Added a lava setting to Avoid

Author: BleachDev

BleachHack-Fabric-1.16/src/main/java/bleach/hack/module/mods/Avoid.java

@@ -16,6 +16,7 @@
 import bleach.hack.setting.base.SettingToggle;
 import net.minecraft.block.CactusBlock;
 import net.minecraft.block.FireBlock;
+import net.minecraft.fluid.LavaFluid;
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
 import net.minecraft.network.packet.c2s.play.VehicleMoveC2SPacket;
 import net.minecraft.util.shape.VoxelShapes;
@@ -27,34 +28,36 @@ public Avoid() {
 		super("Avoid", KEY_UNBOUND, ModuleCategory.WORLD, "Adds collision boxes to certain blocks/areas",
 				new SettingToggle("Cactus", true).withDesc("Adds a bigger collision box to cactuses"),
 				new SettingToggle("Fire", true).withDesc("Adds a collision box to fire"),
+				new SettingToggle("Lava", true).withDesc("Adds a collision box to lava"),
 				new SettingToggle("Unloaded", true).withDesc("Adds walls to unloaded chunks"));
 	}
 
 	@BleachSubscribe
 	public void onBlockShape(EventBlockShape event) {
 		if ((getSetting(0).asToggle().state && event.getState().getBlock() instanceof CactusBlock)
-				|| (getSetting(1).asToggle().state && event.getState().getBlock() instanceof FireBlock)) {
+				|| (getSetting(1).asToggle().state && event.getState().getBlock() instanceof FireBlock)
+				|| (getSetting(2).asToggle().state && event.getState().getFluidState().getFluid() instanceof LavaFluid)) {
 			event.setShape(VoxelShapes.fullCube());
 		}
 	}
 
 	@BleachSubscribe
 	public void onClientMove(EventClientMove event) {
-		if (getSetting(2).asToggle().state
-				&& !mc.world.getChunkManager().isChunkLoaded(
-						(int) (mc.player.getX() + event.getVec().x) >> 4, (int) (mc.player.getZ() + event.getVec().z) >> 4)) {
+		int x = (int) (mc.player.getX() + event.getVec().x) >> 4;
+		int z = (int) (mc.player.getZ() + event.getVec().z) >> 4;
+		if (getSetting(3).asToggle().state && !mc.world.getChunkManager().isChunkLoaded(x, z)) {
 			event.setCancelled(true);
 		}
 	}
 
 	@BleachSubscribe
 	public void onSendPacket(EventSendPacket event) {
-		if (getSetting(2).asToggle().state) {
+		if (getSetting(3).asToggle().state) {
 			if (event.getPacket() instanceof VehicleMoveC2SPacket) {
 				VehicleMoveC2SPacket packet = (VehicleMoveC2SPacket) event.getPacket();
 				if (!mc.world.getChunkManager().isChunkLoaded((int) packet.getX() >> 4, (int) packet.getZ() >> 4)) {
-					event.setCancelled(true);
 					mc.player.getVehicle().updatePosition(mc.player.getVehicle().prevX, mc.player.getVehicle().prevY, mc.player.getVehicle().prevZ);
+					event.setCancelled(true);
 				}
 			} else if (event.getPacket() instanceof PlayerMoveC2SPacket) {
 				PlayerMoveC2SPacket packet = (PlayerMoveC2SPacket) event.getPacket();

BleachHack-Fabric-1.17/src/main/java/bleach/hack/module/mods/Avoid.java

@@ -16,6 +16,7 @@
 import bleach.hack.setting.base.SettingToggle;
 import net.minecraft.block.CactusBlock;
 import net.minecraft.block.FireBlock;
+import net.minecraft.fluid.LavaFluid;
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
 import net.minecraft.network.packet.c2s.play.VehicleMoveC2SPacket;
 import net.minecraft.util.shape.VoxelShapes;
@@ -27,29 +28,31 @@ public Avoid() {
 		super("Avoid", KEY_UNBOUND, ModuleCategory.WORLD, "Adds collision boxes to certain blocks/areas",
 				new SettingToggle("Cactus", true).withDesc("Adds a bigger collision box to cactuses"),
 				new SettingToggle("Fire", true).withDesc("Adds a collision box to fire"),
+				new SettingToggle("Lava", true).withDesc("Adds a collision box to lava"),
 				new SettingToggle("Unloaded", true).withDesc("Adds walls to unloaded chunks"));
 	}
 
 	@BleachSubscribe
 	public void onBlockShape(EventBlockShape event) {
 		if ((getSetting(0).asToggle().state && event.getState().getBlock() instanceof CactusBlock)
-				|| (getSetting(1).asToggle().state && event.getState().getBlock() instanceof FireBlock)) {
+				|| (getSetting(1).asToggle().state && event.getState().getBlock() instanceof FireBlock)
+				|| (getSetting(2).asToggle().state && event.getState().getFluidState().getFluid() instanceof LavaFluid)) {
 			event.setShape(VoxelShapes.fullCube());
 		}
 	}
 
 	@BleachSubscribe
 	public void onClientMove(EventClientMove event) {
-		if (getSetting(2).asToggle().state
-				&& !mc.world.getChunkManager().isChunkLoaded(
-						(int) (mc.player.getX() + event.getVec().x) >> 4, (int) (mc.player.getZ() + event.getVec().z) >> 4)) {
+		int x = (int) (mc.player.getX() + event.getVec().x) >> 4;
+		int z = (int) (mc.player.getZ() + event.getVec().z) >> 4;
+		if (getSetting(3).asToggle().state && !mc.world.getChunkManager().isChunkLoaded(x, z)) {
 			event.setCancelled(true);
 		}
 	}
 
 	@BleachSubscribe
 	public void onSendPacket(EventSendPacket event) {
-		if (getSetting(2).asToggle().state) {
+		if (getSetting(3).asToggle().state) {
 			if (event.getPacket() instanceof VehicleMoveC2SPacket) {
 				VehicleMoveC2SPacket packet = (VehicleMoveC2SPacket) event.getPacket();
 				if (!mc.world.getChunkManager().isChunkLoaded((int) packet.getX() >> 4, (int) packet.getZ() >> 4)) {