[Port] Update to special/babric-b1.7.3 (v2.5.3)

CDAGaming · Jan 14, 2025 · cd4c04f · cd4c04f
1 parent 375b378
commit cd4c04f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 20 deletions.
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -24,18 +24,17 @@ val fileFormat: String by extra
 
 unimined.minecraft {
     defaultRemapJar = false
-    if (!isJarMod) {
+    if (true) {
         val fabricData: FabricLikePatcher.() -> Unit = {
             if (accessWidenerFile.exists()) {
                 accessWidener(accessWidenerFile)
             }
             loader("fabric_loader_version"()!!)
-            customIntermediaries = true
         }
         if (isModern) {
             fabric(fabricData)
         } else {
-            legacyFabric(fabricData)
+            babric(fabricData)
         }
     }
 }

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
@@ -257,7 +257,7 @@ public void updatePresence() {
 
     @Override
     public void getInternalData() {
-        final Map mappings = (Map) StringUtils.getField(EntityList.class, null, "classToStringMapping", "field_1610_b", "b");
+        final Map mappings = (Map) StringUtils.getField(EntityList.class, null, "classToStringMapping", "field_758", "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
@@ -221,8 +221,8 @@ public void updateData() {
 
         try {
             if (newConnection != null) {
-                final NetworkManager netManager = (NetworkManager) StringUtils.getField(NetClientHandler.class, newConnection, "netManager", "field_1213_d", "e");
-                final Socket socket = (Socket) StringUtils.getField(NetworkManager.class, netManager, "networkSocket", "field_12258_e", "h");
+                final NetworkManager netManager = (NetworkManager) StringUtils.getField(NetClientHandler.class, newConnection, "netManager", "field_1971", "e");
+                final Socket socket = (Socket) StringUtils.getField(NetworkManager.class, netManager, "networkSocket", "field_1281", "h");
                 final String retrievedIP = socket.getInetAddress().getHostAddress();
                 final int retrievedPort = socket.getPort();
                 newServerData = (!StringUtils.isNullOrEmpty(retrievedIP) && retrievedPort != 0) ? new ServerNBTStorage(retrievedIP, retrievedPort) : null;

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -30,16 +30,11 @@ unimined.minecraft {
             accessWidener(accessWidenerFile)
         }
         loader("fabric_loader_version"()!!)
-        if (isJarMod) {
-            prodNamespace("official")
-            devMappings = null
-        }
-        customIntermediaries = true
     }
     if (isModern) {
         fabric(fabricData)
     } else {
-        legacyFabric(fabricData)
+        babric(fabricData)
     }
 }
 
@@ -98,9 +93,6 @@ tasks.shadowJar {
 }
 
 tasks.named<RemapJarTask>("remapJar") {
-    if (isJarMod) {
-        prodNamespace("official")
-    }
     dependsOn(tasks.shadowJar.get())
     asJar {
         inputFile.set(tasks.shadowJar.get().archiveFile)

diff --git a/gradle.properties b/gradle.properties
@@ -3,10 +3,10 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 # Archive Info
-mod_name=CraftPresence
+mod_name=CraftPresence-Babric
 mod_id=craftpresence
 group=com.gitlab.cdagaming
-enabled_platforms=fabric,modloader
+enabled_platforms=fabric
 # Critical Info
 isLegacy=true
 isJarMod=true
@@ -17,7 +17,7 @@ mc_version=b1.7.3
 mc_protocol=14
 display_version=
 # Fabric Info
-fabric_loader_version=0.16.9
+fabric_loader_version=0.15.6-babric.2
 fabric_api_version=
 fabric_game_version_range=*
 fabric_loader_version_range=>=0.12.0
@@ -28,7 +28,7 @@ forge_game_version_range=b1.7.3
 forge_loader_version_range=
 # Deployment Info
 versionId=2.5.3
-deploymentType=Release
+deploymentType=Alpha
 versionLabel=Release
 additional_mc_versions=
 # Integration Info
@@ -41,7 +41,7 @@ starscript_version=0.3.4
 classgraph_version=4.8.179
 moonconf_version=1.0.9
 # UniLib Info
-unilib_name=UniLib
+unilib_name=UniLib-Babric
 unilib_build_version=1.0.5
 unilib_minimum_version=1.0.1
 # Dependency Info