feat: add GhostLiquidFixModule

Author: polariscli

src/main/java/org/afterlike/openutils/module/handler/ModuleHandler.java

@@ -27,6 +27,7 @@ public void initialize() {
 		this.register(new SprintModule());
 		// player
 		this.register(new ActionSoundsModule());
+		this.register(new GhostLiquidFixModule());
 		this.register(new NoBreakDelayModule());
 		this.register(new NoHitDelayModule());
 		// render

src/main/java/org/afterlike/openutils/module/impl/player/GhostLiquidFixModule.java

@@ -0,0 +1,10 @@
+package org.afterlike.openutils.module.impl.player;
+
+import org.afterlike.openutils.module.api.Module;
+import org.afterlike.openutils.module.api.ModuleCategory;
+
+public class GhostLiquidFixModule extends Module {
+	public GhostLiquidFixModule() {
+		super("Ghost Liquid Fix", ModuleCategory.PLAYER);
+	}
+}

src/main/java/org/afterlike/openutils/platform/mixin/minecraft/client/multiplayer/PlayerControllerMPMixin.java

@@ -1,14 +1,25 @@
 package org.afterlike.openutils.platform.mixin.minecraft.client.multiplayer;
 
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.multiplayer.PlayerControllerMP;
+import net.minecraft.client.multiplayer.WorldClient;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.play.client.C08PacketPlayerBlockPlacement;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Vec3;
 import org.afterlike.openutils.OpenUtils;
 import org.afterlike.openutils.event.impl.AttackEntityEvent;
+import org.afterlike.openutils.module.impl.player.GhostLiquidFixModule;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(PlayerControllerMP.class)
 public class PlayerControllerMPMixin {
@@ -18,4 +29,31 @@ public class PlayerControllerMPMixin {
 			final CallbackInfo ci) {
 		OpenUtils.get().getEventBus().post(new AttackEntityEvent(playerIn, targetEntity));
 	}
+
+	@Inject(method = "onPlayerRightClick", at = @At("HEAD"))
+	private void ou$onPlayerRightClick(EntityPlayerSP player, WorldClient worldIn,
+			ItemStack heldStack, BlockPos hitPos, EnumFacing side, Vec3 hitVec,
+			CallbackInfoReturnable<Boolean> cir) {
+		if (!OpenUtils.get().getModuleHandler().isEnabled(GhostLiquidFixModule.class)) {
+			return;
+		}
+		if (heldStack != null) {
+			float hitX = (float) (hitVec.xCoord - hitPos.getX());
+			float hitY = (float) (hitVec.yCoord - hitPos.getY());
+			float hitZ = (float) (hitVec.zCoord - hitPos.getZ());
+			C08PacketPlayerBlockPlacement packet = new C08PacketPlayerBlockPlacement(hitPos,
+					side.getIndex(), player.inventory.getCurrentItem(), hitX, hitY, hitZ);
+			if (heldStack.getItem() == Items.lava_bucket) {
+				BlockPos targetPos = new BlockPos(packet.getPosition().getX(),
+						packet.getPosition().getY(), packet.getPosition().getZ())
+						.offset(EnumFacing.getFront(packet.getPlacedBlockDirection()));
+				worldIn.setBlockState(targetPos, Blocks.flowing_lava.getDefaultState());
+			} else if (heldStack.getItem() == Items.water_bucket) {
+				BlockPos targetPos = new BlockPos(packet.getPosition().getX(),
+						packet.getPosition().getY(), packet.getPosition().getZ())
+						.offset(EnumFacing.getFront(packet.getPlacedBlockDirection()));
+				worldIn.setBlockState(targetPos, Blocks.flowing_water.getDefaultState());
+			}
+		}
+	}
 }

src/main/java/org/afterlike/openutils/platform/mixin/minecraft/item/ItemBucketMixin.java

@@ -0,0 +1,56 @@
+package org.afterlike.openutils.platform.mixin.minecraft.item;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBucket;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.World;
+import org.afterlike.openutils.OpenUtils;
+import org.afterlike.openutils.module.impl.player.GhostLiquidFixModule;
+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.Redirect;
+
+@Mixin(ItemBucket.class)
+public class ItemBucketMixin extends Item {
+	@Shadow
+	private Block isFull;
+	@Redirect(method = "onItemRightClick", at = @At(value = "INVOKE",
+			target = "Lnet/minecraft/item/ItemBucket;tryPlaceContainedLiquid(Lnet/minecraft/world/World;Lnet/minecraft/util/BlockPos;)Z"))
+	private boolean ou$onItemRightClick(ItemBucket instance, World worldIn, BlockPos pos) {
+		if (!OpenUtils.get().getModuleHandler().isEnabled(GhostLiquidFixModule.class)) {
+			return instance.tryPlaceContainedLiquid(worldIn, pos);
+		}
+		if (this.isFull == Blocks.air) {
+			return false;
+		}
+		Material material = worldIn.getBlockState(pos).getBlock().getMaterial();
+		boolean isSolid = !material.isSolid();
+		if (!worldIn.isAirBlock(pos) && !isSolid) {
+			return false;
+		}
+		if (worldIn.provider.doesWaterVaporize() && this.isFull == Blocks.flowing_water) {
+			int x = pos.getX();
+			int y = pos.getY();
+			int z = pos.getZ();
+			worldIn.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "random.fizz", 0.5f,
+					2.6f + (worldIn.rand.nextFloat() - worldIn.rand.nextFloat()) * 0.8f);
+			for (int l = 0; l < 8; ++l) {
+				worldIn.spawnParticle(EnumParticleTypes.SMOKE_LARGE, x + Math.random(),
+						y + Math.random(), z + Math.random(), 0.0, 0.0, 0.0);
+			}
+		} else {
+			if (!worldIn.isRemote && isSolid && !material.isLiquid()) {
+				worldIn.destroyBlock(pos, true);
+			}
+			if (!worldIn.isRemote) {
+				worldIn.setBlockState(pos, this.isFull.getDefaultState(), 3);
+			}
+		}
+		return true;
+	}
+}

src/main/resources/mixins.openutils.json

@@ -7,6 +7,7 @@
     "minecraft.client.entity.AbstractClientPlayerMixin",
     "minecraft.entity.EntityLivingBaseAccessor",
     "minecraft.entity.EntityLivingBaseMixin",
+    "minecraft.item.ItemBucketMixin",
     "minecraft.network.NetworkManagerMixin",
     "minecraft.world.storage.WorldInfoMixin",
     "minecraftforge.fml.common.network.handshake.ModListMixin"