Merge pull request #163 from lanAnderson/1.20.2

Port to 1.20.2
lucaargolo · Sep 27, 2024 · e7acc28 · e7acc28
2 parents b039f40 + 887ae39
commit e7acc28
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 17 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,20 +9,20 @@ modrinth_version=2.8.7
 github_api_version=1.314
 
 # Mod Properties
-mod_version=2.4-BETA+1.20
+mod_version=2.4-BETA+1.20.2
 maven_group=io.github.lucaargolo
 
 # Fabric Properties
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.10
+minecraft_version=1.20.2
+yarn_mappings=1.20.2+build.4
 loader_version=0.16.5
 
 # Fabric API
-fabric_version=0.92.2+1.20.1
+fabric_version=0.91.6+1.20.2
 
 #Libraries
-modmenu_version=7.2.2
-rei_version=12.1.780
+modmenu_version=8.0.1
+rei_version=13.1.773
 
 #Publishing
 curseforge_id=413523

diff --git a/src/main/java/io/github/lucaargolo/seasons/FabricSeasons.java b/src/main/java/io/github/lucaargolo/seasons/FabricSeasons.java
@@ -144,11 +144,11 @@ public static boolean isMeltable(BlockPos blockPos) {
     }
 
     public static PlacedMeltablesState getPlacedMeltablesState(ServerWorld world) {
-        return world.getPersistentStateManager().getOrCreate(PlacedMeltablesState::createFromNbt, PlacedMeltablesState::new, "seasons_placed_meltables");
+        return world.getPersistentStateManager().getOrCreate(PlacedMeltablesState.type, "seasons_placed_meltables");
     }
 
     public static ReplacedMeltablesState getReplacedMeltablesState(ServerWorld world) {
-        return world.getPersistentStateManager().getOrCreate(ReplacedMeltablesState::createFromNbt, ReplacedMeltablesState::new, "seasons_replaced_meltables");
+        return world.getPersistentStateManager().getOrCreate(ReplacedMeltablesState.type, "seasons_replaced_meltables");
     }
 
     public static long getTimeToNextSeason(World world) {

diff --git a/src/main/java/io/github/lucaargolo/seasons/mixin/ServerWorldMixin.java b/src/main/java/io/github/lucaargolo/seasons/mixin/ServerWorldMixin.java
@@ -32,24 +32,25 @@ protected ServerWorldMixin(MutableWorldProperties properties, RegistryKey<World>
         super(properties, registryRef, registryManager, dimensionEntry, profiler, isClient, debugWorld, biomeAccess, maxChainedNeighborUpdates);
     }
 
-    @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerWorld;setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Z", ordinal = 0), method = "tickChunk", locals = LocalCapture.CAPTURE_FAILSOFT)
-    public void setMeltableIce(WorldChunk chunk, int randomTickSpeed, CallbackInfo ci, ChunkPos chunkPos, boolean bl, int i, int j, Profiler profiler, BlockPos blockPos, BlockPos blockPos2, Biome biome) {
+    @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerWorld;setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Z", ordinal = 0), method = "tickIceAndSnow", locals = LocalCapture.CAPTURE_FAILSOFT)
+    public void setMeltableIce(boolean raining, BlockPos pos, CallbackInfo ci, BlockPos blockPos, BlockPos blockPos2, Biome biome) {
         FabricSeasons.setMeltable(blockPos2);
     }
 
-    @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerWorld;setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Z", ordinal = 1), method = "tickChunk", locals = LocalCapture.CAPTURE_FAILSOFT)
-    public void setMeltableLayeredSnow(WorldChunk chunk, int randomTickSpeed, CallbackInfo ci, ChunkPos chunkPos, boolean bl, int i, int j, Profiler profiler, BlockPos blockPos, BlockPos blockPos2, Biome biome) {
+    @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerWorld;setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Z", ordinal = 1), method = "tickIceAndSnow", locals = LocalCapture.CAPTURE_FAILSOFT)
+    public void setMeltableLayeredSnow(boolean raining, BlockPos pos, CallbackInfo ci, BlockPos blockPos, BlockPos blockPos2, Biome biome) {
         FabricSeasons.setMeltable(blockPos);
     }
 
-    @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerWorld;setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Z", ordinal = 2), method = "tickChunk", locals = LocalCapture.CAPTURE_FAILSOFT)
-    public void setMeltableSnow(WorldChunk chunk, int randomTickSpeed, CallbackInfo ci, ChunkPos chunkPos, boolean bl, int i, int j, Profiler profiler, BlockPos blockPos, BlockPos blockPos2, Biome biome) {
+    @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerWorld;setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Z", ordinal = 2), method = "tickIceAndSnow", locals = LocalCapture.CAPTURE_FAILSOFT)
+    public void setMeltableSnow(boolean raining, BlockPos pos, CallbackInfo ci, BlockPos blockPos, BlockPos blockPos2, Biome biome) {
         FabricSeasons.setMeltable(blockPos);
     }
 
-    @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;precipitationTick(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/biome/Biome$Precipitation;)V"), method = "tickChunk", locals = LocalCapture.CAPTURE_FAILSOFT)
-    public void setReplacedMeltable(WorldChunk chunk, int randomTickSpeed, CallbackInfo ci, ChunkPos chunkPos, boolean bl, int i, int j, Profiler profiler, BlockPos blockPos, BlockPos blockPos2, Biome biome, int k, Biome.Precipitation precipitation, BlockState blockState3) {
-        if (FabricSeasons.CONFIG.shouldSnowReplaceVegetation())
+
+    @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;precipitationTick(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/biome/Biome$Precipitation;)V"), method = "tickIceAndSnow", locals = LocalCapture.CAPTURE_FAILSOFT)
+    public void setReplacedMeltable(boolean raining, BlockPos pos, CallbackInfo ci, BlockPos blockPos, BlockPos blockPos2, Biome biome, int k, Biome.Precipitation precipitation, BlockState blockState3) {
+        if (FabricSeasons.CONFIG.shouldSnowReplaceVegetation())  
             Meltable.replaceBlockOnSnow((ServerWorld) (Object) this, blockPos, biome);
     }
 

diff --git a/src/main/java/io/github/lucaargolo/seasons/utils/PlacedMeltablesState.java b/src/main/java/io/github/lucaargolo/seasons/utils/PlacedMeltablesState.java
@@ -63,4 +63,10 @@ public static PlacedMeltablesState createFromNbt(NbtCompound nbt) {
         });
         return state;
     }
+
+    public static Type<PlacedMeltablesState> type = new Type<>(
+        PlacedMeltablesState::new,
+        PlacedMeltablesState::createFromNbt,
+        null
+            );
 }
diff --git a/src/main/java/io/github/lucaargolo/seasons/utils/ReplacedMeltablesState.java b/src/main/java/io/github/lucaargolo/seasons/utils/ReplacedMeltablesState.java
@@ -81,4 +81,10 @@ public static ReplacedMeltablesState createFromNbt(NbtCompound nbt) {
         });
         return state;
     }
+
+    public static Type<ReplacedMeltablesState> type = new Type<>(
+            ReplacedMeltablesState::new,
+            ReplacedMeltablesState::createFromNbt,
+            null
+    );
 }