From be0198c6a1765c09ab9015fdff9dd29997449b08 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 8 Nov 2014 23:36:20 +0800 Subject: [PATCH] Ender IO now runs without the Build Craft API! --- build.gradle | 4 +- .../enderio/tool/BuildCraftToolProvider.java | 6 +++ .../java/crazypants/util/BuildcraftUtil.java | 49 +++++++++++++++++++ src/main/java/crazypants/util/FluidUtil.java | 23 +++++++-- .../java/crazypants/util/IFluidReceptor.java | 9 ++++ .../java/crazypants/util/IItemReceptor.java | 12 +++++ src/main/java/crazypants/util/ItemUtil.java | 39 ++++++++++++--- 7 files changed, 127 insertions(+), 15 deletions(-) create mode 100644 src/main/java/crazypants/util/BuildcraftUtil.java create mode 100644 src/main/java/crazypants/util/IFluidReceptor.java create mode 100644 src/main/java/crazypants/util/IItemReceptor.java diff --git a/build.gradle b/build.gradle index af626c5f..94e378e8 100644 --- a/build.gradle +++ b/build.gradle @@ -44,8 +44,8 @@ repositories { dependencies { exportedCompile 'cglib:cglib-nodep:3.1' - exportedCompile "com.mod-buildcraft:buildcraft:${buildcraft_version}:api" - + + compile "com.mod-buildcraft:buildcraft:${buildcraft_version}:api" compile "mcp.mobius.waila:Waila:${waila_version}" compile("appeng:appliedenergistics2:rv1-stable-1:dev") { exclude module: "Waila" diff --git a/src/main/java/crazypants/enderio/tool/BuildCraftToolProvider.java b/src/main/java/crazypants/enderio/tool/BuildCraftToolProvider.java index 70e241a3..d6617f51 100644 --- a/src/main/java/crazypants/enderio/tool/BuildCraftToolProvider.java +++ b/src/main/java/crazypants/enderio/tool/BuildCraftToolProvider.java @@ -10,6 +10,12 @@ public class BuildCraftToolProvider implements IToolProvider, IToolImpl { private BCWrench wrench = new BCWrench(); + public BuildCraftToolProvider() throws Exception { + //Do a check for so we throw an exception in the constructor if we dont have the + // wrench class + Class.forName("buildcraft.api.tools.IToolWrench"); + } + @Override public ITool getTool(ItemStack stack) { if(MpsUtil.instance.isPowerFistEquiped(stack) && !MpsUtil.instance.isOmniToolActive(stack)) { diff --git a/src/main/java/crazypants/util/BuildcraftUtil.java b/src/main/java/crazypants/util/BuildcraftUtil.java new file mode 100644 index 00000000..2fa77e8e --- /dev/null +++ b/src/main/java/crazypants/util/BuildcraftUtil.java @@ -0,0 +1,49 @@ +package crazypants.util; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.IFluidHandler; +import buildcraft.api.transport.IPipeTile; +import buildcraft.api.transport.IPipeTile.PipeType; + +public class BuildcraftUtil implements IItemReceptor, IFluidReceptor { + + static { + //Only register if we can actually load the IPipeTile class + try { + Class.forName("buildcraft.api.transport.IPipeTile"); + BuildcraftUtil instance = new BuildcraftUtil(); + ItemUtil.receptors.add(instance); + FluidUtil.fluidReceptors.add(instance); + } catch (Exception e) { + + } + } + + @Override + public int doInsertItem(Object into, ItemStack item, ForgeDirection side) { + if(into instanceof IPipeTile) { + return ((IPipeTile) into).injectItem(item, true, side); + } + return 0; + } + + @Override + public boolean canInsertIntoObject(Object into, ForgeDirection side) { + if(into instanceof IPipeTile) { + IPipeTile pipe = (IPipeTile) into; + return pipe.getPipeType() == PipeType.ITEM; + } + return false; + } + + @Override + public boolean isValidReceptor(IFluidHandler handler) { + if(handler instanceof IPipeTile) { + IPipeTile pipe = (IPipeTile) handler; + return pipe.getPipeType() == PipeType.FLUID; + } + return true; + } + +} diff --git a/src/main/java/crazypants/util/FluidUtil.java b/src/main/java/crazypants/util/FluidUtil.java index e6677b43..507692ce 100644 --- a/src/main/java/crazypants/util/FluidUtil.java +++ b/src/main/java/crazypants/util/FluidUtil.java @@ -16,12 +16,24 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import buildcraft.api.transport.IPipeTile; -import buildcraft.api.transport.IPipeTile.PipeType; +import cpw.mods.fml.common.Loader; +import crazypants.enderio.Log; import crazypants.enderio.conduit.IConduitBundle; public class FluidUtil { + public static final List fluidReceptors = new ArrayList(); + + static { + try { + Class.forName("crazypants.util.BuildcraftUtil"); + } catch (Exception e) { + if(Loader.isModLoaded("BuildCraft|Transport")) { + Log.warn("ItemUtil: Could not register Build Craft pipe handler. Fluid conduits will show connections to all Build Craft pipes."); + } //Don't log if BC isn't installed, but we still check in case another mod is using their API + } + } + public static Map getNeighbouringFluidHandlers(IBlockAccess world, BlockCoord bc) { Map res = new HashMap(); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { @@ -49,12 +61,13 @@ public class FluidUtil { public static IFluidHandler getFluidHandler(TileEntity te) { if(te instanceof IFluidHandler) { - if(te instanceof IPipeTile) { - if(((IPipeTile) te).getPipeType() != PipeType.FLUID) { + IFluidHandler res = (IFluidHandler) te; + for (IFluidReceptor rec : fluidReceptors) { + if(!rec.isValidReceptor(res)) { return null; } } - return (IFluidHandler) te; + return res; } return null; } diff --git a/src/main/java/crazypants/util/IFluidReceptor.java b/src/main/java/crazypants/util/IFluidReceptor.java new file mode 100644 index 00000000..cab0a0ee --- /dev/null +++ b/src/main/java/crazypants/util/IFluidReceptor.java @@ -0,0 +1,9 @@ +package crazypants.util; + +import net.minecraftforge.fluids.IFluidHandler; + +public interface IFluidReceptor { + + boolean isValidReceptor(IFluidHandler handler); + +} diff --git a/src/main/java/crazypants/util/IItemReceptor.java b/src/main/java/crazypants/util/IItemReceptor.java new file mode 100644 index 00000000..d2a0b099 --- /dev/null +++ b/src/main/java/crazypants/util/IItemReceptor.java @@ -0,0 +1,12 @@ +package crazypants.util; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; + +public interface IItemReceptor { + + boolean canInsertIntoObject(Object into, ForgeDirection side); + + int doInsertItem(Object into, ItemStack item, ForgeDirection side); + +} diff --git a/src/main/java/crazypants/util/ItemUtil.java b/src/main/java/crazypants/util/ItemUtil.java index 890c4084..81451cba 100644 --- a/src/main/java/crazypants/util/ItemUtil.java +++ b/src/main/java/crazypants/util/ItemUtil.java @@ -1,5 +1,8 @@ package crazypants.util; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.InventoryLargeChest; @@ -7,16 +10,29 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityChest; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.transport.IPipeTile; import cofh.api.transport.IItemDuct; +import cpw.mods.fml.common.Loader; +import crazypants.enderio.Log; public class ItemUtil { + public static final List receptors = new ArrayList(); + + static { + try { + Class.forName("crazypants.util.BuildcraftUtil"); + } catch (Exception e) { + if(Loader.isModLoaded("BuildCraft|Transport")) { + Log.warn("ItemUtil: Could not register Build Craft pipe handler. Machines will not be able to output to BC pipes."); + } //Don't log if BC isn't installed, but we still check in case another mod is using their API + } + } + public static String getDurabilityString(ItemStack item) { if(item == null) { return null; } - return Lang.localize("item.darkSteel.tooltip.durability") + " " + (item.getMaxDamage() - item.getItemDamage()) + "/" + item.getMaxDamage(); + return Lang.localize("item.darkSteel.tooltip.durability") + " " + (item.getMaxDamage() - item.getItemDamage()) + "/" + item.getMaxDamage(); } public static NBTTagCompound getOrCreateNBT(ItemStack stack) { @@ -36,9 +52,14 @@ public class ItemUtil { return ItemUtil.doInsertItem(getInventory((IInventory) into), item); } else if(into instanceof IItemDuct) { return ItemUtil.doInsertItem((IItemDuct) into, item, side); - } else if(into instanceof IPipeTile) { - return ((IPipeTile) into).injectItem(item, true, side); } + + for (IItemReceptor rec : receptors) { + if(rec.canInsertIntoObject(into, side)) { + return rec.doInsertItem(into, item, side); + } + } + return 0; } @@ -119,7 +140,7 @@ public class ItemUtil { toInsert.stackSize = 0; } } - if (!inv.isItemValidForSlot(slot, toInsert)) { + if(!inv.isItemValidForSlot(slot, toInsert)) { inserted = 0; } @@ -166,6 +187,7 @@ public class ItemUtil { /** * Checks if items, damage and NBT are equal and the items are stackable. + * * @param s1 * @param s2 * @return @@ -176,12 +198,13 @@ public class ItemUtil { } if(!s1.isItemEqual(s2)) { return false; - } + } return ItemStack.areItemStackTagsEqual(s1, s2); } - + /** * Checks if items, damage and NBT are equal. + * * @param s1 * @param s2 * @return @@ -192,7 +215,7 @@ public class ItemUtil { } if(!s1.isItemEqual(s2)) { return false; - } + } return ItemStack.areItemStackTagsEqual(s1, s2); }