Update to 22w24a

BlueberryMC · Jun 15, 2022 · 4406204 · 4406204
1 parent c04e592
commit 4406204
Show file tree

Hide file tree

Showing 13 changed files with 138 additions and 116 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Get major version
         id: getMajorVersion
         run: |
-          MINECRAFT_VERSION=$(grep MINECRAFT_VERSION buildSrc/src/main/kotlin/net/blueberrymc/gradle/buildSrc/constants/MagicConstants.kt | sed -r "s/.*= \"([0-9]+\\.[0-9]+)(\\.[0-9]+)?\"/\1/" | sed s/\\./_/)
+          MINECRAFT_VERSION=$(grep MAJOR_VERSION buildSrc/src/main/kotlin/net/blueberrymc/gradle/buildSrc/constants/MagicConstants.kt | sed -r "s/.*= \"([0-9]+\\.[0-9]+)(\\.[0-9]+)?\"/\1/" | sed s/\\./_/)
           echo "Detected major version: $MINECRAFT_VERSION"
           echo "::set-output name=value::$MINECRAFT_VERSION"
     outputs:

diff --git a/Blueberry-API/build.gradle.kts b/Blueberry-API/build.gradle.kts
@@ -13,9 +13,9 @@ dependencies {
     api("com.mojang:brigadier:1.0.18")
     api("com.mojang:datafixerupper:5.0.28")
     api("com.mojang:javabridge:1.2.24")
-    api("com.mojang:authlib:3.5.41")
+    api("com.mojang:authlib:3.6.42")
     api("it.unimi.dsi:fastutil:8.5.6")
-    api("io.netty:netty-all:4.1.76.Final")
+    api("io.netty:netty-all:4.1.77.Final")
     api("org.apache.commons:commons-lang3:3.12.0")
     api("org.yaml:snakeyaml:1.29")
     api("org.ow2.asm:asm:9.2")

diff --git a/Blueberry-API/src/main/java/net/blueberrymc/client/gui/screens/FileDialogScreen.java b/Blueberry-API/src/main/java/net/blueberrymc/client/gui/screens/FileDialogScreen.java
@@ -191,8 +191,8 @@ protected boolean isFocused() {
         }
 
         @Override
-        protected void renderList(@NotNull PoseStack poseStack, int rowLeft, int i2, int mouseX, int mouseY, float deltaFrameTime) {
-            super.renderList(poseStack, rowLeft, i2, mouseX, mouseY, deltaFrameTime);
+        protected void renderList(@NotNull PoseStack poseStack, int mouseX, int mouseY, float deltaFrameTime) {
+            super.renderList(poseStack, mouseX, mouseY, deltaFrameTime);
             int itemCount = this.getItemCount();
 
             for (int itemIndex = 0; itemIndex < itemCount; ++itemIndex) {
@@ -203,13 +203,13 @@ protected void renderList(@NotNull PoseStack poseStack, int rowLeft, int i2, int
                     int rowWidth = this.getRowWidth();
                     if (this.isSelectedItem(itemIndex)) {
                         if (entry.file.isDirectory()) {
-                            cdButton.x = rowLeft + rowWidth;
+                            cdButton.x = getRowLeft() + rowWidth;
                             cdButton.y = rowTop - 3;
                             cdButton.visible = true;
                             cdButton.render(poseStack, mouseX, mouseY, deltaFrameTime);
                             if (options.fileType() == FileDialogScreenOptions.FileType.DIRECTORY ||
                                     options.fileType() == FileDialogScreenOptions.FileType.ALL) {
-                                selectButton.x = rowLeft + rowWidth + 22;
+                                selectButton.x = getRowLeft() + rowWidth + 22;
                                 selectButton.y = rowTop - 3;
                                 selectButton.visible = true;
                                 selectButton.render(poseStack, mouseX, mouseY, deltaFrameTime);
@@ -218,7 +218,7 @@ protected void renderList(@NotNull PoseStack poseStack, int rowLeft, int i2, int
                             }
                         } else {
                             cdButton.visible = false;
-                            selectButton.x = rowLeft + rowWidth;
+                            selectButton.x = getRowLeft() + rowWidth;
                             selectButton.y = rowTop - 3;
                             selectButton.visible = true;
                             selectButton.render(poseStack, mouseX, mouseY, deltaFrameTime);

diff --git a/MagmaCube b/MagmaCube
diff --git a/MagmaCube-Patches/0001-POM-Changes.patch b/MagmaCube-Patches/0001-POM-Changes.patch
@@ -27,10 +27,10 @@ index fb84bbcd532981037e97b33e7b8bdef539dbbd2c..871ca99691b10950eeeb6d4b7630708f
      @DontObfuscate
      public static String getClientModName() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f3ce5b2b9aaf2427cc412c96bab35055af606751..95ca34e1af4b0c38b754465ed93f599a354a59fe 100644
+index f631124b85fb375c6375d595aa5a635b371734d1..608f29b206581bbf31b1ab1561c02c54ebcf1b0e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -918,7 +918,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -920,7 +920,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      @DontObfuscate
      public String getServerModName() {

diff --git a/MagmaCube-Patches/0003-Get-our-version-instead-of-magmacube-s.patch b/MagmaCube-Patches/0003-Get-our-version-instead-of-magmacube-s.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Get our version instead of magmacube's
 
 
 diff --git a/src/main/java/net/minecraft/DetectedVersion.java b/src/main/java/net/minecraft/DetectedVersion.java
-index 723f9d25b563263079dae3eb846ae30d4ef66d67..e63d7d1b2072288fab0c33c3009a6df93b1a7325 100644
+index fb72e225f98cf4ead2d903a645965489ab3d121d..dcc312cb575a49d7339bd605ebe986f531a3a696 100644
 --- a/src/main/java/net/minecraft/DetectedVersion.java
 +++ b/src/main/java/net/minecraft/DetectedVersion.java
 @@ -26,7 +26,7 @@ public class DetectedVersion implements WorldVersion {
@@ -20,7 +20,7 @@ index 723f9d25b563263079dae3eb846ae30d4ef66d67..e63d7d1b2072288fab0c33c3009a6df9
 @@ -38,7 +38,7 @@ public class DetectedVersion implements WorldVersion {
          this.dataPackVersion = 10;
          this.buildTime = new Date();
-         this.releaseTarget = "1.19";
+         this.releaseTarget = "1.19.1";
 -        this.magmaCubeVersion = "debug"; // MagmaCube
 +        // this.magmaCubeVersion = "debug"; // MagmaCube // Blueberry
      }
@@ -36,10 +36,10 @@ index 723f9d25b563263079dae3eb846ae30d4ef66d67..e63d7d1b2072288fab0c33c3009a6df9
 
      public static WorldVersion tryDetectVersion() {
 diff --git a/src/main/java/net/minecraft/client/Minecraft.java b/src/main/java/net/minecraft/client/Minecraft.java
-index 09a4ef5af86afcdac75154df15b498fed37a1ef0..12d82a456d0db6ad7be270e2d692d2c5efbd8c12 100644
+index b1f602e434dcf90c1a6e27958d48b05732dfefee..39ac42c69f34a2acb2c2975b6f37675751944c50 100644
 --- a/src/main/java/net/minecraft/client/Minecraft.java
 +++ b/src/main/java/net/minecraft/client/Minecraft.java
-@@ -704,7 +704,7 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
+@@ -709,7 +709,7 @@ public class Minecraft extends ReentrantBlockableEventLoop<Runnable> implements
      }
 
      public String getLaunchedVersion() {
+4 −4		patches/0001-Add-pom.xml.patch
+444 −92		patches/0002-decompile-fix.patch
+4 −4		patches/0004-magmacube-vanilla.patch
+1 −1		pom.xml
+2 −2		scripts/downloadJars.sh
+6 −6		scripts/files/version.json
+6 −6		scripts/functions.sh