v0.14.16.0 - Compat for PMWeather 0.14.16

Took 55 minutes

Author: nullved

build.gradle

@@ -130,7 +130,7 @@ dependencies {
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
 
-    implementation "maven.modrinth:protomanlys-weather:0.14.15-alpha"
+    implementation "maven.modrinth:protomanlys-weather:${pmweather_version}-alpha"
 }
 
 // This block of code expands all declared replace properties in the specified resource targets.
@@ -146,7 +146,8 @@ var generateModMetadata = tasks.register("generateModMetadata", ProcessResources
                              mod_license            : mod_license,
                              mod_version            : mod_version,
                              mod_authors            : mod_authors,
-                             mod_description        : mod_description]
+                             mod_description        : mod_description,
+                             pmweather_version      : pmweather_version]
     inputs.properties replaceProperties
     expand replaceProperties
     from "src/main/templates"

gradle.properties

@@ -17,7 +17,10 @@ parchment_mappings_version=2024.11.17
 mod_id=pmweatherapi
 mod_name=PMWeatherAPI
 mod_license=GNU GPL 3.0
-mod_version=0.14.15.6
+mod_version=0.14.16.0
 mod_group_id=net.nullved
 mod_authors=NullVed
-mod_description=An API for interfacing with ProtoManly's Weather Mod
+mod_description=An API for interfacing with ProtoManly's Weather Mod
+
+# Dependencies
+pmweather_version=0.14.16

src/main/java/net/nullved/pmweatherapi/mixin/RadarRendererMixin.java

@@ -125,13 +125,13 @@ private void render(BlockEntity blockEntity, float partialTicks, PoseStack poseS
 
                 // PMWeatherAPI: Change ids to be integers instead of strings (also removes the String.format nightmare that was causing lag)
                 int id = ((short) x + resolution) << 8 | ((short) z + resolution);
-                String stringID = String.valueOf(id);
+                long longID = (long)(x + resolution + 1) + (long)(z + resolution + 1) * ((long)resolution * 2L + 1L);;
 
-                float dbz = radarBlockEntity.reflectivityMap.getOrDefault(stringID, 0.0F);
-                float temp = radarBlockEntity.temperatureMap.getOrDefault(stringID, 15.0F);
-                float vel = radarBlockEntity.velocityMap.getOrDefault(stringID, 0.0F);
+                float dbz = radarBlockEntity.reflectivityMap.getOrDefault(longID, 0.0F);
+                float temp = radarBlockEntity.temperatureMap.getOrDefault(longID, 15.0F);
+                float vel = radarBlockEntity.velocityMap.getOrDefault(longID, 0.0F);
                 Color color = PMWClientStorages.RADAR_MODE_COLORS.computeIfAbsent(radarMode, rm -> new HashMap<>()).getOrDefault(id, new Color(1.0F, 0, 1.0F));
-                Color dbg = radarBlockEntity.debugMap.getOrDefault(stringID, new Color(0, 0, 0));
+                Color dbg = radarBlockEntity.debugMap.getOrDefault(longID, new Color(0, 0, 0));
 
                 Vector3f pixelPos = (new Vector3f((float)x, 0.0F, (float)z)).mul(1.0F / (float)resolution).mul(sizeRenderDiameter / 2.0F);
                 Vec3 worldPos = (new Vec3(x, 0.0F, z)).multiply(1.0F / (float)resolution, 0.0F, (1.0F / (float)resolution)).multiply(simSize, 0.0F, simSize).add(pos.getCenter());
@@ -323,9 +323,9 @@ private void render(BlockEntity blockEntity, float partialTicks, PoseStack poseS
                         temp = ThermodynamicEngine.samplePoint(GameBusClientEvents.weatherHandler, worldPos, blockEntity.getLevel(), radarBlockEntity, 0).temperature();
                     }
 
-                    radarBlockEntity.reflectivityMap.put(stringID, dbz);
-                    radarBlockEntity.temperatureMap.put(stringID, temp);
-                    radarBlockEntity.velocityMap.put(stringID, vel);
+                    radarBlockEntity.reflectivityMap.put(longID, dbz);
+                    radarBlockEntity.temperatureMap.put(longID, temp);
+                    radarBlockEntity.velocityMap.put(longID, vel);
 
                     // PMWeatherAPI: Support custom radar modes
                     PixelRenderData pixelRenderData = new PixelRenderData(canRender, dbz * 60.0F, vel, temp, x, z, resolution, renderData);
@@ -404,7 +404,7 @@ private void render(BlockEntity blockEntity, float partialTicks, PoseStack poseS
                         }
                     }
 
-                    radarBlockEntity.debugMap.put(stringID, dbg);
+                    radarBlockEntity.debugMap.put(longID, dbg);
                 }
                 if (ClientConfig.radarDebugging) {
                     color = dbg;

src/main/templates/META-INF/neoforge.mods.toml

@@ -38,7 +38,7 @@ side = "BOTH"
 [[dependencies."${mod_id}"]]
 modId = "pmweather"
 type = "required"
-versionRange = "[0.14.15-${minecraft_version}-alpha]"
+versionRange = "[${pmweather_version}-${minecraft_version}-alpha]"
 ordering = "BEFORE"
 side = "BOTH"