Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b979d5ac61 | ||
|
|
12cdcba470 | ||
|
|
c9aa80f09f | ||
|
|
12015d6ba4 | ||
|
|
a8c89b11c7 | ||
|
|
f8ff656daa | ||
|
|
f89fc08505 | ||
|
|
94afc8b0c0 | ||
|
|
64aa45a370 | ||
|
|
05bea0aab1 | ||
|
|
fbb368989e |
13
build.gradle
@@ -1,6 +1,6 @@
|
|||||||
// Based on https://github.com/OnyxStudios/Cardinal-Components-API/blob/1.17/build.gradle
|
// Based on https://github.com/OnyxStudios/Cardinal-Components-API/blob/1.17/build.gradle
|
||||||
plugins {
|
plugins {
|
||||||
id "fabric-loom" version "0.12-SNAPSHOT" apply false
|
id "fabric-loom" version "1.1-SNAPSHOT" apply false
|
||||||
id "com.matthewprenger.cursegradle" version "1.4.0"
|
id "com.matthewprenger.cursegradle" version "1.4.0"
|
||||||
id "maven-publish"
|
id "maven-publish"
|
||||||
id "java-library"
|
id "java-library"
|
||||||
@@ -122,14 +122,19 @@ dependencies {
|
|||||||
}
|
}
|
||||||
modImplementation ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
|
modImplementation ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
|
||||||
modImplementation ("maven.modrinth:lambdynamiclights:${project.ldl_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:iris:${project.iris_version}")
|
||||||
modCompileOnly ("maven.modrinth:cit-resewn:${project.cit_resewn_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:animatica:${project.animatica_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:entitytexturefeatures:${project.entitytexturefeatures_version}")
|
||||||
modImplementation ("maven.modrinth:cem:${project.cem_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 ("maven.modrinth:exordium:${project.exordium_version}")
|
||||||
|
|
||||||
modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
|
modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
|
||||||
exclude group: 'com.google.code.gson'
|
exclude group: 'com.google.code.gson'
|
||||||
|
|||||||
@@ -1,31 +1,36 @@
|
|||||||
# Done to increase the memory available to gradle.
|
# Done to increase the memory available to gradle.
|
||||||
org.gradle.jvmargs=-Xmx1G
|
org.gradle.jvmargs=-Xmx4G
|
||||||
|
|
||||||
# Fabric Properties
|
# Fabric Properties
|
||||||
# check these on https://fabricmc.net/use
|
# check these on https://fabricmc.net/use
|
||||||
minecraft_version=1.19
|
minecraft_version=1.19.4-rc2
|
||||||
yarn_mappings=1.19+build.4
|
yarn_mappings=1.19.4-rc2+build.1
|
||||||
loader_version=0.14.8
|
loader_version=0.14.17
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version = 1.3.4
|
mod_version = 1.5.0+1.19.4
|
||||||
maven_group = net.puzzlemc
|
maven_group = net.puzzlemc
|
||||||
archives_base_name = puzzle
|
archives_base_name = puzzle
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
|
# 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.19
|
fabric_version=0.75.3+1.19.4
|
||||||
mod_menu_version = 4.0.0
|
mod_menu_version = 6.1.0-beta.3
|
||||||
|
midnightlib_version=1.2.1-fabric
|
||||||
|
|
||||||
cull_leaves_version = 2.3.3
|
cull_leaves_version = 3.0.2-fabric
|
||||||
ldl_version = 2.1.2+1.19
|
ldl_version = 2.2.0+1.19.3
|
||||||
lbg_version = 1.3.0+1.19
|
lbg_version = 1.3.0+1.19
|
||||||
iris_version = 1.19.x-v1.2.5
|
iris_version = 1.5.2+1.19.3
|
||||||
continuity_version = 2.0.0+1.19
|
continuity_version = 2.0.0+1.19
|
||||||
animatica_version = 0.5+1.19
|
animatica_version = 0.5+1.19
|
||||||
cit_resewn_version = 1.0.1+1.18.2
|
colormatic_version = 3.1.2
|
||||||
cem_version = 0.7.1-1.19
|
borderless_mining_version = 1.1.6+1.19.3
|
||||||
complete_config_version = 1.0.0
|
dynamic_fps_version = v2.2.0
|
||||||
spruceui_version=4.0.0+1.19
|
toml4j_version = 0.7.2
|
||||||
midnightlib_version=0.5.2
|
cit_resewn_version = 1.1.1+1.19
|
||||||
entitytexturefeatures_version=3.1.5
|
cem_version = 0.7.1-1.19.3
|
||||||
|
complete_config_version = 2.2.0
|
||||||
|
spruceui_version=4.1.0+1.19.3
|
||||||
|
entitytexturefeatures_version=4.2.0.1.fabric.1.19.3
|
||||||
|
exordium_version=1.0.3-1.19.4
|
||||||
|
|||||||
@@ -6,19 +6,19 @@ import java.util.ArrayList;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class PuzzleConfig extends MidnightConfig {
|
public class PuzzleConfig extends MidnightConfig {
|
||||||
@Entry public static List<String> disabledIntegrations = new ArrayList<>();
|
@Entry(category = "gui", name = "Disabled integrations") public static List<String> disabledIntegrations = new ArrayList<>();
|
||||||
@Entry public static boolean enablePuzzleButton = true;
|
@Entry(category = "gui", name = "Enable Puzzle button") public static boolean enablePuzzleButton = true;
|
||||||
@Entry public static boolean debugMessages = false;
|
@Entry(category = "debug", name = "Enable debug messages") public static boolean debugMessages = false;
|
||||||
|
|
||||||
@Entry public static boolean checkUpdates = true;
|
@Entry(category = "debug", name = "puzzle.option.check_for_updates") public static boolean checkUpdates = true;
|
||||||
@Entry public static boolean showPuzzleInfo = true;
|
@Entry(category = "gui", name = "puzzle.option.show_version_info") public static boolean showPuzzleInfo = true;
|
||||||
@Entry public static boolean resourcepackSplashScreen = true;
|
@Entry(category = "features", name = "puzzle.option.resourcepack_splash_screen") public static boolean resourcepackSplashScreen = true;
|
||||||
@Entry public static boolean unlimitedRotations = true;
|
@Entry(category = "features", name = "puzzle.option.unlimited_model_rotations") public static boolean unlimitedRotations = true;
|
||||||
@Entry public static boolean biggerModels = true;
|
@Entry(category = "features", name = "puzzle.option.bigger_custom_models") public static boolean biggerModels = true;
|
||||||
|
|
||||||
@Entry public static int backgroundColor = 15675965;
|
@Entry(category = "features", name = "Splash Background Color") public static int backgroundColor = 15675965;
|
||||||
@Entry public static int progressBarColor = 16777215;
|
@Entry(category = "features", name = "Splash Progress Bar Color") public static int progressBarColor = 16777215;
|
||||||
@Entry public static int progressBarBackgroundColor = 15675965;
|
@Entry(category = "features", name = "Splash Progress Bar Background Color") public static int progressBarBackgroundColor = 15675965;
|
||||||
@Entry public static int progressFrameColor = 16777215;
|
@Entry(category = "features", name = "Splash Progress Bar Frame Color") public static int progressFrameColor = 16777215;
|
||||||
@Entry public static boolean disableBlend = false;
|
@Entry(category = "features", name = "puzzle.option.better_splash_screen_blend") public static boolean disableBlend = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,59 +1,45 @@
|
|||||||
package net.puzzlemc.core.mixin;
|
package net.puzzlemc.core.mixin;
|
||||||
|
|
||||||
import net.fabricmc.loader.api.FabricLoader;
|
import net.minecraft.client.gui.widget.PressableTextWidget;
|
||||||
import net.puzzlemc.core.PuzzleCore;
|
import net.puzzlemc.core.PuzzleCore;
|
||||||
import net.puzzlemc.core.config.PuzzleConfig;
|
import net.puzzlemc.core.config.PuzzleConfig;
|
||||||
import net.puzzlemc.core.util.UpdateChecker;
|
import net.puzzlemc.core.util.UpdateChecker;
|
||||||
import net.minecraft.client.gui.screen.*;
|
import net.minecraft.client.gui.screen.*;
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.minecraft.util.Util;
|
import net.minecraft.util.Util;
|
||||||
import net.minecraft.util.math.MathHelper;
|
|
||||||
import org.spongepowered.asm.mixin.Final;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|
||||||
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
@Mixin(TitleScreen.class)
|
@Mixin(TitleScreen.class)
|
||||||
public abstract class MixinTitleScreen extends Screen {
|
public abstract class MixinTitleScreen extends Screen {
|
||||||
|
private final String versionText = PuzzleCore.version.replace("+", " for ");
|
||||||
@Shadow @Final private boolean doBackgroundFade;
|
|
||||||
@Shadow private long backgroundFadeStart;
|
|
||||||
private Text puzzleText;
|
|
||||||
private int puzzleTextWidth;
|
|
||||||
private int yOffset;
|
|
||||||
|
|
||||||
protected MixinTitleScreen(Text title) {
|
protected MixinTitleScreen(Text title) {
|
||||||
super(title);
|
super(title);
|
||||||
}
|
}
|
||||||
@Inject(at = @At("TAIL"), method = "init")
|
@Inject(at = @At("TAIL"), method = "init")
|
||||||
private void puzzle$init(CallbackInfo ci) {
|
private void puzzle$init(CallbackInfo ci) {
|
||||||
yOffset = 20;
|
int yOffset = 20;
|
||||||
if (FabricLoader.getInstance().isModLoaded("dashloader")) yOffset = yOffset + 10;
|
Text puzzleText;
|
||||||
if (UpdateChecker.isUpToDate) {
|
if (UpdateChecker.isUpToDate) {
|
||||||
puzzleText = Text.of(PuzzleCore.version);
|
puzzleText = Text.literal(versionText);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
puzzleText = Text.translatable("").append(Text.of(PuzzleCore.version + " | ")).append(Text.translatable("puzzle.text.update_available"));
|
puzzleText = Text.literal("").append(Text.of(versionText+" | ")).append(Text.translatable("puzzle.text.update_available"));
|
||||||
this.puzzleTextWidth = this.textRenderer.getWidth(puzzleText);
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(at = @At("TAIL"), method = "render")
|
|
||||||
private void puzzle$render(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
|
|
||||||
if (PuzzleConfig.showPuzzleInfo) {
|
if (PuzzleConfig.showPuzzleInfo) {
|
||||||
float f = this.doBackgroundFade ? (float) (Util.getMeasuringTimeMs() - this.backgroundFadeStart) / 1000.0F : 1.0F;
|
PressableTextWidget text = this.addDrawableChild(new PressableTextWidget(2, this.height - 12 - yOffset, this.textRenderer.getWidth(puzzleText), 10, puzzleText, (button) -> {
|
||||||
float g = this.doBackgroundFade ? MathHelper.clamp(f - 1.0F, 0.0F, 1.0F) : 1.0F;
|
if (Objects.requireNonNull(this.client).options.getChatLinksPrompt().getValue()) {
|
||||||
int l = MathHelper.ceil(g * 255.0F) << 24;
|
this.client.setScreen(new ConfirmLinkScreen(this::confirmLink, PuzzleCore.updateURL, true));
|
||||||
textRenderer.drawWithShadow(matrices, puzzleText,2,this.height - yOffset, 16777215 | l);
|
} else {
|
||||||
if (mouseX > 2 && mouseX < 2 + this.puzzleTextWidth && mouseY > this.height - yOffset && mouseY < this.height - yOffset + 10) {
|
Util.getOperatingSystem().open(PuzzleCore.updateURL);
|
||||||
fill(matrices, 2, this.height - yOffset + 9, 2 + this.puzzleTextWidth, this.height - yOffset + 10, 16777215 | l);
|
}
|
||||||
}
|
}, this.textRenderer));
|
||||||
|
if (UpdateChecker.isUpToDate) text.active = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -63,16 +49,4 @@ public abstract class MixinTitleScreen extends Screen {
|
|||||||
}
|
}
|
||||||
Objects.requireNonNull(this.client).setScreen(this);
|
Objects.requireNonNull(this.client).setScreen(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@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.getChatLinksPrompt().getValue()) {
|
|
||||||
this.client.setScreen(new ConfirmChatLinkScreen(this::confirmLink, PuzzleCore.updateURL, true));
|
|
||||||
} else {
|
|
||||||
Util.getOperatingSystem().open(PuzzleCore.updateURL);
|
|
||||||
}
|
|
||||||
cir.setReturnValue(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
|
|||||||
|
|
||||||
public class UpdateChecker {
|
public class UpdateChecker {
|
||||||
private static final Gson GSON = new Gson();
|
private static final Gson GSON = new Gson();
|
||||||
private static final String minecraftVersion = MinecraftClient.getInstance().getGame().getVersion().getId();
|
private static final String minecraftVersion = MinecraftClient.getInstance().getGameVersion();
|
||||||
public static final Logger logger = LogManager.getLogger(PuzzleCore.name);
|
public static final Logger logger = LogManager.getLogger(PuzzleCore.name);
|
||||||
|
|
||||||
public static final Type UPDATE_TYPE_TOKEN = new TypeToken<Map<String, String>>(){}.getType();
|
public static final Type UPDATE_TYPE_TOKEN = new TypeToken<Map<String, String>>(){}.getType();
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.8 KiB |
@@ -39,18 +39,22 @@ dependencies {
|
|||||||
modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}")
|
modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}")
|
||||||
modImplementation ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
|
modImplementation ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
|
||||||
modImplementation ("maven.modrinth:lambdynamiclights:${project.ldl_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:iris:${project.iris_version}")
|
||||||
modImplementation ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
|
modImplementation ("maven.modrinth:cit-resewn:${project.cit_resewn_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:entitytexturefeatures:${project.entitytexturefeatures_version}")
|
||||||
modImplementation ("maven.modrinth:cem:${project.cem_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 ("maven.modrinth:exordium:${project.exordium_version}")
|
||||||
|
|
||||||
modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
|
modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
|
||||||
exclude group: 'com.google.code.gson'
|
exclude group: 'com.google.code.gson'
|
||||||
exclude group: 'com.google.guava'
|
exclude group: 'com.google.guava'
|
||||||
}
|
}
|
||||||
modImplementation ("maven.modrinth:continuity:${project.continuity_version}") {
|
modCompileOnlyApi ("maven.modrinth:continuity:${project.continuity_version}") {
|
||||||
exclude module: "modmenu"
|
exclude module: "modmenu"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
package net.puzzlemc.gui;
|
package net.puzzlemc.gui;
|
||||||
|
|
||||||
|
import eu.midnightdust.lib.util.MidnightColorUtil;
|
||||||
import net.fabricmc.loader.api.FabricLoader;
|
import net.fabricmc.loader.api.FabricLoader;
|
||||||
import net.irisshaders.iris.api.v0.IrisApi;
|
import net.irisshaders.iris.api.v0.IrisApi;
|
||||||
import net.irisshaders.iris.api.v0.IrisApiConfig;
|
import net.irisshaders.iris.api.v0.IrisApiConfig;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
|
import net.minecraft.text.Style;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
||||||
|
|
||||||
@@ -12,11 +14,11 @@ public class IrisCompat {
|
|||||||
public static void init() {
|
public static void init() {
|
||||||
if (FabricLoader.getInstance().isModLoaded("iris")) {
|
if (FabricLoader.getInstance().isModLoaded("iris")) {
|
||||||
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("Iris")));
|
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("Iris")));
|
||||||
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("Enable Shaders"), (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();
|
IrisApiConfig irisConfig = IrisApi.getInstance().getConfig();
|
||||||
irisConfig.setShadersEnabledAndApply(!irisConfig.areShadersEnabled());
|
irisConfig.setShadersEnabledAndApply(!irisConfig.areShadersEnabled());
|
||||||
}));
|
}));
|
||||||
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("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.literal("➥ ").append(Text.translatable("iris.puzzle.option.open").setStyle(Style.EMPTY.withColor(MidnightColorUtil.radialRainbow(0.5f, 1).getRGB())))), (button) -> {
|
||||||
MinecraftClient client = MinecraftClient.getInstance();
|
MinecraftClient client = MinecraftClient.getInstance();
|
||||||
client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(client.currentScreen));
|
client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(client.currentScreen));
|
||||||
}));
|
}));
|
||||||
|
|||||||
@@ -4,8 +4,17 @@ import dev.lambdaurora.lambdabettergrass.LBGConfig;
|
|||||||
import dev.lambdaurora.lambdabettergrass.LambdaBetterGrass;
|
import dev.lambdaurora.lambdabettergrass.LambdaBetterGrass;
|
||||||
import dev.lambdaurora.lambdynlights.DynamicLightsConfig;
|
import dev.lambdaurora.lambdynlights.DynamicLightsConfig;
|
||||||
import dev.lambdaurora.lambdynlights.LambDynLights;
|
import dev.lambdaurora.lambdynlights.LambDynLights;
|
||||||
|
import dev.tr7zw.exordium.Config;
|
||||||
|
import dev.tr7zw.exordium.ExordiumMod;
|
||||||
|
import dev.tr7zw.exordium.ExordiumModBase;
|
||||||
|
import dynamicfps.DynamicFPSConfig;
|
||||||
|
import dynamicfps.DynamicFPSMod;
|
||||||
|
import eu.midnightdust.core.MidnightLibClient;
|
||||||
import eu.midnightdust.cullleaves.config.CullLeavesConfig;
|
import eu.midnightdust.cullleaves.config.CullLeavesConfig;
|
||||||
import eu.midnightdust.lib.config.AutoModMenu;
|
import eu.midnightdust.lib.util.PlatformFunctions;
|
||||||
|
import io.github.kvverti.colormatic.Colormatic;
|
||||||
|
import io.github.kvverti.colormatic.ColormaticConfigController;
|
||||||
|
import link.infra.borderlessmining.config.ConfigHandler;
|
||||||
import me.pepperbell.continuity.client.config.ContinuityConfig;
|
import me.pepperbell.continuity.client.config.ContinuityConfig;
|
||||||
import me.pepperbell.continuity.client.config.Option;
|
import me.pepperbell.continuity.client.config.Option;
|
||||||
import net.dorianpb.cem.internal.config.CemConfig;
|
import net.dorianpb.cem.internal.config.CemConfig;
|
||||||
@@ -21,9 +30,10 @@ import net.minecraft.text.Text;
|
|||||||
import net.minecraft.util.Formatting;
|
import net.minecraft.util.Formatting;
|
||||||
import net.puzzlemc.splashscreen.PuzzleSplashScreen;
|
import net.puzzlemc.splashscreen.PuzzleSplashScreen;
|
||||||
import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
|
import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
|
||||||
import traben.entity_texture_features.client.ETFClient;
|
import traben.entity_texture_features.ETFApi;
|
||||||
import traben.entity_texture_features.config.ETFConfig;
|
import traben.entity_texture_features.config.ETFConfig;
|
||||||
import traben.entity_texture_features.config.ETFConfigScreen;
|
import io.github.kvverti.colormatic.ColormaticConfig;
|
||||||
|
import traben.entity_texture_features.texture_handlers.ETFManager;
|
||||||
|
|
||||||
public class PuzzleClient implements ClientModInitializer {
|
public class PuzzleClient implements ClientModInitializer {
|
||||||
|
|
||||||
@@ -33,6 +43,7 @@ public class PuzzleClient implements ClientModInitializer {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onInitializeClient() {
|
public void onInitializeClient() {
|
||||||
|
MidnightLibClient.hiddenMods.add("puzzle");
|
||||||
MinecraftClient client = MinecraftClient.getInstance();
|
MinecraftClient client = MinecraftClient.getInstance();
|
||||||
PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Puzzle")));
|
PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Puzzle")));
|
||||||
PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("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) -> {
|
||||||
@@ -47,7 +58,7 @@ public class PuzzleClient implements ClientModInitializer {
|
|||||||
client.setScreen(PuzzleConfig.getScreen(client.currentScreen, "puzzle"));
|
client.setScreen(PuzzleConfig.getScreen(client.currentScreen, "puzzle"));
|
||||||
}));
|
}));
|
||||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Puzzle")));
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Puzzle")));
|
||||||
if (FabricLoader.getInstance().isModLoaded("puzzle-splashscreen") && !PuzzleConfig.disabledIntegrations.contains("puzzle-splashscreen")) {
|
if (isActive("puzzle-splashscreen")) {
|
||||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("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.resourcepackSplashScreen = !PuzzleConfig.resourcepackSplashScreen;
|
||||||
PuzzleConfig.write(id);
|
PuzzleConfig.write(id);
|
||||||
@@ -55,7 +66,7 @@ public class PuzzleClient implements ClientModInitializer {
|
|||||||
MinecraftClient.getInstance().getTextureManager().registerTexture(PuzzleSplashScreen.LOGO, new PuzzleSplashScreen.LogoTexture(PuzzleSplashScreen.LOGO));
|
MinecraftClient.getInstance().getTextureManager().registerTexture(PuzzleSplashScreen.LOGO, new PuzzleSplashScreen.LogoTexture(PuzzleSplashScreen.LOGO));
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
if (FabricLoader.getInstance().isModLoaded("puzzle-models") && !PuzzleConfig.disabledIntegrations.contains("puzzle-models")) {
|
if (isActive("puzzle-models")) {
|
||||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("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.unlimitedRotations = !PuzzleConfig.unlimitedRotations;
|
||||||
PuzzleConfig.write(id);
|
PuzzleConfig.write(id);
|
||||||
@@ -65,21 +76,111 @@ public class PuzzleClient implements ClientModInitializer {
|
|||||||
PuzzleConfig.write(id);
|
PuzzleConfig.write(id);
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
if (FabricLoader.getInstance().isModLoaded("cullleaves") && !PuzzleConfig.disabledIntegrations.contains("cullleaves")) {
|
if (isActive("cullleaves")) {
|
||||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("CullLeaves")));
|
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("CullLeaves")));
|
||||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("Cull Leaves"), (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.enabled = !CullLeavesConfig.enabled;
|
||||||
CullLeavesConfig.write("cullleaves");
|
CullLeavesConfig.write("cullleaves");
|
||||||
MinecraftClient.getInstance().worldRenderer.reload();
|
MinecraftClient.getInstance().worldRenderer.reload();
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
if (FabricLoader.getInstance().isModLoaded("iris") && !PuzzleConfig.disabledIntegrations.contains("iris")) {
|
if (isActive("colormatic")) {
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Colormatic")));
|
||||||
|
ColormaticConfig colormaticConfig = Colormatic.config();
|
||||||
|
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(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(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(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, Text.translatable("colormatic.config.option.relativeBlockLightIntensity"),
|
||||||
|
() -> (int) (100*(1.0 - colormaticConfig.relativeBlockLightIntensityExponent / -16.0)),
|
||||||
|
(button) -> button.setMessage(Text.translatable("colormatic.config.option.relativeBlockLightIntensity")
|
||||||
|
.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);
|
||||||
|
ColormaticConfigController.persist(colormaticConfig);
|
||||||
|
}
|
||||||
|
catch (NumberFormatException ignored) {}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
if (isActive("dynamicfps")) {
|
||||||
|
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("Dynamic FPS")));
|
||||||
|
DynamicFPSConfig fpsConfig = DynamicFPSMod.config;
|
||||||
|
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,Text.translatable("config.dynamicfps.unfocused_fps"), () -> fpsConfig.unfocusedFPS,
|
||||||
|
(button) -> button.setMessage(Text.of(fpsConfig.unfocusedFPS + " FPS")),
|
||||||
|
(slider) -> {
|
||||||
|
try {
|
||||||
|
fpsConfig.unfocusedFPS = slider.getInt();
|
||||||
|
}
|
||||||
|
catch (NumberFormatException ignored) {}
|
||||||
|
finally {fpsConfig.save();}
|
||||||
|
}));
|
||||||
|
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(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,Text.translatable("config.dynamicfps.unfocused_volume"), () -> ((Number)(fpsConfig.unfocusedVolumeMultiplier * 100)).intValue(),
|
||||||
|
(button) -> button.setMessage(Text.of(((Number)(fpsConfig.unfocusedVolumeMultiplier * 100)).intValue() + "%")),
|
||||||
|
(slider) -> {
|
||||||
|
try {
|
||||||
|
fpsConfig.unfocusedVolumeMultiplier = ((Number)slider.getInt()).floatValue() / 100;
|
||||||
|
}
|
||||||
|
catch (NumberFormatException ignored) {}
|
||||||
|
finally {fpsConfig.save();}
|
||||||
|
}));
|
||||||
|
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 {
|
||||||
|
fpsConfig.hiddenVolumeMultiplier = ((Number)slider.getInt()).floatValue() / 100;
|
||||||
|
}
|
||||||
|
catch (NumberFormatException ignored) {}
|
||||||
|
finally {fpsConfig.save();}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
if (isActive("borderlessmining")) {
|
||||||
|
PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Borderless Mining")));
|
||||||
|
ConfigHandler bmConfig = ConfigHandler.getInstance();
|
||||||
|
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(Text.translatable("config.borderlessmining.general.enabledmac"), (button) -> button.setMessage(bmConfig.enableMacOS ? YES : NO), (button) -> {
|
||||||
|
bmConfig.enableMacOS = !bmConfig.enableMacOS;
|
||||||
|
bmConfig.setEnabledPending(bmConfig.isEnabled());
|
||||||
|
bmConfig.save();
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (isActive("iris")) {
|
||||||
IrisCompat.init();
|
IrisCompat.init();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public static boolean lateInitDone = false;
|
public static boolean lateInitDone = false;
|
||||||
public static void lateInit() { // Some mods are initialized after Puzzle, so we can't access them in our ClientModInitializer
|
public static void lateInit() { // Some mods are initialized after Puzzle, so we can't access them in our ClientModInitializer
|
||||||
if (FabricLoader.getInstance().isModLoaded("lambdynlights") && !PuzzleConfig.disabledIntegrations.contains("lambdynlights")) {
|
if (isActive("lambdynlights")) {
|
||||||
DynamicLightsConfig ldlConfig = LambDynLights.get().config;
|
DynamicLightsConfig ldlConfig = LambDynLights.get().config;
|
||||||
|
|
||||||
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambDynamicLights")));
|
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambDynamicLights")));
|
||||||
@@ -90,7 +191,7 @@ public class PuzzleClient implements ClientModInitializer {
|
|||||||
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("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())));
|
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) {
|
if (isActive("citresewn") && CITResewnConfig.INSTANCE != null) {
|
||||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("CIT Resewn")));
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("CIT Resewn")));
|
||||||
CITResewnConfig citConfig = CITResewnConfig.INSTANCE;
|
CITResewnConfig citConfig = CITResewnConfig.INSTANCE;
|
||||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("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) -> {
|
||||||
@@ -110,7 +211,7 @@ public class PuzzleClient implements ClientModInitializer {
|
|||||||
citConfig.broken_paths = !citConfig.broken_paths;
|
citConfig.broken_paths = !citConfig.broken_paths;
|
||||||
citConfig.write();
|
citConfig.write();
|
||||||
}));
|
}));
|
||||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100,Text.translatable("config.citresewn.cache_ms.title"), (slider) -> slider.setInt(citConfig.cache_ms),
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100,Text.translatable("config.citresewn.cache_ms.title"), () -> citConfig.cache_ms,
|
||||||
(button) -> button.setMessage(message(citConfig)),
|
(button) -> button.setMessage(message(citConfig)),
|
||||||
(slider) -> {
|
(slider) -> {
|
||||||
try {
|
try {
|
||||||
@@ -120,13 +221,13 @@ public class PuzzleClient implements ClientModInitializer {
|
|||||||
citConfig.write();
|
citConfig.write();
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
if (FabricLoader.getInstance().isModLoaded("lambdabettergrass") && !PuzzleConfig.disabledIntegrations.contains("lambdabettergrass")) {
|
if (isActive("lambdabettergrass")) {
|
||||||
LBGConfig lbgConfig = LambdaBetterGrass.get().config;
|
LBGConfig lbgConfig = LambdaBetterGrass.get().config;
|
||||||
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambdaBetterGrass")));
|
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambdaBetterGrass")));
|
||||||
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.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())));
|
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")) {
|
if (isActive("cem") && FabricLoader.getInstance().isModLoaded("completeconfig")) {
|
||||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Custom Entity Models")));
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Custom Entity Models")));
|
||||||
CemConfig cemConfig = (CemConfig) CemConfigFairy.getConfig();
|
CemConfig cemConfig = (CemConfig) CemConfigFairy.getConfig();
|
||||||
CemOptions cemOptions = CemConfigFairy.getConfig();
|
CemOptions cemOptions = CemConfigFairy.getConfig();
|
||||||
@@ -143,7 +244,7 @@ public class PuzzleClient implements ClientModInitializer {
|
|||||||
cemConfig.save();
|
cemConfig.save();
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
if (FabricLoader.getInstance().isModLoaded("continuity") && !PuzzleConfig.disabledIntegrations.contains("continuity")) {
|
if (isActive("continuity")) {
|
||||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Continuity")));
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Continuity")));
|
||||||
ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
|
ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
|
||||||
contConfig.getOptionMapView().forEach((s, option) -> {
|
contConfig.getOptionMapView().forEach((s, option) -> {
|
||||||
@@ -158,34 +259,61 @@ public class PuzzleClient implements ClientModInitializer {
|
|||||||
} catch (Exception ignored) {}
|
} catch (Exception ignored) {}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (FabricLoader.getInstance().isModLoaded("entity_texture_features") && !PuzzleConfig.disabledIntegrations.contains("entity_texture_features")) {
|
if (isActive("entity_texture_features")) {
|
||||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.etf.title")));
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.title")));
|
||||||
ETFConfig etfConfig = ETFClient.ETFConfigData;
|
ETFConfig etfConfig = ETFApi.getETFConfigObject;
|
||||||
ETFConfigScreen etfConfigScreen = new ETFConfigScreen();
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.enable_custom_textures.title"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> {
|
||||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.etf.enable_custom_textures.title"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> {
|
|
||||||
etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures;
|
etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures;
|
||||||
etfConfigScreen.saveConfig();
|
ETFApi.saveETFConfigChangesAndResetETF();
|
||||||
etfConfigScreen.resetVisuals();
|
|
||||||
}));
|
}));
|
||||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.etf.enable_emissive_textures.title"), (button) -> button.setMessage(etfConfig.enableEmissiveTextures ? YES : NO), (button) -> {
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.enable_emissive_textures.title"), (button) -> button.setMessage(etfConfig.enableEmissiveTextures ? YES : NO), (button) -> {
|
||||||
etfConfig.enableEmissiveTextures = !etfConfig.enableEmissiveTextures;
|
etfConfig.enableEmissiveTextures = !etfConfig.enableEmissiveTextures;
|
||||||
etfConfigScreen.saveConfig();
|
ETFApi.saveETFConfigChangesAndResetETF();
|
||||||
etfConfigScreen.resetVisuals();
|
|
||||||
}));
|
}));
|
||||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Emissive Texture Rendering Mode"), (button) -> button.setMessage(etfConfig.fullBrightEmissives ? Text.of("Brighter") : Text.of("Default")), (button) -> {
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.emissive_mode.title"), (button) -> button.setMessage(
|
||||||
etfConfig.fullBrightEmissives = !etfConfig.fullBrightEmissives ;
|
Text.literal(etfConfig.emissiveRenderMode.toString())), (button) -> {
|
||||||
etfConfigScreen.saveConfig();
|
etfConfig.emissiveRenderMode = etfConfig.emissiveRenderMode.next();
|
||||||
etfConfigScreen.resetVisuals();
|
ETFApi.saveETFConfigChangesAndResetETF();
|
||||||
}));
|
}));
|
||||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.etf.blinking_mob_settings.title"), (button) -> button.setMessage(etfConfig.enableBlinking ? YES : NO), (button) -> {
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.blinking_mob_settings.title"), (button) -> button.setMessage(etfConfig.enableBlinking ? YES : NO), (button) -> {
|
||||||
etfConfig.enableBlinking = !etfConfig.enableBlinking;
|
etfConfig.enableBlinking = !etfConfig.enableBlinking;
|
||||||
etfConfigScreen.saveConfig();
|
ETFApi.saveETFConfigChangesAndResetETF();
|
||||||
etfConfigScreen.resetVisuals();
|
|
||||||
}));
|
}));
|
||||||
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Enable Player Skin Features"), (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;
|
etfConfig.skinFeaturesEnabled = !etfConfig.skinFeaturesEnabled;
|
||||||
etfConfigScreen.saveConfig();
|
ETFApi.saveETFConfigChangesAndResetETF();
|
||||||
etfConfigScreen.resetVisuals();
|
}));
|
||||||
|
}
|
||||||
|
if (isActive("exordium")) {
|
||||||
|
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("text.exordium.title")));
|
||||||
|
Config exordiumConfig = ExordiumModBase.instance.config;
|
||||||
|
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("text.exordium.enableGui"), (button) -> button.setMessage(exordiumConfig.enabledGui ? YES : NO), (button) -> {
|
||||||
|
exordiumConfig.enabledGui = !exordiumConfig.enabledGui;
|
||||||
|
ExordiumModBase.instance.writeConfig();
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(5, 60, Text.translatable("text.exordium.targetFramerateGui"), () -> exordiumConfig.targetFPSIngameGui, (button) -> button.setMessage(Text.literal(exordiumConfig.targetFPSIngameGui+"")), (slider) -> {
|
||||||
|
exordiumConfig.targetFPSIngameGui = slider.getInt();
|
||||||
|
ExordiumModBase.instance.writeConfig();
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("text.exordium.enabledGuiAnimationSpeedup"), (button) -> button.setMessage(exordiumConfig.enabledGuiAnimationSpeedup ? YES : NO), (button) -> {
|
||||||
|
exordiumConfig.enabledGuiAnimationSpeedup = !exordiumConfig.enabledGuiAnimationSpeedup;
|
||||||
|
ExordiumModBase.instance.writeConfig();
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(30, 120, Text.translatable("text.exordium.targetFPSIngameGuiAnimated"), () -> exordiumConfig.targetFPSIngameGuiAnimated, (button) -> button.setMessage(Text.literal(exordiumConfig.targetFPSIngameGuiAnimated+"")), (slider) -> {
|
||||||
|
exordiumConfig.targetFPSIngameGuiAnimated = slider.getInt();
|
||||||
|
ExordiumModBase.instance.writeConfig();
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("text.exordium.enableNametagScreenBuffering"), (button) -> button.setMessage(exordiumConfig.enableNametagScreenBuffering ? YES : NO), (button) -> {
|
||||||
|
exordiumConfig.enableNametagScreenBuffering = !exordiumConfig.enableNametagScreenBuffering;
|
||||||
|
ExordiumModBase.instance.writeConfig();
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(30, 80, Text.translatable("text.exordium.targetFPSNameTags"), () -> exordiumConfig.targetFPSNameTags, (button) -> button.setMessage(Text.literal(exordiumConfig.targetFPSNameTags+"")), (slider) -> {
|
||||||
|
exordiumConfig.targetFPSNameTags = slider.getInt();
|
||||||
|
ExordiumModBase.instance.writeConfig();
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("text.exordium.enableSignBuffering"), (button) -> button.setMessage(exordiumConfig.enableSignBuffering ? YES : NO), (button) -> {
|
||||||
|
exordiumConfig.enableSignBuffering = !exordiumConfig.enableSignBuffering;
|
||||||
|
ExordiumModBase.instance.writeConfig();
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
lateInitDone = true;
|
lateInitDone = true;
|
||||||
@@ -215,4 +343,7 @@ public class PuzzleClient implements ClientModInitializer {
|
|||||||
return (Text.translatable("config.citresewn.cache_ms.ticks.any", ticks)).formatted(color);
|
return (Text.translatable("config.citresewn.cache_ms.ticks.any", ticks)).formatted(color);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public static boolean isActive(String modid) {
|
||||||
|
return PlatformFunctions.isModLoaded(modid) && !PuzzleConfig.disabledIntegrations.contains(modid);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
package net.puzzlemc.gui.screen;
|
|
||||||
|
|
||||||
import net.coderbot.iris.gui.screen.ShaderPackScreen;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.gui.DrawableHelper;
|
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
|
||||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
|
||||||
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
public class IrisButton extends DrawableHelper {
|
|
||||||
public static ButtonWidget getButton(int x, int y, int width, int height, Screen parent, MinecraftClient client) {
|
|
||||||
ShaderPackScreen shaderPackPage = new ShaderPackScreen(parent);
|
|
||||||
return new ButtonWidget(x, y, width, height, shaderPackPage.getTitle().copy().append("..."), (button) ->
|
|
||||||
Objects.requireNonNull(client).setScreen(shaderPackPage));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
package net.puzzlemc.gui.screen;
|
|
||||||
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
|
|
||||||
public class LoadingScreenBackgrond {
|
|
||||||
public static void render(MinecraftClient client, MatrixStack matrices, int width, int height, float delta) {
|
|
||||||
// if (client.world != null) {
|
|
||||||
// LogManager.getLogManager().getLogger("Puzzle").info(client.world.getDimension().toString());
|
|
||||||
// }
|
|
||||||
// client.getTextureManager().bindTexture(new Identifier("minecraft","optifine/gui/loading/background0.png"));
|
|
||||||
// DrawableHelper.drawTexture(matrices,0,0,width,height,0,0,width,height,width,height);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +1,33 @@
|
|||||||
package net.puzzlemc.gui.screen;
|
package net.puzzlemc.gui.screen;
|
||||||
|
|
||||||
|
import com.google.common.collect.Lists;
|
||||||
|
import net.minecraft.client.gui.tab.GridScreenTab;
|
||||||
|
import net.minecraft.client.gui.tab.Tab;
|
||||||
|
import net.minecraft.client.gui.tab.TabManager;
|
||||||
|
import net.minecraft.client.gui.widget.TabNavigationWidget;
|
||||||
import net.minecraft.screen.ScreenTexts;
|
import net.minecraft.screen.ScreenTexts;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
|
import net.puzzlemc.gui.PuzzleApi;
|
||||||
import net.puzzlemc.gui.PuzzleClient;
|
import net.puzzlemc.gui.PuzzleClient;
|
||||||
import net.puzzlemc.gui.screen.page.GraphicsPage;
|
import net.puzzlemc.gui.screen.widget.PuzzleOptionListWidget;
|
||||||
import net.puzzlemc.gui.screen.page.MiscPage;
|
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
||||||
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.Screen;
|
||||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
import net.minecraft.client.gui.widget.ButtonWidget;
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
import net.minecraft.client.util.math.MatrixStack;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
public class PuzzleOptionsScreen extends Screen {
|
public class PuzzleOptionsScreen extends Screen {
|
||||||
|
public PuzzleOptionListWidget list;
|
||||||
|
public List<Text> tooltip = null;
|
||||||
|
public TabManager tabManager = new TabManager(a -> {}, a -> {});
|
||||||
|
public Tab prevTab;
|
||||||
|
public TabNavigationWidget tabNavigation;
|
||||||
|
public static Text graphicsTab = Text.translatable("puzzle.page.graphics");
|
||||||
|
public static Text miscTab = Text.translatable("puzzle.page.misc");
|
||||||
|
public static Text performanceTab = Text.translatable("puzzle.page.performance");
|
||||||
|
public static Text resourcesTab = Text.translatable("puzzle.page.resources");
|
||||||
|
|
||||||
public PuzzleOptionsScreen(Screen parent) {
|
public PuzzleOptionsScreen(Screen parent) {
|
||||||
super(Text.translatable("puzzle.screen.title"));
|
super(Text.translatable("puzzle.screen.title"));
|
||||||
@@ -23,28 +37,67 @@ public class PuzzleOptionsScreen extends Screen {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void init() {
|
protected void init() {
|
||||||
super.init();
|
|
||||||
if (!PuzzleClient.lateInitDone) PuzzleClient.lateInit();
|
if (!PuzzleClient.lateInitDone) PuzzleClient.lateInit();
|
||||||
GraphicsPage graphicsPage = new GraphicsPage(this);
|
|
||||||
MiscPage miscPage = new MiscPage(this);
|
|
||||||
PerformancePage performancePage = new PerformancePage(this);
|
|
||||||
ResourcesPage resourcesPage = new ResourcesPage(this);
|
|
||||||
|
|
||||||
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)));
|
List<Tab> tabs = Lists.newArrayList();
|
||||||
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.GRAPHICS_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(graphicsTab));
|
||||||
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.RESOURCE_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(resourcesTab));
|
||||||
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)));
|
if (!PuzzleApi.PERFORMANCE_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(performanceTab));
|
||||||
// if (FabricLoader.getInstance().isModLoaded("iris")) {
|
if (!PuzzleApi.MISC_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(miscTab));
|
||||||
// this.addDrawableChild(IrisButton.getButton(this.width / 2 - 155, this.height / 6 + 96 - 6, 310, 20, this, client));
|
|
||||||
// }
|
tabNavigation = TabNavigationWidget.builder(tabManager, this.width).tabs(tabs.toArray(new Tab[0])).build();
|
||||||
this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height / 6 + 168, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
|
if (tabs.size() > 1) this.addDrawableChild(tabNavigation);
|
||||||
|
tabNavigation.selectTab(0, false);
|
||||||
|
tabNavigation.init();
|
||||||
|
prevTab = tabManager.getCurrentTab();
|
||||||
|
this.addDrawableChild(tabNavigation);
|
||||||
|
this.list = new PuzzleOptionListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
|
||||||
|
fillList();
|
||||||
|
this.addSelectableChild(this.list);
|
||||||
|
|
||||||
|
super.init();
|
||||||
|
|
||||||
|
this.addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)).dimensions(this.width / 2 - 100, this.height - 28, 200, 20).build());
|
||||||
|
}
|
||||||
|
private void fillList() {
|
||||||
|
List<PuzzleWidget> options = List.of();
|
||||||
|
if (tabManager.getCurrentTab() == null) return;
|
||||||
|
else if (tabManager.getCurrentTab().getTitle().equals(graphicsTab)) options = PuzzleApi.GRAPHICS_OPTIONS;
|
||||||
|
else if (tabManager.getCurrentTab().getTitle().equals(miscTab)) options = PuzzleApi.MISC_OPTIONS;
|
||||||
|
else if (tabManager.getCurrentTab().getTitle().equals(performanceTab)) options = PuzzleApi.PERFORMANCE_OPTIONS;
|
||||||
|
else if (tabManager.getCurrentTab().getTitle().equals(resourcesTab)) options = PuzzleApi.RESOURCE_OPTIONS;
|
||||||
|
list.addAll(options);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
|
||||||
|
if (this.tabNavigation.trySwitchTabsWithKey(keyCode)) return true;
|
||||||
|
return super.keyPressed(keyCode, scanCode, modifiers);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void tick() {
|
||||||
|
super.tick();
|
||||||
|
if (prevTab != null && prevTab != tabManager.getCurrentTab()) {
|
||||||
|
prevTab = tabManager.getCurrentTab();
|
||||||
|
this.list.clear();
|
||||||
|
fillList();
|
||||||
|
list.setScrollAmount(0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
|
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
|
||||||
this.renderBackground(matrices);
|
this.renderBackground(matrices);
|
||||||
|
if (client != null && client.world != null) this.list.setRenderBackground(false);
|
||||||
|
this.list.render(matrices, mouseX, mouseY, delta);
|
||||||
|
|
||||||
|
drawCenteredTextWithShadow(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
|
||||||
super.render(matrices, mouseX, mouseY, delta);
|
super.render(matrices, mouseX, mouseY, delta);
|
||||||
drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
|
if (tooltip != null) {
|
||||||
|
if (this.list.getFocused() != null && (this.list.getHoveredEntry() == null || this.list.getHoveredEntry().button == null || !this.list.getHoveredEntry().button.isMouseOver(mouseX, mouseY))) {
|
||||||
|
renderTooltip(matrices, tooltip, this.list.getFocused().getX(), this.list.getFocused().getY() + (this.list.getFocused().getHeight() * 2));
|
||||||
|
}
|
||||||
|
else renderTooltip(matrices, tooltip, mouseX, mouseY);
|
||||||
|
}
|
||||||
|
tooltip = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,45 +0,0 @@
|
|||||||
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.widget.ButtonWidget;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
public abstract class AbstractPuzzleOptionsPage extends Screen {
|
|
||||||
private PuzzleOptionListWidget list;
|
|
||||||
private final List<PuzzleWidget> options;
|
|
||||||
|
|
||||||
public AbstractPuzzleOptionsPage(Screen parent, Text title, List<PuzzleWidget> options) {
|
|
||||||
super(title);
|
|
||||||
this.parent = parent;
|
|
||||||
this.options = options;
|
|
||||||
}
|
|
||||||
private final Screen parent;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void init() {
|
|
||||||
this.list = new PuzzleOptionListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
|
|
||||||
list.addAll(options);
|
|
||||||
this.addSelectableChild(this.list);
|
|
||||||
|
|
||||||
super.init();
|
|
||||||
|
|
||||||
this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
|
|
||||||
this.renderBackground(matrices);
|
|
||||||
if (client != null && client.world != null) this.list.setRenderBackground(false);
|
|
||||||
this.list.render(matrices, mouseX, mouseY, delta);
|
|
||||||
|
|
||||||
drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
|
|
||||||
super.render(matrices, mouseX, mouseY, delta);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
package net.puzzlemc.gui.screen.page;
|
|
||||||
|
|
||||||
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, Text.translatable("puzzle.page.graphics"), PuzzleApi.GRAPHICS_OPTIONS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
package net.puzzlemc.gui.screen.page;
|
|
||||||
|
|
||||||
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, Text.translatable("puzzle.page.misc"), PuzzleApi.MISC_OPTIONS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
package net.puzzlemc.gui.screen.page;
|
|
||||||
|
|
||||||
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, Text.translatable("puzzle.page.performance"), PuzzleApi.PERFORMANCE_OPTIONS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
package net.puzzlemc.gui.screen.page;
|
|
||||||
|
|
||||||
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, 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.client.util.math.MatrixStack;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
|
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
public class PuzzleButtonWidget extends ButtonWidget {
|
public class PuzzleButtonWidget extends ButtonWidget {
|
||||||
private final PuzzleWidget.TextAction title;
|
private final PuzzleWidget.TextAction title;
|
||||||
|
|
||||||
public PuzzleButtonWidget(int x, int y, int width, int height, PuzzleWidget.TextAction title, PressAction onPress) {
|
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;
|
this.title = title;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -8,8 +8,11 @@ import net.minecraft.client.gui.Element;
|
|||||||
import net.minecraft.client.gui.Selectable;
|
import net.minecraft.client.gui.Selectable;
|
||||||
import net.minecraft.client.gui.widget.ClickableWidget;
|
import net.minecraft.client.gui.widget.ClickableWidget;
|
||||||
import net.minecraft.client.gui.widget.ElementListWidget;
|
import net.minecraft.client.gui.widget.ElementListWidget;
|
||||||
|
import net.minecraft.client.resource.language.I18n;
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
import net.minecraft.client.util.math.MatrixStack;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
|
import net.minecraft.text.TranslatableTextContent;
|
||||||
|
import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -35,7 +38,7 @@ public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWi
|
|||||||
} else if (button.buttonType == ButtonType.BUTTON) {
|
} else if (button.buttonType == ButtonType.BUTTON) {
|
||||||
this.addButton(new PuzzleButtonWidget(this.width / 2 + 25, 0, 150, 20, button.buttonTextAction, button.onPress), button.descriptionText);
|
this.addButton(new PuzzleButtonWidget(this.width / 2 + 25, 0, 150, 20, button.buttonTextAction, button.onPress), button.descriptionText);
|
||||||
} else if (button.buttonType == ButtonType.SLIDER) {
|
} else if (button.buttonType == ButtonType.SLIDER) {
|
||||||
this.addButton(new PuzzleSliderWidget(button.min, button.max, this.width / 2 + 25, 0, 150, 20, button.setSliderValue, button.buttonTextAction, button.changeSliderValue), button.descriptionText);
|
this.addButton(new PuzzleSliderWidget(button.min, button.max, this.width / 2 + 25, 0, 150, 20, button.defaultSliderValue.getAsInt(), button.buttonTextAction, button.changeSliderValue), button.descriptionText);
|
||||||
} else if (button.buttonType == ButtonType.TEXT_FIELD) {
|
} else if (button.buttonType == ButtonType.TEXT_FIELD) {
|
||||||
this.addButton(new PuzzleTextFieldWidget(textRenderer, this.width / 2 + 25, 0, 150, 20, button.setTextValue, button.changeTextValue), button.descriptionText);
|
this.addButton(new PuzzleTextFieldWidget(textRenderer, this.width / 2 + 25, 0, 150, 20, button.setTextValue, button.changeTextValue), button.descriptionText);
|
||||||
} else
|
} else
|
||||||
@@ -43,6 +46,9 @@ public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void clear() {
|
||||||
|
super.clearEntries();
|
||||||
|
}
|
||||||
public int getRowWidth() {
|
public int getRowWidth() {
|
||||||
return 400;
|
return 400;
|
||||||
}
|
}
|
||||||
@@ -51,15 +57,21 @@ public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWi
|
|||||||
return super.getScrollbarPositionX() + 60;
|
return super.getScrollbarPositionX() + 60;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ButtonEntry getHoveredEntry() {
|
||||||
|
return super.getHoveredEntry();
|
||||||
|
}
|
||||||
|
|
||||||
public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
|
public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
|
||||||
private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
|
private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
|
||||||
private List<ClickableWidget> buttons = new ArrayList<>();
|
private List<ClickableWidget> buttons = new ArrayList<>();
|
||||||
private final ClickableWidget button;
|
public final ClickableWidget button;
|
||||||
private final Text text;
|
public final Text text;
|
||||||
|
private MinecraftClient client = MinecraftClient.getInstance();
|
||||||
|
|
||||||
private ButtonEntry(ClickableWidget button, Text text) {
|
private ButtonEntry(ClickableWidget button, Text text) {
|
||||||
if (button != null)
|
if (button != null)
|
||||||
this.buttons.add(button);
|
this.buttons.add(button);
|
||||||
this.button = button;
|
this.button = button;
|
||||||
this.text = text;
|
this.text = text;
|
||||||
}
|
}
|
||||||
@@ -70,11 +82,42 @@ 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) {
|
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) {
|
if (button != null) {
|
||||||
button.y = y;
|
button.setY(y);
|
||||||
button.render(matrices, mouseX, mouseY, tickDelta);
|
button.render(matrices, mouseX, mouseY, tickDelta);
|
||||||
}
|
}
|
||||||
if (button == null) drawCenteredText(matrices,textRenderer, Text.literal("------ ").append(text).append(" ------"),x + 200,y+5,0xFFFFFF);
|
if (button == null) drawCenteredTextWithShadow(matrices,textRenderer, Text.literal("------ ").append(text).append(" ------"),x + 200,y+5,0xFFFFFF);
|
||||||
else drawTextWithShadow(matrices,textRenderer, text,x+15,y+5,0xFFFFFF);
|
else drawTextWithShadow(matrices,textRenderer, text,x+15,y+5,0xFFFFFF);
|
||||||
|
|
||||||
|
if (!(client.currentScreen instanceof PuzzleOptionsScreen 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.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";
|
||||||
|
if (key == null && content.getKey().endsWith(".title")) {
|
||||||
|
String strippedContent = content.getKey().substring(0, content.getKey().length()-6);
|
||||||
|
if (I18n.hasTranslation(strippedContent + ".tooltip")) key = strippedContent + ".tooltip";
|
||||||
|
else if (I18n.hasTranslation(strippedContent + ".desc")) key = strippedContent + ".desc";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (key != null) {
|
||||||
|
List<Text> list = new ArrayList<>();
|
||||||
|
for (String str : I18n.translate(key).split("\n"))
|
||||||
|
list.add(Text.literal(str));
|
||||||
|
page.tooltip = list;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public int getY() {
|
||||||
|
return button.getY();
|
||||||
|
}
|
||||||
|
public int getX() {
|
||||||
|
return button.getX();
|
||||||
|
}
|
||||||
|
public int getHeight() {
|
||||||
|
return button.getHeight();
|
||||||
|
}
|
||||||
|
public int getWidth() {
|
||||||
|
return button.getWidth();
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<? extends Element> children() {
|
public List<? extends Element> children() {
|
||||||
|
|||||||
@@ -9,13 +9,12 @@ public class PuzzleSliderWidget extends SliderWidget {
|
|||||||
private final PuzzleWidget.TextAction setTextAction;
|
private final PuzzleWidget.TextAction setTextAction;
|
||||||
private final PuzzleWidget.ChangeSliderValueAction changeAction;
|
private final PuzzleWidget.ChangeSliderValueAction changeAction;
|
||||||
|
|
||||||
public PuzzleSliderWidget(int min, int max, int x, int y, int width, int height, PuzzleWidget.SetSliderValueAction setValueAction, PuzzleWidget.TextAction setTextAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
|
public PuzzleSliderWidget(int min, int max, int x, int y, int width, int height, float defaultValue, PuzzleWidget.TextAction setTextAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
|
||||||
super(x,y,width,height,Text.of(""),0);
|
super(x,y,width,height,Text.of(""),(defaultValue-min) / (max - min));
|
||||||
|
|
||||||
this.min = min;
|
this.min = min;
|
||||||
this.max = max;
|
this.max = max;
|
||||||
|
|
||||||
setValueAction.setSliderValue(this);
|
|
||||||
this.setTextAction = setTextAction;
|
this.setTextAction = setTextAction;
|
||||||
this.changeAction = changeAction;
|
this.changeAction = changeAction;
|
||||||
this.updateMessage();
|
this.updateMessage();
|
||||||
|
|||||||
@@ -7,16 +7,17 @@ import net.minecraft.client.gui.widget.ClickableWidget;
|
|||||||
import net.minecraft.client.gui.widget.TextFieldWidget;
|
import net.minecraft.client.gui.widget.TextFieldWidget;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
|
|
||||||
|
import java.util.function.IntSupplier;
|
||||||
|
|
||||||
public class PuzzleWidget {
|
public class PuzzleWidget {
|
||||||
public ButtonType buttonType;
|
public ButtonType buttonType;
|
||||||
public int min;
|
public int min;
|
||||||
public int max;
|
public int max;
|
||||||
public Text descriptionText;
|
public Text descriptionText;
|
||||||
public Text buttonText;
|
|
||||||
public TextAction buttonTextAction;
|
public TextAction buttonTextAction;
|
||||||
public ButtonWidget.PressAction onPress;
|
public ButtonWidget.PressAction onPress;
|
||||||
public PuzzleWidget.SetTextValueAction setTextValue;
|
public PuzzleWidget.SetTextValueAction setTextValue;
|
||||||
public PuzzleWidget.SetSliderValueAction setSliderValue;
|
public IntSupplier defaultSliderValue;
|
||||||
public PuzzleWidget.ChangeTextValueAction changeTextValue;
|
public PuzzleWidget.ChangeTextValueAction changeTextValue;
|
||||||
public PuzzleWidget.ChangeSliderValueAction changeSliderValue;
|
public PuzzleWidget.ChangeSliderValueAction changeSliderValue;
|
||||||
|
|
||||||
@@ -42,22 +43,24 @@ public class PuzzleWidget {
|
|||||||
this.onPress = onPress;
|
this.onPress = onPress;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Puzzle Slider Widget Container (WIP - Doesn't work)
|
* Puzzle Slider Widget Container
|
||||||
*/
|
*/
|
||||||
public PuzzleWidget(int min, int max, Text descriptionText, PuzzleWidget.SetSliderValueAction setValueAction, PuzzleWidget.TextAction setTextAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
|
public PuzzleWidget(int min, int max, Text descriptionText, IntSupplier defaultSliderValue, PuzzleWidget.TextAction setTextAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
|
||||||
this.buttonType = ButtonType.SLIDER;
|
this.buttonType = ButtonType.SLIDER;
|
||||||
this.min = min;
|
this.min = min;
|
||||||
this.max = max;
|
this.max = max;
|
||||||
this.descriptionText = descriptionText;
|
this.descriptionText = descriptionText;
|
||||||
this.setSliderValue = setValueAction;
|
this.defaultSliderValue = defaultSliderValue;
|
||||||
this.buttonTextAction = setTextAction;
|
this.buttonTextAction = setTextAction;
|
||||||
this.changeSliderValue = changeAction;
|
this.changeSliderValue = changeAction;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Puzzle Text Field Widget Container (WIP - Doesn't work)
|
* Puzzle Text Field Widget Container (WIP - Doesn't work)
|
||||||
*/
|
*/
|
||||||
public PuzzleWidget(Text descriptionText, PuzzleWidget.SetTextValueAction setValue, ChangeTextValueAction changeAction, int a) {
|
public PuzzleWidget(int min, int max, Text descriptionText, PuzzleWidget.SetTextValueAction setValue, ChangeTextValueAction changeAction) {
|
||||||
this.buttonType = ButtonType.TEXT_FIELD;
|
this.buttonType = ButtonType.TEXT_FIELD;
|
||||||
|
this.min = min;
|
||||||
|
this.max = max;
|
||||||
this.descriptionText = descriptionText;
|
this.descriptionText = descriptionText;
|
||||||
this.setTextValue = setValue;
|
this.setTextValue = setValue;
|
||||||
this.changeTextValue = changeAction;
|
this.changeTextValue = changeAction;
|
||||||
@@ -75,10 +78,6 @@ public class PuzzleWidget {
|
|||||||
void setTextValue(TextFieldWidget textField);
|
void setTextValue(TextFieldWidget textField);
|
||||||
}
|
}
|
||||||
@Environment(EnvType.CLIENT)
|
@Environment(EnvType.CLIENT)
|
||||||
public interface SetSliderValueAction {
|
|
||||||
void setSliderValue(PuzzleSliderWidget slider);
|
|
||||||
}
|
|
||||||
@Environment(EnvType.CLIENT)
|
|
||||||
public interface TextAction {
|
public interface TextAction {
|
||||||
void setTitle(ClickableWidget button);
|
void setTitle(ClickableWidget button);
|
||||||
}
|
}
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 179 B |
@@ -4,8 +4,8 @@ import com.google.gson.JsonObject;
|
|||||||
import com.google.gson.JsonParseException;
|
import com.google.gson.JsonParseException;
|
||||||
import net.minecraft.client.render.model.json.ModelElement;
|
import net.minecraft.client.render.model.json.ModelElement;
|
||||||
import net.minecraft.util.JsonHelper;
|
import net.minecraft.util.JsonHelper;
|
||||||
import net.minecraft.util.math.Vec3f;
|
|
||||||
import net.puzzlemc.core.config.PuzzleConfig;
|
import net.puzzlemc.core.config.PuzzleConfig;
|
||||||
|
import org.joml.Vector3f;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|||||||
|
|
||||||
@Mixin(ModelElement.Deserializer.class)
|
@Mixin(ModelElement.Deserializer.class)
|
||||||
public abstract class MixinModelElementDeserializer {
|
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)
|
@Inject(at = @At("HEAD"),method = "deserializeRotationAngle", cancellable = true)
|
||||||
private void puzzle$deserializeRotationAngle(JsonObject object, CallbackInfoReturnable<Float> cir) {
|
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)
|
@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) {
|
if (PuzzleConfig.biggerModels) {
|
||||||
Vec3f vec3f = this.deserializeVec3f(object, "to");
|
Vector3f 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)) {
|
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);
|
cir.setReturnValue(vec3f);
|
||||||
} else {
|
} else {
|
||||||
throw new JsonParseException("'to' specifier exceeds the allowed boundaries: " + vec3f);
|
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)
|
@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) {
|
if (PuzzleConfig.biggerModels) {
|
||||||
Vec3f vec3f = this.deserializeVec3f(object, "from");
|
Vector3f 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)) {
|
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);
|
cir.setReturnValue(vec3f);
|
||||||
} else {
|
} else {
|
||||||
throw new JsonParseException("'from' specifier exceeds the allowed boundaries: " + vec3f);
|
throw new JsonParseException("'from' specifier exceeds the allowed boundaries: " + vec3f);
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.8 KiB |
@@ -1,7 +1,10 @@
|
|||||||
package net.puzzlemc.splashscreen;
|
package net.puzzlemc.splashscreen;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.platform.TextureUtil;
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
import eu.midnightdust.lib.util.MidnightColorUtil;
|
import eu.midnightdust.lib.util.MidnightColorUtil;
|
||||||
import net.fabricmc.api.ClientModInitializer;
|
import net.fabricmc.api.ClientModInitializer;
|
||||||
|
import net.minecraft.client.texture.AbstractTexture;
|
||||||
import net.minecraft.client.texture.NativeImageBackedTexture;
|
import net.minecraft.client.texture.NativeImageBackedTexture;
|
||||||
import net.minecraft.util.Util;
|
import net.minecraft.util.Util;
|
||||||
import net.minecraft.util.math.ColorHelper;
|
import net.minecraft.util.math.ColorHelper;
|
||||||
@@ -22,14 +25,13 @@ import net.minecraft.util.Identifier;
|
|||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.io.File;
|
import java.io.*;
|
||||||
import java.io.FileInputStream;
|
import java.net.URL;
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
import java.nio.file.StandardCopyOption;
|
import java.nio.file.StandardCopyOption;
|
||||||
|
import java.util.Objects;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
|
||||||
public class PuzzleSplashScreen implements ClientModInitializer {
|
public class PuzzleSplashScreen implements ClientModInitializer {
|
||||||
@@ -66,10 +68,6 @@ public class PuzzleSplashScreen implements ClientModInitializer {
|
|||||||
public Identifier getFabricId() {
|
public Identifier getFabricId() {
|
||||||
return new Identifier("puzzle", "splash_screen");
|
return new Identifier("puzzle", "splash_screen");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void method_14491(ResourceManager manager) {
|
|
||||||
reload(manager);
|
|
||||||
}
|
|
||||||
@Override
|
@Override
|
||||||
public void reload(ResourceManager manager) {
|
public void reload(ResourceManager manager) {
|
||||||
if (PuzzleConfig.resourcepackSplashScreen) {
|
if (PuzzleConfig.resourcepackSplashScreen) {
|
||||||
@@ -106,8 +104,7 @@ public class PuzzleSplashScreen implements ClientModInitializer {
|
|||||||
manager.findResources("textures", path -> path.getPath().contains("mojangstudios.png")).forEach((id, resource) -> {
|
manager.findResources("textures", path -> path.getPath().contains("mojangstudios.png")).forEach((id, resource) -> {
|
||||||
try (InputStream stream = manager.getResource(id).get().getInputStream()) {
|
try (InputStream stream = manager.getResource(id).get().getInputStream()) {
|
||||||
Files.copy(stream, LOGO_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
|
Files.copy(stream, LOGO_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
|
||||||
InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
|
client.getTextureManager().registerTexture(LOGO, new DynamicLogoTexture());
|
||||||
client.getTextureManager().registerTexture(LOGO, new NativeImageBackedTexture(NativeImage.read(input)));
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
LogManager.getLogger("Puzzle").error("Error occurred while loading custom minecraft logo " + id.toString(), e);
|
LogManager.getLogger("Puzzle").error("Error occurred while loading custom minecraft logo " + id.toString(), e);
|
||||||
}
|
}
|
||||||
@@ -138,9 +135,9 @@ public class PuzzleSplashScreen implements ClientModInitializer {
|
|||||||
|
|
||||||
protected TextureData loadTextureData(ResourceManager resourceManager) {
|
protected TextureData loadTextureData(ResourceManager resourceManager) {
|
||||||
MinecraftClient minecraftClient = MinecraftClient.getInstance();
|
MinecraftClient minecraftClient = MinecraftClient.getInstance();
|
||||||
DefaultResourcePack defaultResourcePack = minecraftClient.getResourcePackProvider().getPack();
|
DefaultResourcePack defaultResourcePack = minecraftClient.getDefaultResourcePack();
|
||||||
try {
|
try {
|
||||||
InputStream inputStream = defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO);
|
InputStream inputStream = Objects.requireNonNull(defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO)).get();
|
||||||
TextureData var6;
|
TextureData var6;
|
||||||
try {
|
try {
|
||||||
var6 = new TextureData(new TextureResourceMetadata(true, true), NativeImage.read(inputStream));
|
var6 = new TextureData(new TextureResourceMetadata(true, true), NativeImage.read(inputStream));
|
||||||
@@ -155,4 +152,18 @@ public class PuzzleSplashScreen implements ClientModInitializer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@Environment(EnvType.CLIENT)
|
||||||
|
public static class DynamicLogoTexture extends ResourceTexture {
|
||||||
|
public DynamicLogoTexture() {
|
||||||
|
super(LOGO);
|
||||||
|
}
|
||||||
|
protected TextureData loadTextureData(ResourceManager resourceManager) {
|
||||||
|
try {
|
||||||
|
InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
|
||||||
|
return new TextureData(new TextureResourceMetadata(true, true), NativeImage.read(input));
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,11 +45,7 @@ public abstract class MixinSplashScreen extends Overlay {
|
|||||||
private static void puzzle$initSplashscreen(MinecraftClient client, CallbackInfo ci) { // Load our custom textures at game start //
|
private static void puzzle$initSplashscreen(MinecraftClient client, CallbackInfo ci) { // Load our custom textures at game start //
|
||||||
if (PuzzleConfig.resourcepackSplashScreen) {
|
if (PuzzleConfig.resourcepackSplashScreen) {
|
||||||
if (PuzzleSplashScreen.LOGO_TEXTURE.toFile().exists()) {
|
if (PuzzleSplashScreen.LOGO_TEXTURE.toFile().exists()) {
|
||||||
try {
|
client.getTextureManager().registerTexture(LOGO, new PuzzleSplashScreen.DynamicLogoTexture());
|
||||||
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()) {
|
if (PuzzleSplashScreen.BACKGROUND_TEXTURE.toFile().exists()) {
|
||||||
try {
|
try {
|
||||||
@@ -68,7 +64,7 @@ public abstract class MixinSplashScreen extends Overlay {
|
|||||||
private void puzzle$betterBlend(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
|
private void puzzle$betterBlend(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
|
||||||
if (PuzzleConfig.disableBlend) 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))
|
@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/Window;getScaledWidth()I", shift = At.Shift.BEFORE, ordinal = 2))
|
||||||
private void puzzle$renderSplashBackground(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
|
private void puzzle$renderSplashBackground(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
|
||||||
if (Files.exists(PuzzleSplashScreen.BACKGROUND_TEXTURE)) {
|
if (Files.exists(PuzzleSplashScreen.BACKGROUND_TEXTURE)) {
|
||||||
int width = client.getWindow().getScaledWidth();
|
int width = client.getWindow().getScaledWidth();
|
||||||
@@ -87,7 +83,7 @@ public abstract class MixinSplashScreen extends Overlay {
|
|||||||
RenderSystem.enableBlend();
|
RenderSystem.enableBlend();
|
||||||
RenderSystem.blendEquation(32774);
|
RenderSystem.blendEquation(32774);
|
||||||
RenderSystem.defaultBlendFunc();
|
RenderSystem.defaultBlendFunc();
|
||||||
RenderSystem.setShader(GameRenderer::getPositionTexShader);
|
RenderSystem.setShader(GameRenderer::getPositionTexProgram);
|
||||||
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, s);
|
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, s);
|
||||||
drawTexture(matrices, 0, 0, 0, 0, 0, width, height, width, height);
|
drawTexture(matrices, 0, 0, 0, 0, 0, width, height, width, height);
|
||||||
RenderSystem.defaultBlendFunc();
|
RenderSystem.defaultBlendFunc();
|
||||||
@@ -96,11 +92,11 @@ public abstract class MixinSplashScreen extends Overlay {
|
|||||||
}
|
}
|
||||||
@Inject(method = "renderProgressBar", at = @At("HEAD"))
|
@Inject(method = "renderProgressBar", at = @At("HEAD"))
|
||||||
private void puzzle$addProgressBarBackground(MatrixStack matrices, int minX, int minY, int maxX, int maxY, float opacity, CallbackInfo ci) {
|
private void puzzle$addProgressBarBackground(MatrixStack matrices, int minX, int minY, int maxX, int maxY, float opacity, CallbackInfo ci) {
|
||||||
RenderSystem.disableBlend();
|
|
||||||
if (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarBackgroundColor == 15675965) return;
|
if (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarBackgroundColor == 15675965) return;
|
||||||
long l = Util.getMeasuringTimeMs();
|
long l = Util.getMeasuringTimeMs();
|
||||||
float f = this.reloadCompleteTime > -1L ? (float)(l - this.reloadCompleteTime) / 1000.0F : -1.0F;
|
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);
|
int m = MathHelper.ceil((1.0F - MathHelper.clamp(f - 1.0F, 0.0F, 1.0F)) * 255.0F);
|
||||||
|
RenderSystem.disableBlend();
|
||||||
fill(matrices, minX, minY, maxX, maxY, withAlpha(PuzzleConfig.progressBarBackgroundColor, m));
|
fill(matrices, minX, minY, maxX, maxY, withAlpha(PuzzleConfig.progressBarBackgroundColor, m));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.8 KiB |
@@ -1,17 +1,39 @@
|
|||||||
{
|
{
|
||||||
"puzzle.text.update_available":"Ein Update ist verfügbar!",
|
"puzzle.text.update_available":"Ein Update ist verfügbar!",
|
||||||
"puzzle.screen.title":"Puzzle Einstellungen",
|
"puzzle.screen.title":"Puzzle Einstellungen",
|
||||||
"puzzle.page.graphics":"Grafik Einstellungen",
|
"puzzle.page.graphics":"Grafik",
|
||||||
"puzzle.page.resources":"Resourcen Einstellungen",
|
"puzzle.page.resources":"Resourcen",
|
||||||
"puzzle.page.performance":"Performance Einstellungen",
|
"puzzle.page.performance":"Performance",
|
||||||
"puzzle.page.misc":"Sonstige Einstellungen",
|
"puzzle.page.misc":"Sonstiges",
|
||||||
"puzzle.option.check_for_updates":"Auf Updates überprüfen",
|
"puzzle.option.check_for_updates":"Auf Updates überprüfen",
|
||||||
"puzzle.option.show_version_info":"Zeige Puzzles Versions Informationen",
|
"puzzle.option.show_version_info":"Zeige Informationen über Puzzle's Version",
|
||||||
"puzzle.option.resourcepack_splash_screen":"Nutzte den Resourcepack-splash-Screen",
|
"puzzle.option.resourcepack_splash_screen":"Nutze Resourcepack-Ladebildschirm",
|
||||||
"puzzle.option.better_splash_screen_blend":"Verbessere das Blending des Splash-Screen-Logos",
|
"puzzle.option.better_splash_screen_blend":"Verbessere das Blending des Splash-Screen-Logos",
|
||||||
"puzzle.option.emissive_textures":"Emissive Texturen",
|
|
||||||
"puzzle.option.unlimited_model_rotations":"Unbegrenzte Modellrotationen",
|
"puzzle.option.unlimited_model_rotations":"Unbegrenzte Modellrotationen",
|
||||||
"puzzle.option.bigger_custom_models":"Größere benutzerdefinierte Modelle",
|
"puzzle.option.bigger_custom_models":"Größere benutzerdefinierte Modelle",
|
||||||
"puzzle.option.render_layer_overrides":"Render Layer Overrides",
|
"puzzle.midnightconfig.title":"Erweiterte Puzzle Konfiguration",
|
||||||
"puzzle.midnightconfig.title":"Erweiterte Puzzle Konfiguration"
|
"puzzle.option.check_for_updates.tooltip": "Aktiviert Puzzle's eingebauten Update-Checker",
|
||||||
|
"puzzle.option.show_version_info.tooltip": "Zeigt Informationen über die Version\nvon Puzzle und die Verfügbarkeit von Updates\nauf dem Titelbildschirm und im F3-Menü",
|
||||||
|
"puzzle.option.resourcepack_splash_screen.tooltip": "Ermöglicht Resourcepacks, das Aussehen\ndes Ladebildschirms mit dem\nOptiFine-Format zu verändern",
|
||||||
|
"puzzle.option.better_splash_screen_blend.tooltip": "Ändert die Art des Blending,\ndie für das Logo auf dem Ladebildschirm benutzt wird,\ndamit es besser mit farbigen Logos funktioniert.",
|
||||||
|
"puzzle.option.unlimited_model_rotations.tooltip": "Schaltet volle 360° Rotation für\nbenutzerdefinierte Item-/Blockmodelle frei",
|
||||||
|
"puzzle.option.bigger_custom_models.tooltip": "Erhöht das Größenlimit für\nbenutzerdefinierte Item-/Blockmodelle\nvon 3x3x3 auf 5x5x5",
|
||||||
|
"puzzle.midnightconfig.tooltip": "Optionen für fortgeschrittene Nutzer",
|
||||||
|
|
||||||
|
"cullleaves.puzzle.option.enabled": "Aktiviere Culling für Blätter",
|
||||||
|
"cullleaves.puzzle.option.enabled.tooltip": "Fügt Occlusion Culling für \nBlätter hinzu, was die Leistung des \nSpiels verbessert",
|
||||||
|
"iris.puzzle.option.enableShaders": "Shader aktivieren",
|
||||||
|
"iris.puzzle.option.enableShaders.tooltip": "Legt fest, ob Shader aktiviert werden sollen",
|
||||||
|
"iris.puzzle.option.open": "ÖFFNEN",
|
||||||
|
"options.iris.shaderPackSelection.tooltip": "Öffnet einen Bildschirm, um Shader\nauszuwählen und zu konfigurieren",
|
||||||
|
"lambdabettergrass.option.mode.tooltip": "Verbindet die Seiten von Grasblöcken\nmit anliegenden Grasblöcken",
|
||||||
|
"lambdabettergrass.option.better_snow.tooltip": "Fügt eine rein visuelle Schnee-/Moosschicht\nunter nicht-volle Blöcke hinzu,\nwelche von Schnee/Moos umgeben sind",
|
||||||
|
"config.dynamicfps.reduce_when_unfocused.tooltip": "Reduziert Minecraft's FPS,\nwährend das Spiel nicht im Fokus ist\n(z.B. wenn ein anderes Fenster fokussiert oder das Spiel versteckt ist)\num Strom und Systemressourcen zu sparen",
|
||||||
|
"config.dynamicfps.unfocused_fps.tooltip": "Die Anzahl der Bilder pro Sekunde (FPS)\nmit denen Minecraft rendern\ndarf, wenn es nicht im Fokus ist",
|
||||||
|
"config.dynamicfps.restore_when_hovered.tooltip": "Legt fest, ob die Limitierung\nder FPS aufgehoben werden soll, wenn Minecraft in der Vorschau erscheint\n(z.B. in der Taskleiste oder Dock überfahren wird)",
|
||||||
|
"config.dynamicfps.run_gc_on_unfocus.tooltip": "Lässt einen Garbage Collector laufen,\nwährend Minecraft nicht im Fokus ist\num etwas Arbeitsspeicher (RAM) freizumachen",
|
||||||
|
"config.dynamicfps.unfocused_volume.tooltip": "Die Lautstärke mit der Minecraft\nGeräusche wiedergeben kann, während es nicht im Fokus ist\n(z.B. wenn ein anderes Fenster fokussiert ist)",
|
||||||
|
"config.dynamicfps.hidden_volume.tooltip": "Die Lautstärke mit der Minecraft\nGeräusche wiedergeben kann, während es nicht im Fokus ist\n(z.B. wenn es minimiert, von anderen Fenstern verdeckt\noder auf einem anderen virtuellen Desktop ist)",
|
||||||
|
"entity_texture_features.puzzle.emissive_type.brighter": "§eHeller",
|
||||||
|
"entity_texture_features.puzzle.emissive_type.default": "§6Normal"
|
||||||
}
|
}
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
"puzzle.text.update_available":"Μια καινούρια έκδοση είναι διαθέσιμη!",
|
"puzzle.text.update_available":"Μια καινούρια έκδοση είναι διαθέσιμη!",
|
||||||
"puzzle.screen.title":"Ρυθμίσεις του Puzzle",
|
"puzzle.screen.title":"Ρυθμίσεις του Puzzle",
|
||||||
"puzzle.page.graphics":"Ρυθμίσεις Γραφικών",
|
"puzzle.page.graphics":"Γραφικών",
|
||||||
"puzzle.page.resources":"Ρυθμίσεις Πόρων",
|
"puzzle.page.resources":"Πόρων",
|
||||||
"puzzle.page.performance":"Ρυθμίσεις Απόδοσης",
|
"puzzle.page.performance":"Απόδοσης",
|
||||||
"puzzle.page.misc":"Διάφορες Ρυθμίσεις",
|
"puzzle.page.misc":"Διάφορες",
|
||||||
"puzzle.option.check_for_updates":"Έλεγχος για αναβαθμίσεις",
|
"puzzle.option.check_for_updates":"Έλεγχος για αναβαθμίσεις",
|
||||||
"puzzle.option.show_version_info":"Εμφάνηση έκδοσης του Puzzle",
|
"puzzle.option.show_version_info":"Εμφάνηση έκδοσης του Puzzle",
|
||||||
"puzzle.option.resourcepack_splash_screen":"Οθόνη φόρτωσης πακέτου πόρων",
|
"puzzle.option.resourcepack_splash_screen":"Οθόνη φόρτωσης πακέτου πόρων",
|
||||||
|
|||||||
@@ -1,17 +1,42 @@
|
|||||||
{
|
{
|
||||||
"puzzle.text.update_available":"An update is available!",
|
"puzzle.text.update_available":"An update is available!",
|
||||||
"puzzle.screen.title":"Puzzle Settings",
|
"puzzle.screen.title":"Puzzle Settings",
|
||||||
"puzzle.page.graphics":"Graphics Settings",
|
"puzzle.page.graphics":"Graphics",
|
||||||
"puzzle.page.resources":"Resource Settings",
|
"puzzle.page.resources":"Resource",
|
||||||
"puzzle.page.performance":"Performance Settings",
|
"puzzle.page.performance":"Performance",
|
||||||
"puzzle.page.misc":"Miscellaneous Settings",
|
"puzzle.page.misc":"Miscellaneous",
|
||||||
"puzzle.option.check_for_updates":"Check for Updates",
|
"puzzle.option.check_for_updates":"Check for Updates",
|
||||||
|
"puzzle.option.check_for_updates.tooltip":"Enables Puzzle's built-in update checker",
|
||||||
"puzzle.option.show_version_info":"Show Puzzle version info",
|
"puzzle.option.show_version_info":"Show Puzzle version info",
|
||||||
|
"puzzle.option.show_version_info.tooltip":"Show information about the current\nPuzzle version and update status on\nthe Title Screen and F3 Menu",
|
||||||
"puzzle.option.resourcepack_splash_screen":"Use resourcepack splash screen",
|
"puzzle.option.resourcepack_splash_screen":"Use resourcepack splash screen",
|
||||||
|
"puzzle.option.resourcepack_splash_screen.tooltip":"Enables resourcepacks to change the look\nof Minecraft's loading/splash\nscreen using the OptiFine format",
|
||||||
"puzzle.option.better_splash_screen_blend":"Better splash screen logo blending",
|
"puzzle.option.better_splash_screen_blend":"Better splash screen logo blending",
|
||||||
"puzzle.option.emissive_textures":"Emissive Textures",
|
"puzzle.option.better_splash_screen_blend.tooltip":"Changes the type of blending used\nby the logo on the splash screen\nto work better with custom colored logos",
|
||||||
"puzzle.option.unlimited_model_rotations":"Unlimited Model Rotations",
|
"puzzle.option.unlimited_model_rotations":"Unlimited Model Rotations",
|
||||||
|
"puzzle.option.unlimited_model_rotations.tooltip":"Unlocks full 360° rotation on custom block/item models",
|
||||||
"puzzle.option.bigger_custom_models":"Bigger Custom Models",
|
"puzzle.option.bigger_custom_models":"Bigger Custom Models",
|
||||||
"puzzle.option.render_layer_overrides":"Render Layer Overrides",
|
"puzzle.option.bigger_custom_models.tooltip":"Increases the limit of\ncustom block/item model sizes\nfrom 3x3x3 to 5x5x5",
|
||||||
"puzzle.midnightconfig.title":"Puzzle Advanced Config"
|
"puzzle.midnightconfig.title":"Puzzle Advanced Config",
|
||||||
|
"puzzle.midnightconfig.category.gui":"GUI",
|
||||||
|
"puzzle.midnightconfig.category.features":"Features",
|
||||||
|
"puzzle.midnightconfig.category.debug":"Debug",
|
||||||
|
"puzzle.midnightconfig.tooltip":"Options for advanced users only",
|
||||||
|
|
||||||
|
"cullleaves.puzzle.option.enabled": "Cull Leaves",
|
||||||
|
"cullleaves.puzzle.option.enabled.tooltip": "Enable the culling of leaves to enhance performance",
|
||||||
|
"iris.puzzle.option.enableShaders": "Enable Shaders",
|
||||||
|
"iris.puzzle.option.enableShaders.tooltip": "Whether or not to enable shaderpacks",
|
||||||
|
"iris.puzzle.option.open": "OPEN",
|
||||||
|
"options.iris.shaderPackSelection.tooltip": "Open a screen to select\nshaderpacks and configure them",
|
||||||
|
"lambdabettergrass.option.mode.tooltip": "Makes the sides of\ngrass blocks connect to\nadjacent grass blocks",
|
||||||
|
"lambdabettergrass.option.better_snow.tooltip": "Adds a purely visual snow/moss layer\nto non-full blocks that\nare surrounded by snow/moss",
|
||||||
|
"config.dynamicfps.reduce_when_unfocused.tooltip": "Reduces Minecraft's FPS when unfocused\n(i.e. another window is focused or the game is hidden)\nto save power and system resources",
|
||||||
|
"config.dynamicfps.unfocused_fps.tooltip": "The amount of frames per second\nMinecraft is allowed to\nrender at while unfocused",
|
||||||
|
"config.dynamicfps.restore_when_hovered.tooltip": "Whether or not to stop the\nFPS limiting while Minecraft is previewed\n(i.e. hovered on task bar or dock)",
|
||||||
|
"config.dynamicfps.run_gc_on_unfocus.tooltip": "Run a garbage collector while\nMinecraft is not focused to\nfree up some RAM",
|
||||||
|
"config.dynamicfps.unfocused_volume.tooltip": "The volume the game should play\nsound at while unfocused\n(i.e. another window is selected)",
|
||||||
|
"config.dynamicfps.hidden_volume.tooltip": "The volume the game should play\nsound at while not visible\n(i.e. minimized, covered by other windows\nor on another virtual desktop)",
|
||||||
|
"entity_texture_features.puzzle.emissive_type.brighter": "§eBrighter",
|
||||||
|
"entity_texture_features.puzzle.emissive_type.default": "§6Default"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
"puzzle.text.update_available":"Uuendus on saadaval!",
|
"puzzle.text.update_available":"Uuendus on saadaval!",
|
||||||
"puzzle.screen.title":"Puzzle sätted",
|
"puzzle.screen.title":"Puzzle sätted",
|
||||||
"puzzle.page.graphics":"Graafikasätted",
|
"puzzle.page.graphics":"Graafika",
|
||||||
"puzzle.page.resources":"Ressursisätted",
|
"puzzle.page.resources":"Ressursi",
|
||||||
"puzzle.page.performance":"Jõudlussätted",
|
"puzzle.page.performance":"Jõudlus",
|
||||||
"puzzle.page.misc":"Muud sätted",
|
"puzzle.page.misc":"Muud",
|
||||||
"puzzle.option.check_for_updates":"Uuenduste kontroll",
|
"puzzle.option.check_for_updates":"Uuenduste kontroll",
|
||||||
"puzzle.option.show_version_info":"Kuva Puzzle versiooniteavet",
|
"puzzle.option.show_version_info":"Kuva Puzzle versiooniteavet",
|
||||||
"puzzle.option.resourcepack_splash_screen":"Kasuta ressursipaki laadimiskuva",
|
"puzzle.option.resourcepack_splash_screen":"Kasuta ressursipaki laadimiskuva",
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
"puzzle.text.update_available":"업데이트가 가능합니다!",
|
"puzzle.text.update_available":"업데이트가 가능합니다!",
|
||||||
"puzzle.screen.title":"Puzzle 설정",
|
"puzzle.screen.title":"Puzzle 설정",
|
||||||
"puzzle.page.graphics":"그래픽 설정",
|
"puzzle.page.graphics":"그래픽",
|
||||||
"puzzle.page.resources":"리소스 설정",
|
"puzzle.page.resources":"리소스",
|
||||||
"puzzle.page.performance":"성능 설정",
|
"puzzle.page.performance":"성능",
|
||||||
"puzzle.page.misc":"기타 설정",
|
"puzzle.page.misc":"기타",
|
||||||
"puzzle.option.check_for_updates":"업데이트 확인",
|
"puzzle.option.check_for_updates":"업데이트 확인",
|
||||||
"puzzle.option.show_version_info":"Puzzle 버전 정보 보기",
|
"puzzle.option.show_version_info":"Puzzle 버전 정보 보기",
|
||||||
"puzzle.option.resourcepack_splash_screen":"스플래시 화면에서 리소스팩 사용",
|
"puzzle.option.resourcepack_splash_screen":"스플래시 화면에서 리소스팩 사용",
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
"puzzle.text.update_available":"Aktualizacja jest dostępna!",
|
"puzzle.text.update_available":"Aktualizacja jest dostępna!",
|
||||||
"puzzle.screen.title":"Ustawienia Puzzle",
|
"puzzle.screen.title":"Ustawienia Puzzle",
|
||||||
"puzzle.page.graphics":"Ustawienia grafiki",
|
"puzzle.page.graphics":"Grafiki",
|
||||||
"puzzle.page.resources":"Ustawienia zasobów",
|
"puzzle.page.resources":"Zasobów",
|
||||||
"puzzle.page.performance":"Ustawienia wydajności",
|
"puzzle.page.performance":"Wydajności",
|
||||||
"puzzle.page.misc":"Różne ustawienia",
|
"puzzle.page.misc":"Ustawienia",
|
||||||
"puzzle.option.check_for_updates":"Sprawdź aktualizacje",
|
"puzzle.option.check_for_updates":"Sprawdź aktualizacje",
|
||||||
"puzzle.option.show_version_info":"Pokaż informacje o wersji Puzzle",
|
"puzzle.option.show_version_info":"Pokaż informacje o wersji Puzzle",
|
||||||
"puzzle.option.resourcepack_splash_screen":"Użyj ekranu powitalnego paczek zasobów",
|
"puzzle.option.resourcepack_splash_screen":"Użyj ekranu powitalnego paczek zasobów",
|
||||||
|
|||||||
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":"Gráficas",
|
||||||
|
"puzzle.page.resources":"Recursos",
|
||||||
|
"puzzle.page.performance":"Desempenho",
|
||||||
|
"puzzle.page.misc":"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"
|
||||||
|
}
|
||||||
@@ -1,17 +1,39 @@
|
|||||||
{
|
{
|
||||||
"puzzle.text.update_available":"Доступно обновление!",
|
"puzzle.text.update_available":"Доступно обновление!",
|
||||||
"puzzle.screen.title":"Настройки Puzzle",
|
"puzzle.screen.title":"Настройки Puzzle",
|
||||||
"puzzle.page.graphics":"Настройки графики",
|
"puzzle.page.graphics":"графики",
|
||||||
"puzzle.page.resources":"Настройки ресурсов",
|
"puzzle.page.resources":"ресурсов",
|
||||||
"puzzle.page.performance":"Производительность",
|
"puzzle.page.performance":"Производительность",
|
||||||
"puzzle.page.misc":"Прочие настройки",
|
"puzzle.page.misc":"Прочие",
|
||||||
"puzzle.option.check_for_updates":"Проверять обновления",
|
"puzzle.option.check_for_updates":"Проверять обновления",
|
||||||
|
"puzzle.option.check_for_updates.tooltip":"Включить встроенную в Puzzle проверку обновлений",
|
||||||
"puzzle.option.show_version_info":"Показывать информацию о версии",
|
"puzzle.option.show_version_info":"Показывать информацию о версии",
|
||||||
|
"puzzle.option.show_version_info.tooltip":"Отображать информацию о текущей версии\nPuzzle и наличии обновлений\nна главном экране и экране отладки",
|
||||||
"puzzle.option.resourcepack_splash_screen":"Пользовательский экран загрузки",
|
"puzzle.option.resourcepack_splash_screen":"Пользовательский экран загрузки",
|
||||||
|
"puzzle.option.resourcepack_splash_screen.tooltip":"Разрешить наборам ресурсов изменять\nвнешний вид экрана загрузки Minecraft,\nиспользуя формат OptiFine",
|
||||||
"puzzle.option.better_splash_screen_blend":"Улучшенное смешивание логотипа",
|
"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":"Неограниченные повороты моделей",
|
||||||
|
"puzzle.option.unlimited_model_rotations.tooltip":"Разрешить поворот частей\nпользовательских моделей\nблоков/предметов на 360°",
|
||||||
"puzzle.option.bigger_custom_models":"Увеличенный размер моделей",
|
"puzzle.option.bigger_custom_models":"Увеличенный размер моделей",
|
||||||
"puzzle.option.render_layer_overrides":"Пользовательские слои отрисовки",
|
"puzzle.option.bigger_custom_models.tooltip":"Увеличить предельный размер\nпользовательских моделей блоков\nи предметов с 3×3×3 до 5×5×5",
|
||||||
"puzzle.midnightconfig.title":"Расширенные настройки Puzzle"
|
"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Обычные"
|
||||||
}
|
}
|
||||||
|
|||||||