Update to 1.20.4 (#40)

* Update to 1.20.4-rc1. * Clean up imports * Update to 1.20.4 --------- Co-authored-by: D1p4k <[email protected]>
NucleoidMC · Dec 7, 2023 · 1f8ec9c · 1f8ec9c
1 parent 2221206
commit 1f8ec9c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -47,7 +47,7 @@ dependencies {
 
   modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-  modLocalRuntime "eu.pb4:polymer-reg-sync-manipulator:0.5.5+1.20.1"
+  modLocalRuntime "eu.pb4:polymer-reg-sync-manipulator:0.7.0+1.20.3-rc1"
 
   testmodImplementation sourceSets.main.output
 }

diff --git a/gradle.properties b/gradle.properties
@@ -2,14 +2,14 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.9
-loader_version=0.14.21
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.1
+loader_version=0.15.0
 
 # Mod Properties
 mod_version=0.4.11
 maven_group=xyz.nucleoid
 archives_base_name=fantasy
 
 # Dependencies
-fabric_version=0.85.0+1.20.1
+fabric_version=0.91.1+1.20.4
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 #Mon Aug 10 09:53:15 AEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

diff --git a/src/main/java/xyz/nucleoid/fantasy/RuntimeWorld.java b/src/main/java/xyz/nucleoid/fantasy/RuntimeWorld.java
@@ -13,7 +13,7 @@
 import net.minecraft.world.dimension.DimensionOptions;
 import net.minecraft.world.level.ServerWorldProperties;
 import net.minecraft.world.level.storage.LevelStorage;
-import net.minecraft.world.spawner.Spawner;
+import net.minecraft.world.spawner.SpecialSpawner;
 import org.jetbrains.annotations.Nullable;
 import xyz.nucleoid.fantasy.mixin.MinecraftServerAccess;
 import xyz.nucleoid.fantasy.util.VoidWorldProgressListener;
@@ -43,7 +43,7 @@ protected RuntimeWorld(MinecraftServer server, RegistryKey<World> registryKey, R
     }
 
 
-    protected RuntimeWorld(MinecraftServer server, Executor workerExecutor, LevelStorage.Session session, ServerWorldProperties properties, RegistryKey<World> worldKey, DimensionOptions dimensionOptions, WorldGenerationProgressListener worldGenerationProgressListener, boolean debugWorld, long seed, List<Spawner> spawners, boolean shouldTickTime, @Nullable RandomSequencesState randomSequencesState, Style style) {
+    protected RuntimeWorld(MinecraftServer server, Executor workerExecutor, LevelStorage.Session session, ServerWorldProperties properties, RegistryKey<World> worldKey, DimensionOptions dimensionOptions, WorldGenerationProgressListener worldGenerationProgressListener, boolean debugWorld, long seed, List<SpecialSpawner> spawners, boolean shouldTickTime, @Nullable RandomSequencesState randomSequencesState, Style style) {
         super(server, workerExecutor, session, properties, worldKey, dimensionOptions, worldGenerationProgressListener, debugWorld, seed, spawners, shouldTickTime, randomSequencesState);
         this.style = style;
     }

diff --git a/src/main/java/xyz/nucleoid/fantasy/mixin/registry/SimpleRegistryMixin.java b/src/main/java/xyz/nucleoid/fantasy/mixin/registry/SimpleRegistryMixin.java
@@ -1,8 +1,8 @@
 package xyz.nucleoid.fantasy.mixin.registry;
 
 import com.mojang.serialization.Lifecycle;
-import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.ObjectList;
+import it.unimi.dsi.fastutil.objects.Reference2IntMap;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.SimpleRegistry;
 import net.minecraft.registry.entry.RegistryEntry;
@@ -30,7 +30,7 @@ public abstract class SimpleRegistryMixin<T> implements RemoveFromRegistry<T> {
 
     @Shadow @Final private ObjectList<RegistryEntry.Reference<T>> rawIdToEntry;
 
-    @Shadow @Final private Object2IntMap<T> entryToRawId;
+    @Shadow @Final private Reference2IntMap<T> entryToRawId;
 
     @Shadow public abstract Optional<RegistryEntry<T>> getEntry(int rawId);
 

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -19,8 +19,8 @@
     }
   },
   "depends": {
-    "fabricloader": ">=0.14.0",
-    "minecraft": ">=1.20-",
+    "fabricloader": ">=0.14.23",
+    "minecraft": ">=1.20.3-",
     "fabric-lifecycle-events-v1": "*",
     "java": ">=17"
   }