diff options
Diffstat (limited to 'paper-server/src')
| -rw-r--r-- | paper-server/src/assembly/META-INF/main-class | 1 | ||||
| -rw-r--r-- | paper-server/src/assembly/bootstrap.xml | 65 | ||||
| -rw-r--r-- | paper-server/src/test/java/org/bukkit/support/RegistryHelper.java | 1 |
3 files changed, 0 insertions, 67 deletions
diff --git a/paper-server/src/assembly/META-INF/main-class b/paper-server/src/assembly/META-INF/main-class deleted file mode 100644 index 94a6b1554c..0000000000 --- a/paper-server/src/assembly/META-INF/main-class +++ /dev/null @@ -1 +0,0 @@ -org.bukkit.craftbukkit.Main
\ No newline at end of file diff --git a/paper-server/src/assembly/bootstrap.xml b/paper-server/src/assembly/bootstrap.xml deleted file mode 100644 index f8980991f5..0000000000 --- a/paper-server/src/assembly/bootstrap.xml +++ /dev/null @@ -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> diff --git a/paper-server/src/test/java/org/bukkit/support/RegistryHelper.java b/paper-server/src/test/java/org/bukkit/support/RegistryHelper.java index 68ae998b30..629e3a3bca 100644 --- a/paper-server/src/test/java/org/bukkit/support/RegistryHelper.java +++ b/paper-server/src/test/java/org/bukkit/support/RegistryHelper.java @@ -75,7 +75,6 @@ public final class RegistryHelper { } public static void setup(FeatureFlagSet featureFlagSet) { - System.setProperty("Paper.pushPaperAssetsRoot", "true"); // Paper - build system changes - push asset root SharedConstants.tryDetectVersion(); Bootstrap.bootStrap(); |