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 #43 from Traben-0/1.19

Browse Source 
ETF 4.0 support added
This commit is contained in:
Martin Prokoph
2022-08-01 12:57:16 +00:00
committed by GitHub
parent 795759b4e5 05bea0aab1
commit 64aa45a370
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@@ -1,5 +1,5 @@
# Done to increase the memory available to gradle. # Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G org.gradle.jvmargs=-Xmx4G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
@@ -28,4 +28,4 @@ org.gradle.jvmargs=-Xmx1G
complete_config_version = 1.0.0 complete_config_version = 1.0.0
spruceui_version=4.0.0+1.19 spruceui_version=4.0.0+1.19
midnightlib_version=0.5.2 midnightlib_version=0.5.2
entitytexturefeatures_version=3.1.5 entitytexturefeatures_version=4.0.1.fabric

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

@@ -5,7 +5,6 @@ import dev.lambdaurora.lambdabettergrass.LambdaBetterGrass;
import dev.lambdaurora.lambdynlights.DynamicLightsConfig; import dev.lambdaurora.lambdynlights.DynamicLightsConfig;
import dev.lambdaurora.lambdynlights.LambDynLights; import dev.lambdaurora.lambdynlights.LambDynLights;
import eu.midnightdust.cullleaves.config.CullLeavesConfig; import eu.midnightdust.cullleaves.config.CullLeavesConfig;
import eu.midnightdust.lib.config.AutoModMenu;
import me.pepperbell.continuity.client.config.ContinuityConfig; import me.pepperbell.continuity.client.config.ContinuityConfig;
import me.pepperbell.continuity.client.config.Option; import me.pepperbell.continuity.client.config.Option;
import net.dorianpb.cem.internal.config.CemConfig; import net.dorianpb.cem.internal.config.CemConfig;
@@ -21,9 +20,8 @@ import net.minecraft.text.Text;
import net.minecraft.util.Formatting; import net.minecraft.util.Formatting;
import net.puzzlemc.splashscreen.PuzzleSplashScreen; import net.puzzlemc.splashscreen.PuzzleSplashScreen;
import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig; import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
import traben.entity_texture_features.client.ETFClient; import traben.entity_texture_features.ETFApi;
import traben.entity_texture_features.config.ETFConfig; import traben.entity_texture_features.config.ETFConfig;
import traben.entity_texture_features.config.ETFConfigScreen;
public class PuzzleClient implements ClientModInitializer { public class PuzzleClient implements ClientModInitializer {
@@ -160,32 +158,37 @@ 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.translatable("config.etf.title"))); PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.etf.title")));
ETFConfig etfConfig = ETFClient.ETFConfigData; ETFConfig etfConfig = ETFApi.getETFConfigObject;
ETFConfigScreen etfConfigScreen = new ETFConfigScreen(); //ETFConfigScreen etfConfigScreen = new ETFConfigScreen();
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.etf.enable_custom_textures.title"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> { PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.etf.enable_custom_textures.title"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> {
etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures; etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures;
etfConfigScreen.saveConfig(); ETFApi.saveETFConfigChangesAndResetETF();
etfConfigScreen.resetVisuals(); //etfConfigScreen.saveConfig();
//etfConfigScreen.resetVisuals();
})); }));
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.etf.enable_emissive_textures.title"), (button) -> button.setMessage(etfConfig.enableEmissiveTextures ? YES : NO), (button) -> { PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.etf.enable_emissive_textures.title"), (button) -> button.setMessage(etfConfig.enableEmissiveTextures ? YES : NO), (button) -> {
etfConfig.enableEmissiveTextures = !etfConfig.enableEmissiveTextures; etfConfig.enableEmissiveTextures = !etfConfig.enableEmissiveTextures;
etfConfigScreen.saveConfig(); ETFApi.saveETFConfigChangesAndResetETF();
etfConfigScreen.resetVisuals(); //etfConfigScreen.saveConfig();
//etfConfigScreen.resetVisuals();
})); }));
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Emissive Texture Rendering Mode"), (button) -> button.setMessage(etfConfig.fullBrightEmissives ? Text.of("Brighter") : Text.of("Default")), (button) -> { PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Emissive Texture Rendering Mode"), (button) -> button.setMessage(etfConfig.fullBrightEmissives ? Text.of("Brighter") : Text.of("Default")), (button) -> {
etfConfig.fullBrightEmissives = !etfConfig.fullBrightEmissives ; etfConfig.fullBrightEmissives = !etfConfig.fullBrightEmissives ;
etfConfigScreen.saveConfig(); ETFApi.saveETFConfigChangesAndResetETF();
etfConfigScreen.resetVisuals(); //etfConfigScreen.saveConfig();
//etfConfigScreen.resetVisuals();
})); }));
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.etf.blinking_mob_settings.title"), (button) -> button.setMessage(etfConfig.enableBlinking ? YES : NO), (button) -> { PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.etf.blinking_mob_settings.title"), (button) -> button.setMessage(etfConfig.enableBlinking ? YES : NO), (button) -> {
etfConfig.enableBlinking = !etfConfig.enableBlinking; etfConfig.enableBlinking = !etfConfig.enableBlinking;
etfConfigScreen.saveConfig(); ETFApi.saveETFConfigChangesAndResetETF();
etfConfigScreen.resetVisuals(); //etfConfigScreen.saveConfig();
//etfConfigScreen.resetVisuals();
})); }));
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Enable Player Skin Features"), (button) -> button.setMessage(etfConfig.skinFeaturesEnabled ? YES : NO), (button) -> { PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Enable Player Skin Features"), (button) -> button.setMessage(etfConfig.skinFeaturesEnabled ? YES : NO), (button) -> {
etfConfig.skinFeaturesEnabled = !etfConfig.skinFeaturesEnabled; etfConfig.skinFeaturesEnabled = !etfConfig.skinFeaturesEnabled;
etfConfigScreen.saveConfig(); ETFApi.saveETFConfigChangesAndResetETF();
etfConfigScreen.resetVisuals(); //etfConfigScreen.saveConfig();
//etfConfigScreen.resetVisuals();
})); }));
} }
lateInitDone = true; lateInitDone = true;