Update to 21w19a

build.gradle

@@ -4,8 +4,8 @@ import java.nio.charset.StandardCharsets
 import java.time.Year
 
 plugins {
-    id "fabric-loom" version "0.6-SNAPSHOT" apply false
-    id "net.minecrell.licenser" version "0.2.1"
+    id "fabric-loom" version "0.8-SNAPSHOT" apply false
+    id "org.cadixdev.licenser" version "0.5.0"
     id "com.matthewprenger.cursegradle" version "1.4.0"
     id "maven-publish"
     id "java-library"
@@ -16,7 +16,7 @@ archivesBaseName = "Cardinal-Components-API"
 
 subprojects {
     apply plugin: 'fabric-loom'
-    apply plugin: 'net.minecrell.licenser'
+    apply plugin: 'org.cadixdev.licenser'
     apply plugin: 'com.matthewprenger.cursegradle'
     apply plugin: 'maven-publish'
     apply plugin: 'java-library'
@@ -29,18 +29,14 @@ subprojects {
 
 allprojects {
     apply plugin: "fabric-loom"
-    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = targetCompatibility = JavaVersion.VERSION_16
     version = System.getenv("TRAVIS_TAG") ?: rootProject.mod_version
 
     configurations {
         dev
     }
 
     repositories {
-        maven {
-            name = "FabricMC"
-            url = "https://maven.fabricmc.net"
-        }
     }
 
     dependencies {
@@ -57,21 +53,11 @@ allprojects {
     }
 
     processResources {
-        // this will ensure that this task is redone when there"s a change
         inputs.property "version", project.version
 
-        // replace stuff in fabric.mod.json, nothing else
-        from(sourceSets.main.resources.srcDirs) {
-            include "fabric.mod.json"
-
-            // add mod metadata
+        filesMatching("fabric.mod.json") {
             expand "version": project.version
         }
-
-        // copy everything else, that"s not the fabric.mod.json
-        from(sourceSets.main.resources.srcDirs) {
-            exclude "fabric.mod.json"
-        }
     }
 
     license {
@@ -92,8 +78,23 @@ allprojects {
         }
     }
 
+    // ensure that the encoding is set to UTF-8, no matter what the system default is
+    // this fixes some edge cases with special characters not displaying correctly
+    // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+    tasks.withType(JavaCompile).configureEach {
+        it.options.encoding = "UTF-8"
+        it.options.release = 16
+    }
+
+    java {
+        // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+        // if it is present.
+        // If you remove this line, sources will not be generated.
+        withSourcesJar()
+    }
+
     jar {
-        classifier = "dev"
+        archiveClassifier = "dev"
         from(rootProject.file("LICENSE.md")) {
             rename { "LICENSE_${project.archivesBaseName.replace('-', '_')}"}
         }
@@ -159,7 +160,7 @@ dependencies {
     include fabricApi.module("fabric-networking-v0", fabric_api_version)
 
     subprojects.each {
-        compile project(path: ":${it.name}", configuration: "dev")
+        api project(path: ":${it.name}", configuration: "dev")
         include project(":${it.name}")
     }
 }

cardinal-components-chunk/build.gradle

@@ -1,3 +1,3 @@
 dependencies {
-    compile project(":cardinal-components-base")
-}
+    api project(":cardinal-components-base")
+}

cardinal-components-entity/src/main/java/dev/onyxstudios/cca/mixin/entity/common/MixinEntityTrackerEntry.java

@@ -0,0 +1,24 @@
+package dev.onyxstudios.cca.mixin.entity.common;
+
+import dev.onyxstudios.cca.api.v3.entity.TrackingStartCallback;
+import net.minecraft.entity.Entity;
+import net.minecraft.server.network.EntityTrackerEntry;
+import net.minecraft.server.network.ServerPlayerEntity;
+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;
+
+@Mixin(EntityTrackerEntry.class)
+public abstract class MixinEntityTrackerEntry {
+    @Shadow
+    @Final
+    private Entity entity;
+
+    @Inject(method = "startTracking", at = @At("RETURN"))
+    private void onStartedTracking(ServerPlayerEntity player, CallbackInfo ci) {
+        TrackingStartCallback.EVENT.invoker().onPlayerStartTracking(player, this.entity);
+    }
+}

cardinal-components-entity/src/main/java/dev/onyxstudios/cca/mixin/entity/common/MixinServerPlayerEntity.java

@@ -23,8 +23,6 @@
 package dev.onyxstudios.cca.mixin.entity.common;
 
 import dev.onyxstudios.cca.api.v3.entity.PlayerCopyCallback;
-import dev.onyxstudios.cca.api.v3.entity.TrackingStartCallback;
-import net.minecraft.entity.Entity;
 import net.minecraft.server.network.ServerPlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -33,11 +31,6 @@
 
 @Mixin(ServerPlayerEntity.class)
 public abstract class MixinServerPlayerEntity {
-    @Inject(method = "onStartedTracking", at = @At("HEAD"))
-    private void onStartedTracking(Entity tracked, CallbackInfo info) {
-        TrackingStartCallback.EVENT.invoker().onPlayerStartTracking((ServerPlayerEntity)(Object)this, tracked);
-    }
-
     @Inject(method = "copyFrom", at = @At("RETURN"))
     private void copyDataFrom(ServerPlayerEntity original, boolean lossless, CallbackInfo ci) {
         PlayerCopyCallback.EVENT.invoker().copyData(original, (ServerPlayerEntity) (Object) this, lossless);

cardinal-components-entity/src/main/resources/mixins.cardinal_components_entity.json

@@ -5,6 +5,7 @@
   "package": "dev.onyxstudios.cca.mixin.entity",
   "mixins": [
     "common.MixinEntity",
+    "common.MixinEntityTrackerEntry",
     "common.MixinPlayerManager",
     "common.MixinServerPlayerEntity",
     "common.MixinServerWorld"

cardinal-components-level/build.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    compile project(":cardinal-components-base")
-    compile project(":cardinal-components-world")
-}
+    api project(":cardinal-components-base")
+    api project(":cardinal-components-world")
+}

cardinal-components-world/build.gradle

@@ -1,3 +1,3 @@
 dependencies {
-    compile project(":cardinal-components-base")
-}
+    api project(":cardinal-components-base")
+}

gradle.properties

@@ -2,15 +2,15 @@
 org.gradle.jvmargs = -Xmx3G
 
 #see https://modmuss50.me/fabric.html
-minecraft_version=21w14a
-yarn_mappings=26
+minecraft_version=21w19a
+yarn_mappings=2
 loader_version=0.11.3
 
 #Fabric api
-fabric_api_version=0.32.7+1.17
+fabric_api_version=0.34.4+1.17
 
 #Publishing
-mod_version = 3.0.0-nightly.21w14a
+mod_version = 3.0.0-nightly.21w19a
 curseforge_id = 318449
 curseforge_versions = 1.17
 changelog_url = https://github.com/OnyxStudios/Cardinal-Components-API/blob/1.17/changelog.md

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,5 +1,21 @@
 #!/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
@@ -28,7 +44,7 @@ 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"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,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
@@ -109,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
@@ -138,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
 
@@ -159,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

@@ -1,3 +1,19 @@
+@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
@@ -13,8 +29,11 @@ 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"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -65,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 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%
 

settings.gradle

@@ -1,6 +1,5 @@
 pluginManagement {
     repositories {
-        jcenter()
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'