From dc26d2110cad905afa0d3d0caae896dace710f78 Mon Sep 17 00:00:00 2001 From: Jamalam Date: Thu, 24 Oct 2024 14:36:08 +0100 Subject: [PATCH 01/21] feat: update to 1.21.3 --- .../jamlib/config/gui/ButtonWithTextureWidget.java | 3 ++- .../jamalam360/jamlib/config/gui/ConfigScreen.java | 9 ++++----- fabric/build.gradle | 4 ++-- gradle.properties | 9 +++++---- libs.versions.toml | 8 ++++---- neoforge/build.gradle | 4 ++-- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/ButtonWithTextureWidget.java b/common/src/main/java/io/github/jamalam360/jamlib/config/gui/ButtonWithTextureWidget.java index 5fa9bb6..bb88202 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/ButtonWithTextureWidget.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/config/gui/ButtonWithTextureWidget.java @@ -3,6 +3,7 @@ import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.Tooltip; +import net.minecraft.client.renderer.RenderType; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; @@ -28,6 +29,6 @@ protected void renderWidget(GuiGraphics guiGraphics, int i, int j, float f) { int x = this.getX() + (this.width - this.textureWidth) / 2; int y = this.getY() + (this.height - this.textureHeight) / 2; - guiGraphics.blit(this.texture, x, y, this.textureWidth, this.textureHeight, 0.0F, 0.0F, this.textureWidth, this.textureHeight, this.textureWidth, this.textureHeight); + guiGraphics.blit(RenderType::guiTextured, this.texture, x, y, this.textureWidth, this.textureHeight, this.textureWidth, this.textureHeight, this.textureWidth, this.textureHeight); } } diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/ConfigScreen.java b/common/src/main/java/io/github/jamalam360/jamlib/config/gui/ConfigScreen.java index 0dc23d1..ca79f22 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/ConfigScreen.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/config/gui/ConfigScreen.java @@ -33,6 +33,7 @@ import net.minecraft.client.gui.navigation.CommonInputs; import net.minecraft.client.gui.navigation.FocusNavigationEvent; import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.renderer.RenderType; import net.minecraft.client.resources.language.I18n; import net.minecraft.client.sounds.SoundManager; import net.minecraft.network.chat.CommonComponents; @@ -194,7 +195,7 @@ public void setTexture(ResourceLocation texture) { @Override public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) { - graphics.blit(this.texture, this.getX(), this.getY(), this.getWidth(), this.getHeight(), 0.0F, 0.0F, this.getWidth(), this.getHeight(), this.getWidth(), this.getHeight()); + graphics.blit(RenderType::guiTextured, this.texture, this.getX(), this.getY(), this.getWidth(), this.getHeight(), this.getWidth(), this.getHeight(), this.getWidth(), this.getHeight()); } @Override @@ -266,15 +267,13 @@ public void updateWidgetNarration(NarrationElementOutput narrationElementOutput) public void renderWidget(GuiGraphics guiGraphics, int i, int j, float f) { Minecraft minecraft = Minecraft.getInstance(); - guiGraphics.setColor(1.0F, 1.0F, 1.0F, this.alpha); RenderSystem.enableBlend(); RenderSystem.defaultBlendFunc(); RenderSystem.enableDepthTest(); - guiGraphics.blitSprite(this.getSprite(), this.getX(), this.getY(), this.getWidth(), this.getHeight()); + guiGraphics.blitSprite(RenderType::guiTextured, this.getSprite(), this.getX(), this.getY(), this.getWidth(), this.getHeight()); double position = (this.value) / (this.max - this.min); double handleX = this.getX() + position * (this.getWidth() - 8); - guiGraphics.blitSprite(this.getHandleSprite(), (int) handleX, this.getY(), 8, this.getHeight()); - guiGraphics.setColor(1.0F, 1.0F, 1.0F, 1.0F); + guiGraphics.blitSprite(RenderType::guiTextured, this.getHandleSprite(), (int) handleX, this.getY(), 8, this.getHeight()); int k = this.active ? 16777215 : 10526880; this.renderScrollingString(guiGraphics, minecraft.font, 2, k | Mth.ceil(this.alpha * 255.0F) << 24); } diff --git a/fabric/build.gradle b/fabric/build.gradle index 3e3aa75..f7cef2a 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -97,13 +97,13 @@ publishing { processResources { filesMatching("fabric.mod.json") { expand "version": project.version, - "minecraft_version": project.minecraft_version, + "minecraft_version": project.minimum_minecraft_version, "fabric_api_version": libs.versions.fabric.api.get(), "architectury_version": libs.versions.architectury.get() } inputs.property "version", project.version - inputs.property "minecraft_version", project.minecraft_version + inputs.property "minecraft_version", project.minimum_minecraft_version inputs.property "fabric_api_version", libs.versions.fabric.api.get() inputs.property "architectury_version", libs.versions.architectury.get() } diff --git a/gradle.properties b/gradle.properties index d3d66f3..e21f8d1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,11 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false org.gradle.parallel=true -version=1.2.1+1.21.1 -minecraft_version=1.21.1 -additional_minecraft_versions=1.21 -branch=1.21.1 +version=1.2.1+1.21.3 +minecraft_version=1.21.3 +additional_minecraft_versions=1.21.2 +minimum_minecraft_version=1.21.2 +branch=main group=io.github.jamalam360 mod_name=JamLib mod_id=jamlib diff --git a/libs.versions.toml b/libs.versions.toml index 5aa09b0..b9f18f7 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -1,20 +1,20 @@ [versions] # https://modrinth.com/mod/architectury-api/versions -architectury = "13.0.6" +architectury = "14.0.3" # https://parchmentmc.org/docs/getting-started parchment-minecraft = "1.21" parchment = "2024.07.28" # https://projects.neoforged.net/neoforged/neoforge -neoforge = "21.1.72" +neoforge = "21.3.1-beta" # https://fabricmc.net/develop fabric-loader = "0.16.7" -fabric-api = "0.106.0+1.21.1" +fabric-api = "0.106.1+1.21.3" # https://modrinth.com/mod/modmenu/versions -modmenu = "11.0.1" +modmenu = "12.0.0-beta.1" # https://github.com/falkreon/Jankson/releases/latest jankson = "1.2.3" diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 8ce455f..68c58e0 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -97,11 +97,11 @@ publishing { processResources { filesMatching("neoforge.mods.toml") { - expand "minecraft_version": project.minecraft_version, + expand "minecraft_version": project.minimum_minecraft_version, "architectury_version": libs.versions.architectury.get() } - inputs.property "minecraft_version", project.minecraft_version + inputs.property "minecraft_version", project.minimum_minecraft_version inputs.property "architectury_version", libs.versions.architectury.get() } From 8fcedebb920444647d97ccebc49dfd125bf52261 Mon Sep 17 00:00:00 2001 From: Jamalam Date: Thu, 24 Oct 2024 15:33:33 +0100 Subject: [PATCH 02/21] fix: processResources on NeoForge now works --- neoforge/build.gradle | 8 ++++++-- neoforge/src/main/resources/META-INF/neoforge.mods.toml | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 68c58e0..64f57af 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -96,12 +96,16 @@ publishing { } processResources { - filesMatching("neoforge.mods.toml") { - expand "minecraft_version": project.minimum_minecraft_version, + filesMatching("META-INF/neoforge.mods.toml") { + expand "version": project.version, + "minecraft_version": project.minimum_minecraft_version, + "neoforge_version": libs.versions.neoforge.get(), "architectury_version": libs.versions.architectury.get() } + inputs.property "version", project.version inputs.property "minecraft_version", project.minimum_minecraft_version + inputs.property "neoforge_version", libs.versions.neoforge.get() inputs.property "architectury_version", libs.versions.architectury.get() } diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 1019f4f..6f06682 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -5,7 +5,7 @@ issueTrackerURL = "https://github.com/JamCoreModding/jamlib/issues" [[mods]] modId = "jamlib" -version = "${file.jarVersion}" +version = "${version}" displayName = "JamLib" displayURL = "https://github.com/JamCoreModding/jamlib" logoFile = "icon.png" @@ -15,7 +15,7 @@ description = '''The platform-agnostic library used in all of JamCore's mods''' [[dependencies.jamlib]] modId = "neoforge" type = "required" -versionRange = "[21,)" +versionRange = "[${neoforge_version},)" ordering = "NONE" side = "BOTH" From 265a22e0bced4fb49aa1f16335799b1907c17ac5 Mon Sep 17 00:00:00 2001 From: Jamalam Date: Thu, 24 Oct 2024 15:47:12 +0100 Subject: [PATCH 03/21] fix: don't use legacy mixin ap --- build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index 04b40d3..5238225 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,10 @@ subprojects { loom { silentMojangMappingsLicense() + + mixin { + useLegacyMixinAp = false + } } jar { From fba1f028a33d797032dd5bacf264afea13aa6f7c Mon Sep 17 00:00:00 2001 From: Jamalam Date: Thu, 24 Oct 2024 16:29:05 +0100 Subject: [PATCH 04/21] feat: bump version --- CHANGELOG.md | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b4ad77..cb4816d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1 @@ -- Add `ClientPlayLifecycleEvents`. +- Update to 1.21.3/2 diff --git a/gradle.properties b/gradle.properties index e21f8d1..f4f7cc2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false org.gradle.parallel=true -version=1.2.1+1.21.3 +version=1.2.2+1.21.3 minecraft_version=1.21.3 additional_minecraft_versions=1.21.2 minimum_minecraft_version=1.21.2 From 54bda9ee6433d977a7881b1d2b909326052273a8 Mon Sep 17 00:00:00 2001 From: Jamalam Date: Fri, 13 Dec 2024 16:18:31 +0000 Subject: [PATCH 05/21] feat: 1.21.4 update --- CHANGELOG.md | 2 +- build.gradle | 2 +- .../jamlib/config/gui/SelectionList.java | 2 +- fabric/build.gradle | 17 ++++---- gradle.properties | 12 ++++-- gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 38 ++++++++++++------ gradlew.bat | 23 ++++++----- libs.versions.toml | 14 +++---- neoforge/build.gradle | 15 ++++--- .../resources/META-INF/neoforge.mods.toml | 4 +- 12 files changed, 80 insertions(+), 53 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b4ad77..cdc7898 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1 @@ -- Add `ClientPlayLifecycleEvents`. +Update to 1.21.4 diff --git a/build.gradle b/build.gradle index 04b40d3..7defb21 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "architectury-plugin" version "3.4-SNAPSHOT" - id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false + id "dev.architectury.loom" version "1.9-SNAPSHOT" apply false id "com.github.breadmoirai.github-release" version "2.4.1" id "maven-publish" } diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/SelectionList.java b/common/src/main/java/io/github/jamalam360/jamlib/config/gui/SelectionList.java index 866fb92..97fd5f1 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/SelectionList.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/config/gui/SelectionList.java @@ -49,7 +49,7 @@ private SelectionListEntry getHoveredEntry(int mouseX, int mouseY) { } @Override - protected int getScrollbarPosition() { + protected int scrollBarX() { return this.width - 7; } diff --git a/fabric/build.gradle b/fabric/build.gradle index f7cef2a..152eb11 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -95,17 +95,18 @@ publishing { } processResources { + def substitutions = [ + "version" : project.version, + "minecraft_version" : project.minimum_minecraft_version, + "fabric_api_version" : project.minimum_fabric_api_version, + "architectury_version": project.minimum_architectury_api_version + ] + filesMatching("fabric.mod.json") { - expand "version": project.version, - "minecraft_version": project.minimum_minecraft_version, - "fabric_api_version": libs.versions.fabric.api.get(), - "architectury_version": libs.versions.architectury.get() + expand substitutions } - inputs.property "version", project.version - inputs.property "minecraft_version", project.minimum_minecraft_version - inputs.property "fabric_api_version", libs.versions.fabric.api.get() - inputs.property "architectury_version", libs.versions.architectury.get() + substitutions.each { inputs.property it.key, it.value } } shadowJar { diff --git a/gradle.properties b/gradle.properties index e21f8d1..862c8ef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,14 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false org.gradle.parallel=true -version=1.2.1+1.21.3 -minecraft_version=1.21.3 -additional_minecraft_versions=1.21.2 -minimum_minecraft_version=1.21.2 +version=1.2.2+1.21.4 +minecraft_version=1.21.4 + +additional_minecraft_versions= +minimum_minecraft_version=1.21.4 +minimum_architectury_api_version=15.0.1 +minimum_fabric_api_version=0.111.0+1.21.4 + branch=main group=io.github.jamalam360 mod_name=JamLib diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832f090a2944b7473328c07c9755baa3196..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 60756 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 /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +134,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index f127cfd..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -26,6 +28,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -42,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/libs.versions.toml b/libs.versions.toml index b9f18f7..9e0d330 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -1,20 +1,20 @@ [versions] # https://modrinth.com/mod/architectury-api/versions -architectury = "14.0.3" +architectury = "15.0.1" # https://parchmentmc.org/docs/getting-started -parchment-minecraft = "1.21" -parchment = "2024.07.28" +parchment-minecraft = "1.21.4" +parchment = "2024.12.07" # https://projects.neoforged.net/neoforged/neoforge -neoforge = "21.3.1-beta" +neoforge = "21.4.13-beta" # https://fabricmc.net/develop -fabric-loader = "0.16.7" -fabric-api = "0.106.1+1.21.3" +fabric-loader = "0.16.9" +fabric-api = "0.111.0+1.21.4" # https://modrinth.com/mod/modmenu/versions -modmenu = "12.0.0-beta.1" +modmenu = "13.0.0-beta.1" # https://github.com/falkreon/Jankson/releases/latest jankson = "1.2.3" diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 68c58e0..8d05c19 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -96,13 +96,18 @@ publishing { } processResources { - filesMatching("neoforge.mods.toml") { - expand "minecraft_version": project.minimum_minecraft_version, - "architectury_version": libs.versions.architectury.get() + def substitutions = [ + "version" : project.version, + "minecraft_version" : project.minimum_minecraft_version, + "neoforge_version" : project.minimum_minecraft_version.substring(2), + "architectury_version": project.minimum_architectury_api_version + ] + + filesMatching("META-INF/neoforge.mods.toml") { + expand substitutions } - inputs.property "minecraft_version", project.minimum_minecraft_version - inputs.property "architectury_version", libs.versions.architectury.get() + substitutions.each { inputs.property it.key, it.value } } shadowJar { diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 1019f4f..6f06682 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -5,7 +5,7 @@ issueTrackerURL = "https://github.com/JamCoreModding/jamlib/issues" [[mods]] modId = "jamlib" -version = "${file.jarVersion}" +version = "${version}" displayName = "JamLib" displayURL = "https://github.com/JamCoreModding/jamlib" logoFile = "icon.png" @@ -15,7 +15,7 @@ description = '''The platform-agnostic library used in all of JamCore's mods''' [[dependencies.jamlib]] modId = "neoforge" type = "required" -versionRange = "[21,)" +versionRange = "[${neoforge_version},)" ordering = "NONE" side = "BOTH" From 2e644e229237885f2ee1a1210b5741371840c5c8 Mon Sep 17 00:00:00 2001 From: Jamalam Date: Fri, 13 Dec 2024 16:22:58 +0000 Subject: [PATCH 06/21] fix: check additional_minecraft_versions is not empty before splitting it --- fabric/build.gradle | 2 +- neoforge/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fabric/build.gradle b/fabric/build.gradle index 152eb11..600ae88 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -42,7 +42,7 @@ if (System.getenv("CURSEFORGE_API_KEY") != null && System.getenv("MODRINTH_API_K displayName = "V${project.version} (Fabric ${project.minecraft_version})" changelog = rootProject.file("CHANGELOG.md").text releaseType = project.version.contains("beta") ? "beta" : "release" - gameVersions = [project.minecraft_version, *project.additional_minecraft_versions.split(",")] + gameVersions = [project.minecraft_version, *(project.additional_minecraft_versions == "" ? [] : project.additional_minecraft_versions.split(","))] gameLoaders = ["fabric", "quilt"] mainPublication tasks.remapJar diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 8d05c19..a45edbb 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -48,7 +48,7 @@ if (System.getenv("CURSEFORGE_API_KEY") != null && System.getenv("MODRINTH_API_K displayName = "V${project.version} (NeoForge ${project.minecraft_version})" changelog = rootProject.file("CHANGELOG.md").text releaseType = project.version.contains("beta") ? "beta" : "release" - gameVersions = [project.minecraft_version, *project.additional_minecraft_versions.split(",")] + gameVersions = [project.minecraft_version, *(project.additional_minecraft_versions == "" ? [] : project.additional_minecraft_versions.split(","))] gameLoaders = ["neoforge"] mainPublication tasks.remapJar From 94e0a58f628c91b6518d1ac30391ce2fc087f029 Mon Sep 17 00:00:00 2001 From: Jamalam Date: Fri, 13 Dec 2024 16:35:13 +0000 Subject: [PATCH 07/21] fix: change dependency logic (closes #8) --- CHANGELOG.md | 2 +- fabric/build.gradle | 19 ++++++++++--------- gradle.properties | 6 +++++- libs.versions.toml | 2 +- neoforge/build.gradle | 17 +++++++++++------ .../resources/META-INF/neoforge.mods.toml | 4 ++-- 6 files changed, 30 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b4ad77..c30378b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1 @@ -- Add `ClientPlayLifecycleEvents`. +- Change dependency logic (closes #8) diff --git a/fabric/build.gradle b/fabric/build.gradle index f7cef2a..600ae88 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -42,7 +42,7 @@ if (System.getenv("CURSEFORGE_API_KEY") != null && System.getenv("MODRINTH_API_K displayName = "V${project.version} (Fabric ${project.minecraft_version})" changelog = rootProject.file("CHANGELOG.md").text releaseType = project.version.contains("beta") ? "beta" : "release" - gameVersions = [project.minecraft_version, *project.additional_minecraft_versions.split(",")] + gameVersions = [project.minecraft_version, *(project.additional_minecraft_versions == "" ? [] : project.additional_minecraft_versions.split(","))] gameLoaders = ["fabric", "quilt"] mainPublication tasks.remapJar @@ -95,17 +95,18 @@ publishing { } processResources { + def substitutions = [ + "version" : project.version, + "minecraft_version" : project.minimum_minecraft_version, + "fabric_api_version" : project.minimum_fabric_api_version, + "architectury_version": project.minimum_architectury_api_version + ] + filesMatching("fabric.mod.json") { - expand "version": project.version, - "minecraft_version": project.minimum_minecraft_version, - "fabric_api_version": libs.versions.fabric.api.get(), - "architectury_version": libs.versions.architectury.get() + expand substitutions } - inputs.property "version", project.version - inputs.property "minecraft_version", project.minimum_minecraft_version - inputs.property "fabric_api_version", libs.versions.fabric.api.get() - inputs.property "architectury_version", libs.versions.architectury.get() + substitutions.each { inputs.property it.key, it.value } } shadowJar { diff --git a/gradle.properties b/gradle.properties index e21f8d1..0d413d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,14 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false org.gradle.parallel=true -version=1.2.1+1.21.3 +version=1.2.1-build.2+1.21.3 minecraft_version=1.21.3 + additional_minecraft_versions=1.21.2 minimum_minecraft_version=1.21.2 +minimum_architectury_api_version=14.0.4 +minimum_fabric_api_version=0.104.0+1.21.2 + branch=main group=io.github.jamalam360 mod_name=JamLib diff --git a/libs.versions.toml b/libs.versions.toml index b9f18f7..36560a5 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -1,6 +1,6 @@ [versions] # https://modrinth.com/mod/architectury-api/versions -architectury = "14.0.3" +architectury = "14.0.4" # https://parchmentmc.org/docs/getting-started parchment-minecraft = "1.21" diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 68c58e0..a45edbb 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -48,7 +48,7 @@ if (System.getenv("CURSEFORGE_API_KEY") != null && System.getenv("MODRINTH_API_K displayName = "V${project.version} (NeoForge ${project.minecraft_version})" changelog = rootProject.file("CHANGELOG.md").text releaseType = project.version.contains("beta") ? "beta" : "release" - gameVersions = [project.minecraft_version, *project.additional_minecraft_versions.split(",")] + gameVersions = [project.minecraft_version, *(project.additional_minecraft_versions == "" ? [] : project.additional_minecraft_versions.split(","))] gameLoaders = ["neoforge"] mainPublication tasks.remapJar @@ -96,13 +96,18 @@ publishing { } processResources { - filesMatching("neoforge.mods.toml") { - expand "minecraft_version": project.minimum_minecraft_version, - "architectury_version": libs.versions.architectury.get() + def substitutions = [ + "version" : project.version, + "minecraft_version" : project.minimum_minecraft_version, + "neoforge_version" : project.minimum_minecraft_version.substring(2), + "architectury_version": project.minimum_architectury_api_version + ] + + filesMatching("META-INF/neoforge.mods.toml") { + expand substitutions } - inputs.property "minecraft_version", project.minimum_minecraft_version - inputs.property "architectury_version", libs.versions.architectury.get() + substitutions.each { inputs.property it.key, it.value } } shadowJar { diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 1019f4f..6f06682 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -5,7 +5,7 @@ issueTrackerURL = "https://github.com/JamCoreModding/jamlib/issues" [[mods]] modId = "jamlib" -version = "${file.jarVersion}" +version = "${version}" displayName = "JamLib" displayURL = "https://github.com/JamCoreModding/jamlib" logoFile = "icon.png" @@ -15,7 +15,7 @@ description = '''The platform-agnostic library used in all of JamCore's mods''' [[dependencies.jamlib]] modId = "neoforge" type = "required" -versionRange = "[21,)" +versionRange = "[${neoforge_version},)" ordering = "NONE" side = "BOTH" From a8556c798c49a116d9758e5e541c257155e934e0 Mon Sep 17 00:00:00 2001 From: Jamalam Date: Thu, 20 Feb 2025 22:39:40 +0000 Subject: [PATCH 08/21] fix: ensure inherited fields are present in config GUIs (closes #13) --- .idea/scopes/Fabric_sources.xml | 3 --- .idea/scopes/Forge_sources.xml | 3 --- CHANGELOG.md | 2 +- .../io/github/jamalam360/jamlib/config/gui/ConfigScreen.java | 2 +- .../src/main/java/io/github/jamalam360/testmod/TestMod.java | 5 ++++- .../github/jamalam360/testmod/config/NestedConfigChild.java | 5 +++++ .../github/jamalam360/testmod/config/NestedConfigParent.java | 5 +++++ .../testmod/{ => config}/QuickerConnectButtonTestConfig.java | 2 +- .../github/jamalam360/testmod/{ => config}/TestConfig.java | 2 +- .../src/main/resources/assets/testmod/lang/en_us.json | 1 + 10 files changed, 19 insertions(+), 11 deletions(-) delete mode 100644 .idea/scopes/Fabric_sources.xml delete mode 100644 .idea/scopes/Forge_sources.xml create mode 100644 testmod-common/src/main/java/io/github/jamalam360/testmod/config/NestedConfigChild.java create mode 100644 testmod-common/src/main/java/io/github/jamalam360/testmod/config/NestedConfigParent.java rename testmod-common/src/main/java/io/github/jamalam360/testmod/{ => config}/QuickerConnectButtonTestConfig.java (97%) rename testmod-common/src/main/java/io/github/jamalam360/testmod/{ => config}/TestConfig.java (98%) diff --git a/.idea/scopes/Fabric_sources.xml b/.idea/scopes/Fabric_sources.xml deleted file mode 100644 index 0448412..0000000 --- a/.idea/scopes/Fabric_sources.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/scopes/Forge_sources.xml b/.idea/scopes/Forge_sources.xml deleted file mode 100644 index 7b5f24d..0000000 --- a/.idea/scopes/Forge_sources.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index cdc7898..191d767 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1 @@ -Update to 1.21.4 +- Ensure inherited fields are present in config GUIs (closes #13). \ No newline at end of file diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/ConfigScreen.java b/common/src/main/java/io/github/jamalam360/jamlib/config/gui/ConfigScreen.java index ca79f22..579509b 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/ConfigScreen.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/config/gui/ConfigScreen.java @@ -118,7 +118,7 @@ protected void init() { ConfigEntryList list = new ConfigEntryList(this.minecraft, this.width, this.height - 64, 32, 25); if (this.entries.isEmpty()) { - for (Field field : this.manager.getConfigClass().getDeclaredFields()) { + for (Field field : this.manager.getConfigClass().getFields()) { if (field.isAnnotationPresent(HiddenInGui.class)) { continue; } diff --git a/testmod-common/src/main/java/io/github/jamalam360/testmod/TestMod.java b/testmod-common/src/main/java/io/github/jamalam360/testmod/TestMod.java index 0cffde8..7512cb1 100644 --- a/testmod-common/src/main/java/io/github/jamalam360/testmod/TestMod.java +++ b/testmod-common/src/main/java/io/github/jamalam360/testmod/TestMod.java @@ -3,6 +3,9 @@ import io.github.jamalam360.jamlib.JamLibPlatform; import io.github.jamalam360.jamlib.config.ConfigManager; import io.github.jamalam360.jamlib.events.client.ClientPlayLifecycleEvents; +import io.github.jamalam360.testmod.config.NestedConfigChild; +import io.github.jamalam360.testmod.config.QuickerConnectButtonTestConfig; +import io.github.jamalam360.testmod.config.TestConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,7 +17,7 @@ public class TestMod { public static final ConfigManager CONFIG_MANAGER = new ConfigManager<>(MOD_ID, "first_config", TestConfig.class); public static final ConfigManager CONFIG_MANAGER_2 = new ConfigManager<>(MOD_ID, "second_config", TestConfig.class); public static final ConfigManager QCB_CONFIG = new ConfigManager<>(MOD_ID, "quickerconnectbutton", QuickerConnectButtonTestConfig.class); - + public static final ConfigManager NESTED_CONFIG = new ConfigManager<>(MOD_ID, "nested", NestedConfigChild.class); public static void init() { LOGGER.info("Initializing JamLib Test Mod on {}", JamLibPlatform.getPlatform()); diff --git a/testmod-common/src/main/java/io/github/jamalam360/testmod/config/NestedConfigChild.java b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/NestedConfigChild.java new file mode 100644 index 0000000..66e6acd --- /dev/null +++ b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/NestedConfigChild.java @@ -0,0 +1,5 @@ +package io.github.jamalam360.testmod.config; + +public class NestedConfigChild extends NestedConfigParent { + public String fromChild = "child"; +} diff --git a/testmod-common/src/main/java/io/github/jamalam360/testmod/config/NestedConfigParent.java b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/NestedConfigParent.java new file mode 100644 index 0000000..17f3593 --- /dev/null +++ b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/NestedConfigParent.java @@ -0,0 +1,5 @@ +package io.github.jamalam360.testmod.config; + +public class NestedConfigParent { + public String fromParent = "parent"; +} diff --git a/testmod-common/src/main/java/io/github/jamalam360/testmod/QuickerConnectButtonTestConfig.java b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/QuickerConnectButtonTestConfig.java similarity index 97% rename from testmod-common/src/main/java/io/github/jamalam360/testmod/QuickerConnectButtonTestConfig.java rename to testmod-common/src/main/java/io/github/jamalam360/testmod/config/QuickerConnectButtonTestConfig.java index a27ca06..151fdd8 100644 --- a/testmod-common/src/main/java/io/github/jamalam360/testmod/QuickerConnectButtonTestConfig.java +++ b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/QuickerConnectButtonTestConfig.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.testmod; +package io.github.jamalam360.testmod.config; import blue.endless.jankson.Comment; import io.github.jamalam360.jamlib.config.ConfigExtensions; diff --git a/testmod-common/src/main/java/io/github/jamalam360/testmod/TestConfig.java b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java similarity index 98% rename from testmod-common/src/main/java/io/github/jamalam360/testmod/TestConfig.java rename to testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java index 29d5002..45925cd 100644 --- a/testmod-common/src/main/java/io/github/jamalam360/testmod/TestConfig.java +++ b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.testmod; +package io.github.jamalam360.testmod.config; import blue.endless.jankson.Comment; import io.github.jamalam360.jamlib.config.ConfigExtensions; diff --git a/testmod-common/src/main/resources/assets/testmod/lang/en_us.json b/testmod-common/src/main/resources/assets/testmod/lang/en_us.json index 86976db..5836614 100644 --- a/testmod-common/src/main/resources/assets/testmod/lang/en_us.json +++ b/testmod-common/src/main/resources/assets/testmod/lang/en_us.json @@ -1,6 +1,7 @@ { "config.testmod.first_config.title": "First config", "config.testmod.second_config.title": "Second config", + "config.testmod.nested.title": "Nested", "config.testmod.first_config.tooltip": "Tooltip for the first config. It goes onto multiple lines as it is quite a long tooltip.", "config.testmod.second_config.tooltip": "Tooltip for the second config", "config.testmod.first_config.testBoolean": "Test boolean (it has quite a long name, so the text should scroll)", From 3fa769e1d0b4d26b390f20cd23434fdc4c3c9b19 Mon Sep 17 00:00:00 2001 From: Jamalam Date: Thu, 20 Feb 2025 22:45:45 +0000 Subject: [PATCH 09/21] fix: when both a mod ID and config file name are specified, the config file is now saved under `config/{mod id}/{config name}.json5` closes #12 This should not be a breaking change as I am not aware of any mods registering multiple configs currently. --- CHANGELOG.md | 4 +++- .../jamalam360/jamlib/config/ConfigManager.java | 12 +++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 191d767..70904dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,3 @@ -- Ensure inherited fields are present in config GUIs (closes #13). \ No newline at end of file +- Ensure inherited fields are present in config GUIs (closes #13). +- When both a mod ID and config file name are specified, the config file is now saved under `config/{mod id}/{config name}.json5` (closes #12). + - This should not be a breaking change as I am not aware of any mods registering multiple configs currently. \ No newline at end of file diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java b/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java index db2d8c5..18c1ef6 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java @@ -54,7 +54,13 @@ public ConfigManager(String modId, Class configClass) { */ public ConfigManager(String modId, String configName, Class configClass) { MANAGERS.put(configName, this); - this.configPath = Platform.getConfigFolder().resolve(configName + ".json5"); + + if (modId.equals(configName)) { + this.configPath = Platform.getConfigFolder().resolve(configName + ".json5"); + } else { + this.configPath = Platform.getConfigFolder().resolve(modId).resolve(configName + ".json5"); + } + this.configName = configName; this.modId = modId; this.configClass = configClass; @@ -110,6 +116,10 @@ public void save() { String stringifiedJson = json.toJson(grammar); try { + if (!Files.exists(this.configPath.getParent())) { + Files.createDirectories(this.configPath.getParent()); + } + Files.writeString(this.configPath, stringifiedJson); JamLib.LOGGER.info("Updated config file at {}", this.configPath); } catch (IOException e) { From 40e6367767557e9796ff0695f5e1dcb3278f9780 Mon Sep 17 00:00:00 2001 From: Jamalam Date: Thu, 20 Feb 2025 22:46:38 +0000 Subject: [PATCH 10/21] fix: switch to fabric-api mod ID closes #10 --- CHANGELOG.md | 3 ++- fabric/src/main/resources/fabric.mod.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70904dc..d7fbc3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ - Ensure inherited fields are present in config GUIs (closes #13). - When both a mod ID and config file name are specified, the config file is now saved under `config/{mod id}/{config name}.json5` (closes #12). - - This should not be a breaking change as I am not aware of any mods registering multiple configs currently. \ No newline at end of file + - This should not be a breaking change as I am not aware of any mods registering multiple configs currently. +- Switch to fabric-api mod ID in dependencies block (closes #10) \ No newline at end of file diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index c91345b..ebeccc1 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -27,7 +27,7 @@ "jamlib.mixins.json" ], "depends": { - "fabric": ">=${fabric_api_version}", + "fabric-api": ">=${fabric_api_version}", "minecraft": ">=${minecraft_version}", "architectury": ">=${architectury_version}" } From 18f44d56e36145eb37bcf8867bb07fc5fa823bd2 Mon Sep 17 00:00:00 2001 From: Jamalam Date: Thu, 20 Feb 2025 22:54:35 +0000 Subject: [PATCH 11/21] feat: enable split source sets closes #14 --- CHANGELOG.md | 3 ++- common/build.gradle | 9 ++++++++- .../jamalam360/jamlib/client}/JamLibClient.java | 13 ++++++++----- .../config/gui/ButtonWithTextureWidget.java | 2 +- .../jamlib/client}/config/gui/ConfigScreen.java | 12 ++++++------ .../client}/config/gui/SelectConfigScreen.java | 4 ++-- .../client}/config/gui/SelectionList.java | 2 +- .../client}/config/gui/SelectionListEntry.java | 2 +- .../client/ClientPlayLifecycleEvents.java | 4 +--- .../mixin/event/ClientPacketListenerMixin.java | 4 ++-- .../client}/mixin/event/ConnectionMixin.java | 4 ++-- .../client/resources/jamlib.client.mixins.json | 17 +++++++++++++++++ .../io/github/jamalam360/jamlib/JamLib.java | 5 ++--- .../{ => client}/config/ConfigExtensions.java | 2 +- .../{ => client}/config/ConfigManager.java | 2 +- .../jamlib/{ => client}/config/HiddenInGui.java | 4 ++-- .../{ => client}/config/MatchesRegex.java | 2 +- .../{ => client}/config/RequiresRestart.java | 2 +- .../jamlib/{ => client}/config/Slider.java | 2 +- .../jamlib/{ => client}/config/WithinRange.java | 2 +- .../src/main/resources/architectury.common.json | 3 --- common/src/main/resources/jamlib.accesswidener | 1 - common/src/main/resources/jamlib.mixins.json | 4 +--- fabric/build.gradle | 4 ---- .../jamlib/fabric/JamLibClientFabric.java | 11 +++++++++++ .../fabric/config/ModMenuCompatibility.java | 6 +++--- fabric/src/main/resources/fabric.mod.json | 6 +++++- neoforge/build.gradle | 4 ---- .../jamlib/neoforge/JamLibNeoForgeClient.java | 8 +++++--- .../main/resources/META-INF/neoforge.mods.toml | 3 +++ testmod-common/build.gradle | 4 ---- .../io/github/jamalam360/testmod/TestMod.java | 4 ++-- .../config/QuickerConnectButtonTestConfig.java | 6 +++--- .../jamalam360/testmod/config/TestConfig.java | 14 +++++++------- testmod-fabric/build.gradle | 3 --- testmod-neoforge/build.gradle | 2 -- 36 files changed, 101 insertions(+), 79 deletions(-) rename common/src/{main/java/io/github/jamalam360/jamlib => client/java/io/github/jamalam360/jamlib/client}/JamLibClient.java (81%) rename common/src/{main/java/io/github/jamalam360/jamlib => client/java/io/github/jamalam360/jamlib/client}/config/gui/ButtonWithTextureWidget.java (96%) rename common/src/{main/java/io/github/jamalam360/jamlib => client/java/io/github/jamalam360/jamlib/client}/config/gui/ConfigScreen.java (98%) rename common/src/{main/java/io/github/jamalam360/jamlib => client/java/io/github/jamalam360/jamlib/client}/config/gui/SelectConfigScreen.java (96%) rename common/src/{main/java/io/github/jamalam360/jamlib => client/java/io/github/jamalam360/jamlib/client}/config/gui/SelectionList.java (97%) rename common/src/{main/java/io/github/jamalam360/jamlib => client/java/io/github/jamalam360/jamlib/client}/config/gui/SelectionListEntry.java (98%) rename common/src/{main/java/io/github/jamalam360/jamlib => client/java/io/github/jamalam360/jamlib/client}/events/client/ClientPlayLifecycleEvents.java (84%) rename common/src/{main/java/io/github/jamalam360/jamlib => client/java/io/github/jamalam360/jamlib/client}/mixin/event/ClientPacketListenerMixin.java (88%) rename common/src/{main/java/io/github/jamalam360/jamlib => client/java/io/github/jamalam360/jamlib/client}/mixin/event/ConnectionMixin.java (88%) create mode 100644 common/src/client/resources/jamlib.client.mixins.json rename common/src/main/java/io/github/jamalam360/jamlib/{ => client}/config/ConfigExtensions.java (99%) rename common/src/main/java/io/github/jamalam360/jamlib/{ => client}/config/ConfigManager.java (99%) rename common/src/main/java/io/github/jamalam360/jamlib/{ => client}/config/HiddenInGui.java (74%) rename common/src/main/java/io/github/jamalam360/jamlib/{ => client}/config/MatchesRegex.java (89%) rename common/src/main/java/io/github/jamalam360/jamlib/{ => client}/config/RequiresRestart.java (89%) rename common/src/main/java/io/github/jamalam360/jamlib/{ => client}/config/Slider.java (90%) rename common/src/main/java/io/github/jamalam360/jamlib/{ => client}/config/WithinRange.java (90%) delete mode 100644 common/src/main/resources/architectury.common.json delete mode 100644 common/src/main/resources/jamlib.accesswidener create mode 100644 fabric/src/main/java/io/github/jamalam360/jamlib/fabric/JamLibClientFabric.java diff --git a/CHANGELOG.md b/CHANGELOG.md index d7fbc3f..4f733fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ - Ensure inherited fields are present in config GUIs (closes #13). - When both a mod ID and config file name are specified, the config file is now saved under `config/{mod id}/{config name}.json5` (closes #12). - This should not be a breaking change as I am not aware of any mods registering multiple configs currently. -- Switch to fabric-api mod ID in dependencies block (closes #10) \ No newline at end of file +- Switch to fabric-api mod ID in dependencies block (closes #10). +- Enable split source sets (closes #14). \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle index 1fa6e77..f314a78 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -3,7 +3,14 @@ architectury { } loom { - accessWidenerPath = file("src/main/resources/jamlib.accesswidener") + splitEnvironmentSourceSets() + + mods { + jamlib { + sourceSet sourceSets.main + sourceSet sourceSets.client + } + } } dependencies { diff --git a/common/src/main/java/io/github/jamalam360/jamlib/JamLibClient.java b/common/src/client/java/io/github/jamalam360/jamlib/client/JamLibClient.java similarity index 81% rename from common/src/main/java/io/github/jamalam360/jamlib/JamLibClient.java rename to common/src/client/java/io/github/jamalam360/jamlib/client/JamLibClient.java index 69d0d7a..6fe5960 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/JamLibClient.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/JamLibClient.java @@ -1,18 +1,21 @@ -package io.github.jamalam360.jamlib; +package io.github.jamalam360.jamlib.client; import static io.github.jamalam360.jamlib.JamLib.JAR_RENAMING_CHECKER; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; +import dev.architectury.event.events.client.ClientPlayerEvent; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.network.chat.Component; +import org.jetbrains.annotations.ApiStatus; -@Environment(EnvType.CLIENT) public class JamLibClient { + @ApiStatus.Internal + public static void init() { + ClientPlayerEvent.CLIENT_PLAYER_JOIN.register(JamLibClient::onPlayerJoin); + } - public static void onPlayerJoin(LocalPlayer player) { + private static void onPlayerJoin(LocalPlayer player) { if (player != Minecraft.getInstance().player) { return; } diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/ButtonWithTextureWidget.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ButtonWithTextureWidget.java similarity index 96% rename from common/src/main/java/io/github/jamalam360/jamlib/config/gui/ButtonWithTextureWidget.java rename to common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ButtonWithTextureWidget.java index bb88202..9050b43 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/ButtonWithTextureWidget.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ButtonWithTextureWidget.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.config.gui; +package io.github.jamalam360.jamlib.client.config.gui; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/ConfigScreen.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java similarity index 98% rename from common/src/main/java/io/github/jamalam360/jamlib/config/gui/ConfigScreen.java rename to common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java index 579509b..2710c5f 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/ConfigScreen.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java @@ -1,13 +1,13 @@ -package io.github.jamalam360.jamlib.config.gui; +package io.github.jamalam360.jamlib.client.config.gui; import com.mojang.blaze3d.systems.RenderSystem; import dev.architectury.platform.Platform; import io.github.jamalam360.jamlib.JamLib; -import io.github.jamalam360.jamlib.config.ConfigExtensions; -import io.github.jamalam360.jamlib.config.ConfigManager; -import io.github.jamalam360.jamlib.config.HiddenInGui; -import io.github.jamalam360.jamlib.config.Slider; -import io.github.jamalam360.jamlib.config.WithinRange; +import io.github.jamalam360.jamlib.client.config.ConfigExtensions; +import io.github.jamalam360.jamlib.client.config.ConfigManager; +import io.github.jamalam360.jamlib.client.config.HiddenInGui; +import io.github.jamalam360.jamlib.client.config.Slider; +import io.github.jamalam360.jamlib.client.config.WithinRange; import java.lang.reflect.Field; import java.text.DecimalFormat; import java.util.ArrayList; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/SelectConfigScreen.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectConfigScreen.java similarity index 96% rename from common/src/main/java/io/github/jamalam360/jamlib/config/gui/SelectConfigScreen.java rename to common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectConfigScreen.java index 79d7cdd..7ad98dc 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/SelectConfigScreen.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectConfigScreen.java @@ -1,7 +1,7 @@ -package io.github.jamalam360.jamlib.config.gui; +package io.github.jamalam360.jamlib.client.config.gui; import dev.architectury.platform.Platform; -import io.github.jamalam360.jamlib.config.ConfigManager; +import io.github.jamalam360.jamlib.client.config.ConfigManager; import java.util.List; import java.util.Objects; import net.minecraft.client.Minecraft; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/SelectionList.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectionList.java similarity index 97% rename from common/src/main/java/io/github/jamalam360/jamlib/config/gui/SelectionList.java rename to common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectionList.java index 97fd5f1..ee9609a 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/SelectionList.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectionList.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.config.gui; +package io.github.jamalam360.jamlib.client.config.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/SelectionListEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectionListEntry.java similarity index 98% rename from common/src/main/java/io/github/jamalam360/jamlib/config/gui/SelectionListEntry.java rename to common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectionListEntry.java index cccf1d7..b9cecb9 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/gui/SelectionListEntry.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectionListEntry.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.config.gui; +package io.github.jamalam360.jamlib.client.config.gui; import java.util.List; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/events/client/ClientPlayLifecycleEvents.java b/common/src/client/java/io/github/jamalam360/jamlib/client/events/client/ClientPlayLifecycleEvents.java similarity index 84% rename from common/src/main/java/io/github/jamalam360/jamlib/events/client/ClientPlayLifecycleEvents.java rename to common/src/client/java/io/github/jamalam360/jamlib/client/events/client/ClientPlayLifecycleEvents.java index c0d8996..bf8b80e 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/events/client/ClientPlayLifecycleEvents.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/events/client/ClientPlayLifecycleEvents.java @@ -1,12 +1,10 @@ -package io.github.jamalam360.jamlib.events.client; +package io.github.jamalam360.jamlib.client.events.client; -import com.mojang.authlib.minecraft.client.MinecraftClient; import dev.architectury.event.Event; import dev.architectury.event.EventFactory; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; -import net.minecraft.world.entity.player.Player; /** * Events for client-side player lifecycle events. diff --git a/common/src/main/java/io/github/jamalam360/jamlib/mixin/event/ClientPacketListenerMixin.java b/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/event/ClientPacketListenerMixin.java similarity index 88% rename from common/src/main/java/io/github/jamalam360/jamlib/mixin/event/ClientPacketListenerMixin.java rename to common/src/client/java/io/github/jamalam360/jamlib/client/mixin/event/ClientPacketListenerMixin.java index 02b658f..2fb1d05 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/mixin/event/ClientPacketListenerMixin.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/event/ClientPacketListenerMixin.java @@ -1,6 +1,6 @@ -package io.github.jamalam360.jamlib.mixin.event; +package io.github.jamalam360.jamlib.client.mixin.event; -import io.github.jamalam360.jamlib.events.client.ClientPlayLifecycleEvents; +import io.github.jamalam360.jamlib.client.events.client.ClientPlayLifecycleEvents; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/mixin/event/ConnectionMixin.java b/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/event/ConnectionMixin.java similarity index 88% rename from common/src/main/java/io/github/jamalam360/jamlib/mixin/event/ConnectionMixin.java rename to common/src/client/java/io/github/jamalam360/jamlib/client/mixin/event/ConnectionMixin.java index 3f99ca9..c7bbe88 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/mixin/event/ConnectionMixin.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/event/ConnectionMixin.java @@ -1,6 +1,6 @@ -package io.github.jamalam360.jamlib.mixin.event; +package io.github.jamalam360.jamlib.client.mixin.event; -import io.github.jamalam360.jamlib.events.client.ClientPlayLifecycleEvents; +import io.github.jamalam360.jamlib.client.events.client.ClientPlayLifecycleEvents; import io.netty.channel.ChannelHandlerContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/common/src/client/resources/jamlib.client.mixins.json b/common/src/client/resources/jamlib.client.mixins.json new file mode 100644 index 0000000..e86408b --- /dev/null +++ b/common/src/client/resources/jamlib.client.mixins.json @@ -0,0 +1,17 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "io.github.jamalam360.jamlib.client.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + ], + "client": [ + "event.ClientPacketListenerMixin", + "event.ConnectionMixin" + ], + "server": [ + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/common/src/main/java/io/github/jamalam360/jamlib/JamLib.java b/common/src/main/java/io/github/jamalam360/jamlib/JamLib.java index 8cc4b6b..80611a4 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/JamLib.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/JamLib.java @@ -14,14 +14,13 @@ public class JamLib { public static final String MOD_ID = "jamlib"; public static final String MOD_NAME = "JamLib"; public static final Logger LOGGER = LoggerFactory.getLogger(MOD_NAME); - protected static final JarRenamingChecker JAR_RENAMING_CHECKER = new JarRenamingChecker(); + @ApiStatus.Internal + public static final JarRenamingChecker JAR_RENAMING_CHECKER = new JarRenamingChecker(); @ApiStatus.Internal public static void init() { LOGGER.info("Initializing JamLib on {}", JamLibPlatform.getPlatform()); checkForJarRenaming(JamLib.class); - - EnvExecutor.runInEnv(EnvType.CLIENT, () -> () -> ClientPlayerEvent.CLIENT_PLAYER_JOIN.register(JamLibClient::onPlayerJoin)); } /** diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigExtensions.java b/common/src/main/java/io/github/jamalam360/jamlib/client/config/ConfigExtensions.java similarity index 99% rename from common/src/main/java/io/github/jamalam360/jamlib/config/ConfigExtensions.java rename to common/src/main/java/io/github/jamalam360/jamlib/client/config/ConfigExtensions.java index 767d8c2..2e179fd 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigExtensions.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/client/config/ConfigExtensions.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.config; +package io.github.jamalam360.jamlib.client.config; import io.github.jamalam360.jamlib.JamLib; import net.minecraft.network.chat.Component; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java b/common/src/main/java/io/github/jamalam360/jamlib/client/config/ConfigManager.java similarity index 99% rename from common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java rename to common/src/main/java/io/github/jamalam360/jamlib/client/config/ConfigManager.java index 18c1ef6..d5116dd 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/client/config/ConfigManager.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.config; +package io.github.jamalam360.jamlib.client.config; import blue.endless.jankson.Jankson; import blue.endless.jankson.JsonElement; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/HiddenInGui.java b/common/src/main/java/io/github/jamalam360/jamlib/client/config/HiddenInGui.java similarity index 74% rename from common/src/main/java/io/github/jamalam360/jamlib/config/HiddenInGui.java rename to common/src/main/java/io/github/jamalam360/jamlib/client/config/HiddenInGui.java index 954472a..0b087d6 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/HiddenInGui.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/client/config/HiddenInGui.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.config; +package io.github.jamalam360.jamlib.client.config; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -6,7 +6,7 @@ import java.lang.annotation.Target; /** - * Applying this to a config field will cause it to not show in the {@link io.github.jamalam360.jamlib.config.gui.ConfigScreen}. + * Applying this to a config field will cause it to not show in the {@link io.github.jamalam360.jamlib.client.config.gui.ConfigScreen}. * * @see ConfigManager */ diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/MatchesRegex.java b/common/src/main/java/io/github/jamalam360/jamlib/client/config/MatchesRegex.java similarity index 89% rename from common/src/main/java/io/github/jamalam360/jamlib/config/MatchesRegex.java rename to common/src/main/java/io/github/jamalam360/jamlib/client/config/MatchesRegex.java index 44773b4..5eeea35 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/MatchesRegex.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/client/config/MatchesRegex.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.config; +package io.github.jamalam360.jamlib.client.config; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/RequiresRestart.java b/common/src/main/java/io/github/jamalam360/jamlib/client/config/RequiresRestart.java similarity index 89% rename from common/src/main/java/io/github/jamalam360/jamlib/config/RequiresRestart.java rename to common/src/main/java/io/github/jamalam360/jamlib/client/config/RequiresRestart.java index 7cb5224..e58fbfd 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/RequiresRestart.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/client/config/RequiresRestart.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.config; +package io.github.jamalam360.jamlib.client.config; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/Slider.java b/common/src/main/java/io/github/jamalam360/jamlib/client/config/Slider.java similarity index 90% rename from common/src/main/java/io/github/jamalam360/jamlib/config/Slider.java rename to common/src/main/java/io/github/jamalam360/jamlib/client/config/Slider.java index 67456e4..2618acb 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/Slider.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/client/config/Slider.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.config; +package io.github.jamalam360.jamlib.client.config; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/WithinRange.java b/common/src/main/java/io/github/jamalam360/jamlib/client/config/WithinRange.java similarity index 90% rename from common/src/main/java/io/github/jamalam360/jamlib/config/WithinRange.java rename to common/src/main/java/io/github/jamalam360/jamlib/client/config/WithinRange.java index fb65314..5432ff2 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/WithinRange.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/client/config/WithinRange.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.config; +package io.github.jamalam360.jamlib.client.config; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/common/src/main/resources/architectury.common.json b/common/src/main/resources/architectury.common.json deleted file mode 100644 index 99e1ef4..0000000 --- a/common/src/main/resources/architectury.common.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "accessWidener": "jamlib.accesswidener" -} diff --git a/common/src/main/resources/jamlib.accesswidener b/common/src/main/resources/jamlib.accesswidener deleted file mode 100644 index 236e6b1..0000000 --- a/common/src/main/resources/jamlib.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named diff --git a/common/src/main/resources/jamlib.mixins.json b/common/src/main/resources/jamlib.mixins.json index 4b6b545..a6984a4 100644 --- a/common/src/main/resources/jamlib.mixins.json +++ b/common/src/main/resources/jamlib.mixins.json @@ -1,13 +1,11 @@ { "required": true, "minVersion": "0.8", - "package": "io.github.jamalam360.jamlib.mixin", + "package": "io.github.jamalam360.jamlib.client.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ ], "client": [ - "event.ClientPacketListenerMixin", - "event.ConnectionMixin" ], "server": [ ], diff --git a/fabric/build.gradle b/fabric/build.gradle index 600ae88..63d8cc3 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -12,10 +12,6 @@ base { archivesName = "jamlib-fabric" } -loom { - accessWidenerPath = project(":common").loom.accessWidenerPath -} - configurations { common shadowCommon diff --git a/fabric/src/main/java/io/github/jamalam360/jamlib/fabric/JamLibClientFabric.java b/fabric/src/main/java/io/github/jamalam360/jamlib/fabric/JamLibClientFabric.java new file mode 100644 index 0000000..e4c25e8 --- /dev/null +++ b/fabric/src/main/java/io/github/jamalam360/jamlib/fabric/JamLibClientFabric.java @@ -0,0 +1,11 @@ +package io.github.jamalam360.jamlib.fabric; + +import io.github.jamalam360.jamlib.client.JamLibClient; +import net.fabricmc.api.ClientModInitializer; + +public class JamLibClientFabric implements ClientModInitializer { + @Override + public void onInitializeClient() { + JamLibClient.init(); + } +} diff --git a/fabric/src/main/java/io/github/jamalam360/jamlib/fabric/config/ModMenuCompatibility.java b/fabric/src/main/java/io/github/jamalam360/jamlib/fabric/config/ModMenuCompatibility.java index f20d75b..fbebe64 100644 --- a/fabric/src/main/java/io/github/jamalam360/jamlib/fabric/config/ModMenuCompatibility.java +++ b/fabric/src/main/java/io/github/jamalam360/jamlib/fabric/config/ModMenuCompatibility.java @@ -3,9 +3,9 @@ import com.mojang.datafixers.util.Pair; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; -import io.github.jamalam360.jamlib.config.ConfigManager; -import io.github.jamalam360.jamlib.config.gui.ConfigScreen; -import io.github.jamalam360.jamlib.config.gui.SelectConfigScreen; +import io.github.jamalam360.jamlib.client.config.ConfigManager; +import io.github.jamalam360.jamlib.client.config.gui.ConfigScreen; +import io.github.jamalam360.jamlib.client.config.gui.SelectConfigScreen; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index ebeccc1..5b908fd 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -19,12 +19,16 @@ "main": [ "io.github.jamalam360.jamlib.fabric.JamLibFabric" ], + "client": [ + "io.github.jamalam360.jamlib.fabric.JamLibClientFabric" + ], "modmenu": [ "io.github.jamalam360.jamlib.fabric.config.ModMenuCompatibility" ] }, "mixins": [ - "jamlib.mixins.json" + "jamlib.mixins.json", + "jamlib.client.mixins.json" ], "depends": { "fabric-api": ">=${fabric_api_version}", diff --git a/neoforge/build.gradle b/neoforge/build.gradle index a45edbb..fe22033 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -12,10 +12,6 @@ base { archivesName = "jamlib-neoforge" } -loom { - accessWidenerPath = project(":common").loom.accessWidenerPath -} - configurations { common shadowCommon diff --git a/neoforge/src/main/java/io/github/jamalam360/jamlib/neoforge/JamLibNeoForgeClient.java b/neoforge/src/main/java/io/github/jamalam360/jamlib/neoforge/JamLibNeoForgeClient.java index 7d52321..89fc9cd 100644 --- a/neoforge/src/main/java/io/github/jamalam360/jamlib/neoforge/JamLibNeoForgeClient.java +++ b/neoforge/src/main/java/io/github/jamalam360/jamlib/neoforge/JamLibNeoForgeClient.java @@ -1,9 +1,10 @@ package io.github.jamalam360.jamlib.neoforge; import io.github.jamalam360.jamlib.JamLib; -import io.github.jamalam360.jamlib.config.ConfigManager; -import io.github.jamalam360.jamlib.config.gui.ConfigScreen; -import io.github.jamalam360.jamlib.config.gui.SelectConfigScreen; +import io.github.jamalam360.jamlib.client.JamLibClient; +import io.github.jamalam360.jamlib.client.config.ConfigManager; +import io.github.jamalam360.jamlib.client.config.gui.ConfigScreen; +import io.github.jamalam360.jamlib.client.config.gui.SelectConfigScreen; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.ModList; @@ -17,6 +18,7 @@ public class JamLibNeoForgeClient { public JamLibNeoForgeClient(IEventBus bus) { + JamLibClient.init(); bus.addListener(this::onFmlLoadComplete); } diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 6f06682..0ca5ebd 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -35,3 +35,6 @@ side = "BOTH" [[mixins]] config = "jamlib.mixins.json" + +[[mixins]] +config = "jamlib.client.mixins.json" diff --git a/testmod-common/build.gradle b/testmod-common/build.gradle index 81bfa71..91e4cb0 100644 --- a/testmod-common/build.gradle +++ b/testmod-common/build.gradle @@ -1,7 +1,3 @@ -loom { - accessWidenerPath = project(':common').file("src/main/resources/jamlib.accesswidener") -} - dependencies { modImplementation libs.fabric.loader modImplementation libs.architectury.common diff --git a/testmod-common/src/main/java/io/github/jamalam360/testmod/TestMod.java b/testmod-common/src/main/java/io/github/jamalam360/testmod/TestMod.java index 7512cb1..6fcb2d4 100644 --- a/testmod-common/src/main/java/io/github/jamalam360/testmod/TestMod.java +++ b/testmod-common/src/main/java/io/github/jamalam360/testmod/TestMod.java @@ -1,8 +1,8 @@ package io.github.jamalam360.testmod; import io.github.jamalam360.jamlib.JamLibPlatform; -import io.github.jamalam360.jamlib.config.ConfigManager; -import io.github.jamalam360.jamlib.events.client.ClientPlayLifecycleEvents; +import io.github.jamalam360.jamlib.client.config.ConfigManager; +import io.github.jamalam360.jamlib.client.events.client.ClientPlayLifecycleEvents; import io.github.jamalam360.testmod.config.NestedConfigChild; import io.github.jamalam360.testmod.config.QuickerConnectButtonTestConfig; import io.github.jamalam360.testmod.config.TestConfig; diff --git a/testmod-common/src/main/java/io/github/jamalam360/testmod/config/QuickerConnectButtonTestConfig.java b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/QuickerConnectButtonTestConfig.java index 151fdd8..356f32a 100644 --- a/testmod-common/src/main/java/io/github/jamalam360/testmod/config/QuickerConnectButtonTestConfig.java +++ b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/QuickerConnectButtonTestConfig.java @@ -1,9 +1,9 @@ package io.github.jamalam360.testmod.config; import blue.endless.jankson.Comment; -import io.github.jamalam360.jamlib.config.ConfigExtensions; -import io.github.jamalam360.jamlib.config.MatchesRegex; -import io.github.jamalam360.jamlib.config.WithinRange; +import io.github.jamalam360.jamlib.client.config.ConfigExtensions; +import io.github.jamalam360.jamlib.client.config.MatchesRegex; +import io.github.jamalam360.jamlib.client.config.WithinRange; import java.util.List; import net.minecraft.network.chat.Component; diff --git a/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java index 45925cd..c0d1bd2 100644 --- a/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java +++ b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java @@ -1,13 +1,13 @@ package io.github.jamalam360.testmod.config; import blue.endless.jankson.Comment; -import io.github.jamalam360.jamlib.config.ConfigExtensions; -import io.github.jamalam360.jamlib.config.ConfigManager; -import io.github.jamalam360.jamlib.config.HiddenInGui; -import io.github.jamalam360.jamlib.config.MatchesRegex; -import io.github.jamalam360.jamlib.config.RequiresRestart; -import io.github.jamalam360.jamlib.config.Slider; -import io.github.jamalam360.jamlib.config.WithinRange; +import io.github.jamalam360.jamlib.client.config.ConfigExtensions; +import io.github.jamalam360.jamlib.client.config.ConfigManager; +import io.github.jamalam360.jamlib.client.config.HiddenInGui; +import io.github.jamalam360.jamlib.client.config.MatchesRegex; +import io.github.jamalam360.jamlib.client.config.RequiresRestart; +import io.github.jamalam360.jamlib.client.config.Slider; +import io.github.jamalam360.jamlib.client.config.WithinRange; import java.util.List; import net.minecraft.network.chat.Component; diff --git a/testmod-fabric/build.gradle b/testmod-fabric/build.gradle index 4636878..0a155db 100644 --- a/testmod-fabric/build.gradle +++ b/testmod-fabric/build.gradle @@ -3,8 +3,6 @@ plugins { } loom { - accessWidenerPath = project(":common").loom.accessWidenerPath - mixin { useLegacyMixinAp = true } } @@ -41,7 +39,6 @@ shadowJar { } remapJar { - injectAccessWidener = true input.set shadowJar.archiveFile dependsOn shadowJar } diff --git a/testmod-neoforge/build.gradle b/testmod-neoforge/build.gradle index 75f7834..f29996f 100644 --- a/testmod-neoforge/build.gradle +++ b/testmod-neoforge/build.gradle @@ -3,8 +3,6 @@ plugins { } loom { - accessWidenerPath = project(":common").loom.accessWidenerPath - mods { neoForge { sourceSet project(":neoforge").sourceSets.main From 7c7e326adb5ad746122db24bd2e859b99c967eb1 Mon Sep 17 00:00:00 2001 From: Jamalam Date: Thu, 20 Feb 2025 22:57:37 +0000 Subject: [PATCH 12/21] fix: mistake with split sources --- .../jamlib/client/config/gui/ConfigScreen.java | 10 +++++----- .../client/config/gui/SelectConfigScreen.java | 2 +- .../{client => }/config/ConfigExtensions.java | 2 +- .../jamlib/{client => }/config/ConfigManager.java | 2 +- .../jamlib/{client => }/config/HiddenInGui.java | 2 +- .../jamlib/{client => }/config/MatchesRegex.java | 2 +- .../{client => }/config/RequiresRestart.java | 2 +- .../jamlib/{client => }/config/Slider.java | 2 +- .../jamlib/{client => }/config/WithinRange.java | 2 +- .../jamlib/fabric/config/ModMenuCompatibility.java | 2 +- .../jamlib/neoforge/JamLibNeoForgeClient.java | 2 +- .../java/io/github/jamalam360/testmod/TestMod.java | 2 +- .../config/QuickerConnectButtonTestConfig.java | 6 +++--- .../jamalam360/testmod/config/TestConfig.java | 14 +++++++------- 14 files changed, 26 insertions(+), 26 deletions(-) rename common/src/main/java/io/github/jamalam360/jamlib/{client => }/config/ConfigExtensions.java (99%) rename common/src/main/java/io/github/jamalam360/jamlib/{client => }/config/ConfigManager.java (99%) rename common/src/main/java/io/github/jamalam360/jamlib/{client => }/config/HiddenInGui.java (89%) rename common/src/main/java/io/github/jamalam360/jamlib/{client => }/config/MatchesRegex.java (89%) rename common/src/main/java/io/github/jamalam360/jamlib/{client => }/config/RequiresRestart.java (89%) rename common/src/main/java/io/github/jamalam360/jamlib/{client => }/config/Slider.java (90%) rename common/src/main/java/io/github/jamalam360/jamlib/{client => }/config/WithinRange.java (90%) diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java index 2710c5f..fda37b7 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java @@ -3,11 +3,11 @@ import com.mojang.blaze3d.systems.RenderSystem; import dev.architectury.platform.Platform; import io.github.jamalam360.jamlib.JamLib; -import io.github.jamalam360.jamlib.client.config.ConfigExtensions; -import io.github.jamalam360.jamlib.client.config.ConfigManager; -import io.github.jamalam360.jamlib.client.config.HiddenInGui; -import io.github.jamalam360.jamlib.client.config.Slider; -import io.github.jamalam360.jamlib.client.config.WithinRange; +import io.github.jamalam360.jamlib.config.ConfigExtensions; +import io.github.jamalam360.jamlib.config.ConfigManager; +import io.github.jamalam360.jamlib.config.HiddenInGui; +import io.github.jamalam360.jamlib.config.Slider; +import io.github.jamalam360.jamlib.config.WithinRange; import java.lang.reflect.Field; import java.text.DecimalFormat; import java.util.ArrayList; diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectConfigScreen.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectConfigScreen.java index 7ad98dc..c06e2d0 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectConfigScreen.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectConfigScreen.java @@ -1,7 +1,7 @@ package io.github.jamalam360.jamlib.client.config.gui; import dev.architectury.platform.Platform; -import io.github.jamalam360.jamlib.client.config.ConfigManager; +import io.github.jamalam360.jamlib.config.ConfigManager; import java.util.List; import java.util.Objects; import net.minecraft.client.Minecraft; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/client/config/ConfigExtensions.java b/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigExtensions.java similarity index 99% rename from common/src/main/java/io/github/jamalam360/jamlib/client/config/ConfigExtensions.java rename to common/src/main/java/io/github/jamalam360/jamlib/config/ConfigExtensions.java index 2e179fd..767d8c2 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/client/config/ConfigExtensions.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigExtensions.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.client.config; +package io.github.jamalam360.jamlib.config; import io.github.jamalam360.jamlib.JamLib; import net.minecraft.network.chat.Component; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/client/config/ConfigManager.java b/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java similarity index 99% rename from common/src/main/java/io/github/jamalam360/jamlib/client/config/ConfigManager.java rename to common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java index d5116dd..18c1ef6 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/client/config/ConfigManager.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.client.config; +package io.github.jamalam360.jamlib.config; import blue.endless.jankson.Jankson; import blue.endless.jankson.JsonElement; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/client/config/HiddenInGui.java b/common/src/main/java/io/github/jamalam360/jamlib/config/HiddenInGui.java similarity index 89% rename from common/src/main/java/io/github/jamalam360/jamlib/client/config/HiddenInGui.java rename to common/src/main/java/io/github/jamalam360/jamlib/config/HiddenInGui.java index 0b087d6..6350c01 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/client/config/HiddenInGui.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/config/HiddenInGui.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.client.config; +package io.github.jamalam360.jamlib.config; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/client/config/MatchesRegex.java b/common/src/main/java/io/github/jamalam360/jamlib/config/MatchesRegex.java similarity index 89% rename from common/src/main/java/io/github/jamalam360/jamlib/client/config/MatchesRegex.java rename to common/src/main/java/io/github/jamalam360/jamlib/config/MatchesRegex.java index 5eeea35..44773b4 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/client/config/MatchesRegex.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/config/MatchesRegex.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.client.config; +package io.github.jamalam360.jamlib.config; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/client/config/RequiresRestart.java b/common/src/main/java/io/github/jamalam360/jamlib/config/RequiresRestart.java similarity index 89% rename from common/src/main/java/io/github/jamalam360/jamlib/client/config/RequiresRestart.java rename to common/src/main/java/io/github/jamalam360/jamlib/config/RequiresRestart.java index e58fbfd..7cb5224 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/client/config/RequiresRestart.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/config/RequiresRestart.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.client.config; +package io.github.jamalam360.jamlib.config; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/client/config/Slider.java b/common/src/main/java/io/github/jamalam360/jamlib/config/Slider.java similarity index 90% rename from common/src/main/java/io/github/jamalam360/jamlib/client/config/Slider.java rename to common/src/main/java/io/github/jamalam360/jamlib/config/Slider.java index 2618acb..67456e4 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/client/config/Slider.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/config/Slider.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.client.config; +package io.github.jamalam360.jamlib.config; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/client/config/WithinRange.java b/common/src/main/java/io/github/jamalam360/jamlib/config/WithinRange.java similarity index 90% rename from common/src/main/java/io/github/jamalam360/jamlib/client/config/WithinRange.java rename to common/src/main/java/io/github/jamalam360/jamlib/config/WithinRange.java index 5432ff2..fb65314 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/client/config/WithinRange.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/config/WithinRange.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.client.config; +package io.github.jamalam360.jamlib.config; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/fabric/src/main/java/io/github/jamalam360/jamlib/fabric/config/ModMenuCompatibility.java b/fabric/src/main/java/io/github/jamalam360/jamlib/fabric/config/ModMenuCompatibility.java index fbebe64..d8fa8d1 100644 --- a/fabric/src/main/java/io/github/jamalam360/jamlib/fabric/config/ModMenuCompatibility.java +++ b/fabric/src/main/java/io/github/jamalam360/jamlib/fabric/config/ModMenuCompatibility.java @@ -3,7 +3,7 @@ import com.mojang.datafixers.util.Pair; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; -import io.github.jamalam360.jamlib.client.config.ConfigManager; +import io.github.jamalam360.jamlib.config.ConfigManager; import io.github.jamalam360.jamlib.client.config.gui.ConfigScreen; import io.github.jamalam360.jamlib.client.config.gui.SelectConfigScreen; import java.util.HashMap; diff --git a/neoforge/src/main/java/io/github/jamalam360/jamlib/neoforge/JamLibNeoForgeClient.java b/neoforge/src/main/java/io/github/jamalam360/jamlib/neoforge/JamLibNeoForgeClient.java index 89fc9cd..0669728 100644 --- a/neoforge/src/main/java/io/github/jamalam360/jamlib/neoforge/JamLibNeoForgeClient.java +++ b/neoforge/src/main/java/io/github/jamalam360/jamlib/neoforge/JamLibNeoForgeClient.java @@ -2,7 +2,7 @@ import io.github.jamalam360.jamlib.JamLib; import io.github.jamalam360.jamlib.client.JamLibClient; -import io.github.jamalam360.jamlib.client.config.ConfigManager; +import io.github.jamalam360.jamlib.config.ConfigManager; import io.github.jamalam360.jamlib.client.config.gui.ConfigScreen; import io.github.jamalam360.jamlib.client.config.gui.SelectConfigScreen; import net.neoforged.api.distmarker.Dist; diff --git a/testmod-common/src/main/java/io/github/jamalam360/testmod/TestMod.java b/testmod-common/src/main/java/io/github/jamalam360/testmod/TestMod.java index 6fcb2d4..707bc2a 100644 --- a/testmod-common/src/main/java/io/github/jamalam360/testmod/TestMod.java +++ b/testmod-common/src/main/java/io/github/jamalam360/testmod/TestMod.java @@ -1,7 +1,7 @@ package io.github.jamalam360.testmod; import io.github.jamalam360.jamlib.JamLibPlatform; -import io.github.jamalam360.jamlib.client.config.ConfigManager; +import io.github.jamalam360.jamlib.config.ConfigManager; import io.github.jamalam360.jamlib.client.events.client.ClientPlayLifecycleEvents; import io.github.jamalam360.testmod.config.NestedConfigChild; import io.github.jamalam360.testmod.config.QuickerConnectButtonTestConfig; diff --git a/testmod-common/src/main/java/io/github/jamalam360/testmod/config/QuickerConnectButtonTestConfig.java b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/QuickerConnectButtonTestConfig.java index 356f32a..151fdd8 100644 --- a/testmod-common/src/main/java/io/github/jamalam360/testmod/config/QuickerConnectButtonTestConfig.java +++ b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/QuickerConnectButtonTestConfig.java @@ -1,9 +1,9 @@ package io.github.jamalam360.testmod.config; import blue.endless.jankson.Comment; -import io.github.jamalam360.jamlib.client.config.ConfigExtensions; -import io.github.jamalam360.jamlib.client.config.MatchesRegex; -import io.github.jamalam360.jamlib.client.config.WithinRange; +import io.github.jamalam360.jamlib.config.ConfigExtensions; +import io.github.jamalam360.jamlib.config.MatchesRegex; +import io.github.jamalam360.jamlib.config.WithinRange; import java.util.List; import net.minecraft.network.chat.Component; diff --git a/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java index c0d1bd2..45925cd 100644 --- a/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java +++ b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java @@ -1,13 +1,13 @@ package io.github.jamalam360.testmod.config; import blue.endless.jankson.Comment; -import io.github.jamalam360.jamlib.client.config.ConfigExtensions; -import io.github.jamalam360.jamlib.client.config.ConfigManager; -import io.github.jamalam360.jamlib.client.config.HiddenInGui; -import io.github.jamalam360.jamlib.client.config.MatchesRegex; -import io.github.jamalam360.jamlib.client.config.RequiresRestart; -import io.github.jamalam360.jamlib.client.config.Slider; -import io.github.jamalam360.jamlib.client.config.WithinRange; +import io.github.jamalam360.jamlib.config.ConfigExtensions; +import io.github.jamalam360.jamlib.config.ConfigManager; +import io.github.jamalam360.jamlib.config.HiddenInGui; +import io.github.jamalam360.jamlib.config.MatchesRegex; +import io.github.jamalam360.jamlib.config.RequiresRestart; +import io.github.jamalam360.jamlib.config.Slider; +import io.github.jamalam360.jamlib.config.WithinRange; import java.util.List; import net.minecraft.network.chat.Component; From ec419a7fc218b9a665595a5a9fcf2fa5bd36f0e1 Mon Sep 17 00:00:00 2001 From: Jamalam Date: Thu, 20 Feb 2025 23:43:22 +0000 Subject: [PATCH 13/21] feat: large, nice, config refactors --- .../config/gui/ButtonWithTextureWidget.java | 34 -- .../client/config/gui/ConfigScreen.java | 330 +++--------------- .../jamlib/client/config/gui/EnumButton.java | 36 ++ .../client/config/gui/SelectConfigScreen.java | 6 +- .../client/config/gui/SelectionList.java | 1 - .../client/config/gui/SelectionListEntry.java | 1 - .../client/config/gui/SliderButton.java | 34 ++ .../client/mixin/ImageWidget$SpriteMixin.java | 21 ++ .../MutableSpriteImageWidget$Sprite.java | 7 + .../resources/jamlib.client.mixins.json | 5 +- .../jamlib/config/ConfigExtensions.java | 14 +- .../jamlib/config/ConfigManager.java | 15 +- .../gui/{ => sprites}/link_discord.png | Bin .../gui/{ => sprites}/link_generic.png | Bin .../gui/{ => sprites}/link_github.png | Bin .../textures/gui/{ => sprites}/reset.png | Bin .../gui/{ => sprites}/validation_error.png | Bin .../gui/{ => sprites}/validation_warning.png | Bin common/src/main/resources/jamlib.mixins.json | 2 +- 19 files changed, 175 insertions(+), 331 deletions(-) delete mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ButtonWithTextureWidget.java create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/EnumButton.java create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SliderButton.java create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/mixin/ImageWidget$SpriteMixin.java create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/mixinsupport/MutableSpriteImageWidget$Sprite.java rename common/src/main/resources/assets/jamlib/textures/gui/{ => sprites}/link_discord.png (100%) rename common/src/main/resources/assets/jamlib/textures/gui/{ => sprites}/link_generic.png (100%) rename common/src/main/resources/assets/jamlib/textures/gui/{ => sprites}/link_github.png (100%) rename common/src/main/resources/assets/jamlib/textures/gui/{ => sprites}/reset.png (100%) rename common/src/main/resources/assets/jamlib/textures/gui/{ => sprites}/validation_error.png (100%) rename common/src/main/resources/assets/jamlib/textures/gui/{ => sprites}/validation_warning.png (100%) diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ButtonWithTextureWidget.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ButtonWithTextureWidget.java deleted file mode 100644 index 9050b43..0000000 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ButtonWithTextureWidget.java +++ /dev/null @@ -1,34 +0,0 @@ -package io.github.jamalam360.jamlib.client.config.gui; - -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.components.Tooltip; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.network.chat.CommonComponents; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.resources.ResourceLocation; - -class ButtonWithTextureWidget extends Button { - - private final ResourceLocation texture; - private final int textureWidth; - private final int textureHeight; - - protected ButtonWithTextureWidget(int x, int y, int width, int height, MutableComponent description, ResourceLocation texture, int textureWidth, int textureHeight, OnPress onPress) { - super(x, y, width, height, CommonComponents.EMPTY, onPress, s -> description); - this.setTooltip(Tooltip.create(description)); - this.texture = texture; - this.textureWidth = textureWidth; - this.textureHeight = textureHeight; - } - - @Override - protected void renderWidget(GuiGraphics guiGraphics, int i, int j, float f) { - super.renderWidget(guiGraphics, i, j, f); - - int x = this.getX() + (this.width - this.textureWidth) / 2; - int y = this.getY() + (this.height - this.textureHeight) / 2; - - guiGraphics.blit(RenderType::guiTextured, this.texture, x, y, this.textureWidth, this.textureHeight, this.textureWidth, this.textureHeight, this.textureWidth, this.textureHeight); - } -} diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java index fda37b7..33987ec 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java @@ -1,51 +1,30 @@ package io.github.jamalam360.jamlib.client.config.gui; -import com.mojang.blaze3d.systems.RenderSystem; import dev.architectury.platform.Platform; import io.github.jamalam360.jamlib.JamLib; -import io.github.jamalam360.jamlib.config.ConfigExtensions; -import io.github.jamalam360.jamlib.config.ConfigManager; -import io.github.jamalam360.jamlib.config.HiddenInGui; -import io.github.jamalam360.jamlib.config.Slider; -import io.github.jamalam360.jamlib.config.WithinRange; -import java.lang.reflect.Field; -import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.regex.Pattern; +import io.github.jamalam360.jamlib.client.mixinsupport.MutableSpriteImageWidget$Sprite; +import io.github.jamalam360.jamlib.config.*; import net.minecraft.ChatFormatting; import net.minecraft.Util; -import net.minecraft.client.InputType; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ComponentPath; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.AbstractSliderButton; -import net.minecraft.client.gui.components.AbstractWidget; -import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.components.EditBox; -import net.minecraft.client.gui.components.ImageWidget; -import net.minecraft.client.gui.components.Tooltip; -import net.minecraft.client.gui.narration.NarratedElementType; -import net.minecraft.client.gui.narration.NarrationElementOutput; -import net.minecraft.client.gui.navigation.CommonInputs; -import net.minecraft.client.gui.navigation.FocusNavigationEvent; +import net.minecraft.client.gui.components.*; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.renderer.RenderType; import net.minecraft.client.resources.language.I18n; -import net.minecraft.client.sounds.SoundManager; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.resources.ResourceLocation; import net.minecraft.util.FormattedCharSequence; -import net.minecraft.util.Mth; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.lang.reflect.Field; +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.function.Function; +import java.util.regex.Pattern; + /** * A screen for editing a config managed through a {@link ConfigManager}. */ @@ -101,19 +80,18 @@ protected void init() { Objects.requireNonNull(this.minecraft).setScreen(this.parent); }).pos(this.width / 2 + 4, this.height - 28).size(150, 20).build()); - this.addRenderableWidget( - new ButtonWithTextureWidget( - 7, 7, 20, 20, Component.translatable("config.jamlib.edit_manually"), ResourceLocation.withDefaultNamespace("textures/item/writable_book.png"), 16, 16, - button -> { + SpriteIconButton editManuallyButton = this.addRenderableWidget( + SpriteIconButton.builder(Component.translatable("config.jamlib.edit_manually"), button -> { if (!this.changedFields.isEmpty()) { this.manager.save(); } Util.getPlatform().openFile(Platform.getConfigFolder().resolve(this.manager.getConfigName() + ".json5").toFile()); Objects.requireNonNull(this.minecraft).setScreen(this.parent); - } - ) + }, true).sprite(JamLib.id("writable_book"), 16, 16).size(20, 20).build() ); + editManuallyButton.setX(7); + editManuallyButton.setY(7); ConfigEntryList list = new ConfigEntryList(this.minecraft, this.width, this.height - 64, 32, 25); @@ -137,17 +115,18 @@ protected void init() { for (int i = 0; i < links.size(); i++) { ConfigExtensions.Link link = links.get(i); - this.addRenderableWidget( - new ButtonWithTextureWidget( - this.width - 30 - (28 * i), 5, 20, 20, (MutableComponent) link.getTooltip(), link.getTexture(), 16, 16, - button -> { - try { - Util.getPlatform().openUri(link.getUrl().toURI()); - } catch (Exception e) { - JamLib.LOGGER.error("Failed to open link", e); - } - }) + SpriteIconButton linkButton = this.addRenderableWidget( + SpriteIconButton.builder(link.getTooltip(), button -> { + try { + Util.getPlatform().openUri(link.getUrl().toURI()); + } catch (Exception e) { + JamLib.LOGGER.error("Failed to open link", e); + } + }, true).sprite(link.getTexture(), 16, 16).size(20, 20).build() + ); + linkButton.setX(this.width - 30 - (28 * i)); + linkButton.setY(5); } } } @@ -172,213 +151,7 @@ public void tick() { } } - /** - * A copy of {@link ImageWidget}{@code .Texture} that allows you to pass in an x and y value - */ - private static class TextureWidget extends AbstractWidget { - - private ResourceLocation texture; - - public TextureWidget(int x, int y, int width, int height, ResourceLocation texture) { - super(x, y, width, height, CommonComponents.EMPTY); - this.texture = texture; - } - - @Override - public boolean isMouseOver(double d, double e) { - return this.visible && d >= (double) this.getX() && e >= (double) this.getY() && d < (double) (this.getX() + this.width) && e < (double) (this.getY() + this.height); - } - - public void setTexture(ResourceLocation texture) { - this.texture = texture; - } - - @Override - public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) { - graphics.blit(RenderType::guiTextured, this.texture, this.getX(), this.getY(), this.getWidth(), this.getHeight(), this.getWidth(), this.getHeight(), this.getWidth(), this.getHeight()); - } - - @Override - protected void updateWidgetNarration(NarrationElementOutput _ignored) { - } - - @Override - public void playDownSound(SoundManager _ignored) { - } - - @Override - public boolean isActive() { - return false; - } - - @Override - @Nullable - public ComponentPath nextFocusPath(FocusNavigationEvent _ignored) { - return null; - } - } - - /** - * Had to be copied from {@link AbstractSliderButton} because that was too private to extend properly - */ - private static class SliderButton extends AbstractWidget { - - private static final ResourceLocation SLIDER_SPRITE = ResourceLocation.withDefaultNamespace("widget/slider"); - private static final ResourceLocation HIGHLIGHTED_SPRITE = ResourceLocation.withDefaultNamespace("widget/slider_highlighted"); - private static final ResourceLocation SLIDER_HANDLE_SPRITE = ResourceLocation.withDefaultNamespace("widget/slider_handle"); - private static final ResourceLocation SLIDER_HANDLE_HIGHLIGHTED_SPRITE = ResourceLocation.withDefaultNamespace("widget/slider_handle_highlighted"); - private final double min; - private final double max; - private final Consumer onChange; - protected double value; - private boolean canChangeValue; - - public SliderButton(int x, int y, int width, int height, Component message, double min, double max, double current, Consumer onChange) { - super(x, y, width, height, message); - this.value = current; - this.min = min; - this.max = max; - this.onChange = onChange; - } - - private ResourceLocation getSprite() { - return this.isFocused() && !this.canChangeValue ? HIGHLIGHTED_SPRITE : SLIDER_SPRITE; - } - - private ResourceLocation getHandleSprite() { - return !this.isHovered && !this.canChangeValue ? SLIDER_HANDLE_SPRITE : SLIDER_HANDLE_HIGHLIGHTED_SPRITE; - } - - protected @NotNull MutableComponent createNarrationMessage() { - return Component.translatable("gui.narrate.slider", this.getMessage()); - } - - public void updateWidgetNarration(NarrationElementOutput narrationElementOutput) { - narrationElementOutput.add(NarratedElementType.TITLE, this.createNarrationMessage()); - - if (this.active) { - if (this.isFocused()) { - narrationElementOutput.add(NarratedElementType.USAGE, Component.translatable("narration.slider.usage.focused")); - } else { - narrationElementOutput.add(NarratedElementType.USAGE, Component.translatable("narration.slider.usage.hovered")); - } - } - } - - public void renderWidget(GuiGraphics guiGraphics, int i, int j, float f) { - Minecraft minecraft = Minecraft.getInstance(); - RenderSystem.enableBlend(); - RenderSystem.defaultBlendFunc(); - RenderSystem.enableDepthTest(); - guiGraphics.blitSprite(RenderType::guiTextured, this.getSprite(), this.getX(), this.getY(), this.getWidth(), this.getHeight()); - double position = (this.value) / (this.max - this.min); - double handleX = this.getX() + position * (this.getWidth() - 8); - guiGraphics.blitSprite(RenderType::guiTextured, this.getHandleSprite(), (int) handleX, this.getY(), 8, this.getHeight()); - int k = this.active ? 16777215 : 10526880; - this.renderScrollingString(guiGraphics, minecraft.font, 2, k | Mth.ceil(this.alpha * 255.0F) << 24); - } - - public void onClick(double d, double e) { - this.setValueFromMouse(d); - } - - public void setFocused(boolean bl) { - super.setFocused(bl); - - if (!bl) { - this.canChangeValue = false; - } else { - InputType inputType = Minecraft.getInstance().getLastInputType(); - - if (inputType == InputType.MOUSE || inputType == InputType.KEYBOARD_TAB) { - this.canChangeValue = true; - } - } - } - - public boolean keyPressed(int i, int j, int k) { - if (CommonInputs.selected(i)) { - this.canChangeValue = !this.canChangeValue; - return true; - } else { - if (this.canChangeValue) { - boolean bl = i == 263; - if (bl || i == 262) { - float f = bl ? -1.0F : 1.0F; - double step = (this.max - this.min) / (this.width / 8F); - this.setValue(Mth.clamp(this.value + step * f, this.min, this.max)); - return true; - } - } - - return false; - } - } - - private void setValueFromMouse(double d) { - double position = (d - (double) (this.getX() + 4)) / (double) (this.width - 8); - this.setValue(Mth.clamp(position * (this.max - this.min) + this.min, this.min, this.max)); - } - - protected void onDrag(double d, double e, double f, double g) { - this.setValueFromMouse(d); - super.onDrag(d, e, f, g); - } - - @Override - public void playDownSound(SoundManager soundManager) { - } - - @Override - public void onRelease(double d, double e) { - super.playDownSound(Minecraft.getInstance().getSoundManager()); - } - - protected double getValue() { - return this.value; - } - - private void setValue(double d) { - double e = this.value; - this.value = Mth.clamp(d, this.min, this.max); - if (e != this.value) { - this.onChange.accept(this); - } - } - } - - private static class EnumButton> extends Button { - - private final Class enumClass; - private final Consumer> onChange; - private int index; - - @SuppressWarnings("unchecked") - protected EnumButton(int x, int y, int width, int height, MutableComponent description, Class> enumClass, Consumer> onChange) { - super(x, y, width, height, CommonComponents.EMPTY, b -> { - ((EnumButton) b).setIndex((((EnumButton) b).index + 1) % ((EnumButton) b).enumClass.getEnumConstants().length); - ((EnumButton) b).onChange.accept(((EnumButton) b)); - }, s -> description); - this.enumClass = (Class) enumClass; - this.onChange = onChange; - this.index = 0; - } - - private E getValue() { - return this.enumClass.getEnumConstants()[this.index]; - } - - private void setValue(E value) { - this.setIndex(value.ordinal()); - } - - private void setIndex(int index) { - this.index = index; - } - } - private class GuiEntry { - private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.##"); private final Type type; private final String translationKey; @@ -420,7 +193,9 @@ private static Component getEnumComponent(ConfigManager manager, Field field, protected java.util.List createWidget(ConfigManager manager, int width) { java.util.List widgets = new ArrayList<>(); - TextureWidget validationIcon = new TextureWidget(width - 212, 0, 20, 20, JamLib.id("textures/gui/validation_warning.png")); + ImageWidget validationIcon = ImageWidget.sprite(20, 20, JamLib.id("validation_warning")); + validationIcon.setX(width - 212); + validationIcon.setY(0); validationIcon.setTooltip(Tooltip.create(Component.translatable("config.jamlib.requires_restart_tooltip"))); validationIcon.visible = false; widgets.add(validationIcon); @@ -489,7 +264,7 @@ protected java.util.List createWidget(ConfigManager manager, break; } - widgets.add(new ButtonWithTextureWidget(width - 30, 0, 20, 20, Component.translatable("config.jamlib.reset"), JamLib.id("textures/gui/reset.png"), 16, 16, button -> { + SpriteIconButton resetButton = SpriteIconButton.builder(Component.translatable("config.jamlib.reset"), (button) -> { this.setFieldValue(manager, this.initialValue); widgets.get(1).setMessage(handleUpdatesOnChange(manager, widgets, ConfigScreen.this.changedFields)); @@ -498,7 +273,10 @@ protected java.util.List createWidget(ConfigManager manager, } else if (widgets.get(1) instanceof SliderButton slider) { slider.setValue(((Number) this.initialValue).doubleValue()); } - })); + }, true).sprite(JamLib.id("reset"), 16, 16).size(20, 20).build(); + resetButton.setX(width - 30); + resetButton.setY(0); + widgets.add(resetButton); validate(manager, widgets); @@ -551,24 +329,20 @@ private SliderButton createSlider(List widgets) { current = rangeAnnot.min(); } - SliderButton slider = new SliderButton( - width - 188, - 0, - 150, - 20, - CommonComponents.EMPTY, - rangeAnnot.min(), - rangeAnnot.max(), - current.doubleValue(), - s -> { - this.setFieldValue(manager, (Number) s.getValue()); - s.setMessage(handleUpdatesOnChange(manager, widgets, ConfigScreen.this.changedFields)); - } - ); - - slider.setMessage(Component.literal(DECIMAL_FORMAT.format(slider.getValue()))); - - return slider; + return new SliderButton( + width - 188, + 0, + 150, + 20, + Component.literal(DECIMAL_FORMAT.format(current.doubleValue())), + rangeAnnot.min(), + rangeAnnot.max(), + current.doubleValue(), + value -> { + this.setFieldValue(manager, (Number) value); + return handleUpdatesOnChange(manager, widgets, ConfigScreen.this.changedFields); + } + ); } private Component handleUpdatesOnChange(ConfigManager manager, List widgets, List changedFields) { @@ -609,11 +383,12 @@ private void validate(ConfigManager manager, List widgets) { List errors = ((ConfigExtensions) ext).getValidationErrors(manager, new ConfigExtensions.FieldValidationInfo(this.field.getName(), newValue, this.initialValue, this.field)); errors.sort((o1, o2) -> o2.type().ordinal() - o1.type().ordinal()); - TextureWidget validationIcon = (TextureWidget) widgets.getFirst(); + ImageWidget validationIcon = (ImageWidget) widgets.getFirst(); if (!errors.isEmpty()) { this.isValid = errors.getFirst().type() != ConfigExtensions.ValidationError.Type.ERROR; validationIcon.visible = true; - validationIcon.setTexture(errors.getFirst().type().getTexture()); + + ((MutableSpriteImageWidget$Sprite) validationIcon).setSprite(errors.getFirst().type().getTexture()); validationIcon.setTooltip(Tooltip.create(errors.getFirst().message())); } else { this.isValid = true; @@ -706,7 +481,6 @@ private static Type fromField(Field field) { } private class ConfigEntryList extends SelectionList { - public ConfigEntryList(Minecraft minecraft, int width, int height, int y, int itemHeight) { super(minecraft, width, height, y, itemHeight); } diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/EnumButton.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/EnumButton.java new file mode 100644 index 0000000..fe89942 --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/EnumButton.java @@ -0,0 +1,36 @@ +package io.github.jamalam360.jamlib.client.config.gui; + +import net.minecraft.client.gui.components.Button; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.MutableComponent; + +import java.util.function.Consumer; + +public class EnumButton> extends Button { + private final Class enumClass; + private final Consumer> onChange; + private int index; + + @SuppressWarnings("unchecked") + protected EnumButton(int x, int y, int width, int height, MutableComponent description, Class> enumClass, Consumer> onChange) { + super(x, y, width, height, CommonComponents.EMPTY, b -> { + ((EnumButton) b).setIndex((((EnumButton) b).index + 1) % ((EnumButton) b).enumClass.getEnumConstants().length); + ((EnumButton) b).onChange.accept(((EnumButton) b)); + }, s -> description); + this.enumClass = (Class) enumClass; + this.onChange = onChange; + this.index = 0; + } + + protected E getValue() { + return this.enumClass.getEnumConstants()[this.index]; + } + + protected void setValue(E value) { + this.setIndex(value.ordinal()); + } + + protected void setIndex(int index) { + this.index = index; + } +} diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectConfigScreen.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectConfigScreen.java index c06e2d0..f265795 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectConfigScreen.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectConfigScreen.java @@ -16,17 +16,16 @@ @ApiStatus.Internal public class SelectConfigScreen extends Screen { - private final String modId; private final Screen parent; public SelectConfigScreen(Screen parent, String modId) { - super(getTitleComponent(modId)); + super(createTitle(modId)); this.parent = parent; this.modId = modId; } - private static Component getTitleComponent(String modId) { + private static Component createTitle(String modId) { String translationKey = "config." + modId + ".title"; if (I18n.exists(translationKey)) { @@ -54,7 +53,6 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) { } private static class ConfigSelectionList extends SelectionList { - public ConfigSelectionList(Minecraft minecraft, int width, int height, int y, int itemHeight) { super(minecraft, width, height, y, itemHeight); } diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectionList.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectionList.java index ee9609a..b16e6ed 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectionList.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectionList.java @@ -10,7 +10,6 @@ @ApiStatus.Internal public class SelectionList extends ContainerObjectSelectionList { - public SelectionList(Minecraft minecraft, int width, int height, int y, int itemHeight) { super(minecraft, width, height, y, itemHeight); this.centerListVertically = false; diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectionListEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectionListEntry.java index b9cecb9..3016b20 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectionListEntry.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SelectionListEntry.java @@ -17,7 +17,6 @@ @ApiStatus.Internal public class SelectionListEntry extends ContainerObjectSelectionList.Entry { - private final Component title; private final List tooltip; private final List widgets; diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SliderButton.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SliderButton.java new file mode 100644 index 0000000..99cfca2 --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SliderButton.java @@ -0,0 +1,34 @@ +package io.github.jamalam360.jamlib.client.config.gui; + +import net.minecraft.client.gui.components.AbstractSliderButton; +import net.minecraft.network.chat.Component; +import net.minecraft.util.Mth; + +import java.util.function.Function; + +public class SliderButton extends AbstractSliderButton { + private final double min; + private final double max; + private final Function onChange; + + protected SliderButton(int x, int y, int width, int height, Component message, double min, double max, double value, Function onChange) { + super(x, y, width, height, message, value); + this.min = min; + this.max = max; + this.onChange = onChange; + this.value = ((Mth.clamp((float) value, this.min, this.max) - this.min) / (this.max - this.min)); + } + + protected void setValue(double value) { + this.value = ((Mth.clamp((float) value, this.min, this.max) - this.min) / (this.max - this.min)); + } + + @Override + protected void updateMessage() { + } + + @Override + protected void applyValue() { + this.setMessage(this.onChange.apply(Mth.lerp(Mth.clamp(this.value, 0.0F, 1.0F), this.min, this.max))); + } +} diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/ImageWidget$SpriteMixin.java b/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/ImageWidget$SpriteMixin.java new file mode 100644 index 0000000..b0bc1e7 --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/ImageWidget$SpriteMixin.java @@ -0,0 +1,21 @@ +package io.github.jamalam360.jamlib.client.mixin; + +import io.github.jamalam360.jamlib.client.mixinsupport.MutableSpriteImageWidget$Sprite; +import net.minecraft.resources.ResourceLocation; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(targets = "net.minecraft.client.gui.components.ImageWidget$Sprite") +public class ImageWidget$SpriteMixin implements MutableSpriteImageWidget$Sprite { + @Mutable + @Shadow + @Final + private ResourceLocation sprite; + + @Override + public void setSprite(ResourceLocation sprite) { + this.sprite = sprite; + } +} diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/mixinsupport/MutableSpriteImageWidget$Sprite.java b/common/src/client/java/io/github/jamalam360/jamlib/client/mixinsupport/MutableSpriteImageWidget$Sprite.java new file mode 100644 index 0000000..385288b --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/mixinsupport/MutableSpriteImageWidget$Sprite.java @@ -0,0 +1,7 @@ +package io.github.jamalam360.jamlib.client.mixinsupport; + +import net.minecraft.resources.ResourceLocation; + +public interface MutableSpriteImageWidget$Sprite { + void setSprite(ResourceLocation texture); +} diff --git a/common/src/client/resources/jamlib.client.mixins.json b/common/src/client/resources/jamlib.client.mixins.json index e86408b..5047ae8 100644 --- a/common/src/client/resources/jamlib.client.mixins.json +++ b/common/src/client/resources/jamlib.client.mixins.json @@ -4,11 +4,12 @@ "package": "io.github.jamalam360.jamlib.client.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ - ], - "client": [ + "ImageWidget$SpriteMixin", "event.ClientPacketListenerMixin", "event.ConnectionMixin" ], + "client": [ + ], "server": [ ], "injectors": { diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigExtensions.java b/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigExtensions.java index 767d8c2..b7d7c13 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigExtensions.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigExtensions.java @@ -26,6 +26,12 @@ default List getLinks() { return List.of(); } + /** + * Called after {@link ConfigManager#save()} has been called. + * This is a good place to manually perform syncing, if that is necessary for your config. + */ + default void afterSave() { } + /** * Can be used to validate your config fields after they have been edited in the config screen. Remember that this function is only called when the user is using a * config screen - if they are editing the file directly they are on their own. @@ -77,9 +83,9 @@ default List getValidationErrors(ConfigManager manager, Fiel class Link { // I am not an artist but these are recognizable at least. - public static final ResourceLocation DISCORD = JamLib.id("textures/gui/link_discord.png"); - public static final ResourceLocation GENERIC_LINK = JamLib.id("textures/gui/link_generic.png"); - public static final ResourceLocation GITHUB = JamLib.id("textures/gui/link_github.png"); + public static final ResourceLocation DISCORD = JamLib.id("link_discord"); + public static final ResourceLocation GENERIC_LINK = JamLib.id("link_generic"); + public static final ResourceLocation GITHUB = JamLib.id("link_github"); private final ResourceLocation texture; private final URL url; @@ -144,7 +150,7 @@ public enum Type { private final ResourceLocation texture; Type() { - this.texture = JamLib.id("textures/gui/validation_" + this.name().toLowerCase() + ".png"); + this.texture = JamLib.id("validation_" + this.name().toLowerCase()); } public ResourceLocation getTexture() { diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java b/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java index 18c1ef6..f9d8fa2 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java @@ -24,10 +24,10 @@ * @see RequiresRestart */ public class ConfigManager { - @ApiStatus.Internal public static final Map> MANAGERS = new HashMap<>(); private static final Jankson JANKSON = Jankson.builder().build(); + private static final JsonGrammar JSON_GRAMMER = JsonGrammar.builder().bareRootObject(false).bareSpecialNumerics(false).printCommas(true).printWhitespace(true).printUnquotedKeys(true).withComments(true).build(); private final Path configPath; private final String modId; private final String configName; @@ -112,8 +112,7 @@ public String getModId() { public void save() { JsonElement json = JANKSON.toJson(this.config); transformJsonBeforeSave(json); - JsonGrammar grammar = JsonGrammar.builder().bareRootObject(false).bareSpecialNumerics(false).printCommas(true).printWhitespace(true).printUnquotedKeys(true).withComments(true).build(); - String stringifiedJson = json.toJson(grammar); + String stringifiedJson = json.toJson(JSON_GRAMMER); try { if (!Files.exists(this.configPath.getParent())) { @@ -125,6 +124,10 @@ public void save() { } catch (IOException e) { JamLib.LOGGER.error("Failed to write config file at {}", this.configPath, e); } + + if (this.config instanceof ConfigExtensions ext) { + ext.afterSave(); + } } /** @@ -158,7 +161,7 @@ private void validateConfigClass() { } } } catch (IllegalArgumentException | IllegalAccessException e) { - JamLib.LOGGER.error("Failed to validate config class " + this.configClass.getName(), e); + JamLib.LOGGER.error("Failed to validate config class {}", this.configClass.getName(), e); } } @@ -166,7 +169,7 @@ private T createDefaultConfig() { try { return this.configClass.getConstructor().newInstance(); } catch (Exception e) { - JamLib.LOGGER.error("Failed to create default config for " + this.configClass.getName(), e); + JamLib.LOGGER.error("Failed to create default config for {}", this.configClass.getName(), e); } return null; @@ -183,7 +186,7 @@ private void transformJsonBeforeSave(JsonElement e) { } } - private void attachDefaultComments(Class clazz, Object defaults, JsonObject obj) { + private void attachDefaultComments(Class clazz, T defaults, JsonObject obj) { for (String key : obj.keySet()) { JsonElement e = obj.get(key); if (e instanceof JsonObject) { diff --git a/common/src/main/resources/assets/jamlib/textures/gui/link_discord.png b/common/src/main/resources/assets/jamlib/textures/gui/sprites/link_discord.png similarity index 100% rename from common/src/main/resources/assets/jamlib/textures/gui/link_discord.png rename to common/src/main/resources/assets/jamlib/textures/gui/sprites/link_discord.png diff --git a/common/src/main/resources/assets/jamlib/textures/gui/link_generic.png b/common/src/main/resources/assets/jamlib/textures/gui/sprites/link_generic.png similarity index 100% rename from common/src/main/resources/assets/jamlib/textures/gui/link_generic.png rename to common/src/main/resources/assets/jamlib/textures/gui/sprites/link_generic.png diff --git a/common/src/main/resources/assets/jamlib/textures/gui/link_github.png b/common/src/main/resources/assets/jamlib/textures/gui/sprites/link_github.png similarity index 100% rename from common/src/main/resources/assets/jamlib/textures/gui/link_github.png rename to common/src/main/resources/assets/jamlib/textures/gui/sprites/link_github.png diff --git a/common/src/main/resources/assets/jamlib/textures/gui/reset.png b/common/src/main/resources/assets/jamlib/textures/gui/sprites/reset.png similarity index 100% rename from common/src/main/resources/assets/jamlib/textures/gui/reset.png rename to common/src/main/resources/assets/jamlib/textures/gui/sprites/reset.png diff --git a/common/src/main/resources/assets/jamlib/textures/gui/validation_error.png b/common/src/main/resources/assets/jamlib/textures/gui/sprites/validation_error.png similarity index 100% rename from common/src/main/resources/assets/jamlib/textures/gui/validation_error.png rename to common/src/main/resources/assets/jamlib/textures/gui/sprites/validation_error.png diff --git a/common/src/main/resources/assets/jamlib/textures/gui/validation_warning.png b/common/src/main/resources/assets/jamlib/textures/gui/sprites/validation_warning.png similarity index 100% rename from common/src/main/resources/assets/jamlib/textures/gui/validation_warning.png rename to common/src/main/resources/assets/jamlib/textures/gui/sprites/validation_warning.png diff --git a/common/src/main/resources/jamlib.mixins.json b/common/src/main/resources/jamlib.mixins.json index a6984a4..dd9baf5 100644 --- a/common/src/main/resources/jamlib.mixins.json +++ b/common/src/main/resources/jamlib.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "io.github.jamalam360.jamlib.client.mixin", + "package": "io.github.jamalam360.jamlib.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ ], From a092a88945f436452c144d400fb4cd59d9094f8c Mon Sep 17 00:00:00 2001 From: Jamalam Date: Fri, 21 Feb 2025 21:06:41 +0000 Subject: [PATCH 14/21] feat: config screen refactors --- .../client/config/gui/ConfigScreen.java | 382 +----------------- .../config/gui/entry/BooleanConfigEntry.java | 41 ++ .../gui/entry/CollectionConfigEntry.java | 33 ++ .../client/config/gui/entry/ConfigEntry.java | 166 ++++++++ .../config/gui/{ => entry}/EnumButton.java | 2 +- .../config/gui/entry/EnumConfigEntry.java | 62 +++ .../config/gui/entry/NumberConfigEntry.java | 105 +++++ .../config/gui/{ => entry}/SliderButton.java | 4 +- .../config/gui/entry/StringConfigEntry.java | 46 +++ .../jamlib/client/gui/WidgetList.java | 210 ++++++++++ .../mixin/AbstractSelectionListMixin.java | 22 + .../resources/jamlib.client.mixins.json | 1 + .../textures/gui/sprites/writable_book.png | Bin 0 -> 247 bytes .../jamalam360/testmod/config/TestConfig.java | 3 +- 14 files changed, 713 insertions(+), 364 deletions(-) create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/BooleanConfigEntry.java create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/CollectionConfigEntry.java create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java rename common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/{ => entry}/EnumButton.java (94%) create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/EnumConfigEntry.java create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/NumberConfigEntry.java rename common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/{ => entry}/SliderButton.java (91%) create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/StringConfigEntry.java create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/gui/WidgetList.java create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/mixin/AbstractSelectionListMixin.java create mode 100644 common/src/main/resources/assets/jamlib/textures/gui/sprites/writable_book.png diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java index 33987ec..edc5b69 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java @@ -2,28 +2,26 @@ import dev.architectury.platform.Platform; import io.github.jamalam360.jamlib.JamLib; -import io.github.jamalam360.jamlib.client.mixinsupport.MutableSpriteImageWidget$Sprite; -import io.github.jamalam360.jamlib.config.*; -import net.minecraft.ChatFormatting; +import io.github.jamalam360.jamlib.client.config.gui.entry.ConfigEntry; +import io.github.jamalam360.jamlib.client.gui.WidgetList; +import io.github.jamalam360.jamlib.config.ConfigExtensions; +import io.github.jamalam360.jamlib.config.ConfigManager; +import io.github.jamalam360.jamlib.config.HiddenInGui; import net.minecraft.Util; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.*; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.SpriteIconButton; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; -import net.minecraft.util.FormattedCharSequence; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.Nullable; import java.lang.reflect.Field; -import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.function.Function; -import java.util.regex.Pattern; /** * A screen for editing a config managed through a {@link ConfigManager}. @@ -33,8 +31,7 @@ public class ConfigScreen extends Screen { protected final ConfigManager manager; private final Screen parent; - private final List entries; - private final List changedFields; + private final List entries; private Button doneButton; public ConfigScreen(ConfigManager manager, Screen parent) { @@ -42,10 +39,10 @@ public ConfigScreen(ConfigManager manager, Screen parent) { this.manager = manager; this.parent = parent; this.entries = new ArrayList<>(); - this.changedFields = new ArrayList<>(); } - protected static String createTranslationKey(String modId, String configName, String path) { + @ApiStatus.Internal + public static String createTranslationKey(String modId, String configName, String path) { if (modId.equals(configName)) { return "config." + modId + "." + path; } else { @@ -73,7 +70,7 @@ protected void init() { }).pos(this.width / 2 - 154, this.height - 28).size(150, 20).build()); this.doneButton = this.addRenderableWidget(Button.builder(CommonComponents.GUI_DONE, button -> { - if (!this.changedFields.isEmpty()) { + if (this.hasChanges()) { this.manager.save(); } @@ -82,7 +79,7 @@ protected void init() { SpriteIconButton editManuallyButton = this.addRenderableWidget( SpriteIconButton.builder(Component.translatable("config.jamlib.edit_manually"), button -> { - if (!this.changedFields.isEmpty()) { + if (this.hasChanges()) { this.manager.save(); } @@ -92,20 +89,20 @@ protected void init() { ); editManuallyButton.setX(7); editManuallyButton.setY(7); - - ConfigEntryList list = new ConfigEntryList(this.minecraft, this.width, this.height - 64, 32, 25); + WidgetList list = new WidgetList(this.minecraft, this.width, this.height - 64, 32); if (this.entries.isEmpty()) { for (Field field : this.manager.getConfigClass().getFields()) { if (field.isAnnotationPresent(HiddenInGui.class)) { continue; } - this.entries.add(new GuiEntry(this.manager.getModId(), this.manager.getConfigName(), field)); + + this.entries.add(ConfigEntry.createFromField(this.manager.getModId(), this.manager.getConfigName(), field)); } } - for (GuiEntry entry : this.entries) { - list.addEntry(entry); + for (ConfigEntry entry : this.entries) { + list.addWidgetGroup(entry.createWidgets(this.width)); } this.addRenderableWidget(list); @@ -138,7 +135,11 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) { } private boolean canExit() { - return this.entries.stream().allMatch(GuiEntry::isValid); + return this.entries.stream().allMatch(ConfigEntry::isValid); + } + + private boolean hasChanges() { + return this.entries.stream().anyMatch(ConfigEntry::hasChanged); } @Override @@ -150,343 +151,4 @@ public void tick() { this.doneButton.active = canExit; } } - - private class GuiEntry { - private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.##"); - private final Type type; - private final String translationKey; - private final List tooltip; - private final Field field; - private final Object initialValue; - private boolean isValid = true; - - @SuppressWarnings("unchecked") - protected GuiEntry(String modId, String configName, Field field) { - this.type = Type.fromField(field); - this.field = field; - this.initialValue = this.getFieldValue((ConfigManager) ConfigManager.MANAGERS.get(configName)); - this.translationKey = ConfigScreen.createTranslationKey(modId, configName, field.getName()); - - String tooltipTranslationKey = this.translationKey + ".tooltip"; - - if (I18n.exists(tooltipTranslationKey)) { - this.tooltip = Minecraft.getInstance().font.split(Component.translatable(tooltipTranslationKey), 200); - } else { - this.tooltip = null; - } - } - - private static Component getBooleanComponent(boolean v) { - return Component.literal(v ? "Yes" : "No").withStyle(s -> s.withColor(v ? ChatFormatting.GREEN : ChatFormatting.RED)); - } - - private static Component getEnumComponent(ConfigManager manager, Field field, Enum enumValue) { - String translationKey = ConfigScreen.createTranslationKey(manager.getModId(), manager.getConfigName(), field.getName() + "." + enumValue.name().toLowerCase()); - - if (I18n.exists(translationKey)) { - return Component.translatable(translationKey); - } else { - return Component.literal(enumValue.name()); - } - } - - protected java.util.List createWidget(ConfigManager manager, int width) { - java.util.List widgets = new ArrayList<>(); - - ImageWidget validationIcon = ImageWidget.sprite(20, 20, JamLib.id("validation_warning")); - validationIcon.setX(width - 212); - validationIcon.setY(0); - validationIcon.setTooltip(Tooltip.create(Component.translatable("config.jamlib.requires_restart_tooltip"))); - validationIcon.visible = false; - widgets.add(validationIcon); - - switch (this.type) { - case BOOLEAN: - widgets.add(Button.builder(getBooleanComponent(Boolean.TRUE.equals(getFieldValue(manager))), (button) -> { - this.setFieldValue(manager, !(Boolean.TRUE.equals(this.getFieldValue(manager)))); - button.setMessage(handleUpdatesOnChange(manager, widgets, ConfigScreen.this.changedFields)); - }).pos(width - 188, 0).size(150, 20).build()); - break; - case FLOAT: - if (this.field.isAnnotationPresent(Slider.class)) { - widgets.add(this.createSlider(widgets)); - } else { - widgets.add(this.createEditBox(widgets, Pattern.compile("^-?\\d*\\.?\\d*$"), Float::parseFloat)); - } - - break; - case DOUBLE: - if (this.field.isAnnotationPresent(Slider.class)) { - widgets.add(this.createSlider(widgets)); - } else { - widgets.add(this.createEditBox(widgets, Pattern.compile("^-?\\d*\\.?\\d*$"), Double::parseDouble)); - } - - break; - case INTEGER: - if (this.field.isAnnotationPresent(Slider.class)) { - widgets.add(this.createSlider(widgets)); - } else { - widgets.add(this.createEditBox(widgets, Pattern.compile("^-?\\d*$"), Integer::parseInt)); - } - - break; - case LONG: - if (this.field.isAnnotationPresent(Slider.class)) { - widgets.add(this.createSlider(widgets)); - } else { - widgets.add(this.createEditBox(widgets, Pattern.compile("^-?\\d*$"), Long::parseLong)); - } - - break; - case STRING: - widgets.add(this.createEditBox(widgets, null, Function.identity())); - break; - case ENUM: - @SuppressWarnings("unchecked") EnumButton button = new EnumButton<>( - width - 188, - 0, - 150, - 20, - CommonComponents.EMPTY.copy(), - (Class>) this.field.getType(), - (b) -> { - this.setFieldValue(manager, b.getValue()); - b.setMessage(handleUpdatesOnChange(manager, widgets, ConfigScreen.this.changedFields)); - } - ); - - button.setValue(Objects.requireNonNull(this.getFieldValue(manager))); - button.setMessage(getEnumComponent(manager, this.field, button.getValue())); - widgets.add(button); - break; - case LIST: - break; - } - - SpriteIconButton resetButton = SpriteIconButton.builder(Component.translatable("config.jamlib.reset"), (button) -> { - this.setFieldValue(manager, this.initialValue); - widgets.get(1).setMessage(handleUpdatesOnChange(manager, widgets, ConfigScreen.this.changedFields)); - - if (widgets.get(1) instanceof EditBox box) { - box.setValue(String.valueOf(this.initialValue)); - } else if (widgets.get(1) instanceof SliderButton slider) { - slider.setValue(((Number) this.initialValue).doubleValue()); - } - }, true).sprite(JamLib.id("reset"), 16, 16).size(20, 20).build(); - resetButton.setX(width - 30); - resetButton.setY(0); - widgets.add(resetButton); - - validate(manager, widgets); - - return widgets; - } - - private EditBox createEditBox(List widgets, Pattern filter, Function parse) { - EditBox box = new EditBox( - Minecraft.getInstance().font, - width - 188, - 0, - 150, - 20, - CommonComponents.EMPTY - ); - - Object value = this.getFieldValue(manager); - - if (value instanceof Number number) { - box.setValue(DECIMAL_FORMAT.format(number.doubleValue())); - } else if (value instanceof String string) { - box.setValue(string); - } else if (value != null) { - box.setValue(value.toString()); - } else { - box.setValue(""); - } - - if (filter != null) { - box.setFilter(s -> filter.matcher(s).matches()); - } - - box.setResponder(s -> { - try { - this.setFieldValue(manager, parse.apply(s)); - } catch (Exception ignored) { - } - - box.setMessage(handleUpdatesOnChange(manager, widgets, ConfigScreen.this.changedFields)); - }); - - return box; - } - - private SliderButton createSlider(List widgets) { - WithinRange rangeAnnot = this.field.getAnnotation(WithinRange.class); - Number current = this.getFieldValue(manager); - - if (current == null) { - current = rangeAnnot.min(); - } - - return new SliderButton( - width - 188, - 0, - 150, - 20, - Component.literal(DECIMAL_FORMAT.format(current.doubleValue())), - rangeAnnot.min(), - rangeAnnot.max(), - current.doubleValue(), - value -> { - this.setFieldValue(manager, (Number) value); - return handleUpdatesOnChange(manager, widgets, ConfigScreen.this.changedFields); - } - ); - } - - private Component handleUpdatesOnChange(ConfigManager manager, List widgets, List changedFields) { - Object newValue = this.getFieldValue(manager); - - if (changedFields.contains(this) && this.initialValue.equals(newValue)) { - changedFields.remove(this); - } else if (!changedFields.contains(this) && !this.initialValue.equals(newValue)) { - changedFields.add(this); - } - - this.validate(manager, widgets); - - Class c = this.field.getType(); - - if (c == boolean.class) { - return getBooleanComponent(Boolean.TRUE.equals(newValue)); - } - - if (newValue instanceof Number number) { - return Component.literal(DECIMAL_FORMAT.format(number.doubleValue())); - } else if (newValue instanceof Enum enumValue) { - return getEnumComponent(manager, this.field, enumValue); - } else if (newValue instanceof Boolean boolValue) { - return getBooleanComponent(boolValue); - } else if (newValue != null) { - return Component.literal(newValue.toString()); - } else { - return Component.literal(""); - } - } - - @SuppressWarnings("unchecked") - private void validate(ConfigManager manager, List widgets) { - Object newValue = this.getFieldValue(manager); - - if (manager.get() instanceof ConfigExtensions ext) { - List errors = ((ConfigExtensions) ext).getValidationErrors(manager, new ConfigExtensions.FieldValidationInfo(this.field.getName(), newValue, this.initialValue, this.field)); - errors.sort((o1, o2) -> o2.type().ordinal() - o1.type().ordinal()); - - ImageWidget validationIcon = (ImageWidget) widgets.getFirst(); - if (!errors.isEmpty()) { - this.isValid = errors.getFirst().type() != ConfigExtensions.ValidationError.Type.ERROR; - validationIcon.visible = true; - - ((MutableSpriteImageWidget$Sprite) validationIcon).setSprite(errors.getFirst().type().getTexture()); - validationIcon.setTooltip(Tooltip.create(errors.getFirst().message())); - } else { - this.isValid = true; - validationIcon.visible = false; - } - } - } - - protected Component getName() { - return Component.translatable(this.translationKey); - } - - protected List getTooltip() { - return this.tooltip; - } - - protected boolean isValid() { - return this.isValid; - } - - @SuppressWarnings("unchecked") - @Nullable - private V getFieldValue(ConfigManager manager) { - try { - return (V) this.field.get(manager.get()); - } catch (IllegalAccessException e) { - JamLib.LOGGER.error("Failed to access field for config {}", manager.getConfigName(), e); - return null; - } - } - - private void setFieldValue(ConfigManager manager, V v) { - Object realValue = v; - - if (v instanceof Number n) { - Class c = this.field.getType(); - - if (c == double.class || c == Double.class) { - realValue = n.doubleValue(); - } else if (c == float.class || c == Float.class) { - realValue = n.floatValue(); - } else if (c == int.class || c == Integer.class) { - realValue = n.intValue(); - } else if (c == long.class || c == Long.class) { - realValue = n.longValue(); - } - } - - try { - this.field.set(manager.get(), realValue); - } catch (IllegalAccessException e) { - JamLib.LOGGER.error("Failed to access field for config {}", manager.getConfigName(), e); - } - } - - private enum Type { - BOOLEAN, - FLOAT, - DOUBLE, - INTEGER, - LONG, - STRING, - ENUM, - LIST; - - private static Type fromField(Field field) { - Class c = field.getType(); - - if (c == boolean.class) { - return BOOLEAN; - } else if (c == float.class) { - return FLOAT; - } else if (c == double.class) { - return DOUBLE; - } else if (c == int.class) { - return INTEGER; - } else if (c == long.class) { - return LONG; - } else if (c == String.class) { - return STRING; - } else if (c.isEnum()) { - return ENUM; - } else if (java.util.List.class.isAssignableFrom(c)) { - return LIST; - } else { - throw new IllegalArgumentException("Unsupported config type: " + c); - } - } - } - } - - private class ConfigEntryList extends SelectionList { - public ConfigEntryList(Minecraft minecraft, int width, int height, int y, int itemHeight) { - super(minecraft, width, height, y, itemHeight); - } - - protected void addEntry(GuiEntry entry) { - this.addEntry(new SelectionListEntry(entry.getName(), entry.getTooltip(), entry.createWidget(ConfigScreen.this.manager, this.width))); - } - } } diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/BooleanConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/BooleanConfigEntry.java new file mode 100644 index 0000000..e25092e --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/BooleanConfigEntry.java @@ -0,0 +1,41 @@ +package io.github.jamalam360.jamlib.client.config.gui.entry; + +import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.components.Button; +import net.minecraft.network.chat.Component; +import org.jetbrains.annotations.Nullable; + +import java.lang.reflect.Field; +import java.util.List; + +public class BooleanConfigEntry extends ConfigEntry { + @Nullable + private Button button = null; + + public BooleanConfigEntry(String modId, String configName, Field field) { + super(modId, configName, field); + } + + @Override + public List createElementWidgets(int width) { + this.button = Button.builder(this.getComponent(Boolean.TRUE.equals(this.getFieldValue())), button -> { + this.setFieldValue(!(Boolean.TRUE.equals(this.getFieldValue()))); + }).pos(width - 188, 0).size(150, 20).build(); + + return List.of(this.button); + } + + @Override + public void onChange() { + super.onChange(); + + if (this.button != null) { + this.button.setMessage(getComponent(Boolean.TRUE.equals(this.getFieldValue()))); + } + } + + private Component getComponent(boolean value) { + return Component.literal(value ? "Yes" : "No").withStyle(s -> s.withColor(value ? ChatFormatting.GREEN : ChatFormatting.RED)); + } +} diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/CollectionConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/CollectionConfigEntry.java new file mode 100644 index 0000000..16f5d03 --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/CollectionConfigEntry.java @@ -0,0 +1,33 @@ +package io.github.jamalam360.jamlib.client.config.gui.entry; + +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.components.Button; +import net.minecraft.network.chat.Component; + +import java.lang.reflect.Field; +import java.util.List; + +public class CollectionConfigEntry extends ConfigEntry { + public CollectionConfigEntry(String modId, String configName, Field field) { + super(modId, configName, field); + } + + @Override + public List createElementWidgets(int width) { + List buttons = List.of( + Button.builder(Component.literal("beans"), button -> { + System.out.println("first"); + }).pos(width - 188, 0).size(150, 20).build(), + Button.builder(Component.literal("means heinz"), button -> { + System.out.println("second"); + }).pos(width - 188, 20).size(150, 20).build() + ); + + return buttons; + } + + @Override + public void onChange() { + super.onChange(); + } +} diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java new file mode 100644 index 0000000..df52b1b --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java @@ -0,0 +1,166 @@ +package io.github.jamalam360.jamlib.client.config.gui.entry; + +import io.github.jamalam360.jamlib.JamLib; +import io.github.jamalam360.jamlib.client.config.gui.ConfigScreen; +import io.github.jamalam360.jamlib.client.mixinsupport.MutableSpriteImageWidget$Sprite; +import io.github.jamalam360.jamlib.config.ConfigExtensions; +import io.github.jamalam360.jamlib.config.ConfigManager; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.components.*; +import net.minecraft.client.resources.language.I18n; +import net.minecraft.network.chat.Component; +import net.minecraft.util.FormattedCharSequence; +import org.jetbrains.annotations.Nullable; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +public abstract class ConfigEntry { + protected final Field field; + protected final ConfigManager configManager; + private final Object originalValue; + private final String translationKey; + @Nullable + private final List tooltip; + private boolean valid = true; + private ImageWidget validationIcon; + + public static ConfigEntry createFromField(String modId, String configName, Field field) { + Class c = field.getType(); + + if (c == boolean.class) { + return new BooleanConfigEntry(modId, configName, field); + } else if (c == float.class || c == double.class || c == int.class || c == long.class) { + return new NumberConfigEntry(modId, configName, field); + } else if (c == String.class) { + return new StringConfigEntry(modId, configName, field); + } else if (c.isEnum()) { + return new EnumConfigEntry<>(modId, configName, field); + } else if (Collection.class.isAssignableFrom(c)) { + return new CollectionConfigEntry(modId, configName, field); + } else { + throw new IllegalArgumentException("Unsupported config field type " + c); + } + } + + public ConfigEntry(String modId, String configName, Field field) { + this.field = field; + this.configManager = ConfigManager.MANAGERS.get(configName); + this.originalValue = this.getFieldValue(); + this.translationKey = ConfigScreen.createTranslationKey(modId, configName, field.getName()); + + if (I18n.exists(this.translationKey + ".tooltip")) { + this.tooltip = Minecraft.getInstance().font.split(Component.translatable(this.translationKey + ".tooltip"), 200); + } else { + this.tooltip = null; + } + } + + public List createWidgets(int width) { + List widgets = new ArrayList<>(); + + widgets.add(new FittingMultiLineTextWidget(12, Minecraft.getInstance().font.lineHeight / 2 + 1, width / 2 - 10, Minecraft.getInstance().font.lineHeight, Component.translatable(this.translationKey), Minecraft.getInstance().font)); + + this.validationIcon = ImageWidget.sprite(20, 20, JamLib.id("validation_warning")); + this.validationIcon.setX(width - 212); + this.validationIcon.setY(0); + this.validationIcon.setTooltip(Tooltip.create(Component.translatable("config.jamlib.requires_restart_tooltip"))); + this.validationIcon.visible = false; + widgets.add(this.validationIcon); + + widgets.addAll(this.createElementWidgets(width)); + + SpriteIconButton resetButton = SpriteIconButton.builder(Component.translatable("config.jamlib.reset"), (button) -> { + this.setFieldValue(this.originalValue); + + if (widgets.get(1) instanceof EditBox box) { + box.setValue(String.valueOf(this.originalValue)); + } else if (widgets.get(1) instanceof SliderButton slider) { + slider.setValue((Double) this.originalValue); + } + }, true).sprite(JamLib.id("reset"), 16, 16).size(20, 20).build(); + resetButton.setX(width - 30); + resetButton.setY(0); + widgets.add(resetButton); + + return widgets; + } + + public abstract List createElementWidgets(int width); + + public void onChange() { + this.validate(); + } + + private void validate() { + Object newValue = this.getFieldValue(); + + if (this.configManager.get() instanceof ConfigExtensions ext) { + @SuppressWarnings("unchecked") List errors = ((ConfigExtensions) ext).getValidationErrors((ConfigManager) this.configManager, new ConfigExtensions.FieldValidationInfo(this.field.getName(), newValue, this.originalValue, this.field)); + errors.sort((o1, o2) -> o2.type().ordinal() - o1.type().ordinal()); + + if (!errors.isEmpty()) { + this.valid = errors.getFirst().type() != ConfigExtensions.ValidationError.Type.ERROR; + this.validationIcon.visible = true; + + ((MutableSpriteImageWidget$Sprite) this.validationIcon).setSprite(errors.getFirst().type().getTexture()); + this.validationIcon.setTooltip(Tooltip.create(errors.getFirst().message())); + } else { + this.valid = true; + this.validationIcon.visible = false; + } + } + } + + public boolean hasChanged() { + return this.getFieldValue().equals(this.originalValue); + } + + public boolean isValid() { + return this.valid; + } + + public Component getName() { + return Component.translatable(this.translationKey); + } + + public @Nullable List getTooltip() { + return this.tooltip; + } + + protected Object getFieldValue() { + try { + return this.field.get(this.configManager.get()); + } catch (IllegalAccessException e) { + JamLib.LOGGER.error("Failed to access field for config {}", this.configManager.getConfigName(), e); + return null; + } + } + + protected void setFieldValue(Object v) { + Object realValue = v; + + if (v instanceof Number n) { + Class c = this.field.getType(); + + if (c == double.class || c == Double.class) { + realValue = n.doubleValue(); + } else if (c == float.class || c == Float.class) { + realValue = n.floatValue(); + } else if (c == int.class || c == Integer.class) { + realValue = n.intValue(); + } else if (c == long.class || c == Long.class) { + realValue = n.longValue(); + } + } + + try { + this.field.set(this.configManager.get(), realValue); + this.onChange(); + } catch (IllegalAccessException e) { + JamLib.LOGGER.error("Failed to access field for config {}", this.configManager.getConfigName(), e); + } + } +} diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/EnumButton.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/EnumButton.java similarity index 94% rename from common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/EnumButton.java rename to common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/EnumButton.java index fe89942..a78f61c 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/EnumButton.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/EnumButton.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.client.config.gui; +package io.github.jamalam360.jamlib.client.config.gui.entry; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.CommonComponents; diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/EnumConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/EnumConfigEntry.java new file mode 100644 index 0000000..7d36b65 --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/EnumConfigEntry.java @@ -0,0 +1,62 @@ +package io.github.jamalam360.jamlib.client.config.gui.entry; + +import io.github.jamalam360.jamlib.client.config.gui.ConfigScreen; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.resources.language.I18n; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; +import org.jetbrains.annotations.Nullable; + +import java.lang.reflect.Field; +import java.util.List; + +public class EnumConfigEntry> extends ConfigEntry { + @Nullable + private EnumButton button = null; + + public EnumConfigEntry(String modId, String configName, Field field) { + super(modId, configName, field); + } + + @Override + public List createElementWidgets(int width) { + //noinspection unchecked + this.button = new EnumButton<>( + width - 188, + 0, + 150, + 20, + CommonComponents.EMPTY.copy(), + (Class>) this.field.getType(), + (b) -> this.setFieldValue(b.getValue()) + ); + this.button.setValue(this.getEnumValue()); + this.button.setMessage(this.getComponent()); + + return List.of(this.button); + } + + @Override + public void onChange() { + super.onChange(); + + if (this.button != null) { + this.button.setMessage(this.getComponent()); + } + } + + private Component getComponent() { + String translationKey = ConfigScreen.createTranslationKey(this.configManager.getModId(), this.configManager.getConfigName(), field.getName() + "." + this.getEnumValue().name().toLowerCase()); + + if (I18n.exists(translationKey)) { + return Component.translatable(translationKey); + } else { + return Component.literal(this.getEnumValue().name()); + } + } + + private E getEnumValue() { + //noinspection unchecked + return (E) this.getFieldValue(); + } +} diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/NumberConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/NumberConfigEntry.java new file mode 100644 index 0000000..a169bab --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/NumberConfigEntry.java @@ -0,0 +1,105 @@ +package io.github.jamalam360.jamlib.client.config.gui.entry; + +import io.github.jamalam360.jamlib.config.Slider; +import io.github.jamalam360.jamlib.config.WithinRange; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.components.EditBox; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; +import org.jetbrains.annotations.Nullable; + +import java.lang.reflect.Field; +import java.text.DecimalFormat; +import java.util.List; +import java.util.function.Function; +import java.util.regex.Pattern; + +public class NumberConfigEntry extends ConfigEntry { + private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.##"); + private final Function parser; + private final Pattern regex; + @Nullable + private EditBox editBox = null; + + public NumberConfigEntry(String modId, String configName, Field field) { + super(modId, configName, field); + + Class c = field.getType(); + + if (c == float.class) { + this.parser = Float::parseFloat; + this.regex = Pattern.compile("^-?\\d*\\.?\\d*$"); + } else if (c == double.class) { + this.parser = Double::parseDouble; + this.regex = Pattern.compile("^-?\\d*\\.?\\d*$"); + } else if (c == int.class) { + this.parser = Integer::parseInt; + this.regex = Pattern.compile("^-?\\d*$"); + } else if (c == long.class) { + this.parser = Long::parseLong; + this.regex = Pattern.compile("^-?\\d*$"); + } else { + throw new IllegalArgumentException("Unsupported class for NumberConfigEntry " + c); + } + } + + @Override + public List createElementWidgets(int width) { + Number current = (Number) this.getFieldValue(); + + if (this.field.isAnnotationPresent(Slider.class)) { + WithinRange range = this.field.getAnnotation(WithinRange.class); + + if (current == null) { + current = range.min(); + } + + SliderButton slider = new SliderButton( + width - 188, + 0, + 150, + 20, + this.getComponent(current), + range.min(), + range.max(), + current.doubleValue(), + value -> { + this.setFieldValue(value); + return this.getComponent(value); + } + ); + return List.of(slider); + } else { + this.editBox = new EditBox( + Minecraft.getInstance().font, + width - 188, + 0, + 150, + 20, + CommonComponents.EMPTY + ); + this.editBox.setValue(DECIMAL_FORMAT.format(current.doubleValue())); + this.editBox.setFilter(s -> this.regex.matcher(s).matches()); + this.editBox.setResponder(s -> { + if (!s.isEmpty()) { + this.setFieldValue(this.parser.apply(s)); + } + }); + return List.of(this.editBox); + } + } + + @Override + public void onChange() { + super.onChange(); + + if (this.editBox != null) { + this.editBox.setMessage(this.getComponent((Number) this.getFieldValue())); + } + } + + private Component getComponent(Number value) { + return Component.literal(DECIMAL_FORMAT.format(value.doubleValue())); + } +} diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SliderButton.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/SliderButton.java similarity index 91% rename from common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SliderButton.java rename to common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/SliderButton.java index 99cfca2..cb46c35 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/SliderButton.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/SliderButton.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.client.config.gui; +package io.github.jamalam360.jamlib.client.config.gui.entry; import net.minecraft.client.gui.components.AbstractSliderButton; import net.minecraft.network.chat.Component; @@ -19,7 +19,7 @@ protected SliderButton(int x, int y, int width, int height, Component message, d this.value = ((Mth.clamp((float) value, this.min, this.max) - this.min) / (this.max - this.min)); } - protected void setValue(double value) { + public void setValue(double value) { this.value = ((Mth.clamp((float) value, this.min, this.max) - this.min) / (this.max - this.min)); } diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/StringConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/StringConfigEntry.java new file mode 100644 index 0000000..6b59d75 --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/StringConfigEntry.java @@ -0,0 +1,46 @@ +package io.github.jamalam360.jamlib.client.config.gui.entry; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.components.EditBox; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; +import org.jetbrains.annotations.Nullable; + +import java.lang.reflect.Field; +import java.util.List; + +public class StringConfigEntry extends ConfigEntry { + @Nullable + private EditBox editBox = null; + + public StringConfigEntry(String modId, String configName, Field field) { + super(modId, configName, field); + } + + @Override + public List createElementWidgets(int width) { + this.editBox = new EditBox( + Minecraft.getInstance().font, + width - 188, + 0, + 150, + 20, + CommonComponents.EMPTY + ); + this.editBox.setValue(this.getFieldValue().toString()); + this.editBox.setResponder(this::setFieldValue); + + + return List.of(this.editBox); + } + + @Override + public void onChange() { + super.onChange(); + + if (this.editBox != null) { + this.editBox.setMessage(Component.literal((String) this.getFieldValue())); + } + } +} diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/gui/WidgetList.java b/common/src/client/java/io/github/jamalam360/jamlib/client/gui/WidgetList.java new file mode 100644 index 0000000..a14949d --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/gui/WidgetList.java @@ -0,0 +1,210 @@ +package io.github.jamalam360.jamlib.client.gui; + +import com.google.common.collect.ImmutableList; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.components.ContainerObjectSelectionList; +import net.minecraft.client.gui.components.events.ContainerEventHandler; +import net.minecraft.client.gui.components.events.GuiEventListener; +import net.minecraft.client.gui.narration.NarratableEntry; +import net.minecraft.util.Mth; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.List; +import java.util.Objects; +import java.util.Optional; + +public class WidgetList extends ContainerObjectSelectionList { + public static final int PADDING = 4; + + public WidgetList(Minecraft minecraft, int width, int height, int y) { + super(minecraft, width, height, y, 1); + System.out.println(height); + this.centerListVertically = false; + this.headerHeight = PADDING; + } + + public void addWidgetGroup(AbstractWidget... widgets) { + this.addEntry(new WidgetList.Entry(ImmutableList.copyOf(widgets))); + } + + public void addWidgetGroup(List widgets) { + this.addEntry(new WidgetList.Entry(widgets)); + } + + @Override + public int getRowWidth() { + return this.width; + } + + @Nullable + public Entry getRealEntryAtPosition(double mouseX, double mouseY) { + int halfRowWidth = this.getRowWidth() / 2; + int centerX = this.getX() + this.width / 2; + int left = centerX - halfRowWidth; + int right = centerX + halfRowWidth; + int m = Mth.floor(mouseY - (double) this.getY()) - this.headerHeight + (int) this.scrollAmount() - 4; + + if (mouseX < left || mouseX > right || m < 0) { + return null; + } + + int height = 0; + + for (int idx = 0; idx < this.getItemCount(); idx++) { + Entry entry = this.getEntry(idx); + height += entry.getHeight() + PADDING; + if (m < height) { + return entry; + } + } + + return null; + } + + @Override + public int maxScrollAmount() { +// int height = this.headerHeight; +// +// for (int i = 0; i < this.getItemCount(); i++) { +// height += this.getEntry(i).getHeight() + PADDING; +// } +// +// return height; + return super.maxScrollAmount(); + } + + @Override + protected void renderListItems(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) { + for (int itemIdx = 0; itemIdx < this.getItemCount(); ++itemIdx) { + int top = this.getRowTop(itemIdx); + int bottom = this.getRowBottom(itemIdx); + if (bottom >= this.getY() && top <= this.getBottom()) { + this.renderItem(graphics, mouseX, mouseY, partialTick, itemIdx, this.getRowLeft(), top, this.getRowWidth(), this.getEntry(itemIdx).getHeight()); + } + } + } + + @Override + protected int contentHeight() { + int itemsHeight = 0; + + for (int i = 0; i < this.getItemCount(); i++) { + itemsHeight += this.getEntry(i).getHeight() + PADDING; + } + + return itemsHeight + this.headerHeight; + } + + @Override + public int getRowTop(int index) { + int itemsHeight = 0; + + for (int i = 0; i < index; i++) { + itemsHeight += this.getEntry(i).getHeight() + PADDING; + } + + return this.getY() - (int) this.scrollAmount() + itemsHeight + this.headerHeight; + } + + @Override + public int getRowBottom(int index) { + return this.getRowTop(index) + this.getEntry(index).getHeight(); + } + + @Override + protected double scrollRate() { + return 10; + } + + @Override + protected int scrollBarX() { + return this.getX() + this.width - 6; + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + if (this.isValidClickButton(button)) { + this.updateScrolling(mouseX, mouseY, button); + if (this.isMouseOver(mouseX, mouseY)) { + Entry entry = this.getRealEntryAtPosition(mouseX, mouseY); + if (entry != null) { + if (entry.mouseClicked(mouseX, mouseY, button)) { + Entry focused = this.getFocused(); + if (focused != entry && focused instanceof ContainerEventHandler eventHandler) { + eventHandler.setFocused(null); + } + + this.setFocused(entry); + this.setDragging(true); + return true; + } + } else { + // TODO: hmm? +// return this.clickedHeader((int) (mouseX - (double) (this.getX() + this.width / 2 - this.getRowWidth() / 2)), (int) (mouseY - (double) this.getY()) + (int) this.scrollAmount() - 4); + } + } + } + return false; + } + + public class Entry extends ContainerObjectSelectionList.Entry { + private final List children; + private final List childYs; + + private Entry(List list) { + this.children = ImmutableList.copyOf(list); + this.childYs = this.children.stream().map(AbstractWidget::getY).toList(); + } + + @Override + public void render(GuiGraphics guiGraphics, int index, int top, int left, int width, int height, int mouseX, int mouseY, boolean hovering, float partialTick) { + for (int i = 0; i < this.children.size(); i++) { + AbstractWidget widget = this.children.get(i); + int relativeY = this.childYs.get(i); + widget.setY(top + relativeY); + widget.render(guiGraphics, mouseX, mouseY, partialTick); + } + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + for (AbstractWidget widget : this.children) { + if (widget.isMouseOver(mouseX, mouseY) && widget.mouseClicked(mouseX, mouseY, button)) { + return true; + } + } + + return false; + } + + public int getHeight() { + int maxY = 0; + + for (int i = 0; i < this.children.size(); i++) { + AbstractWidget widget = this.children.get(i); + int relativeY = this.childYs.get(i); + maxY = Math.max(relativeY + widget.getHeight(), maxY); + } + + return maxY; + } + + @Override + public boolean isMouseOver(double mouseX, double mouseY) { + return Objects.equals(WidgetList.this.getRealEntryAtPosition(mouseX, mouseY), this); + } + + @Override + public @NotNull List children() { + return this.children; + } + + @Override + public @NotNull List narratables() { + return this.children; + } + } +} diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/AbstractSelectionListMixin.java b/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/AbstractSelectionListMixin.java new file mode 100644 index 0000000..2cfcf83 --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/AbstractSelectionListMixin.java @@ -0,0 +1,22 @@ +package io.github.jamalam360.jamlib.client.mixin; + +import io.github.jamalam360.jamlib.client.gui.WidgetList; +import net.minecraft.client.gui.components.AbstractSelectionList; +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; + +@Mixin(AbstractSelectionList.class) +public class AbstractSelectionListMixin { + @Inject( + method = "getEntryAtPosition", + at = @At("HEAD"), + cancellable = true + ) + private void jamlib$modifyGetEntryAtPositionForWidgetList(double mouseX, double mouseY, CallbackInfoReturnable cir) { + if ((Object) this instanceof WidgetList widgetList) { + cir.setReturnValue(widgetList.getRealEntryAtPosition(mouseX, mouseY)); + } + } +} diff --git a/common/src/client/resources/jamlib.client.mixins.json b/common/src/client/resources/jamlib.client.mixins.json index 5047ae8..2546a69 100644 --- a/common/src/client/resources/jamlib.client.mixins.json +++ b/common/src/client/resources/jamlib.client.mixins.json @@ -9,6 +9,7 @@ "event.ConnectionMixin" ], "client": [ + "AbstractSelectionListMixin" ], "server": [ ], diff --git a/common/src/main/resources/assets/jamlib/textures/gui/sprites/writable_book.png b/common/src/main/resources/assets/jamlib/textures/gui/sprites/writable_book.png new file mode 100644 index 0000000000000000000000000000000000000000..b4fffce1b4634097f5ef6d83e3e2daf9703c0cdf GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU1=9EK-Me<}+No2gwr}6Q zcJ11kGiTP<*XQKqL`O%L8p-A8NX9A&_)4%_3NVWauofIRZVS}ISQ6wH%;50sMjDV) z>gnPbQgJKUf$0$Ad%1>;G{>Envk&qV9t_>B#~|t7+x<9 { - //public class TestConfig { + public List listOfInts = List.of(1, 2, 3); + @Comment("This is a boolean") @RequiresRestart public boolean testBoolean = true; From 2c37cf57e5ff443a215843c144bf4f51a1699ccd Mon Sep 17 00:00:00 2001 From: Jamalam Date: Wed, 26 Feb 2025 12:57:16 +0000 Subject: [PATCH 15/21] fix: identify config managers by `(MOD_ID, CONFIG_NAME)` rather than by just `(CONFIG_NAME)` (closes #15) --- CHANGELOG.md | 3 ++- .../io/github/jamalam360/jamlib/config/ConfigManager.java | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f733fb..a94cdac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,4 +2,5 @@ - When both a mod ID and config file name are specified, the config file is now saved under `config/{mod id}/{config name}.json5` (closes #12). - This should not be a breaking change as I am not aware of any mods registering multiple configs currently. - Switch to fabric-api mod ID in dependencies block (closes #10). -- Enable split source sets (closes #14). \ No newline at end of file +- Enable split source sets (closes #14). +- Identify config managers by `(MOD_ID, CONFIG_NAME)` rather than by just `(CONFIG_NAME)` (closes #15). \ No newline at end of file diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java b/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java index f9d8fa2..f8fbfb3 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigManager.java @@ -25,7 +25,7 @@ */ public class ConfigManager { @ApiStatus.Internal - public static final Map> MANAGERS = new HashMap<>(); + public static final Map> MANAGERS = new HashMap<>(); private static final Jankson JANKSON = Jankson.builder().build(); private static final JsonGrammar JSON_GRAMMER = JsonGrammar.builder().bareRootObject(false).bareSpecialNumerics(false).printCommas(true).printWhitespace(true).printUnquotedKeys(true).withComments(true).build(); private final Path configPath; @@ -53,7 +53,7 @@ public ConfigManager(String modId, Class configClass) { * @param configClass The config class */ public ConfigManager(String modId, String configName, Class configClass) { - MANAGERS.put(configName, this); + MANAGERS.put(new Key(modId, configName), this); if (modId.equals(configName)) { this.configPath = Platform.getConfigFolder().resolve(configName + ".json5"); @@ -250,4 +250,7 @@ private void attachDefaultComments(Class clazz, T defaults, JsonObject obj) { } } } + + public record Key(String modId, String configName) { + } } From b4e799e82e56c7510d01bef0af6246be0973914f Mon Sep 17 00:00:00 2001 From: Jamalam Date: Wed, 26 Feb 2025 13:03:47 +0000 Subject: [PATCH 16/21] wip --- .../client/config/gui/ConfigScreen.java | 20 ++- .../config/gui/entry/BooleanConfigEntry.java | 9 +- .../gui/entry/CollectionConfigEntry.java | 33 ----- .../client/config/gui/entry/ConfigEntry.java | 128 ++++++++++-------- .../client/config/gui/entry/ConfigField.java | 16 +++ .../config/gui/entry/EnumConfigEntry.java | 26 ++-- .../config/gui/entry/FieldConfigField.java | 61 +++++++++ .../config/gui/entry/ListConfigEntry.java | 125 +++++++++++++++++ .../gui/entry/ListMemberConfigField.java | 68 ++++++++++ .../config/gui/entry/NumberConfigEntry.java | 44 +++--- .../config/gui/entry/StringConfigEntry.java | 23 +--- .../client/gui/ScrollingStringWidget.java | 17 +++ .../jamlib/client/gui/WidgetList.java | 68 +--------- .../jamlib/config/ConfigExtensions.java | 2 +- .../jamalam360/testmod/config/TestConfig.java | 12 +- 15 files changed, 430 insertions(+), 222 deletions(-) delete mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/CollectionConfigEntry.java create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigField.java create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/FieldConfigField.java create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ListConfigEntry.java create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ListMemberConfigField.java create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/gui/ScrollingStringWidget.java diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java index edc5b69..4c4c621 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/ConfigScreen.java @@ -10,6 +10,7 @@ import net.minecraft.Util; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.SpriteIconButton; import net.minecraft.client.gui.screens.Screen; @@ -31,7 +32,8 @@ public class ConfigScreen extends Screen { protected final ConfigManager manager; private final Screen parent; - private final List entries; + private final List> entries; + private WidgetList widgetList; private Button doneButton; public ConfigScreen(ConfigManager manager, Screen parent) { @@ -89,7 +91,7 @@ protected void init() { ); editManuallyButton.setX(7); editManuallyButton.setY(7); - WidgetList list = new WidgetList(this.minecraft, this.width, this.height - 64, 32); + this.widgetList = new WidgetList(this.minecraft, this.width, this.height - 64, 32); if (this.entries.isEmpty()) { for (Field field : this.manager.getConfigClass().getFields()) { @@ -101,11 +103,11 @@ protected void init() { } } - for (ConfigEntry entry : this.entries) { - list.addWidgetGroup(entry.createWidgets(this.width)); + for (ConfigEntry entry : this.entries) { + this.widgetList.addWidgetGroup(entry.createWidgets(this.width)); } - this.addRenderableWidget(list); + this.addRenderableWidget(this.widgetList); if (this.manager.get() instanceof ConfigExtensions ext) { List links = ext.getLinks(); @@ -150,5 +152,13 @@ public void tick() { if (this.doneButton.active != canExit) { this.doneButton.active = canExit; } + + for (int i = 0; i < this.entries.size(); i++) { + ConfigEntry entry = this.entries.get(i); + List widgets = entry.getNewWidgets(this.width); + if (widgets != null) { + this.widgetList.updateWidgetGroup(i, widgets); + } + } } } diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/BooleanConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/BooleanConfigEntry.java index e25092e..778085b 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/BooleanConfigEntry.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/BooleanConfigEntry.java @@ -6,22 +6,21 @@ import net.minecraft.network.chat.Component; import org.jetbrains.annotations.Nullable; -import java.lang.reflect.Field; import java.util.List; -public class BooleanConfigEntry extends ConfigEntry { +public class BooleanConfigEntry extends ConfigEntry { @Nullable private Button button = null; - public BooleanConfigEntry(String modId, String configName, Field field) { + public BooleanConfigEntry(String modId, String configName, ConfigField field) { super(modId, configName, field); } @Override - public List createElementWidgets(int width) { + public List createElementWidgets(int left, int width) { this.button = Button.builder(this.getComponent(Boolean.TRUE.equals(this.getFieldValue())), button -> { this.setFieldValue(!(Boolean.TRUE.equals(this.getFieldValue()))); - }).pos(width - 188, 0).size(150, 20).build(); + }).pos(left, 0).size(width, 20).build(); return List.of(this.button); } diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/CollectionConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/CollectionConfigEntry.java deleted file mode 100644 index 16f5d03..0000000 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/CollectionConfigEntry.java +++ /dev/null @@ -1,33 +0,0 @@ -package io.github.jamalam360.jamlib.client.config.gui.entry; - -import net.minecraft.client.gui.components.AbstractWidget; -import net.minecraft.client.gui.components.Button; -import net.minecraft.network.chat.Component; - -import java.lang.reflect.Field; -import java.util.List; - -public class CollectionConfigEntry extends ConfigEntry { - public CollectionConfigEntry(String modId, String configName, Field field) { - super(modId, configName, field); - } - - @Override - public List createElementWidgets(int width) { - List buttons = List.of( - Button.builder(Component.literal("beans"), button -> { - System.out.println("first"); - }).pos(width - 188, 0).size(150, 20).build(), - Button.builder(Component.literal("means heinz"), button -> { - System.out.println("second"); - }).pos(width - 188, 20).size(150, 20).build() - ); - - return buttons; - } - - @Override - public void onChange() { - super.onChange(); - } -} diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java index df52b1b..e0d00c9 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java @@ -1,7 +1,9 @@ package io.github.jamalam360.jamlib.client.config.gui.entry; +import com.google.gson.Gson; import io.github.jamalam360.jamlib.JamLib; import io.github.jamalam360.jamlib.client.config.gui.ConfigScreen; +import io.github.jamalam360.jamlib.client.gui.ScrollingStringWidget; import io.github.jamalam360.jamlib.client.mixinsupport.MutableSpriteImageWidget$Sprite; import io.github.jamalam360.jamlib.config.ConfigExtensions; import io.github.jamalam360.jamlib.config.ConfigManager; @@ -17,38 +19,43 @@ import java.util.Collection; import java.util.List; -public abstract class ConfigEntry { - protected final Field field; - protected final ConfigManager configManager; - private final Object originalValue; +public abstract class ConfigEntry { + private static final Gson GSON = new Gson(); + protected final ConfigField field; + protected final ConfigManager configManager; + protected final V originalValue; private final String translationKey; @Nullable private final List tooltip; - private boolean valid = true; - private ImageWidget validationIcon; + protected ImageWidget validationIcon; + @Nullable + protected List errors; + private boolean recreateWidgetsNextTick = false; - public static ConfigEntry createFromField(String modId, String configName, Field field) { + @SuppressWarnings({"rawtypes", "unchecked"}) + public static ConfigEntry createFromField(String modId, String configName, Field field) { Class c = field.getType(); if (c == boolean.class) { - return new BooleanConfigEntry(modId, configName, field); + return new BooleanConfigEntry<>(modId, configName, new FieldConfigField(field)); } else if (c == float.class || c == double.class || c == int.class || c == long.class) { - return new NumberConfigEntry(modId, configName, field); + return new NumberConfigEntry<>(modId, configName, new FieldConfigField(field)); } else if (c == String.class) { - return new StringConfigEntry(modId, configName, field); + return new StringConfigEntry<>(modId, configName, new FieldConfigField(field)); } else if (c.isEnum()) { - return new EnumConfigEntry<>(modId, configName, field); + return new EnumConfigEntry<>(modId, configName, new FieldConfigField(field)); } else if (Collection.class.isAssignableFrom(c)) { - return new CollectionConfigEntry(modId, configName, field); + return new ListConfigEntry<>(modId, configName, new FieldConfigField(field)); } else { throw new IllegalArgumentException("Unsupported config field type " + c); } } - public ConfigEntry(String modId, String configName, Field field) { + public ConfigEntry(String modId, String configName, ConfigField field) { this.field = field; - this.configManager = ConfigManager.MANAGERS.get(configName); - this.originalValue = this.getFieldValue(); + //noinspection unchecked + this.configManager = (ConfigManager) ConfigManager.MANAGERS.get(configName); + this.originalValue = this.cloneObject(this.getFieldValue()); this.translationKey = ConfigScreen.createTranslationKey(modId, configName, field.getName()); if (I18n.exists(this.translationKey + ".tooltip")) { @@ -61,7 +68,7 @@ public ConfigEntry(String modId, String configName, Field field) { public List createWidgets(int width) { List widgets = new ArrayList<>(); - widgets.add(new FittingMultiLineTextWidget(12, Minecraft.getInstance().font.lineHeight / 2 + 1, width / 2 - 10, Minecraft.getInstance().font.lineHeight, Component.translatable(this.translationKey), Minecraft.getInstance().font)); + widgets.add(new ScrollingStringWidget(12, Minecraft.getInstance().font.lineHeight / 2 + 1, width / 2 - 10, Minecraft.getInstance().font.lineHeight, Component.translatable(this.translationKey), Minecraft.getInstance().font)); this.validationIcon = ImageWidget.sprite(20, 20, JamLib.id("validation_warning")); this.validationIcon.setX(width - 212); @@ -70,17 +77,9 @@ public List createWidgets(int width) { this.validationIcon.visible = false; widgets.add(this.validationIcon); - widgets.addAll(this.createElementWidgets(width)); - - SpriteIconButton resetButton = SpriteIconButton.builder(Component.translatable("config.jamlib.reset"), (button) -> { - this.setFieldValue(this.originalValue); + widgets.addAll(this.createElementWidgets(width - 188, 150)); - if (widgets.get(1) instanceof EditBox box) { - box.setValue(String.valueOf(this.originalValue)); - } else if (widgets.get(1) instanceof SliderButton slider) { - slider.setValue((Double) this.originalValue); - } - }, true).sprite(JamLib.id("reset"), 16, 16).size(20, 20).build(); + SpriteIconButton resetButton = SpriteIconButton.builder(Component.translatable("config.jamlib.reset"), (button) -> this.setFieldValue(this.originalValue), true).sprite(JamLib.id("reset"), 16, 16).size(20, 20).build(); resetButton.setX(width - 30); resetButton.setY(0); widgets.add(resetButton); @@ -88,62 +87,75 @@ public List createWidgets(int width) { return widgets; } - public abstract List createElementWidgets(int width); + public abstract List createElementWidgets(int left, int width); public void onChange() { this.validate(); } - private void validate() { - Object newValue = this.getFieldValue(); + protected void validate() { + V newValue = this.getFieldValue(); - if (this.configManager.get() instanceof ConfigExtensions ext) { - @SuppressWarnings("unchecked") List errors = ((ConfigExtensions) ext).getValidationErrors((ConfigManager) this.configManager, new ConfigExtensions.FieldValidationInfo(this.field.getName(), newValue, this.originalValue, this.field)); - errors.sort((o1, o2) -> o2.type().ordinal() - o1.type().ordinal()); - - if (!errors.isEmpty()) { - this.valid = errors.getFirst().type() != ConfigExtensions.ValidationError.Type.ERROR; - this.validationIcon.visible = true; + if (this.configManager.get() instanceof ConfigExtensions) { + @SuppressWarnings("unchecked") ConfigExtensions ext = (ConfigExtensions) this.configManager.get(); + this.errors = ext.getValidationErrors(this.configManager, new ConfigExtensions.FieldValidationInfo(this.field.getName(), newValue, this.originalValue, this.field.getBackingField())); + this.errors.sort((o1, o2) -> o2.type().ordinal() - o1.type().ordinal()); + this.updateValidationIcon(); + } + } - ((MutableSpriteImageWidget$Sprite) this.validationIcon).setSprite(errors.getFirst().type().getTexture()); - this.validationIcon.setTooltip(Tooltip.create(errors.getFirst().message())); - } else { - this.valid = true; + protected void updateValidationIcon() { + if (this.validationIcon != null) { + if (this.isValid()) { this.validationIcon.visible = false; + } else { + this.validationIcon.visible = true; + ((MutableSpriteImageWidget$Sprite) this.validationIcon).setSprite(this.errors.getFirst().type().getTexture()); + this.validationIcon.setTooltip(Tooltip.create(this.errors.getFirst().message())); } } } + @Nullable + public List getNewWidgets(int width) { + if (this.recreateWidgetsNextTick) { + this.recreateWidgetsNextTick = false; + return this.createWidgets(width); + } else { + return null; + } + } + + public void recreateWidgetsNextTick() { + this.recreateWidgetsNextTick = true; + } + public boolean hasChanged() { return this.getFieldValue().equals(this.originalValue); } public boolean isValid() { - return this.valid; + return this.errors == null || this.errors.stream().noneMatch(e -> e.type() == ConfigExtensions.ValidationError.Type.ERROR); } public Component getName() { return Component.translatable(this.translationKey); } + // TODO: tooltips public @Nullable List getTooltip() { return this.tooltip; } - protected Object getFieldValue() { - try { - return this.field.get(this.configManager.get()); - } catch (IllegalAccessException e) { - JamLib.LOGGER.error("Failed to access field for config {}", this.configManager.getConfigName(), e); - return null; - } + protected V getFieldValue() { + return this.field.getValue(this.configManager); } - protected void setFieldValue(Object v) { + protected void setFieldValue(V v) { Object realValue = v; if (v instanceof Number n) { - Class c = this.field.getType(); + Class c = this.field.getElementType(); if (c == double.class || c == Double.class) { realValue = n.doubleValue(); @@ -156,11 +168,17 @@ protected void setFieldValue(Object v) { } } - try { - this.field.set(this.configManager.get(), realValue); - this.onChange(); - } catch (IllegalAccessException e) { - JamLib.LOGGER.error("Failed to access field for config {}", this.configManager.getConfigName(), e); + //noinspection unchecked + this.field.setValue(this.configManager, (V) realValue); + this.onChange(); + } + + private V cloneObject(V object) { + if (object == null) { + return null; } + + //noinspection unchecked + return (V) GSON.fromJson(GSON.toJson(object), object.getClass()); } } diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigField.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigField.java new file mode 100644 index 0000000..314d560 --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigField.java @@ -0,0 +1,16 @@ +package io.github.jamalam360.jamlib.client.config.gui.entry; + +import io.github.jamalam360.jamlib.config.ConfigManager; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; + +public interface ConfigField { + V getValue(ConfigManager manager); + void setValue(ConfigManager manager, V value); + boolean isAnnotationPresent(Class annotationClass); + A getAnnotation(Class annotationClass); + Class getElementType(); + String getName(); + Field getBackingField(); +} diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/EnumConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/EnumConfigEntry.java index 7d36b65..8ad7cdd 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/EnumConfigEntry.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/EnumConfigEntry.java @@ -7,30 +7,29 @@ import net.minecraft.network.chat.Component; import org.jetbrains.annotations.Nullable; -import java.lang.reflect.Field; import java.util.List; -public class EnumConfigEntry> extends ConfigEntry { +public class EnumConfigEntry> extends ConfigEntry { @Nullable - private EnumButton button = null; + private EnumButton button = null; - public EnumConfigEntry(String modId, String configName, Field field) { + public EnumConfigEntry(String modId, String configName, ConfigField field) { super(modId, configName, field); } @Override - public List createElementWidgets(int width) { + public List createElementWidgets(int left, int width) { //noinspection unchecked this.button = new EnumButton<>( - width - 188, + left, 0, - 150, + width, 20, CommonComponents.EMPTY.copy(), - (Class>) this.field.getType(), + (Class>) this.field.getElementType(), (b) -> this.setFieldValue(b.getValue()) ); - this.button.setValue(this.getEnumValue()); + this.button.setValue(this.getFieldValue()); this.button.setMessage(this.getComponent()); return List.of(this.button); @@ -46,17 +45,12 @@ public void onChange() { } private Component getComponent() { - String translationKey = ConfigScreen.createTranslationKey(this.configManager.getModId(), this.configManager.getConfigName(), field.getName() + "." + this.getEnumValue().name().toLowerCase()); + String translationKey = ConfigScreen.createTranslationKey(this.configManager.getModId(), this.configManager.getConfigName(), field.getName() + "." + this.getFieldValue().name().toLowerCase()); if (I18n.exists(translationKey)) { return Component.translatable(translationKey); } else { - return Component.literal(this.getEnumValue().name()); + return Component.literal(this.getFieldValue().name()); } } - - private E getEnumValue() { - //noinspection unchecked - return (E) this.getFieldValue(); - } } diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/FieldConfigField.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/FieldConfigField.java new file mode 100644 index 0000000..2930e55 --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/FieldConfigField.java @@ -0,0 +1,61 @@ +package io.github.jamalam360.jamlib.client.config.gui.entry; + +import io.github.jamalam360.jamlib.JamLib; +import io.github.jamalam360.jamlib.config.ConfigManager; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; + +public class FieldConfigField implements ConfigField { + private final Field field; + + public FieldConfigField(Field field) { + this.field = field; + } + + @SuppressWarnings("unchecked") + @Override + public V getValue(ConfigManager manager) { + try { + return (V) this.field.get(manager.get()); + } catch (IllegalAccessException e) { + JamLib.LOGGER.error("Failed to access field for config {}", manager.getConfigName(), e); + return null; + } + } + + @Override + public void setValue(ConfigManager manager, V value) { + try { + this.field.set(manager.get(), value); + } catch (IllegalAccessException e) { + JamLib.LOGGER.error("Failed to access field for config {}", manager.getConfigName(), e); + } + } + + @Override + public boolean isAnnotationPresent(Class annotationClass) { + return this.field.isAnnotationPresent(annotationClass); + } + + @Override + public T1 getAnnotation(Class annotationClass) { + return this.field.getAnnotation(annotationClass); + } + + @SuppressWarnings("unchecked") + @Override + public Class getElementType() { + return (Class) this.field.getType(); + } + + @Override + public String getName() { + return this.field.getName(); + } + + @Override + public Field getBackingField() { + return this.field; + } +} diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ListConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ListConfigEntry.java new file mode 100644 index 0000000..fb7f5f7 --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ListConfigEntry.java @@ -0,0 +1,125 @@ +package io.github.jamalam360.jamlib.client.config.gui.entry; + +import io.github.jamalam360.jamlib.JamLib; +import io.github.jamalam360.jamlib.client.gui.WidgetList; +import io.github.jamalam360.jamlib.config.ConfigExtensions; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.ImageWidget; +import net.minecraft.client.gui.components.Tooltip; +import net.minecraft.network.chat.Component; + +import java.lang.reflect.ParameterizedType; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.function.Predicate; + +public class ListConfigEntry extends ConfigEntry> { + private List> listMembers; + + public ListConfigEntry(String modId, String configName, ConfigField> field) { + super(modId, configName, field); + } + + @Override + public List createElementWidgets(int left, int width) { + this.createListMembers(); + List widgets = new ArrayList<>(); + int currentY = 0; + int bottom = 0; + int childWidth = width - 20 - WidgetList.PADDING; + + for (int i = 0; i < this.listMembers.size(); i++) { + ConfigEntry entry = this.listMembers.get(i); + List entryWidgets = entry.createElementWidgets(left, childWidth); + + for (AbstractWidget widget : entryWidgets) { + bottom = Math.max(widget.getBottom(), bottom); + widget.setY(widget.getY() + currentY); + } + + int finalI = i; + widgets.add(Button.builder(Component.literal("-"), button -> { + this.getFieldValue().remove(finalI); + this.recreateWidgetsNextTick(); + this.onChange(); + }).size(20, 20).pos(left + childWidth + WidgetList.PADDING, currentY).build()); + widgets.addAll(entryWidgets); + currentY += bottom + WidgetList.PADDING; + } + + widgets.add(Button.builder(Component.literal("+"), button -> { + //noinspection unchecked + this.getFieldValue().add((E) this.getDefaultNewValue()); + this.recreateWidgetsNextTick(); + this.onChange(); + }).size(width, 20).pos(left, currentY).build()); + this.updateValidationIcon(); + return widgets; + } + + @SuppressWarnings("unchecked") + private void createListMembers() { + this.listMembers = new ArrayList<>(); + List list = this.getFieldValue(); + Class elementType = (Class) ((ParameterizedType) this.field.getBackingField().getGenericType()).getActualTypeArguments()[0]; + for (int i = 0; i < list.size(); i++) { + if (elementType == boolean.class) { + this.listMembers.add((ConfigEntry) new BooleanConfigEntry<>(this.configManager.getModId(), this.configManager.getConfigName(), (ConfigField) new ListMemberConfigField<>(this.field.getBackingField(), elementType, i))); + } else if (elementType == float.class || elementType == double.class || elementType == int.class || elementType == long.class || elementType == Float.class || elementType == Double.class || elementType == Integer.class || elementType == Long.class) { + this.listMembers.add((ConfigEntry) new NumberConfigEntry<>(this.configManager.getModId(), this.configManager.getConfigName(), (ConfigField) new ListMemberConfigField<>(this.field.getBackingField(), elementType, i))); + } else if (elementType == String.class) { + this.listMembers.add((ConfigEntry) new StringConfigEntry<>(this.configManager.getModId(), this.configManager.getConfigName(), (ConfigField) new ListMemberConfigField<>(this.field.getBackingField(), elementType, i))); + } else if (elementType.isEnum()) { + this.listMembers.add((ConfigEntry) new EnumConfigEntry<>(this.configManager.getModId(), this.configManager.getConfigName(), (ConfigField) new ListMemberConfigField<>(this.field.getBackingField(), elementType, i))); + } else if (Collection.class.isAssignableFrom(elementType)) { + throw new IllegalArgumentException("Cannot nest collections in config"); + } else { + throw new IllegalArgumentException("Unsupported config field type " + elementType); + } + } + } + + @Override + protected void validate() { + super.validate(); + if (this.configManager.get() instanceof ConfigExtensions) { + @SuppressWarnings("unchecked") ConfigExtensions ext = (ConfigExtensions) this.configManager.get(); + + List elementErrors = new ArrayList<>(); + + for (ConfigEntry entry : this.listMembers) { + this.errors.addAll(ext.getValidationErrors(this.configManager, new ConfigExtensions.FieldValidationInfo(entry.field.getName(), entry.getFieldValue(), entry.originalValue, entry.field.getBackingField()))); + } + + this.errors.sort((o1, o2) -> o2.type().ordinal() - o1.type().ordinal()); + System.out.println(this.errors); + this.updateValidationIcon(); + } + } + + @Override + public boolean isValid() { + return super.isValid() && this.listMembers.stream().allMatch(ConfigEntry::isValid); + } + + @SuppressWarnings("unchecked") + private Object getDefaultNewValue() { + Class c = (Class) ((ParameterizedType) this.field.getBackingField().getGenericType()).getActualTypeArguments()[0]; + + if (c == boolean.class) { + return false; + } else if (c == float.class || c == double.class || c == int.class || c == long.class || c == Float.class || c == Double.class || c == Integer.class || c == Long.class) { + return 0; + } else if (c == String.class) { + return ""; + } else if (c.isEnum()) { + return c.getEnumConstants()[0]; + } else if (Collection.class.isAssignableFrom(c)) { + throw new IllegalArgumentException("Cannot nest collections in config"); + } else { + throw new IllegalArgumentException("Unsupported config field type " + c); + } + } +} diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ListMemberConfigField.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ListMemberConfigField.java new file mode 100644 index 0000000..2db249e --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ListMemberConfigField.java @@ -0,0 +1,68 @@ +package io.github.jamalam360.jamlib.client.config.gui.entry; + +import io.github.jamalam360.jamlib.JamLib; +import io.github.jamalam360.jamlib.config.ConfigManager; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.util.List; + +public class ListMemberConfigField implements ConfigField { + private final Field listField; + private final Class elementClass; + private final int index; + + public ListMemberConfigField(Field listField, Class elementClass, int index) { + this.listField = listField; + this.elementClass = elementClass; + this.index = index; + } + + @SuppressWarnings("unchecked") + @Override + public V getValue(ConfigManager manager) { + try { + List list = (List) this.listField.get(manager.get()); + return this.index >= 0 && this.index < list.size() ? list.get(this.index) : null; + } catch (IllegalAccessException e) { + JamLib.LOGGER.error("Failed to access field for config {}", manager.getConfigName(), e); + return null; + } + } + + @SuppressWarnings("unchecked") + @Override + public void setValue(ConfigManager manager, V value) { + try { + List list = (List) this.listField.get(manager.get()); + list.set(this.index, value); + } catch (IllegalAccessException e) { + JamLib.LOGGER.error("Failed to access field for config {}", manager.getConfigName(), e); + } + } + + @Override + public boolean isAnnotationPresent(Class annotationClass) { + return this.listField.isAnnotationPresent(annotationClass); + } + + @Override + public T1 getAnnotation(Class annotationClass) { + return this.listField.getAnnotation(annotationClass); + } + + @Override + public Class getElementType() { + return this.elementClass; + } + + @Override + public String getName() { + return this.listField.getName() + "." + this.index; + } + + @Override + public Field getBackingField() { + return this.listField; + } +} diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/NumberConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/NumberConfigEntry.java index a169bab..94978d1 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/NumberConfigEntry.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/NumberConfigEntry.java @@ -9,34 +9,33 @@ import net.minecraft.network.chat.Component; import org.jetbrains.annotations.Nullable; -import java.lang.reflect.Field; import java.text.DecimalFormat; import java.util.List; import java.util.function.Function; import java.util.regex.Pattern; -public class NumberConfigEntry extends ConfigEntry { +public class NumberConfigEntry extends ConfigEntry { private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.##"); - private final Function parser; + private final Function parser; private final Pattern regex; @Nullable private EditBox editBox = null; - public NumberConfigEntry(String modId, String configName, Field field) { + public NumberConfigEntry(String modId, String configName, ConfigField field) { super(modId, configName, field); - Class c = field.getType(); + Class c = field.getElementType(); - if (c == float.class) { + if (c == float.class || c == Float.class) { this.parser = Float::parseFloat; this.regex = Pattern.compile("^-?\\d*\\.?\\d*$"); - } else if (c == double.class) { + } else if (c == double.class || c == Double.class) { this.parser = Double::parseDouble; this.regex = Pattern.compile("^-?\\d*\\.?\\d*$"); - } else if (c == int.class) { + } else if (c == int.class || c == Integer.class) { this.parser = Integer::parseInt; this.regex = Pattern.compile("^-?\\d*$"); - } else if (c == long.class) { + } else if (c == long.class || c == Long.class) { this.parser = Long::parseLong; this.regex = Pattern.compile("^-?\\d*$"); } else { @@ -45,8 +44,8 @@ public NumberConfigEntry(String modId, String configName, Field field) { } @Override - public List createElementWidgets(int width) { - Number current = (Number) this.getFieldValue(); + public List createElementWidgets(int left, int width) { + Number current = this.getFieldValue(); if (this.field.isAnnotationPresent(Slider.class)) { WithinRange range = this.field.getAnnotation(WithinRange.class); @@ -56,16 +55,17 @@ public List createElementWidgets(int width) { } SliderButton slider = new SliderButton( - width - 188, + left, 0, - 150, + width, 20, this.getComponent(current), range.min(), range.max(), current.doubleValue(), value -> { - this.setFieldValue(value); + //noinspection unchecked + this.setFieldValue((V) value); return this.getComponent(value); } ); @@ -73,9 +73,9 @@ public List createElementWidgets(int width) { } else { this.editBox = new EditBox( Minecraft.getInstance().font, - width - 188, + left, 0, - 150, + width, 20, CommonComponents.EMPTY ); @@ -83,22 +83,14 @@ public List createElementWidgets(int width) { this.editBox.setFilter(s -> this.regex.matcher(s).matches()); this.editBox.setResponder(s -> { if (!s.isEmpty()) { - this.setFieldValue(this.parser.apply(s)); + //noinspection unchecked + this.setFieldValue((V) this.parser.apply(s)); } }); return List.of(this.editBox); } } - @Override - public void onChange() { - super.onChange(); - - if (this.editBox != null) { - this.editBox.setMessage(this.getComponent((Number) this.getFieldValue())); - } - } - private Component getComponent(Number value) { return Component.literal(DECIMAL_FORMAT.format(value.doubleValue())); } diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/StringConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/StringConfigEntry.java index 6b59d75..208c0d2 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/StringConfigEntry.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/StringConfigEntry.java @@ -7,40 +7,29 @@ import net.minecraft.network.chat.Component; import org.jetbrains.annotations.Nullable; -import java.lang.reflect.Field; import java.util.List; -public class StringConfigEntry extends ConfigEntry { +public class StringConfigEntry extends ConfigEntry { @Nullable private EditBox editBox = null; - public StringConfigEntry(String modId, String configName, Field field) { + public StringConfigEntry(String modId, String configName, ConfigField field) { super(modId, configName, field); } @Override - public List createElementWidgets(int width) { + public List createElementWidgets(int left, int width) { this.editBox = new EditBox( Minecraft.getInstance().font, - width - 188, + left, 0, - 150, + width, 20, CommonComponents.EMPTY ); - this.editBox.setValue(this.getFieldValue().toString()); + this.editBox.setValue(this.getFieldValue()); this.editBox.setResponder(this::setFieldValue); - return List.of(this.editBox); } - - @Override - public void onChange() { - super.onChange(); - - if (this.editBox != null) { - this.editBox.setMessage(Component.literal((String) this.getFieldValue())); - } - } } diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/gui/ScrollingStringWidget.java b/common/src/client/java/io/github/jamalam360/jamlib/client/gui/ScrollingStringWidget.java new file mode 100644 index 0000000..ce14277 --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/gui/ScrollingStringWidget.java @@ -0,0 +1,17 @@ +package io.github.jamalam360.jamlib.client.gui; + +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.components.StringWidget; +import net.minecraft.network.chat.Component; + +public class ScrollingStringWidget extends StringWidget { + public ScrollingStringWidget(int x, int y, int width, int height, Component component, Font font) { + super(x, y, width, height, component, font); + } + + @Override + public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { + this.renderScrollingString(guiGraphics, this.getFont(), 2, this.getColor()); + } +} diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/gui/WidgetList.java b/common/src/client/java/io/github/jamalam360/jamlib/client/gui/WidgetList.java index a14949d..a8cfff6 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/gui/WidgetList.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/gui/WidgetList.java @@ -5,7 +5,6 @@ import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.ContainerObjectSelectionList; -import net.minecraft.client.gui.components.events.ContainerEventHandler; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.util.Mth; @@ -13,25 +12,22 @@ import org.jetbrains.annotations.Nullable; import java.util.List; -import java.util.Objects; -import java.util.Optional; public class WidgetList extends ContainerObjectSelectionList { public static final int PADDING = 4; public WidgetList(Minecraft minecraft, int width, int height, int y) { super(minecraft, width, height, y, 1); - System.out.println(height); this.centerListVertically = false; this.headerHeight = PADDING; } - public void addWidgetGroup(AbstractWidget... widgets) { - this.addEntry(new WidgetList.Entry(ImmutableList.copyOf(widgets))); + public void addWidgetGroup(List widgets) { + this.addEntry(new Entry(widgets)); } - public void addWidgetGroup(List widgets) { - this.addEntry(new WidgetList.Entry(widgets)); + public void updateWidgetGroup(int index, List widgets) { + this.children().set(index, new Entry(widgets)); } @Override @@ -64,18 +60,6 @@ public Entry getRealEntryAtPosition(double mouseX, double mouseY) { return null; } - @Override - public int maxScrollAmount() { -// int height = this.headerHeight; -// -// for (int i = 0; i < this.getItemCount(); i++) { -// height += this.getEntry(i).getHeight() + PADDING; -// } -// -// return height; - return super.maxScrollAmount(); - } - @Override protected void renderListItems(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) { for (int itemIdx = 0; itemIdx < this.getItemCount(); ++itemIdx) { @@ -124,33 +108,7 @@ protected int scrollBarX() { return this.getX() + this.width - 6; } - @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (this.isValidClickButton(button)) { - this.updateScrolling(mouseX, mouseY, button); - if (this.isMouseOver(mouseX, mouseY)) { - Entry entry = this.getRealEntryAtPosition(mouseX, mouseY); - if (entry != null) { - if (entry.mouseClicked(mouseX, mouseY, button)) { - Entry focused = this.getFocused(); - if (focused != entry && focused instanceof ContainerEventHandler eventHandler) { - eventHandler.setFocused(null); - } - - this.setFocused(entry); - this.setDragging(true); - return true; - } - } else { - // TODO: hmm? -// return this.clickedHeader((int) (mouseX - (double) (this.getX() + this.width / 2 - this.getRowWidth() / 2)), (int) (mouseY - (double) this.getY()) + (int) this.scrollAmount() - 4); - } - } - } - return false; - } - - public class Entry extends ContainerObjectSelectionList.Entry { + public static class Entry extends ContainerObjectSelectionList.Entry { private final List children; private final List childYs; @@ -169,17 +127,6 @@ public void render(GuiGraphics guiGraphics, int index, int top, int left, int wi } } - @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - for (AbstractWidget widget : this.children) { - if (widget.isMouseOver(mouseX, mouseY) && widget.mouseClicked(mouseX, mouseY, button)) { - return true; - } - } - - return false; - } - public int getHeight() { int maxY = 0; @@ -192,11 +139,6 @@ public int getHeight() { return maxY; } - @Override - public boolean isMouseOver(double mouseX, double mouseY) { - return Objects.equals(WidgetList.this.getRealEntryAtPosition(mouseX, mouseY), this); - } - @Override public @NotNull List children() { return this.children; diff --git a/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigExtensions.java b/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigExtensions.java index b7d7c13..f9d76aa 100644 --- a/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigExtensions.java +++ b/common/src/main/java/io/github/jamalam360/jamlib/config/ConfigExtensions.java @@ -55,7 +55,7 @@ default List getValidationErrors(ConfigManager manager, Fiel result.add(new ValidationError(ValidationError.Type.WARNING, info, Component.translatable("config.jamlib.requires_restart_tooltip"))); } - if (info.backingField().isAnnotationPresent(WithinRange.class)) { + if (info.backingField().isAnnotationPresent(WithinRange.class) && !List.class.isAssignableFrom(info.backingField().getType())) { if (info.backingField().getType() != double.class && info.backingField().getType() != Double.class && info.backingField().getType() != float.class && info.backingField().getType() != Float.class && info.backingField().getType() != int.class && info.backingField().getType() != Integer.class diff --git a/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java index 41aab2d..7cbcd8b 100644 --- a/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java +++ b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java @@ -8,12 +8,18 @@ import io.github.jamalam360.jamlib.config.RequiresRestart; import io.github.jamalam360.jamlib.config.Slider; import io.github.jamalam360.jamlib.config.WithinRange; + +import java.util.ArrayList; import java.util.List; import net.minecraft.network.chat.Component; public class TestConfig implements ConfigExtensions { - public List listOfInts = List.of(1, 2, 3); + @Slider + @WithinRange(min = 1, max = 10) + public List listOfInts = new ArrayList<>(List.of(1, 2, 3)); + + public List listOfEnums = new ArrayList<>(List.of(ConfigEnum.SECOND)); @Comment("This is a boolean") @RequiresRestart @@ -53,6 +59,10 @@ public List getValidationErrors(ConfigManager manag errors.add(new ValidationError(ValidationError.Type.ERROR, info, Component.translatable("config.testmod.i_dont_like_4"))); } + if (info.name().equals("listOfInts") && ((List) info.value()).size() == 3) { + errors.add(new ValidationError(ValidationError.Type.ERROR, info, Component.literal("Length must be 3"))); + } + return errors; } From 7f4d744cf3380238209c8366925f5fb0233224d4 Mon Sep 17 00:00:00 2001 From: Jamalam Date: Wed, 26 Feb 2025 13:27:05 +0000 Subject: [PATCH 17/21] feat: final list support changes closes #11 --- CHANGELOG.md | 3 ++- .../client/config/gui/entry/ConfigEntry.java | 19 ++++++++++--------- .../config/gui/entry/ListConfigEntry.java | 1 - .../client/gui/ScrollingStringWidget.java | 5 +++++ .../jamlib/client/gui/WidgetList.java | 1 + .../jamalam360/testmod/config/TestConfig.java | 2 +- 6 files changed, 19 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a94cdac..35d9ec5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,4 +3,5 @@ - This should not be a breaking change as I am not aware of any mods registering multiple configs currently. - Switch to fabric-api mod ID in dependencies block (closes #10). - Enable split source sets (closes #14). -- Identify config managers by `(MOD_ID, CONFIG_NAME)` rather than by just `(CONFIG_NAME)` (closes #15). \ No newline at end of file +- Identify config managers by `(MOD_ID, CONFIG_NAME)` rather than by just `(CONFIG_NAME)` (closes #15). +- Allow `List` config fields (closes #11). \ No newline at end of file diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java index e0d00c9..8bc446e 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java @@ -26,7 +26,7 @@ public abstract class ConfigEntry { protected final V originalValue; private final String translationKey; @Nullable - private final List tooltip; + private final Component tooltip; protected ImageWidget validationIcon; @Nullable protected List errors; @@ -54,12 +54,12 @@ public static ConfigEntry createFromField(String modId, String conf public ConfigEntry(String modId, String configName, ConfigField field) { this.field = field; //noinspection unchecked - this.configManager = (ConfigManager) ConfigManager.MANAGERS.get(configName); + this.configManager = (ConfigManager) ConfigManager.MANAGERS.get(new ConfigManager.Key(modId, configName)); this.originalValue = this.cloneObject(this.getFieldValue()); this.translationKey = ConfigScreen.createTranslationKey(modId, configName, field.getName()); if (I18n.exists(this.translationKey + ".tooltip")) { - this.tooltip = Minecraft.getInstance().font.split(Component.translatable(this.translationKey + ".tooltip"), 200); + this.tooltip = Component.translatable(this.translationKey + ".tooltip"); } else { this.tooltip = null; } @@ -68,7 +68,13 @@ public ConfigEntry(String modId, String configName, ConfigField field) { public List createWidgets(int width) { List widgets = new ArrayList<>(); - widgets.add(new ScrollingStringWidget(12, Minecraft.getInstance().font.lineHeight / 2 + 1, width / 2 - 10, Minecraft.getInstance().font.lineHeight, Component.translatable(this.translationKey), Minecraft.getInstance().font)); + ScrollingStringWidget title = new ScrollingStringWidget(12, Minecraft.getInstance().font.lineHeight / 2 + 1, width / 2 - 10, Minecraft.getInstance().font.lineHeight, Component.translatable(this.translationKey), Minecraft.getInstance().font); + + if (this.tooltip != null) { + title.setTooltip(Tooltip.create(this.tooltip)); + } + + widgets.add(title); this.validationIcon = ImageWidget.sprite(20, 20, JamLib.id("validation_warning")); this.validationIcon.setX(width - 212); @@ -142,11 +148,6 @@ public Component getName() { return Component.translatable(this.translationKey); } - // TODO: tooltips - public @Nullable List getTooltip() { - return this.tooltip; - } - protected V getFieldValue() { return this.field.getValue(this.configManager); } diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ListConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ListConfigEntry.java index fb7f5f7..ffdf2de 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ListConfigEntry.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ListConfigEntry.java @@ -94,7 +94,6 @@ protected void validate() { } this.errors.sort((o1, o2) -> o2.type().ordinal() - o1.type().ordinal()); - System.out.println(this.errors); this.updateValidationIcon(); } } diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/gui/ScrollingStringWidget.java b/common/src/client/java/io/github/jamalam360/jamlib/client/gui/ScrollingStringWidget.java index ce14277..405dc38 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/gui/ScrollingStringWidget.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/gui/ScrollingStringWidget.java @@ -1,5 +1,6 @@ package io.github.jamalam360.jamlib.client.gui; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.StringWidget; @@ -13,5 +14,9 @@ public ScrollingStringWidget(int x, int y, int width, int height, Component comp @Override public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { this.renderScrollingString(guiGraphics, this.getFont(), 2, this.getColor()); + + if (this.isMouseOver(mouseX, mouseY) && this.getTooltip() != null) { + guiGraphics.renderTooltip(Minecraft.getInstance().font, this.getTooltip().toCharSequence(Minecraft.getInstance()), mouseX, mouseY); + } } } diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/gui/WidgetList.java b/common/src/client/java/io/github/jamalam360/jamlib/client/gui/WidgetList.java index a8cfff6..c3acf74 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/gui/WidgetList.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/gui/WidgetList.java @@ -5,6 +5,7 @@ import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.ContainerObjectSelectionList; +import net.minecraft.client.gui.components.Tooltip; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.util.Mth; diff --git a/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java index 7cbcd8b..7af2f33 100644 --- a/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java +++ b/testmod-common/src/main/java/io/github/jamalam360/testmod/config/TestConfig.java @@ -59,7 +59,7 @@ public List getValidationErrors(ConfigManager manag errors.add(new ValidationError(ValidationError.Type.ERROR, info, Component.translatable("config.testmod.i_dont_like_4"))); } - if (info.name().equals("listOfInts") && ((List) info.value()).size() == 3) { + if (info.name().equals("listOfInts") && ((List) info.value()).size() != 3) { errors.add(new ValidationError(ValidationError.Type.ERROR, info, Component.literal("Length must be 3"))); } From 3f393b48703bc293ed63110ac60d02fbc4daf3f3 Mon Sep 17 00:00:00 2001 From: Jamalam Date: Wed, 26 Feb 2025 13:30:52 +0000 Subject: [PATCH 18/21] chore: some documentation --- .../jamlib/client/config/gui/entry/BooleanConfigEntry.java | 5 ++--- .../jamlib/client/config/gui/entry/ConfigEntry.java | 1 + .../jamlib/client/config/gui/entry/package-info.java | 7 +++++++ .../jamlib/client/gui/ScrollingStringWidget.java | 3 +++ .../io/github/jamalam360/jamlib/client/gui/WidgetList.java | 3 +++ 5 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/package-info.java diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/BooleanConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/BooleanConfigEntry.java index 778085b..2d5ed8e 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/BooleanConfigEntry.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/BooleanConfigEntry.java @@ -4,6 +4,7 @@ import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import java.util.List; @@ -18,9 +19,7 @@ public BooleanConfigEntry(String modId, String configName, ConfigField createElementWidgets(int left, int width) { - this.button = Button.builder(this.getComponent(Boolean.TRUE.equals(this.getFieldValue())), button -> { - this.setFieldValue(!(Boolean.TRUE.equals(this.getFieldValue()))); - }).pos(left, 0).size(width, 20).build(); + this.button = Button.builder(this.getComponent(Boolean.TRUE.equals(this.getFieldValue())), button -> this.setFieldValue(!(Boolean.TRUE.equals(this.getFieldValue())))).pos(left, 0).size(width, 20).build(); return List.of(this.button); } diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java index 8bc446e..25fe93f 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java @@ -12,6 +12,7 @@ import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.util.FormattedCharSequence; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import java.lang.reflect.Field; diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/package-info.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/package-info.java new file mode 100644 index 0000000..2ba9aeb --- /dev/null +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/package-info.java @@ -0,0 +1,7 @@ +/** + * All classes in this package are internal. + */ +@ApiStatus.Internal +package io.github.jamalam360.jamlib.client.config.gui.entry; + +import org.jetbrains.annotations.ApiStatus; \ No newline at end of file diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/gui/ScrollingStringWidget.java b/common/src/client/java/io/github/jamalam360/jamlib/client/gui/ScrollingStringWidget.java index 405dc38..f2626c6 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/gui/ScrollingStringWidget.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/gui/ScrollingStringWidget.java @@ -6,6 +6,9 @@ import net.minecraft.client.gui.components.StringWidget; import net.minecraft.network.chat.Component; +/** + * A string widget that scrolls if the component is too long for the width + */ public class ScrollingStringWidget extends StringWidget { public ScrollingStringWidget(int x, int y, int width, int height, Component component, Font font) { super(x, y, width, height, component, font); diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/gui/WidgetList.java b/common/src/client/java/io/github/jamalam360/jamlib/client/gui/WidgetList.java index c3acf74..83f47da 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/gui/WidgetList.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/gui/WidgetList.java @@ -14,6 +14,9 @@ import java.util.List; +/** + * A scrollable list of widget groups. Widget groups can have arbitrary heights. + */ public class WidgetList extends ContainerObjectSelectionList { public static final int PADDING = 4; From 64b82169e83c1b69a15cb99ae019c9c83314fa93 Mon Sep 17 00:00:00 2001 From: Jamalam Date: Wed, 26 Feb 2025 13:35:13 +0000 Subject: [PATCH 19/21] chore: bump version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 862c8ef..496b0ae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false org.gradle.parallel=true -version=1.2.2+1.21.4 +version=1.3.0+1.21.4 minecraft_version=1.21.4 additional_minecraft_versions= From 95a9f1608269b866a97953fe50f6171722c07dbb Mon Sep 17 00:00:00 2001 From: Jamalam Date: Wed, 26 Feb 2025 13:42:56 +0000 Subject: [PATCH 20/21] fix: reset button next to each config field now resets to the default value, rather than the value the field had when the config screen was opened --- CHANGELOG.md | 9 +++++--- .../client/config/gui/entry/ConfigEntry.java | 22 +++++++++++++++---- .../resources/assets/jamlib/lang/en_us.json | 1 + 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35d9ec5..2ef376d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ - Ensure inherited fields are present in config GUIs (closes #13). -- When both a mod ID and config file name are specified, the config file is now saved under `config/{mod id}/{config name}.json5` (closes #12). - - This should not be a breaking change as I am not aware of any mods registering multiple configs currently. +- When both a mod ID and config file name are specified, the config file is now saved under + `config/{mod id}/{config name}.json5` (closes #12). + - This should not be a breaking change as I am not aware of any mods registering multiple configs currently. - Switch to fabric-api mod ID in dependencies block (closes #10). - Enable split source sets (closes #14). - Identify config managers by `(MOD_ID, CONFIG_NAME)` rather than by just `(CONFIG_NAME)` (closes #15). -- Allow `List` config fields (closes #11). \ No newline at end of file +- Allow `List` config fields (closes #11). +- The reset button next to each config field now resets to the default value, rather than the value the field had when + the config screen was opened. \ No newline at end of file diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java index 25fe93f..2073f64 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/config/gui/entry/ConfigEntry.java @@ -8,14 +8,16 @@ import io.github.jamalam360.jamlib.config.ConfigExtensions; import io.github.jamalam360.jamlib.config.ConfigManager; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.components.*; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.components.ImageWidget; +import net.minecraft.client.gui.components.SpriteIconButton; +import net.minecraft.client.gui.components.Tooltip; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; -import net.minecraft.util.FormattedCharSequence; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -86,9 +88,10 @@ public List createWidgets(int width) { widgets.addAll(this.createElementWidgets(width - 188, 150)); - SpriteIconButton resetButton = SpriteIconButton.builder(Component.translatable("config.jamlib.reset"), (button) -> this.setFieldValue(this.originalValue), true).sprite(JamLib.id("reset"), 16, 16).size(20, 20).build(); + SpriteIconButton resetButton = SpriteIconButton.builder(Component.translatable("config.jamlib.reset"), (button) -> this.setFieldValue(this.getDefaultValue()), true).sprite(JamLib.id("reset"), 16, 16).size(20, 20).build(); resetButton.setX(width - 30); resetButton.setY(0); + resetButton.setTooltip(Tooltip.create(Component.translatable("config.jamlib.reset_tooltip"))); widgets.add(resetButton); return widgets; @@ -175,6 +178,17 @@ protected void setFieldValue(V v) { this.onChange(); } + private V getDefaultValue() { + try { + T defaultConfig = this.configManager.getConfigClass().getConstructor().newInstance(); + //noinspection unchecked + return (V) this.field.getBackingField().get(defaultConfig); + } catch (InstantiationException | IllegalAccessException | InvocationTargetException | + NoSuchMethodException e) { + throw new RuntimeException("Failed to get default config for config " + this.configManager.getConfigClass(), e); + } + } + private V cloneObject(V object) { if (object == null) { return null; diff --git a/common/src/main/resources/assets/jamlib/lang/en_us.json b/common/src/main/resources/assets/jamlib/lang/en_us.json index d61f317..db30ab4 100644 --- a/common/src/main/resources/assets/jamlib/lang/en_us.json +++ b/common/src/main/resources/assets/jamlib/lang/en_us.json @@ -3,6 +3,7 @@ "config.jamlib.open": "Open", "config.jamlib.edit_manually": "Edit Manually", "config.jamlib.reset": "Reset", + "config.jamlib.reset_tooltip": "Reset to Default Value", "config.jamlib.matches_regex_tooltip": "Value should match the following regular expression: %s", "config.jamlib.requires_restart_tooltip": "A restart is required for this change to take effect", "config.jamlib.within_range_tooltip": "Value should be between %d and %d", From 39ec04b539e39452228d187f228383acd1f7bd4b Mon Sep 17 00:00:00 2001 From: Jamalam Date: Wed, 26 Feb 2025 14:20:54 +0000 Subject: [PATCH 21/21] fix: undo package change of ClientPlayLifecycleEvents, whoops --- .../jamlib/client/mixin/event/ClientPacketListenerMixin.java | 2 +- .../jamalam360/jamlib/client/mixin/event/ConnectionMixin.java | 2 +- .../{client => }/events/client/ClientPlayLifecycleEvents.java | 2 +- gradle.properties | 2 +- .../src/main/java/io/github/jamalam360/testmod/TestMod.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename common/src/client/java/io/github/jamalam360/jamlib/{client => }/events/client/ClientPlayLifecycleEvents.java (93%) diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/event/ClientPacketListenerMixin.java b/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/event/ClientPacketListenerMixin.java index 2fb1d05..ad57593 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/event/ClientPacketListenerMixin.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/event/ClientPacketListenerMixin.java @@ -1,6 +1,6 @@ package io.github.jamalam360.jamlib.client.mixin.event; -import io.github.jamalam360.jamlib.client.events.client.ClientPlayLifecycleEvents; +import io.github.jamalam360.jamlib.events.client.ClientPlayLifecycleEvents; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/event/ConnectionMixin.java b/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/event/ConnectionMixin.java index c7bbe88..cafa229 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/event/ConnectionMixin.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/client/mixin/event/ConnectionMixin.java @@ -1,6 +1,6 @@ package io.github.jamalam360.jamlib.client.mixin.event; -import io.github.jamalam360.jamlib.client.events.client.ClientPlayLifecycleEvents; +import io.github.jamalam360.jamlib.events.client.ClientPlayLifecycleEvents; import io.netty.channel.ChannelHandlerContext; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/common/src/client/java/io/github/jamalam360/jamlib/client/events/client/ClientPlayLifecycleEvents.java b/common/src/client/java/io/github/jamalam360/jamlib/events/client/ClientPlayLifecycleEvents.java similarity index 93% rename from common/src/client/java/io/github/jamalam360/jamlib/client/events/client/ClientPlayLifecycleEvents.java rename to common/src/client/java/io/github/jamalam360/jamlib/events/client/ClientPlayLifecycleEvents.java index bf8b80e..5f363a0 100644 --- a/common/src/client/java/io/github/jamalam360/jamlib/client/events/client/ClientPlayLifecycleEvents.java +++ b/common/src/client/java/io/github/jamalam360/jamlib/events/client/ClientPlayLifecycleEvents.java @@ -1,4 +1,4 @@ -package io.github.jamalam360.jamlib.client.events.client; +package io.github.jamalam360.jamlib.events.client; import dev.architectury.event.Event; import dev.architectury.event.EventFactory; diff --git a/gradle.properties b/gradle.properties index fa3a25d..20040c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false org.gradle.parallel=true -version=1.3.0+1.21.3 +version=1.3.1+1.21.3 minecraft_version=1.21.3 additional_minecraft_versions=1.21.2 diff --git a/testmod-common/src/main/java/io/github/jamalam360/testmod/TestMod.java b/testmod-common/src/main/java/io/github/jamalam360/testmod/TestMod.java index 707bc2a..7512cb1 100644 --- a/testmod-common/src/main/java/io/github/jamalam360/testmod/TestMod.java +++ b/testmod-common/src/main/java/io/github/jamalam360/testmod/TestMod.java @@ -2,7 +2,7 @@ import io.github.jamalam360.jamlib.JamLibPlatform; import io.github.jamalam360.jamlib.config.ConfigManager; -import io.github.jamalam360.jamlib.client.events.client.ClientPlayLifecycleEvents; +import io.github.jamalam360.jamlib.events.client.ClientPlayLifecycleEvents; import io.github.jamalam360.testmod.config.NestedConfigChild; import io.github.jamalam360.testmod.config.QuickerConnectButtonTestConfig; import io.github.jamalam360.testmod.config.TestConfig;