From bcda47d94cb0fdd3713d02627597a67d2092fe2c Mon Sep 17 00:00:00 2001
From: Traben <ben.trabant@gmail.com>
Date: Mon, 30 May 2022 14:51:28 +1000
Subject: [PATCH] ETF 3.0 update

---
 gradle.properties                                 |  3 ++-
 .../main/java/net/puzzlemc/gui/PuzzleClient.java  | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 8296e3f..570f9be 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,4 +28,5 @@ org.gradle.jvmargs=-Xmx1G
 	complete_config_version = 1.0.0
 	spruceui_version=3.3.2+1.17
 	midnightlib_version=0.4.0
-	entitytexturefeatures_version=2.4.5
+	#update to 3.0 included class renames, ETF will be stable for puzzle usage from here on out
+	entitytexturefeatures_version=3.0.0
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 7450659..8c6317f 100755
--- a/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java
+++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java
@@ -21,8 +21,8 @@ import net.minecraft.util.Formatting;
 import net.puzzlemc.splashscreen.PuzzleSplashScreen;
 import shcm.shsupercm.fabric.citresewn.CITResewn;
 import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
-import traben.entity_texture_features.client.ETF_CLIENT;
-import traben.entity_texture_features.client.ETF_METHODS;
+import traben.entity_texture_features.client.ETFClient;
+import traben.entity_texture_features.client.utils.ETFUtils;
 import traben.entity_texture_features.config.ETFConfig;
 import traben.entity_texture_features.config.ETFConfigScreen;
 
@@ -98,7 +98,7 @@ public class PuzzleClient implements ClientModInitializer {
         }
         if (FabricLoader.getInstance().isModLoaded("entity_texture_features") && !PuzzleConfig.disabledIntegrations.contains("entity_texture_features")) {
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Entity Texture Features")));
-            ETFConfig etfConfig = ETF_CLIENT.ETFConfigData;
+            ETFConfig etfConfig = ETFClient.ETFConfigData;
             ETFConfigScreen etfConfigScreen = new ETFConfigScreen();
             PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Enable Optifine Random mobs"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> {
                 etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures;
@@ -110,8 +110,13 @@ public class PuzzleClient implements ClientModInitializer {
                 etfConfigScreen.saveConfig();
                 etfConfigScreen.resetVisuals();
             }));
-            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Emissive texture Z-Fighting / Shader patch"), (button) -> button.setMessage(etfConfig.doShadersEmissiveFix ? YES : NO), (button) -> {
-                etfConfig.doShadersEmissiveFix = !etfConfig.doShadersEmissiveFix;
+            // shader fix no longer required as an option from V3.0 onwards as a solution has been found
+            // I figure this is a good use of the menu slot,
+            // it is the most significant feature for emissives added at the same time the shader fix was removed,
+            // it can impact shader compatability and each option has distinct visual differences.
+            // see https://github.com/Traben-0/Entity_Texture_Features/blob/master/readMeAssets/EMISSIVE_GUIDE.md
+            PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Emissive Entity Textures: Rendering Mode"), (button) -> button.setMessage(etfConfig.fullBrightEmissives ? Text.of("Brighter") : Text.of("Default")), (button) -> {
+                etfConfig.fullBrightEmissives  = !etfConfig.fullBrightEmissives ;
                 etfConfigScreen.saveConfig();
                 etfConfigScreen.resetVisuals();
             }));