[Port] Update to 1.15.2 (v2.5.3)

CDAGaming · Jan 9, 2025 · 5937c7c · 5937c7c
1 parent 1396731
commit 5937c7c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 50 deletions.
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
@@ -747,9 +747,9 @@ private void joinServer(final ServerData serverData) {
     @Override
     public void initPresence() {
         // Player Position Arguments
-        syncArgument("player.position.x", () -> MathUtils.roundDouble(CraftPresence.player.x, 3));
-        syncArgument("player.position.y", () -> MathUtils.roundDouble(CraftPresence.player.y, 3));
-        syncArgument("player.position.z", () -> MathUtils.roundDouble(CraftPresence.player.z, 3));
+        syncArgument("player.position.x", () -> MathUtils.roundDouble(CraftPresence.player.getX(), 3));
+        syncArgument("player.position.y", () -> MathUtils.roundDouble(CraftPresence.player.getY(), 3));
+        syncArgument("player.position.z", () -> MathUtils.roundDouble(CraftPresence.player.getZ(), 3));
 
         // Player Health Arguments
         syncArgument("player.health.current", () -> MathUtils.roundDouble(CraftPresence.player.getHealth(), 0));

diff --git a/fabric/src/main/java/com/gitlab/cdagaming/craftpresence/fabric/impl/ModMenuImpl.java b/fabric/src/main/java/com/gitlab/cdagaming/craftpresence/fabric/impl/ModMenuImpl.java
@@ -25,25 +25,16 @@
 package com.gitlab.cdagaming.craftpresence.fabric.impl;
 
 import com.gitlab.cdagaming.craftpresence.config.gui.MainGui;
-import com.gitlab.cdagaming.craftpresence.core.Constants;
+import io.github.prospector.modmenu.api.ConfigScreenFactory;
 import io.github.prospector.modmenu.api.ModMenuApi;
-import net.minecraft.client.gui.screens.Screen;
-
-import java.util.function.Function;
 
 /**
  * Hook to provide Integration with ProspectorDev's ModMenu
  *
  * @author CDAGaming
  */
 public class ModMenuImpl implements ModMenuApi {
-    @Override
-    public String getModId() {
-        return Constants.MOD_ID;
-    }
-
-    @Override
-    public Function<Screen, ? extends Screen> getConfigScreenFactory() {
+    public ConfigScreenFactory<?> getModConfigScreenFactory() {
         return MainGui::new;
     }
 }
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": 4
+    "pack_format": 5
   }
 }
diff --git a/forge/src/main/java/com/gitlab/cdagaming/craftpresence/forge/CraftPresenceForge.java b/forge/src/main/java/com/gitlab/cdagaming/craftpresence/forge/CraftPresenceForge.java
@@ -28,18 +28,14 @@
 import com.gitlab.cdagaming.craftpresence.config.gui.MainGui;
 import com.gitlab.cdagaming.unilib.core.CoreUtils;
 import io.github.cdagaming.unicore.utils.OSUtils;
-import io.github.cdagaming.unicore.utils.StringUtils;
 import net.minecraftforge.fml.ExtensionPoint;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.loading.FMLEnvironment;
-import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
 import net.minecraftforge.fml.network.FMLNetworkConstants;
 import org.apache.commons.lang3.tuple.Pair;
 
-import java.util.List;
-
 /**
  * The Primary Application Class and Utilities
  *
@@ -65,14 +61,6 @@ public CraftPresenceForge() {
             }
 
             try {
-                // Workaround: Modify "ModInfo#hasConfigUI" for certain Forge Clients
-                // - Reference => https://github.com/MinecraftForge/MinecraftForge/pull/6208
-                final ModList modList = ModList.get();
-                final List<ModInfo> sortedList = (List<ModInfo>) StringUtils.getField(ModList.class, modList, "sortedList");
-                final ModInfo modInfo = sortedList.stream().filter(info -> info.getModId().equals("craftpresence")).findFirst().get();
-                sortedList.set(sortedList.indexOf(modInfo), new CraftPresenceModInfo(modInfo));
-                StringUtils.updateField(ModList.class, modList, sortedList, "sortedList");
-
                 // Register The Config GUI Factory, used in Forge for Mod Menu integration
                 ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY, () -> (mc, parentScreen) -> new MainGui(parentScreen));
             } catch (Throwable ex) {
@@ -95,15 +83,4 @@ public CraftPresenceForge() {
     public void setupIntegrations() {
         // N/A
     }
-
-    private static class CraftPresenceModInfo extends ModInfo {
-        public CraftPresenceModInfo(ModInfo modInfo) {
-            super(modInfo.getOwningFile(), modInfo.getModConfig());
-        }
-
-        @Override
-        public boolean hasConfigUI() {
-            return true;
-        }
-    }
 }
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": 4
+    "pack_format": 5
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -13,24 +13,24 @@ isJarMod=false
 # Mapping Info
 mc_mappings=
 mc_mappings_type=mojmap
-mc_version=1.14.4
-mc_protocol=498
+mc_version=1.15.2
+mc_protocol=578
 display_version=
 # Fabric Info
 fabric_loader_version=0.16.9
-fabric_api_version=0.28.5+1.14
-fabric_game_version_range=>=1.14 <1.15
+fabric_api_version=0.28.5+1.15
+fabric_game_version_range=>=1.15 <1.16
 fabric_loader_version_range=>=0.13.0
 # Forge Info
-forge_version=28.2.26
-fml_version_range=[26,)
-forge_game_version_range=[1.14, 1.15)
-forge_loader_version_range=[26.0.0,)
+forge_version=31.2.57
+fml_version_range=[29,)
+forge_game_version_range=[1.15, 1.16)
+forge_loader_version_range=[29.0.0,)
 # Deployment Info
 versionId=2.5.3
 deploymentType=Release
 versionLabel=Release
-additional_mc_versions=1.14,1.14.1,1.14.2,1.14.3
+additional_mc_versions=1.15,1.15.1
 # Integration Info
 source_java_version=21
 build_java_version=8
@@ -45,5 +45,5 @@ unilib_name=UniLib
 unilib_build_version=1.0.5
 unilib_minimum_version=1.0.1
 # Dependency Info
-modmenu_group=io.github.prospector
-modmenu_version=1.7.17+build.1
+modmenu_group=com.terraformersmc
+modmenu_version=1.10.7