From 30b647938e316aa1eb101fc9e41e120a06d19cd6 Mon Sep 17 00:00:00 2001 From: Motschen Date: Thu, 5 Jan 2023 18:26:01 +0100 Subject: [PATCH] Fix crash with newer ETF versions --- gradle.properties | 4 ++-- puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java | 6 +++--- src/main/resources/assets/puzzle/lang/en_us.json | 4 +--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 37243b4..484346a 100755 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx4G loader_version=0.14.8 # Mod Properties - mod_version = 1.4.0-1.19 + mod_version = 1.4.2-1.19 maven_group = net.puzzlemc archives_base_name = puzzle @@ -32,4 +32,4 @@ org.gradle.jvmargs=-Xmx4G complete_config_version = 1.0.0 spruceui_version=4.0.0+1.19 midnightlib_version=0.5.2 - entitytexturefeatures_version=4.0.1.fabric + entitytexturefeatures_version=4.3.1.fabric.1.19.2 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 b60323d..e4eb2e6 100755 --- a/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java +++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java @@ -265,9 +265,9 @@ public class PuzzleClient implements ClientModInitializer { etfConfig.enableEmissiveTextures = !etfConfig.enableEmissiveTextures; ETFApi.saveETFConfigChangesAndResetETF(); })); - PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.full_bright_emissives.title"), (button) -> button.setMessage( - etfConfig.fullBrightEmissives ? Text.translatable("entity_texture_features.puzzle.emissive_type.brighter") : Text.translatable("entity_texture_features.puzzle.emissive_type.default")), (button) -> { - etfConfig.fullBrightEmissives = !etfConfig.fullBrightEmissives ; + PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.emissive_mode.title"), (button) -> button.setMessage( + Text.literal(etfConfig.emissiveRenderMode.toString())), (button) -> { + etfConfig.emissiveRenderMode = etfConfig.emissiveRenderMode.next(); ETFApi.saveETFConfigChangesAndResetETF(); })); PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.blinking_mob_settings.title"), (button) -> button.setMessage(etfConfig.enableBlinking ? YES : NO), (button) -> { diff --git a/src/main/resources/assets/puzzle/lang/en_us.json b/src/main/resources/assets/puzzle/lang/en_us.json index f6b1c9c..a2d29c5 100755 --- a/src/main/resources/assets/puzzle/lang/en_us.json +++ b/src/main/resources/assets/puzzle/lang/en_us.json @@ -33,7 +33,5 @@ "config.dynamicfps.restore_when_hovered.tooltip": "Whether or not to stop the\nFPS limiting while Minecraft is previewed\n(i.e. hovered on task bar or dock)", "config.dynamicfps.run_gc_on_unfocus.tooltip": "Run a garbage collector while\nMinecraft is not focused to\nfree up some RAM", "config.dynamicfps.unfocused_volume.tooltip": "The volume the game should play\nsound at while unfocused\n(i.e. another window is selected)", - "config.dynamicfps.hidden_volume.tooltip": "The volume the game should play\nsound at while not visible\n(i.e. minimized, covered by other windows\nor on another virtual desktop)", - "entity_texture_features.puzzle.emissive_type.brighter": "§eBrighter", - "entity_texture_features.puzzle.emissive_type.default": "§6Default" + "config.dynamicfps.hidden_volume.tooltip": "The volume the game should play\nsound at while not visible\n(i.e. minimized, covered by other windows\nor on another virtual desktop)" }