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

Disk drive drops

Browse Source
This commit is contained in:
raoulvdberge
2019-10-03 22:16:09 +02:00
parent 595f86edd8
commit 6845a45f7f
5 changed files with 65 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/raoulvdberge/refinedstorage/RS.java
View File

@@ -67,6 +67,7 @@ public final class RS {
FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(Item.class, this::onRegisterItems);
FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(IRecipeSerializer.class, this::onRegisterRecipeSerializers);
FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(ContainerType.class, this::onRegisterContainers);
}
@SubscribeEvent

22
src/main/java/com/raoulvdberge/refinedstorage/block/DiskDriveBlock.java
View File

@@ -21,8 +21,6 @@ import net.minecraftforge.fml.network.NetworkHooks;
import javax.annotation.Nullable;
public class DiskDriveBlock extends NodeBlock {
// TODO public static final PropertyObject<Integer[]> DISK_STATE = new PropertyObject<>("disk_state", Integer[].class);
public DiskDriveBlock() {
super(BlockUtils.DEFAULT_ROCK_PROPERTIES);
@@ -63,27 +61,9 @@ public class DiskDriveBlock extends NodeBlock {
return true;
}
/* TODO
/* TODO
@Override
public boolean onBlockActivated(World world, BlockPos pos, BlockState state, PlayerEntity player, EnumHand hand, Direction side, float hitX, float hitY, float hitZ) {
return openNetworkGui(RSGui.DISK_DRIVE, player, world, pos, side);
}
@Override
protected BlockStateContainer.Builder createBlockStateBuilder() {
return super.createBlockStateBuilder().add(DISK_STATE);
}
@Override
public BlockState getExtendedState(BlockState state, IBlockAccess world, BlockPos pos) {
BlockState s = super.getExtendedState(state, world, pos);
TileEntity tile = world.getTileEntity(pos);
if (tile instanceof TileDiskDrive) {
s = ((IExtendedBlockState) s).withProperty(DISK_STATE, ((TileDiskDrive) tile).getDiskState());
}
return s;
}*/
}

30
src/main/java/com/raoulvdberge/refinedstorage/block/NodeBlock.java
View File

@@ -4,13 +4,20 @@ import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeManager;
import com.raoulvdberge.refinedstorage.api.util.Action;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.tile.NetworkNodeTile;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.inventory.InventoryHelper;
import net.minecraft.item.ItemStack;
import net.minecraft.state.BooleanProperty;
import net.minecraft.state.StateContainer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorld;
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.items.IItemHandler;
public abstract class NodeBlock extends BaseBlock {
public static final BooleanProperty CONNECTED = BooleanProperty.create("connected");
@@ -37,6 +44,29 @@ public abstract class NodeBlock extends BaseBlock {
}
}
@Override
public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) {
if (state.getBlock() != newState.getBlock()) {
TileEntity tile = worldIn.getTileEntity(pos);
if (tile instanceof NetworkNodeTile) {
IItemHandler handler = ((NetworkNodeTile) tile).getNode().getDrops();
if (handler != null) {
NonNullList<ItemStack> drops = NonNullList.create();
for (int i = 0; i < handler.getSlots(); ++i) {
drops.add(handler.getStackInSlot(i));
}
InventoryHelper.dropItems(worldIn, pos, drops);
}
}
super.onReplaced(state, worldIn, pos, newState, isMoving);
}
}
@Override
protected void fillStateContainer(StateContainer.Builder<Block, BlockState> builder) {
super.fillStateContainer(builder);

25
src/main/java/com/raoulvdberge/refinedstorage/tile/DiskDriveTile.java
View File

@@ -11,14 +11,20 @@ import com.raoulvdberge.refinedstorage.util.WorldUtils;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.IntNBT;
import net.minecraft.nbt.ListNBT;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelDataMap;
import net.minecraftforge.client.model.data.ModelProperty;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.util.Constants;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.Arrays;
public class DiskDriveTile extends NetworkNodeTile<DiskDriveNetworkNode> {
@@ -73,6 +79,8 @@ public class DiskDriveTile extends NetworkNodeTile<DiskDriveNetworkNode> {
private static final String NBT_DISK_STATE = "DiskStates";
public static final ModelProperty<DiskDriveNetworkNode.DiskState[]> DISK_STATE_PROPERTY = new ModelProperty<>();
private LazyOptional<IItemHandler> diskCapability = LazyOptional.of(() -> getNode().getDisks());
private DiskDriveNetworkNode.DiskState[] diskState = new DiskDriveNetworkNode.DiskState[8];
public DiskDriveTile() {
@@ -125,20 +133,15 @@ public class DiskDriveTile extends NetworkNodeTile<DiskDriveNetworkNode> {
return new ModelDataMap.Builder().withInitial(DISK_STATE_PROPERTY, diskState).build();
}
/* TODO
@Nonnull
@Override
public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable Direction facing) {
return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing);
}
@Override
public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable Direction facing) {
if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(getNode().getDisks());
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction direction) {
if (cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
return diskCapability.cast();
}
return super.getCapability(capability, facing);
}*/
return super.getCapability(cap, direction);
}
@Override
@Nonnull

19
src/main/resources/data/refinedstorage/loot_tables/blocks/disk_drive.json Normal file
View File

@@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "refinedstorage:disk_drive"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}