100 Commits

Author SHA1 Message Date
Martin Prokoph
5117c886e0 fix: remove 1.21.4 from neoforge 1.21.5 targets 2025-12-11 20:17:40 +01:00
Martin Prokoph
185e2f9a7c release: Puzzle v2.2.1 2025-12-11 20:12:04 +01:00
Martin Prokoph
11c8ba6837 fix: properly support MC 1.21.4
- Also, loading screen textures will now be loaded way earlier on NeoForge :)
2025-12-11 20:07:24 +01:00
Martin Prokoph
2611a29107 fix: crash when ModMenu is not installed 2025-12-11 17:55:32 +01:00
Martin Prokoph
9dd384359f port: Mounts of Mayham (1.21.11) 2025-12-11 17:47:15 +01:00
Martin Prokoph
7149307f1f publishing: fix version targets 2025-11-23 14:32:45 +01:00
Martin Prokoph
1d52a5e3de release: Puzzle v2.2.0 2025-11-23 14:30:28 +01:00
Martin Prokoph
30e09acfb7 feat: improve EMF integration 2025-11-23 13:39:24 +01:00
Martin Prokoph
6b51595caa fix: list looking corrupted on 1.20.1 2025-11-19 22:04:36 +01:00
Martin Prokoph
31279c6367 stonecutter: cleanup 2025-11-19 21:51:20 +01:00
Martin Prokoph
15ab623edb stonecutter: support Fabric 1.20.1 2025-11-19 21:33:47 +01:00
Martin Prokoph
6e270b1a4d stonecutter: support 1.21.1 2025-11-19 20:50:38 +01:00
Martin Prokoph
8ed02fef87 stonecutter: support 1.21.5 2025-11-19 19:04:04 +01:00
Martin Prokoph
36bc344b94 stonecutter: support 1.21.8 2025-11-19 18:15:19 +01:00
Martin Prokoph
c2e4008871 stonecutter: support NeoForge 1.21.10 2025-11-19 16:26:51 +01:00
Martin Prokoph
b77bdc215e stonecutter: setup project for multiversion support
- Switch to Stonecutter build system
- Migrate mappings to Mojmap
2025-11-19 16:05:34 +01:00
Martin Prokoph
caee4c801a port: The Copper Age (1.21.9)
Most changes were related to the MidnightLib 1.8.0 update
2025-10-01 19:00:00 +02:00
Martin Prokoph
97117ea46a port: Chase the Skies (1.21.6) 2025-06-17 19:44:15 +02:00
Martin Prokoph
ee274fcefd Merge pull request #94 from seriousfreezing/1.21.5
Update pt_br.json
2025-06-17 19:17:42 +02:00
SeriousFreezing
74de5ba33c Update pt_br.json 2025-06-13 18:24:53 -03:00
Martin Prokoph
7caadedcf1 fix: get logo blending working again 2025-03-29 16:53:02 +01:00
Martin Prokoph
16f5c08011 fix: NeoForge 1.21.5 compat
Why tf does NeoForge change the MinecraftClient instance...
2025-03-29 15:02:39 +01:00
Martin Prokoph
eac8b24617 Merge pull request #92 from PuzzleMC/temp
port: recent 1.21.4 progress to 1.21.5
2025-03-29 14:42:36 +01:00
Martin Prokoph
c930b778b6 Merge branch '1.21.5' into temp 2025-03-29 14:42:13 +01:00
Martin Prokoph
cd33715e70 Merge pull request #87 from notlin4/patch-2
Update traditional Chinese translation
2025-03-29 14:39:33 +01:00
Martin Prokoph
2db5e05342 feat: add icons for mod titles 2025-03-29 14:38:32 +01:00
Martin Prokoph
a39a17b878 fix: compat with MidnightLib 1.7.0 2025-03-29 13:12:31 +01:00
Martin Prokoph
b73c28d48d port: Spring to Life (1.21.5) 2025-03-26 19:48:18 +01:00
Martin Prokoph
fbac443231 fix: crash related to EMF compat 2025-03-26 19:45:34 +01:00
notlin4
edbf42b1bc Update traditional Chinese translation 2024-12-14 15:24:17 +08:00
notlin4
1c3daeb08e Update traditional Chinese translation 2024-12-14 15:14:33 +08:00
notlin4
93b0b47e0e Update traditional Chinese translation 2024-12-14 15:13:03 +08:00
notlin4
31e91c5a93 Update traditional Chinese translation 2024-12-14 15:12:37 +08:00
Martin Prokoph
cbdc1750bc Fix compilation 2024-12-06 20:37:19 +01:00
Martin Prokoph
77b7b35f6d Port to 1.21.4
- Improved error handling
- Update LambDynamicLights
- Fix splash screen background blending once again
2024-12-06 20:33:15 +01:00
Martin Prokoph
ab83b2744a Fix mixin apply error 2024-11-05 19:10:09 +01:00
Martin Prokoph
9ee7ab1b89 Update to 1.21.3 2024-11-05 10:29:04 +01:00
Martin Prokoph
07af46da3c Handle incorrectly defined blend functions
- Now logs a warning instead of crashing
2024-09-24 23:40:12 +02:00
Martin Prokoph
f230cf3a4e Merge pull request #81 from C4BR3R4/patch-1
Create es_es.json
2024-09-24 23:37:10 +02:00
C4BR3R4
8646efb161 Create es_es.json
Changelog: http://c4br3r4.es/index.php?topic=1234.0
2024-09-07 14:17:47 +02:00
Martin Prokoph
fb1852dc2b Actually disable blending & Update example pack
- Blending will now be disabled when set to "off" instead of using the default blend function
2024-09-07 12:33:28 +02:00
Martin Prokoph
9dbe28242a Publishing: Add MidnightLib to the relations 2024-09-06 18:52:10 +02:00
Martin Prokoph
35c613a536 Puzzle 2.0.0 - Multiplatform & Cleaner code
- Removed intrusive branding (previously visible on Title screen and F3 menu)
- De-modularized: Previously, Puzzle was split into multiple modules which complicated the development process and was just unnecessary
- Experimental NeoForge support
- Many small improvements
- puzzle-splashscreen: Improved  background image blending
- puzzle-splashscreen: Added support for custom blend functions for full OptiFine parity
2024-09-06 18:44:27 +02:00
Martin Prokoph
651483af22 Update to 1.21 2024-06-16 18:53:43 +02:00
Martin Prokoph
b3b49cb8b8 Port to 1.20.6
- Port to 1.20.6
- Move compatibility code into individual classes
2024-05-04 19:55:04 +02:00
Martin Prokoph
39261272bf Puzzle 1.6.1 for 1.20.4
- Update to 1.20.4
- Re-Use MidnightConfig's list widget -> prettier background
2023-12-11 21:33:54 +01:00
Motschen
bc01662cda Puzzle 1.6.0 - 1.20.2 & Stability improvements
- Port to 1.20.2
- Improve stability by skipping outdated compat entries
- Update EMF integration
2023-09-24 21:18:45 +02:00
Martin Prokoph
1dc7245a99 Merge pull request #72 from Gazmanovich/1.20-1
Create be_by.json
2023-09-23 12:24:59 +02:00
Martin Prokoph
860d969c1d Merge pull request #69 from ImVietnam/patch-1
Create vi_vn.json
2023-09-23 12:24:37 +02:00
Alex Gazmanovich
acd3dbf9e2 Create be_by.json 2023-08-09 12:02:14 +03:00
I_am_Vietnam
cbd48603d2 Create vi_vn.json 2023-07-19 11:18:10 +07:00
Motschen
f91274dd90 Puzzle 1.5.2 - Fix crash without ModMenu
Fixes #67 & #68
2023-07-12 11:34:38 +02:00
Motschen
884ee8caf6 Puzzle 1.5.1 - 1.20 & Fixes
- Update to 1.20
- Fix version string behaving weirdly with ModMenu installed
- Integration for CEM replaced with EMF
2023-06-10 18:55:29 +02:00
Martin Prokoph
c921f3ff99 Update Traditional Chinese by @notlin4
Update Traditional Chinese by @notlin4
2023-06-10 16:52:45 +02:00
Martin Prokoph
8532a24b5e Merge pull request #59 from notlin4/patch-1
Update Traditional Chinese
2023-06-10 16:50:25 +02:00
Martin Prokoph
3a873df26a Merge pull request #60 from Felix14-v2/1.19.4
Update ru_ru.json
2023-06-10 16:49:57 +02:00
Martin Prokoph
e3615a79c4 Merge pull request #62 from Madis0/patch-2
Readme badges
2023-05-24 19:02:01 +02:00
Madis Otenurm
2704c2c80b Update README.md 2023-05-16 07:43:05 +03:00
Felix14-v2
83897109fe Update ru_ru.json
Oops
2023-04-21 15:41:08 +03:00
Felix14-v2
fc20a1b182 Update ru_ru.json 2023-04-21 15:29:29 +03:00
notlin4
927faea146 Update Traditional Chinese 2023-04-16 14:33:21 +08:00
Motschen
b979d5ac61 Puzzle 1.5.0 - 1.19.4, Options overhaul, Fixed splash screen
- Port to 1.19.4
- Overhaul the Puzzle Options screen
  - Categories are now displayed via tabs
- Fix #50 (Splash screen logo being pixelated)
- Add compatibility with Exordium
2023-03-15 18:54:29 +01:00
Martin Prokoph
12cdcba470 Merge pull request #54 from FITFC/1.19.3
Added lang/pt_br
2023-03-15 15:48:50 +01:00
FITFC
c9aa80f09f Added lang/pt_br 2022-12-24 12:45:21 -05:00
Motschen
12015d6ba4 Puzzle 1.4.2 - Update to 1.19.3
Here's a little Christmas present for y'all!
Puzzle now has 1.19.3 support.
2022-12-24 17:53:39 +01:00
Martin Prokoph
a8c89b11c7 Merge pull request #45 from Felix14-v2/1.19
Update ru_ru.json
2022-08-02 20:46:26 +00:00
Felix14-v2
f8ff656daa Update ru_ru.json 2022-08-02 23:35:50 +03:00
Motschen
f89fc08505 Puzzle 1.4.0 - Fixes, Integrations & Tooltip
- Fixed #41 (ETF 4.0+ crashing)
- Fixed #39 (Broken update checker)
- Fixed slider widgets being broken
- Hide buttons when options are empty (Closes #10)
- More mod integrations (Closes #20)
  - DynamicFPS
  - Borderless Mining
  - Colormatic
- Added tooltips for all Puzzle options
- Made everything translatable
- Improve German translations
2022-08-02 14:05:47 +02:00
Martin Prokoph
94afc8b0c0 Merge pull request #40 from Madis0/compress
Compress images
2022-08-01 17:41:00 +00:00
Martin Prokoph
64aa45a370 Merge pull request #43 from Traben-0/1.19
ETF 4.0 support added
2022-08-01 12:57:16 +00:00
Traben
05bea0aab1 ETF 4.0 support added 2022-08-01 15:01:16 +10:00
Madis
fbb368989e Compress images 2022-07-20 22:21:44 +03:00
Motschen
795759b4e5 Puzzle 1.3.4 - Custom splashscreen background & fixes
- Add the ability to use custom splash screen background images placed in a resourcepack under "assets/minecraft/puzzle/splash_background.png"
- Some more fixes regarding splash screen
2022-07-06 20:47:19 +02:00
Martin Prokoph
2410b8ff54 Merge pull request #35 from Felix14-v2/1.19
Update ru_ru.json
2022-07-06 18:42:27 +00:00
Martin Prokoph
d08889f186 Merge pull request #36 from gyular/ko_kr
create korean translation
2022-07-06 18:41:51 +00:00
gyular
2886fd509b create korean translation 2022-06-22 17:22:11 +09:00
Felix14-v2
8be9fc6872 Update ru_ru.json 2022-06-13 18:02:32 +03:00
Motschen
87ebfdd3b6 Puzzle 1.3.3 - Better Splashscreen
- Only apply puzzle-splashscreen when needed (fixes #34, fixes #8)
2022-06-12 21:57:15 +02:00
Motschen
e8e563ad7b Fix crash due to broken MidnightLib version 2022-06-12 09:55:13 +02:00
Motschen
417cd3e2f8 Update to 1.19 2022-06-11 23:37:56 +02:00
Motschen
b95045e21a Puzzle 1.3.0 - Fix puzzle-splashscreen, update integrations 2022-06-06 15:11:51 +02:00
Motschen
fbbfe773a8 Puzzle 1.2.2 - Update ETF, New translations 2022-05-31 17:37:43 +02:00
Martin Prokoph
222f842386 Merge pull request #31 from Traben-0/1.18
Entity Texture Features V3.0 - patch
2022-05-30 16:49:39 +00:00
Martin Prokoph
f5aad84b90 Merge pull request #30 from Radplay/1.18
Add a polish translation
2022-05-30 16:46:27 +00:00
Martin Prokoph
2d9c069b79 Merge pull request #26 from Wudji/1.18
Create zh_cn.json
2022-05-30 16:45:54 +00:00
Martin Prokoph
06cb75d518 Merge pull request #28 from Guanran928/1.18
zh-cn and zh-tw translations
2022-05-30 16:44:17 +00:00
Martin Prokoph
9c775d8c06 Merge pull request #25 from Madis0/patch-1
Create et_ee.json
2022-05-30 16:43:30 +00:00
Traben
bcda47d94c ETF 3.0 update 2022-05-30 14:51:28 +10:00
Radplay
01bab4b885 Create pl_pl.json 2022-05-16 18:29:43 +02:00
Guanran928
b008d7b75e Create zh-tw.json 2022-04-23 02:41:05 +08:00
Guanran928
4a21d9eb91 Create zh-cn.json 2022-04-23 02:39:59 +08:00
Wudji
2332192301 Create zh_cn.json 2022-04-06 08:24:49 +08:00
Madis Otenurm
acefd614ec Create et_ee.json 2022-04-03 15:51:54 +03:00
Motschen
e55d62d9e9 Merge pull request #22 from RaptaG/patch-1
Create el_gr.json
2022-03-21 20:47:59 +01:00
RaptaG
488a12f417 Greek Translation 2022-03-21 18:35:42 +00:00
Motschen
d282d43f20 Puzzle 1.2.1 - Fix CITResewn 1.0.0+ 2022-03-18 14:49:57 +01:00
Motschen
fa52471ade Puzzle 1.2.0 - 1.18
Fix #18
Fix #17
Fix #13
Russian translations by @Felix14-v2
German translations by @2020Sanoj
2022-03-13 22:00:43 +01:00
Motschen
1ffe62f3af Merge pull request #11 from Felix14-v2/1.18
Added ru_ru.json
2022-03-13 21:17:23 +01:00
Felix14-v2
5cd113d060 Added ru_ru.json 2022-01-25 12:39:09 +01:00
Motschen
88d6b4f5c3 Puzzle 1.1.0 - Use IrisAPI, Deactivatable Integrations, Remove puzzle-blocks
- Use the new Iris API
- Builtin mod support is now configurable
- Puzzle button in Options screen can be disabled
- Remove puzzle-blocks (Already covered by Continuity)
- Fix #4
- Fix #5
- Fix #6
- Fix #7
2022-01-09 15:32:24 +01:00
130 changed files with 2722 additions and 2037 deletions

14
CHANGELOG.md Normal file
View File

@@ -0,0 +1,14 @@
## Puzzle v2.2.1
- Add support for 1.21.11 (Mounts of Mayhem)
- Fix crash when ModMenu is missing
- Fix 1.21.4 support by providing an extra build
- This is the first 1.21.4 build with working splashscreen logo blending!
- Load splashscreen textures earlier on NeoForge
- Update to MidnightLib 1.9.2
# Puzzle v2.2.0
- Setup a **multiversion** build environment
- Puzzle will now always be up-to-date on all relevant versions of Minecraft
(Fabric/Forge 1.20.1; Fabric/NeoForge 1.21.1, 1.21.5, 1.21.8, 1.21.10)
- Migrate to Mojang mappings in preparation for upcoming non-obfuscated releases
- Updated Entity Model/Texture Features compatibility

Binary file not shown.

View File

@@ -1,2 +1,4 @@
# Puzzle
Unites optifine replacement mods in a clean & vanilla-style gui
[![Download from Curseforge](https://cf.way2muchnoise.eu/full_563977_downloads%20on%20Curseforge.svg?badge_style=for_the_badge)](https://www.curseforge.com/minecraft/mc-mods/puzzle) [![Download from Modrinth](https://img.shields.io/modrinth/dt/puzzle?color=4&label=Download%20from%20Modrinth&style=for-the-badge)](https://modrinth.com/mod/puzzle)

View File

@@ -1,174 +0,0 @@
// Based on https://github.com/OnyxStudios/Cardinal-Components-API/blob/1.17/build.gradle
plugins {
id "fabric-loom" version "0.10-SNAPSHOT" apply false
id "com.matthewprenger.cursegradle" version "1.4.0"
id "maven-publish"
id "java-library"
}
group = "net.puzzlemc"
archivesBaseName = "puzzle"
subprojects {
apply plugin: 'fabric-loom'
apply plugin: 'com.matthewprenger.cursegradle'
apply plugin: 'maven-publish'
apply plugin: 'java-library'
archivesBaseName = project.name
group = "${rootProject.group}.${rootProject.archivesBaseName}"
}
allprojects {
apply plugin: "fabric-loom"
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
version = System.getenv("TRAVIS_TAG") ?: rootProject.mod_version
configurations {
dev
}
repositories {
maven { url 'https://jitpack.io' }
}
dependencies {
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
modApi "net.fabricmc:fabric-loader:${rootProject.loader_version}"
modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_version}"
}
processResources {
inputs.property "version", project.version
filesMatching("fabric.mod.json") {
expand "version": project.version
}
}
// 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).configureEach {
it.options.encoding = "UTF-8"
it.options.release = 17
}
java {
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this line, sources will not be generated.
withSourcesJar()
}
jar {
}
afterEvaluate {
artifacts {
dev file: file("${project.buildDir}/libs/$archivesBaseName-${version}-dev.jar"), type: "jar", builtBy: sourcesJar
}
}
}
subprojects {
version = rootProject.version
}
sourceSets {
testmod {
compileClasspath += main.compileClasspath
runtimeClasspath += main.runtimeClasspath
}
test {
compileClasspath += main.compileClasspath
runtimeClasspath += main.runtimeClasspath
}
}
subprojects.each { remapJar.dependsOn("${it.path}:remapJar") }
repositories {
maven {
name = "JitPack"
url = "https://jitpack.io"
}
maven {
name = "TerraformersMC"
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://api.modrinth.com/maven"
}
maven {
url "https://www.cursemaven.com"
content {
includeGroup "curse.maven"
}
}
maven {
name = 'JitPack'
url 'https://jitpack.io'
}
maven {
url "https://maven.shedaniel.me/"
}
}
dependencies {
modImplementation ("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}") {
exclude group: "net.fabricmc.fabric-api"
}
modImplementation ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
modImplementation ("maven.modrinth:lambdynamiclights:${project.ldl_version}")
modImplementation ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
modImplementation ("maven.modrinth:iris:${project.iris_version}")
modImplementation ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
modImplementation ("maven.modrinth:continuity:${project.continuity_version}")
modImplementation ("maven.modrinth:animatica:${project.animatica_version}")
modImplementation ("curse.maven:custom-entity-models-cem-477078:${project.cem_version}")
modImplementation "com.gitlab.Lortseam:completeconfig:${project.complete_config_version}"
modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
exclude group: 'com.google.code.gson'
exclude group: 'com.google.guava'
}
modImplementation "dev.lambdaurora:spruceui:${project.spruceui_version}"
modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
include "maven.modrinth:midnightlib:${project.midnightlib_version}"
subprojects.each {
api project(path: ":${it.name}", configuration: "dev")
include project(":${it.name}")
}
}
publishing {
publications {
mavenJava(MavenPublication) {
artifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar")) {
builtBy(remapJar)
}
pom.withXml {
subprojects.each {
depNode.appendNode("groupId", it.group)
depNode.appendNode("artifactId", it.name)
depNode.appendNode("version", it.version)
depNode.appendNode("scope", "compile")
}
}
}
}
}

304
build.gradle.kts Normal file
View File

@@ -0,0 +1,304 @@
plugins {
id("dev.architectury.loom")
id("architectury-plugin")
id("me.modmuss50.mod-publish-plugin")
id("com.github.johnrengelman.shadow")
`maven-publish`
}
val minecraft = stonecutter.current.version
val loader = loom.platform.get().name.lowercase()
version = "${mod.version}+$minecraft"
group = mod.group
base {
archivesName.set("${mod.id}-$loader")
}
repositories {
maven("https://maven.neoforged.net/releases/")
// ModMenu
maven("https://maven.terraformersmc.com/")
maven("https://maven.nucleoid.xyz/")
// MidnightLib
maven("https://maven.midnightdust.eu/releases/")
// Jigsaw modules
maven("https://api.modrinth.com/maven")
maven("https://maven.terraformersmc.com/releases")
maven("https://aperlambda.github.io/maven")
mavenCentral()
maven("https://maven.gegy.dev")
maven("https://www.cursemaven.com")
maven("https://jitpack.io")
maven("https://maven.shedaniel.me/")
maven("https://maven.quiltmc.org/repository/release/")
}
val mappingsAttribute = Attribute.of("net.minecraft.mappings", String::class.java)
dependencies {
attributesSchema {
attribute(mappingsAttribute)
}
minecraft("com.mojang:minecraft:$minecraft")
// Jigsaw modules (GUI compat mods)
modCompileOnlyApi ("maven.modrinth:cull-leaves:${mod.jigsaw("cull_leaves_version")}")
modCompileOnlyApi ("maven.modrinth:iris:${mod.jigsaw("iris_version")}")
modCompileOnly ("maven.modrinth:cit-resewn:${mod.jigsaw("cit_resewn_version")}")
modCompileOnlyApi ("maven.modrinth:continuity:${mod.jigsaw("continuity_version")}")
modCompileOnlyApi ("maven.modrinth:animatica:${mod.jigsaw("animatica_version")}")
modCompileOnlyApi ("maven.modrinth:colormatic:${mod.jigsaw("colormatic_version")}")
modCompileOnlyApi ("maven.modrinth:borderless-mining:${mod.jigsaw("borderless_mining_version")}")
modCompileOnlyApi ("maven.modrinth:dynamic-fps:${mod.jigsaw("dynamic_fps_version")}")
modCompileOnlyApi ("com.moandjiezana.toml:toml4j:${mod.jigsaw("toml4j_version")}")
modCompileOnlyApi ("maven.modrinth:entitytexturefeatures:${mod.jigsaw("etf_version")}")
modCompileOnlyApi ("maven.modrinth:entity-model-features:${mod.jigsaw("emf_version")}")
modCompileOnlyApi ("maven.modrinth:completeconfig:${mod.jigsaw("complete_config_version")}")
//modImplementation ("maven.modrinth:exordium:${project.exordium_version}")
modCompileOnlyApi ("maven.modrinth:lambdabettergrass:${mod.jigsaw("lbg_version")}")
modCompileOnlyApi ("dev.lambdaurora:spruceui:${mod.jigsaw("spruceui_version")}")
// Required for Lambda's mods (DO NOT DEPEND ON OTHERWISE)
modCompileOnly ("dev.yumi.mc.core:yumi-mc-foundation:1.0.0-alpha.15+1.21.1")
modCompileOnlyApi ("org.aperlambda:lambdajcommon:1.8.1") {
exclude(group = "com.google.code.gson")
exclude(group = "com.google.guava")
}
// MidnightLib
val midnightlib = if (mod.dep("midnightlib_version").contains("+")) "eu.midnightdust:midnightlib:${mod.dep("midnightlib_version")}"
else "eu.midnightdust:midnightlib:${mod.dep("midnightlib_version")}+${minecraft}-${loader}"
modImplementation(midnightlib) {
exclude(group = "net.fabricmc.fabric-api")
exclude(group = "com.terraformersmc")
}
include(midnightlib)
if (loader == "fabric") {
modImplementation("net.fabricmc:fabric-loader:${mod.dep("fabric_loader")}")
modImplementation("com.terraformersmc:modmenu:${mod.dep("modmenu_version")}")
// Fabric API is required to load modded resources
modImplementation("net.fabricmc.fabric-api:fabric-api:${mod.dep("fabric_version")}")
modCompileOnly ("dev.lambdaurora.lambdynamiclights:lambdynamiclights-api:${mod.jigsaw("ldl_version")}")
modCompileOnly ("dev.lambdaurora.lambdynamiclights:lambdynamiclights-runtime:${mod.jigsaw("ldl_version")}")
}
if (loader == "neoforge") {
"neoForge"("net.neoforged:neoforge:${mod.dep("neoforge_loader")}")
modCompileOnly ("dev.lambdaurora.lambdynamiclights:lambdynamiclights-api:${mod.jigsaw("ldl_version")}") {
attributes {
attribute(mappingsAttribute, "mojmap")
}
}
modCompileOnly ("dev.lambdaurora.lambdynamiclights:lambdynamiclights-runtime:${mod.jigsaw("ldl_version")}") {
attributes {
attribute(mappingsAttribute, "mojmap")
}
}
}
mappings (loom.officialMojangMappings())
}
loom {
accessWidenerPath = rootProject.file("src/main/resources/puzzle-models.accesswidener")
decompilers {
get("vineflower").apply { // Adds names to lambdas - useful for mixins
options.put("mark-corresponding-synthetics", "1")
}
}
if (loader == "forge") {
forge.mixinConfigs("puzzle.mixins.json")
}
}
publishMods {
val modrinthToken = System.getenv("MODRINTH_TOKEN")
val curseforgeToken = System.getenv("CURSEFORGE_TOKEN")
val githubToken = System.getenv("GITHUB_TOKEN").orEmpty()
file = project.tasks.remapJar.get().archiveFile
dryRun = modrinthToken == null || curseforgeToken == null
displayName = "${mod.name} ${mod.version} - ${loader.replaceFirstChar { it.uppercase() }} ${property("mod.mc_title")}"
version = "${mod.version}+${property("mod.mc_title")}-${loader}"
changelog = rootProject.file("CHANGELOG.md").readText()
type = STABLE
modLoaders.add(loader)
if (loader == "fabric") {
modLoaders.add("quilt")
}
val targets = property("mod.mc_targets").toString().split(' ')
modrinth {
projectId = property("publish.modrinth").toString()
accessToken = modrinthToken
targets.forEach(minecraftVersions::add)
requires("midnightlib")
if (loader == "fabric") {
requires("fabric-api")
}
}
curseforge {
projectId = property("publish.curseforge").toString()
accessToken = curseforgeToken.toString()
targets.forEach(minecraftVersions::add)
requires("midnightlib")
if (loader == "fabric") {
requires("fabric-api")
}
}
// github {
// accessToken = githubToken
// repository = "TeamMidnightDust/MidnightLib"
// commitish = "multiversion" // This is the branch the release tag will be created from
//
// tagName = "v" + properties["mod.version"]
//
// // Allow the release to be initially created without any files.
// allowEmptyFiles = true
// }
}
publishing {
repositories {
maven {
name = "MidnightDust"
url = uri("https://maven.midnightdust.eu/releases")
credentials(PasswordCredentials::class)
}
}
publications {
create<MavenPublication>("mavenJava") {
pom {
groupId = "eu.midnightdust"
artifactId = project.mod.id
version = "${project.version}-${loader}"
from(components["java"])
}
}
}
}
java {
withSourcesJar()
val java = if (stonecutter.eval(minecraft, ">=1.20.5")) JavaVersion.VERSION_21 else JavaVersion.VERSION_17
targetCompatibility = java
sourceCompatibility = java
}
val shadowBundle: Configuration by configurations.creating {
isCanBeConsumed = false
isCanBeResolved = true
}
tasks.shadowJar {
configurations = listOf(shadowBundle)
archiveClassifier = "dev-shadow"
}
tasks.remapJar {
injectAccessWidener = true
input = tasks.shadowJar.get().archiveFile
archiveClassifier = null
dependsOn(tasks.shadowJar)
}
tasks.jar {
archiveClassifier = "dev"
}
val buildAndCollect = tasks.register<Copy>("buildAndCollect") {
group = "build"
from(tasks.remapJar.get().archiveFile, tasks.remapSourcesJar.get().archiveFile)
into(rootProject.layout.buildDirectory.file("libs/${mod.version}/$loader"))
dependsOn("build")
}
if (stonecutter.current.isActive) {
rootProject.tasks.register("buildActive") {
group = "project"
dependsOn(buildAndCollect)
}
rootProject.tasks.register("runActive") {
group = "project"
dependsOn(tasks.named("runClient"))
}
}
tasks.processResources {
properties(
listOf("fabric.mod.json"),
"id" to mod.id,
"name" to mod.name,
"version" to mod.version,
"minecraft" to mod.prop("mc_dep_fabric")
)
properties(
listOf("META-INF/mods.toml", "pack.mcmeta"),
"id" to mod.id,
"name" to mod.name,
"version" to mod.version,
"minecraft" to mod.prop("mc_dep_forgelike")
)
properties(
listOf("META-INF/neoforge.mods.toml", "pack.mcmeta"),
"id" to mod.id,
"name" to mod.name,
"version" to mod.version,
"minecraft" to mod.prop("mc_dep_forgelike")
)
}
tasks.build {
group = "versioned"
description = "Must run through 'chiseledBuild'"
}
stonecutter {
constants {
arrayOf("fabric", "neoforge").forEach { it -> put(it, loader == it) }
}
replacements.string {
direction = eval(current.version, ">=1.21.8")
replace("context.renderComponentTooltip(", "context.setComponentTooltipForNextFrame(")
}
replacements.string {
direction = eval(current.version, ">=1.21.4")
replace("getTextureImage", "loadContents")
}
replacements.string {
direction = eval(current.version, ">=1.21.4")
replace("TextureImage", "TextureContents")
}
replacements.string {
direction = eval(current.version, ">=1.21.4")
replace("SimpleTexture", "ReloadableTexture")
}
replacements.string {
direction = eval(current.version, ">=1.21.11")
replace("ResourceLocation", "Identifier")
}
replacements.string {
direction = eval(current.version, ">=1.21")
replace("new ResourceLocation", "ResourceLocation.fromNamespaceAndPath")
}
replacements.string {
direction = eval(current.version, ">=1.21.11")
replace("net.minecraft.Util", "net.minecraft.util.Util")
}
}

View File

@@ -0,0 +1,8 @@
plugins {
`kotlin-dsl`
kotlin("jvm") version "2.0.20"
}
repositories {
mavenCentral()
}

View File

@@ -0,0 +1,34 @@
import org.gradle.api.Project
import org.gradle.api.artifacts.dsl.RepositoryHandler
import org.gradle.kotlin.dsl.expand
import org.gradle.kotlin.dsl.maven
import org.gradle.language.jvm.tasks.ProcessResources
import java.util.*
val Project.mod: ModData get() = ModData(this)
fun Project.prop(key: String): String? = findProperty(key)?.toString()
fun String.upperCaseFirst() = replaceFirstChar { if (it.isLowerCase()) it.uppercaseChar() else it }
fun RepositoryHandler.strictMaven(url: String, alias: String, vararg groups: String) = exclusiveContent {
forRepository { maven(url) { name = alias } }
filter { groups.forEach(::includeGroup) }
}
fun ProcessResources.properties(files: Iterable<String>, vararg properties: Pair<String, Any>) {
for ((name, value) in properties) inputs.property(name, value)
filesMatching(files) {
expand(properties.toMap())
}
}
@JvmInline
value class ModData(private val project: Project) {
val id: String get() = requireNotNull(project.prop("mod.id")) { "Missing 'mod.id'" }
val name: String get() = requireNotNull(project.prop("mod.name")) { "Missing 'mod.name'" }
val version: String get() = requireNotNull(project.prop("mod.version")) { "Missing 'mod.version'" }
val group: String get() = requireNotNull(project.prop("mod.group")) { "Missing 'mod.group'" }
fun prop(key: String) = requireNotNull(project.prop("mod.$key")) { "Missing 'mod.$key'" }
fun dep(key: String) = requireNotNull(project.prop("deps.$key")) { "Missing 'deps.$key'" }
fun jigsaw(key: String) = requireNotNull(project.prop("jigsaws.$key")) { "Missing 'jigsaws.$key'" }
}

76
gradle.properties Executable file → Normal file
View File

@@ -1,30 +1,56 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G
org.gradle.jvmargs=-Xmx3G
#org.gradle.parallel=true
org.gradle.caching=false
org.gradle.caching.debug=false
org.gradle.parallel=false
#org.gradle.configureondemand=true
# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.18.1
yarn_mappings=1.18.1+build.14
loader_version=0.12.12
# Mod properties
mod.version=2.2.1
mod.group=eu.midnightdust
mod.id=puzzle
mod.name=Puzzle
# Mod Properties
mod_version = 1.0.0
maven_group = net.puzzlemc
archives_base_name = puzzle
# Used for the mod metadata
mod.mc_dep_fabric=[VERSIONED]
mod.mc_dep_forgelike=[VERSIONED]
# Used for the release title. I.e. '1.20.x'
mod.mc_title=[VERSIONED]
# Space separated versions for publishing. I.e. '1.20, 1.20.1'
mod.mc_targets=[VERSIONED]
# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.45.0+1.18
mod_menu_version = 2.0.13
# Mod setup
deps.fabric_loader=0.17.3
deps.fabric_version=[VERSIONED]
cull_leaves_version = 2.3.2
ldl_version = 2.1.0+1.17
lbg_version = 1.2.2+1.17
iris_version = mc1.18.1-1.1.3
continuity_version = 1.0.3+1.18
animatica_version = 0.2+1.18
cit_resewn_version = 0.8.1-1.18
cem_version = 3561474
complete_config_version = 1.0.0
spruceui_version=3.3.2+1.17
midnightlib_version=0.3.1
deps.forge_loader=[VERSIONED]
deps.neoforge_loader=[VERSIONED]
deps.neoforge_patch=[VERSIONED]
# Mod dependencies
deps.yarn_build=[VERSIONED]
deps.modmenu_version=[VERSIONED]
deps.midnightlib_version=1.9.2
# Mod integrations
jigsaws.cull_leaves_version = 3.0.2-fabric
jigsaws.ldl_version = 4.8.6+1.21.10
jigsaws.lbg_version = 2.5.0+1.21.9
jigsaws.iris_version = 1.9.6+1.21.10-fabric
jigsaws.continuity_version = 3.0.0-beta.5+1.21
jigsaws.animatica_version = 0.6.1+1.21
jigsaws.colormatic_version = 3.1.2
jigsaws.borderless_mining_version = 1.1.8+1.20.1
jigsaws.dynamic_fps_version = 3.6.3
jigsaws.toml4j_version = 0.7.2
jigsaws.cit_resewn_version = 1.1.3+1.20
jigsaws.complete_config_version = 2.3.0
jigsaws.spruceui_version=5.0.0+1.20
jigsaws.emf_version=[VERSIONED]
jigsaws.etf_version=[VERSIONED]
jigsaws.exordium_version=1.2.1-1.20.2
# Publishing
publish.modrinth=3IuO68q1
publish.curseforge=563977

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View File

@@ -1,3 +0,0 @@
archivesBaseName = "puzzle-base"
dependencies {
}

View File

@@ -1,23 +0,0 @@
package net.puzzlemc.core;
import net.fabricmc.loader.api.FabricLoader;
import net.puzzlemc.core.config.PuzzleConfig;
import net.puzzlemc.core.util.UpdateChecker;
import net.fabricmc.api.ClientModInitializer;
public class PuzzleCore implements ClientModInitializer {
public final static String version = "Puzzle "+ FabricLoader.getInstance().getModContainer("puzzle").get().getMetadata().getVersion();
public final static String name = "Puzzle";
public final static String id = "puzzle";
public final static String website = "https://github.com/PuzzleMC/Puzzle";
public static String updateURL = "https://modrinth.com/mod/puzzle";
public final static String UPDATE_CHECKER_URL = "https://raw.githubusercontent.com/PuzzleMC/Puzzle-Versions/main/puzzle_versions.json";
@Override
public void onInitializeClient() {
PuzzleConfig.init(id, PuzzleConfig.class);
if (PuzzleConfig.checkUpdates) UpdateChecker.init();
}
}

View File

@@ -1,69 +0,0 @@
package net.puzzlemc.core.config;
import com.google.gson.ExclusionStrategy;
import com.google.gson.FieldAttributes;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import net.fabricmc.loader.api.FabricLoader;
import java.lang.annotation.*;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;
// MidnightConfigLite v0.2.0
// Just writing and parsing of config files
/** Based on https://github.com/Minenash/TinyConfig
* Credits to Minenash */
public class MidnightConfigLite {
protected static class EntryInfo {
Object defaultValue;
}
public static final Map<String,Class<?>> configClass = new HashMap<>();
private static Path path;
private static final Gson gson = new GsonBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE).addSerializationExclusionStrategy(new HiddenAnnotationExclusionStrategy()).setPrettyPrinting().create();
public static void init(String modid, Class<?> config) {
path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
configClass.put(modid, config);
for (Field field : config.getFields()) {
EntryInfo info = new EntryInfo();
if (field.isAnnotationPresent(Entry.class))
try {
info.defaultValue = field.get(null);
} catch (IllegalAccessException ignored) {}
}
try { gson.fromJson(Files.newBufferedReader(path), config); }
catch (Exception e) { write(modid); }
}
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).getDeclaredConstructor().newInstance()).getBytes());
} catch (Exception e) {
e.printStackTrace();
}
}
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
public @interface Entry {
}
public static class HiddenAnnotationExclusionStrategy implements ExclusionStrategy {
public boolean shouldSkipClass(Class<?> clazz) { return false; }
public boolean shouldSkipField(FieldAttributes fieldAttributes) {
return fieldAttributes.getAnnotation(Entry.class) == null;
}
}
}

View File

@@ -1,18 +0,0 @@
package net.puzzlemc.core.config;
public class PuzzleConfig extends MidnightConfigLite {
@Entry public static boolean debugMessages = false;
@Entry public static boolean checkUpdates = true;
@Entry public static boolean showPuzzleInfo = true;
@Entry public static boolean resourcepackSplashScreen = true;
@Entry public static boolean disableSplashScreenBlend = false;
@Entry public static boolean emissiveTextures = true;
@Entry public static boolean customRenderLayers = true;
@Entry public static boolean unlimitedRotations = true;
@Entry public static boolean biggerModels = true;
@Entry public static int backgroundColor = 15675965;
@Entry public static int progressBarColor = 16777215;
@Entry public static int progressFrameColor = 16777215;
}

View File

@@ -1,38 +0,0 @@
package net.puzzlemc.core.mixin;
import com.mojang.blaze3d.platform.GlDebugInfo;
import net.puzzlemc.core.PuzzleCore;
import net.puzzlemc.core.config.PuzzleConfig;
import net.puzzlemc.core.util.UpdateChecker;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.hud.DebugHud;
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.CallbackInfoReturnable;
import java.util.List;
@Mixin(DebugHud.class)
public abstract class MixinDebugHud extends DrawableHelper {
@Inject(at = @At("RETURN"), method = "getRightText", cancellable = true)
private void puzzle$getRightText(CallbackInfoReturnable<List<String>> cir) {
if (PuzzleConfig.showPuzzleInfo) {
List<String> entries = cir.getReturnValue();
String message;
if (UpdateChecker.isUpToDate) {
message = "Puzzle is up to date (" + PuzzleCore.version + ")";
} else {
message = "Puzzle is outdated (" + PuzzleCore.version + " -> " + UpdateChecker.latestVersion + ")";
}
for (int i = 0; i < entries.size(); i++) {
String str = entries.get(i);
if (str.startsWith(GlDebugInfo.getVersion())) {
entries.add(i + 1, message);
break;
}
}
}
}
}

View File

@@ -1,75 +0,0 @@
package net.puzzlemc.core.mixin;
import net.puzzlemc.core.PuzzleCore;
import net.puzzlemc.core.config.PuzzleConfig;
import net.puzzlemc.core.util.UpdateChecker;
import net.minecraft.client.gui.screen.*;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
import net.minecraft.util.Util;
import net.minecraft.util.math.MathHelper;
import org.spongepowered.asm.mixin.Final;
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.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.Objects;
@Mixin(TitleScreen.class)
public abstract class MixinTitleScreen extends Screen {
@Shadow @Final private boolean doBackgroundFade;
@Shadow private long backgroundFadeStart;
private Text puzzleText;
private int puzzleTextWidth;
protected MixinTitleScreen(Text title) {
super(title);
}
@Inject(at = @At("TAIL"), method = "init")
private void puzzle$init(CallbackInfo ci) {
if (UpdateChecker.isUpToDate) {
puzzleText = Text.of(PuzzleCore.version);
}
else {
puzzleText = new TranslatableText("").append(Text.of(PuzzleCore.version + " | ")).append(new TranslatableText("puzzle.text.update_available"));
this.puzzleTextWidth = this.textRenderer.getWidth(puzzleText);
}
}
@Inject(at = @At("TAIL"), method = "render")
private void puzzle$render(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
if (PuzzleConfig.showPuzzleInfo) {
float f = this.doBackgroundFade ? (float) (Util.getMeasuringTimeMs() - this.backgroundFadeStart) / 1000.0F : 1.0F;
float g = this.doBackgroundFade ? MathHelper.clamp(f - 1.0F, 0.0F, 1.0F) : 1.0F;
int l = MathHelper.ceil(g * 255.0F) << 24;
textRenderer.drawWithShadow(matrices, puzzleText,2,this.height - 20, 16777215 | l);
if (mouseX > 2 && mouseX < 2 + this.puzzleTextWidth && mouseY > this.height - 20 && mouseY < this.height - 10) {
fill(matrices, 2, this.height - 11, 2 + this.puzzleTextWidth, this.height-10, 16777215 | l);
}
}
}
private void confirmLink(boolean open) {
if (open) {
Util.getOperatingSystem().open(PuzzleCore.updateURL);
}
Objects.requireNonNull(this.client).setScreen(this);
}
@Inject(at = @At("HEAD"), method = "mouseClicked",cancellable = true)
private void puzzle$mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> cir) {
if (mouseX > 2 && mouseX < (double)(2 + this.puzzleTextWidth) && mouseY > (double)(this.height - 20) && mouseY < (double)this.height-10) {
if (Objects.requireNonNull(this.client).options.chatLinksPrompt) {
this.client.setScreen(new ConfirmChatLinkScreen(this::confirmLink, PuzzleCore.updateURL, true));
} else {
Util.getOperatingSystem().open(PuzzleCore.updateURL);
}
cir.setReturnValue(false);
}
}
}

View File

@@ -1,17 +0,0 @@
package net.puzzlemc.core.util;
import java.awt.*;
public class ColorUtil {
/**
* @credit https://stackoverflow.com/questions/4129666/how-to-convert-hex-to-rgb-using-java
* @param colorStr e.g. "FFFFFF"
* @return
*/
public static Color hex2Rgb(String colorStr) {
return new Color(
Integer.valueOf( colorStr.substring( 0, 2 ), 16 ),
Integer.valueOf( colorStr.substring( 2, 4 ), 16 ),
Integer.valueOf( colorStr.substring( 4, 6 ), 16 ));
}
}

View File

@@ -1,55 +0,0 @@
package net.puzzlemc.core.util;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import net.puzzlemc.core.PuzzleCore;
import net.minecraft.client.MinecraftClient;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.lang.reflect.Type;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.*;
import java.util.concurrent.CompletableFuture;
public class UpdateChecker {
private static final Gson GSON = new Gson();
private static final String minecraftVersion = MinecraftClient.getInstance().getGame().getVersion().getId();
public static final Logger logger = LogManager.getLogger(PuzzleCore.name);
public static final Type UPDATE_TYPE_TOKEN = new TypeToken<Map<String, String>>(){}.getType();
public static String latestVersion;
public static boolean isUpToDate = true;
public static void init() {
CompletableFuture.supplyAsync(() -> {
try (Reader reader = new InputStreamReader(new URL(PuzzleCore.UPDATE_CHECKER_URL).openStream())) {
return GSON.<Map<String, String>>fromJson(reader, UPDATE_TYPE_TOKEN);
} catch (MalformedURLException error) {
logger.log(Level.ERROR, "Unable to check for updates because of connection problems: " + error.getMessage());
} catch (IOException error) {
logger.log(Level.ERROR, "Unable to check for updates because of an I/O Exception: " + error.getMessage());
}
return null;
}).thenAcceptAsync(versionMap -> {
if (versionMap != null && versionMap.containsKey(minecraftVersion)) {
latestVersion = versionMap.get(minecraftVersion);
if (!latestVersion.equals(PuzzleCore.version)) {
isUpToDate = false;
PuzzleCore.updateURL = PuzzleCore.website + "download/" + latestVersion.replace(PuzzleCore.name + " ","");
logger.log(Level.INFO, "There is a newer version of "+ PuzzleCore.name +" available: " + latestVersion);
logger.log(Level.INFO, "Please update immediately!");
}
} else {
logger.log(Level.WARN, "A problem with the database occurred, could not check for updates.");
}
}, MinecraftClient.getInstance());
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -1,40 +0,0 @@
{
"schemaVersion": 1,
"id": "puzzle-base",
"version": "${version}",
"name": "Puzzle Base",
"description": "Shared code between all Puzzle modules",
"authors": [
"PuzzleMC",
"Motschen"
],
"contact": {
"homepage": "https://www.midnightdust.eu/",
"sources": "https://github.com/TeamMidnightDust/Puzzle",
"issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
},
"license": "MIT",
"icon": "assets/puzzle/icon.png",
"environment": "client",
"entrypoints": {
"client": [
"net.puzzlemc.core.PuzzleCore"
]
},
"custom": {
"modmenu": {
"parent": "puzzle"
}
},
"mixins": [
"puzzle-base.mixins.json"
],
"depends": {
"fabric": "*"
}
}

View File

@@ -1,12 +0,0 @@
{
"required": true,
"package": "net.puzzlemc.core.mixin",
"compatibilityLevel": "JAVA_17",
"client": [
"MixinTitleScreen",
"MixinDebugHud"
],
"injectors": {
"defaultRequire": 1
}
}

View File

@@ -1,4 +0,0 @@
archivesBaseName = "puzzle-blocks"
dependencies {
api project(":puzzle-base")
}

View File

@@ -1,87 +0,0 @@
package net.puzzlemc.blocks;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
import net.fabricmc.fabric.impl.blockrenderlayer.BlockRenderLayerMapImpl;
import net.minecraft.block.Block;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.resource.ResourceManager;
import net.minecraft.resource.ResourceType;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import net.puzzlemc.core.config.PuzzleConfig;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.InputStream;
import java.util.Arrays;
import java.util.Properties;
public class PuzzleBlocks implements ClientModInitializer {
Logger LOGGER = LogManager.getLogger("puzzle-blocks");
public void onInitializeClient() {
ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
@Override
public Identifier getFabricId() {
return new Identifier("puzzle", "blocks");
}
@Override
public void reload(ResourceManager manager) {
if (PuzzleConfig.customRenderLayers) {
for (Identifier id : manager.findResources("optifine", path -> path.contains("block.properties"))) {
try (InputStream stream = manager.getResource(id).getInputStream()) {
Properties properties = new Properties();
properties.load(stream);
if (properties.get("layer.solid") != null) {
String[] solid_blocks = properties.get("layer.solid").toString().split(" ");
Arrays.stream(solid_blocks).iterator().forEachRemaining(string -> {
if (PuzzleConfig.debugMessages) LOGGER.info(string + " -> solid");
Block block = Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).get();
if (Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).isPresent()) {
BlockRenderLayerMapImpl.INSTANCE.putBlock(block, RenderLayer.getSolid());
}
});
}
if (properties.get("layer.cutout") != null) {
String[] solid_blocks = properties.get("layer.cutout").toString().split(" ");
Arrays.stream(solid_blocks).iterator().forEachRemaining(string -> {
if (PuzzleConfig.debugMessages) LOGGER.info(string + " -> cutout");
Block block = Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).get();
if (Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).isPresent()) {
BlockRenderLayerMapImpl.INSTANCE.putBlock(block, RenderLayer.getCutout());
}
});
}
if (properties.get("layer.cutout_mipped") != null) {
String[] solid_blocks = properties.get("layer.cutout_mipped").toString().split(" ");
Arrays.stream(solid_blocks).iterator().forEachRemaining(string -> {
if (PuzzleConfig.debugMessages) LOGGER.info(string + " -> cutout_mipped");
Block block = Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).get();
if (Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).isPresent()) {
BlockRenderLayerMapImpl.INSTANCE.putBlock(block, RenderLayer.getCutoutMipped());
}
});
}
if (properties.get("layer.translucent") != null) {
String[] solid_blocks = properties.get("layer.translucent").toString().split(" ");
Arrays.stream(solid_blocks).iterator().forEachRemaining(string -> {
if (PuzzleConfig.debugMessages) LOGGER.info(string + " -> translucent");
Block block = Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).get();
if (Registry.BLOCK.getOrEmpty(Identifier.tryParse(string)).isPresent()) {
BlockRenderLayerMapImpl.INSTANCE.putBlock(block, RenderLayer.getTranslucent());
}
});
}
} catch (Exception e) {
LogManager.getLogger("Puzzle").error("Error occurred while loading block.properties " + id.toString(), e);
}
}
}
}
});
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -1,36 +0,0 @@
{
"schemaVersion": 1,
"id": "puzzle-blocks",
"version": "${version}",
"name": "Puzzle Blocks",
"description": "Lets resourcepacks change render layers of blocks",
"authors": [
"PuzzleMC",
"Motschen"
],
"contact": {
"homepage": "https://www.midnightdust.eu/",
"sources": "https://github.com/TeamMidnightDust/Puzzle",
"issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
},
"license": "MIT",
"icon": "assets/puzzle/icon.png",
"environment": "client",
"entrypoints": {
"client": [
"net.puzzlemc.blocks.PuzzleBlocks"
]
},
"custom": {
"modmenu": {
"parent": "puzzle"
}
},
"depends": {
"fabric": "*"
}
}

View File

@@ -1,5 +0,0 @@
archivesBaseName = "puzzle-emissives"
dependencies {
api project(":puzzle-base")
}

View File

@@ -1,60 +0,0 @@
package net.puzzlemc.emissives;
import net.fabricmc.api.ClientModInitializer;
import net.puzzlemc.core.config.PuzzleConfig;
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 org.apache.logging.log4j.LogManager;
import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
public class PuzzleEmissiveTextures implements ClientModInitializer {
public static final Map<Identifier, Identifier> emissiveTextures = new HashMap<>();
public void onInitializeClient() {
ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
@Override
public Identifier getFabricId() {
return new Identifier("puzzle", "emissive_textures");
}
@Override
public void reload(ResourceManager manager) {
if (PuzzleConfig.emissiveTextures) {
String suffix = "_e";
for (Identifier id : manager.findResources("optifine", path -> path.contains("emissive.properties"))) {
try (InputStream stream = manager.getResource(id).getInputStream()) {
Properties properties = new Properties();
properties.load(stream);
if (properties.get("suffix.emissive") != null) {
suffix = properties.get("suffix.emissive").toString();
}
} catch (Exception e) {
LogManager.getLogger("Puzzle").error("Error occurred while loading emissive.properties " + id.toString(), e);
}
String finalSuffix = suffix;
for (Identifier emissiveId : manager.findResources("textures", path -> path.endsWith(finalSuffix + ".png"))) {
try {
String normalTexture = emissiveId.toString();
normalTexture = normalTexture.substring(0, normalTexture.lastIndexOf(finalSuffix));
Identifier normalId = Identifier.tryParse(normalTexture + ".png");
emissiveTextures.put(normalId, emissiveId);
if (PuzzleConfig.debugMessages) LogManager.getLogger("Puzzle").info(normalId + " " + emissiveId);
} catch (Exception e) {
LogManager.getLogger("Puzzle").error("Error occurred while loading emissive texture " + emissiveId.toString(), e);
}
}
}
}
}
});
}
}

View File

@@ -1,39 +0,0 @@
package net.puzzlemc.emissives.mixin;
import net.minecraft.client.render.OverlayTexture;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.entity.*;
import net.minecraft.client.render.entity.feature.FeatureRendererContext;
import net.minecraft.client.render.entity.model.EntityModel;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.LivingEntity;
import net.puzzlemc.core.config.PuzzleConfig;
import net.puzzlemc.emissives.PuzzleEmissiveTextures;
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.CallbackInfo;
@Mixin(value = LivingEntityRenderer.class)
public abstract class MixinLivingEntityRenderer<T extends LivingEntity, M extends EntityModel<T>> extends EntityRenderer<T> implements FeatureRendererContext<T, M> {
@Shadow public abstract M getModel();
protected MixinLivingEntityRenderer(EntityRendererFactory.Context ctx) {
super(ctx);
}
@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/model/EntityModel;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumer;IIFFFF)V", shift = At.Shift.AFTER), method = "render*")
private void onRender(T entity, float yaw, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) {
if (PuzzleConfig.emissiveTextures && PuzzleEmissiveTextures.emissiveTextures.containsKey(this.getTexture(entity))) {
VertexConsumer vertexConsumer = vertexConsumers.getBuffer(RenderLayer.getBeaconBeam(PuzzleEmissiveTextures.emissiveTextures.get(this.getTexture(entity)),true));
matrices.scale(1.015f,1.015f,1.015f);
this.getModel().render(matrices, vertexConsumer, 15728640, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F);
matrices.scale(1f,1f,1f);
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -1,40 +0,0 @@
{
"schemaVersion": 1,
"id": "puzzle-emissives",
"version": "${version}",
"name": "Puzzle Emissive Textures",
"description": "Displays emissive textures on blocks and entities",
"authors": [
"PuzzleMC",
"Motschen"
],
"contact": {
"homepage": "https://www.midnightdust.eu/",
"sources": "https://github.com/TeamMidnightDust/Puzzle",
"issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
},
"license": "MIT",
"icon": "assets/puzzle/icon.png",
"environment": "client",
"entrypoints": {
"client": [
"net.puzzlemc.emissives.PuzzleEmissiveTextures"
]
},
"custom": {
"modmenu": {
"parent": "puzzle"
}
},
"mixins": [
"puzzle-emissives.mixins.json"
],
"depends": {
"fabric": "*"
}
}

View File

@@ -1,55 +0,0 @@
archivesBaseName = "puzzle-gui"
repositories {
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://api.modrinth.com/maven"
}
maven {
url "https://www.cursemaven.com"
content {
includeGroup "curse.maven"
}
}
maven {
name = 'JitPack'
url 'https://jitpack.io'
}
maven {
url "https://maven.shedaniel.me/"
}
}
dependencies {
api project(":puzzle-base")
api project(":puzzle-splashscreen")
modImplementation "dev.lambdaurora:spruceui:${project.spruceui_version}"
modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}"
modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}")
modImplementation ("maven.modrinth:cull-leaves:${project.cull_leaves_version}")
modImplementation ("maven.modrinth:lambdynamiclights:${project.ldl_version}")
modImplementation ("maven.modrinth:lambdabettergrass:${project.lbg_version}")
modImplementation ("maven.modrinth:iris:${project.iris_version}")
modImplementation ("maven.modrinth:cit-resewn:${project.cit_resewn_version}")
modImplementation ("curse.maven:custom-entity-models-cem-477078:${project.cem_version}")
modImplementation "com.gitlab.Lortseam:completeconfig:${project.complete_config_version}"
modImplementation("org.aperlambda:lambdajcommon:1.8.1") {
exclude group: 'com.google.code.gson'
exclude group: 'com.google.guava'
}
modImplementation ("maven.modrinth:continuity:${project.continuity_version}") {
exclude module: "modmenu"
}
}

View File

@@ -1,42 +0,0 @@
package net.puzzlemc.gui;
import net.coderbot.iris.Iris;
import net.coderbot.iris.config.IrisConfig;
import net.coderbot.iris.gui.screen.ShaderPackScreen;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.MinecraftClient;
import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
import java.io.IOException;
public class IrisCompat {
public static void init() {
if (FabricLoader.getInstance().isModLoaded("iris")) {
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("Iris")));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("Enable Shaders"), (button) -> button.setMessage(Iris.getIrisConfig().areShadersEnabled() ? PuzzleClient.YES : PuzzleClient.NO), (button) -> {
IrisConfig irisConfig = Iris.getIrisConfig();
irisConfig.setShadersEnabled(!irisConfig.areShadersEnabled());
try {
Iris.getIrisConfig().save();
} catch (IOException e) {
Iris.logger.error("Error saving configuration file!");
Iris.logger.catching(e);
}
try {
Iris.reload();
} catch (IOException e) {
Iris.logger.error("Error reloading shader pack while applying changes!");
Iris.logger.catching(e);
}
}));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("options.iris.shaderPackSelection.title"), (button) -> button.setMessage(Text.of("OPEN")), (button) -> {
MinecraftClient client = MinecraftClient.getInstance();
ShaderPackScreen shaderPackPage = new ShaderPackScreen(client.currentScreen);
client.setScreen(shaderPackPage);
}));
}
}
}

View File

@@ -1,198 +0,0 @@
package net.puzzlemc.gui;
import dev.lambdaurora.lambdabettergrass.LBGConfig;
import dev.lambdaurora.lambdabettergrass.LambdaBetterGrass;
import dev.lambdaurora.lambdynlights.DynamicLightsConfig;
import dev.lambdaurora.lambdynlights.LambDynLights;
import eu.midnightdust.cullleaves.config.CullLeavesConfig;
import me.pepperbell.continuity.client.config.ContinuityConfig;
import net.dorianpb.cem.internal.config.CemConfig;
import net.dorianpb.cem.internal.config.CemConfigFairy;
import net.dorianpb.cem.internal.config.CemOptions;
import net.puzzlemc.core.config.PuzzleConfig;
import net.puzzlemc.gui.mixin.CemConfigAccessor;
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.MinecraftClient;
import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
import net.minecraft.util.Formatting;
import net.puzzlemc.splashscreen.PuzzleSplashScreen;
import shcm.shsupercm.fabric.citresewn.CITResewn;
import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
public class PuzzleClient implements ClientModInitializer {
public final static String id = "puzzle";
public static final Text YES = new TranslatableText("gui.yes").formatted(Formatting.GREEN);
public static final Text NO = new TranslatableText("gui.no").formatted(Formatting.RED);
@Override
public void onInitializeClient() {
PuzzleApi.addToMiscOptions(new PuzzleWidget(Text.of("Puzzle")));
PuzzleApi.addToMiscOptions(new PuzzleWidget(new TranslatableText("puzzle.option.check_for_updates"), (button) -> button.setMessage(PuzzleConfig.checkUpdates ? YES : NO), (button) -> {
PuzzleConfig.checkUpdates = !PuzzleConfig.checkUpdates;
PuzzleConfig.write(id);
}));
PuzzleApi.addToMiscOptions(new PuzzleWidget(new TranslatableText("puzzle.option.show_version_info"), (button) -> button.setMessage(PuzzleConfig.showPuzzleInfo ? YES : NO), (button) -> {
PuzzleConfig.showPuzzleInfo = !PuzzleConfig.showPuzzleInfo;
PuzzleConfig.write(id);
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Puzzle")));
if (FabricLoader.getInstance().isModLoaded("puzzle-splashscreen")) {
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.resourcepack_splash_screen"), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> {
PuzzleConfig.resourcepackSplashScreen = !PuzzleConfig.resourcepackSplashScreen;
PuzzleConfig.write(id);
PuzzleSplashScreen.resetColors();
MinecraftClient.getInstance().getTextureManager().registerTexture(PuzzleSplashScreen.LOGO, new PuzzleSplashScreen.LogoTexture());
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.disable_splash_screen_blend"), (button) -> button.setMessage(PuzzleConfig.disableSplashScreenBlend ? YES : NO), (button) -> {
PuzzleConfig.disableSplashScreenBlend = !PuzzleConfig.disableSplashScreenBlend;
PuzzleConfig.write(id);
}));
}
if (FabricLoader.getInstance().isModLoaded("puzzle-emissives")) {
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.emissive_textures"), (button) -> button.setMessage(PuzzleConfig.emissiveTextures ? YES : NO), (button) -> {
PuzzleConfig.emissiveTextures = !PuzzleConfig.emissiveTextures;
PuzzleConfig.write(id);
}));
}
if (FabricLoader.getInstance().isModLoaded("puzzle-models")) {
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.unlimited_model_rotations"), (button) -> button.setMessage(PuzzleConfig.unlimitedRotations ? YES : NO), (button) -> {
PuzzleConfig.unlimitedRotations = !PuzzleConfig.unlimitedRotations;
PuzzleConfig.write(id);
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.bigger_custom_models"), (button) -> button.setMessage(PuzzleConfig.biggerModels ? YES : NO), (button) -> {
PuzzleConfig.biggerModels = !PuzzleConfig.biggerModels;
PuzzleConfig.write(id);
}));
}
if (FabricLoader.getInstance().isModLoaded("puzzle-blocks")) {
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("puzzle.option.render_layer_overrides"), (button) -> button.setMessage(PuzzleConfig.customRenderLayers ? YES : NO), (button) -> {
PuzzleConfig.customRenderLayers = !PuzzleConfig.customRenderLayers;
PuzzleConfig.write(id);
}));
}
if (FabricLoader.getInstance().isModLoaded("cullleaves")) {
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("CullLeaves")));
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Text.of("Cull Leaves"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
CullLeavesConfig.enabled = !CullLeavesConfig.enabled;
CullLeavesConfig.write("cullleaves");
MinecraftClient.getInstance().worldRenderer.reload();
}));
}
if (FabricLoader.getInstance().isModLoaded("iris")) {
IrisCompat.init();
}
if (FabricLoader.getInstance().isModLoaded("continuity")) {
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Continuity")));
ContinuityConfig contConfig = ContinuityConfig.INSTANCE;
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("options.continuity.disable_ctm"), (button) -> button.setMessage(contConfig.disableCTM.get() ? YES : NO), (button) -> {
contConfig.disableCTM.set(!contConfig.disableCTM.get());
contConfig.onChange();
contConfig.save();
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("options.continuity.use_manual_culling"), (button) -> button.setMessage(contConfig.useManualCulling.get() ? YES : NO), (button) -> {
contConfig.useManualCulling.set(!contConfig.useManualCulling.get());
contConfig.onChange();
contConfig.save();
}));
}
}
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 (FabricLoader.getInstance().isModLoaded("lambdynlights")) {
DynamicLightsConfig ldlConfig = LambDynLights.get().config;
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambDynamicLights")));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdynlights.option.mode"), (button) -> button.setMessage(ldlConfig.getDynamicLightsMode().getTranslatedText()), (button) -> ldlConfig.setDynamicLightsMode(ldlConfig.getDynamicLightsMode().next())));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.entities")), (button) -> button.setMessage(ldlConfig.getEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getEntitiesLightSource().set(!ldlConfig.getEntitiesLightSource().get())));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.block_entities")), (button) -> button.setMessage(ldlConfig.getBlockEntitiesLightSource().get() ? YES : NO), (button) -> ldlConfig.getBlockEntitiesLightSource().set(!ldlConfig.getBlockEntitiesLightSource().get())));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next())));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next())));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("").append("DynLights: ").append(new TranslatableText("lambdynlights.option.light_sources.water_sensitive_check")), (button) -> button.setMessage(ldlConfig.getWaterSensitiveCheck().get() ? YES : NO), (button) -> ldlConfig.getWaterSensitiveCheck().set(!ldlConfig.getWaterSensitiveCheck().get())));
}
if (FabricLoader.getInstance().isModLoaded("citresewn") && CITResewn.INSTANCE != null && CITResewnConfig.INSTANCE() != null) {
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("CIT Resewn")));
CITResewnConfig citConfig = CITResewnConfig.INSTANCE();
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? YES : NO), (button) -> {
citConfig.enabled = !citConfig.enabled;
citConfig.write();
MinecraftClient.getInstance().reloadResources();
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.mute_errors.title"), (button) -> button.setMessage(citConfig.mute_errors ? YES : NO), (button) -> {
citConfig.mute_errors = !citConfig.mute_errors;
citConfig.write();
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.mute_warns.title"), (button) -> button.setMessage(citConfig.mute_warns ? YES : NO), (button) -> {
citConfig.mute_warns = !citConfig.mute_warns;
citConfig.write();
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.citresewn.broken_paths.title"), (button) -> button.setMessage(citConfig.broken_paths ? YES : NO), (button) -> {
citConfig.broken_paths = !citConfig.broken_paths;
citConfig.write();
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100,new TranslatableText("config.citresewn.cache_ms.title"), (slider) -> slider.setInt(citConfig.cache_ms),
(button) -> button.setMessage(message(citConfig)),
(slider) -> {
try {
citConfig.cache_ms = slider.getInt();
}
catch (NumberFormatException ignored) {}
citConfig.write();
}));
}
if (FabricLoader.getInstance().isModLoaded("lambdabettergrass")) {
LBGConfig lbgConfig = LambdaBetterGrass.get().config;
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Text.of("LambdaBetterGrass")));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(new TranslatableText("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
}
if (FabricLoader.getInstance().isModLoaded("cem") && FabricLoader.getInstance().isModLoaded("completeconfig")) {
PuzzleApi.addToResourceOptions(new PuzzleWidget(Text.of("Custom Entity Models")));
CemConfig cemConfig = (CemConfig) CemConfigFairy.getConfig();
CemOptions cemOptions = CemConfigFairy.getConfig();
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.cem.use_optifine_folder"), (button) -> button.setMessage(cemConfig.useOptifineFolder() ? YES : NO), (button) -> {
((CemConfigAccessor)cemOptions).setUseOptifineFolder(!cemConfig.useOptifineFolder());
cemConfig.save();
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.cem.use_new_model_creation_fix"), (button) -> button.setMessage(cemConfig.useTransparentParts() ? YES : NO), (button) -> {
((CemConfigAccessor)cemOptions).setUseModelCreationFix(!cemConfig.useTransparentParts());
cemConfig.save();
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(new TranslatableText("config.cem.use_old_animations"), (button) -> button.setMessage(cemConfig.useOldAnimations() ? YES : NO), (button) -> {
((CemConfigAccessor)cemOptions).setUseOldAnimations(!cemConfig.useOldAnimations());
cemConfig.save();
}));
}
lateInitDone = true;
}
public static Text message(CITResewnConfig config) {
int ticks = config.cache_ms;
if (ticks <= 1) {
return (new TranslatableText("config.citresewn.cache_ms.ticks." + ticks)).formatted(Formatting.AQUA);
} 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 (new TranslatableText("config.citresewn.cache_ms.ticks.any", ticks)).formatted(color);
}
}
}

View File

@@ -1,28 +0,0 @@
package net.puzzlemc.gui.config;
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
import com.terraformersmc.modmenu.api.ModMenuApi;
import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import java.util.HashMap;
import java.util.Map;
@Environment(EnvType.CLIENT)
public class ModMenuIntegration implements ModMenuApi {
//Used to set the config screen for all modules //
@Override
public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
Map<String, ConfigScreenFactory<?>> map = new HashMap<>();
map.put("puzzle",PuzzleOptionsScreen::new);
map.put("puzzle-gui",PuzzleOptionsScreen::new);
map.put("puzzle-blocks",PuzzleOptionsScreen::new);
map.put("puzzle-base",PuzzleOptionsScreen::new);
map.put("puzzle-models",PuzzleOptionsScreen::new);
map.put("puzzle-randomentities",PuzzleOptionsScreen::new);
map.put("puzzle-splashscreen",PuzzleOptionsScreen::new);
return map;
}
}

View File

@@ -1,17 +0,0 @@
package net.puzzlemc.gui.mixin;
import net.dorianpb.cem.internal.config.CemConfig;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(value = CemConfig.class, remap = false)
public interface CemConfigAccessor {
@Accessor("use_optifine_folder")
void setUseOptifineFolder(boolean value);
@Accessor("use_new_model_creation_fix")
void setUseModelCreationFix(boolean value);
@Accessor("use_old_animations")
void setUseOldAnimations(boolean value);
}

View File

@@ -1,30 +0,0 @@
package net.puzzlemc.gui.mixin;
import eu.midnightdust.lib.util.screen.TexturedOverlayButtonWidget;
import net.minecraft.util.Identifier;
import net.puzzlemc.gui.PuzzleClient;
import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.option.OptionsScreen;
import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.Objects;
@Mixin(OptionsScreen.class)
public abstract class MixinOptionsScreen extends Screen {
private static final Identifier PUZZLE_ICON_TEXTURE = new Identifier(PuzzleClient.id, "textures/gui/puzzle_button.png");
protected MixinOptionsScreen(Text title) {
super(title);
}
@Inject(at = @At("HEAD"), method = "init")
private void midnightlib$init(CallbackInfo ci) {
this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 - 178, this.height / 6 - 12, 20, 20, 0, 0, 20, PUZZLE_ICON_TEXTURE, 32, 64, (buttonWidget) -> (Objects.requireNonNull(this.client)).setScreen(new PuzzleOptionsScreen(this)), new TranslatableText("midnightlib.overview.title")));
}
}

View File

@@ -1,17 +0,0 @@
package net.puzzlemc.gui.screen;
import net.coderbot.iris.gui.screen.ShaderPackScreen;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import java.util.Objects;
public class IrisButton extends DrawableHelper {
public static ButtonWidget getButton(int x, int y, int width, int height, Screen parent, MinecraftClient client) {
ShaderPackScreen shaderPackPage = new ShaderPackScreen(parent);
return new ButtonWidget(x, y, width, height, shaderPackPage.getTitle().copy().append("..."), (button) ->
Objects.requireNonNull(client).setScreen(shaderPackPage));
}
}

View File

@@ -1,14 +0,0 @@
package net.puzzlemc.gui.screen;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.util.math.MatrixStack;
public class LoadingScreenBackgrond {
public static void render(MinecraftClient client, MatrixStack matrices, int width, int height, float delta) {
// if (client.world != null) {
// LogManager.getLogManager().getLogger("Puzzle").info(client.world.getDimension().toString());
// }
// client.getTextureManager().bindTexture(new Identifier("minecraft","optifine/gui/loading/background0.png"));
// DrawableHelper.drawTexture(matrices,0,0,width,height,0,0,width,height,width,height);
}
}

View File

@@ -1,51 +0,0 @@
package net.puzzlemc.gui.screen;
import net.fabricmc.loader.api.FabricLoader;
import net.puzzlemc.gui.PuzzleClient;
import net.puzzlemc.gui.screen.page.GraphicsPage;
import net.puzzlemc.gui.screen.page.MiscPage;
import net.puzzlemc.gui.screen.page.PerformancePage;
import net.puzzlemc.gui.screen.page.ResourcesPage;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.ScreenTexts;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.TranslatableText;
import java.util.Objects;
public class PuzzleOptionsScreen extends Screen {
public PuzzleOptionsScreen(Screen parent) {
super(new TranslatableText("puzzle.screen.title"));
this.parent = parent;
}
private final Screen parent;
@Override
protected void init() {
super.init();
if (!PuzzleClient.lateInitDone) PuzzleClient.lateInit();
GraphicsPage graphicsPage = new GraphicsPage(this);
MiscPage miscPage = new MiscPage(this);
PerformancePage performancePage = new PerformancePage(this);
ResourcesPage resourcesPage = new ResourcesPage(this);
this.addDrawableChild(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 48 - 6, 150, 20, graphicsPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(graphicsPage)));
this.addDrawableChild(new ButtonWidget(this.width / 2 + 5, this.height / 6 + 48 - 6, 150, 20, resourcesPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(resourcesPage)));
this.addDrawableChild(new ButtonWidget(this.width / 2 - 155, this.height / 6 + 72 - 6, 150, 20, performancePage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(performancePage)));
this.addDrawableChild(new ButtonWidget(this.width / 2 + 5, this.height / 6 + 72 - 6, 150, 20, miscPage.getTitle().copy().append("..."), (button) -> Objects.requireNonNull(client).setScreen(miscPage)));
// if (FabricLoader.getInstance().isModLoaded("iris")) {
// this.addDrawableChild(IrisButton.getButton(this.width / 2 - 155, this.height / 6 + 96 - 6, 310, 20, this, client));
// }
this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height / 6 + 168, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
}
@Override
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
this.renderBackground(matrices);
super.render(matrices, mouseX, mouseY, delta);
drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
}
}

View File

@@ -1,45 +0,0 @@
package net.puzzlemc.gui.screen.page;
import net.puzzlemc.gui.screen.widget.PuzzleOptionListWidget;
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.ScreenTexts;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.TranslatableText;
import java.util.List;
import java.util.Objects;
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.addSelectableChild(this.list);
super.init();
this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
}
@Override
public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
this.renderBackground(matrices);
if (client != null && client.world != null) this.list.setRenderBackground(false);
this.list.render(matrices, mouseX, mouseY, delta);
drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF);
super.render(matrices, mouseX, mouseY, delta);
}
}

View File

@@ -1,12 +0,0 @@
package net.puzzlemc.gui.screen.page;
import net.puzzlemc.gui.PuzzleApi;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.text.TranslatableText;
public class GraphicsPage extends AbstractPuzzleOptionsPage {
public GraphicsPage(Screen parent) {
super(parent, new TranslatableText("puzzle.page.graphics"), PuzzleApi.GRAPHICS_OPTIONS);
}
}

View File

@@ -1,12 +0,0 @@
package net.puzzlemc.gui.screen.page;
import net.puzzlemc.gui.PuzzleApi;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.text.TranslatableText;
public class MiscPage extends AbstractPuzzleOptionsPage {
public MiscPage(Screen parent) {
super(parent, new TranslatableText("puzzle.page.misc"), PuzzleApi.MISC_OPTIONS);
}
}

View File

@@ -1,12 +0,0 @@
package net.puzzlemc.gui.screen.page;
import net.puzzlemc.gui.PuzzleApi;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.text.TranslatableText;
public class PerformancePage extends AbstractPuzzleOptionsPage {
public PerformancePage(Screen parent) {
super(parent, new TranslatableText("puzzle.page.performance"), PuzzleApi.PERFORMANCE_OPTIONS);
}
}

View File

@@ -1,12 +0,0 @@
package net.puzzlemc.gui.screen.page;
import net.puzzlemc.gui.PuzzleApi;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.text.TranslatableText;
public class ResourcesPage extends AbstractPuzzleOptionsPage {
public ResourcesPage(Screen parent) {
super(parent, new TranslatableText("puzzle.page.resources"), PuzzleApi.RESOURCE_OPTIONS);
}
}

View File

@@ -1,19 +0,0 @@
package net.puzzlemc.gui.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);
}
}

View File

@@ -1,90 +0,0 @@
package net.puzzlemc.gui.screen.widget;
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.Selectable;
import net.minecraft.client.gui.widget.ClickableWidget;
import net.minecraft.client.gui.widget.ElementListWidget;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import org.apache.logging.log4j.LogManager;
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(ClickableWidget button, Text text) {
this.addEntry(ButtonEntry.create(button, text));
}
public void addAll(List<PuzzleWidget> buttons) {
for (PuzzleWidget button : buttons) {
if (button.buttonType == ButtonType.TEXT) {
this.addButton(null, button.descriptionText);
} else 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, button.setSliderValue, button.buttonTextAction, button.changeSliderValue), button.descriptionText);
} else if (button.buttonType == ButtonType.TEXT_FIELD) {
this.addButton(new PuzzleTextFieldWidget(textRenderer, this.width / 2 - 155 + 160, 0, 150, 20, button.setTextValue, button.changeTextValue), 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() + 60;
}
public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
private List<ClickableWidget> buttons = new ArrayList<>();
private final ClickableWidget button;
private final Text text;
private ButtonEntry(ClickableWidget button, Text text) {
if (button != null)
this.buttons.add(button);
this.button = button;
this.text = text;
}
public static ButtonEntry create(ClickableWidget button, Text text) {
return new ButtonEntry(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) {
if (button != null) {
button.y = y;
button.render(matrices, mouseX, mouseY, tickDelta);
}
if (button == null) drawCenteredText(matrices,textRenderer, new LiteralText(" ").append(text).append(" "),x + 200,y+5,0xFFFFFF);
else drawTextWithShadow(matrices,textRenderer, text,x+15,y+5,0xFFFFFF);
}
public List<? extends Element> children() {
return buttons;
}
@Override
public List<? extends Selectable> selectableChildren() {
return buttons;
}
}
}

View File

@@ -1,41 +0,0 @@
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, PuzzleWidget.SetSliderValueAction setValueAction, PuzzleWidget.TextAction setTextAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
super(x,y,width,height,Text.of(""),0);
this.min = min;
this.max = max;
setValueAction.setSliderValue(this);
this.setTextAction = setTextAction;
this.changeAction = changeAction;
this.updateMessage();
}
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);
}
}

View File

@@ -1,23 +0,0 @@
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;
setValueAction.setTextValue(this);
}
@Override
public void write(String text) {
super.write(text);
this.change.onChange(this);
setValueAction.setTextValue(this);
}
}

View File

@@ -1,17 +0,0 @@
package net.puzzlemc.gui.util;
import java.awt.*;
public class ColorUtil {
/**
* @credit https://stackoverflow.com/questions/4129666/how-to-convert-hex-to-rgb-using-java
* @param colorStr e.g. "FFFFFF"
* @return
*/
public static Color hex2Rgb(String colorStr) {
return new Color(
Integer.valueOf( colorStr.substring( 0, 2 ), 16 ),
Integer.valueOf( colorStr.substring( 2, 4 ), 16 ),
Integer.valueOf( colorStr.substring( 4, 6 ), 16 ));
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

View File

@@ -1,43 +0,0 @@
{
"schemaVersion": 1,
"id": "puzzle-gui",
"version": "${version}",
"name": "Puzzle GUI",
"description": "Unites optifine replacement mods in a clean & vanilla-style gui",
"authors": [
"PuzzleMC",
"Motschen"
],
"contact": {
"homepage": "https://www.midnightdust.eu/",
"sources": "https://github.com/TeamMidnightDust/Puzzle",
"issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
},
"license": "MIT",
"icon": "assets/puzzle/icon.png",
"environment": "client",
"entrypoints": {
"client": [
"net.puzzlemc.gui.PuzzleClient"
],
"modmenu": [
"net.puzzlemc.gui.config.ModMenuIntegration"
]
},
"custom": {
"modmenu": {
"parent": "puzzle"
}
},
"mixins": [
"puzzle-gui.mixins.json"
],
"depends": {
"fabric": "*"
}
}

View File

@@ -1,9 +0,0 @@
archivesBaseName = "puzzle-models"
loom {
accessWidenerPath = file("src/main/resources/puzzle-models.accesswidener")
}
dependencies {
api project(":puzzle-base")
}

View File

@@ -1,48 +0,0 @@
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.minecraft.util.math.Vec3f;
import net.puzzlemc.core.config.PuzzleConfig;
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 Vec3f 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<Vec3f> cir) {
if (PuzzleConfig.biggerModels) {
Vec3f vec3f = this.deserializeVec3f(object, "to");
if (!(vec3f.getX() < -32.0F) && !(vec3f.getY() < -32.0F) && !(vec3f.getZ() < -32.0F) && !(vec3f.getX() > 48.0F) && !(vec3f.getY() > 48.0F) && !(vec3f.getZ() > 48.0F)) {
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<Vec3f> cir) {
if (PuzzleConfig.biggerModels) {
Vec3f vec3f = this.deserializeVec3f(object, "from");
if (!(vec3f.getX() < -32.0F) && !(vec3f.getY() < -32.0F) && !(vec3f.getZ() < -32.0F) && !(vec3f.getX() > 48.0F) && !(vec3f.getY() > 48.0F) && !(vec3f.getZ() > 48.0F)) {
cir.setReturnValue(vec3f);
} else {
throw new JsonParseException("'from' specifier exceeds the allowed boundaries: " + vec3f);
}
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -1,35 +0,0 @@
{
"schemaVersion": 1,
"id": "puzzle-models",
"version": "${version}",
"name": "Puzzle Models",
"description": "Provides more freedom for item and block models!",
"authors": [
"PuzzleMC",
"Motschen"
],
"contact": {
"homepage": "https://www.midnightdust.eu/",
"sources": "https://github.com/TeamMidnightDust/Puzzle",
"issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
},
"custom": {
"modmenu": {
"parent": "puzzle"
}
},
"license": "MIT",
"icon": "assets/puzzle/icon.png",
"environment": "client",
"accessWidener" : "puzzle-models.accesswidener",
"mixins": [
"puzzle-models.mixins.json"
],
"depends": {
"fabric": "*"
}
}

View File

@@ -1,2 +0,0 @@
accessWidener v1 named
accessible class net/minecraft/client/render/model/json/ModelElement$Deserializer

View File

@@ -1,5 +0,0 @@
archivesBaseName = "puzzle-splashscreen"
dependencies {
api project(":puzzle-base")
}

View File

@@ -1,132 +0,0 @@
package net.puzzlemc.splashscreen;
import net.fabricmc.api.ClientModInitializer;
import net.minecraft.client.texture.NativeImageBackedTexture;
import net.minecraft.util.math.ColorHelper;
import net.puzzlemc.core.config.PuzzleConfig;
import net.puzzlemc.core.util.ColorUtil;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
import net.fabricmc.loader.api.FabricLoader;
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.resource.DefaultResourcePack;
import net.minecraft.resource.ResourceManager;
import net.minecraft.resource.ResourceType;
import net.minecraft.util.Identifier;
import org.apache.logging.log4j.LogManager;
import java.awt.*;
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.Properties;
public class PuzzleSplashScreen implements ClientModInitializer {
public static final Identifier LOGO = new Identifier("textures/gui/title/mojangstudios.png");
public static File CONFIG_PATH = new File(String.valueOf(FabricLoader.getInstance().getConfigDir().resolve(".puzzle_cache")));
public static Path LOGO_TEXTURE = Paths.get(CONFIG_PATH + "/mojangstudios.png");
private static final MinecraftClient client = MinecraftClient.getInstance();
public static void resetColors() {
PuzzleConfig.backgroundColor = 15675965;
PuzzleConfig.progressBarColor = 16777215;
PuzzleConfig.progressFrameColor = 16777215;
PuzzleConfig.write("puzzle");
}
public void onInitializeClient() {
if (!CONFIG_PATH.exists()) { // Run when config directory is nonexistent //
if (CONFIG_PATH.mkdir()) { // Create our custom config directory //
try {
Files.setAttribute(CONFIG_PATH.toPath(), "dos:hidden", true);
} catch (IOException ignored) {
}
}
}
ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
@Override
public Identifier getFabricId() {
return new Identifier("puzzle", "splash_screen");
}
@Override
public void reload(ResourceManager manager) {
if (PuzzleConfig.resourcepackSplashScreen) {
PuzzleSplashScreen.resetColors();
client.getTextureManager().registerTexture(LOGO, new LogoTexture());
for (Identifier id : manager.findResources("optifine", path -> path.contains("color.properties"))) {
try (InputStream stream = manager.getResource(id).getInputStream()) {
Properties properties = new Properties();
properties.load(stream);
if (properties.get("screen.loading") != null) {
Color backgroundColorRGB = ColorUtil.hex2Rgb(properties.get("screen.loading").toString());
PuzzleConfig.backgroundColor = ColorHelper.Argb.getArgb(backgroundColorRGB.getAlpha(), backgroundColorRGB.getRed(), backgroundColorRGB.getGreen(), backgroundColorRGB.getGreen());
}
if (properties.get("screen.loading.bar") != null) {
Color progressFrameColorRGB = ColorUtil.hex2Rgb(properties.get("screen.loading.bar").toString());
PuzzleConfig.progressFrameColor = ColorHelper.Argb.getArgb(progressFrameColorRGB.getAlpha(), progressFrameColorRGB.getRed(), progressFrameColorRGB.getGreen(), progressFrameColorRGB.getGreen());
}
if (properties.get("screen.loading.progress") != null) {
Color progressBarColorRGB = ColorUtil.hex2Rgb(properties.get("screen.loading.progress").toString());
PuzzleConfig.progressBarColor = ColorHelper.Argb.getArgb(progressBarColorRGB.getAlpha(), progressBarColorRGB.getRed(), progressBarColorRGB.getGreen(), progressBarColorRGB.getGreen());
}
if (properties.get("screen.loading") != null) {
PuzzleConfig.write("puzzle");
}
} catch (Exception e) {
LogManager.getLogger("Puzzle").error("Error occurred while loading color.properties " + id.toString(), e);
}
}
for (Identifier id : manager.findResources("textures", path -> path.contains("mojangstudios.png"))) {
try (InputStream stream = manager.getResource(id).getInputStream()) {
Files.copy(stream, LOGO_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
DefaultResourcePack defaultResourcePack = client.getResourcePackProvider().getPack();
InputStream defaultLogo = defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO);
InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
if (input != defaultLogo)
client.getTextureManager().registerTexture(LOGO, new NativeImageBackedTexture(NativeImage.read(input)));
else Files.delete(LOGO_TEXTURE);
} catch (Exception e) {
LogManager.getLogger("Puzzle").error("Error occurred while loading custom minecraft logo " + id.toString(), e);
}
}
}
}
});
}
@Environment(EnvType.CLIENT)
public static class LogoTexture extends ResourceTexture {
public LogoTexture() { super(LOGO); }
protected TextureData loadTextureData(ResourceManager resourceManager) {
MinecraftClient minecraftClient = MinecraftClient.getInstance();
DefaultResourcePack defaultResourcePack = minecraftClient.getResourcePackProvider().getPack();
try {
InputStream inputStream = defaultResourcePack.open(ResourceType.CLIENT_RESOURCES, LOGO);
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);
}
}
}
}

View File

@@ -1,90 +0,0 @@
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.screen.Overlay;
import net.minecraft.client.gui.screen.SplashOverlay;
import net.minecraft.client.texture.NativeImage;
import net.minecraft.client.texture.NativeImageBackedTexture;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.Identifier;
import net.minecraft.util.Util;
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.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
@Mixin(value = SplashOverlay.class, priority = 2000)
public abstract class MixinSplashScreen extends Overlay {
@Shadow @Final static Identifier LOGO;
@Shadow private long reloadCompleteTime;
@Shadow @Final private MinecraftClient client;
@Shadow private long reloadStartTime;
@Inject(method = "init(Lnet/minecraft/client/MinecraftClient;)V", at = @At("TAIL"))
private static void init(MinecraftClient client, CallbackInfo ci) { // Load our custom textures at game start //
if (PuzzleConfig.resourcepackSplashScreen && PuzzleSplashScreen.LOGO_TEXTURE.toFile().exists()) {
try {
InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE));
client.getTextureManager().registerTexture(LOGO, new NativeImageBackedTexture(NativeImage.read(input)));
} catch (IOException ignored) {}
}
}
@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V", shift = At.Shift.AFTER, ordinal = 0))
private void modifyBackgroundColor(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { // Set the Background Color to our configured value //
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);
if (PuzzleConfig.resourcepackSplashScreen && PuzzleConfig.backgroundColor != 15675965)
fill(matrices, 0, 0, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight(), withAlpha(PuzzleConfig.backgroundColor, m));
}
@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V", shift = At.Shift.AFTER, ordinal = 1))
private void modifyBackgroundColor2(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { // Set the Background Color to our configured value //
long l = Util.getMeasuringTimeMs();
float g = this.reloadStartTime > -1L ? (float)(l - this.reloadStartTime) / 500.0F : -1.0F;
int m = MathHelper.ceil(MathHelper.clamp(g, 0.15D, 1.0D) * 255.0D);
if (PuzzleConfig.resourcepackSplashScreen && PuzzleConfig.backgroundColor != 15675965)
fill(matrices, 0, 0, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight(), withAlpha(PuzzleConfig.backgroundColor, m));
}
@Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;_clear(IZ)V", shift = At.Shift.AFTER))
private void modifyBackgroundColor3(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { // Set the Background Color to our configured value //
if (PuzzleConfig.resourcepackSplashScreen && PuzzleConfig.backgroundColor != 15675965) {
int m = PuzzleConfig.backgroundColor;
float p = (float) (m >> 16 & 255) / 255.0F;
float q = (float) (m >> 8 & 255) / 255.0F;
float r = (float) (m & 255) / 255.0F;
GlStateManager._clearColor(p, q, r, 1.0F);
GlStateManager._clear(16384, MinecraftClient.IS_SYSTEM_MAC);
}
}
@Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;enableBlend()V", shift = At.Shift.AFTER), remap = false)
private void disableBlend(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
if (PuzzleConfig.disableSplashScreenBlend) RenderSystem.disableBlend();
}
@ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V"), index = 5)
private int modifyProgressFrame(int color) { // Set the Progress Bar Frame Color to our configured value //
return PuzzleConfig.progressFrameColor | 255 << 24;
}
@ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashOverlay;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V", ordinal = 4), index = 5)
private int modifyProgressColor(int color) { // Set the Progress Bar Color to our configured value //
return PuzzleConfig.progressBarColor | 255 << 24;
}
private static int withAlpha(int color, int alpha) {
return color & 16777215 | alpha << 24;
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -1,40 +0,0 @@
{
"schemaVersion": 1,
"id": "puzzle-splashscreen",
"version": "${version}",
"name": "Puzzle Splash Screen",
"description": "Allows resourcepacks to define a custom splash screen",
"authors": [
"PuzzleMC",
"Motschen"
],
"contact": {
"homepage": "https://www.midnightdust.eu/",
"sources": "https://github.com/TeamMidnightDust/Puzzle",
"issues": "https://github.com/TeamMidnightDust/Puzzle/issues"
},
"license": "MIT",
"icon": "assets/puzzle/icon.png",
"environment": "client",
"entrypoints": {
"client": [
"net.puzzlemc.splashscreen.PuzzleSplashScreen"
]
},
"custom": {
"modmenu": {
"parent": "puzzle"
}
},
"mixins": [
"puzzle-splashscreen.mixins.json"
],
"depends": {
"fabric": "*"
}
}

View File

@@ -1,17 +0,0 @@
pluginManagement {
repositories {
maven {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}
gradlePluginPortal()
}
}
include 'puzzle-base'
include 'puzzle-splashscreen'
include 'puzzle-models'
include 'puzzle-blocks'
//include 'puzzle-randomentities'
include 'puzzle-gui'
include 'puzzle-emissives'

31
settings.gradle.kts Normal file
View File

@@ -0,0 +1,31 @@
pluginManagement {
repositories {
mavenCentral()
gradlePluginPortal()
maven("https://maven.fabricmc.net/")
maven("https://maven.architectury.dev")
maven("https://maven.minecraftforge.net")
maven("https://maven.neoforged.net/releases/")
maven("https://maven.kikugie.dev/snapshots")
}
}
plugins {
id("dev.kikugie.stonecutter") version "0.7"
}
stonecutter {
centralScript = "build.gradle.kts"
kotlinController = true
shared {
fun mc(loader: String, vararg versions: String) {
for (version in versions) vers("$version-$loader", version)
}
mc("fabric","1.20.1", "1.21.1", "1.21.4", "1.21.5", "1.21.8", "1.21.10", "1.21.11")
//WARNING: neoforge uses mods.toml instead of neoforge.mods.toml for versions 1.20.4 (?) and earlier
mc("neoforge", "1.21.1", "1.21.4", "1.21.5", "1.21.8", "1.21.10", "1.21.11")
}
create(rootProject)
}
rootProject.name = "Puzzle"

View File

@@ -0,0 +1,80 @@
package net.puzzlemc.core;
import net.minecraft.resources.Identifier;
import net.puzzlemc.splashscreen.PuzzleSplashScreen;
import static net.puzzlemc.core.PuzzleCore.MOD_ID;
//? fabric {
import net.fabricmc.api.ClientModInitializer;
import net.minecraft.server.packs.PackType;
//? if >= 1.21.9 {
import net.fabricmc.fabric.api.resource.v1.ResourceLoader;
//?} else {
/*import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
import net.minecraft.server.packs.resources.ResourceManager;
*///?}
public class PuzzleClient implements ClientModInitializer {
@Override
public void onInitializeClient() {
PuzzleCore.initModules();
//ResourceManagerHelper.get(PackType.CLIENT_RESOURCES).registerReloadListener
//? if >= 1.21.9 {
ResourceLoader.get(PackType.CLIENT_RESOURCES).registerReloader(Identifier.fromNamespaceAndPath(MOD_ID, "splash_screen"), PuzzleSplashScreen.ReloadListener.INSTANCE);
//?} else {
/*ResourceManagerHelper.get(PackType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
@Override
public Identifier getFabricId() {
return Identifier.fromNamespaceAndPath(MOD_ID, "splash_screen");
}
@Override
public void onResourceManagerReload(ResourceManager manager) {
PuzzleSplashScreen.ReloadListener.INSTANCE.onResourceManagerReload(manager);
}
});
*///?}
}
}
//?}
//? 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.puzzlemc.gui.screen.PuzzleOptionsScreen;
import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
//? if >= 1.21.5 {
import net.neoforged.neoforge.client.event.AddClientReloadListenersEvent;
//?} else {
/^import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent;
^///?}
@Mod(value = MOD_ID, dist = Dist.CLIENT)
public class PuzzleClient {
public PuzzleClient() {
PuzzleCore.initModules();
ModList.get().getModContainerById(MOD_ID).orElseThrow().registerExtensionPoint(IConfigScreenFactory.class, (client, parent) -> new PuzzleOptionsScreen(parent));
}
@EventBusSubscriber(modid = MOD_ID, value = Dist.CLIENT /^? if <= 1.21.5 {^/ /^, bus = EventBusSubscriber.Bus.MOD ^//^?}^/)
public static class MidnightLibBusEvents {
//? if >= 1.21.5 {
@SubscribeEvent
public static void onResourceReload(AddClientReloadListenersEvent event) {
event.addListener(Identifier.fromNamespaceAndPath(MOD_ID, "splash_screen"), PuzzleSplashScreen.ReloadListener.INSTANCE);
}
//?} else {
/^@SubscribeEvent
public static void onResourceReload(RegisterClientReloadListenersEvent event) {
event.registerReloadListener(PuzzleSplashScreen.ReloadListener.INSTANCE);
}
^///?}
}
}
*///?}

View 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();
}
}

View File

@@ -0,0 +1,14 @@
package net.puzzlemc.core;
//? fabric {
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
import com.terraformersmc.modmenu.api.ModMenuApi;
import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
public class PuzzleModMenu implements ModMenuApi {
@Override
public ConfigScreenFactory<?> getModConfigScreenFactory() {
return PuzzleOptionsScreen::new;
}
}
//?}

View 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<>();
}

View File

@@ -2,15 +2,13 @@ package net.puzzlemc.gui;
import net.puzzlemc.core.config.PuzzleConfig;
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.ArrayList;
import java.util.List;
public class PuzzleApi {
private static Logger LOGGER = LogManager.getLogger("puzzle-gui");
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<>();
@@ -18,22 +16,22 @@ public class PuzzleApi {
public static void addToGraphicsOptions(PuzzleWidget button) {
GRAPHICS_OPTIONS.add(button);
if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + " -> Graphics Options");
if (PuzzleConfig.debugMessages)
LOGGER.info("{} -> Graphics Options", button.descriptionText.getContents().toString());
}
public static void addToMiscOptions(PuzzleWidget button) {
MISC_OPTIONS.add(button);
if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + " -> Misc Options");
if (PuzzleConfig.debugMessages)
LOGGER.info("{} -> Misc Options", button.descriptionText.getContents().toString());
}
public static void addToPerformanceOptions(PuzzleWidget button) {
PERFORMANCE_OPTIONS.add(button);
if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + "- > Performance Options");
if (PuzzleConfig.debugMessages)
LOGGER.info("{}- > Performance Options", button.descriptionText.getContents().toString());
}
public static void addToResourceOptions(PuzzleWidget button) {
RESOURCE_OPTIONS.add(button);
if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + " -> Resource Options");
}
@Deprecated public static void addToTextureOptions(PuzzleWidget button) {
RESOURCE_OPTIONS.add(button);
if (PuzzleConfig.debugMessages) LOGGER.info(button.descriptionText.asString() + " -> LEGACY Texture Options");
if (PuzzleConfig.debugMessages)
LOGGER.info("{} -> Resource Options", button.descriptionText.getContents().toString());
}
}

View File

@@ -0,0 +1,69 @@
package net.puzzlemc.gui;
import eu.midnightdust.core.MidnightLib;
import eu.midnightdust.lib.util.PlatformFunctions;
import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.Identifier;
import net.puzzlemc.core.config.PuzzleConfig;
import net.puzzlemc.gui.compat.*;
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
import net.minecraft.client.Minecraft;
import net.puzzlemc.splashscreen.PuzzleSplashScreen;
import static net.puzzlemc.core.PuzzleCore.LOGGER;
import static net.puzzlemc.core.PuzzleCore.MOD_ID;
public class PuzzleGui {
public static final Component YES = Component.translatable("gui.yes").withStyle(ChatFormatting.GREEN);
public static final Component NO = Component.translatable("gui.no").withStyle(ChatFormatting.RED);
public static final Identifier PUZZLE_BUTTON = Identifier.fromNamespaceAndPath(MOD_ID, "icon/button");
public static void init() {
MidnightLib.hiddenMods.add(MOD_ID);
PuzzleApi.addToMiscOptions(new PuzzleWidget(Component.literal("\uD83E\uDDE9 Puzzle")));
PuzzleApi.addToMiscOptions(new PuzzleWidget(Component.translatable("puzzle.midnightconfig.title"), (button) -> button.setMessage(Component.literal("OPEN")), (button) -> {
Minecraft.getInstance().setScreen(PuzzleConfig.getScreen(Minecraft.getInstance().screen, MOD_ID));
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.literal("\uD83E\uDDE9 Puzzle")));
PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("puzzle.option.resourcepack_splash_screen"), (button) -> button.setMessage(PuzzleConfig.resourcepackSplashScreen ? YES : NO), (button) -> {
PuzzleConfig.resourcepackSplashScreen = !PuzzleConfig.resourcepackSplashScreen;
PuzzleSplashScreen.resetColors();
PuzzleConfig.write(MOD_ID);
Minecraft.getInstance().getTextureManager()./*? if >= 1.21.5 {*/ registerAndLoad /*?} else {*//*register*//*?}*/(PuzzleSplashScreen.LOGO, new PuzzleSplashScreen.LogoTexture(PuzzleSplashScreen.LOGO));
}));
//? if < 1.21.11 {
/*PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("puzzle.option.unlimited_model_rotations"), (button) -> button.setMessage(PuzzleConfig.unlimitedRotations ? YES : NO), (button) -> {
PuzzleConfig.unlimitedRotations = !PuzzleConfig.unlimitedRotations;
PuzzleConfig.write(MOD_ID);
}));
*///?}
PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("puzzle.option.bigger_custom_models"), (button) -> button.setMessage(PuzzleConfig.biggerModels ? YES : NO), (button) -> {
PuzzleConfig.biggerModels = !PuzzleConfig.biggerModels;
PuzzleConfig.write(MOD_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);
}
}

View File

@@ -0,0 +1,28 @@
package net.puzzlemc.gui.compat;
import com.mojang.text2speech.OperatingSystem;
import link.infra.borderlessmining.config.ConfigHandler;
import net.minecraft.network.chat.Component;
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(Component.literal("\uD83E\uDE9F Borderless Mining")));
ConfigHandler bmConfig = ConfigHandler.getInstance();
PuzzleApi.addToMiscOptions(new PuzzleWidget(Component.translatable("config.borderlessmining.general.enabled"), (button) -> button.setMessage(bmConfig.isEnabledOrPending() ? YES : NO), (button) -> {
bmConfig.setEnabledPending(!bmConfig.isEnabledOrPending());
bmConfig.save();
}));
if (OperatingSystem.get() == OperatingSystem.MAC_OS) {
PuzzleApi.addToMiscOptions(new PuzzleWidget(Component.translatable("config.borderlessmining.general.enabledmac"), (button) -> button.setMessage(bmConfig.enableMacOS ? YES : NO), (button) -> {
bmConfig.enableMacOS = !bmConfig.enableMacOS;
bmConfig.setEnabledPending(bmConfig.isEnabled());
bmConfig.save();
}));
}
}
}

View File

@@ -0,0 +1,60 @@
package net.puzzlemc.gui.compat;
import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.Component;
import net.puzzlemc.gui.PuzzleApi;
import net.puzzlemc.gui.screen.widget.PuzzleWidget;
import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig;
import static net.minecraft.network.chat.CommonComponents.GUI_NO;
import static net.minecraft.network.chat.CommonComponents.GUI_YES;
public class CITRCompat {
public static void init() {
if (CITResewnConfig.INSTANCE != null) {
PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.literal("⛏ CIT Resewn")));
CITResewnConfig citConfig = CITResewnConfig.INSTANCE;
PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("config.citresewn.enabled.title"), (button) -> button.setMessage(citConfig.enabled ? GUI_YES : GUI_NO), (button) -> {
citConfig.enabled = !citConfig.enabled;
citConfig.write();
Minecraft.getInstance().reloadResourcePacks();
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("config.citresewn.mute_errors.title"), (button) -> button.setMessage(citConfig.mute_errors ? GUI_YES : GUI_NO), (button) -> {
citConfig.mute_errors = !citConfig.mute_errors;
citConfig.write();
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("config.citresewn.mute_warns.title"), (button) -> button.setMessage(citConfig.mute_warns ? GUI_YES : GUI_NO), (button) -> {
citConfig.mute_warns = !citConfig.mute_warns;
citConfig.write();
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("config.citresewn.broken_paths.title"), (button) -> button.setMessage(citConfig.broken_paths ? GUI_YES : GUI_NO), (button) -> {
citConfig.broken_paths = !citConfig.broken_paths;
citConfig.write();
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 100, Component.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 Component message(CITResewnConfig config) {
int ticks = config.cache_ms;
if (ticks <= 1) {
return (Component.translatable("config.citresewn.cache_ms.ticks." + ticks)).withStyle(ChatFormatting.AQUA);
} else {
ChatFormatting color = ChatFormatting.DARK_RED;
if (ticks <= 40) color = ChatFormatting.RED;
if (ticks <= 20) color = ChatFormatting.GOLD;
if (ticks <= 10) color = ChatFormatting.DARK_GREEN;
if (ticks <= 5) color = ChatFormatting.GREEN;
return (Component.translatable("config.citresewn.cache_ms.ticks.any", ticks)).withStyle(color);
}
}
}

View File

@@ -0,0 +1,48 @@
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.network.chat.Component;
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() {
//? if fabric {
PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.literal("\uD83C\uDF08 Colormatic")));
ColormaticConfig colormaticConfig = Colormatic.config();
PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("colormatic.config.option.clearSky"), (button) -> button.setMessage(colormaticConfig.clearSky ? YES : NO), (button) -> {
colormaticConfig.clearSky = !colormaticConfig.clearSky;
ColormaticConfigController.persist(colormaticConfig);
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("colormatic.config.option.clearVoid"), (button) -> button.setMessage(colormaticConfig.clearVoid ? YES : NO), (button) -> {
colormaticConfig.clearVoid = !colormaticConfig.clearVoid;
ColormaticConfigController.persist(colormaticConfig);
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("colormatic.config.option.blendSkyLight"), (button) -> button.setMessage(colormaticConfig.blendSkyLight ? YES : NO), (button) -> {
colormaticConfig.blendSkyLight = !colormaticConfig.blendSkyLight;
ColormaticConfigController.persist(colormaticConfig);
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.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, Component.translatable("colormatic.config.option.relativeBlockLightIntensity"),
() -> (int) (100*(1.0 - colormaticConfig.relativeBlockLightIntensityExponent / -16.0)),
(button) -> button.setMessage(Component.translatable("colormatic.config.option.relativeBlockLightIntensity")
.append(": ")
.append(Component.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) {}
}));
//?}
}
}

View File

@@ -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.network.chat.Component;
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(Component.literal("▒ 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(Component.translatable("options.continuity."+s), (button) -> button.setMessage(booleanOption.get() ? YES : NO), (button) -> {
booleanOption.set(!booleanOption.get());
contConfig.save();
}));
} catch (Exception ignored) {}
});
}
}

View File

@@ -0,0 +1,21 @@
package net.puzzlemc.gui.compat;
import eu.midnightdust.cullleaves.config.CullLeavesConfig;
import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.Component;
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(Component.literal("\uD83C\uDF43 Cull Leaves")));
PuzzleApi.addToPerformanceOptions(new PuzzleWidget(Component.translatable("cullleaves.puzzle.option.enabled"), (button) -> button.setMessage(CullLeavesConfig.enabled ? YES : NO), (button) -> {
CullLeavesConfig.enabled = !CullLeavesConfig.enabled;
CullLeavesConfig.write("cullleaves");
Minecraft.getInstance().levelRenderer.needsUpdate();
}));
}
}

View File

@@ -0,0 +1,54 @@
package net.puzzlemc.gui.compat;
import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
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 traben.entity_texture_features.config.ETFConfig;
import traben.entity_texture_features.config.screens.ETFConfigScreenMain;
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(Component.literal("\uD83D\uDC37 ").append(Component.translatable("entity_model_features.title"))));
EMFConfig emfConfig = EMF.config().getConfig();
PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("entity_model_features.config.update"), (button) -> button.setMessage(Component.literal(emfConfig.modelUpdateFrequency.toString())), (button) -> {
final NavigableSet<ETFConfig.UpdateFrequency> set = new TreeSet<>(EnumSet.allOf(ETFConfig.UpdateFrequency.class));
emfConfig.modelUpdateFrequency = Objects.requireNonNullElseGet(set.higher(emfConfig.modelUpdateFrequency), set::first);
EMF.config().saveToFile();
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(0, 65, Component.translatable("entity_model_features.config.lod"), () -> emfConfig.animationLODDistance,
(button) -> button.setMessage(lodMessage(emfConfig.animationLODDistance)),
(slider) -> {
try {
emfConfig.animationLODDistance = slider.getInt();
} catch (NumberFormatException ignored) {}
EMF.config().saveToFile();
}));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.translatable("entity_model_features.config.low_fps_lod"), (button) -> button.setMessage(emfConfig.retainDetailOnLowFps ? YES : NO), (button) -> {
emfConfig.retainDetailOnLowFps = !emfConfig.retainDetailOnLowFps;
EMF.config().saveToFile();
}));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.translatable("entity_model_features.config.large_mob_lod"), (button) -> button.setMessage(emfConfig.retainDetailOnLargerMobs ? YES : NO), (button) -> {
emfConfig.retainDetailOnLargerMobs = !emfConfig.retainDetailOnLargerMobs;
EMF.config().saveToFile();
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("puzzle.action.open_config_screen"), (button) -> button.setMessage(Component.nullToEmpty("OPEN")), button -> Minecraft.getInstance().setScreen(new ETFConfigScreenMain(Minecraft.getInstance().screen))));
}
public static Component lodMessage(int value) {
if (value == 20) return Component.literal(value + " (Default)");
else if (value == 0 || value == 65) return CommonComponents.OPTION_OFF.copy().withStyle(ChatFormatting.RED);
else return Component.literal(String.valueOf(value)).withStyle(ChatFormatting.AQUA);
}
}

View File

@@ -0,0 +1,50 @@
package net.puzzlemc.gui.compat;
import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.Component;
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 traben.entity_texture_features.config.screens.ETFConfigScreenMain;
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(Component.literal("\uD83D\uDC2E ").append(Component.translatable("config.entity_texture_features.title"))));
ETFConfig etfConfig = ETFApi.getETFConfigObject();
PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.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(Component.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(Component.translatable("config.entity_texture_features.emissive_mode.title"), (button) -> button.setMessage(
Component.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(Component.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(Component.translatable("config.entity_texture_features.player_skin_features.title"), (button) -> button.setMessage(etfConfig.skinFeaturesEnabled ? YES : NO), (button) -> {
etfConfig.skinFeaturesEnabled = !etfConfig.skinFeaturesEnabled;
ETFApi.saveETFConfigChangesAndResetETF();
}));
PuzzleApi.addToResourceOptions(new PuzzleWidget(Component.translatable("puzzle.action.open_config_screen"), (button) -> button.setMessage(Component.nullToEmpty("OPEN")), button -> Minecraft.getInstance().setScreen(new ETFConfigScreenMain(Minecraft.getInstance().screen))));
}
}

View 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.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
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(Component.literal("\uD83D\uDC41 Iris")));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.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(Component.translatable("options.iris.shaderPackSelection.title"), (button) -> button.setMessage(Component.literal("").append(Component.translatable("iris.puzzle.option.open").withStyle(ChatFormatting.GOLD))), (button) -> {
Minecraft client = Minecraft.getInstance();
client.setScreen((Screen) IrisApi.getInstance().openMainIrisScreenObj(client.screen));
}));
}
}

View File

@@ -0,0 +1,21 @@
package net.puzzlemc.gui.compat;
import dev.lambdaurora.lambdabettergrass.LBGConfig;
import dev.lambdaurora.lambdabettergrass.LambdaBetterGrass;
import net.minecraft.network.chat.Component;
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() {
//? fabric {
LBGConfig lbgConfig = LambdaBetterGrass.get().config;
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.literal("\uD83C\uDF31 LambdaBetterGrass")));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.translatable("lambdabettergrass.option.mode"), (button) -> button.setMessage(lbgConfig.getMode().getTranslatedText()), (button) -> lbgConfig.setMode(lbgConfig.getMode().next())));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.translatable("lambdabettergrass.option.better_snow"), (button) -> button.setMessage(lbgConfig.hasBetterLayer() ? YES : NO), (button) -> lbgConfig.setBetterLayer(!lbgConfig.hasBetterLayer())));
//?}
}
}

View File

@@ -0,0 +1,23 @@
package net.puzzlemc.gui.compat;
import dev.lambdaurora.lambdynlights.DynamicLightsConfig;
import dev.lambdaurora.lambdynlights.LambDynLights;
import net.minecraft.network.chat.Component;
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(Component.literal("\uD83D\uDCA1 LambDynamicLights")));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.translatable("lambdynlights.option.mode"), (button) -> button.setMessage(ldlConfig.getDynamicLightsMode().getTranslatedText()), (button) -> ldlConfig.setDynamicLightsMode(ldlConfig.getDynamicLightsMode().next())));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.empty().append("DynLights: ").append(Component.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(Component.empty().append("DynLights: ").append(Component.translatable("entity.minecraft.creeper")), (button) -> button.setMessage(ldlConfig.getCreeperLightingMode().getTranslatedText()), (button) -> ldlConfig.setCreeperLightingMode(ldlConfig.getCreeperLightingMode().next())));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.empty().append("DynLights: ").append(Component.translatable("block.minecraft.tnt")), (button) -> button.setMessage(ldlConfig.getTntLightingMode().getTranslatedText()), (button) -> ldlConfig.setTntLightingMode(ldlConfig.getTntLightingMode().next())));
PuzzleApi.addToGraphicsOptions(new PuzzleWidget(Component.empty().append("DynLights: ").append(Component.translatable("lambdynlights.option.light_sources.water_sensitive_check")), (button) -> button.setMessage(ldlConfig.getWaterSensitiveCheck().get() ? YES : NO), (button) -> ldlConfig.getWaterSensitiveCheck().set(!ldlConfig.getWaterSensitiveCheck().get())));
}
}

View File

@@ -0,0 +1,86 @@
package net.puzzlemc.gui.mixin;
import eu.midnightdust.core.config.MidnightLibConfig;
import eu.midnightdust.lib.util.PlatformFunctions;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
import net.puzzlemc.core.config.PuzzleConfig;
import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
import org.spongepowered.asm.mixin.Mixin;
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;
//? if >= 1.21 {
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Shadow;
import net.minecraft.client.gui.screens.options.OptionsScreen;
import net.minecraft.client.gui.components.SpriteIconButton;
import net.minecraft.client.gui.layouts.HeaderAndFooterLayout;
import net.puzzlemc.gui.PuzzleGui;
//?} else {
/*import net.minecraft.client.gui.screens.OptionsScreen;
import net.minecraft.client.gui.components.TextAndImageButton;
import net.minecraft.resources.Identifier;
import static net.puzzlemc.core.PuzzleCore.MOD_ID;
*///?}
@Mixin(OptionsScreen.class)
public abstract class MixinOptionsScreen extends Screen {
private MixinOptionsScreen(Component title) {super(title);}
//? if >= 1.21 {
@Shadow @Final private HeaderAndFooterLayout layout;
@Unique
SpriteIconButton puzzle$button = SpriteIconButton.builder(Component.translatable("puzzle.screen.title"), (buttonWidget) ->
(Objects.requireNonNull(this.minecraft)).setScreen(new PuzzleOptionsScreen(this)), true)
.size(20, 20).sprite(PuzzleGui.PUZZLE_BUTTON, 20, 20).build();
@Inject(at = @At("HEAD"), method = "init")
public void puzzle$onInit(CallbackInfo ci) {
if (PuzzleConfig.enablePuzzleButton) {
this.puzzle$setButtonPos();
this.addRenderableWidget(puzzle$button);
}
}
@Inject(at = @At("TAIL"), method = "repositionElements")
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);
}
//?} else {
/*@Unique TextAndImageButton puzzle$button = TextAndImageButton.builder(Component.translatable("midnightlib.overview.title"), Identifier.fromNamespaceAndPath(MOD_ID, "icon/button.png"),
button -> Objects.requireNonNull(minecraft).setScreen(new PuzzleOptionsScreen(this))).textureSize(19, 19).usedTextureSize(16, 16).offset(-2, 0).build();
@Inject(at = @At("HEAD"), method = "init")
private void midnightlib$init(CallbackInfo ci) {
if (PuzzleConfig.enablePuzzleButton) {
puzzle$button.setWidth(20);
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, this.height / 6 - 12);
this.addRenderableWidget(puzzle$button);
}
}
*///?}
}

View File

@@ -0,0 +1,115 @@
package net.puzzlemc.gui.screen;
import com.google.common.collect.Lists;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.tabs.GridLayoutTab;
import net.minecraft.client.gui.components.tabs.Tab;
import net.minecraft.client.gui.components.tabs.TabManager;
import net.minecraft.client.gui.components.tabs.TabNavigationBar;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.Component;
import net.puzzlemc.gui.PuzzleApi;
import net.puzzlemc.gui.PuzzleGui;
import net.puzzlemc.gui.screen.widget.*;
//? if >= 1.21.9
import net.minecraft.client.input.KeyEvent;
import java.util.List;
import java.util.Objects;
import static net.minecraft.network.chat.CommonComponents.GUI_DONE;
public class PuzzleOptionsScreen extends Screen {
public PuzzleOptionListWidget list;
public List<Component> tooltip = null;
public TabManager tabManager = new TabManager(a -> {}, a -> {});
public Tab prevTab;
public TabNavigationBar tabNavigation;
public static Component graphicsTab = Component.translatable("puzzle.page.graphics");
public static Component miscTab = Component.translatable("puzzle.page.misc");
public static Component performanceTab = Component.translatable("puzzle.page.performance");
public static Component resourcesTab = Component.translatable("puzzle.page.resources");
public PuzzleOptionsScreen(Screen parent) {
super(Component.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 GridLayoutTab(graphicsTab));
if (!PuzzleApi.RESOURCE_OPTIONS.isEmpty()) tabs.add(new GridLayoutTab(resourcesTab));
if (!PuzzleApi.PERFORMANCE_OPTIONS.isEmpty()) tabs.add(new GridLayoutTab(performanceTab));
if (!PuzzleApi.MISC_OPTIONS.isEmpty()) tabs.add(new GridLayoutTab(miscTab));
tabNavigation = TabNavigationBar.builder(tabManager, this.width).addTabs(tabs.toArray(new Tab[0])).build();
tabNavigation.selectTab(0, false);
tabNavigation.arrangeElements();
prevTab = tabManager.getCurrentTab();
this.list = new PuzzleOptionListWidget(this.minecraft, this.width, this.height - 57, 24, 25);
fillList();
if (tabs.size() > 1) {
this.addRenderableWidget(tabNavigation);
list.renderHeaderSeparator = false;
}
this.addWidget(list);
super.init();
this.addRenderableWidget(Button.builder(GUI_DONE, (button) -> Objects.requireNonNull(minecraft).setScreen(parent)).bounds(this.width / 2 - 100, this.height - 26, 200, 20).build());
}
private void fillList() {
List<PuzzleWidget> options = List.of();
if (tabManager.getCurrentTab() == null) return;
else {
Component title = tabManager.getCurrentTab().getTabTitle();
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 void tick() {
super.tick();
if (prevTab != null && prevTab != tabManager.getCurrentTab()) {
prevTab = tabManager.getCurrentTab();
this.list.clear();
fillList();
list.setScrollAmount(0);
}
}
@Override
//? if >= 1.21.9 {
public boolean keyPressed(KeyEvent input) {
return this.tabNavigation.keyPressed(input) || super.keyPressed(input);
}
//?} else {
/*public boolean keyPressed(int key, int scanCode, int modifiers) {
return this.tabNavigation.keyPressed(key) || super.keyPressed(key, scanCode, modifiers);
}
*///?}
@Override
public void render(GuiGraphics context, int mouseX, int mouseY, float delta) {
//? if >= 1.21 {
super.render(context, mouseX, mouseY, delta);
//?} else {
/*super.renderBackground(context);
*///?}
this.list.render(context, mouseX, mouseY, delta);
//? if < 1.21
/*super.render(context, mouseX, mouseY, delta);*/
}
}

View File

@@ -0,0 +1,32 @@
package net.puzzlemc.gui.screen.widget;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.Button;
import net.minecraft.network.chat.Component;
import java.util.function.Supplier;
public class PuzzleButtonWidget extends Button {
private final PuzzleWidget.TextAction title;
public PuzzleButtonWidget(int x, int y, int width, int height, PuzzleWidget.TextAction title, OnPress onPress) {
super(x, y, width, height, Component.empty(), onPress, Supplier::get);
this.title = title;
}
@Override
//? if < 1.21.11 {
/*public void renderWidget(GuiGraphics context, int mouseX, int mouseY, float delta) {
*///?} else {
public void renderContents(GuiGraphics context, int mouseX, int mouseY, float delta) {
//?}
try { title.setTitle(this);
} catch (Exception e) {e.fillInStackTrace(); this.visible = false;}
//? if < 1.21.11 {
/*super.renderWidget(context, mouseX, mouseY, delta);
*///?} else {
this.renderDefaultSprite(context);
this.renderDefaultLabel(context.textRendererForWidget(this, GuiGraphics.HoveredTextEffects.NONE));
//?}
}
}

View File

@@ -0,0 +1,98 @@
package net.puzzlemc.gui.screen.widget;
import eu.midnightdust.lib.config.ButtonEntry;
import eu.midnightdust.lib.config.EntryInfo;
import eu.midnightdust.lib.config.MidnightConfig;
import eu.midnightdust.lib.config.MidnightConfigListWidget;
import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.AbstractWidget;
import net.minecraft.client.resources.language.I18n;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.contents.TranslatableContents;
import net.puzzlemc.gui.screen.PuzzleOptionsScreen;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.List;
import static net.puzzlemc.core.PuzzleCore.LOGGER;
public class PuzzleOptionListWidget extends MidnightConfigListWidget {
Font textRenderer;
public PuzzleOptionListWidget(Minecraft minecraftClient, int i, int j, int k, int l) {
super(minecraftClient, i, j, k, l);
this.centerListVertically = false;
textRenderer = minecraftClient.font;
}
public void addAll(List<PuzzleWidget> buttons) {
int buttonX = this.width - 160;
for (PuzzleWidget button : buttons) {
try {
if (button.buttonType == ButtonType.TEXT)
this.addButton(List.of(), Component.literal("").append(button.descriptionText).withStyle(ChatFormatting.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);
}
catch (Exception e) {
LOGGER.error("Failed to add button {}. Likely caused by an update of the specific mod.", button.descriptionText);
}
}
}
public void addButton(List<AbstractWidget> buttons, Component text) {
EntryInfo info = new EntryInfo(null, "puzzle");
if (buttons.isEmpty()) info.comment = new MidnightConfig.Comment(){
public Class<? extends Annotation> annotationType() {return null;}
public boolean centered() {return true;}
public String category() {return "";}
public String name() {return "";}
public String url() {return "";}
public String requiredMod() {return "";}
};
var entry = new ButtonEntry(buttons, text, info);
this.addEntry(entry);
}
public void /*? if >= 1.21 {*/ renderWidget /*?} else {*/ /*renderList *//*?}*/(GuiGraphics context, int mouseX, int mouseY, float delta) {
super./*? if >= 1.21 {*/ renderWidget /*?} else {*/ /*renderList *//*?}*/(context, mouseX, mouseY, delta);
ButtonEntry e = this.getHovered();
if (minecraft.screen instanceof PuzzleOptionsScreen page && e != null && !e.buttons.isEmpty() &&
e.text.getContents() instanceof TranslatableContents content) {
AbstractWidget button = e.buttons.get(0);
String key = null;
if (I18n.exists(content.getKey() + ".tooltip")) key = content.getKey() + ".tooltip";
else if (I18n.exists(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.exists(strippedContent + ".tooltip")) key = strippedContent + ".tooltip";
else if (I18n.exists(strippedContent + ".desc")) key = strippedContent + ".desc";
}
if (key != null) {
List<Component> list = new ArrayList<>();
for (String str : I18n.get(key).split("\n"))
list.add(Component.literal(str));
page.tooltip = list;
if (!button.isMouseOver(mouseX, mouseY)) {
context.setComponentTooltipForNextFrame(textRenderer, list, button.getX(), button.getY() + (button.getHeight() * 2));
}
else context.setComponentTooltipForNextFrame(textRenderer, list, mouseX, mouseY);
}
}
}
@Override
public ButtonEntry getHovered() {
return super.getHovered();
}
}

View File

@@ -0,0 +1,43 @@
package net.puzzlemc.gui.screen.widget;
import net.minecraft.client.gui.components.AbstractSliderButton;
import net.minecraft.network.chat.Component;
public class PuzzleSliderWidget extends AbstractSliderButton {
private final int min;
private final int max;
private final PuzzleWidget.TextAction setComponentAction;
private final PuzzleWidget.ChangeSliderValueAction changeAction;
public PuzzleSliderWidget(int min, int max, int x, int y, int width, int height, float defaultValue, PuzzleWidget.TextAction setComponentAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
super(x,y,width,height, Component.empty(),(defaultValue-min) / (max - min));
this.min = min;
this.max = max;
this.setComponentAction = setComponentAction;
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.setComponentAction.setTitle(this);
}
@Override
protected void applyValue() {
this.changeAction.onChange(this);
}
}

View File

@@ -0,0 +1,25 @@
package net.puzzlemc.gui.screen.widget;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.components.EditBox;
import net.minecraft.network.chat.Component;
public class PuzzleTextFieldWidget extends EditBox {
private final PuzzleWidget.SetTextValueAction setValueAction;
private final PuzzleWidget.ChangeTextValueAction change;
public PuzzleTextFieldWidget(Font font, int x, int y, int width, int height, PuzzleWidget.SetTextValueAction setValue, PuzzleWidget.ChangeTextValueAction change) {
super(font, x, y, width, height, Component.empty());
this.setValueAction = setValue;
this.change = change;
try {
setValueAction.setTextValue(this);
} catch (Exception e) {e.fillInStackTrace(); this.setVisible(false);}
}
@Override
public void setValue(String text) {
super.setValue(text);
this.change.onChange(this);
setValueAction.setTextValue(this);
}
}

View File

@@ -1,24 +1,21 @@
package net.puzzlemc.gui.screen.widget;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.ClickableWidget;
import net.minecraft.client.gui.widget.SliderWidget;
import net.minecraft.client.gui.widget.TextFieldWidget;
import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
import net.minecraft.client.gui.components.AbstractWidget;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.EditBox;
import net.minecraft.network.chat.Component;
import java.util.function.IntSupplier;
public class PuzzleWidget {
public ButtonType buttonType;
public int min;
public int max;
public Text descriptionText;
public Text buttonText;
public Component descriptionText;
public TextAction buttonTextAction;
public ButtonWidget.PressAction onPress;
public Button.OnPress onPress;
public PuzzleWidget.SetTextValueAction setTextValue;
public PuzzleWidget.SetSliderValueAction setSliderValue;
public IntSupplier defaultSliderValue;
public PuzzleWidget.ChangeTextValueAction changeTextValue;
public PuzzleWidget.ChangeSliderValueAction changeSliderValue;
@@ -26,7 +23,7 @@ public class PuzzleWidget {
* Puzzle Text Widget Container
* @param descriptionText The text you want to display.
*/
public PuzzleWidget(Text descriptionText) {
public PuzzleWidget(Component descriptionText) {
this.buttonType = ButtonType.TEXT;
this.descriptionText = descriptionText;
}
@@ -37,51 +34,45 @@ public class PuzzleWidget {
* @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) {
public PuzzleWidget(Component descriptionText, PuzzleWidget.TextAction getTitle, Button.OnPress onPress) {
this.buttonType = ButtonType.BUTTON;
this.descriptionText = descriptionText;
this.buttonTextAction = getTitle;
this.onPress = onPress;
}
/**
* Puzzle Slider Widget Container (WIP - Doesn't work)
* Puzzle Slider Widget Container
*/
public PuzzleWidget(int min, int max, Text descriptionText, PuzzleWidget.SetSliderValueAction setValueAction, PuzzleWidget.TextAction setTextAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
public PuzzleWidget(int min, int max, Component descriptionText, IntSupplier defaultSliderValue, PuzzleWidget.TextAction setTextAction, PuzzleWidget.ChangeSliderValueAction changeAction) {
this.buttonType = ButtonType.SLIDER;
this.min = min;
this.max = max;
this.descriptionText = descriptionText;
this.setSliderValue = setValueAction;
this.defaultSliderValue = defaultSliderValue;
this.buttonTextAction = setTextAction;
this.changeSliderValue = changeAction;
}
/**
* Puzzle Text Field Widget Container (WIP - Doesn't work)
*/
public PuzzleWidget(Text descriptionText, PuzzleWidget.SetTextValueAction setValue, ChangeTextValueAction changeAction, int a) {
public PuzzleWidget(int min, int max, Component 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;
}
@Environment(EnvType.CLIENT)
public interface ChangeTextValueAction {
void onChange(TextFieldWidget textField);
void onChange(EditBox textField);
}
@Environment(EnvType.CLIENT)
public interface ChangeSliderValueAction {
void onChange(PuzzleSliderWidget slider);
}
@Environment(EnvType.CLIENT)
public interface SetTextValueAction {
void setTextValue(TextFieldWidget textField);
void setTextValue(EditBox textField);
}
@Environment(EnvType.CLIENT)
public interface SetSliderValueAction {
void setSliderValue(PuzzleSliderWidget slider);
}
@Environment(EnvType.CLIENT)
public interface TextAction {
void setTitle(ClickableWidget button);
void setTitle(AbstractWidget button);
}
}

View File

@@ -0,0 +1,68 @@
package net.puzzlemc.models.mixin;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import net.minecraft.client.renderer.block.model.BlockElement;
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;
//? if < 1.21.11
/*import net.minecraft.util.GsonHelper;*/
@Mixin(BlockElement.Deserializer.class)
public abstract class MixinModelElementDeserializer {
//? if < 1.21.11 {
/*@Shadow protected abstract Vector3f getVector3f(JsonObject jsonObject, String string);
@Inject(at = @At("HEAD"),method = "getAngle", cancellable = true)
private void puzzle$deserializeRotationAngle(JsonObject object, CallbackInfoReturnable<Float> cir) {
if (PuzzleConfig.unlimitedRotations) {
float angle = GsonHelper.getAsFloat(object, "angle");
cir.setReturnValue(angle);
}
}
@Inject(at = @At("HEAD"),method = "getTo", cancellable = true)
private void puzzle$deserializeTo(JsonObject object, CallbackInfoReturnable<Vector3f> cir) {
if (PuzzleConfig.biggerModels) {
Vector3f vec3f = this.getVector3f(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 = "getFrom", cancellable = true)
private void puzzle$deserializeFrom(JsonObject object, CallbackInfoReturnable<Vector3f> cir) {
if (PuzzleConfig.biggerModels) {
Vector3f vec3f = this.getVector3f(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);
}
}
}
*///?} else {
@Shadow
private static Vector3f getVector3f(JsonObject jsonObject, String string) {
throw new RuntimeException("MixinModelElementDeserializer from Puzzle could not be loaded properly");
}
@Inject(at = @At("HEAD"),method = "getPosition", cancellable = true)
private static void puzzle$deserializePos(JsonObject object, String string, CallbackInfoReturnable<Vector3f> cir) {
if (PuzzleConfig.biggerModels) {
Vector3f vec3f = getVector3f(object, string);
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("'%s' specifier exceeds the allowed boundaries: %s".formatted(string, vec3f));
}
}
}
//?}
}

View File

@@ -0,0 +1,280 @@
package net.puzzlemc.splashscreen;
import com.mojang.blaze3d.platform.NativeImage;
import eu.midnightdust.lib.util.MidnightColorUtil;
import eu.midnightdust.lib.util.PlatformFunctions;
import net.minecraft.util.Util;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.DynamicTexture;
import net.minecraft.client.renderer.texture.ReloadableTexture;
import net.minecraft.client.resources.metadata.texture.TextureMetadataSection;
import net.minecraft.resources.Identifier;
import net.minecraft.server.packs.PackType;
import net.minecraft.server.packs.VanillaPackResources;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
import net.puzzlemc.core.config.PuzzleConfig;
import org.jetbrains.annotations.NotNull;
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;
//? if >= 1.21.5 {
import com.mojang.blaze3d.pipeline.RenderPipeline;
import com.mojang.blaze3d.pipeline.BlendFunction;
import com.mojang.blaze3d.platform.DepthTestFunction;
import com.mojang.blaze3d.platform.DestFactor;
import com.mojang.blaze3d.platform.SourceFactor;
import net.minecraft.client.renderer.texture.TextureContents;
import net.puzzlemc.splashscreen.mixin.RenderPipelinesAccessor;
//?}
//? if = 1.21.4 || = 1.21.5 {
/*import net.minecraft.client.gui.screens.LoadingOverlay;
import net.minecraft.client.renderer.RenderStateShard;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.util.TriState;
import net.minecraft.client.renderer.texture.TextureContents;
*///?}
//? if = 1.21.4 {
/*import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.VertexFormat;
import com.mojang.blaze3d.platform.GlStateManager;
import static net.minecraft.client.renderer.RenderStateShard.*;
*///?}
//? if >= 1.21.11
import net.minecraft.client.renderer.texture.MipmapStrategy;
import static net.puzzlemc.core.PuzzleCore.LOGGER;
import static net.puzzlemc.core.PuzzleCore.MOD_ID;
public class PuzzleSplashScreen {
public static final Identifier LOGO = Identifier.fromNamespaceAndPath("minecraft", "textures/gui/title/mojangstudios.png");
public static final Identifier BACKGROUND = Identifier.fromNamespaceAndPath("minecraft", "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 Minecraft client = Minecraft.getInstance();
private static boolean keepBackground = false;
//? if >= 1.21.5
public static RenderPipeline CUSTOM_LOGO_PIPELINE;
//? if = 1.21.5 || = 1.21.4
/*public static RenderType CUSTOM_LOGO_LAYER;*/
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.getPlatform().equals(Util.OS.WINDOWS)) {
try { Files.setAttribute(CONFIG_PATH.toPath(), "dos:hidden", true);
} catch (IOException ignored) {}
}
}
}
//? if >= 1.21.4
buildRenderLayer();
}
//? if >= 1.21.4 {
public static void buildRenderLayer() {
if (PuzzleConfig.resourcepackSplashScreen) {
//? if >= 1.21.5 {
BlendFunction blendFunction = new BlendFunction(SourceFactor.SRC_ALPHA, DestFactor.ONE);
if (PuzzleConfig.disableBlend) blendFunction = null;
else if (PuzzleConfig.customBlendFunction.size() == 4) {
try {
blendFunction = new BlendFunction(
SourceFactor.valueOf(PuzzleConfig.customBlendFunction.get(0)),
DestFactor.valueOf(PuzzleConfig.customBlendFunction.get(1)),
SourceFactor.valueOf(PuzzleConfig.customBlendFunction.get(2)),
DestFactor.valueOf(PuzzleConfig.customBlendFunction.get(3)));
} catch (Exception e) {
LOGGER.error("Incorrect blend function defined in color.properties: {}{}", PuzzleConfig.customBlendFunction, e.getMessage());
}
}
var CUSTOM_LOGO_PIPELINE_BUILDER = RenderPipeline.builder(RenderPipelinesAccessor.getGUI_TEXTURED_SNIPPET())
.withLocation("pipeline/mojang_logo_puzzle")
.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST)
.withDepthWrite(false);
CUSTOM_LOGO_PIPELINE_BUILDER = blendFunction != null ? CUSTOM_LOGO_PIPELINE_BUILDER.withBlend(blendFunction) : CUSTOM_LOGO_PIPELINE_BUILDER.withoutBlend();
CUSTOM_LOGO_PIPELINE = CUSTOM_LOGO_PIPELINE_BUILDER.build();
//?}
//? if = 1.21.5 {
/*CUSTOM_LOGO_LAYER = RenderType.create("mojang_logo_puzzle", 786432, CUSTOM_LOGO_PIPELINE,
RenderType.CompositeState.builder()
.setTextureState(new RenderStateShard.TextureStateShard(LoadingOverlay.MOJANG_STUDIOS_LOGO_LOCATION, TriState.DEFAULT, false))
.createCompositeState(false));
*///?} else if = 1.21.4 {
/*RenderStateShard.TransparencyStateShard transparency = new RenderStateShard.TransparencyStateShard("puzzle_logo_transparency", () -> {
RenderSystem.enableBlend();
if (PuzzleConfig.disableBlend) RenderSystem.disableBlend();
else if (PuzzleConfig.customBlendFunction.size() == 4) {
try {
RenderSystem.blendFuncSeparate(
GlStateManager.SourceFactor.valueOf(PuzzleConfig.customBlendFunction.get(0)),
GlStateManager.DestFactor.valueOf(PuzzleConfig.customBlendFunction.get(1)),
GlStateManager.SourceFactor.valueOf(PuzzleConfig.customBlendFunction.get(2)),
GlStateManager.DestFactor.valueOf(PuzzleConfig.customBlendFunction.get(3)));
} catch (Exception e) {
LOGGER.error("Incorrect blend function defined in color.properties: {}{}", PuzzleConfig.customBlendFunction, e.getMessage());
}
}
}, () -> {
RenderSystem.disableBlend();
RenderSystem.defaultBlendFunc();
});
CUSTOM_LOGO_LAYER = RenderType.create("mojang_logo", DefaultVertexFormat.POSITION_TEX_COLOR, VertexFormat.Mode.QUADS, 786432, RenderType.CompositeState.builder().setTextureState(new RenderStateShard.TextureStateShard(LoadingOverlay.MOJANG_STUDIOS_LOGO_LOCATION, TriState.DEFAULT, false))
.setShaderState(POSITION_TEXTURE_COLOR_SHADER)
.setTransparencyState(transparency)
.setDepthTestState(NO_DEPTH_TEST)
.setWriteMaskState(COLOR_WRITE)
.createCompositeState(false));
*///?}
}
}
//?}
public static class ReloadListener implements ResourceManagerReloadListener {
public static final ReloadListener INSTANCE = new ReloadListener();
private ReloadListener() {}
@Override
public void onResourceManagerReload(ResourceManager manager) {
client = Minecraft.getInstance();
if (PuzzleConfig.resourcepackSplashScreen) {
PuzzleSplashScreen.resetColors();
client.getTextureManager()./*? if >= 1.21.4 {*/ registerAndLoad /*?} else {*//*register*//*?}*/(LOGO, new LogoTexture(LOGO));
client.getTextureManager()./*? if >= 1.21.4 {*/ registerAndLoad /*?} else {*//*register*//*?}*/(BACKGROUND, new LogoTexture(BACKGROUND));
manager.listResources("optifine", path -> path.getPath().contains("color.properties")).forEach((id, resource) -> {
try (InputStream stream = resource.open()) {
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.listResources("textures", path -> path.getPath().contains("mojangstudios.png")).forEach((id, resource) -> {
try (InputStream stream = resource.open()) {
Files.copy(stream, LOGO_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
client.getTextureManager()./*? if >= 1.21.4 {*/ registerAndLoad /*?} else {*//*register*//*?}*/(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.listResources(MOD_ID, path -> path.getPath().contains("splash_background.png")).forEach((id, resource) -> {
try (InputStream stream = resource.open()) {
Files.copy(stream, BACKGROUND_TEXTURE, StandardCopyOption.REPLACE_EXISTING);
InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE));
client.getTextureManager().register(BACKGROUND, new DynamicTexture(/*? if >= 1.21.5 {*/ () -> "splash_screen_background", /*?}*/ 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);
//? if >= 1.21.5
buildRenderLayer();
}
}
}
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 ReloadableTexture {
public LogoTexture(Identifier logo) {
super(logo);
}
@Override
public @NotNull TextureContents loadContents(ResourceManager resourceManager) {
Minecraft client = Minecraft.getInstance();
VanillaPackResources defaultResourcePack = client.getVanillaPackResources();
try (InputStream input = Objects.requireNonNull(defaultResourcePack.getResource(PackType.CLIENT_RESOURCES, LOGO)).get()) {
return /*? if >= 1.21.4 {*/ new TextureContents(NativeImage.read(input), new TextureMetadataSection(true, true /*? if >= 1.21.11 {*/, MipmapStrategy.AUTO, 0 /*?}*/)) /*?} else {*/ /*new TextureContents(new TextureMetadataSection(true, true), NativeImage.read(input)) *//*?}*/;
} catch (IOException ex) {
return /*? if >= 1.21.4 {*/ TextureContents.createMissing() /*?} else {*/ /*new TextureContents(ex) *//*?}*/;
}
}
}
public static class DynamicLogoTexture extends ReloadableTexture {
public DynamicLogoTexture() {
super(LOGO);
}
@Override
public @NotNull TextureContents loadContents(ResourceManager resourceManager) {
try (InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.LOGO_TEXTURE))) {
return /*? if >= 1.21.4 {*/ new TextureContents(NativeImage.read(input), new TextureMetadataSection(true, true/*? if >= 1.21.11 {*/, MipmapStrategy.AUTO, 0 /*?}*/)) /*?} else {*/ /*new TextureContents(new TextureMetadataSection(true, true), NativeImage.read(input)) *//*?}*/;
} catch (IOException e) {
LOGGER.error("Encountered an error during logo loading: ", e);
//? if >= 1.21.4 {
try {
return TextureContents.load(resourceManager, LOGO);
} catch (IOException ex) {
return TextureContents.createMissing();
}
//?} else {
/*return TextureContents.load(resourceManager, LOGO);
*///?}
}
}
}
}

View File

@@ -0,0 +1,38 @@
package net.puzzlemc.splashscreen.mixin;
//? neoforge {
/*import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.LoadingOverlay;
import net.minecraft.server.packs.resources.ReloadInstance;
import net.neoforged.fml.earlydisplay.DisplayWindow;
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 LoadingOverlay {
public MixinNeoForgeLoadingOverlay(Minecraft arg, ReloadInstance arg2, Consumer<Optional<Throwable>> consumer, boolean bl) {
super(arg, arg2, consumer, bl);
}
@Inject(method = "<init>", at = @At("TAIL"))
private void puzzle$initTexturesNeoforge(Minecraft mc, ReloadInstance reloader, Consumer<Optional<Throwable>> errorConsumer, DisplayWindow displayWindow, CallbackInfo ci) {
LoadingOverlay.registerTextures(/^? if >= 1.21.4 {^/ mc.getTextureManager() /^?} else {^/ /^mc ^//^?}^/);
}
@Inject(method = "render", at = @At("HEAD"), cancellable = true) // Replaces the NeoForge loading screen in later stages with the (customized) vanilla version
private void puzzle$redirectNeoForgeLoading(GuiGraphics context, int mouseX, int mouseY, float tickDelta, CallbackInfo ci) {
if (PuzzleConfig.resourcepackSplashScreen && PuzzleConfig.hasCustomSplashScreen) {
super.render(context, mouseX, mouseY, tickDelta);
ci.cancel();
}
}
}
*///?}

View File

@@ -0,0 +1,168 @@
package net.puzzlemc.splashscreen.mixin;
import com.mojang.blaze3d.platform.NativeImage;
import net.minecraft.util.Util;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.screens.LoadingOverlay;
import net.minecraft.client.gui.screens.Overlay;
import net.minecraft.client.renderer.texture.DynamicTexture;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.resources.Identifier;
import net.minecraft.util.Mth;
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;
//? if >= 1.21.8 {
import net.minecraft.util.ARGB;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import com.mojang.blaze3d.pipeline.RenderPipeline;
import net.minecraft.client.renderer.RenderPipelines;
//?} else if >= 1.21.4 {
/*import net.minecraft.util.ARGB;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import net.minecraft.client.renderer.RenderType;
import java.util.function.Function;
*///?} else {
/*import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.renderer.GameRenderer;
import static net.puzzlemc.core.PuzzleCore.LOGGER;
*///?}
import static net.puzzlemc.splashscreen.PuzzleSplashScreen.BACKGROUND;
//? if >= 1.21.4
import static net.minecraft.client.gui.screens.LoadingOverlay.MOJANG_STUDIOS_LOGO_LOCATION;
@Mixin(value = LoadingOverlay.class, priority = 2000)
public abstract class MixinSplashScreen extends Overlay {
@Shadow private long fadeInStart;
@Shadow @Final private Minecraft minecraft;
@Shadow @Final private boolean fadeIn;
@Shadow private long fadeOutStart;
@Shadow
private static int replaceAlpha(int color, int alpha) {
return 0;
}
//? if < 1.21.4
/*@Shadow @Final static Identifier MOJANG_STUDIOS_LOGO_LOCATION;*/
@Inject(method = "registerTextures", at = @At("TAIL")) // Load our custom textures at game start //
//? if >= 1.21.4 {
private static void puzzle$initSplashscreen(TextureManager textureManager, CallbackInfo ci) {
//?} else {
/*private static void puzzle$initSplashscreen(Minecraft client, CallbackInfo ci) {
TextureManager textureManager = client.getTextureManager();
*///?}
if (PuzzleConfig.resourcepackSplashScreen) {
if (PuzzleSplashScreen.LOGO_TEXTURE.toFile().exists()) {
textureManager./*? if >= 1.21.4 {*/ registerAndLoad /*?} else {*//*register*//*?}*/(MOJANG_STUDIOS_LOGO_LOCATION, new PuzzleSplashScreen.DynamicLogoTexture());
}
if (PuzzleSplashScreen.BACKGROUND_TEXTURE.toFile().exists()) {
try {
InputStream input = new FileInputStream(String.valueOf(PuzzleSplashScreen.BACKGROUND_TEXTURE));
textureManager.register(BACKGROUND, new DynamicTexture(/*? if >= 1.21.5 {*/ () ->"splash_screen_background", /*?}*/ 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;
}
//? if >= 1.21.8 {
@WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blit(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/Identifier;IIFFIIIIIII)V"))
private void puzzle$modifyRenderLayer(GuiGraphics context, RenderPipeline pipeline, Identifier sprite, int x, int y, float u, float v, int width, int height, int regionWidth, int regionHeight, int textureWidth, int textureHeight, int color, Operation<Void> original) {
if (PuzzleConfig.resourcepackSplashScreen)
context.blit(PuzzleSplashScreen.CUSTOM_LOGO_PIPELINE, sprite, x, y, u, v, width, height, regionWidth, regionHeight, textureWidth, textureHeight, color);
else context.blit(pipeline, sprite, x, y, u, v, width, height, textureWidth, textureHeight, color);
}
//?} else if >= 1.21.4 {
/*@WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blit(Ljava/util/function/Function;Lnet/minecraft/resources/Identifier;IIFFIIIIIII)V"))
private void puzzle$modifyRenderLayer(GuiGraphics context, Function<Identifier, RenderType> renderType, Identifier sprite, int x, int y, float u, float v, int width, int height, int regionWidth, int regionHeight, int textureWidth, int textureHeight, int color, Operation<Void> original) {
if (PuzzleConfig.resourcepackSplashScreen)
context.blit(id -> PuzzleSplashScreen.CUSTOM_LOGO_LAYER, sprite, x, y, u, v, width, height, regionWidth, regionHeight, textureWidth, textureHeight, color);
else context.blit(renderType, sprite, x, y, u, v, width, height, textureWidth, textureHeight, color);
}
*///?} else {
/*@Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;blendFunc(II)V", shift = At.Shift.AFTER), remap = false)
private void puzzle$betterBlend(GuiGraphics 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.SourceFactor.valueOf(PuzzleConfig.customBlendFunction.get(0)),
GlStateManager.DestFactor.valueOf(PuzzleConfig.customBlendFunction.get(1)),
GlStateManager.SourceFactor.valueOf(PuzzleConfig.customBlendFunction.get(2)),
GlStateManager.DestFactor.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/GuiGraphics;guiWidth()I", ordinal = 2))
private void puzzle$renderSplashBackground(GuiGraphics context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
if (Files.exists(PuzzleSplashScreen.BACKGROUND_TEXTURE) && PuzzleConfig.resourcepackSplashScreen) {
int width = minecraft.getWindow().getGuiScaledWidth();
int height = minecraft.getWindow().getGuiScaledHeight();
long l = Util.getMillis();
float f = this.fadeOutStart > -1L ? (float)(l - this.fadeOutStart) / 1000.0F : -1.0F;
float g = this.fadeInStart> -1L ? (float)(l - this.fadeInStart) / 500.0F : -1.0F;
float s;
if (f >= 1.0F) s = 1.0F - Mth.clamp(f - 1.0F, 0.0F, 1.0F);
else if (fadeIn) s = Mth.clamp(g, 0.0F, 1.0F);
else s = 1.0F;
//? if >= 1.21.8 {
context.blit(RenderPipelines.GUI_TEXTURED, BACKGROUND, 0, 0, 0, 0, width, height, width, height, ARGB.white(s));
//?} else if >= 1.21.4 {
/*context.blit(RenderType::guiTextured, BACKGROUND, 0, 0, 0, 0, width, height, width, height, ARGB.white(s));
*///?} else {
/*RenderSystem.enableBlend();
RenderSystem.defaultBlendFunc();
RenderSystem.setShader(GameRenderer::getPositionTexShader);
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, s);
context.blit(BACKGROUND, 0, 0, 0, 0, width, height, width, height);
RenderSystem.disableBlend();
*///?}
}
}
@Inject(method = "drawProgressBar", at = @At("HEAD"))
private void puzzle$addProgressBarBackground(GuiGraphics context, int minX, int minY, int maxX, int maxY, float opacity, CallbackInfo ci) {
if (!PuzzleConfig.resourcepackSplashScreen || PuzzleConfig.progressBarBackgroundColor == 15675965) return;
long l = Util.getMillis();
float f = this.fadeOutStart > -1L ? (float)(l - this.fadeOutStart) / 1000.0F : -1.0F;
int m = Mth.ceil((1.0F - Mth.clamp(f - 1.0F, 0.0F, 1.0F)) * 255.0F);
context.fill(minX, minY, maxX, maxY, replaceAlpha(PuzzleConfig.progressBarBackgroundColor, m));
}
@ModifyArg(method = "drawProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;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 = "drawProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;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;
}
}

View File

@@ -0,0 +1,23 @@
package net.puzzlemc.splashscreen.mixin;
//? if >= 1.21.5 {
import com.mojang.blaze3d.pipeline.RenderPipeline;
import net.minecraft.client.renderer.RenderPipelines;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(RenderPipelines.class)
public interface RenderPipelinesAccessor {
@Accessor
static RenderPipeline.Snippet getGUI_TEXTURED_SNIPPET() {
return null;
}
}
//?} else {
/*import eu.midnightdust.core.MidnightLib;
import org.spongepowered.asm.mixin.Mixin;
@Mixin(MidnightLib.class)
public interface RenderPipelinesAccessor {} // TODO: Properly disable this mixin when on 1.21.1 and lower
*///?}

View File

@@ -0,0 +1,37 @@
modLoader = "javafml"
loaderVersion = "[2,)"
#issueTrackerURL = ""
license = "MIT License"
[[mods]]
modId = "${id}"
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 = "${minecraft}"
ordering = "NONE"
side = "CLIENT"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View 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Стандартна"
}

View 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"
}

View 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"
}

View File

@@ -1,19 +1,43 @@
{
"puzzle.text.update_available":"An update is available!",
"puzzle.screen.title":"Puzzle Settings",
"puzzle.page.graphics":"Graphics Settings",
"puzzle.page.resources":"Resource Settings",
"puzzle.page.performance":"Performance Settings",
"puzzle.page.misc":"Miscellaneous Settings",
"puzzle.page.graphics":"Graphics",
"puzzle.page.resources":"Resource",
"puzzle.page.performance":"Performance",
"puzzle.page.misc":"Miscellaneous",
"puzzle.action.open_config_screen":"Open config screen",
"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.disable_splash_screen_blend":"Disable splash screen logo blending",
"puzzle.option.emissive_textures":"Emissive Textures",
"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.render_layer_overrides":"Render Layer Overrides",
"puzzle.midnightconfig.title":"Title",
"puzzle.midnightconfig.showPuzzleInfo":"Show Puzzle Info",
"puzzle.midnightconfig.showPuzzleInfo.tooltip":"Show Puzzle Info"
"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"
}

View 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"
}

View 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"
}

Some files were not shown because too many files have changed in this diff Show More