Skip to content

Block Breaker without FakePlayer #41

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

Open
EternalQ wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Block Breaker without FakePlayer #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5e7710
fix: remove unneccesary event on break
EternalQ Mar 3, 2026
74be30c
Merge branch 'master' of github.com:GTNewHorizons/OpenBlocks
EternalQ Mar 3, 2026
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
36 changes: 23 additions & 13 deletions src/main/java/openblocks/common/tileentity/TileEntityBlockBreaker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package openblocks.common.tileentity;

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

import net.minecraft.block.Block;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.init.Blocks;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
Expand All @@ -15,8 +15,6 @@
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import openmods.api.INeighbourAwareTile;
import openmods.fakeplayer.BreakBlockAction;
import openmods.fakeplayer.FakePlayerPool;
import openmods.include.IncludeInterface;
import openmods.inventory.GenericInventory;
import openmods.inventory.legacy.ItemDistribution;
Expand Down Expand Up @@ -125,21 +123,33 @@ public void breakBlock() {
final Block block = worldObj.getBlock(x, y, z);
if (!canBreakBlock(block, x, y, z)) return;

final List<EntityItem> drops = FakePlayerPool.instance
.executeOnPlayer((WorldServer) worldObj, new BreakBlockAction(worldObj, x, y, z));
tryInjectItems(drops, direction.getOpposite());
final List<ItemStack> drops = getBlockDrops(x, y, z);
if (tryStore(drops, direction.getOpposite())) worldObj.setBlock(x, y, z, Blocks.air, 0, 3);;
}

private void tryInjectItems(List<EntityItem> drops, ForgeDirection direction) {
TileEntity targetInventory = getTileInDirection(direction);
if (targetInventory == null) return;
public List<ItemStack> getBlockDrops(final int x, final int y, final int z) {
List<ItemStack> out = new ArrayList<>();
final Block which = worldObj.getBlock(x, y, z);

if (which != null) {
out = which.getDrops(worldObj, x, y, z, worldObj.getBlockMetadata(x, y, z), 0);
}

for (EntityItem drop : drops) {
ItemStack stack = drop.getEntityItem();
ItemDistribution.insertItemInto(stack, targetInventory, direction, true);
if (out == null) {
return new ArrayList<>();
}
return out;
}

private boolean tryStore(List<ItemStack> drops, ForgeDirection direction) {
TileEntity targetInventory = getTileInDirection(direction);
if (targetInventory == null) return false;

if (stack.stackSize <= 0) drop.setDead();
boolean anyInserted = false;
for (ItemStack stack : drops) {
anyInserted |= ItemDistribution.insertItemInto(stack, targetInventory, direction, true);
}
return anyInserted;
}

@Override
Expand Down