v0.16.1.0-rc2 - PMW 0.16 Update

- Removed PMWSavedData
- Added RadarMode#isCustom
- Added a bunch of IRadarOverlay helper methods for easier pose management
- Added a new debug overlay when the Debug option is on
- Disabled the transparency config option
- Changed how RadarOverlays are registered. No longer needs a supplier for registration
- Added ability to unregister overlays at any time by its ID
- Added some helper methods to RadarRenderData
- Fix Darken Biomes on Radar option
- Fix PMW debugging modes
- Switch from RenderType#entityCutout to a custom one with no culling for rendering on both sides

Took 3 hours 14 minutes

Author: nullved

gradle.properties

@@ -17,11 +17,11 @@ parchment_mappings_version=2024.11.17
 mod_id=pmweatherapi
 mod_name=PMWeatherAPI
 mod_license=GNU GPL 3.0
-mod_version=0.16.1.0-rc1
+mod_version=0.16.1.0-rc2
 mod_group_id=net.nullved
 mod_authors=nullved
 mod_description=An API for interfacing with ProtoManly's Weather Mod
 
 # Dependencies
 pmweather_version=0.16.1
-pmweather_version_range=[0.16.1-1.21.1-alpha,0.16.999-1.21.1-alpha)
+pmweather_version_range=[0.16.0-1.21.1-alpha,0.16.999-1.21.1-alpha)

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

@@ -21,7 +21,6 @@
 import net.nullved.pmweatherapi.client.render.radar.RadarOverlays;
 import net.nullved.pmweatherapi.config.PMWClientConfig;
 import net.nullved.pmweatherapi.data.PMWStorages;
-import net.nullved.pmweatherapi.example.ExampleOverlay;
 import net.nullved.pmweatherapi.metar.MetarServerStorage;
 import net.nullved.pmweatherapi.metar.MetarStorage;
 import net.nullved.pmweatherapi.metar.MetarStorageData;
@@ -86,14 +85,12 @@ private void registerPayloads(RegisterPayloadHandlersEvent event) {
     }
 
     private void clientSetup(FMLClientSetupEvent event) {
-        //RadarMode.removeBaseRendering(true);
-
         PMWClientStorages.registerStorage(RadarStorage.ID, RadarClientStorage.class, RadarClientStorage::new);
         PMWClientStorages.registerStorage(MetarStorage.ID, MetarClientStorage.class, MetarClientStorage::new);
         PMWClientStorages.registerStorage(WSRStorage.ID, WSRClientStorage.class, WSRClientStorage::new);
 
-        RadarOverlays.registerOverlay(() -> IDOverlay.INSTANCE);
-//        RadarOverlays.registerOverlay(() -> ExampleOverlay.INSTANCE);
+        RadarOverlays.registerOverlay(IDOverlay.INSTANCE);
+//        RadarOverlays.registerOverlay(ExampleOverlay.INSTANCE);
     }
     public static ResourceLocation rl(String path) {
         return ResourceLocation.fromNamespaceAndPath(MODID, path);

src/main/java/net/nullved/pmweatherapi/client/render/DebugOverlay.java

@@ -0,0 +1,38 @@
+package net.nullved.pmweatherapi.client.render;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Axis;
+import net.nullved.pmweatherapi.PMWeatherAPI;
+import net.nullved.pmweatherapi.client.render.radar.IRadarOverlay;
+import net.nullved.pmweatherapi.radar.NearbyRadars;
+
+public class DebugOverlay implements IRadarOverlay {
+    public static final IRadarOverlay INSTANCE = new DebugOverlay();
+
+    @Override
+    public void render(boolean canRender, RadarRenderData radarRenderData, Object... args) {
+        NearbyRadars.client().forRadarNearBlock(radarRenderData.radarPos(), radarRenderData.simSize(), bp -> {
+            PoseStack pose = radarRenderData.poseStack();
+            pose.pushPose();
+            placeOnRadar(bp.getCenter(), pose, radarRenderData);
+            scale(pose, 0.05f);
+            renderTextureUpwards(PMWeatherAPI.rl("textures/radar/test1.png"), radarRenderData, pose);
+
+            pose.translate(0, 1, 0);
+            renderTexture(PMWeatherAPI.rl("textures/radar/test2.png"), radarRenderData, pose);
+            pose.mulPose(Axis.YP.rotationDegrees(90));
+            renderTexture(PMWeatherAPI.rl("textures/radar/test2.png"), radarRenderData, pose);
+            pose.popPose();
+        });
+    }
+
+    @Override
+    public String getModID() {
+        return PMWeatherAPI.MODID;
+    }
+
+    @Override
+    public String getIDPath() {
+        return "debug";
+    }
+}

src/main/java/net/nullved/pmweatherapi/client/render/IDOverlay.java

@@ -36,10 +36,11 @@ public void render(boolean canRender, RadarRenderData radarRenderData, Object...
         float scale = radarRenderData.sizeRenderDiameter() / 3.0F;
 
         poseStack.pushPose();
-        poseStack.translate((side.x * scale) - 0.5F * (scale - 1), 1.055f, (side.z * scale) - 0.5F * (scale - 1));
+        poseStack.translate((side.x * scale) - 0.5F * (scale - 1) - 0.5F, 0.005f, (side.z * scale) - 0.5F * (scale - 1) - 0.5F);
         poseStack.mulPose(Axis.YN.rotationDegrees(side.rotation));
         poseStack.mulPose(Axis.XP.rotationDegrees(90));
-        poseStack.scale(0.01f, 0.01f, 0.01f);
+        poseStack.scale(0.01F, 0.01F, 0.01F);
+        poseStack.scale(scale, scale, scale);
 
         renderText(Component.literal(mode.getId().toString()), radarRenderData, poseStack);
 
@@ -48,13 +49,13 @@ public void render(boolean canRender, RadarRenderData radarRenderData, Object...
 
         float lineHeight = 8.0f;
         float offset = lineHeight;
-        for (Supplier<? extends IRadarOverlay> overlay: RadarOverlays.getOverlays()) {
+        for (IRadarOverlay overlay: RadarOverlays.getOverlays()) {
             poseStack.pushPose();
             poseStack.translate(0, 0, offset);
             poseStack.scale(0.6f, 0.6f, 0.6f);
             poseStack.mulPose(Axis.XP.rotationDegrees(90));
 
-            renderText(Component.literal(overlay.get().getID().toString()).withColor(0xBBBBBB), radarRenderData, poseStack);
+            renderText(Component.literal(overlay.getID().toString()).withColor(0xBBBBBB), radarRenderData, poseStack);
 
             poseStack.popPose();
             offset += lineHeight * 0.6f;

src/main/java/net/nullved/pmweatherapi/client/render/RadarRenderData.java

@@ -3,7 +3,7 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import dev.protomanly.pmweather.block.entity.RadarBlockEntity;
 import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.core.BlockPos;
 
 /**
  * A wrapper class to be passed to {@link RadarRenderData}
@@ -18,4 +18,30 @@
  * @since 0.14.15.2
  */
 public record RadarRenderData(RadarBlockEntity blockEntity, float sizeRenderDiameter, float simSize, float partialTicks, PoseStack poseStack, MultiBufferSource multiBufferSource, int combinedLightIn, int combinedOverlayIn) {
-}
+    /**
+     * Helper method to get the {@link BlockPos} of the {@link RadarBlockEntity}
+     * @return The radar's {@link BlockPos}
+     * @since 0.16.1.0-rc2
+     */
+    public BlockPos radarPos() {
+        return this.blockEntity.getBlockPos();
+    }
+
+    /**
+     * Helper method to get the x-position of the {@link RadarBlockEntity}
+     * @return The radar's x-position
+     * @since 0.16.1.0-rc2
+     */
+    public int radarX() {
+        return radarPos().getX();
+    }
+
+    /**
+     * Helper method to get the z-position of the {@link RadarBlockEntity}
+     * @return The radar's z-position
+     * @since 0.16.1.0-rc2
+     */
+    public int radarZ() {
+        return radarPos().getZ();
+    }
+}