Updates for 1.18.x

.github/workflows/gradle.yml

@@ -8,10 +8,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 16
+        java-version: 17
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '0.8-SNAPSHOT'
+    id 'fabric-loom' version '0.10-SNAPSHOT'
 }
 
 archivesBaseName = "${project.archives_base_name}-mc${project.minecraft_version}"
@@ -17,8 +17,8 @@ if (build_id != null) {
     version += "+build.${build_id}"
 }
 
-minecraft {
-    refmapName = "mixins.hydrogen.refmap.json"
+loom {
+    mixin.defaultRefmapName = "mixins.hydrogen.refmap.json"
 }
 
 dependencies {
@@ -42,7 +42,7 @@ if (project.use_third_party_mods) {
 	dependencies {
 		// DataBreaker applies a number of patches to eliminate the loading of data fixers
 		// This greatly reduces the amount of time needed to start the game, but is generally unsafe in production
-		modRuntime ("supercoder79:databreaker:${project.databreaker_version}") {
+		modRuntimeOnly ("supercoder79:databreaker:${project.databreaker_version}") {
 			transitive = false
 		}
 	}

gradle.properties

@@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.17.1
-yarn_mappings=1.17.1+build.1
-loader_version=0.11.6
-fabric_api_version=0.36.1+1.17
+minecraft_version=1.18.1
+yarn_mappings=1.18.1+build.1
+loader_version=0.12.9
+fabric_api_version=0.44.0+1.18
 
 # Mod Properties
 mod_version=0.3
@@ -15,4 +15,4 @@ archives_base_name=hydrogen-fabric
 
 # If true, third-party mods will be loaded during runtime in the developer run configurations
 use_third_party_mods = true
-databreaker_version = 0.2.7
+databreaker_version = 0.2.8

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )
@@ -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
@@ -129,6 +130,7 @@ fi
 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

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/com/google/common/collect/HydrogenImmutableReferenceHashMap.java

@@ -116,6 +116,16 @@ ImmutableSet<Entry<K, V>> createEntrySet() {
         return new HydrogenEntrySet<>(this.key, this.value, this.size);
     }
 
+    @Override
+    ImmutableSet<K> createKeySet() {
+        return new ImmutableMapKeySet<>(this);
+    }
+
+    @Override
+    ImmutableCollection<V> createValues() {
+        return new ImmutableMapValues<>(this);
+    }
+
     @Override
     boolean isPartialView() {
         return false;

src/main/resources/fabric.mod.json

@@ -26,9 +26,9 @@
     ]
   },
   "depends": {
-    "fabricloader": ">=0.11.0",
+    "fabricloader": ">=0.12.5",
     "fabric-resource-loader-v0": ">=0.4",
-    "minecraft": ["1.17", "1.17.1"]
+    "minecraft": [">=1.18-beta.4 <=1.18", ">=1.18.1-beta.1 <=1.18.1" ]
   },
   "breaks": {
     "optifabric": "*"

src/main/resources/hydrogen.mixins.json

@@ -1,7 +1,7 @@
 {
   "package": "me.jellysquid.mods.hydrogen.mixin",
   "required": true,
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "injectors": {
     "defaultRequire": 1
   },
@@ -17,8 +17,6 @@
     "client.model.MixinModelIdentifier"
   ],
   "mixins": [
-    "chunk.MixinChunkSerializer",
-    "chunk.MixinWorldChunk",
     "nbt.MixinNbtCompound",
     "state.MixinState",
     "util.MixinIdentifier"