Puzzle 1.1.0 - Use IrisAPI, Deactivatable Integrations, Remove puzzle-blocks

- Use the new Iris API
- Builtin mod support is now configurable
- Puzzle button in Options screen can be disabled
- Remove puzzle-blocks (Already covered by Continuity)
- Fix #4
- Fix #5
- Fix #6
- Fix #7

gradle.properties

@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.12.12
 
 # Mod Properties
-	mod_version = 1.0.0-pre4
+	mod_version = 1.1.0
 	maven_group = net.puzzlemc
 	archives_base_name = puzzle
 
@@ -20,7 +20,7 @@ org.gradle.jvmargs=-Xmx1G
 	cull_leaves_version = 2.3.2
 	ldl_version = 2.1.0+1.17
 	lbg_version = 1.2.2+1.17
-	iris_version = mc1.18.1-1.1.3
+	iris_version = 1.18.x-v1.1.4
 	continuity_version = 1.0.3+1.18
 	animatica_version = 0.2+1.18
 	cit_resewn_version = 0.8.1-1.18

puzzle-base/build.gradle

@@ -1,3 +1,9 @@
 archivesBaseName = "puzzle-base"
-dependencies {
+repositories {
+    maven {
+        url = "https://api.modrinth.com/maven"
+    }
+}
+dependencies {
+    modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
 }

puzzle-base/src/main/java/net/puzzlemc/core/PuzzleCore.java

@@ -1,18 +1,19 @@
 package net.puzzlemc.core;
 
+import net.fabricmc.loader.api.FabricLoader;
 import net.puzzlemc.core.config.PuzzleConfig;
 import net.puzzlemc.core.util.UpdateChecker;
 import net.fabricmc.api.ClientModInitializer;
 
 public class PuzzleCore implements ClientModInitializer {
 
-    public final static String version = "Puzzle B0";
+    public final static String version = "Puzzle "+ FabricLoader.getInstance().getModContainer("puzzle").get().getMetadata().getVersion();
     public final static String name = "Puzzle";
     public final static String id = "puzzle";
     public final static String website = "https://github.com/PuzzleMC/Puzzle";
-    public static String updateURL = website; //+"download";
+    public final static String updateURL = "https://modrinth.com/mod/puzzle";
 
-    public final static String UPDATE_URL = "https://raw.githubusercontent.com/PuzzleMC/Puzzle-Versions/main/puzzle_versions.json";
+    public final static String UPDATE_CHECKER_URL = "https://raw.githubusercontent.com/PuzzleMC/Puzzle-Versions/main/puzzle_versions.json";
 
     @Override
     public void onInitializeClient() {

puzzle-base/src/main/java/net/puzzlemc/core/config/MidnightConfigLite.java

@@ -1,69 +0,0 @@
-package net.puzzlemc.core.config;
-
-import com.google.gson.ExclusionStrategy;
-import com.google.gson.FieldAttributes;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import net.fabricmc.loader.api.FabricLoader;
-
-import java.lang.annotation.*;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
-
-// MidnightConfigLite v0.2.0
-// Just writing and parsing of config files
-
-/** Based on https://github.com/Minenash/TinyConfig
- *  Credits to Minenash */
-
-public class MidnightConfigLite {
-
-    protected static class EntryInfo {
-        Object defaultValue;
-    }
-
-    public static final Map<String,Class<?>> configClass = new HashMap<>();
-    private static Path path;
-
-    private static final Gson gson = new GsonBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE).addSerializationExclusionStrategy(new HiddenAnnotationExclusionStrategy()).setPrettyPrinting().create();
-
-    public static void init(String modid, Class<?> config) {
-        path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
-        configClass.put(modid, config);
-
-        for (Field field : config.getFields()) {
-            EntryInfo info = new EntryInfo();
-            if (field.isAnnotationPresent(Entry.class))
-                try {
-                    info.defaultValue = field.get(null);
-                } catch (IllegalAccessException ignored) {}
-        }
-        try { gson.fromJson(Files.newBufferedReader(path), config); }
-        catch (Exception e) { write(modid); }
-    }
-
-    public static void write(String modid) {
-        path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
-        try {
-            if (!Files.exists(path)) Files.createFile(path);
-            Files.write(path, gson.toJson(configClass.get(modid).getDeclaredConstructor().newInstance()).getBytes());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.FIELD)
-    public @interface Entry {
-    }
-
-    public static class HiddenAnnotationExclusionStrategy implements ExclusionStrategy {
-        public boolean shouldSkipClass(Class<?> clazz) { return false; }
-        public boolean shouldSkipField(FieldAttributes fieldAttributes) {
-            return fieldAttributes.getAnnotation(Entry.class) == null;
-        }
-    }
-}

puzzle-base/src/main/java/net/puzzlemc/core/config/PuzzleConfig.java

@@ -1,6 +1,13 @@
 package net.puzzlemc.core.config;
 
-public class PuzzleConfig extends MidnightConfigLite {
+import eu.midnightdust.lib.config.MidnightConfig;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PuzzleConfig extends MidnightConfig {
+    @Entry public static List<String> disabledIntegrations = new ArrayList<>();
+    @Entry public static boolean enablePuzzleButton = true;
     @Entry public static boolean debugMessages = false;
 
     @Entry public static boolean checkUpdates = true;
@@ -8,7 +15,6 @@ public class PuzzleConfig extends MidnightConfigLite {
     @Entry public static boolean resourcepackSplashScreen = true;
     @Entry public static boolean disableSplashScreenBlend = false;
     @Entry public static boolean emissiveTextures = true;
-    @Entry public static boolean customRenderLayers = true;
     @Entry public static boolean unlimitedRotations = true;
     @Entry public static boolean biggerModels = true;
 

puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinTitleScreen.java

@@ -1,5 +1,6 @@
 package net.puzzlemc.core.mixin;
 
+import net.fabricmc.loader.api.FabricLoader;
 import net.puzzlemc.core.PuzzleCore;
 import net.puzzlemc.core.config.PuzzleConfig;
 import net.puzzlemc.core.util.UpdateChecker;
@@ -26,12 +27,14 @@ public abstract class MixinTitleScreen extends Screen {
     @Shadow private long backgroundFadeStart;
     private Text puzzleText;
     private int puzzleTextWidth;
+    private int yOffset = 20;
 
     protected MixinTitleScreen(Text title) {
         super(title);
     }
     @Inject(at = @At("TAIL"), method = "init")
     private void puzzle$init(CallbackInfo ci) {
+        if (FabricLoader.getInstance().isModLoaded("dashloader")) yOffset = yOffset + 10;
         if (UpdateChecker.isUpToDate) {
             puzzleText = Text.of(PuzzleCore.version);
         }
@@ -47,9 +50,9 @@ public abstract class MixinTitleScreen extends Screen {
             float f = this.doBackgroundFade ? (float) (Util.getMeasuringTimeMs() - this.backgroundFadeStart) / 1000.0F : 1.0F;
             float g = this.doBackgroundFade ? MathHelper.clamp(f - 1.0F, 0.0F, 1.0F) : 1.0F;
             int l = MathHelper.ceil(g * 255.0F) << 24;
-            textRenderer.drawWithShadow(matrices, puzzleText,2,this.height - 20, 16777215 | l);
+            textRenderer.drawWithShadow(matrices, puzzleText,2,this.height - yOffset, 16777215 | l);
-            if (mouseX > 2 && mouseX < 2 + this.puzzleTextWidth && mouseY > this.height - 20 && mouseY < this.height - 10) {
+            if (mouseX > 2 && mouseX < 2 + this.puzzleTextWidth && mouseY > this.height - yOffset && mouseY < this.height - yOffset + 10) {
-                fill(matrices, 2, this.height - 11, 2 + this.puzzleTextWidth, this.height-10, 16777215 | l);
+                fill(matrices, 2, this.height - yOffset + 9, 2 + this.puzzleTextWidth, this.height - yOffset + 10, 16777215 | l);
             }
         }
     }
@@ -63,7 +66,7 @@ public abstract class MixinTitleScreen extends Screen {
 
     @Inject(at = @At("HEAD"), method = "mouseClicked",cancellable = true)
     private void puzzle$mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> cir) {
-        if (mouseX > 2 && mouseX < (double)(2 + this.puzzleTextWidth) && mouseY > (double)(this.height - 20) && mouseY < (double)this.height-10) {
+        if (mouseX > 2 && mouseX < (double)(2 + this.puzzleTextWidth) && mouseY > (double)(this.height - yOffset) && mouseY < (double)this.height - yOffset + 10) {
             if (Objects.requireNonNull(this.client).options.chatLinksPrompt) {
                 this.client.setScreen(new ConfirmChatLinkScreen(this::confirmLink, PuzzleCore.updateURL, true));
             } else {

puzzle-base/src/main/java/net/puzzlemc/core/util/UpdateChecker.java

@@ -29,7 +29,7 @@ public class UpdateChecker {
 
     public static void init() {
         CompletableFuture.supplyAsync(() -> {
-            try (Reader reader = new InputStreamReader(new URL(PuzzleCore.UPDATE_URL).openStream())) {
+            try (Reader reader = new InputStreamReader(new URL(PuzzleCore.UPDATE_CHECKER_URL).openStream())) {
                 return GSON.<Map<String, String>>fromJson(reader, UPDATE_TYPE_TOKEN);
             } catch (MalformedURLException error) {
                 logger.log(Level.ERROR, "Unable to check for updates because of connection problems: " + error.getMessage());
@@ -43,12 +43,11 @@ public class UpdateChecker {
                 latestVersion = versionMap.get(minecraftVersion);
                 if (!latestVersion.equals(PuzzleCore.version)) {
                     isUpToDate = false;
-                    PuzzleCore.updateURL = PuzzleCore.website + "download/" + latestVersion.replace(PuzzleCore.name + " ","");
                     logger.log(Level.INFO, "There is a newer version of "+ PuzzleCore.name +" available: " + latestVersion);
                     logger.log(Level.INFO, "Please update immediately!");
                 }
             } else {
-                logger.log(Level.WARN, "A problem with the database occured, could not check for updates.");
+                logger.log(Level.WARN, "A problem with the database occurred, could not check for updates.");
             }
         }, MinecraftClient.getInstance());
     }

puzzle-blocks/build.gradle

@@ -1,4 +0,0 @@
-archivesBaseName = "puzzle-blocks"
-dependencies {
-    api project(":puzzle-base")
-}

puzzle-blocks/src/main/java/net/puzzlemc/blocks/PuzzleBlocks.java

@@ -1,87 +0,0 @@
-package net.puzzlemc.blocks;
-
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
-import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
-import net.fabricmc.fabric.impl.blockrenderlayer.BlockRenderLayerMapImpl;
-import net.minecraft.block.Block;
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.resource.ResourceManager;
-import net.minecraft.resource.ResourceType;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
-import net.puzzlemc.core.config.PuzzleConfig;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Properties;
-
-public class PuzzleBlocks implements ClientModInitializer {
-    Logger LOGGER = LogManager.getLogger("puzzle-blocks");
-
-    public void onInitializeClient() {
-        ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
-            @Override
-            public Identifier getFabricId() {
-                return new Identifier("puzzle", "blocks");
-            }
-
-            @Override
-            public void reload(ResourceManager manager) {
-                if (PuzzleConfig.customRenderLayers) {
-                    for (Identifier id : manager.findResources("optifine", path -> path.contains("block.properties"))) {
-                        try (InputStream stream = manager.getResource(id).getInputStream()) {
-                            Properties properties = new Properties();
-                            properties.load(stream);
-
-                            if (properties.get("layer.solid") != null) {
-                                String[] solid_blocks = properties.get("layer.solid").toString().split(" ");
-                                Arrays.stream(solid_blocks).iterator().forEachRemaining(string -> {
-                                    if (PuzzleConfig.debugMessages) LOGGER.info(string + " -> solid");
-                                    Block block = Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).get();
-                                    if (Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).isPresent()) {
-                                        BlockRenderLayerMapImpl.INSTANCE.putBlock(block, RenderLayer.getSolid());
-                                    }
-                                });
-                            }
-                            if (properties.get("layer.cutout") != null) {
-                                String[] solid_blocks = properties.get("layer.cutout").toString().split(" ");
-                                Arrays.stream(solid_blocks).iterator().forEachRemaining(string -> {
-                                    if (PuzzleConfig.debugMessages) LOGGER.info(string + " -> cutout");
-                                    Block block = Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).get();
-                                    if (Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).isPresent()) {
-                                        BlockRenderLayerMapImpl.INSTANCE.putBlock(block, RenderLayer.getCutout());
-                                    }
-                                });
-                            }
-                            if (properties.get("layer.cutout_mipped") != null) {
-                                String[] solid_blocks = properties.get("layer.cutout_mipped").toString().split(" ");
-                                Arrays.stream(solid_blocks).iterator().forEachRemaining(string -> {
-                                    if (PuzzleConfig.debugMessages) LOGGER.info(string + " -> cutout_mipped");
-                                    Block block = Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).get();
-                                    if (Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).isPresent()) {
-                                        BlockRenderLayerMapImpl.INSTANCE.putBlock(block, RenderLayer.getCutoutMipped());
-                                    }
-                                });
-                            }
-                            if (properties.get("layer.translucent") != null) {
-                                String[] solid_blocks = properties.get("layer.translucent").toString().split(" ");
-                                Arrays.stream(solid_blocks).iterator().forEachRemaining(string -> {
-                                    if (PuzzleConfig.debugMessages) LOGGER.info(string + " -> translucent");
-                                    Block block = Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).get();
-                                    if (Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).isPresent()) {
-                                        BlockRenderLayerMapImpl.INSTANCE.putBlock(block, RenderLayer.getTranslucent());
-                                    }
-                                });
-                            }
-                        } catch (Exception e) {
-                            LogManager.getLogger("Puzzle").error("Error occurred while loading block.properties " + id.toString(), e);
-                        }
-                    }
-                }
-            }
-        });
-    }
-}

puzzle-blocks/src/main/resources/fabric.mod.json

@@ -1,36 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "puzzle-blocks",
-  "version": "${version}",
-
-  "name": "Puzzle Blocks",
-  "description": "Lets resourcepacks change render layers of blocks",
-  "authors": [
-    "PuzzleMC",
-    "Motschen"
-  ],
-  "contact": {
-    "homepage": "https://www.midnightdust.eu/",
-    "sources": "https://github.com/TeamMidnightDust/Puzzle",
-    "issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
-  },
-
-  "license": "MIT",
-  "icon": "assets/puzzle/icon.png",
-
-  "environment": "client",
-  "entrypoints": {
-    "client": [
-      "net.puzzlemc.blocks.PuzzleBlocks"
-    ]
-  },
-  "custom": {
-    "modmenu": {
-      "parent": "puzzle"
-    }
-  },
-
-  "depends": {
-    "fabric": "*"
-  }
-}

puzzle-emissives/build.gradle

@@ -1,5 +1,10 @@
 archivesBaseName = "puzzle-emissives"
-
+repositories {
+    maven {
+        url = "https://api.modrinth.com/maven"
+    }
+}
 dependencies {
     api project(":puzzle-base")
+    modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
 }

puzzle-gui/src/main/java/net/puzzlemc/gui/IrisCompat.java

@@ -1,41 +1,25 @@
 package net.puzzlemc.gui;
 
-import net.coderbot.iris.Iris;
-import net.coderbot.iris.config.IrisConfig;
-import net.coderbot.iris.gui.screen.ShaderPackScreen;
 import net.fabricmc.loader.api.FabricLoader;
+import net.irisshaders.iris.api.v0.IrisApi;
+import net.irisshaders.iris.api.v0.IrisApiConfig;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
 import net.minecraft.text.TranslatableText;
 import net.puzzlemc.gui.screen.widget.PuzzleWidget;
 
-import java.io.IOException;
-
 public class IrisCompat {
     public static void init() {
         if (FabricLoader.getInstance().isModLoaded("iris")) {
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("Iris")));
-            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("Enable Shaders"), (button) -> button.setMessage(Iris.getIrisConfig().areShadersEnabled() ? PuzzleClient.YES : PuzzleClient.NO), (button) -> {
+            PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("Enable Shaders"), (button) -> button.setMessage(IrisApi.getInstance().getConfig().areShadersEnabled() ? PuzzleClient.YES : PuzzleClient.NO), (button) -> {
-                IrisConfig irisConfig = Iris.getIrisConfig();
+                IrisApiConfig irisConfig = IrisApi.getInstance().getConfig();
-                irisConfig.setShadersEnabled(!irisConfig.areShadersEnabled());
+                irisConfig.setShadersEnabledAndApply(!irisConfig.areShadersEnabled());
-                try {
-                    Iris.getIrisConfig().save();
-                } catch (IOException e) {
-                    Iris.logger.error("Error saving configuration file!");
-                    Iris.logger.catching(e);
-                }
-
-                try {
-                    Iris.reload();
-                } catch (IOException e) {
-                    Iris.logger.error("Error reloading shader pack while applying changes!");
-                    Iris.logger.catching(e);
-                }
             }));
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("options.iris.shaderPackSelection.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> {
                 MinecraftClient client = MinecraftClient.getInstance();
-                ShaderPackScreen shaderPackPage = new ShaderPackScreen(client.currentScreen);
+                client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(client.currentScreen));
-                client.setScreen(shaderPackPage);
             }));
         }
     }

puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java

@@ -30,52 +30,49 @@ public class PuzzleClient implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
+        MinecraftClient client = MinecraftClient.getInstance();
         PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Puzzle")));
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Check for Updates"), (button) -> button.setMessage(PuzzleConfig.checkUpdates ? YES : NO), (button) -> {
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(new TranslatableText("puzzle.option.check_for_updates"), (button) -> button.setMessage(PuzzleConfig.checkUpdates ? YES : NO), (button) -> {
             PuzzleConfig.checkUpdates = !PuzzleConfig.checkUpdates;
             PuzzleConfig.write(id);
         }));
-        PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Show Puzzle version info"), (button) -> button.setMessage(PuzzleConfig.showPuzzleInfo ? YES : NO), (button) -> {
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(new TranslatableText("puzzle.option.show_version_info"), (button) -> button.setMessage(PuzzleConfig.showPuzzleInfo ? YES : NO), (button) -> {
             PuzzleConfig.showPuzzleInfo = !PuzzleConfig.showPuzzleInfo;
             PuzzleConfig.write(id);
         }));
+        PuzzleApi.addToMiscOptions(new PuzzleWidget(new TranslatableText("puzzle.midnightconfig.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> {
+            client.setScreen(PuzzleConfig.getScreen(client.currentScreen, "puzzle"));
+        }));
         PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Puzzle")));
-        if (FabricLoader.getInstance().isModLoaded("puzzle-splashscreen")) {
+        if (FabricLoader.getInstance().isModLoaded("puzzle-splashscreen") && !PuzzleConfig.disabledIntegrations.contains("puzzle-splashscreen")) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Use resourcepack splash screen "), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.resourcepack_splash_screen"), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> {
                 PuzzleConfig.resourcepackSplashScreen = !PuzzleConfig.resourcepackSplashScreen;
                 PuzzleConfig.write(id);
                 PuzzleSplashScreen.resetColors();
                 MinecraftClient.getInstance().getTextureManager().registerTexture(PuzzleSplashScreen.LOGO, new PuzzleSplashScreen.LogoTexture());
             }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Disable splash screen logo blending "), (button) -> button.setMessage(PuzzleConfig.disableSplashScreenBlend ? YES : NO), (button) -> {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.disable_splash_screen_blend"), (button) -> button.setMessage(PuzzleConfig.disableSplashScreenBlend ? YES : NO), (button) -> {
                 PuzzleConfig.disableSplashScreenBlend = !PuzzleConfig.disableSplashScreenBlend;
                 PuzzleConfig.write(id);
             }));
         }
-        if (FabricLoader.getInstance().isModLoaded("puzzle-emissives")) {
+        if (FabricLoader.getInstance().isModLoaded("puzzle-emissives") && !PuzzleConfig.disabledIntegrations.contains("puzzle-emissives")) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Emissive Textures"), (button) -> button.setMessage(PuzzleConfig.emissiveTextures ? YES : NO), (button) -> {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.emissive_textures"), (button) -> button.setMessage(PuzzleConfig.emissiveTextures ? YES : NO), (button) -> {
                 PuzzleConfig.emissiveTextures = !PuzzleConfig.emissiveTextures;
                 PuzzleConfig.write(id);
             }));
         }
-        if (FabricLoader.getInstance().isModLoaded("puzzle-models")) {
+        if (FabricLoader.getInstance().isModLoaded("puzzle-models") && !PuzzleConfig.disabledIntegrations.contains("puzzle-models")) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Unlimited Model Rotations"), (button) -> button.setMessage(PuzzleConfig.unlimitedRotations ? YES : NO), (button) -> {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.unlimited_model_rotations"), (button) -> button.setMessage(PuzzleConfig.unlimitedRotations ? YES : NO), (button) -> {
                 PuzzleConfig.unlimitedRotations = !PuzzleConfig.unlimitedRotations;
                 PuzzleConfig.write(id);
             }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Bigger Custom Models"), (button) -> button.setMessage(PuzzleConfig.biggerModels ? YES : NO), (button) -> {
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.bigger_custom_models"), (button) -> button.setMessage(PuzzleConfig.biggerModels ? YES : NO), (button) -> {
                 PuzzleConfig.biggerModels = !PuzzleConfig.biggerModels;
                 PuzzleConfig.write(id);
             }));
         }
-        if (FabricLoader.getInstance().isModLoaded("puzzle-blocks")) {
+        if (FabricLoader.getInstance().isModLoaded("cullleaves") && !PuzzleConfig.disabledIntegrations.contains("cullleaves")) {
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Render Layer Overwrites"), (button) -> button.setMessage(PuzzleConfig.customRenderLayers ? YES : NO), (button) -> {
-                PuzzleConfig.customRenderLayers = !PuzzleConfig.customRenderLayers;
-                PuzzleConfig.write(id);
-            }));
-        }
-
-        if (FabricLoader.getInstance().isModLoaded("cullleaves")) {
             PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("CullLeaves")));
             PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("Cull Leaves"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
                 CullLeavesConfig.enabled = !CullLeavesConfig.enabled;
@@ -83,11 +80,11 @@ public class PuzzleClient implements ClientModInitializer {
                 MinecraftClient.getInstance().worldRenderer.reload();
             }));
         }
-        if (FabricLoader.getInstance().isModLoaded("iris")) {
+        if (FabricLoader.getInstance().isModLoaded("iris") && !PuzzleConfig.disabledIntegrations.contains("iris")) {
             IrisCompat.init();
         }
 
-        if (FabricLoader.getInstance().isModLoaded("continuity")) {
+        if (FabricLoader.getInstance().isModLoaded("continuity") && !PuzzleConfig.disabledIntegrations.contains("continuity")) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Continuity")));
             ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
             PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("options.continuity.disable_ctm"), (button) -> button.setMessage(contConfig.disableCTM.get() ? YES : NO), (button) -> {
@@ -104,7 +101,7 @@ public class PuzzleClient implements ClientModInitializer {
     }
     public static boolean lateInitDone = false;
     public static void lateInit() { // Some mods are initialized after Puzzle, so we can't access them in our ClientModInitializer
-        if (FabricLoader.getInstance().isModLoaded("lambdynlights")) {
+        if (FabricLoader.getInstance().isModLoaded("lambdynlights") && !PuzzleConfig.disabledIntegrations.contains("lambdynlights")) {
             DynamicLightsConfig ldlConfig = LambDynLights.get().config;
 
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambDynamicLights")));
@@ -115,7 +112,7 @@ public class PuzzleClient implements ClientModInitializer {
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next())));
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.water_sensitive_check")), (button) -> button.setMessage(ldlConfig.getWaterSensitiveCheck().get() ? YES : NO), (button) -> ldlConfig.getWaterSensitiveCheck().set(!ldlConfig.getWaterSensitiveCheck().get())));
         }
-        if (FabricLoader.getInstance().isModLoaded("citresewn") && CITResewn.INSTANCE != null && CITResewnConfig.INSTANCE() != null) {
+        if (FabricLoader.getInstance().isModLoaded("citresewn") && !PuzzleConfig.disabledIntegrations.contains("citresewn") && CITResewn.INSTANCE != null && CITResewnConfig.INSTANCE() != null) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("CIT Resewn")));
             CITResewnConfig citConfig = CITResewnConfig.INSTANCE();
             PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? YES : NO), (button) -> {
@@ -145,13 +142,13 @@ public class PuzzleClient implements ClientModInitializer {
                 citConfig.write();
             }));
         }
-        if (FabricLoader.getInstance().isModLoaded("lambdabettergrass")) {
+        if (FabricLoader.getInstance().isModLoaded("lambdabettergrass") && !PuzzleConfig.disabledIntegrations.contains("lambdabettergrass")) {
             LBGConfig lbgConfig = LambdaBetterGrass.get().config;
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambdaBetterGrass")));
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
             PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
         }
-        if (FabricLoader.getInstance().isModLoaded("cem") && FabricLoader.getInstance().isModLoaded("completeconfig")) {
+        if (FabricLoader.getInstance().isModLoaded("cem") && FabricLoader.getInstance().isModLoaded("completeconfig") && !PuzzleConfig.disabledIntegrations.contains("cem")) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Custom Entity Models")));
             CemConfig cemConfig = (CemConfig) CemConfigFairy.getConfig();
             CemOptions cemOptions = CemConfigFairy.getConfig();

puzzle-gui/src/main/java/net/puzzlemc/gui/config/ModMenuIntegration.java

@@ -11,8 +11,12 @@ import java.util.Map;
 
 @Environment(EnvType.CLIENT)
 public class ModMenuIntegration implements ModMenuApi {
+    @Override
+    public ConfigScreenFactory<?> getModConfigScreenFactory() {
+        return PuzzleOptionsScreen::new;
+    }
 
-     //Used to set the config screen for all modules //
+    //Used to set the config screen for all modules //
     @Override
     public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
         Map<String, ConfigScreenFactory<?>> map = new HashMap<>();
@@ -21,7 +25,7 @@ public class ModMenuIntegration implements ModMenuApi {
         map.put("puzzle-blocks",PuzzleOptionsScreen::new);
         map.put("puzzle-base",PuzzleOptionsScreen::new);
         map.put("puzzle-models",PuzzleOptionsScreen::new);
-        map.put("puzzle-randomentities",PuzzleOptionsScreen::new);
+        map.put("puzzle-emissives",PuzzleOptionsScreen::new);
         map.put("puzzle-splashscreen",PuzzleOptionsScreen::new);
         return map;
     }

puzzle-gui/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java

@@ -2,6 +2,7 @@ package net.puzzlemc.gui.mixin;
 
 import eu.midnightdust.lib.util.screen.TexturedOverlayButtonWidget;
 import net.minecraft.util.Identifier;
+import net.puzzlemc.core.config.PuzzleConfig;
 import net.puzzlemc.gui.PuzzleClient;
 import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
 import net.minecraft.client.gui.screen.Screen;
@@ -25,6 +26,7 @@ public abstract class MixinOptionsScreen extends Screen {
 
     @Inject(at = @At("HEAD"), method = "init")
     private void midnightlib$init(CallbackInfo ci) {
+        if (PuzzleConfig.enablePuzzleButton)
             this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 - 178, this.height / 6 - 12, 20, 20, 0, 0, 20, PUZZLE_ICON_TEXTURE, 32, 64, (buttonWidget) -> (Objects.requireNonNull(this.client)).setScreen(new PuzzleOptionsScreen(this)), new TranslatableText("midnightlib.overview.title")));
     }
 }

puzzle-models/build.gradle

@@ -3,7 +3,12 @@ archivesBaseName = "puzzle-models"
 loom {
     accessWidenerPath =  file("src/main/resources/puzzle-models.accesswidener")
 }
-
+repositories {
+    maven {
+        url = "https://api.modrinth.com/maven"
+    }
+}
 dependencies {
     api project(":puzzle-base")
+    modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
 }

puzzle-splashscreen/build.gradle

@@ -1,5 +1,10 @@
 archivesBaseName = "puzzle-splashscreen"
-
+repositories {
+    maven {
+        url = "https://api.modrinth.com/maven"
+    }
+}
 dependencies {
     api project(":puzzle-base")
+    modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
 }

puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java

@@ -45,7 +45,7 @@ public class PuzzleSplashScreen implements ClientModInitializer {
     }
 
     public void onInitializeClient() {
-        if (!CONFIG_PATH.exists()) { // Run when config directory is nonexistant //
+        if (!CONFIG_PATH.exists()) { // Run when config directory is nonexistent //
             if (CONFIG_PATH.mkdir()) { // Create our custom config directory //
                 try {
                     Files.setAttribute(CONFIG_PATH.toPath(), "dos:hidden", true);

puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java

@@ -55,7 +55,7 @@ public abstract class MixinSplashScreen extends Overlay {
     private void modifyBackgroundColor2(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { // Set the Background Color to our configured value //
         long l = Util.getMeasuringTimeMs();
         float g = this.reloadStartTime > -1L ? (float)(l - this.reloadStartTime) / 500.0F : -1.0F;
-        int m = MathHelper.ceil(MathHelper.clamp((double)g, 0.15D, 1.0D) * 255.0D);
+        int m = MathHelper.ceil(MathHelper.clamp(g, 0.15D, 1.0D) * 255.0D);
         if (PuzzleConfig.resourcepackSplashScreen && PuzzleConfig.backgroundColor != 15675965)
             fill(matrices, 0, 0, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight(), withAlpha(PuzzleConfig.backgroundColor, m));
     }

settings.gradle

@@ -11,7 +11,5 @@ include 'puzzle-base'
 
 include 'puzzle-splashscreen'
 include 'puzzle-models'
-include 'puzzle-blocks'
-//include 'puzzle-randomentities'
 include 'puzzle-gui'
 include 'puzzle-emissives'

src/main/resources/assets/puzzle/lang/en_us.json

@@ -5,9 +5,13 @@
 	"puzzle.page.resources":"Resource Settings",
 	"puzzle.page.performance":"Performance Settings",
 	"puzzle.page.misc":"Miscellaneous Settings",
-	"puzzle.option.ctm":"Connected Textures",
+	"puzzle.option.check_for_updates":"Check for Updates",
-	"puzzle.option.inside_ctm":"Connect Inside Textures",
+	"puzzle.option.show_version_info":"Show Puzzle version info",
-	"puzzle.midnightconfig.title":"Title",
+	"puzzle.option.resourcepack_splash_screen":"Use resourcepack splash screen",
-	"puzzle.midnightconfig.showPuzzleInfo":"Show Puzzle Info",
+	"puzzle.option.disable_splash_screen_blend":"Disable splash screen logo blending",
-	"puzzle.midnightconfig.showPuzzleInfo.tooltip":"Show Puzzle Info"
+	"puzzle.option.emissive_textures":"Emissive Textures",
+	"puzzle.option.unlimited_model_rotations":"Unlimited Model Rotations",
+	"puzzle.option.bigger_custom_models":"Bigger Custom Models",
+	"puzzle.option.render_layer_overrides":"Render Layer Overrides",
+	"puzzle.midnightconfig.title":"Puzzle Advanced Configuration"
 }