Skip to content

Commit

Permalink
Liquid filler fixes (MeteorDevelopment#3968)
Browse files Browse the repository at this point in the history
  • Loading branch information
@thebest9178
thebest9178 authored Aug 24, 2023
1 parent 1f42816 commit cf6e9b4
Showing 1 changed file with 133 additions and 35 deletions.
168 changes: 133 additions & 35 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/world/LiquidFiller.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,56 +9,91 @@
import meteordevelopment.meteorclient.settings.*;
import meteordevelopment.meteorclient.systems.modules.Categories;
import meteordevelopment.meteorclient.systems.modules.Module;
import meteordevelopment.meteorclient.utils.Utils;
import meteordevelopment.meteorclient.utils.player.FindItemResult;
import meteordevelopment.meteorclient.utils.player.InvUtils;
import meteordevelopment.meteorclient.utils.world.BlockIterator;
import meteordevelopment.meteorclient.utils.world.BlockUtils;
import meteordevelopment.orbit.EventHandler;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.fluid.Fluid;
import net.minecraft.fluid.Fluids;
import net.minecraft.item.BlockItem;
import net.minecraft.util.math.BlockPos;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;

public class LiquidFiller extends Module {
private final SettingGroup sgGeneral = settings.getDefaultGroup();
private final SettingGroup sgWhitelist = settings.createGroup("Whitelist");

private final Setting<PlaceIn> placeInLiquids = sgGeneral.add(new EnumSetting.Builder<PlaceIn>()
.name("place-in")
.description("What type of liquids to place in.")
.defaultValue(PlaceIn.Lava)
.defaultValue(PlaceIn.Both)
.build()
);

private final Setting<Integer> horizontalRadius = sgGeneral.add(new IntSetting.Builder()
.name("horizontal-radius")
.description("Horizontal radius in which to search for liquids.")
.defaultValue(4)
.min(0)
.sliderMax(6)
private final Setting<Shape> shape = sgGeneral.add(new EnumSetting.Builder<Shape>()
.name("shape")
.description("The shape of placing algorithm.")
.defaultValue(Shape.Sphere)
.build()
);

private final Setting<Integer> verticalRadius = sgGeneral.add(new IntSetting.Builder()
.name("vertical-radius")
.description("Vertical radius in which to search for liquids.")
private final Setting<Double> range = sgGeneral.add(new DoubleSetting.Builder()
.name("range")
.description("The place range.")
.defaultValue(4)
.min(0)
.sliderMax(6)
.build()
);

private final Setting<Integer> delay = sgGeneral.add(new IntSetting.Builder()
.name("delay")
.description("Delay between actions in ticks.")
.defaultValue(1)
.defaultValue(0)
.min(0)
.build()
);

private final Setting<List<Block>> whitelist = sgGeneral.add(new BlockListSetting.Builder()
.name("block-whitelist")
private final Setting<Integer> maxBlocksPerTick = sgGeneral.add(new IntSetting.Builder()
.name("max-blocks-per-tick")
.description("Maximum blocks to try to place per tick.")
.defaultValue(1)
.min(1)
.sliderRange(1, 10)
.build()
);

private final Setting<SortMode> sortMode = sgGeneral.add(new EnumSetting.Builder<SortMode>()
.name("sort-mode")
.description("The blocks you want to place first.")
.defaultValue(SortMode.Closest)
.build()
);

private final Setting<Boolean> rotate = sgGeneral.add(new BoolSetting.Builder()
.name("rotate")
.description("Automatically rotates towards the space targeted for filling.")
.defaultValue(true)
.build()
);

// Whitelist and blacklist

private final Setting<ListMode> listMode = sgWhitelist.add(new EnumSetting.Builder<ListMode>()
.name("list-mode")
.description("Selection mode.")
.defaultValue(ListMode.Whitelist)
.build()
);

private final Setting<List<Block>> whitelist = sgWhitelist.add(new BlockListSetting.Builder()
.name("whitelist")
.description("The allowed blocks that it will use to fill up the liquid.")
.defaultValue(
Blocks.DIRT,
Expand All @@ -69,16 +104,19 @@ public class LiquidFiller extends Module {
Blocks.GRANITE,
Blocks.ANDESITE
)
.visible(() -> listMode.get() == ListMode.Whitelist)
.build()
);

private final Setting<Boolean> rotate = sgGeneral.add(new BoolSetting.Builder()
.name("rotate")
.description("Automatically rotates towards the space targeted for filling.")
.defaultValue(true)
private final Setting<List<Block>> blacklist = sgWhitelist.add(new BlockListSetting.Builder()
.name("blacklist")
.description("The denied blocks that it not will use to fill up the liquid.")
.visible(() -> listMode.get() == ListMode.Blacklist)
.build()
);

private final List<BlockPos.Mutable> blocks = new ArrayList<>();

private int timer;

public LiquidFiller(){
Expand All @@ -100,33 +138,93 @@ private void onTick(TickEvent.Pre event) {
timer = 0;
}

// Calculate some stuff
double pX = mc.player.getX();
double pY = mc.player.getY();
double pZ = mc.player.getZ();

double rangeSq = Math.pow(range.get(), 2);

if (shape.get() == Shape.UniformCube) range.set((double) Math.round(range.get()));

// Find slot with a block
FindItemResult item = InvUtils.findInHotbar(itemStack -> itemStack.getItem() instanceof BlockItem && whitelist.get().contains(Block.getBlockFromItem(itemStack.getItem())));
FindItemResult item;
if (listMode.get() == ListMode.Whitelist) {
item = InvUtils.findInHotbar(itemStack -> itemStack.getItem() instanceof BlockItem && whitelist.get().contains(Block.getBlockFromItem(itemStack.getItem())));
} else {
item = InvUtils.findInHotbar(itemStack -> itemStack.getItem() instanceof BlockItem && !blacklist.get().contains(Block.getBlockFromItem(itemStack.getItem())));
}
if (!item.found()) return;

// Loop blocks around the player
BlockIterator.register(horizontalRadius.get(), verticalRadius.get(), (blockPos, blockState) -> {
// Check if the block a source liquid block
if (isSource(blockState)) {
Block liquid = blockState.getBlock();

PlaceIn placeIn = placeInLiquids.get();
if (placeIn == PlaceIn.Both || (placeIn == PlaceIn.Lava && liquid == Blocks.LAVA) || (placeIn == PlaceIn.Water && liquid == Blocks.WATER)) {
if (BlockUtils.place(blockPos, item, rotate.get(), 0, true)) {
BlockIterator.disableCurrent();
}
}
BlockIterator.register((int) Math.ceil(range.get()+1), (int) Math.ceil(range.get()), (blockPos, blockState) -> {
boolean toofarSphere = Utils.squaredDistance(pX, pY, pZ, blockPos.getX() + 0.5, blockPos.getY() + 0.5, blockPos.getZ() + 0.5) > rangeSq;
boolean toofarUniformCube = maxDist(Math.floor(pX), Math.floor(pY), Math.floor(pZ), blockPos.getX(), blockPos.getY(), blockPos.getZ()) >= range.get();

// Check distance
if ((toofarSphere && shape.get() == Shape.Sphere) || (toofarUniformCube && shape.get() == Shape.UniformCube)) return;

// Check if the block is a source block and set to be filled
Fluid fluid = blockState.getFluidState().getFluid();
if ((placeInLiquids.get() == PlaceIn.Both && (fluid != Fluids.WATER && fluid != Fluids.LAVA))
|| (placeInLiquids.get() == PlaceIn.Water && fluid != Fluids.WATER)
|| (placeInLiquids.get() == PlaceIn.Lava && fluid != Fluids.LAVA))
return;

// Check if the player can place at pos
if (!BlockUtils.canPlace(blockPos)) return;

// Add block
blocks.add(blockPos.mutableCopy());
});

BlockIterator.after(() -> {
// Sort blocks
if (sortMode.get() == SortMode.TopDown || sortMode.get() == SortMode.BottomUp)
blocks.sort(Comparator.comparingDouble(value -> value.getY() * (sortMode.get() == SortMode.BottomUp ? 1 : -1)));
else if (sortMode.get() != SortMode.None)
blocks.sort(Comparator.comparingDouble(value -> Utils.squaredDistance(pX, pY, pZ, value.getX() + 0.5, value.getY() + 0.5, value.getZ() + 0.5) * (sortMode.get() == SortMode.Closest ? 1 : -1)));

// Place and clear place positions
int count = 0;
for (BlockPos pos : blocks) {
if (count >= maxBlocksPerTick.get()) break;
BlockUtils.place(pos, item, rotate.get(), 0, true);
count++;
}
blocks.clear();
});
}

private boolean isSource(BlockState blockState) {
return blockState.getFluidState().getLevel() == 8 && blockState.getFluidState().isStill();
public enum ListMode {
Whitelist,
Blacklist
}

public enum PlaceIn {
Lava,
Both,
Water,
Both
Lava
}

public enum SortMode {
None,
Closest,
Furthest,
TopDown,
BottomUp
}

public enum Shape {
Sphere,
UniformCube
}

private static double maxDist(double x1, double y1, double z1, double x2, double y2, double z2) {
// Gets the largest X, Y or Z difference, manhattan style
double dX = Math.ceil(Math.abs(x2 - x1));
double dY = Math.ceil(Math.abs(y2 - y1));
double dZ = Math.ceil(Math.abs(z2 - z1));
return Math.max(Math.max(dX, dY), dZ);
}
}

0 comments on commit cf6e9b4

Please sign in to comment.