mirror of
https://github.com/PuzzleMC/Puzzle.git
synced 2025-12-16 11:55:09 +01:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8532a24b5e | ||
|
|
927faea146 | ||
|
|
12cdcba470 | ||
|
|
c9aa80f09f | ||
|
|
12015d6ba4 | ||
|
|
a8c89b11c7 | ||
|
|
f8ff656daa |
@@ -122,18 +122,18 @@ dependencies {
|
||||
}
|
||||
modImplementation ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
|
||||
modImplementation ("maven.modrinth:lambdynamiclights:${project.ldl_version}")
|
||||
modImplementation ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
|
||||
modCompileOnlyApi ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
|
||||
modImplementation ("maven.modrinth:iris:${project.iris_version}")
|
||||
modCompileOnly ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
|
||||
modImplementation ("maven.modrinth:continuity:${project.continuity_version}")
|
||||
modCompileOnlyApi ("maven.modrinth:continuity:${project.continuity_version}")
|
||||
modImplementation ("maven.modrinth:animatica:${project.animatica_version}")
|
||||
modImplementation ("maven.modrinth:colormatic:${project.colormatic_version}")
|
||||
modCompileOnlyApi ("maven.modrinth:colormatic:${project.colormatic_version}")
|
||||
modImplementation ("maven.modrinth:borderless-mining:${project.borderless_mining_version}")
|
||||
modImplementation ("maven.modrinth:dynamic-fps:${project.dynamic_fps_version}")
|
||||
modImplementation("com.moandjiezana.toml:toml4j:${project.toml4j_version}")
|
||||
modImplementation ("maven.modrinth:entitytexturefeatures:${project.entitytexturefeatures_version}")
|
||||
modImplementation ("maven.modrinth:cem:${project.cem_version}")
|
||||
modImplementation "com.gitlab.Lortseam:completeconfig:${project.complete_config_version}"
|
||||
modImplementation "com.github.Lortseam.completeconfig:base:${project.complete_config_version}"
|
||||
|
||||
modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
|
||||
exclude group: 'com.google.code.gson'
|
||||
|
||||
@@ -3,33 +3,33 @@ org.gradle.jvmargs=-Xmx4G
|
||||
|
||||
# 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.8
|
||||
minecraft_version=1.19.3
|
||||
yarn_mappings=1.19.3+build.5
|
||||
loader_version=0.14.12
|
||||
|
||||
# Mod Properties
|
||||
mod_version = 1.4.1-1.18
|
||||
mod_version = 1.4.2-1.19.3
|
||||
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.57.0+1.18.2
|
||||
mod_menu_version = 2.0.13
|
||||
fabric_version=0.70.0+1.19.3
|
||||
mod_menu_version = 5.0.2
|
||||
|
||||
cull_leaves_version = 2.3.3
|
||||
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
|
||||
colormatic_version = 3.1.1
|
||||
borderless_mining_version = 1.1.2+1.18.2
|
||||
dynamic_fps_version = v2.1.0
|
||||
cull_leaves_version = 3.0.2-fabric
|
||||
ldl_version = 2.2.0+1.19.3
|
||||
lbg_version = 1.3.0+1.19
|
||||
iris_version = 1.19.3-v1.4.6
|
||||
continuity_version = 2.0.0+1.19
|
||||
animatica_version = 0.5+1.19
|
||||
colormatic_version = 3.1.2
|
||||
borderless_mining_version = 1.1.6+1.19.3
|
||||
dynamic_fps_version = 2.2.0
|
||||
toml4j_version = 0.7.2
|
||||
cit_resewn_version = 1.0.1+1.18.2
|
||||
cem_version = 0.7.1
|
||||
complete_config_version = 1.0.0
|
||||
spruceui_version=3.3.3+1.18
|
||||
midnightlib_version=0.4.4
|
||||
entitytexturefeatures_version=4.1.1.fabric_18
|
||||
cit_resewn_version = 1.1.1+1.19
|
||||
cem_version = 0.7.1-1.19.3
|
||||
complete_config_version = 2.2.0
|
||||
spruceui_version=4.1.0+1.19.3
|
||||
midnightlib_version=1.1.0-fabric
|
||||
entitytexturefeatures_version=4.2.0.1.fabric.1.19.3
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package net.puzzlemc.core.mixin;
|
||||
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
import net.minecraft.text.TranslatableText;
|
||||
import net.puzzlemc.core.PuzzleCore;
|
||||
import net.puzzlemc.core.config.PuzzleConfig;
|
||||
import net.puzzlemc.core.util.UpdateChecker;
|
||||
@@ -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,8 +67,8 @@ 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<Boolean> 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) {
|
||||
this.client.setScreen(new ConfirmChatLinkScreen(this::confirmLink, PuzzleCore.updateURL, true));
|
||||
if (Objects.requireNonNull(this.client).options.getChatLinksPrompt().getValue()) {
|
||||
this.client.setScreen(new ConfirmLinkScreen(this::confirmLink, PuzzleCore.updateURL, true));
|
||||
} else {
|
||||
Util.getOperatingSystem().open(PuzzleCore.updateURL);
|
||||
}
|
||||
|
||||
@@ -39,21 +39,21 @@ dependencies {
|
||||
modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}")
|
||||
modImplementation ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
|
||||
modImplementation ("maven.modrinth:lambdynamiclights:${project.ldl_version}")
|
||||
modImplementation ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
|
||||
modCompileOnlyApi ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
|
||||
modImplementation ("maven.modrinth:iris:${project.iris_version}")
|
||||
modImplementation ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
|
||||
modImplementation ("maven.modrinth:colormatic:${project.colormatic_version}")
|
||||
modCompileOnlyApi ("maven.modrinth:colormatic:${project.colormatic_version}")
|
||||
modImplementation ("maven.modrinth:borderless-mining:${project.borderless_mining_version}")
|
||||
modImplementation ("maven.modrinth:dynamic-fps:${project.dynamic_fps_version}")
|
||||
modImplementation ("maven.modrinth:entitytexturefeatures:${project.entitytexturefeatures_version}")
|
||||
modImplementation ("maven.modrinth:cem:${project.cem_version}")
|
||||
modImplementation "com.gitlab.Lortseam:completeconfig:${project.complete_config_version}"
|
||||
modImplementation "com.github.Lortseam.completeconfig:base:${project.complete_config_version}"
|
||||
|
||||
modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
|
||||
exclude group: 'com.google.code.gson'
|
||||
exclude group: 'com.google.guava'
|
||||
}
|
||||
modImplementation ("maven.modrinth:continuity:${project.continuity_version}") {
|
||||
modCompileOnlyApi ("maven.modrinth:continuity:${project.continuity_version}") {
|
||||
exclude module: "modmenu"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,21 +6,19 @@ import net.irisshaders.iris.api.v0.IrisApi;
|
||||
import net.irisshaders.iris.api.v0.IrisApiConfig;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.text.LiteralText;
|
||||
import net.minecraft.text.Style;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.TranslatableText;
|
||||
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
||||
|
||||
public class IrisCompat {
|
||||
public static void init() {
|
||||
if (FabricLoader.getInstance().isModLoaded("iris")) {
|
||||
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("Iris")));
|
||||
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("iris.puzzle.option.enableShaders"), (button) -> button.setMessage(IrisApi.getInstance().getConfig().areShadersEnabled() ? PuzzleClient.YES : PuzzleClient.NO), (button) -> {
|
||||
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("iris.puzzle.option.enableShaders"), (button) -> button.setMessage(IrisApi.getInstance().getConfig().areShadersEnabled() ? PuzzleClient.YES : PuzzleClient.NO), (button) -> {
|
||||
IrisApiConfig irisConfig = IrisApi.getInstance().getConfig();
|
||||
irisConfig.setShadersEnabledAndApply(!irisConfig.areShadersEnabled());
|
||||
}));
|
||||
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("options.iris.shaderPackSelection.title"), (button) -> button.setMessage(new LiteralText("➥ ").append(new TranslatableText("iris.puzzle.option.open").setStyle(Style.EMPTY.withColor(MidnightColorUtil.radialRainbow(0.5f, 1).getRGB())))), (button) -> {
|
||||
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("options.iris.shaderPackSelection.title"), (button) -> button.setMessage(Text.literal("➥ ").append(Text.translatable("iris.puzzle.option.open").setStyle(Style.EMPTY.withColor(MidnightColorUtil.radialRainbow(0.5f, 1).getRGB())))), (button) -> {
|
||||
MinecraftClient client = MinecraftClient.getInstance();
|
||||
client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(client.currentScreen));
|
||||
}));
|
||||
|
||||
@@ -18,18 +18,18 @@ public class PuzzleApi {
|
||||
|
||||
public static void addToGraphicsOptions(PuzzleWidget button) {
|
||||
GRAPHICS_OPTIONS.add(button);
|
||||
if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.toString() + " -> 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.toString() + " -> 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.toString() + "- > 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.toString() + " -> Resource Options");
|
||||
if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.getContent().toString() + " -> Resource Options");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,8 +16,6 @@ import me.pepperbell.continuity.client.config.Option;
|
||||
import net.dorianpb.cem.internal.config.CemConfig;
|
||||
import net.dorianpb.cem.internal.config.CemConfigFairy;
|
||||
import net.dorianpb.cem.internal.config.CemOptions;
|
||||
import net.minecraft.text.LiteralText;
|
||||
import net.minecraft.text.TranslatableText;
|
||||
import net.puzzlemc.core.config.PuzzleConfig;
|
||||
import net.puzzlemc.gui.mixin.CemConfigAccessor;
|
||||
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
||||
@@ -31,32 +29,33 @@ import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
|
||||
import traben.entity_texture_features.ETFApi;
|
||||
import traben.entity_texture_features.config.ETFConfig;
|
||||
import io.github.kvverti.colormatic.ColormaticConfig;
|
||||
import traben.entity_texture_features.texture_handlers.ETFManager;
|
||||
|
||||
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() {
|
||||
MidnightLibClient.hiddenMods.add("puzzle");
|
||||
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();
|
||||
@@ -64,18 +63,18 @@ public class PuzzleClient implements ClientModInitializer {
|
||||
}));
|
||||
}
|
||||
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);
|
||||
}));
|
||||
}
|
||||
if (FabricLoader.getInstance().isModLoaded("cullleaves") && !PuzzleConfig.disabledIntegrations.contains("cullleaves")) {
|
||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("CullLeaves")));
|
||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(new TranslatableText("cullleaves.puzzle.option.enabled"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
|
||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("cullleaves.puzzle.option.enabled"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
|
||||
CullLeavesConfig.enabled = !CullLeavesConfig.enabled;
|
||||
CullLeavesConfig.write("cullleaves");
|
||||
MinecraftClient.getInstance().worldRenderer.reload();
|
||||
@@ -84,27 +83,27 @@ public class PuzzleClient implements ClientModInitializer {
|
||||
if (FabricLoader.getInstance().isModLoaded("colormatic") && !PuzzleConfig.disabledIntegrations.contains("colormatic")) {
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Colormatic")));
|
||||
ColormaticConfig colormaticConfig = Colormatic.config();
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("colormatic.config.option.clearSky"), (button) -> button.setMessage(colormaticConfig.clearSky ? YES : NO), (button) -> {
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.clearSky"), (button) -> button.setMessage(colormaticConfig.clearSky ? YES : NO), (button) -> {
|
||||
colormaticConfig.clearSky = !colormaticConfig.clearSky;
|
||||
ColormaticConfigController.persist(colormaticConfig);
|
||||
}));
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("colormatic.config.option.clearVoid"), (button) -> button.setMessage(colormaticConfig.clearVoid ? YES : NO), (button) -> {
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.clearVoid"), (button) -> button.setMessage(colormaticConfig.clearVoid ? YES : NO), (button) -> {
|
||||
colormaticConfig.clearVoid = !colormaticConfig.clearVoid;
|
||||
ColormaticConfigController.persist(colormaticConfig);
|
||||
}));
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("colormatic.config.option.blendSkyLight"), (button) -> button.setMessage(colormaticConfig.blendSkyLight ? YES : NO), (button) -> {
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.blendSkyLight"), (button) -> button.setMessage(colormaticConfig.blendSkyLight ? YES : NO), (button) -> {
|
||||
colormaticConfig.blendSkyLight = !colormaticConfig.blendSkyLight;
|
||||
ColormaticConfigController.persist(colormaticConfig);
|
||||
}));
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("colormatic.config.option.flickerBlockLight"), (button) -> button.setMessage(colormaticConfig.flickerBlockLight ? YES : NO), (button) -> {
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("colormatic.config.option.flickerBlockLight"), (button) -> button.setMessage(colormaticConfig.flickerBlockLight ? YES : NO), (button) -> {
|
||||
colormaticConfig.flickerBlockLight = !colormaticConfig.flickerBlockLight;
|
||||
ColormaticConfigController.persist(colormaticConfig);
|
||||
}));
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100, new TranslatableText("colormatic.config.option.relativeBlockLightIntensity"),
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100, Text.translatable("colormatic.config.option.relativeBlockLightIntensity"),
|
||||
() -> (int) (100*(1.0 - colormaticConfig.relativeBlockLightIntensityExponent / -16.0)),
|
||||
(button) -> button.setMessage(new TranslatableText("colormatic.config.option.relativeBlockLightIntensity")
|
||||
(button) -> button.setMessage(Text.translatable("colormatic.config.option.relativeBlockLightIntensity")
|
||||
.append(": ")
|
||||
.append(new LiteralText(String.valueOf((int)(100 * Math.exp(ColormaticConfig.scaled(colormaticConfig.relativeBlockLightIntensityExponent))))).append("%"))),
|
||||
.append(Text.literal(String.valueOf((int)(100 * Math.exp(ColormaticConfig.scaled(colormaticConfig.relativeBlockLightIntensityExponent))))).append("%"))),
|
||||
(slider) -> {
|
||||
try {
|
||||
colormaticConfig.relativeBlockLightIntensityExponent = ((1.00 - ((slider.getInt())/100f)) * -16.0);
|
||||
@@ -116,11 +115,11 @@ public class PuzzleClient implements ClientModInitializer {
|
||||
if (FabricLoader.getInstance().isModLoaded("dynamicfps") && !PuzzleConfig.disabledIntegrations.contains("dynamicfps")) {
|
||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("Dynamic FPS")));
|
||||
DynamicFPSConfig fpsConfig = DynamicFPSMod.config;
|
||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(new TranslatableText("config.dynamicfps.reduce_when_unfocused"), (button) -> button.setMessage(fpsConfig.reduceFPSWhenUnfocused ? YES : NO), (button) -> {
|
||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("config.dynamicfps.reduce_when_unfocused"), (button) -> button.setMessage(fpsConfig.reduceFPSWhenUnfocused ? YES : NO), (button) -> {
|
||||
fpsConfig.reduceFPSWhenUnfocused = !fpsConfig.reduceFPSWhenUnfocused;
|
||||
fpsConfig.save();
|
||||
}));
|
||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 60,new TranslatableText("config.dynamicfps.unfocused_fps"), () -> fpsConfig.unfocusedFPS,
|
||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 60,Text.translatable("config.dynamicfps.unfocused_fps"), () -> fpsConfig.unfocusedFPS,
|
||||
(button) -> button.setMessage(Text.of(fpsConfig.unfocusedFPS + " FPS")),
|
||||
(slider) -> {
|
||||
try {
|
||||
@@ -129,15 +128,15 @@ public class PuzzleClient implements ClientModInitializer {
|
||||
catch (NumberFormatException ignored) {}
|
||||
finally {fpsConfig.save();}
|
||||
}));
|
||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(new TranslatableText("config.dynamicfps.restore_when_hovered"), (button) -> button.setMessage(fpsConfig.restoreFPSWhenHovered ? YES : NO), (button) -> {
|
||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("config.dynamicfps.restore_when_hovered"), (button) -> button.setMessage(fpsConfig.restoreFPSWhenHovered ? YES : NO), (button) -> {
|
||||
fpsConfig.restoreFPSWhenHovered = !fpsConfig.restoreFPSWhenHovered;
|
||||
fpsConfig.save();
|
||||
}));
|
||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(new TranslatableText("config.dynamicfps.run_gc_on_unfocus"), (button) -> button.setMessage(fpsConfig.runGCOnUnfocus ? YES : NO), (button) -> {
|
||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("config.dynamicfps.run_gc_on_unfocus"), (button) -> button.setMessage(fpsConfig.runGCOnUnfocus ? YES : NO), (button) -> {
|
||||
fpsConfig.runGCOnUnfocus = !fpsConfig.runGCOnUnfocus;
|
||||
fpsConfig.save();
|
||||
}));
|
||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 100,new TranslatableText("config.dynamicfps.unfocused_volume"), () -> ((Number)(fpsConfig.unfocusedVolumeMultiplier * 100)).intValue(),
|
||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 100,Text.translatable("config.dynamicfps.unfocused_volume"), () -> ((Number)(fpsConfig.unfocusedVolumeMultiplier * 100)).intValue(),
|
||||
(button) -> button.setMessage(Text.of(((Number)(fpsConfig.unfocusedVolumeMultiplier * 100)).intValue() + "%")),
|
||||
(slider) -> {
|
||||
try {
|
||||
@@ -146,7 +145,7 @@ public class PuzzleClient implements ClientModInitializer {
|
||||
catch (NumberFormatException ignored) {}
|
||||
finally {fpsConfig.save();}
|
||||
}));
|
||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 100,new TranslatableText("config.dynamicfps.hidden_volume"), () -> ((Number)(fpsConfig.hiddenVolumeMultiplier * 100)).intValue(),
|
||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(0, 100,Text.translatable("config.dynamicfps.hidden_volume"), () -> ((Number)(fpsConfig.hiddenVolumeMultiplier * 100)).intValue(),
|
||||
(button) -> button.setMessage(Text.of(((Number)(fpsConfig.hiddenVolumeMultiplier * 100)).intValue() + "%")),
|
||||
(slider) -> {
|
||||
try {
|
||||
@@ -159,12 +158,12 @@ public class PuzzleClient implements ClientModInitializer {
|
||||
if (FabricLoader.getInstance().isModLoaded("borderlessmining") && !PuzzleConfig.disabledIntegrations.contains("borderlessmining")) {
|
||||
PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Borderless Mining")));
|
||||
ConfigHandler bmConfig = ConfigHandler.getInstance();
|
||||
PuzzleApi.addToMiscOptions(new PuzzleWidget(new TranslatableText("config.borderlessmining.general.enabled"), (button) -> button.setMessage(bmConfig.isEnabledOrPending() ? YES : NO), (button) -> {
|
||||
PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("config.borderlessmining.general.enabled"), (button) -> button.setMessage(bmConfig.isEnabledOrPending() ? YES : NO), (button) -> {
|
||||
bmConfig.setEnabledPending(!bmConfig.isEnabledOrPending());
|
||||
bmConfig.save();
|
||||
}));
|
||||
if (MinecraftClient.IS_SYSTEM_MAC) {
|
||||
PuzzleApi.addToMiscOptions(new PuzzleWidget(new TranslatableText("config.borderlessmining.general.enabledmac"), (button) -> button.setMessage(bmConfig.enableMacOS ? YES : NO), (button) -> {
|
||||
PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("config.borderlessmining.general.enabledmac"), (button) -> button.setMessage(bmConfig.enableMacOS ? YES : NO), (button) -> {
|
||||
bmConfig.enableMacOS = !bmConfig.enableMacOS;
|
||||
bmConfig.setEnabledPending(bmConfig.isEnabled());
|
||||
bmConfig.save();
|
||||
@@ -181,34 +180,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"), () -> citConfig.cache_ms,
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100,Text.translatable("config.citresewn.cache_ms.title"), () -> citConfig.cache_ms,
|
||||
(button) -> button.setMessage(message(citConfig)),
|
||||
(slider) -> {
|
||||
try {
|
||||
@@ -221,22 +220,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();
|
||||
}));
|
||||
@@ -248,7 +247,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();
|
||||
@@ -257,25 +256,26 @@ 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.entity_texture_features.title")));
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.title")));
|
||||
ETFConfig etfConfig = ETFApi.getETFConfigObject;
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.entity_texture_features.enable_custom_textures.title"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> {
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.enable_custom_textures.title"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> {
|
||||
etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures;
|
||||
ETFApi.saveETFConfigChangesAndResetETF();
|
||||
}));
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.entity_texture_features.enable_emissive_textures.title"), (button) -> button.setMessage(etfConfig.enableEmissiveTextures ? YES : NO), (button) -> {
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.enable_emissive_textures.title"), (button) -> button.setMessage(etfConfig.enableEmissiveTextures ? YES : NO), (button) -> {
|
||||
etfConfig.enableEmissiveTextures = !etfConfig.enableEmissiveTextures;
|
||||
ETFApi.saveETFConfigChangesAndResetETF();
|
||||
}));
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.entity_texture_features.full_bright_emissives.title"), (button) -> button.setMessage(etfConfig.fullBrightEmissives ? Text.of("Brighter") : Text.of("Default")), (button) -> {
|
||||
etfConfig.fullBrightEmissives = !etfConfig.fullBrightEmissives;
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.emissive_mode.title"), (button) -> button.setMessage(
|
||||
Text.literal(etfConfig.emissiveRenderMode.toString())), (button) -> {
|
||||
etfConfig.emissiveRenderMode = etfConfig.emissiveRenderMode.next();
|
||||
ETFApi.saveETFConfigChangesAndResetETF();
|
||||
}));
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.entity_texture_features.blinking_mob_settings.title"), (button) -> button.setMessage(etfConfig.enableBlinking ? YES : NO), (button) -> {
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.blinking_mob_settings.title"), (button) -> button.setMessage(etfConfig.enableBlinking ? YES : NO), (button) -> {
|
||||
etfConfig.enableBlinking = !etfConfig.enableBlinking;
|
||||
ETFApi.saveETFConfigChangesAndResetETF();
|
||||
}));
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.entity_texture_features.player_skin_features.title"), (button) -> button.setMessage(etfConfig.skinFeaturesEnabled ? YES : NO), (button) -> {
|
||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.player_skin_features.title"), (button) -> button.setMessage(etfConfig.skinFeaturesEnabled ? YES : NO), (button) -> {
|
||||
etfConfig.skinFeaturesEnabled = !etfConfig.skinFeaturesEnabled;
|
||||
ETFApi.saveETFConfigChangesAndResetETF();
|
||||
}));
|
||||
@@ -285,7 +285,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) {
|
||||
@@ -304,7 +304,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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@ package net.puzzlemc.gui.mixin;
|
||||
import eu.midnightdust.core.config.MidnightLibConfig;
|
||||
import eu.midnightdust.lib.util.screen.TexturedOverlayButtonWidget;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
import net.minecraft.text.TranslatableText;
|
||||
import net.minecraft.util.Identifier;
|
||||
import net.puzzlemc.core.config.PuzzleConfig;
|
||||
import net.puzzlemc.gui.PuzzleClient;
|
||||
@@ -32,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")));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package net.puzzlemc.gui.screen;
|
||||
|
||||
import net.minecraft.screen.ScreenTexts;
|
||||
import net.minecraft.text.Text;
|
||||
import net.puzzlemc.gui.PuzzleApi;
|
||||
import net.minecraft.client.gui.screen.ScreenTexts;
|
||||
import net.minecraft.text.TranslatableText;
|
||||
import net.puzzlemc.gui.PuzzleClient;
|
||||
import net.puzzlemc.gui.screen.page.GraphicsPage;
|
||||
import net.puzzlemc.gui.screen.page.MiscPage;
|
||||
@@ -17,7 +17,7 @@ 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;
|
||||
@@ -31,11 +31,11 @@ public class PuzzleOptionsScreen extends Screen {
|
||||
PerformancePage performancePage = new PerformancePage(this);
|
||||
ResourcesPage resourcesPage = new ResourcesPage(this);
|
||||
|
||||
if (!PuzzleApi.GRAPHICS_OPTIONS.isEmpty()) this.addDrawableChild(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 48 - 6, 150, 20, graphicsPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(graphicsPage)));
|
||||
if (!PuzzleApi.RESOURCE_OPTIONS.isEmpty()) this.addDrawableChild(new ButtonWidget(this.width / 2 + 5, this.height / 6 + 48 - 6, 150, 20, resourcesPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(resourcesPage)));
|
||||
if (!PuzzleApi.PERFORMANCE_OPTIONS.isEmpty()) this.addDrawableChild(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 72 - 6, 150, 20, performancePage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(performancePage)));
|
||||
if (!PuzzleApi.MISC_OPTIONS.isEmpty()) this.addDrawableChild(new ButtonWidget(this.width / 2 + 5, this.height / 6 + 72 - 6, 150, 20, miscPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(miscPage)));
|
||||
this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height / 6 + 168, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
|
||||
if (!PuzzleApi.GRAPHICS_OPTIONS.isEmpty()) this.addDrawableChild(ButtonWidget.builder(graphicsPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(graphicsPage)).dimensions(this.width / 2 - 155, this.height / 6 + 48 - 6, 150, 20).build());
|
||||
if (!PuzzleApi.RESOURCE_OPTIONS.isEmpty()) this.addDrawableChild(ButtonWidget.builder(resourcesPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(resourcesPage)).dimensions(this.width / 2 + 5, this.height / 6 + 48 - 6, 150, 20).build());
|
||||
if (!PuzzleApi.PERFORMANCE_OPTIONS.isEmpty()) this.addDrawableChild(ButtonWidget.builder(performancePage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(performancePage)).dimensions(this.width / 2 - 155, this.height / 6 + 72 - 6, 150, 20).build());
|
||||
if (!PuzzleApi.MISC_OPTIONS.isEmpty()) this.addDrawableChild(ButtonWidget.builder(miscPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(miscPage)).dimensions(this.width / 2 + 5, this.height / 6 + 72 - 6, 150, 20).build());
|
||||
this.addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)).dimensions(this.width / 2 - 100, this.height / 6 + 168, 200, 20).build());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package net.puzzlemc.gui.screen.page;
|
||||
|
||||
import net.minecraft.client.gui.screen.ScreenTexts;
|
||||
import net.minecraft.screen.ScreenTexts;
|
||||
import net.minecraft.text.Text;
|
||||
import net.puzzlemc.gui.screen.widget.PuzzleOptionListWidget;
|
||||
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
||||
@@ -31,7 +31,7 @@ public abstract class AbstractPuzzleOptionsPage extends Screen {
|
||||
|
||||
super.init();
|
||||
|
||||
this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
|
||||
this.addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)).dimensions(this.width / 2 - 100, this.height - 28, 200, 20).build());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package net.puzzlemc.gui.screen.page;
|
||||
|
||||
import net.minecraft.text.TranslatableText;
|
||||
import net.minecraft.text.Text;
|
||||
import net.puzzlemc.gui.PuzzleApi;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package net.puzzlemc.gui.screen.page;
|
||||
|
||||
import net.minecraft.text.TranslatableText;
|
||||
import net.minecraft.text.Text;
|
||||
import net.puzzlemc.gui.PuzzleApi;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package net.puzzlemc.gui.screen.page;
|
||||
|
||||
import net.minecraft.text.TranslatableText;
|
||||
import net.minecraft.text.Text;
|
||||
import net.puzzlemc.gui.PuzzleApi;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package net.puzzlemc.gui.screen.page;
|
||||
|
||||
import net.minecraft.text.TranslatableText;
|
||||
import net.minecraft.text.Text;
|
||||
import net.puzzlemc.gui.PuzzleApi;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,11 +4,13 @@ import net.minecraft.client.gui.widget.ButtonWidget;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.text.Text;
|
||||
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public class PuzzleButtonWidget extends ButtonWidget {
|
||||
private final PuzzleWidget.TextAction title;
|
||||
|
||||
public PuzzleButtonWidget(int x, int y, int width, int height, PuzzleWidget.TextAction title, PressAction onPress) {
|
||||
super(x, y, width, height, Text.of(""), onPress);
|
||||
super(x, y, width, height, Text.of(""), onPress, Supplier::get);
|
||||
this.title = title;
|
||||
}
|
||||
@Override
|
||||
|
||||
@@ -10,9 +10,8 @@ import net.minecraft.client.gui.widget.ClickableWidget;
|
||||
import net.minecraft.client.gui.widget.ElementListWidget;
|
||||
import net.minecraft.client.resource.language.I18n;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.text.LiteralText;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.text.TranslatableText;
|
||||
import net.minecraft.text.TranslatableTextContent;
|
||||
import net.puzzlemc.gui.screen.page.AbstractPuzzleOptionsPage;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
|
||||
@@ -80,14 +79,14 @@ public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWi
|
||||
|
||||
public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
|
||||
if (button != null) {
|
||||
button.y = y;
|
||||
button.setY(y);
|
||||
button.render(matrices, mouseX, mouseY, tickDelta);
|
||||
}
|
||||
if (button == null) drawCenteredText(matrices,textRenderer, new LiteralText("------ ").append(text).append(" ------"),x + 200,y+5,0xFFFFFF);
|
||||
if (button == null) drawCenteredText(matrices,textRenderer, Text.literal("------ ").append(text).append(" ------"),x + 200,y+5,0xFFFFFF);
|
||||
else drawTextWithShadow(matrices,textRenderer, text,x+15,y+5,0xFFFFFF);
|
||||
|
||||
if (!(client.currentScreen instanceof AbstractPuzzleOptionsPage page)) return;
|
||||
if (button != null && (button.isMouseOver(mouseX, mouseY) || ((page.list.getHoveredEntry() == null || page.list.getHoveredEntry().button == null || !page.list.getHoveredEntry().button.isMouseOver(mouseX, mouseY)) && button.isFocused())) && text instanceof TranslatableText content) {
|
||||
if (button != null && (button.isMouseOver(mouseX, mouseY) || ((page.list.getHoveredEntry() == null || page.list.getHoveredEntry().button == null || !page.list.getHoveredEntry().button.isMouseOver(mouseX, mouseY)) && button.isFocused())) && text.getContent() instanceof TranslatableTextContent content) {
|
||||
String key = null;
|
||||
if (I18n.hasTranslation(content.getKey() + ".tooltip")) key = content.getKey() + ".tooltip";
|
||||
else if (I18n.hasTranslation(content.getKey() + ".desc")) key = content.getKey() + ".desc";
|
||||
@@ -100,16 +99,16 @@ public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWi
|
||||
if (key != null) {
|
||||
List<Text> list = new ArrayList<>();
|
||||
for (String str : I18n.translate(key).split("\n"))
|
||||
list.add(new LiteralText(str));
|
||||
list.add(Text.literal(str));
|
||||
page.tooltip = list;
|
||||
}
|
||||
}
|
||||
}
|
||||
public int getY() {
|
||||
return button.y;
|
||||
return button.getY();
|
||||
}
|
||||
public int getX() {
|
||||
return button.x;
|
||||
return button.getX();
|
||||
}
|
||||
public int getHeight() {
|
||||
return button.getHeight();
|
||||
|
||||
@@ -43,6 +43,6 @@
|
||||
},
|
||||
"breaks": {
|
||||
"citresewn": "<=1.0.0+1.18.2",
|
||||
"entity_texture_features": "<4.0.0"
|
||||
"entity_texture_features": "<3.0.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,8 +4,8 @@ import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParseException;
|
||||
import net.minecraft.client.render.model.json.ModelElement;
|
||||
import net.minecraft.util.JsonHelper;
|
||||
import net.minecraft.util.math.Vec3f;
|
||||
import net.puzzlemc.core.config.PuzzleConfig;
|
||||
import org.joml.Vector3f;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
@Mixin(ModelElement.Deserializer.class)
|
||||
public abstract class MixinModelElementDeserializer {
|
||||
@Shadow protected abstract Vec3f deserializeVec3f(JsonObject object, String name);
|
||||
@Shadow protected abstract Vector3f deserializeVec3f(JsonObject object, String name);
|
||||
|
||||
@Inject(at = @At("HEAD"),method = "deserializeRotationAngle", cancellable = true)
|
||||
private void puzzle$deserializeRotationAngle(JsonObject object, CallbackInfoReturnable<Float> cir) {
|
||||
@@ -24,10 +24,10 @@ public abstract class MixinModelElementDeserializer {
|
||||
}
|
||||
}
|
||||
@Inject(at = @At("HEAD"),method = "deserializeTo", cancellable = true)
|
||||
private void puzzle$deserializeTo(JsonObject object, CallbackInfoReturnable<Vec3f> cir) {
|
||||
private void puzzle$deserializeTo(JsonObject object, CallbackInfoReturnable<Vector3f> cir) {
|
||||
if (PuzzleConfig.biggerModels) {
|
||||
Vec3f vec3f = this.deserializeVec3f(object, "to");
|
||||
if (!(vec3f.getX() < -32.0F) && !(vec3f.getY() < -32.0F) && !(vec3f.getZ() < -32.0F) && !(vec3f.getX() > 48.0F) && !(vec3f.getY() > 48.0F) && !(vec3f.getZ() > 48.0F)) {
|
||||
Vector3f vec3f = this.deserializeVec3f(object, "to");
|
||||
if (!(vec3f.x < -32.0F) && !(vec3f.y < -32.0F) && !(vec3f.z < -32.0F) && !(vec3f.x > 48.0F) && !(vec3f.y > 48.0F) && !(vec3f.z > 48.0F)) {
|
||||
cir.setReturnValue(vec3f);
|
||||
} else {
|
||||
throw new JsonParseException("'to' specifier exceeds the allowed boundaries: " + vec3f);
|
||||
@@ -35,10 +35,10 @@ public abstract class MixinModelElementDeserializer {
|
||||
}
|
||||
}
|
||||
@Inject(at = @At("HEAD"),method = "deserializeFrom", cancellable = true)
|
||||
private void puzzle$deserializeFrom(JsonObject object, CallbackInfoReturnable<Vec3f> cir) {
|
||||
private void puzzle$deserializeFrom(JsonObject object, CallbackInfoReturnable<Vector3f> cir) {
|
||||
if (PuzzleConfig.biggerModels) {
|
||||
Vec3f vec3f = this.deserializeVec3f(object, "from");
|
||||
if (!(vec3f.getX() < -32.0F) && !(vec3f.getY() < -32.0F) && !(vec3f.getZ() < -32.0F) && !(vec3f.getX() > 48.0F) && !(vec3f.getY() > 48.0F) && !(vec3f.getZ() > 48.0F)) {
|
||||
Vector3f vec3f = this.deserializeVec3f(object, "from");
|
||||
if (!(vec3f.x < -32.0F) && !(vec3f.y < -32.0F) && !(vec3f.z < -32.0F) && !(vec3f.x > 48.0F) && !(vec3f.y > 48.0F) && !(vec3f.z > 48.0F)) {
|
||||
cir.setReturnValue(vec3f);
|
||||
} else {
|
||||
throw new JsonParseException("'from' specifier exceeds the allowed boundaries: " + vec3f);
|
||||
|
||||
@@ -30,6 +30,7 @@ import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
import java.util.Objects;
|
||||
import java.util.Properties;
|
||||
|
||||
public class PuzzleSplashScreen implements ClientModInitializer {
|
||||
@@ -77,8 +78,8 @@ public class PuzzleSplashScreen implements ClientModInitializer {
|
||||
client.getTextureManager().registerTexture(LOGO, new LogoTexture(LOGO));
|
||||
client.getTextureManager().registerTexture(BACKGROUND, new LogoTexture(BACKGROUND));
|
||||
|
||||
manager.findResources("optifine", path -> path.contains("color.properties")).forEach(id -> {
|
||||
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);
|
||||
|
||||
@@ -103,8 +104,8 @@ public class PuzzleSplashScreen implements ClientModInitializer {
|
||||
LogManager.getLogger("Puzzle").error("Error occurred while loading color.properties " + id.toString(), e);
|
||||
}
|
||||
});
|
||||
manager.findResources("textures", path -> path.contains("mojangstudios.png")).forEach(id -> {
|
||||
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);
|
||||
InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
|
||||
client.getTextureManager().registerTexture(LOGO, new NativeImageBackedTexture(NativeImage.read(input)));
|
||||
@@ -112,8 +113,8 @@ public class PuzzleSplashScreen implements ClientModInitializer {
|
||||
LogManager.getLogger("Puzzle").error("Error occurred while loading custom minecraft logo " + id.toString(), e);
|
||||
}
|
||||
});
|
||||
manager.findResources("puzzle", path -> path.contains("splash_background.png")).forEach(id -> {
|
||||
try (InputStream stream = manager.getResource(id).getInputStream()) {
|
||||
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)));
|
||||
@@ -138,9 +139,9 @@ public class PuzzleSplashScreen implements ClientModInitializer {
|
||||
|
||||
protected TextureData loadTextureData(ResourceManager resourceManager) {
|
||||
MinecraftClient minecraftClient = MinecraftClient.getInstance();
|
||||
DefaultResourcePack defaultResourcePack = minecraftClient.getResourcePackProvider().getPack();
|
||||
DefaultResourcePack defaultResourcePack = minecraftClient.getDefaultResourcePack();
|
||||
try {
|
||||
InputStream inputStream = defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO);
|
||||
InputStream inputStream = Objects.requireNonNull(defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO)).get();
|
||||
TextureData var6;
|
||||
try {
|
||||
var6 = new TextureData(new TextureResourceMetadata(true, true), NativeImage.read(inputStream));
|
||||
|
||||
@@ -87,7 +87,7 @@ public abstract class MixinSplashScreen extends Overlay {
|
||||
RenderSystem.enableBlend();
|
||||
RenderSystem.blendEquation(32774);
|
||||
RenderSystem.defaultBlendFunc();
|
||||
RenderSystem.setShader(GameRenderer::getPositionTexShader);
|
||||
RenderSystem.setShader(GameRenderer::getPositionTexProgram);
|
||||
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, s);
|
||||
drawTexture(matrices, 0, 0, 0, 0, 0, width, height, width, height);
|
||||
RenderSystem.defaultBlendFunc();
|
||||
|
||||
39
src/main/resources/assets/puzzle/lang/pt_br.json
Normal file
39
src/main/resources/assets/puzzle/lang/pt_br.json
Normal file
@@ -0,0 +1,39 @@
|
||||
{
|
||||
"puzzle.text.update_available":"Uma atualização está disponível!",
|
||||
"puzzle.screen.title":"Puzzle Definições",
|
||||
"puzzle.page.graphics":"Configurações gráficas",
|
||||
"puzzle.page.resources":"Configurações de recursos",
|
||||
"puzzle.page.performance":"Configurações de desempenho",
|
||||
"puzzle.page.misc":"Configurações Diversas",
|
||||
"puzzle.option.check_for_updates":"Verifique se há atualizações",
|
||||
"puzzle.option.check_for_updates.tooltip":"Ativa o verificador de atualização integrado do Puzzle",
|
||||
"puzzle.option.show_version_info":"Mostrar informações da versão do Puzzle",
|
||||
"puzzle.option.show_version_info.tooltip":"Mostrar informações sobre o atual\nVersão do Puzzle e status de atualização em\na tela de título e o menu F3",
|
||||
"puzzle.option.resourcepack_splash_screen":"Use a tela inicial do pacote de recursos",
|
||||
"puzzle.option.resourcepack_splash_screen.tooltip":"Permite que os pacotes de recursos mudem a aparência\ndo carregamento do Minecraft/splash\ntela usando o formato OptiFine",
|
||||
"puzzle.option.better_splash_screen_blend":"Melhor combinação do logotipo da tela inicial",
|
||||
"puzzle.option.better_splash_screen_blend.tooltip":"Muda o tipo de mistura usado\npelo logotipo na tela inicial\npara trabalhar melhor com logotipos coloridos personalizados",
|
||||
"puzzle.option.unlimited_model_rotations":"Rotações de modelo ilimitadas",
|
||||
"puzzle.option.unlimited_model_rotations.tooltip":"Desbloqueia rotação total de 360° em modelos de itens/blocos personalizados",
|
||||
"puzzle.option.bigger_custom_models":"Modelos personalizados maiores",
|
||||
"puzzle.option.bigger_custom_models.tooltip":"Aumenta o limite de\ntamanhos de modelo de bloco/item personalizados\nde 3x3x3 a 5x5x5",
|
||||
"puzzle.midnightconfig.title":"Configuração avançada do Puzzle",
|
||||
"puzzle.midnightconfig.tooltip":"Opções apenas para usuários avançados",
|
||||
|
||||
"cullleaves.puzzle.option.enabled": "Abate de Folhas",
|
||||
"cullleaves.puzzle.option.enabled.tooltip": "Ative o abate de folhas para melhorar o desempenho",
|
||||
"iris.puzzle.option.enableShaders": "Ativar sombreadores",
|
||||
"iris.puzzle.option.enableShaders.tooltip": "Habilitar ou não shaderpacks",
|
||||
"iris.puzzle.option.open": "ABRIR",
|
||||
"options.iris.shaderPackSelection.tooltip": "Abra uma tela para selecionar\nshaderpacks e configurá-los",
|
||||
"lambdabettergrass.option.mode.tooltip": "Faz os lados de\nblocos de grama se conectam a\nblocos de grama adjacentes",
|
||||
"lambdabettergrass.option.better_snow.tooltip": "Adiciona uma neve puramente visual/camada de musgo\na blocos não completos que\nestão rodeados de neve/musgo",
|
||||
"config.dynamicfps.reduce_when_unfocused.tooltip": "Reduz o FPS do Minecraft quando desfocado\n(ou seja, outra janela está focada ou o jogo está oculto)\npara economizar energia e recursos do sistema",
|
||||
"config.dynamicfps.unfocused_fps.tooltip": "A quantidade de quadros por segundo\nMinecraft é permitido\nrenderizar enquanto estiver fora de foco",
|
||||
"config.dynamicfps.restore_when_hovered.tooltip": "Interromper ou não o\nLimitação de FPS enquanto o Minecraft é visualizado\n(ou seja, pairou na barra de tarefas ou dock)",
|
||||
"config.dynamicfps.run_gc_on_unfocus.tooltip": "Execute um coletor de lixo enquanto\nMinecraft não está focado em\nliberar um pouco de RAM",
|
||||
"config.dynamicfps.unfocused_volume.tooltip": "O volume que o jogo deve reproduzir\nsom enquanto desfocado\n(ou seja, outra janela é selecionada)",
|
||||
"config.dynamicfps.hidden_volume.tooltip": "O volume que o jogo deve reproduzir\nsom em enquanto não visível\n(ou seja, minimizado, coberto por outras janelas\nem em outra área de trabalho virtual)",
|
||||
"entity_texture_features.puzzle.emissive_type.brighter": "§eMais brilhante",
|
||||
"entity_texture_features.puzzle.emissive_type.default": "§6Padrão"
|
||||
}
|
||||
@@ -6,12 +6,34 @@
|
||||
"puzzle.page.performance":"Производительность",
|
||||
"puzzle.page.misc":"Прочие настройки",
|
||||
"puzzle.option.check_for_updates":"Проверять обновления",
|
||||
"puzzle.option.check_for_updates.tooltip":"Включить встроенную в Puzzle проверку обновлений",
|
||||
"puzzle.option.show_version_info":"Показывать информацию о версии",
|
||||
"puzzle.option.show_version_info.tooltip":"Отображать информацию о текущей версии\nPuzzle и наличии обновлений\nна главном экране и экране отладки",
|
||||
"puzzle.option.resourcepack_splash_screen":"Пользовательский экран загрузки",
|
||||
"puzzle.option.resourcepack_splash_screen.tooltip":"Разрешить наборам ресурсов изменять\nвнешний вид экрана загрузки Minecraft,\nиспользуя формат OptiFine",
|
||||
"puzzle.option.better_splash_screen_blend":"Улучшенное смешивание логотипа",
|
||||
"puzzle.option.emissive_textures":"Светящиеся текстуры",
|
||||
"puzzle.option.better_splash_screen_blend.tooltip":"Изменить метод смешивания, используемый\nдля логотипа на экране загрузки,\nчтобы улучшить вид с изменёнными цветами",
|
||||
"puzzle.option.unlimited_model_rotations":"Неограниченные повороты моделей",
|
||||
"puzzle.option.unlimited_model_rotations.tooltip":"Разрешить поворот частей\nпользовательских моделей\nблоков/предметов на 360°",
|
||||
"puzzle.option.bigger_custom_models":"Увеличенный размер моделей",
|
||||
"puzzle.option.render_layer_overrides":"Пользовательские слои отрисовки",
|
||||
"puzzle.midnightconfig.title":"Расширенные настройки Puzzle"
|
||||
"puzzle.option.bigger_custom_models.tooltip":"Увеличить предельный размер\nпользовательских моделей блоков\nи предметов с 3×3×3 до 5×5×5",
|
||||
"puzzle.midnightconfig.title":"Расширенные настройки Puzzle",
|
||||
"puzzle.midnightconfig.tooltip":"Только для продвинутых пользователей!",
|
||||
|
||||
"cullleaves.puzzle.option.enabled": "Отбраковка листвы",
|
||||
"cullleaves.puzzle.option.enabled.tooltip": "Включить отбраковку блоков листвы\nдля улучшения производительности",
|
||||
"iris.puzzle.option.enableShaders": "Шейдеры",
|
||||
"iris.puzzle.option.enableShaders.tooltip": "Включить выбранный набор шейдеров",
|
||||
"iris.puzzle.option.open": "Выбрать ",
|
||||
"options.iris.shaderPackSelection.tooltip": "Открыть экран переключения\nи настройки наборов шейдеров",
|
||||
"lambdabettergrass.option.mode.tooltip": "Включить соединение текстуры\nтравы у соседних блоков дёрна",
|
||||
"lambdabettergrass.option.better_snow.tooltip": "Добавить имитацию наличия слоя снега\nили мха для неполных блоков, имеющих\nсоответствующее окружение",
|
||||
"config.dynamicfps.reduce_when_unfocused.tooltip": "Уменьшать FPS в Minecraft при переходе в фон\nдля экономии энергии и системных ресурсов\n(когда игра свёрнута или активно другое окно)",
|
||||
"config.dynamicfps.unfocused_fps.tooltip": "Фактическое количество\nкадров в секунду, которое\nMinecraft сможет выводить\nв фоновом режиме",
|
||||
"config.dynamicfps.restore_when_hovered.tooltip": "Отключать ограничение FPS,\nкогда на окно с Minecraft\nнаведён курсор мыши",
|
||||
"config.dynamicfps.run_gc_on_unfocus.tooltip": "Запускать сборщик мусора при\nпереходе игры в фон, чтобы\nосвободить пространство в ОЗУ\n(уменьшает число просадок FPS)",
|
||||
"config.dynamicfps.unfocused_volume.tooltip": "Громкость звука игры в состоянии фона\n(когда активно другое окно)",
|
||||
"config.dynamicfps.hidden_volume.tooltip": "Громкость звука игры в скрытом состоянии\n(когда окно свёрнуто, закрыто другим окном\nили находится на другом рабочем столе)",
|
||||
"entity_texture_features.puzzle.emissive_type.brighter": "§eЯркие",
|
||||
"entity_texture_features.puzzle.emissive_type.default": "§6Обычные"
|
||||
}
|
||||
|
||||
@@ -1,17 +1,39 @@
|
||||
{
|
||||
"puzzle.text.update_available": "有新版本可供升級!",
|
||||
"puzzle.screen.title":"拼圖設置",
|
||||
"puzzle.page.graphics":"顯示設置",
|
||||
"puzzle.page.resources":"資源設置",
|
||||
"puzzle.page.performance":"性能設置",
|
||||
"puzzle.page.misc":"其他設置",
|
||||
"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.option.resourcepack_splash_screen":"使用資源包的加載界面",
|
||||
"puzzle.option.disable_splash_screen_blend":"禁止加載界面徽標渲染",
|
||||
"puzzle.option.emissive_textures":"發光貼圖",
|
||||
"puzzle.option.check_for_updates.tooltip": "開啟 Puzzle 內建的更新檢查",
|
||||
"puzzle.option.show_version_info": "顯示 Puzzle 版本信息",
|
||||
"puzzle.option.show_version_info.tooltip": "在標題畫面和 F3 選單上\n顯示有關目前 Puzzle 版本和更新狀態的資訊",
|
||||
"puzzle.option.resourcepack_splash_screen": "使用資源包載入畫面",
|
||||
"puzzle.option.resourcepack_splash_screen.tooltip": "使資源包可以使用 OptiFine 格式\n更改 Minecraft 的載入畫面",
|
||||
"puzzle.option.better_splash_screen_blend": "更好的載入畫面圖示混和",
|
||||
"puzzle.option.better_splash_screen_blend.tooltip": "更改激活畫面上標誌的混合方式\n以便更好地與自訂顏色的標誌配合使用",
|
||||
"puzzle.option.unlimited_model_rotations": "無限模型旋轉",
|
||||
"puzzle.option.bigger_custom_models":"更大的自定義模型",
|
||||
"puzzle.option.render_layer_overrides":"覆蓋渲染層",
|
||||
"puzzle.midnightconfig.title":"拼圖高級設置"
|
||||
"puzzle.option.unlimited_model_rotations.tooltip": "在自訂方塊/物品模型上解鎖完整 360° 旋轉",
|
||||
"puzzle.option.bigger_custom_models": "更大的自訂模型",
|
||||
"puzzle.option.bigger_custom_models.tooltip": "增加將自訂方塊/物品模型大小\n從 3x3x3 增加到 5x5x5",
|
||||
"puzzle.midnightconfig.title": "Puzzle 進階設定",
|
||||
"puzzle.midnightconfig.tooltip": "給予進階使用者使用的選項",
|
||||
|
||||
"cullleaves.puzzle.option.enabled": "樹葉剔除",
|
||||
"cullleaves.puzzle.option.enabled.tooltip": "開啟樹葉剔除以提升效能。",
|
||||
"iris.puzzle.option.enableShaders": "開啟光影",
|
||||
"iris.puzzle.option.enableShaders.tooltip": "開啟或關閉光影包",
|
||||
"iris.puzzle.option.open": "開",
|
||||
"options.iris.shaderPackSelection.tooltip": "開啟選擇畫面光影包和設定",
|
||||
"lambdabettergrass.option.mode.tooltip": "讓草的側面連接相鄰的草塊",
|
||||
"lambdabettergrass.option.better_snow.tooltip": "對雪塊/苔蘚方塊被包圍的不完整方塊\n增加視覺效果",
|
||||
"config.dynamicfps.reduce_when_unfocused.tooltip": "當 Minecraft 失去焦點時限制 FPS\n(如切換到其他視窗或是遊戲被隱藏)\n以節省電源和系統資源",
|
||||
"config.dynamicfps.unfocused_fps.tooltip": "當 Minecraft 失去焦點時允許的最大 FPS",
|
||||
"config.dynamicfps.restore_when_hovered.tooltip": "開啟或關閉預覽 Mineceraft 時是否停止 FPS 限制\n(如停留在工作列或 Dock)",
|
||||
"config.dynamicfps.run_gc_on_unfocus.tooltip": "當 Minecraft 失去焦點時執行垃圾清理\n以減少一些記憶體",
|
||||
"config.dynamicfps.unfocused_volume.tooltip": "當 Minecraft 失去焦點時撥放的音量\n(如選擇了另一個視窗)",
|
||||
"config.dynamicfps.hidden_volume.tooltip": "遊戲在不可見時應該播放的音量\n(如最小化、被其他視窗覆蓋或在另一個虛擬桌面上)",
|
||||
"entity_texture_features.puzzle.emissive_type.brighter": "§e更亮",
|
||||
"entity_texture_features.puzzle.emissive_type.default": "§6預設"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user