diff --git a/build.gradle.kts b/build.gradle.kts index 953e7df..07f0cac 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,11 +1,10 @@ plugins { - id("fabric-loom") version "0.12.+" - id("io.github.juuxel.loom-quiltflower") version "1.7.+" + id("fabric-loom") version "1.5.+" id("com.modrinth.minotaur") version "2.+" `maven-publish` } -version = "2.0.0+1.20.1" +version = "2.0.0+1.20.4" group = "dev.ashhhleyyy" repositories { diff --git a/gradle.properties b/gradle.properties index 5cacfe8..9c0a032 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,3 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..d64cd49 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 84d1f85..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,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 +198,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" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 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 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/libs.versions.toml b/libs.versions.toml index 0a42343..463b0a4 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -1,13 +1,13 @@ [versions] -minecraft = "1.20.1" -yarn = "1.20.1+build.2" +minecraft = "1.20.4" +yarn = "1.20.4+build.3" -fabric-loader = "0.14.21" -fabric-api = "0.83.1+1.20.1" +fabric-loader = "0.15.3" +fabric-api = "0.95.3+1.20.4" -placeholder-api = "2.1.1+1.20" +placeholder-api = "2.3.0+1.20.3" -fabric-permissions = "0.1-SNAPSHOT" +fabric-permissions = "0.2-SNAPSHOT" [libraries] minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 81ad5f4..a2060c1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,13 +9,12 @@ pluginManagement { url = uri("https://server.bbkr.space/artifactory/libs-release") } gradlePluginPortal() + mavenCentral() } } rootProject.name = "player-pronouns" -enableFeaturePreview("VERSION_CATALOGS") - dependencyResolutionManagement { versionCatalogs { create("libs") { diff --git a/src/main/java/dev/ashhhleyyy/playerpronouns/api/Pronoun.java b/src/main/java/dev/ashhhleyyy/playerpronouns/api/Pronoun.java index 3aea461..6ff0aaa 100644 --- a/src/main/java/dev/ashhhleyyy/playerpronouns/api/Pronoun.java +++ b/src/main/java/dev/ashhhleyyy/playerpronouns/api/Pronoun.java @@ -60,7 +60,7 @@ public record Pronoun( case "underline" -> style = style.withUnderline(true); case "obfuscated" -> style = style.withObfuscated(true); default -> { - TextColor col = TextColor.parse(format); + TextColor col = TextColor.parse(format).result().orElse(null); if (col != null) { style = style.withColor(col); } else { diff --git a/src/main/java/dev/ashhhleyyy/playerpronouns/api/Pronouns.java b/src/main/java/dev/ashhhleyyy/playerpronouns/api/Pronouns.java index 9a4e0be..9eaa674 100644 --- a/src/main/java/dev/ashhhleyyy/playerpronouns/api/Pronouns.java +++ b/src/main/java/dev/ashhhleyyy/playerpronouns/api/Pronouns.java @@ -3,7 +3,7 @@ package dev.ashhhleyyy.playerpronouns.api; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.text.Text; -import net.minecraft.util.dynamic.Codecs; +import net.minecraft.text.TextCodecs; /** * A combined set of {@link Pronoun}s @@ -18,7 +18,7 @@ public record Pronouns( ) { public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( Codec.STRING.fieldOf("raw").forGetter(Pronouns::raw), - Codecs.TEXT.fieldOf("formatted").forGetter(Pronouns::formatted), + TextCodecs.CODEC.fieldOf("formatted").forGetter(Pronouns::formatted), Codec.BOOL.optionalFieldOf("remote", false).forGetter(Pronouns::remote) ).apply(instance, Pronouns::new)); } diff --git a/src/main/java/dev/ashhhleyyy/playerpronouns/api/PronounsApi.java b/src/main/java/dev/ashhhleyyy/playerpronouns/api/PronounsApi.java index 7923c07..4e78ecb 100644 --- a/src/main/java/dev/ashhhleyyy/playerpronouns/api/PronounsApi.java +++ b/src/main/java/dev/ashhhleyyy/playerpronouns/api/PronounsApi.java @@ -52,7 +52,7 @@ public final class PronounsApi { * * This should not be called by most mods, unless they are implementing a custom backend. * - * @param reader The reader to configure + * @param setter The setter to configure */ public static void initSetter(PronounSetter setter) { if (SETTER != null) { diff --git a/src/main/java/dev/ashhhleyyy/playerpronouns/impl/PlayerPronouns.java b/src/main/java/dev/ashhhleyyy/playerpronouns/impl/PlayerPronouns.java index 3e08b76..b648ded 100644 --- a/src/main/java/dev/ashhhleyyy/playerpronouns/impl/PlayerPronouns.java +++ b/src/main/java/dev/ashhhleyyy/playerpronouns/impl/PlayerPronouns.java @@ -40,27 +40,15 @@ public class PlayerPronouns implements ModInitializer, PronounsApi.PronounReader private static final String USER_AGENT = "player-pronouns/1.0 (+https://ashhhleyyy.dev/projects/2021/player-pronouns)"; private static final Map PRONOUNDB_ID_MAP = new HashMap<>() {{ - // short pronoun set identifier map from https://pronoundb.org/docs - put("hh", "he/him"); - put("hi", "he/it"); - put("hs", "he/she"); - put("ht", "he/they"); - put("ih", "it/he"); - put("ii", "it/its"); - put("is", "it/she"); - put("it", "it/they"); - put("shh", "she/he"); - put("sh", "she/her"); - put("si", "she/it"); - put("st", "she/they"); - put("th", "they/he"); - put("ti", "they/it"); - put("ts", "they/she"); - put("tt", "they/them"); + // short pronoun set identifier map from https://pronoundb.org/wiki/api-docs + put("he", "he/him"); + put("it", "it/its"); + put("she", "she/her"); + put("they", "they/them"); put("any", "any"); - put("other", "other"); put("ask", "ask"); put("avoid", "avoid"); + put("other", "other"); }}; private PronounDatabase pronounDatabase; @@ -101,7 +89,7 @@ public class PlayerPronouns implements ModInitializer, PronounsApi.PronounReader var currentPronouns = pronounDatabase.get(handler.getPlayer().getUuid()); if (currentPronouns != null && !currentPronouns.remote()) return; - var pronounDbUrl = "https://pronoundb.org/api/v1/lookup?platform=minecraft&id=%s" + var pronounDbUrl = "https://pronoundb.org/api/v2/lookup?platform=minecraft&ids=%s" .formatted(handler.getPlayer().getUuid()); try { var client = HttpClient.newBuilder() @@ -122,10 +110,21 @@ public class PlayerPronouns implements ModInitializer, PronounsApi.PronounReader if (currentPronouns2 != null && !currentPronouns2.remote()) return; var json = JsonHelper.deserialize(body); - var pronounsResponse = json.get("pronouns").getAsString(); - if (!"unspecified".equals(pronounsResponse)) { - var pronouns = PRONOUNDB_ID_MAP.getOrDefault(pronounsResponse, "ask"); - setPronouns(handler.getPlayer(), new Pronouns(pronouns, PronounList.get().getCalculatedPronounStrings().get(pronouns), true)); + StringBuilder pronouns = new StringBuilder("unspecified"); + if (json.has(handler.getPlayer().getUuid().toString()) && json.getAsJsonObject(handler.getPlayer().getUuid().toString()).getAsJsonObject("sets").has("en")) { + var pronounsList = json.getAsJsonObject(handler.getPlayer().getUuid().toString()).getAsJsonObject("sets").getAsJsonArray("en"); + if (pronounsList.size() == 1) { + pronouns = new StringBuilder(PRONOUNDB_ID_MAP.get(pronounsList.get(0).getAsString())); + } else { + pronouns = new StringBuilder(); + for (var prounoun: pronounsList) { + pronouns.append(prounoun.getAsString()).append("/"); + } + pronouns = new StringBuilder(pronouns.substring(0, pronouns.length() - 1)); // remove trailing slash + } + } + if (!"unspecified".contentEquals(pronouns)) { + setPronouns(handler.getPlayer(), new Pronouns(pronouns.toString(), PronounList.get().getCalculatedPronounStrings().get(pronouns.toString()), true)); } }, server); } catch (URISyntaxException e) { diff --git a/src/main/java/dev/ashhhleyyy/playerpronouns/impl/data/PalettePronounDatabase.java b/src/main/java/dev/ashhhleyyy/playerpronouns/impl/data/PalettePronounDatabase.java index 30af079..5985740 100644 --- a/src/main/java/dev/ashhhleyyy/playerpronouns/impl/data/PalettePronounDatabase.java +++ b/src/main/java/dev/ashhhleyyy/playerpronouns/impl/data/PalettePronounDatabase.java @@ -21,7 +21,7 @@ import java.util.Optional; import java.util.UUID; /** - * An improved version of {@link dev.ashhhleyyy.playerpronouns.data.BinaryPronounDatabase} that uses a palette + * An improved version of {@link dev.ashhhleyyy.playerpronouns.impl.data.BinaryPronounDatabase} that uses a palette * for efficiency when storing lots of players. It also supports versioning of the file to allow for changes to be * made to the format in the future. */ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index d0c1bde..32fb639 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -20,10 +20,10 @@ ] }, "depends": { - "fabricloader": ">=0.14.21", - "fabric": "*", - "minecraft": ">=1.20.1", - "placeholder-api": ">=2.1.1", + "fabricloader": "*", + "fabric-api": "*", + "minecraft": ">=1.20.4", + "placeholder-api": "*", "fabric-permissions-api-v0": "*" } }