From eca3be2e637970a55efaa90a06c11457eca7424f Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 16 Nov 2014 20:08:53 -0800 Subject: [PATCH] #232 make BuildCraft @Optional statements more specific --- src/main/java/forestry/apiculture/gadgets/TileAlveary.java | 2 +- src/main/java/forestry/apiculture/gadgets/TileApiary.java | 2 +- src/main/java/forestry/core/gadgets/TileForestry.java | 6 +++--- src/main/java/forestry/core/gadgets/TilePowered.java | 2 +- src/main/java/forestry/energy/gadgets/EngineCopper.java | 2 +- src/main/java/forestry/factory/gadgets/MachineBottler.java | 2 +- .../java/forestry/factory/gadgets/MachineCentrifuge.java | 2 +- .../java/forestry/factory/gadgets/MachineFermenter.java | 2 +- .../java/forestry/factory/gadgets/MachineMoistener.java | 2 +- src/main/java/forestry/factory/gadgets/MachineRaintank.java | 2 +- src/main/java/forestry/farming/gadgets/TileHatch.java | 2 +- src/main/java/forestry/mail/gadgets/MachineMailbox.java | 2 +- src/main/java/forestry/mail/gadgets/MachineTrader.java | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/forestry/apiculture/gadgets/TileAlveary.java b/src/main/java/forestry/apiculture/gadgets/TileAlveary.java index 0aed6db2a..3a5e28143 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileAlveary.java +++ b/src/main/java/forestry/apiculture/gadgets/TileAlveary.java @@ -249,7 +249,7 @@ public abstract class TileAlveary extends TileForestry implements IAlvearyCompon } /* ITRIGGERPROVIDER */ - @Optional.Method(modid = "BuildCraft|Core") + @Optional.Method(modid = "BuildCraftAPI|statements") @Override public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { LinkedList res = new LinkedList(); diff --git a/src/main/java/forestry/apiculture/gadgets/TileApiary.java b/src/main/java/forestry/apiculture/gadgets/TileApiary.java index 4b806386f..d3466ab38 100755 --- a/src/main/java/forestry/apiculture/gadgets/TileApiary.java +++ b/src/main/java/forestry/apiculture/gadgets/TileApiary.java @@ -346,7 +346,7 @@ public class TileApiary extends TileBeehouse implements ISidedInventory { // } /* ITRIGGERPROVIDER */ - @Optional.Method(modid = "BuildCraft|Core") + @Optional.Method(modid = "BuildCraftAPI|statements") @Override public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { LinkedList res = new LinkedList(); diff --git a/src/main/java/forestry/core/gadgets/TileForestry.java b/src/main/java/forestry/core/gadgets/TileForestry.java index 5f5315f12..a4fa057bb 100755 --- a/src/main/java/forestry/core/gadgets/TileForestry.java +++ b/src/main/java/forestry/core/gadgets/TileForestry.java @@ -42,7 +42,7 @@ import net.minecraftforge.common.util.ForgeDirection; import java.util.Collection; -@Optional.Interface(iface = "buildcraft.api.statements.ITriggerProvider", modid = "BuildCraft|Core") +@Optional.Interface(iface = "buildcraft.api.statements.ITriggerProvider", modid = "BuildCraftAPI|statements") public abstract class TileForestry extends TileEntity implements INetworkedEntity, IOwnable, IErrorSource, ITriggerProvider { protected boolean isInited = false; @@ -153,13 +153,13 @@ public abstract class TileForestry extends TileEntity implements INetworkedEntit } /* ITriggerProvider */ - @Optional.Method(modid = "BuildCraft|Core") + @Optional.Method(modid = "BuildCraftAPI|statements") @Override public Collection getInternalTriggers(IStatementContainer container) { return null; } - @Optional.Method(modid = "BuildCraft|Core") + @Optional.Method(modid = "BuildCraftAPI|statements") @Override public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { return null; diff --git a/src/main/java/forestry/core/gadgets/TilePowered.java b/src/main/java/forestry/core/gadgets/TilePowered.java index 5591d69a5..0805bd7da 100644 --- a/src/main/java/forestry/core/gadgets/TilePowered.java +++ b/src/main/java/forestry/core/gadgets/TilePowered.java @@ -26,7 +26,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; -@Optional.Interface(iface = "buildcraft.api.tiles.IHasWork", modid = "BuildCraft|Core") +@Optional.Interface(iface = "buildcraft.api.tiles.IHasWork", modid = "BuildCraftAPI|tiles") public abstract class TilePowered extends TileBase implements IRenderableMachine, IPowerHandler, IHasWork { public static int WORK_CYCLES = 4; diff --git a/src/main/java/forestry/energy/gadgets/EngineCopper.java b/src/main/java/forestry/energy/gadgets/EngineCopper.java index 66783503d..3e4691db1 100755 --- a/src/main/java/forestry/energy/gadgets/EngineCopper.java +++ b/src/main/java/forestry/energy/gadgets/EngineCopper.java @@ -500,7 +500,7 @@ public class EngineCopper extends Engine implements ISpecialInventory, ISidedInv } /* ITRIGGERPROVIDER */ - @Optional.Method(modid = "BuildCraft|Core") + @Optional.Method(modid = "BuildCraftAPI|statements") @Override public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { LinkedList res = new LinkedList(); diff --git a/src/main/java/forestry/factory/gadgets/MachineBottler.java b/src/main/java/forestry/factory/gadgets/MachineBottler.java index abb7b3b17..7e7dec2ab 100755 --- a/src/main/java/forestry/factory/gadgets/MachineBottler.java +++ b/src/main/java/forestry/factory/gadgets/MachineBottler.java @@ -505,7 +505,7 @@ public class MachineBottler extends TilePowered implements ISidedInventory, ILiq } /* ITRIGGERPROVIDER */ - @Optional.Method(modid = "BuildCraft|Core") + @Optional.Method(modid = "BuildCraftAPI|statements") @Override public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { LinkedList res = new LinkedList(); diff --git a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java index c0b2f53be..75995c5bb 100755 --- a/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java +++ b/src/main/java/forestry/factory/gadgets/MachineCentrifuge.java @@ -472,7 +472,7 @@ public class MachineCentrifuge extends TilePowered implements ISidedInventory, I } /* ITRIGGERPROVIDER */ - @Optional.Method(modid = "BuildCraft|Core") + @Optional.Method(modid = "BuildCraftAPI|statements") @Override public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { LinkedList res = new LinkedList(); diff --git a/src/main/java/forestry/factory/gadgets/MachineFermenter.java b/src/main/java/forestry/factory/gadgets/MachineFermenter.java index 51e501c43..afd999f0d 100755 --- a/src/main/java/forestry/factory/gadgets/MachineFermenter.java +++ b/src/main/java/forestry/factory/gadgets/MachineFermenter.java @@ -685,7 +685,7 @@ public class MachineFermenter extends TilePowered implements ISidedInventory, IL } /* ITRIGGERPROVIDER */ - @Optional.Method(modid = "BuildCraft|Core") + @Optional.Method(modid = "BuildCraftAPI|statements") @Override public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { LinkedList res = new LinkedList(); diff --git a/src/main/java/forestry/factory/gadgets/MachineMoistener.java b/src/main/java/forestry/factory/gadgets/MachineMoistener.java index 33b64ded6..d4433e8fe 100755 --- a/src/main/java/forestry/factory/gadgets/MachineMoistener.java +++ b/src/main/java/forestry/factory/gadgets/MachineMoistener.java @@ -737,7 +737,7 @@ public class MachineMoistener extends TileBase implements ISpecialInventory, ISi } /* ITRIGGERPROVIDER */ - @Optional.Method(modid = "BuildCraft|Core") + @Optional.Method(modid = "BuildCraftAPI|statements") @Override public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { LinkedList res = new LinkedList(); diff --git a/src/main/java/forestry/factory/gadgets/MachineRaintank.java b/src/main/java/forestry/factory/gadgets/MachineRaintank.java index 33bc77014..921e188c9 100755 --- a/src/main/java/forestry/factory/gadgets/MachineRaintank.java +++ b/src/main/java/forestry/factory/gadgets/MachineRaintank.java @@ -323,7 +323,7 @@ public class MachineRaintank extends TileBase implements ISidedInventory, ILiqui } /* ITRIGGERPROVIDER */ - @Optional.Method(modid = "BuildCraft|Core") + @Optional.Method(modid = "BuildCraftAPI|statements") @Override public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { LinkedList res = new LinkedList(); diff --git a/src/main/java/forestry/farming/gadgets/TileHatch.java b/src/main/java/forestry/farming/gadgets/TileHatch.java index 89f882fa4..52ca9b219 100755 --- a/src/main/java/forestry/farming/gadgets/TileHatch.java +++ b/src/main/java/forestry/farming/gadgets/TileHatch.java @@ -329,7 +329,7 @@ public class TileHatch extends TileFarm implements ISidedInventory { } /* ITRIGGERPROVIDER */ - @Optional.Method(modid = "BuildCraft|Core") + @Optional.Method(modid = "BuildCraftAPI|statements") @Override public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { if (!hasMaster()) diff --git a/src/main/java/forestry/mail/gadgets/MachineMailbox.java b/src/main/java/forestry/mail/gadgets/MachineMailbox.java index ae2c4ccce..39fb314fb 100755 --- a/src/main/java/forestry/mail/gadgets/MachineMailbox.java +++ b/src/main/java/forestry/mail/gadgets/MachineMailbox.java @@ -118,7 +118,7 @@ public class MachineMailbox extends TileBase implements IMailContainer, ISpecial } /* ITRIGGERPROVIDER */ - @Optional.Method(modid = "BuildCraft|Core") + @Optional.Method(modid = "BuildCraftAPI|statements") @Override public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { LinkedList res = new LinkedList(); diff --git a/src/main/java/forestry/mail/gadgets/MachineTrader.java b/src/main/java/forestry/mail/gadgets/MachineTrader.java index 0c3357ddf..224a2d780 100755 --- a/src/main/java/forestry/mail/gadgets/MachineTrader.java +++ b/src/main/java/forestry/mail/gadgets/MachineTrader.java @@ -378,7 +378,7 @@ public class MachineTrader extends TileBase implements ISidedInventory { } /* ITRIGGERPROVIDER */ - @Optional.Method(modid = "BuildCraft|Core") + @Optional.Method(modid = "BuildCraftAPI|statements") @Override public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { LinkedList res = new LinkedList();