0.3.0: update to 1.17

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 16
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 16
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-  id 'fabric-loom' version '0.5-SNAPSHOT'
+  id 'fabric-loom' version '0.8-SNAPSHOT'
   id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_16
+targetCompatibility = JavaVersion.VERSION_16
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -13,7 +13,6 @@ group = project.maven_group
 repositories {
   maven { url = "https://maven.nucleoid.xyz" }
   maven { url = "https://maven.gegy.dev/" }
-  maven { url = "https://jitpack.io/" }
 }
 
 dependencies {
@@ -23,39 +22,36 @@ dependencies {
 
   modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-  modImplementation include('xyz.nucleoid:stimuli:0.1.0')
+  modImplementation include('xyz.nucleoid:stimuli:0.2.0+1.17')
 
-  modCompileOnly "dev.gegy:player-roles:1.3.1"
+  modCompileOnly "dev.gegy:player-roles-api:1.4.2"
 
-  modRuntime("com.github.SuperCoder7979:databreaker:0.2.6") {
+  modRuntime("supercoder79:databreaker:0.2.7") {
     exclude module: "fabric-loader"
   }
 }
 
 processResources {
   inputs.property "version", project.version
 
-  from(sourceSets.main.resources.srcDirs) {
-    include "fabric.mod.json"
+  filesMatching("fabric.mod.json") {
     expand "version": project.version
   }
-
-  from(sourceSets.main.resources.srcDirs) {
-    exclude "fabric.mod.json"
-  }
 }
 
-tasks.withType(JavaCompile) {
-  options.encoding = "UTF-8"
+tasks.withType(JavaCompile).configureEach {
+  it.options.encoding = "UTF-8"
+  it.options.release = 16
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-  classifier = "sources"
-  from sourceSets.main.allSource
+java {
+  withSourcesJar()
 }
 
 jar {
-  from "LICENSE"
+  from("LICENSE") {
+    rename { "${it}_${project.archivesBaseName}" }
+  }
 }
 
 def env = System.getenv()

gradle.properties

@@ -1,15 +1,14 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
 
-# Fabric Properties
-minecraft_version=1.16.4
-yarn_mappings=1.16.4+build.7
-loader_version=0.10.8
+minecraft_version=1.17
+yarn_mappings=1.17+build.1
+loader_version=0.11.3
+
+# Fabric API
+fabric_version=0.34.9+1.17
 
 # Mod Properties
-mod_version=0.2.0
+mod_version=0.3.0
 maven_group=xyz.nucleoid
 archives_base_name=leukocyte
-
-# Dependencies
-fabric_version=0.26.0+1.16

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Aug 10 09:53:15 AEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ 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
@@ -125,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# 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
@@ -154,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        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" ;;
+        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
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+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"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -29,6 +29,9 @@ 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"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ 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%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

src/main/java/xyz/nucleoid/leukocyte/Leukocyte.java

@@ -1,17 +1,14 @@
 package xyz.nucleoid.leukocyte;
 
 import com.mojang.datafixers.util.Pair;
-import com.mojang.serialization.DataResult;
 import net.fabricmc.fabric.api.util.NbtType;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtList;
 import net.minecraft.nbt.NbtOps;
-import net.minecraft.nbt.Tag;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.registry.RegistryKey;
 import net.minecraft.world.PersistentState;
-import net.minecraft.world.PersistentStateManager;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 import xyz.nucleoid.leukocyte.authority.Authority;
@@ -33,20 +30,19 @@ public final class Leukocyte extends PersistentState {
     private final IndexedAuthorityMap authorities = new IndexedAuthorityMap();
 
     private Leukocyte() {
-        super(ID);
     }
 
     public static Leukocyte get(MinecraftServer server) {
-        PersistentStateManager state = server.getOverworld().getPersistentStateManager();
-        return state.getOrCreate(Leukocyte::new, ID);
+        var state = server.getOverworld().getPersistentStateManager();
+        return state.getOrCreate(Leukocyte::readNbt, Leukocyte::new, ID);
     }
 
     public static void registerRuleEnforcer(ProtectionRuleEnforcer enforcer) {
         RULE_ENFORCERS.add(enforcer);
     }
 
     public static EventListenerMap createEventListenersFor(ProtectionRuleMap rules) {
-        EventListenerMap listeners = new EventListenerMap();
+        var listeners = new EventListenerMap();
         for (ProtectionRuleEnforcer enforcer : RULE_ENFORCERS) {
             enforcer.applyTo(rules, listeners);
         }
@@ -87,11 +83,20 @@ Iterable<Authority> selectAuthorities(RegistryKey<World> dimension, StimulusEven
     }
 
     @Override
-    public CompoundTag toTag(CompoundTag root) {
-        ListTag authorityList = new ListTag();
+    public boolean isDirty() {
+        return true;
+    }
+
+    public AuthorityMap getAuthorities() {
+        return this.authorities;
+    }
+
+    @Override
+    public NbtCompound writeNbt(NbtCompound root) {
+        var authorityList = new NbtList();
 
-        for (Authority authority : this.authorities) {
-            DataResult<Tag> result = Authority.CODEC.encodeStart(NbtOps.INSTANCE, authority);
+        for (var authority : this.authorities) {
+            var result = Authority.CODEC.encodeStart(NbtOps.INSTANCE, authority);
             result.result().ifPresent(authorityList::add);
         }
 
@@ -100,26 +105,18 @@ public CompoundTag toTag(CompoundTag root) {
         return root;
     }
 
-    @Override
-    public void fromTag(CompoundTag root) {
-        this.authorities.clear();
+    private static Leukocyte readNbt(NbtCompound root) {
+        var leukocyte = new Leukocyte();
 
-        ListTag authoritiesList = root.getList("authorities", NbtType.COMPOUND);
+        var authoritiesList = root.getList("authorities", NbtType.COMPOUND);
 
-        for (Tag authorityTag : authoritiesList) {
+        for (var authorityTag : authoritiesList) {
             Authority.CODEC.decode(NbtOps.INSTANCE, authorityTag)
                     .map(Pair::getFirst)
                     .result()
-                    .ifPresent(this::addAuthority);
+                    .ifPresent(leukocyte::addAuthority);
         }
-    }
 
-    @Override
-    public boolean isDirty() {
-        return true;
-    }
-
-    public AuthorityMap getAuthorities() {
-        return this.authorities;
+        return leukocyte;
     }
 }