mirror of
https://github.com/PuzzleMC/Puzzle.git
synced 2025-12-16 11:55:09 +01:00
Compare commits
81 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ab83b2744a | ||
|
|
9ee7ab1b89 | ||
|
|
07af46da3c | ||
|
|
f230cf3a4e | ||
|
|
8646efb161 | ||
|
|
fb1852dc2b | ||
|
|
9dbe28242a | ||
|
|
35c613a536 | ||
|
|
651483af22 | ||
|
|
b3b49cb8b8 | ||
|
|
39261272bf | ||
|
|
bc01662cda | ||
|
|
1dc7245a99 | ||
|
|
860d969c1d | ||
|
|
acd3dbf9e2 | ||
|
|
cbd48603d2 | ||
|
|
f91274dd90 | ||
|
|
884ee8caf6 | ||
|
|
c921f3ff99 | ||
|
|
8532a24b5e | ||
|
|
3a873df26a | ||
|
|
e3615a79c4 | ||
|
|
2704c2c80b | ||
|
|
83897109fe | ||
|
|
fc20a1b182 | ||
|
|
927faea146 | ||
|
|
b979d5ac61 | ||
|
|
12cdcba470 | ||
|
|
c9aa80f09f | ||
|
|
12015d6ba4 | ||
|
|
a8c89b11c7 | ||
|
|
f8ff656daa | ||
|
|
f89fc08505 | ||
|
|
94afc8b0c0 | ||
|
|
64aa45a370 | ||
|
|
05bea0aab1 | ||
|
|
fbb368989e | ||
|
|
795759b4e5 | ||
|
|
2410b8ff54 | ||
|
|
d08889f186 | ||
|
|
2886fd509b | ||
|
|
8be9fc6872 | ||
|
|
87ebfdd3b6 | ||
|
|
e8e563ad7b | ||
|
|
417cd3e2f8 | ||
|
|
b95045e21a | ||
|
|
fbbfe773a8 | ||
|
|
222f842386 | ||
|
|
f5aad84b90 | ||
|
|
2d9c069b79 | ||
|
|
06cb75d518 | ||
|
|
9c775d8c06 | ||
|
|
bcda47d94c | ||
|
|
01bab4b885 | ||
|
|
b008d7b75e | ||
|
|
4a21d9eb91 | ||
|
|
2332192301 | ||
|
|
acefd614ec | ||
|
|
e55d62d9e9 | ||
|
|
488a12f417 | ||
|
|
d282d43f20 | ||
|
|
fa52471ade | ||
|
|
1ffe62f3af | ||
|
|
5cd113d060 | ||
|
|
88d6b4f5c3 | ||
|
|
49ddb467ae | ||
|
|
c0abca50f9 | ||
|
|
8e86674dff | ||
|
|
da4f52561e | ||
|
|
1a1335a659 | ||
|
|
d8ce15e5da | ||
|
|
066cc56268 | ||
|
|
301b777152 | ||
|
|
92439549cc | ||
|
|
c9b0e81f77 | ||
|
|
14f63e2758 | ||
|
|
f28f2cd38b | ||
|
|
60e484e004 | ||
|
|
73ff9615b5 | ||
|
|
2ee6f0be51 | ||
|
|
2e7c504e72 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -23,3 +23,6 @@ bin/
|
|||||||
# fabric
|
# fabric
|
||||||
|
|
||||||
run/
|
run/
|
||||||
|
|
||||||
|
# unfinished
|
||||||
|
puzzle-randomentities/
|
||||||
BIN
Puzzle_Splashscreen_Template.zip
Normal file
BIN
Puzzle_Splashscreen_Template.zip
Normal file
Binary file not shown.
2
README.md
Normal file → Executable file
2
README.md
Normal file → Executable file
@@ -1,2 +1,4 @@
|
|||||||
# Puzzle
|
# Puzzle
|
||||||
Unites optifine replacement mods in a clean & vanilla-style gui
|
Unites optifine replacement mods in a clean & vanilla-style gui
|
||||||
|
|
||||||
|
[](https://www.curseforge.com/minecraft/mc-mods/puzzle) [](https://modrinth.com/mod/puzzle)
|
||||||
|
|||||||
202
build.gradle
202
build.gradle
@@ -1,104 +1,118 @@
|
|||||||
|
import groovy.json.JsonSlurper
|
||||||
|
import groovy.json.JsonOutput
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id 'fabric-loom' version '0.6-SNAPSHOT'
|
id "architectury-plugin" version "3.4-SNAPSHOT"
|
||||||
id 'maven-publish'
|
id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
|
||||||
|
id "me.shedaniel.unified-publishing" version "0.1.+" apply false
|
||||||
|
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
architectury {
|
||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
minecraft = rootProject.minecraft_version
|
||||||
|
|
||||||
archivesBaseName = project.archives_base_name
|
|
||||||
version = project.mod_version
|
|
||||||
group = project.maven_group
|
|
||||||
|
|
||||||
minecraft {
|
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
subprojects {
|
||||||
maven { url "https://maven.shedaniel.me/" }
|
apply plugin: "dev.architectury.loom"
|
||||||
maven { url "https://jitpack.io" }
|
|
||||||
maven { url "https://maven.terraformersmc.com/releases" }
|
repositories {
|
||||||
maven { url "https://aperlambda.github.io/maven" }
|
maven {
|
||||||
|
url = "https://api.modrinth.com/maven"
|
||||||
|
}
|
||||||
|
maven { url "https://maven.terraformersmc.com/releases" }
|
||||||
|
maven {
|
||||||
|
name = 'AperLambda'
|
||||||
|
url = 'https://aperlambda.github.io/maven'
|
||||||
|
}
|
||||||
|
mavenCentral()
|
||||||
|
maven {
|
||||||
|
name 'Gegy'
|
||||||
|
url 'https://maven.gegy.dev'
|
||||||
|
}
|
||||||
|
|
||||||
|
maven {
|
||||||
|
url "https://www.cursemaven.com"
|
||||||
|
content {
|
||||||
|
includeGroup "curse.maven"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
maven {
|
||||||
|
name = 'JitPack'
|
||||||
|
url 'https://jitpack.io'
|
||||||
|
}
|
||||||
|
maven {
|
||||||
|
url "https://maven.shedaniel.me/"
|
||||||
|
}
|
||||||
|
maven { url "https://maven.quiltmc.org/repository/release/" }
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
|
||||||
|
// The following line declares the yarn mappings you may select this one as well.
|
||||||
|
mappings loom.layered {
|
||||||
|
it.mappings("net.fabricmc:yarn:$rootProject.yarn_mappings:v2")
|
||||||
|
it.mappings("dev.architectury:yarn-mappings-patch-neoforge:$rootProject.yarn_mappings_patch_neoforge_version")
|
||||||
|
}
|
||||||
|
modCompileOnlyApi ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
|
||||||
|
|
||||||
|
modCompileOnlyApi ("maven.modrinth:iris:${project.iris_version}")
|
||||||
|
modCompileOnly ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
|
||||||
|
modCompileOnlyApi ("maven.modrinth:continuity:${project.continuity_version}")
|
||||||
|
modCompileOnlyApi ("maven.modrinth:animatica:${project.animatica_version}")
|
||||||
|
modCompileOnlyApi ("maven.modrinth:colormatic:${project.colormatic_version}")
|
||||||
|
modCompileOnlyApi ("maven.modrinth:borderless-mining:${project.borderless_mining_version}")
|
||||||
|
modCompileOnlyApi ("maven.modrinth:dynamic-fps:${project.dynamic_fps_version}")
|
||||||
|
modCompileOnlyApi ("com.moandjiezana.toml:toml4j:${project.toml4j_version}")
|
||||||
|
modCompileOnlyApi ("maven.modrinth:entitytexturefeatures:${project.etf_version}")
|
||||||
|
modCompileOnlyApi ("maven.modrinth:entity-model-features:${project.emf_version}")
|
||||||
|
modCompileOnlyApi ("maven.modrinth:completeconfig:${project.complete_config_version}")
|
||||||
|
//modImplementation ("maven.modrinth:exordium:${project.exordium_version}")
|
||||||
|
|
||||||
|
|
||||||
|
modCompileOnlyApi ("maven.modrinth:lambdynamiclights:${project.ldl_version}")
|
||||||
|
modCompileOnlyApi ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
|
||||||
|
modCompileOnlyApi "dev.lambdaurora:spruceui:${project.spruceui_version}"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
allprojects {
|
||||||
//to change the versions see the gradle.properties file
|
apply plugin: "java"
|
||||||
minecraft "com.mojang:minecraft:${project.minecraft_version}"
|
apply plugin: "architectury-plugin"
|
||||||
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
|
apply plugin: "maven-publish"
|
||||||
modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
|
|
||||||
|
|
||||||
modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
|
archivesBaseName = rootProject.archives_base_name
|
||||||
|
version = rootProject.mod_version
|
||||||
|
group = rootProject.maven_group
|
||||||
|
|
||||||
modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}"
|
tasks.withType(JavaCompile) {
|
||||||
modImplementation ("com.github.TeamMidnightDust:CullLeaves:${project.cull_leaves_version}"){
|
options.encoding = "UTF-8"
|
||||||
exclude module: "modmenu"
|
options.release = 21
|
||||||
}
|
}
|
||||||
modImplementation ("com.github.LambdAurora:LambDynamicLights:${project.ldl_version}") {
|
ext {
|
||||||
exclude module: "modmenu"
|
releaseChangelog = {
|
||||||
exclude module: "sodium-fabric"
|
def changes = new StringBuilder()
|
||||||
}
|
changes << "## Puzzle v$project.version for $project.minecraft_version\n[View the changelog](https://www.github.com/PuzzleMC/Puzzle/commits/)"
|
||||||
modImplementation ("com.github.LambdAurora:LambdaBetterGrass:${project.lbg_version}") {
|
def proc = "git log --max-count=1 --pretty=format:%s".execute()
|
||||||
exclude module: "modmenu"
|
proc.in.eachLine { line ->
|
||||||
}
|
def processedLine = line.toString()
|
||||||
modImplementation ("com.github.The-HyperZone:Iris:${project.iris_version}") {
|
if (!processedLine.contains("New translations") && !processedLine.contains("Merge") && !processedLine.contains("branch")) {
|
||||||
exclude module: "modmenu"
|
changes << "\n- ${processedLine.capitalize()}"
|
||||||
}
|
}
|
||||||
modImplementation ("com.github.PepperCode1:ConnectedTexturesMod-Fabric:${project.ctmf_version}") {
|
}
|
||||||
exclude module: "modmenu"
|
proc.waitFor()
|
||||||
}
|
return changes.toString()
|
||||||
modImplementation ("com.github.LambdAurora:LambdaControls:${project.lc_version}") {
|
}
|
||||||
exclude module: "modmenu"
|
}
|
||||||
}
|
processResources {
|
||||||
}
|
// Minify json resources
|
||||||
|
doLast {
|
||||||
processResources {
|
fileTree(dir: outputs.files.asPath, include: "**/*.json").each {
|
||||||
inputs.property "version", project.version
|
File file -> file.text = JsonOutput.toJson(new JsonSlurper().parse(file))
|
||||||
|
}
|
||||||
from(sourceSets.main.resources.srcDirs) {
|
}
|
||||||
include "fabric.mod.json"
|
}
|
||||||
expand "version": project.version
|
|
||||||
}
|
java {
|
||||||
|
withSourcesJar()
|
||||||
from(sourceSets.main.resources.srcDirs) {
|
}
|
||||||
exclude "fabric.mod.json"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ensure that the encoding is set to UTF-8, no matter what the system default is
|
|
||||||
// this fixes some edge cases with special characters not displaying correctly
|
|
||||||
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
|
|
||||||
tasks.withType(JavaCompile) {
|
|
||||||
options.encoding = "UTF-8"
|
|
||||||
}
|
|
||||||
|
|
||||||
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
|
|
||||||
// if it is present.
|
|
||||||
// If you remove this task, sources will not be generated.
|
|
||||||
task sourcesJar(type: Jar, dependsOn: classes) {
|
|
||||||
classifier = "sources"
|
|
||||||
from sourceSets.main.allSource
|
|
||||||
}
|
|
||||||
|
|
||||||
jar {
|
|
||||||
from "LICENSE"
|
|
||||||
}
|
|
||||||
|
|
||||||
// configure the maven publication
|
|
||||||
publishing {
|
|
||||||
publications {
|
|
||||||
mavenJava(MavenPublication) {
|
|
||||||
// add all the jars that should be included when publishing to maven
|
|
||||||
artifact(remapJar) {
|
|
||||||
builtBy remapJar
|
|
||||||
}
|
|
||||||
artifact(sourcesJar) {
|
|
||||||
builtBy remapSourcesJar
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// select the repositories you want to publish to
|
|
||||||
repositories {
|
|
||||||
// uncomment to publish to the local maven
|
|
||||||
// mavenLocal()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
34
common/build.gradle
Normal file
34
common/build.gradle
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
architectury {
|
||||||
|
common(rootProject.enabled_platforms.split(","))
|
||||||
|
}
|
||||||
|
loom {
|
||||||
|
accessWidenerPath = file("src/main/resources/puzzle-models.accesswidener")
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
// We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
|
||||||
|
// Do NOT use other classes from fabric loader
|
||||||
|
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
|
||||||
|
modCompileOnly "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric"
|
||||||
|
|
||||||
|
modCompileOnly "org.quiltmc:quilt-loader:${rootProject.quilt_loader_version}"
|
||||||
|
modCompileOnlyApi "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${rootProject.quilt_fabric_api_version}"
|
||||||
|
modCompileOnlyApi ("org.aperlambda:lambdajcommon:1.8.1") {
|
||||||
|
exclude group: 'com.google.code.gson'
|
||||||
|
exclude group: 'com.google.guava'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
publications {
|
||||||
|
mavenCommon(MavenPublication) {
|
||||||
|
artifactId = rootProject.archives_base_name
|
||||||
|
from components.java
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
|
||||||
|
repositories {
|
||||||
|
// Add repositories to publish to here.
|
||||||
|
}
|
||||||
|
}
|
||||||
18
common/src/main/java/net/puzzlemc/core/PuzzleCore.java
Executable file
18
common/src/main/java/net/puzzlemc/core/PuzzleCore.java
Executable file
@@ -0,0 +1,18 @@
|
|||||||
|
package net.puzzlemc.core;
|
||||||
|
|
||||||
|
import net.puzzlemc.core.config.PuzzleConfig;
|
||||||
|
import net.puzzlemc.gui.PuzzleGui;
|
||||||
|
import net.puzzlemc.splashscreen.PuzzleSplashScreen;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
public class PuzzleCore {
|
||||||
|
public final static String MOD_ID = "puzzle";
|
||||||
|
public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
|
||||||
|
|
||||||
|
public static void initModules() {
|
||||||
|
PuzzleConfig.init(MOD_ID, PuzzleConfig.class);
|
||||||
|
PuzzleGui.init();
|
||||||
|
PuzzleSplashScreen.init();
|
||||||
|
}
|
||||||
|
}
|
||||||
28
common/src/main/java/net/puzzlemc/core/config/PuzzleConfig.java
Executable file
28
common/src/main/java/net/puzzlemc/core/config/PuzzleConfig.java
Executable file
@@ -0,0 +1,28 @@
|
|||||||
|
package net.puzzlemc.core.config;
|
||||||
|
|
||||||
|
import eu.midnightdust.lib.config.MidnightConfig;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class PuzzleConfig extends MidnightConfig {
|
||||||
|
private static final String GUI = "gui";
|
||||||
|
private static final String INTERNAL = "internal";
|
||||||
|
private static final String FEATURES = "features";
|
||||||
|
|
||||||
|
@Entry(category = GUI, name = "Disabled integrations") public static List<String> disabledIntegrations = new ArrayList<>();
|
||||||
|
@Entry(category = GUI, name = "Enable Puzzle button") public static boolean enablePuzzleButton = true;
|
||||||
|
|
||||||
|
@Entry(category = FEATURES, name = "puzzle.option.resourcepack_splash_screen") public static boolean resourcepackSplashScreen = true;
|
||||||
|
@Entry(category = FEATURES, name = "puzzle.option.unlimited_model_rotations") public static boolean unlimitedRotations = true;
|
||||||
|
@Entry(category = FEATURES, name = "puzzle.option.bigger_custom_models") public static boolean biggerModels = true;
|
||||||
|
|
||||||
|
@Entry(category = INTERNAL, name = "Enable debug messages") public static boolean debugMessages = false;
|
||||||
|
@Entry(category = INTERNAL, name = "Has custom splash screen") public static boolean hasCustomSplashScreen = false;
|
||||||
|
@Entry(category = INTERNAL, name = "Splash Background Color") public static int backgroundColor = 15675965;
|
||||||
|
@Entry(category = INTERNAL, name = "Splash Progress Bar Color") public static int progressBarColor = 16777215;
|
||||||
|
@Entry(category = INTERNAL, name = "Splash Progress Bar Background Color") public static int progressBarBackgroundColor = 15675965;
|
||||||
|
@Entry(category = INTERNAL, name = "Splash Progress Bar Frame Color") public static int progressFrameColor = 16777215;
|
||||||
|
@Entry(category = INTERNAL, name = "puzzle.option.better_splash_screen_blend") public static boolean disableBlend = false;
|
||||||
|
@Entry(category = INTERNAL, name = "Custom Blend Function") public static List<String> customBlendFunction = new ArrayList<>();
|
||||||
|
}
|
||||||
37
common/src/main/java/net/puzzlemc/gui/PuzzleApi.java
Executable file
37
common/src/main/java/net/puzzlemc/gui/PuzzleApi.java
Executable file
@@ -0,0 +1,37 @@
|
|||||||
|
package net.puzzlemc.gui;
|
||||||
|
|
||||||
|
import net.puzzlemc.core.config.PuzzleConfig;
|
||||||
|
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static net.puzzlemc.core.PuzzleCore.LOGGER;
|
||||||
|
|
||||||
|
public class PuzzleApi {
|
||||||
|
public static List<PuzzleWidget> GRAPHICS_OPTIONS = new ArrayList<>();
|
||||||
|
public static List<PuzzleWidget> MISC_OPTIONS = new ArrayList<>();
|
||||||
|
public static List<PuzzleWidget> PERFORMANCE_OPTIONS = new ArrayList<>();
|
||||||
|
public static List<PuzzleWidget> RESOURCE_OPTIONS = new ArrayList<>();
|
||||||
|
|
||||||
|
public static void addToGraphicsOptions(PuzzleWidget button) {
|
||||||
|
GRAPHICS_OPTIONS.add(button);
|
||||||
|
if (PuzzleConfig.debugMessages)
|
||||||
|
LOGGER.info("{} -> Graphics Options", button.descriptionText.getContent().toString());
|
||||||
|
}
|
||||||
|
public static void addToMiscOptions(PuzzleWidget button) {
|
||||||
|
MISC_OPTIONS.add(button);
|
||||||
|
if (PuzzleConfig.debugMessages)
|
||||||
|
LOGGER.info("{} -> Misc Options", button.descriptionText.getContent().toString());
|
||||||
|
}
|
||||||
|
public static void addToPerformanceOptions(PuzzleWidget button) {
|
||||||
|
PERFORMANCE_OPTIONS.add(button);
|
||||||
|
if (PuzzleConfig.debugMessages)
|
||||||
|
LOGGER.info("{}- > Performance Options", button.descriptionText.getContent().toString());
|
||||||
|
}
|
||||||
|
public static void addToResourceOptions(PuzzleWidget button) {
|
||||||
|
RESOURCE_OPTIONS.add(button);
|
||||||
|
if (PuzzleConfig.debugMessages)
|
||||||
|
LOGGER.info("{} -> Resource Options", button.descriptionText.getContent().toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
68
common/src/main/java/net/puzzlemc/gui/PuzzleGui.java
Executable file
68
common/src/main/java/net/puzzlemc/gui/PuzzleGui.java
Executable file
@@ -0,0 +1,68 @@
|
|||||||
|
package net.puzzlemc.gui;
|
||||||
|
|
||||||
|
import eu.midnightdust.core.MidnightLib;
|
||||||
|
import eu.midnightdust.lib.util.PlatformFunctions;
|
||||||
|
import net.minecraft.util.Identifier;
|
||||||
|
import net.puzzlemc.core.config.PuzzleConfig;
|
||||||
|
import net.puzzlemc.gui.compat.*;
|
||||||
|
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
||||||
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
import net.minecraft.util.Formatting;
|
||||||
|
import net.puzzlemc.splashscreen.PuzzleSplashScreen;
|
||||||
|
|
||||||
|
import static net.puzzlemc.core.PuzzleCore.LOGGER;
|
||||||
|
|
||||||
|
public class PuzzleGui {
|
||||||
|
public final static String id = "puzzle";
|
||||||
|
public static final Text YES = Text.translatable("gui.yes").formatted(Formatting.GREEN);
|
||||||
|
public static final Text NO = Text.translatable("gui.no").formatted(Formatting.RED);
|
||||||
|
public static final Identifier PUZZLE_BUTTON = Identifier.of(id, "icon/button");
|
||||||
|
|
||||||
|
public static void init() {
|
||||||
|
MidnightLib.hiddenMods.add("puzzle");
|
||||||
|
MinecraftClient client = MinecraftClient.getInstance();
|
||||||
|
PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Puzzle")));
|
||||||
|
PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.translatable("puzzle.midnightconfig.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> {
|
||||||
|
client.setScreen(PuzzleConfig.getScreen(client.currentScreen, "puzzle"));
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Puzzle")));
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.resourcepack_splash_screen"), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> {
|
||||||
|
PuzzleConfig.resourcepackSplashScreen = !PuzzleConfig.resourcepackSplashScreen;
|
||||||
|
PuzzleSplashScreen.resetColors();
|
||||||
|
PuzzleConfig.write(id);
|
||||||
|
MinecraftClient.getInstance().getTextureManager().registerTexture(PuzzleSplashScreen.LOGO, new PuzzleSplashScreen.LogoTexture(PuzzleSplashScreen.LOGO));
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.unlimited_model_rotations"), (button) -> button.setMessage(PuzzleConfig.unlimitedRotations ? YES : NO), (button) -> {
|
||||||
|
PuzzleConfig.unlimitedRotations = !PuzzleConfig.unlimitedRotations;
|
||||||
|
PuzzleConfig.write(id);
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("puzzle.option.bigger_custom_models"), (button) -> button.setMessage(PuzzleConfig.biggerModels ? YES : NO), (button) -> {
|
||||||
|
PuzzleConfig.biggerModels = !PuzzleConfig.biggerModels;
|
||||||
|
PuzzleConfig.write(id);
|
||||||
|
}));
|
||||||
|
if (isActive("cullleaves")) CullLeavesCompat.init();
|
||||||
|
if (isActive("colormatic")) ColormaticCompat.init();
|
||||||
|
if (isActive("borderlessmining")) BorderlessMiningCompat.init();
|
||||||
|
if (isActive("iris")) IrisCompat.init();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean lateInitDone = false;
|
||||||
|
public static void lateInit() { // Some mods are initialized after Puzzle, so we can't access them in our ClientModInitializer
|
||||||
|
if (isActive("lambdynlights")) LDLCompat.init();
|
||||||
|
if (isActive("citresewn")) CITRCompat.init();
|
||||||
|
if (isActive("lambdabettergrass")) LBGCompat.init();
|
||||||
|
if (isActive("continuity")) ContinuityCompat.init();
|
||||||
|
try {
|
||||||
|
if (isActive("entity_texture_features")) ETFCompat.init();
|
||||||
|
if (isActive("entity_model_features")) EMFCompat.init();
|
||||||
|
} catch (Exception e) {
|
||||||
|
LOGGER.error("ETF/EMF config structure changed. Again...", e);
|
||||||
|
}
|
||||||
|
|
||||||
|
lateInitDone = true;
|
||||||
|
}
|
||||||
|
public static boolean isActive(String modid) {
|
||||||
|
return PlatformFunctions.isModLoaded(modid) && !PuzzleConfig.disabledIntegrations.contains(modid);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package net.puzzlemc.gui.compat;
|
||||||
|
|
||||||
|
import link.infra.borderlessmining.config.ConfigHandler;
|
||||||
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
import net.puzzlemc.gui.PuzzleApi;
|
||||||
|
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
||||||
|
|
||||||
|
import static net.puzzlemc.gui.PuzzleGui.NO;
|
||||||
|
import static net.puzzlemc.gui.PuzzleGui.YES;
|
||||||
|
|
||||||
|
public class BorderlessMiningCompat {
|
||||||
|
public static void init() {
|
||||||
|
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();
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
60
common/src/main/java/net/puzzlemc/gui/compat/CITRCompat.java
Normal file
60
common/src/main/java/net/puzzlemc/gui/compat/CITRCompat.java
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
package net.puzzlemc.gui.compat;
|
||||||
|
|
||||||
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
import net.minecraft.util.Formatting;
|
||||||
|
import net.puzzlemc.gui.PuzzleApi;
|
||||||
|
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
||||||
|
import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
|
||||||
|
|
||||||
|
import static net.minecraft.screen.ScreenTexts.NO;
|
||||||
|
import static net.minecraft.screen.ScreenTexts.YES;
|
||||||
|
|
||||||
|
public class CITRCompat {
|
||||||
|
public static void init() {
|
||||||
|
if (CITResewnConfig.INSTANCE != null) {
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("CIT Resewn")));
|
||||||
|
CITResewnConfig citConfig = CITResewnConfig.INSTANCE;
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? YES : NO), (button) -> {
|
||||||
|
citConfig.enabled = !citConfig.enabled;
|
||||||
|
citConfig.write();
|
||||||
|
MinecraftClient.getInstance().reloadResources();
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.mute_errors.title"), (button) -> button.setMessage(citConfig.mute_errors ? YES : NO), (button) -> {
|
||||||
|
citConfig.mute_errors = !citConfig.mute_errors;
|
||||||
|
citConfig.write();
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.mute_warns.title"), (button) -> button.setMessage(citConfig.mute_warns ? YES : NO), (button) -> {
|
||||||
|
citConfig.mute_warns = !citConfig.mute_warns;
|
||||||
|
citConfig.write();
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.citresewn.broken_paths.title"), (button) -> button.setMessage(citConfig.broken_paths ? YES : NO), (button) -> {
|
||||||
|
citConfig.broken_paths = !citConfig.broken_paths;
|
||||||
|
citConfig.write();
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100, Text.translatable("config.citresewn.cache_ms.title"), () -> citConfig.cache_ms,
|
||||||
|
(button) -> button.setMessage(message(citConfig)),
|
||||||
|
(slider) -> {
|
||||||
|
try {
|
||||||
|
citConfig.cache_ms = slider.getInt();
|
||||||
|
} catch (NumberFormatException ignored) {
|
||||||
|
}
|
||||||
|
citConfig.write();
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public static Text message(CITResewnConfig config) {
|
||||||
|
int ticks = config.cache_ms;
|
||||||
|
if (ticks <= 1) {
|
||||||
|
return (Text.translatable("config.citresewn.cache_ms.ticks." + ticks)).formatted(Formatting.AQUA);
|
||||||
|
} else {
|
||||||
|
Formatting color = Formatting.DARK_RED;
|
||||||
|
if (ticks <= 40) color = Formatting.RED;
|
||||||
|
if (ticks <= 20) color = Formatting.GOLD;
|
||||||
|
if (ticks <= 10) color = Formatting.DARK_GREEN;
|
||||||
|
if (ticks <= 5) color = Formatting.GREEN;
|
||||||
|
|
||||||
|
return (Text.translatable("config.citresewn.cache_ms.ticks.any", ticks)).formatted(color);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
package net.puzzlemc.gui.compat;
|
||||||
|
|
||||||
|
import io.github.kvverti.colormatic.Colormatic;
|
||||||
|
import io.github.kvverti.colormatic.ColormaticConfig;
|
||||||
|
import io.github.kvverti.colormatic.ColormaticConfigController;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
import net.puzzlemc.gui.PuzzleApi;
|
||||||
|
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
||||||
|
|
||||||
|
import static net.puzzlemc.gui.PuzzleGui.NO;
|
||||||
|
import static net.puzzlemc.gui.PuzzleGui.YES;
|
||||||
|
|
||||||
|
public class ColormaticCompat {
|
||||||
|
public static void init() {
|
||||||
|
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) {}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
package net.puzzlemc.gui.compat;
|
||||||
|
|
||||||
|
import me.pepperbell.continuity.client.config.ContinuityConfig;
|
||||||
|
import me.pepperbell.continuity.client.config.Option;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
import net.puzzlemc.gui.PuzzleApi;
|
||||||
|
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
||||||
|
|
||||||
|
import static net.puzzlemc.gui.PuzzleGui.NO;
|
||||||
|
import static net.puzzlemc.gui.PuzzleGui.YES;
|
||||||
|
|
||||||
|
public class ContinuityCompat {
|
||||||
|
public static void init() {
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Continuity")));
|
||||||
|
ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
|
||||||
|
contConfig.getOptionMapView().forEach((s, option) -> {
|
||||||
|
if (s.equals("use_manual_culling")) return;
|
||||||
|
try {
|
||||||
|
Option.BooleanOption booleanOption = ((Option.BooleanOption)option);
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("options.continuity."+s), (button) -> button.setMessage(booleanOption.get() ? YES : NO), (button) -> {
|
||||||
|
booleanOption.set(!booleanOption.get());
|
||||||
|
contConfig.save();
|
||||||
|
}));
|
||||||
|
} catch (Exception ignored) {}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
package net.puzzlemc.gui.compat;
|
||||||
|
|
||||||
|
import eu.midnightdust.cullleaves.config.CullLeavesConfig;
|
||||||
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
import net.puzzlemc.gui.PuzzleApi;
|
||||||
|
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
||||||
|
|
||||||
|
import static net.puzzlemc.gui.PuzzleGui.NO;
|
||||||
|
import static net.puzzlemc.gui.PuzzleGui.YES;
|
||||||
|
|
||||||
|
public class CullLeavesCompat {
|
||||||
|
public static void init() {
|
||||||
|
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("CullLeaves")));
|
||||||
|
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.translatable("cullleaves.puzzle.option.enabled"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
|
||||||
|
CullLeavesConfig.enabled = !CullLeavesConfig.enabled;
|
||||||
|
CullLeavesConfig.write("cullleaves");
|
||||||
|
MinecraftClient.getInstance().worldRenderer.reload();
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
39
common/src/main/java/net/puzzlemc/gui/compat/EMFCompat.java
Normal file
39
common/src/main/java/net/puzzlemc/gui/compat/EMFCompat.java
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
package net.puzzlemc.gui.compat;
|
||||||
|
|
||||||
|
import eu.midnightdust.lib.util.PlatformFunctions;
|
||||||
|
import net.minecraft.screen.ScreenTexts;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
import net.puzzlemc.gui.PuzzleApi;
|
||||||
|
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
||||||
|
import traben.entity_model_features.EMF;
|
||||||
|
import traben.entity_model_features.config.EMFConfig;
|
||||||
|
|
||||||
|
import java.util.EnumSet;
|
||||||
|
import java.util.NavigableSet;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.TreeSet;
|
||||||
|
|
||||||
|
import static net.puzzlemc.gui.PuzzleGui.NO;
|
||||||
|
import static net.puzzlemc.gui.PuzzleGui.YES;
|
||||||
|
|
||||||
|
public class EMFCompat {
|
||||||
|
public static void init() {
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("entity_model_features.title")));
|
||||||
|
EMFConfig emfConfig = EMF.config().getConfig();
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("entity_model_features.config.force_models"), (button) -> button.setMessage(emfConfig.attemptRevertingEntityModelsAlteredByAnotherMod ? YES : NO), (button) -> {
|
||||||
|
emfConfig.attemptRevertingEntityModelsAlteredByAnotherMod = !emfConfig.attemptRevertingEntityModelsAlteredByAnotherMod;
|
||||||
|
EMF.config().saveToFile();
|
||||||
|
}));
|
||||||
|
if (PlatformFunctions.isModLoaded("physicsmod")) {
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("entity_model_features.config.physics"), (button) -> button.setMessage(emfConfig.attemptPhysicsModPatch_2 != EMFConfig.PhysicsModCompatChoice.OFF ?
|
||||||
|
Text.translatable("entity_model_features.config." + (emfConfig.attemptPhysicsModPatch_2 == EMFConfig.PhysicsModCompatChoice.VANILLA ? "physics.1" : "physics.2")) : ScreenTexts.OFF), (button) -> {
|
||||||
|
final NavigableSet<EMFConfig.PhysicsModCompatChoice> set =
|
||||||
|
new TreeSet<>(EnumSet.allOf(EMFConfig.PhysicsModCompatChoice.class));
|
||||||
|
|
||||||
|
emfConfig.attemptPhysicsModPatch_2 = Objects.requireNonNullElseGet(
|
||||||
|
set.higher(emfConfig.attemptPhysicsModPatch_2), set::first);
|
||||||
|
EMF.config().saveToFile();
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
47
common/src/main/java/net/puzzlemc/gui/compat/ETFCompat.java
Normal file
47
common/src/main/java/net/puzzlemc/gui/compat/ETFCompat.java
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
package net.puzzlemc.gui.compat;
|
||||||
|
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
import net.puzzlemc.gui.PuzzleApi;
|
||||||
|
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
||||||
|
import traben.entity_texture_features.ETFApi;
|
||||||
|
import traben.entity_texture_features.config.ETFConfig;
|
||||||
|
|
||||||
|
import java.util.EnumSet;
|
||||||
|
import java.util.NavigableSet;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.TreeSet;
|
||||||
|
|
||||||
|
import static net.puzzlemc.gui.PuzzleGui.NO;
|
||||||
|
import static net.puzzlemc.gui.PuzzleGui.YES;
|
||||||
|
|
||||||
|
public class ETFCompat {
|
||||||
|
public static void init() {
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.title")));
|
||||||
|
ETFConfig etfConfig = ETFApi.getETFConfigObject();
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.enable_custom_textures.title"), (button) -> button.setMessage(etfConfig.enableCustomTextures ? YES : NO), (button) -> {
|
||||||
|
etfConfig.enableCustomTextures = !etfConfig.enableCustomTextures;
|
||||||
|
ETFApi.saveETFConfigChangesAndResetETF();
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.enable_emissive_textures.title"), (button) -> button.setMessage(etfConfig.enableEmissiveTextures ? YES : NO), (button) -> {
|
||||||
|
etfConfig.enableEmissiveTextures = !etfConfig.enableEmissiveTextures;
|
||||||
|
ETFApi.saveETFConfigChangesAndResetETF();
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.emissive_mode.title"), (button) -> button.setMessage(
|
||||||
|
Text.literal(etfConfig.emissiveRenderMode.toString())), (button) -> {
|
||||||
|
final NavigableSet<ETFConfig.EmissiveRenderModes> set =
|
||||||
|
new TreeSet<>(EnumSet.allOf(ETFConfig.EmissiveRenderModes.class));
|
||||||
|
|
||||||
|
etfConfig.emissiveRenderMode = Objects.requireNonNullElseGet(
|
||||||
|
set.higher(etfConfig.emissiveRenderMode), set::first);
|
||||||
|
ETFApi.saveETFConfigChangesAndResetETF();
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.blinking_mob_settings.title"), (button) -> button.setMessage(etfConfig.enableBlinking ? YES : NO), (button) -> {
|
||||||
|
etfConfig.enableBlinking = !etfConfig.enableBlinking;
|
||||||
|
ETFApi.saveETFConfigChangesAndResetETF();
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.translatable("config.entity_texture_features.player_skin_features.title"), (button) -> button.setMessage(etfConfig.skinFeaturesEnabled ? YES : NO), (button) -> {
|
||||||
|
etfConfig.skinFeaturesEnabled = !etfConfig.skinFeaturesEnabled;
|
||||||
|
ETFApi.saveETFConfigChangesAndResetETF();
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
25
common/src/main/java/net/puzzlemc/gui/compat/IrisCompat.java
Normal file
25
common/src/main/java/net/puzzlemc/gui/compat/IrisCompat.java
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
package net.puzzlemc.gui.compat;
|
||||||
|
|
||||||
|
import net.irisshaders.iris.api.v0.IrisApi;
|
||||||
|
import net.irisshaders.iris.api.v0.IrisApiConfig;
|
||||||
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
import net.minecraft.util.Formatting;
|
||||||
|
import net.puzzlemc.gui.PuzzleApi;
|
||||||
|
import net.puzzlemc.gui.PuzzleGui;
|
||||||
|
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
||||||
|
|
||||||
|
public class IrisCompat {
|
||||||
|
public static void init() {
|
||||||
|
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("Iris")));
|
||||||
|
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("iris.puzzle.option.enableShaders"), (button) -> button.setMessage(IrisApi.getInstance().getConfig().areShadersEnabled() ? PuzzleGui.YES : PuzzleGui.NO), (button) -> {
|
||||||
|
IrisApiConfig irisConfig = IrisApi.getInstance().getConfig();
|
||||||
|
irisConfig.setShadersEnabledAndApply(!irisConfig.areShadersEnabled());
|
||||||
|
}));
|
||||||
|
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("options.iris.shaderPackSelection.title"), (button) -> button.setMessage(Text.literal("➥ ").append(Text.translatable("iris.puzzle.option.open").formatted(Formatting.GOLD))), (button) -> {
|
||||||
|
MinecraftClient client = MinecraftClient.getInstance();
|
||||||
|
client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(client.currentScreen));
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
19
common/src/main/java/net/puzzlemc/gui/compat/LBGCompat.java
Normal file
19
common/src/main/java/net/puzzlemc/gui/compat/LBGCompat.java
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
package net.puzzlemc.gui.compat;
|
||||||
|
|
||||||
|
import dev.lambdaurora.lambdabettergrass.LBGConfig;
|
||||||
|
import dev.lambdaurora.lambdabettergrass.LambdaBetterGrass;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
import net.puzzlemc.gui.PuzzleApi;
|
||||||
|
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
||||||
|
|
||||||
|
import static net.puzzlemc.gui.PuzzleGui.NO;
|
||||||
|
import static net.puzzlemc.gui.PuzzleGui.YES;
|
||||||
|
|
||||||
|
public class LBGCompat {
|
||||||
|
public static void init() {
|
||||||
|
LBGConfig lbgConfig = LambdaBetterGrass.get().config;
|
||||||
|
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.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
|
||||||
|
}
|
||||||
|
}
|
||||||
24
common/src/main/java/net/puzzlemc/gui/compat/LDLCompat.java
Normal file
24
common/src/main/java/net/puzzlemc/gui/compat/LDLCompat.java
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
package net.puzzlemc.gui.compat;
|
||||||
|
|
||||||
|
import dev.lambdaurora.lambdynlights.DynamicLightsConfig;
|
||||||
|
import dev.lambdaurora.lambdynlights.LambDynLights;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
import net.puzzlemc.gui.PuzzleApi;
|
||||||
|
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
|
||||||
|
|
||||||
|
import static net.puzzlemc.gui.PuzzleGui.NO;
|
||||||
|
import static net.puzzlemc.gui.PuzzleGui.YES;
|
||||||
|
|
||||||
|
public class LDLCompat {
|
||||||
|
public static void init() {
|
||||||
|
DynamicLightsConfig ldlConfig = LambDynLights.get().config;
|
||||||
|
|
||||||
|
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambDynamicLights")));
|
||||||
|
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.translatable("lambdynlights.option.mode"), (button) -> button.setMessage(ldlConfig.getDynamicLightsMode().getTranslatedText()), (button) -> ldlConfig.setDynamicLightsMode(ldlConfig.getDynamicLightsMode().next())));
|
||||||
|
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.empty().append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.entities")), (button) -> button.setMessage(ldlConfig.getEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getEntitiesLightSource().set(!ldlConfig.getEntitiesLightSource().get())));
|
||||||
|
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.empty().append("DynLights: ").append(Text.translatable("lambdynlights.option.light_sources.block_entities")), (button) -> button.setMessage(ldlConfig.getBlockEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getBlockEntitiesLightSource().set(!ldlConfig.getBlockEntitiesLightSource().get())));
|
||||||
|
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.empty().append("DynLights: ").append(Text.translatable("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next())));
|
||||||
|
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.empty().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.empty().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())));
|
||||||
|
}
|
||||||
|
}
|
||||||
52
common/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java
Executable file
52
common/src/main/java/net/puzzlemc/gui/mixin/MixinOptionsScreen.java
Executable file
@@ -0,0 +1,52 @@
|
|||||||
|
package net.puzzlemc.gui.mixin;
|
||||||
|
|
||||||
|
import eu.midnightdust.core.config.MidnightLibConfig;
|
||||||
|
import eu.midnightdust.lib.util.PlatformFunctions;
|
||||||
|
import net.minecraft.client.gui.widget.TextIconButtonWidget;
|
||||||
|
import net.minecraft.client.gui.widget.ThreePartsLayoutWidget;
|
||||||
|
import net.puzzlemc.core.config.PuzzleConfig;
|
||||||
|
import net.puzzlemc.gui.PuzzleGui;
|
||||||
|
import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
|
||||||
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
|
import net.minecraft.client.gui.screen.option.OptionsScreen;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
import org.spongepowered.asm.mixin.Final;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
|
import org.spongepowered.asm.mixin.Unique;
|
||||||
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
@Mixin(OptionsScreen.class)
|
||||||
|
public abstract class MixinOptionsScreen extends Screen {
|
||||||
|
@Shadow @Final private ThreePartsLayoutWidget layout;
|
||||||
|
@Unique TextIconButtonWidget puzzle$button = TextIconButtonWidget.builder(Text.translatable("puzzle.screen.title"), (buttonWidget) ->
|
||||||
|
(Objects.requireNonNull(this.client)).setScreen(new PuzzleOptionsScreen(this)), true)
|
||||||
|
.dimension(20, 20).texture(PuzzleGui.PUZZLE_BUTTON, 20, 20).build();
|
||||||
|
|
||||||
|
private MixinOptionsScreen(Text title) {super(title);}
|
||||||
|
|
||||||
|
@Inject(at = @At("HEAD"), method = "init")
|
||||||
|
public void puzzle$onInit(CallbackInfo ci) {
|
||||||
|
if (PuzzleConfig.enablePuzzleButton) {
|
||||||
|
this.puzzle$setButtonPos();
|
||||||
|
this.addDrawableChild(puzzle$button);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Inject(at = @At("TAIL"), method = "refreshWidgetPositions")
|
||||||
|
public void puzzle$onResize(CallbackInfo ci) {
|
||||||
|
if (PuzzleConfig.enablePuzzleButton) this.puzzle$setButtonPos();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Unique
|
||||||
|
public void puzzle$setButtonPos() {
|
||||||
|
int i = 0;
|
||||||
|
if (PlatformFunctions.isModLoaded("lod")) i = i + 358;
|
||||||
|
if (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.FALSE)) i = i - 25;
|
||||||
|
puzzle$button.setPosition(this.width / 2 - 178 + i, layout.getY() + layout.getFooterHeight() - 4);
|
||||||
|
}
|
||||||
|
}
|
||||||
92
common/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java
Executable file
92
common/src/main/java/net/puzzlemc/gui/screen/PuzzleOptionsScreen.java
Executable file
@@ -0,0 +1,92 @@
|
|||||||
|
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.text.Text;
|
||||||
|
import net.puzzlemc.gui.PuzzleApi;
|
||||||
|
import net.puzzlemc.gui.PuzzleGui;
|
||||||
|
import net.puzzlemc.gui.screen.widget.*;
|
||||||
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
|
import net.minecraft.client.gui.widget.ButtonWidget;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
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) {
|
||||||
|
super(Text.translatable("puzzle.screen.title"));
|
||||||
|
this.parent = parent;
|
||||||
|
}
|
||||||
|
private final Screen parent;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void init() {
|
||||||
|
if (!PuzzleGui.lateInitDone) PuzzleGui.lateInit();
|
||||||
|
|
||||||
|
List<Tab> tabs = Lists.newArrayList();
|
||||||
|
if (!PuzzleApi.GRAPHICS_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(graphicsTab));
|
||||||
|
if (!PuzzleApi.RESOURCE_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(resourcesTab));
|
||||||
|
if (!PuzzleApi.PERFORMANCE_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(performanceTab));
|
||||||
|
if (!PuzzleApi.MISC_OPTIONS.isEmpty()) tabs.add(new GridScreenTab(miscTab));
|
||||||
|
|
||||||
|
tabNavigation = TabNavigationWidget.builder(tabManager, this.width).tabs(tabs.toArray(new Tab[0])).build();
|
||||||
|
tabNavigation.selectTab(0, false);
|
||||||
|
tabNavigation.init();
|
||||||
|
prevTab = tabManager.getCurrentTab();
|
||||||
|
|
||||||
|
this.list = new PuzzleOptionListWidget(this.client, this.width, this.height - 57, 24, 25);
|
||||||
|
fillList();
|
||||||
|
|
||||||
|
if (tabs.size() > 1) {
|
||||||
|
this.addDrawableChild(tabNavigation);
|
||||||
|
list.renderHeaderSeparator = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.addDrawableChild(list);
|
||||||
|
|
||||||
|
super.init();
|
||||||
|
this.addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)).dimensions(this.width / 2 - 100, this.height - 26, 200, 20).build());
|
||||||
|
}
|
||||||
|
private void fillList() {
|
||||||
|
List<PuzzleWidget> options = List.of();
|
||||||
|
if (tabManager.getCurrentTab() == null) return;
|
||||||
|
else {
|
||||||
|
Text title = tabManager.getCurrentTab().getTitle();
|
||||||
|
if (title.equals(graphicsTab)) options = PuzzleApi.GRAPHICS_OPTIONS;
|
||||||
|
else if (title.equals(miscTab)) options = PuzzleApi.MISC_OPTIONS;
|
||||||
|
else if (title.equals(performanceTab))
|
||||||
|
options = PuzzleApi.PERFORMANCE_OPTIONS;
|
||||||
|
else if (title.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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
5
common/src/main/java/net/puzzlemc/gui/screen/widget/ButtonType.java
Executable file
5
common/src/main/java/net/puzzlemc/gui/screen/widget/ButtonType.java
Executable file
@@ -0,0 +1,5 @@
|
|||||||
|
package net.puzzlemc.gui.screen.widget;
|
||||||
|
|
||||||
|
public enum ButtonType {
|
||||||
|
TEXT, BUTTON, SLIDER, TEXT_FIELD
|
||||||
|
}
|
||||||
22
common/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleButtonWidget.java
Executable file
22
common/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleButtonWidget.java
Executable file
@@ -0,0 +1,22 @@
|
|||||||
|
package net.puzzlemc.gui.screen.widget;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.DrawContext;
|
||||||
|
import net.minecraft.client.gui.widget.ButtonWidget;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
|
public class PuzzleButtonWidget extends ButtonWidget {
|
||||||
|
private final PuzzleWidget.TextAction title;
|
||||||
|
|
||||||
|
public PuzzleButtonWidget(int x, int y, int width, int height, PuzzleWidget.TextAction title, PressAction onPress) {
|
||||||
|
super(x, y, width, height, Text.of(""), onPress, Supplier::get);
|
||||||
|
this.title = title;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
|
||||||
|
try { title.setTitle(this);
|
||||||
|
} catch (Exception e) {e.fillInStackTrace(); this.visible = false;}
|
||||||
|
super.renderWidget(context, mouseX, mouseY, delta);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
package net.puzzlemc.gui.screen.widget;
|
||||||
|
|
||||||
|
import eu.midnightdust.lib.config.MidnightConfig;
|
||||||
|
import net.fabricmc.api.EnvType;
|
||||||
|
import net.fabricmc.api.Environment;
|
||||||
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.client.font.TextRenderer;
|
||||||
|
import net.minecraft.client.gui.DrawContext;
|
||||||
|
import net.minecraft.client.gui.widget.ClickableWidget;
|
||||||
|
import net.minecraft.client.resource.language.I18n;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
import net.minecraft.text.TranslatableTextContent;
|
||||||
|
import net.minecraft.util.Formatting;
|
||||||
|
import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static net.puzzlemc.core.PuzzleCore.LOGGER;
|
||||||
|
|
||||||
|
@Environment(EnvType.CLIENT)
|
||||||
|
public class PuzzleOptionListWidget extends MidnightConfig.MidnightConfigListWidget {
|
||||||
|
TextRenderer textRenderer;
|
||||||
|
|
||||||
|
public PuzzleOptionListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l) {
|
||||||
|
super(minecraftClient, i, j, k, l);
|
||||||
|
this.centerListVertically = false;
|
||||||
|
textRenderer = minecraftClient.textRenderer;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addAll(List<PuzzleWidget> buttons) {
|
||||||
|
int buttonX = this.width - 160;
|
||||||
|
for (PuzzleWidget button : buttons) {
|
||||||
|
if (button.buttonType == ButtonType.TEXT)
|
||||||
|
this.addButton(List.of(), Text.literal(" ").append(button.descriptionText).formatted(Formatting.BOLD));
|
||||||
|
else if (button.buttonType == ButtonType.BUTTON)
|
||||||
|
this.addButton(List.of(new PuzzleButtonWidget(buttonX, 0, 150, 20, button.buttonTextAction, button.onPress)), button.descriptionText);
|
||||||
|
else if (button.buttonType == ButtonType.SLIDER)
|
||||||
|
this.addButton(List.of(new PuzzleSliderWidget(button.min, button.max, buttonX, 0, 150, 20, button.defaultSliderValue.getAsInt(), button.buttonTextAction, button.changeSliderValue)), button.descriptionText);
|
||||||
|
else if (button.buttonType == ButtonType.TEXT_FIELD)
|
||||||
|
this.addButton(List.of(new PuzzleTextFieldWidget(textRenderer, buttonX, 0, 150, 20, button.setTextValue, button.changeTextValue)), button.descriptionText);
|
||||||
|
else
|
||||||
|
LOGGER.warn("Button {} is missing the buttonType variable. This shouldn't happen!", button);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public void addButton(List<ClickableWidget> buttons, Text text) {
|
||||||
|
var entry = new MidnightConfig.ButtonEntry(buttons, text, new MidnightConfig.EntryInfo());
|
||||||
|
entry.centered = buttons.isEmpty();
|
||||||
|
this.addEntry(entry);
|
||||||
|
}
|
||||||
|
public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
|
||||||
|
super.renderWidget(context, mouseX, mouseY, delta);
|
||||||
|
MidnightConfig.ButtonEntry e = this.getHoveredEntry();
|
||||||
|
if (client.currentScreen instanceof PuzzleOptionsScreen page && e != null && !e.buttons.isEmpty() &&
|
||||||
|
e.text.getContent() instanceof TranslatableTextContent content) {
|
||||||
|
ClickableWidget button = e.buttons.getFirst();
|
||||||
|
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;
|
||||||
|
if (!button.isMouseOver(mouseX, mouseY)) {
|
||||||
|
context.drawTooltip(textRenderer, list, button.getX(), button.getY() + (button.getHeight() * 2));
|
||||||
|
}
|
||||||
|
else context.drawTooltip(textRenderer, list, mouseX, mouseY);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public MidnightConfig.ButtonEntry getHoveredEntry() {
|
||||||
|
return super.getHoveredEntry();
|
||||||
|
}
|
||||||
|
}
|
||||||
42
common/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleSliderWidget.java
Executable file
42
common/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleSliderWidget.java
Executable file
@@ -0,0 +1,42 @@
|
|||||||
|
package net.puzzlemc.gui.screen.widget;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.widget.SliderWidget;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
|
||||||
|
public class PuzzleSliderWidget extends SliderWidget {
|
||||||
|
private final int min;
|
||||||
|
private final int max;
|
||||||
|
private final PuzzleWidget.TextAction setTextAction;
|
||||||
|
private final 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(""),(defaultValue-min) / (max - min));
|
||||||
|
|
||||||
|
this.min = min;
|
||||||
|
this.max = max;
|
||||||
|
|
||||||
|
this.setTextAction = setTextAction;
|
||||||
|
this.changeAction = changeAction;
|
||||||
|
try {
|
||||||
|
this.updateMessage();
|
||||||
|
} catch (Exception e) {e.fillInStackTrace(); this.visible = false;}
|
||||||
|
}
|
||||||
|
public int getInt() {
|
||||||
|
int difference = max - min;
|
||||||
|
int r = (int) (value * difference);
|
||||||
|
return r + min;
|
||||||
|
}
|
||||||
|
public void setInt(int v) {
|
||||||
|
value = value / v - value * min;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void updateMessage() {
|
||||||
|
this.setTextAction.setTitle(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void applyValue() {
|
||||||
|
this.changeAction.onChange(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package net.puzzlemc.gui.screen.widget;
|
||||||
|
|
||||||
|
import net.minecraft.client.font.TextRenderer;
|
||||||
|
import net.minecraft.client.gui.widget.TextFieldWidget;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
|
||||||
|
public class PuzzleTextFieldWidget extends TextFieldWidget {
|
||||||
|
private final PuzzleWidget.SetTextValueAction setValueAction;
|
||||||
|
private final PuzzleWidget.ChangeTextValueAction change;
|
||||||
|
|
||||||
|
public PuzzleTextFieldWidget(TextRenderer textRenderer, int x, int y, int width, int height, PuzzleWidget.SetTextValueAction setValue, PuzzleWidget.ChangeTextValueAction change) {
|
||||||
|
super(textRenderer, x, y, width, height, Text.of(""));
|
||||||
|
this.setValueAction = setValue;
|
||||||
|
this.change = change;
|
||||||
|
try {
|
||||||
|
setValueAction.setTextValue(this);
|
||||||
|
} catch (Exception e) {e.fillInStackTrace(); this.setVisible(false);}
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void write(String text) {
|
||||||
|
super.write(text);
|
||||||
|
this.change.onChange(this);
|
||||||
|
setValueAction.setTextValue(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
78
common/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleWidget.java
Executable file
78
common/src/main/java/net/puzzlemc/gui/screen/widget/PuzzleWidget.java
Executable file
@@ -0,0 +1,78 @@
|
|||||||
|
package net.puzzlemc.gui.screen.widget;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.widget.ButtonWidget;
|
||||||
|
import net.minecraft.client.gui.widget.ClickableWidget;
|
||||||
|
import net.minecraft.client.gui.widget.TextFieldWidget;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
|
||||||
|
import java.util.function.IntSupplier;
|
||||||
|
|
||||||
|
public class PuzzleWidget {
|
||||||
|
public ButtonType buttonType;
|
||||||
|
public int min;
|
||||||
|
public int max;
|
||||||
|
public Text descriptionText;
|
||||||
|
public TextAction buttonTextAction;
|
||||||
|
public ButtonWidget.PressAction onPress;
|
||||||
|
public PuzzleWidget.SetTextValueAction setTextValue;
|
||||||
|
public IntSupplier defaultSliderValue;
|
||||||
|
public PuzzleWidget.ChangeTextValueAction changeTextValue;
|
||||||
|
public PuzzleWidget.ChangeSliderValueAction changeSliderValue;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Puzzle Text Widget Container
|
||||||
|
* @param descriptionText The text you want to display.
|
||||||
|
*/
|
||||||
|
public PuzzleWidget(Text descriptionText) {
|
||||||
|
this.buttonType = ButtonType.TEXT;
|
||||||
|
this.descriptionText = descriptionText;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Puzzle Button Widget Container
|
||||||
|
* @param descriptionText Tells the user what the option does.
|
||||||
|
* @param getTitle Function to set the text on the button.
|
||||||
|
* @param onPress Function to call when the user presses the button.
|
||||||
|
*/
|
||||||
|
public PuzzleWidget(Text descriptionText, PuzzleWidget.TextAction getTitle, ButtonWidget.PressAction onPress) {
|
||||||
|
this.buttonType = ButtonType.BUTTON;
|
||||||
|
this.descriptionText = descriptionText;
|
||||||
|
this.buttonTextAction = getTitle;
|
||||||
|
this.onPress = onPress;
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* Puzzle Slider Widget Container
|
||||||
|
*/
|
||||||
|
public PuzzleWidget(int min, int max, Text descriptionText, IntSupplier defaultSliderValue, PuzzleWidget.TextAction setTextAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
|
||||||
|
this.buttonType = ButtonType.SLIDER;
|
||||||
|
this.min = min;
|
||||||
|
this.max = max;
|
||||||
|
this.descriptionText = descriptionText;
|
||||||
|
this.defaultSliderValue = defaultSliderValue;
|
||||||
|
this.buttonTextAction = setTextAction;
|
||||||
|
this.changeSliderValue = changeAction;
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* Puzzle Text Field Widget Container (WIP - Doesn't work)
|
||||||
|
*/
|
||||||
|
public PuzzleWidget(int min, int max, Text descriptionText, PuzzleWidget.SetTextValueAction setValue, ChangeTextValueAction changeAction) {
|
||||||
|
this.buttonType = ButtonType.TEXT_FIELD;
|
||||||
|
this.min = min;
|
||||||
|
this.max = max;
|
||||||
|
this.descriptionText = descriptionText;
|
||||||
|
this.setTextValue = setValue;
|
||||||
|
this.changeTextValue = changeAction;
|
||||||
|
}
|
||||||
|
public interface ChangeTextValueAction {
|
||||||
|
void onChange(TextFieldWidget textField);
|
||||||
|
}
|
||||||
|
public interface ChangeSliderValueAction {
|
||||||
|
void onChange(PuzzleSliderWidget slider);
|
||||||
|
}
|
||||||
|
public interface SetTextValueAction {
|
||||||
|
void setTextValue(TextFieldWidget textField);
|
||||||
|
}
|
||||||
|
public interface TextAction {
|
||||||
|
void setTitle(ClickableWidget button);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
package net.puzzlemc.models.mixin;
|
||||||
|
|
||||||
|
import com.google.gson.JsonObject;
|
||||||
|
import com.google.gson.JsonParseException;
|
||||||
|
import net.minecraft.client.render.model.json.ModelElement;
|
||||||
|
import net.minecraft.util.JsonHelper;
|
||||||
|
import net.puzzlemc.core.config.PuzzleConfig;
|
||||||
|
import org.joml.Vector3f;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||||
|
|
||||||
|
@Mixin(ModelElement.Deserializer.class)
|
||||||
|
public abstract class MixinModelElementDeserializer {
|
||||||
|
@Shadow protected abstract Vector3f deserializeVec3f(JsonObject object, String name);
|
||||||
|
|
||||||
|
@Inject(at = @At("HEAD"),method = "deserializeRotationAngle", cancellable = true)
|
||||||
|
private void puzzle$deserializeRotationAngle(JsonObject object, CallbackInfoReturnable<Float> cir) {
|
||||||
|
if (PuzzleConfig.unlimitedRotations) {
|
||||||
|
float angle = JsonHelper.getFloat(object, "angle");
|
||||||
|
cir.setReturnValue(angle);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@Inject(at = @At("HEAD"),method = "deserializeTo", cancellable = true)
|
||||||
|
private void puzzle$deserializeTo(JsonObject object, CallbackInfoReturnable<Vector3f> cir) {
|
||||||
|
if (PuzzleConfig.biggerModels) {
|
||||||
|
Vector3f vec3f = this.deserializeVec3f(object, "to");
|
||||||
|
if (!(vec3f.x < -32.0F) && !(vec3f.y < -32.0F) && !(vec3f.z < -32.0F) && !(vec3f.x > 48.0F) && !(vec3f.y > 48.0F) && !(vec3f.z > 48.0F)) {
|
||||||
|
cir.setReturnValue(vec3f);
|
||||||
|
} else {
|
||||||
|
throw new JsonParseException("'to' specifier exceeds the allowed boundaries: " + vec3f);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@Inject(at = @At("HEAD"),method = "deserializeFrom", cancellable = true)
|
||||||
|
private void puzzle$deserializeFrom(JsonObject object, CallbackInfoReturnable<Vector3f> cir) {
|
||||||
|
if (PuzzleConfig.biggerModels) {
|
||||||
|
Vector3f vec3f = this.deserializeVec3f(object, "from");
|
||||||
|
if (!(vec3f.x < -32.0F) && !(vec3f.y < -32.0F) && !(vec3f.z < -32.0F) && !(vec3f.x > 48.0F) && !(vec3f.y > 48.0F) && !(vec3f.z > 48.0F)) {
|
||||||
|
cir.setReturnValue(vec3f);
|
||||||
|
} else {
|
||||||
|
throw new JsonParseException("'from' specifier exceeds the allowed boundaries: " + vec3f);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
174
common/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java
Executable file
174
common/src/main/java/net/puzzlemc/splashscreen/PuzzleSplashScreen.java
Executable file
@@ -0,0 +1,174 @@
|
|||||||
|
package net.puzzlemc.splashscreen;
|
||||||
|
|
||||||
|
import eu.midnightdust.lib.util.MidnightColorUtil;
|
||||||
|
import eu.midnightdust.lib.util.PlatformFunctions;
|
||||||
|
import net.minecraft.client.texture.NativeImageBackedTexture;
|
||||||
|
import net.minecraft.resource.*;
|
||||||
|
import net.minecraft.util.Util;
|
||||||
|
import net.puzzlemc.core.config.PuzzleConfig;
|
||||||
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.client.resource.metadata.TextureResourceMetadata;
|
||||||
|
import net.minecraft.client.texture.NativeImage;
|
||||||
|
import net.minecraft.client.texture.ResourceTexture;
|
||||||
|
import net.minecraft.util.Identifier;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
import java.nio.file.StandardCopyOption;
|
||||||
|
import java.util.*;
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
|
import static net.puzzlemc.core.PuzzleCore.LOGGER;
|
||||||
|
import static net.puzzlemc.core.PuzzleCore.MOD_ID;
|
||||||
|
|
||||||
|
public class PuzzleSplashScreen {
|
||||||
|
public static final Identifier LOGO = Identifier.of("textures/gui/title/mojangstudios.png");
|
||||||
|
public static final Identifier BACKGROUND = Identifier.of("puzzle/splash_background.png");
|
||||||
|
public static File CONFIG_PATH = new File(String.valueOf(PlatformFunctions.getConfigDirectory().resolve(".puzzle_cache")));
|
||||||
|
public static Path LOGO_TEXTURE = Paths.get(CONFIG_PATH + "/mojangstudios.png");
|
||||||
|
public static Path BACKGROUND_TEXTURE = Paths.get(CONFIG_PATH + "/splash_background.png");
|
||||||
|
private static final MinecraftClient client = MinecraftClient.getInstance();
|
||||||
|
private static boolean keepBackground = false;
|
||||||
|
|
||||||
|
public static void init() {
|
||||||
|
if (!CONFIG_PATH.exists()) { // Run when config directory is nonexistent //
|
||||||
|
if (CONFIG_PATH.mkdir()) { // Create our custom config directory //
|
||||||
|
if (Util.getOperatingSystem().equals(Util.OperatingSystem.WINDOWS)) {
|
||||||
|
try { Files.setAttribute(CONFIG_PATH.toPath(), "dos:hidden", true);
|
||||||
|
} catch (IOException ignored) {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static class ReloadListener implements SynchronousResourceReloader {
|
||||||
|
public static final ReloadListener INSTANCE = new ReloadListener();
|
||||||
|
|
||||||
|
private ReloadListener() {}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void reload(ResourceManager manager) {
|
||||||
|
if (PuzzleConfig.resourcepackSplashScreen) {
|
||||||
|
PuzzleSplashScreen.resetColors();
|
||||||
|
client.getTextureManager().registerTexture(LOGO, new LogoTexture(LOGO));
|
||||||
|
client.getTextureManager().registerTexture(BACKGROUND, new LogoTexture(BACKGROUND));
|
||||||
|
|
||||||
|
manager.findResources("optifine", path -> path.getPath().contains("color.properties")).forEach((id, resource) -> {
|
||||||
|
try (InputStream stream = resource.getInputStream()) {
|
||||||
|
Properties properties = new Properties();
|
||||||
|
properties.load(stream);
|
||||||
|
|
||||||
|
if (properties.get("screen.loading") != null) {
|
||||||
|
PuzzleConfig.backgroundColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading").toString()).getRGB();
|
||||||
|
PuzzleConfig.hasCustomSplashScreen = true;
|
||||||
|
}
|
||||||
|
if (properties.get("screen.loading.bar") != null) {
|
||||||
|
PuzzleConfig.progressBarBackgroundColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.bar").toString()).getRGB();
|
||||||
|
PuzzleConfig.hasCustomSplashScreen = true;
|
||||||
|
}
|
||||||
|
if (properties.get("screen.loading.progress") != null) {
|
||||||
|
PuzzleConfig.progressBarColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.progress").toString()).getRGB();
|
||||||
|
PuzzleConfig.hasCustomSplashScreen = true;
|
||||||
|
}
|
||||||
|
if (properties.get("screen.loading.outline") != null) {
|
||||||
|
PuzzleConfig.progressFrameColor = MidnightColorUtil.hex2Rgb(properties.get("screen.loading.outline").toString()).getRGB();
|
||||||
|
PuzzleConfig.hasCustomSplashScreen = true;
|
||||||
|
}
|
||||||
|
if (properties.get("screen.loading.blend") != null) {
|
||||||
|
// Recommended blend: SRC_ALPHA ONE_MINUS_SRC_ALPHA ONE ZERO
|
||||||
|
PuzzleConfig.disableBlend = properties.get("screen.loading.blend").toString().equals("off");
|
||||||
|
PuzzleConfig.customBlendFunction = new ArrayList<>(Arrays.stream(properties.get("screen.loading.blend").toString().split(" ")).toList());
|
||||||
|
PuzzleConfig.hasCustomSplashScreen = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
LOGGER.error("Error occurred while loading color.properties {}", id.toString(), e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
AtomicInteger logoCount = new AtomicInteger();
|
||||||
|
manager.findResources("textures", path -> path.getPath().contains("mojangstudios.png")).forEach((id, resource) -> {
|
||||||
|
try (InputStream stream = resource.getInputStream()) {
|
||||||
|
Files.copy(stream, LOGO_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
|
||||||
|
client.getTextureManager().registerTexture(LOGO, new DynamicLogoTexture());
|
||||||
|
if (logoCount.get() > 0) PuzzleConfig.hasCustomSplashScreen = true;
|
||||||
|
logoCount.getAndIncrement();
|
||||||
|
} catch (Exception e) {
|
||||||
|
LOGGER.error("Error occurred while loading custom minecraft logo {}", id.toString(), e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
manager.findResources(MOD_ID, path -> path.getPath().contains("splash_background.png")).forEach((id, resource) -> {
|
||||||
|
try (InputStream stream = resource.getInputStream()) {
|
||||||
|
Files.copy(stream, BACKGROUND_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
|
||||||
|
InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE));
|
||||||
|
client.getTextureManager().registerTexture(BACKGROUND, new NativeImageBackedTexture(NativeImage.read(input)));
|
||||||
|
keepBackground = true;
|
||||||
|
PuzzleConfig.hasCustomSplashScreen = true;
|
||||||
|
} catch (Exception e) {
|
||||||
|
LOGGER.error("Error occurred while loading custom splash background {}", id.toString(), e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
if (!keepBackground) {
|
||||||
|
try {
|
||||||
|
Files.delete(BACKGROUND_TEXTURE);
|
||||||
|
} catch (Exception ignored) {}
|
||||||
|
}
|
||||||
|
keepBackground = false;
|
||||||
|
PuzzleConfig.write(MOD_ID);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void resetColors() {
|
||||||
|
PuzzleConfig.backgroundColor = 15675965;
|
||||||
|
PuzzleConfig.progressBarColor = 16777215;
|
||||||
|
PuzzleConfig.progressBarBackgroundColor = 15675965;
|
||||||
|
PuzzleConfig.progressFrameColor = 16777215;
|
||||||
|
PuzzleConfig.disableBlend = false;
|
||||||
|
PuzzleConfig.customBlendFunction = new ArrayList<>();
|
||||||
|
PuzzleConfig.hasCustomSplashScreen = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class LogoTexture extends ResourceTexture {
|
||||||
|
public LogoTexture(Identifier logo) { super(logo); }
|
||||||
|
|
||||||
|
protected TextureData loadTextureData(ResourceManager resourceManager) {
|
||||||
|
MinecraftClient minecraftClient = MinecraftClient.getInstance();
|
||||||
|
DefaultResourcePack defaultResourcePack = minecraftClient.getDefaultResourcePack();
|
||||||
|
try {
|
||||||
|
InputStream inputStream = Objects.requireNonNull(defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO)).get();
|
||||||
|
TextureData var6;
|
||||||
|
try {
|
||||||
|
var6 = new TextureData(new TextureResourceMetadata(true, true), NativeImage.read(inputStream));
|
||||||
|
} finally {
|
||||||
|
if (inputStream != null) {
|
||||||
|
inputStream.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return var6;
|
||||||
|
} catch (IOException var18) {
|
||||||
|
return new TextureData(var18);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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) {
|
||||||
|
LOGGER.error("Encountered an error during logo loading: ", e);
|
||||||
|
return TextureData.load(resourceManager, LOGO);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
120
common/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java
Executable file
120
common/src/main/java/net/puzzlemc/splashscreen/mixin/MixinSplashScreen.java
Executable file
@@ -0,0 +1,120 @@
|
|||||||
|
package net.puzzlemc.splashscreen.mixin;
|
||||||
|
|
||||||
|
import com.mojang.blaze3d.platform.GlStateManager;
|
||||||
|
import com.mojang.blaze3d.systems.RenderSystem;
|
||||||
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.client.gui.DrawContext;
|
||||||
|
import net.minecraft.client.gui.screen.Overlay;
|
||||||
|
import net.minecraft.client.gui.screen.SplashOverlay;
|
||||||
|
import net.minecraft.client.render.*;
|
||||||
|
import net.minecraft.client.texture.NativeImage;
|
||||||
|
import net.minecraft.client.texture.NativeImageBackedTexture;
|
||||||
|
import net.minecraft.util.Identifier;
|
||||||
|
import net.minecraft.util.Util;
|
||||||
|
import net.minecraft.util.math.ColorHelper;
|
||||||
|
import net.minecraft.util.math.MathHelper;
|
||||||
|
import net.puzzlemc.core.config.PuzzleConfig;
|
||||||
|
import net.puzzlemc.splashscreen.PuzzleSplashScreen;
|
||||||
|
import org.spongepowered.asm.mixin.Final;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
|
import org.spongepowered.asm.mixin.injection.*;
|
||||||
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.util.function.IntSupplier;
|
||||||
|
|
||||||
|
import static net.puzzlemc.core.PuzzleCore.LOGGER;
|
||||||
|
import static net.puzzlemc.splashscreen.PuzzleSplashScreen.BACKGROUND;
|
||||||
|
|
||||||
|
@Mixin(value = SplashOverlay.class, priority = 2000)
|
||||||
|
public abstract class MixinSplashScreen extends Overlay {
|
||||||
|
@Shadow @Final public static Identifier LOGO;
|
||||||
|
@Shadow private long reloadCompleteTime;
|
||||||
|
@Shadow @Final private MinecraftClient client;
|
||||||
|
@Shadow @Final private boolean reloading;
|
||||||
|
@Shadow private long reloadStartTime;
|
||||||
|
@Shadow
|
||||||
|
private static int withAlpha(int color, int alpha) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Inject(method = "init(Lnet/minecraft/client/MinecraftClient;)V", at = @At("TAIL"))
|
||||||
|
private static void puzzle$initSplashscreen(MinecraftClient client, CallbackInfo ci) { // Load our custom textures at game start //
|
||||||
|
if (PuzzleConfig.resourcepackSplashScreen) {
|
||||||
|
if (PuzzleSplashScreen.LOGO_TEXTURE.toFile().exists()) {
|
||||||
|
client.getTextureManager().registerTexture(LOGO, new PuzzleSplashScreen.DynamicLogoTexture());
|
||||||
|
}
|
||||||
|
if (PuzzleSplashScreen.BACKGROUND_TEXTURE.toFile().exists()) {
|
||||||
|
try {
|
||||||
|
InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE));
|
||||||
|
client.getTextureManager().registerTexture(BACKGROUND, new NativeImageBackedTexture(NativeImage.read(input)));
|
||||||
|
} catch (IOException ignored) {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Redirect(method = "render", at = @At(value = "INVOKE", target = "Ljava/util/function/IntSupplier;getAsInt()I"))
|
||||||
|
private int puzzle$modifyBackground(IntSupplier instance) { // Set the Progress Bar Frame Color to our configured value //
|
||||||
|
return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarBackgroundColor == 15675965) ? instance.getAsInt() : PuzzleConfig.backgroundColor | 255 << 24;
|
||||||
|
}
|
||||||
|
@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/ColorHelper;getWhite(F)I", shift = At.Shift.AFTER))
|
||||||
|
private void puzzle$betterBlend(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
|
||||||
|
if (PuzzleConfig.resourcepackSplashScreen) {
|
||||||
|
if (PuzzleConfig.disableBlend) RenderSystem.disableBlend();
|
||||||
|
else if (PuzzleConfig.customBlendFunction.size() == 4) {
|
||||||
|
try {
|
||||||
|
RenderSystem.blendFuncSeparate(
|
||||||
|
GlStateManager.SrcFactor.valueOf(PuzzleConfig.customBlendFunction.get(0)),
|
||||||
|
GlStateManager.DstFactor.valueOf(PuzzleConfig.customBlendFunction.get(1)),
|
||||||
|
GlStateManager.SrcFactor.valueOf(PuzzleConfig.customBlendFunction.get(2)),
|
||||||
|
GlStateManager.DstFactor.valueOf(PuzzleConfig.customBlendFunction.get(3)));
|
||||||
|
} catch (Exception e) {
|
||||||
|
LOGGER.error("Incorrect blend function defined in color.properties: {}{}", PuzzleConfig.customBlendFunction, e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;getScaledWindowWidth()I", ordinal = 2))
|
||||||
|
private void puzzle$renderSplashBackground(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
|
||||||
|
if (Files.exists(PuzzleSplashScreen.BACKGROUND_TEXTURE) && PuzzleConfig.resourcepackSplashScreen) {
|
||||||
|
int width = client.getWindow().getScaledWidth();
|
||||||
|
int height = client.getWindow().getScaledHeight();
|
||||||
|
long l = Util.getMeasuringTimeMs();
|
||||||
|
float f = this.reloadCompleteTime > -1L ? (float)(l - this.reloadCompleteTime) / 1000.0F : -1.0F;
|
||||||
|
float g = this.reloadStartTime> -1L ? (float)(l - this.reloadStartTime) / 500.0F : -1.0F;
|
||||||
|
float s;
|
||||||
|
if (f >= 1.0F) s = 1.0F - MathHelper.clamp(f - 1.0F, 0.0F, 1.0F);
|
||||||
|
else if (reloading) s = MathHelper.clamp(g, 0.0F, 1.0F);
|
||||||
|
else s = 1.0F;
|
||||||
|
RenderSystem.enableBlend();
|
||||||
|
RenderSystem.blendEquation(32774);
|
||||||
|
RenderSystem.defaultBlendFunc();
|
||||||
|
context.drawTexture(RenderLayer::getGuiTextured, BACKGROUND, 0, 0, 0, 0, width, height, width, height, ColorHelper.getWhite(s));
|
||||||
|
RenderSystem.defaultBlendFunc();
|
||||||
|
RenderSystem.disableBlend();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@Inject(method = "renderProgressBar", at = @At("HEAD"))
|
||||||
|
private void puzzle$addProgressBarBackground(DrawContext context, int minX, int minY, int maxX, int maxY, float opacity, CallbackInfo ci) {
|
||||||
|
context.getMatrices().translate(0, 0, 1f);
|
||||||
|
if (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarBackgroundColor == 15675965) return;
|
||||||
|
long l = Util.getMeasuringTimeMs();
|
||||||
|
float f = this.reloadCompleteTime > -1L ? (float)(l - this.reloadCompleteTime) / 1000.0F : -1.0F;
|
||||||
|
int m = MathHelper.ceil((1.0F - MathHelper.clamp(f - 1.0F, 0.0F, 1.0F)) * 255.0F);
|
||||||
|
RenderSystem.disableBlend();
|
||||||
|
context.fill(minX, minY, maxX, maxY, withAlpha(PuzzleConfig.progressBarBackgroundColor, m));
|
||||||
|
}
|
||||||
|
|
||||||
|
@ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;fill(IIIII)V"), index = 4)
|
||||||
|
private int puzzle$modifyProgressFrame(int color) { // Set the Progress Bar Frame Color to our configured value //
|
||||||
|
return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressFrameColor == 16777215) ? color : PuzzleConfig.progressFrameColor | 255 << 24;
|
||||||
|
}
|
||||||
|
@ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;fill(IIIII)V", ordinal = 0), index = 4)
|
||||||
|
private int puzzle$modifyProgressColor(int color) { // Set the Progress Bar Color to our configured value //
|
||||||
|
return (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarColor == 16777215) ? color : PuzzleConfig.progressBarColor | 255 << 24;
|
||||||
|
}
|
||||||
|
}
|
||||||
3
common/src/main/resources/architectury.puzzle.json
Normal file
3
common/src/main/resources/architectury.puzzle.json
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"accessWidener": "puzzle-models.accesswidener"
|
||||||
|
}
|
||||||
BIN
common/src/main/resources/assets/puzzle/icon.png
Normal file
BIN
common/src/main/resources/assets/puzzle/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
42
common/src/main/resources/assets/puzzle/lang/be_by.json
Normal file
42
common/src/main/resources/assets/puzzle/lang/be_by.json
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
{
|
||||||
|
"puzzle.text.update_available":"Даступна абнаўленне!",
|
||||||
|
"puzzle.screen.title":"Налады Puzzle",
|
||||||
|
"puzzle.page.graphics":"Графіка",
|
||||||
|
"puzzle.page.resources":"Рэсурсы",
|
||||||
|
"puzzle.page.performance":"Прадукцыйнасць",
|
||||||
|
"puzzle.page.misc":"Рознае",
|
||||||
|
"puzzle.option.check_for_updates":"Праверыць абнаўленні",
|
||||||
|
"puzzle.option.check_for_updates.tooltip":"Уключае ўбудаваны правершчык абнаўленняў",
|
||||||
|
"puzzle.option.show_version_info":"Паказваць версію Puzzle",
|
||||||
|
"puzzle.option.show_version_info.tooltip":"Паказваць інфармацыю пра бягучую\nверсію Puzzle и наяўнасць абнаўленняў на\nтытульным экране і меню F3",
|
||||||
|
"puzzle.option.resourcepack_splash_screen":"Выкарыстанне пакетаў рэсурсаў для сплэшэй",
|
||||||
|
"puzzle.option.resourcepack_splash_screen.tooltip":"Уключае пакеты рэсурсаў, якія змяняюць\nзагрузачныя экраны/сплэшы\nMinecraft, якія выкарыстоўваюць фармат OptiFine",
|
||||||
|
"puzzle.option.better_splash_screen_blend":"Палепшанае спалучэнне сплэшэй і лагатыпу",
|
||||||
|
"puzzle.option.better_splash_screen_blend.tooltip":"Змяняе тып спалучэння\nлагатыпу і сплэшэй\nкаб палепшыць працу з лагатыпамі карыстальніцкіх колераў",
|
||||||
|
"puzzle.option.unlimited_model_rotations":"Неабмежаванае вярчэнне мадэлі",
|
||||||
|
"puzzle.option.unlimited_model_rotations.tooltip":"Дазваляе вярчэнне на 360° на карыстальніцкіх мадэляў блокаў/прадметаў",
|
||||||
|
"puzzle.option.bigger_custom_models":"Павялічаныя карыстальніцкія мадэлі",
|
||||||
|
"puzzle.option.bigger_custom_models.tooltip":"Павялічвае ліміт памеру\nкарыстальніцкіх мадэляў блокаў/прадметаў\nз 3x3x3 да 5x5x5",
|
||||||
|
"puzzle.midnightconfig.title":"Пашыраныя налады Puzzle",
|
||||||
|
"puzzle.midnightconfig.category.gui":"GUI",
|
||||||
|
"puzzle.midnightconfig.category.features":"Асаблівасці",
|
||||||
|
"puzzle.midnightconfig.category.debug":"Debug",
|
||||||
|
"puzzle.midnightconfig.tooltip":"Налады толькі для вопытных карыстальнікаў",
|
||||||
|
|
||||||
|
"cullleaves.puzzle.option.enabled": "Адбракоўваць лісце",
|
||||||
|
"cullleaves.puzzle.option.enabled.tooltip": "Уключыць адбракоўванне лісця, каб павялічыць прадукцыйнасць",
|
||||||
|
"iris.puzzle.option.enableShaders": "Уключыць шэйдэры",
|
||||||
|
"iris.puzzle.option.enableShaders.tooltip": "Дазваляе уключаць ці выключаць шэйдэры",
|
||||||
|
"iris.puzzle.option.open": "АДКРЫЦЬ",
|
||||||
|
"options.iris.shaderPackSelection.tooltip": "Адкрывае экран выбару\nшэйдэраў і іх налад",
|
||||||
|
"lambdabettergrass.option.mode.tooltip": "Робіць бакі\nзямлі з дзёрнам злучанымі з\nверхам гэтага блоку",
|
||||||
|
"lambdabettergrass.option.better_snow.tooltip": "Дадае крыху бачны слой снег/імху\nна непоўныя блокі, якія\nакружаны снегам/імхом",
|
||||||
|
"config.dynamicfps.reduce_when_unfocused.tooltip": "Зніжае FPS у Minecraft калі ён не актыўны\n(то бок калі іншая прагракма адчынена ці гульня згорнута)\nкаб захаваць рэсурсы сістэмы",
|
||||||
|
"config.dynamicfps.unfocused_fps.tooltip": "Колькасць кадраў у секунду, калі\nMinecraft згорнуты",
|
||||||
|
"config.dynamicfps.restore_when_hovered.tooltip": "Дазваляе скасаваць ці не\nабмежаванне FPS, калі Minecraft актыны\n(то бок актыўны ці наведзены курсорам з панелі задач)",
|
||||||
|
"config.dynamicfps.run_gc_on_unfocus.tooltip": "Запусціць збіральнік смецця калі\nMinecraft неактыўны,\n каб ачысціць крыху АЗУ",
|
||||||
|
"config.dynamicfps.unfocused_volume.tooltip": "Гучнасць прайгравальных гукаў\nкалі гульня не актыўна\n(то бок іншае акно абрана)",
|
||||||
|
"config.dynamicfps.hidden_volume.tooltip": "Гучнасць прайгравальных гукаў\nкали гульня не бачна\n(то бок згорнута, знаходзіцца пад іншымі вокнамі\nці на ішай віртуальнай машыне)",
|
||||||
|
"entity_texture_features.puzzle.emissive_type.brighter": "§eЯрчэй",
|
||||||
|
"entity_texture_features.puzzle.emissive_type.default": "§6Стандартна"
|
||||||
|
}
|
||||||
39
common/src/main/resources/assets/puzzle/lang/de_de.json
Normal file
39
common/src/main/resources/assets/puzzle/lang/de_de.json
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
{
|
||||||
|
"puzzle.text.update_available":"Ein Update ist verfügbar!",
|
||||||
|
"puzzle.screen.title":"Puzzle Einstellungen",
|
||||||
|
"puzzle.page.graphics":"Grafik",
|
||||||
|
"puzzle.page.resources":"Resourcen",
|
||||||
|
"puzzle.page.performance":"Performance",
|
||||||
|
"puzzle.page.misc":"Sonstiges",
|
||||||
|
"puzzle.option.check_for_updates":"Auf Updates überprüfen",
|
||||||
|
"puzzle.option.show_version_info":"Zeige Informationen über Puzzle's Version",
|
||||||
|
"puzzle.option.resourcepack_splash_screen":"Nutze Resourcepack-Ladebildschirm",
|
||||||
|
"puzzle.option.better_splash_screen_blend":"Verbessere das Blending des Splash-Screen-Logos",
|
||||||
|
"puzzle.option.unlimited_model_rotations":"Unbegrenzte Modellrotationen",
|
||||||
|
"puzzle.option.bigger_custom_models":"Größere benutzerdefinierte Modelle",
|
||||||
|
"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"
|
||||||
|
}
|
||||||
18
common/src/main/resources/assets/puzzle/lang/el_gr.json
Normal file
18
common/src/main/resources/assets/puzzle/lang/el_gr.json
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"puzzle.text.update_available":"Μια καινούρια έκδοση είναι διαθέσιμη!",
|
||||||
|
"puzzle.screen.title":"Ρυθμίσεις του Puzzle",
|
||||||
|
"puzzle.page.graphics":"Γραφικών",
|
||||||
|
"puzzle.page.resources":"Πόρων",
|
||||||
|
"puzzle.page.performance":"Απόδοσης",
|
||||||
|
"puzzle.page.misc":"Διάφορες",
|
||||||
|
"puzzle.option.check_for_updates":"Έλεγχος για αναβαθμίσεις",
|
||||||
|
"puzzle.option.show_version_info":"Εμφάνηση έκδοσης του Puzzle",
|
||||||
|
"puzzle.option.resourcepack_splash_screen":"Οθόνη φόρτωσης πακέτου πόρων",
|
||||||
|
"puzzle.option.disable_splash_screen_blend":"Μη ανάμηξη λογότυπου οθ. φόρτωσης",
|
||||||
|
"puzzle.option.emissive_textures":"Λαμπρά Είδη",
|
||||||
|
"puzzle.option.unlimited_model_rotations":"Απεριόριστες Περιστροφές Μοντέλων",
|
||||||
|
"puzzle.option.bigger_custom_models":"Μεγαλύτερα Ειδικά Μοντέλα",
|
||||||
|
"puzzle.option.render_layer_overrides":"Εμφάνηση Παρακάμψεων Στρώσεων",
|
||||||
|
"puzzle.midnightconfig.title":"Εξειδηκευμένες Ρυθμίσεις του Puzzle"
|
||||||
|
}
|
||||||
|
|
||||||
42
common/src/main/resources/assets/puzzle/lang/en_us.json
Executable file
42
common/src/main/resources/assets/puzzle/lang/en_us.json
Executable file
@@ -0,0 +1,42 @@
|
|||||||
|
{
|
||||||
|
"puzzle.text.update_available":"An update is available!",
|
||||||
|
"puzzle.screen.title":"Puzzle Settings",
|
||||||
|
"puzzle.page.graphics":"Graphics",
|
||||||
|
"puzzle.page.resources":"Resource",
|
||||||
|
"puzzle.page.performance":"Performance",
|
||||||
|
"puzzle.page.misc":"Miscellaneous",
|
||||||
|
"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.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.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.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.tooltip":"Unlocks full 360° rotation on custom block/item models",
|
||||||
|
"puzzle.option.bigger_custom_models":"Bigger Custom Models",
|
||||||
|
"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.category.gui":"GUI",
|
||||||
|
"puzzle.midnightconfig.category.features":"Features",
|
||||||
|
"puzzle.midnightconfig.category.internal":"Internal",
|
||||||
|
"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"
|
||||||
|
}
|
||||||
42
common/src/main/resources/assets/puzzle/lang/es_es.json
Normal file
42
common/src/main/resources/assets/puzzle/lang/es_es.json
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
{
|
||||||
|
"puzzle.text.update_available":"¡Hay una actualización disponible!",
|
||||||
|
"puzzle.screen.title":"Configuración de Puzzle",
|
||||||
|
"puzzle.page.graphics":"Gráficos",
|
||||||
|
"puzzle.page.resources":"Recursos",
|
||||||
|
"puzzle.page.performance":"Rendimiento",
|
||||||
|
"puzzle.page.misc":"Variado",
|
||||||
|
"puzzle.option.check_for_updates":"Comprobar Actualizaciones",
|
||||||
|
"puzzle.option.check_for_updates.tooltip":"Activa el comprobador de actualizaciones integrado de Puzzle.",
|
||||||
|
"puzzle.option.show_version_info":"Mostrar información de la versión Puzzle",
|
||||||
|
"puzzle.option.show_version_info.tooltip":"Muestra información sobre la versión actual\nde Puzzle y el estado de actualización\nen la pantalla de título y en el menú F3.",
|
||||||
|
"puzzle.option.resourcepack_splash_screen":"Usar la Pantalla de Carga del Paquete de Recursos [*]",
|
||||||
|
"puzzle.option.resourcepack_splash_screen.tooltip":"Permite que los paquetes de recursos\ncambien el aspecto de la pantalla de carga/principal\nde Minecraft utilizando el formato OptiFine.",
|
||||||
|
"puzzle.option.better_splash_screen_blend":"Mejor Mezcla del Logo de la Pantalla de Carga",
|
||||||
|
"puzzle.option.better_splash_screen_blend.tooltip":"Cambia el tipo de mezcla utilizada\npor el logotipo de la pantalla de carga\npara que funcione mejor con logotipos\nde colores personalizados.",
|
||||||
|
"puzzle.option.unlimited_model_rotations":"Rotaciones Ilimitadas de Modelos",
|
||||||
|
"puzzle.option.unlimited_model_rotations.tooltip":"Desbloquea la rotación completa de 360° en los modelos de bloques/objetos personalizados.",
|
||||||
|
"puzzle.option.bigger_custom_models":"Modelos Personalizados más Grandes",
|
||||||
|
"puzzle.option.bigger_custom_models.tooltip":"Aumenta el límite de tamaños\nde los modelos de bloques/objetos personalizados\nde 3x3x3 a 5x5x5.",
|
||||||
|
"puzzle.midnightconfig.title":"Acceder a las Opciones adicionales de Puzzle para Expertos",
|
||||||
|
"puzzle.midnightconfig.category.gui":"Interfaz",
|
||||||
|
"puzzle.midnightconfig.category.features":"Características",
|
||||||
|
"puzzle.midnightconfig.category.debug":"Depuración",
|
||||||
|
"puzzle.midnightconfig.tooltip":"Ajustes para usuarios experimentados.",
|
||||||
|
|
||||||
|
"cullleaves.puzzle.option.enabled": "Reducir Cantidad de Hojas",
|
||||||
|
"cullleaves.puzzle.option.enabled.tooltip": "Permitir reducir la cantidad de hojas para mejorar el rendimiento.",
|
||||||
|
"iris.puzzle.option.enableShaders": "Activar Sombreadores",
|
||||||
|
"iris.puzzle.option.enableShaders.tooltip": "Activar o no los paquetes de sombreadores.",
|
||||||
|
"iris.puzzle.option.open": "ABRIR",
|
||||||
|
"options.iris.shaderPackSelection.tooltip": "Abre la pantalla de selección\nde los paquetes de sombreadores.",
|
||||||
|
"lambdabettergrass.option.mode.tooltip": "Hace que los lados de los bloques de\ncésped se conecten con los bloques de\ncésped adyacentes.",
|
||||||
|
"lambdabettergrass.option.better_snow.tooltip": "Añade una capa de nieve/musgo puramente\nvisual a los bloques no llenos que están rodeados\nde nieve/musgo.",
|
||||||
|
"config.dynamicfps.reduce_when_unfocused.tooltip": "Reduce los FPS de Minecraft cuando el\njuego se encuentra en segundo plano (es decir,\ncuando otra ventana está en primer plano o el juego\nestá oculto) para ahorrar energía y recursos\ndel sistema.",
|
||||||
|
"config.dynamicfps.unfocused_fps.tooltip": "La cantidad de fotogramas por segundo que\nMinecraft puede renderizar mientras se\nencuentra en segundo plano.",
|
||||||
|
"config.dynamicfps.restore_when_hovered.tooltip": "Detener o no la limitación de FPS mientras\ndurante la previsualización de Minecraft\n(por ejemplo cuando se señala en la barra de\ntareas o en el área de notificación).",
|
||||||
|
"config.dynamicfps.run_gc_on_unfocus.tooltip": "Ejecutar un recolector de basura mientras\nMinecraft se encuentra en segundo plano\npara liberar algo de RAM.",
|
||||||
|
"config.dynamicfps.unfocused_volume.tooltip": "El volumen del sonido del juego cuando permanece\nen segundo plano (es decir, cuando hay otra\nventana seleccionada).",
|
||||||
|
"config.dynamicfps.hidden_volume.tooltip": "El volumen del juego cuando no es visible (es decir, minimizado, cubierto por otras ventanas o en otro escritorio virtual).",
|
||||||
|
"entity_texture_features.puzzle.emissive_type.brighter": "§eResplandeciente",
|
||||||
|
"entity_texture_features.puzzle.emissive_type.default": "§6Predeterminado"
|
||||||
|
}
|
||||||
17
common/src/main/resources/assets/puzzle/lang/et_ee.json
Normal file
17
common/src/main/resources/assets/puzzle/lang/et_ee.json
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"puzzle.text.update_available":"Uuendus on saadaval!",
|
||||||
|
"puzzle.screen.title":"Puzzle sätted",
|
||||||
|
"puzzle.page.graphics":"Graafika",
|
||||||
|
"puzzle.page.resources":"Ressursi",
|
||||||
|
"puzzle.page.performance":"Jõudlus",
|
||||||
|
"puzzle.page.misc":"Muud",
|
||||||
|
"puzzle.option.check_for_updates":"Uuenduste kontroll",
|
||||||
|
"puzzle.option.show_version_info":"Kuva Puzzle versiooniteavet",
|
||||||
|
"puzzle.option.resourcepack_splash_screen":"Kasuta ressursipaki laadimiskuva",
|
||||||
|
"puzzle.option.disable_splash_screen_blend":"Keela laadimiskuva logo segunemine",
|
||||||
|
"puzzle.option.emissive_textures":"Hõõguvad tekstuurid",
|
||||||
|
"puzzle.option.unlimited_model_rotations":"Lõpmatud mudelipöörded",
|
||||||
|
"puzzle.option.bigger_custom_models":"Suuremad kohandatud mudelid",
|
||||||
|
"puzzle.option.render_layer_overrides":"Renderduskihi ülekatted",
|
||||||
|
"puzzle.midnightconfig.title":"Puzzle täpsem seadistus"
|
||||||
|
}
|
||||||
17
common/src/main/resources/assets/puzzle/lang/ko_kr.json
Normal file
17
common/src/main/resources/assets/puzzle/lang/ko_kr.json
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"puzzle.text.update_available":"업데이트가 가능합니다!",
|
||||||
|
"puzzle.screen.title":"Puzzle 설정",
|
||||||
|
"puzzle.page.graphics":"그래픽",
|
||||||
|
"puzzle.page.resources":"리소스",
|
||||||
|
"puzzle.page.performance":"성능",
|
||||||
|
"puzzle.page.misc":"기타",
|
||||||
|
"puzzle.option.check_for_updates":"업데이트 확인",
|
||||||
|
"puzzle.option.show_version_info":"Puzzle 버전 정보 보기",
|
||||||
|
"puzzle.option.resourcepack_splash_screen":"스플래시 화면에서 리소스팩 사용",
|
||||||
|
"puzzle.option.better_splash_screen_blend":"향상된 스플래시 화면 로고 블렌딩",
|
||||||
|
"puzzle.option.emissive_textures":"방사성 텍스쳐",
|
||||||
|
"puzzle.option.unlimited_model_rotations":"모델 회전 제한없음",
|
||||||
|
"puzzle.option.bigger_custom_models":"향상된 커스텀 모델",
|
||||||
|
"puzzle.option.render_layer_overrides":"렌더링 레이어 재정의",
|
||||||
|
"puzzle.midnightconfig.title":"Puzzle 고급 환경설정"
|
||||||
|
}
|
||||||
17
common/src/main/resources/assets/puzzle/lang/pl_pl.json
Normal file
17
common/src/main/resources/assets/puzzle/lang/pl_pl.json
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"puzzle.text.update_available":"Aktualizacja jest dostępna!",
|
||||||
|
"puzzle.screen.title":"Ustawienia Puzzle",
|
||||||
|
"puzzle.page.graphics":"Grafiki",
|
||||||
|
"puzzle.page.resources":"Zasobów",
|
||||||
|
"puzzle.page.performance":"Wydajności",
|
||||||
|
"puzzle.page.misc":"Ustawienia",
|
||||||
|
"puzzle.option.check_for_updates":"Sprawdź aktualizacje",
|
||||||
|
"puzzle.option.show_version_info":"Pokaż informacje o wersji Puzzle",
|
||||||
|
"puzzle.option.resourcepack_splash_screen":"Użyj ekranu powitalnego paczek zasobów",
|
||||||
|
"puzzle.option.disable_splash_screen_blend":"Wyłącz mieszanie loga ekranu powitalnego",
|
||||||
|
"puzzle.option.emissive_textures":"Emisyjne tekstury",
|
||||||
|
"puzzle.option.unlimited_model_rotations":"Nielimitowane rotacje modeli",
|
||||||
|
"puzzle.option.bigger_custom_models":"Większe niestandardowe modele",
|
||||||
|
"puzzle.option.render_layer_overrides":"Renderuj nadpisania warstw",
|
||||||
|
"puzzle.midnightconfig.title":"Zaawansowana konfiguracja Puzzle"
|
||||||
|
}
|
||||||
39
common/src/main/resources/assets/puzzle/lang/pt_br.json
Normal file
39
common/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"
|
||||||
|
}
|
||||||
48
common/src/main/resources/assets/puzzle/lang/ru_ru.json
Normal file
48
common/src/main/resources/assets/puzzle/lang/ru_ru.json
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
{
|
||||||
|
"puzzle.text.update_available":"Доступно обновление!",
|
||||||
|
"puzzle.screen.title":"Настройки Puzzle",
|
||||||
|
"puzzle.page.graphics":"Графика",
|
||||||
|
"puzzle.page.resources":"Ресурсы",
|
||||||
|
"puzzle.page.performance":"Оптимизация",
|
||||||
|
"puzzle.page.misc":"Прочие",
|
||||||
|
"puzzle.option.check_for_updates":"Проверять обновления",
|
||||||
|
"puzzle.option.check_for_updates.tooltip":"Включить встроенную в Puzzle проверку обновлений",
|
||||||
|
"puzzle.option.show_version_info":"Показывать информацию о версии",
|
||||||
|
"puzzle.option.show_version_info.tooltip":"Отображать информацию о текущей версии\nPuzzle и наличии обновлений\nна главном экране и экране отладки",
|
||||||
|
"puzzle.option.resourcepack_splash_screen":"Пользовательский экран загрузки",
|
||||||
|
"puzzle.option.resourcepack_splash_screen.tooltip":"Разрешить наборам ресурсов изменять\nвнешний вид экрана загрузки Minecraft,\nиспользуя формат OptiFine",
|
||||||
|
"puzzle.option.better_splash_screen_blend":"Улучшенное смешивание логотипа",
|
||||||
|
"puzzle.option.better_splash_screen_blend.tooltip":"Изменить метод смешивания, используемый\nдля логотипа на экране загрузки,\nчтобы улучшить вид с изменёнными цветами",
|
||||||
|
"puzzle.option.unlimited_model_rotations":"Неограниченные повороты моделей",
|
||||||
|
"puzzle.option.unlimited_model_rotations.tooltip":"Разрешить поворот частей\nпользовательских моделей\nблоков/предметов на 360°",
|
||||||
|
"puzzle.option.bigger_custom_models":"Увеличенный размер моделей",
|
||||||
|
"puzzle.option.bigger_custom_models.tooltip":"Увеличить предельный размер\nпользовательских моделей блоков\nи предметов с 3×3×3 до 5×5×5",
|
||||||
|
"puzzle.midnightconfig.title":"Расширенные настройки Puzzle",
|
||||||
|
"puzzle.midnightconfig.category.gui":"Интерфейс",
|
||||||
|
"puzzle.midnightconfig.category.features":"Функционал",
|
||||||
|
"puzzle.midnightconfig.category.debug":"Отладка",
|
||||||
|
"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Обычные",
|
||||||
|
|
||||||
|
"modmenu.descriptionTranslation.puzzle": "Функции улучшения внешнего вида и производительности.",
|
||||||
|
"modmenu.descriptionTranslation.puzzle-base": "Общий код всех модулей Puzzle.",
|
||||||
|
"modmenu.descriptionTranslation.puzzle-gui": "Альтернативы Optifine, объединённые в едином меню.",
|
||||||
|
"modmenu.descriptionTranslation.puzzle-models": "Больше свободы моделям блоков и предметов!",
|
||||||
|
"modmenu.descriptionTranslation.puzzle-splashscreen": "Свой экран загрузки при помощи наборов ресурсов."
|
||||||
|
}
|
||||||
42
common/src/main/resources/assets/puzzle/lang/vi_vn.json
Normal file
42
common/src/main/resources/assets/puzzle/lang/vi_vn.json
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
{
|
||||||
|
"puzzle.text.update_available":"Đã có bản cập nhật!",
|
||||||
|
"puzzle.screen.title":"Cài đặt Puzzle",
|
||||||
|
"puzzle.page.graphics":"Đồ họa",
|
||||||
|
"puzzle.page.resources":"Tài nguyên",
|
||||||
|
"puzzle.page.performance":"Hiệu năng",
|
||||||
|
"puzzle.page.misc":"Khác",
|
||||||
|
"puzzle.option.check_for_updates":"Kiểm tra cập nhật",
|
||||||
|
"puzzle.option.check_for_updates.tooltip":"Bật trình kiểm tra cập nhật tích hợp của Puzzle",
|
||||||
|
"puzzle.option.show_version_info":"Hiển thị thông tin phiên bản Puzzle",
|
||||||
|
"puzzle.option.show_version_info.tooltip":"Hiển thị thông tin về phiên bản \nPuzzle hiện tại và trạng thái cập nhật trên\nMàn hình Tiêu đề và Menu F3",
|
||||||
|
"puzzle.option.resourcepack_splash_screen":"Sử dụng màn hình đốm gói tài nguyên",
|
||||||
|
"puzzle.option.resourcepack_splash_screen.tooltip":"Cho phép gói tài nguyên thay đổi giao diện\nmàn hình tải/đốm\ncủa Minecraft bằng định dạng OptiFine",
|
||||||
|
"puzzle.option.better_splash_screen_blend":"Logo màn hình đốm tốt hơn",
|
||||||
|
"puzzle.option.better_splash_screen_blend.tooltip":"Thay đổi kiểu hòa trộn được sử dụng\nbởi biểu trưng trên màn hình đốm\nđể hoạt động tốt hơn với các biểu trưng có màu tùy chỉnh",
|
||||||
|
"puzzle.option.unlimited_model_rotations":"Xoay mô hình không giới hạn",
|
||||||
|
"puzzle.option.unlimited_model_rotations.tooltip":"Mở khóa xoay 360° đầy đủ trên các mô hình khối/vật phẩm tùy chỉnh",
|
||||||
|
"puzzle.option.bigger_custom_models":"Mô hình tùy chỉnh lớn hơn",
|
||||||
|
"puzzle.option.bigger_custom_models.tooltip":"Tăng giới hạn của\nkích thước mô hình khối/vật phẩm tùy chỉnh\ntừ 3x3x3 lên 5x5x5",
|
||||||
|
"puzzle.midnightconfig.title":"Cấu hình Puzzle nâng cao",
|
||||||
|
"puzzle.midnightconfig.category.gui":"GUI",
|
||||||
|
"puzzle.midnightconfig.category.features":"Tính năng",
|
||||||
|
"puzzle.midnightconfig.category.debug":"Gỡ lỗi",
|
||||||
|
"puzzle.midnightconfig.tooltip":"Tùy chọn chỉ dành cho người dùng nâng cao",
|
||||||
|
|
||||||
|
"cullleaves.puzzle.option.enabled": "Loại bỏ Lá",
|
||||||
|
"cullleaves.puzzle.option.enabled.tooltip": "Bật tính năng loại bỏ lá để nâng cao hiệu suất",
|
||||||
|
"iris.puzzle.option.enableShaders": "Bật Shader",
|
||||||
|
"iris.puzzle.option.enableShaders.tooltip": "Bật shaderpack",
|
||||||
|
"iris.puzzle.option.open": "MỞ",
|
||||||
|
"options.iris.shaderPackSelection.tooltip": "Mở một màn hình để chọn\nshaderpack và định cấu hình chúng",
|
||||||
|
"lambdabettergrass.option.mode.tooltip": "Làm cho các cạnh của\nkhối cỏ kết nối với\nkhối cỏ liền kề",
|
||||||
|
"lambdabettergrass.option.better_snow.tooltip": "Thêm một lớp tuyết/rêu hoàn toàn trực quan\nvào các khối không đầy đủ\nđược bao quanh bởi tuyết/rêu",
|
||||||
|
"config.dynamicfps.reduce_when_unfocused.tooltip": "Giảm FPS của Minecraft khi không tập trung\n(tức là một cửa sổ khác được tập trung hoặc trò chơi bị ẩn)\nđể tiết kiệm năng lượng và tài nguyên hệ thống",
|
||||||
|
"config.dynamicfps.unfocused_fps.tooltip": "Lượng khung hình mỗi giây\nMinecraft được phép\nkết xuất khi không tập trung",
|
||||||
|
"config.dynamicfps.restore_when_hovered.tooltip": "Dừng giới hạn\nFPS trong khi Minecraft được xem trước\n(tức là được di chuột trên thanh tác vụ hoặc thanh công cụ)",
|
||||||
|
"config.dynamicfps.run_gc_on_unfocus.tooltip": "Chạy trình thu gom rác trong khi\nMinecraft không tập trung vào\ngiải phóng một số RAM",
|
||||||
|
"config.dynamicfps.unfocused_volume.tooltip": "Âm lượng mà trò chơi sẽ phát\nâm thanh khi không tập trung\n(tức là một cửa sổ khác được chọn)",
|
||||||
|
"config.dynamicfps.hidden_volume.tooltip": "Âm lượng mà trò chơi sẽ phát\nâm thanh trong khi không hiển thị\n(tức là được thu nhỏ, bị che bởi các cửa sổ khác\ncũng như trên màn hình ảo khác)",
|
||||||
|
"entity_texture_features.puzzle.emissive_type.brighter": "§eSáng hơn",
|
||||||
|
"entity_texture_features.puzzle.emissive_type.default": "§6Mặc định"
|
||||||
|
}
|
||||||
17
common/src/main/resources/assets/puzzle/lang/zh_cn.json
Normal file
17
common/src/main/resources/assets/puzzle/lang/zh_cn.json
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"puzzle.text.update_available":"更新可用!",
|
||||||
|
"puzzle.screen.title":"Puzzle 设置",
|
||||||
|
"puzzle.page.graphics":"图像设置",
|
||||||
|
"puzzle.page.resources":"资源设置",
|
||||||
|
"puzzle.page.performance":"性能设置",
|
||||||
|
"puzzle.page.misc":"杂项设置",
|
||||||
|
"puzzle.option.check_for_updates":"检查更新",
|
||||||
|
"puzzle.option.show_version_info":"显示 Puzzle 版本信息",
|
||||||
|
"puzzle.option.resourcepack_splash_screen":"使用资源包提供的闪烁标语",
|
||||||
|
"puzzle.option.disable_splash_screen_blend":"禁用闪烁标语闪烁",
|
||||||
|
"puzzle.option.emissive_textures":"发光纹理",
|
||||||
|
"puzzle.option.unlimited_model_rotations":"无限制模型旋转",
|
||||||
|
"puzzle.option.bigger_custom_models":"更大的自定义模型",
|
||||||
|
"puzzle.option.render_layer_overrides":"渲染层覆盖",
|
||||||
|
"puzzle.midnightconfig.title":"Puzzle 高级设置"
|
||||||
|
}
|
||||||
39
common/src/main/resources/assets/puzzle/lang/zh_tw.json
Normal file
39
common/src/main/resources/assets/puzzle/lang/zh_tw.json
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
{
|
||||||
|
"puzzle.text.update_available": "有新版本可供升級!",
|
||||||
|
"puzzle.screen.title": "Puzzle 設定",
|
||||||
|
"puzzle.page.graphics": "顯示設定",
|
||||||
|
"puzzle.page.resources": "資源設定",
|
||||||
|
"puzzle.page.performance": "效能設定",
|
||||||
|
"puzzle.page.misc": "其他設定",
|
||||||
|
"puzzle.option.check_for_updates": "檢查更新",
|
||||||
|
"puzzle.option.check_for_updates.tooltip": "開啟 Puzzle 內建的更新檢查",
|
||||||
|
"puzzle.option.show_version_info": "顯示 Puzzle 版本信息",
|
||||||
|
"puzzle.option.show_version_info.tooltip": "在標題畫面和 F3 選單上\n顯示有關目前 Puzzle 版本和更新狀態的資訊",
|
||||||
|
"puzzle.option.resourcepack_splash_screen": "使用資源包載入畫面",
|
||||||
|
"puzzle.option.resourcepack_splash_screen.tooltip": "使資源包可以使用 OptiFine 格式\n更改 Minecraft 的載入畫面",
|
||||||
|
"puzzle.option.better_splash_screen_blend": "更好的載入畫面圖示混和",
|
||||||
|
"puzzle.option.better_splash_screen_blend.tooltip": "更改激活畫面上標誌的混合方式\n以便更好地與自訂顏色的標誌配合使用",
|
||||||
|
"puzzle.option.unlimited_model_rotations": "無限模型旋轉",
|
||||||
|
"puzzle.option.unlimited_model_rotations.tooltip": "在自訂方塊/物品模型上解鎖完整 360° 旋轉",
|
||||||
|
"puzzle.option.bigger_custom_models": "更大的自訂模型",
|
||||||
|
"puzzle.option.bigger_custom_models.tooltip": "增加將自訂方塊/物品模型大小\n從 3x3x3 增加到 5x5x5",
|
||||||
|
"puzzle.midnightconfig.title": "Puzzle 進階設定",
|
||||||
|
"puzzle.midnightconfig.tooltip": "給予進階使用者使用的選項",
|
||||||
|
|
||||||
|
"cullleaves.puzzle.option.enabled": "樹葉剔除",
|
||||||
|
"cullleaves.puzzle.option.enabled.tooltip": "開啟樹葉剔除以提升效能。",
|
||||||
|
"iris.puzzle.option.enableShaders": "開啟光影",
|
||||||
|
"iris.puzzle.option.enableShaders.tooltip": "開啟或關閉光影包",
|
||||||
|
"iris.puzzle.option.open": "開",
|
||||||
|
"options.iris.shaderPackSelection.tooltip": "開啟選擇畫面光影包和設定",
|
||||||
|
"lambdabettergrass.option.mode.tooltip": "讓草的側面連接相鄰的草塊",
|
||||||
|
"lambdabettergrass.option.better_snow.tooltip": "對雪塊/苔蘚方塊被包圍的不完整方塊\n增加視覺效果",
|
||||||
|
"config.dynamicfps.reduce_when_unfocused.tooltip": "當 Minecraft 失去焦點時限制 FPS\n(如切換到其他視窗或是遊戲被隱藏)\n以節省電源和系統資源",
|
||||||
|
"config.dynamicfps.unfocused_fps.tooltip": "當 Minecraft 失去焦點時允許的最大 FPS",
|
||||||
|
"config.dynamicfps.restore_when_hovered.tooltip": "開啟或關閉預覽 Mineceraft 時是否停止 FPS 限制\n(如停留在工作列或 Dock)",
|
||||||
|
"config.dynamicfps.run_gc_on_unfocus.tooltip": "當 Minecraft 失去焦點時執行垃圾清理\n以減少一些記憶體",
|
||||||
|
"config.dynamicfps.unfocused_volume.tooltip": "當 Minecraft 失去焦點時撥放的音量\n(如選擇了另一個視窗)",
|
||||||
|
"config.dynamicfps.hidden_volume.tooltip": "遊戲在不可見時應該播放的音量\n(如最小化、被其他視窗覆蓋或在另一個虛擬桌面上)",
|
||||||
|
"entity_texture_features.puzzle.emissive_type.brighter": "§e更亮",
|
||||||
|
"entity_texture_features.puzzle.emissive_type.default": "§6預設"
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 152 B |
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"required": true,
|
"required": true,
|
||||||
"package": "eu.midnightdust.puzzle.mixin",
|
"package": "net.puzzlemc.gui.mixin",
|
||||||
"compatibilityLevel": "JAVA_8",
|
"compatibilityLevel": "JAVA_17",
|
||||||
"client": [
|
"client": [
|
||||||
"MixinOptionsScreen"
|
"MixinOptionsScreen"
|
||||||
],
|
],
|
||||||
2
common/src/main/resources/puzzle-models.accesswidener
Executable file
2
common/src/main/resources/puzzle-models.accesswidener
Executable file
@@ -0,0 +1,2 @@
|
|||||||
|
accessWidener v1 named
|
||||||
|
accessible class net/minecraft/client/render/model/json/ModelElement$Deserializer
|
||||||
11
common/src/main/resources/puzzle-models.mixins.json
Executable file
11
common/src/main/resources/puzzle-models.mixins.json
Executable file
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"required": true,
|
||||||
|
"package": "net.puzzlemc.models.mixin",
|
||||||
|
"compatibilityLevel": "JAVA_17",
|
||||||
|
"client": [
|
||||||
|
"MixinModelElementDeserializer"
|
||||||
|
],
|
||||||
|
"injectors": {
|
||||||
|
"defaultRequire": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
11
common/src/main/resources/puzzle-splashscreen.mixins.json
Executable file
11
common/src/main/resources/puzzle-splashscreen.mixins.json
Executable file
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"required": true,
|
||||||
|
"package": "net.puzzlemc.splashscreen.mixin",
|
||||||
|
"compatibilityLevel": "JAVA_17",
|
||||||
|
"client": [
|
||||||
|
"MixinSplashScreen"
|
||||||
|
],
|
||||||
|
"injectors": {
|
||||||
|
"defaultRequire": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
107
fabric/build.gradle
Normal file
107
fabric/build.gradle
Normal file
@@ -0,0 +1,107 @@
|
|||||||
|
plugins {
|
||||||
|
id 'com.github.johnrengelman.shadow'
|
||||||
|
id "me.shedaniel.unified-publishing"
|
||||||
|
}
|
||||||
|
repositories {
|
||||||
|
maven { url "https://maven.terraformersmc.com/releases" }
|
||||||
|
}
|
||||||
|
|
||||||
|
architectury {
|
||||||
|
platformSetupLoomIde()
|
||||||
|
fabric()
|
||||||
|
}
|
||||||
|
|
||||||
|
configurations {
|
||||||
|
common
|
||||||
|
shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
|
||||||
|
compileClasspath.extendsFrom common
|
||||||
|
runtimeClasspath.extendsFrom common
|
||||||
|
developmentFabric.extendsFrom common
|
||||||
|
archivesBaseName = rootProject.archives_base_name + "-fabric"
|
||||||
|
version = rootProject.mod_version + "+" + rootProject.minecraft_version
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
|
||||||
|
modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
|
||||||
|
modImplementation include ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric")
|
||||||
|
|
||||||
|
modImplementation ("com.terraformersmc:modmenu:${project.modmenu_version}") {
|
||||||
|
exclude(group: "net.fabricmc.fabric-api")
|
||||||
|
}
|
||||||
|
|
||||||
|
common(project(path: ":common", configuration: "namedElements")) { transitive false }
|
||||||
|
shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
|
||||||
|
}
|
||||||
|
|
||||||
|
processResources {
|
||||||
|
inputs.property "version", rootProject.version
|
||||||
|
|
||||||
|
filesMatching("fabric.mod.json") {
|
||||||
|
expand "version": rootProject.version
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
shadowJar {
|
||||||
|
exclude "architectury.common.json"
|
||||||
|
|
||||||
|
configurations = [project.configurations.shadowCommon]
|
||||||
|
archiveClassifier = "dev-shadow"
|
||||||
|
}
|
||||||
|
|
||||||
|
remapJar {
|
||||||
|
input.set shadowJar.archiveFile
|
||||||
|
dependsOn shadowJar
|
||||||
|
}
|
||||||
|
|
||||||
|
sourcesJar {
|
||||||
|
def commonSources = project(":common").sourcesJar
|
||||||
|
dependsOn commonSources
|
||||||
|
from commonSources.archiveFile.map { zipTree(it) }
|
||||||
|
}
|
||||||
|
|
||||||
|
components.java {
|
||||||
|
withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
|
||||||
|
skip()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
unifiedPublishing {
|
||||||
|
project {
|
||||||
|
displayName = "Puzzle $rootProject.version - Fabric $project.minecraft_version"
|
||||||
|
releaseType = "$project.release_type"
|
||||||
|
changelog = releaseChangelog()
|
||||||
|
gameVersions = []
|
||||||
|
gameLoaders = ["fabric","quilt"]
|
||||||
|
mainPublication remapJar
|
||||||
|
relations {
|
||||||
|
depends {
|
||||||
|
curseforge = "fabric-api"
|
||||||
|
modrinth = "fabric-api"
|
||||||
|
}
|
||||||
|
includes {
|
||||||
|
curseforge = "midnightlib"
|
||||||
|
modrinth = "midnightlib"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN")
|
||||||
|
if (CURSEFORGE_TOKEN != null) {
|
||||||
|
curseforge {
|
||||||
|
token = CURSEFORGE_TOKEN
|
||||||
|
id = rootProject.curseforge_id
|
||||||
|
gameVersions.addAll "Java 21", project.minecraft_version, project.supported_versions
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN")
|
||||||
|
if (MODRINTH_TOKEN != null) {
|
||||||
|
modrinth {
|
||||||
|
token = MODRINTH_TOKEN
|
||||||
|
id = rootProject.modrinth_id
|
||||||
|
version = "$rootProject.version-$project.name"
|
||||||
|
gameVersions.addAll project.minecraft_version, project.supported_versions
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
28
fabric/src/main/java/net/puzzlemc/fabric/PuzzleFabric.java
Normal file
28
fabric/src/main/java/net/puzzlemc/fabric/PuzzleFabric.java
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
package net.puzzlemc.fabric;
|
||||||
|
|
||||||
|
import net.fabricmc.api.ClientModInitializer;
|
||||||
|
import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
|
||||||
|
import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
|
||||||
|
import net.minecraft.resource.ResourceManager;
|
||||||
|
import net.minecraft.resource.ResourceType;
|
||||||
|
import net.minecraft.util.Identifier;
|
||||||
|
import net.puzzlemc.core.PuzzleCore;
|
||||||
|
import net.puzzlemc.splashscreen.PuzzleSplashScreen;
|
||||||
|
|
||||||
|
public class PuzzleFabric implements ClientModInitializer {
|
||||||
|
@Override
|
||||||
|
public void onInitializeClient() {
|
||||||
|
PuzzleCore.initModules();
|
||||||
|
|
||||||
|
ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
|
||||||
|
@Override
|
||||||
|
public Identifier getFabricId() {
|
||||||
|
return Identifier.of("puzzle", "splash_screen");
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public void reload(ResourceManager manager) {
|
||||||
|
PuzzleSplashScreen.ReloadListener.INSTANCE.reload(manager);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,14 +1,10 @@
|
|||||||
package eu.midnightdust.puzzle.config;
|
package net.puzzlemc.fabric.modmenu;
|
||||||
|
|
||||||
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
|
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
|
||||||
import com.terraformersmc.modmenu.api.ModMenuApi;
|
import com.terraformersmc.modmenu.api.ModMenuApi;
|
||||||
import eu.midnightdust.puzzle.screen.PuzzleOptionsScreen;
|
import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
|
||||||
import net.fabricmc.api.EnvType;
|
|
||||||
import net.fabricmc.api.Environment;
|
|
||||||
|
|
||||||
@Environment(EnvType.CLIENT)
|
|
||||||
public class ModMenuIntegration implements ModMenuApi {
|
public class ModMenuIntegration implements ModMenuApi {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ConfigScreenFactory<?> getModConfigScreenFactory() {
|
public ConfigScreenFactory<?> getModConfigScreenFactory() {
|
||||||
return PuzzleOptionsScreen::new;
|
return PuzzleOptionsScreen::new;
|
||||||
@@ -6,8 +6,8 @@
|
|||||||
"name": "Puzzle",
|
"name": "Puzzle",
|
||||||
"description": "Unites optifine replacement mods in a clean & vanilla-style gui",
|
"description": "Unites optifine replacement mods in a clean & vanilla-style gui",
|
||||||
"authors": [
|
"authors": [
|
||||||
"Motschen",
|
"PuzzleMC",
|
||||||
"TeamMidnightDust"
|
"Motschen"
|
||||||
],
|
],
|
||||||
"contact": {
|
"contact": {
|
||||||
"homepage": "https://www.midnightdust.eu/",
|
"homepage": "https://www.midnightdust.eu/",
|
||||||
@@ -18,21 +18,25 @@
|
|||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"icon": "assets/puzzle/icon.png",
|
"icon": "assets/puzzle/icon.png",
|
||||||
|
|
||||||
"environment": "*",
|
"environment": "client",
|
||||||
|
|
||||||
"entrypoints": {
|
"entrypoints": {
|
||||||
"client": [
|
"client": [
|
||||||
"eu.midnightdust.puzzle.PuzzleClient"
|
"net.puzzlemc.fabric.PuzzleFabric"
|
||||||
],
|
],
|
||||||
"modmenu": [
|
"modmenu": [
|
||||||
"eu.midnightdust.puzzle.config.ModMenuIntegration"
|
"net.puzzlemc.fabric.modmenu.ModMenuIntegration"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
||||||
"mixins": [
|
"mixins": [
|
||||||
"puzzle.mixins.json"
|
"puzzle-gui.mixins.json",
|
||||||
|
"puzzle-models.mixins.json",
|
||||||
|
"puzzle-splashscreen.mixins.json"
|
||||||
],
|
],
|
||||||
|
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabric": "*"
|
"fabric": "*",
|
||||||
|
"minecraft": ">=1.21"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,25 +1,47 @@
|
|||||||
# Done to increase the memory available to gradle.
|
# Done to increase the memory available to gradle.
|
||||||
org.gradle.jvmargs=-Xmx1G
|
org.gradle.jvmargs=-Xmx2G
|
||||||
|
|
||||||
# Fabric Properties
|
minecraft_version=1.21.3
|
||||||
# check these on https://fabricmc.net/use
|
supported_versions=1.21.2
|
||||||
minecraft_version=1.16.5
|
yarn_mappings=1.21.3+build.2
|
||||||
yarn_mappings=1.16.5+build.6
|
enabled_platforms=fabric,neoforge
|
||||||
loader_version=0.11.3
|
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version = 0.1.0
|
mod_version = 2.0.3
|
||||||
maven_group = eu.midnightdust
|
maven_group = net.puzzlemc
|
||||||
archives_base_name = puzzle
|
archives_base_name = puzzle
|
||||||
|
release_type=release
|
||||||
|
curseforge_id=563977
|
||||||
|
modrinth_id=3IuO68q1
|
||||||
|
|
||||||
# Dependencies
|
# Modloaders
|
||||||
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
|
fabric_loader_version=0.16.9
|
||||||
fabric_version=0.32.5+1.16
|
fabric_api_version=0.107.0+1.21.3
|
||||||
mod_menu_version = 1.16.9
|
|
||||||
|
|
||||||
cull_leaves_version = 2.1.0
|
neoforge_version=21.3.11-beta
|
||||||
ldl_version = 1.3.4-1.16
|
yarn_mappings_patch_neoforge_version = 1.21+build.4
|
||||||
lbg_version = 1.0.3-1.16
|
|
||||||
lc_version = 1.6.0-1.16
|
# Libraries
|
||||||
iris_version = 807b026
|
midnightlib_version = 1.6.4
|
||||||
ctmf_version = v0.4.0
|
modmenu_version = 12.0.0-beta.1
|
||||||
|
|
||||||
|
# Mod Integrations
|
||||||
|
cull_leaves_version = 3.0.2-fabric
|
||||||
|
ldl_version = 2.3.2+1.20.1
|
||||||
|
lbg_version = 1.5.2+1.20.1
|
||||||
|
iris_version = 1.8.0-beta.3+1.21-fabric
|
||||||
|
continuity_version = 3.0.0-beta.5+1.21
|
||||||
|
animatica_version = 0.6.1+1.21
|
||||||
|
colormatic_version = 3.1.2
|
||||||
|
borderless_mining_version = 1.1.8+1.20.1
|
||||||
|
dynamic_fps_version = 3.6.3
|
||||||
|
toml4j_version = 0.7.2
|
||||||
|
cit_resewn_version = 1.1.3+1.20
|
||||||
|
complete_config_version = 2.3.0
|
||||||
|
spruceui_version=5.0.0+1.20
|
||||||
|
emf_version=2.2.3
|
||||||
|
etf_version=6.2.2
|
||||||
|
exordium_version=1.2.1-1.20.2
|
||||||
|
# Required for LBG
|
||||||
|
quilt_loader_version=0.19.0-beta.18
|
||||||
|
quilt_fabric_api_version=7.0.1+0.83.0-1.20
|
||||||
|
|||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
269
gradlew
vendored
269
gradlew
vendored
@@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env sh
|
#!/bin/sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright 2015 the original author or authors.
|
# Copyright © 2015-2021 the original authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -17,67 +17,101 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
##
|
#
|
||||||
## Gradle start up script for UN*X
|
# Gradle start up script for POSIX generated by Gradle.
|
||||||
##
|
#
|
||||||
|
# Important for running:
|
||||||
|
#
|
||||||
|
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||||
|
# noncompliant, but you have some other compliant shell such as ksh or
|
||||||
|
# bash, then to run this script, type that shell name before the whole
|
||||||
|
# command line, like:
|
||||||
|
#
|
||||||
|
# ksh Gradle
|
||||||
|
#
|
||||||
|
# Busybox and similar reduced shells will NOT work, because this script
|
||||||
|
# requires all of these POSIX shell features:
|
||||||
|
# * functions;
|
||||||
|
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||||
|
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||||
|
# * compound commands having a testable exit status, especially «case»;
|
||||||
|
# * various built-in commands including «command», «set», and «ulimit».
|
||||||
|
#
|
||||||
|
# Important for patching:
|
||||||
|
#
|
||||||
|
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||||
|
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||||
|
#
|
||||||
|
# The "traditional" practice of packing multiple parameters into a
|
||||||
|
# space-separated string is a well documented source of bugs and security
|
||||||
|
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||||
|
# options in "$@", and eventually passing that to Java.
|
||||||
|
#
|
||||||
|
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||||
|
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||||
|
# see the in-line comments for details.
|
||||||
|
#
|
||||||
|
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||||
|
# Darwin, MinGW, and NonStop.
|
||||||
|
#
|
||||||
|
# (3) This script is generated from the Groovy template
|
||||||
|
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
|
# within the Gradle project.
|
||||||
|
#
|
||||||
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
# Attempt to set APP_HOME
|
# Attempt to set APP_HOME
|
||||||
|
|
||||||
# Resolve links: $0 may be a link
|
# Resolve links: $0 may be a link
|
||||||
PRG="$0"
|
app_path=$0
|
||||||
# Need this for relative symlinks.
|
|
||||||
while [ -h "$PRG" ] ; do
|
# Need this for daisy-chained symlinks.
|
||||||
ls=`ls -ld "$PRG"`
|
while
|
||||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||||
if expr "$link" : '/.*' > /dev/null; then
|
[ -h "$app_path" ]
|
||||||
PRG="$link"
|
do
|
||||||
else
|
ls=$( ls -ld "$app_path" )
|
||||||
PRG=`dirname "$PRG"`"/$link"
|
link=${ls#*' -> '}
|
||||||
fi
|
case $link in #(
|
||||||
|
/*) app_path=$link ;; #(
|
||||||
|
*) app_path=$APP_HOME$link ;;
|
||||||
|
esac
|
||||||
done
|
done
|
||||||
SAVED="`pwd`"
|
|
||||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||||
APP_HOME="`pwd -P`"
|
|
||||||
cd "$SAVED" >/dev/null
|
|
||||||
|
|
||||||
APP_NAME="Gradle"
|
APP_NAME="Gradle"
|
||||||
APP_BASE_NAME=`basename "$0"`
|
APP_BASE_NAME=${0##*/}
|
||||||
|
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD="maximum"
|
MAX_FD=maximum
|
||||||
|
|
||||||
warn () {
|
warn () {
|
||||||
echo "$*"
|
echo "$*"
|
||||||
}
|
} >&2
|
||||||
|
|
||||||
die () {
|
die () {
|
||||||
echo
|
echo
|
||||||
echo "$*"
|
echo "$*"
|
||||||
echo
|
echo
|
||||||
exit 1
|
exit 1
|
||||||
}
|
} >&2
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
# OS specific support (must be 'true' or 'false').
|
||||||
cygwin=false
|
cygwin=false
|
||||||
msys=false
|
msys=false
|
||||||
darwin=false
|
darwin=false
|
||||||
nonstop=false
|
nonstop=false
|
||||||
case "`uname`" in
|
case "$( uname )" in #(
|
||||||
CYGWIN* )
|
CYGWIN* ) cygwin=true ;; #(
|
||||||
cygwin=true
|
Darwin* ) darwin=true ;; #(
|
||||||
;;
|
MSYS* | MINGW* ) msys=true ;; #(
|
||||||
Darwin* )
|
NONSTOP* ) nonstop=true ;;
|
||||||
darwin=true
|
|
||||||
;;
|
|
||||||
MINGW* )
|
|
||||||
msys=true
|
|
||||||
;;
|
|
||||||
NONSTOP* )
|
|
||||||
nonstop=true
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|||||||
if [ -n "$JAVA_HOME" ] ; then
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||||
else
|
else
|
||||||
JAVACMD="$JAVA_HOME/bin/java"
|
JAVACMD=$JAVA_HOME/bin/java
|
||||||
fi
|
fi
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
|
|||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD="java"
|
JAVACMD=java
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
@@ -106,80 +140,95 @@ location of your Java installation."
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
MAX_FD_LIMIT=`ulimit -H -n`
|
case $MAX_FD in #(
|
||||||
if [ $? -eq 0 ] ; then
|
max*)
|
||||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
MAX_FD="$MAX_FD_LIMIT"
|
warn "Could not query maximum file descriptor limit"
|
||||||
fi
|
esac
|
||||||
ulimit -n $MAX_FD
|
case $MAX_FD in #(
|
||||||
if [ $? -ne 0 ] ; then
|
'' | soft) :;; #(
|
||||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
*)
|
||||||
fi
|
ulimit -n "$MAX_FD" ||
|
||||||
else
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For Darwin, add options to specify how the application appears in the dock
|
|
||||||
if $darwin; then
|
|
||||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
|
||||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
|
||||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
|
||||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
|
||||||
|
|
||||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
|
||||||
|
|
||||||
# We build the pattern for arguments to be converted via cygpath
|
|
||||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
|
||||||
SEP=""
|
|
||||||
for dir in $ROOTDIRSRAW ; do
|
|
||||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
|
||||||
SEP="|"
|
|
||||||
done
|
|
||||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
|
||||||
# Add a user-defined pattern to the cygpath arguments
|
|
||||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
|
||||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
|
||||||
fi
|
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
|
||||||
i=0
|
|
||||||
for arg in "$@" ; do
|
|
||||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
|
||||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
|
||||||
|
|
||||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
|
||||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
|
||||||
else
|
|
||||||
eval `echo args$i`="\"$arg\""
|
|
||||||
fi
|
|
||||||
i=`expr $i + 1`
|
|
||||||
done
|
|
||||||
case $i in
|
|
||||||
0) set -- ;;
|
|
||||||
1) set -- "$args0" ;;
|
|
||||||
2) set -- "$args0" "$args1" ;;
|
|
||||||
3) set -- "$args0" "$args1" "$args2" ;;
|
|
||||||
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
|
||||||
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
|
||||||
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
|
||||||
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
|
||||||
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
|
||||||
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Escape application args
|
# Collect all arguments for the java command, stacking in reverse order:
|
||||||
save () {
|
# * args from the command line
|
||||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
# * the main class name
|
||||||
echo " "
|
# * -classpath
|
||||||
}
|
# * -D...appname settings
|
||||||
APP_ARGS=`save "$@"`
|
# * --module-path (only if needed)
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||||
|
|
||||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
if "$cygwin" || "$msys" ; then
|
||||||
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
|
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||||
|
|
||||||
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
|
|
||||||
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
for arg do
|
||||||
|
if
|
||||||
|
case $arg in #(
|
||||||
|
-*) false ;; # don't mess with options #(
|
||||||
|
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||||
|
[ -e "$t" ] ;; #(
|
||||||
|
*) false ;;
|
||||||
|
esac
|
||||||
|
then
|
||||||
|
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||||
|
fi
|
||||||
|
# Roll the args list around exactly as many times as the number of
|
||||||
|
# args, so each arg winds up back in the position where it started, but
|
||||||
|
# possibly modified.
|
||||||
|
#
|
||||||
|
# NB: a `for` loop captures its iteration list before it begins, so
|
||||||
|
# changing the positional parameters here affects neither the number of
|
||||||
|
# iterations, nor the values presented in `arg`.
|
||||||
|
shift # remove old arg
|
||||||
|
set -- "$@" "$arg" # push replacement arg
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Collect all arguments for the java command;
|
||||||
|
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||||
|
# shell script including quotes and variable substitutions, so put them in
|
||||||
|
# double quotes to make sure that they get re-expanded; and
|
||||||
|
# * put everything else in single quotes, so that it's not re-expanded.
|
||||||
|
|
||||||
|
set -- \
|
||||||
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
-classpath "$CLASSPATH" \
|
||||||
|
org.gradle.wrapper.GradleWrapperMain \
|
||||||
|
"$@"
|
||||||
|
|
||||||
|
# Use "xargs" to parse quoted args.
|
||||||
|
#
|
||||||
|
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||||
|
#
|
||||||
|
# In Bash we could simply go:
|
||||||
|
#
|
||||||
|
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||||
|
# set -- "${ARGS[@]}" "$@"
|
||||||
|
#
|
||||||
|
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||||
|
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||||
|
# character that might be a shell metacharacter, then use eval to reverse
|
||||||
|
# that process (while maintaining the separation between arguments), and wrap
|
||||||
|
# the whole thing up as a single "set" statement.
|
||||||
|
#
|
||||||
|
# This will of course break if any of these variables contains a newline or
|
||||||
|
# an unmatched quote.
|
||||||
|
#
|
||||||
|
|
||||||
|
eval "set -- $(
|
||||||
|
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||||
|
xargs -n1 |
|
||||||
|
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||||
|
tr '\n' ' '
|
||||||
|
)" '"$@"'
|
||||||
|
|
||||||
exec "$JAVACMD" "$@"
|
exec "$JAVACMD" "$@"
|
||||||
|
|||||||
113
neoforge/build.gradle
Normal file
113
neoforge/build.gradle
Normal file
@@ -0,0 +1,113 @@
|
|||||||
|
plugins {
|
||||||
|
id 'com.github.johnrengelman.shadow'
|
||||||
|
id "me.shedaniel.unified-publishing"
|
||||||
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
maven {
|
||||||
|
name = 'NeoForged'
|
||||||
|
url = 'https://maven.neoforged.net/releases'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
architectury {
|
||||||
|
platformSetupLoomIde()
|
||||||
|
neoForge()
|
||||||
|
}
|
||||||
|
|
||||||
|
loom {
|
||||||
|
accessWidenerPath = project(":common").loom.accessWidenerPath
|
||||||
|
}
|
||||||
|
|
||||||
|
configurations {
|
||||||
|
common {
|
||||||
|
canBeResolved = true
|
||||||
|
canBeConsumed = false
|
||||||
|
}
|
||||||
|
compileClasspath.extendsFrom common
|
||||||
|
runtimeClasspath.extendsFrom common
|
||||||
|
developmentNeoForge.extendsFrom common
|
||||||
|
|
||||||
|
// Files in this configuration will be bundled into your mod using the Shadow plugin.
|
||||||
|
// Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
|
||||||
|
shadowBundle {
|
||||||
|
canBeResolved = true
|
||||||
|
canBeConsumed = false
|
||||||
|
}
|
||||||
|
archivesBaseName = rootProject.archives_base_name + "-neoforge"
|
||||||
|
version = rootProject.mod_version + "+" + rootProject.minecraft_version
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
neoForge "net.neoforged:neoforge:$rootProject.neoforge_version"
|
||||||
|
modImplementation ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-neoforge")
|
||||||
|
|
||||||
|
common(project(path: ':common', configuration: 'namedElements')) { transitive false }
|
||||||
|
shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge')
|
||||||
|
}
|
||||||
|
|
||||||
|
processResources {
|
||||||
|
inputs.property 'version', rootProject.version
|
||||||
|
|
||||||
|
filesMatching('META-INF/neoforge.mods.toml') {
|
||||||
|
expand version: rootProject.version
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
shadowJar {
|
||||||
|
configurations = [project.configurations.shadowBundle]
|
||||||
|
archiveClassifier = 'dev-shadow'
|
||||||
|
}
|
||||||
|
|
||||||
|
remapJar {
|
||||||
|
input.set shadowJar.archiveFile
|
||||||
|
}
|
||||||
|
|
||||||
|
sourcesJar {
|
||||||
|
def commonSources = project(":common").sourcesJar
|
||||||
|
dependsOn commonSources
|
||||||
|
from commonSources.archiveFile.map { zipTree(it) }
|
||||||
|
}
|
||||||
|
|
||||||
|
components.java {
|
||||||
|
withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
|
||||||
|
skip()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
unifiedPublishing {
|
||||||
|
project {
|
||||||
|
displayName = "Puzzle $rootProject.version - NeoForge $project.minecraft_version"
|
||||||
|
releaseType = "alpha"
|
||||||
|
changelog = releaseChangelog()
|
||||||
|
gameVersions = []
|
||||||
|
gameLoaders = ["neoforge"]
|
||||||
|
mainPublication remapJar
|
||||||
|
relations {
|
||||||
|
depends {
|
||||||
|
curseforge = "midnightlib"
|
||||||
|
modrinth = "midnightlib"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN")
|
||||||
|
if (CURSEFORGE_TOKEN != null) {
|
||||||
|
curseforge {
|
||||||
|
token = CURSEFORGE_TOKEN
|
||||||
|
id = rootProject.curseforge_id
|
||||||
|
gameVersions.addAll "Java 21", project.minecraft_version, project.supported_versions
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN")
|
||||||
|
if (MODRINTH_TOKEN != null) {
|
||||||
|
modrinth {
|
||||||
|
token = MODRINTH_TOKEN
|
||||||
|
id = rootProject.modrinth_id
|
||||||
|
version = "$rootProject.version-$project.name"
|
||||||
|
gameVersions.addAll project.minecraft_version, project.supported_versions
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
1
neoforge/gradle.properties
Normal file
1
neoforge/gradle.properties
Normal file
@@ -0,0 +1 @@
|
|||||||
|
loom.platform=neoforge
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package net.puzzlemc.neoforge;
|
||||||
|
|
||||||
|
import net.neoforged.api.distmarker.Dist;
|
||||||
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
|
import net.neoforged.fml.ModList;
|
||||||
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
|
import net.neoforged.fml.common.Mod;
|
||||||
|
import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent;
|
||||||
|
import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
|
||||||
|
import net.puzzlemc.core.PuzzleCore;
|
||||||
|
import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
|
||||||
|
import net.puzzlemc.splashscreen.PuzzleSplashScreen;
|
||||||
|
|
||||||
|
import static net.puzzlemc.core.PuzzleCore.MOD_ID;
|
||||||
|
|
||||||
|
@Mod(value = MOD_ID, dist = Dist.CLIENT)
|
||||||
|
public class PuzzleNeoForge {
|
||||||
|
public PuzzleNeoForge() {
|
||||||
|
PuzzleCore.initModules();
|
||||||
|
ModList.get().getModContainerById(MOD_ID).orElseThrow().registerExtensionPoint(IConfigScreenFactory.class, (client, parent) -> new PuzzleOptionsScreen(parent));
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventBusSubscriber(modid = MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
|
||||||
|
public static class MidnightLibBusEvents {
|
||||||
|
@SubscribeEvent
|
||||||
|
public static void onResourceReload(RegisterClientReloadListenersEvent event) {
|
||||||
|
event.registerReloadListener(PuzzleSplashScreen.ReloadListener.INSTANCE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package net.puzzlemc.neoforge.mixin.splashscreen;
|
||||||
|
|
||||||
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.client.gui.DrawContext;
|
||||||
|
import net.minecraft.client.gui.screen.SplashOverlay;
|
||||||
|
import net.minecraft.resource.ResourceReload;
|
||||||
|
import net.neoforged.neoforge.client.loading.NeoForgeLoadingOverlay;
|
||||||
|
import net.puzzlemc.core.config.PuzzleConfig;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
|
@Mixin(NeoForgeLoadingOverlay.class)
|
||||||
|
public class MixinNeoForgeLoadingOverlay extends SplashOverlay {
|
||||||
|
public MixinNeoForgeLoadingOverlay(MinecraftClient client, ResourceReload monitor, Consumer<Optional<Throwable>> exceptionHandler, boolean reloading) {
|
||||||
|
super(client, monitor, exceptionHandler, reloading);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Inject(method = "render", at = @At("HEAD"), cancellable = true) // Replaces the NeoForge loading screen in later stages with the (customized) vanilla version
|
||||||
|
private void redirectNeoForgeLoading(DrawContext context, int mouseX, int mouseY, float tickDelta, CallbackInfo ci) {
|
||||||
|
if (PuzzleConfig.resourcepackSplashScreen && PuzzleConfig.hasCustomSplashScreen) {
|
||||||
|
super.render(context, mouseX, mouseY, tickDelta);
|
||||||
|
ci.cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
37
neoforge/src/main/resources/META-INF/neoforge.mods.toml
Normal file
37
neoforge/src/main/resources/META-INF/neoforge.mods.toml
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
modLoader = "javafml"
|
||||||
|
loaderVersion = "[2,)"
|
||||||
|
#issueTrackerURL = ""
|
||||||
|
license = "MIT License"
|
||||||
|
|
||||||
|
[[mods]]
|
||||||
|
modId = "puzzle"
|
||||||
|
version = "${version}"
|
||||||
|
displayName = "Puzzle"
|
||||||
|
logoFile = "puzzle.png"
|
||||||
|
authors = "PuzzleMC, Motschen"
|
||||||
|
description = '''
|
||||||
|
Unites optifine replacement mods in a clean & vanilla-style gui
|
||||||
|
'''
|
||||||
|
|
||||||
|
[[mixins]]
|
||||||
|
config = "puzzle-gui.mixins.json"
|
||||||
|
[[mixins]]
|
||||||
|
config = "puzzle-models.mixins.json"
|
||||||
|
[[mixins]]
|
||||||
|
config = "puzzle-splashscreen.mixins.json"
|
||||||
|
[[mixins]]
|
||||||
|
config = "puzzle-splashscreen_neoforge.mixins.json"
|
||||||
|
|
||||||
|
[[dependencies.puzzle]]
|
||||||
|
modId = "neoforge"
|
||||||
|
mandatory = true
|
||||||
|
versionRange = "[21.0,)"
|
||||||
|
ordering = "NONE"
|
||||||
|
side = "CLIENT"
|
||||||
|
|
||||||
|
[[dependencies.puzzle]]
|
||||||
|
modId = "minecraft"
|
||||||
|
mandatory = true
|
||||||
|
versionRange = "[1.21,)"
|
||||||
|
ordering = "NONE"
|
||||||
|
side = "CLIENT"
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"required": true,
|
||||||
|
"package": "net.puzzlemc.neoforge.mixin",
|
||||||
|
"compatibilityLevel": "JAVA_17",
|
||||||
|
"client": [
|
||||||
|
"splashscreen.MixinNeoForgeLoadingOverlay"
|
||||||
|
],
|
||||||
|
"injectors": {
|
||||||
|
"defaultRequire": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
neoforge/src/main/resources/puzzle.png
Normal file
BIN
neoforge/src/main/resources/puzzle.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
@@ -1,10 +1,15 @@
|
|||||||
pluginManagement {
|
pluginManagement {
|
||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
maven { url "https://maven.fabricmc.net/" }
|
||||||
maven {
|
maven { url "https://maven.architectury.dev/" }
|
||||||
name = 'Fabric'
|
maven { url "https://maven.neoforged.net/releases" }
|
||||||
url = 'https://maven.fabricmc.net/'
|
|
||||||
}
|
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
include("common")
|
||||||
|
include("fabric")
|
||||||
|
include("neoforge")
|
||||||
|
//include("quilt")
|
||||||
|
|
||||||
|
rootProject.name = "puzzle"
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
package eu.midnightdust.puzzle;
|
|
||||||
|
|
||||||
import eu.midnightdust.puzzle.screen.widget.PuzzleWidget;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class PuzzleApi {
|
|
||||||
public static List<PuzzleWidget> GRAPHICS_OPTIONS = new ArrayList<>();
|
|
||||||
public static List<PuzzleWidget> MISC_OPTIONS = new ArrayList<>();
|
|
||||||
public static List<PuzzleWidget> PERFORMANCE_OPTIONS = new ArrayList<>();
|
|
||||||
public static List<PuzzleWidget> TEXTURE_OPTIONS = new ArrayList<>();
|
|
||||||
|
|
||||||
public static void addToGraphicsOptions(PuzzleWidget button) {GRAPHICS_OPTIONS.add(button);}
|
|
||||||
public static void addToMiscOptions(PuzzleWidget button) {MISC_OPTIONS.add(button);}
|
|
||||||
public static void addToPerformanceOptions(PuzzleWidget button) {PERFORMANCE_OPTIONS.add(button);}
|
|
||||||
public static void addToTextureOptions(PuzzleWidget button) {TEXTURE_OPTIONS.add(button);}
|
|
||||||
}
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
package eu.midnightdust.puzzle;
|
|
||||||
|
|
||||||
import eu.midnightdust.cullleaves.config.CullLeavesConfig;
|
|
||||||
import eu.midnightdust.puzzle.screen.widget.PuzzleWidget;
|
|
||||||
import me.lambdaurora.lambdabettergrass.LBGConfig;
|
|
||||||
import me.lambdaurora.lambdabettergrass.LambdaBetterGrass;
|
|
||||||
import me.lambdaurora.lambdynlights.DynamicLightsConfig;
|
|
||||||
import me.lambdaurora.lambdynlights.LambDynLights;
|
|
||||||
import net.fabricmc.api.ClientModInitializer;
|
|
||||||
import net.fabricmc.loader.api.FabricLoader;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
import net.minecraft.util.Formatting;
|
|
||||||
import team.chisel.ctm.client.CTMClient;
|
|
||||||
import team.chisel.ctm.client.config.ConfigManager;
|
|
||||||
|
|
||||||
public class PuzzleClient implements ClientModInitializer {
|
|
||||||
|
|
||||||
public static final Text YES = new TranslatableText("gui.yes").formatted(Formatting.GREEN);
|
|
||||||
public static final Text NO = new TranslatableText("gui.no").formatted(Formatting.RED);
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onInitializeClient() {
|
|
||||||
if (FabricLoader.getInstance().isModLoaded("cullleaves")) {
|
|
||||||
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("Cull Leaves"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
|
|
||||||
CullLeavesConfig.enabled = !CullLeavesConfig.enabled;
|
|
||||||
CullLeavesConfig.write();
|
|
||||||
MinecraftClient.getInstance().worldRenderer.reload();
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
if (FabricLoader.getInstance().isModLoaded("lambdynlights")) {
|
|
||||||
DynamicLightsConfig ldlConfig = LambDynLights.get().config;
|
|
||||||
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdynlights.option.mode"), (button) -> button.setMessage(ldlConfig.getDynamicLightsMode().getTranslatedText()), (button) -> ldlConfig.setDynamicLightsMode(ldlConfig.getDynamicLightsMode().next())));
|
|
||||||
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdynlights.option.mode").append(": ").append(new TranslatableText("lambdynlights.option.entities")), (button) -> button.setMessage(ldlConfig.hasEntitiesLightSource() ? YES : NO), (button) -> ldlConfig.setEntitiesLightSource(!ldlConfig.hasEntitiesLightSource())));
|
|
||||||
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdynlights.option.mode").append(": ").append(new TranslatableText("lambdynlights.option.block_entities")), (button) -> button.setMessage(ldlConfig.hasBlockEntitiesLightSource() ? YES : NO), (button) -> ldlConfig.setBlockEntitiesLightSource(!ldlConfig.hasBlockEntitiesLightSource())));
|
|
||||||
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdynlights.option.mode").append(": ").append(new TranslatableText("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next())));
|
|
||||||
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdynlights.option.mode").append(": ").append(new TranslatableText("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next())));
|
|
||||||
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdynlights.option.mode").append(": ").append(new TranslatableText("lambdynlights.option.water_sensitive")), (button) -> button.setMessage(ldlConfig.hasWaterSensitiveCheck() ? YES : NO), (button) -> ldlConfig.setWaterSensitiveCheck(!ldlConfig.hasWaterSensitiveCheck())));
|
|
||||||
}
|
|
||||||
if (FabricLoader.getInstance().isModLoaded("ctm")) {
|
|
||||||
ConfigManager ctmfConfigManager = CTMClient.getConfigManager();
|
|
||||||
ConfigManager.Config ctmfConfig = CTMClient.getConfigManager().getConfig();
|
|
||||||
PuzzleApi.addToTextureOptions(new PuzzleWidget(new TranslatableText("puzzle.option.ctm"), (button) -> button.setMessage(ctmfConfig.disableCTM ? NO : YES), (button) -> {
|
|
||||||
ctmfConfig.disableCTM = !ctmfConfig.disableCTM;
|
|
||||||
ctmfConfigManager.onConfigChange();
|
|
||||||
}));
|
|
||||||
PuzzleApi.addToTextureOptions(new PuzzleWidget(new TranslatableText("puzzle.option.inside_ctm"), (button) -> button.setMessage(ctmfConfig.connectInsideCTM ? YES : NO), (button) -> {
|
|
||||||
ctmfConfig.connectInsideCTM = !ctmfConfig.connectInsideCTM;
|
|
||||||
ctmfConfigManager.onConfigChange();
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
if (FabricLoader.getInstance().isModLoaded("lambdabettergrass")) {
|
|
||||||
LBGConfig lbgConfig = LambdaBetterGrass.get().config;
|
|
||||||
PuzzleApi.addToTextureOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
|
|
||||||
PuzzleApi.addToTextureOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,340 +0,0 @@
|
|||||||
package eu.midnightdust.puzzle.config;
|
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
|
||||||
import com.google.gson.GsonBuilder;
|
|
||||||
import net.fabricmc.api.EnvType;
|
|
||||||
import net.fabricmc.api.Environment;
|
|
||||||
import net.fabricmc.loader.api.FabricLoader;
|
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
|
||||||
import net.minecraft.client.gui.screen.ScreenTexts;
|
|
||||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
|
||||||
import net.minecraft.client.gui.widget.TextFieldWidget;
|
|
||||||
import net.minecraft.client.resource.language.I18n;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.text.*;
|
|
||||||
import net.minecraft.util.Formatting;
|
|
||||||
|
|
||||||
import java.lang.annotation.*;
|
|
||||||
import java.lang.reflect.Field;
|
|
||||||
import java.lang.reflect.Method;
|
|
||||||
import java.lang.reflect.Modifier;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.nio.file.Path;
|
|
||||||
import java.util.*;
|
|
||||||
import java.util.function.BiFunction;
|
|
||||||
import java.util.function.Function;
|
|
||||||
import java.util.function.Predicate;
|
|
||||||
import java.util.regex.Pattern;
|
|
||||||
|
|
||||||
// MidnightConfig v0.1.2
|
|
||||||
// Changelog:
|
|
||||||
// - The config screen no longer shows the entries of all instances of MidnightConfig
|
|
||||||
// - Compatible with servers!
|
|
||||||
|
|
||||||
/** Based on https://github.com/Minenash/TinyConfig
|
|
||||||
* Credits to Minenash - CC0-1.0 */
|
|
||||||
|
|
||||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
|
||||||
public class MidnightConfig {
|
|
||||||
|
|
||||||
private static final Pattern INTEGER_ONLY = Pattern.compile("(-?[0-9]*)");
|
|
||||||
private static final Pattern DECIMAL_ONLY = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)");
|
|
||||||
|
|
||||||
private static final List<EntryInfo> entries = new ArrayList<>();
|
|
||||||
|
|
||||||
protected static class EntryInfo {
|
|
||||||
Field field;
|
|
||||||
Object widget;
|
|
||||||
int width;
|
|
||||||
Method dynamicTooltip;
|
|
||||||
Map.Entry<TextFieldWidget,Text> error;
|
|
||||||
Object defaultValue;
|
|
||||||
Object value;
|
|
||||||
String tempValue;
|
|
||||||
boolean inLimits = true;
|
|
||||||
String id;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static final Map<String,Class> configClass = new HashMap();
|
|
||||||
private static String translationPrefix;
|
|
||||||
private static Path path;
|
|
||||||
|
|
||||||
private static final Gson gson = new GsonBuilder()
|
|
||||||
.excludeFieldsWithModifiers(Modifier.TRANSIENT)
|
|
||||||
.excludeFieldsWithModifiers(Modifier.PRIVATE)
|
|
||||||
.setPrettyPrinting()
|
|
||||||
.create();
|
|
||||||
|
|
||||||
public static void init(String modid, Class<?> config) {
|
|
||||||
translationPrefix = modid + ".midnightconfig.";
|
|
||||||
path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
|
|
||||||
configClass.put(modid, config);
|
|
||||||
|
|
||||||
for (Field field : config.getFields()) {
|
|
||||||
Class<?> type = field.getType();
|
|
||||||
EntryInfo info = new EntryInfo();
|
|
||||||
|
|
||||||
Entry e;
|
|
||||||
try { e = field.getAnnotation(Entry.class); }
|
|
||||||
catch (Exception ignored) { continue; }
|
|
||||||
|
|
||||||
info.width = e.width();
|
|
||||||
info.field = field;
|
|
||||||
info.id = modid;
|
|
||||||
|
|
||||||
if (type == int.class) textField(info, Integer::parseInt, INTEGER_ONLY, e.min(), e.max(), true);
|
|
||||||
else if (type == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(),false);
|
|
||||||
else if (type == String.class) textField(info, String::length, null, Math.min(e.min(),0), Math.max(e.max(),1),true);
|
|
||||||
else if (type == boolean.class) {
|
|
||||||
Function<Object,Text> func = value -> new LiteralText((Boolean) value ? "True" : "False").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED);
|
|
||||||
info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> {
|
|
||||||
info.value = !(Boolean) info.value;
|
|
||||||
button.setMessage(func.apply(info.value));
|
|
||||||
}, func);
|
|
||||||
}
|
|
||||||
else if (type.isEnum()) {
|
|
||||||
List<?> values = Arrays.asList(field.getType().getEnumConstants());
|
|
||||||
Function<Object,Text> func = value -> new TranslatableText(translationPrefix + "enum." + type.getSimpleName() + "." + info.value.toString());
|
|
||||||
info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object,Text>>( button -> {
|
|
||||||
int index = values.indexOf(info.value) + 1;
|
|
||||||
info.value = values.get(index >= values.size()? 0 : index);
|
|
||||||
button.setMessage(func.apply(info.value));
|
|
||||||
}, func);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
continue;
|
|
||||||
|
|
||||||
entries.add(info);
|
|
||||||
|
|
||||||
try { info.defaultValue = field.get(null); }
|
|
||||||
catch (IllegalAccessException ignored) {}
|
|
||||||
|
|
||||||
try {
|
|
||||||
info.dynamicTooltip = config.getMethod(e.dynamicTooltip());
|
|
||||||
info.dynamicTooltip.setAccessible(true);
|
|
||||||
} catch (Exception ignored) {}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
try { gson.fromJson(Files.newBufferedReader(path), config); }
|
|
||||||
catch (Exception e) { write(modid); }
|
|
||||||
|
|
||||||
for (EntryInfo info : entries) {
|
|
||||||
try {
|
|
||||||
info.value = info.field.get(null);
|
|
||||||
info.tempValue = info.value.toString();
|
|
||||||
}
|
|
||||||
catch (IllegalAccessException ignored) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
public static void initServer(String modid, Class<?> config) {
|
|
||||||
translationPrefix = modid + ".midnightconfig.";
|
|
||||||
path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
|
|
||||||
configClass.put(modid,config);
|
|
||||||
|
|
||||||
try { gson.fromJson(Files.newBufferedReader(path), config); }
|
|
||||||
catch (Exception e) { write(modid); }
|
|
||||||
|
|
||||||
for (EntryInfo info : entries) {
|
|
||||||
try {
|
|
||||||
info.value = info.field.get(null);
|
|
||||||
info.tempValue = info.value.toString();
|
|
||||||
}
|
|
||||||
catch (IllegalAccessException ignored) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void textField(EntryInfo info, Function<String,Number> f, Pattern pattern, double min, double max, boolean cast) {
|
|
||||||
boolean isNumber = pattern != null;
|
|
||||||
info.widget = (BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) (t, b) -> s -> {
|
|
||||||
s = s.trim();
|
|
||||||
if (!(s.isEmpty() || !isNumber || pattern.matcher(s).matches()))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
Number value = 0;
|
|
||||||
boolean inLimits = false;
|
|
||||||
System.out.println(((isNumber ^ s.isEmpty())));
|
|
||||||
System.out.println(!s.equals("-") && !s.equals("."));
|
|
||||||
info.error = null;
|
|
||||||
if (!(isNumber && s.isEmpty()) && !s.equals("-") && !s.equals(".")) {
|
|
||||||
value = f.apply(s);
|
|
||||||
inLimits = value.doubleValue() >= min && value.doubleValue() <= max;
|
|
||||||
info.error = inLimits? null : new AbstractMap.SimpleEntry<>(t, new LiteralText(value.doubleValue() < min ?
|
|
||||||
"§cMinimum " + (isNumber? "value" : "length") + (cast? " is " + (int)min : " is " + min) :
|
|
||||||
"§cMaximum " + (isNumber? "value" : "length") + (cast? " is " + (int)max : " is " + max)));
|
|
||||||
}
|
|
||||||
|
|
||||||
info.tempValue = s;
|
|
||||||
t.setEditableColor(inLimits? 0xFFFFFFFF : 0xFFFF7777);
|
|
||||||
info.inLimits = inLimits;
|
|
||||||
b.active = entries.stream().allMatch(e -> e.inLimits);
|
|
||||||
|
|
||||||
if (inLimits)
|
|
||||||
info.value = isNumber? value : s;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void write(String modid) {
|
|
||||||
path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
|
|
||||||
try {
|
|
||||||
if (!Files.exists(path)) Files.createFile(path);
|
|
||||||
Files.write(path, gson.toJson(configClass.get(modid).newInstance()).getBytes());
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
public static void update(String modid, Class<?> config) {
|
|
||||||
write(modid);
|
|
||||||
try { gson.fromJson(Files.newBufferedReader(path), config); }
|
|
||||||
catch (Exception e) { write(modid); }
|
|
||||||
|
|
||||||
for (EntryInfo info : entries) {
|
|
||||||
try {
|
|
||||||
info.value = info.field.get(null);
|
|
||||||
info.tempValue = info.value.toString();
|
|
||||||
}
|
|
||||||
catch (IllegalAccessException ignored) {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Environment(EnvType.CLIENT)
|
|
||||||
public static Screen getScreen(Screen parent, String modid) {
|
|
||||||
return new TinyConfigScreen(parent, modid);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Environment(EnvType.CLIENT)
|
|
||||||
private static class TinyConfigScreen extends Screen {
|
|
||||||
|
|
||||||
protected TinyConfigScreen(Screen parent, String modid) {
|
|
||||||
super(new TranslatableText(modid + ".midnightconfig." + "title"));
|
|
||||||
this.parent = parent;
|
|
||||||
this.modid = modid;
|
|
||||||
this.translationPrefix = modid + ".midnightconfig.";
|
|
||||||
}
|
|
||||||
private final Screen parent;
|
|
||||||
private final String modid;
|
|
||||||
private final String translationPrefix;
|
|
||||||
|
|
||||||
// Real Time config update //
|
|
||||||
@Override
|
|
||||||
public void tick() {
|
|
||||||
for (EntryInfo info : entries)
|
|
||||||
try { info.field.set(null, info.value); }
|
|
||||||
catch (IllegalAccessException ignore) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void init() {
|
|
||||||
super.init();
|
|
||||||
|
|
||||||
this.addButton(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> {
|
|
||||||
try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); }
|
|
||||||
catch (Exception e) { write(modid); }
|
|
||||||
|
|
||||||
for (EntryInfo info : entries) {
|
|
||||||
try {
|
|
||||||
info.value = info.field.get(null);
|
|
||||||
info.tempValue = info.value.toString();
|
|
||||||
}
|
|
||||||
catch (IllegalAccessException ignored) {}
|
|
||||||
}
|
|
||||||
Objects.requireNonNull(client).openScreen(parent);
|
|
||||||
}));
|
|
||||||
|
|
||||||
ButtonWidget done = this.addButton(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
|
|
||||||
for (EntryInfo info : entries)
|
|
||||||
if (info.id.equals(modid)) {
|
|
||||||
try {
|
|
||||||
info.field.set(null, info.value);
|
|
||||||
} catch (IllegalAccessException ignore) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
write(modid);
|
|
||||||
Objects.requireNonNull(client).openScreen(parent);
|
|
||||||
}));
|
|
||||||
|
|
||||||
int y = 45;
|
|
||||||
for (EntryInfo info : entries) {
|
|
||||||
if (info.id.equals(modid)) {
|
|
||||||
addButton(new ButtonWidget(width - 155, y, 40, 20, new LiteralText("Reset").formatted(Formatting.RED), (button -> {
|
|
||||||
info.value = info.defaultValue;
|
|
||||||
info.tempValue = info.value.toString();
|
|
||||||
Objects.requireNonNull(client).openScreen(this);
|
|
||||||
})));
|
|
||||||
|
|
||||||
if (info.widget instanceof Map.Entry) {
|
|
||||||
Map.Entry<ButtonWidget.PressAction, Function<Object, Text>> widget = (Map.Entry<ButtonWidget.PressAction, Function<Object, Text>>) info.widget;
|
|
||||||
addButton(new ButtonWidget(width - 110, y, info.width, 20, widget.getValue().apply(info.value), widget.getKey()));
|
|
||||||
} else {
|
|
||||||
TextFieldWidget widget = addButton(new TextFieldWidget(textRenderer, width - 110, y, info.width, 20, null));
|
|
||||||
widget.setText(info.tempValue);
|
|
||||||
|
|
||||||
Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(widget, done);
|
|
||||||
widget.setTextPredicate(processor);
|
|
||||||
|
|
||||||
children.add(widget);
|
|
||||||
}
|
|
||||||
y += 25;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
|
|
||||||
this.renderBackground(matrices);
|
|
||||||
|
|
||||||
|
|
||||||
int stringWidth = (int) (title.getString().length() * 2.75f);
|
|
||||||
this.fillGradient(matrices, this.width / 2 - stringWidth, 10, this.width /2 + stringWidth, 29, -1072689136, -804253680);
|
|
||||||
this.fillGradient(matrices, 0, 35, width, this.height - 40, -1072689136, -804253680);
|
|
||||||
|
|
||||||
|
|
||||||
super.render(matrices, mouseX, mouseY, delta);
|
|
||||||
//renderTooltip(matrices, title, width/2 - stringWidth, 27);
|
|
||||||
drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
|
|
||||||
|
|
||||||
int y = 40;
|
|
||||||
for (EntryInfo info : entries) {
|
|
||||||
if (info.id.equals(modid)) {
|
|
||||||
drawTextWithShadow(matrices, textRenderer, new TranslatableText(translationPrefix + info.field.getName()), 12, y + 10, 0xFFFFFF);
|
|
||||||
|
|
||||||
if (info.error != null && info.error.getKey().isMouseOver(mouseX, mouseY))
|
|
||||||
renderTooltip(matrices, info.error.getValue(), mouseX, mouseY);
|
|
||||||
else if (mouseY >= y && mouseY < (y + 25)) {
|
|
||||||
if (info.dynamicTooltip != null) {
|
|
||||||
try {
|
|
||||||
renderTooltip(matrices, (List<Text>) info.dynamicTooltip.invoke(null, entries), mouseX, mouseY);
|
|
||||||
y += 25;
|
|
||||||
continue;
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
String key = translationPrefix + info.field.getName() + ".tooltip";
|
|
||||||
if (I18n.hasTranslation(key)) {
|
|
||||||
List<Text> list = new ArrayList<>();
|
|
||||||
for (String str : I18n.translate(key).split("\n"))
|
|
||||||
list.add(new LiteralText(str));
|
|
||||||
renderTooltip(matrices, list, mouseX, mouseY);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
y += 25;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Retention(RetentionPolicy.RUNTIME)
|
|
||||||
@Target(ElementType.FIELD)
|
|
||||||
public @interface Entry {
|
|
||||||
String dynamicTooltip() default "";
|
|
||||||
int width() default 100;
|
|
||||||
double min() default Double.MIN_NORMAL;
|
|
||||||
double max() default Double.MAX_VALUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
package eu.midnightdust.puzzle.mixin;
|
|
||||||
|
|
||||||
import eu.midnightdust.puzzle.screen.PuzzleOptionsScreen;
|
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
|
||||||
import net.minecraft.client.gui.screen.options.OptionsScreen;
|
|
||||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
|
||||||
|
|
||||||
@Mixin(OptionsScreen.class)
|
|
||||||
public class MixinOptionsScreen extends Screen {
|
|
||||||
|
|
||||||
protected MixinOptionsScreen(Text title) {
|
|
||||||
super(title);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(at = @At("TAIL"),method = "init")
|
|
||||||
public void init(CallbackInfo ci) {
|
|
||||||
PuzzleOptionsScreen puzzleScreen = new PuzzleOptionsScreen(this);
|
|
||||||
this.addButton(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 144 - 6, 150, 20, new TranslatableText("puzzle.screen.title").append("..."), (button) -> {
|
|
||||||
this.client.openScreen(puzzleScreen);
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
package eu.midnightdust.puzzle.screen;
|
|
||||||
|
|
||||||
import eu.midnightdust.puzzle.screen.page.GraphicsPage;
|
|
||||||
import eu.midnightdust.puzzle.screen.page.MiscPage;
|
|
||||||
import eu.midnightdust.puzzle.screen.page.PerformancePage;
|
|
||||||
import eu.midnightdust.puzzle.screen.page.TexturesPage;
|
|
||||||
import net.coderbot.iris.gui.ShaderPackScreen;
|
|
||||||
import net.fabricmc.loader.api.FabricLoader;
|
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
|
||||||
import net.minecraft.client.gui.screen.ScreenTexts;
|
|
||||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
public class PuzzleOptionsScreen extends Screen {
|
|
||||||
|
|
||||||
public PuzzleOptionsScreen(Screen parent) {
|
|
||||||
super(new TranslatableText("puzzle.screen.title"));
|
|
||||||
this.parent = parent;
|
|
||||||
}
|
|
||||||
private final Screen parent;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void init() {
|
|
||||||
super.init();
|
|
||||||
GraphicsPage graphicsPage = new GraphicsPage(this);
|
|
||||||
MiscPage miscPage = new MiscPage(this);
|
|
||||||
PerformancePage performancePage = new PerformancePage(this);
|
|
||||||
TexturesPage texturesPage = new TexturesPage(this);
|
|
||||||
|
|
||||||
this.addButton(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 48 - 6, 150, 20, graphicsPage.getTitle().copy().append("..."), (button) -> {
|
|
||||||
Objects.requireNonNull(client).openScreen(graphicsPage);
|
|
||||||
}));
|
|
||||||
this.addButton(new ButtonWidget(this.width / 2 + 5, this.height / 6 + 48 - 6, 150, 20, texturesPage.getTitle().copy().append("..."), (button) -> {
|
|
||||||
Objects.requireNonNull(client).openScreen(texturesPage);
|
|
||||||
}));
|
|
||||||
this.addButton(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 72 - 6, 150, 20, performancePage.getTitle().copy().append("..."), (button) -> {
|
|
||||||
Objects.requireNonNull(client).openScreen(performancePage);
|
|
||||||
}));
|
|
||||||
this.addButton(new ButtonWidget(this.width / 2 + 5, this.height / 6 + 72 - 6, 150, 20, miscPage.getTitle().copy().append("..."), (button) -> {
|
|
||||||
Objects.requireNonNull(client).openScreen(miscPage);
|
|
||||||
}));
|
|
||||||
if (FabricLoader.getInstance().isModLoaded("iris")) {
|
|
||||||
try {
|
|
||||||
ShaderPackScreen shaderPackPage = new ShaderPackScreen(this);
|
|
||||||
this.addButton(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 96 - 6, 150, 20, shaderPackPage.getTitle().copy().append("..."), (button) -> {
|
|
||||||
Objects.requireNonNull(client).openScreen(shaderPackPage);
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
catch (NoClassDefFoundError e) {
|
|
||||||
LogManager.getLogger("Puzzle").info("The shaderpack selection screen is not present, not adding it.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this.addButton(new ButtonWidget(this.width / 2 - 100, this.height / 6 + 168, 200, 20, ScreenTexts.DONE, (button) -> {
|
|
||||||
Objects.requireNonNull(client).openScreen(parent);
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
|
|
||||||
this.renderBackground(matrices);
|
|
||||||
|
|
||||||
super.render(matrices, mouseX, mouseY, delta);
|
|
||||||
drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
package eu.midnightdust.puzzle.screen.page;
|
|
||||||
|
|
||||||
import eu.midnightdust.puzzle.screen.widget.PuzzleOptionListWidget;
|
|
||||||
import eu.midnightdust.puzzle.screen.widget.PuzzleWidget;
|
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
|
||||||
import net.minecraft.client.gui.screen.ScreenTexts;
|
|
||||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
public abstract class AbstractPuzzleOptionsPage extends Screen {
|
|
||||||
private PuzzleOptionListWidget list;
|
|
||||||
private final List<PuzzleWidget> options;
|
|
||||||
|
|
||||||
public AbstractPuzzleOptionsPage(Screen parent, TranslatableText 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.children.add(this.list);
|
|
||||||
|
|
||||||
super.init();
|
|
||||||
|
|
||||||
this.addButton(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> {
|
|
||||||
Objects.requireNonNull(client).openScreen(parent);
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
|
|
||||||
this.renderBackground(matrices);
|
|
||||||
this.list.render(matrices, mouseX, mouseY, delta);
|
|
||||||
|
|
||||||
drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
|
|
||||||
super.render(matrices, mouseX, mouseY, delta);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
package eu.midnightdust.puzzle.screen.page;
|
|
||||||
|
|
||||||
import eu.midnightdust.puzzle.PuzzleApi;
|
|
||||||
import eu.midnightdust.puzzle.screen.page.AbstractPuzzleOptionsPage;
|
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
|
|
||||||
public class GraphicsPage extends AbstractPuzzleOptionsPage {
|
|
||||||
|
|
||||||
public GraphicsPage(Screen parent) {
|
|
||||||
super(parent, new TranslatableText("puzzle.page.graphics"), PuzzleApi.GRAPHICS_OPTIONS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
package eu.midnightdust.puzzle.screen.page;
|
|
||||||
|
|
||||||
import eu.midnightdust.puzzle.PuzzleApi;
|
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
|
|
||||||
public class MiscPage extends AbstractPuzzleOptionsPage {
|
|
||||||
|
|
||||||
public MiscPage(Screen parent) {
|
|
||||||
super(parent, new TranslatableText("puzzle.page.misc"), PuzzleApi.MISC_OPTIONS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
package eu.midnightdust.puzzle.screen.page;
|
|
||||||
|
|
||||||
import eu.midnightdust.puzzle.PuzzleApi;
|
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
|
|
||||||
public class PerformancePage extends AbstractPuzzleOptionsPage {
|
|
||||||
|
|
||||||
public PerformancePage(Screen parent) {
|
|
||||||
super(parent, new TranslatableText("puzzle.page.performance"), PuzzleApi.PERFORMANCE_OPTIONS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
package eu.midnightdust.puzzle.screen.page;
|
|
||||||
|
|
||||||
import eu.midnightdust.puzzle.PuzzleApi;
|
|
||||||
import eu.midnightdust.puzzle.screen.page.AbstractPuzzleOptionsPage;
|
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
|
|
||||||
public class TexturesPage extends AbstractPuzzleOptionsPage {
|
|
||||||
|
|
||||||
public TexturesPage(Screen parent) {
|
|
||||||
super(parent, new TranslatableText("puzzle.page.textures"), PuzzleApi.TEXTURE_OPTIONS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
package eu.midnightdust.puzzle.screen.widget;
|
|
||||||
|
|
||||||
public enum ButtonType {
|
|
||||||
BUTTON, SLIDER, TEXT_FIELD
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
package eu.midnightdust.puzzle.screen.widget;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
|
|
||||||
public class PuzzleButtonWidget extends ButtonWidget {
|
|
||||||
private final PuzzleWidget.TextAction title;
|
|
||||||
|
|
||||||
public PuzzleButtonWidget(int x, int y, int width, int height, PuzzleWidget.TextAction title, PressAction onPress) {
|
|
||||||
super(x, y, width, height, Text.of(""), onPress);
|
|
||||||
this.title = title;
|
|
||||||
}
|
|
||||||
@Override
|
|
||||||
public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) {
|
|
||||||
title.setTitle(this);
|
|
||||||
super.renderButton(matrices, mouseX, mouseY, delta);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
package eu.midnightdust.puzzle.screen.widget;
|
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableMap;
|
|
||||||
import net.fabricmc.api.EnvType;
|
|
||||||
import net.fabricmc.api.Environment;
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
|
||||||
import net.minecraft.client.font.TextRenderer;
|
|
||||||
import net.minecraft.client.gui.Element;
|
|
||||||
import net.minecraft.client.gui.widget.AbstractButtonWidget;
|
|
||||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
|
||||||
import net.minecraft.client.gui.widget.ElementListWidget;
|
|
||||||
import net.minecraft.client.util.math.MatrixStack;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
|
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
@Environment(EnvType.CLIENT)
|
|
||||||
public class PuzzleOptionListWidget extends ElementListWidget<PuzzleOptionListWidget.ButtonEntry> {
|
|
||||||
TextRenderer textRenderer;
|
|
||||||
|
|
||||||
public PuzzleOptionListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l, int m) {
|
|
||||||
super(minecraftClient, i, j, k, l, m);
|
|
||||||
this.centerListVertically = false;
|
|
||||||
textRenderer = minecraftClient.textRenderer;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addButton(AbstractButtonWidget button, Text text) {
|
|
||||||
this.addEntry(ButtonEntry.create(button, text));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addAll(List<PuzzleWidget> buttons) {
|
|
||||||
for (int i = 0; i < buttons.size(); ++i) {
|
|
||||||
PuzzleWidget button = buttons.get(i);
|
|
||||||
if (button.buttonType == ButtonType.BUTTON) {
|
|
||||||
this.addButton(new PuzzleButtonWidget(this.width / 2 - 155 + 160, 0, 150, 20, button.buttonTextAction, button.onPress), button.descriptionText);
|
|
||||||
}
|
|
||||||
else if (button.buttonType == ButtonType.SLIDER) {
|
|
||||||
this.addButton(new PuzzleSliderWidget(button.min,button.max,this.width / 2 - 155 + 160, 0, 150, 20, ((TranslatableText) button.buttonText),1), button.descriptionText);
|
|
||||||
}
|
|
||||||
else if (button.buttonType == ButtonType.TEXT_FIELD) {
|
|
||||||
this.addButton(new PuzzleTextFieldWidget(textRenderer,this.width / 2 - 155 + 160, 0, 150, 20,null, button.buttonText), button.descriptionText);
|
|
||||||
}
|
|
||||||
else LogManager.getLogger("Puzzle").warn("Button " + button + " is missing the buttonType variable. This shouldn't happen!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getRowWidth() {
|
|
||||||
return 400;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected int getScrollbarPositionX() {
|
|
||||||
return super.getScrollbarPositionX() + 32;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Optional<AbstractButtonWidget> getHoveredButton(double mouseX, double mouseY) {
|
|
||||||
for (ButtonEntry buttonEntry : this.children()) {
|
|
||||||
for (AbstractButtonWidget abstractButtonWidget : buttonEntry.buttons) {
|
|
||||||
if (abstractButtonWidget.isMouseOver(mouseX, mouseY)) {
|
|
||||||
return Optional.of(abstractButtonWidget);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return Optional.empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
|
|
||||||
private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
|
|
||||||
private final List<AbstractButtonWidget> buttons;
|
|
||||||
private final Map<AbstractButtonWidget, Text> buttonsWithText;
|
|
||||||
|
|
||||||
private ButtonEntry(ImmutableMap<AbstractButtonWidget, Text> buttons) {
|
|
||||||
this.buttons = buttons.keySet().asList();
|
|
||||||
this.buttonsWithText = buttons;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ButtonEntry create(AbstractButtonWidget button, Text text) {
|
|
||||||
return new ButtonEntry(ImmutableMap.of(button, text));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
|
|
||||||
this.buttonsWithText.forEach((button, text) -> {
|
|
||||||
button.y = y;
|
|
||||||
button.render(matrices, mouseX, mouseY, tickDelta);
|
|
||||||
drawTextWithShadow(matrices,textRenderer, text,x+15,y+5,0xFFFFFF);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<? extends Element> children() {
|
|
||||||
return buttons;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
package eu.midnightdust.puzzle.screen.widget;
|
|
||||||
|
|
||||||
import net.minecraft.client.gui.widget.SliderWidget;
|
|
||||||
import net.minecraft.text.LiteralText;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
|
|
||||||
public class PuzzleSliderWidget extends SliderWidget {
|
|
||||||
private final int min;
|
|
||||||
private final double difference;
|
|
||||||
|
|
||||||
public PuzzleSliderWidget(int min, int max, int x, int y, int width, int height, TranslatableText label, double value) {
|
|
||||||
super(x,y,width,height,label,value);
|
|
||||||
this.updateMessage();
|
|
||||||
this.min = min;
|
|
||||||
this.difference = max - min;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void updateMessage() {
|
|
||||||
Text text = new LiteralText((int) (min + this.value * difference) + "");
|
|
||||||
this.setMessage(new TranslatableText("label").append(": ").append((Text) text));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void applyValue() {
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
package eu.midnightdust.puzzle.screen.widget;
|
|
||||||
|
|
||||||
import net.minecraft.client.font.TextRenderer;
|
|
||||||
import net.minecraft.client.gui.widget.SliderWidget;
|
|
||||||
import net.minecraft.client.gui.widget.TextFieldWidget;
|
|
||||||
import net.minecraft.text.LiteralText;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
import org.jetbrains.annotations.Nullable;
|
|
||||||
|
|
||||||
public class PuzzleTextFieldWidget extends TextFieldWidget {
|
|
||||||
private TranslatableText label;
|
|
||||||
|
|
||||||
public PuzzleTextFieldWidget(TextRenderer textRenderer, int x, int y, int width, int height, @Nullable TextFieldWidget copyFrom, Text text) {
|
|
||||||
super(textRenderer, x, y, width, height, text);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
package eu.midnightdust.puzzle.screen.widget;
|
|
||||||
|
|
||||||
import net.fabricmc.api.EnvType;
|
|
||||||
import net.fabricmc.api.Environment;
|
|
||||||
import net.minecraft.client.gui.widget.AbstractButtonWidget;
|
|
||||||
import net.minecraft.client.gui.widget.ButtonWidget;
|
|
||||||
import net.minecraft.text.Text;
|
|
||||||
import net.minecraft.text.TranslatableText;
|
|
||||||
|
|
||||||
public class PuzzleWidget {
|
|
||||||
public ButtonType buttonType;
|
|
||||||
public int min;
|
|
||||||
public int max;
|
|
||||||
public Text descriptionText;
|
|
||||||
public Text buttonText;
|
|
||||||
public TextAction buttonTextAction;
|
|
||||||
public ButtonWidget.PressAction onPress;
|
|
||||||
public PuzzleWidget.SaveAction onSave;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Puzzle Button Widget Container
|
|
||||||
* @param descriptionText Tells the user what the option does.
|
|
||||||
* @param getTitle Function to set the text on the button.
|
|
||||||
* @param onPress Function to call when the user presses the button.
|
|
||||||
*/
|
|
||||||
public PuzzleWidget(Text descriptionText, PuzzleWidget.TextAction getTitle, ButtonWidget.PressAction onPress) {
|
|
||||||
this.buttonType = ButtonType.BUTTON;
|
|
||||||
this.descriptionText = descriptionText;
|
|
||||||
this.buttonTextAction = getTitle;
|
|
||||||
this.onPress = onPress;
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Puzzle Slider Widget Container (WIP - Doesn't work)
|
|
||||||
*/
|
|
||||||
public PuzzleWidget(int min, int max, Text descriptionText, TranslatableText buttonText) {
|
|
||||||
this.buttonType = ButtonType.SLIDER;
|
|
||||||
this.min = min;
|
|
||||||
this.max = max;
|
|
||||||
this.descriptionText = descriptionText;
|
|
||||||
this.buttonText = buttonText;
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Puzzle Text Field Widget Container (WIP - Doesn't work)
|
|
||||||
*/
|
|
||||||
public PuzzleWidget(Text descriptionText, Text buttonText) {
|
|
||||||
this.buttonType = ButtonType.TEXT_FIELD;
|
|
||||||
this.descriptionText = descriptionText;
|
|
||||||
this.buttonText = buttonText;
|
|
||||||
}
|
|
||||||
@Environment(EnvType.CLIENT)
|
|
||||||
public interface SaveAction {
|
|
||||||
void onSave(AbstractButtonWidget button);
|
|
||||||
}
|
|
||||||
@Environment(EnvType.CLIENT)
|
|
||||||
public interface TextAction {
|
|
||||||
void setTitle(AbstractButtonWidget button);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.2 KiB |
@@ -1,9 +0,0 @@
|
|||||||
{
|
|
||||||
"puzzle.screen.title":"Puzzle Settings",
|
|
||||||
"puzzle.page.graphics":"Graphics Settings",
|
|
||||||
"puzzle.page.textures":"Texture Settings",
|
|
||||||
"puzzle.page.performance":"Performance Settings",
|
|
||||||
"puzzle.page.misc":"Miscellaneous Settings",
|
|
||||||
"puzzle.option.ctm":"Connected Textures",
|
|
||||||
"puzzle.option.inside_ctm":"Connect Inside Textures"
|
|
||||||
}
|
|
||||||
Binary file not shown.
Reference in New Issue
Block a user