v0.16.2.0-rc2 - PMShaders Fix

- Should now render radar when PMShaders is enabled
- Fixed MIXED_REFLECTIVITY and SNOW_REFLECTIVITY ColorMaps
- Removed old version check from 0.16.1 and previous versions
- PMWAPI now only supports the version of PMW it is designated for

Took 54 minutes

Author: nullved

build.gradle

@@ -131,6 +131,13 @@ dependencies {
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
 
     implementation "maven.modrinth:protomanlys-weather:${pmweather_version}-alpha"
+
+    // PMShaders Compat Testing
+    if (project.property("compat.pmshaders") == "true") {
+        runtimeOnly "maven.modrinth:sodium:${sodium_version}"
+        runtimeOnly "maven.modrinth:iris:${iris_version}"
+        runtimeOnly "maven.modrinth:pmshaders:${pmshaders_version}"
+    }
 }
 
 // This block of code expands all declared replace properties in the specified resource targets.

gradle.properties

@@ -7,7 +7,7 @@ org.gradle.configuration-cache=true
 ## Environment Properties
 minecraft_version=1.21.1
 minecraft_version_range=[1.21.1,1.22)
-neo_version=21.1.176
+neo_version=21.1.219
 neo_version_range=[21,)
 loader_version_range=[4,)
 parchment_minecraft_version=1.21.1
@@ -17,11 +17,16 @@ parchment_mappings_version=2024.11.17
 mod_id=pmweatherapi
 mod_name=PMWeatherAPI
 mod_license=GNU GPL 3.0
-mod_version=0.16.2.0-rc1
+mod_version=0.16.2.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.2
-pmweather_version_range=[0.16.0-1.21.1-alpha,0.16.999-1.21.1-alpha)
+pmweather_version_range=[0.16.2,0.16.3)
+
+compat.pmshaders=false
+pmshaders_version=1.0.2
+sodium_version=mc1.21.1-0.6.13-neoforge
+iris_version=1.8.12+1.21.1-neoforge

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

@@ -6,7 +6,6 @@
 import net.minecraft.resources.ResourceLocation;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModContainer;
-import net.neoforged.fml.ModList;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.config.ModConfig;
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
@@ -30,11 +29,8 @@
 import net.nullved.pmweatherapi.radar.storage.*;
 import net.nullved.pmweatherapi.storage.data.BlockPosData;
 import net.nullved.pmweatherapi.storage.data.StorageDataManager;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.slf4j.Logger;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Mod(PMWeatherAPI.MODID)
@@ -49,55 +45,43 @@ public PMWeatherAPI(IEventBus modEventBus, ModContainer modContainer) {
         modEventBus.addListener(this::clientSetup);
         modEventBus.addListener(this::registerPayloads);
 
-        AddonHelper.registerAddon(new AddonInfo(modContainer, new ArrayList<>(){{
-            add("0.16");
-        }}));
+        AddonHelper.registerAddon(new AddonInfo(modContainer, List.of("0.16.2")));
 
         LOGGER.info("Initialized PMWAPI");
 
-        if (ModList.get().isLoaded("pmweather")) {
-            ModContainer pmweather = ModList.get().getModContainerById("pmweather").get();
-
-            ArtifactVersion pmweatherVer = pmweather.getModInfo().getVersion();
-            String pmweatherVerS = pmweatherVer.getMajorVersion() + "." + pmweatherVer.getMinorVersion() + "." + pmweatherVer.getIncrementalVersion();
-            String pmweatherExpected = "0.16.1-1.21.1-alpha";
-            int pmweatherCompared = pmweatherVer.compareTo(new DefaultArtifactVersion(pmweatherExpected));
-
-            if (pmweatherCompared == 0) {
-                PMWeatherAPI.LOGGER.info("Found PMWeather Version {}", pmweatherExpected.split("-")[0]);
-            } else if (pmweatherCompared > 0) {
-                PMWeatherAPI.LOGGER.warn("Found newer PMWeather Version {} than supported ({})! Support is NOT guaranteed!", pmweatherVerS, pmweatherExpected.split("-")[0]);
-            } else {
-                PMWeatherAPI.LOGGER.info("Found old PMWeather Version {}! Please update PMWeather to version {}!", pmweatherVerS, pmweatherExpected.split("-")[0]);
-            }
-        }
-
+        LOGGER.info("Registering PMWAPI Config");
         if (FMLEnvironment.dist.isClient()) {
             modContainer.registerConfig(ModConfig.Type.CLIENT, PMWClientConfig.SPEC);
             modContainer.registerExtensionPoint(IConfigScreenFactory.class, ConfigurationScreen::new);
         }
     }
 
     private void commonSetup(FMLCommonSetupEvent event) {
+        LOGGER.info("Registering PMWAPI Storage Data...");
         StorageDataManager.register(BlockPosData.ID, BlockPosData::deserializeFromNBT);
         StorageDataManager.register(RadarStorageData.ID, RadarStorageData::deserializeFromNBT);
         StorageDataManager.register(MetarStorageData.ID, MetarStorageData::deserializeFromNBT);
         StorageDataManager.register(WSRStorageData.ID, WSRStorageData::deserializeFromNBT);
 
+        LOGGER.info("Registering PMWAPI Storages [Common]...");
         PMWStorages.registerStorage(RadarStorage.ID, RadarServerStorage.class, RadarServerStorage::new);
         PMWStorages.registerStorage(MetarStorage.ID, MetarServerStorage.class, MetarServerStorage::new);
         PMWStorages.registerStorage(WSRStorage.ID, WSRServerStorage.class, WSRServerStorage::new);
     }
 
     private void registerPayloads(RegisterPayloadHandlersEvent event) {
+        LOGGER.info("Registering PMWAPI Network Payloads...");
+
         PMWNetworking.register(event.registrar("1"));
     }
 
     private void clientSetup(FMLClientSetupEvent event) {
+        LOGGER.info("Registering PMWAPI Storages [Client]...");
         PMWClientStorages.registerStorage(RadarStorage.ID, RadarClientStorage.class, RadarClientStorage::new);
         PMWClientStorages.registerStorage(MetarStorage.ID, MetarClientStorage.class, MetarClientStorage::new);
         PMWClientStorages.registerStorage(WSRStorage.ID, WSRClientStorage.class, WSRClientStorage::new);
 
+        LOGGER.info("Registering PMWAPI Radar Overlays...");
         RadarOverlays.registerOverlay(IDOverlay.INSTANCE);
 //        RadarOverlays.registerOverlay(ExampleOverlay.INSTANCE);
     }

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

@@ -16,19 +16,17 @@ public class RadarRenderTypes {
     private static final HashMap<ResourceLocation, RenderType> OVERLAY_CACHE = new HashMap<>();
     public static final RenderType RADAR = RenderType.create(
             "radar",
-            DefaultVertexFormat.POSITION_COLOR_LIGHTMAP,
+            DefaultVertexFormat.POSITION_COLOR,
             VertexFormat.Mode.QUADS,
             256,
             false,
             false,
             RenderType.CompositeState.builder()
-                    .setShaderState(RenderStateShard.POSITION_COLOR_LIGHTMAP_SHADER)
+                    .setShaderState(RenderStateShard.POSITION_COLOR_SHADER)
                     .setTransparencyState(NO_TRANSPARENCY)
                     .setDepthTestState(RenderStateShard.LEQUAL_DEPTH_TEST)
-                    .setWriteMaskState(RenderStateShard.COLOR_DEPTH_WRITE)
+                    .setWriteMaskState(COLOR_DEPTH_WRITE)
                     .setCullState(RenderStateShard.NO_CULL)
-                    .setLightmapState(LIGHTMAP)
-                    .setOverlayState(RenderStateShard.NO_OVERLAY)
                     .createCompositeState(false)
     );
 

src/main/java/net/nullved/pmweatherapi/radar/RadarMode.java

@@ -67,7 +67,7 @@ public class RadarMode implements StringRepresentable, Comparable<RadarMode> {
             : ColorMaps.REFLECTIVITY.get(prd.rdbz());
 
         if (prd.rdbz() > 5.0F && !prd.radarRenderData().blockEntity().hasRangeUpgrade) {
-            if (prd.temp() < 3.0F && prd.temp() > 1.0F) color = ColorMaps.MIXED_REFLECTIVITY.get(prd.rdbz());
+            if (prd.temp() < 3.0F && prd.temp() > -1.0F) color = ColorMaps.MIXED_REFLECTIVITY.get(prd.rdbz());
             else if (prd.temp() <= -1.0F) color = ColorMaps.SNOW_REFLECTIVITY.get(prd.rdbz());
         }
 

src/main/java/net/nullved/pmweatherapi/util/ColorMaps.java

@@ -43,16 +43,16 @@ public static void recomputeAll() {
      * A {@link ColorMap} equivalent to {@link ColorTables#getMixedReflectivity(float)}
      * @since 0.16.0.0
      */
-    public static final ColorMap MIXED_REFLECTIVITY = ColorMap.Builder.of(0x00FFFFFF)
-        .override(0x00FFFFFF, 0.0F)
+    public static final ColorMap MIXED_REFLECTIVITY = ColorMap.Builder.of(0xFFFFFFFF)
+        .override(0xFFFFFFF, 0.0F)
         .build(0xFF006FFF, 70.0F);
 
     /**
      * A {@link ColorMap} equivalent to {@link ColorTables#getSnowReflectivity(float)}
      * @since 0.16.0.0
      */
-    public static final ColorMap SNOW_REFLECTIVITY = ColorMap.Builder.of(0x00FAC3F8)
-        .override(0x00FAC3F8, 0.0F)
+    public static final ColorMap SNOW_REFLECTIVITY = ColorMap.Builder.of(0xFFFAC3F8)
+        .override(0xFFFAC3F8, 0.0F)
         .build(0xFFD200D2, 70.0F);
 
     /**