diff --git a/build.gradle b/build.gradle index c9d818a..ef71cdc 100755 --- a/build.gradle +++ b/build.gradle @@ -124,7 +124,7 @@ dependencies { modImplementation ("maven.modrinth:lambdynamiclights:${project.ldl_version}") modImplementation ("maven.modrinth:lambdabettergrass:${project.lbg_version}") modImplementation ("maven.modrinth:iris:${project.iris_version}") - modImplementation ("maven.modrinth:cit-resewn:${project.cit_resewn_version}") + modCompileOnly ("maven.modrinth:cit-resewn:${project.cit_resewn_version}") modImplementation ("maven.modrinth:continuity:${project.continuity_version}") modImplementation ("maven.modrinth:animatica:${project.animatica_version}") modImplementation ("maven.modrinth:entitytexturefeatures:${project.entitytexturefeatures_version}") diff --git a/gradle.properties b/gradle.properties index edd9b19..836aacf 100755 --- a/gradle.properties +++ b/gradle.properties @@ -3,29 +3,29 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.18.2 - yarn_mappings=1.18.2+build.3 - loader_version=0.14.6 + minecraft_version=1.19 + yarn_mappings=1.19+build.4 + loader_version=0.14.8 # Mod Properties - mod_version = 1.3.0 + mod_version = 1.3.4 maven_group = net.puzzlemc archives_base_name = puzzle # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api - fabric_version=0.55.1+1.18.2 - mod_menu_version = 2.0.13 + fabric_version=0.57.0+1.19 + mod_menu_version = 4.0.0 - cull_leaves_version = 2.3.2 - ldl_version = 2.1.0+1.17 - lbg_version = 1.2.3+1.18 - iris_version = 1.18.x-v1.2.4 - continuity_version = 1.0.3+1.18 - animatica_version = 0.2+1.18 + cull_leaves_version = 2.3.3 + ldl_version = 2.1.2+1.19 + lbg_version = 1.3.0+1.19 + iris_version = 1.19.x-v1.2.5 + continuity_version = 2.0.0+1.19 + animatica_version = 0.5+1.19 cit_resewn_version = 1.0.1+1.18.2 - cem_version = 0.7.1 + cem_version = 0.7.1-1.19 complete_config_version = 1.0.0 - spruceui_version=3.3.3+1.18 - midnightlib_version=0.4.0 - entitytexturefeatures_version=3.0.0 + spruceui_version=4.0.0+1.19 + midnightlib_version=0.5.2 + entitytexturefeatures_version=3.1.5 diff --git a/puzzle-base/src/main/java/net/puzzlemc/core/config/PuzzleConfig.java b/puzzle-base/src/main/java/net/puzzlemc/core/config/PuzzleConfig.java index 6ca3bca..59d3ee6 100755 --- a/puzzle-base/src/main/java/net/puzzlemc/core/config/PuzzleConfig.java +++ b/puzzle-base/src/main/java/net/puzzlemc/core/config/PuzzleConfig.java @@ -13,7 +13,6 @@ public class PuzzleConfig extends MidnightConfig { @Entry public static boolean checkUpdates = true; @Entry public static boolean showPuzzleInfo = true; @Entry public static boolean resourcepackSplashScreen = true; - @Entry public static boolean betterSplashScreenBlend = true; @Entry public static boolean unlimitedRotations = true; @Entry public static boolean biggerModels = true; @@ -21,4 +20,5 @@ public class PuzzleConfig extends MidnightConfig { @Entry public static int progressBarColor = 16777215; @Entry public static int progressBarBackgroundColor = 15675965; @Entry public static int progressFrameColor = 16777215; + @Entry public static boolean disableBlend = false; } diff --git a/puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinDebugHud.java b/puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinDebugHud.java index 61e7d9a..fa3dfc7 100755 --- a/puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinDebugHud.java +++ b/puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinDebugHud.java @@ -15,7 +15,7 @@ import java.util.List; @Mixin(DebugHud.class) public abstract class MixinDebugHud extends DrawableHelper { - @Inject(at = @At("RETURN"), method = "getRightText", cancellable = true) + @Inject(at = @At("RETURN"), method = "getRightText") private void puzzle$getRightText(CallbackInfoReturnable> cir) { if (PuzzleConfig.showPuzzleInfo) { List entries = cir.getReturnValue(); diff --git a/puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinTitleScreen.java b/puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinTitleScreen.java index b78b52e..ac0f2cb 100755 --- a/puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinTitleScreen.java +++ b/puzzle-base/src/main/java/net/puzzlemc/core/mixin/MixinTitleScreen.java @@ -7,7 +7,6 @@ import net.puzzlemc.core.util.UpdateChecker; import net.minecraft.client.gui.screen.*; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import net.minecraft.util.Util; import net.minecraft.util.math.MathHelper; import org.spongepowered.asm.mixin.Final; @@ -40,7 +39,7 @@ public abstract class MixinTitleScreen extends Screen { puzzleText = Text.of(PuzzleCore.version); } else { - puzzleText = new TranslatableText("").append(Text.of(PuzzleCore.version + " | ")).append(new TranslatableText("puzzle.text.update_available")); + puzzleText = Text.translatable("").append(Text.of(PuzzleCore.version + " | ")).append(Text.translatable("puzzle.text.update_available")); this.puzzleTextWidth = this.textRenderer.getWidth(puzzleText); } } @@ -68,7 +67,7 @@ public abstract class MixinTitleScreen extends Screen { @Inject(at = @At("HEAD"), method = "mouseClicked",cancellable = true) private void puzzle$mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable cir) { if (mouseX > 2 && mouseX < (double)(2 + this.puzzleTextWidth) && mouseY > (double)(this.height - yOffset) && mouseY < (double)this.height - yOffset + 10) { - if (Objects.requireNonNull(this.client).options.chatLinksPrompt) { + if (Objects.requireNonNull(this.client).options.getChatLinksPrompt().getValue()) { this.client.setScreen(new ConfirmChatLinkScreen(this::confirmLink, PuzzleCore.updateURL, true)); } else { Util.getOperatingSystem().open(PuzzleCore.updateURL); diff --git a/puzzle-gui/src/main/java/net/puzzlemc/gui/IrisCompat.java b/puzzle-gui/src/main/java/net/puzzlemc/gui/IrisCompat.java index 041faa8..4ceedbf 100644 --- a/puzzle-gui/src/main/java/net/puzzlemc/gui/IrisCompat.java +++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/IrisCompat.java @@ -6,7 +6,6 @@ import net.irisshaders.iris.api.v0.IrisApiConfig; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import net.puzzlemc.gui.screen.widget.PuzzleWidget; public class IrisCompat { @@ -17,7 +16,7 @@ public class IrisCompat { IrisApiConfig irisConfig = IrisApi.getInstance().getConfig(); irisConfig.setShadersEnabledAndApply(!irisConfig.areShadersEnabled()); })); - PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("options.iris.shaderPackSelection.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> { + PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("options.iris.shaderPackSelection.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> { MinecraftClient client = MinecraftClient.getInstance(); client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(client.currentScreen)); })); diff --git a/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleApi.java b/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleApi.java index 26189a9..394e2f7 100755 --- a/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleApi.java +++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleApi.java @@ -18,22 +18,18 @@ public class PuzzleApi { public static void addToGraphicsOptions(PuzzleWidget button) { GRAPHICS_OPTIONS.add(button); - if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + " -> Graphics Options"); + if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.getContent().toString() + " -> Graphics Options"); } public static void addToMiscOptions(PuzzleWidget button) { MISC_OPTIONS.add(button); - if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + " -> Misc Options"); + if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.getContent().toString() + " -> Misc Options"); } public static void addToPerformanceOptions(PuzzleWidget button) { PERFORMANCE_OPTIONS.add(button); - if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + "- > Performance Options"); + if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.getContent().toString() + "- > Performance Options"); } public static void addToResourceOptions(PuzzleWidget button) { RESOURCE_OPTIONS.add(button); - if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + " -> Resource Options"); - } - @Deprecated public static void addToTextureOptions(PuzzleWidget button) { - RESOURCE_OPTIONS.add(button); - if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + " -> LEGACY Texture Options"); + if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.getContent().toString() + " -> Resource Options"); } } 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 ddd97aa..63ed02c 100755 --- a/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java +++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/PuzzleClient.java @@ -5,6 +5,7 @@ import dev.lambdaurora.lambdabettergrass.LambdaBetterGrass; import dev.lambdaurora.lambdynlights.DynamicLightsConfig; import dev.lambdaurora.lambdynlights.LambDynLights; 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.Option; import net.dorianpb.cem.internal.config.CemConfig; @@ -17,7 +18,6 @@ import net.fabricmc.api.ClientModInitializer; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; import net.puzzlemc.splashscreen.PuzzleSplashScreen; import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig; @@ -28,43 +28,39 @@ import traben.entity_texture_features.config.ETFConfigScreen; public class PuzzleClient implements ClientModInitializer { public final static String id = "puzzle"; - public static final Text YES = new TranslatableText("gui.yes").formatted(Formatting.GREEN); - public static final Text NO = new TranslatableText("gui.no").formatted(Formatting.RED); + public static final Text YES = Text.translatable("gui.yes").formatted(Formatting.GREEN); + public static final Text NO = Text.translatable("gui.no").formatted(Formatting.RED); @Override public void onInitializeClient() { MinecraftClient client = MinecraftClient.getInstance(); PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Puzzle"))); - PuzzleApi.addToMiscOptions(new PuzzleWidget(new TranslatableText("puzzle.option.check_for_updates"), (button) -> button.setMessage(PuzzleConfig.checkUpdates ? YES : NO), (button) -> { + PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("puzzle.option.check_for_updates"), (button) -> button.setMessage(PuzzleConfig.checkUpdates ? YES : NO), (button) -> { PuzzleConfig.checkUpdates = !PuzzleConfig.checkUpdates; PuzzleConfig.write(id); })); - PuzzleApi.addToMiscOptions(new PuzzleWidget(new TranslatableText("puzzle.option.show_version_info"), (button) -> button.setMessage(PuzzleConfig.showPuzzleInfo ? YES : NO), (button) -> { + PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("puzzle.option.show_version_info"), (button) -> button.setMessage(PuzzleConfig.showPuzzleInfo ? YES : NO), (button) -> { PuzzleConfig.showPuzzleInfo = !PuzzleConfig.showPuzzleInfo; PuzzleConfig.write(id); })); - PuzzleApi.addToMiscOptions(new PuzzleWidget(new TranslatableText("puzzle.midnightconfig.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> { + PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("puzzle.midnightconfig.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> { client.setScreen(PuzzleConfig.getScreen(client.currentScreen, "puzzle")); })); PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Puzzle"))); if (FabricLoader.getInstance().isModLoaded("puzzle-splashscreen") && !PuzzleConfig.disabledIntegrations.contains("puzzle-splashscreen")) { - PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.resourcepack_splash_screen"), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> { + PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.resourcepack_splash_screen"), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> { PuzzleConfig.resourcepackSplashScreen = !PuzzleConfig.resourcepackSplashScreen; PuzzleConfig.write(id); PuzzleSplashScreen.resetColors(); - MinecraftClient.getInstance().getTextureManager().registerTexture(PuzzleSplashScreen.LOGO, new PuzzleSplashScreen.LogoTexture()); - })); - PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.better_splash_screen_blend"), (button) -> button.setMessage(PuzzleConfig.betterSplashScreenBlend ? YES : NO), (button) -> { - PuzzleConfig.betterSplashScreenBlend = !PuzzleConfig.betterSplashScreenBlend; - PuzzleConfig.write(id); + MinecraftClient.getInstance().getTextureManager().registerTexture(PuzzleSplashScreen.LOGO, new PuzzleSplashScreen.LogoTexture(PuzzleSplashScreen.LOGO)); })); } if (FabricLoader.getInstance().isModLoaded("puzzle-models") && !PuzzleConfig.disabledIntegrations.contains("puzzle-models")) { - PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.unlimited_model_rotations"), (button) -> button.setMessage(PuzzleConfig.unlimitedRotations ? YES : NO), (button) -> { + PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.unlimited_model_rotations"), (button) -> button.setMessage(PuzzleConfig.unlimitedRotations ? YES : NO), (button) -> { PuzzleConfig.unlimitedRotations = !PuzzleConfig.unlimitedRotations; PuzzleConfig.write(id); })); - PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.bigger_custom_models"), (button) -> button.setMessage(PuzzleConfig.biggerModels ? YES : NO), (button) -> { + PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.bigger_custom_models"), (button) -> button.setMessage(PuzzleConfig.biggerModels ? YES : NO), (button) -> { PuzzleConfig.biggerModels = !PuzzleConfig.biggerModels; PuzzleConfig.write(id); })); @@ -80,9 +76,6 @@ public class PuzzleClient implements ClientModInitializer { if (FabricLoader.getInstance().isModLoaded("iris") && !PuzzleConfig.disabledIntegrations.contains("iris")) { IrisCompat.init(); } - - - } public static boolean lateInitDone = false; public static void lateInit() { // Some mods are initialized after Puzzle, so we can't access them in our ClientModInitializer @@ -90,34 +83,34 @@ public class PuzzleClient implements ClientModInitializer { DynamicLightsConfig ldlConfig = LambDynLights.get().config; PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambDynamicLights"))); - PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdynlights.option.mode"), (button) -> button.setMessage(ldlConfig.getDynamicLightsMode().getTranslatedText()), (button) -> ldlConfig.setDynamicLightsMode(ldlConfig.getDynamicLightsMode().next()))); - PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.entities")), (button) -> button.setMessage(ldlConfig.getEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getEntitiesLightSource().set(!ldlConfig.getEntitiesLightSource().get()))); - PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.block_entities")), (button) -> button.setMessage(ldlConfig.getBlockEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getBlockEntitiesLightSource().set(!ldlConfig.getBlockEntitiesLightSource().get()))); - PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next()))); - PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next()))); - PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.water_sensitive_check")), (button) -> button.setMessage(ldlConfig.getWaterSensitiveCheck().get() ? YES : NO), (button) -> ldlConfig.getWaterSensitiveCheck().set(!ldlConfig.getWaterSensitiveCheck().get()))); + PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdynlights.option.mode"), (button) -> button.setMessage(ldlConfig.getDynamicLightsMode().getTranslatedText()), (button) -> ldlConfig.setDynamicLightsMode(ldlConfig.getDynamicLightsMode().next()))); + PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("").append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.entities")), (button) -> button.setMessage(ldlConfig.getEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getEntitiesLightSource().set(!ldlConfig.getEntitiesLightSource().get()))); + PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("").append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.block_entities")), (button) -> button.setMessage(ldlConfig.getBlockEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getBlockEntitiesLightSource().set(!ldlConfig.getBlockEntitiesLightSource().get()))); + PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("").append("DynLights: ").append(Text.translatable("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next()))); + PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("").append("DynLights: ").append(Text.translatable("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next()))); + PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("").append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.water_sensitive_check")), (button) -> button.setMessage(ldlConfig.getWaterSensitiveCheck().get() ? YES : NO), (button) -> ldlConfig.getWaterSensitiveCheck().set(!ldlConfig.getWaterSensitiveCheck().get()))); } if (FabricLoader.getInstance().isModLoaded("citresewn") && !PuzzleConfig.disabledIntegrations.contains("citresewn") && CITResewnConfig.INSTANCE != null) { PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("CIT Resewn"))); CITResewnConfig citConfig = CITResewnConfig.INSTANCE; - PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? YES : NO), (button) -> { + PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? YES : NO), (button) -> { citConfig.enabled = !citConfig.enabled; citConfig.write(); MinecraftClient.getInstance().reloadResources(); })); - PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.mute_errors.title"), (button) -> button.setMessage(citConfig.mute_errors ? YES : NO), (button) -> { + PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.mute_errors.title"), (button) -> button.setMessage(citConfig.mute_errors ? YES : NO), (button) -> { citConfig.mute_errors = !citConfig.mute_errors; citConfig.write(); })); - PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.mute_warns.title"), (button) -> button.setMessage(citConfig.mute_warns ? YES : NO), (button) -> { + PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.mute_warns.title"), (button) -> button.setMessage(citConfig.mute_warns ? YES : NO), (button) -> { citConfig.mute_warns = !citConfig.mute_warns; citConfig.write(); })); - PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.broken_paths.title"), (button) -> button.setMessage(citConfig.broken_paths ? YES : NO), (button) -> { + PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.broken_paths.title"), (button) -> button.setMessage(citConfig.broken_paths ? YES : NO), (button) -> { citConfig.broken_paths = !citConfig.broken_paths; citConfig.write(); })); - PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100,new TranslatableText("config.citresewn.cache_ms.title"), (slider) -> slider.setInt(citConfig.cache_ms), + PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100,Text.translatable("config.citresewn.cache_ms.title"), (slider) -> slider.setInt(citConfig.cache_ms), (button) -> button.setMessage(message(citConfig)), (slider) -> { try { @@ -130,22 +123,22 @@ public class PuzzleClient implements ClientModInitializer { if (FabricLoader.getInstance().isModLoaded("lambdabettergrass") && !PuzzleConfig.disabledIntegrations.contains("lambdabettergrass")) { LBGConfig lbgConfig = LambdaBetterGrass.get().config; PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambdaBetterGrass"))); - PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next()))); - PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer()))); + PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next()))); + PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer()))); } if (FabricLoader.getInstance().isModLoaded("cem") && FabricLoader.getInstance().isModLoaded("completeconfig") && !PuzzleConfig.disabledIntegrations.contains("cem")) { PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Custom Entity Models"))); CemConfig cemConfig = (CemConfig) CemConfigFairy.getConfig(); CemOptions cemOptions = CemConfigFairy.getConfig(); - PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.cem.use_optifine_folder"), (button) -> button.setMessage(cemConfig.useOptifineFolder() ? YES : NO), (button) -> { + PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.cem.use_optifine_folder"), (button) -> button.setMessage(cemConfig.useOptifineFolder() ? YES : NO), (button) -> { ((CemConfigAccessor)cemOptions).setUseOptifineFolder(!cemConfig.useOptifineFolder()); cemConfig.save(); })); - PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.cem.use_new_model_creation_fix"), (button) -> button.setMessage(cemConfig.useTransparentParts() ? YES : NO), (button) -> { + PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.cem.use_new_model_creation_fix"), (button) -> button.setMessage(cemConfig.useTransparentParts() ? YES : NO), (button) -> { ((CemConfigAccessor)cemOptions).setUseModelCreationFix(!cemConfig.useTransparentParts()); cemConfig.save(); })); - PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.cem.use_old_animations"), (button) -> button.setMessage(cemConfig.useOldAnimations() ? YES : NO), (button) -> { + PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.cem.use_old_animations"), (button) -> button.setMessage(cemConfig.useOldAnimations() ? YES : NO), (button) -> { ((CemConfigAccessor)cemOptions).setUseOldAnimations(!cemConfig.useOldAnimations()); cemConfig.save(); })); @@ -157,7 +150,7 @@ public class PuzzleClient implements ClientModInitializer { if (s.equals("use_manual_culling")) return; try { Option.BooleanOption booleanOption = ((Option.BooleanOption)option); - PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("options.continuity."+s), (button) -> button.setMessage(booleanOption.get() ? YES : NO), (button) -> { + PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("options.continuity."+s), (button) -> button.setMessage(booleanOption.get() ? YES : NO), (button) -> { booleanOption.set(!booleanOption.get()); contConfig.onChange(); contConfig.save(); @@ -166,15 +159,15 @@ public class PuzzleClient implements ClientModInitializer { }); } if (FabricLoader.getInstance().isModLoaded("entity_texture_features") && !PuzzleConfig.disabledIntegrations.contains("entity_texture_features")) { - PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.etf.title"))); + PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.etf.title"))); ETFConfig etfConfig = ETFClient.ETFConfigData; ETFConfigScreen etfConfigScreen = new ETFConfigScreen(); - PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("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; etfConfigScreen.saveConfig(); etfConfigScreen.resetVisuals(); })); - PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("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; etfConfigScreen.saveConfig(); etfConfigScreen.resetVisuals(); @@ -184,7 +177,7 @@ public class PuzzleClient implements ClientModInitializer { etfConfigScreen.saveConfig(); etfConfigScreen.resetVisuals(); })); - PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("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; etfConfigScreen.saveConfig(); etfConfigScreen.resetVisuals(); @@ -200,7 +193,7 @@ public class PuzzleClient implements ClientModInitializer { public static Text message(CITResewnConfig config) { int ticks = config.cache_ms; if (ticks <= 1) { - return (new TranslatableText("config.citresewn.cache_ms.ticks." + ticks)).formatted(Formatting.AQUA); + return (Text.translatable("config.citresewn.cache_ms.ticks." + ticks)).formatted(Formatting.AQUA); } else { Formatting color = Formatting.DARK_RED; if (ticks <= 40) { @@ -219,7 +212,7 @@ public class PuzzleClient implements ClientModInitializer { color = Formatting.GREEN; } - return (new TranslatableText("config.citresewn.cache_ms.ticks.any", ticks)).formatted(color); + return (Text.translatable("config.citresewn.cache_ms.ticks.any", ticks)).formatted(color); } } } diff --git a/puzzle-gui/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java b/puzzle-gui/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java index 487a6fc..14d9edd 100755 --- a/puzzle-gui/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java +++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java @@ -1,7 +1,6 @@ package net.puzzlemc.gui.mixin; import eu.midnightdust.core.config.MidnightLibConfig; -import eu.midnightdust.lib.config.MidnightConfig; import eu.midnightdust.lib.util.screen.TexturedOverlayButtonWidget; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.util.Identifier; @@ -11,7 +10,6 @@ import net.puzzlemc.gui.screen.PuzzleOptionsScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.option.OptionsScreen; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -33,7 +31,7 @@ public abstract class MixinOptionsScreen extends Screen { int i = 0; if (FabricLoader.getInstance().isModLoaded("lod")) i = i + 358; if (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.FALSE)) i = i - 25; - this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 - 178 + i, this.height / 6 - 12, 20, 20, 0, 0, 20, PUZZLE_ICON_TEXTURE, 32, 64, (buttonWidget) -> (Objects.requireNonNull(this.client)).setScreen(new PuzzleOptionsScreen(this)), new TranslatableText("midnightlib.overview.title"))); + this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 - 178 + i, this.height / 6 - 12, 20, 20, 0, 0, 20, PUZZLE_ICON_TEXTURE, 32, 64, (buttonWidget) -> (Objects.requireNonNull(this.client)).setScreen(new PuzzleOptionsScreen(this)), Text.translatable("midnightlib.overview.title"))); } } } diff --git a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java index 341d859..2cb152a 100755 --- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java +++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java @@ -1,23 +1,22 @@ package net.puzzlemc.gui.screen; -import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.screen.ScreenTexts; +import net.minecraft.text.Text; import net.puzzlemc.gui.PuzzleClient; import net.puzzlemc.gui.screen.page.GraphicsPage; import net.puzzlemc.gui.screen.page.MiscPage; import net.puzzlemc.gui.screen.page.PerformancePage; import net.puzzlemc.gui.screen.page.ResourcesPage; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.ScreenTexts; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.TranslatableText; import java.util.Objects; public class PuzzleOptionsScreen extends Screen { public PuzzleOptionsScreen(Screen parent) { - super(new TranslatableText("puzzle.screen.title")); + super(Text.translatable("puzzle.screen.title")); this.parent = parent; } private final Screen parent; diff --git a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/AbstractPuzzleOptionsPage.java b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/AbstractPuzzleOptionsPage.java index 7e39fb1..1544693 100755 --- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/AbstractPuzzleOptionsPage.java +++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/AbstractPuzzleOptionsPage.java @@ -1,12 +1,12 @@ package net.puzzlemc.gui.screen.page; +import net.minecraft.screen.ScreenTexts; +import net.minecraft.text.Text; import net.puzzlemc.gui.screen.widget.PuzzleOptionListWidget; import net.puzzlemc.gui.screen.widget.PuzzleWidget; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.ScreenTexts; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.TranslatableText; import java.util.List; import java.util.Objects; @@ -15,7 +15,7 @@ public abstract class AbstractPuzzleOptionsPage extends Screen { private PuzzleOptionListWidget list; private final List options; - public AbstractPuzzleOptionsPage(Screen parent, TranslatableText title, List options) { + public AbstractPuzzleOptionsPage(Screen parent, Text title, List options) { super(title); this.parent = parent; this.options = options; diff --git a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/GraphicsPage.java b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/GraphicsPage.java index b629e98..9e621d2 100755 --- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/GraphicsPage.java +++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/GraphicsPage.java @@ -1,12 +1,12 @@ package net.puzzlemc.gui.screen.page; +import net.minecraft.text.Text; import net.puzzlemc.gui.PuzzleApi; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.text.TranslatableText; public class GraphicsPage extends AbstractPuzzleOptionsPage { public GraphicsPage(Screen parent) { - super(parent, new TranslatableText("puzzle.page.graphics"), PuzzleApi.GRAPHICS_OPTIONS); + super(parent, Text.translatable("puzzle.page.graphics"), PuzzleApi.GRAPHICS_OPTIONS); } } diff --git a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/MiscPage.java b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/MiscPage.java index 908b1f5..0ad1f60 100755 --- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/MiscPage.java +++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/MiscPage.java @@ -1,12 +1,12 @@ package net.puzzlemc.gui.screen.page; +import net.minecraft.text.Text; import net.puzzlemc.gui.PuzzleApi; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.text.TranslatableText; public class MiscPage extends AbstractPuzzleOptionsPage { public MiscPage(Screen parent) { - super(parent, new TranslatableText("puzzle.page.misc"), PuzzleApi.MISC_OPTIONS); + super(parent, Text.translatable("puzzle.page.misc"), PuzzleApi.MISC_OPTIONS); } } diff --git a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/PerformancePage.java b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/PerformancePage.java index 00692c4..6bfcd5d 100755 --- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/PerformancePage.java +++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/PerformancePage.java @@ -1,12 +1,12 @@ package net.puzzlemc.gui.screen.page; +import net.minecraft.text.Text; import net.puzzlemc.gui.PuzzleApi; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.text.TranslatableText; public class PerformancePage extends AbstractPuzzleOptionsPage { public PerformancePage(Screen parent) { - super(parent, new TranslatableText("puzzle.page.performance"), PuzzleApi.PERFORMANCE_OPTIONS); + super(parent, Text.translatable("puzzle.page.performance"), PuzzleApi.PERFORMANCE_OPTIONS); } } diff --git a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/ResourcesPage.java b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/ResourcesPage.java index a457b3d..54d3845 100755 --- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/ResourcesPage.java +++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/page/ResourcesPage.java @@ -1,12 +1,12 @@ package net.puzzlemc.gui.screen.page; +import net.minecraft.text.Text; import net.puzzlemc.gui.PuzzleApi; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.text.TranslatableText; public class ResourcesPage extends AbstractPuzzleOptionsPage { public ResourcesPage(Screen parent) { - super(parent, new TranslatableText("puzzle.page.resources"), PuzzleApi.RESOURCE_OPTIONS); + super(parent, Text.translatable("puzzle.page.resources"), PuzzleApi.RESOURCE_OPTIONS); } } diff --git a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleOptionListWidget.java b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleOptionListWidget.java index 633038b..aa5f635 100755 --- a/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleOptionListWidget.java +++ b/puzzle-gui/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleOptionListWidget.java @@ -9,7 +9,6 @@ import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.gui.widget.ElementListWidget; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.LiteralText; import net.minecraft.text.Text; import org.apache.logging.log4j.LogManager; @@ -74,7 +73,7 @@ public class PuzzleOptionListWidget extends ElementListWidget path.contains("color.properties"))) { - try (InputStream stream = manager.getResource(id).getInputStream()) { + manager.findResources("optifine", path -> path.getPath().contains("color.properties")).forEach((id, resource) -> { + try (InputStream stream = manager.getResource(id).get().getInputStream()) { Properties properties = new Properties(); properties.load(stream); @@ -89,33 +94,47 @@ public class PuzzleSplashScreen implements ClientModInitializer { if (properties.get("screen.loading.outline") != null) { PuzzleConfig.progressFrameColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.outline").toString()).getRGB(); } - if (properties.get("screen.loading") != null) { - PuzzleConfig.write("puzzle"); + if (properties.get("screen.loading.blend") != null) { + PuzzleConfig.disableBlend = properties.get("screen.loading.blend").toString().equals("off"); + PuzzleConfig.progressFrameColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.outline").toString()).getRGB(); } + PuzzleConfig.write("puzzle"); } catch (Exception e) { LogManager.getLogger("Puzzle").error("Error occurred while loading color.properties " + id.toString(), e); } - } - for (Identifier id : manager.findResources("textures", path -> path.contains("mojangstudios.png"))) { - try (InputStream stream = manager.getResource(id).getInputStream()) { + }); + manager.findResources("textures", path -> path.getPath().contains("mojangstudios.png")).forEach((id, resource) -> { + try (InputStream stream = manager.getResource(id).get().getInputStream()) { Files.copy(stream, LOGO_TEXTURE, StandardCopyOption.REPLACE_EXISTING); - DefaultResourcePack defaultResourcePack = client.getResourcePackProvider().getPack(); - InputStream defaultLogo = defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO); InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE)); - if (input != defaultLogo) client.getTextureManager().registerTexture(LOGO, new NativeImageBackedTexture(NativeImage.read(input))); - else Files.delete(LOGO_TEXTURE); } catch (Exception e) { LogManager.getLogger("Puzzle").error("Error occurred while loading custom minecraft logo " + id.toString(), e); } + }); + manager.findResources("puzzle", path -> path.getPath().contains("splash_background.png")).forEach((id, resource) -> { + try (InputStream stream = manager.getResource(id).get().getInputStream()) { + Files.copy(stream, BACKGROUND_TEXTURE, StandardCopyOption.REPLACE_EXISTING); + InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE)); + client.getTextureManager().registerTexture(BACKGROUND, new NativeImageBackedTexture(NativeImage.read(input))); + keepBackground = true; + } catch (Exception e) { + LogManager.getLogger("Puzzle").error("Error occurred while loading custom splash background " + id.toString(), e); + } + }); + if (!keepBackground) { + try { + Files.delete(BACKGROUND_TEXTURE); + } catch (Exception ignored) {} } + keepBackground = false; } } }); } @Environment(EnvType.CLIENT) public static class LogoTexture extends ResourceTexture { - public LogoTexture() { super(LOGO); } + public LogoTexture(Identifier logo) { super(logo); } protected TextureData loadTextureData(ResourceManager resourceManager) { MinecraftClient minecraftClient = MinecraftClient.getInstance(); diff --git a/puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java b/puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java index 3c33cd8..96979ab 100755 --- a/puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java +++ b/puzzle-splashscreen/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java @@ -4,6 +4,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Overlay; import net.minecraft.client.gui.screen.SplashOverlay; +import net.minecraft.client.render.GameRenderer; import net.minecraft.client.texture.NativeImage; import net.minecraft.client.texture.NativeImageBackedTexture; import net.minecraft.client.util.math.MatrixStack; @@ -21,6 +22,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; +import java.nio.file.Files; import java.util.function.IntSupplier; @Mixin(value = SplashOverlay.class, priority = 2000) @@ -28,22 +30,69 @@ public abstract class MixinSplashScreen extends Overlay { @Shadow @Final static Identifier LOGO; @Shadow private long reloadCompleteTime; + @Shadow + private static int withAlpha(int color, int alpha) { + return 0; + } + + @Shadow @Final private MinecraftClient client; + + @Shadow @Final private boolean reloading; + + @Shadow private long reloadStartTime; + @Inject(method = "init(Lnet/minecraft/client/MinecraftClient;)V", at = @At("TAIL")) private static void puzzle$initSplashscreen(MinecraftClient client, CallbackInfo ci) { // Load our custom textures at game start // - if (PuzzleConfig.resourcepackSplashScreen && PuzzleSplashScreen.LOGO_TEXTURE.toFile().exists()) { - try { - InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE)); - client.getTextureManager().registerTexture(LOGO, new NativeImageBackedTexture(NativeImage.read(input))); - } catch (IOException ignored) {} + if (PuzzleConfig.resourcepackSplashScreen) { + if (PuzzleSplashScreen.LOGO_TEXTURE.toFile().exists()) { + try { + InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE)); + client.getTextureManager().registerTexture(LOGO, new NativeImageBackedTexture(NativeImage.read(input))); + } catch (IOException ignored) { + } + } + if (PuzzleSplashScreen.BACKGROUND_TEXTURE.toFile().exists()) { + try { + InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE)); + client.getTextureManager().registerTexture(PuzzleSplashScreen.BACKGROUND, new NativeImageBackedTexture(NativeImage.read(input))); + } catch (IOException ignored) { + } + } } } @Redirect(method = "render", at = @At(value = "INVOKE", target = "Ljava/util/function/IntSupplier;getAsInt()I")) private int puzzle$modifyBackground(IntSupplier instance) { // Set the Progress Bar Frame Color to our configured value // - return PuzzleConfig.backgroundColor | 255 << 24; + return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarBackgroundColor == 15675965) ? instance.getAsInt() : PuzzleConfig.backgroundColor | 255 << 24; } @Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;blendFunc(II)V", shift = At.Shift.AFTER), remap = false) private void puzzle$betterBlend(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { - if (PuzzleConfig.betterSplashScreenBlend) RenderSystem.defaultBlendFunc(); + if (PuzzleConfig.disableBlend) RenderSystem.defaultBlendFunc(); + } + @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/Window;getScaledWidth()I", shift = At.Shift.BEFORE)) + private void puzzle$renderSplashBackground(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { + if (Files.exists(PuzzleSplashScreen.BACKGROUND_TEXTURE)) { + int width = client.getWindow().getScaledWidth(); + int height = client.getWindow().getScaledHeight(); + long l = Util.getMeasuringTimeMs(); + float f = this.reloadCompleteTime > -1L ? (float)(l - this.reloadCompleteTime) / 1000.0F : -1.0F; + float g = this.reloadStartTime> -1L ? (float)(l - this.reloadStartTime) / 500.0F : -1.0F; + float s; + if (f >= 1.0F) + s = 1.0F - MathHelper.clamp(f - 1.0F, 0.0F, 1.0F); + else if (reloading) + s = MathHelper.clamp(g, 0.0F, 1.0F); + else + s = 1.0F; + RenderSystem.setShaderTexture(0, PuzzleSplashScreen.BACKGROUND); + RenderSystem.enableBlend(); + RenderSystem.blendEquation(32774); + RenderSystem.defaultBlendFunc(); + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, s); + drawTexture(matrices, 0, 0, 0, 0, 0, width, height, width, height); + RenderSystem.defaultBlendFunc(); + RenderSystem.disableBlend(); + } } @Inject(method = "renderProgressBar", at = @At("HEAD")) private void puzzle$addProgressBarBackground(MatrixStack matrices, int minX, int minY, int maxX, int maxY, float opacity, CallbackInfo ci) { @@ -54,25 +103,13 @@ public abstract class MixinSplashScreen extends Overlay { int m = MathHelper.ceil((1.0F - MathHelper.clamp(f - 1.0F, 0.0F, 1.0F)) * 255.0F); fill(matrices, minX, minY, maxX, maxY, withAlpha(PuzzleConfig.progressBarBackgroundColor, m)); } - @Inject(method = "renderProgressBar", at = @At("TAIL")) - private void puzzle$fixProgressBarEnd(MatrixStack matrices, int minX, int minY, int maxX, int maxY, float opacity, CallbackInfo ci) { // For some reason the end of the progressbar is colored wrong - if (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressFrameColor == 16777215) return; - long l = Util.getMeasuringTimeMs(); - float f = this.reloadCompleteTime > -1L ? (float)(l - this.reloadCompleteTime) / 1000.0F : -1.0F; - int m = MathHelper.ceil((1.0F - MathHelper.clamp(f - 1.0F, 0.0F, 1.0F)) * 255.0F); - fill(matrices, maxX-1, minY, maxX, maxY, withAlpha(PuzzleConfig.progressFrameColor, m)); - } @ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V"), index = 5) private int puzzle$modifyProgressFrame(int color) { // Set the Progress Bar Frame Color to our configured value // - return PuzzleConfig.progressFrameColor | 255 << 24; + return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressFrameColor == 16777215) ? color : PuzzleConfig.progressFrameColor | 255 << 24; } - @ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V", ordinal = 4), index = 5) + @ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V", ordinal = 0), index = 5) private int puzzle$modifyProgressColor(int color) { // Set the Progress Bar Color to our configured value // - return PuzzleConfig.progressBarColor | 255 << 24; + return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarColor == 16777215) ? color : PuzzleConfig.progressBarColor | 255 << 24; } - private static int withAlpha(int color, int alpha) { - return color & 0xFFFFFF | alpha << 24; - } - } diff --git a/puzzle-splashscreen_example_pack.zip b/puzzle-splashscreen_example_pack.zip new file mode 100644 index 0000000..d862f2f Binary files /dev/null and b/puzzle-splashscreen_example_pack.zip differ diff --git a/src/main/resources/assets/puzzle/lang/ko_kr.json b/src/main/resources/assets/puzzle/lang/ko_kr.json new file mode 100644 index 0000000..2b51dee --- /dev/null +++ b/src/main/resources/assets/puzzle/lang/ko_kr.json @@ -0,0 +1,17 @@ +{ + "puzzle.text.update_available":"업데이트가 가능합니다!", + "puzzle.screen.title":"Puzzle 설정", + "puzzle.page.graphics":"그래픽 설정", + "puzzle.page.resources":"리소스 설정", + "puzzle.page.performance":"성능 설정", + "puzzle.page.misc":"기타 설정", + "puzzle.option.check_for_updates":"업데이트 확인", + "puzzle.option.show_version_info":"Puzzle 버전 정보 보기", + "puzzle.option.resourcepack_splash_screen":"스플래시 화면에서 리소스팩 사용", + "puzzle.option.better_splash_screen_blend":"향상된 스플래시 화면 로고 블렌딩", + "puzzle.option.emissive_textures":"방사성 텍스쳐", + "puzzle.option.unlimited_model_rotations":"모델 회전 제한없음", + "puzzle.option.bigger_custom_models":"향상된 커스텀 모델", + "puzzle.option.render_layer_overrides":"렌더링 레이어 재정의", + "puzzle.midnightconfig.title":"Puzzle 고급 환경설정" +} diff --git a/src/main/resources/assets/puzzle/lang/ru_ru.json b/src/main/resources/assets/puzzle/lang/ru_ru.json index 05f1a29..d853c1d 100644 --- a/src/main/resources/assets/puzzle/lang/ru_ru.json +++ b/src/main/resources/assets/puzzle/lang/ru_ru.json @@ -8,10 +8,10 @@ "puzzle.option.check_for_updates":"Проверять обновления", "puzzle.option.show_version_info":"Показывать информацию о версии", "puzzle.option.resourcepack_splash_screen":"Пользовательский экран загрузки", - "puzzle.option.disable_splash_screen_blend":"Отключить смешивание логотипа", + "puzzle.option.better_splash_screen_blend":"Улучшенное смешивание логотипа", "puzzle.option.emissive_textures":"Светящиеся текстуры", "puzzle.option.unlimited_model_rotations":"Неограниченные повороты моделей", "puzzle.option.bigger_custom_models":"Увеличенный размер моделей", - "puzzle.option.render_layer_overrides":"Переопределение слоёв рендеринга", + "puzzle.option.render_layer_overrides":"Пользовательские слои отрисовки", "puzzle.midnightconfig.title":"Расширенные настройки Puzzle" }