Skip to content

New Functionality For Block Respawning #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
GulpieEXE wants to merge 8 commits into from
Closed

New Functionality For Block Respawning #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b2f1e79
Update MinerMobs.java
GulpieEXE Oct 26, 2025
02c93dc
Update MineTowardsTargetGoal.java
GulpieEXE Oct 26, 2025
0da4f00
Add files via upload
GulpieEXE Oct 26, 2025
4ba8700
Merge branch 'Insane96:1.20.1' into 1.20.1
GulpieEXE Nov 8, 2025
3cd45b5
Update MineTowardsTargetGoal.java
GulpieEXE Nov 8, 2025
719eb8f
Update MinerMobs.java
GulpieEXE Nov 8, 2025
b4f0e68
Delete src/main/java/insane96mcp/enhancedai/modules/mobs/miner/persis…
GulpieEXE Nov 8, 2025
38cb6a7
Update BlockRespawnData.java
GulpieEXE Nov 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
194 changes: 122 additions & 72 deletions src/main/java/insane96mcp/enhancedai/modules/mobs/miner/MineTowardsTargetGoal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import insane96mcp.enhancedai.modules.mobs.MeleeAttacking;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundSource;
import net.minecraft.util.Mth;
Expand Down Expand Up @@ -29,14 +30,17 @@
import net.minecraft.world.phys.Vec3;
import net.minecraftforge.common.ForgeMod;
import net.minecraftforge.event.ForgeEventFactory;
import insane96mcp.enhancedai.EnhancedAI;
import insane96mcp.enhancedai.modules.mobs.miner.persistence.BlockRespawnData;

import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;

public class MineTowardsTargetGoal extends Goal {
import static insane96mcp.enhancedai.modules.mobs.miner.MinerMobs.blacklistTileEntities;
Copy link
Owner

@Insane96 Insane96 Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this static import?


public class MineTowardsTargetGoal extends Goal {
private final Mob miner;
private LivingEntity target;
private final double reachDistance;
Expand All @@ -51,12 +55,14 @@ public class MineTowardsTargetGoal extends Goal {

private Path path = null;

public MineTowardsTargetGoal(Mob miner){
public MineTowardsTargetGoal(Mob miner) {
this.miner = miner;
this.reachDistance = miner.getAttribute(ForgeMod.BLOCK_REACH.get()) == null ? 4.5 : miner.getAttributeValue(ForgeMod.BLOCK_REACH.get());
this.setFlags(EnumSet.of(Flag.LOOK, Flag.MOVE));
}


Copy link
Owner

@Insane96 Insane96 Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why all those empty lines between methods?


public boolean canUse() {
if (!MinerMobs.isValidDimension(this.miner)
|| !this.miner.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)
Expand All @@ -70,12 +76,12 @@ public boolean canUse() {
&& (this.miner.distanceToSqr(miner.getTarget()) < maxTargetDistance || maxTargetDistance == 0);
}


public boolean canContinueToUse() {
if (this.targetBlocks.isEmpty())
return false;
if (this.blockState != null && !this.canBreakBlock())
return false;

if (this.target == null || !this.target.isAlive())
return false;

Expand All @@ -85,6 +91,7 @@ public boolean canContinueToUse() {
&& this.path != null && (this.path.getDistToTarget() > 1.5d || !this.miner.hasLineOfSight(this.target));
}


public void start() {
this.target = this.miner.getTarget();
if (this.target == null)
Expand All @@ -95,6 +102,7 @@ public void start() {
}
}


public void stop() {
this.target = null;
if (!this.targetBlocks.isEmpty()) {
Expand All @@ -110,6 +118,7 @@ public void stop() {
this.miner.setAggressive(false);
}


public void tick() {
if (this.targetBlocks.isEmpty())
return;
Expand All @@ -119,24 +128,74 @@ public void tick() {
BlockPos pos = this.targetBlocks.get(0);
this.breakingTick++;
this.miner.getLookControl().setLookAt(pos.getX() + 0.5d, pos.getY() + 0.5d, pos.getZ() + 0.5d);
if (this.prevBreakProgress != (int) ((this.breakingTick / (float) this.tickToBreak) * 10)) {
this.prevBreakProgress = (int) ((this.breakingTick / (float) this.tickToBreak) * 10);
this.miner.level().destroyBlockProgress(this.miner.getId(), pos, this.prevBreakProgress);

// progress visuals
int progress = (int) ((this.breakingTick / (float) this.tickToBreak) * 10);
if (this.prevBreakProgress != progress) {
this.prevBreakProgress = progress;
this.miner.level().destroyBlockProgress(this.miner.getId(), pos, progress);
}
if (this.breakingTick % 6 == 0) {

if (this.breakingTick % 6 == 0)
this.miner.swing(InteractionHand.MAIN_HAND);
}

if (this.breakingTick % 4 == 0) {
SoundType soundType = this.blockState.getSoundType(this.miner.level(), pos, this.miner);
this.miner.level().playSound(null, pos, soundType.getHitSound(), SoundSource.BLOCKS, (soundType.getVolume() + 1.0F) / 8.0F, soundType.getPitch() * 0.5F);
this.miner.level().playSound(null, pos, soundType.getHitSound(), SoundSource.BLOCKS,
(soundType.getVolume() + 1.0F) / 8.0F, soundType.getPitch() * 0.5F);
}

// --- Respawn-aware block breaking ---
if (this.breakingTick >= this.tickToBreak && this.miner.level() instanceof ServerLevel level) {
if (ForgeEventFactory.onEntityDestroyBlock(this.miner, this.targetBlocks.get(0), this.blockState) && this.miner.level().destroyBlock(pos, false, this.miner) && (!this.blockState.requiresCorrectToolForDrops() || this.miner.getItemBySlot(EquipmentSlot.OFFHAND).isCorrectToolForDrops(this.blockState))) {
BlockEntity blockentity = this.blockState.hasBlockEntity() ? this.miner.level().getBlockEntity(pos) : null;
LootParams.Builder lootparams$builder = (new LootParams.Builder(level)).withParameter(LootContextParams.ORIGIN, Vec3.atCenterOf(pos)).withParameter(LootContextParams.TOOL, this.miner.getOffhandItem()).withOptionalParameter(LootContextParams.BLOCK_ENTITY, blockentity).withOptionalParameter(LootContextParams.THIS_ENTITY, this.miner);
this.blockState.spawnAfterBreak(level, pos, this.miner.getOffhandItem(), false);
this.blockState.getDrops(lootparams$builder).forEach((itemStack) -> level.addFreshEntity(new ItemEntity(level, pos.getX() + 0.5f, pos.getY() + 0.5f, pos.getZ() + 0.5f, itemStack)));
if (!ForgeEventFactory.onEntityDestroyBlock(this.miner, pos, this.blockState)) return;

int respawnTime = MinerMobs.BLOCK_RESPAWN_TIME.get(this.miner);
boolean scaleByHardness = MinerMobs.SCALE_RESPAWN_BY_HARDNESS.get(this.miner);

if (scaleByHardness) {
double hardness = Math.max(0, this.blockState.getDestroySpeed(level, pos));
int baseTime = MinerMobs.BASE_RESPAWN_TIME.get(this.miner);
double multiplier = MinerMobs.HARDNESS_RESPAWN_MULTIPLIER.get(this.miner);
respawnTime = (int) Math.ceil(baseTime + hardness * multiplier);
}

boolean willRespawn = respawnTime > 0;

CompoundTag blockNbt = null;
if (willRespawn && MinerMobs.shouldSaveBlockNBT(this.blockState)) {
BlockEntity blockEntity = level.getBlockEntity(pos);
if (blockEntity != null)
blockNbt = blockEntity.saveWithFullMetadata();
}

if (willRespawn) {
// Remove block without drops, record for respawn
level.removeBlockEntity(pos);
level.setBlock(pos, net.minecraft.world.level.block.Blocks.AIR.defaultBlockState(), 3);

long respawnAt = level.getGameTime() + respawnTime;
BlockRespawnData data = BlockRespawnData.get(level);
data.set(pos, respawnAt, this.blockState, blockNbt);

EnhancedAI.LOGGER.debug("Scheduled respawn for block {} at {} after {} ticks",
this.blockState.getBlock().getName().getString(), pos, respawnTime);
}
else {
// Normal destruction with drops
if (this.miner.getItemBySlot(EquipmentSlot.OFFHAND).isCorrectToolForDrops(this.blockState)) {
BlockEntity blockEntity = this.blockState.hasBlockEntity() ? level.getBlockEntity(pos) : null;
LootParams.Builder lootparams = (new LootParams.Builder(level))
.withParameter(LootContextParams.ORIGIN, Vec3.atCenterOf(pos))
.withParameter(LootContextParams.TOOL, this.miner.getOffhandItem())
.withOptionalParameter(LootContextParams.BLOCK_ENTITY, blockEntity)
.withOptionalParameter(LootContextParams.THIS_ENTITY, this.miner);
this.blockState.spawnAfterBreak(level, pos, this.miner.getOffhandItem(), false);
this.blockState.getDrops(lootparams).forEach(stack ->
level.addFreshEntity(new ItemEntity(level, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, stack)));
level.removeBlock(pos, false);
}
}

this.miner.level().destroyBlockProgress(this.miner.getId(), pos, -1);
this.targetBlocks.remove(0);
if (!this.targetBlocks.isEmpty())
Expand All @@ -156,52 +215,31 @@ private void initBlockBreak() {
private void fillTargetBlocks() {
int mobHeight = Mth.ceil(this.miner.getBbHeight());
for (int i = 0; i < mobHeight; i++) {
BlockHitResult rayTraceResult = this.miner.level().clip(new ClipContext(this.miner.position().add(0, i + 0.5d, 0), this.target.getEyePosition(1f).add(0, i, 0), ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this.miner));
if (rayTraceResult.getType() == HitResult.Type.MISS
|| this.targetBlocks.contains(rayTraceResult.getBlockPos())
|| rayTraceResult.getBlockPos().getY() > MinerMobs.MAX_Y.get(this.miner))
continue;
BlockHitResult rayTrace = this.miner.level().clip(new ClipContext(this.miner.position().add(0, i + 0.5d, 0), this.target.getEyePosition(1f).add(0, i, 0), ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this.miner));
if (rayTrace.getType() == HitResult.Type.MISS
|| this.targetBlocks.contains(rayTrace.getBlockPos())
|| rayTrace.getBlockPos().getY() > MinerMobs.MAX_Y.get(this.miner))
continue;

double distance = this.miner.distanceToSqr(rayTraceResult.getLocation());
double distance = this.miner.distanceToSqr(rayTrace.getLocation());
if (distance > this.reachDistance * this.reachDistance)
continue;

BlockState state = this.miner.level().getBlockState(rayTraceResult.getBlockPos());
BlockState state = this.miner.level().getBlockState(rayTrace.getBlockPos());

if (state.getDestroySpeed(this.miner.level(), rayTraceResult.getBlockPos()) == -1
|| (state.hasBlockEntity() && MinerMobs.blacklistTileEntities))
if (state.getDestroySpeed(this.miner.level(), rayTrace.getBlockPos()) == -1
|| (state.hasBlockEntity() && blacklistTileEntities))
continue;

boolean listed = state.is(MinerMobs.BLOCK_BLACKLIST);
if (listed != MinerMobs.blockBlacklistAsWhitelist)
continue;

this.targetBlocks.add(rayTraceResult.getBlockPos());
this.targetBlocks.add(rayTrace.getBlockPos());
}
Collections.reverse(this.targetBlocks);
}

public boolean requiresUpdateEveryTick() {
return true;
}

/**
* Returns true if the miner has been stuck in the same spot (radius 1.5 blocks) for more than 3 seconds
*/
public boolean isStuck() {
if (this.miner.getTarget() == null)
return false;

if (MeleeAttacking.isWithinMeleeAttackRange(this.miner, this.miner.getTarget()) && this.miner.getSensing().hasLineOfSight(this.miner.getTarget()))
return false;
if (this.lastPosition == null || this.miner.distanceToSqr(this.lastPosition) > 2.25d) {
this.lastPosition = this.miner.position();
this.lastPositionTickstamp = this.miner.tickCount;
}
return this.miner.getNavigation().isDone() || this.miner.tickCount - this.lastPositionTickstamp >= 60;
}

// Copy-paste of vanilla code
private int computeTickToBreak() {
int canHarvestBlock = this.canHarvestBlock() ? 30 : 100;
double diggingSpeed = this.getDigSpeed() / this.blockState.getDestroySpeed(this.miner.level(), this.targetBlocks.get(0)) / canHarvestBlock;
Expand All @@ -211,57 +249,69 @@ private int computeTickToBreak() {
private float getDigSpeed() {
float digSpeed = this.miner.getOffhandItem().getDestroySpeed(this.blockState);
if (digSpeed > 1.0F) {
int efficiencyLevel = EnchantmentHelper.getBlockEfficiency(this.miner);
ItemStack itemstack = this.miner.getOffhandItem();
if (efficiencyLevel > 0 && !itemstack.isEmpty()) {
digSpeed += (float)(efficiencyLevel * efficiencyLevel + 1);
}
int efficiency = EnchantmentHelper.getBlockEfficiency(this.miner);
if (efficiency > 0) digSpeed += (float) (efficiency * efficiency + 1);
}

if (MobEffectUtil.hasDigSpeed(this.miner)) {
digSpeed *= 1.0F + (float)(MobEffectUtil.getDigSpeedAmplification(this.miner) + 1) * 0.2F;
}

if (MobEffectUtil.hasDigSpeed(this.miner))
digSpeed *= 1.0F + (MobEffectUtil.getDigSpeedAmplification(this.miner) + 1) * 0.2F;
if (this.miner.hasEffect(MobEffects.DIG_SLOWDOWN)) {
//noinspection ConstantConditions
float miningFatigueAmplifier = switch (this.miner.getEffect(MobEffects.DIG_SLOWDOWN).getAmplifier()) {
float f = switch (this.miner.getEffect(MobEffects.DIG_SLOWDOWN).getAmplifier()) {
Copy link
Owner

@Insane96 Insane96 Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not keep the correct name?

case 0 -> 0.3F;
case 1 -> 0.09F;
case 2 -> 0.0027F;
default -> 8.1E-4F;
};

digSpeed *= miningFatigueAmplifier;
digSpeed *= f;
}

if (this.miner.isEyeInFluidType(ForgeMod.WATER_TYPE.get()) && !EnchantmentHelper.hasAquaAffinity(this.miner))
digSpeed /= 5.0F;

return digSpeed;
}

private boolean canBreakBlock() {
MinerMobs.ToolRequirement toolRequirement = MinerMobs.TOOL_REQUIREMENT.get(this.miner);
if (toolRequirement == MinerMobs.ToolRequirement.NONE || toolRequirement == MinerMobs.ToolRequirement.ANY_TOOL)
MinerMobs.ToolRequirement toolReq = MinerMobs.TOOL_REQUIREMENT.get(this.miner);
if (toolReq == MinerMobs.ToolRequirement.NONE || toolReq == MinerMobs.ToolRequirement.ANY_TOOL)
return true;
if ((toolRequirement == MinerMobs.ToolRequirement.CORRECT_TOOL_FOR_REQUIRED) && !this.blockState.requiresCorrectToolForDrops())
if (toolReq == MinerMobs.ToolRequirement.CORRECT_TOOL_FOR_REQUIRED && !this.blockState.requiresCorrectToolForDrops())
return true;

ItemStack stack = this.miner.getOffhandItem();
if (stack.isEmpty())
return false;

return stack.isCorrectToolForDrops(this.blockState);
return !stack.isEmpty() && stack.isCorrectToolForDrops(this.blockState);
}

private boolean canHarvestBlock() {
if (!this.blockState.requiresCorrectToolForDrops())
return true;

ItemStack stack = this.miner.getOffhandItem();
if (stack.isEmpty())
return !stack.isEmpty() && stack.isCorrectToolForDrops(this.blockState);
}

public boolean requiresUpdateEveryTick() { return true; }

private boolean isStuck() {
if (this.miner.getTarget() == null)
return false;
if (MeleeAttacking.isWithinMeleeAttackRange(this.miner, this.miner.getTarget())
&& this.miner.getSensing().hasLineOfSight(this.miner.getTarget()))
return false;
if (this.lastPosition == null || this.miner.distanceToSqr(this.lastPosition) > 2.25d) {
this.lastPosition = this.miner.position();
this.lastPositionTickstamp = this.miner.tickCount;
}
return this.miner.getNavigation().isDone() || this.miner.tickCount - this.lastPositionTickstamp >= 60;
}

private void freeSpaceForRespawn(ServerLevel level, BlockPos pos) {
BlockState existing = level.getBlockState(pos);

// If block is already air, nothing to do
if (existing.isAir()) return;

// Drop the block as an item
existing.spawnAfterBreak(level, pos, ItemStack.EMPTY, true);
level.removeBlock(pos, false);

return stack.isCorrectToolForDrops(this.blockState);
// Move any entities standing on the block slightly upward
level.getEntities(null, existing.getShape(level, pos).bounds().move(pos.getX(), pos.getY(), pos.getZ()))
.forEach(e -> e.setPos(e.getX(), e.getY() + 1.0, e.getZ()));
}
}
Loading