Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working towards item based devices.

Browse Source
This commit is contained in:
Florian Nücke
2020-12-14 16:30:54 +01:00
parent 5fa043e8f5
commit bafef4c939
6 changed files with 105 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/li/cil/oc2/api/bus/device/provider/DeviceProvider.java
View File

@@ -9,11 +9,6 @@ import net.minecraftforge.common.util.LazyOptional;
* Allows querying for devices given some context.
* <p>
* See the specializations of {@link DeviceQuery} for possible queries.
* <p>
* Returning a devices does <em>not</em> transfer ownership of the device in terms
* of responsibility for persistence. Callers of this method will <em>not</em> attempt
* to persist objects returned by this method. It is the responsibility of the provider
* to ensure persistence where required.
* <ul>
* <li>Implementations <em>may</em> handle multiple query types and return various device
* types depending on the query.</li>

4
src/main/java/li/cil/oc2/api/bus/device/provider/ItemDeviceQuery.java Normal file
View File

@@ -0,0 +1,4 @@
package li.cil.oc2.api.bus.device.provider;
public interface ItemDeviceQuery extends DeviceQuery {
}

23
src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java
View File

@@ -10,6 +10,7 @@ import li.cil.oc2.common.block.ComputerBlock;
import li.cil.oc2.common.bus.AbstractDeviceBusController;
import li.cil.oc2.common.bus.TileEntityDeviceBusElement;
import li.cil.oc2.common.capabilities.Capabilities;
import li.cil.oc2.common.container.DeviceItemStackHandler;
import li.cil.oc2.common.network.Network;
import li.cil.oc2.common.network.message.ComputerBusStateMessage;
import li.cil.oc2.common.network.message.ComputerRunStateMessage;
@@ -42,7 +43,6 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.items.ItemStackHandler;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
@@ -51,8 +51,7 @@ import javax.annotation.Nullable;
import java.io.BufferedInputStream;
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.util.Set;
import java.util.UUID;
import java.util.*;
import static java.util.Objects.requireNonNull;
@@ -69,6 +68,7 @@ public final class ComputerTileEntity extends AbstractTileEntity implements ITic
private static final String VFS_NBT_TAG_NAME = "vfs";
private static final String RUNNER_NBT_TAG_NAME = "runner";
private static final String RUN_STATE_NBT_TAG_NAME = "runState";
private static final String ITEMS_NBT_TAG_NAME = "items";
private static final int DEVICE_LOAD_RETRY_INTERVAL = 10 * 20; // In ticks.
@@ -100,7 +100,7 @@ public final class ComputerTileEntity extends AbstractTileEntity implements ITic
private PhysicalMemory ram;
private UUID ramBlobHandle;
private final ItemStackHandler itemHandler = new ItemStackHandler();
private final DeviceItemStackHandler itemHandler = new DeviceItemStackHandler(4);
///////////////////////////////////////////////////////////////////
@@ -287,6 +287,8 @@ public final class ComputerTileEntity extends AbstractTileEntity implements ITic
NBTUtils.putEnum(compound, RUN_STATE_NBT_TAG_NAME, runState);
}
compound.put(ITEMS_NBT_TAG_NAME, itemHandler.serializeNBT());
final ListNBT devicesNbt = new ListNBT();
writeDevices(devicesNbt);
compound.put(DEVICES_NBT_TAG_NAME, devicesNbt);
@@ -331,7 +333,9 @@ public final class ComputerTileEntity extends AbstractTileEntity implements ITic
}
}
// TODO Read item NBTs, generate item based devices.
if (compound.contains(ITEMS_NBT_TAG_NAME, NBTTagIds.TAG_COMPOUND)) {
itemHandler.deserializeNBT(compound.getCompound(ITEMS_NBT_TAG_NAME));
}
if (compound.contains(DEVICES_NBT_TAG_NAME, NBTTagIds.TAG_LIST)) {
readDevices(compound.getList(DEVICES_NBT_TAG_NAME, NBTTagIds.TAG_COMPOUND));
@@ -509,6 +513,15 @@ public final class ComputerTileEntity extends AbstractTileEntity implements ITic
super(ComputerTileEntity.this);
}
@Override
public Optional<Collection<LazyOptional<DeviceBusElement>>> getNeighbors() {
return super.getNeighbors().map(neighbors -> {
final ArrayList<LazyOptional<DeviceBusElement>> list = new ArrayList<>(neighbors);
list.add(LazyOptional.of(itemHandler::getBusElement));
return list;
});
}
@Override
protected boolean canConnectToSide(final Direction direction) {
return getBlockState().get(ComputerBlock.HORIZONTAL_FACING) != direction;

33
src/main/java/li/cil/oc2/common/bus/ItemHandlerDeviceBusElement.java Normal file
View File

@@ -0,0 +1,33 @@
package li.cil.oc2.common.bus;
import li.cil.oc2.api.bus.device.Device;
import li.cil.oc2.common.bus.device.provider.Providers;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.items.ItemStackHandler;
import java.util.HashSet;
public class ItemHandlerDeviceBusElement extends AbstractGroupingDeviceBusElement {
private final ItemStackHandler handler;
///////////////////////////////////////////////////////////////////
public ItemHandlerDeviceBusElement(final ItemStackHandler handler) {
super(handler.getSlots());
this.handler = handler;
}
public void handleSlotChanged(final int slot) {
final HashSet<Device> newDevices = new HashSet<>();
final ItemStack stack = handler.getStackInSlot(slot);
if (!stack.isEmpty()) {
for (final LazyOptional<Device> device : Providers.getDevices(stack)) {
device.ifPresent(newDevices::add);
device.addListener(unused -> handleSlotChanged(slot));
}
}
setDevicesForGroup(slot, newDevices);
}
}

14
src/main/java/li/cil/oc2/common/bus/device/provider/Providers.java
View File

@@ -4,8 +4,10 @@ import li.cil.oc2.api.bus.device.Device;
import li.cil.oc2.api.bus.device.provider.BlockDeviceQuery;
import li.cil.oc2.api.bus.device.provider.DeviceProvider;
import li.cil.oc2.api.bus.device.provider.DeviceQuery;
import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery;
import li.cil.oc2.common.bus.device.provider.util.BlockDeviceProvider;
import li.cil.oc2.common.bus.device.provider.util.TileEntityDeviceProvider;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
@@ -48,6 +50,10 @@ public final class Providers {
return getDevices(new BlockQuery(world, pos, side));
}
public static List<LazyOptional<Device>> getDevices(final ItemStack stack) {
return getDevices(new ItemQuery(stack));
}
public static List<LazyOptional<Device>> getDevices(final DeviceQuery query) {
final ArrayList<LazyOptional<Device>> devices = new ArrayList<>();
for (final DeviceProvider provider : DEVICE_PROVIDERS) {
@@ -88,4 +94,12 @@ public final class Providers {
return side;
}
}
private static final class ItemQuery implements ItemDeviceQuery {
private final ItemStack stack;
public ItemQuery(final ItemStack stack) {
this.stack = stack;
}
}
}

69
src/main/java/li/cil/oc2/common/container/DeviceItemStackHandler.java
View File

@@ -1,21 +1,22 @@
package li.cil.oc2.common.container;
import li.cil.oc2.api.bus.Device;
import li.cil.oc2.common.bus.device.provider.Providers;
import li.cil.oc2.api.bus.DeviceBusElement;
import li.cil.oc2.common.bus.ItemHandlerDeviceBusElement;
import li.cil.oc2.common.util.NBTTagIds;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.NonNullList;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.items.ItemStackHandler;
import org.jetbrains.annotations.NotNull;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
public class DeviceItemStackHandler extends ItemStackHandler {
private final HashSet<Device> devices = new HashSet<>();
private final UUID[] deviceIds;
private static final String BUS_ELEMENT_NBT_TAG_NAME = "busElement";
///////////////////////////////////////////////////////////////////
private final ItemHandlerDeviceBusElement busElement;
///////////////////////////////////////////////////////////////////
public DeviceItemStackHandler(final int size) {
this(NonNullList.withSize(size, ItemStack.EMPTY));
@@ -23,9 +24,26 @@ public class DeviceItemStackHandler extends ItemStackHandler {
public DeviceItemStackHandler(final NonNullList<ItemStack> stacks) {
super(stacks);
deviceIds = new UUID[stacks.size()];
for (int i = 0; i < deviceIds.length; i++) {
deviceIds[i] = UUID.randomUUID();
this.busElement = new ItemHandlerDeviceBusElement(this);
}
public DeviceBusElement getBusElement() {
return busElement;
}
@Override
public CompoundNBT serializeNBT() {
final CompoundNBT nbt = super.serializeNBT();
nbt.put(BUS_ELEMENT_NBT_TAG_NAME, busElement.serializeNBT());
return nbt;
}
@Override
public void deserializeNBT(final CompoundNBT nbt) {
super.deserializeNBT(nbt);
busElement.deserializeNBT(nbt.getList(BUS_ELEMENT_NBT_TAG_NAME, NBTTagIds.TAG_COMPOUND));
for (int i = 0; i < getSlots(); i++) {
busElement.handleSlotChanged(i);
}
}
@@ -39,26 +57,11 @@ public class DeviceItemStackHandler extends ItemStackHandler {
return 1;
}
///////////////////////////////////////////////////////////////////
@Override
protected void onLoad() {
super.onLoad();
final HashSet<Device> newDevices = new HashSet<>();
for (int i = 0; i < getSlots(); i++) {
final ItemStack stack = getStackInSlot(i);
if (stack.isEmpty()) {
continue;
}
// final List<LazyOptional<Device>> devices = Providers.getDevices(stack);
}
}
protected void onDevicesAdded(final Set<Device> devices) {
}
protected void onDevicesRemoved(final Set<Device> devices) {
protected void onContentsChanged(final int slot) {
super.onContentsChanged(slot);
busElement.handleSlotChanged(slot);
}
}