feat: natural textures

Merges: #17

Author: FalsePattern

src/main/java/com/falsepattern/mcpatcher/internal/config/ExtraConfig.java

@@ -0,0 +1,59 @@
+/*
+ * Right Proper MCPatcher
+ *
+ * Copyright (C) 2025 FalsePattern
+ * All Rights Reserved
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, only version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.falsepattern.mcpatcher.internal.config;
+
+import com.falsepattern.lib.config.Config;
+import com.falsepattern.lib.config.ConfigurationManager;
+import com.falsepattern.mcpatcher.Tags;
+import lombok.NoArgsConstructor;
+
+@Config.Comment("Additional Runtime Configurations")
+@Config.LangKey
+@Config(modid = Tags.MOD_ID,
+        category = "02_extras")
+@NoArgsConstructor
+public final class ExtraConfig {
+    //@formatter:off
+    @Config.Comment({"Disable this if you don't want Natural Textures configuration files from multiple resource packs to 'stack' on top of each other in order of priority.",
+                     "If true, the total set of Natural Textures will be created using all resource packs in the chain.",
+                     "If false, only the highest priority 'natural.properties' file will be used."})
+    @Config.LangKey
+    @Config.Name("naturalTexturesStack")
+    @Config.DefaultBoolean(true)
+    public static boolean naturalTexturesStack;
+    //@formatter:on
+
+    // region Init
+    static {
+        ConfigurationManager.selfInit();
+        ModuleConfig.init();
+    }
+
+    /**
+     * This is here to make the static initializer run
+     */
+    public static void init() {
+
+    }
+    // endregion
+}

src/main/java/com/falsepattern/mcpatcher/internal/config/MCPatcherGuiFactory.java

@@ -44,6 +44,7 @@ private static Class<?>[] getConfigClasses() {
         val result = new ArrayList<Class<?>>();
         result.add(ModuleConfig.class);
         result.add(MixinConfig.class);
+        result.add(ExtraConfig.class);
         return result.toArray(new Class<?>[0]);
     }
 

src/main/java/com/falsepattern/mcpatcher/internal/config/MixinConfig.java

@@ -49,6 +49,13 @@ public final class MixinConfig {
     @Config.DefaultBoolean(true)
     public static boolean connectedTexturesMixins;
 
+    @Config.Comment({"Disable this if you don't want natural texture mixins to land.",
+                     "This is required for naturalTextures."})
+    @Config.LangKey
+    @Config.Name("naturalTexturesMixins")
+    @Config.DefaultBoolean(true)
+    public static boolean naturalTexturesMixins;
+
     @Config.Comment({"Disable this if you don't want better glass mixins to land.",
                      "This is required for betterGlass."})
     @Config.LangKey

src/main/java/com/falsepattern/mcpatcher/internal/config/ModuleConfig.java

@@ -41,6 +41,13 @@ public final class ModuleConfig {
     @Config.DefaultBoolean(true)
     public static boolean connectedTextures;
 
+    @Config.Comment({"Runtime toggle for natural textures.",
+                     "Requires naturalTexturesMixins enabled."})
+    @Config.LangKey
+    @Config.Name("naturalTextures")
+    @Config.DefaultBoolean(true)
+    public static boolean naturalTextures;
+
     @Config.Comment({"Allow regular glass blocks, glass panes, and beacon glass to have semi-transparent textures.",
                      "Requires betterGlassMixins enabled."})
     @Config.LangKey
@@ -67,6 +74,10 @@ public static boolean isConnectedTexturesEnabled() {
         return MixinConfig.connectedTexturesMixins && connectedTextures;
     }
 
+    public static boolean isNaturalTexturesEnabled() {
+        return MixinConfig.naturalTexturesMixins && naturalTextures;
+    }
+
     public static boolean isBetterGlassEnabled() {
         return MixinConfig.betterGlassMixins && betterGlass;
     }

src/main/java/com/falsepattern/mcpatcher/internal/mixin/Mixin.java

@@ -55,6 +55,11 @@ public enum Mixin implements IMixins {
                               () -> MixinConfig.connectedTexturesMixins && MixinConfig.resourcePackOverlayMixins,
                               client("ctm.TextureMapMixin_Overlay")),
 
+    NaturalTextures(Phase.EARLY,
+                      () -> MixinConfig.naturalTexturesMixins,
+                      client("natural.RenderBlocksMixin",
+                             "natural.TextureMapMixin")),
+
     RandomMobs(Phase.EARLY,
                () -> MixinConfig.randomMobsMixins,
                client("mob.EntityMixin",

src/main/java/com/falsepattern/mcpatcher/internal/mixin/mixins/client/ctm/RenderBlocksMixin.java

@@ -25,7 +25,7 @@
 import com.falsepattern.mcpatcher.internal.config.ModuleConfig;
 import com.falsepattern.mcpatcher.internal.modules.ctm.CTMEngine;
 import com.falsepattern.mcpatcher.internal.modules.ctm.PaneRenderHelper;
-import com.falsepattern.mcpatcher.internal.modules.ctm.Side;
+import com.falsepattern.mcpatcher.internal.modules.common.Side;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;