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

5.0.5
dima-dencep · Jul 23, 2024 · 458ac38 · 458ac38
2 parents 6094dd3 + cea66ef
commit 458ac38
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 49 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-    id "io.github.goooler.shadow" version "8.1.7" apply false
+    id "io.github.goooler.shadow" version "8.1.8" apply false
     id "architectury-plugin" version "3.4-SNAPSHOT"
     id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
-    id "net.neoforged.licenser" version "0.7.2" apply false
+    id "net.neoforged.licenser" version "0.7.+" apply false
     id "io.github.p03w.machete" version "2.+" apply false
 }
 

diff --git a/fabric/src/main/java/org/redlance/dima_dencep/mods/rrls/fabric/ConfigExpectPlatformImpl.java b/fabric/src/main/java/org/redlance/dima_dencep/mods/rrls/fabric/ConfigExpectPlatformImpl.java
@@ -48,7 +48,7 @@ public class ConfigExpectPlatformImpl implements ConfigData {
     public String reloadText = "Edit in config!";
 
     @ConfigEntry.Category("other")
-    public boolean resetResources = false;
+    public boolean resetResources = true;
 
     @ConfigEntry.Category("splash")
     @ConfigEntry.Gui.Tooltip

diff --git a/...g/redlance/dima_dencep/mods/rrls/forge/mixins/config/ConfigurationSectionScreenMixin.java b/...g/redlance/dima_dencep/mods/rrls/forge/mixins/config/ConfigurationSectionScreenMixin.java
@@ -10,14 +10,10 @@
 
 package org.redlance.dima_dencep.mods.rrls.forge.mixins.config;
 
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import net.neoforged.fml.config.ModConfig;
 import net.neoforged.neoforge.client.gui.ConfigurationScreen;
-import net.neoforged.neoforge.common.ModConfigSpec;
 import org.redlance.dima_dencep.mods.rrls.Rrls;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -27,27 +23,11 @@
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-
 @Mixin(value = ConfigurationScreen.ConfigurationSectionScreen.class, remap = false)
 public abstract class ConfigurationSectionScreenMixin {
     @Shadow
     @Final
     protected ConfigurationScreen.ConfigurationSectionScreen.Context context;
-
-    @Shadow
-    protected abstract ConfigurationScreen.ConfigurationSectionScreen.Element createBooleanValue(String key, ModConfigSpec.ValueSpec spec, Supplier<Boolean> source, Consumer<Boolean> target);
-    @Shadow
-    protected abstract ConfigurationScreen.ConfigurationSectionScreen.Element createIntegerValue(String key, ModConfigSpec.ValueSpec spec, Supplier<Integer> source, Consumer<Integer> target);
-    @Shadow
-    protected abstract ConfigurationScreen.ConfigurationSectionScreen.Element createLongValue(String key, ModConfigSpec.ValueSpec spec, Supplier<Long> source, Consumer<Long> target);
-    @Shadow
-    protected abstract ConfigurationScreen.ConfigurationSectionScreen.Element createDoubleValue(String key, ModConfigSpec.ValueSpec spec, Supplier<Double> source, Consumer<Double> target);
-    @Shadow
-    protected abstract ConfigurationScreen.ConfigurationSectionScreen.Element createStringValue(String key, Predicate<String> tester, Supplier<String> source, Consumer<String> target);
-
     @Shadow
     protected ConfigurationScreen.RestartType needsRestart;
 
@@ -77,26 +57,4 @@ public abstract class ConfigurationSectionScreenMixin {
 
         return value;
     }
-
-    @WrapOperation(
-            method = "rebuild",
-            at = @At(
-                    value = "INVOKE",
-                    target = "Lnet/neoforged/neoforge/client/gui/ConfigurationScreen$ConfigurationSectionScreen;createOtherValue(Ljava/lang/String;Lnet/neoforged/neoforge/common/ModConfigSpec$ConfigValue;)Lnet/neoforged/neoforge/client/gui/ConfigurationScreen$ConfigurationSectionScreen$Element;"
-            )
-    )
-    public ConfigurationScreen.ConfigurationSectionScreen.Element rrls$fixValues(ConfigurationScreen.ConfigurationSectionScreen instance, String key, ModConfigSpec.ConfigValue value, Operation<ConfigurationScreen.ConfigurationSectionScreen.Element> original, @Local(ordinal = 0) ModConfigSpec.ValueSpec valueSpec) {
-        if (Rrls.MOD_ID.equals(this.context.modId())) {
-            return switch (valueSpec.getDefault()) {
-                case Boolean b -> createBooleanValue(key, valueSpec, value, value::set);
-                case Integer i -> createIntegerValue(key, valueSpec, value, value::set);
-                case Long l -> createLongValue(key, valueSpec, value, value::set);
-                case Double d -> createDoubleValue(key, valueSpec, value, value::set);
-                case String s -> createStringValue(key, valueSpec::test, value, value::set);
-                default -> original.call(instance, key, value);
-            };
-        }
-
-        return original.call(instance, key, value);
-    }
 }
diff --git a/...e/src/main/java/org/redlance/dima_dencep/mods/rrls/neoforge/ConfigExpectPlatformImpl.java b/...e/src/main/java/org/redlance/dima_dencep/mods/rrls/neoforge/ConfigExpectPlatformImpl.java
@@ -73,7 +73,7 @@ public ConfigExpectPlatformImpl(ModConfigSpec.Builder builder) {
 
         resetResources = builder
                 .translation("text.autoconfig.rrls.option.resetResources")
-                .define("resetResources", false);
+                .define("resetResources", true);
 
         reInitScreen = builder
                 .translation("text.autoconfig.rrls.option.reInitScreen")

diff --git a/gradle.properties b/gradle.properties
@@ -6,13 +6,13 @@ org.gradle.parallel=true
     minecraft_version = 1.21
     parchment_version = 2024.07.07
     loader_version = 0.16.0
-    forge_version = 21.0.110-beta
+    forge_version = 21.0.117-beta
 
 # Mod Properties
-    mod_version = 5.0.4
+    mod_version = 5.0.5
     maven_group = org.redlance.dima_dencep.mods
     archives_base_name = rrls
 
 # Dependencies
     modmenu_version = 11.0.1
-    cloth_config_version = 15.0.127
+    cloth_config_version = 15.0.128