Motschen/Puzzle
1
0
Fork 0
mirror of https://github.com/PuzzleMC/Puzzle.git synced 2025-12-15 19:35:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31 from Traben-0/1.18

Browse Source 
Entity Texture Features V3.0 - patch
This commit is contained in:
Martin Prokoph
2022-05-30 16:49:39 +00:00
committed by GitHub
parent f5aad84b90 bcda47d94c
commit 222f842386
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gradle.properties
View File

@@ -28,4 +28,5 @@ org.gradle.jvmargs=-Xmx1G
complete_config_version = 1.0.0 complete_config_version = 1.0.0
spruceui_version=3.3.2+1.17 spruceui_version=3.3.2+1.17
midnightlib_version=0.4.0 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

15
puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java
View File

@@ -21,8 +21,8 @@ import net.minecraft.util.Formatting;
import net.puzzlemc.splashscreen.PuzzleSplashScreen; import net.puzzlemc.splashscreen.PuzzleSplashScreen;
import shcm.shsupercm.fabric.citresewn.CITResewn; import shcm.shsupercm.fabric.citresewn.CITResewn;
import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig; import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
import traben.entity_texture_features.client.ETF_CLIENT; import traben.entity_texture_features.client.ETFClient;
import traben.entity_texture_features.client.ETF_METHODS; import traben.entity_texture_features.client.utils.ETFUtils;
import traben.entity_texture_features.config.ETFConfig; import traben.entity_texture_features.config.ETFConfig;
import traben.entity_texture_features.config.ETFConfigScreen; 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")) { if (FabricLoader.getInstance().isModLoaded("entity_texture_features") && !PuzzleConfig.disabledIntegrations.contains("entity_texture_features")) {
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("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(); ETFConfigScreen etfConfigScreen = new ETFConfigScreen();
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Enable Optifine Random mobs"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> { PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Enable Optifine Random mobs"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> {
etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures; etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures;
@@ -110,8 +110,13 @@ public class PuzzleClient implements ClientModInitializer {
etfConfigScreen.saveConfig(); etfConfigScreen.saveConfig();
etfConfigScreen.resetVisuals(); etfConfigScreen.resetVisuals();
})); }));
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Emissive texture Z-Fighting / Shader patch"), (button) -> button.setMessage(etfConfig.doShadersEmissiveFix ? YES : NO), (button) -> { // shader fix no longer required as an option from V3.0 onwards as a solution has been found
etfConfig.doShadersEmissiveFix = !etfConfig.doShadersEmissiveFix; // 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.saveConfig();
etfConfigScreen.resetVisuals(); etfConfigScreen.resetVisuals();
})); }));