v0.16.4.0-rc1 - PMWeather 0.16.4 Update

- Update to PMWeather 0.16.4
- PMWeatherAPI is now able to run in the next PMWeather version in order to allow its use while an official update is pushed
- Fixed IRadarOverlay#placeOnRadar

Took 22 minutes

Author: nullved

gradle.properties

@@ -17,14 +17,14 @@ parchment_mappings_version=2024.11.17
 mod_id=pmweatherapi
 mod_name=PMWeatherAPI
 mod_license=GNU GPL 3.0
-mod_version=0.16.3.0-rc1
+mod_version=0.16.4.0-rc1
 mod_group_id=net.nullved
 mod_authors=nullved
 mod_description=An API for interfacing with ProtoManly's Weather Mod
 
 # Dependencies
-pmweather_version=0.16.3
-pmweather_version_range=[0.16.3,0.16.4)
+pmweather_version=0.16.4
+pmweather_version_range=[0.16.4,0.16.6)
 
 compat.pmshaders=false
 pmshaders_version=1.0.2

src/main/java/net/nullved/pmweatherapi/PMWeatherAPI.java

@@ -45,7 +45,7 @@ public PMWeatherAPI(IEventBus modEventBus, ModContainer modContainer) {
         modEventBus.addListener(this::clientSetup);
         modEventBus.addListener(this::registerPayloads);
 
-        AddonHelper.registerAddon(new AddonInfo(modContainer, List.of("0.16.3")));
+        AddonHelper.registerAddon(new AddonInfo(modContainer, List.of("0.16.4", "0.16.5")));
 
         LOGGER.info("Initialized PMWAPI");
 

src/main/java/net/nullved/pmweatherapi/client/render/radar/IRadarOverlay.java

@@ -261,36 +261,6 @@ default void scale(PoseStack pose, float scaleFactor) {
         pose.scale(scaleFactor, scaleFactor, scaleFactor);
     }
 
-    /**
-     * Transforms and scales a pose so that 1 block in world space == 1 pixel in radar space.
-     *
-     * @param poseStack The {@link PoseStack} to transform
-     * @param rrd The {@link RadarRenderData}
-     * @since 0.16.1.0-rc2
-     */
-    default void poseToRadarSpace(PoseStack poseStack, RadarRenderData rrd) {
-        float wtrRatio = (rrd.sizeRenderDiameter() / 2.0F) / rrd.simSize();
-
-        poseStack.translate(0, 0.055f, 0);
-        poseStack.scale(wtrRatio, 1, wtrRatio);
-        poseStack.translate(-rrd.radarX() - 0.5f, 0f, -rrd.radarZ() - 0.5f);
-    }
-
-    /**
-     * Goes to the given {@link Vec3} relative to the radar's position.
-     * Uses {@link #poseToRadarSpace(PoseStack, RadarRenderData)} and {@link #poseToWorldSpace(PoseStack, RadarRenderData)}
-     *
-     * @param location The {@link Vec3} of the absolute location
-     * @param poseStack The {@link PoseStack}
-     * @param rrd The {@link RadarRenderData}
-     * @since 0.16.1.0-rc2
-     */
-    default void placeOnRadar(Vec3 location, PoseStack poseStack, RadarRenderData rrd) {
-        poseToRadarSpace(poseStack, rrd);
-        poseStack.translate(location.x, 0, location.z);
-        poseToWorldSpace(poseStack, rrd);
-    }
-
     /**
      * Orients a {@link PoseStack} to face upwards.
      * May not work if other rotations are present!
@@ -324,6 +294,42 @@ default void flipPose(PoseStack poseStack, Axis axis) {
         poseStack.mulPose(axis.rotationDegrees(180));
     }
 
+    /**
+     * Goes to the given {@link Vec3} relative to the radar's position.
+     * Uses {@link #poseToRadarSpace(PoseStack, RadarRenderData)} and {@link #poseToWorldSpace(PoseStack, RadarRenderData)}
+     *
+     * @param location The {@link Vec3} of the absolute location
+     * @param poseStack The {@link PoseStack}
+     * @param rrd The {@link RadarRenderData}
+     * @since 0.16.1.0-rc2
+     */
+    default void placeOnRadar(Vec3 location, PoseStack poseStack, RadarRenderData rrd) {
+        double dx = location.x - (rrd.radarX() + 0.5D);
+        double dz = location.z - (rrd.radarZ() + 0.5D);
+
+        float ratio = (rrd.sizeRenderDiameter() / 2.0F) / rrd.simSize();
+        poseStack.translate(dx * ratio, 0.01f, dz * ratio);
+//
+//        poseToRadarSpace(poseStack, rrd);
+//        poseStack.translate(location.x, 0, location.z);
+//        poseToWorldSpace(poseStack, rrd);
+    }
+
+    /**
+     * Transforms and scales a pose so that 1 block in world space == 1 pixel in radar space.
+     *
+     * @param poseStack The {@link PoseStack} to transform
+     * @param rrd The {@link RadarRenderData}
+     * @since 0.16.1.0-rc2
+     */
+    default void poseToRadarSpace(PoseStack poseStack, RadarRenderData rrd) {
+        float wtrRatio = (rrd.sizeRenderDiameter() / 2.0F) / rrd.simSize();
+
+        poseStack.translate(0, 0.055f, 0);
+        poseStack.scale(wtrRatio, 1, wtrRatio);
+        poseStack.translate(-rrd.radarX() - 0.5f, 0f, -rrd.radarZ() - 0.5f);
+    }
+
     /**
      * Translates a {@link Vec3} of absolute coordinates to a {@link Vec3} of radar coordinates
      *
@@ -336,7 +342,6 @@ default Vec3 worldToRadarCoords(Vec3 pos, RadarRenderData rrd) {
         return worldToRadarCoords(pos, rrd.blockEntity().getBlockPos(), rrd.sizeRenderDiameter(), rrd.simSize());
     }
 
-
     /**
      * Translates a {@link Vec3} of absolute coordinates to a {@link Vec3} of radar coordinates
      *
@@ -351,7 +356,6 @@ default Vec3 worldToRadarCoords(Vec3 pos, BlockPos radarPos, float sizeRenderDia
         return worldToRadarCoords(pos.x, pos.z, radarPos, sizeRenderDiameter, simSize);
     }
 
-
     /**
      * Translates absolute coordinates to a {@link Vec3} of radar coordinates
      *
@@ -365,7 +369,6 @@ default Vec3 worldToRadarCoords(double x, double z, RadarRenderData rrd) {
         return worldToRadarCoords(x, z, rrd.blockEntity().getBlockPos(), rrd.sizeRenderDiameter(), rrd.simSize());
     }
 
-
     /**
      * Translates a {@link Vec3} of absolute coordinates to a {@link Vec3} of radar coordinates
      *
@@ -403,7 +406,6 @@ default void poseToWorldSpace(PoseStack poseStack, RadarRenderData rrd) {
         poseStack.translate(0, -0.05f, 0);
     }
 
-
     /**
      * Translates a {@link Vec3} of radar coordinates to a {@link Vec3} of absolute coordinates
      *
@@ -413,10 +415,9 @@ default void poseToWorldSpace(PoseStack poseStack, RadarRenderData rrd) {
      * @since 0.16.1.0-rc2
      */
     default Vec3 radarToWorldCoords(Vec3 pos, RadarRenderData rrd) {
-        return worldToRadarCoords(pos, rrd.blockEntity().getBlockPos(), rrd.sizeRenderDiameter(), rrd.simSize());
+        return radarToWorldCoords(pos, rrd.blockEntity().getBlockPos(), rrd.sizeRenderDiameter(), rrd.simSize());
     }
 
-
     /**
      * Translates a {@link Vec3} of radar coordinates to a {@link Vec3} of absolute coordinates
      *
@@ -427,10 +428,9 @@ default Vec3 radarToWorldCoords(Vec3 pos, RadarRenderData rrd) {
      * @since 0.16.1.0-rc2
      */
     default Vec3 radarToWorldCoords(Vec3 pos, BlockPos radarPos, float sizeRenderDiameter, float simSize) {
-        return worldToRadarCoords(pos.x, pos.z, radarPos, sizeRenderDiameter, simSize);
+        return radarToWorldCoords(pos.x, pos.z, radarPos, sizeRenderDiameter, simSize);
     }
 
-
     /**
      * Translates a {@link Vec3} of radar coordinates to a {@link Vec3} of absolute coordinates
      *
@@ -441,7 +441,7 @@ default Vec3 radarToWorldCoords(Vec3 pos, BlockPos radarPos, float sizeRenderDia
      * @since 0.16.1.0-rc2
      */
     default Vec3 radarToWorldCoords(double x, double z, RadarRenderData rrd) {
-        return worldToRadarCoords(x, z, rrd.blockEntity().getBlockPos(), rrd.sizeRenderDiameter(), rrd.simSize());
+        return radarToWorldCoords(x, z, rrd.blockEntity().getBlockPos(), rrd.sizeRenderDiameter(), rrd.simSize());
     }
 
     /**
@@ -457,8 +457,8 @@ default Vec3 radarToWorldCoords(double x, double z, RadarRenderData rrd) {
     default Vec3 radarToWorldCoords(double x, double z, BlockPos radarPos, float sizeRenderDiameter, float simSize) {
         double rtwRatio = simSize / (sizeRenderDiameter / 2.0);
 
-        double centerX = radarPos.getX() + 0.5D;
-        double centerZ = radarPos.getZ() + 0.5D;
+        double centerX = radarPos.getX();
+        double centerZ = radarPos.getZ();
 
         double worldX = centerX + (x * rtwRatio);
         double worldZ = centerZ + (z * rtwRatio);