mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-26 22:40:21 +01:00
[ci skip] more cleanup from repo reorg
This commit is contained in:
Jake Potrebic
parent
083c083188
commit
eb793c3131
7 changed files with 0 additions and 171 deletions
40
paper-api/.gitignore
vendored
40
paper-api/.gitignore
vendored
|
|
@ -1,40 +0,0 @@
|
||||||
.gradle/
|
|
||||||
|
|
||||||
# Eclipse stuff
|
|
||||||
/.classpath
|
|
||||||
/.project
|
|
||||||
/.settings
|
|
||||||
/.checkstyle
|
|
||||||
/.factorypath
|
|
||||||
|
|
||||||
# netbeans
|
|
||||||
/nbproject
|
|
||||||
/nb-configuration.xml
|
|
||||||
|
|
||||||
# we use maven!
|
|
||||||
/build.xml
|
|
||||||
|
|
||||||
# maven
|
|
||||||
/target
|
|
||||||
|
|
||||||
# vim
|
|
||||||
.*.sw[a-p]
|
|
||||||
|
|
||||||
# various other potential build files
|
|
||||||
/build
|
|
||||||
/bin
|
|
||||||
/dist
|
|
||||||
/manifest.mf
|
|
||||||
|
|
||||||
# Mac filesystem dust
|
|
||||||
.DS_Store
|
|
||||||
|
|
||||||
# intellij
|
|
||||||
*.iml
|
|
||||||
*.ipr
|
|
||||||
*.iws
|
|
||||||
.idea/
|
|
||||||
|
|
||||||
# vs code
|
|
||||||
/.vscode
|
|
||||||
/.factorypath
|
|
||||||
45
paper-server/.gitignore
vendored
45
paper-server/.gitignore
vendored
|
|
@ -1,45 +0,0 @@
|
||||||
.gradle/
|
|
||||||
build/
|
|
||||||
|
|
||||||
# Eclipse stuff
|
|
||||||
/.classpath
|
|
||||||
/.project
|
|
||||||
/.settings
|
|
||||||
/.checkstyle
|
|
||||||
/.factorypath
|
|
||||||
|
|
||||||
# netbeans
|
|
||||||
/nbproject
|
|
||||||
nb*.xml
|
|
||||||
|
|
||||||
# we use maven!
|
|
||||||
/build.xml
|
|
||||||
|
|
||||||
# maven
|
|
||||||
/target
|
|
||||||
dependency-reduced-pom.xml
|
|
||||||
|
|
||||||
# vim
|
|
||||||
.*.sw[a-p]
|
|
||||||
|
|
||||||
# various other potential build files
|
|
||||||
/build
|
|
||||||
/bin
|
|
||||||
/dist
|
|
||||||
/manifest.mf
|
|
||||||
|
|
||||||
/world
|
|
||||||
/logs
|
|
||||||
|
|
||||||
# Mac filesystem dust
|
|
||||||
.DS_Store
|
|
||||||
|
|
||||||
# intellij
|
|
||||||
*.iml
|
|
||||||
*.ipr
|
|
||||||
*.iws
|
|
||||||
.idea/
|
|
||||||
|
|
||||||
# vs code
|
|
||||||
/.vscode
|
|
||||||
/.factorypath
|
|
||||||
|
|
@ -313,7 +313,6 @@ tasks.registerRunTask("runReobfServer") {
|
||||||
tasks.registerRunTask("runDevServer") {
|
tasks.registerRunTask("runDevServer") {
|
||||||
description = "Spin up a test server without assembling a jar"
|
description = "Spin up a test server without assembling a jar"
|
||||||
classpath(sourceSets.main.map { it.runtimeClasspath })
|
classpath(sourceSets.main.map { it.runtimeClasspath })
|
||||||
jvmArgs("-DPaper.pushPaperAssetsRoot=true")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.registerRunTask("runBundler") {
|
tasks.registerRunTask("runBundler") {
|
||||||
|
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
--- a/net/minecraft/server/packs/VanillaPackResourcesBuilder.java
|
|
||||||
+++ b/net/minecraft/server/packs/VanillaPackResourcesBuilder.java
|
|
||||||
@@ -137,6 +_,15 @@
|
|
||||||
|
|
||||||
public VanillaPackResourcesBuilder applyDevelopmentConfig() {
|
|
||||||
developmentConfig.accept(this);
|
|
||||||
+ if (Boolean.getBoolean("Paper.pushPaperAssetsRoot")) {
|
|
||||||
+ try {
|
|
||||||
+ this.pushAssetPath(net.minecraft.server.packs.PackType.SERVER_DATA, net.minecraft.server.packs.VanillaPackResourcesBuilder.safeGetPath(java.util.Objects.requireNonNull(
|
|
||||||
+ // Important that this is a patched class
|
|
||||||
+ VanillaPackResourcesBuilder.class.getResource("/data/.paperassetsroot"), "Missing required .paperassetsroot file").toURI()).getParent());
|
|
||||||
+ } catch (java.net.URISyntaxException | IOException ex) {
|
|
||||||
+ throw new RuntimeException(ex);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
org.bukkit.craftbukkit.Main
|
|
||||||
|
|
@ -1,65 +0,0 @@
|
||||||
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
|
|
||||||
|
|
||||||
<id>bootstrap</id>
|
|
||||||
|
|
||||||
<formats>
|
|
||||||
<format>jar</format>
|
|
||||||
</formats>
|
|
||||||
|
|
||||||
<includeBaseDirectory>false</includeBaseDirectory>
|
|
||||||
|
|
||||||
<files>
|
|
||||||
<file>
|
|
||||||
<destName>libraries.list</destName>
|
|
||||||
<outputDirectory>META-INF</outputDirectory>
|
|
||||||
<source>${project.build.directory}/dependencies-checksums.sha</source>
|
|
||||||
</file>
|
|
||||||
<file>
|
|
||||||
<destName>versions.list</destName>
|
|
||||||
<outputDirectory>META-INF</outputDirectory>
|
|
||||||
<source>${project.build.directory}/artifacts-checksums.sha</source>
|
|
||||||
</file>
|
|
||||||
</files>
|
|
||||||
|
|
||||||
<fileSets>
|
|
||||||
<fileSet>
|
|
||||||
<directory>${project.basedir}/src/assembly/META-INF</directory>
|
|
||||||
<filtered>true</filtered>
|
|
||||||
<outputDirectory>META-INF</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
</fileSets>
|
|
||||||
|
|
||||||
<dependencySets>
|
|
||||||
<!-- libraries -->
|
|
||||||
<dependencySet>
|
|
||||||
<excludes>
|
|
||||||
<exclude>org.spigotmc:minecraft-server</exclude>
|
|
||||||
</excludes>
|
|
||||||
<outputDirectory>META-INF/libraries</outputDirectory>
|
|
||||||
<useProjectArtifact>false</useProjectArtifact>
|
|
||||||
</dependencySet>
|
|
||||||
|
|
||||||
<!-- main jar -->
|
|
||||||
<dependencySet>
|
|
||||||
<includes>
|
|
||||||
<include>${project.groupId}:${project.artifactId}</include>
|
|
||||||
</includes>
|
|
||||||
<outputDirectory>META-INF/versions</outputDirectory>
|
|
||||||
</dependencySet>
|
|
||||||
|
|
||||||
<!-- bootstrap -->
|
|
||||||
<dependencySet>
|
|
||||||
<includes>
|
|
||||||
<include>${project.groupId}:${project.artifactId}</include>
|
|
||||||
</includes>
|
|
||||||
<unpack>true</unpack>
|
|
||||||
<unpackOptions>
|
|
||||||
<includes>
|
|
||||||
<include>org/bukkit/craftbukkit/bootstrap/**</include>
|
|
||||||
</includes>
|
|
||||||
</unpackOptions>
|
|
||||||
</dependencySet>
|
|
||||||
</dependencySets>
|
|
||||||
</assembly>
|
|
||||||
|
|
@ -75,7 +75,6 @@ public final class RegistryHelper {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void setup(FeatureFlagSet featureFlagSet) {
|
public static void setup(FeatureFlagSet featureFlagSet) {
|
||||||
System.setProperty("Paper.pushPaperAssetsRoot", "true"); // Paper - build system changes - push asset root
|
|
||||||
SharedConstants.tryDetectVersion();
|
SharedConstants.tryDetectVersion();
|
||||||
Bootstrap.bootStrap();
|
Bootstrap.bootStrap();
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue