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

Just use mod id as top level item tag container.

Browse Source
This commit is contained in:
Florian Nücke
2020-12-19 12:14:04 +01:00
parent 6379bf9f62
commit fd926531a7
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/li/cil/oc2/Constants.java
View File

@@ -1,7 +1,5 @@
package li.cil.oc2;
import li.cil.oc2.api.API;
public final class Constants {
public static final int KILOBYTE = 1024;
public static final int MEGABYTE = 1024 * KILOBYTE;
@@ -24,7 +22,6 @@ public final class Constants {
///////////////////////////////////////////////////////////////////
public static final String HDD_INFO_NBT_TAG_NAME = API.MOD_ID + "hdd";
public static final String HDD_SIZE_NBT_TAG_NAME = "size";
public static final String HDD_BASE_NBT_TAG_NAME = "base";
public static final String HDD_READONLY_NBT_TAG_NAME = "readonly";

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

@@ -3,6 +3,7 @@ package li.cil.oc2.common.block.entity;
import it.unimi.dsi.fastutil.bytes.ByteArrayFIFOQueue;
import li.cil.ceres.api.Serialized;
import li.cil.oc2.Constants;
import li.cil.oc2.api.API;
import li.cil.oc2.api.bus.DeviceBusElement;
import li.cil.oc2.api.bus.device.Device;
import li.cil.oc2.api.bus.device.vm.VMContext;
@@ -129,7 +130,7 @@ public final class ComputerTileEntity extends AbstractTileEntity implements ITic
final ItemStack hdd = new ItemStack(Items.HDD_ITEM.get());
final CompoundNBT hddInfo = new CompoundNBT();
hddInfo.putString(Constants.HDD_BASE_NBT_TAG_NAME, "linux");
hdd.setTagInfo(Constants.HDD_INFO_NBT_TAG_NAME, hddInfo);
hdd.setTagInfo(API.MOD_ID, hddInfo);
itemHandler.setStackInSlot(4, hdd);
}

3
src/main/java/li/cil/oc2/common/bus/device/provider/HardDriveItemDeviceProvider.java
View File

@@ -2,6 +2,7 @@ package li.cil.oc2.common.bus.device.provider;
import li.cil.oc2.Config;
import li.cil.oc2.Constants;
import li.cil.oc2.api.API;
import li.cil.oc2.api.bus.device.Device;
import li.cil.oc2.api.bus.device.provider.ItemDeviceQuery;
import li.cil.oc2.common.bus.device.HardDiskDriveDevice;
@@ -36,7 +37,7 @@ public final class HardDriveItemDeviceProvider extends AbstractItemDeviceProvide
protected LazyOptional<Device> getItemDevice(final ItemDeviceQuery query) {
final ItemStack stack = query.getItemStack();
final CompoundNBT info = stack.getChildTag(Constants.HDD_INFO_NBT_TAG_NAME);
final CompoundNBT info = stack.getChildTag(API.MOD_ID);
if (info == null) {
return LazyOptional.empty();
}