From b25d8f673be72cdc90c008075e213688fde2eec9 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Tue, 30 Sep 2014 22:08:40 +0100 Subject: [PATCH 1/6] Only use the EnergyNet-related interfaces if IC2 itself is loaded. Also add some extra safety to useIC2(). Conflicts: src/main/java/mekanism/common/util/MekanismUtils.java --- .../common/IAdvancedBoundingBlock.java | 2 +- .../tile/TileEntityAdvancedBoundingBlock.java | 10 +++---- .../common/tile/TileEntityElectricBlock.java | 30 +++++++++---------- .../mekanism/common/util/MekanismUtils.java | 3 +- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/main/java/mekanism/common/IAdvancedBoundingBlock.java b/src/main/java/mekanism/common/IAdvancedBoundingBlock.java index f47f7307d..ba1ca1e7e 100644 --- a/src/main/java/mekanism/common/IAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/IAdvancedBoundingBlock.java @@ -16,7 +16,7 @@ import dan200.computercraft.api.peripheral.IPeripheral; @InterfaceList({ @Interface(iface = "buildcraft.api.power.IPowerReceptor", modid = "BuildCraftAPI|power"), - @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2API", striprefs = true), + @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHAPI|energy"), @Interface(iface = "dan200.computercraft.api.peripheral.IPeripheral", modid = "ComputerCraft") }) diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index 89ff5429b..df591a90e 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -27,7 +27,7 @@ import dan200.computercraft.api.peripheral.IPeripheral; @InterfaceList({ @Interface(iface = "buildcraft.api.power.IPowerReceptor", modid = "BuildCraftAPI|power"), - @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2API", striprefs = true), + @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHAPI|energy"), @Interface(iface = "dan200.computercraft.api.peripheral.IPeripheral", modid = "ComputerCraft") }) @@ -194,7 +194,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) { if(getInv() == null) @@ -357,7 +357,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public double getDemandedEnergy() { if(getInv() == null) @@ -369,7 +369,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public double injectEnergy(ForgeDirection directionFrom, double amount, double voltage) { if(getInv() == null) @@ -381,7 +381,7 @@ public class TileEntityAdvancedBoundingBlock extends TileEntityBoundingBlock imp } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public int getSinkTier() { if(getInv() == null) diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index 7b3d44737..8b645b7fb 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -33,8 +33,8 @@ import buildcraft.api.power.PowerHandler.PowerReceiver; import cofh.api.energy.IEnergyHandler; @InterfaceList({ - @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2API", striprefs = true), - @Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2API", striprefs = true), + @Interface(iface = "ic2.api.energy.tile.IEnergySink", modid = "IC2"), + @Interface(iface = "ic2.api.tile.IEnergyStorage", modid = "IC2"), @Interface(iface = "cofh.api.energy.IEnergyHandler", modid = "CoFHAPI|energy"), @Interface(iface = "buildcraft.api.power.IPowerReceptor", modid = "BuildCraftAPI|power"), @Interface(iface = "buildcraft.api.power.IPowerEmitter", modid = "BuildCraftAPI|power") @@ -74,7 +74,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } - @Method(modid = "IC2API") + @Method(modid = "IC2") public void register() { if(!worldObj.isRemote) @@ -87,7 +87,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } } - @Method(modid = "IC2API") + @Method(modid = "IC2") public void deregister() { if(!worldObj.isRemote) @@ -307,21 +307,21 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public int getSinkTier() { return 4; } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public void setStored(int energy) { setEnergy(energy*Mekanism.FROM_IC2); } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public int addEnergy(int amount) { setEnergy(getEnergy() + amount*Mekanism.FROM_IC2); @@ -329,7 +329,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public boolean isTeleporterCompatible(ForgeDirection side) { return getOutputtingSides().contains(side); @@ -342,35 +342,35 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) { return !getOutputtingSides().contains(direction); } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public int getStored() { return (int)Math.round(getEnergy()*Mekanism.TO_IC2); } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public int getCapacity() { return (int)Math.round(getMaxEnergy()*Mekanism.TO_IC2); } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public int getOutput() { return (int)Math.round(getMaxOutput()*Mekanism.TO_IC2); } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public double getDemandedEnergy() { return (getMaxEnergy() - getEnergy())*Mekanism.TO_IC2; @@ -383,14 +383,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public double getOutputEnergyUnitsPerTick() { return getMaxOutput()*Mekanism.TO_IC2; } @Override - @Method(modid = "IC2API") + @Method(modid = "IC2") public double injectEnergy(ForgeDirection direction, double i, double v) { if(Coord4D.get(this).getFromSide(direction).getTileEntity(worldObj) instanceof IGridTransmitter) diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 231286482..78004e571 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -76,6 +76,7 @@ import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.registry.GameData; import buildcraft.api.tools.IToolWrench; +import ic2.api.energy.EnergyNet; /** * Utilities used by Mekanism. All miscellaneous methods are located here. @@ -1208,7 +1209,7 @@ public final class MekanismUtils */ public static boolean useIC2() { - return Mekanism.hooks.IC2Loaded && !Mekanism.blacklistIC2; + return Mekanism.hooks.IC2Loaded && EnergyNet.instance != null && !Mekanism.blacklistIC2; } /** From 3c715d906b6a5f61cba0661ccacb509152077ba9 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Tue, 30 Sep 2014 22:14:16 +0100 Subject: [PATCH 2/6] Shuffle up EnergyNet support a bit. Remove the ENet's TileEntity instead of the world's one, and remove the existing one if one exists when adding the current one. Also move registration to on first tick to hopefully avoid adding too early issues. This is when IC2's delegates register so should be relatively foolproof. Conflicts: src/main/java/mekanism/common/tile/TileEntityElectricBlock.java --- src/main/java/mekanism/common/Mekanism.java | 3 -- .../common/tile/TileEntityElectricBlock.java | 28 +++++++++++++++---- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 56c8d69a0..51b67b67c 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -228,8 +228,6 @@ public class Mekanism public static Set jetpackOn = new HashSet(); public static Set gasmaskOn = new HashSet(); - public static Set ic2Registered = new HashSet(); - public static Set activeVibrators = new HashSet(); //Items @@ -1286,7 +1284,6 @@ public class Mekanism //Clear all cache data teleporters.clear(); dynamicInventories.clear(); - ic2Registered.clear(); jetpackOn.clear(); gasmaskOn.clear(); activeVibrators.clear(); diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index 8b645b7fb..5727da9fc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -1,8 +1,10 @@ package mekanism.common.tile; +import ic2.api.energy.EnergyNet; import ic2.api.energy.event.EnergyTileLoadEvent; import ic2.api.energy.event.EnergyTileUnloadEvent; import ic2.api.energy.tile.IEnergySink; +import ic2.api.energy.tile.IEnergyTile; import ic2.api.tile.IEnergyStorage; import io.netty.buffer.ByteBuf; @@ -14,6 +16,7 @@ import mekanism.api.energy.ICableOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.transmitters.IGridTransmitter; +import mekanism.common.EnergyNetwork.EnergyTransferEvent; import mekanism.common.ITileNetwork; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; @@ -50,6 +53,9 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i /** BuildCraft power handler. */ public PowerHandler powerHandler; + /** Is this registered with IC2 */ + public boolean ic2Registered = false; + /** * The base of all blocks that deal with electricity. It has a facing state, initialized state, * and a current amount of stored energy. @@ -79,10 +85,18 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i { if(!worldObj.isRemote) { - if(!Mekanism.ic2Registered.contains(Coord4D.get(this))) + TileEntity registered = EnergyNet.instance.getTileEntity(worldObj, xCoord, yCoord, zCoord); + if(registered != this) { - Mekanism.ic2Registered.add(Coord4D.get(this)); - MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this)); + if(registered instanceof IEnergyTile) + { + MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent((IEnergyTile)registered)); + } + else if(registered == null) + { + MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent(this)); + ic2Registered = true; + } } } } @@ -92,10 +106,10 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i { if(!worldObj.isRemote) { - if(Mekanism.ic2Registered.contains(Coord4D.get(this))) + TileEntity registered = EnergyNet.instance.getTileEntity(worldObj, xCoord, yCoord, zCoord); + if(registered instanceof IEnergyTile) { - Mekanism.ic2Registered.remove(Coord4D.get(this)); - MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent(this)); + MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent((IEnergyTile)registered)); } } } @@ -105,6 +119,8 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i { if(MekanismUtils.useBuildCraft()) reconfigure(); + if(!ic2Registered && MekanismUtils.useIC2()) + register(); } public EnumSet getOutputtingSides() From 3e71622d95d2154817286073f073fc17b97cb65f Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Thu, 2 Oct 2014 18:03:22 +0100 Subject: [PATCH 3/6] Update IC2 api --- src/api/java/ic2/api/Direction.java | 41 ++++++++----------- src/api/java/ic2/api/energy/IEnergyNet.java | 14 +++++++ src/api/java/ic2/api/energy/NodeStats.java | 25 +++++++++++ .../java/ic2/api/energy/tile/IEnergySink.java | 1 + .../ic2/api/info/IEnergyValueProvider.java | 3 ++ .../ic2/api/item/IElectricItemManager.java | 2 + src/api/java/ic2/api/recipe/RecipeOutput.java | 7 ++++ src/api/java/ic2/api/recipe/Recipes.java | 4 +- 8 files changed, 71 insertions(+), 26 deletions(-) create mode 100644 src/api/java/ic2/api/energy/NodeStats.java diff --git a/src/api/java/ic2/api/Direction.java b/src/api/java/ic2/api/Direction.java index 64350dd56..f0c687bbf 100644 --- a/src/api/java/ic2/api/Direction.java +++ b/src/api/java/ic2/api/Direction.java @@ -12,41 +12,39 @@ public enum Direction { /** * -X */ - XN(0), + XN, /** * +X */ - XP(1), + XP, /** * -Y */ - YN(2), //MC-Code starts with 0 here + YN, //MC-Code starts with 0 here /** * +Y */ - YP(3), // 1... + YP, // 1... /** * -Z */ - ZN(4), + ZN, /** * +Z */ - ZP(5); + ZP; - Direction(int dir1) { - this.dir = dir1; + public static Direction fromSideValue(int side) { + return directions[(side + 2) % 6]; } - /*public CoordinateTuple ApplyToCoordinates(CoordinateTuple coordinates) { - CoordinateTuple ret = new CoordinateTuple(coordinates); + public static Direction fromForgeDirection(ForgeDirection dir) { + if (dir == ForgeDirection.UNKNOWN) return null; - ret.coords[dir/2] += GetSign(); - - return ret; - }*/ + return fromSideValue(dir.ordinal()); + } /** * Get the tile entity next to a tile entity following this direction. @@ -70,7 +68,7 @@ public enum Direction { public TileEntity applyTo(World world, int x, int y, int z) { int coords[] = { x, y, z }; - coords[dir/2] += getSign(); + coords[ordinal() / 2] += getSign(); if (world != null && world.blockExists(coords[0], coords[1], coords[2])) { try { @@ -89,13 +87,7 @@ public enum Direction { * @return Inverse direction */ public Direction getInverse() { - int inverseDir = dir - getSign(); - - for (Direction direction : directions) { - if (direction.dir == inverseDir) return direction; - } - - return this; + return directions[ordinal() ^ 1]; } /** @@ -104,7 +96,7 @@ public enum Direction { * @return Minecraft side value */ public int toSideValue() { - return (dir + 4) % 6; + return (ordinal() + 4) % 6; } /** @@ -113,14 +105,13 @@ public enum Direction { * @return -1 if the direction is negative, +1 if the direction is positive */ private int getSign() { - return (dir % 2) * 2 - 1; + return (ordinal() % 2) * 2 - 1; } public ForgeDirection toForgeDirection() { return ForgeDirection.getOrientation(toSideValue()); } - private int dir; public static final Direction[] directions = Direction.values(); } diff --git a/src/api/java/ic2/api/energy/IEnergyNet.java b/src/api/java/ic2/api/energy/IEnergyNet.java index 4d07b9838..8f656e505 100644 --- a/src/api/java/ic2/api/energy/IEnergyNet.java +++ b/src/api/java/ic2/api/energy/IEnergyNet.java @@ -42,7 +42,9 @@ public interface IEnergyNet { * @note call this twice with x ticks delay to get the avg. emitted power p = (call2 - call1) / x EU/tick * * @param tileEntity energy emitter + * @deprecated Discontinued, use getNodeStats instead. */ + @Deprecated double getTotalEnergyEmitted(TileEntity tileEntity); /** @@ -51,9 +53,21 @@ public interface IEnergyNet { * @note call this twice with x ticks delay to get the avg. sunken power p = (call2 - call1) / x EU/tick * * @param tileEntity energy emitter + * @deprecated Discontinued, use getNodeStats instead. */ + @Deprecated double getTotalEnergySunken(TileEntity tileEntity); + /** + * Retrieve statistics for the tile entity specified. + * + * The statistics apply to the last simulated tick. + * + * @param te Tile entity to check. + * @return Statistics for the tile entity. + */ + NodeStats getNodeStats(TileEntity te); + /** * Determine the typical power used by the specific tier, e.g. 128 eu/t for tier 2. * diff --git a/src/api/java/ic2/api/energy/NodeStats.java b/src/api/java/ic2/api/energy/NodeStats.java new file mode 100644 index 000000000..db33da7df --- /dev/null +++ b/src/api/java/ic2/api/energy/NodeStats.java @@ -0,0 +1,25 @@ +package ic2.api.energy; + +public class NodeStats { + public NodeStats(double energyIn, double energyOut, double voltage) { + this.energyIn = energyIn; + this.energyOut = energyOut; + this.voltage = voltage; + } + + public double getEnergyIn() { + return energyIn; + } + + public double getEnergyOut() { + return energyOut; + } + + public double getVoltage() { + return voltage; + } + + protected double energyIn; + protected double energyOut; + protected double voltage; +} diff --git a/src/api/java/ic2/api/energy/tile/IEnergySink.java b/src/api/java/ic2/api/energy/tile/IEnergySink.java index 9676bff1b..4ae8e7954 100644 --- a/src/api/java/ic2/api/energy/tile/IEnergySink.java +++ b/src/api/java/ic2/api/energy/tile/IEnergySink.java @@ -24,6 +24,7 @@ public interface IEnergySink extends IEnergyAcceptor { * 1 = LV, 2 = MV, 3 = HV, 4 = EV etc. * * @note Modifying the energy net from this method is disallowed. + * @note Return Integer.MAX_VALUE to allow any voltage. * * @return tier of this energy sink */ diff --git a/src/api/java/ic2/api/info/IEnergyValueProvider.java b/src/api/java/ic2/api/info/IEnergyValueProvider.java index 178a95431..1e7b2cc57 100644 --- a/src/api/java/ic2/api/info/IEnergyValueProvider.java +++ b/src/api/java/ic2/api/info/IEnergyValueProvider.java @@ -7,6 +7,9 @@ public interface IEnergyValueProvider { * Determine the energy value for a single item in the supplied stack. * The value is used by most machines in the discharge slot. * + * This only applies to basic single use items, others are to be queried + * through e.g. ElectricItem.manager.getCharge(). + * * @param itemStack ItemStack containing the item to evaluate. * @return energy in EU */ diff --git a/src/api/java/ic2/api/item/IElectricItemManager.java b/src/api/java/ic2/api/item/IElectricItemManager.java index dfadbb26c..5de43d773 100644 --- a/src/api/java/ic2/api/item/IElectricItemManager.java +++ b/src/api/java/ic2/api/item/IElectricItemManager.java @@ -90,4 +90,6 @@ public interface IElectricItemManager { * @return tool tip string or null for none */ String getToolTip(ItemStack stack); + + // TODO: add tier getter } diff --git a/src/api/java/ic2/api/recipe/RecipeOutput.java b/src/api/java/ic2/api/recipe/RecipeOutput.java index c9474cd71..867cfa258 100644 --- a/src/api/java/ic2/api/recipe/RecipeOutput.java +++ b/src/api/java/ic2/api/recipe/RecipeOutput.java @@ -8,6 +8,8 @@ import net.minecraft.nbt.NBTTagCompound; public final class RecipeOutput { public RecipeOutput(NBTTagCompound metadata1, List items1) { + assert !items1.contains(null); + this.metadata = metadata1; this.items = items1; } @@ -16,6 +18,11 @@ public final class RecipeOutput { this(metadata1, Arrays.asList(items1)); } + @Override + public String toString() { + return "ROutput<"+items+","+metadata+">"; + } + public final List items; public final NBTTagCompound metadata; } diff --git a/src/api/java/ic2/api/recipe/Recipes.java b/src/api/java/ic2/api/recipe/Recipes.java index 2ee76fc1b..4c1259768 100644 --- a/src/api/java/ic2/api/recipe/Recipes.java +++ b/src/api/java/ic2/api/recipe/Recipes.java @@ -1,5 +1,6 @@ package ic2.api.recipe; + /** * General recipe registry. * @@ -10,6 +11,8 @@ public class Recipes { public static IMachineRecipeManager extractor; public static IMachineRecipeManager compressor; public static IMachineRecipeManager centrifuge; + public static IMachineRecipeManager blockcutter; + public static IMachineRecipeManager blastfurance; public static IMachineRecipeManager recycler; public static IMachineRecipeManager metalformerExtruding; public static IMachineRecipeManager metalformerCutting; @@ -54,5 +57,4 @@ public class Recipes { public static ISemiFluidFuelManager semiFluidGenerator; public static IFluidHeatManager FluidHeatGenerator; - } From f0b7f342b8945e52c586f532ad0c8cf667728cd7 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Thu, 2 Oct 2014 18:13:19 +0100 Subject: [PATCH 4/6] ElectricBlocks now output to IC2 properly. --- .../common/block/BlockEnergyCube.java | 11 ---- .../mekanism/common/block/BlockMachine.java | 14 ------ .../common/integration/MekanismHooks.java | 4 +- .../common/integration/OreDictManager.java | 4 +- .../common/tile/TileEntityElectricBlock.java | 50 +++++++++++++++---- .../common/block/BlockGenerator.java | 14 ------ 6 files changed, 42 insertions(+), 55 deletions(-) diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index c1b6a9c6c..e5013bb16 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -251,17 +251,6 @@ public class BlockEnergyCube extends BlockContainer implements IPeripheralProvid return itemStack; } - @Override - public void onBlockAdded(World world, int x, int y, int z) - { - TileEntity tileEntity = world.getTileEntity(x, y, z); - - if(!world.isRemote && MekanismUtils.useIC2()) - { - ((TileEntityElectricBlock)tileEntity).register(); - } - } - public ItemStack dismantleBlock(World world, int x, int y, int z, boolean returnBlock) { ItemStack itemStack = getPickBlock(null, world, x, y, z); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 59c649489..5551c4b29 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -1124,20 +1124,6 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer return true; } - @Override - public void onBlockAdded(World world, int x, int y, int z) - { - TileEntity tileEntity = world.getTileEntity(x, y, z); - - if(!world.isRemote) - { - if(tileEntity instanceof TileEntityElectricBlock && MekanismUtils.useIC2()) - { - ((TileEntityElectricBlock)tileEntity).register(); - } - } - } - public static enum MachineType { ENRICHMENT_CHAMBER(Mekanism.MachineBlock, 0, "EnrichmentChamber", 3, Mekanism.enrichmentChamberUsage*400, TileEntityEnrichmentChamber.class, true, false, true), diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index c42a8fcdd..2f2b4e09f 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -30,8 +30,6 @@ import ic2.api.recipe.Recipes; */ public final class MekanismHooks { - private Class BasicComponents; - private Class BuildCraftEnergy; public boolean IC2Loaded = false; @@ -80,7 +78,7 @@ public final class MekanismHooks } - @Method(modid = "IC2API") + @Method(modid = "IC2") public void hookIC2Recipes() { for(Map.Entry entry : Recipes.macerator.getRecipes().entrySet()) diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index 6ce3e49a6..2275ed592 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -398,7 +398,7 @@ public final class OreDictManager try { RecipeHandler.addCrusherRecipe(new ItemStack(Mekanism.Ingot, 1, 2), MekanismUtils.size(OreDictionary.getOres("dustBronze").get(0), 1)); - if(Mekanism.hooks.IC2APILoaded) + if(Mekanism.hooks.IC2Loaded) { addIC2BronzeRecipe(); } @@ -506,7 +506,7 @@ public final class OreDictManager } - @Method(modid = "IC2API") + @Method(modid = "IC2") public static void addIC2BronzeRecipe() { try { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index 5727da9fc..45163e03c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -4,6 +4,7 @@ import ic2.api.energy.EnergyNet; import ic2.api.energy.event.EnergyTileLoadEvent; import ic2.api.energy.event.EnergyTileUnloadEvent; import ic2.api.energy.tile.IEnergySink; +import ic2.api.energy.tile.IEnergySource; import ic2.api.energy.tile.IEnergyTile; import ic2.api.tile.IEnergyStorage; import io.netty.buffer.ByteBuf; @@ -16,7 +17,6 @@ import mekanism.api.energy.ICableOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.api.transmitters.IGridTransmitter; -import mekanism.common.EnergyNetwork.EnergyTransferEvent; import mekanism.common.ITileNetwork; import mekanism.common.Mekanism; import mekanism.common.util.MekanismUtils; @@ -42,7 +42,7 @@ import cofh.api.energy.IEnergyHandler; @Interface(iface = "buildcraft.api.power.IPowerReceptor", modid = "BuildCraftAPI|power"), @Interface(iface = "buildcraft.api.power.IPowerEmitter", modid = "BuildCraftAPI|power") }) -public abstract class TileEntityElectricBlock extends TileEntityContainerBlock implements ITileNetwork, IPowerEmitter, IPowerReceptor, IStrictEnergyStorage, IEnergyHandler, IEnergySink, IEnergyStorage, IStrictEnergyAcceptor, ICableOutputter +public abstract class TileEntityElectricBlock extends TileEntityContainerBlock implements ITileNetwork, IPowerEmitter, IPowerReceptor, IStrictEnergyStorage, IEnergyHandler, IEnergySink, IEnergySource, IEnergyStorage, IStrictEnergyAcceptor, ICableOutputter { /** How much energy is stored in this block. */ public double electricityStored; @@ -226,7 +226,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Method(modid = "BuildCraftAPI|power") protected void reconfigure() { - powerHandler.configure(0, (float)((getMaxEnergy()-getEnergy())*Mekanism.TO_BC), 0, (float)(getMaxEnergy()*Mekanism.TO_BC)); + powerHandler.configure(0, (float)((getMaxEnergy() - getEnergy()) * Mekanism.TO_BC), 0, (float)(getMaxEnergy() * Mekanism.TO_BC)); } @Override @@ -329,6 +329,13 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i return 4; } + @Override + @Method(modid = "IC2") + public int getSourceTier() + { + return 4; + } + @Override @Method(modid = "IC2") public void setStored(int energy) @@ -361,21 +368,28 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Method(modid = "IC2") public boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction) { - return !getOutputtingSides().contains(direction); + return getConsumingSides().contains(direction); + } + + @Override + @Method(modid = "IC2") + public boolean emitsEnergyTo(TileEntity receiver, ForgeDirection direction) + { + return getOutputtingSides().contains(direction); } @Override @Method(modid = "IC2") public int getStored() { - return (int)Math.round(getEnergy()*Mekanism.TO_IC2); + return (int)Math.round(getEnergy() * Mekanism.TO_IC2); } @Override @Method(modid = "IC2") public int getCapacity() { - return (int)Math.round(getMaxEnergy()*Mekanism.TO_IC2); + return (int)Math.round(getMaxEnergy() * Mekanism.TO_IC2); } @Override @@ -389,7 +403,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Method(modid = "IC2") public double getDemandedEnergy() { - return (getMaxEnergy() - getEnergy())*Mekanism.TO_IC2; + return (getMaxEnergy() - getEnergy()) * Mekanism.TO_IC2; + } + + @Override + @Method(modid = "IC2") + public double getOfferedEnergy() + { + return Math.min(getEnergy(), getMaxOutput()) * Mekanism.TO_IC2; } @Override @@ -402,19 +423,26 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Method(modid = "IC2") public double getOutputEnergyUnitsPerTick() { - return getMaxOutput()*Mekanism.TO_IC2; + return getMaxOutput() * Mekanism.TO_IC2; } @Override @Method(modid = "IC2") - public double injectEnergy(ForgeDirection direction, double i, double v) + public double injectEnergy(ForgeDirection direction, double amount, double voltage) { if(Coord4D.get(this).getFromSide(direction).getTileEntity(worldObj) instanceof IGridTransmitter) { - return i; + return amount; } - return i-transferEnergyToAcceptor(direction, i*Mekanism.FROM_IC2)*Mekanism.TO_IC2; + return amount-transferEnergyToAcceptor(direction, amount*Mekanism.FROM_IC2)*Mekanism.TO_IC2; + } + + @Override + @Method(modid = "IC2") + public void drawEnergy(double amount) + { + setEnergy(Math.max(getEnergy() - (amount * Mekanism.FROM_IC2), 0)); } @Override diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 0a6f9f2ac..7eb817cf4 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -493,20 +493,6 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IP return itemStack; } - @Override - public void onBlockAdded(World world, int x, int y, int z) - { - TileEntity tileEntity = world.getTileEntity(x, y, z); - - if(!world.isRemote) - { - if(tileEntity != null && MekanismUtils.useIC2()) - { - ((TileEntityElectricBlock)tileEntity).register(); - } - } - } - @Override public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { From 4f41f5a1df71e3768b75c6a29f1d4aa7a505310b Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Thu, 2 Oct 2014 18:42:04 +0100 Subject: [PATCH 5/6] Prevent IC2 double-outputting. --- .../ic2/api/energy/tile/IEnergyConductor.java | 53 +++++++++++++++++++ .../common/tile/TileEntityElectricBlock.java | 3 +- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 src/api/java/ic2/api/energy/tile/IEnergyConductor.java diff --git a/src/api/java/ic2/api/energy/tile/IEnergyConductor.java b/src/api/java/ic2/api/energy/tile/IEnergyConductor.java new file mode 100644 index 000000000..08dab8896 --- /dev/null +++ b/src/api/java/ic2/api/energy/tile/IEnergyConductor.java @@ -0,0 +1,53 @@ +package ic2.api.energy.tile; + +/** + * Tile entities which conduct energy pulses without buffering (mostly cables) have to implement this + * interface. + * + * See ic2/api/energy/usage.txt for an overall description of the energy net api. + */ +public interface IEnergyConductor extends IEnergyAcceptor, IEnergyEmitter { + /** + * Energy loss for the conductor in EU per block. + * + * @return Energy loss + */ + double getConductionLoss(); + + /** + * Amount of energy the insulation will handle before shocking nearby players and mobs. + * + * @return Insulation energy absorption in EU + */ + double getInsulationEnergyAbsorption(); + + /** + * Amount of energy the insulation will handle before it is destroyed. + * Ensure that this value is greater than the insulation energy absorption + 64. + * + * @return Insulation-destroying energy in EU + */ + double getInsulationBreakdownEnergy(); + + /** + * Amount of energy the conductor will handle before it melts. + * + * @return Conductor-destroying energy in EU + */ + double getConductorBreakdownEnergy(); + + /** + * Remove the conductor's insulation if the insulation breakdown energy was exceeded. + * + * @see #getInsulationBreakdownEnergy() + */ + void removeInsulation(); + + /** + * Remove the conductor if the conductor breakdown energy was exceeded. + * + * @see #getConductorBreakdownEnergy() + */ + void removeConductor(); +} + diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index 45163e03c..e1e2c6e0b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -3,6 +3,7 @@ package mekanism.common.tile; import ic2.api.energy.EnergyNet; import ic2.api.energy.event.EnergyTileLoadEvent; import ic2.api.energy.event.EnergyTileUnloadEvent; +import ic2.api.energy.tile.IEnergyConductor; import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergySource; import ic2.api.energy.tile.IEnergyTile; @@ -375,7 +376,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Method(modid = "IC2") public boolean emitsEnergyTo(TileEntity receiver, ForgeDirection direction) { - return getOutputtingSides().contains(direction); + return getOutputtingSides().contains(direction) && receiver instanceof IEnergyConductor; } @Override From 92a5929c2849bb58ff65e5fbd129d49e8e483cac Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Thu, 2 Oct 2014 22:16:29 +0100 Subject: [PATCH 6/6] That was not a statement. --- src/main/java/mekanism/common/item/ItemElectricBow.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java index 8c84c6ffa..0e7220702 100644 --- a/src/main/java/mekanism/common/item/ItemElectricBow.java +++ b/src/main/java/mekanism/common/item/ItemElectricBow.java @@ -20,7 +20,7 @@ public class ItemElectricBow extends ItemEnergized public ItemElectricBow() { super(120000); - this.setFull3D; + setFull3D(); } @Override