diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 9759196..a74e442 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # Puddles -Adds Puddles. Compatible with any shaderpack! +Adds puddles. Compatible with your favorite shaderpacks & mods! diff --git a/build.gradle b/build.gradle old mode 100644 new mode 100755 index 590713a..e205e7f --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.5-SNAPSHOT' + id 'fabric-loom' version '0.7-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties old mode 100644 new mode 100755 index f6bab1c..fb81335 --- a/gradle.properties +++ b/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 - loader_version=0.11.1 + yarn_mappings=1.16.5+build.9 + 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 \ No newline at end of file + fabric_version=0.34.2+1.16 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar old mode 100644 new mode 100755 index 5c2d1cf..e708b1c Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties old mode 100644 new mode 100755 index 4b7e1f3..442d913 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 8e25e6c..4f906e0 --- a/gradlew +++ b/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 -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +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 -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 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" "$@" diff --git a/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755 index 9618d8d..107acd3 --- a/gradlew.bat +++ b/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 diff --git a/renders/puddle_banner.png b/renders/puddle_banner.png new file mode 100755 index 0000000..3b62f4f Binary files /dev/null and b/renders/puddle_banner.png differ diff --git a/renders/puddle_logo.png b/renders/puddle_logo.png new file mode 100755 index 0000000..6597b6a Binary files /dev/null and b/renders/puddle_logo.png differ diff --git a/settings.gradle b/settings.gradle old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/puddles/Puddles.java b/src/main/java/eu/midnightdust/puddles/Puddles.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/puddles/PuddlesClient.java b/src/main/java/eu/midnightdust/puddles/PuddlesClient.java old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/puddles/block/PuddleBlock.java b/src/main/java/eu/midnightdust/puddles/block/PuddleBlock.java old mode 100644 new mode 100755 index ea98240..82a5f49 --- a/src/main/java/eu/midnightdust/puddles/block/PuddleBlock.java +++ b/src/main/java/eu/midnightdust/puddles/block/PuddleBlock.java @@ -1,166 +1,167 @@ -package eu.midnightdust.puddles.block; - -import eu.midnightdust.puddles.Puddles; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.block.*; -import net.minecraft.entity.ai.pathing.NavigationType; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.fluid.*; -import net.minecraft.item.*; -import net.minecraft.loot.context.LootContext; -import net.minecraft.potion.PotionUtil; -import net.minecraft.potion.Potions; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvents; -import net.minecraft.stat.Stats; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.util.shape.VoxelShape; -import net.minecraft.util.shape.VoxelShapes; -import net.minecraft.world.BlockView; -import net.minecraft.world.World; -import net.minecraft.world.WorldAccess; -import net.minecraft.world.WorldView; - -import java.util.Collections; -import java.util.List; -import java.util.Random; - -@SuppressWarnings("deprecation") -public class PuddleBlock extends Block { - - protected final FlowableFluid fluid; - public static final VoxelShape COLLISION_SHAPE; - - public PuddleBlock(FlowableFluid fluid, AbstractBlock.Settings settings) { - super(settings); - this.fluid = fluid; - } - @Override - public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - ItemStack itemStack = player.getStackInHand(hand); - if (itemStack.isEmpty()) { - return ActionResult.PASS; - } else { - Item item = itemStack.getItem(); - ItemStack waterBottleStack; - if (item == Items.GLASS_BOTTLE) { - if (!world.isClient) { - if (!player.abilities.creativeMode) { - waterBottleStack = PotionUtil.setPotion(new ItemStack(Items.POTION), Potions.WATER); - player.incrementStat(Stats.USE_CAULDRON); - itemStack.decrement(1); - if (itemStack.isEmpty()) { - player.setStackInHand(hand, waterBottleStack); - } else if (!player.inventory.insertStack(waterBottleStack)) { - player.dropItem(waterBottleStack, false); - } else if (player instanceof ServerPlayerEntity) { - ((ServerPlayerEntity)player).refreshScreenHandler(player.playerScreenHandler); - } - } - - world.playSound(null, pos, SoundEvents.ITEM_BOTTLE_FILL, SoundCategory.BLOCKS, 1.0F, 1.0F); - world.setBlockState(pos, Blocks.AIR.getDefaultState()); - } - return ActionResult.success(world.isClient); - } - else return ActionResult.FAIL; - } - - } - @Override - public boolean hasRandomTicks(BlockState state) { - return true; - } - @Override - public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { - if (!world.isRaining() && random.nextInt(2000) == 0) { - world.setBlockState(pos, Blocks.AIR.getDefaultState()); - } - - this.scheduledTick(state, world, pos, random); - } - - @Override - public VoxelShape getCollisionShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { - return context.isAbove(COLLISION_SHAPE, pos, true) ? COLLISION_SHAPE : VoxelShapes.empty(); - } - @Override - public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { - return COLLISION_SHAPE; - } - @Override - public VoxelShape getCullingShape(BlockState state, BlockView world, BlockPos pos) { - return VoxelShapes.empty(); - } - - public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) { - return true; - } - - public FluidState getFluidState(BlockState state) { - return fluid.getFlowing(1,false); - } - - @Environment(EnvType.CLIENT) - public boolean isSideInvisible(BlockState state, BlockState stateFrom, Direction direction) { - return stateFrom.getFluidState().getFluid().matchesType(this.fluid); - } - - public BlockRenderType getRenderType(BlockState state) { - return BlockRenderType.INVISIBLE; - } - - public List getDroppedStacks(BlockState state, LootContext.Builder builder) { - return Collections.emptyList(); - } - - public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { - if (world.getBlockState(pos) == Blocks.AIR.getDefaultState() || world.getBlockState(pos) == Puddles.Puddle.getDefaultState()) { - int i; - // Check if there are fluids on the sides or corners of the block above - for (i = 2; i < 6; ++i) { - BlockPos pos1 = pos.up(); - BlockPos pos2 = pos1.offset(Direction.byId(i)); - if (!world.getFluidState(pos1.offset(Direction.byId(i))).isEmpty()) { - // 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 - return false; - } - } - // Check if there are fluids on the sides or corners of the block below - for (i = 2; i < 6; ++i) { - BlockPos pos1 = pos.down(); - BlockPos pos2 = pos1.offset(Direction.byId(i)); - if (!world.getFluidState(pos1.offset(Direction.byId(i))).isEmpty()) { - // 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 - return false; - } - } - 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; - } - 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); - } -} - +package eu.midnightdust.puddles.block; + +import eu.midnightdust.puddles.Puddles; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.*; +import net.minecraft.entity.ai.pathing.NavigationType; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.fluid.*; +import net.minecraft.item.*; +import net.minecraft.loot.context.LootContext; +import net.minecraft.potion.PotionUtil; +import net.minecraft.potion.Potions; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.stat.Stats; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; + +import java.util.Collections; +import java.util.List; +import java.util.Random; + +@SuppressWarnings("deprecation") +public class PuddleBlock extends Block { + + protected final FlowableFluid fluid; + public static final VoxelShape COLLISION_SHAPE; + + public PuddleBlock(FlowableFluid fluid, AbstractBlock.Settings settings) { + super(settings); + this.fluid = fluid; + } + @Override + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + ItemStack itemStack = player.getStackInHand(hand); + if (itemStack.isEmpty()) { + return ActionResult.PASS; + } else { + Item item = itemStack.getItem(); + ItemStack waterBottleStack; + if (item == Items.GLASS_BOTTLE) { + if (!world.isClient) { + if (!player.abilities.creativeMode) { + waterBottleStack = PotionUtil.setPotion(new ItemStack(Items.POTION), Potions.WATER); + player.incrementStat(Stats.USE_CAULDRON); + itemStack.decrement(1); + if (itemStack.isEmpty()) { + player.setStackInHand(hand, waterBottleStack); + } else if (!player.inventory.insertStack(waterBottleStack)) { + player.dropItem(waterBottleStack, false); + } else if (player instanceof ServerPlayerEntity) { + ((ServerPlayerEntity)player).refreshScreenHandler(player.playerScreenHandler); + } + } + + world.playSound(null, pos, SoundEvents.ITEM_BOTTLE_FILL, SoundCategory.BLOCKS, 1.0F, 1.0F); + world.setBlockState(pos, Blocks.AIR.getDefaultState()); + } + return ActionResult.success(world.isClient); + } + else return ActionResult.FAIL; + } + + } + @Override + public boolean hasRandomTicks(BlockState state) { + return true; + } + @Override + public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { + if (!world.isRaining() && random.nextInt(2000) == 0) { + world.setBlockState(pos, Blocks.AIR.getDefaultState()); + } + + this.scheduledTick(state, world, pos, random); + } + + @Override + public VoxelShape getCollisionShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + return context.isAbove(COLLISION_SHAPE, pos, true) ? COLLISION_SHAPE : VoxelShapes.empty(); + } + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + return COLLISION_SHAPE; + } + @Override + public VoxelShape getCullingShape(BlockState state, BlockView world, BlockPos pos) { + return VoxelShapes.empty(); + } + + public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) { + return true; + } + + public FluidState getFluidState(BlockState state) { + return fluid.getFlowing(1,false); + } + + @Environment(EnvType.CLIENT) + public boolean isSideInvisible(BlockState state, BlockState stateFrom, Direction direction) { + return stateFrom.getFluidState().getFluid().matchesType(this.fluid); + } + + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.INVISIBLE; + } + + public List getDroppedStacks(BlockState state, LootContext.Builder builder) { + return Collections.emptyList(); + } + + @Override + public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { + if (world.getBlockState(pos) == Blocks.AIR.getDefaultState() || world.getBlockState(pos) == Puddles.Puddle.getDefaultState()) { + int i; + // Check if there are fluids on the sides or corners of the block above + for (i = 2; i < 6; ++i) { + BlockPos pos1 = pos.up(); + BlockPos pos2 = pos1.offset(Direction.byId(i)); + if (!world.getFluidState(pos1.offset(Direction.byId(i))).isEmpty()) { + // 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 + return false; + } + } + // Check if there are fluids on the sides or corners of the block below + for (i = 2; i < 6; ++i) { + BlockPos pos1 = pos.down(); + BlockPos pos2 = pos1.offset(Direction.byId(i)); + if (!world.getFluidState(pos1.offset(Direction.byId(i))).isEmpty()) { + // 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 + return false; + } + } + 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; + } + 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); + } +} + diff --git a/src/main/java/eu/midnightdust/puddles/mixin/MixinServerWorld.java b/src/main/java/eu/midnightdust/puddles/mixin/MixinServerWorld.java old mode 100644 new mode 100755 index d1bd884..cb04fe9 --- a/src/main/java/eu/midnightdust/puddles/mixin/MixinServerWorld.java +++ b/src/main/java/eu/midnightdust/puddles/mixin/MixinServerWorld.java @@ -1,63 +1,65 @@ -package eu.midnightdust.puddles.mixin; - -import eu.midnightdust.puddles.Puddles; -import net.minecraft.block.Blocks; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.state.property.Properties; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.ChunkPos; -import net.minecraft.util.math.Direction; -import net.minecraft.util.profiler.Profiler; -import net.minecraft.util.registry.RegistryKey; -import net.minecraft.world.*; -import net.minecraft.world.chunk.WorldChunk; -import net.minecraft.world.dimension.DimensionType; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import java.util.function.Supplier; - -@Mixin(ServerWorld.class) -public abstract class MixinServerWorld extends World { - protected MixinServerWorld(MutableWorldProperties properties, RegistryKey registryRef, DimensionType dimensionType, Supplier profiler, boolean isClient, boolean debugWorld, long seed) { - super(properties, registryRef, dimensionType, profiler, isClient, debugWorld, seed); - } - - @Shadow protected abstract BlockPos getSurface(BlockPos pos); - - @Inject(at = @At("TAIL"),method = "tickChunk") - public void tickChunk(WorldChunk chunk, int randomTickSpeed, CallbackInfo ci) { - ChunkPos chunkPos = chunk.getPos(); - boolean bl = this.isRaining(); - int x = chunkPos.getStartX(); - int z = chunkPos.getStartZ(); - Profiler profiler = this.getProfiler(); - BlockPos pos; - - if (this.getGameRules().getInt(Puddles.PUDDLE_SPAWN_RATE) != 0) { - profiler.push("puddles"); - if (bl && random.nextInt(10000 / this.getGameRules().getInt(Puddles.PUDDLE_SPAWN_RATE)) == 0) { - pos = this.getSurface(getRandomPosInChunk(x, 0, z, 15)); - if (this.hasRain(pos) && getBlockState(pos.down()).isSideSolidFullSquare(this, pos, Direction.UP)) { - setBlockState(pos, Puddles.Puddle.getDefaultState()); - } - } - profiler.pop(); - } - - if (this.getGameRules().getInt(Puddles.SNOW_STACK_CHANCE) != 0) { - profiler.push("extra_snow"); - if (bl && random.nextInt(10000 / this.getGameRules().getInt(Puddles.SNOW_STACK_CHANCE)) == 0) { - pos = this.getSurface(getRandomPosInChunk(x, 0, z, 15)); - if (this.getBlockState(pos).getBlock() == Blocks.SNOW && getBlockState(pos.down()).isSideSolidFullSquare(this, pos, Direction.UP)) { - int layer = getBlockState(pos).get(Properties.LAYERS); - setBlockState(pos, Blocks.SNOW.getDefaultState().with(Properties.LAYERS, layer + 1)); - } - } - profiler.pop(); - } - } +package eu.midnightdust.puddles.mixin; + +import eu.midnightdust.puddles.Puddles; +import net.minecraft.block.Blocks; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.state.property.Properties; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.ChunkPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.profiler.Profiler; +import net.minecraft.util.registry.RegistryKey; +import net.minecraft.world.*; +import net.minecraft.world.chunk.WorldChunk; +import net.minecraft.world.dimension.DimensionType; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.function.Supplier; + +@Mixin(ServerWorld.class) +public abstract class MixinServerWorld extends World { + protected MixinServerWorld(MutableWorldProperties properties, RegistryKey registryRef, DimensionType dimensionType, Supplier profiler, boolean isClient, boolean debugWorld, long seed) { + super(properties, registryRef, dimensionType, profiler, isClient, debugWorld, seed); + } + + @Shadow protected abstract BlockPos getSurface(BlockPos pos); + + @Inject(at = @At("TAIL"),method = "tickChunk") + public void puddles$tickChunk(WorldChunk chunk, int randomTickSpeed, CallbackInfo ci) { + ChunkPos chunkPos = chunk.getPos(); + boolean bl = this.isRaining(); + int x = chunkPos.getStartX(); + int z = chunkPos.getStartZ(); + Profiler profiler = this.getProfiler(); + BlockPos pos; + + if (this.getGameRules().getInt(Puddles.PUDDLE_SPAWN_RATE) != 0) { + profiler.push("puddles"); + if (bl && random.nextInt(10000 / this.getGameRules().getInt(Puddles.PUDDLE_SPAWN_RATE)) == 0) { + pos = this.getSurface(getRandomPosInChunk(x, 0, z, 15)); + if (this.hasRain(pos) && getBlockState(pos.down()).isSideSolidFullSquare(this, pos, Direction.UP) && Puddles.Puddle.canPlaceAt(null,this,pos)) { + setBlockState(pos, Puddles.Puddle.getDefaultState()); + } + } + profiler.pop(); + } + + if (this.getGameRules().getInt(Puddles.SNOW_STACK_CHANCE) != 0) { + profiler.push("extra_snow"); + if (bl && random.nextInt(10000 / this.getGameRules().getInt(Puddles.SNOW_STACK_CHANCE)) == 0) { + pos = this.getSurface(getRandomPosInChunk(x, 0, z, 15)); + if (this.getBlockState(pos).getBlock() == Blocks.SNOW && getBlockState(pos.down()).isSideSolidFullSquare(this, pos, Direction.UP)) { + int layer = getBlockState(pos).get(Properties.LAYERS); + if (layer < 5) { + setBlockState(pos, Blocks.SNOW.getDefaultState().with(Properties.LAYERS, layer + 1)); + } + } + } + profiler.pop(); + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/puddles/blockstates/puddle.json b/src/main/resources/assets/puddles/blockstates/puddle.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/puddles/icon.png b/src/main/resources/assets/puddles/icon.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/puddles/lang/en_us.json b/src/main/resources/assets/puddles/lang/en_us.json old mode 100644 new mode 100755 index ee95555..8544624 --- a/src/main/resources/assets/puddles/lang/en_us.json +++ b/src/main/resources/assets/puddles/lang/en_us.json @@ -1,3 +1,3 @@ -{ - "block.puddles.puddle":"Puddle" +{ + "block.puddles.puddle":"Puddle" } \ No newline at end of file diff --git a/src/main/resources/assets/puddles/models/block/puddle.json b/src/main/resources/assets/puddles/models/block/puddle.json old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/puddles/models/item/puddle.json b/src/main/resources/assets/puddles/models/item/puddle.json old mode 100644 new mode 100755 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json old mode 100644 new mode 100755 diff --git a/src/main/resources/puddles.mixins.json b/src/main/resources/puddles.mixins.json old mode 100644 new mode 100755