From eb793c313123a69cabfee8946d20293574a6b1be Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Sun, 22 Dec 2024 19:07:17 -0800 Subject: [ci skip] more cleanup from repo reorg --- paper-api/.gitignore | 40 ------------- paper-server/.gitignore | 45 --------------- paper-server/build.gradle.kts | 1 - .../packs/VanillaPackResourcesBuilder.java.patch | 18 ------ paper-server/src/assembly/META-INF/main-class | 1 - paper-server/src/assembly/bootstrap.xml | 65 ---------------------- .../java/org/bukkit/support/RegistryHelper.java | 1 - 7 files changed, 171 deletions(-) delete mode 100644 paper-api/.gitignore delete mode 100644 paper-server/.gitignore delete mode 100644 paper-server/patches/sources/net/minecraft/server/packs/VanillaPackResourcesBuilder.java.patch delete mode 100644 paper-server/src/assembly/META-INF/main-class delete mode 100644 paper-server/src/assembly/bootstrap.xml diff --git a/paper-api/.gitignore b/paper-api/.gitignore deleted file mode 100644 index 97e78e27ee..0000000000 --- a/paper-api/.gitignore +++ /dev/null @@ -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 diff --git a/paper-server/.gitignore b/paper-server/.gitignore deleted file mode 100644 index 083ccfdb5f..0000000000 --- a/paper-server/.gitignore +++ /dev/null @@ -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 diff --git a/paper-server/build.gradle.kts b/paper-server/build.gradle.kts index 266795c487..c07f189f60 100644 --- a/paper-server/build.gradle.kts +++ b/paper-server/build.gradle.kts @@ -313,7 +313,6 @@ tasks.registerRunTask("runReobfServer") { tasks.registerRunTask("runDevServer") { description = "Spin up a test server without assembling a jar" classpath(sourceSets.main.map { it.runtimeClasspath }) - jvmArgs("-DPaper.pushPaperAssetsRoot=true") } tasks.registerRunTask("runBundler") { diff --git a/paper-server/patches/sources/net/minecraft/server/packs/VanillaPackResourcesBuilder.java.patch b/paper-server/patches/sources/net/minecraft/server/packs/VanillaPackResourcesBuilder.java.patch deleted file mode 100644 index acd2b45a58..0000000000 --- a/paper-server/patches/sources/net/minecraft/server/packs/VanillaPackResourcesBuilder.java.patch +++ /dev/null @@ -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; - } - 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 @@ - - - bootstrap - - - jar - - - false - - - - libraries.list - META-INF - ${project.build.directory}/dependencies-checksums.sha - - - versions.list - META-INF - ${project.build.directory}/artifacts-checksums.sha - - - - - - ${project.basedir}/src/assembly/META-INF - true - META-INF - - - - - - - - org.spigotmc:minecraft-server - - META-INF/libraries - false - - - - - - ${project.groupId}:${project.artifactId} - - META-INF/versions - - - - - - ${project.groupId}:${project.artifactId} - - true - - - org/bukkit/craftbukkit/bootstrap/** - - - - - 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(); -- cgit v1.2.3