Merge pull request #15 from AbyssDweller/1.20.x

1.20.x Update

build.gradle

@@ -18,8 +18,8 @@ repositories {
 	// for more information about repositories.
 
     maven {
-        name = "Ladysnake Libs"
-        url = 'https://ladysnake.jfrog.io/artifactory/mods'
+        name = "Ladysnake Mods"
+        url = 'https://maven.ladysnake.org/releases'
     }
     maven {
         url = 'https://maven.cafeteria.dev'

gradle.properties

@@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx6G
 org.gradle.java.home=C:/Program Files/Java/jdk-17.0.2
 
 # Fabric Properties
-minecraft_version=1.19.2
-yarn_mappings=1.19.2+build.9
+minecraft_version=1.20.1
+yarn_mappings=1.20.1+build.10
 loader_version=0.14.9
 
 #Fabric api
-fabric_version=0.60.0+1.19.2
+fabric_version=0.90.4+1.20.1
 
 # Mod Properties
-	mod_version = 1.0.9-1.19.x
+	mod_version = 1.0.9-1.20.x
 	maven_group = com.aspects
 	archives_base_name = aspects
 
 # Dependencies
-	origins_version=v1.7.0
+	origins_version=v1.10.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 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-7.6.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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,10 +80,10 @@ 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##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # 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"'
@@ -143,12 +143,16 @@ fi
 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=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=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,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.

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

src/main/java/net/fabricmc/fishplex/Aspects.java

@@ -3,8 +3,9 @@ package net.fabricmc.fishplex;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
 import net.minecraft.item.Item;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -23,11 +24,12 @@ public class Aspects implements ModInitializer {
  
 		@Override
 		public void onInitialize() {
-			Registry.register(Registry.ITEM, new Identifier("aspects", "anemo_feather"), ANEMO_FEATHER);
-			Registry.register(Registry.ITEM, new Identifier("aspects", "pyro_fire"), PYRO_FIRE);
-			Registry.register(Registry.ITEM, new Identifier("aspects", "hydro_kelp"), HYDRO_KELP);
-			Registry.register(Registry.ITEM, new Identifier("aspects", "geo_diamond"), GEO_DIAMOND);
-			Registry.register(Registry.ITEM, new Identifier("aspects", "ordo_star"), ORDO_STAR);
-			Registry.register(Registry.ITEM, new Identifier("aspects", "perditio_bone"), PERDITIO_BONE);
+			Registry.register(Registries.ITEM, new Identifier("aspects", "anemo_feather"), ANEMO_FEATHER);
+			Registry.register(Registries.ITEM, new Identifier("aspects", "pyro_fire"), PYRO_FIRE);
+			Registry.register(Registries.ITEM, new Identifier("aspects", "hydro_kelp"), HYDRO_KELP);
+			Registry.register(Registries.ITEM, new Identifier("aspects", "geo_diamond"), GEO_DIAMOND);
+			Registry.register(Registries.ITEM, new Identifier("aspects", "ordo_star"), ORDO_STAR);
+			Registry.register(Registries.ITEM, new Identifier("aspects", "perditio_bone"), PERDITIO_BONE);
+
 	}
 }

src/main/resources/aspects.mixins.json

@@ -4,10 +4,9 @@
   "package": "net.fabricmc.fishplex.mixin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
+
   ],
-  "client": [
-    "AspectsMixin"
-  ],
+
   "injectors": {
     "defaultRequire": 1
   }

src/main/resources/fabric.mod.json

@@ -30,10 +30,10 @@
   "depends": {
     "fabricloader": ">=0.14.9",
     "fabric": "*",
-    "minecraft": ">=1.19.1",
+    "minecraft": ">=1.20",
     "java": ">=17",
     "extrakeybinds":"*",
-    "origins": ">=1.7.0"
+    "origins": ">=1.10.0"
   }