Fixed worm stuff.

This commit is contained in:
Flanks255 2024-06-03 16:16:57 -05:00
parent a841121dde
commit a6f50e2f3a

View file

@ -10,7 +10,9 @@
package de.ellpeck.actuallyadditions.mod.entity; package de.ellpeck.actuallyadditions.mod.entity;
import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
import de.ellpeck.actuallyadditions.mod.config.CommonConfig; import de.ellpeck.actuallyadditions.mod.config.CommonConfig;
import de.ellpeck.actuallyadditions.mod.misc.apiimpl.farmer.DefaultFarmerBehavior;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
@ -78,7 +80,9 @@ public class EntityWorm extends Entity {
if (waterTicket != null) if (waterTicket != null)
waterTicket.invalidate(); waterTicket.invalidate();
waterTicket = FarmlandWaterManager.addAABBTicket(this.level(), new AABB(getX() - 2, getY() - 1.5, getZ() - 2, getX() + 2, getY(), getZ() + 2)); AABB aabb = new AABB(getX() - 1.5, getY() - 1.5, getZ() - 1.0, getX() + 1.5, getY() + 0.5, getZ() + 1.5);
//ActuallyAdditions.LOGGER.info("Worm AABB: " + aabb);
waterTicket = FarmlandWaterManager.addAABBTicket(this.level(), aabb);
} }
@Override @Override
@ -101,21 +105,11 @@ public class EntityWorm extends Entity {
if (canWormify(this.level(), pos, state)) { if (canWormify(this.level(), pos, state)) {
boolean isFarmland = block instanceof FarmBlock; boolean isFarmland = block instanceof FarmBlock;
if (!isFarmland) {
/* if (!isFarmland || state.getValue(FarmlandBlock.MOISTURE) < 7) {
if (isMiddlePose || this.level().random.nextFloat() >= 0.45F) { if (isMiddlePose || this.level().random.nextFloat() >= 0.45F) {
DefaultFarmerBehavior.useHoeAt(this.level(), pos);
if (!isFarmland) {
DefaultFarmerBehavior.useHoeAt(this.level, pos);
}
state = this.level().getBlockState(pos);
isFarmland = state.getBlock() instanceof FarmlandBlock;
if (isFarmland) {
this.level().setBlock(pos, state.setValue(FarmlandBlock.MOISTURE, 7), 2);
}
} }
}*/ }
if (isFarmland && this.level().random.nextFloat() >= 0.95F) { if (isFarmland && this.level().random.nextFloat() >= 0.95F) {
BlockPos plant = pos.above(); BlockPos plant = pos.above();