Update gradle, fix bugs & crashes

README.md

@@ -1,2 +1,2 @@
 # Puddles
-Adds Puddles. Compatible with any shaderpack!
+Adds puddles. Compatible with your favorite shaderpacks & mods!

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.5-SNAPSHOT'
+	id 'fabric-loom' version '0.7-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -4,14 +4,14 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
 	minecraft_version=1.16.5
-	yarn_mappings=1.16.5+build.3
+    yarn_mappings=1.16.5+build.9
-	loader_version=0.11.1
+    loader_version=0.11.3
 
 # Mod Properties
-	mod_version = 1.0.0
+	mod_version = 1.1.0
 	maven_group = eu.midnightdust
 	archives_base_name = puddles
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.29.4+1.16
+	fabric_version=0.34.2+1.16

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -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
@@ -125,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
+# For Cygwin or MSYS, switch paths to Windows format before running java
-if $cygwin ; then
+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
@@ -154,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 -- ;;
+        0) set -- ;;
-        (1) set -- "$args0" ;;
+        1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
+        2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,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

@@ -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/eu/midnightdust/puddles/block/PuddleBlock.java

@@ -1,166 +1,167 @@
-package eu.midnightdust.puddles.block;
+package eu.midnightdust.puddles.block;
-
+
-import eu.midnightdust.puddles.Puddles;
+import eu.midnightdust.puddles.Puddles;
-import net.fabricmc.api.EnvType;
+import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
+import net.fabricmc.api.Environment;
-import net.minecraft.block.*;
+import net.minecraft.block.*;
-import net.minecraft.entity.ai.pathing.NavigationType;
+import net.minecraft.entity.ai.pathing.NavigationType;
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.fluid.*;
+import net.minecraft.fluid.*;
-import net.minecraft.item.*;
+import net.minecraft.item.*;
-import net.minecraft.loot.context.LootContext;
+import net.minecraft.loot.context.LootContext;
-import net.minecraft.potion.PotionUtil;
+import net.minecraft.potion.PotionUtil;
-import net.minecraft.potion.Potions;
+import net.minecraft.potion.Potions;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.server.world.ServerWorld;
+import net.minecraft.server.world.ServerWorld;
-import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundCategory;
-import net.minecraft.sound.SoundEvents;
+import net.minecraft.sound.SoundEvents;
-import net.minecraft.stat.Stats;
+import net.minecraft.stat.Stats;
-import net.minecraft.util.ActionResult;
+import net.minecraft.util.ActionResult;
-import net.minecraft.util.Hand;
+import net.minecraft.util.Hand;
-import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.BlockHitResult;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.Direction;
-import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.util.shape.VoxelShape;
-import net.minecraft.util.shape.VoxelShapes;
+import net.minecraft.util.shape.VoxelShapes;
-import net.minecraft.world.BlockView;
+import net.minecraft.world.BlockView;
-import net.minecraft.world.World;
+import net.minecraft.world.World;
-import net.minecraft.world.WorldAccess;
+import net.minecraft.world.WorldAccess;
-import net.minecraft.world.WorldView;
+import net.minecraft.world.WorldView;
-
+
-import java.util.Collections;
+import java.util.Collections;
-import java.util.List;
+import java.util.List;
-import java.util.Random;
+import java.util.Random;
-
+
-@SuppressWarnings("deprecation")
+@SuppressWarnings("deprecation")
-public class PuddleBlock extends Block {
+public class PuddleBlock extends Block {
-
+
-    protected final FlowableFluid fluid;
+    protected final FlowableFluid fluid;
-    public static final VoxelShape COLLISION_SHAPE;
+    public static final VoxelShape COLLISION_SHAPE;
-
+
-    public PuddleBlock(FlowableFluid fluid, AbstractBlock.Settings settings) {
+    public PuddleBlock(FlowableFluid fluid, AbstractBlock.Settings settings) {
-        super(settings);
+        super(settings);
-        this.fluid = fluid;
+        this.fluid = fluid;
-    }
+    }
-    @Override
+    @Override
-    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
+    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
-        ItemStack itemStack = player.getStackInHand(hand);
+        ItemStack itemStack = player.getStackInHand(hand);
-        if (itemStack.isEmpty()) {
+        if (itemStack.isEmpty()) {
-            return ActionResult.PASS;
+            return ActionResult.PASS;
-        } else {
+        } else {
-            Item item = itemStack.getItem();
+            Item item = itemStack.getItem();
-            ItemStack waterBottleStack;
+            ItemStack waterBottleStack;
-            if (item == Items.GLASS_BOTTLE) {
+            if (item == Items.GLASS_BOTTLE) {
-                if (!world.isClient) {
+                if (!world.isClient) {
-                    if (!player.abilities.creativeMode) {
+                    if (!player.abilities.creativeMode) {
-                        waterBottleStack = PotionUtil.setPotion(new ItemStack(Items.POTION), Potions.WATER);
+                        waterBottleStack = PotionUtil.setPotion(new ItemStack(Items.POTION), Potions.WATER);
-                        player.incrementStat(Stats.USE_CAULDRON);
+                        player.incrementStat(Stats.USE_CAULDRON);
-                        itemStack.decrement(1);
+                        itemStack.decrement(1);
-                        if (itemStack.isEmpty()) {
+                        if (itemStack.isEmpty()) {
-                            player.setStackInHand(hand, waterBottleStack);
+                            player.setStackInHand(hand, waterBottleStack);
-                        } else if (!player.inventory.insertStack(waterBottleStack)) {
+                        } else if (!player.inventory.insertStack(waterBottleStack)) {
-                            player.dropItem(waterBottleStack, false);
+                            player.dropItem(waterBottleStack, false);
-                        } else if (player instanceof ServerPlayerEntity) {
+                        } else if (player instanceof ServerPlayerEntity) {
-                            ((ServerPlayerEntity)player).refreshScreenHandler(player.playerScreenHandler);
+                            ((ServerPlayerEntity)player).refreshScreenHandler(player.playerScreenHandler);
-                        }
+                        }
-                    }
+                    }
-
+
-                    world.playSound(null, pos, SoundEvents.ITEM_BOTTLE_FILL, SoundCategory.BLOCKS, 1.0F, 1.0F);
+                    world.playSound(null, pos, SoundEvents.ITEM_BOTTLE_FILL, SoundCategory.BLOCKS, 1.0F, 1.0F);
-                    world.setBlockState(pos, Blocks.AIR.getDefaultState());
+                    world.setBlockState(pos, Blocks.AIR.getDefaultState());
-                }
+                }
-                return ActionResult.success(world.isClient);
+                return ActionResult.success(world.isClient);
-            }
+            }
-            else return ActionResult.FAIL;
+            else return ActionResult.FAIL;
-        }
+        }
-
+
-    }
+    }
-    @Override
+    @Override
-    public boolean hasRandomTicks(BlockState state) {
+    public boolean hasRandomTicks(BlockState state) {
-        return true;
+        return true;
-    }
+    }
-    @Override
+    @Override
-    public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) {
+    public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) {
-        if (!world.isRaining() && random.nextInt(2000) == 0) {
+        if (!world.isRaining() && random.nextInt(2000) == 0) {
-            world.setBlockState(pos, Blocks.AIR.getDefaultState());
+            world.setBlockState(pos, Blocks.AIR.getDefaultState());
-        }
+        }
-
+
-        this.scheduledTick(state, world, pos, random);
+        this.scheduledTick(state, world, pos, random);
-    }
+    }
-
+
-    @Override
+    @Override
-    public VoxelShape getCollisionShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
+    public VoxelShape getCollisionShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
-        return context.isAbove(COLLISION_SHAPE, pos, true) ? COLLISION_SHAPE : VoxelShapes.empty();
+        return context.isAbove(COLLISION_SHAPE, pos, true) ? COLLISION_SHAPE : VoxelShapes.empty();
-    }
+    }
-    @Override
+    @Override
-    public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
+    public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
-        return  COLLISION_SHAPE;
+        return  COLLISION_SHAPE;
-    }
+    }
-    @Override
+    @Override
-    public VoxelShape getCullingShape(BlockState state, BlockView world, BlockPos pos) {
+    public VoxelShape getCullingShape(BlockState state, BlockView world, BlockPos pos) {
-        return VoxelShapes.empty();
+        return VoxelShapes.empty();
-    }
+    }
-
+
-    public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) {
+    public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) {
-        return true;
+        return true;
-    }
+    }
-
+
-    public FluidState getFluidState(BlockState state) {
+    public FluidState getFluidState(BlockState state) {
-        return fluid.getFlowing(1,false);
+        return fluid.getFlowing(1,false);
-    }
+    }
-
+
-    @Environment(EnvType.CLIENT)
+    @Environment(EnvType.CLIENT)
-    public boolean isSideInvisible(BlockState state, BlockState stateFrom, Direction direction) {
+    public boolean isSideInvisible(BlockState state, BlockState stateFrom, Direction direction) {
-        return stateFrom.getFluidState().getFluid().matchesType(this.fluid);
+        return stateFrom.getFluidState().getFluid().matchesType(this.fluid);
-    }
+    }
-
+
-    public BlockRenderType getRenderType(BlockState state) {
+    public BlockRenderType getRenderType(BlockState state) {
-        return BlockRenderType.INVISIBLE;
+        return BlockRenderType.INVISIBLE;
-    }
+    }
-
+
-    public List<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder builder) {
+    public List<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder builder) {
-        return Collections.emptyList();
+        return Collections.emptyList();
-    }
+    }
-
+
-    public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
+    @Override
-        if (world.getBlockState(pos) == Blocks.AIR.getDefaultState() || world.getBlockState(pos) == Puddles.Puddle.getDefaultState()) {
+    public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
-            int i;
+        if (world.getBlockState(pos) == Blocks.AIR.getDefaultState() || world.getBlockState(pos) == Puddles.Puddle.getDefaultState()) {
-            // Check if there are fluids on the sides or corners of the block above
+            int i;
-            for (i = 2; i < 6; ++i) {
+            // Check if there are fluids on the sides or corners of the block above
-                BlockPos pos1 = pos.up();
+            for (i = 2; i < 6; ++i) {
-                BlockPos pos2 = pos1.offset(Direction.byId(i));
+                BlockPos pos1 = pos.up();
-                if (!world.getFluidState(pos1.offset(Direction.byId(i))).isEmpty()) {
+                BlockPos pos2 = pos1.offset(Direction.byId(i));
-                    // When sides of the block above have water don't place the puddle
+                if (!world.getFluidState(pos1.offset(Direction.byId(i))).isEmpty()) {
-                    return false;
+                    // When sides of the block above have water don't place the puddle
-                }
+                    return false;
-                if (!world.getFluidState(pos2.offset(Direction.byId(i).rotateYClockwise())).isEmpty()) {
+                }
-                    // When corners of the block above have water don't place the puddle
+                if (!world.getFluidState(pos2.offset(Direction.byId(i).rotateYClockwise())).isEmpty()) {
-                    return false;
+                    // When corners of the block above have water don't place the puddle
-                }
+                    return false;
-            }
+                }
-            // Check if there are fluids on the sides or corners of the block below
+            }
-            for (i = 2; i < 6; ++i) {
+            // Check if there are fluids on the sides or corners of the block below
-                BlockPos pos1 = pos.down();
+            for (i = 2; i < 6; ++i) {
-                BlockPos pos2 = pos1.offset(Direction.byId(i));
+                BlockPos pos1 = pos.down();
-                if (!world.getFluidState(pos1.offset(Direction.byId(i))).isEmpty()) {
+                BlockPos pos2 = pos1.offset(Direction.byId(i));
-                    // When sides of the block below have water don't place the puddle
+                if (!world.getFluidState(pos1.offset(Direction.byId(i))).isEmpty()) {
-                    return false;
+                    // When sides of the block below have water don't place the puddle
-                }
+                    return false;
-                if (!world.getFluidState(pos2.offset(Direction.byId(i).rotateYClockwise())).isEmpty()) {
+                }
-                    // When corners of the block below have water don't place the puddle
+                if (!world.getFluidState(pos2.offset(Direction.byId(i).rotateYClockwise())).isEmpty()) {
-                    return false;
+                    // When corners of the block below have water don't place the puddle
-                }
+                    return false;
-            }
+                }
-            return world.getBlockState(pos.down()).isSideSolidFullSquare(world, pos, Direction.UP);
+            }
-        }
+            return world.getBlockState(pos.down()).isSideSolidFullSquare(world, pos, Direction.UP);
-        // When there's already another block at the position don't place the puddle
+        }
-        else return false;
+        // When there's already another block at the position don't place the puddle
-    }
+        else return false;
-    public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) {
+    }
-        return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom);
+    public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) {
-    }
+        return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom);
-
+    }
-    static {
+
-        COLLISION_SHAPE = net.minecraft.block.Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 0.5D, 16.0D);
+    static {
-    }
+        COLLISION_SHAPE = net.minecraft.block.Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 0.5D, 16.0D);
-}
+    }
-
+}
+

src/main/java/eu/midnightdust/puddles/mixin/MixinServerWorld.java

@@ -1,63 +1,65 @@
-package eu.midnightdust.puddles.mixin;
+package eu.midnightdust.puddles.mixin;
-
+
-import eu.midnightdust.puddles.Puddles;
+import eu.midnightdust.puddles.Puddles;
-import net.minecraft.block.Blocks;
+import net.minecraft.block.Blocks;
-import net.minecraft.server.world.ServerWorld;
+import net.minecraft.server.world.ServerWorld;
-import net.minecraft.state.property.Properties;
+import net.minecraft.state.property.Properties;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.ChunkPos;
+import net.minecraft.util.math.ChunkPos;
-import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.Direction;
-import net.minecraft.util.profiler.Profiler;
+import net.minecraft.util.profiler.Profiler;
-import net.minecraft.util.registry.RegistryKey;
+import net.minecraft.util.registry.RegistryKey;
-import net.minecraft.world.*;
+import net.minecraft.world.*;
-import net.minecraft.world.chunk.WorldChunk;
+import net.minecraft.world.chunk.WorldChunk;
-import net.minecraft.world.dimension.DimensionType;
+import net.minecraft.world.dimension.DimensionType;
-import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
+
-import java.util.function.Supplier;
+import java.util.function.Supplier;
-
+
-@Mixin(ServerWorld.class)
+@Mixin(ServerWorld.class)
-public abstract class MixinServerWorld extends World {
+public abstract class MixinServerWorld extends World {
-    protected MixinServerWorld(MutableWorldProperties properties, RegistryKey<World> registryRef, DimensionType dimensionType, Supplier<Profiler> profiler, boolean isClient, boolean debugWorld, long seed) {
+    protected MixinServerWorld(MutableWorldProperties properties, RegistryKey<World> registryRef, DimensionType dimensionType, Supplier<Profiler> profiler, boolean isClient, boolean debugWorld, long seed) {
-        super(properties, registryRef, dimensionType, profiler, isClient, debugWorld, seed);
+        super(properties, registryRef, dimensionType, profiler, isClient, debugWorld, seed);
-    }
+    }
-
+
-    @Shadow protected abstract BlockPos getSurface(BlockPos pos);
+    @Shadow protected abstract BlockPos getSurface(BlockPos pos);
-
+
-    @Inject(at = @At("TAIL"),method = "tickChunk")
+    @Inject(at = @At("TAIL"),method = "tickChunk")
-    public void tickChunk(WorldChunk chunk, int randomTickSpeed, CallbackInfo ci) {
+    public void puddles$tickChunk(WorldChunk chunk, int randomTickSpeed, CallbackInfo ci) {
-        ChunkPos chunkPos = chunk.getPos();
+        ChunkPos chunkPos = chunk.getPos();
-        boolean bl = this.isRaining();
+        boolean bl = this.isRaining();
-        int x = chunkPos.getStartX();
+        int x = chunkPos.getStartX();
-        int z = chunkPos.getStartZ();
+        int z = chunkPos.getStartZ();
-        Profiler profiler = this.getProfiler();
+        Profiler profiler = this.getProfiler();
-        BlockPos pos;
+        BlockPos pos;
-
+
-        if (this.getGameRules().getInt(Puddles.PUDDLE_SPAWN_RATE) != 0) {
+        if (this.getGameRules().getInt(Puddles.PUDDLE_SPAWN_RATE) != 0) {
-            profiler.push("puddles");
+            profiler.push("puddles");
-            if (bl && random.nextInt(10000 / this.getGameRules().getInt(Puddles.PUDDLE_SPAWN_RATE)) == 0) {
+            if (bl && random.nextInt(10000 / this.getGameRules().getInt(Puddles.PUDDLE_SPAWN_RATE)) == 0) {
-                pos = this.getSurface(getRandomPosInChunk(x, 0, z, 15));
+                pos = this.getSurface(getRandomPosInChunk(x, 0, z, 15));
-                if (this.hasRain(pos) && getBlockState(pos.down()).isSideSolidFullSquare(this, pos, Direction.UP)) {
+                if (this.hasRain(pos) && getBlockState(pos.down()).isSideSolidFullSquare(this, pos, Direction.UP) && Puddles.Puddle.canPlaceAt(null,this,pos)) {
-                    setBlockState(pos, Puddles.Puddle.getDefaultState());
+                    setBlockState(pos, Puddles.Puddle.getDefaultState());
-                }
+                }
-            }
+            }
-            profiler.pop();
+            profiler.pop();
-        }
+        }
-
+
-        if (this.getGameRules().getInt(Puddles.SNOW_STACK_CHANCE) != 0) {
+        if (this.getGameRules().getInt(Puddles.SNOW_STACK_CHANCE) != 0) {
-            profiler.push("extra_snow");
+            profiler.push("extra_snow");
-            if (bl && random.nextInt(10000 / this.getGameRules().getInt(Puddles.SNOW_STACK_CHANCE)) == 0) {
+            if (bl && random.nextInt(10000 / this.getGameRules().getInt(Puddles.SNOW_STACK_CHANCE)) == 0) {
-                pos = this.getSurface(getRandomPosInChunk(x, 0, z, 15));
+                pos = this.getSurface(getRandomPosInChunk(x, 0, z, 15));
-                if (this.getBlockState(pos).getBlock() == Blocks.SNOW && getBlockState(pos.down()).isSideSolidFullSquare(this, pos, Direction.UP)) {
+                if (this.getBlockState(pos).getBlock() == Blocks.SNOW && getBlockState(pos.down()).isSideSolidFullSquare(this, pos, Direction.UP)) {
-                    int layer = getBlockState(pos).get(Properties.LAYERS);
+                    int layer = getBlockState(pos).get(Properties.LAYERS);
-                    setBlockState(pos, Blocks.SNOW.getDefaultState().with(Properties.LAYERS, layer + 1));
+                    if (layer < 5) {
-                }
+                        setBlockState(pos, Blocks.SNOW.getDefaultState().with(Properties.LAYERS, layer + 1));
-            }
+                    }
-            profiler.pop();
+                }
-        }
+            }
-    }
+            profiler.pop();
+        }
+    }
 }

src/main/resources/assets/puddles/lang/en_us.json

@@ -1,3 +1,3 @@
-{
+{
-	"block.puddles.puddle":"Puddle"
+	"block.puddles.puddle":"Puddle"
 }