From d282d43f2060e1e484046c3f89caabd57133ded1 Mon Sep 17 00:00:00 2001 From: Motschen Date: Fri, 18 Mar 2022 14:49:57 +0100 Subject: [PATCH] Puzzle 1.2.1 - Fix CITResewn 1.0.0+ --- gradle.properties | 4 ++-- puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java | 4 ++-- puzzle-gui/src/main/resources/fabric.mod.json | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index f1b6023..8296e3f 100755 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.13.3 # Mod Properties - mod_version = 1.2.0 + mod_version = 1.2.1 maven_group = net.puzzlemc archives_base_name = puzzle @@ -23,7 +23,7 @@ org.gradle.jvmargs=-Xmx1G 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 + cit_resewn_version = 1.0.1+1.18.2 cem_version = 3561474 complete_config_version = 1.0.0 spruceui_version=3.3.2+1.17 diff --git a/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java b/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java index d9109ff..7450659 100755 --- a/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java +++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java @@ -140,9 +140,9 @@ 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") && !PuzzleConfig.disabledIntegrations.contains("citresewn") && CITResewn.INSTANCE != null && CITResewnConfig.INSTANCE() != null) { + if (FabricLoader.getInstance().isModLoaded("citresewn") && !PuzzleConfig.disabledIntegrations.contains("citresewn") && CITResewnConfig.INSTANCE != null) { PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("CIT Resewn"))); - CITResewnConfig citConfig = CITResewnConfig.INSTANCE(); + CITResewnConfig citConfig = CITResewnConfig.INSTANCE; PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? YES : NO), (button) -> { citConfig.enabled = !citConfig.enabled; citConfig.write(); diff --git a/puzzle-gui/src/main/resources/fabric.mod.json b/puzzle-gui/src/main/resources/fabric.mod.json index 5db7dc9..9038262 100755 --- a/puzzle-gui/src/main/resources/fabric.mod.json +++ b/puzzle-gui/src/main/resources/fabric.mod.json @@ -39,5 +39,8 @@ "depends": { "fabric": "*" + }, + "breaks": { + "citresewn": "<=1.0.0+1.18.2" } }