v0.14.15.6 - Custom Radar Modes + ColorMaps

- Added Custom Radar Modes
- Added PixelRenderData for CRMs
- Added ColorMaps, a ColorTables equivalent
- Added StringProperty for storing string values in BlockStates
- Added logo
- Updated neoforge.mods.toml

Took 6 hours 37 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.14.15.5
+mod_version=0.14.15.6
 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/PMWeatherAPI.java

@@ -25,15 +25,13 @@ public PMWeatherAPI(IEventBus modEventBus, ModContainer modContainer) {
         modEventBus.addListener(this::commonSetup);
         modEventBus.addListener(this::registerPayloads);
 
-        // modEventBus.addListener(this::clientSetup);
-
         LOGGER.info("Initialized PMWAPI");
     }
 
     private void commonSetup(FMLCommonSetupEvent event) {
-        if (!ModList.get().isLoaded("pmweather")) {
-            throw new RuntimeException("ProtoManly's Weather not detected!");
-        }
+//        if (!ModList.get().isLoaded("pmweather")) {
+//            throw new RuntimeException("ProtoManly's Weather not detected!");
+//        }
     }
 
     private void registerPayloads(RegisterPayloadHandlersEvent event) {

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

@@ -6,13 +6,24 @@
 import net.neoforged.api.distmarker.OnlyIn;
 import net.nullved.pmweatherapi.PMWeatherAPI;
 import net.nullved.pmweatherapi.client.radar.RadarClientStorage;
+import net.nullved.pmweatherapi.radar.RadarMode;
+
+import java.awt.*;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * A class holding the specific storage instances for the client
  * @since 0.14.15.3
  */
 @OnlyIn(Dist.CLIENT)
 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<>();
+
     private static Level lastLevel;
     private static RadarClientStorage radar;
 

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

@@ -0,0 +1,16 @@
+package net.nullved.pmweatherapi.client.render;
+
+/**
+ * Specific rendering data for a pixel on the radar
+ * @param canRender {@code true} if either the server doesn't require WSR-88D or a WSR-88D is complete within 4 chunks of the radar
+ * @param rdbz The relative reflectivity
+ * @param velocity The velocity
+ * @param temp The temperature
+ * @param x The x-position of the pixel (from {@code -resolution} to {@code resolution})
+ * @param z The z-position of the pixel (from {@code -resolution} to {@code resolution})
+ * @param resolution The resolution of the radar
+ * @param renderData The associated {@link RenderData}
+ * @since 0.14.15.6
+ */
+public record PixelRenderData(boolean canRender, float rdbz, float velocity, float temp, int x, int z, int resolution, RenderData renderData) {
+}

src/main/java/net/nullved/pmweatherapi/data/PMWExtras.java

@@ -0,0 +1,17 @@
+package net.nullved.pmweatherapi.data;
+
+import net.minecraft.core.BlockPos;
+import net.nullved.pmweatherapi.radar.RadarMode;
+import net.nullved.pmweatherapi.util.StringProperty;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A class storing extra things used by varying parts of the API
+ * @since 0.14.15.6
+ */
+public class PMWExtras {
+    public static StringProperty RADAR_MODE = new StringProperty("radarmode", RadarMode.values());
+    public static final Map<BlockPos, BlockPos> RADAR_WSR_88D_LOOKUP = new HashMap<>();
+}

src/main/java/net/nullved/pmweatherapi/data/PMWStorages.java

@@ -2,8 +2,10 @@
 
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.Level;
+import net.nullved.pmweatherapi.radar.RadarMode;
 import net.nullved.pmweatherapi.radar.RadarServerStorage;
 import net.nullved.pmweatherapi.radar.RadarStorage;
+import net.nullved.pmweatherapi.util.StringProperty;
 
 import java.util.HashMap;
 import java.util.Map;

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

@@ -0,0 +1,50 @@
+package net.nullved.pmweatherapi.mixin;
+
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import dev.protomanly.pmweather.block.RadarBlock;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.Level;
+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.EnumProperty;
+import net.minecraft.world.phys.BlockHitResult;
+import net.nullved.pmweatherapi.data.PMWExtras;
+import net.nullved.pmweatherapi.radar.RadarMode;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(RadarBlock.class)
+public class RadarBlockMixin {
+    @Shadow public static EnumProperty<RadarBlock.Mode> RADAR_MODE;
+
+    @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.stringValue()).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;"))
+    private void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder, CallbackInfo ci) {
+        builder.add(PMWExtras.RADAR_MODE);
+    }
+
+    @WrapMethod(method = "useWithoutItem")
+    private InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult, Operation<InteractionResult> original) {
+        original.call(state, level, pos, player, hitResult);
+
+        if (!level.isClientSide()) {
+            RadarMode currentMode = RadarMode.get(state.getValue(PMWExtras.RADAR_MODE).value());
+            RadarMode newMode = currentMode.cycle();
+            level.setBlockAndUpdate(pos, state.setValue(PMWExtras.RADAR_MODE, newMode.stringValue()));
+        }
+
+        return InteractionResult.SUCCESS_NO_ITEM_USED;
+    }
+}