[Port] Update to special/bta-7.1 (v2.5.1)

CDAGaming · Oct 11, 2024 · 2122fc2 · 2122fc2
1 parent 20d0f89
commit 2122fc2
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/...c/main/java/com/gitlab/cdagaming/craftpresence/core/config/migration/HypherConverter.java b/...c/main/java/com/gitlab/cdagaming/craftpresence/core/config/migration/HypherConverter.java
@@ -162,7 +162,7 @@ public Config apply(Config instance, JsonElement rawJson, Object... args) {
 
             // Per-GUI Events
             instance.advancedSettings.enablePerGui = true;
-            instance.advancedSettings.guiSettings.guiData.put("GuiMultiplayer", new ModuleData()
+            instance.advancedSettings.guiSettings.guiData.put("GuiSelectServer", new ModuleData()
                     .setData(convertPresenceData(conf.get("server_list"))));
             instance.advancedSettings.guiSettings.guiData.put("GuiDownloadTerrain", new ModuleData()
                     .setData(convertPresenceData(conf.get("join_game"))));

diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/entity/EntityUtils.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/entity/EntityUtils.java
@@ -128,7 +128,7 @@ public void clearAttributes() {
     @Override
     public void updateData() {
         final Entity NEW_CURRENT_TARGET = CraftPresence.instance.objectMouseOver != null && CraftPresence.instance.objectMouseOver.entity != null ? CraftPresence.instance.objectMouseOver.entity : null;
-        final Entity NEW_CURRENT_RIDING = CraftPresence.player.vehicle;
+        final Entity NEW_CURRENT_RIDING = (Entity) CraftPresence.player.vehicle;
 
         final boolean hasTargetChanged = !Objects.equals(NEW_CURRENT_TARGET, CURRENT_TARGET);
         final boolean hasRidingChanged = !Objects.equals(NEW_CURRENT_RIDING, CURRENT_RIDING);
@@ -257,7 +257,7 @@ public void updatePresence() {
 
     @Override
     public void getInternalData() {
-        final Map mappings = (Map) StringUtils.getField(EntityDispatcher.class, null, "classToStringMapping", "field_1610_b", "b");
+        final Map mappings = (Map) StringUtils.getField(EntityDispatcher.class, null, "classToKeyMap", "field_1610_b", "b");
         if (!mappings.values().isEmpty()) {
             for (Object entityLocationObj : mappings.values()) {
                 final String entityLocation = (String) entityLocationObj;

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
@@ -569,7 +569,7 @@ private void joinServer(final ServerNBTStorage serverData) {
 
             if (CraftPresence.player != null) {
                 CraftPresence.world.sendQuittingDisconnectingPacket();
-                CraftPresence.instance.changeWorld1(null);
+                CraftPresence.instance.changeWorld(null);
             }
 
             RenderUtils.openScreen(
@@ -593,8 +593,8 @@ public void initPresence() {
         syncArgument("player.position.z", () -> MathUtils.roundDouble(CraftPresence.player.z, 3));
 
         // Player Health Arguments
-        syncArgument("player.health.current", () -> MathUtils.roundDouble(CraftPresence.player.health, 0));
-        syncArgument("player.health.max", () -> MathUtils.roundDouble(20.0D, 0));
+        syncArgument("player.health.current", () -> MathUtils.roundDouble(CraftPresence.player.getHealth(), 0));
+        syncArgument("player.health.max", () -> MathUtils.roundDouble(CraftPresence.player.getMaxHealth(), 0));
 
         // World Data Arguments
         syncArgument("world.difficulty", () -> {

diff --git a/gradle.properties b/gradle.properties
@@ -15,14 +15,14 @@ mc_mappings=4.3-b1.7.3
 mc_mappings_type=mcp
 mc_version=b1.7.3
 mc_protocol=14
-display_version=b1.7.7.0_02
+display_version=b7.1_01
 # Fabric Info
 fabric_loader_version=0.16.5
 fabric_api_version=
 fabric_game_version_range=*
 fabric_loader_version_range=>=0.13.0
 # Forge Info
-forge_version=1.7.7.0_02
+forge_version=7.1_01
 fml_version_range=
 forge_game_version_range=b1.7.3
 forge_loader_version_range=

diff --git a/libs/nsss-1.7.7.0_02.jar b/libs/nsss-1.7.7.0_02.jar
diff --git a/libs/nsss-7.1_01.jar b/libs/nsss-7.1_01.jar