Ellpeck/PrettyPipes
1
0
Fork 0
mirror of https://github.com/Ellpeck/PrettyPipes.git synced 2024-11-22 19:58:35 +01:00
Code Issues Projects Releases Wiki Activity

fixed the pipe not dropping its cover on break

Browse source
This commit is contained in:
Ell 2020-10-20 16:09:38 +02:00
parent 27b3ddd869
commit c1100b02fe
3 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/de/ellpeck/prettypipes/items/WrenchItem.java
View file

@ -52,11 +52,7 @@ public class WrenchItem extends Item {
if (!world.isRemote) { if (!world.isRemote) {
if (tile.cover != null) { if (tile.cover != null) {
// remove the cover // remove the cover
List<ItemStack> drops = Block.getDrops(tile.cover, (ServerWorld) world, pos, null, player, player.getHeldItem(context.getHand())); tile.removeCover(player, context.getHand());
for (ItemStack drop : drops)
Block.spawnAsEntity(world, pos, drop);
tile.cover = null;
Utility.sendTileEntityToClients(tile); Utility.sendTileEntityToClients(tile);
} else { } else {
// remove the pipe // remove the pipe

19
src/main/java/de/ellpeck/prettypipes/pipe/PipeBlock.java
View file

@ -258,12 +258,6 @@ public class PipeBlock extends ContainerBlock {
@Override @Override
public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) { public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) {
if (state.getBlock() != newState.getBlock()) { if (state.getBlock() != newState.getBlock()) {
PipeTileEntity tile = Utility.getTileEntity(PipeTileEntity.class, worldIn, pos);
if (tile != null) {
Utility.dropInventory(tile, tile.modules);
for (IPipeItem item : tile.getItems())
item.drop(worldIn, item.getContent());
}
PipeNetwork network = PipeNetwork.get(worldIn); PipeNetwork network = PipeNetwork.get(worldIn);
network.removeNode(pos); network.removeNode(pos);
network.onPipeChanged(pos, state); network.onPipeChanged(pos, state);
@ -271,6 +265,19 @@ public class PipeBlock extends ContainerBlock {
} }
} }
@Override
public void onBlockHarvested(World worldIn, BlockPos pos, BlockState state, PlayerEntity player) {
PipeTileEntity tile = Utility.getTileEntity(PipeTileEntity.class, worldIn, pos);
if (tile != null) {
Utility.dropInventory(tile, tile.modules);
for (IPipeItem item : tile.getItems())
item.drop(worldIn, item.getContent());
if (tile.cover != null)
tile.removeCover(player, Hand.MAIN_HAND);
}
super.onBlockHarvested(worldIn, pos, state, player);
}
@Override @Override
public boolean hasComparatorInputOverride(BlockState state) { public boolean hasComparatorInputOverride(BlockState state) {
return true; return true;

12
src/main/java/de/ellpeck/prettypipes/pipe/PipeTileEntity.java
View file

@ -9,6 +9,7 @@ import de.ellpeck.prettypipes.network.PipeItem;
import de.ellpeck.prettypipes.network.PipeNetwork; import de.ellpeck.prettypipes.network.PipeNetwork;
import de.ellpeck.prettypipes.pipe.containers.MainPipeContainer; import de.ellpeck.prettypipes.pipe.containers.MainPipeContainer;
import de.ellpeck.prettypipes.pressurizer.PressurizerTileEntity; import de.ellpeck.prettypipes.pressurizer.PressurizerTileEntity;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.player.PlayerInventory;
@ -26,10 +27,12 @@ import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType; import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction; import net.minecraft.util.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.util.text.TranslationTextComponent;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.Capability;
@ -351,6 +354,15 @@ public class PipeTileEntity extends TileEntity implements INamedContainerProvide
return builder.build(); return builder.build();
} }
public void removeCover(PlayerEntity player, Hand hand) {
if (this.world.isRemote)
return;
List<ItemStack> drops = Block.getDrops(this.cover, (ServerWorld) this.world, this.pos, null, player, player.getHeldItem(hand));
for (ItemStack drop : drops)
Block.spawnAsEntity(this.world, this.pos, drop);
this.cover = null;
}
@Override @Override
public void remove() { public void remove() {
super.remove(); super.remove();