diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index caee96aa..2e7bb67d 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -4,15 +4,15 @@ Version 2.0.4 Changes - Added silent dark steel pressure plates - Add basic WAILA plugin (tterrag) -- Re-balanced/reduced Stirling Generator output -- Updated zh_TW.lang (mymagadsl) -- Register ingot storage blocks to Ore Dictionary (Alexander Hess) -- Added enlightened fused quartz to the oredict as hardened glass (Tonius) +- Re-balanced/reduced Stirling Generator output - Increased default power use of powered spawner - Hootch can now be made with apples - Nutrient Distillation can be made with skulls (highest output), other sources output reduced - Upgraded farms now have a higher continuous power use -- Farmer harvesting logs now uses more power than harvesting other crops (values in config) +- Farmer harvesting logs now uses more power than harvesting other crops (values in config) +- Updated zh_TW.lang (mymagadsl) +- Register ingot storage blocks to Ore Dictionary (Alexander Hess) +- Added enlightened fused quartz to the oredict as hardened glass (Tonius) Bugs - #935 Machines can be accessed and modified regardless of cauldron world guard settings diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index f39be345..fd7bb542 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -1,7 +1,6 @@ //*** Ender IO *****// //Power -enderio.power.mj=MJ enderio.power.rf=RF enderio.power.tick=/t enderio.power.maxOutput=Max Output diff --git a/src/main/java/crazypants/enderio/conduit/power/IPowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/IPowerConduit.java index b95ccabf..256c2341 100644 --- a/src/main/java/crazypants/enderio/conduit/power/IPowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/IPowerConduit.java @@ -22,9 +22,9 @@ public interface IPowerConduit extends IConduit, IInternalPowerReceptor, IExtrac ICapacitor getCapacitor(); - float getMaxEnergyExtracted(ForgeDirection dir); + int getMaxEnergyExtracted(ForgeDirection dir); - float getMaxEnergyRecieved(ForgeDirection dir); + int getMaxEnergyRecieved(ForgeDirection dir); IIcon getTextureForInputMode(); @@ -33,13 +33,13 @@ public interface IPowerConduit extends IConduit, IInternalPowerReceptor, IExtrac //called from NetworkPowerManager void onTick(); - //mj - float getEnergyStored(); + + int getEnergyStored(); void setEnergyStored(float give); boolean getConnectionsDirty(); - double getMaxEnergyStored(); + int getMaxEnergyStored(); } diff --git a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java index 250a244a..66b52215 100644 --- a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java +++ b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java @@ -10,7 +10,6 @@ import java.util.Set; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.power.IPowerEmitter; import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent; import crazypants.enderio.Log; import crazypants.enderio.conduit.ConduitNetworkTickHandler; @@ -28,8 +27,8 @@ public class NetworkPowerManager { private PowerConduitNetwork network; int maxEnergyStored; - float energyStored; - private float reserved; + int energyStored; + private int reserved; private int updateRenderTicks = 10; private int inactiveTicks = 100; @@ -67,35 +66,35 @@ public class NetworkPowerManager { return networkPowerTracker; } - public float getPowerInConduits() { + public int getPowerInConduits() { return energyStored; } - public float getMaxPowerInConduits() { + public int getMaxPowerInConduits() { return maxEnergyStored; } - public float getPowerInCapacitorBanks() { + public int getPowerInCapacitorBanks() { if(capSupply == null) { return 0; } return capSupply.stored; } - public float getMaxPowerInCapacitorBanks() { + public int getMaxPowerInCapacitorBanks() { if(capSupply == null) { return 0; } return capSupply.maxCap; } - public float getPowerInReceptors() { - float result = 0; + public int getPowerInReceptors() { + int result = 0; Set done = new HashSet(); for (ReceptorEntry re : receptors) { if(!re.emmiter.getConnectionsDirty()) { IPowerInterface powerReceptor = re.powerInterface; - if(!done.contains(powerReceptor.getDelegate()) && !(powerReceptor.getDelegate() instanceof IPowerEmitter)) { + if(!done.contains(powerReceptor.getDelegate())) { done.add(powerReceptor.getDelegate()); result += powerReceptor.getEnergyStored(re.direction); } @@ -104,13 +103,13 @@ public class NetworkPowerManager { return result; } - public float getMaxPowerInReceptors() { - float result = 0; + public int getMaxPowerInReceptors() { + int result = 0; Set done = new HashSet(); for (ReceptorEntry re : receptors) { if(!re.emmiter.getConnectionsDirty()) { IPowerInterface powerReceptor = re.powerInterface; - if(!done.contains(powerReceptor.getDelegate()) && !(powerReceptor.getDelegate() instanceof IPowerEmitter)) { + if(!done.contains(powerReceptor.getDelegate())) { done.add(powerReceptor.getDelegate()); result += powerReceptor.getMaxEnergyStored(re.direction); } @@ -141,8 +140,8 @@ public class NetworkPowerManager { int appliedCount = 0; int numReceptors = receptors.size(); - float available = energyStored + capSupply.canExtract; - float wasAvailable = available; + int available = energyStored + capSupply.canExtract; + int wasAvailable = available; if(available <= 0 || (receptors.isEmpty() && storageReceptors.isEmpty())) { trackerEndTick(); @@ -159,19 +158,19 @@ public class NetworkPowerManager { IPowerInterface pp = r.powerInterface; if(pp != null) { - float used = 0; + int used = 0; if(pp.getClass() == PowerInterfaceRF.class) { - float canOffer = Math.min(r.emmiter.getMaxEnergyExtracted(r.direction), available); + int canOffer = Math.min(r.emmiter.getMaxEnergyExtracted(r.direction), available); used = pp.recieveEnergy(r.direction.getOpposite(), canOffer); trackerSend(r.emmiter, used, false); } else { - float reservedForEntry = removeReservedEnergy(r); + int reservedForEntry = removeReservedEnergy(r); available += reservedForEntry; - float canOffer = Math.min(r.emmiter.getMaxEnergyExtracted(r.direction), available); - float requested = pp.getPowerRequest(r.direction.getOpposite()); + int canOffer = Math.min(r.emmiter.getMaxEnergyExtracted(r.direction), available); + int requested = pp.getPowerRequest(r.direction.getOpposite()); // If it is possible to supply the minimum amount of energy if(pp.getMinEnergyReceived(r.direction) <= r.emmiter.getMaxEnergyExtracted(r.direction) && requested > 0) { @@ -193,12 +192,12 @@ public class NetworkPowerManager { appliedCount++; } - float used = wasAvailable - available; + int used = wasAvailable - available; // use all the capacator storage first energyStored -= used; if(!capSupply.capBanks.isEmpty()) { - float capBankChange = 0; + int capBankChange = 0; if(energyStored < 0) { // not enough so get the rest from the capacitor bank capBankChange = energyStored; @@ -298,17 +297,17 @@ public class NetworkPowerManager { } } - private float removeReservedEnergy(ReceptorEntry r) { + private int removeReservedEnergy(ReceptorEntry r) { StarveBuffer starveBuf = starveBuffers.remove(r.coord); if(starveBuf == null) { return 0; } - float result = starveBuf.stored; + int result = starveBuf.stored; reserved -= result; return result; } - private void reserveEnergy(ReceptorEntry r, float amount) { + private void reserveEnergy(ReceptorEntry r, int amount) { starveBuffers.put(r.coord, new StarveBuffer(amount)); reserved += amount; } @@ -399,9 +398,9 @@ public class NetworkPowerManager { private static class StarveBuffer { - float stored; + int stored; - public StarveBuffer(float stored) { + public StarveBuffer(int stored) { this.stored = stored; } @@ -411,7 +410,7 @@ public class NetworkPowerManager { } - private double minAbs(double amount, double limit) { + private int minAbs(int amount, int limit) { if(amount < 0) { return Math.max(amount, -limit); } else { @@ -421,13 +420,13 @@ public class NetworkPowerManager { private class CapBankSupply { - float canExtract; - float canFill; + int canExtract; + int canFill; Set capBanks = new HashSet(); float filledRatio; - float stored = 0; - float maxCap = 0; + int stored = 0; + int maxCap = 0; List enteries = new ArrayList(); @@ -462,14 +461,13 @@ public class NetworkPowerManager { maxToBalance += cb.getMaxEnergyStored(); } - double canGet = 0; - + int canGet = 0; if(cb.isOutputEnabled(rec.direction.getOpposite())) { canGet = Math.min(cb.getEnergyStored(), cb.getMaxOutput()); canGet = Math.min(canGet, rec.emmiter.getMaxEnergyRecieved(rec.direction)); canExtract += canGet; } - double canFill = 0; + int canFill = 0; if(cb.isInputEnabled(rec.direction.getOpposite())) { canFill = Math.min(cb.getMaxEnergyStored() - cb.getEnergyStored(), cb.getMaxInput()); canFill = Math.min(canFill, rec.emmiter.getMaxEnergyExtracted(rec.direction)); @@ -481,7 +479,7 @@ public class NetworkPowerManager { filledRatio = 0; if(maxToBalance > 0) { - filledRatio = toBalance / maxToBalance; + filledRatio = (float)toBalance / maxToBalance; } } @@ -503,23 +501,23 @@ public class NetworkPowerManager { } } - float toalTransferAmount = Math.min(canAdd, canRemove); + int toalTransferAmount = Math.min(canAdd, canRemove); for (int i = 0; i < enteries.size() && toalTransferAmount > 0; i++) { CapBankSupplyEntry from = enteries.get(i); if(from.emmiter.getConectionMode(from.direction) == ConnectionMode.IN_OUT) { - double amount = from.toBalance; + int amount = from.toBalance; amount = minAbs(amount, toalTransferAmount); from.capBank.addEnergy(amount); toalTransferAmount -= Math.abs(amount); - double toTranfser = Math.abs(amount); + int toTranfser = Math.abs(amount); for (int j = i + 1; j < enteries.size() && toTranfser > 0; j++) { CapBankSupplyEntry to = enteries.get(j); if(Math.signum(amount) != Math.signum(to.toBalance)) { - double toAmount = Math.min(toTranfser, Math.abs(to.toBalance)); - to.capBank.addEnergy(toAmount * Math.signum(to.toBalance)); + int toAmount = Math.min(toTranfser, Math.abs(to.toBalance)); + to.capBank.addEnergy(toAmount * (int)Math.signum(to.toBalance)); toTranfser -= toAmount; } } @@ -528,17 +526,17 @@ public class NetworkPowerManager { } - void remove(float amount) { + void remove(int amount) { if(canExtract <= 0 || amount <= 0) { return; } float ratio = amount / canExtract; for (CapBankSupplyEntry entry : enteries) { - double use = Math.ceil(ratio * entry.canExtract); + int use = (int)Math.ceil(ratio * entry.canExtract); use = Math.min(use, amount); use = Math.min(use, entry.canExtract); - entry.capBank.addEnergy(-(float) use); + entry.capBank.addEnergy(-use); trackerRecieve(entry.emmiter, (float) use, true); amount -= use; if(amount == 0) { @@ -547,18 +545,18 @@ public class NetworkPowerManager { } } - void add(float amount) { + void add(int amount) { if(canFill <= 0 || amount <= 0) { return; } float ratio = amount / canFill; for (CapBankSupplyEntry entry : enteries) { - double add = (int) Math.ceil(ratio * entry.canFill); + int add = (int) Math.ceil(ratio * entry.canFill); add = Math.min(add, entry.canFill); add = Math.min(add, amount); - entry.capBank.addEnergy((float) add); - trackerSend(entry.emmiter, (float) add, true); + entry.capBank.addEnergy(add); + trackerSend(entry.emmiter, add, true); amount -= add; if(amount == 0) { return; @@ -571,13 +569,13 @@ public class NetworkPowerManager { private static class CapBankSupplyEntry { final TileCapacitorBank capBank; - final double canExtract; - final double canFill; - double toBalance; + final int canExtract; + final int canFill; + int toBalance; IPowerConduit emmiter; ForgeDirection direction; - private CapBankSupplyEntry(TileCapacitorBank capBank, double available, double canFill, IPowerConduit emmiter, ForgeDirection direction) { + private CapBankSupplyEntry(TileCapacitorBank capBank, int available, int canFill, IPowerConduit emmiter, ForgeDirection direction) { this.capBank = capBank; this.canExtract = available; this.canFill = canFill; @@ -586,7 +584,7 @@ public class NetworkPowerManager { } void calcToBalance(float targetRatio) { - float targetAmount = capBank.getMaxEnergyStored() * targetRatio; + int targetAmount = (int)Math.floor(capBank.getMaxEnergyStored() * targetRatio); toBalance = targetAmount - capBank.getEnergyStored(); if(toBalance < 0) { toBalance = Math.max(toBalance, -canExtract); diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerTracker.java b/src/main/java/crazypants/enderio/conduit/power/PowerTracker.java index 120c7bd5..f7be04ca 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerTracker.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerTracker.java @@ -10,9 +10,9 @@ public class PowerTracker { private final TickTracker sentTracker = new TickTracker(); - private float sentThisTick = 0; + private int sentThisTick = 0; - private float recievedThisTick = 0; + private int recievedThisTick = 0; public void tickStart(float storedEnergy) { double curStorage = storedEnergy; @@ -24,15 +24,15 @@ public class PowerTracker { } } - public void powerRecieved(float power) { + public void powerRecieved(int power) { recievedThisTick += power; } - public void powerSent(float power) { + public void powerSent(int power) { sentThisTick += power; } - public void tickEnd(float storedEnergy) { + public void tickEnd(int storedEnergy) { previousStorageLevel = storedEnergy; sentTracker.tick(sentThisTick); recTracker.tick(recievedThisTick); @@ -40,12 +40,12 @@ public class PowerTracker { sentThisTick = 0; } - public float getAverageMjTickRecieved() { - return recTracker.getMJT(); + public float getAverageRfTickRecieved() { + return recTracker.getRFT(); } - public float getAverageMjTickSent() { - return sentTracker.getMJT(); + public float getAverageRfTickSent() { + return sentTracker.getRFT(); } private static class TickTracker { @@ -54,7 +54,7 @@ public class PowerTracker { private int index = 0; private LimitedQueue lastFiveSeconds = new LimitedQueue(5); - float getMJT() { + float getRFT() { int numTicks = index + (lastFiveSeconds.size() * 20); if(numTicks == 0) { return 0; @@ -66,7 +66,7 @@ public class PowerTracker { return totalPower / numTicks; } - void tick(float power) { + void tick(int power) { lastSecondTotal += power; index++; if(index == 20) { diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 79ef35ca..3a53ffb4 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -75,11 +75,11 @@ public final class Config { public static double transceiverEnergyLoss = 0.1; - public static double transceiverUpkeepCost = 0.25; + public static int transceiverUpkeepCostRF = 2; - public static double transceiverBucketTransmissionCost = 1; + public static int transceiverBucketTransmissionCostRF = 10; - public static int transceiverMaxIO = 2048; + public static int transceiverMaxIoRF = 20480; public static File configDirectory; @@ -92,8 +92,6 @@ public final class Config { public static boolean useSneakMouseWheelYetaWrench = true; public static boolean useSneakRightClickYetaWrench = false; - public static boolean useRfAsDefault = true; - public static boolean itemConduitUsePhyscialDistance = false; public static int enderFluidConduitExtractRate = 200; @@ -190,13 +188,15 @@ public final class Config { public static int rocketFuelPowerTotalBurnTime = 7000; public static int fireWaterPowerPerCycle = 8; public static int fireWaterPowerTotalBurnTime = 15000; - public static float vatPowerUserPerTick = 2; + public static int vatPowerUserPerTickRF = 20; - public static double maxPhotovoltaicOutput = 1.0; - public static double maxPhotovoltaicAdvancedOutput = 4.0; + public static int maxPhotovoltaicOutputRF = 10; + public static int maxPhotovoltaicAdvancedOutputRF = 40; - public static double zombieGeneratorMjPerTick = 8.0; + public static int zombieGeneratorRfPerTick = 80; public static int zombieGeneratorTicksPerBucketFuel = 10000; + + public static int stirlingGeneratorBaseRfPerTick = 20; public static boolean combustionGeneratorUseOpaqueModel = true; @@ -221,19 +221,21 @@ public final class Config { public static int crafterMjPerCraft = 250; - public static int capacitorBankMaxIoMJ = 500; - public static int capacitorBankMaxStorageMJ = 500000; + public static int capacitorBankMaxIoRF = 5000; + public static int capacitorBankMaxStorageRF = 5000000; public static int poweredSpawnerMinDelayTicks = 200; public static int poweredSpawnerMaxDelayTicks = 800; - public static float poweredSpawnerLevelOnePowerPerTick = 25; - public static float poweredSpawnerLevelTwoPowerPerTick = 75; - public static float poweredSpawnerLevelThreePowerPerTick = 150; + public static int poweredSpawnerLevelOnePowerPerTickRF = 250; + public static int poweredSpawnerLevelTwoPowerPerTickRF = 750; + public static int poweredSpawnerLevelThreePowerPerTickRF = 1500; public static int poweredSpawnerMaxPlayerDistance = 0; public static boolean poweredSpawnerUseVanillaSpawChecks = false; public static double brokenSpawnerDropChance = 1; public static int powerSpawnerAddSpawnerCost = 30; + public static int painterEnergyPerTaskRF = 2000; + public static double vacuumChestRange = 6; public static boolean useModMetals = true; @@ -260,10 +262,10 @@ public final class Config { public static String[] soulVesselBlackList = new String[0]; public static boolean soulVesselCapturesBosses = false; - public static double soulBinderLevelOnePowerPerTick = 50; - public static double soulBinderLevelTwoPowerPerTick = 100; - public static double soulBinderLevelThreePowerPerTick = 200; - public static int soulBinderMjForBrokenSpawner = 250000; + public static int soulBinderLevelOnePowerPerTickRF = 500; + public static int soulBinderLevelTwoPowerPerTickRF = 1000; + public static int soulBinderLevelThreePowerPerTickRF = 2000; + public static int soulBinderBrokenSpawnerRF = 2500000; public static void load(FMLPreInitializationEvent event) { @@ -300,15 +302,15 @@ public final class Config { } public static void processConfig(Configuration config) { - useRfAsDefault = config - .get(sectionPower.name, "displayPowerAsRedstoneFlux", useRfAsDefault, "If true, all power is displayed in RF, otherwise MJ is used.") - .getBoolean(useRfAsDefault); - - capacitorBankMaxIoMJ = config.get(sectionPower.name, "capacitorBankMaxIoMJ", capacitorBankMaxIoMJ, "The maximum IO for a single capacitor in MJ/t") - .getInt(capacitorBankMaxIoMJ); - capacitorBankMaxStorageMJ = config.get(sectionPower.name, "capacitorBankMaxStorageMJ", capacitorBankMaxStorageMJ, - "The maximum storage for a single capacitor in MJ") - .getInt(capacitorBankMaxStorageMJ); + + capacitorBankMaxIoRF = config.get(sectionPower.name, "capacitorBankMaxIoRF", capacitorBankMaxIoRF, "The maximum IO for a single capacitor in RF/t") + .getInt(capacitorBankMaxIoRF); + capacitorBankMaxStorageRF = config.get(sectionPower.name, "capacitorBankMaxStorageRF", capacitorBankMaxStorageRF, + "The maximum storage for a single capacitor in RF") + .getInt(capacitorBankMaxStorageRF); + + painterEnergyPerTaskRF = config.get(sectionPower.name, "painterEnergyPerTaskRF", painterEnergyPerTaskRF, "The total amount of RF required to paint one block") + .getInt(painterEnergyPerTaskRF); useHardRecipes = config.get(sectionRecipe.name, "useHardRecipes", useHardRecipes, "When enabled machines cost significantly more.") .getBoolean(useHardRecipes); @@ -329,10 +331,10 @@ public final class Config { "If set to false: Photovoltaic Cells will not be craftable.") .getBoolean(photovoltaicCellEnabled); - maxPhotovoltaicOutput = config.get(sectionPower.name, "maxPhotovoltaicOutput", maxPhotovoltaicOutput, - "Maximum output in MJ/t of the Photovoltaic Panels.").getDouble(maxPhotovoltaicOutput); - maxPhotovoltaicAdvancedOutput = config.get(sectionPower.name, "maxPhotovoltaicAdvancedOutput", maxPhotovoltaicAdvancedOutput, - "Maximum output in MJ/t of the Advanced Photovoltaic Panels.").getDouble(maxPhotovoltaicAdvancedOutput); + maxPhotovoltaicOutputRF = config.get(sectionPower.name, "maxPhotovoltaicOutputRF", maxPhotovoltaicOutputRF, + "Maximum output in RF/t of the Photovoltaic Panels.").getInt(maxPhotovoltaicOutputRF); + maxPhotovoltaicAdvancedOutputRF = config.get(sectionPower.name, "maxPhotovoltaicAdvancedOutputRF", maxPhotovoltaicAdvancedOutputRF, + "Maximum output in RF/t of the Advanced Photovoltaic Panels.").getInt(maxPhotovoltaicAdvancedOutputRF); useAlternateBinderRecipe = config.get(sectionRecipe.name, "useAlternateBinderRecipe", false, "Create conduit binder in crafting table instead of furnace") .getBoolean(useAlternateBinderRecipe); @@ -374,15 +376,15 @@ public final class Config { .getBoolean(false); transceiverEnergyLoss = config.get(sectionPower.name, "transceiverEnergyLoss", transceiverEnergyLoss, "Amount of energy lost when transfered by Dimensional Transceiver; 0 is no loss, 1 is 100% loss").getDouble(transceiverEnergyLoss); - transceiverUpkeepCost = config.get(sectionPower.name, "transceiverUpkeepCost", transceiverUpkeepCost, - "Number of MJ/t required to keep a Dimensional Transceiver connection open").getDouble(transceiverUpkeepCost); - transceiverMaxIO = config.get(sectionPower.name, "transceiverMaxIO", transceiverMaxIO, - "Maximum MJ/t sent and recieved by a Dimensional Transceiver per tick. Input and output limits are not cumulative").getInt(transceiverMaxIO); - transceiverBucketTransmissionCost = config.get(sectionEfficiency.name, "transceiverBucketTransmissionCost", transceiverBucketTransmissionCost, - "The cost in MJ of transporting a bucket of fluid via a Dimensional Transceiver.").getDouble(transceiverBucketTransmissionCost); + transceiverUpkeepCostRF = config.get(sectionPower.name, "transceiverUpkeepCostRF", transceiverUpkeepCostRF, + "Number of RF/t required to keep a Dimensional Transceiver connection open").getInt(transceiverUpkeepCostRF); + transceiverMaxIoRF = config.get(sectionPower.name, "transceiverMaxIoRF", transceiverMaxIoRF, + "Maximum MJ/t sent and recieved by a Dimensional Transceiver per tick. Input and output limits are not cumulative").getInt(transceiverMaxIoRF); + transceiverBucketTransmissionCostRF = config.get(sectionEfficiency.name, "transceiverBucketTransmissionCostRF", transceiverBucketTransmissionCostRF, + "The cost in MJ of transporting a bucket of fluid via a Dimensional Transceiver.").getInt(transceiverBucketTransmissionCostRF); - vatPowerUserPerTick = (float) config.get(sectionPower.name, "vatPowerUserPerTick", vatPowerUserPerTick, - "Power use (MJ/t) used by the vat.").getDouble(vatPowerUserPerTick); + vatPowerUserPerTickRF = config.get(sectionPower.name, "vatPowerUserPerTickRF", vatPowerUserPerTickRF, + "Power use (RF/t) used by the vat.").getInt(vatPowerUserPerTickRF); detailedPowerTrackingEnabled = config .get( @@ -604,10 +606,14 @@ public final class Config { fireWaterPowerTotalBurnTime = config.get(sectionPower.name, "fireWaterPowerTotalBurnTime", fireWaterPowerTotalBurnTime, "The total burn time. Examples: BC Oil = 5000, BC Fuel = 25000").getInt(fireWaterPowerTotalBurnTime); - zombieGeneratorMjPerTick = config.get(sectionPower.name, "zombieGeneratorMjPerTick", zombieGeneratorMjPerTick, - "The amount of power generated per tick.").getDouble(zombieGeneratorMjPerTick); + zombieGeneratorRfPerTick = config.get(sectionPower.name, "zombieGeneratorRfPerTick", zombieGeneratorRfPerTick, + "The amount of power generated per tick.").getInt(zombieGeneratorRfPerTick); zombieGeneratorTicksPerBucketFuel = config.get(sectionPower.name, "zombieGeneratorTicksPerMbFuel", zombieGeneratorTicksPerBucketFuel, "The number of ticks one bucket of fuel lasts.").getInt(zombieGeneratorTicksPerBucketFuel); + + stirlingGeneratorBaseRfPerTick = config.get(sectionPower.name, "stirlingGeneratorBaseRfPerTick", stirlingGeneratorBaseRfPerTick, + "The amount of power generated per tick.").getInt(stirlingGeneratorBaseRfPerTick); + addFuelTooltipsToAllFluidContainers = config.get(sectionPersonal.name, "addFuelTooltipsToAllFluidContainers", addFuelTooltipsToAllFluidContainers, "If true, the MJ/t and burn time of the fuel will be displayed in all tooltips for fluid containers with fuel.").getBoolean( @@ -658,13 +664,13 @@ public final class Config { "Min tick delay between spawns for a non-upgraded spawner").getInt(poweredSpawnerMinDelayTicks); poweredSpawnerMaxDelayTicks = config.get(sectionSpawner.name, "poweredSpawnerMaxDelayTicks", poweredSpawnerMaxDelayTicks, "Min tick delay between spawns for a non-upgraded spawner").getInt(poweredSpawnerMaxDelayTicks); - poweredSpawnerLevelOnePowerPerTick = (float) config.get(sectionSpawner.name, "poweredSpawnerLevelOnePowerPerTick", poweredSpawnerLevelOnePowerPerTick, - "MJ per tick for a level 1 (non-upgraded) spawner").getDouble(poweredSpawnerLevelOnePowerPerTick); - poweredSpawnerLevelTwoPowerPerTick = (float) config.get(sectionSpawner.name, "poweredSpawnerLevelTwoPowerPerTick", poweredSpawnerLevelTwoPowerPerTick, - "MJ per tick for a level 2 spawner").getDouble(poweredSpawnerLevelTwoPowerPerTick); - poweredSpawnerLevelThreePowerPerTick = (float) config.get(sectionSpawner.name, "poweredSpawnerLevelThreePowerPerTick", - poweredSpawnerLevelThreePowerPerTick, - "MJ per tick for a level 3 spawner").getDouble(poweredSpawnerLevelThreePowerPerTick); + poweredSpawnerLevelOnePowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelOnePowerPerTickRF", poweredSpawnerLevelOnePowerPerTickRF, + "RF per tick for a level 1 (non-upgraded) spawner").getInt(poweredSpawnerLevelOnePowerPerTickRF); + poweredSpawnerLevelTwoPowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelTwoPowerPerTickRF", poweredSpawnerLevelTwoPowerPerTickRF, + "RF per tick for a level 2 spawner").getInt(poweredSpawnerLevelTwoPowerPerTickRF); + poweredSpawnerLevelThreePowerPerTickRF = config.get(sectionSpawner.name, "poweredSpawnerLevelThreePowerPerTickRF", + poweredSpawnerLevelThreePowerPerTickRF, + "RF per tick for a level 3 spawner").getInt(poweredSpawnerLevelThreePowerPerTickRF); poweredSpawnerMaxPlayerDistance = config.get(sectionSpawner.name, "poweredSpawnerMaxPlayerDistance", poweredSpawnerMaxPlayerDistance, "Max distance of the closest player for the spawner to be active. A zero value will remove the player check").getInt(poweredSpawnerMaxPlayerDistance); poweredSpawnerUseVanillaSpawChecks = config.get(sectionSpawner.name, "poweredSpawnerUseVanillaSpawChecks", poweredSpawnerUseVanillaSpawChecks, @@ -699,15 +705,14 @@ public final class Config { soulVesselCapturesBosses = config.getBoolean("soulVesselCapturesBosses", sectionSoulBinder.name, soulVesselCapturesBosses, "When set to false, any mob with a 'boss bar' won't be able to be captured in the Soul Vial"); - soulBinderLevelOnePowerPerTick = config.get(sectionSoulBinder.name, "soulBinderLevelOnePowerPerTick", soulBinderLevelOnePowerPerTick, - "The number of MJ/t consumed by an unupgraded soul binder.").getDouble(soulBinderLevelOnePowerPerTick); - - soulBinderLevelTwoPowerPerTick = config.get(sectionSoulBinder.name, "soulBinderLevelTwoPowerPerTick", soulBinderLevelTwoPowerPerTick, - "The number of MJ/t consumed by a soul binder with a double layer capacitor upgrade.").getDouble(soulBinderLevelTwoPowerPerTick); - soulBinderLevelThreePowerPerTick = config.get(sectionSoulBinder.name, "soulBinderLevelThreePowerPerTick", soulBinderLevelThreePowerPerTick, - "The number of MJ/t consumed by a soul binder with an octadic capacitor upgrade.").getDouble(soulBinderLevelThreePowerPerTick); - soulBinderMjForBrokenSpawner = config.get(sectionSoulBinder.name, "soulBinderMjForBrokenSpawner", soulBinderMjForBrokenSpawner, - "The number of MJ required to change the type of a broken spawner.").getInt(soulBinderMjForBrokenSpawner); + soulBinderLevelOnePowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelOnePowerPerTickRF", soulBinderLevelOnePowerPerTickRF, + "The number of RF/t consumed by an unupgraded soul binder.").getInt(soulBinderLevelOnePowerPerTickRF); + soulBinderLevelTwoPowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelTwoPowerPerTickRF", soulBinderLevelTwoPowerPerTickRF, + "The number of RF/t consumed by a soul binder with a double layer capacitor upgrade.").getInt(soulBinderLevelTwoPowerPerTickRF); + soulBinderLevelThreePowerPerTickRF = config.get(sectionSoulBinder.name, "soulBinderLevelThreePowerPerTickRF", soulBinderLevelThreePowerPerTickRF, + "The number of RF/t consumed by a soul binder with an octadic capacitor upgrade.").getInt(soulBinderLevelThreePowerPerTickRF); + soulBinderBrokenSpawnerRF = config.get(sectionSoulBinder.name, "soulBinderBrokenSpawnerRF", soulBinderBrokenSpawnerRF, + "The number of RF required to change the type of a broken spawner.").getInt(soulBinderBrokenSpawnerRF); } private Config() { diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 6ed9739e..e09d5282 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -5,6 +5,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import cofh.api.energy.EnergyStorage; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -16,9 +18,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; 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 cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -51,13 +50,11 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi // Power protected Capacitors capacitorType; - protected float storedEnergy; + protected int storedEnergyRF; protected ItemStack[] inventory; protected final SlotDefinition slotDefinition; - protected PowerHandler powerHandler; - protected RedstoneControlMode redstoneControlMode; protected boolean redstoneCheckPassed; @@ -79,11 +76,11 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi return sound == null ? null : new ResourceLocation(EnderIO.MODID + ":" + sound); } - public AbstractMachineEntity(SlotDefinition slotDefinition, Type powerType) { + public AbstractMachineEntity(SlotDefinition slotDefinition) { this.slotDefinition = slotDefinition; facing = 3; capacitorType = Capacitors.BASIC_CAPACITOR; - powerHandler = PowerHandlerUtil.createHandler(capacitorType.capacitor, this, powerType); + inventory = new ItemStack[slotDefinition.getNumSlots()]; redstoneControlMode = RedstoneControlMode.IGNORE; soundRes = getSoundFor(getSoundName()); @@ -181,10 +178,6 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi protected abstract boolean isMachineItemValidForSlot(int i, ItemStack itemstack); - public AbstractMachineEntity(SlotDefinition slotDefinition) { - this(slotDefinition, Type.MACHINE); - } - @Override public RedstoneControlMode getRedstoneControlMode() { return redstoneControlMode; @@ -247,8 +240,27 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi // --- Power // -------------------------------------------------------------------------------------- + + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + if(isSideDisabled(dir.ordinal())) { + return 0; + } + return getCapacitor().getMaxEnergyReceived(); + } + + @Override + public int getMaxEnergyStored() { + return getCapacitor().getMaxEnergyStored(); + } + + @Override + public void setEnergyStored(int stored) { + storedEnergyRF = stored; + } + public boolean hasPower() { - return storedEnergy > 0; + return storedEnergyRF > 0; } public ICapacitor getCapacitor() { @@ -257,48 +269,30 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi public int getEnergyStoredScaled(int scale) { // NB: called on the client so can't use the power provider - return VecmathUtil.clamp(Math.round(scale * (storedEnergy / getCapacitor().getMaxEnergyStored())), 0, scale); + return VecmathUtil.clamp(Math.round(scale * (storedEnergyRF / getMaxEnergyStored())), 0, scale); } - public float getEnergyStored() { - return storedEnergy; + public int getEnergyStored() { + return storedEnergyRF; } public void setCapacitor(Capacitors capacitorType) { this.capacitorType = capacitorType; - PowerHandlerUtil.configure(powerHandler, capacitorType.capacitor); forceClientUpdate = true; } - - @Override - public void doWork(PowerHandler workProvider) { - } - - @Override - public PowerReceiver getPowerReceiver(ForgeDirection side) { - if(isSideDisabled(side.ordinal())) { - return null; - } - return powerHandler.getPowerReceiver(); - } - - @Override - public World getWorld() { - return worldObj; - } - - public float getPowerUsePerTick() { + + public int getPowerUsePerTick() { return getCapacitor().getMaxEnergyExtracted(); } - // RF Power + // RF API Power @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { if(isSideDisabled(from.ordinal())) { return 0; } - return PowerHandlerUtil.recieveRedstoneFlux(from, powerHandler, maxReceive, simulate); + return PowerHandlerUtil.recieveInternal(this, maxReceive,from, simulate); } @Override @@ -313,16 +307,12 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi @Override public int getEnergyStored(ForgeDirection from) { - return (int) (powerHandler.getEnergyStored() * 10); + return getEnergyStored(); } @Override public int getMaxEnergyStored(ForgeDirection from) { - return (int) (powerHandler.getMaxEnergyStored() * 10); - } - - public int getMaxEnergyStoredMJ() { - return (int) powerHandler.getMaxEnergyStored(); + return getMaxEnergyStored(); } // --- Process Loop @@ -359,8 +349,6 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi } // else is server, do all logic only on the server - updateStoredEnergyFromPowerHandler(); - boolean requiresClientSync = forceClientUpdate; boolean prevRedCheck = redstoneCheckPassed; if(redstoneStateDirty) { @@ -376,10 +364,10 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi requiresClientSync |= processTasks(redstoneCheckPassed); - boolean powerChanged = (lastSyncPowerStored != storedEnergy && worldObj.getTotalWorldTime() % 5 == 0); + boolean powerChanged = (lastSyncPowerStored != storedEnergyRF && worldObj.getTotalWorldTime() % 5 == 0); if(requiresClientSync) { - lastSyncPowerStored = storedEnergy; + lastSyncPowerStored = storedEnergyRF; // this will cause 'getPacketDescription()' to be called and its result // will be sent to the PacketHandler on the other end of // client/server connection @@ -387,7 +375,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi // And this will make sure our current tile entity state is saved markDirty(); } else if(powerChanged) { - lastSyncPowerStored = storedEnergy; + lastSyncPowerStored = storedEnergyRF; PacketHandler.sendToAllAround(new PacketPowerStorage(this), this); } @@ -514,10 +502,6 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi return false; } - protected void updateStoredEnergyFromPowerHandler() { - storedEnergy = (float) powerHandler.getEnergyStored(); - } - protected abstract boolean processTasks(boolean redstoneCheckPassed); // ---- Tile Entity @@ -544,10 +528,12 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]); - float storedEnergy = nbtRoot.getFloat("storedEnergy"); - powerHandler.setEnergy(storedEnergy); - // For the client as provider is not saved to NBT - this.storedEnergy = storedEnergy; + if(nbtRoot.hasKey("storedEnergy")) { + float storedEnergyMJ = nbtRoot.getFloat("storedEnergy"); + storedEnergyRF = (int)(storedEnergyMJ * 10); + } else { + storedEnergyRF = nbtRoot.getInteger("storedEnergyRF"); + } // read in the inventories contents inventory = new ItemStack[slotDefinition.getNumSlots()]; @@ -602,7 +588,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi } public void writeCommon(NBTTagCompound nbtRoot) { - nbtRoot.setFloat("storedEnergy", storedEnergy); + nbtRoot.setInteger("storedEnergyRF", storedEnergyRF); nbtRoot.setShort("capacitorType", (short) capacitorType.ordinal()); // write inventory list diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index 0afeaf2f..b3b827d9 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -139,9 +139,9 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity { return usePower(getPowerUsePerTick()); } - protected double usePower(double wantToUse) { - double used = Math.min(powerHandler.getEnergyStored(), wantToUse); - powerHandler.setEnergy(powerHandler.getEnergyStored() - used); + protected double usePower(int wantToUse) { + int used = Math.min(getEnergyStored(), wantToUse); + setEnergyStored(getEnergyStored() - used); currentTask.update((float) used); return used; } diff --git a/src/main/java/crazypants/enderio/machine/IMachineRecipe.java b/src/main/java/crazypants/enderio/machine/IMachineRecipe.java index e148f77e..0a110aa6 100644 --- a/src/main/java/crazypants/enderio/machine/IMachineRecipe.java +++ b/src/main/java/crazypants/enderio/machine/IMachineRecipe.java @@ -32,7 +32,7 @@ public interface IMachineRecipe { * @param inputs * @return */ - float getEnergyRequired(MachineRecipeInput... inputs); + int getEnergyRequired(MachineRecipeInput... inputs); /** * Only returns true if output can be generated using these inputs. If diff --git a/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java b/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java index 9c25f40b..457bc9ad 100644 --- a/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java +++ b/src/main/java/crazypants/enderio/machine/PacketPowerStorage.java @@ -13,7 +13,7 @@ public class PacketPowerStorage implements IMessage, IMessageHandler= capacitorType.capacitor.getMaxEnergyStored()) { + if(storedEnergyRF >= capacitorType.capacitor.getMaxEnergyStored()) { inPause = true; } @@ -187,14 +180,14 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP } private boolean transmitEnergy() { - if(storedEnergy <= 0) { + if(storedEnergyRF <= 0) { return false; } if(powerDis == null) { powerDis = new PowerDistributor(new BlockCoord(this)); } - float transmitted = powerDis.transmitEnergy(worldObj, Math.min(maxOutputTick, storedEnergy)); - storedEnergy -= transmitted; + float transmitted = powerDis.transmitEnergy(worldObj, Math.min(maxOutputTick, storedEnergyRF)); + storedEnergyRF -= transmitted; return transmitted > 0; } @@ -204,15 +197,15 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP if((ticksRemaingCoolant <= 0 && getCoolantTank().getFluidAmount() <= 0) || (ticksRemaingFuel <= 0 && getFuelTank().getFluidAmount() <= 0) || - storedEnergy >= powerHandler.getMaxEnergyStored()) { + storedEnergyRF >= getMaxEnergyStored()) { return false; } //once full, don't start again until we have drained 10 seconds worth of power to prevent //flickering on and off constantly when powering a machine that draws less than this produces if(inPause) { - double powerPerCycle = curFuel == null ? 0 : curFuel.powerPerCycle; - if(storedEnergy >= (powerHandler.getMaxEnergyStored() - (powerPerCycle * 200))) { + int powerPerCycle = getPowerPerCycle(); + if(storedEnergyRF >= (getMaxEnergyStored() - (powerPerCycle * 200))) { return false; } } @@ -259,14 +252,18 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP } } - float oldVal = storedEnergy; - storedEnergy += curFuel.powerPerCycle; - generated = curFuel.powerPerCycle; - storedEnergy = Math.min(storedEnergy, capacitorType.capacitor.getMaxEnergyStored()); + float oldVal = storedEnergyRF; + generated = getPowerPerCycle(); + storedEnergyRF += generated; + storedEnergyRF = Math.min(storedEnergyRF, getMaxEnergyStored()); return getFuelTank().getFluidAmount() > 0 && getCoolantTank().getFluidAmount() > 0; } + private int getPowerPerCycle() { + return curFuel == null ? 0 : (int)(curFuel.powerPerCycle * 10); + } + public int getNumTicksPerMbFuel() { if(getFuelTank().getFluidAmount() <= 0) { return 0; @@ -303,15 +300,9 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP return numTicks; } - @Override - protected void updateStoredEnergyFromPowerHandler() { - //no-op as we don't actually need a BC power handler for a generator - //Need to clean this up - } - @Override public int getEnergyStored(ForgeDirection from) { - return (int) (storedEnergy * 10); + return (int) (storedEnergyRF * 10); } @Override @@ -339,7 +330,7 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP public void readCustomNBT(NBTTagCompound nbtRoot) { super.readCustomNBT(nbtRoot); active = nbtRoot.getBoolean("active"); - generated = nbtRoot.getFloat("generated"); + generated = nbtRoot.getInteger("generatedRF"); } @Override @@ -392,10 +383,10 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP public void writeCustomNBT(NBTTagCompound nbtRoot) { super.writeCustomNBT(nbtRoot); nbtRoot.setBoolean("active", active); - nbtRoot.setFloat("generated", generated); + nbtRoot.setInteger("generatedRF", generated); } - public double getMjGeneratedLastTick() { + public int getGeneratedLastTick() { if(!active) { return 0; } @@ -403,7 +394,7 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP } @Override - public float getPowerUsePerTick() { + public int getPowerUsePerTick() { if(getFuelTank().getFluidAmount() <= 0) { return 0; } @@ -411,7 +402,7 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP if(fuel == null) { return 0; } - return fuel.powerPerCycle; + return (int)fuel.powerPerCycle; } public FluidTank getCoolantTank() { diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java index 7e0381d1..a2e5b95c 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java @@ -50,7 +50,7 @@ public class GuiStirlingGenerator extends GuiMachineBase { FontRenderer fr = getFontRenderer(); int y = guiTop + fr.FONT_HEIGHT / 2 + 3; - double output = 0; + int output = 0; if(entity.isActive()) { output = entity.getPowerUsePerTick(); } diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java index a1440a98..0bda5e80 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/TileEntityStirlingGenerator.java @@ -6,9 +6,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.power.IPowerEmitter; -import buildcraft.api.power.PowerHandler.Type; import crazypants.enderio.ModObject; +import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; @@ -17,9 +16,9 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.Capacitors; import crazypants.util.BlockCoord; -public class TileEntityStirlingGenerator extends AbstractMachineEntity implements ISidedInventory, IPowerEmitter { +public class TileEntityStirlingGenerator extends AbstractMachineEntity implements ISidedInventory { - public static final float ENERGY_PER_TICK = 2; + public static final int ENERGY_PER_TICK = Config.stirlingGeneratorBaseRfPerTick; /** How many ticks left until the item is burnt. */ public int burnTime = 0; @@ -27,10 +26,10 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement private PowerDistributor powerDis; + private int storedEnergyRF; + public TileEntityStirlingGenerator() { - super(new SlotDefinition(1, 0), Type.ENGINE); - configurePowerHandler(); - + super(new SlotDefinition(1, 0)); } @Override @@ -38,21 +37,6 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement return mode != IoMode.PUSH && mode != IoMode.PUSH_PULL; } - @Override - public void setCapacitor(Capacitors capacitorType) { - super.setCapacitor(capacitorType); - configurePowerHandler(); - } - - void configurePowerHandler() { - powerHandler.configure(0, 0, 0, capacitorType.capacitor.getMaxEnergyStored()); - } - - @Override - public boolean canEmitPowerFrom(ForgeDirection side) { - return true; - } - @Override public String getMachineName() { return ModObject.blockStirlingGenerator.unlocalisedName; @@ -128,20 +112,14 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement } } - @Override - protected void updateStoredEnergyFromPowerHandler() { - //no-op as we don't actually need a BC power handler for a generator - //Need to clean this up - } - @Override public int getEnergyStored(ForgeDirection from) { - return (int)(storedEnergy * 10); + return (int)(storedEnergyRF * 10); } @Override - public float getPowerUsePerTick() { - return ENERGY_PER_TICK * getEnergyMultiplier(); + public int getPowerUsePerTick() { + return (int)Math.round(ENERGY_PER_TICK * getEnergyMultiplier()); } @Override @@ -150,8 +128,8 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement boolean sendBurnTimePacket = false; if(burnTime > 0) { - if(storedEnergy < powerHandler.getMaxEnergyStored()) { - storedEnergy += (ENERGY_PER_TICK * getEnergyMultiplier()); + if(storedEnergyRF < getMaxEnergyStored()) { + storedEnergyRF += getPowerUsePerTick(); } burnTime--; sendBurnTimePacket = worldObj.getTotalWorldTime() % 20 == 1 || burnTime == 0; @@ -161,7 +139,7 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement if(redstoneCheckPassed) { - if(burnTime <= 0 && storedEnergy < powerHandler.getMaxEnergyStored()) { + if(burnTime <= 0 && storedEnergyRF < getMaxEnergyStored()) { if(inventory[0] != null && inventory[0].stackSize > 0) { burnTime = Math.round(TileEntityFurnace.getItemBurnTime(inventory[0]) / getBurnTimeMultiplier()); if(burnTime > 0) { @@ -207,12 +185,12 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement if(powerDis == null) { powerDis = new PowerDistributor(new BlockCoord(this)); } - double canTransmit = Math.min(storedEnergy, capacitorType.capacitor.getMaxEnergyExtracted()); + double canTransmit = Math.min(storedEnergyRF, capacitorType.capacitor.getMaxEnergyExtracted()); if(canTransmit <= 0) { return false; } float transmitted = powerDis.transmitEnergy(worldObj, (float)canTransmit); - storedEnergy -= transmitted; + storedEnergyRF -= transmitted; return transmitted > 0; } @@ -220,4 +198,6 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement public boolean hasCustomInventoryName() { return false; } + + } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java index 747b028a..42825807 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java @@ -69,7 +69,7 @@ public class GuiZombieGenerator extends GuiMachineBase { int scaled; FontRenderer fr = getFontRenderer(); - double output = 0; + int output = 0; if(gen.isActive()) { output = gen.outputPerTick; } diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java index 5475cbf6..a1ed61d9 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java @@ -9,7 +9,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import buildcraft.api.power.IPowerEmitter; import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; @@ -21,13 +20,13 @@ import crazypants.enderio.network.PacketHandler; import crazypants.util.BlockCoord; import crazypants.util.FluidUtil; -public class TileZombieGenerator extends AbstractMachineEntity implements IPowerEmitter, IFluidHandler { +public class TileZombieGenerator extends AbstractMachineEntity implements IFluidHandler { private static int IO_MB_TICK = 250; final NutrientTank fuelTank = new NutrientTank(FluidContainerRegistry.BUCKET_VOLUME * 2); - float outputPerTick = (float) Config.zombieGeneratorMjPerTick; + int outputPerTick = Config.zombieGeneratorRfPerTick; int tickPerBucketOfFuel = Config.zombieGeneratorTicksPerBucketFuel; private boolean tanksDirty; @@ -38,8 +37,7 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IPower private boolean inPause; public TileZombieGenerator() { - super(new SlotDefinition(0, 0, 0)); - powerHandler.configure(0, 0, 0, capacitorType.capacitor.getMaxEnergyStored()); + super(new SlotDefinition(0, 0, 0)); } @Override @@ -47,10 +45,7 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IPower return ModObject.blockZombieGenerator.unlocalisedName; } - @Override - public boolean canEmitPowerFrom(ForgeDirection side) { - return !isSideDisabled(side.ordinal()); - } + @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { @@ -93,7 +88,7 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IPower } @Override - public float getPowerUsePerTick() { + public int getPowerUsePerTick() { return outputPerTick; } @@ -119,16 +114,10 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IPower powerDis.neighboursChanged(); } } - - @Override - protected void updateStoredEnergyFromPowerHandler() { - //no-op as we don't actually need a BC power handler for a generator - //Need to clean this up - } - + @Override public int getEnergyStored(ForgeDirection from) { - return (int) (storedEnergy * 10); + return storedEnergyRF; } @Override @@ -149,7 +138,7 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IPower res = true; } - if(storedEnergy >= capacitorType.capacitor.getMaxEnergyStored()) { + if(storedEnergyRF >= capacitorType.capacitor.getMaxEnergyStored()) { inPause = true; } @@ -170,7 +159,7 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IPower //once full, don't start again until we have drained 10 seconds worth of power to prevent //flickering on and off constantly when powering a machine that draws less than this produces - if(inPause && storedEnergy >= (powerHandler.getMaxEnergyStored() - (outputPerTick * 200))) { + if(inPause && storedEnergyRF >= (getMaxEnergyStored() - (outputPerTick * 200))) { return false; } inPause = false; @@ -187,21 +176,21 @@ public class TileZombieGenerator extends AbstractMachineEntity implements IPower tanksDirty = true; } - float oldVal = storedEnergy; - storedEnergy += outputPerTick; - storedEnergy = Math.min(storedEnergy, capacitorType.capacitor.getMaxEnergyStored()); + float oldVal = storedEnergyRF; + storedEnergyRF += outputPerTick; + storedEnergyRF = Math.min(storedEnergyRF, capacitorType.capacitor.getMaxEnergyStored()); return true; } private boolean transmitEnergy() { - if(storedEnergy <= 0) { + if(storedEnergyRF <= 0) { return false; } if(powerDis == null) { powerDis = new PowerDistributor(new BlockCoord(this)); } - float transmitted = powerDis.transmitEnergy(worldObj, Math.min(outputPerTick * 2, storedEnergy)); - storedEnergy -= transmitted; + float transmitted = powerDis.transmitEnergy(worldObj, Math.min(outputPerTick * 2, storedEnergyRF)); + storedEnergyRF -= transmitted; return transmitted > 0; } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java index e5afd917..30c325a5 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java @@ -131,7 +131,7 @@ public class BlockHyperCube extends BlockEio implements IGuiHandler, IResourceTo TileHyperCube hc = (TileHyperCube) te; hc.onBreakBlock(); ItemStack itemStack = new ItemStack(this); - PowerHandlerUtil.setStoredEnergyForItem(itemStack, (float) hc.getInternalPowerHandler().getEnergyStored()); + PowerHandlerUtil.setStoredEnergyForItem(itemStack, hc.getEnergyStored()); setChannelOnItem(hc, itemStack); setIoOnItem(hc, itemStack); ret.add(itemStack); @@ -214,7 +214,7 @@ public class BlockHyperCube extends BlockEio implements IGuiHandler, IResourceTo TileHyperCube hc = (TileHyperCube) te; hc.onBreakBlock(); ItemStack itemStack = new ItemStack(this); - PowerHandlerUtil.setStoredEnergyForItem(itemStack, (float) hc.getInternalPowerHandler().getEnergyStored()); + PowerHandlerUtil.setStoredEnergyForItem(itemStack, hc.getEnergyStored()); setChannelOnItem(hc, itemStack); setIoOnItem(hc, itemStack); float f = 0.7F; @@ -241,7 +241,7 @@ public class BlockHyperCube extends BlockEio implements IGuiHandler, IResourceTo TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileHyperCube) { TileHyperCube cb = (TileHyperCube) te; - cb.getInternalPowerHandler().setEnergy(PowerHandlerUtil.getStoredEnergyForItem(stack)); + cb.setEnergyStored(PowerHandlerUtil.getStoredEnergyForItem(stack)); if(player instanceof EntityPlayerMP) { cb.setOwner(((EntityPlayerMP) player).getGameProfile().getName()); } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java index 3b8434be..ca49cae4 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java @@ -83,8 +83,8 @@ public class GuiHyperCube extends GuiScreenBase { @Override protected void updateText() { text.clear(); - text.add(PowerDisplayUtil.formatPower(cube.powerHandler.getEnergyStored()) + " / " - + PowerDisplayUtil.formatPower(cube.powerHandler.getMaxEnergyStored()) + " " + PowerDisplayUtil.abrevation()); + text.add(PowerDisplayUtil.formatPower(cube.getEnergyStored()) + " / " + + PowerDisplayUtil.formatPower(cube.getMaxEnergyStored()) + " " + PowerDisplayUtil.abrevation()); } }); diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java index 38666beb..1db8e2a3 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeRenderer.java @@ -47,7 +47,7 @@ public class HyperCubeRenderer extends TileEntitySpecialRenderer implements IIte model.render(cube, x, y, z); - if(cube.getInternalPowerHandler().getEnergyStored() > 0) { + if(cube.getEnergyStored() > 0) { renderPower(te.getWorldObj(), x, y, z, cube.getChannel() != null); } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketStoredPower.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketStoredPower.java index bc31e634..962739da 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketStoredPower.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketStoredPower.java @@ -3,7 +3,6 @@ package crazypants.enderio.machine.hypercube; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import buildcraft.api.power.PowerHandler; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -14,7 +13,7 @@ public class PacketStoredPower implements IMessage, IMessageHandler receptors = new ArrayList(); private ListIterator receptorIterator = receptors.listIterator(); @@ -118,8 +111,6 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept private CompositeInventory localInventory = new CompositeInventory(); private boolean inventoriesDirty = true; - private PowerHandler disabledPowerHandler; - private Channel channel = null; private Channel registeredChannel = null; private String owner; @@ -138,7 +129,6 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept private boolean isConnected = false; public TileHyperCube() { - powerHandler = PowerHandlerUtil.createHandler(internalCapacitor, this, Type.STORAGE); redstoneControlMode = RedstoneControlMode.IGNORE; recieveBuffer = new ItemRecieveBuffer(this); } @@ -175,7 +165,7 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept } int getEnergyStoredScaled(int scale) { - return (int) VecmathUtil.clamp(Math.round(scale * (powerHandler.getEnergyStored() / powerHandler.getMaxEnergyStored())), 0, scale); + return (int) VecmathUtil.clamp(Math.round(scale * (getEnergyStored() / getMaxEnergyStored())), 0, scale); } public void onBreakBlock() { @@ -196,11 +186,11 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept } List cons = HyperCubeRegister.instance.getCubesForChannel(channel); for (TileHyperCube cube : cons) { - if(cube != this && cube.powerHandler.getEnergyStored() <= 0) { + if(cube != this && cube.getEnergyStored() <= 0) { return false; } } - return cons != null && cons.size() > 1 && powerHandler.getEnergyStored() > 0; + return cons != null && cons.size() > 1 && getEnergyStored() > 0; } private void sendEnergyToOtherNodes() { @@ -213,14 +203,14 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept if(canSendPower()) { for (TileHyperCube cube : cubes) { - double stored = powerHandler.getEnergyStored(); + int stored = getEnergyStored(); if(stored > 0 && cube != null && cube != this && cube.canRecievePower()) { - double curPower = cube.powerHandler.getEnergyStored(); - double requires = cube.powerHandler.getMaxEnergyStored() - curPower; - double transfer = Math.min(requires, stored); - transfer = Math.min(transfer, Config.transceiverMaxIO); - cube.powerHandler.setEnergy(curPower + ((1 - ENERGY_LOSS) * transfer)); - powerHandler.setEnergy(powerHandler.getEnergyStored() - transfer); + int curPower = cube.getEnergyStored(); + int requires = cube.getMaxEnergyStored() - curPower; + int transfer = Math.min(requires, stored); + transfer = Math.min(transfer, Config.transceiverMaxIoRF); + cube.setEnergyStored(curPower + (int)Math.round((1 - ENERGY_LOSS) * transfer)); + setEnergyStored(getEnergyStored() - transfer); } } @@ -255,23 +245,15 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept return; } // else is server, do all logic only on the server - // do the required tick to keep BC API happy - double stored = powerHandler.getEnergyStored(); - powerHandler.update(); - // do a dummy recieve of power to force the updating of what is an isn't a - // power source as we rely on this - // to make sure we dont both send and recieve to the same source - powerHandler.getPowerReceiver().receiveEnergy(Type.STORAGE, 1, null); - powerHandler.setEnergy(stored); + // Pay upkeep cost - stored -= ENERGY_UPKEEP; + storedEnergyRF -= ENERGY_UPKEEP; // Pay fluid transmission cost - stored -= (MILLIBUCKET_TRANSMISSION_COST * milliBucketsTransfered); + storedEnergyRF -= (MILLIBUCKET_TRANSMISSION_COST * milliBucketsTransfered); // update power status - stored = Math.max(stored, 0); - powerHandler.setEnergy(stored); + storedEnergyRF = Math.max(storedEnergyRF, 0); milliBucketsTransfered = 0; @@ -289,7 +271,7 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept } - if(powerHandler.getEnergyStored() > 0) { + if(storedEnergyRF > 0) { transmitEnergy(); sendEnergyToOtherNodes(); } @@ -318,11 +300,10 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept } requiresClientSync |= prevRedCheck != redstoneCheckPassed; - - float storedEnergy = (float) powerHandler.getEnergyStored(); - boolean powerChanged = lastSyncPowerStored != storedEnergy && worldObj.getTotalWorldTime() % 21 == 0; + + boolean powerChanged = lastSyncPowerStored != storedEnergyRF && worldObj.getTotalWorldTime() % 21 == 0; if(powerChanged) { - lastSyncPowerStored = storedEnergy; + lastSyncPowerStored = storedEnergyRF; EnderIO.packetPipeline.sendToAllAround(new PacketStoredPower(this), this); } @@ -366,12 +347,12 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept private boolean transmitEnergy() { - if(!getModeForChannel(SubChannel.POWER).isRecieveEnabled() || !redstoneCheckPassed || powerHandler.getEnergyStored() <= 0) { + if(!getModeForChannel(SubChannel.POWER).isRecieveEnabled() || !redstoneCheckPassed || getEnergyStored() <= 0) { return false; } - float canTransmit = (float) Math.min(powerHandler.getEnergyStored(), internalCapacitor.getMaxEnergyExtracted()); - float transmitted = 0; + int canTransmit = Math.min(getEnergyStored(), internalCapacitor.getMaxEnergyExtracted()); + int transmitted = 0; updatePowersReceptors(); @@ -398,46 +379,18 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept } appliedCount++; } - powerHandler.setEnergy(powerHandler.getEnergyStored() - transmitted); + setEnergyStored(getEnergyStored() - transmitted); return transmitted > 0; } - @Override - public PowerReceiver getPowerReceiver(ForgeDirection side) { - return getPowerHandler().getPowerReceiver(); - } - - @Override - public World getWorld() { - return worldObj; - } - - public PowerHandler getPowerHandler() { - if(getModeForChannel(SubChannel.POWER) == IoMode.RECIEVE) { - return getDisabledPowerHandler(); - } - return powerHandler; - } - - public PowerHandler getInternalPowerHandler() { - return powerHandler; - } - - private PowerHandler getDisabledPowerHandler() { - if(disabledPowerHandler == null) { - disabledPowerHandler = PowerHandlerUtil.createHandler(new BasicCapacitor(0, 0), this, Type.STORAGE); - } - return disabledPowerHandler; - } - // RF Power @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { if(getModeForChannel(SubChannel.POWER) != IoMode.RECIEVE) { - return PowerHandlerUtil.recieveRedstoneFlux(from, powerHandler, maxReceive, simulate); + return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); } return 0; } @@ -454,16 +407,35 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept @Override public int getEnergyStored(ForgeDirection from) { - return (int) (powerHandler.getEnergyStored() * 10); + return storedEnergyRF; } @Override public int getMaxEnergyStored(ForgeDirection from) { - return (int) (powerHandler.getMaxEnergyStored() * 10); + return getMaxEnergyStored(); } @Override - public void doWork(PowerHandler workProvider) { + public int getMaxEnergyRecieved(ForgeDirection dir) { + if(getModeForChannel(SubChannel.POWER) == IoMode.RECIEVE) { + return 0; + } + return internalCapacitor.getMaxEnergyReceived(); + } + + @Override + public int getEnergyStored() { + return storedEnergyRF; + } + + @Override + public int getMaxEnergyStored() { + return internalCapacitor.getMaxEnergyStored(); + } + + @Override + public void setEnergyStored(int stored) { + storedEnergyRF = stored; } @Override @@ -834,7 +806,13 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept @Override public void readCustomNBT(NBTTagCompound nbtRoot) { - powerHandler.setEnergy(nbtRoot.getFloat("storedEnergy")); + + if(nbtRoot.hasKey("storedEnergy")) { + storedEnergyRF = (int)(nbtRoot.getFloat("storedEnergy") * 10); + } else { + storedEnergyRF = nbtRoot.getInteger("storedEnergyRF"); + } + String channelName = nbtRoot.getString("channelName"); String channelUser = nbtRoot.getString("channelUser"); if(channelName != null && !channelName.isEmpty()) { @@ -863,7 +841,7 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept @Override public void writeCustomNBT(NBTTagCompound nbtRoot) { - nbtRoot.setFloat("storedEnergy", (float) powerHandler.getEnergyStored()); + nbtRoot.setInteger("storedEnergyRF", storedEnergyRF); if(channel != null) { nbtRoot.setString("channelName", channel.name); if(channel.user != null) { diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index c356c6e9..6aa9b306 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -2,60 +2,43 @@ package crazypants.enderio.machine.killera; import java.util.Collection; import java.util.List; -import java.util.Map; -import com.google.common.collect.Multimap; -import com.mojang.authlib.GameProfile; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - -import buildcraft.api.power.PowerHandler.PowerReceiver; -import buildcraft.api.power.PowerHandler.Type; import net.minecraft.command.IEntitySelector; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.IEntityMultiPart; -import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.boss.EntityDragonPart; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.play.server.S0BPacketAnimation; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; + +import com.google.common.collect.Multimap; +import com.mojang.authlib.GameProfile; + import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.generator.zombie.NutrientTank; -import crazypants.enderio.machine.generator.zombie.PacketZombieTank; import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.power.BasicCapacitor; -import crazypants.enderio.power.PowerHandlerUtil; import crazypants.render.BoundingBox; import crazypants.util.BlockCoord; import crazypants.util.FluidUtil; import crazypants.util.ForgeDirectionOffsets; -import crazypants.util.ItemUtil; import crazypants.vecmath.Vector3d; public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandler, IEntitySelector { @@ -91,8 +74,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle private int experienceTotal; public TileKillerJoe() { - super(new SlotDefinition(1, 0, 0)); - powerHandler = PowerHandlerUtil.createHandler(new BasicCapacitor(0, 0), this, Type.MACHINE); + super(new SlotDefinition(1, 0, 0)); } @Override @@ -415,10 +397,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle //------------------------------- Power - public PowerReceiver getPowerReceiver(ForgeDirection side) { - return null; - } - + @Override public boolean canConnectEnergy(ForgeDirection from) { return false; } diff --git a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java index 948b36ad..e2e49517 100644 --- a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java @@ -7,14 +7,11 @@ import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.EnumSkyBlock; -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.TileEntityEio; import crazypants.enderio.power.Capacitors; +import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.IInternalPowerReceptor; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.BlockCoord; @@ -25,9 +22,7 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe private ForgeDirection face = ForgeDirection.DOWN; - public static final float MJ_USE_PER_TICK = 0.05f; - - protected PowerHandler powerHandler; + public static final int RF_USE_PER_TICK = 1; private boolean init = true; @@ -43,8 +38,13 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe private boolean requiresPower = true; + private ICapacitor capacitor; + + private int energyStoredRF; + public TileElectricLight() { - powerHandler = PowerHandlerUtil.createHandler(Capacitors.BASIC_CAPACITOR.capacitor, this, Type.MACHINE); + capacitor = Capacitors.BASIC_CAPACITOR.capacitor; + energyStoredRF = 0; } public void onNeighborBlockChange(Block blockID) { @@ -72,14 +72,14 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe public void setInverted(boolean inverted) { isInvereted = inverted; } - + public void setRequiresPower(boolean isPowered) { - requiresPower = isPowered; + requiresPower = isPowered; } public boolean isRequiresPower() { return requiresPower; - } + } public boolean isInvereted() { return isInvereted; @@ -89,7 +89,6 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe this.isInvereted = isInvereted; } - @Override public void updateEntity() { if(worldObj.isRemote) { @@ -97,15 +96,10 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe } boolean hasRedstone = hasRedstoneSignal(); - if(requiresPower) { - double stored = powerHandler.getEnergyStored(); - powerHandler.update(); - powerHandler.setEnergy(stored); - } boolean isActivated = (requiresPower ? hasPower() : true) && (hasRedstone && !isInvereted || !hasRedstone && isInvereted); if(isActivated && requiresPower) { - powerHandler.setEnergy(Math.max(0, powerHandler.getEnergyStored() - MJ_USE_PER_TICK)); + setEnergyStored(getEnergyStored() - RF_USE_PER_TICK); } if(!hasPower() && requiresPower) { isActivated = false; @@ -338,8 +332,13 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe isInvereted = root.getBoolean("isInverted"); requiresPower = root.getBoolean("requiresPower"); - float storedEnergy = root.getFloat("storedEnergy"); - powerHandler.setEnergy(storedEnergy); + if(root.hasKey("storedEnergy")) { + float se = root.getFloat("storedEnergy"); + energyStoredRF = (int) (se * 10); + } else { + energyStoredRF = root.getInteger("storedEnergyRF"); + } + lightNodeCoords = root.getIntArray("lightNodes"); } @@ -347,7 +346,7 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe public void writeCustomNBT(NBTTagCompound root) { root.setShort("face", (short) face.ordinal()); - root.setFloat("storedEnergy", (float) powerHandler.getEnergyStored()); + root.setInteger("storedEnergyRF", energyStoredRF); root.setBoolean("isInverted", isInvereted); root.setBoolean("requiresPower", requiresPower); @@ -364,30 +363,13 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe } public boolean hasPower() { - return powerHandler.getEnergyStored() > MJ_USE_PER_TICK; + return energyStoredRF > RF_USE_PER_TICK; } private boolean hasRedstoneSignal() { return worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord) > 0; } - @Override - public PowerReceiver getPowerReceiver(ForgeDirection side) { - if(!requiresPower) { - return null; - } - return powerHandler.getPowerReceiver(); - } - - @Override - public void doWork(PowerHandler workProvider) { - } - - @Override - public World getWorld() { - return worldObj; - } - // RF Power @Override @@ -395,7 +377,7 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe if(!requiresPower) { return 0; } - return PowerHandlerUtil.recieveRedstoneFlux(from, powerHandler, maxReceive, simulate); + return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); } @Override @@ -413,18 +395,41 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe @Override public int getEnergyStored(ForgeDirection from) { - if(!requiresPower) { - return 0; - } - return (int) (powerHandler.getEnergyStored() * 10); + return getEnergyStored(); } @Override public int getMaxEnergyStored(ForgeDirection from) { + return getMaxEnergyStored(); + } + + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { if(!requiresPower) { return 0; } - return (int) (powerHandler.getMaxEnergyStored() * 10); + return capacitor.getMaxEnergyReceived(); + } + + @Override + public int getEnergyStored() { + if(!requiresPower) { + return 0; + } + return energyStoredRF; + } + + @Override + public int getMaxEnergyStored() { + if(!requiresPower) { + return 0; + } + return capacitor.getMaxEnergyStored(); + } + + @Override + public void setEnergyStored(int stored) { + energyStoredRF = stored; } static class NodeEntry { diff --git a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java index 206e3129..e034bfef 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java @@ -89,7 +89,7 @@ public class GuiPowerMonitor extends GuiScreenBase { @Override protected void updateText() { text.clear(); - text.add(formatPower(te.getEnergyStored()) + "/" + formatPower(te.getMaxEnergyStoredMJ()) + " " + text.add(formatPower(te.getEnergyStored()) + "/" + formatPower(te.getMaxEnergyStored()) + " " + PowerDisplayUtil.abrevation()); } @@ -368,7 +368,7 @@ public class GuiPowerMonitor extends GuiScreenBase { rgb = valuesCol; y += fontRenderer.FONT_HEIGHT + 2; sb = new StringBuilder(); - sb.append(formatPowerFloat(te.aveMjSent)); + sb.append(formatPowerFloat(te.aveRfSent)); sb.append(" "); sb.append(PowerDisplayUtil.abrevation()); sb.append(PowerDisplayUtil.perTickStr()); @@ -383,7 +383,7 @@ public class GuiPowerMonitor extends GuiScreenBase { rgb = valuesCol; y += fontRenderer.FONT_HEIGHT + 2; sb = new StringBuilder(); - sb.append(formatPowerFloat(te.aveMjRecieved)); + sb.append(formatPowerFloat(te.aveRfRecieved)); sb.append(" "); sb.append(PowerDisplayUtil.abrevation()); sb.append(PowerDisplayUtil.perTickStr()); diff --git a/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java b/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java index 94e1079b..9504d24c 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java @@ -1,6 +1,5 @@ package crazypants.enderio.machine.monitor; -import static crazypants.enderio.power.PowerInterfaceBC.*; import io.netty.buffer.ByteBuf; import java.util.List; @@ -10,11 +9,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChatComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.power.IPowerReceptor; -import buildcraft.api.power.PowerHandler.PowerReceiver; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -29,7 +25,6 @@ import crazypants.enderio.conduit.power.PowerConduitNetwork; import crazypants.enderio.conduit.power.PowerTracker; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.IInternalPowerReceptor; -import crazypants.enderio.power.PowerInterfaceBC; import crazypants.enderio.power.PowerInterfaceRF; import crazypants.util.Lang; @@ -64,10 +59,7 @@ public class PacketConduitProbe implements IMessage, IMessageHandler 0.025) { //update rendering at a 2.5% diff diff --git a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java index 116631bb..7d30fa76 100644 --- a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java +++ b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java @@ -9,37 +9,10 @@ import crazypants.util.Lang; public class PowerDisplayUtil { - public static enum PowerType { - MJ(1, "power.mj"), - RF(10, "power.rf"); - - private final double ratio; - private final String abr; - - private PowerType(double ratio, String abr) { - this.ratio = ratio; - this.abr = abr; - } - - String abr() { - return Lang.localize(abr); - } - - double toDisplayValue(double powerMJ) { - return powerMJ * ratio; - } - - double fromDisplayValue(double powerDisplayed) { - return powerDisplayed / ratio; - } - } - private static final NumberFormat INT_NF = NumberFormat.getIntegerInstance(); private static final NumberFormat FLOAT_NF = NumberFormat.getInstance(); - private static PowerType currentPowerType = Config.useRfAsDefault ? PowerType.RF : PowerType.MJ; - public static String perTickStr() { return Lang.localize("power.tick"); } @@ -47,14 +20,12 @@ public class PowerDisplayUtil { public static String ofStr() { return Lang.localize("gui.powerMonitor.of"); } - + static { FLOAT_NF.setMinimumFractionDigits(1); FLOAT_NF.setMaximumFractionDigits(1); } - - public static String getStoredEnergyString(ItemStack item) { if(item == null) { return null; @@ -64,56 +35,44 @@ public class PowerDisplayUtil { } IEnergyContainerItem ci = (IEnergyContainerItem)item.getItem(); - return Lang.localize("item.tooltip.power")+ " "+ PowerDisplayUtil.formatPower(ci.getEnergyStored(item) / 10) + "/" - + PowerDisplayUtil.formatPower(ci.getMaxEnergyStored(item) / 10) + " " + PowerDisplayUtil.abrevation(); + return Lang.localize("item.tooltip.power")+ " "+ PowerDisplayUtil.formatPower(ci.getEnergyStored(item)) + "/" + + PowerDisplayUtil.formatPower(ci.getMaxEnergyStored(item)) + " " + PowerDisplayUtil.abrevation(); } - public static String formatPowerPerTick(float powerPerTick) { + public static String formatPowerPerTick(int powerPerTick) { return formatPower(powerPerTick) + " " + abrevation() + perTickStr(); } - public static String formatStoredPower(double amount, double capacity) { + public static String formatStoredPower(int amount, int capacity) { return formatPower(amount) + "/" + formatPower(capacity) + " " + PowerDisplayUtil.abrevation(); } - public static String formatPower(PowerType type, double amount) { - return INT_NF.format(currentPowerType.toDisplayValue(type.fromDisplayValue(amount))); + + public static String formatPower(int powerRF) { + return INT_NF.format(powerRF); + } + + public static String formatPowerFloat(float averageRfTickSent) { + return FLOAT_NF.format(averageRfTickSent); } - public static String formatPower(double powerMJ) { - return INT_NF.format(currentPowerType.toDisplayValue(powerMJ)); - } - - public static Float parsePower(String power) { + public static Integer parsePower(String power) { if(power == null) { return null; } try { - Number d = FLOAT_NF.parse(power); + Number d = INT_NF.parse(power); if(d == null) { return null; } - return (float) currentPowerType.fromDisplayValue(d.doubleValue()); + return d.intValue(); } catch (Exception e) { return null; } } - public static String formatPowerFloat(double powerMJ) { - if(currentPowerType == PowerType.RF) { - return formatPower(powerMJ); - } - return FLOAT_NF.format(currentPowerType.toDisplayValue(powerMJ)); - } - public static String abrevation() { - return currentPowerType.abr(); + return Lang.localize("power.rf"); } - public static int fromDisplay(int input) { - return (int) currentPowerType.fromDisplayValue(input); - } - - - } diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index 1bdbf2d6..c646ac4b 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -14,11 +14,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -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 cofh.api.energy.IEnergyContainerItem; import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; @@ -40,16 +36,13 @@ import crazypants.vecmath.VecmathUtil; public class TileCapacitorBank extends TileEntityEio implements IInternalPowerReceptor, IInventory, IIoConfigurable { - static final BasicCapacitor BASE_CAP = new BasicCapacitor(Config.capacitorBankMaxIoMJ, Config.capacitorBankMaxStorageMJ); + static final BasicCapacitor BASE_CAP = new BasicCapacitor(Config.capacitorBankMaxIoRF, Config.capacitorBankMaxStorageRF); BlockCoord[] multiblock = null; - private PowerHandler powerHandler; - private PowerHandler disabledPowerHandler; + private int lastSyncPowerStored; - private double lastSyncPowerStored; - - double storedEnergy; + int storedEnergyRF; private int maxStoredEnergy; @@ -59,7 +52,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe private int maxOutput; - private int mjBuf = 0; + //private int mjBuf = 0; private boolean multiblockDirty = false; @@ -93,35 +86,23 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe private boolean notifyNeighbours = false; - double energyAtLastRender = -1; + int energyAtLastRender = -1; private boolean isCreative = false; double lastRenderStoredRatio; -// private boolean registered = false; - public TileCapacitorBank() { inventory = new ItemStack[4]; - storedEnergy = 0; + storedEnergyRF = 0; inputControlMode = RedstoneControlMode.IGNORE; outputControlMode = RedstoneControlMode.IGNORE; maxStoredEnergy = BASE_CAP.getMaxEnergyStored(); maxIO = BASE_CAP.getMaxEnergyExtracted(); maxInput = maxIO; maxOutput = maxIO; - updatePowerHandler(); } - @Override - public void invalidate() { - super.invalidate(); -// if(registered) { -// WirelessChargerController.instance.deregisterCharger(this); -// registered = false; -// } - } - @Override public IoMode toggleIoModeForFace(ForgeDirection faceHit) { IPowerInterface rec = getReceptorForFace(faceHit); @@ -224,20 +205,12 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe } if(!isContoller()) { -// if(registered) { -// WirelessChargerController.instance.deregisterCharger(this); -// registered = false; -// } if(notifyNeighbours) { worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); notifyNeighbours = false; } return; } -// if(!registered) { -// WirelessChargerController.instance.registerCharger(this); -// registered = true; -// } chargeItems(); @@ -261,17 +234,13 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe if(outputEnabled) { transmitEnergy(); } - //input any BC energy, yes, after output to avoid losing energy if we can - if(powerHandler != null && powerHandler.getEnergyStored() > 0) { - storedEnergy += powerHandler.getEnergyStored(); - powerHandler.setEnergy(0); - } + if(isCreative) { - storedEnergy = getMaxEnergyStored() / 2; + storedEnergyRF = getMaxEnergyStored() / 2; } - if(lastSyncPowerStored != storedEnergy && worldObj.getTotalWorldTime() % 10 == 0) { - lastSyncPowerStored = storedEnergy; + if(lastSyncPowerStored != storedEnergyRF && worldObj.getTotalWorldTime() % 10 == 0) { + lastSyncPowerStored = storedEnergyRF; PacketHandler.sendToAllAround(new PacketPowerStorage(this), this, 64); } @@ -291,26 +260,23 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe public boolean chargeItems(ItemStack[] items) { boolean chargedItem = false; - double available = Math.min(maxIO, storedEnergy); + int available = Math.min(maxIO, storedEnergyRF); for (ItemStack item : items) { if(item != null && available > 0) { - double used = 0; + int used = 0; if(item.getItem() instanceof IEnergyContainerItem) { IEnergyContainerItem chargable = (IEnergyContainerItem) item.getItem(); - double max = chargable.getMaxEnergyStored(item); - double cur = chargable.getEnergyStored(item); - double canUse = Math.min(available * 10, max - cur); + int max = chargable.getMaxEnergyStored(item); + int cur = chargable.getEnergyStored(item); + int canUse = Math.min(available, max - cur); if(cur < max) { - used = chargable.receiveEnergy(item, (int) canUse, false) / 10; - // TODO: I should be able to use 'used' but it is always returning 0 - // ATM. - used = (chargable.getEnergyStored(item) - cur) / 10; + used = chargable.receiveEnergy(item, (int) canUse, false); } } if(used > 0) { - storedEnergy = storedEnergy - used; + storedEnergyRF = storedEnergyRF - used; chargedItem = true; available -= used; } @@ -346,11 +312,11 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe private boolean transmitEnergy() { - if(storedEnergy <= 0) { + if(storedEnergyRF <= 0) { return false; } - double canTransmit = Math.min(storedEnergy, maxOutput); - double transmitted = 0; + int canTransmit = Math.min(storedEnergyRF, maxOutput); + int transmitted = 0; if(!masterReceptors.isEmpty() && !receptorIterator.hasNext()) { receptorIterator = masterReceptors.listIterator(); @@ -372,12 +338,12 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe IConduitBundle bundle = (IConduitBundle) receptor.receptor.getDelegate(); IPowerConduit conduit = bundle.getConduit(IPowerConduit.class); if(conduit != null && conduit.getConectionMode(receptor.fromDir.getOpposite()) == ConnectionMode.INPUT) { - used = powerInterface.recieveEnergy(receptor.fromDir.getOpposite(), (float)canTransmit); + used = powerInterface.recieveEnergy(receptor.fromDir.getOpposite(), canTransmit); } else { used = 0; } } else { - used = powerInterface.recieveEnergy(receptor.fromDir.getOpposite(), (float)canTransmit); + used = powerInterface.recieveEnergy(receptor.fromDir.getOpposite(), canTransmit); } transmitted += used; @@ -393,7 +359,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe } appliedCount++; } - storedEnergy = storedEnergy - transmitted; + storedEnergyRF = storedEnergyRF - transmitted; return transmitted > 0; @@ -491,7 +457,8 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe getController().doSetMaxOutput(maxOutput); } - public double getEnergyStored() { + @Override + public int getEnergyStored() { return getController().doGetEnergyStored(); } @@ -499,6 +466,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe return getController().doGetEnergyStoredRatio(); } + @Override public int getMaxEnergyStored() { return getController().doGetMaxEnergyStored(); } @@ -507,25 +475,18 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe return getController().doGetMaxIO(); } - public PowerHandler getPowerHandler() { - return getController().doGetPowerHandler(); + // RF Power + + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + return getMaxEnergyStored(); } @Override - public PowerReceiver getPowerReceiver(ForgeDirection side) { - - IoMode mode = getIoMode(side); - if(mode == IoMode.DISABLED) { - return null; - } - if(mode == IoMode.PUSH) { - return getDisabledPowerHandler().getPowerReceiver(); - } - return getPowerHandler().getPowerReceiver(); + public void setEnergyStored(int stored) { + getController().doSetEnergyStored(stored); } - - // RF Power - + @Override public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { return 0; @@ -547,26 +508,26 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe @Override public int getEnergyStored(ForgeDirection from) { - return (int) (getController().doGetEnergyStored(from) * 10); + return getController().doGetEnergyStored(from); } @Override public int getMaxEnergyStored(ForgeDirection from) { - return getController().doGetMaxEnergyStored() * 10; + return getController().doGetMaxEnergyStored(); } public int doReceiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - double freeSpace = maxStoredEnergy - storedEnergy; + int freeSpace = maxStoredEnergy - storedEnergyRF; freeSpace = Math.min(freeSpace, getMaxInput()); - double result = Math.min((double)maxReceive / 10d, freeSpace); + int result = Math.min(maxReceive, freeSpace); if(!simulate) { doAddEnergy(result); } return (int)(result * 10); } - public double doGetEnergyStored(ForgeDirection from) { - return storedEnergy; + public int doGetEnergyStored(ForgeDirection from) { + return storedEnergyRF; } public int doGetMaxEnergyStored(ForgeDirection from) { @@ -575,7 +536,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe // end rf power - public void addEnergy(double add) { + public void addEnergy(int add) { getController().doAddEnergy(add); } @@ -646,41 +607,26 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe return maxStoredEnergy; } - PowerHandler doGetPowerHandler() { - if(inputEnabled) { - double space = getMaxEnergyStored() - getEnergyStored(); - int canAccept = (int) Math.min(space, maxInput); - if(powerHandler == null || canAccept != mjBuf) { - mjBuf = canAccept; - powerHandler = PowerHandlerUtil.createHandler(new BasicCapacitor(maxInput, mjBuf, maxOutput), this, Type.PIPE); - } - return powerHandler; - } - return getDisabledPowerHandler(); - } - - private PowerHandler getDisabledPowerHandler() { - if(disabledPowerHandler == null) { - disabledPowerHandler = PowerHandlerUtil.createHandler(new BasicCapacitor(0, 0), this, Type.STORAGE); - } - return disabledPowerHandler; - } - int doGetEnergyStoredScaled(int scale) { // NB: called on the client so can't use the power provider - return (int)VecmathUtil.clamp(Math.round(scale * (storedEnergy / maxStoredEnergy)), 0, scale); + return (int)VecmathUtil.clamp(Math.round(scale * (storedEnergyRF / maxStoredEnergy)), 0, scale); } - double doGetEnergyStored() { - return storedEnergy; + int doGetEnergyStored() { + return storedEnergyRF; } + + void doSetEnergyStored(int stored) { + storedEnergyRF = stored; + } + double doGetEnergyStoredRatio() { - return storedEnergy / maxStoredEnergy; + return (double)storedEnergyRF / maxStoredEnergy; } - void doAddEnergy(double add) { - storedEnergy = Math.max(0, Math.min(maxStoredEnergy, storedEnergy + add)); + void doAddEnergy(int add) { + storedEnergyRF = Math.max(0, Math.min(maxStoredEnergy, storedEnergyRF + add)); } void doSetMaxInput(int in) { @@ -693,8 +639,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe cp.maxInput = maxInput; } } - } - updatePowerHandler(); + } } void doSetMaxOutput(int out) { @@ -708,28 +653,9 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe } } } - updatePowerHandler(); } - // ------------ Common power functions - - @Override - public void doWork(PowerHandler workProvider) { - } - - @Override - public World getWorld() { - return worldObj; - } - - private void updatePowerHandler() { - if(storedEnergy > maxStoredEnergy) { - storedEnergy = maxStoredEnergy; - } else if(storedEnergy < 0) { - storedEnergy = 0; - } - powerHandler = null; - } + // ------------ Multiblock management @@ -747,10 +673,6 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe } public void onBreakBlock() { -// if(registered) { -// WirelessChargerController.instance.deregisterCharger(this); -// registered = false; -// } TileCapacitorBank controller = getController(); controller.clearCurrentMultiblock(); } @@ -771,7 +693,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe } private void formMultiblock() { -// try { + if(isCreative) { return; } @@ -805,9 +727,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe for (TileCapacitorBank cb : blocks) { cb.setMultiblock(mb); } -// } finally { -// WirelessChargerController.instance.registerCharger(getController()); -// } + } private void findNighbouringBanks(TileCapacitorBank tileCapacitorBank, List blocks) { @@ -831,7 +751,8 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe //WirelessChargerController.instance.deregisterCharger(this); // split up current multiblock and reconfigure all the internal capacitors - double powerPerBlock = storedEnergy / multiblock.length; + int powerPerBlock = storedEnergyRF / multiblock.length; + int remaining = storedEnergyRF % multiblock.length; for (BlockCoord bc : multiblock) { TileCapacitorBank cb = getCapBank(bc); if(cb != null) { @@ -839,27 +760,25 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe cb.maxIO = BASE_CAP.getMaxEnergyExtracted(); cb.maxInput = Math.min(cb.maxInput, cb.maxIO); cb.maxOutput = Math.min(cb.maxOutput, cb.maxIO); - cb.storedEnergy = powerPerBlock; - cb.updatePowerHandler(); + cb.storedEnergyRF = powerPerBlock; cb.multiblockDirty = true; } } + storedEnergyRF += remaining; } multiblock = mb; if(isMaster()) { - //WirelessChargerController.instance.registerCharger(this); - List invItems = new ArrayList(); - float totalStored = 0; + int totalStored = 0; int totalCap = multiblock.length * BASE_CAP.getMaxEnergyStored(); int totalIO = multiblock.length * BASE_CAP.getMaxEnergyExtracted(); for (BlockCoord bc : multiblock) { TileCapacitorBank cb = getCapBank(bc); if(cb != null) { - totalStored += cb.storedEnergy; + totalStored += cb.storedEnergyRF; } ItemStack[] inv = cb.inventory; for (int i = 0; i < inv.length; i++) { @@ -870,7 +789,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe } cb.multiblockDirty = false; } - storedEnergy = totalStored; + storedEnergyRF = totalStored; maxStoredEnergy = totalCap; maxIO = totalIO; maxInput = maxInput < 0 ? maxIO : Math.min(maxInput, maxIO); @@ -892,8 +811,6 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe for (int i = 0; i < inventory.length && i < invItems.size(); i++) { inventory[i] = invItems.get(i); } - - updatePowerHandler(); } receptorsDirty = true; getController().masterReceptorsDirty = true; @@ -1051,29 +968,39 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe @Override public void readCustomNBT(NBTTagCompound nbtRoot) { - double oldEnergy = storedEnergy; - if(nbtRoot.hasKey("storedEnergy")) { - storedEnergy = nbtRoot.getFloat("storedEnergy"); + double oldEnergy = storedEnergyRF; + if(nbtRoot.hasKey("storedEnergyD")) { + storedEnergyRF = (int)nbtRoot.getDouble("storedEnergyD") * 10; } else { - storedEnergy = nbtRoot.getDouble("storedEnergyD"); + storedEnergyRF = nbtRoot.getInteger("storedEnergyRF"); } maxStoredEnergy = nbtRoot.getInteger("maxStoredEnergy"); - double newEnergy = storedEnergy; - if(maxStoredEnergy != 0 && Math.abs(oldEnergy - newEnergy) / maxStoredEnergy > 0.05 || nbtRoot.hasKey("render")) { + double newEnergy = storedEnergyRF; + if(maxStoredEnergy != 0 && Math.abs(oldEnergy - newEnergy) / (double)maxStoredEnergy > 0.05 || nbtRoot.hasKey("render")) { render = true; } if(energyAtLastRender != -1 && maxStoredEnergy != 0) { - double change = Math.abs(energyAtLastRender - storedEnergy) / maxStoredEnergy; + double change = Math.abs(energyAtLastRender - storedEnergyRF) / (double)maxStoredEnergy; if(change > 0.05) { render = true; } } - maxIO = nbtRoot.getInteger("maxIO"); + if(nbtRoot.hasKey("maxIO")) { + maxIO = nbtRoot.getInteger("maxIO") * 10; + } else { + maxIO = nbtRoot.getInteger("maxIoRF"); + } + if(nbtRoot.hasKey("maxInput")) { - maxInput = nbtRoot.getInteger("maxInput"); - maxOutput = nbtRoot.getInteger("maxOutput"); + nbtRoot.setInteger("maxInputRF", nbtRoot.getInteger("maxInput") * 10); + nbtRoot.setInteger("maxOuputRF", nbtRoot.getInteger("maxOuput") * 10); + } + + if(nbtRoot.hasKey("maxInputRF")) { + maxInput = nbtRoot.getInteger("maxInputRF"); + maxOutput = nbtRoot.getInteger("maxOutputRF"); } else { maxInput = maxIO; maxOutput = maxIO; @@ -1081,8 +1008,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe inputControlMode = RedstoneControlMode.values()[nbtRoot.getShort("inputControlMode")]; outputControlMode = RedstoneControlMode.values()[nbtRoot.getShort("outputControlMode")]; - - updatePowerHandler(); + boolean wasMulti = isMultiblock(); if(nbtRoot.getBoolean("isMultiblock")) { @@ -1123,11 +1049,11 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe @Override public void writeCustomNBT(NBTTagCompound nbtRoot) { - nbtRoot.setDouble("storedEnergyD", storedEnergy); + nbtRoot.setDouble("storedEnergyRF", storedEnergyRF); nbtRoot.setInteger("maxStoredEnergy", maxStoredEnergy); - nbtRoot.setInteger("maxIO", maxIO); - nbtRoot.setInteger("maxInput", maxInput); - nbtRoot.setInteger("maxOutput", maxOutput); + nbtRoot.setInteger("maxIoRF", maxIO); + nbtRoot.setInteger("maxInputRF", maxInput); + nbtRoot.setInteger("maxOutputRF", maxOutput); nbtRoot.setShort("inputControlMode", (short) inputControlMode.ordinal()); nbtRoot.setShort("outputControlMode", (short) outputControlMode.ordinal()); @@ -1198,7 +1124,6 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe maxIO = maxIO * 1000; maxInput = maxIO; maxOutput = maxIO; - updatePowerHandler(); } public boolean isCreative() { diff --git a/src/main/java/crazypants/enderio/machine/recipe/AbstractMachineRecipe.java b/src/main/java/crazypants/enderio/machine/recipe/AbstractMachineRecipe.java index 4e09b81c..d6f6d391 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/AbstractMachineRecipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/AbstractMachineRecipe.java @@ -10,7 +10,7 @@ import crazypants.enderio.machine.MachineRecipeInput; public abstract class AbstractMachineRecipe implements IMachineRecipe { @Override - public float getEnergyRequired(MachineRecipeInput... inputs) { + public int getEnergyRequired(MachineRecipeInput... inputs) { if(inputs == null || inputs.length <= 0) { return 0; } diff --git a/src/main/java/crazypants/enderio/machine/recipe/IRecipe.java b/src/main/java/crazypants/enderio/machine/recipe/IRecipe.java index 0cd6f171..18dceef3 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/IRecipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/IRecipe.java @@ -10,7 +10,7 @@ public interface IRecipe { boolean isValid(); - float getEnergyRequired(); + int getEnergyRequired(); RecipeOutput[] getOutputs(); diff --git a/src/main/java/crazypants/enderio/machine/recipe/Recipe.java b/src/main/java/crazypants/enderio/machine/recipe/Recipe.java index 980ea043..7831e000 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/Recipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/Recipe.java @@ -13,17 +13,17 @@ public class Recipe implements IRecipe { private final RecipeInput[] inputs; private final RecipeOutput[] outputs; - private final float energyRequired; + private final int energyRequired; - public Recipe(RecipeOutput output, float energyRequired, RecipeInput... input) { + public Recipe(RecipeOutput output, int energyRequired, RecipeInput... input) { this(input, new RecipeOutput[] { output }, energyRequired); } - public Recipe(RecipeInput input, float energyRequired, RecipeOutput... output) { + public Recipe(RecipeInput input, int energyRequired, RecipeOutput... output) { this(new RecipeInput[] { input }, output, energyRequired); } - public Recipe(RecipeInput[] input, RecipeOutput[] output, float energyRequired) { + public Recipe(RecipeInput[] input, RecipeOutput[] output, int energyRequired) { this.inputs = input; this.outputs = output; this.energyRequired = energyRequired; @@ -159,7 +159,7 @@ public class Recipe implements IRecipe { } @Override - public float getEnergyRequired() { + public int getEnergyRequired() { return energyRequired; } diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolorPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolorPanel.java index 46bfed01..2b4b1aa4 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolorPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolorPanel.java @@ -60,9 +60,9 @@ public class BlockItemSolorPanel extends ItemBlockWithMetadata implements IAdvan @Override public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { TooltipAddera.addDetailedTooltipFromResources(list, itemstack); - float prod = (float)Config.maxPhotovoltaicOutput; + int prod = Config.maxPhotovoltaicOutputRF; if(itemstack.getItemDamage() == 1) { - prod = (float)Config.maxPhotovoltaicAdvancedOutput; + prod = Config.maxPhotovoltaicAdvancedOutputRF; } list.add(Lang.localize("maxSolorProduction") + " " + PowerDisplayUtil.formatPowerPerTick(prod)); } diff --git a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java index b1ebc757..c8a3cc55 100644 --- a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java @@ -7,12 +7,7 @@ import java.util.ListIterator; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.EnumSkyBlock; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.power.IPowerEmitter; -import buildcraft.api.power.PowerHandler; -import buildcraft.api.power.PowerHandler.PowerReceiver; -import buildcraft.api.power.PowerHandler.Type; import crazypants.enderio.config.Config; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.IInternalPowerReceptor; @@ -20,9 +15,8 @@ import crazypants.enderio.power.IPowerInterface; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.BlockCoord; -public class TileEntitySolarPanel extends TileEntity implements IInternalPowerReceptor, IPowerEmitter { - - protected PowerHandler powerHandler; +public class TileEntitySolarPanel extends TileEntity implements IInternalPowerReceptor { + private BasicCapacitor capacitor; private final List receptors = new ArrayList(); @@ -32,32 +26,15 @@ public class TileEntitySolarPanel extends TileEntity implements IInternalPowerRe private float lastCollectionValue = -1; private int checkOffset; private static final int CHECK_INTERVAL = 100; + + private int storedEnergyRF; public TileEntitySolarPanel() { checkOffset = (int) (Math.random() * 20); capacitor = new BasicCapacitor(0, 10000, 10); - powerHandler = PowerHandlerUtil.createHandler(capacitor, this, Type.ENGINE); - } - - @Override - public boolean canEmitPowerFrom(ForgeDirection side) { - return side == ForgeDirection.DOWN; - } - - @Override - public void doWork(PowerHandler workProvider) { - } - - @Override - public World getWorld() { - return worldObj; - } - - @Override - public PowerReceiver getPowerReceiver(ForgeDirection side) { - return powerHandler.getPowerReceiver(); } + public void onNeighborBlockChange() { receptorsDirty = true; } @@ -66,7 +43,7 @@ public class TileEntitySolarPanel extends TileEntity implements IInternalPowerRe @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - return PowerHandlerUtil.recieveRedstoneFlux(from, powerHandler, maxReceive, simulate); + return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); } @Override @@ -81,13 +58,38 @@ public class TileEntitySolarPanel extends TileEntity implements IInternalPowerRe @Override public int getEnergyStored(ForgeDirection from) { - return (int) (powerHandler.getEnergyStored() * 10); + return getEnergyStored(); } @Override public int getMaxEnergyStored(ForgeDirection from) { - return (int) (powerHandler.getMaxEnergyStored() * 10); + return getMaxEnergyStored(); } + + + + @Override + public int getMaxEnergyRecieved(ForgeDirection dir) { + return capacitor.getMaxEnergyReceived(); + } + + + @Override + public int getEnergyStored() { + return storedEnergyRF; + } + + @Override + public int getMaxEnergyStored() { + return capacitor.getMaxEnergyStored(); + } + + + @Override + public void setEnergyStored(int stored) { + storedEnergyRF = stored; + } + @Override public void updateEntity() { @@ -108,15 +110,15 @@ public class TileEntitySolarPanel extends TileEntity implements IInternalPowerRe lastCollectionValue = getEnergyPerTick() * fromSun; } float collected = lastCollectionValue; - powerHandler.setEnergy(Math.min(powerHandler.getMaxEnergyStored(), powerHandler.getEnergyStored() + collected)); + storedEnergyRF += collected; } - private float getEnergyPerTick() { + private int getEnergyPerTick() { int meta = getBlockMetadata(); if(meta == 0) { - return (float)Config.maxPhotovoltaicOutput; + return Config.maxPhotovoltaicOutputRF; } - return (float)Config.maxPhotovoltaicAdvancedOutput; + return Config.maxPhotovoltaicAdvancedOutputRF; } private float calculateLightRatio() { @@ -137,18 +139,9 @@ public class TileEntitySolarPanel extends TileEntity implements IInternalPowerRe private boolean transmitEnergy() { - if(powerHandler.getEnergyStored() <= 0) { - powerHandler.update(); - return false; - } - // Mandatory power handler update - double stored = powerHandler.getEnergyStored(); - powerHandler.update(); - powerHandler.setEnergy(stored); - - double canTransmit = Math.min(powerHandler.getEnergyStored(), capacitor.getMaxEnergyExtracted()); - float transmitted = 0; + int canTransmit = Math.min(getEnergyStored(), capacitor.getMaxEnergyExtracted()); + int transmitted = 0; checkReceptors(); @@ -163,7 +156,7 @@ public class TileEntitySolarPanel extends TileEntity implements IInternalPowerRe Receptor receptor = receptorIterator.next(); IPowerInterface pp = receptor.receptor; if(pp != null && pp.getMinEnergyReceived(receptor.fromDir.getOpposite()) <= canTransmit) { - double used = pp.recieveEnergy(receptor.fromDir.getOpposite(), (float) canTransmit); + int used = pp.recieveEnergy(receptor.fromDir.getOpposite(), canTransmit); transmitted += used; canTransmit -= used; } @@ -178,7 +171,7 @@ public class TileEntitySolarPanel extends TileEntity implements IInternalPowerRe appliedCount++; } - powerHandler.setEnergy(powerHandler.getEnergyStored() - transmitted); + setEnergyStored(getEnergyStored() - transmitted); return transmitted > 0; diff --git a/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java b/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java index c5bb424e..1bc9f891 100644 --- a/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java +++ b/src/main/java/crazypants/enderio/machine/soul/SoulBinderSpawnerRecipe.java @@ -20,8 +20,8 @@ public class SoulBinderSpawnerRecipe implements IMachineRecipe { } @Override - public float getEnergyRequired(MachineRecipeInput... inputs) { - return Config.soulBinderMjForBrokenSpawner; + public int getEnergyRequired(MachineRecipeInput... inputs) { + return Config.soulBinderBrokenSpawnerRF; } @Override diff --git a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java index 886c6474..e549c06b 100644 --- a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java @@ -9,24 +9,28 @@ import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; +import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.PowerHandlerUtil; public class TileSoulBinder extends AbstractPoweredTaskEntity { - public static final float POWER_PER_TICK_ONE = (float)Config.soulBinderLevelOnePowerPerTick; - private static final BasicCapacitor CAP_ONE = new BasicCapacitor((int) (POWER_PER_TICK_ONE * 1.25), + public static final int POWER_PER_TICK_ONE = Config.soulBinderLevelOnePowerPerTickRF; + private static final BasicCapacitor CAP_ONE = new BasicCapacitor((int) (POWER_PER_TICK_ONE * 2), Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored()); - public static final float POWER_PER_TICK_TWO = (float)Config.soulBinderLevelTwoPowerPerTick; - private static final BasicCapacitor CAP_TWO = new BasicCapacitor((int) (POWER_PER_TICK_TWO * 1.25), + public static final int POWER_PER_TICK_TWO = Config.soulBinderLevelTwoPowerPerTickRF; + private static final BasicCapacitor CAP_TWO = new BasicCapacitor((int) (POWER_PER_TICK_TWO * 2), Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored()); - public static final float POWER_PER_TICK_THREE = (float)Config.soulBinderLevelThreePowerPerTick; - private static final BasicCapacitor CAP_THREE = new BasicCapacitor((int) (POWER_PER_TICK_THREE * 1.25), + public static final int POWER_PER_TICK_THREE = Config.soulBinderLevelThreePowerPerTickRF; + private static final BasicCapacitor CAP_THREE = new BasicCapacitor((int) (POWER_PER_TICK_THREE * 2), Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored()); + private ICapacitor capacitor; + public TileSoulBinder() { super(new SlotDefinition(2, 2, 1)); + capacitor = CAP_ONE; } @Override @@ -43,23 +47,30 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity { this.capacitorType = capacitorType; switch (capacitorType) { case BASIC_CAPACITOR: - PowerHandlerUtil.configure(powerHandler, CAP_ONE); + capacitor = CAP_ONE; break; case ACTIVATED_CAPACITOR: - PowerHandlerUtil.configure(powerHandler, CAP_TWO); + capacitor = CAP_TWO; break; case ENDER_CAPACITOR: - PowerHandlerUtil.configure(powerHandler, CAP_THREE); + capacitor = CAP_THREE; break; default: - PowerHandlerUtil.configure(powerHandler, CAP_ONE); + capacitor = CAP_ONE; break; } forceClientUpdate = true; } + + @Override - public float getPowerUsePerTick() { + public ICapacitor getCapacitor() { + return capacitor; + } + + @Override + public int getPowerUsePerTick() { if(capacitorType.ordinal() == 0) { return POWER_PER_TICK_ONE; } else if(capacitorType.ordinal() == 1) { diff --git a/src/main/java/crazypants/enderio/machine/spawner/DummyRecipe.java b/src/main/java/crazypants/enderio/machine/spawner/DummyRecipe.java index d529fa40..e03e2678 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/DummyRecipe.java +++ b/src/main/java/crazypants/enderio/machine/spawner/DummyRecipe.java @@ -16,7 +16,7 @@ public class DummyRecipe implements IMachineRecipe { } @Override - public float getEnergyRequired(MachineRecipeInput... inputs) { + public int getEnergyRequired(MachineRecipeInput... inputs) { //NB: This value is not actually used, see createTask in the tile return TilePoweredSpawner.POWER_PER_TICK_ONE * 800; } diff --git a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java index 59790258..a38755e3 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java @@ -18,6 +18,7 @@ import crazypants.enderio.machine.PoweredTask; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; +import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.PowerHandlerUtil; public class TilePoweredSpawner extends AbstractPoweredTaskEntity { @@ -25,14 +26,14 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { public static final int MIN_SPAWN_DELAY_BASE = Config.poweredSpawnerMinDelayTicks; public static final int MAX_SPAWN_DELAY_BASE = Config.poweredSpawnerMaxDelayTicks; - public static final float POWER_PER_TICK_ONE = Config.poweredSpawnerLevelOnePowerPerTick; + public static final int POWER_PER_TICK_ONE = Config.poweredSpawnerLevelOnePowerPerTickRF; private static final BasicCapacitor CAP_ONE = new BasicCapacitor((int) (POWER_PER_TICK_ONE * 1.25), Capacitors.BASIC_CAPACITOR.capacitor.getMaxEnergyStored()); - public static final float POWER_PER_TICK_TWO = Config.poweredSpawnerLevelTwoPowerPerTick; + public static final int POWER_PER_TICK_TWO = Config.poweredSpawnerLevelTwoPowerPerTickRF; private static final BasicCapacitor CAP_TWO = new BasicCapacitor((int) (POWER_PER_TICK_TWO * 1.25), Capacitors.ACTIVATED_CAPACITOR.capacitor.getMaxEnergyStored()); - public static final float POWER_PER_TICK_THREE = Config.poweredSpawnerLevelThreePowerPerTick; + public static final int POWER_PER_TICK_THREE = Config.poweredSpawnerLevelThreePowerPerTickRF; private static final BasicCapacitor CAP_THREE = new BasicCapacitor((int) (POWER_PER_TICK_THREE * 1.25), Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored()); @@ -42,10 +43,13 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { private final MobSpawnerBaseLogic logic = new SpawnerLogic(); private static final String NULL_ENTITY_NAME = "None"; + + private ICapacitor capacitor; public TilePoweredSpawner() { super(new SlotDefinition(0, 0)); logic.setEntityName(NULL_ENTITY_NAME); + capacitor = CAP_ONE; } @Override @@ -59,21 +63,26 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { this.capacitorType = capacitorType; switch (capacitorType) { case BASIC_CAPACITOR: - PowerHandlerUtil.configure(powerHandler, CAP_ONE); + capacitor = CAP_ONE; break; case ACTIVATED_CAPACITOR: - PowerHandlerUtil.configure(powerHandler, CAP_TWO); + capacitor = CAP_ONE; break; case ENDER_CAPACITOR: - PowerHandlerUtil.configure(powerHandler, CAP_THREE); + capacitor = CAP_ONE; break; default: - PowerHandlerUtil.configure(powerHandler, CAP_ONE); + capacitor = CAP_ONE; break; } forceClientUpdate = true; } + @Override + public ICapacitor getCapacitor() { + return capacitor; + } + @Override public String getMachineName() { return ModObject.blockPoweredSpawner.unlocalisedName; @@ -98,7 +107,7 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { } @Override - public float getPowerUsePerTick() { + public int getPowerUsePerTick() { if(capacitorType.ordinal() == 0) { return POWER_PER_TICK_ONE; } else if(capacitorType.ordinal() == 1) { diff --git a/src/main/java/crazypants/enderio/machine/still/TileVat.java b/src/main/java/crazypants/enderio/machine/still/TileVat.java index a9200f86..33102df0 100644 --- a/src/main/java/crazypants/enderio/machine/still/TileVat.java +++ b/src/main/java/crazypants/enderio/machine/still/TileVat.java @@ -299,8 +299,8 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler } @Override - public float getPowerUsePerTick() { - return Config.vatPowerUserPerTick; + public int getPowerUsePerTick() { + return Config.vatPowerUserPerTickRF; } @Override diff --git a/src/main/java/crazypants/enderio/machine/still/VatRecipe.java b/src/main/java/crazypants/enderio/machine/still/VatRecipe.java index 29098cc5..3cbabdc5 100644 --- a/src/main/java/crazypants/enderio/machine/still/VatRecipe.java +++ b/src/main/java/crazypants/enderio/machine/still/VatRecipe.java @@ -19,7 +19,7 @@ public class VatRecipe implements IRecipe { protected final RecipeInput[] inputs; protected final RecipeOutput[] output; - protected final float energyRequired; + protected final int energyRequired; public VatRecipe(IRecipe recipe) { List fluids = recipe.getInputFluidStacks(); @@ -52,7 +52,7 @@ public class VatRecipe implements IRecipe { } @Override - public float getEnergyRequired() { + public int getEnergyRequired() { return energyRequired; } diff --git a/src/main/java/crazypants/enderio/machine/tank/TileTank.java b/src/main/java/crazypants/enderio/machine/tank/TileTank.java index 965bd215..84f28a1f 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TileTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/TileTank.java @@ -11,7 +11,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import buildcraft.api.power.PowerHandler.PowerReceiver; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.network.PacketHandler; @@ -330,10 +329,6 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler { return false; } - public PowerReceiver getPowerReceiver(ForgeDirection side) { - return null; - } - public boolean canConnectEnergy(ForgeDirection from) { return false; } diff --git a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java index 75fdecc8..a5b31711 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java @@ -37,12 +37,6 @@ public class BlockWirelessCharger extends BlockEio implements IResourceTooltipPr super(ModObject.blockWirelessCharger.unlocalisedName, TileWirelessCharger.class); setLightOpacity(1); } - -// @Override -// protected void init() { -// super.init(); -// EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_WIRELESS_CHARGER, this); -// } @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { @@ -63,11 +57,6 @@ public class BlockWirelessCharger extends BlockEio implements IResourceTooltipPr } } } -// if(entityPlayer.isSneaking()) { -// return false; -// } -// entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_WIRELESS_CHARGER, world, x, y, z); -// return true; return false; } @@ -85,7 +74,7 @@ public class BlockWirelessCharger extends BlockEio implements IResourceTooltipPr TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileWirelessCharger) { TileWirelessCharger twc = (TileWirelessCharger)te; - if(twc.storedEnergy > 0) { + if(twc.getEnergyStored() > 0) { return centerOn; } } diff --git a/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java index 998af822..f1edfb18 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java @@ -6,7 +6,7 @@ import net.minecraft.world.World; public interface IWirelessCharger { - World getWorld(); + World getWorldObj(); BlockCoord getLocation(); diff --git a/src/main/java/crazypants/enderio/machine/wireless/PacketStoredEnergy.java b/src/main/java/crazypants/enderio/machine/wireless/PacketStoredEnergy.java index 5907de48..ed528d24 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/PacketStoredEnergy.java +++ b/src/main/java/crazypants/enderio/machine/wireless/PacketStoredEnergy.java @@ -16,7 +16,7 @@ public class PacketStoredEnergy implements IMessage, IMessageHandler 0) || - (me.storedEnergy > 0 && message.storedEnergy <= 0); - me.storedEnergy = message.storedEnergy; + boolean doRender = (me.storedEnergyRF <= 0 && message.storedEnergy > 0) || + (me.storedEnergyRF > 0 && message.storedEnergy <= 0); + me.storedEnergyRF = message.storedEnergy; if(doRender) { System.out.println("PacketStoredEnergy.onMessage: "); player.worldObj.markBlockRangeForRenderUpdate(message.x, message.y, message.z, message.x, message.y, message.z); - //player.worldObj.markBlockForUpdate(message.x, message.y, message.z); } } diff --git a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java index 8992f4cf..530949bc 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java @@ -1,13 +1,10 @@ package crazypants.enderio.machine.wireless; -import cofh.api.energy.IEnergyContainerItem; -import buildcraft.api.power.PowerHandler; -import buildcraft.api.power.PowerHandler.PowerReceiver; -import buildcraft.api.power.PowerHandler.Type; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cofh.api.energy.IEnergyContainerItem; import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; import crazypants.enderio.power.IInternalPowerReceptor; @@ -16,20 +13,17 @@ import crazypants.util.BlockCoord; public class TileWirelessCharger extends TileEntityEio implements IInternalPowerReceptor, IWirelessCharger { - public static final int MAX_ENERGY_STORED_MJ = 100000; - public static final int MAX_ENERGY_IN = 1000; - public static final int MAX_ENERGY_OUT = 1000; + public static final int MAX_ENERGY_STORED = 1000000; + public static final int MAX_ENERGY_IN = 10000; + public static final int MAX_ENERGY_OUT = 10000; - double storedEnergy; - private PowerHandler powerHandler; + int storedEnergyRF; private double lastPowerUpdate = -1; private boolean registered = false; - public TileWirelessCharger() { - powerHandler = new PowerHandler(this, Type.STORAGE); - powerHandler.configure(0, MAX_ENERGY_IN, 0, MAX_ENERGY_IN); + public TileWirelessCharger() { } @Override @@ -51,24 +45,12 @@ public class TileWirelessCharger extends TileEntityEio implements IInternalPower registered = true; } - double stored = powerHandler.getEnergyStored(); - if(stored > 0) { - storedEnergy += stored; - storedEnergy = Math.min(storedEnergy, MAX_ENERGY_STORED_MJ); - if(stored > (MAX_ENERGY_STORED_MJ - 2)) { - powerHandler.configure(0, 0, 0, 0); - } else { - powerHandler.configure(0, MAX_ENERGY_IN, 0, MAX_ENERGY_IN); - } - powerHandler.setEnergy(0); - } - if( (lastPowerUpdate == -1) || - (lastPowerUpdate == 0 && storedEnergy > 0) || - (lastPowerUpdate > 0 && storedEnergy == 0) || - (lastPowerUpdate != storedEnergy && worldObj.getTotalWorldTime() % 20 == 0) + (lastPowerUpdate == 0 && storedEnergyRF > 0) || + (lastPowerUpdate > 0 && storedEnergyRF == 0) || + (lastPowerUpdate != storedEnergyRF && worldObj.getTotalWorldTime() % 20 == 0) ) { - lastPowerUpdate = storedEnergy; + lastPowerUpdate = storedEnergyRF; EnderIO.packetPipeline.sendToAllAround(new PacketStoredEnergy(this), this); } @@ -76,26 +58,22 @@ public class TileWirelessCharger extends TileEntityEio implements IInternalPower public boolean chargeItems(ItemStack[] items) { boolean chargedItem = false; - double available = Math.min(MAX_ENERGY_OUT, storedEnergy); + int available = Math.min(MAX_ENERGY_OUT, storedEnergyRF); for (ItemStack item : items) { if(item != null && available > 0) { - float used = 0; + int used = 0; if(item.getItem() instanceof IEnergyContainerItem) { IEnergyContainerItem chargable = (IEnergyContainerItem) item.getItem(); - float max = chargable.getMaxEnergyStored(item); - float cur = chargable.getEnergyStored(item); - double canUse = Math.min(available * 10, max - cur); + int max = chargable.getMaxEnergyStored(item); + int cur = chargable.getEnergyStored(item); + int canUse = Math.min(available, max - cur); if(cur < max) { - used = chargable.receiveEnergy(item, (int) canUse, false) / 10; - // TODO: I should be able to use 'used' but it is always returning 0 - // ATM. - used = (chargable.getEnergyStored(item) - cur) / 10; + used = chargable.receiveEnergy(item, (int) canUse, false); } - } if(used > 0) { - storedEnergy = storedEnergy - used; + storedEnergyRF = storedEnergyRF - used; chargedItem = true; available -= used; } @@ -106,37 +84,42 @@ public class TileWirelessCharger extends TileEntityEio implements IInternalPower @Override protected void writeCustomNBT(NBTTagCompound root) { - root.setDouble("storedEnergy", storedEnergy); + root.setInteger("storedEnergyRF", storedEnergyRF); } @Override protected void readCustomNBT(NBTTagCompound root) { - storedEnergy = root.getDouble("storedEnergy"); + if(root.hasKey("storedEnergy")) { + double storedMJ = root.getDouble("storedEnergy"); + storedEnergyRF = (int)(storedMJ * 10); + } else { + storedEnergyRF = root.getInteger("storedEnergy"); + } } @Override - public void doWork(PowerHandler arg0) { + public int getMaxEnergyRecieved(ForgeDirection dir) { + return MAX_ENERGY_IN; } @Override - public PowerReceiver getPowerReceiver(ForgeDirection arg0) { - return powerHandler.getPowerReceiver(); + public int getEnergyStored() { + return storedEnergyRF; } @Override - public World getWorld() { - return getWorldObj(); + public int getMaxEnergyStored() { + return MAX_ENERGY_STORED; } @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - double maxMj = Math.min(maxReceive / 10, MAX_ENERGY_IN); - double canRecieve = Math.min(MAX_ENERGY_STORED_MJ - storedEnergy, maxMj); - int canRecieveRF = (int)(canRecieve * 10); - if(!simulate) { - storedEnergy += (canRecieveRF / 10f); - } - return canRecieveRF; + public void setEnergyStored(int stored) { + storedEnergyRF = stored; + } + + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); } @Override @@ -146,12 +129,12 @@ public class TileWirelessCharger extends TileEntityEio implements IInternalPower @Override public int getEnergyStored(ForgeDirection from) { - return (int)(storedEnergy * 10); + return storedEnergyRF; } @Override public int getMaxEnergyStored(ForgeDirection from) { - return MAX_ENERGY_STORED_MJ * 10; + return MAX_ENERGY_STORED; } @Override diff --git a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java index 4b9a7760..9496d104 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java +++ b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java @@ -42,7 +42,7 @@ public class WirelessChargerController { if(capBank == null) { return; } - Map chargers = getChargersForWorld(capBank.getWorld()); + Map chargers = getChargersForWorld(capBank.getWorldObj()); chargers.put(capBank.getLocation(), capBank); } @@ -50,7 +50,7 @@ public class WirelessChargerController { if(capBank == null) { return; } - Map chargers = getChargersForWorld(capBank.getWorld()); + Map chargers = getChargersForWorld(capBank.getWorldObj()); chargers.remove(capBank.getLocation()); } @@ -92,102 +92,5 @@ public class WirelessChargerController { return res; } - // public static final int CHUNK_RANGE = (RANGE/16 + (RANGE%16 == 0 ? 0 : 1)); - // - // private Map>> perWorldChargers = new HashMap>>(); - // - // private WirelessChargerController() { - // } - // - // public void registerCharger(TileCapacitorBank capBank) { - // if(capBank == null) { - // return; - // } - // Map> chargers = getChargersForWorld(capBank.getWorld()); - // List coords = getChunksInRange(capBank.getLocation()); - // for(ChunkCoordIntPair cc : coords) { - // addCharger(chargers, cc, capBank); - // } - // - // } - // - // public void dereigsterCharger(TileCapacitorBank capBank) { - // if(capBank == null) { - // return; - // } - // Map> chargers = getChargersForWorld(capBank.getWorld()); - // List coords = getChunksInRange(capBank.getLocation()); - // for(ChunkCoordIntPair cc : coords) { - // removeCharger(chargers, cc, capBank); - // } - // } - // - // - // @SubscribeEvent - // public void onPlayerTick(TickEvent.PlayerTickEvent event) { - // if(event.side == Side.CLIENT || event.phase != TickEvent.Phase.END) { - // return; - // } - // - // List charges = getChargersInRange(event.player); - // - // - // } - // - // private List getChargersInRange(EntityPlayer player) { - // Map> worldCharges = getChargersForWorld(player.worldObj); - // if(worldCharges.isEmpty()) { - // return null; - // } - // BlockCoord bc = new BlockCoord((int)player.posX, 0, (int)player.posZ); - // List chunks = getChunksInRange(bc); - // - // List result = new ArrayList(); - // - // } - // - // - // private void removeCharger(Map> chunkChargers, ChunkCoordIntPair cc, TileCapacitorBank capBank) { - // List chargers = chunkChargers.get(cc); - // if(chargers == null) { - // return; - // } - // chargers.remove(capBank); - // if(chargers.size() == 0) { - // chunkChargers.remove(cc); - // } - // } - // - // private void addCharger(Map> chunkChargers, ChunkCoordIntPair cc, TileCapacitorBank capBank) { - // List chargers = chunkChargers.get(cc); - // if(chargers == null) { - // chargers = new ArrayList(); - // chunkChargers.put(cc, chargers); - // } - // chargers.add(capBank); - // } - // - // private List getChunksInRange(BlockCoord coord) { - // int chunkX = coord.x >> 4; - // int chunkY = coord.y >> 4; - // - // List res = new ArrayList(); - // for(int xOffset=-CHUNK_RANGE; xOffset <= CHUNK_RANGE; xOffset++) { - // for(int yOffset=-CHUNK_RANGE; yOffset <= CHUNK_RANGE; yOffset++) { - // res.add(new ChunkCoordIntPair(chunkX + xOffset, chunkY + yOffset)); - // } - // } - // return res; - // } - // - // private Map> getChargersForWorld(World world) { - // int id = world.provider.dimensionId; - // Map> res = perWorldChargers.get(id); - // if(res == null) { - // res = new HashMap>(); - // perWorldChargers.put(id, res); - // } - // return res; - // } - + } diff --git a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java index 023f88a1..90e66c73 100644 --- a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java @@ -117,10 +117,10 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { private ArrayList input; private PositionedStack output; - private double energy; + private int energy; // Possible energy cost in the future? - public double getEnergy() { + public int getEnergy() { return energy; } @@ -134,7 +134,7 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { return output; } - public AlloySmelterRecipe(float energy, RecipeInput[] ingredients, ItemStack result) { + public AlloySmelterRecipe(int energy, RecipeInput[] ingredients, ItemStack result) { int recipeSize = ingredients.length; this.input = new ArrayList(); int yOff = 8; @@ -150,7 +150,7 @@ public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { if(result != null) { this.output = new PositionedStack(result, 74, 54 - yOff); } - this.energy = energy; //If we wanted to do an energy cost + this.energy = energy; } } } diff --git a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java index e99b7698..0584f4ba 100644 --- a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java @@ -177,10 +177,10 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler { private PositionedStack output; private ArrayList otherOutputs; private float[] outputChance; - private double energy; + private int energy; // Possible energy cost in the future? - public double getEnergy() { + public int getEnergy() { return energy; } @@ -215,11 +215,11 @@ public class SagMillRecipeHandler extends TemplateRecipeHandler { return otherOutputs; } - public MillRecipe(float energy, RecipeInput ingredient, RecipeOutput[] outputs) { + public MillRecipe(int energy, RecipeInput ingredient, RecipeOutput[] outputs) { this(null, energy, ingredient, outputs); } - public MillRecipe(ItemStack targetedResult, float energy, RecipeInput ingredient, RecipeOutput[] outputs) { + public MillRecipe(ItemStack targetedResult, int energy, RecipeInput ingredient, RecipeOutput[] outputs) { this.energy = energy; input = new ArrayList(2); diff --git a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java index 7a6000c5..d485dc2b 100644 --- a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java @@ -244,11 +244,11 @@ public class VatRecipeHandler extends TemplateRecipeHandler { public class InnerVatRecipe extends TemplateRecipeHandler.CachedRecipe { private ArrayList inputs; - private double energy; + private int energy; private FluidStack result; private FluidStack inFluid; - public double getEnergy() { + public int getEnergy() { return energy; } @@ -262,7 +262,7 @@ public class VatRecipeHandler extends TemplateRecipeHandler { return null; } - public InnerVatRecipe(float energy, RecipeInput[] ingredients, FluidStack result) { + public InnerVatRecipe(int energy, RecipeInput[] ingredients, FluidStack result) { ArrayList inputsOne = new ArrayList(); ArrayList inputsTwo = new ArrayList(); for (RecipeInput input : ingredients) { diff --git a/src/main/java/crazypants/enderio/power/Capacitors.java b/src/main/java/crazypants/enderio/power/Capacitors.java index 1bdca7e9..82e526a0 100644 --- a/src/main/java/crazypants/enderio/power/Capacitors.java +++ b/src/main/java/crazypants/enderio/power/Capacitors.java @@ -6,15 +6,15 @@ import crazypants.enderio.EnderIO; public enum Capacitors { BASIC_CAPACITOR( - new BasicCapacitor(20, 10000, 2), + new BasicCapacitor(40, 100000, 20), "basicCapacitor"), ACTIVATED_CAPACITOR( - new BasicCapacitor(40, 20000, 6), + new BasicCapacitor(120, 200000, 60), "activatedCapacitor"), ENDER_CAPACITOR( - new BasicCapacitor(100, 100000, 10), + new BasicCapacitor(200, 1000000, 100), "enderCapacitor"); public final ICapacitor capacitor; diff --git a/src/main/java/crazypants/enderio/power/IInternalPowerReceptor.java b/src/main/java/crazypants/enderio/power/IInternalPowerReceptor.java index 71c2e588..dc2e9eb9 100644 --- a/src/main/java/crazypants/enderio/power/IInternalPowerReceptor.java +++ b/src/main/java/crazypants/enderio/power/IInternalPowerReceptor.java @@ -1,12 +1,16 @@ package crazypants.enderio.power; -import buildcraft.api.power.IPowerReceptor; +import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyHandler; -public interface IInternalPowerReceptor extends IPowerReceptor, IEnergyHandler { - - // PowerHandler getPowerHandler(); - // - // void applyPerdition(); +public interface IInternalPowerReceptor extends IEnergyHandler { + int getMaxEnergyRecieved(ForgeDirection dir); + + int getEnergyStored(); + + int getMaxEnergyStored(); + + void setEnergyStored(int stored); + } diff --git a/src/main/java/crazypants/enderio/power/IPowerInterface.java b/src/main/java/crazypants/enderio/power/IPowerInterface.java index ff15acae..ddd32b4c 100644 --- a/src/main/java/crazypants/enderio/power/IPowerInterface.java +++ b/src/main/java/crazypants/enderio/power/IPowerInterface.java @@ -8,14 +8,14 @@ public interface IPowerInterface { boolean canConduitConnect(ForgeDirection direction); - float getEnergyStored(ForgeDirection dir); + int getEnergyStored(ForgeDirection dir); - float getMaxEnergyStored(ForgeDirection dir); + int getMaxEnergyStored(ForgeDirection dir); - float getPowerRequest(ForgeDirection dir); + int getPowerRequest(ForgeDirection dir); - float getMinEnergyReceived(ForgeDirection dir); + int getMinEnergyReceived(ForgeDirection dir); - float recieveEnergy(ForgeDirection opposite, float canOffer); + int recieveEnergy(ForgeDirection opposite, float canOffer); } diff --git a/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java b/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java index 85b21fc4..39b9007b 100644 --- a/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java +++ b/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java @@ -3,15 +3,6 @@ package crazypants.enderio.power; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.mj.IBatteryObject; -import buildcraft.api.mj.MjAPI; -import buildcraft.api.power.IPowerReceptor; -import buildcraft.api.power.PowerHandler; -import buildcraft.api.power.PowerHandler.PerditionCalculator; -import buildcraft.api.power.PowerHandler.PowerReceiver; -import buildcraft.api.power.PowerHandler.Type; -import buildcraft.api.transport.IPipeTile; -import buildcraft.api.transport.IPipeTile.PipeType; import cofh.api.energy.IEnergyHandler; public class PowerHandlerUtil { @@ -19,157 +10,42 @@ public class PowerHandlerUtil { public static IPowerInterface create(Object o) { if(o instanceof IEnergyHandler) { return new PowerInterfaceRF((IEnergyHandler) o); - } else if(o instanceof IPowerReceptor) { - return new PowerInterfaceBC((IPowerReceptor) o); - } - IBatteryObject battery = MjAPI.getMjBattery(o); - if(battery != null) { - return new PowerInterfaceBC2(battery); - } + } return null; } - public static boolean canConnectRecievePower(IPowerReceptor rec) { - if(rec == null) { - return false; - } - if(rec instanceof IPipeTile) { - IPipeTile pipeTile = (IPipeTile) rec; - return pipeTile.getPipeType() == PipeType.POWER; - } - return true; - - } - - public static double getStoredEnergyForItem(ItemStack item) { + public static int getStoredEnergyForItem(ItemStack item) { NBTTagCompound tag = item.getTagCompound(); if(tag == null) { return 0; } - return tag.getDouble("storedEnergy"); + + if(tag.hasKey("storedEnergy")) { + double storedMj = tag.getDouble("storedEnergy"); + return (int)(storedMj * 10); + } + + return tag.getInteger("storedEnergyRF"); } - public static void setStoredEnergyForItem(ItemStack item, double storedEnergy) { + public static void setStoredEnergyForItem(ItemStack item, int storedEnergy) { NBTTagCompound tag = item.getTagCompound(); if(tag == null) { tag = new NBTTagCompound(); } - tag.setDouble("storedEnergy", storedEnergy); + tag.setInteger("storedEnergyRF", storedEnergy); item.setTagCompound(tag); } - public static PowerHandler createHandler(ICapacitor capacitor, IPowerReceptor pr, Type type) { - PowerHandler ph = new PowerHandler(pr, type); - ph.configure(capacitor.getMinEnergyReceived(), capacitor.getMaxEnergyReceived(), capacitor.getMinActivationEnergy(), capacitor.getMaxEnergyStored()); - ph.configurePowerPerdition(0, 0); - ph.setPerdition(new NullPerditionCalculator()); - return ph; - } - - public static void configure(PowerHandler ph, ICapacitor capacitor) { - ph.configure(capacitor.getMinEnergyReceived(), capacitor.getMaxEnergyReceived(), capacitor.getMinActivationEnergy(), capacitor.getMaxEnergyStored()); - if(ph.getEnergyStored() > ph.getMaxEnergyStored()) { - ph.setEnergy(ph.getMaxEnergyStored()); - } - ph.configurePowerPerdition(0, 0); - ph.setPerdition(new NullPerditionCalculator()); - } - - public static float transmitInternal(IInternalPowerReceptor receptor, PowerReceiver pp, float quantity, Type type, ForgeDirection from) { - IEnergyHandler eh = receptor; - return eh.receiveEnergy(from, (int) (quantity* 10), false) / 10f; - - // PowerHandler ph = receptor.getPowerHandler(); - // if(ph == null) { - // return 0; - // } - // - // double energyStored = pp.getEnergyStored(); - // double canUse = quantity; - // canUse = Math.min(canUse, pp.getMaxEnergyReceived()); - // // Don't overflow it - // canUse = Math.min(canUse, pp.getMaxEnergyStored() - energyStored); - // if(canUse <= pp.getMinEnergyReceived()) { - // pp.receiveEnergy(type, 0, null); - // ph.setEnergy(energyStored); - // return 0; - // } - // - // // Do all required functions except: - // // - We will handle perd'n ourselves and there is not need to drain excess - // // from our engines as they are self regulating - // // - Also not making use of the doWork calls. - // pp.receiveEnergy(type, 0, from); - // ph.setEnergy(energyStored); - // - // ph.setEnergy(ph.getEnergyStored() + canUse); - // receptor.applyPerdition(); - // - // return (float) canUse; - } - - public static int recieveRedstoneFlux(ForgeDirection from, PowerHandler powerHandler, int maxReceive, boolean simulate) { - return recieveRedstoneFlux(from, powerHandler, maxReceive, simulate, false); - } - - public static int recieveRedstoneFlux(ForgeDirection from, PowerHandler powerHandler, int maxReceive, boolean simulate, boolean tickPH) { - double canRecieve = getMaxEnergyRecievedMj(powerHandler, maxReceive / 10d, from); - if(!simulate) { - if(tickPH) { - doBuildCraftEnergyTick(powerHandler, from); - } - powerHandler.setEnergy(powerHandler.getEnergyStored() + canRecieve); - } - return (int)(canRecieve * 10); - } - - public static double getMaxEnergyRecievedMj(PowerHandler ph, double max, ForgeDirection from) { - if(ph == null) { - return 0; - } - double canRecieve = max; - canRecieve = Math.min(canRecieve, ph.getMaxEnergyReceived()); - canRecieve = Math.min(canRecieve, ph.getMaxEnergyStored() - ph.getEnergyStored()); - if(canRecieve <= ph.getMinEnergyReceived()) { - return 0; - } - return canRecieve; - } - - public static void doBuildCraftEnergyTick(PowerHandler ph, ForgeDirection from) { - if(ph == null) { - return; - } - PowerReceiver pp = ph.getPowerReceiver(); - if(pp == null) { - return; - } - double stored = ph.getEnergyStored(); - pp.receiveEnergy(Type.PIPE, 0, from); - ph.setEnergy(stored); - } - - private static class NullPerditionCalculator extends PerditionCalculator { - - @Override - public double applyPerdition(PowerHandler powerHandler, double current, long ticksPassed) { - if(current <= 0) { - return 0; - } - double decAmount = 0.001f; - double res; - do { - res = current - decAmount; - decAmount *= 10; - } while (res >= current && decAmount < PerditionCalculator.MIN_POWERLOSS); - return res; - } - - @Override - public double getTaxPercent() { - return 0; - } - + + public static int recieveInternal(IInternalPowerReceptor target, int maxReceive, ForgeDirection from, boolean simulate) { + int result = Math.min(target.getMaxEnergyRecieved(from), maxReceive); + result = Math.min(target.getMaxEnergyStored() - target.getEnergyStored(), result); + if(result > 0 && !simulate) { + target.setEnergyStored(target.getEnergyStored() + result); + } + return result; } + } diff --git a/src/main/java/crazypants/enderio/power/PowerInterfaceBC.java b/src/main/java/crazypants/enderio/power/PowerInterfaceBC.java deleted file mode 100644 index a41f8360..00000000 --- a/src/main/java/crazypants/enderio/power/PowerInterfaceBC.java +++ /dev/null @@ -1,110 +0,0 @@ -package crazypants.enderio.power; - -import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.power.IPowerEmitter; -import buildcraft.api.power.IPowerReceptor; -import buildcraft.api.power.PowerHandler.PowerReceiver; -import buildcraft.api.power.PowerHandler.Type; - -public class PowerInterfaceBC implements IPowerInterface { - - private IPowerReceptor bcPower; - - public PowerInterfaceBC(IPowerReceptor powerReceptor) { - bcPower = powerReceptor; - } - - @Override - public Object getDelegate() { - return bcPower; - } - - @Override - public boolean canConduitConnect(ForgeDirection direction) { - if(bcPower != null) { - if(bcPower instanceof IPowerEmitter) { - return ((IPowerEmitter) bcPower).canEmitPowerFrom(direction.getOpposite()); - } - return PowerHandlerUtil.canConnectRecievePower(bcPower); - } - return false; - } - - @Override - public float getEnergyStored(ForgeDirection dir) { - double result = 0; - if(bcPower instanceof IInternalPowerReceptor) { - result = ((IInternalPowerReceptor) bcPower).getEnergyStored(null)/10; - } else if(bcPower != null && !(bcPower instanceof IPowerEmitter)) { - PowerReceiver pr = bcPower.getPowerReceiver(dir); - if(pr != null) { - result += pr.getEnergyStored(); - } - } - return (float) result; - } - - @Override - public float getMaxEnergyStored(ForgeDirection dir) { - double result = 0; - if(bcPower instanceof IInternalPowerReceptor) { - result = ((IInternalPowerReceptor) bcPower).getMaxEnergyStored(null)/10; - } else if(bcPower != null && !(bcPower instanceof IPowerEmitter)) { - PowerReceiver pr = bcPower.getPowerReceiver(dir); - if(pr != null) { - result += pr.getMaxEnergyStored(); - } - } - return (float) result; - } - - @Override - public float getPowerRequest(ForgeDirection dir) { - if(bcPower != null) { - PowerReceiver pr = bcPower.getPowerReceiver(dir); - if(pr == null || pr.getType() == Type.ENGINE) { - return 0; - } - return (float) pr.powerRequest(); - } - - return 0; - } - - @Override - public float getMinEnergyReceived(ForgeDirection dir) { - if(bcPower != null) { - PowerReceiver pr = bcPower.getPowerReceiver(dir); - if(pr == null) { - return 0; - } - return (float) pr.getMinEnergyReceived(); - } - return 0; - } - - @Override - public float recieveEnergy(ForgeDirection opposite, float canOffer) { - if(bcPower != null) { - if(bcPower instanceof IInternalPowerReceptor) { - return PowerHandlerUtil.transmitInternal((IInternalPowerReceptor) bcPower, bcPower.getPowerReceiver(opposite), canOffer, Type.PIPE, opposite); - } - if(bcPower instanceof IPowerEmitter) { - return 0; - } - PowerReceiver pr = bcPower.getPowerReceiver(opposite); - if(pr == null) { - return 0; - } - double offer = Math.min(pr.powerRequest(), canOffer); - return (float) pr.receiveEnergy(Type.PIPE, offer, opposite); - } - return 0; - } - - public static int fromRF(int energyStored) { - return energyStored/10; - - } - -} diff --git a/src/main/java/crazypants/enderio/power/PowerInterfaceBC2.java b/src/main/java/crazypants/enderio/power/PowerInterfaceBC2.java deleted file mode 100644 index b934df0e..00000000 --- a/src/main/java/crazypants/enderio/power/PowerInterfaceBC2.java +++ /dev/null @@ -1,47 +0,0 @@ -package crazypants.enderio.power; - -import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.mj.IBatteryObject; - -public class PowerInterfaceBC2 implements IPowerInterface { - private final IBatteryObject battery; - - public PowerInterfaceBC2(IBatteryObject battery) { - this.battery = battery; - } - - @Override - public Object getDelegate() { - return battery; - } - - @Override - public boolean canConduitConnect(ForgeDirection direction) { - return true; - } - - @Override - public float getEnergyStored(ForgeDirection dir) { - return (float) battery.getEnergyStored(); - } - - @Override - public float getMaxEnergyStored(ForgeDirection dir) { - return (float) battery.maxCapacity(); - } - - @Override - public float getPowerRequest(ForgeDirection dir) { - return (float) battery.getEnergyRequested(); - } - - @Override - public float getMinEnergyReceived(ForgeDirection dir) { - return (float) battery.minimumConsumption(); - } - - @Override - public float recieveEnergy(ForgeDirection opposite, float canOffer) { - return (float) battery.addEnergy(canOffer); - } -} diff --git a/src/main/java/crazypants/enderio/power/PowerInterfaceRF.java b/src/main/java/crazypants/enderio/power/PowerInterfaceRF.java index 02799c1f..19e02381 100644 --- a/src/main/java/crazypants/enderio/power/PowerInterfaceRF.java +++ b/src/main/java/crazypants/enderio/power/PowerInterfaceRF.java @@ -24,46 +24,46 @@ public class PowerInterfaceRF implements IPowerInterface { } @Override - public float getEnergyStored(ForgeDirection dir) { + public int getEnergyStored(ForgeDirection dir) { if(rfPower != null && dir != null) { - return rfPower.getEnergyStored(dir) / 10f; + return rfPower.getEnergyStored(dir); } return 0; } @Override - public float getMaxEnergyStored(ForgeDirection dir) { + public int getMaxEnergyStored(ForgeDirection dir) { if(rfPower != null && dir != null) { - return rfPower.getMaxEnergyStored(dir) / 10f; + return rfPower.getMaxEnergyStored(dir); } return 0; } @Override - public float getPowerRequest(ForgeDirection dir) { + public int getPowerRequest(ForgeDirection dir) { if(rfPower != null && dir != null && rfPower.canConnectEnergy(dir)) { - return rfPower.receiveEnergy(dir, 99999999, true) / 10f; + return rfPower.receiveEnergy(dir, 99999999, true); } return 0; } - public static float getPowerRequestMJ(ForgeDirection dir, IEnergyHandler handler) { + public static int getPowerRequest(ForgeDirection dir, IEnergyHandler handler) { if(handler != null && dir != null && handler.canConnectEnergy(dir)) { - return handler.receiveEnergy(dir, 99999999, true) / 10f; + return handler.receiveEnergy(dir, 99999999, true); } return 0; } @Override - public float getMinEnergyReceived(ForgeDirection dir) { + public int getMinEnergyReceived(ForgeDirection dir) { return 0; } @Override - public float recieveEnergy(ForgeDirection opposite, float canOffer) { + public int recieveEnergy(ForgeDirection opposite, float canOffer) { if(rfPower != null && opposite != null) { - return rfPower.receiveEnergy(opposite, (int) (canOffer * 10), false) / 10f; + return rfPower.receiveEnergy(opposite, (int) (canOffer * 10), false); } return 0; } diff --git a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java index ffcf3bff..29d9cba2 100644 --- a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java +++ b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java @@ -22,7 +22,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.enderio.network.PacketHandler; import crazypants.enderio.teleport.packet.PacketOpenAuthGui; import crazypants.util.BlockCoord; @@ -203,8 +202,8 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IResourceToo @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); }