v0.15.3.0 - Update to PMWeather 0.15.3

- Fixed badlands radar color
- Fixed duplicate property crash
- Added shift + rclick functionality

Took 13 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.15.2.0
+mod_version=0.15.3.0
 mod_group_id=net.nullved
 mod_authors=NullVed
 mod_description=An API for interfacing with ProtoManly's Weather Mod
 
 # Dependencies
-pmweather_version=0.15.2
+pmweather_version=0.15.3
 pmweather_version_range=[0.15.0-1.21.1-alpha,0.15.999-1.21.1-alpha)

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

@@ -10,6 +10,7 @@
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraft.world.phys.BlockHitResult;
 import net.nullved.pmweatherapi.data.PMWExtras;
@@ -24,13 +25,14 @@
 @Mixin(RadarBlock.class)
 public class RadarBlockMixin {
     @Shadow public static EnumProperty<RadarBlock.Mode> RADAR_MODE;
+    @Shadow public static BooleanProperty ON;
 
     @Redirect(method = "<init>", at = @At(value = "INVOKE", target = "Ldev/protomanly/pmweather/block/RadarBlock;registerDefaultState(Lnet/minecraft/world/level/block/state/BlockState;)V"))
     private void init(RadarBlock instance, BlockState state) {
         instance.registerDefaultState(instance.defaultBlockState().setValue(PMWExtras.RADAR_MODE, RadarMode.REFLECTIVITY).setValue(RADAR_MODE, RadarBlock.Mode.REFLECTIVITY));
     }
 
-    @Inject(method = "createBlockStateDefinition", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/StateDefinition$Builder;add([Lnet/minecraft/world/level/block/state/properties/Property;)Lnet/minecraft/world/level/block/state/StateDefinition$Builder;"))
+    @Inject(method = "createBlockStateDefinition", at = @At(value = "TAIL"))
     private void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder, CallbackInfo ci) {
         builder.add(PMWExtras.RADAR_MODE);
     }
@@ -39,6 +41,11 @@ private void createBlockStateDefinition(StateDefinition.Builder<Block, BlockStat
     private InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult, Operation<InteractionResult> original) {
         original.call(state, level, pos, player, hitResult);
 
+        if (player.isCrouching()) {
+            level.setBlockAndUpdate(pos, state.setValue(ON, !state.getValue(ON)));
+            return InteractionResult.SUCCESS_NO_ITEM_USED;
+        }
+
         if (!level.isClientSide()) {
             RadarMode currentMode = state.getValue(PMWExtras.RADAR_MODE);
             RadarMode newMode = currentMode.cycle();

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

@@ -5,6 +5,7 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.*;
 import dev.protomanly.pmweather.PMWeather;
+import dev.protomanly.pmweather.block.RadarBlock;
 import dev.protomanly.pmweather.block.entity.RadarBlockEntity;
 import dev.protomanly.pmweather.config.ClientConfig;
 import dev.protomanly.pmweather.config.ServerConfig;
@@ -61,6 +62,7 @@ public class RadarRendererMixin {
     private void render(BlockEntity blockEntity, float partialTicks, PoseStack poseStack, MultiBufferSource multiBufferSource, int combinedLightIn, int combinedOverlayIn, Operation<Void> original) {
         if (!(blockEntity instanceof RadarBlockEntity radarBlockEntity)) return;
         if (Minecraft.getInstance().player.position().distanceTo(blockEntity.getBlockPos().getCenter()) > (double) 20.0F || RenderedRadars > 2) return;
+        if (!radarBlockEntity.getBlockState().getValue(RadarBlock.ON)) return;
 
         ++RenderedRadars;
         boolean canRender = true;
@@ -439,7 +441,7 @@ private void render(BlockEntity blockEntity, float partialTicks, PoseStack poseS
                     String rn = biome.getRegisteredName().toLowerCase();
                     if (rn.contains("ocean") || rn.contains("river")) startColor = new Color(biome.value().getWaterColor());
                     else if (rn.contains("beach") || rn.contains("desert")) startColor = new Color(227, 198, 150);
-                    else if (rn.contains("badlangs")) startColor = new Color(214, 111, 42);
+                    else if (rn.contains("badlands")) startColor = new Color(214, 111, 42);
                     else startColor = new Color(biome.value().getGrassColor(worldPos.x, worldPos.z));
 
                     radarBlockEntity.terrainMap.put(longID, startColor);