[Port] Update to 1.20.1 (v2.5.2)

CDAGaming · Nov 26, 2024 · 59ca086 · 59ca086
1 parent 870aab6
commit 59ca086
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 20 deletions.
diff --git a/...ain/java/com/gitlab/cdagaming/craftpresence/utils/gui/controls/DynamicScrollableList.java b/...ain/java/com/gitlab/cdagaming/craftpresence/utils/gui/controls/DynamicScrollableList.java
@@ -34,11 +34,11 @@
 import com.gitlab.cdagaming.unilib.utils.gui.RenderUtils;
 import com.gitlab.cdagaming.unilib.utils.gui.controls.ScrollableListControl;
 import com.gitlab.cdagaming.unilib.utils.gui.integrations.ExtendedScreen;
-import com.mojang.blaze3d.vertex.PoseStack;
 import io.github.cdagaming.unicore.impl.Pair;
 import io.github.cdagaming.unicore.utils.MappingUtils;
 import io.github.cdagaming.unicore.utils.StringUtils;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
@@ -207,7 +207,7 @@ public void setupAliasData() {
     }
 
     @Override
-    public void renderSlotItem(@Nonnull final PoseStack matrices, final String originalName, final int xPos, final int yPos, final int widthIn, final int heightIn, final int mouseXIn, final int mouseYIn, final boolean isHovering, final float partialTicks) {
+    public void renderSlotItem(@Nonnull final GuiGraphics matrices, final String originalName, final int xPos, final int yPos, final int widthIn, final int heightIn, final int mouseXIn, final int mouseYIn, final boolean isHovering, final float partialTicks) {
         final List<String> hoverText = StringUtils.newArrayList();
         String displayName = getEntryAliases().getOrDefault(originalName, originalName);
         int xOffset = xPos;
@@ -270,7 +270,7 @@ public void renderSlotItem(@Nonnull final PoseStack matrices, final String origi
                 final ItemStack stack = data.get(originalName);
                 if (!ItemUtils.isItemEmpty(stack)) {
                     RenderUtils.drawItemStack(
-                            getGameInstance(), matrices, getFontRenderer(), xOffset, yPos + 4, stack,
+                            matrices, getFontRenderer(), xOffset, yPos + 4, stack,
                             2.0f
                     );
                     xOffset += 35;

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/server/ServerUtils.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/server/ServerUtils.java
@@ -718,7 +718,8 @@ private void joinServer(final ServerData serverData) {
                     currentScreen != null ? currentScreen : new TitleScreen(),
                     CraftPresence.instance,
                     ServerAddress.parseString(serverData.ip),
-                    serverData
+                    serverData,
+                    false
             );
         } catch (Throwable ex) {
             printException(ex);

diff --git a/fabric/src/main/resources/pack.mcmeta b/fabric/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "${mod_name} Resources",
-    "pack_format": 13
+    "pack_format": 15
   }
 }
diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "${mod_name} Resources",
-    "pack_format": 13
+    "pack_format": 15
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -13,30 +13,31 @@ isJarMod=false
 # Mapping Info
 mc_mappings=
 mc_mappings_type=mojmap
-mc_version=1.19.4
-mc_protocol=762
+mc_version=1.20.1
+mc_protocol=763
 display_version=
 # Fabric Info
 fabric_loader_version=0.16.9
-fabric_api_version=0.87.2+1.19.4
-fabric_game_version_range=>=1.19.4 <1.20
+fabric_api_version=0.92.2+1.20.1
+fabric_game_version_range=>=1.20 <1.20.2
 fabric_loader_version_range=>=0.13.0
 # Quilt Info
 quilt_loader_version=0.26.3
-quilt_api_version=5.0.0-beta.11+1.19.4
-quilt_fabric_api_version=6.0.0-beta.11+0.87.0-1.19.4
-quilt_game_version_range=>=1.19.4,<1.20
+quilt_api_version=6.2.0+1.20.1
+quilt_fabric_api_version=7.6.0+0.92.2-1.20.1
+quilt_game_version_range=>=1.20,<1.20.2
 quilt_loader_version_range=>=0.19.2
 # Forge Info
-forge_version=45.1.0
-fml_version_range=[45,)
-forge_game_version_range=[1.19.4, 1.20)
-forge_loader_version_range=[45.0.0,)
+forge_version=47.1.0
+fml_version_range=[46,)
+forge_game_version_range=[1.20, 1.20.2)
+forge_loader_version_range=[46.0.0,)
+additional_forge_loaders=neoforge
 # Deployment Info
 versionId=2.5.2
 deploymentType=Release
 versionLabel=Release
-additional_mc_versions=
+additional_mc_versions=1.20
 # Integration Info
 source_java_version=21
 build_java_version=17
@@ -52,4 +53,4 @@ unilib_build_version=1.0.4
 unilib_minimum_version=1.0.1
 # Dependency Info
 modmenu_group=com.terraformersmc
-modmenu_version=6.3.1
+modmenu_version=7.2.2
diff --git a/quilt/src/main/resources/pack.mcmeta b/quilt/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "${mod_name} Resources",
-    "pack_format": 13
+    "pack_format": 15
   }
 }