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

Move out all remaining stuff from utils to classes

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-07-19 05:13:07 +02:00
parent 77c1a2dbd0
commit 8743aaa214
22 changed files with 199 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
src/main/java/refinedstorage/RefinedStorageUtils.java
View File

@@ -1,151 +0,0 @@
package refinedstorage;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagIntArray;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraftforge.common.util.Constants;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.InvWrapper;
import net.minecraftforge.items.wrapper.SidedInvWrapper;
public final class RefinedStorageUtils {
private static final String NBT_INVENTORY = "Inventory_%d";
private static final String NBT_SLOT = "Slot";
public static void writeItems(IItemHandler handler, int id, NBTTagCompound nbt) {
NBTTagList tagList = new NBTTagList();
for (int i = 0; i < handler.getSlots(); i++) {
if (handler.getStackInSlot(i) != null) {
NBTTagCompound compoundTag = new NBTTagCompound();
compoundTag.setInteger(NBT_SLOT, i);
handler.getStackInSlot(i).writeToNBT(compoundTag);
tagList.appendTag(compoundTag);
}
}
nbt.setTag(String.format(NBT_INVENTORY, id), tagList);
}
public static void readItems(IItemHandler handler, int id, NBTTagCompound nbt) {
String name = String.format(NBT_INVENTORY, id);
if (nbt.hasKey(name)) {
NBTTagList tagList = nbt.getTagList(name, Constants.NBT.TAG_COMPOUND);
for (int i = 0; i < tagList.tagCount(); i++) {
int slot = tagList.getCompoundTagAt(i).getInteger(NBT_SLOT);
ItemStack stack = ItemStack.loadItemStackFromNBT(tagList.getCompoundTagAt(i));
handler.insertItem(slot, stack, false);
}
}
}
public static void writeItemsLegacy(IInventory inventory, int id, NBTTagCompound nbt) {
NBTTagList tagList = new NBTTagList();
for (int i = 0; i < inventory.getSizeInventory(); i++) {
if (inventory.getStackInSlot(i) != null) {
NBTTagCompound compoundTag = new NBTTagCompound();
compoundTag.setInteger(NBT_SLOT, i);
inventory.getStackInSlot(i).writeToNBT(compoundTag);
tagList.appendTag(compoundTag);
}
}
nbt.setTag(String.format(NBT_INVENTORY, id), tagList);
}
public static void readItemsLegacy(IInventory inventory, int id, NBTTagCompound nbt) {
String name = String.format(NBT_INVENTORY, id);
if (nbt.hasKey(name)) {
NBTTagList tagList = nbt.getTagList(name, Constants.NBT.TAG_COMPOUND);
for (int i = 0; i < tagList.tagCount(); i++) {
int slot = tagList.getCompoundTagAt(i).getInteger(NBT_SLOT);
ItemStack stack = ItemStack.loadItemStackFromNBT(tagList.getCompoundTagAt(i));
inventory.setInventorySlotContents(slot, stack);
}
}
}
public static void writeBooleanArray(NBTTagCompound tag, String name, boolean[] array) {
int[] intArray = new int[array.length];
for (int i = 0; i < intArray.length; ++i) {
intArray[i] = array[i] ? 1 : 0;
}
tag.setTag(name, new NBTTagIntArray(intArray));
}
public static boolean[] readBooleanArray(NBTTagCompound tag, String name) {
int[] intArray = tag.getIntArray(name);
boolean array[] = new boolean[intArray.length];
for (int i = 0; i < intArray.length; ++i) {
array[i] = intArray[i] == 1 ? true : false;
}
return array;
}
public static EnumHand getHandById(int id) {
switch (id) {
case 0:
return EnumHand.MAIN_HAND;
case 1:
return EnumHand.OFF_HAND;
default:
return EnumHand.MAIN_HAND;
}
}
public static int getIdFromHand(EnumHand hand) {
switch (hand) {
case MAIN_HAND:
return 0;
case OFF_HAND:
return 1;
default:
return 0;
}
}
public static IItemHandler getItemHandler(TileEntity tile, EnumFacing side) {
if (tile == null) {
return null;
}
IItemHandler handler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side);
if (handler == null) {
if (side != null && tile instanceof ISidedInventory) {
handler = new SidedInvWrapper((ISidedInventory) tile, side);
} else if (tile instanceof IInventory) {
handler = new InvWrapper((IInventory) tile);
}
}
return handler;
}
}

36
src/main/java/refinedstorage/apiimpl/autocrafting/BasicCraftingTask.java
View File

@@ -2,10 +2,10 @@ package refinedstorage.apiimpl.autocrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagIntArray;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.world.World;
import net.minecraftforge.common.util.Constants;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.api.autocrafting.ICraftingPattern;
import refinedstorage.api.autocrafting.ICraftingTask;
import refinedstorage.api.network.INetworkMaster;
@@ -38,9 +38,9 @@ public class BasicCraftingTask implements ICraftingTask {
public BasicCraftingTask(NBTTagCompound tag, ICraftingPattern pattern) {
this.pattern = pattern;
this.satisfied = RefinedStorageUtils.readBooleanArray(tag, NBT_SATISFIED);
this.checked = RefinedStorageUtils.readBooleanArray(tag, NBT_CHECKED);
this.childTasks = RefinedStorageUtils.readBooleanArray(tag, NBT_CHILD_TASKS);
this.satisfied = readBooleanArray(tag, NBT_SATISFIED);
this.checked = readBooleanArray(tag, NBT_CHECKED);
this.childTasks = readBooleanArray(tag, NBT_CHILD_TASKS);
NBTTagList tookList = tag.getTagList(NBT_TOOK, Constants.NBT.TAG_COMPOUND);
@@ -121,9 +121,9 @@ public class BasicCraftingTask implements ICraftingTask {
pattern.writeToNBT(patternTag);
tag.setTag(CraftingPattern.NBT, patternTag);
RefinedStorageUtils.writeBooleanArray(tag, NBT_SATISFIED, satisfied);
RefinedStorageUtils.writeBooleanArray(tag, NBT_CHECKED, checked);
RefinedStorageUtils.writeBooleanArray(tag, NBT_CHILD_TASKS, childTasks);
writeBooleanArray(tag, NBT_SATISFIED, satisfied);
writeBooleanArray(tag, NBT_CHECKED, checked);
writeBooleanArray(tag, NBT_CHILD_TASKS, childTasks);
NBTTagList tookList = new NBTTagList();
@@ -178,4 +178,26 @@ public class BasicCraftingTask implements ICraftingTask {
return builder.toString();
}
public static void writeBooleanArray(NBTTagCompound tag, String name, boolean[] array) {
int[] intArray = new int[array.length];
for (int i = 0; i < intArray.length; ++i) {
intArray[i] = array[i] ? 1 : 0;
}
tag.setTag(name, new NBTTagIntArray(intArray));
}
public static boolean[] readBooleanArray(NBTTagCompound tag, String name) {
int[] intArray = tag.getIntArray(name);
boolean array[] = new boolean[intArray.length];
for (int i = 0; i < intArray.length; ++i) {
array[i] = intArray[i] == 1 ? true : false;
}
return array;
}
}

13
src/main/java/refinedstorage/apiimpl/autocrafting/ProcessingCraftingTask.java
View File

@@ -4,7 +4,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.api.autocrafting.ICraftingPattern;
import refinedstorage.api.autocrafting.ICraftingPatternContainer;
import refinedstorage.api.autocrafting.ICraftingTask;
@@ -34,9 +33,9 @@ public class ProcessingCraftingTask implements ICraftingTask {
public ProcessingCraftingTask(NBTTagCompound tag, ICraftingPattern pattern) {
this.pattern = pattern;
this.inserted = RefinedStorageUtils.readBooleanArray(tag, NBT_INSERTED);
this.childTasks = RefinedStorageUtils.readBooleanArray(tag, NBT_CHILD_TASKS);
this.satisfied = RefinedStorageUtils.readBooleanArray(tag, NBT_SATISFIED);
this.inserted = BasicCraftingTask.readBooleanArray(tag, NBT_INSERTED);
this.childTasks = BasicCraftingTask.readBooleanArray(tag, NBT_CHILD_TASKS);
this.satisfied = BasicCraftingTask.readBooleanArray(tag, NBT_SATISFIED);
}
@Override
@@ -120,9 +119,9 @@ public class ProcessingCraftingTask implements ICraftingTask {
pattern.writeToNBT(patternTag);
tag.setTag(CraftingPattern.NBT, patternTag);
RefinedStorageUtils.writeBooleanArray(tag, NBT_INSERTED, inserted);
RefinedStorageUtils.writeBooleanArray(tag, NBT_CHILD_TASKS, childTasks);
RefinedStorageUtils.writeBooleanArray(tag, NBT_SATISFIED, satisfied);
BasicCraftingTask.writeBooleanArray(tag, NBT_INSERTED, inserted);
BasicCraftingTask.writeBooleanArray(tag, NBT_CHILD_TASKS, childTasks);
BasicCraftingTask.writeBooleanArray(tag, NBT_SATISFIED, satisfied);
tag.setInteger("Type", ID);
}

3
src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java
View File

@@ -7,7 +7,6 @@ import net.minecraft.util.EnumHand;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageGui;
import refinedstorage.RefinedStorageItems;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.api.network.*;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.item.ItemWirelessGrid;
@@ -73,7 +72,7 @@ public class WirelessGridHandler implements IWirelessGridHandler {
consumers.add(new WirelessGridConsumer(player, hand, player.getHeldItem(hand)));
player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_GRID, player.worldObj, RefinedStorageUtils.getIdFromHand(hand), 0, 0);
player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_GRID, player.worldObj, hand.ordinal(), 0, 0);
network.sendStorageToClient((EntityPlayerMP) player);

4
src/main/java/refinedstorage/gui/GuiHandler.java
View File

@@ -3,11 +3,11 @@ package refinedstorage.gui;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.network.IGuiHandler;
import refinedstorage.RefinedStorageGui;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.container.*;
import refinedstorage.tile.*;
import refinedstorage.tile.controller.TileController;
@@ -64,7 +64,7 @@ public class GuiHandler implements IGuiHandler {
}
private WirelessGrid getWirelessGrid(EntityPlayer player, int hand) {
return new WirelessGrid(player.worldObj, player.getHeldItem(RefinedStorageUtils.getHandById(hand)), RefinedStorageUtils.getHandById(hand));
return new WirelessGrid(player.worldObj, player.getHeldItem(EnumHand.values()[hand]), EnumHand.values()[hand]);
}
private ContainerGrid getWirelessGridContainer(EntityPlayer player, int hand) {

4
src/main/java/refinedstorage/network/MessageWirelessGridSettingsUpdate.java
View File

@@ -3,9 +3,9 @@ package refinedstorage.network;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumHand;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import refinedstorage.RefinedStorageItems;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.tile.grid.TileGrid;
public class MessageWirelessGridSettingsUpdate extends MessageHandlerPlayerToServer<MessageWirelessGridSettingsUpdate> implements IMessage {
@@ -46,7 +46,7 @@ public class MessageWirelessGridSettingsUpdate extends MessageHandlerPlayerToSer
@Override
public void handle(MessageWirelessGridSettingsUpdate message, EntityPlayerMP player) {
ItemStack held = player.getHeldItem(RefinedStorageUtils.getHandById(message.hand));
ItemStack held = player.getHeldItem((message.hand < 0 || message.hand > EnumHand.values().length - 1) ? EnumHand.MAIN_HAND : EnumHand.values()[message.hand]);
if (held != null && held.getItem() == RefinedStorageItems.WIRELESS_GRID && held.getTagCompound() != null) {
if (TileGrid.isValidViewType(message.viewType)) {

97
src/main/java/refinedstorage/tile/TileBase.java
View File

@@ -3,7 +3,11 @@ package refinedstorage.tile;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
@@ -11,7 +15,11 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.ITickable;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.util.Constants;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.InvWrapper;
import net.minecraftforge.items.wrapper.SidedInvWrapper;
import refinedstorage.RefinedStorage;
import refinedstorage.network.MessageTileContainerUpdate;
@@ -20,6 +28,9 @@ import javax.annotation.Nullable;
public abstract class TileBase extends TileEntity implements ITickable {
private static final String NBT_DIRECTION = "Direction";
private static final String NBT_INVENTORY = "Inventory_%d";
private static final String NBT_SLOT = "Slot";
private EnumFacing direction = EnumFacing.NORTH;
protected int ticks = 0;
@@ -122,4 +133,90 @@ public abstract class TileBase extends TileEntity implements ITickable {
public IItemHandler getDroppedItems() {
return null;
}
protected void writeItems(IItemHandler handler, int id, NBTTagCompound nbt) {
NBTTagList tagList = new NBTTagList();
for (int i = 0; i < handler.getSlots(); i++) {
if (handler.getStackInSlot(i) != null) {
NBTTagCompound compoundTag = new NBTTagCompound();
compoundTag.setInteger(NBT_SLOT, i);
handler.getStackInSlot(i).writeToNBT(compoundTag);
tagList.appendTag(compoundTag);
}
}
nbt.setTag(String.format(NBT_INVENTORY, id), tagList);
}
protected void readItems(IItemHandler handler, int id, NBTTagCompound nbt) {
String name = String.format(NBT_INVENTORY, id);
if (nbt.hasKey(name)) {
NBTTagList tagList = nbt.getTagList(name, Constants.NBT.TAG_COMPOUND);
for (int i = 0; i < tagList.tagCount(); i++) {
int slot = tagList.getCompoundTagAt(i).getInteger(NBT_SLOT);
ItemStack stack = ItemStack.loadItemStackFromNBT(tagList.getCompoundTagAt(i));
handler.insertItem(slot, stack, false);
}
}
}
protected void writeItemsLegacy(IInventory inventory, int id, NBTTagCompound nbt) {
NBTTagList tagList = new NBTTagList();
for (int i = 0; i < inventory.getSizeInventory(); i++) {
if (inventory.getStackInSlot(i) != null) {
NBTTagCompound compoundTag = new NBTTagCompound();
compoundTag.setInteger(NBT_SLOT, i);
inventory.getStackInSlot(i).writeToNBT(compoundTag);
tagList.appendTag(compoundTag);
}
}
nbt.setTag(String.format(NBT_INVENTORY, id), tagList);
}
protected void readItemsLegacy(IInventory inventory, int id, NBTTagCompound nbt) {
String name = String.format(NBT_INVENTORY, id);
if (nbt.hasKey(name)) {
NBTTagList tagList = nbt.getTagList(name, Constants.NBT.TAG_COMPOUND);
for (int i = 0; i < tagList.tagCount(); i++) {
int slot = tagList.getCompoundTagAt(i).getInteger(NBT_SLOT);
ItemStack stack = ItemStack.loadItemStackFromNBT(tagList.getCompoundTagAt(i));
inventory.setInventorySlotContents(slot, stack);
}
}
}
protected IItemHandler getItemHandler(TileEntity tile, EnumFacing side) {
if (tile == null) {
return null;
}
IItemHandler handler = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side);
if (handler == null) {
if (side != null && tile instanceof ISidedInventory) {
handler = new SidedInvWrapper((ISidedInventory) tile, side);
} else if (tile instanceof IInventory) {
handler = new InvWrapper((IInventory) tile);
}
}
return handler;
}
}

9
src/main/java/refinedstorage/tile/TileConstructor.java
View File

@@ -13,7 +13,6 @@ import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.apiimpl.autocrafting.CraftingTaskScheduler;
import refinedstorage.container.ContainerConstructor;
import refinedstorage.container.slot.SlotSpecimen;
@@ -92,8 +91,8 @@ public class TileConstructor extends TileNode implements ICompareConfig {
compare = tag.getInteger(NBT_COMPARE);
}
RefinedStorageUtils.readItems(filter, 0, tag);
RefinedStorageUtils.readItems(upgrades, 1, tag);
TileBase.readItems(filter, 0, tag);
TileBase.readItems(upgrades, 1, tag);
scheduler.read(tag);
}
@@ -104,8 +103,8 @@ public class TileConstructor extends TileNode implements ICompareConfig {
tag.setInteger(NBT_COMPARE, compare);
RefinedStorageUtils.writeItems(filter, 0, tag);
RefinedStorageUtils.writeItems(upgrades, 1, tag);
TileBase.writeItems(filter, 0, tag);
TileBase.writeItems(upgrades, 1, tag);
scheduler.writeToNBT(tag);

11
src/main/java/refinedstorage/tile/TileCrafter.java
View File

@@ -10,7 +10,6 @@ import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.CombinedInvWrapper;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageItems;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.api.autocrafting.ICraftingPatternContainer;
import refinedstorage.api.autocrafting.ICraftingTask;
import refinedstorage.api.network.INetworkMaster;
@@ -79,16 +78,16 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer {
public void read(NBTTagCompound nbt) {
super.read(nbt);
RefinedStorageUtils.readItems(patterns, 0, nbt);
RefinedStorageUtils.readItems(upgrades, 1, nbt);
TileBase.readItems(patterns, 0, nbt);
TileBase.readItems(upgrades, 1, nbt);
}
@Override
public NBTTagCompound write(NBTTagCompound tag) {
super.write(tag);
RefinedStorageUtils.writeItems(patterns, 0, tag);
RefinedStorageUtils.writeItems(upgrades, 1, tag);
TileBase.writeItems(patterns, 0, tag);
TileBase.writeItems(upgrades, 1, tag);
return tag;
}
@@ -100,7 +99,7 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer {
@Override
public IItemHandler getConnectedItems() {
return RefinedStorageUtils.getItemHandler(getFacingTile(), getDirection().getOpposite());
return TileBase.getItemHandler(getFacingTile(), getDirection().getOpposite());
}
public IItemHandler getPatterns() {

9
src/main/java/refinedstorage/tile/TileDestructor.java
View File

@@ -13,7 +13,6 @@ import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.container.ContainerDestructor;
import refinedstorage.inventory.BasicItemHandler;
import refinedstorage.inventory.UpgradeItemHandler;
@@ -111,8 +110,8 @@ public class TileDestructor extends TileNode implements ICompareConfig, IModeCon
mode = nbt.getInteger(NBT_MODE);
}
RefinedStorageUtils.readItems(filters, 0, nbt);
RefinedStorageUtils.readItems(upgrades, 1, nbt);
TileBase.readItems(filters, 0, nbt);
TileBase.readItems(upgrades, 1, nbt);
}
@Override
@@ -122,8 +121,8 @@ public class TileDestructor extends TileNode implements ICompareConfig, IModeCon
tag.setInteger(NBT_COMPARE, compare);
tag.setInteger(NBT_MODE, mode);
RefinedStorageUtils.writeItems(filters, 0, tag);
RefinedStorageUtils.writeItems(upgrades, 1, tag);
TileBase.writeItems(filters, 0, tag);
TileBase.writeItems(upgrades, 1, tag);
return tag;
}

5
src/main/java/refinedstorage/tile/TileDetector.java
View File

@@ -7,7 +7,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.items.IItemHandler;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageBlocks;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.container.ContainerDetector;
import refinedstorage.inventory.BasicItemHandler;
@@ -149,7 +148,7 @@ public class TileDetector extends TileNode implements ICompareConfig {
amount = nbt.getInteger(NBT_AMOUNT);
}
RefinedStorageUtils.readItems(filter, 0, nbt);
TileBase.readItems(filter, 0, nbt);
}
@Override
@@ -160,7 +159,7 @@ public class TileDetector extends TileNode implements ICompareConfig {
tag.setInteger(NBT_MODE, mode);
tag.setInteger(NBT_AMOUNT, amount);
RefinedStorageUtils.writeItems(filter, 0, tag);
TileBase.writeItems(filter, 0, tag);
return tag;
}

9
src/main/java/refinedstorage/tile/TileDiskDrive.java
View File

@@ -13,7 +13,6 @@ import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageItems;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.storage.IStorage;
import refinedstorage.api.storage.IStorageProvider;
@@ -157,8 +156,8 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
public void read(NBTTagCompound nbt) {
super.read(nbt);
RefinedStorageUtils.readItems(disks, 0, nbt);
RefinedStorageUtils.readItems(filters, 1, nbt);
TileBase.readItems(disks, 0, nbt);
TileBase.readItems(filters, 1, nbt);
if (nbt.hasKey(NBT_PRIORITY)) {
priority = nbt.getInteger(NBT_PRIORITY);
@@ -183,8 +182,8 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
}
}
RefinedStorageUtils.writeItems(disks, 0, tag);
RefinedStorageUtils.writeItems(filters, 1, tag);
TileBase.writeItems(disks, 0, tag);
TileBase.writeItems(filters, 1, tag);
tag.setInteger(NBT_PRIORITY, priority);
tag.setInteger(NBT_COMPARE, compare);

11
src/main/java/refinedstorage/tile/TileExporter.java
View File

@@ -10,7 +10,6 @@ import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.apiimpl.autocrafting.CraftingTaskScheduler;
import refinedstorage.container.ContainerExporter;
import refinedstorage.inventory.BasicItemHandler;
@@ -35,7 +34,7 @@ public class TileExporter extends TileNode implements ICompareConfig {
@Override
public void updateNode() {
IItemHandler handler = RefinedStorageUtils.getItemHandler(getFacingTile(), getDirection().getOpposite());
IItemHandler handler = TileBase.getItemHandler(getFacingTile(), getDirection().getOpposite());
int size = upgrades.hasUpgrade(ItemUpgrade.TYPE_STACK) ? 64 : 1;
@@ -84,8 +83,8 @@ public class TileExporter extends TileNode implements ICompareConfig {
compare = nbt.getInteger(NBT_COMPARE);
}
RefinedStorageUtils.readItems(filters, 0, nbt);
RefinedStorageUtils.readItems(upgrades, 1, nbt);
TileBase.readItems(filters, 0, nbt);
TileBase.readItems(upgrades, 1, nbt);
scheduler.read(nbt);
}
@@ -96,8 +95,8 @@ public class TileExporter extends TileNode implements ICompareConfig {
tag.setInteger(NBT_COMPARE, compare);
RefinedStorageUtils.writeItems(filters, 0, tag);
RefinedStorageUtils.writeItems(upgrades, 1, tag);
TileBase.writeItems(filters, 0, tag);
TileBase.writeItems(upgrades, 1, tag);
scheduler.writeToNBT(tag);

11
src/main/java/refinedstorage/tile/TileImporter.java
View File

@@ -9,7 +9,6 @@ import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.container.ContainerImporter;
import refinedstorage.inventory.BasicItemHandler;
import refinedstorage.inventory.UpgradeItemHandler;
@@ -38,7 +37,7 @@ public class TileImporter extends TileNode implements ICompareConfig, IModeConfi
@Override
public void updateNode() {
IItemHandler handler = RefinedStorageUtils.getItemHandler(getFacingTile(), getDirection().getOpposite());
IItemHandler handler = TileBase.getItemHandler(getFacingTile(), getDirection().getOpposite());
if (getFacingTile() instanceof TileDiskDrive || handler == null) {
return;
@@ -105,8 +104,8 @@ public class TileImporter extends TileNode implements ICompareConfig, IModeConfi
mode = nbt.getInteger(NBT_MODE);
}
RefinedStorageUtils.readItems(filters, 0, nbt);
RefinedStorageUtils.readItems(upgrades, 1, nbt);
TileBase.readItems(filters, 0, nbt);
TileBase.readItems(upgrades, 1, nbt);
}
@Override
@@ -116,8 +115,8 @@ public class TileImporter extends TileNode implements ICompareConfig, IModeConfi
tag.setInteger(NBT_COMPARE, compare);
tag.setInteger(NBT_MODE, mode);
RefinedStorageUtils.writeItems(filters, 0, tag);
RefinedStorageUtils.writeItems(upgrades, 1, tag);
TileBase.writeItems(filters, 0, tag);
TileBase.writeItems(upgrades, 1, tag);
return tag;
}

17
src/main/java/refinedstorage/tile/TileInterface.java
View File

@@ -10,7 +10,6 @@ import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.CombinedInvWrapper;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.container.ContainerInterface;
import refinedstorage.inventory.BasicItemHandler;
import refinedstorage.inventory.UpgradeItemHandler;
@@ -106,10 +105,10 @@ public class TileInterface extends TileNode implements ICompareConfig {
public void read(NBTTagCompound nbt) {
super.read(nbt);
RefinedStorageUtils.readItems(importItems, 0, nbt);
RefinedStorageUtils.readItems(exportSpecimenItems, 1, nbt);
RefinedStorageUtils.readItems(exportItems, 2, nbt);
RefinedStorageUtils.readItems(upgrades, 3, nbt);
TileBase.readItems(importItems, 0, nbt);
TileBase.readItems(exportSpecimenItems, 1, nbt);
TileBase.readItems(exportItems, 2, nbt);
TileBase.readItems(upgrades, 3, nbt);
if (nbt.hasKey(NBT_COMPARE)) {
compare = nbt.getInteger(NBT_COMPARE);
@@ -120,10 +119,10 @@ public class TileInterface extends TileNode implements ICompareConfig {
public NBTTagCompound write(NBTTagCompound tag) {
super.write(tag);
RefinedStorageUtils.writeItems(importItems, 0, tag);
RefinedStorageUtils.writeItems(exportSpecimenItems, 1, tag);
RefinedStorageUtils.writeItems(exportItems, 2, tag);
RefinedStorageUtils.writeItems(upgrades, 3, tag);
TileBase.writeItems(importItems, 0, tag);
TileBase.writeItems(exportSpecimenItems, 1, tag);
TileBase.writeItems(exportItems, 2, tag);
TileBase.writeItems(upgrades, 3, tag);
tag.setInteger(NBT_COMPARE, compare);

9
src/main/java/refinedstorage/tile/TileProcessingPatternEncoder.java
View File

@@ -7,7 +7,6 @@ import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import refinedstorage.RefinedStorageItems;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.inventory.BasicItemHandler;
import refinedstorage.inventory.BasicItemValidator;
import refinedstorage.item.ItemPattern;
@@ -20,8 +19,8 @@ public class TileProcessingPatternEncoder extends TileBase {
public NBTTagCompound write(NBTTagCompound tag) {
super.write(tag);
RefinedStorageUtils.writeItems(patterns, 0, tag);
RefinedStorageUtils.writeItems(configuration, 1, tag);
TileBase.writeItems(patterns, 0, tag);
TileBase.writeItems(configuration, 1, tag);
return tag;
}
@@ -30,8 +29,8 @@ public class TileProcessingPatternEncoder extends TileBase {
public void read(NBTTagCompound nbt) {
super.read(nbt);
RefinedStorageUtils.readItems(patterns, 0, nbt);
RefinedStorageUtils.readItems(configuration, 1, nbt);
TileBase.readItems(patterns, 0, nbt);
TileBase.readItems(configuration, 1, nbt);
}
public void onCreatePattern() {

9
src/main/java/refinedstorage/tile/TileSolderer.java
View File

@@ -9,7 +9,6 @@ import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.CombinedInvWrapper;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.api.RefinedStorageAPI;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.solderer.ISoldererRecipe;
@@ -111,8 +110,8 @@ public class TileSolderer extends TileNode {
public void read(NBTTagCompound nbt) {
super.read(nbt);
RefinedStorageUtils.readItems(items, 0, nbt);
RefinedStorageUtils.readItems(upgrades, 1, nbt);
TileBase.readItems(items, 0, nbt);
TileBase.readItems(upgrades, 1, nbt);
recipe = RefinedStorageAPI.SOLDERER_REGISTRY.getRecipe(items);
@@ -129,8 +128,8 @@ public class TileSolderer extends TileNode {
public NBTTagCompound write(NBTTagCompound tag) {
super.write(tag);
RefinedStorageUtils.writeItems(items, 0, tag);
RefinedStorageUtils.writeItems(upgrades, 1, tag);
TileBase.writeItems(items, 0, tag);
TileBase.writeItems(upgrades, 1, tag);
tag.setBoolean(NBT_WORKING, working);
tag.setInteger(NBT_PROGRESS, progress);

5
src/main/java/refinedstorage/tile/TileStorage.java
View File

@@ -8,7 +8,6 @@ import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageBlocks;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.storage.IStorage;
import refinedstorage.api.storage.IStorageProvider;
@@ -108,7 +107,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG
public void read(NBTTagCompound nbt) {
super.read(nbt);
RefinedStorageUtils.readItems(filters, 0, nbt);
TileBase.readItems(filters, 0, nbt);
if (nbt.hasKey(NBT_PRIORITY)) {
priority = nbt.getInteger(NBT_PRIORITY);
@@ -131,7 +130,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG
public NBTTagCompound write(NBTTagCompound tag) {
super.write(tag);
RefinedStorageUtils.writeItems(filters, 0, tag);
TileBase.writeItems(filters, 0, tag);
tag.setInteger(NBT_PRIORITY, priority);

5
src/main/java/refinedstorage/tile/TileWirelessTransmitter.java
View File

@@ -8,7 +8,6 @@ import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.api.network.IWirelessTransmitter;
import refinedstorage.container.ContainerWirelessTransmitter;
import refinedstorage.inventory.BasicItemHandler;
@@ -31,14 +30,14 @@ public class TileWirelessTransmitter extends TileNode implements IWirelessTransm
public void read(NBTTagCompound nbt) {
super.read(nbt);
RefinedStorageUtils.readItems(upgrades, 0, nbt);
TileBase.readItems(upgrades, 0, nbt);
}
@Override
public NBTTagCompound write(NBTTagCompound tag) {
super.write(tag);
RefinedStorageUtils.writeItems(upgrades, 0, tag);
TileBase.writeItems(upgrades, 0, tag);
return tag;
}

8
src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java
View File

@@ -9,7 +9,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.items.IItemHandler;
import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.storage.IStorage;
import refinedstorage.api.storage.IStorageProvider;
@@ -17,6 +16,7 @@ import refinedstorage.container.ContainerStorage;
import refinedstorage.inventory.BasicItemHandler;
import refinedstorage.network.MessagePriorityUpdate;
import refinedstorage.tile.IStorageGui;
import refinedstorage.tile.TileBase;
import refinedstorage.tile.TileNode;
import refinedstorage.tile.config.ICompareConfig;
import refinedstorage.tile.config.IModeConfig;
@@ -119,7 +119,7 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I
public void read(NBTTagCompound nbt) {
super.read(nbt);
RefinedStorageUtils.readItems(filters, 0, nbt);
TileBase.readItems(filters, 0, nbt);
if (nbt.hasKey(NBT_PRIORITY)) {
priority = nbt.getInteger(NBT_PRIORITY);
@@ -138,7 +138,7 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I
public NBTTagCompound write(NBTTagCompound tag) {
super.write(tag);
RefinedStorageUtils.writeItems(filters, 0, tag);
TileBase.writeItems(filters, 0, tag);
tag.setInteger(NBT_PRIORITY, priority);
tag.setInteger(NBT_COMPARE, compare);
@@ -200,7 +200,7 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I
} else if (facing instanceof IDeepStorageUnit) {
storages.add(new DeepStorageUnitStorage(this, (IDeepStorageUnit) facing));
} else {
IItemHandler handler = RefinedStorageUtils.getItemHandler(facing, getDirection().getOpposite());
IItemHandler handler = TileBase.getItemHandler(facing, getDirection().getOpposite());
if (handler != null) {
storages.add(new ItemHandlerStorage(this, handler));

10
src/main/java/refinedstorage/tile/grid/TileGrid.java
View File

@@ -13,7 +13,6 @@ import net.minecraftforge.items.wrapper.InvWrapper;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageBlocks;
import refinedstorage.RefinedStorageItems;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.api.network.IGridHandler;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.apiimpl.network.NetworkUtils;
@@ -24,6 +23,7 @@ import refinedstorage.inventory.BasicItemHandler;
import refinedstorage.inventory.BasicItemValidator;
import refinedstorage.item.ItemPattern;
import refinedstorage.network.MessageGridSettingsUpdate;
import refinedstorage.tile.TileBase;
import refinedstorage.tile.TileNode;
import refinedstorage.tile.config.IRedstoneModeConfig;
@@ -333,8 +333,8 @@ public class TileGrid extends TileNode implements IGrid {
public void read(NBTTagCompound tag) {
super.read(tag);
RefinedStorageUtils.readItemsLegacy(matrix, 0, tag);
RefinedStorageUtils.readItems(patterns, 1, tag);
TileBase.readItemsLegacy(matrix, 0, tag);
TileBase.readItems(patterns, 1, tag);
if (tag.hasKey(NBT_VIEW_TYPE)) {
viewType = tag.getInteger(NBT_VIEW_TYPE);
@@ -357,8 +357,8 @@ public class TileGrid extends TileNode implements IGrid {
public NBTTagCompound write(NBTTagCompound tag) {
super.write(tag);
RefinedStorageUtils.writeItemsLegacy(matrix, 0, tag);
RefinedStorageUtils.writeItems(patterns, 1, tag);
TileBase.writeItemsLegacy(matrix, 0, tag);
TileBase.writeItems(patterns, 1, tag);
tag.setInteger(NBT_VIEW_TYPE, viewType);
tag.setInteger(NBT_SORTING_DIRECTION, sortingDirection);

9
src/main/java/refinedstorage/tile/grid/WirelessGrid.java
View File

@@ -7,7 +7,6 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageUtils;
import refinedstorage.api.network.IGridHandler;
import refinedstorage.block.EnumGridType;
import refinedstorage.item.ItemWirelessGrid;
@@ -73,28 +72,28 @@ public class WirelessGrid implements IGrid {
@Override
public void onViewTypeChanged(int type) {
RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), type, getSortingDirection(), getSortingType(), getSearchBoxMode()));
RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(hand.ordinal(), type, getSortingDirection(), getSortingType(), getSearchBoxMode()));
this.viewType = type;
}
@Override
public void onSortingTypeChanged(int type) {
RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), getViewType(), getSortingDirection(), type, getSearchBoxMode()));
RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(hand.ordinal(), getViewType(), getSortingDirection(), type, getSearchBoxMode()));
this.sortingType = type;
}
@Override
public void onSortingDirectionChanged(int direction) {
RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), getViewType(), direction, getSortingType(), getSearchBoxMode()));
RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(hand.ordinal(), getViewType(), direction, getSortingType(), getSearchBoxMode()));
this.sortingDirection = direction;
}
@Override
public void onSearchBoxModeChanged(int searchBoxMode) {
RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), getViewType(), getSortingDirection(), getSortingType(), searchBoxMode));
RefinedStorage.INSTANCE.network.sendToServer(new MessageWirelessGridSettingsUpdate(hand.ordinal(), getViewType(), getSortingDirection(), getSortingType(), searchBoxMode));
this.searchBoxMode = searchBoxMode;
}