dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #724

Browse Source
This commit is contained in:
raoulvdberge
2016-12-26 02:19:22 +01:00
parent 62305ca533
commit 800bbb814b
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java
View File

@@ -23,6 +23,7 @@ import net.minecraft.dispenser.PositionImpl;
import net.minecraft.entity.item.EntityFireworkRocket; import net.minecraft.entity.item.EntityFireworkRocket;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTUtil; import net.minecraft.nbt.NBTUtil;
@@ -122,6 +123,10 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
state = Blocks.FLOWING_LAVA.getDefaultState(); state = Blocks.FLOWING_LAVA.getDefaultState();
} }
if (!canPlace(front, state)) {
return;
}
holder.world().setBlockState(front, state, 1 | 2); holder.world().setBlockState(front, state, 1 | 2);
} }
} }
@@ -130,6 +135,12 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
} }
} }
private boolean canPlace(BlockPos pos, IBlockState state) {
BlockEvent.PlaceEvent e = new BlockEvent.PlaceEvent(new BlockSnapshot(holder.world(), pos, state), holder.world().getBlockState(holder.pos()), FakePlayerFactory.getMinecraft((WorldServer) holder.world()), null);
return !MinecraftForge.EVENT_BUS.post(e);
}
private void placeBlock() { private void placeBlock() {
BlockPos front = holder.pos().offset(holder.getDirection()); BlockPos front = holder.pos().offset(holder.getDirection());
@@ -140,15 +151,29 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
IBlockState state = block.getBlock().getStateFromMeta(took.getMetadata()); IBlockState state = block.getBlock().getStateFromMeta(took.getMetadata());
BlockEvent.PlaceEvent e = new BlockEvent.PlaceEvent(new BlockSnapshot(holder.world(), front, state), holder.world().getBlockState(holder.pos()), FakePlayerFactory.getMinecraft((WorldServer) holder.world()), null); if (!canPlace(front, state)) {
if (MinecraftForge.EVENT_BUS.post(e)) {
return; return;
} }
network.extractItem(itemFilters.getStackInSlot(0), 1, compare, false); network.extractItem(itemFilters.getStackInSlot(0), 1, compare, false);
holder.world().setBlockState(front, state, 1 | 2); if (item.getItem() instanceof ItemBlock) {
((ItemBlock) item.getItem()).placeBlockAt(
took,
FakePlayerFactory.getMinecraft((WorldServer) holder.world()),
holder.world(),
front,
holder.getDirection(),
0,
0,
0,
state
);
} else {
holder.world().setBlockState(front, state, 1 | 2);
state.getBlock().onBlockPlacedBy(holder.world(), front, state, FakePlayerFactory.getMinecraft((WorldServer) holder.world()), took);
}
// From ItemBlock#onItemUse // From ItemBlock#onItemUse
SoundType blockSound = block.getBlock().getSoundType(state, holder.world(), holder.pos(), null); SoundType blockSound = block.getBlock().getSoundType(state, holder.world(), holder.pos(), null);