From d7f8b1c0abce035bd49ca99771f64512f40189c6 Mon Sep 17 00:00:00 2001 From: Tom Elfring Date: Sun, 28 May 2017 11:48:57 +0200 Subject: [PATCH] Disable MineFactoryReloaded compat --- .../api/IDeepStorageUnit.java | 29 ------- .../transporter/TransporterManager.java | 9 +-- .../mekanism/common/tile/TileEntityBin.java | 76 +++++++++---------- 3 files changed, 41 insertions(+), 73 deletions(-) delete mode 100644 src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java b/src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java deleted file mode 100644 index bc84d73cb..000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java +++ /dev/null @@ -1,29 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; - -public interface IDeepStorageUnit -{ - /** - * @return A populated ItemStack with stackSize for the full amount of materials in the DSU. - * May have a stackSize > getMaxStackSize(). May have a stackSize of 0 (indicating locked contents). - */ - ItemStack getStoredItemType(); - - /** - * Sets the total amount of the item currently being stored, or zero if all items are to be removed. - */ - void setStoredItemCount(int amount); - - /** - * Sets the type of the stored item and initializes the number of stored items to amount. - * Will overwrite any existing stored items. - */ - void setStoredItemType(ItemStack type, int amount); - - /** - * @return The maximum number of items the DSU can hold. - * May change based on the current type stored. - */ - int getMaxStoredCount(); -} diff --git a/src/main/java/mekanism/common/content/transporter/TransporterManager.java b/src/main/java/mekanism/common/content/transporter/TransporterManager.java index ab8d2261c..ca9cd31ed 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterManager.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterManager.java @@ -24,7 +24,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.items.IItemHandler; -import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; public class TransporterManager { @@ -145,10 +144,10 @@ public class TransporterManager } } - if(Loader.isModLoaded("MinefactoryReloaded") && tile instanceof IDeepStorageUnit && !(tile instanceof TileEntityBin)) - { - return; - } +// if(Loader.isModLoaded("MinefactoryReloaded") && tile instanceof IDeepStorageUnit && !(tile instanceof TileEntityBin)) +// { +// return; +// } if(tile instanceof ISidedInventory) { diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 16cd9d902..1043358f5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -42,10 +42,8 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; -@Interface(iface = "powercrystals.minefactoryreloaded.api.IDeepStorageUnit", modid = "MineFactoryReloaded") -public class TileEntityBin extends TileEntityBasicBlock implements ISidedInventory, IActiveState, IDeepStorageUnit, IConfigurable, ITierUpgradeable +public class TileEntityBin extends TileEntityBasicBlock implements ISidedInventory, IActiveState, IConfigurable, ITierUpgradeable { public boolean isActive; @@ -637,41 +635,41 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento return true; } - @Override - public ItemStack getStoredItemType() - { - if(itemType == null) - { - return ItemStack.EMPTY; - } - - return MekanismUtils.size(itemType, getItemCount()); - } - - @Override - public void setStoredItemCount(int amount) - { - if(amount == 0) - { - setStoredItemType(ItemStack.EMPTY, 0); - } - - setItemCount(amount); - } - - @Override - public void setStoredItemType(ItemStack type, int amount) - { - itemType = type; - cacheCount = amount; - - topStack = ItemStack.EMPTY; - bottomStack = ItemStack.EMPTY; - - markDirty(); - } - - @Override +// @Override +// public ItemStack getStoredItemType() +// { +// if(itemType == null) +// { +// return ItemStack.EMPTY; +// } +// +// return MekanismUtils.size(itemType, getItemCount()); +// } +// +// @Override +// public void setStoredItemCount(int amount) +// { +// if(amount == 0) +// { +// setStoredItemType(ItemStack.EMPTY, 0); +// } +// +// setItemCount(amount); +// } +// +// @Override +// public void setStoredItemType(ItemStack type, int amount) +// { +// itemType = type; +// cacheCount = amount; +// +// topStack = ItemStack.EMPTY; +// bottomStack = ItemStack.EMPTY; +// +// markDirty(); +// } +// +// @Override public int getMaxStoredCount() { return tier.storage; @@ -771,4 +769,4 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento return tileEntityBin.remove(amount, simulate); } } -} \ No newline at end of file +}