Move bukkit version fixes to build changes

gommehdnet · Apr 10, 2024 · 46b3fb7 · 46b3fb7
1 parent 807ecf8
commit 46b3fb7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch
@@ -68,15 +68,15 @@ index c490a29bcf7410bc54959ee71375605964379ed5..476f34bcf936a6c32af062fe1c0a5076
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 774556a62eb240da42e84db4502e2ed43495be17..d62fac1aa2778f0cd5eeefc9fdf57c2ab33fcbad 100644
+index 774556a62eb240da42e84db4502e2ed43495be17..b6c77b5e233ca817fec83f20b66cb40405daf63c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -11,7 +11,7 @@ public final class Versioning {
      public static String getBukkitVersion() {
          String result = "Unknown-Version";
 
 -        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties");
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.example.paperfork/cheetah-api/pom.properties"); // Cheetah
++        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/net.gommehd.cheetah/cheetah-api/pom.properties"); // Cheetah - Build changes
          Properties properties = new Properties();
 
          if (stream != null) {
diff --git a/patches/server/0005-fixed-version-checks.patch b/patches/server/0005-fixed-version-checks.patch
@@ -36,16 +36,3 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..537a53cd64e448a918370ff8774be4a9
 
          switch (distance) {
              case -1:
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index d62fac1aa2778f0cd5eeefc9fdf57c2ab33fcbad..bedccc22c501a249ddf0f5f8560ae0246cee1281 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-@@ -11,7 +11,7 @@ public final class Versioning {
-     public static String getBukkitVersion() {
-         String result = "Unknown-Version";
-
--        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/com.example.paperfork/cheetah-api/pom.properties"); // Cheetah
-+        InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/net.gommehd.cheetah/cheetah-api/pom.properties"); // Cheetah
-         Properties properties = new Properties();
-
-         if (stream != null) {