v0.15.3.1 - Fix multiple radar bug

- Fixed a bug where 2+ radars would fight over terrain to show

Took 17 minutes

Author: nullved

gradle.properties

@@ -17,7 +17,7 @@ parchment_mappings_version=2024.11.17
 mod_id=pmweatherapi
 mod_name=PMWeatherAPI
 mod_license=GNU GPL 3.0
-mod_version=0.15.3.0
+mod_version=0.15.3.1
 mod_group_id=net.nullved
 mod_authors=NullVed
 mod_description=An API for interfacing with ProtoManly's Weather Mod

src/main/java/net/nullved/pmweatherapi/client/data/PMWClientStorages.java

@@ -1,6 +1,7 @@
 package net.nullved.pmweatherapi.client.data;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
@@ -22,7 +23,7 @@ public class PMWClientStorages {
      * A {@link Map} of {@link RadarMode}s to {@link Map}s of pixel ids and their {@link Color}
      * @since 0.14.15.6
      */
-    public static Map<RadarMode, Map<Integer, Color>> RADAR_MODE_COLORS = new HashMap<>();
+    public static Map<BlockPos, Map<RadarMode, Map<Integer, Color>>> RADAR_MODE_COLORS = new HashMap<>();
 
     private static Level lastLevel;
     private static RadarClientStorage radar;

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

@@ -139,7 +139,7 @@ private void render(BlockEntity blockEntity, float partialTicks, PoseStack poseS
 
         RenderData renderData = new RenderData(blockEntity, sizeRenderDiameter, partialTicks, poseStack, multiBufferSource, combinedLightIn, combinedOverlayIn);
         RadarMode radarMode = blockEntity.getBlockState().getValue(PMWExtras.RADAR_MODE);
-        if (!PMWClientStorages.RADAR_MODE_COLORS.containsKey(radarMode)) update = true;
+        if (!PMWClientStorages.RADAR_MODE_COLORS.computeIfAbsent(radarBlockEntity.getBlockPos(), bp -> new HashMap<>()).containsKey(radarMode)) update = true;
 
         for(int x = -resolution; x <= resolution; ++x) {
             for(int z = -resolution; z <= resolution; ++z) {
@@ -152,7 +152,7 @@ private void render(BlockEntity blockEntity, float partialTicks, PoseStack poseS
                 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 color = PMWClientStorages.RADAR_MODE_COLORS.computeIfAbsent(radarBlockEntity.getBlockPos(), bp -> new HashMap<>()).computeIfAbsent(radarMode, rm -> new HashMap<>()).getOrDefault(id, new Color(1.0F, 0, 1.0F));
                 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);
@@ -430,7 +430,7 @@ private void render(BlockEntity blockEntity, float partialTicks, PoseStack poseS
                     if (!PMWClientConfig.disableCustomRadarModeRendering) {
                         PixelRenderData pixelRenderData = new PixelRenderData(canRender, dbz * 60.0F, vel, temp, x, z, resolution, worldPos, renderData);
                         color = radarMode.getColorForPixel(pixelRenderData);
-                        PMWClientStorages.RADAR_MODE_COLORS.get(radarMode).put(id, color);
+                        PMWClientStorages.RADAR_MODE_COLORS.computeIfAbsent(radarBlockEntity.getBlockPos(), bp -> new HashMap<>()).get(radarMode).put(id, color);
                     }
                 }