commit f63a1fa42f6cc8e30ebf35b77608c6d7c851a0d7 Author: JFronny <33260128+jfronny@users.noreply.github.com> Date: Tue Nov 24 22:04:13 2020 +0100 Add files diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3c37caf --- /dev/null +++ b/.gitignore @@ -0,0 +1,118 @@ +# User-specific stuff +.idea/ + +*.iml +*.ipr +*.iws + +# IntelliJ +out/ +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Cache of project +.gradletasknamecache + +**/build/ + +# Common working directory +run/ + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..bc87a97 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2020 JFronny + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..544ecba --- /dev/null +++ b/build.gradle @@ -0,0 +1,90 @@ +plugins { + id 'fabric-loom' version '0.5-SNAPSHOT' + id 'maven-publish' +} + +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + +archivesBaseName = project.archives_base_name +version = project.mod_version +group = project.maven_group + +repositories { + maven { url = 'https://server.bbkr.space/artifactory/libs-release'; name = "Cotton" } +} + +dependencies { + //to change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs. + // You may need to force-disable transitiveness on them. + modCompile("io.github.prospector:modmenu:1.14.9+build.14") + modApi("me.shedaniel.cloth:config-2:4.8.3") { + exclude(group: "net.fabricmc.fabric-api") + } + include ("me.shedaniel.cloth:config-2:4.8.3") { + exclude(group: "net.fabricmc.fabric-api") + } + + modApi "io.github.cottonmc:LibCD:3.0.3+1.16.3" +} + +processResources { + inputs.property "version", project.version + + from(sourceSets.main.resources.srcDirs) { + include "fabric.mod.json" + expand "version": project.version + } + + from(sourceSets.main.resources.srcDirs) { + exclude "fabric.mod.json" + } +} + +// ensure that the encoding is set to UTF-8, no matter what the system default is +// this fixes some edge cases with special characters not displaying correctly +// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} + +// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task +// if it is present. +// If you remove this task, sources will not be generated. +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = "sources" + from sourceSets.main.allSource +} + +jar { + from "LICENSE" +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + // add all the jars that should be included when publishing to maven + artifact(remapJar) { + builtBy remapJar + } + artifact(sourcesJar) { + builtBy remapSourcesJar + } + } + } + + // select the repositories you want to publish to + repositories { + // uncomment to publish to the local maven + // mavenLocal() + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..0a4a929 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,14 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +# Fabric Properties +# check these on https://modmuss50.me/fabric.html +minecraft_version=1.16.4 +yarn_mappings=1.16.4+build.7 +loader_version=0.10.8 +# Mod Properties +mod_version=1.0 +maven_group=io.gitlab.jfronny +archives_base_name=respackopts +# Dependencies +# check this on https://modmuss50.me/fabric.html +fabric_version=0.26.2+1.16 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..62d4c05 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..bb8b2fc --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..fbd7c51 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# 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"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +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. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..5093609 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,104 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +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. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +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. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..5b60df3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + jcenter() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/io/gitlab/jfronny/respackopts/GuiFactory.java b/src/main/java/io/gitlab/jfronny/respackopts/GuiFactory.java new file mode 100644 index 0000000..41e221e --- /dev/null +++ b/src/main/java/io/gitlab/jfronny/respackopts/GuiFactory.java @@ -0,0 +1,89 @@ +package io.gitlab.jfronny.respackopts; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; +import me.shedaniel.clothconfig2.api.ConfigBuilder; +import me.shedaniel.clothconfig2.api.ConfigCategory; +import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; +import net.minecraft.client.gui.screen.FatalErrorScreen; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.text.TranslatableText; + +import java.util.HashMap; +import java.util.Map; + +public class GuiFactory { + public void buildCategory(JsonObject source, String screenId, ConfigCategory config, ConfigEntryBuilder entryBuilder) { + if (!Respackopts.boolVals.containsKey(screenId)) + Respackopts.boolVals.put(screenId, new HashMap<>()); + if (!Respackopts.numVals.containsKey(screenId)) + Respackopts.numVals.put(screenId, new HashMap<>()); + if (!Respackopts.strVals.containsKey(screenId)) + Respackopts.strVals.put(screenId, new HashMap<>()); + for (Map.Entry entry : source.entrySet()) { + String n = entry.getKey(); + JsonElement e = entry.getValue(); + if (e.isJsonPrimitive()) { + JsonPrimitive p = e.getAsJsonPrimitive(); + if (p.isBoolean()) { + boolean defaultValue = p.getAsBoolean(); + boolean currentValue = defaultValue; + if (Respackopts.boolVals.get(screenId).containsKey(n)) + currentValue = Respackopts.boolVals.get(screenId).get(n); + else + Respackopts.boolVals.get(screenId).put(n, defaultValue); + config.addEntry(entryBuilder.startBooleanToggle(new TranslatableText(n), currentValue) + .setDefaultValue(defaultValue) + .setSaveConsumer(v -> Respackopts.boolVals.get(screenId).put(n, v)) + .build()); + } + else if (p.isNumber()) { + double defaultValue = p.getAsDouble(); + double currentValue = defaultValue; + if (Respackopts.numVals.get(screenId).containsKey(n)) + currentValue = Respackopts.numVals.get(screenId).get(n); + else + Respackopts.numVals.get(screenId).put(n, defaultValue); + config.addEntry(entryBuilder.startDoubleField(new TranslatableText(n), currentValue) + .setDefaultValue(defaultValue) + .setSaveConsumer(v -> Respackopts.numVals.get(screenId).put(n, v)) + .build()); + } + else if (p.isString()) { + String defaultValue = p.getAsString(); + String currentValue = defaultValue; + if (Respackopts.strVals.get(screenId).containsKey(n)) + currentValue = Respackopts.strVals.get(screenId).get(n); + else + Respackopts.strVals.get(screenId).put(n, defaultValue); + config.addEntry(entryBuilder.startStrField(new TranslatableText(n), currentValue) + .setDefaultValue(defaultValue) + .setSaveConsumer(v -> Respackopts.strVals.get(screenId).put(n, v)) + .build()); + } + } + else { + System.err.println("[respackopts] Unsupported non-primitive datatype"); + } + } + } + + public Screen buildGui(JsonObject source, String resourcepackid, Screen parent, Runnable respackReload) { + try { + ConfigBuilder builder; + builder = ConfigBuilder.create() + .setParentScreen(parent) + .setTitle(new TranslatableText("respackopts.title." + resourcepackid)); + ConfigEntryBuilder entryBuilder = builder.entryBuilder(); + builder.setSavingRunnable(respackReload); + ConfigCategory config = builder.getOrCreateCategory(new TranslatableText("respackopts.category." + resourcepackid)); + buildCategory(source, resourcepackid, config, entryBuilder); + return builder.build(); + } + catch (Throwable t) { + t.printStackTrace(); + return new FatalErrorScreen(new TranslatableText("respackopts.loadFailed"), new TranslatableText("respackopts.loadError")); + } + } +} diff --git a/src/main/java/io/gitlab/jfronny/respackopts/LibCDCompat.java b/src/main/java/io/gitlab/jfronny/respackopts/LibCDCompat.java new file mode 100644 index 0000000..c626a7f --- /dev/null +++ b/src/main/java/io/gitlab/jfronny/respackopts/LibCDCompat.java @@ -0,0 +1,44 @@ +package io.gitlab.jfronny.respackopts; + +import io.github.cottonmc.libcd.api.CDSyntaxError; +import io.github.cottonmc.libcd.api.condition.ConditionManager; +import io.github.cottonmc.libcd.api.init.ConditionInitializer; +import net.minecraft.util.Identifier; + +import java.util.HashMap; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicBoolean; + +public class LibCDCompat implements ConditionInitializer { + @Override + public void initConditions(ConditionManager conditionManager) { + conditionManager.registerCondition(new Identifier(Respackopts.ID, "cfg"), q -> { + if (!(q instanceof String)) { + throw new CDSyntaxError("Expected string"); + } + String s = (String) q; + System.out.println(s); + if (!s.contains(":")) { + throw new CDSyntaxError("You must include you resource pack ID in conditions (format: pack:some.key)"); + } + AtomicBoolean found = new AtomicBoolean(false); + AtomicBoolean output = new AtomicBoolean(false); + Respackopts.resPackMetas.forEach((r, v) -> { + if (Objects.equals(v.meta.id, s.split(":")[0])) { + found.set(true); + String name = s.substring(s.indexOf(':') + 1); + output.set(v.conf.get(name).getAsBoolean()); + if (!Respackopts.boolVals.containsKey(s.split(":")[0])) + Respackopts.boolVals.put(s.split(":")[0], new HashMap<>()); + HashMap a = Respackopts.boolVals.get(s.split(":")[0]); + if (a.containsKey(name)) + output.set(a.get(name)); + } + }); + if (!found.get()) { + throw new CDSyntaxError("Could not find pack with specified ID"); + } + return output.get(); + }); + } +} diff --git a/src/main/java/io/gitlab/jfronny/respackopts/MMI.java b/src/main/java/io/gitlab/jfronny/respackopts/MMI.java new file mode 100644 index 0000000..5536543 --- /dev/null +++ b/src/main/java/io/gitlab/jfronny/respackopts/MMI.java @@ -0,0 +1,37 @@ +package io.gitlab.jfronny.respackopts; + +import io.github.prospector.modmenu.api.ConfigScreenFactory; +import io.github.prospector.modmenu.api.ModMenuApi; +import me.shedaniel.clothconfig2.api.ConfigBuilder; +import me.shedaniel.clothconfig2.api.ConfigCategory; +import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; +import net.minecraft.client.gui.screen.FatalErrorScreen; +import net.minecraft.text.TranslatableText; + +public class MMI implements ModMenuApi { + @Override + public ConfigScreenFactory getModConfigScreenFactory() { + return parent -> { + try { + ConfigBuilder builder; + builder = ConfigBuilder.create() + .setParentScreen(parent) + .setTitle(new TranslatableText("respackopts.mainconfig")); + ConfigEntryBuilder entryBuilder = builder.entryBuilder(); + builder.setSavingRunnable(() -> { + //TODO implement reload + Respackopts.save(); + }); + Respackopts.resPackMetas.forEach((s, v) -> { + ConfigCategory config = builder.getOrCreateCategory(new TranslatableText("respackopts.category." + v.meta.id)); + Respackopts.factory.buildCategory(v.conf, v.meta.id, config, entryBuilder); + }); + return builder.build(); + } + catch (Throwable t) { + t.printStackTrace(); + return new FatalErrorScreen(new TranslatableText("respackopts.loadFailed"), new TranslatableText("respackopts.loadError")); + } + }; + } +} diff --git a/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java b/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java new file mode 100644 index 0000000..bf1b8f0 --- /dev/null +++ b/src/main/java/io/gitlab/jfronny/respackopts/Respackopts.java @@ -0,0 +1,60 @@ +package io.gitlab.jfronny.respackopts; + +import com.google.gson.Gson; +import io.gitlab.jfronny.respackopts.data.Config; +import io.gitlab.jfronny.respackopts.data.Respackmeta; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.loader.api.FabricLoader; +import org.lwjgl.stb.STBRPNode; + +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.HashMap; + +@Environment(EnvType.CLIENT) +public class Respackopts implements ClientModInitializer { + public static HashMap> boolVals; + public static HashMap> numVals; + public static HashMap> strVals; + public static Gson g = new Gson(); + public static GuiFactory factory = new GuiFactory(); + public static final Integer metaVersion = 1; + public static HashMap resPackMetas = new HashMap<>(); + public static final String ID = "respackopts"; + static final Path p = FabricLoader.getInstance().getConfigDir().resolve("respackopts.json"); + @Override + public void onInitializeClient() { + try { + Reader reader = Files.newBufferedReader(p); + Config c = g.fromJson(reader, Config.class); + boolVals = c.boolVals; + numVals = c.numVals; + strVals = c.strVals; + } catch (IOException e) { + e.printStackTrace(); + } + if (boolVals == null) + boolVals = new HashMap<>(); + if (numVals == null) + numVals = new HashMap<>(); + if (strVals == null) + strVals = new HashMap<>(); + } + + public static void save() { + System.out.println("Yay"); + Config c = new Config(); + c.boolVals = boolVals; + c.numVals = numVals; + c.strVals = strVals; + try { + Writer writer = Files.newBufferedWriter(p); + g.toJson(c, writer); + } catch (IOException e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/io/gitlab/jfronny/respackopts/TexturedButtonWidget.java b/src/main/java/io/gitlab/jfronny/respackopts/TexturedButtonWidget.java new file mode 100644 index 0000000..7cb5ee4 --- /dev/null +++ b/src/main/java/io/gitlab/jfronny/respackopts/TexturedButtonWidget.java @@ -0,0 +1,52 @@ +package io.gitlab.jfronny.respackopts; + +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.util.NarratorManager; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; + +public class TexturedButtonWidget extends ButtonWidget { + private final Identifier texture; + private final int u; + private final int v; + private final int uWidth; + private final int vHeight; + + public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, Identifier texture, int uWidth, int vHeight, PressAction onPress) { + this(x, y, width, height, u, v, texture, uWidth, vHeight, onPress, NarratorManager.EMPTY); + } + + public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, Identifier texture, int uWidth, int vHeight, PressAction onPress, Text message) { + this(x, y, width, height, u, v, texture, uWidth, vHeight, onPress, message, EMPTY); + } + + public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, Identifier texture, int uWidth, int vHeight, PressAction onPress, Text message, TooltipSupplier tooltipSupplier) { + super(x, y, width, height, message, onPress, tooltipSupplier); + this.uWidth = uWidth; + this.vHeight = vHeight; + this.u = u; + this.v = v; + this.texture = texture; + } + + public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) { + MinecraftClient client = MinecraftClient.getInstance(); + client.getTextureManager().bindTexture(this.texture); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.disableDepthTest(); + int adjustedV = this.v; + if (!this.active) { + adjustedV += this.height * 2; + } else if (this.isHovered()) { + adjustedV += this.height; + } + drawTexture(matrices, this.x, this.y, (float)this.u, (float)adjustedV, this.width, this.height, this.uWidth, this.vHeight); + RenderSystem.enableDepthTest(); + if (this.isHovered()) { + this.renderToolTip(matrices, mouseX, mouseY); + } + } +} diff --git a/src/main/java/io/gitlab/jfronny/respackopts/data/Config.java b/src/main/java/io/gitlab/jfronny/respackopts/data/Config.java new file mode 100644 index 0000000..3ff9cbd --- /dev/null +++ b/src/main/java/io/gitlab/jfronny/respackopts/data/Config.java @@ -0,0 +1,9 @@ +package io.gitlab.jfronny.respackopts.data; + +import java.util.HashMap; + +public class Config { + public HashMap> boolVals; + public HashMap> numVals; + public HashMap> strVals; +} diff --git a/src/main/java/io/gitlab/jfronny/respackopts/data/Respackmeta.java b/src/main/java/io/gitlab/jfronny/respackopts/data/Respackmeta.java new file mode 100644 index 0000000..d183c22 --- /dev/null +++ b/src/main/java/io/gitlab/jfronny/respackopts/data/Respackmeta.java @@ -0,0 +1,18 @@ +package io.gitlab.jfronny.respackopts.data; + +import com.google.gson.JsonObject; + +public class Respackmeta { + public JsonMeta meta; + public JsonObject conf; + + public Respackmeta(JsonMeta meta, JsonObject conf) { + this.meta = meta; + this.conf = conf; + } + + public static class JsonMeta { + public String id; + public Integer version; + } +} diff --git a/src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackEntryMixin.java b/src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackEntryMixin.java new file mode 100644 index 0000000..75df7b0 --- /dev/null +++ b/src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackEntryMixin.java @@ -0,0 +1,80 @@ +package io.gitlab.jfronny.respackopts.mixin; + +import com.mojang.blaze3d.systems.RenderSystem; +import io.github.prospector.modmenu.ModMenu; +import io.github.prospector.modmenu.gui.ModListEntry; +import io.github.prospector.modmenu.gui.ModMenuTexturedButtonWidget; +import io.github.prospector.modmenu.gui.ModsScreen; +import io.gitlab.jfronny.respackopts.Respackopts; +import io.gitlab.jfronny.respackopts.TexturedButtonWidget; +import io.gitlab.jfronny.respackopts.data.Respackmeta; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.pack.PackListWidget; +import net.minecraft.client.gui.screen.pack.ResourcePackOrganizer; +import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.resource.ResourceManager; +import net.minecraft.text.TranslatableText; +import net.minecraft.util.Identifier; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.util.Objects; + +@Mixin(PackListWidget.ResourcePackEntry.class) +public abstract class ResourcePackEntryMixin extends AlwaysSelectedEntryListWidget.Entry { + @Shadow private PackListWidget widget; + + @Shadow protected abstract boolean isSelectable(); + + @Shadow @Final private ResourcePackOrganizer.Pack pack; + boolean respackopts$selected; + + @Inject(at = @At("TAIL"), method = "render(Lnet/minecraft/client/util/math/MatrixStack;IIIIIIIZF)V") + private void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta, CallbackInfo info) { + String k = pack.getDisplayName().asString(); + if (this.isSelectable() && Respackopts.resPackMetas.containsKey(k)) { + int d = mouseX - x; + d = widget.getRowWidth() - d; + int e = mouseY - y; + respackopts$selected = d <= 32 && d >= 12 && e <= entryHeight / 2 + 10 && e >= entryHeight / 2 - 10; + respackopts$renderButton(matrices, respackopts$selected, new Identifier("modmenu", "textures/gui/configure_button.png"), x + entryWidth - 30, y + entryHeight / 2 - 10, 20, 20, 0, 0, 32, 64); + } + } + + @Inject(at = @At("TAIL"), method = "mouseClicked(DDI)Z") + public void mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable info) { + if (this.isSelectable()) { + String k = pack.getDisplayName().asString(); + if (Respackopts.resPackMetas.containsKey(k) && respackopts$selected) { + Respackmeta meta = Respackopts.resPackMetas.get(k); + MinecraftClient c = MinecraftClient.getInstance(); + c.openScreen(Respackopts.factory.buildGui(meta.conf, meta.meta.id, c.currentScreen, () -> { + Respackopts.save(); + })); + } + //TODO mark resource packs as changed if config modified + } + } + + private void respackopts$renderButton(MatrixStack matrices, boolean hovered, Identifier texture, int x, int y, int width, int height, int u, int v, int uWidth, int vHeight) { + MinecraftClient client = MinecraftClient.getInstance(); + client.getTextureManager().bindTexture(texture); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); + RenderSystem.disableDepthTest(); + int adjustedV = v; + if (hovered) { + adjustedV += height; + } + DrawableHelper.drawTexture(matrices, x, y, u, (float)adjustedV, width, height, uWidth, vHeight); + RenderSystem.enableDepthTest(); + } +} diff --git a/src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackManagerMixin.java b/src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackManagerMixin.java new file mode 100644 index 0000000..24d3b8a --- /dev/null +++ b/src/main/java/io/gitlab/jfronny/respackopts/mixin/ResourcePackManagerMixin.java @@ -0,0 +1,57 @@ +package io.gitlab.jfronny.respackopts.mixin; + +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import io.gitlab.jfronny.respackopts.Respackopts; +import io.gitlab.jfronny.respackopts.data.Respackmeta; +import net.minecraft.resource.ResourcePackManager; +import net.minecraft.resource.ResourcePackProfile; +import net.minecraft.resource.ResourceType; +import net.minecraft.util.Identifier; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Map; + +@Mixin(ResourcePackManager.class) +public class ResourcePackManagerMixin { + @Shadow private Map profiles; + + @Inject(at = @At("TAIL"), method = "scanPacks()V") + private void scanPacks(CallbackInfo info) { + profiles.forEach((s, v) -> { + if (hasMetadata(v, "meta.json") && hasMetadata(v, "conf.json")) { + try { + Respackmeta.JsonMeta meta = Respackopts.g.fromJson(readMetadata(v, "meta.json", Respackopts.g), Respackmeta.JsonMeta.class); + if (Respackopts.metaVersion.equals(meta.version)) { + Respackopts.resPackMetas.put(v.getDisplayName().asString(), new Respackmeta(meta, readMetadata(v, "conf.json", Respackopts.g))); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + }); + } + + private boolean hasMetadata(ResourcePackProfile v, String fname) { + return v.createResourcePack().contains(ResourceType.CLIENT_RESOURCES, new Identifier(Respackopts.ID, fname)); + } + + private JsonObject readMetadata(ResourcePackProfile v, String fname, Gson g) throws IOException { + InputStream is = v.createResourcePack().open(ResourceType.CLIENT_RESOURCES, new Identifier(Respackopts.ID, fname)); + ByteArrayOutputStream bais = new ByteArrayOutputStream(); + byte[] buffer = new byte[1024]; + int length; + while ((length = is.read(buffer)) != -1) { + bais.write(buffer, 0, length); + } + return g.fromJson(bais.toString(), JsonElement.class).getAsJsonObject(); + } +} diff --git a/src/main/resources/assets/respackopts/lang/en_us.json b/src/main/resources/assets/respackopts/lang/en_us.json new file mode 100644 index 0000000..3431a25 --- /dev/null +++ b/src/main/resources/assets/respackopts/lang/en_us.json @@ -0,0 +1,6 @@ +{ + "respackopts.loadFailed": "Failed to load resourcepacks", + "respackopts.loadError": "There is an issue with the resourcepack configs. Please take a look at the game log", + "respackopts.configure": "Configure", + "respackopts.mainconfig": "ResPack Opts" +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..b0cc8d2 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,33 @@ +{ + "schemaVersion": 1, + "id": "respackopts", + "version": "${version}", + "name": "Resource Pack Options", + "description": "Allows resource packs to expose GUIs to users", + "authors": [ + "JFronny" + ], + "contact": {}, + "license": "MIT", + "icon": "assets/respackopts/icon.png", + "environment": "client", + "entrypoints": { + "client": [ + "io.gitlab.jfronny.respackopts.Respackopts" + ], + "modmenu": [ + "io.gitlab.jfronny.respackopts.MMI" + ], + "libcd:conditions": [ + "io.gitlab.jfronny.respackopts.LibCDCompat" + ] + }, + "mixins": [ + "respackopts.mixins.json" + ], + "depends": { + "fabricloader": ">=0.10.8", + "fabric": "*", + "minecraft": "*" + } +} diff --git a/src/main/resources/respackopts.mixins.json b/src/main/resources/respackopts.mixins.json new file mode 100644 index 0000000..52078da --- /dev/null +++ b/src/main/resources/respackopts.mixins.json @@ -0,0 +1,15 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "io.gitlab.jfronny.respackopts.mixin", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "ResourcePackEntryMixin", + "ResourcePackManagerMixin" + ], + "client": [ + ], + "injectors": { + "defaultRequire": 1 + } +}