beta 2

Traben-0 · Dec 1, 2023 · 82e0453 · 82e0453
1 parent 3cab6ed
commit 82e0453
Show file tree

Hide file tree

Showing 21 changed files with 451 additions and 412 deletions.
diff --git a/common/CHANGELOG.md b/common/CHANGELOG.md
@@ -1,5 +1,20 @@
 [**ETF Changelog:**]
 
+[beta 2]
+- fixed skull block emissives
+- fixed render context desync *(mobs textures defaulting depending on where you are looking last beta)*
+- fixed elytra emissives
+- removed the ETF cape skin feature, it was fun working with putting a cape inside the skin texture, but it added quite a lot
+of overhead, when the minecraftcapes.net mod is just more effective. With this removed I plan to add support for
+player skin feature emissives in whatever cape texture is being used at a future time. Which will be more freeing than 
+only applying skin feature emissives to etf loaded capes
+- Added a new config screen category `Debug settings`. the debug right click option is now here. the log texture creation setting is now here.
+- added a new debug button in the debug settings screen that will print **ALL** currently cached ETF texture data to the log, details of every known texture and every variant,
+as well as telling you which textures can and cannot be varied. for example elytra.png shows up in the list of textures that can be varied with random entity rules ;)
+
+
+[beta 1]
+
 ETF 5.0 is a massive rework of the code, ETF is now almost an entirely different mod in its application from what v4.5 was.
 It should now universally affect every entity and entity render feature. 
 - the `blocks` property now again additionally checks the block below block entities differing from OptiFine's behaviour

diff --git a/...main/java/traben/entity_texture_features/config/screens/ETFConfigScreenDebugSettings.java b/...main/java/traben/entity_texture_features/config/screens/ETFConfigScreenDebugSettings.java
@@ -0,0 +1,77 @@
+package traben.entity_texture_features.config.screens;
+
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.screen.ScreenTexts;
+import net.minecraft.text.Text;
+import traben.entity_texture_features.ETFClientCommon;
+import traben.entity_texture_features.ETFVersionDifferenceHandler;
+import traben.entity_texture_features.config.ETFConfig;
+import traben.entity_texture_features.features.ETFManager;
+
+import java.util.Objects;
+
+//inspired by puzzles custom gui code
+public class ETFConfigScreenDebugSettings extends ETFConfigScreen {
+    protected ETFConfigScreenDebugSettings(Screen parent) {
+        super(ETFVersionDifferenceHandler.getTextFromTranslation("config.entity_texture_features.debug_screen.title"), parent);
+
+    }
+
+
+    @Override
+    protected void init() {
+        super.init();
+        this.addDrawableChild(getETFButton((int) (this.width * 0.55), (int) (this.height * 0.9), (int) (this.width * 0.2), 20,
+                ScreenTexts.BACK,
+                (button) -> Objects.requireNonNull(client).setScreen(parent)));
+        this.addDrawableChild(getETFButton((int) (this.width * 0.25), (int) (this.height * 0.9), (int) (this.width * 0.22), 20,
+                ETFVersionDifferenceHandler.getTextFromTranslation("dataPack.validation.reset"),
+                (button) -> {
+                    //temporaryETFConfig = new ETFConfig();
+                    ETFConfigScreenMain.temporaryETFConfig.debugLoggingMode = ETFConfig.DebugLogMode.None;
+                    ETFConfigScreenMain.temporaryETFConfig.illegalPathSupportMode = ETFConfig.IllegalPathMode.None;
+                    this.clearAndInit();
+                    //Objects.requireNonNull(client).setScreen(parent);
+                }));
+
+
+        this.addDrawableChild(getETFButton((int) (this.width * 0.2), (int) (this.height * 0.2), (int) (this.width * 0.6), 20,
+                Text.of(ETFVersionDifferenceHandler.getTextFromTranslation(
+                        "config." + ETFClientCommon.MOD_ID + ".debug_logging_mode.title"
+                ).getString() + ": " + (ETFConfigScreenMain.temporaryETFConfig.debugLoggingMode)),
+                (button) -> {
+                    ETFConfigScreenMain.temporaryETFConfig.debugLoggingMode = ETFConfigScreenMain.temporaryETFConfig.debugLoggingMode.next();
+                    button.setMessage(Text.of(ETFVersionDifferenceHandler.getTextFromTranslation(
+                            "config." + ETFClientCommon.MOD_ID + ".debug_logging_mode.title"
+                    ).getString() + ": " + (ETFConfigScreenMain.temporaryETFConfig.debugLoggingMode)));
+                },
+                ETFVersionDifferenceHandler.getTextFromTranslation("config." + ETFClientCommon.MOD_ID + ".debug_logging_mode.tooltip")
+        ));
+        this.addDrawableChild(getETFButton((int) (this.width * 0.2), (int) (this.height * 0.3), (int) (this.width * 0.6), 20,
+                Text.of(ETFVersionDifferenceHandler.getTextFromTranslation(
+                        "config." + ETFClientCommon.MOD_ID + ".log_creation"
+                ).getString() + ": " + (ETFConfigScreenMain.temporaryETFConfig.logTextureDataInitialization ? ScreenTexts.ON : ScreenTexts.OFF).getString()),
+                (button) -> {
+                    ETFConfigScreenMain.temporaryETFConfig.logTextureDataInitialization = !ETFConfigScreenMain.temporaryETFConfig.logTextureDataInitialization;
+                    button.setMessage(Text.of(ETFVersionDifferenceHandler.getTextFromTranslation(
+                            "config." + ETFClientCommon.MOD_ID + ".log_creation"
+                    ).getString() + ": " + (ETFConfigScreenMain.temporaryETFConfig.logTextureDataInitialization ? ScreenTexts.ON : ScreenTexts.OFF).getString()));
+                },
+                ETFVersionDifferenceHandler.getTextFromTranslation("config." + ETFClientCommon.MOD_ID + ".log_creation.tooltip")
+        ));
+
+
+        this.addDrawableChild(getETFButton((int) (this.width * 0.2), (int) (this.height * 0.6), (int) (this.width * 0.6), 20,
+                ETFVersionDifferenceHandler.getTextFromTranslation("config.entity_texture_features.debug_screen.mass_log"),
+                (button) -> {
+                    ETFManager.getInstance().doTheBigBoyPrintoutKronk();
+                    button.setMessage(ETFVersionDifferenceHandler.getTextFromTranslation("config.entity_texture_features.debug_screen.mass_log.done"));
+                    button.active = false;
+                },
+                ETFVersionDifferenceHandler.getTextFromTranslation("config.entity_texture_features.debug_screen.mass_log.tooltip")
+        ));
+
+    }
+
+
+}
diff --git a/...in/java/traben/entity_texture_features/config/screens/ETFConfigScreenGeneralSettings.java b/...in/java/traben/entity_texture_features/config/screens/ETFConfigScreenGeneralSettings.java
@@ -27,40 +27,17 @@ protected void init() {
                 ETFVersionDifferenceHandler.getTextFromTranslation("dataPack.validation.reset"),
                 (button) -> {
                     //temporaryETFConfig = new ETFConfig();
-                    ETFConfigScreenMain.temporaryETFConfig.debugLoggingMode = ETFConfig.DebugLogMode.None;
                     ETFConfigScreenMain.temporaryETFConfig.illegalPathSupportMode = ETFConfig.IllegalPathMode.None;
                     ETFConfigScreenMain.temporaryETFConfig.hideConfigButton = false;
-                    ETFConfigScreenMain.temporaryETFConfig.logTextureDataInitialization = false;
+                    ETFConfigScreenMain.temporaryETFConfig.enableFullBodyWardenTextures = true;
                     this.clearAndInit();
                     //Objects.requireNonNull(client).setScreen(parent);
                 }));
 
 
+
+
         this.addDrawableChild(getETFButton((int) (this.width * 0.2), (int) (this.height * 0.2), (int) (this.width * 0.6), 20,
-                Text.of(ETFVersionDifferenceHandler.getTextFromTranslation(
-                        "config." + ETFClientCommon.MOD_ID + ".debug_logging_mode.title"
-                ).getString() + ": " + (ETFConfigScreenMain.temporaryETFConfig.debugLoggingMode)),
-                (button) -> {
-                    ETFConfigScreenMain.temporaryETFConfig.debugLoggingMode = ETFConfigScreenMain.temporaryETFConfig.debugLoggingMode.next();
-                    button.setMessage(Text.of(ETFVersionDifferenceHandler.getTextFromTranslation(
-                            "config." + ETFClientCommon.MOD_ID + ".debug_logging_mode.title"
-                    ).getString() + ": " + (ETFConfigScreenMain.temporaryETFConfig.debugLoggingMode)));
-                },
-                ETFVersionDifferenceHandler.getTextFromTranslation("config." + ETFClientCommon.MOD_ID + ".debug_logging_mode.tooltip")
-        ));
-        this.addDrawableChild(getETFButton((int) (this.width * 0.2), (int) (this.height * 0.3), (int) (this.width * 0.6), 20,
-                Text.of(ETFVersionDifferenceHandler.getTextFromTranslation(
-                        "config." + ETFClientCommon.MOD_ID + ".log_creation"
-                ).getString() + ": " + (ETFConfigScreenMain.temporaryETFConfig.logTextureDataInitialization ? ScreenTexts.ON : ScreenTexts.OFF).getString()),
-                (button) -> {
-                    ETFConfigScreenMain.temporaryETFConfig.logTextureDataInitialization = !ETFConfigScreenMain.temporaryETFConfig.logTextureDataInitialization;
-                    button.setMessage(Text.of(ETFVersionDifferenceHandler.getTextFromTranslation(
-                            "config." + ETFClientCommon.MOD_ID + ".log_creation"
-                    ).getString() + ": " + (ETFConfigScreenMain.temporaryETFConfig.logTextureDataInitialization ? ScreenTexts.ON : ScreenTexts.OFF).getString()));
-                },
-                ETFVersionDifferenceHandler.getTextFromTranslation("config." + ETFClientCommon.MOD_ID + ".log_creation.tooltip")
-        ));
-        this.addDrawableChild(getETFButton((int) (this.width * 0.2), (int) (this.height * 0.4), (int) (this.width * 0.6), 20,
                 Text.of(ETFVersionDifferenceHandler.getTextFromTranslation(
                         "config." + ETFClientCommon.MOD_ID + ".allow_illegal_texture_paths.title"
                 ).getString() + ": " + (ETFConfigScreenMain.temporaryETFConfig.illegalPathSupportMode)),
@@ -72,7 +49,7 @@ protected void init() {
                 },
                 ETFVersionDifferenceHandler.getTextFromTranslation("config." + ETFClientCommon.MOD_ID + ".allow_illegal_texture_paths.tooltip")
         ));
-        this.addDrawableChild(getETFButton((int) (this.width * 0.2), (int) (this.height * 0.5), (int) (this.width * 0.6), 20,
+        this.addDrawableChild(getETFButton((int) (this.width * 0.2), (int) (this.height * 0.3), (int) (this.width * 0.6), 20,
                 Text.of(ETFVersionDifferenceHandler.getTextFromTranslation(
                         "config." + ETFClientCommon.MOD_ID + ".hide_button"
                 ).getString() + ": " + (ETFConfigScreenMain.temporaryETFConfig.hideConfigButton ? ScreenTexts.ON : ScreenTexts.OFF).getString()),
@@ -84,7 +61,7 @@ protected void init() {
                 },
                 ETFVersionDifferenceHandler.getTextFromTranslation("config." + ETFClientCommon.MOD_ID + ".hide_button.tooltip")
         ));
-        this.addDrawableChild(getETFButton((int) (this.width * 0.2), (int) (this.height * 0.6), (int) (this.width * 0.6), 20,
+        this.addDrawableChild(getETFButton((int) (this.width * 0.2), (int) (this.height * 0.4), (int) (this.width * 0.6), 20,
                 Text.of(ETFVersionDifferenceHandler.getTextFromTranslation(
                         "config." + ETFClientCommon.MOD_ID + ".warden.title"
                 ).getString() + ": " + (ETFConfigScreenMain.temporaryETFConfig.enableFullBodyWardenTextures ? ScreenTexts.ON : ScreenTexts.OFF).getString()),
@@ -97,6 +74,7 @@ protected void init() {
                 ETFVersionDifferenceHandler.getTextFromTranslation("config." + ETFClientCommon.MOD_ID + ".warden.tooltip")
         ));
 
+
     }
 
 

diff --git a/common/src/main/java/traben/entity_texture_features/config/screens/ETFConfigScreenMain.java b/common/src/main/java/traben/entity_texture_features/config/screens/ETFConfigScreenMain.java
@@ -32,6 +32,7 @@ public class ETFConfigScreenMain extends ETFConfigScreen {
     final ETFConfigScreenRandomSettings randomSettingsScreen = new ETFConfigScreenRandomSettings(this);
     final ETFConfigScreenEmissiveSettings emissiveSettingsScreen = new ETFConfigScreenEmissiveSettings(this);
     final ETFConfigScreenBlinkSettings blinkSettingsScreen = new ETFConfigScreenBlinkSettings(this);
+    final ETFConfigScreenDebugSettings debugSettingsScreen = new ETFConfigScreenDebugSettings(this);
     final ETFConfigScreenGeneralSettings generalSettingsScreen = new ETFConfigScreenGeneralSettings(this);
     boolean shownWarning = false;
     int warningCount = 0;
@@ -105,30 +106,39 @@ protected void init() {
                 }).dimensions((int) (this.width * 0.1), (int) (this.height * 0.9), (int) (this.width * 0.2), 20).build());
 
 
-        this.addDrawableChild(ButtonWidget.builder(
-                        ETFVersionDifferenceHandler.getTextFromTranslation("config." + ETFClientCommon.MOD_ID + ".blinking_mob_settings_sub.title"),
-                        (button) -> Objects.requireNonNull(client).setScreen(blinkSettingsScreen))
-                .dimensions((int) (this.width * 0.3) + 75, (int) (this.height * 0.5) + 17, 165, 20).build());
 
-        this.addDrawableChild(ButtonWidget.builder(
-                        ETFVersionDifferenceHandler.getTextFromTranslation("config." + MOD_ID + ".player_skin_settings.title"),
-                        (button) -> Objects.requireNonNull(client).setScreen(playerSkinSettingsScreen))
-                .dimensions((int) (this.width * 0.3) + 75, (int) (this.height * 0.5) - 10, 165, 20).build());
 
         this.addDrawableChild(ButtonWidget.builder(
                         ETFVersionDifferenceHandler.getTextFromTranslation("config." + ETFClientCommon.MOD_ID + ".random_settings.title"),
                         (button) -> Objects.requireNonNull(client).setScreen(randomSettingsScreen))
-                .dimensions((int) (this.width * 0.3) + 75, (int) (this.height * 0.5) - 64, 165, 20).build());
+                .dimensions((int) (this.width * 0.3) + 75, (int) (this.height * 0.5) - 73, 165, 20).build());
 
         this.addDrawableChild(ButtonWidget.builder(
                         ETFVersionDifferenceHandler.getTextFromTranslation("config." + ETFClientCommon.MOD_ID + ".emissive_settings.title"),
                         (button) -> Objects.requireNonNull(client).setScreen(emissiveSettingsScreen))
-                .dimensions((int) (this.width * 0.3) + 75, (int) (this.height * 0.5) - 37, 165, 20).build());
+                .dimensions((int) (this.width * 0.3) + 75, (int) (this.height * 0.5) - 48, 165, 20).build());
+
+        this.addDrawableChild(ButtonWidget.builder(
+                        ETFVersionDifferenceHandler.getTextFromTranslation("config." + MOD_ID + ".player_skin_settings.title"),
+                        (button) -> Objects.requireNonNull(client).setScreen(playerSkinSettingsScreen))
+                .dimensions((int) (this.width * 0.3) + 75, (int) (this.height * 0.5) - 23, 165, 20).build());
+
+        this.addDrawableChild(ButtonWidget.builder(
+                        ETFVersionDifferenceHandler.getTextFromTranslation("config." + ETFClientCommon.MOD_ID + ".blinking_mob_settings_sub.title"),
+                        (button) -> Objects.requireNonNull(client).setScreen(blinkSettingsScreen))
+                .dimensions((int) (this.width * 0.3) + 75, (int) (this.height * 0.5) + 3, 165, 20).build());
+
+        this.addDrawableChild(ButtonWidget.builder(
+                        ETFVersionDifferenceHandler.getTextFromTranslation("config.entity_texture_features.debug_screen.title"),
+                        (button) -> Objects.requireNonNull(client).setScreen(debugSettingsScreen))
+                .dimensions((int) (this.width * 0.3) + 75, (int) (this.height * 0.5) + 28, 165, 20).build());
 
         this.addDrawableChild(ButtonWidget.builder(
                         ETFVersionDifferenceHandler.getTextFromTranslation("config." + ETFClientCommon.MOD_ID + ".general_settings.title"),
                         (button) -> Objects.requireNonNull(client).setScreen(generalSettingsScreen))
-                .dimensions((int) (this.width * 0.3) + 75, (int) (this.height * 0.5) + 44, 165, 20).build());
+                .dimensions((int) (this.width * 0.3) + 75, (int) (this.height * 0.5) + 53, 165, 20).build());
+
+
 
     }