diff --git a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml index f198da9f..1c4a4f81 100644 --- a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml +++ b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml @@ -31,7 +31,7 @@ sand/cobble/wood=0.1 - + @@ -42,7 +42,7 @@ sand/cobble/wood=0.1 - + @@ -53,7 +53,7 @@ sand/cobble/wood=0.1 - + @@ -63,7 +63,7 @@ sand/cobble/wood=0.1 - + @@ -73,7 +73,7 @@ sand/cobble/wood=0.1 - + @@ -83,7 +83,7 @@ sand/cobble/wood=0.1 - + @@ -104,7 +104,7 @@ sand/cobble/wood=0.1 - + @@ -114,7 +114,7 @@ sand/cobble/wood=0.1 - + @@ -123,7 +123,7 @@ sand/cobble/wood=0.1 - + @@ -132,7 +132,7 @@ sand/cobble/wood=0.1 - + @@ -142,7 +142,7 @@ sand/cobble/wood=0.1 - + @@ -152,7 +152,7 @@ sand/cobble/wood=0.1 - + @@ -162,7 +162,7 @@ sand/cobble/wood=0.1 - + @@ -178,7 +178,7 @@ sand/cobble/wood=0.1 - + @@ -188,7 +188,7 @@ sand/cobble/wood=0.1 - + @@ -198,7 +198,7 @@ sand/cobble/wood=0.1 - + diff --git a/resources/assets/enderio/config/SAGMillRecipes_Core.xml b/resources/assets/enderio/config/SAGMillRecipes_Core.xml index 95afa000..89a402bd 100644 --- a/resources/assets/enderio/config/SAGMillRecipes_Core.xml +++ b/resources/assets/enderio/config/SAGMillRecipes_Core.xml @@ -22,8 +22,8 @@ Each recipe must be named and contains one or more input item stack definition and one or more output stack definitions. For each input, all outputs are produced. - A recipe may also define the amount of energy used to complete it (in MJ). The default value used is 400 MJ. A typical - value for an ingot to dust recipe is 240 MJ. + A recipe may also define the amount of energy used to complete it. The default value used is 4000 RF. A typical + value for an ingot to dust recipe is 2400 RF. Examples: @@ -31,7 +31,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -229,7 +229,7 @@ - + @@ -239,7 +239,7 @@ - + @@ -248,7 +248,7 @@ - + @@ -258,7 +258,7 @@ - + @@ -268,7 +268,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -299,7 +299,7 @@ - + @@ -308,7 +308,7 @@ - + @@ -320,7 +320,7 @@ - + @@ -330,7 +330,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -351,7 +351,7 @@ - + @@ -362,7 +362,7 @@ - + @@ -372,7 +372,7 @@ - + @@ -386,7 +386,7 @@ - + @@ -397,7 +397,7 @@ - + @@ -406,7 +406,7 @@ - + @@ -416,7 +416,7 @@ - + @@ -425,7 +425,7 @@ - + @@ -436,7 +436,7 @@ - + @@ -445,7 +445,7 @@ - + @@ -455,7 +455,7 @@ - + @@ -464,7 +464,7 @@ - + @@ -473,7 +473,7 @@ - + @@ -482,7 +482,7 @@ - + @@ -496,7 +496,7 @@ - + @@ -509,7 +509,7 @@ - + @@ -521,7 +521,7 @@ - + @@ -530,7 +530,7 @@ - + @@ -539,7 +539,7 @@ - + @@ -548,7 +548,7 @@ - + @@ -557,7 +557,7 @@ - + @@ -571,7 +571,7 @@ - + @@ -581,7 +581,7 @@ - + @@ -590,7 +590,7 @@ - + @@ -599,7 +599,7 @@ - + @@ -611,7 +611,7 @@ - + @@ -620,7 +620,7 @@ - + @@ -634,7 +634,7 @@ - + @@ -643,7 +643,7 @@ - + @@ -652,7 +652,7 @@ - + @@ -665,7 +665,7 @@ - + @@ -673,7 +673,7 @@ - + @@ -681,7 +681,7 @@ - + @@ -689,7 +689,7 @@ - + @@ -697,7 +697,7 @@ - + @@ -705,7 +705,7 @@ - + @@ -713,7 +713,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -729,7 +729,7 @@ - + @@ -737,7 +737,7 @@ - + @@ -745,7 +745,7 @@ - + @@ -753,7 +753,7 @@ - + @@ -761,7 +761,7 @@ - + @@ -769,7 +769,7 @@ - + @@ -777,7 +777,7 @@ - + @@ -785,7 +785,7 @@ - + @@ -793,7 +793,7 @@ - + @@ -801,7 +801,7 @@ - + @@ -809,7 +809,7 @@ - + @@ -817,7 +817,7 @@ - + @@ -825,7 +825,7 @@ - + @@ -833,7 +833,7 @@ - + @@ -841,7 +841,7 @@ - + @@ -849,7 +849,7 @@ - + @@ -859,7 +859,7 @@ - + @@ -867,7 +867,7 @@ - + @@ -875,7 +875,7 @@ - + @@ -883,7 +883,7 @@ - + @@ -891,7 +891,7 @@ - + @@ -899,7 +899,7 @@ - + @@ -907,7 +907,7 @@ - + @@ -915,7 +915,7 @@ - + @@ -923,7 +923,7 @@ - + @@ -931,7 +931,7 @@ - + @@ -939,7 +939,7 @@ - + @@ -947,7 +947,7 @@ - + @@ -955,7 +955,7 @@ - + @@ -963,7 +963,7 @@ - + @@ -971,7 +971,7 @@ - + @@ -979,7 +979,7 @@ - + @@ -987,7 +987,7 @@ - + @@ -995,7 +995,7 @@ - + @@ -1003,7 +1003,7 @@ - + @@ -1011,7 +1011,7 @@ - + @@ -1019,7 +1019,7 @@ - + @@ -1027,7 +1027,7 @@ - + @@ -1035,7 +1035,7 @@ - + @@ -1043,7 +1043,7 @@ - + @@ -1051,7 +1051,7 @@ - + @@ -1059,7 +1059,7 @@ - + @@ -1067,7 +1067,7 @@ - + @@ -1075,7 +1075,7 @@ - + @@ -1083,7 +1083,7 @@ - + @@ -1091,7 +1091,7 @@ - + @@ -1099,7 +1099,7 @@ - + @@ -1107,7 +1107,7 @@ - + @@ -1115,7 +1115,7 @@ - + @@ -1123,7 +1123,7 @@ - + @@ -1131,7 +1131,7 @@ - + @@ -1139,7 +1139,7 @@ - + @@ -1147,7 +1147,7 @@ - + @@ -1155,7 +1155,7 @@ - + @@ -1163,7 +1163,7 @@ - + @@ -1173,7 +1173,7 @@ - + @@ -1181,7 +1181,7 @@ - + @@ -1189,7 +1189,7 @@ - + @@ -1197,7 +1197,7 @@ - + @@ -1205,7 +1205,7 @@ - + @@ -1213,7 +1213,7 @@ - + @@ -1221,7 +1221,7 @@ - + @@ -1229,7 +1229,7 @@ - + @@ -1237,7 +1237,7 @@ - + @@ -1245,7 +1245,7 @@ - + @@ -1253,7 +1253,7 @@ - + @@ -1261,7 +1261,7 @@ - + @@ -1269,7 +1269,7 @@ - + @@ -1277,7 +1277,7 @@ - + @@ -1285,7 +1285,7 @@ - + @@ -1293,7 +1293,7 @@ - + @@ -1301,7 +1301,7 @@ - + @@ -1309,7 +1309,7 @@ - + @@ -1317,7 +1317,7 @@ - + @@ -1325,7 +1325,7 @@ - + @@ -1333,7 +1333,7 @@ - + @@ -1341,7 +1341,7 @@ - + @@ -1349,7 +1349,7 @@ - + @@ -1357,7 +1357,7 @@ - + @@ -1365,7 +1365,7 @@ - + @@ -1373,7 +1373,7 @@ - + @@ -1381,7 +1381,7 @@ - + @@ -1389,7 +1389,7 @@ - + @@ -1397,7 +1397,7 @@ - + @@ -1405,7 +1405,7 @@ - + @@ -1413,7 +1413,7 @@ - + @@ -1421,7 +1421,7 @@ - + @@ -1429,7 +1429,7 @@ - + @@ -1437,7 +1437,7 @@ - + @@ -1445,7 +1445,7 @@ - + @@ -1453,7 +1453,7 @@ - + @@ -1461,7 +1461,7 @@ - + @@ -1469,7 +1469,7 @@ - + @@ -1477,7 +1477,7 @@ - + @@ -1490,7 +1490,7 @@ - + @@ -1501,7 +1501,7 @@ - + @@ -1512,7 +1512,7 @@ - + @@ -1525,7 +1525,7 @@ - + @@ -1534,7 +1534,7 @@ - + @@ -1544,7 +1544,7 @@ - + @@ -1552,7 +1552,7 @@ - + @@ -1563,7 +1563,7 @@ - + @@ -1571,7 +1571,7 @@ - + @@ -1583,7 +1583,7 @@ - + @@ -1594,7 +1594,7 @@ - + @@ -1603,7 +1603,7 @@ - + @@ -1611,7 +1611,7 @@ - + @@ -1619,7 +1619,7 @@ - + diff --git a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java index 2e67b677..872338d6 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java @@ -7,6 +7,7 @@ import java.util.Set; import mekanism.api.gas.IGasHandler; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; import cofh.api.transport.IItemDuct; @@ -90,5 +91,7 @@ public interface IConduitBundle extends IInternalPowerReceptor, IFluidHandler, I void setFacadeMetadata(int meta); int getFacadeMetadata(); + + World getWorldObj(); } diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index 0f2dc8ab..03216176 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -12,13 +12,10 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import buildcraft.api.power.PowerHandler; -import buildcraft.api.power.PowerHandler.PowerReceiver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -635,27 +632,6 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { // ------------ Power ----------------------------- - @Override - public void doWork(PowerHandler workProvider) { - IPowerConduit pc = getConduit(IPowerConduit.class); - if(pc != null) { - pc.doWork(workProvider); - } - } - - @Override - public PowerReceiver getPowerReceiver(ForgeDirection side) { - IPowerConduit pc = getConduit(IPowerConduit.class); - if(pc != null) { - return pc.getPowerReceiver(side); - } - return null; - } - - @Override - public World getWorld() { - return worldObj; - } @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { @@ -702,8 +678,44 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { return 0; } - // ------- Liquids ----------------------------- + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + IPowerConduit pc = getConduit(IPowerConduit.class); + if(pc != null) { + return pc.getMaxEnergyRecieved(dir); + } + return 0; + } + @Override + public int getEnergyStored() { + IPowerConduit pc = getConduit(IPowerConduit.class); + if(pc != null) { + return pc.getEnergyStored(); + } + return 0; + } + + @Override + public int getMaxEnergyStored() { + IPowerConduit pc = getConduit(IPowerConduit.class); + if(pc != null) { + return pc.getMaxEnergyStored(); + } + return 0; + } + + @Override + public void setEnergyStored(int stored) { + IPowerConduit pc = getConduit(IPowerConduit.class); + if(pc != null) { + pc.setEnergyStored(stored); + } + + } + +//------- Liquids ----------------------------- + @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { ILiquidConduit lc = getConduit(ILiquidConduit.class); diff --git a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java index 9d4417f1..a4dee7ed 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java @@ -29,12 +29,12 @@ public abstract class AbstractGasConduit extends AbstractConduit implements IGas protected boolean redstoneStateDirty = true; public IGasHandler getExternalHandler(ForgeDirection direction) { - IGasHandler con = GasUtil.getExternalGasHandler(getBundle().getWorld(), getLocation().getLocation(direction)); + IGasHandler con = GasUtil.getExternalGasHandler(getBundle().getWorldObj(), getLocation().getLocation(direction)); return (con != null && !(con instanceof IConduitBundle)) ? con : null; } public IGasHandler getTankContainer(BlockCoord bc) { - return GasUtil.getGasHandler(getBundle().getWorld(), bc); + return GasUtil.getGasHandler(getBundle().getWorldObj(), bc); } @Override diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java index 3de8b354..3ab18e39 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java @@ -280,7 +280,7 @@ public class GasConduitNetwork extends AbstractGasTankConduitNetwork if(conduits.isEmpty()) { return null; } - return conduits.get(0).getBundle().getWorld(); + return conduits.get(0).getBundle().getWorldObj(); } public void removeInput(GasOutput lo) { diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index 2b61a771..62944499 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -418,7 +418,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { @Override public IInventory getExternalInventory(ForgeDirection direction) { - World world = getBundle().getWorld(); + World world = getBundle().getWorldObj(); if(world == null) { return null; } diff --git a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java index 5b012609..740215ca 100644 --- a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java +++ b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java @@ -51,7 +51,7 @@ public class NetworkedInventory { this.con = con; this.conDir = conDir; this.location = location; - world = con.getBundle().getWorld(); + world = con.getBundle().getWorldObj(); TileEntity te = world.getTileEntity(location.x, location.y, location.z); if(te.getClass().getName().equals("tconstruct.tools.logic.CraftingStationLogic")) { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java index 67cf35b5..a9715fef 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java @@ -30,12 +30,12 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I protected boolean redstoneStateDirty = true; public IFluidHandler getExternalHandler(ForgeDirection direction) { - IFluidHandler con = FluidUtil.getExternalFluidHandler(getBundle().getWorld(), getLocation().getLocation(direction)); + IFluidHandler con = FluidUtil.getExternalFluidHandler(getBundle().getWorldObj(), getLocation().getLocation(direction)); return (con != null && !(con instanceof IConduitBundle)) ? con : null; } public IFluidHandler getTankContainer(BlockCoord bc) { - return FluidUtil.getFluidHandler(getBundle().getWorld(), bc); + return FluidUtil.getFluidHandler(getBundle().getWorldObj(), bc); } @Override diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java index ddbe6428..05c7bb54 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java @@ -303,7 +303,7 @@ public class AdvancedLiquidConduitNetwork extends AbstractTankConduitNetwork= 0) { // NB: use ceil to ensure we dont through away any energy due to // rounding // errors - float give = (float) Math.ceil(con.getCapacitor().getMaxEnergyStored() * filledRatio); + int give = (int)Math.ceil(con.getCapacitor().getMaxEnergyStored() * filledRatio); give = Math.min(give, con.getCapacitor().getMaxEnergyStored()); give = Math.min(give, energyLeft); con.setEnergyStored(give); @@ -537,7 +537,7 @@ public class NetworkPowerManager { use = Math.min(use, amount); use = Math.min(use, entry.canExtract); entry.capBank.addEnergy(-use); - trackerRecieve(entry.emmiter, (float) use, true); + trackerRecieve(entry.emmiter, use, true); amount -= use; if(amount == 0) { return; diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java index 57d2496d..2822eca7 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java @@ -17,9 +17,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.power.PowerHandler; -import buildcraft.api.power.PowerHandler.PowerReceiver; -import buildcraft.api.power.PowerHandler.Type; import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.AbstractConduit; import crazypants.enderio.conduit.AbstractConduitNetwork; @@ -91,10 +88,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { protected PowerConduitNetwork network; - private PowerHandler powerHandler; - private PowerHandler noInputPH; - - private float energyStored; + private int energyStoredRF; private int subtype; @@ -112,7 +106,6 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { public PowerConduit(int meta) { this.subtype = meta; - //powerHandler = createPowerHandlerForType(); } @Override @@ -165,10 +158,6 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { return CAPACITORS[subtype]; } - private PowerHandler createPowerHandlerForType() { - return PowerHandlerUtil.createHandler(CAPACITORS[subtype], this, Type.PIPE); - } - @Override public void setExtractionRedstoneMode(RedstoneControlMode mode, ForgeDirection dir) { rsModes.put(dir, mode); @@ -203,7 +192,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { public void writeToNBT(NBTTagCompound nbtRoot) { super.writeToNBT(nbtRoot); nbtRoot.setShort("subtype", (short) subtype); - nbtRoot.setFloat("energyStored", energyStored); + nbtRoot.setInteger("energyStoredRF", energyStoredRF); for (Entry entry : rsModes.entrySet()) { if(entry.getValue() != null) { @@ -225,7 +214,11 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { super.readFromNBT(nbtRoot, nbtVersion); subtype = nbtRoot.getShort("subtype"); - energyStored = Math.min(getCapacitor().getMaxEnergyStored(), nbtRoot.getFloat("energyStored")); + if(nbtRoot.hasKey("energyStored")) { + nbtRoot.setInteger("energyStored", (int)(nbtRoot.getFloat("energyStored") * 10)); + + } + energyStoredRF = Math.min(getCapacitor().getMaxEnergyStored(), nbtRoot.getInteger("energyStoredRF")); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { String key = "pRsMode." + dir.name(); @@ -246,43 +239,20 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { } @Override - public void onTick() { - if(powerHandler != null && powerHandler.getEnergyStored() > 0) { - energyStored = (float) Math.min(energyStored + powerHandler.getEnergyStored(), getCapacitor().getMaxEnergyStored()); - powerHandler.setEnergy(0); - } + public void onTick() { } @Override - public float getEnergyStored() { - return energyStored; + public int getEnergyStored() { + return energyStoredRF; } @Override - public void setEnergyStored(float energyStored) { - this.energyStored = energyStored; - } - - @Override - public PowerReceiver getPowerReceiver(ForgeDirection side) { - ConnectionMode mode = getConectionMode(side); - if(side == null || mode == ConnectionMode.OUTPUT || mode == ConnectionMode.DISABLED || !isRedstoneEnabled(side)) { - if(noInputPH == null) { - noInputPH = new PowerHandler(this, Type.PIPE); - noInputPH.configure(0, 0, 0, getOrCreatePowerHandler().getMaxEnergyStored()); - } - return noInputPH.getPowerReceiver(); - } - return getOrCreatePowerHandler().getPowerReceiver(); - } - - private PowerHandler getOrCreatePowerHandler() { - if(powerHandler == null) { - powerHandler = createPowerHandlerForType(); - } - return powerHandler; + public void setEnergyStored(int energyStored) { + this.energyStoredRF = energyStored; } + private boolean isRedstoneEnabled(ForgeDirection dir) { boolean result; RedstoneControlMode mode = getExtractionRedstoneMode(dir); @@ -327,7 +297,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { } @Override - public float getMaxEnergyRecieved(ForgeDirection dir) { + public int getMaxEnergyRecieved(ForgeDirection dir) { ConnectionMode mode = getConectionMode(dir); if(mode == ConnectionMode.OUTPUT || mode == ConnectionMode.DISABLED || !isRedstoneEnabled(dir)) { return 0; @@ -336,7 +306,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { } @Override - public float getMaxEnergyExtracted(ForgeDirection dir) { + public int getMaxEnergyExtracted(ForgeDirection dir) { ConnectionMode mode = getConectionMode(dir); if(mode == ConnectionMode.INPUT || mode == ConnectionMode.DISABLED || !isRedstoneEnabled(dir)) { return 0; @@ -348,11 +318,11 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { } private boolean recievedRfThisTick(ForgeDirection dir) { - if(recievedTicks == null || dir == null || recievedTicks.get(dir) == null || getBundle() == null || getBundle().getWorld() == null) { + if(recievedTicks == null || dir == null || recievedTicks.get(dir) == null || getBundle() == null || getBundle().getWorldObj() == null) { return false; } - long curTick = getBundle().getWorld().getTotalWorldTime(); + long curTick = getBundle().getWorldObj().getTotalWorldTime(); long recT = recievedTicks.get(dir); if(curTick - recT <= 5) { return true; @@ -360,15 +330,6 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { return false; } - @Override - public void doWork(PowerHandler workProvider) { - } - - @Override - public World getWorld() { - return getBundle().getEntity().getWorldObj(); - } - @Override public boolean onNeighborBlockChange(Block blockId) { redstoneStateDirty = true; @@ -389,20 +350,20 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { if(getMaxEnergyRecieved(from) == 0 || maxReceive <= 0) { return 0; } - float freeSpace = getCapacitor().getMaxEnergyStored() - energyStored; - int result = (int) Math.min(maxReceive / 10, freeSpace); + float freeSpace = getCapacitor().getMaxEnergyStored() - energyStoredRF; + int result = (int) Math.min(maxReceive, freeSpace); if(!simulate && result > 0) { - energyStored += result; + energyStoredRF += result; if(getBundle() != null) { if(recievedTicks == null) { recievedTicks = new EnumMap(ForgeDirection.class); } - recievedTicks.put(from, getBundle().getWorld().getTotalWorldTime()); + recievedTicks.put(from, getBundle().getWorldObj().getTotalWorldTime()); } } - return result * 10; + return result; } @Override @@ -417,7 +378,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { @Override public int getEnergyStored(ForgeDirection from) { - return (int) (energyStored * 10); + return energyStoredRF; } @Override @@ -533,7 +494,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { } @Override - public double getMaxEnergyStored() { + public int getMaxEnergyStored() { return CAPACITORS[subtype].getMaxEnergyStored(); } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java index 4df15851..fe880d68 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java @@ -20,7 +20,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.power.IPowerEmitter; import cofh.api.tileentity.IRedstoneControl; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -284,8 +283,7 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula private static Collection> getConectableInterfaces() { if(CONNECTABLE_CLASSES == null) { - CONNECTABLE_CLASSES = new HashSet>(); - CONNECTABLE_CLASSES.add(IPowerEmitter.class); + CONNECTABLE_CLASSES = new HashSet>(); CONNECTABLE_CLASSES.add(IRedstoneControl.class); CONNECTABLE_CLASSES.add(AbstractMachineEntity.class); try{ diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 3a53ffb4..add8ce76 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -204,9 +204,9 @@ public final class Config { public static boolean addFurnaceFuelTootip = true; public static boolean addDurabilityTootip = true; - public static float farmContinuousEnergyUse = 4; - public static float farmActionEnergyUse = 50; - public static float farmAxeActionEnergyUse = 100; + public static int farmContinuousEnergyUseRF = 40; + public static int farmActionEnergyUseRF = 500; + public static int farmAxeActionEnergyUseRF = 1000; public static int farmDefaultSize = 3; public static boolean farmAxeDamageOnLeafBreak = false; @@ -219,7 +219,7 @@ public final class Config { public static boolean useCombustionGenModel = false; - public static int crafterMjPerCraft = 250; + public static int crafterRfPerCraft = 2500; public static int capacitorBankMaxIoRF = 5000; public static int capacitorBankMaxStorageRF = 5000000; @@ -624,13 +624,12 @@ public final class Config { addFurnaceFuelTootip = config.get(sectionPersonal.name, "addFurnaceFuelTootip", addFuelTooltipsToAllFluidContainers, "If true, adds burn duration tooltips to furnace fuels").getBoolean(addFurnaceFuelTootip); - farmContinuousEnergyUse = (float) config.get(sectionFarm.name, "farmContinuousEnergyUse", farmContinuousEnergyUse, - "The amount of power used by a farm per tick ").getDouble(farmContinuousEnergyUse); - farmActionEnergyUse = (float) config.get(sectionFarm.name, "farmActionEnergyUse", farmActionEnergyUse, - "The amount of power used by a farm per action (eg plant, till, harvest) ").getDouble(farmActionEnergyUse); - - farmAxeActionEnergyUse= (float) config.get(sectionFarm.name, "farmAxeActionEnergyUse", farmAxeActionEnergyUse, - "The amount of power used by a farm per wood block 'chopped'").getDouble(farmAxeActionEnergyUse); + farmContinuousEnergyUseRF = config.get(sectionFarm.name, "farmContinuousEnergyUseRF", farmContinuousEnergyUseRF, + "The amount of power used by a farm per tick ").getInt(farmContinuousEnergyUseRF); + farmActionEnergyUseRF = config.get(sectionFarm.name, "farmActionEnergyUseRF", farmActionEnergyUseRF, + "The amount of power used by a farm per action (eg plant, till, harvest) ").getInt(farmActionEnergyUseRF); + farmAxeActionEnergyUseRF= config.get(sectionFarm.name, "farmAxeActionEnergyUseRF", farmAxeActionEnergyUseRF, + "The amount of power used by a farm per wood block 'chopped'").getInt(farmAxeActionEnergyUseRF); farmDefaultSize = config.get(sectionFarm.name, "farmDefaultSize", farmDefaultSize, "The number of blocks a farm will extend from its center").getInt(farmDefaultSize); @@ -657,8 +656,8 @@ public final class Config { useCombustionGenModel = config.get(sectionAesthetic.name, "useCombustionGenModel", useCombustionGenModel, "If set to true: WIP Combustion Generator model will be used").getBoolean(useCombustionGenModel); - crafterMjPerCraft = config.get("AutoCrafter Settings", "crafterMjPerCraft", crafterMjPerCraft, - "MJ used per autocrafted recipe").getInt(crafterMjPerCraft); + crafterRfPerCraft = config.get("AutoCrafter Settings", "crafterRfPerCraft", crafterRfPerCraft, + "RF used per autocrafted recipe").getInt(crafterRfPerCraft); poweredSpawnerMinDelayTicks = config.get(sectionSpawner.name, "poweredSpawnerMinDelayTicks", poweredSpawnerMinDelayTicks, "Min tick delay between spawns for a non-upgraded spawner").getInt(poweredSpawnerMinDelayTicks); diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index b357db34..b40872be 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -115,7 +115,7 @@ public class TooltipAddera { if(fuel != null) { if(showAdvancedTooltips()) { list.add(Lang.localize("fuel.tooltip.heading")); - list.add(EnumChatFormatting.ITALIC + " " + PowerDisplayUtil.formatPowerPerTick(fuel.powerPerCycle)); + list.add(EnumChatFormatting.ITALIC + " " + PowerDisplayUtil.formatPowerPerTick( (int)(fuel.powerPerCycle * 10) )); list.add(EnumChatFormatting.ITALIC + " " + fuel.totalBurningTime + " " + Lang.localize("fuel.tooltip.burnTime")); } else { addShowDetailsTooltip(list); diff --git a/src/main/java/crazypants/enderio/item/ItemMagnet.java b/src/main/java/crazypants/enderio/item/ItemMagnet.java index 291774ef..19639ebd 100644 --- a/src/main/java/crazypants/enderio/item/ItemMagnet.java +++ b/src/main/java/crazypants/enderio/item/ItemMagnet.java @@ -20,7 +20,6 @@ import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.power.PowerDisplayUtil; -import crazypants.enderio.machine.power.PowerDisplayUtil.PowerType; import crazypants.util.ItemUtil; public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipProvider { @@ -99,8 +98,8 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) { super.addInformation(itemStack, par2EntityPlayer, list, par4); - String str = PowerDisplayUtil.formatPower(PowerType.RF, getEnergyStored(itemStack)) + "/" - + PowerDisplayUtil.formatPower(PowerType.RF, getMaxEnergyStored(itemStack)) + " " + PowerDisplayUtil.abrevation(); + String str = PowerDisplayUtil.formatPower(getEnergyStored(itemStack)) + "/" + + PowerDisplayUtil.formatPower(getMaxEnergyStored(itemStack)) + " " + PowerDisplayUtil.abrevation(); list.add(str); } diff --git a/src/main/java/crazypants/enderio/machine/alloy/BasicAlloyRecipe.java b/src/main/java/crazypants/enderio/machine/alloy/BasicAlloyRecipe.java index 1180e93d..cc17939c 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/BasicAlloyRecipe.java +++ b/src/main/java/crazypants/enderio/machine/alloy/BasicAlloyRecipe.java @@ -17,7 +17,7 @@ public class BasicAlloyRecipe implements IAlloyRecipe { public static final int DEFAULT_ENERGY_USE = 1200; - private float energyRequired = DEFAULT_ENERGY_USE; + private int energyRequired = DEFAULT_ENERGY_USE; private ItemStack output; private float expPerItem; @@ -196,7 +196,7 @@ public class BasicAlloyRecipe implements IAlloyRecipe { } @Override - public float getEnergyRequired() { + public int getEnergyRequired() { return energyRequired; } diff --git a/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java b/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java index 6a4704ae..9264e36a 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java +++ b/src/main/java/crazypants/enderio/machine/alloy/VanillaSmeltingRecipe.java @@ -21,9 +21,9 @@ import crazypants.enderio.machine.recipe.RecipeOutput; public class VanillaSmeltingRecipe implements IMachineRecipe { // We will use the same energy as per a standard furnace. - // To do the conversion between fuel burning and MJ, use the Stirling Gen - // which produces one MJ per tick of burn time - private static float MJ_PER_ITEM = TileEntityFurnace.getItemBurnTime(new ItemStack(Items.coal, 1, 0)) / 8; + // To do the conversion between fuel burning and RF, use the Stirling Gen + // which produces ten RF per tick of burn time + private static int RF_PER_ITEM = TileEntityFurnace.getItemBurnTime(new ItemStack(Items.coal, 1, 0)) * 10 / 8 ; private boolean enabled = true; @@ -43,9 +43,9 @@ public class VanillaSmeltingRecipe implements IMachineRecipe { } @Override - public float getEnergyRequired(MachineRecipeInput... inputs) { + public int getEnergyRequired(MachineRecipeInput... inputs) { int numInputs = getNumInputs(inputs); - return numInputs * MJ_PER_ITEM; + return numInputs * RF_PER_ITEM; } private int getNumInputs(MachineRecipeInput[] inputs) { @@ -165,7 +165,7 @@ public class VanillaSmeltingRecipe implements IMachineRecipe { List result = new ArrayList(); Map metaList = FurnaceRecipes.smelting().getSmeltingList(); for (Entry entry : metaList.entrySet()) { - result.add(new Recipe(new RecipeInput(entry.getKey()), MJ_PER_ITEM, new RecipeOutput(entry.getValue()))); + result.add(new Recipe(new RecipeInput(entry.getKey()), RF_PER_ITEM, new RecipeOutput(entry.getValue()))); } return result; } diff --git a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java index 8bc0f024..b76ff052 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java @@ -84,8 +84,8 @@ public class TileCrafter extends AbstractMachineEntity { craftingGrid.copyRequiredInputs(required); if(hasRequiredInput(required)) { craftRecipe(); - double used = Math.min(powerHandler.getEnergyStored(), Config.crafterMjPerCraft); - powerHandler.setEnergy(powerHandler.getEnergyStored() - used); + int used = Math.min(getEnergyStored(), Config.crafterRfPerCraft); + setEnergyStored(getEnergyStored() - used); } return false; } diff --git a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java index 971c118f..cfb6a72f 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java @@ -180,11 +180,11 @@ public class CrusherRecipeManager { Log.info("Finished processing Alloy Smelter recipes. " + recipes.size() + " recipes avaliable."); } - public void addRecipe(ItemStack input, float energyCost, ItemStack output) { + public void addRecipe(ItemStack input, int energyCost, ItemStack output) { addRecipe(input, energyCost, new RecipeOutput(output, 1)); } - public void addRecipe(ItemStack input, float energyCost, RecipeOutput... output) { + public void addRecipe(ItemStack input, int energyCost, RecipeOutput... output) { if(input == null || output == null) { return; } diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index 9f20aa3e..e4674c65 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -13,7 +13,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.power.PowerHandler.Type; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; @@ -30,7 +29,6 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; -import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.BlockCoord; import crazypants.util.Lang; import crazypants.util.Util; @@ -64,9 +62,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /* public TileFarmStation() { super(new SlotDefinition(6, 4, 1)); - currentTask = createTask(); - powerHandler = PowerHandlerUtil.createHandler(cap, this, Type.MACHINE); - + currentTask = createTask(); } public int getFarmSize() { @@ -75,9 +71,9 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /* public void actionPerformed(boolean isAxe) { if(isAxe) { - usePower(Config.farmAxeActionEnergyUse); + usePower(Config.farmAxeActionEnergyUseRF); } else { - usePower(Config.farmActionEnergyUse); + usePower(Config.farmActionEnergyUseRF); } } @@ -521,7 +517,6 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /* break; } tier = capacitorType.ordinal(); - powerHandler.configure(cap.getMinEnergyReceived(), cap.getMaxEnergyReceived(), cap.getMinActivationEnergy(), cap.getMaxEnergyStored()); currentTask = createTask(); } @@ -531,8 +526,8 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /* } @Override - public float getPowerUsePerTick() { - return Math.round(Config.farmContinuousEnergyUse * (getFarmSize()/(float)Config.farmDefaultSize )); + public int getPowerUsePerTick() { + return Math.round(Config.farmContinuousEnergyUseRF * (getFarmSize()/(float)Config.farmDefaultSize )); } @Override diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java index 9c01e7a7..e295857a 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java @@ -59,7 +59,7 @@ public class PlantableFarmer implements IFarmerJoe { } IPlantable plantable = (IPlantable) seedStack.getItem(); - EnumPlantType type = plantable.getPlantType(farm.getWorld(), bc.x, bc.y, bc.z); + EnumPlantType type = plantable.getPlantType(farm.getWorldObj(), bc.x, bc.y, bc.z); if(type == null) { return false; } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java index 6926c5a3..1116012b 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java @@ -48,16 +48,16 @@ public class StemFarmer extends CustomSeedFarmer { harvestCoord = harvestCoord.getLocation(ForgeDirection.UP); if(plantedBlock == farm.getBlock(harvestCoord) && farm.hasDefaultHarvestTool()) { res.harvestedBlocks.add(harvestCoord); - ArrayList drops = plantedBlock.getDrops(farm.getWorld(), harvestCoord.x, harvestCoord.y, harvestCoord.z, meta, farm.getMaxLootingValue()); + ArrayList drops = plantedBlock.getDrops(farm.getWorldObj(), harvestCoord.x, harvestCoord.y, harvestCoord.z, meta, farm.getMaxLootingValue()); if(drops != null) { for(ItemStack drop : drops) { - res.drops.add(new EntityItem(farm.getWorld(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, drop.copy())); + res.drops.add(new EntityItem(farm.getWorldObj(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, drop.copy())); } } farm.damageMaxLootingItem(1, harvestCoord, farm.getBlock(harvestCoord)); farm.actionPerformed(false); - farm.getWorld().setBlockToAir(harvestCoord.x, harvestCoord.y, harvestCoord.z); + farm.getWorldObj().setBlockToAir(harvestCoord.x, harvestCoord.y, harvestCoord.z); } else { done = true; } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java index 8da30dd2..b827967f 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java @@ -107,10 +107,10 @@ public class TreeFarmer implements IFarmerJoe { BlockCoord coord = res.harvestedBlocks.get(i); Block blk = farm.getBlock(coord); - ArrayList drops = blk.getDrops(farm.getWorld(), bc.x, bc.y, bc.z, farm.getBlockMeta(coord), farm.getAxeLootingValue()); + ArrayList drops = blk.getDrops(farm.getWorldObj(), bc.x, bc.y, bc.z, farm.getBlockMeta(coord), farm.getAxeLootingValue()); if(drops != null) { for (ItemStack drop : drops) { - res.drops.add(new EntityItem(farm.getWorld(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, drop.copy())); + res.drops.add(new EntityItem(farm.getWorldObj(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, drop.copy())); } } boolean isWood = true; @@ -123,7 +123,7 @@ public class TreeFarmer implements IFarmerJoe { if(canDropApple) { if(farm.getWorldObj().rand.nextInt(200) == 0) { - res.drops.add(new EntityItem(farm.getWorld(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, new ItemStack(Items.apple))); + res.drops.add(new EntityItem(farm.getWorldObj(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, new ItemStack(Items.apple))); } } }