Merge pull request #94 from dima-dencep/1.21.x/dev

5.0.2

.github/workflows/publish.yml

@@ -45,7 +45,7 @@ jobs:
           properties: 'mod_version minecraft_version'
 
       - name: Upload assets to releases
-        run: ./gradlew build
+        run: ./gradlew build --no-daemon
         env:
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id "io.github.goooler.shadow" version "8.1.7" apply false
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
     id "net.neoforged.licenser" version "0.7.2" apply false
     id "io.github.p03w.machete" version "2.+" apply false
 }

common/src/main/java/org/redlance/dima_dencep/mods/rrls/mixins/GameRendererMixin.java

@@ -47,7 +47,9 @@ public class GameRendererMixin {
 
             if (OverlayHelper.isRenderingState(overlay)) {
                 rrls$enableScissor(graphics, () ->
-                        overlay.render(DummyGuiGraphics.INSTANCE, 0, 0, deltaTracker.getRealtimeDeltaTicks())
+                        overlay.render(DummyGuiGraphics.INSTANCE, 0, 0,
+                                deltaTracker.getGameTimeDeltaPartialTick(false) // Neo: Fix https://bugs.mojang.com/browse/MC-273464
+                        )
                 );
 
                 if (ConfigExpectPlatform.miniRender())

forge/src/main/java/org/redlance/dima_dencep/mods/rrls/neoforge/ConfigExpectPlatformImpl.java

@@ -10,24 +10,20 @@
 
 package org.redlance.dima_dencep.mods.rrls.neoforge;
 
-import net.neoforged.fml.config.ConfigTracker;
 import org.redlance.dima_dencep.mods.rrls.config.DoubleLoad;
 import org.redlance.dima_dencep.mods.rrls.config.HideType;
 import org.redlance.dima_dencep.mods.rrls.config.Type;
 import org.redlance.dima_dencep.mods.rrls.Rrls;
-import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.ModList;
 import net.neoforged.fml.config.ModConfig;
-import net.neoforged.fml.loading.FMLPaths;
 import net.neoforged.neoforge.common.ModConfigSpec;
 import org.apache.commons.lang3.tuple.Pair;
 
-import java.util.Optional;
-
-@SuppressWarnings({"unused","UnstableApiUsage"})
+@SuppressWarnings("unused")
 public class ConfigExpectPlatformImpl { // TODO categorize
     public static final Pair<ConfigExpectPlatformImpl, ModConfigSpec> CONFIG_SPEC_PAIR = new ModConfigSpec.Builder()
             .configure(ConfigExpectPlatformImpl::new);
+
     public final ModConfigSpec.EnumValue<HideType> hideType;
     public final ModConfigSpec.BooleanValue rgbProgress;
     public final ModConfigSpec.BooleanValue blockOverlay;
@@ -110,28 +106,12 @@ public ConfigExpectPlatformImpl(ModConfigSpec.Builder builder) {
     }
 
     static { // Early loading for config
-        Optional<? extends ModContainer> activeContainer = ModList.get().getModContainerById(Rrls.MOD_ID);
         ModConfigSpec configSpec = ConfigExpectPlatformImpl.CONFIG_SPEC_PAIR.getValue();
 
-        final ModConfig modConfig = new ModConfig(ModConfig.Type.STARTUP, configSpec, activeContainer.orElse(null), "rrls.toml") {
-            @Override
-            public String getModId() {
-                if (this.container == null) {
-                    return Rrls.MOD_ID;
-                }
-
-                return super.getModId();
-            }
-        };
-        activeContainer.ifPresentOrElse(
-                container -> container.addConfig(modConfig), // Configs with the STARTUP type are loaded here
-                () -> Rrls.LOGGER.error("Unable to find ModContainer, this can cause issues!")
+        ModList.get().getModContainerById(Rrls.MOD_ID).ifPresentOrElse(
+                container -> container.registerConfig(ModConfig.Type.STARTUP, configSpec, "rrls.toml"),
+                () -> Rrls.LOGGER.fatal("Unable to find ModContainer, config will not load!")
         );
-
-        if (!configSpec.isLoaded()) { // Fallback
-            Rrls.LOGGER.warn("Config is not loaded?");
-            ConfigTracker.INSTANCE.openConfig(modConfig, FMLPaths.CONFIGDIR.get(), null);
-        }
     }
 
     public static HideType hideType() {

gradle.properties

@@ -4,12 +4,12 @@ org.gradle.parallel=true
 
 # Properties
     minecraft_version = 1.21
-    parchment_version = 2024.06.23
-    loader_version = 0.15.11
-    forge_version = 21.0.45-beta
+    parchment_version = 2024.07.07
+    loader_version = 0.16.0
+    forge_version = 21.0.96-beta
 
 # Mod Properties
-    mod_version = 5.0.1
+    mod_version = 5.0.2
     maven_group = org.redlance.dima_dencep.mods
     archives_base_name = rrls
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.