diff --git a/src/main/java/refinedstorage/util/InventoryUtils.java b/src/main/java/refinedstorage/RefinedStorageUtils.java similarity index 72% rename from src/main/java/refinedstorage/util/InventoryUtils.java rename to src/main/java/refinedstorage/RefinedStorageUtils.java index 4132243cb..b730b57ac 100755 --- a/src/main/java/refinedstorage/util/InventoryUtils.java +++ b/src/main/java/refinedstorage/RefinedStorageUtils.java @@ -1,14 +1,18 @@ -package refinedstorage.util; +package refinedstorage; import net.minecraft.entity.item.EntityItem; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagIntArray; import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.EnumHand; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; +import refinedstorage.inventory.InventorySimple; +import refinedstorage.item.ItemUpgrade; -public class InventoryUtils { +public class RefinedStorageUtils { public static final String NBT_INVENTORY = "Inventory_%d"; public static final String NBT_SLOT = "Slot"; @@ -146,7 +150,7 @@ public class InventoryUtils { return toGo == 0; } - public static int getInventoryItems(IInventory inventory) { + public static int getInventoryItemCount(IInventory inventory) { int size = 0; for (int i = 0; i < inventory.getSizeInventory(); ++i) { @@ -197,4 +201,78 @@ public class InventoryUtils { public static boolean compareStackNoQuantity(ItemStack first, ItemStack second) { return compareStack(first, second, COMPARE_NBT | COMPARE_DAMAGE); } + + public static int getSpeed(InventorySimple upgrades) { + return getSpeed(upgrades, 9, 2); + } + + public static int getSpeed(InventorySimple inventory, int speed, int speedIncrease) { + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + if (inventory.getStackInSlot(i) != null && inventory.getStackInSlot(i).getMetadata() == ItemUpgrade.TYPE_SPEED) { + speed -= speedIncrease; + } + } + + return speed; + } + + public static boolean hasUpgrade(InventorySimple inventory, int type) { + return getUpgradeCount(inventory, type) > 0; + } + + public static int getUpgradeCount(InventorySimple inventory, int type) { + int upgrades = 0; + + for (int i = 0; i < inventory.getSizeInventory(); ++i) { + if (inventory.getStackInSlot(i) != null && inventory.getStackInSlot(i).getMetadata() == type) { + upgrades++; + } + } + + return upgrades; + } + + public static void writeBoolArray(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[] readBoolArray(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; + } + } } diff --git a/src/main/java/refinedstorage/block/BlockBase.java b/src/main/java/refinedstorage/block/BlockBase.java index 814e2ec8f..e6daef7a7 100755 --- a/src/main/java/refinedstorage/block/BlockBase.java +++ b/src/main/java/refinedstorage/block/BlockBase.java @@ -17,9 +17,9 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; +import refinedstorage.RefinedStorageUtils; import refinedstorage.item.ItemBlockBase; import refinedstorage.tile.TileBase; -import refinedstorage.util.InventoryUtils; public abstract class BlockBase extends Block { public static final PropertyDirection DIRECTION = PropertyDirection.create("direction"); @@ -126,7 +126,7 @@ public abstract class BlockBase extends Block { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileBase && ((TileBase) tile).getDroppedInventory() != null) { - InventoryUtils.dropInventory(world, ((TileBase) tile).getDroppedInventory(), pos.getX(), pos.getY(), pos.getZ()); + RefinedStorageUtils.dropInventory(world, ((TileBase) tile).getDroppedInventory(), pos.getX(), pos.getY(), pos.getZ()); } super.breakBlock(world, pos, state); diff --git a/src/main/java/refinedstorage/gui/GuiConstructor.java b/src/main/java/refinedstorage/gui/GuiConstructor.java index e5910e5ac..d150e8d74 100755 --- a/src/main/java/refinedstorage/gui/GuiConstructor.java +++ b/src/main/java/refinedstorage/gui/GuiConstructor.java @@ -1,10 +1,10 @@ package refinedstorage.gui; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerConstructor; import refinedstorage.gui.sidebutton.SideButtonCompare; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileConstructor; -import refinedstorage.util.InventoryUtils; public class GuiConstructor extends GuiBase { private TileConstructor constructor; @@ -19,8 +19,8 @@ public class GuiConstructor extends GuiBase { public void init(int x, int y) { addSideButton(new SideButtonRedstoneMode(constructor)); - addSideButton(new SideButtonCompare(constructor, InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(constructor, InventoryUtils.COMPARE_NBT)); + addSideButton(new SideButtonCompare(constructor, RefinedStorageUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(constructor, RefinedStorageUtils.COMPARE_NBT)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiDestructor.java b/src/main/java/refinedstorage/gui/GuiDestructor.java index 4aedbdce7..58f92465d 100755 --- a/src/main/java/refinedstorage/gui/GuiDestructor.java +++ b/src/main/java/refinedstorage/gui/GuiDestructor.java @@ -1,11 +1,11 @@ package refinedstorage.gui; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerDestructor; import refinedstorage.gui.sidebutton.SideButtonCompare; import refinedstorage.gui.sidebutton.SideButtonMode; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileDestructor; -import refinedstorage.util.InventoryUtils; public class GuiDestructor extends GuiBase { private TileDestructor destructor; @@ -22,8 +22,8 @@ public class GuiDestructor extends GuiBase { addSideButton(new SideButtonMode(destructor)); - addSideButton(new SideButtonCompare(destructor, InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(destructor, InventoryUtils.COMPARE_NBT)); + addSideButton(new SideButtonCompare(destructor, RefinedStorageUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(destructor, RefinedStorageUtils.COMPARE_NBT)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiDetector.java b/src/main/java/refinedstorage/gui/GuiDetector.java index f788fa343..0236387a6 100755 --- a/src/main/java/refinedstorage/gui/GuiDetector.java +++ b/src/main/java/refinedstorage/gui/GuiDetector.java @@ -3,12 +3,12 @@ package refinedstorage.gui; import com.google.common.primitives.Ints; import net.minecraft.client.gui.GuiTextField; import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerDetector; import refinedstorage.gui.sidebutton.SideButtonCompare; import refinedstorage.gui.sidebutton.SideButtonDetectorMode; import refinedstorage.network.MessageDetectorAmountUpdate; import refinedstorage.tile.TileDetector; -import refinedstorage.util.InventoryUtils; import java.io.IOException; @@ -25,8 +25,8 @@ public class GuiDetector extends GuiBase { @Override public void init(int x, int y) { - addSideButton(new SideButtonCompare(detector, InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(detector, InventoryUtils.COMPARE_NBT)); + addSideButton(new SideButtonCompare(detector, RefinedStorageUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(detector, RefinedStorageUtils.COMPARE_NBT)); addSideButton(new SideButtonDetectorMode(detector)); diff --git a/src/main/java/refinedstorage/gui/GuiExporter.java b/src/main/java/refinedstorage/gui/GuiExporter.java index 0b0d6424d..0311ba1a8 100755 --- a/src/main/java/refinedstorage/gui/GuiExporter.java +++ b/src/main/java/refinedstorage/gui/GuiExporter.java @@ -1,10 +1,10 @@ package refinedstorage.gui; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerExporter; import refinedstorage.gui.sidebutton.SideButtonCompare; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileExporter; -import refinedstorage.util.InventoryUtils; public class GuiExporter extends GuiBase { private TileExporter exporter; @@ -19,8 +19,8 @@ public class GuiExporter extends GuiBase { public void init(int x, int y) { addSideButton(new SideButtonRedstoneMode(exporter)); - addSideButton(new SideButtonCompare(exporter, InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(exporter, InventoryUtils.COMPARE_NBT)); + addSideButton(new SideButtonCompare(exporter, RefinedStorageUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(exporter, RefinedStorageUtils.COMPARE_NBT)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiHandler.java b/src/main/java/refinedstorage/gui/GuiHandler.java index 39789ae7b..6ec7b9f73 100755 --- a/src/main/java/refinedstorage/gui/GuiHandler.java +++ b/src/main/java/refinedstorage/gui/GuiHandler.java @@ -7,6 +7,7 @@ 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.storage.IStorageGui; import refinedstorage.tile.*; @@ -15,7 +16,6 @@ import refinedstorage.tile.autocrafting.TileCraftingMonitor; import refinedstorage.tile.autocrafting.TileProcessingPatternEncoder; import refinedstorage.tile.grid.TileGrid; import refinedstorage.tile.grid.WirelessGrid; -import refinedstorage.util.HandUtils; public class GuiHandler implements IGuiHandler { private Container getContainer(int ID, EntityPlayer player, TileEntity tile) { @@ -67,7 +67,7 @@ public class GuiHandler implements IGuiHandler { } private WirelessGrid getWirelessGrid(EntityPlayer player, int hand) { - return new WirelessGrid(player.getHeldItem(HandUtils.getHandById(hand)), HandUtils.getHandById(hand)); + return new WirelessGrid(player.getHeldItem(RefinedStorageUtils.getHandById(hand)), RefinedStorageUtils.getHandById(hand)); } private ContainerGrid getWirelessGridContainer(EntityPlayer player, int hand) { diff --git a/src/main/java/refinedstorage/gui/GuiImporter.java b/src/main/java/refinedstorage/gui/GuiImporter.java index f1fcaa35b..2f8f7b784 100755 --- a/src/main/java/refinedstorage/gui/GuiImporter.java +++ b/src/main/java/refinedstorage/gui/GuiImporter.java @@ -1,11 +1,11 @@ package refinedstorage.gui; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerImporter; import refinedstorage.gui.sidebutton.SideButtonCompare; import refinedstorage.gui.sidebutton.SideButtonMode; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileImporter; -import refinedstorage.util.InventoryUtils; public class GuiImporter extends GuiBase { private TileImporter importer; @@ -22,8 +22,8 @@ public class GuiImporter extends GuiBase { addSideButton(new SideButtonMode(importer)); - addSideButton(new SideButtonCompare(importer, InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(importer, InventoryUtils.COMPARE_NBT)); + addSideButton(new SideButtonCompare(importer, RefinedStorageUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(importer, RefinedStorageUtils.COMPARE_NBT)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiInterface.java b/src/main/java/refinedstorage/gui/GuiInterface.java index 63ec0636c..df894e47a 100755 --- a/src/main/java/refinedstorage/gui/GuiInterface.java +++ b/src/main/java/refinedstorage/gui/GuiInterface.java @@ -1,10 +1,10 @@ package refinedstorage.gui; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerInterface; import refinedstorage.gui.sidebutton.SideButtonCompare; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileInterface; -import refinedstorage.util.InventoryUtils; public class GuiInterface extends GuiBase { private TileInterface tile; @@ -19,8 +19,8 @@ public class GuiInterface extends GuiBase { public void init(int x, int y) { addSideButton(new SideButtonRedstoneMode(tile)); - addSideButton(new SideButtonCompare(tile, InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(tile, InventoryUtils.COMPARE_NBT)); + addSideButton(new SideButtonCompare(tile, RefinedStorageUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(tile, RefinedStorageUtils.COMPARE_NBT)); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiProcessingPatternEncoder.java b/src/main/java/refinedstorage/gui/GuiProcessingPatternEncoder.java index 888a610da..62be759e4 100755 --- a/src/main/java/refinedstorage/gui/GuiProcessingPatternEncoder.java +++ b/src/main/java/refinedstorage/gui/GuiProcessingPatternEncoder.java @@ -3,15 +3,9 @@ package refinedstorage.gui; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.init.SoundEvents; import refinedstorage.RefinedStorage; -import refinedstorage.block.EnumGridType; import refinedstorage.container.ContainerProcessingPatternEncoder; -import refinedstorage.gui.sidebutton.SideButtonCompare; -import refinedstorage.gui.sidebutton.SideButtonMode; -import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.network.MessageGridPatternCreate; import refinedstorage.tile.autocrafting.TileProcessingPatternEncoder; -import refinedstorage.tile.grid.TileGrid; -import refinedstorage.util.InventoryUtils; import java.io.IOException; diff --git a/src/main/java/refinedstorage/gui/GuiStorage.java b/src/main/java/refinedstorage/gui/GuiStorage.java index f8cd59eae..6128abcfd 100755 --- a/src/main/java/refinedstorage/gui/GuiStorage.java +++ b/src/main/java/refinedstorage/gui/GuiStorage.java @@ -2,12 +2,12 @@ package refinedstorage.gui; import com.google.common.primitives.Ints; import net.minecraft.client.gui.GuiTextField; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerStorage; import refinedstorage.gui.sidebutton.SideButtonCompare; import refinedstorage.gui.sidebutton.SideButtonMode; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.storage.IStorageGui; -import refinedstorage.util.InventoryUtils; import java.io.IOException; @@ -44,8 +44,8 @@ public class GuiStorage extends GuiBase { } if (gui.getCompareConfig() != null) { - addSideButton(new SideButtonCompare(gui.getCompareConfig(), InventoryUtils.COMPARE_DAMAGE)); - addSideButton(new SideButtonCompare(gui.getCompareConfig(), InventoryUtils.COMPARE_NBT)); + addSideButton(new SideButtonCompare(gui.getCompareConfig(), RefinedStorageUtils.COMPARE_DAMAGE)); + addSideButton(new SideButtonCompare(gui.getCompareConfig(), RefinedStorageUtils.COMPARE_NBT)); } priorityField = new GuiTextField(0, fontRendererObj, x + 98 + 1, y + 54 + 1, 25, fontRendererObj.FONT_HEIGHT); diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java index 5313c78d4..f155d3648 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java @@ -2,10 +2,10 @@ package refinedstorage.gui.sidebutton; import net.minecraft.util.text.TextFormatting; import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageUtils; import refinedstorage.gui.GuiBase; import refinedstorage.network.MessageCompareUpdate; import refinedstorage.tile.config.ICompareConfig; -import refinedstorage.util.InventoryUtils; public class SideButtonCompare extends SideButton { private ICompareConfig config; @@ -35,9 +35,9 @@ public class SideButtonCompare extends SideButton { int ty = 0; - if (mask == InventoryUtils.COMPARE_DAMAGE) { + if (mask == RefinedStorageUtils.COMPARE_DAMAGE) { ty = 80; - } else if (mask == InventoryUtils.COMPARE_NBT) { + } else if (mask == RefinedStorageUtils.COMPARE_NBT) { ty = 48; } diff --git a/src/main/java/refinedstorage/network/MessageWirelessGridSettingsUpdate.java b/src/main/java/refinedstorage/network/MessageWirelessGridSettingsUpdate.java index 5db048608..1b5ee4434 100755 --- a/src/main/java/refinedstorage/network/MessageWirelessGridSettingsUpdate.java +++ b/src/main/java/refinedstorage/network/MessageWirelessGridSettingsUpdate.java @@ -5,9 +5,9 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.RefinedStorageItems; +import refinedstorage.RefinedStorageUtils; import refinedstorage.item.ItemWirelessGrid; import refinedstorage.tile.grid.TileGrid; -import refinedstorage.util.HandUtils; public class MessageWirelessGridSettingsUpdate extends MessageHandlerPlayerToServer implements IMessage { private int hand; @@ -43,7 +43,7 @@ public class MessageWirelessGridSettingsUpdate extends MessageHandlerPlayerToSer @Override public void handle(MessageWirelessGridSettingsUpdate message, EntityPlayerMP player) { - ItemStack held = player.getHeldItem(HandUtils.getHandById(message.hand)); + ItemStack held = player.getHeldItem(RefinedStorageUtils.getHandById(message.hand)); if (held != null && held.getItem() == RefinedStorageItems.WIRELESS_GRID && held.getTagCompound() != null) { if (message.sortingDirection == TileGrid.SORTING_DIRECTION_ASCENDING || message.sortingDirection == TileGrid.SORTING_DIRECTION_DESCENDING) { diff --git a/src/main/java/refinedstorage/storage/ItemGroup.java b/src/main/java/refinedstorage/storage/ItemGroup.java index b326e9fe3..abf343fc6 100755 --- a/src/main/java/refinedstorage/storage/ItemGroup.java +++ b/src/main/java/refinedstorage/storage/ItemGroup.java @@ -5,7 +5,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.common.network.ByteBufUtils; -import refinedstorage.util.InventoryUtils; +import refinedstorage.RefinedStorageUtils; public class ItemGroup { private Item type; @@ -94,13 +94,13 @@ public class ItemGroup { } public boolean compare(ItemGroup other, int flags) { - if ((flags & InventoryUtils.COMPARE_DAMAGE) == InventoryUtils.COMPARE_DAMAGE) { + if ((flags & RefinedStorageUtils.COMPARE_DAMAGE) == RefinedStorageUtils.COMPARE_DAMAGE) { if (damage != other.getDamage()) { return false; } } - if ((flags & InventoryUtils.COMPARE_NBT) == InventoryUtils.COMPARE_NBT) { + if ((flags & RefinedStorageUtils.COMPARE_NBT) == RefinedStorageUtils.COMPARE_NBT) { if ((tag != null && other.getTag() == null) || (tag == null && other.getTag() != null)) { return false; } @@ -112,7 +112,7 @@ public class ItemGroup { } } - if ((flags & InventoryUtils.COMPARE_QUANTITY) == InventoryUtils.COMPARE_QUANTITY) { + if ((flags & RefinedStorageUtils.COMPARE_QUANTITY) == RefinedStorageUtils.COMPARE_QUANTITY) { if (quantity != other.getQuantity()) { return false; } @@ -122,13 +122,13 @@ public class ItemGroup { } public boolean compare(ItemStack stack, int flags) { - if ((flags & InventoryUtils.COMPARE_DAMAGE) == InventoryUtils.COMPARE_DAMAGE) { + if ((flags & RefinedStorageUtils.COMPARE_DAMAGE) == RefinedStorageUtils.COMPARE_DAMAGE) { if (damage != stack.getItemDamage()) { return false; } } - if ((flags & InventoryUtils.COMPARE_NBT) == InventoryUtils.COMPARE_NBT) { + if ((flags & RefinedStorageUtils.COMPARE_NBT) == RefinedStorageUtils.COMPARE_NBT) { if ((tag != null && stack.getTagCompound() == null) || (tag == null && stack.getTagCompound() != null)) { return false; } @@ -140,7 +140,7 @@ public class ItemGroup { } } - if ((flags & InventoryUtils.COMPARE_QUANTITY) == InventoryUtils.COMPARE_QUANTITY) { + if ((flags & RefinedStorageUtils.COMPARE_QUANTITY) == RefinedStorageUtils.COMPARE_QUANTITY) { if (quantity != stack.stackSize) { return false; } @@ -150,10 +150,10 @@ public class ItemGroup { } public boolean compareNoQuantity(ItemGroup other) { - return compare(other, InventoryUtils.COMPARE_NBT | InventoryUtils.COMPARE_DAMAGE); + return compare(other, RefinedStorageUtils.COMPARE_NBT | RefinedStorageUtils.COMPARE_DAMAGE); } public boolean compareNoQuantity(ItemStack stack) { - return compare(stack, InventoryUtils.COMPARE_NBT | InventoryUtils.COMPARE_DAMAGE); + return compare(stack, RefinedStorageUtils.COMPARE_NBT | RefinedStorageUtils.COMPARE_DAMAGE); } } diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java index 3cf1035cd..6205b5b49 100755 --- a/src/main/java/refinedstorage/tile/TileConstructor.java +++ b/src/main/java/refinedstorage/tile/TileConstructor.java @@ -8,13 +8,12 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerConstructor; import refinedstorage.inventory.InventorySimple; import refinedstorage.item.ItemUpgrade; import refinedstorage.tile.autocrafting.CraftingPattern; import refinedstorage.tile.config.ICompareConfig; -import refinedstorage.util.InventoryUtils; -import refinedstorage.util.UpgradeUtils; public class TileConstructor extends TileMachine implements ICompareConfig { public static final String NBT_COMPARE = "Compare"; @@ -33,7 +32,7 @@ public class TileConstructor extends TileMachine implements ICompareConfig { @Override public void updateMachine() { - if (ticks % UpgradeUtils.getSpeed(upgradesInventory, BASE_SPEED, 4) == 0 && inventory.getStackInSlot(0) != null) { + if (ticks % RefinedStorageUtils.getSpeed(upgradesInventory, BASE_SPEED, 4) == 0 && inventory.getStackInSlot(0) != null) { BlockPos front = pos.offset(getDirection()); Block block = ((ItemBlock) inventory.getStackInSlot(0).getItem()).getBlock(); @@ -43,7 +42,7 @@ public class TileConstructor extends TileMachine implements ICompareConfig { if (took != null) { worldObj.setBlockState(front, block.getStateFromMeta(took.getItemDamage()), 1 | 2); - } else if (UpgradeUtils.hasUpgrade(upgradesInventory, ItemUpgrade.TYPE_CRAFTING)) { + } else if (RefinedStorageUtils.hasUpgrade(upgradesInventory, ItemUpgrade.TYPE_CRAFTING)) { CraftingPattern pattern = controller.getPattern(inventory.getStackInSlot(0), compare); if (pattern != null && !controller.hasCraftingTask(pattern, compare)) { @@ -74,8 +73,8 @@ public class TileConstructor extends TileMachine implements ICompareConfig { compare = nbt.getInteger(NBT_COMPARE); } - InventoryUtils.restoreInventory(inventory, 0, nbt); - InventoryUtils.restoreInventory(upgradesInventory, 1, nbt); + RefinedStorageUtils.restoreInventory(inventory, 0, nbt); + RefinedStorageUtils.restoreInventory(upgradesInventory, 1, nbt); } @Override @@ -84,8 +83,8 @@ public class TileConstructor extends TileMachine implements ICompareConfig { nbt.setInteger(NBT_COMPARE, compare); - InventoryUtils.saveInventory(inventory, 0, nbt); - InventoryUtils.saveInventory(upgradesInventory, 1, nbt); + RefinedStorageUtils.saveInventory(inventory, 0, nbt); + RefinedStorageUtils.saveInventory(upgradesInventory, 1, nbt); } @Override diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index abd21dd4b..9add7e9f5 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -16,10 +16,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.util.Constants; import net.minecraftforge.fml.common.network.ByteBufUtils; -import refinedstorage.RefinedStorage; -import refinedstorage.RefinedStorageBlocks; -import refinedstorage.RefinedStorageGui; -import refinedstorage.RefinedStorageItems; +import refinedstorage.*; import refinedstorage.block.BlockController; import refinedstorage.block.EnumControllerType; import refinedstorage.container.ContainerController; @@ -38,8 +35,6 @@ import refinedstorage.tile.autocrafting.task.ProcessingCraftingTask; import refinedstorage.tile.config.IRedstoneModeConfig; import refinedstorage.tile.config.RedstoneMode; import refinedstorage.tile.grid.WirelessGridConsumer; -import refinedstorage.util.HandUtils; -import refinedstorage.util.InventoryUtils; import java.util.*; @@ -226,7 +221,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor while (gridConsumerIterator.hasNext()) { WirelessGridConsumer consumer = gridConsumerIterator.next(); - if (!InventoryUtils.compareStack(consumer.getWirelessGrid(), consumer.getPlayer().getHeldItem(consumer.getHand()))) { + if (!RefinedStorageUtils.compareStack(consumer.getWirelessGrid(), consumer.getPlayer().getHeldItem(consumer.getHand()))) { consumer.getPlayer().closeScreen(); // This will call onContainerClosed on the Container and remove it from the list } else { if (isActive()) { @@ -312,13 +307,13 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor } public CraftingPattern getPattern(ItemStack pattern) { - return getPattern(pattern, InventoryUtils.COMPARE_DAMAGE | InventoryUtils.COMPARE_NBT); + return getPattern(pattern, RefinedStorageUtils.COMPARE_DAMAGE | RefinedStorageUtils.COMPARE_NBT); } public CraftingPattern getPattern(ItemStack pattern, int flags) { for (CraftingPattern craftingPattern : getPatterns()) { for (ItemStack output : craftingPattern.getOutputs()) { - if (InventoryUtils.compareStack(output, pattern, flags)) { + if (RefinedStorageUtils.compareStack(output, pattern, flags)) { return craftingPattern; } } @@ -415,7 +410,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor public ItemStack take(ItemStack stack) { markDirty(); - return take(stack, InventoryUtils.COMPARE_DAMAGE | InventoryUtils.COMPARE_NBT); + return take(stack, RefinedStorageUtils.COMPARE_DAMAGE | RefinedStorageUtils.COMPARE_NBT); } public ItemStack take(ItemStack stack, int flags) { @@ -458,7 +453,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor wirelessGridConsumers.add(new WirelessGridConsumer(player, hand, player.getHeldItem(hand))); - player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_GRID, worldObj, HandUtils.getIdFromHand(hand), 0, 0); + player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.WIRELESS_GRID, worldObj, RefinedStorageUtils.getIdFromHand(hand), 0, 0); drainEnergyFromWirelessGrid(player, ItemWirelessGrid.USAGE_OPEN); @@ -772,7 +767,7 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor if (pattern != null) { for (ItemStack output : pattern.getOutputs()) { - if (InventoryUtils.compareStackNoQuantity(requested, output)) { + if (RefinedStorageUtils.compareStackNoQuantity(requested, output)) { quantityPerRequest = output.stackSize; break; diff --git a/src/main/java/refinedstorage/tile/TileDestructor.java b/src/main/java/refinedstorage/tile/TileDestructor.java index 780bf6a48..bebc7c80b 100755 --- a/src/main/java/refinedstorage/tile/TileDestructor.java +++ b/src/main/java/refinedstorage/tile/TileDestructor.java @@ -9,13 +9,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerDestructor; import refinedstorage.inventory.InventorySimple; import refinedstorage.tile.config.ICompareConfig; import refinedstorage.tile.config.IModeConfig; import refinedstorage.tile.config.ModeConfigUtils; -import refinedstorage.util.InventoryUtils; -import refinedstorage.util.UpgradeUtils; import java.util.List; @@ -38,7 +37,7 @@ public class TileDestructor extends TileMachine implements ICompareConfig, IMode @Override public void updateMachine() { - if (ticks % UpgradeUtils.getSpeed(upgradesInventory, BASE_SPEED, 4) == 0) { + if (ticks % RefinedStorageUtils.getSpeed(upgradesInventory, BASE_SPEED, 4) == 0) { BlockPos front = pos.offset(getDirection()); IBlockState frontBlockState = worldObj.getBlockState(front); @@ -53,7 +52,7 @@ public class TileDestructor extends TileMachine implements ICompareConfig, IMode for (ItemStack drop : drops) { if (!controller.push(drop)) { - InventoryUtils.dropStack(worldObj, drop, front.getX(), front.getY(), front.getZ()); + RefinedStorageUtils.dropStack(worldObj, drop, front.getX(), front.getY(), front.getZ()); } } } @@ -109,8 +108,8 @@ public class TileDestructor extends TileMachine implements ICompareConfig, IMode mode = nbt.getInteger(NBT_MODE); } - InventoryUtils.restoreInventory(inventory, 0, nbt); - InventoryUtils.restoreInventory(upgradesInventory, 1, nbt); + RefinedStorageUtils.restoreInventory(inventory, 0, nbt); + RefinedStorageUtils.restoreInventory(upgradesInventory, 1, nbt); } @Override @@ -120,8 +119,8 @@ public class TileDestructor extends TileMachine implements ICompareConfig, IMode nbt.setInteger(NBT_COMPARE, compare); nbt.setInteger(NBT_MODE, mode); - InventoryUtils.saveInventory(inventory, 0, nbt); - InventoryUtils.saveInventory(upgradesInventory, 1, nbt); + RefinedStorageUtils.saveInventory(inventory, 0, nbt); + RefinedStorageUtils.saveInventory(upgradesInventory, 1, nbt); } @Override diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java index ba3f547ac..601b1406c 100755 --- a/src/main/java/refinedstorage/tile/TileDetector.java +++ b/src/main/java/refinedstorage/tile/TileDetector.java @@ -6,12 +6,12 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import refinedstorage.RefinedStorageBlocks; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerDetector; import refinedstorage.inventory.InventorySimple; import refinedstorage.storage.ItemGroup; import refinedstorage.tile.config.ICompareConfig; import refinedstorage.tile.config.RedstoneMode; -import refinedstorage.util.InventoryUtils; public class TileDetector extends TileMachine implements ICompareConfig { public static final int MODE_UNDER = 0; @@ -143,7 +143,7 @@ public class TileDetector extends TileMachine implements ICompareConfig { amount = nbt.getInteger(NBT_AMOUNT); } - InventoryUtils.restoreInventory(inventory, 0, nbt); + RefinedStorageUtils.restoreInventory(inventory, 0, nbt); } @Override @@ -154,7 +154,7 @@ public class TileDetector extends TileMachine implements ICompareConfig { nbt.setInteger(NBT_MODE, mode); nbt.setInteger(NBT_AMOUNT, amount); - InventoryUtils.saveInventory(inventory, 0, nbt); + RefinedStorageUtils.saveInventory(inventory, 0, nbt); } @Override diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java index f9f0e21e1..5a9ca3a99 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.ITextComponent; import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageUtils; import refinedstorage.block.EnumStorageType; import refinedstorage.container.ContainerDiskDrive; import refinedstorage.inventory.InventorySimple; @@ -16,7 +17,6 @@ import refinedstorage.storage.*; import refinedstorage.tile.config.ICompareConfig; import refinedstorage.tile.config.IModeConfig; import refinedstorage.tile.config.IRedstoneModeConfig; -import refinedstorage.util.InventoryUtils; import java.util.List; @@ -62,8 +62,8 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - InventoryUtils.restoreInventory(inventory, 0, nbt); - InventoryUtils.restoreInventory(filterInventory, 1, nbt); + RefinedStorageUtils.restoreInventory(inventory, 0, nbt); + RefinedStorageUtils.restoreInventory(filterInventory, 1, nbt); if (nbt.hasKey(NBT_PRIORITY)) { priority = nbt.getInteger(NBT_PRIORITY); @@ -82,8 +82,8 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - InventoryUtils.saveInventory(inventory, 0, nbt); - InventoryUtils.saveInventory(filterInventory, 1, nbt); + RefinedStorageUtils.saveInventory(inventory, 0, nbt); + RefinedStorageUtils.saveInventory(filterInventory, 1, nbt); nbt.setInteger(NBT_PRIORITY, priority); nbt.setInteger(NBT_COMPARE, compare); diff --git a/src/main/java/refinedstorage/tile/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java index f9c5cb3c2..cb0303336 100755 --- a/src/main/java/refinedstorage/tile/TileExporter.java +++ b/src/main/java/refinedstorage/tile/TileExporter.java @@ -7,13 +7,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityHopper; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerExporter; import refinedstorage.inventory.InventorySimple; import refinedstorage.item.ItemUpgrade; import refinedstorage.tile.autocrafting.CraftingPattern; import refinedstorage.tile.config.ICompareConfig; -import refinedstorage.util.InventoryUtils; -import refinedstorage.util.UpgradeUtils; public class TileExporter extends TileMachine implements ICompareConfig { public static final String NBT_COMPARE = "Compare"; @@ -35,7 +34,7 @@ public class TileExporter extends TileMachine implements ICompareConfig { if (connectedTile instanceof IInventory) { IInventory connectedInventory = (IInventory) connectedTile; - if (ticks % UpgradeUtils.getSpeed(upgradesInventory) == 0) { + if (ticks % RefinedStorageUtils.getSpeed(upgradesInventory) == 0) { for (int i = 0; i < inventory.getSizeInventory(); ++i) { ItemStack slot = inventory.getStackInSlot(i); @@ -51,7 +50,7 @@ public class TileExporter extends TileMachine implements ICompareConfig { if (remaining != null) { controller.push(remaining); } - } else if (UpgradeUtils.hasUpgrade(upgradesInventory, ItemUpgrade.TYPE_CRAFTING)) { + } else if (RefinedStorageUtils.hasUpgrade(upgradesInventory, ItemUpgrade.TYPE_CRAFTING)) { CraftingPattern pattern = controller.getPattern(slot, compare); if (pattern != null && !controller.hasCraftingTask(pattern, compare)) { @@ -84,8 +83,8 @@ public class TileExporter extends TileMachine implements ICompareConfig { compare = nbt.getInteger(NBT_COMPARE); } - InventoryUtils.restoreInventory(inventory, 0, nbt); - InventoryUtils.restoreInventory(upgradesInventory, 1, nbt); + RefinedStorageUtils.restoreInventory(inventory, 0, nbt); + RefinedStorageUtils.restoreInventory(upgradesInventory, 1, nbt); } @Override @@ -94,8 +93,8 @@ public class TileExporter extends TileMachine implements ICompareConfig { nbt.setInteger(NBT_COMPARE, compare); - InventoryUtils.saveInventory(inventory, 0, nbt); - InventoryUtils.saveInventory(upgradesInventory, 1, nbt); + RefinedStorageUtils.saveInventory(inventory, 0, nbt); + RefinedStorageUtils.saveInventory(upgradesInventory, 1, nbt); } @Override diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java index e93ad2886..4b97e0641 100755 --- a/src/main/java/refinedstorage/tile/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java @@ -8,6 +8,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerStorage; import refinedstorage.inventory.InventorySimple; import refinedstorage.network.MessagePriorityUpdate; @@ -19,7 +20,6 @@ import refinedstorage.tile.config.ICompareConfig; import refinedstorage.tile.config.IModeConfig; import refinedstorage.tile.config.IRedstoneModeConfig; import refinedstorage.tile.config.ModeConfigUtils; -import refinedstorage.util.InventoryUtils; import java.util.List; @@ -83,7 +83,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider deep.setStoredItemCount(deep.getStoredItemType().stackSize + stack.stackSize); } } else if (connectedTile instanceof IInventory) { - InventoryUtils.pushToInventory((IInventory) connectedTile, stack); + RefinedStorageUtils.pushToInventory((IInventory) connectedTile, stack); } } @@ -96,7 +96,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider if (connectedTile instanceof IDeepStorageUnit) { IDeepStorageUnit deep = (IDeepStorageUnit) connectedTile; - if (deep.getStoredItemType() != null && InventoryUtils.compareStackNoQuantity(deep.getStoredItemType(), stack)) { + if (deep.getStoredItemType() != null && RefinedStorageUtils.compareStackNoQuantity(deep.getStoredItemType(), stack)) { if (deep.getStoredItemType().stackSize < quantity) { quantity = deep.getStoredItemType().stackSize; } @@ -114,7 +114,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider for (int i = 0; i < inventory.getSizeInventory(); ++i) { ItemStack slot = inventory.getStackInSlot(i); - if (slot != null && InventoryUtils.compareStack(slot, stack, flags)) { + if (slot != null && RefinedStorageUtils.compareStack(slot, stack, flags)) { if (quantity > slot.stackSize) { quantity = slot.stackSize; } @@ -146,7 +146,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider IDeepStorageUnit deep = (IDeepStorageUnit) connectedTile; if (deep.getStoredItemType() != null) { - if (InventoryUtils.compareStackNoQuantity(deep.getStoredItemType(), stack)) { + if (RefinedStorageUtils.compareStackNoQuantity(deep.getStoredItemType(), stack)) { return (deep.getStoredItemType().stackSize + stack.stackSize) < deep.getMaxStoredCount(); } @@ -155,7 +155,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider return stack.stackSize < deep.getMaxStoredCount(); } } else if (connectedTile instanceof IInventory) { - return InventoryUtils.canPushToInventory((IInventory) connectedTile, stack); + return RefinedStorageUtils.canPushToInventory((IInventory) connectedTile, stack); } } @@ -189,7 +189,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider buf.writeInt(deep.getStoredItemType() == null ? 0 : deep.getStoredItemType().stackSize); } else if (connectedTile instanceof IInventory) { - buf.writeInt(InventoryUtils.getInventoryItems((IInventory) connectedTile)); + buf.writeInt(RefinedStorageUtils.getInventoryItemCount((IInventory) connectedTile)); } else { buf.writeInt(0); } @@ -217,7 +217,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - InventoryUtils.restoreInventory(inventory, 0, nbt); + RefinedStorageUtils.restoreInventory(inventory, 0, nbt); if (nbt.hasKey(NBT_PRIORITY)) { priority = nbt.getInteger(NBT_PRIORITY); @@ -236,7 +236,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - InventoryUtils.saveInventory(inventory, 0, nbt); + RefinedStorageUtils.saveInventory(inventory, 0, nbt); nbt.setInteger(NBT_PRIORITY, priority); nbt.setInteger(NBT_COMPARE, compare); diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java index 5e5f8f6e5..9e7f6fe8a 100755 --- a/src/main/java/refinedstorage/tile/TileImporter.java +++ b/src/main/java/refinedstorage/tile/TileImporter.java @@ -7,12 +7,11 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerImporter; import refinedstorage.inventory.InventorySimple; import refinedstorage.tile.config.ICompareConfig; import refinedstorage.tile.config.IModeConfig; -import refinedstorage.util.InventoryUtils; -import refinedstorage.util.UpgradeUtils; public class TileImporter extends TileMachine implements ICompareConfig, IModeConfig { public static final String NBT_COMPARE = "Compare"; @@ -52,7 +51,7 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo if (stack == null) { currentSlot++; } else { - if (ticks % UpgradeUtils.getSpeed(upgradesInventory) == 0) { + if (ticks % RefinedStorageUtils.getSpeed(upgradesInventory) == 0) { ItemStack toTake = stack.copy(); toTake.stackSize = 1; @@ -78,7 +77,7 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo ItemStack stack = inventory.getStackInSlot(currentSlot); if (stack != null) { - if (ticks % UpgradeUtils.getSpeed(upgradesInventory) == 0) { + if (ticks % RefinedStorageUtils.getSpeed(upgradesInventory) == 0) { ItemStack toTake = stack.copy(); toTake.stackSize = 1; @@ -111,7 +110,7 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo if (slot != null) { slots++; - if (InventoryUtils.compareStack(stack, slot, compare)) { + if (RefinedStorageUtils.compareStack(stack, slot, compare)) { if (isWhitelist()) { return true; } else if (isBlacklist()) { @@ -176,8 +175,8 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo mode = nbt.getInteger(NBT_MODE); } - InventoryUtils.restoreInventory(inventory, 0, nbt); - InventoryUtils.restoreInventory(upgradesInventory, 1, nbt); + RefinedStorageUtils.restoreInventory(inventory, 0, nbt); + RefinedStorageUtils.restoreInventory(upgradesInventory, 1, nbt); } @Override @@ -187,8 +186,8 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo nbt.setInteger(NBT_COMPARE, compare); nbt.setInteger(NBT_MODE, mode); - InventoryUtils.saveInventory(inventory, 0, nbt); - InventoryUtils.saveInventory(upgradesInventory, 1, nbt); + RefinedStorageUtils.saveInventory(inventory, 0, nbt); + RefinedStorageUtils.saveInventory(upgradesInventory, 1, nbt); } @Override diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java index be308c1f4..b5bcc87c7 100755 --- a/src/main/java/refinedstorage/tile/TileInterface.java +++ b/src/main/java/refinedstorage/tile/TileInterface.java @@ -9,13 +9,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerInterface; import refinedstorage.inventory.InventorySimple; import refinedstorage.item.ItemUpgrade; import refinedstorage.tile.autocrafting.CraftingPattern; import refinedstorage.tile.config.ICompareConfig; -import refinedstorage.util.InventoryUtils; -import refinedstorage.util.UpgradeUtils; public class TileInterface extends TileMachine implements ICompareConfig, ISidedInventory { public static final String NBT_COMPARE = "Compare"; @@ -50,7 +49,7 @@ public class TileInterface extends TileMachine implements ICompareConfig, ISided if (slot == null) { currentSlot++; } else { - if (ticks % UpgradeUtils.getSpeed(upgradesInventory) == 0) { + if (ticks % RefinedStorageUtils.getSpeed(upgradesInventory) == 0) { ItemStack toPush = slot.copy(); toPush.stackSize = 1; @@ -68,7 +67,7 @@ public class TileInterface extends TileMachine implements ICompareConfig, ISided boolean mayTake = false; if (got != null) { - if (!InventoryUtils.compareStack(wanted, got, compare)) { + if (!RefinedStorageUtils.compareStack(wanted, got, compare)) { if (controller.push(got)) { inventory.setInventorySlotContents(i + 9, null); } @@ -98,7 +97,7 @@ public class TileInterface extends TileMachine implements ICompareConfig, ISided } } - if (UpgradeUtils.hasUpgrade(upgradesInventory, ItemUpgrade.TYPE_CRAFTING)) { + if (RefinedStorageUtils.hasUpgrade(upgradesInventory, ItemUpgrade.TYPE_CRAFTING)) { CraftingPattern pattern = controller.getPattern(wanted, compare); if (pattern != null && (took == null || took.stackSize != needed)) { @@ -135,8 +134,8 @@ public class TileInterface extends TileMachine implements ICompareConfig, ISided public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - InventoryUtils.restoreInventory(this, 0, nbt); - InventoryUtils.restoreInventory(upgradesInventory, 1, nbt); + RefinedStorageUtils.restoreInventory(this, 0, nbt); + RefinedStorageUtils.restoreInventory(upgradesInventory, 1, nbt); if (nbt.hasKey(NBT_COMPARE)) { compare = nbt.getInteger(NBT_COMPARE); @@ -147,8 +146,8 @@ public class TileInterface extends TileMachine implements ICompareConfig, ISided public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - InventoryUtils.saveInventory(this, 0, nbt); - InventoryUtils.saveInventory(upgradesInventory, 1, nbt); + RefinedStorageUtils.saveInventory(this, 0, nbt); + RefinedStorageUtils.saveInventory(upgradesInventory, 1, nbt); nbt.setInteger(NBT_COMPARE, compare); } diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java index 37a03b840..9219e6b00 100755 --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -9,13 +9,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerSolderer; import refinedstorage.inventory.InventorySimple; import refinedstorage.item.ItemUpgrade; import refinedstorage.tile.solderer.ISoldererRecipe; import refinedstorage.tile.solderer.SoldererRegistry; -import refinedstorage.util.InventoryUtils; -import refinedstorage.util.UpgradeUtils; public class TileSolderer extends TileMachine implements IInventory, ISidedInventory { public static final String NBT_WORKING = "Working"; @@ -49,7 +48,7 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven if (newRecipe == null) { reset(); } else if (newRecipe != recipe) { - boolean isSameItem = inventory.getStackInSlot(3) != null ? InventoryUtils.compareStackNoQuantity(inventory.getStackInSlot(3), newRecipe.getResult()) : false; + boolean isSameItem = inventory.getStackInSlot(3) != null ? RefinedStorageUtils.compareStackNoQuantity(inventory.getStackInSlot(3), newRecipe.getResult()) : false; if (inventory.getStackInSlot(3) == null || (isSameItem && ((inventory.getStackInSlot(3).stackSize + newRecipe.getResult().stackSize) <= inventory.getStackInSlot(3).getMaxStackSize()))) { recipe = newRecipe; @@ -59,7 +58,7 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven markDirty(); } } else if (working) { - progress += 1 + UpgradeUtils.getUpgradeCount(upgradesInventory, ItemUpgrade.TYPE_SPEED); + progress += 1 + RefinedStorageUtils.getUpgradeCount(upgradesInventory, ItemUpgrade.TYPE_SPEED); if (progress >= recipe.getDuration()) { if (inventory.getStackInSlot(3) != null) { @@ -98,8 +97,8 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - InventoryUtils.restoreInventory(this, 0, nbt); - InventoryUtils.restoreInventory(upgradesInventory, 1, nbt); + RefinedStorageUtils.restoreInventory(this, 0, nbt); + RefinedStorageUtils.restoreInventory(upgradesInventory, 1, nbt); recipe = SoldererRegistry.getRecipe(inventory); @@ -116,8 +115,8 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - InventoryUtils.saveInventory(this, 0, nbt); - InventoryUtils.saveInventory(upgradesInventory, 1, nbt); + RefinedStorageUtils.saveInventory(this, 0, nbt); + RefinedStorageUtils.saveInventory(upgradesInventory, 1, nbt); nbt.setBoolean(NBT_WORKING, working); nbt.setInteger(NBT_PROGRESS, progress); diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java index dc839882f..d2329a171 100755 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -7,6 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; +import refinedstorage.RefinedStorageUtils; import refinedstorage.block.BlockStorage; import refinedstorage.block.EnumStorageType; import refinedstorage.container.ContainerStorage; @@ -17,7 +18,6 @@ import refinedstorage.tile.config.ICompareConfig; import refinedstorage.tile.config.IModeConfig; import refinedstorage.tile.config.IRedstoneModeConfig; import refinedstorage.tile.config.ModeConfigUtils; -import refinedstorage.util.InventoryUtils; import java.util.List; @@ -54,7 +54,7 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - InventoryUtils.restoreInventory(inventory, 0, nbt); + RefinedStorageUtils.restoreInventory(inventory, 0, nbt); if (nbt.hasKey(NBT_STORAGE)) { tag = nbt.getCompoundTag(NBT_STORAGE); @@ -77,7 +77,7 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - InventoryUtils.saveInventory(inventory, 0, nbt); + RefinedStorageUtils.saveInventory(inventory, 0, nbt); nbt.setTag(NBT_STORAGE, tag); nbt.setInteger(NBT_PRIORITY, priority); diff --git a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java index 784f3971f..1da08b328 100755 --- a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java @@ -6,8 +6,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.ITextComponent; +import refinedstorage.RefinedStorageUtils; import refinedstorage.inventory.InventorySimple; -import refinedstorage.util.InventoryUtils; public class TileWirelessTransmitter extends TileMachine implements IInventory { public static final int RANGE_PER_UPGRADE = 8; @@ -28,14 +28,14 @@ public class TileWirelessTransmitter extends TileMachine implements IInventory { public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - InventoryUtils.restoreInventory(inventory, 0, nbt); + RefinedStorageUtils.restoreInventory(inventory, 0, nbt); } @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - InventoryUtils.saveInventory(inventory, 0, nbt); + RefinedStorageUtils.saveInventory(inventory, 0, nbt); } public int getRange() { diff --git a/src/main/java/refinedstorage/tile/autocrafting/CraftingPattern.java b/src/main/java/refinedstorage/tile/autocrafting/CraftingPattern.java index dea6a54d1..2f348a699 100755 --- a/src/main/java/refinedstorage/tile/autocrafting/CraftingPattern.java +++ b/src/main/java/refinedstorage/tile/autocrafting/CraftingPattern.java @@ -6,8 +6,8 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; +import refinedstorage.RefinedStorageUtils; import refinedstorage.item.ItemPattern; -import refinedstorage.util.InventoryUtils; public class CraftingPattern { public static final String NBT = "Pattern"; @@ -65,13 +65,13 @@ public class CraftingPattern { } for (int i = 0; i < inputs.length; ++i) { - if (!InventoryUtils.compareStack(inputs[i], otherPattern.getInputs()[i], flags)) { + if (!RefinedStorageUtils.compareStack(inputs[i], otherPattern.getInputs()[i], flags)) { return false; } } for (int i = 0; i < outputs.length; ++i) { - if (!InventoryUtils.compareStack(outputs[i], otherPattern.getOutputs()[i], flags)) { + if (!RefinedStorageUtils.compareStack(outputs[i], otherPattern.getOutputs()[i], flags)) { return false; } } diff --git a/src/main/java/refinedstorage/tile/autocrafting/TileCrafter.java b/src/main/java/refinedstorage/tile/autocrafting/TileCrafter.java index fcd143bc2..0f9543991 100755 --- a/src/main/java/refinedstorage/tile/autocrafting/TileCrafter.java +++ b/src/main/java/refinedstorage/tile/autocrafting/TileCrafter.java @@ -6,11 +6,11 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.ITextComponent; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerCrafter; import refinedstorage.inventory.InventorySimple; import refinedstorage.tile.TileMachine; import refinedstorage.tile.autocrafting.task.ICraftingTask; -import refinedstorage.util.InventoryUtils; public class TileCrafter extends TileMachine implements IInventory { private InventorySimple inventory = new InventorySimple("crafter", PATTERN_SLOTS + 4, this); @@ -46,14 +46,14 @@ public class TileCrafter extends TileMachine implements IInventory { public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - InventoryUtils.restoreInventory(inventory, 0, nbt); + RefinedStorageUtils.restoreInventory(inventory, 0, nbt); } @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - InventoryUtils.saveInventory(inventory, 0, nbt); + RefinedStorageUtils.saveInventory(inventory, 0, nbt); } public int getSpeed() { diff --git a/src/main/java/refinedstorage/tile/autocrafting/TileProcessingPatternEncoder.java b/src/main/java/refinedstorage/tile/autocrafting/TileProcessingPatternEncoder.java index e4f804345..4a52a1be2 100755 --- a/src/main/java/refinedstorage/tile/autocrafting/TileProcessingPatternEncoder.java +++ b/src/main/java/refinedstorage/tile/autocrafting/TileProcessingPatternEncoder.java @@ -8,10 +8,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import refinedstorage.RefinedStorageItems; +import refinedstorage.RefinedStorageUtils; import refinedstorage.inventory.InventorySimple; import refinedstorage.item.ItemPattern; import refinedstorage.tile.TileBase; -import refinedstorage.util.InventoryUtils; public class TileProcessingPatternEncoder extends TileBase implements ISidedInventory { public static final int[] FACES = new int[]{ @@ -28,16 +28,16 @@ public class TileProcessingPatternEncoder extends TileBase implements ISidedInve public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - InventoryUtils.saveInventory(inventory, 0, nbt); - InventoryUtils.saveInventory(inputsOutputsInventory, 1, nbt); + RefinedStorageUtils.saveInventory(inventory, 0, nbt); + RefinedStorageUtils.saveInventory(inputsOutputsInventory, 1, nbt); } @Override public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - InventoryUtils.restoreInventory(inventory, 0, nbt); - InventoryUtils.restoreInventory(inputsOutputsInventory, 1, nbt); + RefinedStorageUtils.restoreInventory(inventory, 0, nbt); + RefinedStorageUtils.restoreInventory(inputsOutputsInventory, 1, nbt); } @Override diff --git a/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java b/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java index ef2234fe8..89b9bc3a8 100755 --- a/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java +++ b/src/main/java/refinedstorage/tile/autocrafting/task/BasicCraftingTask.java @@ -5,9 +5,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.util.Constants; +import refinedstorage.RefinedStorageUtils; import refinedstorage.tile.TileController; import refinedstorage.tile.autocrafting.CraftingPattern; -import refinedstorage.util.NBTUtils; import java.util.ArrayList; import java.util.List; @@ -35,9 +35,9 @@ public class BasicCraftingTask implements ICraftingTask { public BasicCraftingTask(NBTTagCompound tag) { this.pattern = CraftingPattern.readFromNBT(tag.getCompoundTag(CraftingPattern.NBT)); - this.satisfied = NBTUtils.readBoolArray(tag, NBT_SATISFIED); - this.checked = NBTUtils.readBoolArray(tag, NBT_CHECKED); - this.childTasks = NBTUtils.readBoolArray(tag, NBT_CHILD_TASKS); + this.satisfied = RefinedStorageUtils.readBoolArray(tag, NBT_SATISFIED); + this.checked = RefinedStorageUtils.readBoolArray(tag, NBT_CHECKED); + this.childTasks = RefinedStorageUtils.readBoolArray(tag, NBT_CHILD_TASKS); NBTTagList tookList = tag.getTagList(NBT_TOOK, Constants.NBT.TAG_COMPOUND); @@ -106,9 +106,9 @@ public class BasicCraftingTask implements ICraftingTask { pattern.writeToNBT(patternTag); tag.setTag(CraftingPattern.NBT, patternTag); - NBTUtils.writeBoolArray(tag, NBT_SATISFIED, satisfied); - NBTUtils.writeBoolArray(tag, NBT_CHECKED, checked); - NBTUtils.writeBoolArray(tag, NBT_CHILD_TASKS, childTasks); + RefinedStorageUtils.writeBoolArray(tag, NBT_SATISFIED, satisfied); + RefinedStorageUtils.writeBoolArray(tag, NBT_CHECKED, checked); + RefinedStorageUtils.writeBoolArray(tag, NBT_CHILD_TASKS, childTasks); NBTTagList tookList = new NBTTagList(); diff --git a/src/main/java/refinedstorage/tile/autocrafting/task/ProcessingCraftingTask.java b/src/main/java/refinedstorage/tile/autocrafting/task/ProcessingCraftingTask.java index aa4326a27..6acf9717d 100755 --- a/src/main/java/refinedstorage/tile/autocrafting/task/ProcessingCraftingTask.java +++ b/src/main/java/refinedstorage/tile/autocrafting/task/ProcessingCraftingTask.java @@ -6,11 +6,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityHopper; import net.minecraft.util.text.TextFormatting; +import refinedstorage.RefinedStorageUtils; import refinedstorage.tile.TileController; import refinedstorage.tile.autocrafting.CraftingPattern; import refinedstorage.tile.autocrafting.TileCrafter; -import refinedstorage.util.InventoryUtils; -import refinedstorage.util.NBTUtils; public class ProcessingCraftingTask implements ICraftingTask { public static final int ID = 1; @@ -33,9 +32,9 @@ public class ProcessingCraftingTask implements ICraftingTask { public ProcessingCraftingTask(NBTTagCompound tag) { this.pattern = CraftingPattern.readFromNBT(tag.getCompoundTag(CraftingPattern.NBT)); - this.inserted = NBTUtils.readBoolArray(tag, NBT_INSERTED); - this.missing = NBTUtils.readBoolArray(tag, NBT_MISSING); - this.satisfied = NBTUtils.readBoolArray(tag, NBT_SATISFIED); + this.inserted = RefinedStorageUtils.readBoolArray(tag, NBT_INSERTED); + this.missing = RefinedStorageUtils.readBoolArray(tag, NBT_MISSING); + this.satisfied = RefinedStorageUtils.readBoolArray(tag, NBT_SATISFIED); } @Override @@ -84,7 +83,7 @@ public class ProcessingCraftingTask implements ICraftingTask { public boolean onInserted(ItemStack inserted) { for (int i = 0; i < pattern.getOutputs().length; ++i) { - if (!satisfied[i] && InventoryUtils.compareStackNoQuantity(inserted, pattern.getOutputs()[i])) { + if (!satisfied[i] && RefinedStorageUtils.compareStackNoQuantity(inserted, pattern.getOutputs()[i])) { satisfied[i] = true; return true; @@ -110,9 +109,9 @@ public class ProcessingCraftingTask implements ICraftingTask { pattern.writeToNBT(patternTag); tag.setTag(CraftingPattern.NBT, patternTag); - NBTUtils.writeBoolArray(tag, NBT_INSERTED, satisfied); - NBTUtils.writeBoolArray(tag, NBT_MISSING, missing); - NBTUtils.writeBoolArray(tag, NBT_SATISFIED, satisfied); + RefinedStorageUtils.writeBoolArray(tag, NBT_INSERTED, satisfied); + RefinedStorageUtils.writeBoolArray(tag, NBT_MISSING, missing); + RefinedStorageUtils.writeBoolArray(tag, NBT_SATISFIED, satisfied); tag.setInteger("Type", ID); } diff --git a/src/main/java/refinedstorage/tile/config/ModeConfigUtils.java b/src/main/java/refinedstorage/tile/config/ModeConfigUtils.java index 54180cfaa..5eccdd536 100755 --- a/src/main/java/refinedstorage/tile/config/ModeConfigUtils.java +++ b/src/main/java/refinedstorage/tile/config/ModeConfigUtils.java @@ -2,7 +2,7 @@ package refinedstorage.tile.config; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import refinedstorage.util.InventoryUtils; +import refinedstorage.RefinedStorageUtils; public class ModeConfigUtils { public static boolean doesNotViolateMode(IInventory inventory, IModeConfig mode, int compare, ItemStack stack) { @@ -15,7 +15,7 @@ public class ModeConfigUtils { if (slot != null) { slots++; - if (InventoryUtils.compareStack(slot, stack, compare)) { + if (RefinedStorageUtils.compareStack(slot, stack, compare)) { return true; } } @@ -26,7 +26,7 @@ public class ModeConfigUtils { for (int i = 0; i < inventory.getSizeInventory(); ++i) { ItemStack slot = inventory.getStackInSlot(i); - if (slot != null && InventoryUtils.compareStack(slot, stack, compare)) { + if (slot != null && RefinedStorageUtils.compareStack(slot, stack, compare)) { return false; } } diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java index 9a4367db1..9a6a07e55 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java @@ -12,6 +12,7 @@ import net.minecraft.nbt.NBTTagCompound; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageItems; +import refinedstorage.RefinedStorageUtils; import refinedstorage.block.BlockGrid; import refinedstorage.block.EnumGridType; import refinedstorage.container.ContainerGrid; @@ -24,7 +25,6 @@ import refinedstorage.network.MessageGridStoragePush; import refinedstorage.storage.ItemGroup; import refinedstorage.tile.TileMachine; import refinedstorage.tile.config.IRedstoneModeConfig; -import refinedstorage.util.InventoryUtils; import java.util.ArrayList; import java.util.List; @@ -149,7 +149,7 @@ public class TileGrid extends TileMachine implements IGrid { craftedItems += crafted.stackSize; - if (!InventoryUtils.compareStack(crafted, craftingResultInventory.getStackInSlot(0)) || craftedItems + crafted.stackSize > 64) { + if (!RefinedStorageUtils.compareStack(crafted, craftingResultInventory.getStackInSlot(0)) || craftedItems + crafted.stackSize > 64) { break; } } @@ -159,7 +159,7 @@ public class TileGrid extends TileMachine implements IGrid { if (controller != null && controller.push(craftedItem.copy())) { // NO OP } else { - InventoryUtils.dropStack(player.worldObj, craftedItem, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ()); + RefinedStorageUtils.dropStack(player.worldObj, craftedItem, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ()); } } } @@ -286,8 +286,8 @@ public class TileGrid extends TileMachine implements IGrid { public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); - InventoryUtils.restoreInventory(craftingInventory, 0, nbt); - InventoryUtils.restoreInventory(patternsInventory, 1, nbt); + RefinedStorageUtils.restoreInventory(craftingInventory, 0, nbt); + RefinedStorageUtils.restoreInventory(patternsInventory, 1, nbt); if (nbt.hasKey(NBT_SORTING_DIRECTION)) { sortingDirection = nbt.getInteger(NBT_SORTING_DIRECTION); @@ -306,8 +306,8 @@ public class TileGrid extends TileMachine implements IGrid { public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - InventoryUtils.saveInventory(craftingInventory, 0, nbt); - InventoryUtils.saveInventory(patternsInventory, 1, nbt); + RefinedStorageUtils.saveInventory(craftingInventory, 0, nbt); + RefinedStorageUtils.saveInventory(patternsInventory, 1, nbt); nbt.setInteger(NBT_SORTING_DIRECTION, sortingDirection); nbt.setInteger(NBT_SORTING_TYPE, sortingType); diff --git a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java index 69e1e65ae..08843539f 100755 --- a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java @@ -6,6 +6,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageUtils; import refinedstorage.block.EnumGridType; import refinedstorage.item.ItemWirelessGrid; import refinedstorage.network.MessageWirelessGridCraftingStart; @@ -15,7 +16,6 @@ import refinedstorage.network.MessageWirelessGridStoragePush; import refinedstorage.storage.ItemGroup; import refinedstorage.tile.TileController; import refinedstorage.tile.config.IRedstoneModeConfig; -import refinedstorage.util.HandUtils; import java.util.ArrayList; import java.util.List; @@ -83,21 +83,21 @@ public class WirelessGrid implements IGrid { @Override public void onSortingTypeChanged(int type) { - RefinedStorage.NETWORK.sendToServer(new MessageWirelessGridSettingsUpdate(HandUtils.getIdFromHand(hand), getSortingDirection(), type, getSearchBoxMode())); + RefinedStorage.NETWORK.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), getSortingDirection(), type, getSearchBoxMode())); this.sortingType = type; } @Override public void onSortingDirectionChanged(int direction) { - RefinedStorage.NETWORK.sendToServer(new MessageWirelessGridSettingsUpdate(HandUtils.getIdFromHand(hand), direction, getSortingType(), getSearchBoxMode())); + RefinedStorage.NETWORK.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), direction, getSortingType(), getSearchBoxMode())); this.sortingDirection = direction; } @Override public void onSearchBoxModeChanged(int searchBoxMode) { - RefinedStorage.NETWORK.sendToServer(new MessageWirelessGridSettingsUpdate(HandUtils.getIdFromHand(hand), getSortingDirection(), getSortingType(), searchBoxMode)); + RefinedStorage.NETWORK.sendToServer(new MessageWirelessGridSettingsUpdate(RefinedStorageUtils.getIdFromHand(hand), getSortingDirection(), getSortingType(), searchBoxMode)); this.searchBoxMode = searchBoxMode; } diff --git a/src/main/java/refinedstorage/tile/solderer/SoldererRegistry.java b/src/main/java/refinedstorage/tile/solderer/SoldererRegistry.java index 79c2cc4d0..f7ed40261 100755 --- a/src/main/java/refinedstorage/tile/solderer/SoldererRegistry.java +++ b/src/main/java/refinedstorage/tile/solderer/SoldererRegistry.java @@ -2,7 +2,7 @@ package refinedstorage.tile.solderer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import refinedstorage.util.InventoryUtils; +import refinedstorage.RefinedStorageUtils; import java.util.ArrayList; import java.util.List; @@ -19,7 +19,7 @@ public class SoldererRegistry { boolean ok = true; for (int i = 0; i < 3; ++i) { - if (!InventoryUtils.compareStackNoQuantity(recipe.getRow(i), inventory.getStackInSlot(i))) { + if (!RefinedStorageUtils.compareStackNoQuantity(recipe.getRow(i), inventory.getStackInSlot(i))) { ok = false; } @@ -40,7 +40,7 @@ public class SoldererRegistry { public static ISoldererRecipe getRecipe(ItemStack result) { for (ISoldererRecipe recipe : recipes) { - if (InventoryUtils.compareStack(result, recipe.getResult())) { + if (RefinedStorageUtils.compareStack(result, recipe.getResult())) { return recipe; } } diff --git a/src/main/java/refinedstorage/util/HandUtils.java b/src/main/java/refinedstorage/util/HandUtils.java deleted file mode 100755 index 27a2b9f13..000000000 --- a/src/main/java/refinedstorage/util/HandUtils.java +++ /dev/null @@ -1,27 +0,0 @@ -package refinedstorage.util; - -import net.minecraft.util.EnumHand; - -public class HandUtils { - public static EnumHand getHandById(int id) { - switch (id) { - case 0: - return EnumHand.MAIN_HAND; - case 1: - return EnumHand.OFF_HAND; - } - - return EnumHand.MAIN_HAND; - } - - public static int getIdFromHand(EnumHand hand) { - switch (hand) { - case MAIN_HAND: - return 0; - case OFF_HAND: - return 1; - } - - return 0; - } -} diff --git a/src/main/java/refinedstorage/util/NBTUtils.java b/src/main/java/refinedstorage/util/NBTUtils.java deleted file mode 100755 index f81e925f3..000000000 --- a/src/main/java/refinedstorage/util/NBTUtils.java +++ /dev/null @@ -1,28 +0,0 @@ -package refinedstorage.util; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagIntArray; - -public class NBTUtils { - public static void writeBoolArray(NBTTagCompound tag, String name, boolean[] arr) { - int[] intArr = new int[arr.length]; - - for (int i = 0; i < intArr.length; ++i) { - intArr[i] = arr[i] ? 1 : 0; - } - - tag.setTag(name, new NBTTagIntArray(intArr)); - } - - public static boolean[] readBoolArray(NBTTagCompound tag, String name) { - int[] intArr = tag.getIntArray(name); - - boolean arr[] = new boolean[intArr.length]; - - for (int i = 0; i < intArr.length; ++i) { - arr[i] = intArr[i] == 1 ? true : false; - } - - return arr; - } -} diff --git a/src/main/java/refinedstorage/util/UpgradeUtils.java b/src/main/java/refinedstorage/util/UpgradeUtils.java deleted file mode 100755 index 7592878a2..000000000 --- a/src/main/java/refinedstorage/util/UpgradeUtils.java +++ /dev/null @@ -1,36 +0,0 @@ -package refinedstorage.util; - -import refinedstorage.inventory.InventorySimple; -import refinedstorage.item.ItemUpgrade; - -public class UpgradeUtils { - public static int getSpeed(InventorySimple upgrades) { - return getSpeed(upgrades, 9, 2); - } - - public static int getSpeed(InventorySimple inventory, int speed, int speedIncrease) { - for (int i = 0; i < inventory.getSizeInventory(); ++i) { - if (inventory.getStackInSlot(i) != null && inventory.getStackInSlot(i).getMetadata() == ItemUpgrade.TYPE_SPEED) { - speed -= speedIncrease; - } - } - - return speed; - } - - public static boolean hasUpgrade(InventorySimple inventory, int type) { - return getUpgradeCount(inventory, type) > 0; - } - - public static int getUpgradeCount(InventorySimple inventory, int type) { - int upgrades = 0; - - for (int i = 0; i < inventory.getSizeInventory(); ++i) { - if (inventory.getStackInSlot(i) != null && inventory.getStackInSlot(i).getMetadata() == type) { - upgrades++; - } - } - - return upgrades; - } -}