diff --git a/resources/assets/enderio/textures/blocks/combustionGenFrontOn.png b/resources/assets/enderio/textures/blocks/combustionGenFrontOn.png index 798f297a..bfeacdaf 100644 Binary files a/resources/assets/enderio/textures/blocks/combustionGenFrontOn.png and b/resources/assets/enderio/textures/blocks/combustionGenFrontOn.png differ diff --git a/resources/assets/enderio/textures/blocks/vatFrontOn.png b/resources/assets/enderio/textures/blocks/vatFrontOn.png index 37374500..5ceeca84 100644 Binary files a/resources/assets/enderio/textures/blocks/vatFrontOn.png and b/resources/assets/enderio/textures/blocks/vatFrontOn.png differ diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index a92ef6bf..f5f2e27e 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -244,7 +244,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { if(!ConduitUtil.forceSkylightRecalculation(worldObj, xCoord, yCoord, zCoord)) { markForUpdate = true; } - } else { //can do the else as only need to update once + } else { //can do the else as only need to update once ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(EnderIO.proxy.getClientPlayer().getCurrentEquippedItem()); if(curMode != lastMode) { markForUpdate = true; @@ -638,23 +638,6 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { return null; } - @Override - public PowerHandler getPowerHandler() { - IPowerConduit pc = getConduit(IPowerConduit.class); - if(pc != null) { - return pc.getPowerHandler(); - } - return null; - } - - @Override - public void applyPerdition() { - IPowerConduit pc = getConduit(IPowerConduit.class); - if(pc != null) { - pc.applyPerdition(); - } - - } @Override public World getWorld() { diff --git a/src/main/java/crazypants/enderio/conduit/power/IPowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/IPowerConduit.java index e3bc5744..b95ccabf 100644 --- a/src/main/java/crazypants/enderio/conduit/power/IPowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/IPowerConduit.java @@ -30,7 +30,7 @@ public interface IPowerConduit extends IConduit, IInternalPowerReceptor, IExtrac IIcon getTextureForOutputMode(); - //called from NetworkPowerManager + //called from NetworkPowerManager void onTick(); //mj @@ -40,4 +40,6 @@ public interface IPowerConduit extends IConduit, IInternalPowerReceptor, IExtrac boolean getConnectionsDirty(); + double getMaxEnergyStored(); + } diff --git a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java index 0c107818..f90b7deb 100644 --- a/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java +++ b/src/main/java/crazypants/enderio/conduit/power/NetworkPowerManager.java @@ -9,8 +9,7 @@ import java.util.Map; import java.util.Set; import net.minecraft.world.World; -import buildcraft.api.power.PowerHandler.PowerReceiver; -import buildcraft.api.power.PowerHandler.Type; +import buildcraft.api.power.IPowerEmitter; import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent; import crazypants.enderio.Config; import crazypants.enderio.Log; @@ -88,12 +87,12 @@ public class NetworkPowerManager { public float getPowerInReceptors() { float result = 0; - Set done = new HashSet(); + Set done = new HashSet(); for (ReceptorEntry re : receptors) { if(!re.emmiter.getConnectionsDirty()) { IPowerInterface powerReceptor = re.powerInterface; - if(!done.contains(powerReceptor)) { - done.add(powerReceptor); + if(!done.contains(powerReceptor.getDelegate()) && !(powerReceptor.getDelegate() instanceof IPowerEmitter)) { + done.add(powerReceptor.getDelegate()); result += powerReceptor.getEnergyStored(re.direction); } } @@ -103,12 +102,12 @@ public class NetworkPowerManager { public float getMaxPowerInReceptors() { float result = 0; - Set done = new HashSet(); + Set done = new HashSet(); for (ReceptorEntry re : receptors) { if(!re.emmiter.getConnectionsDirty()) { IPowerInterface powerReceptor = re.powerInterface; - if(!done.contains(powerReceptor)) { - done.add(powerReceptor); + if(!done.contains(powerReceptor.getDelegate()) && !(powerReceptor.getDelegate() instanceof IPowerEmitter)) { + done.add(powerReceptor.getDelegate()); result += powerReceptor.getMaxEnergyStored(re.direction); } } @@ -151,53 +150,39 @@ public class NetworkPowerManager { } ReceptorEntry r = receptorIterator.next(); - if(r.emmiter.getPowerHandler() != null && r.emmiter.getPowerHandler().isPowerSource(r.direction)) { + IPowerInterface pp = r.powerInterface; + if(pp != null) { - // do a summy recieve or recieve energy counter will never tick down - double es = r.emmiter.getPowerHandler().getEnergyStored(); - PowerReceiver pr = r.emmiter.getPowerReceiver(r.direction.getOpposite()); - pr.receiveEnergy(Type.STORAGE, 0, null); - r.emmiter.getPowerHandler().setEnergy(es); + float used = 0; + if(pp.getClass() == PowerInterfaceRF.class) { - } else { + float canOffer = Math.min(r.emmiter.getMaxEnergyExtracted(r.direction), available); + used = pp.recieveEnergy(r.direction.getOpposite(), canOffer); + trackerSend(r.emmiter, used, false); - IPowerInterface pp = r.powerInterface; + } else { - if(pp != null) { + float reservedForEntry = removeReservedEnergy(r); + available += reservedForEntry; + float canOffer = Math.min(r.emmiter.getMaxEnergyExtracted(r.direction), available); + float requested = pp.getPowerRequest(r.direction.getOpposite()); - float used = 0; - - if(pp.getClass() == PowerInterfaceRF.class) { - - float 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); - available += reservedForEntry; - float canOffer = Math.min(r.emmiter.getMaxEnergyExtracted(r.direction), available); - float 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) { - // Buffer energy if we can't meet it now - if(pp.getMinEnergyReceived(r.direction) > canOffer) { - reserveEnergy(r, canOffer); - used += canOffer; - } else { - used = pp.recieveEnergy(r.direction.getOpposite(), canOffer); - trackerSend(r.emmiter, used, false); - } + // If it is possible to supply the minimum amount of energy + if(pp.getMinEnergyReceived(r.direction) <= r.emmiter.getMaxEnergyExtracted(r.direction) && requested > 0) { + // Buffer energy if we can't meet it now + if(pp.getMinEnergyReceived(r.direction) > canOffer) { + reserveEnergy(r, canOffer); + used += canOffer; + } else { + used = pp.recieveEnergy(r.direction.getOpposite(), canOffer); + trackerSend(r.emmiter, used, false); } } - available -= used; - if(available <= 0) { - break; - } } - + available -= used; + if(available <= 0) { + break; + } } appliedCount++; } diff --git a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java index b61a88ce..d1067c83 100644 --- a/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/PowerConduit.java @@ -47,9 +47,9 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { static final Map ICONS = new HashMap(); static final ICapacitor[] CAPACITORS = new BasicCapacitor[] { - new BasicCapacitor(500, 1500, 128), - new BasicCapacitor(512, 3000, 512), - new BasicCapacitor(2048, 5000, 2048) + new BasicCapacitor(500, 1500, 128), + new BasicCapacitor(512, 3000, 512), + new BasicCapacitor(2048, 5000, 2048) }; static final String[] POSTFIX = new String[] { "", "Enhanced", "Ender" }; @@ -342,14 +342,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { return getCapacitor().getMaxEnergyReceived(); } - @Override - public PowerHandler getPowerHandler() { - return powerHandler; - } - @Override - public void applyPerdition() { - } @Override public void doWork(PowerHandler workProvider) { @@ -509,4 +502,9 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { return result; } + @Override + public double getMaxEnergyStored() { + return CAPACITORS[subtype].getMaxEnergyStored(); + } + } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index 4d51d691..83b90fcf 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -236,7 +236,7 @@ public abstract class AbstractMachineBlock exte return "enderio:machineTop"; } - private boolean isActive(IBlockAccess blockAccess, int x, int y, int z) { + protected boolean isActive(IBlockAccess blockAccess, int x, int y, int z) { TileEntity te = blockAccess.getTileEntity(x, y, z); if(te instanceof AbstractMachineEntity) { return ((AbstractMachineEntity) te).isActive(); diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 1956f566..ce0d26d9 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -117,14 +117,14 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements IIn redstoneStateDirty = true; } - @Override - public PowerHandler getPowerHandler() { - return powerHandler; - } - - @Override - public void applyPerdition() { - } + // @Override + // public PowerHandler getPowerHandler() { + // return powerHandler; + // } + // + // @Override + // public void applyPerdition() { + // } public short getFacing() { return facing; @@ -214,6 +214,10 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements IIn return (int) (powerHandler.getMaxEnergyStored() * 10); } + public int getMaxEnergyStoredMJ() { + return (int)powerHandler.getMaxEnergyStored(); + } + // --- Process Loop // -------------------------------------------------------------------------- diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 5f3ab5f3..4007f3a9 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -27,6 +27,7 @@ public class MachineRecipes { ItemStack enderCapacitor = new ItemStack(itemBasicCapacitor, 1, Capacitors.ENDER_CAPACITOR.ordinal()); ItemStack basicGear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal()); ItemStack machineChassi = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.MACHINE_CHASSI.ordinal()); + ItemStack electricSteel = new ItemStack(EnderIO.itemAlloy,1,Alloy.ELECTRICAL_STEEL.ordinal()); //stirling gen ItemStack stirlingGen = new ItemStack(EnderIO.blockStirlingGenerator, 1, 0); @@ -56,14 +57,14 @@ public class MachineRecipes { //Still ItemStack still = new ItemStack(EnderIO.blockVat, 1, 0); - GameRegistry.addShapedRecipe(crusher, "iii", "dmd", "gcg", 'd', Items.cauldron, 'g', basicGear, 'm', machineChassi, 'i', Items.iron_ingot, 'c', capacitor); + GameRegistry.addShapedRecipe(crusher, "eve", "eme", "ece", 'v', Items.cauldron, 'm', machineChassi, 'i', electricSteel, 'c', capacitor); //transceiver ItemStack transceiver = new ItemStack(EnderIO.blockHyperCube, 1, 0); ItemStack obsidian = new ItemStack(Blocks.obsidian); ItemStack phasedGold = new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_GOLD.ordinal()); GameRegistry - .addShapedRecipe(transceiver, "oeo", "pdp", "oco", 'o', obsidian, 'e', Items.ender_eye, 'c', enderCapacitor, 'p', phasedGold, 'd', Items.diamond); + .addShapedRecipe(transceiver, "oeo", "pdp", "oco", 'o', obsidian, 'e', Items.ender_eye, 'c', enderCapacitor, 'p', phasedGold, 'd', Items.diamond); //solar panel if(Config.photovoltaicCellEnabled) { @@ -84,8 +85,8 @@ public class MachineRecipes { ItemStack redstoneConduit = new ItemStack(EnderIO.itemRedstoneConduit, 1, 2); ItemStack mJMonitor = new ItemStack(EnderIO.blockPowerMonitor, 1, 0); GameRegistry - .addShapedRecipe(mJMonitor, "bmb", "bMb", "bcb", 'b', Blocks.stonebrick, 'e', Items.ender_eye, 'M', machineChassi, 'm', mJReader, 'p', powerConduit, - 'r', redstoneConduit, 'c', capacitor); + .addShapedRecipe(mJMonitor, "bmb", "bMb", "bcb", 'b', Blocks.stonebrick, 'e', Items.ender_eye, 'M', machineChassi, 'm', mJReader, 'p', powerConduit, + 'r', redstoneConduit, 'c', capacitor); } @@ -149,7 +150,7 @@ public class MachineRecipes { } - //MJ Reader + //MJ Reader ItemStack mJReader = new ItemStack(EnderIO.itemConduitProbe, 1, 0); ItemStack electricalSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()); ItemStack powerConduit = new ItemStack(EnderIO.itemPowerConduit, 1, 0); diff --git a/src/main/java/crazypants/enderio/machine/generator/PowerDistributor.java b/src/main/java/crazypants/enderio/machine/generator/PowerDistributor.java index da5c279b..9b1682e0 100644 --- a/src/main/java/crazypants/enderio/machine/generator/PowerDistributor.java +++ b/src/main/java/crazypants/enderio/machine/generator/PowerDistributor.java @@ -13,14 +13,14 @@ import crazypants.util.BlockCoord; public class PowerDistributor { - + private final List receptors = new ArrayList(); private ListIterator receptorIterator = receptors.listIterator(); private boolean receptorsDirty = true; - + private final BlockCoord bc; - - + + public PowerDistributor(BlockCoord bc) { this.bc = bc; } @@ -29,7 +29,7 @@ public class PowerDistributor { public void neighboursChanged() { receptorsDirty = true; } - + public float transmitEnergy(World worldObj, float available) { float transmitted = 0; @@ -44,7 +44,7 @@ public class PowerDistributor { Receptor receptor = receptorIterator.next(); IPowerInterface pp = receptor.receptor; if(pp != null && pp.getMinEnergyReceived(receptor.fromDir.getOpposite()) <= available) { - double used = pp.recieveEnergy(receptor.fromDir.getOpposite(), (float) available); + double used = pp.recieveEnergy(receptor.fromDir.getOpposite(), available); transmitted += used; available -= used; } @@ -65,7 +65,7 @@ public class PowerDistributor { if(!receptorsDirty) { return; } - receptors.clear(); + receptors.clear(); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { BlockCoord checkLoc = bc.getLocation(dir); TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); @@ -77,7 +77,7 @@ public class PowerDistributor { receptorIterator = receptors.listIterator(); receptorsDirty = false; } - + static class Receptor { IPowerInterface receptor; ForgeDirection fromDir; diff --git a/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java index f90707ef..4e83bc9e 100644 --- a/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java @@ -1,14 +1,11 @@ package crazypants.enderio.machine.generator; -import cofh.api.energy.EnergyStorage; import net.minecraft.block.Block; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; @@ -28,13 +25,14 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP final FluidTank coolantTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 5); final FluidTank fuelTank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME * 5); private boolean tanksDirty; - + private int ticksRemaingFuel; - private int ticksRemaingCoolant; + private int ticksRemaingCoolant; private boolean active; - + private PowerDistributor powerDis; - + private float transmitted; + public TileCombustionGenerator() { super(new SlotDefinition(-1, -1, -1, -1, -1, -1)); powerHandler.configure(0, 0, 0, capacitorType.capacitor.getMaxEnergyStored()); @@ -82,27 +80,26 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP } tanksDirty = true; if(IronEngineCoolant.isCoolant(resource.getFluid())) { - return coolantTank.fill(resource, doFill); - } + return coolantTank.fill(resource, doFill); + } if(IronEngineFuel.getFuelForFluid(resource.getFluid()) != null) { return fuelTank.fill(resource, doFill); } - return 0; + return 0; } - + @Override - public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { return null; } @Override - public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { return null; } - - + @Override public void onNeighborBlockChange(Block blockId) { super.onNeighborBlockChange(blockId); @@ -112,66 +109,81 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP } @Override - protected boolean processTasks(boolean redstoneChecksPassed) { - boolean res = tanksDirty; + protected boolean processTasks(boolean redstoneChecksPassed) { + boolean res = tanksDirty; tanksDirty = false; - + if(!redstoneChecksPassed) { return res; } - + boolean isActive = checkActive(); if(isActive != this.active) { active = isActive; res = true; - } - + } + transmitEnergy(); - + return res; } - - private boolean transmitEnergy() { + + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + return 0; + } + + private boolean transmitEnergy() { if(storedEnergy <= 0) { return false; } if(powerDis == null) { powerDis = new PowerDistributor(new BlockCoord(this)); - } - float transmitted = powerDis.transmitEnergy(worldObj, (float)storedEnergy); + } + double transmitted = powerDis.transmitEnergy(worldObj, storedEnergy); storedEnergy -= transmitted; - return transmitted > 0; + return transmitted > 0; } private boolean checkActive() { - if(fuelTank.getFluidAmount() <= 0 || coolantTank.getFluidAmount() <= 0 || storedEnergy >= powerHandler.getMaxEnergyStored()) { - return false; - } - Coolant coolant = IronEngineCoolant.getCoolant(coolantTank.getFluid()); - if(coolant == null) { - return false; - } - Fuel fuel = IronEngineFuel.getFuelForFluid(fuelTank.getFluid().getFluid()); + + Fuel fuel = fuelTank.getFluid() == null ? null : IronEngineFuel.getFuelForFluid(fuelTank.getFluid().getFluid()); if(fuel == null) { return false; } - + + if(coolantTank.getFluidAmount() <= 0 || storedEnergy >= powerHandler.getMaxEnergyStored() - fuel.powerPerCycle) { + return false; + } + Coolant coolant = IronEngineCoolant.getCoolant(coolantTank.getFluid()); + if(coolant == null) { + return false; + } + + boolean res = false; - ticksRemaingFuel--; + ticksRemaingFuel--; if(ticksRemaingFuel <= 0) { - fuelTank.drain(1, true); + fuelTank.drain(1, true); ticksRemaingFuel = getNumTicksPerMbFuel(fuel); res = true; - } + } ticksRemaingCoolant--; if(ticksRemaingCoolant <= 0) { - coolantTank.drain(1, true); - ticksRemaingCoolant = getNumTicksPerMbCoolant(coolant, fuel); + coolantTank.drain(1, true); + ticksRemaingCoolant = getNumTicksPerMbCoolant(coolant, fuel); res = true; } - + + + + float oldVal = storedEnergy; storedEnergy += fuel.powerPerCycle; - + + storedEnergy = Math.min(storedEnergy, capacitorType.capacitor.getMaxEnergyStored()); + + transmitted = storedEnergy - oldVal; + return fuelTank.getFluidAmount() > 0 && coolantTank.getFluidAmount() > 0; } @@ -181,16 +193,16 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP } return getNumTicksPerMbFuel(IronEngineFuel.getFuelForFluid(fuelTank.getFluid().getFluid())); } - + public int getNumTicksPerMbCoolant() { if(fuelTank.getFluidAmount() <=0 ) { return 0; } Fuel fuel = IronEngineFuel.getFuelForFluid(fuelTank.getFluid().getFluid()); - Coolant coolant = IronEngineCoolant.getCoolant(coolantTank.getFluid()); + Coolant coolant = IronEngineCoolant.getCoolant(coolantTank.getFluid()); return getNumTicksPerMbCoolant(coolant, fuel); } - + static int getNumTicksPerMbFuel(Fuel fuel) { if(fuel == null) { return 0; @@ -202,17 +214,18 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP if(coolant == null || fuel == null) { return 0; } - float power = fuel.powerPerCycle; + float power = fuel.powerPerCycle; float cooling = coolant.getDegreesCoolingPerMB(100); double toCool = 1d/ (0.027 * power); int numTicks = (int)Math.round(toCool/ (cooling * 1000)); 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 - } + //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) { @@ -220,20 +233,20 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP } @Override - public boolean canFill(ForgeDirection from, Fluid fluid) { + public boolean canFill(ForgeDirection from, Fluid fluid) { return IronEngineCoolant.isCoolant(fluid) || IronEngineFuel.getFuelForFluid(fluid) != null; } @Override - public boolean canDrain(ForgeDirection from, Fluid fluid) { - return false; + public boolean canDrain(ForgeDirection from, Fluid fluid) { + return false; } @Override public FluidTankInfo[] getTankInfo(ForgeDirection from) { return new FluidTankInfo[] {coolantTank.getInfo(), fuelTank.getInfo()}; } - + @Override public void readCustomNBT(NBTTagCompound nbtRoot) { super.readCustomNBT(nbtRoot); @@ -259,10 +272,11 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP } else { fuelTank.setFluid(null); } - + ticksRemaingFuel = nbtRoot.getInteger("ticksRemaingFuel"); ticksRemaingCoolant = nbtRoot.getInteger("ticksRemaingCoolant"); - active = nbtRoot.getBoolean("active"); + active = nbtRoot.getBoolean("active"); + transmitted = nbtRoot.getFloat("transmitted"); } @@ -278,23 +292,20 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP NBTTagCompound tankRoot = new NBTTagCompound(); fuelTank.writeToNBT(tankRoot); nbtRoot.setTag("fuelTank", tankRoot); - } + } nbtRoot.setInteger("ticksRemaingFuel",ticksRemaingFuel); nbtRoot.setInteger("ticksRemaingCoolant",ticksRemaingCoolant); - nbtRoot.setBoolean("active",active); + nbtRoot.setBoolean("active",active); + nbtRoot.setFloat("transmitted",transmitted); } public double getCurrentOutputMj() { if(!active) { return 0; } - Fuel fuel = IronEngineFuel.getFuelForFluid(fuelTank.getFluid().getFluid()); - if(fuel == null) { - return 0; - } - return fuel.powerPerCycle; + return transmitted; } - - + + } diff --git a/src/main/java/crazypants/enderio/machine/generator/TileEntityStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/TileEntityStirlingGenerator.java index d08dca4a..ec938cb5 100644 --- a/src/main/java/crazypants/enderio/machine/generator/TileEntityStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/TileEntityStirlingGenerator.java @@ -1,14 +1,9 @@ package crazypants.enderio.machine.generator; -import java.util.ArrayList; -import java.util.List; -import java.util.ListIterator; - import net.minecraft.block.Block; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.power.IPowerEmitter; @@ -17,8 +12,6 @@ import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.power.Capacitors; -import crazypants.enderio.power.IPowerInterface; -import crazypants.enderio.power.PowerHandlerUtil; import crazypants.util.BlockCoord; public class TileEntityStirlingGenerator extends AbstractMachineEntity implements ISidedInventory, IPowerEmitter { @@ -61,6 +54,11 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement return "Stirling Generator"; } + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + return 0; + } + @Override public boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { return TileEntityFurnace.isItemFuel(itemstack); @@ -115,18 +113,19 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement 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 - } + //Need to clean this up + } + + @Override + public int getEnergyStored(ForgeDirection from) { + return (int)(storedEnergy * 10); + } + - @Override - public int getEnergyStored(ForgeDirection from) { - return (int)(storedEnergy * 10); - } - - public double getPowerPerTick() { return ENERGY_PER_TICK * getEnergyMultiplier(); @@ -189,7 +188,7 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement } //private PowerDistributor powerDis; - private boolean transmitEnergy() { + private boolean transmitEnergy() { if(powerDis == null) { powerDis = new PowerDistributor(new BlockCoord(this)); } @@ -197,9 +196,9 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement if(canTransmit <= 0) { return false; } - float transmitted = powerDis.transmitEnergy(worldObj, (float)canTransmit); + float transmitted = powerDis.transmitEnergy(worldObj, (float)canTransmit); storedEnergy -= transmitted; - return transmitted > 0; + return transmitted > 0; } @Override @@ -207,6 +206,6 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement return false; } - + } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java index 4bd3b1a4..97bd53d0 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/TileHyperCube.java @@ -408,7 +408,6 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept return worldObj; } - @Override public PowerHandler getPowerHandler() { if(getModeForChannel(SubChannel.POWER) == IoMode.RECIEVE) { return getDisabledPowerHandler(); @@ -461,10 +460,6 @@ public class TileHyperCube extends TileEntityEio implements IInternalPowerRecept public void doWork(PowerHandler workProvider) { } - @Override - public void applyPerdition() { - } - @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { if(!canSendFluid()) { diff --git a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java index 1c8b27ee..e185bb22 100644 --- a/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/TileElectricLight.java @@ -140,7 +140,7 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { if(dir != face && dir != face.getOpposite()) { // don't project behind - // us + // us Vector3d offset = ForgeDirectionOffsets.forDirCopy(dir); addNodeInDirection(new Vector3d(offset), after); addNodeInDirection(offset.add(ForgeDirectionOffsets.forDirCopy(face.getOpposite())), after); @@ -342,15 +342,6 @@ public class TileElectricLight extends TileEntityEio implements IInternalPowerRe return worldObj; } - @Override - public PowerHandler getPowerHandler() { - return powerHandler; - } - - @Override - public void applyPerdition() { - } - // RF Power @Override diff --git a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java index 28c54f20..8286793b 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java @@ -90,7 +90,7 @@ public class GuiPowerMonitor extends GuiScreenBase { @Override protected void updateText() { text.clear(); - text.add(formatPower(te.getEnergyStored()) + "/" + formatPower(te.getPowerHandler().getMaxEnergyStored()) + " " + text.add(formatPower(te.getEnergyStored()) + "/" + formatPower(te.getMaxEnergyStoredMJ()) + " " + PowerDisplayUtil.abrevation()); } @@ -367,7 +367,7 @@ public class GuiPowerMonitor extends GuiScreenBase { sb.append(formatPowerFloat(te.aveMjSent)); sb.append(" "); sb.append(PowerDisplayUtil.abrevation()); - sb.append(PowerDisplayUtil.ofStr()); + sb.append(PowerDisplayUtil.perTickStr()); fontRenderer.drawString(sb.toString(), x, y, rgb, false); rgb = headingCol; diff --git a/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java b/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java index 96838909..8d550d6c 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketConduitProbe.java @@ -1,5 +1,6 @@ package crazypants.enderio.machine.monitor; +import static crazypants.enderio.power.PowerInterfaceBC.fromRF; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; @@ -14,7 +15,6 @@ 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; import buildcraft.api.power.PowerHandler.PowerReceiver; import crazypants.enderio.Log; import crazypants.enderio.conduit.ConnectionMode; @@ -28,6 +28,8 @@ import crazypants.enderio.conduit.power.PowerTracker; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.IPacketEio; import crazypants.enderio.power.IInternalPowerReceptor; +import crazypants.enderio.power.PowerInterfaceBC; +import crazypants.enderio.power.PowerInterfaceRF; import crazypants.util.Lang; public class PacketConduitProbe implements IPacketEio { @@ -128,32 +130,30 @@ public class PacketConduitProbe implements IPacketEio { } else - if(te instanceof IInternalPowerReceptor) { + if(te instanceof IInternalPowerReceptor) { - IInternalPowerReceptor pr = (IInternalPowerReceptor) te; - PowerHandler ph = pr.getPowerHandler(); - if(ph == null) { + IInternalPowerReceptor pr = (IInternalPowerReceptor) te; + + PowerInterfaceBC.fromRF(pr.getEnergyStored(null)); + + pr.getEnergyStored(null); + + sendPowerReciptorInfo(player, block, fromRF(pr.getEnergyStored(null)), fromRF(pr.getMaxEnergyStored(null)), 0, + 0, PowerInterfaceRF.getPowerRequestMJ(ForgeDirection.NORTH, pr)); + + } else if(te instanceof IPowerReceptor) { + + IPowerReceptor pr = (IPowerReceptor) te; + PowerReceiver rec = pr.getPowerReceiver(side); + if(rec == null) { + player.addChatComponentMessage(new ChatComponentTranslation(block.getLocalizedName() + " " + Lang.localize("gui.mjReader.noPowerFromSide"))); + } else { + sendPowerReciptorInfo(player, block, (float) rec.getEnergyStored(), (float) rec.getMaxEnergyStored(), (float) rec.getMinEnergyReceived(), + (float) rec.getMaxEnergyReceived(), + (float) rec.powerRequest()); + } - player.addChatComponentMessage(new ChatComponentTranslation(block.getLocalizedName() + " " + Lang.localize("gui.mjReader.noPowerFromSide"))); } - - sendPowerReciptorInfo(player, block, (float) ph.getEnergyStored(), (float) ph.getMaxEnergyStored(), (float) ph.getMinEnergyReceived(), - (float) ph.getMaxEnergyReceived(), (float) ph - .getPowerReceiver().powerRequest()); - - } else if(te instanceof IPowerReceptor) { - - IPowerReceptor pr = (IPowerReceptor) te; - PowerReceiver rec = pr.getPowerReceiver(side); - if(rec == null) { - player.addChatComponentMessage(new ChatComponentTranslation(block.getLocalizedName() + " " + Lang.localize("gui.mjReader.noPowerFromSide"))); - } else { - sendPowerReciptorInfo(player, block, (float) rec.getEnergyStored(), (float) rec.getMaxEnergyStored(), (float) rec.getMinEnergyReceived(), - (float) rec.getMaxEnergyReceived(), - (float) rec.powerRequest()); - } - - } } public static void sendInfoMessage(EntityPlayer player, TileConduitBundle tcb) { @@ -319,9 +319,9 @@ public class PacketConduitProbe implements IPacketEio { sb = new StringBuilder(); sb.append(color); sb.append(CON_BUF); - sb.append(PowerDisplayUtil.formatPower(con.getPowerHandler().getEnergyStored())); + sb.append(PowerDisplayUtil.formatPower(con.getEnergyStored())); sb.append(OF); - sb.append(PowerDisplayUtil.formatPower(con.getPowerHandler().getMaxEnergyStored())); + sb.append(PowerDisplayUtil.formatPower(con.getMaxEnergyStored())); sb.append(" "); sb.append(PowerDisplayUtil.abrevation()); sb.append("\n"); diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index 988f7137..a6be7992 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -463,7 +463,6 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe return getController().doGetMaxIO(); } - @Override public PowerHandler getPowerHandler() { return getController().doGetPowerHandler(); } @@ -672,10 +671,6 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe return worldObj; } - @Override - public void applyPerdition() { - } - private void updatePowerHandler() { if(storedEnergy > maxStoredEnergy) { storedEnergy = maxStoredEnergy; diff --git a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java index 1869a560..e914cea5 100644 --- a/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/TileEntitySolarPanel.java @@ -64,15 +64,6 @@ public class TileEntitySolarPanel extends TileEntity implements IInternalPowerRe receptorsDirty = true; } - @Override - public void applyPerdition() { - } - - @Override - public PowerHandler getPowerHandler() { - return powerHandler; - } - // RF Power @Override diff --git a/src/main/java/crazypants/enderio/machine/still/BlockVat.java b/src/main/java/crazypants/enderio/machine/still/BlockVat.java index 27d3246a..79825cc7 100644 --- a/src/main/java/crazypants/enderio/machine/still/BlockVat.java +++ b/src/main/java/crazypants/enderio/machine/still/BlockVat.java @@ -1,5 +1,7 @@ package crazypants.enderio.machine.still; +import java.util.Random; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -17,14 +19,14 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.render.VertexRotation; import crazypants.util.Util; +import crazypants.vecmath.Vector3d; public class BlockVat extends AbstractMachineBlock { public static int renderId; - - public static BlockVat create() { BlockVat res = new BlockVat(); res.init(); @@ -156,19 +158,16 @@ public class BlockVat extends AbstractMachineBlock { return renderId; } - @Override public boolean renderAsNormalBlock() { return false; } - @Override public boolean isOpaqueCube() { return false; } - @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { // The server needs the container as it manages the adding and removing of @@ -202,4 +201,37 @@ public class BlockVat extends AbstractMachineBlock { return "enderio:vatFront"; } + @Override + public void randomDisplayTick(World world, int x, int y, int z, Random rand) { + // If active, randomly throw some smoke around + if(isActive(world, x, y, z)) { + float startX = x; + float startY = y + 0.35F; + float startZ = z; + for (int k = 0; k < 2; k++) { + int ran2adn5 = (int) Math.round((Math.random() * 3) + 2); + ForgeDirection dir = ForgeDirection.VALID_DIRECTIONS[ran2adn5]; + if(dir.offsetY == 0) { + for (int i = 0; i < 2; i++) { + + float xOffset = 0.52f * (1 - dir.offsetX) + (dir.offsetX * (-0.1F + rand.nextFloat() * 0.2F)); + float yOffset = -0.1F + rand.nextFloat() * 0.2F; + float zOffset = 0.52f * (1 - dir.offsetZ) + (dir.offsetZ * (-0.1F + rand.nextFloat() * 0.2F)); + + if(rand.nextFloat() > 0.5) { + VertexRotation vr = new VertexRotation(Math.PI/4, new Vector3d(0,1,0), new Vector3d(0.5,0.25,0.5)); + Vector3d vec = new Vector3d(xOffset, yOffset, zOffset); + vr.apply(vec); + xOffset = (float)vec.x; + yOffset = (float)vec.y; + zOffset = (float)vec.z; + + } + world.spawnParticle("smoke", startX + xOffset, startY + yOffset, startZ + zOffset, 0.0D, 0.0D, 0.0D); + } + } + } + } + } + } diff --git a/src/main/java/crazypants/enderio/power/IInternalPowerReceptor.java b/src/main/java/crazypants/enderio/power/IInternalPowerReceptor.java index e958b984..71c2e588 100644 --- a/src/main/java/crazypants/enderio/power/IInternalPowerReceptor.java +++ b/src/main/java/crazypants/enderio/power/IInternalPowerReceptor.java @@ -1,13 +1,12 @@ package crazypants.enderio.power; -import cofh.api.energy.IEnergyHandler; import buildcraft.api.power.IPowerReceptor; -import buildcraft.api.power.PowerHandler; +import cofh.api.energy.IEnergyHandler; public interface IInternalPowerReceptor extends IPowerReceptor, IEnergyHandler { - PowerHandler getPowerHandler(); - - void applyPerdition(); + // PowerHandler getPowerHandler(); + // + // void applyPerdition(); } diff --git a/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java b/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java index a23421aa..150bc599 100644 --- a/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java +++ b/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java @@ -70,34 +70,36 @@ public class PowerHandlerUtil { } 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; + // 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) { diff --git a/src/main/java/crazypants/enderio/power/PowerInterfaceBC.java b/src/main/java/crazypants/enderio/power/PowerInterfaceBC.java index e7b9d783..a41f8360 100644 --- a/src/main/java/crazypants/enderio/power/PowerInterfaceBC.java +++ b/src/main/java/crazypants/enderio/power/PowerInterfaceBC.java @@ -34,7 +34,7 @@ public class PowerInterfaceBC implements IPowerInterface { public float getEnergyStored(ForgeDirection dir) { double result = 0; if(bcPower instanceof IInternalPowerReceptor) { - result = ((IInternalPowerReceptor) bcPower).getPowerHandler().getEnergyStored(); + result = ((IInternalPowerReceptor) bcPower).getEnergyStored(null)/10; } else if(bcPower != null && !(bcPower instanceof IPowerEmitter)) { PowerReceiver pr = bcPower.getPowerReceiver(dir); if(pr != null) { @@ -48,7 +48,7 @@ public class PowerInterfaceBC implements IPowerInterface { public float getMaxEnergyStored(ForgeDirection dir) { double result = 0; if(bcPower instanceof IInternalPowerReceptor) { - result = ((IInternalPowerReceptor) bcPower).getPowerHandler().getMaxEnergyStored(); + result = ((IInternalPowerReceptor) bcPower).getMaxEnergyStored(null)/10; } else if(bcPower != null && !(bcPower instanceof IPowerEmitter)) { PowerReceiver pr = bcPower.getPowerReceiver(dir); if(pr != null) { @@ -102,4 +102,9 @@ public class PowerInterfaceBC implements IPowerInterface { return 0; } + public static int fromRF(int energyStored) { + return energyStored/10; + + } + } diff --git a/src/main/java/crazypants/enderio/power/PowerInterfaceRF.java b/src/main/java/crazypants/enderio/power/PowerInterfaceRF.java index 08191b2d..28b46ddf 100644 --- a/src/main/java/crazypants/enderio/power/PowerInterfaceRF.java +++ b/src/main/java/crazypants/enderio/power/PowerInterfaceRF.java @@ -47,6 +47,14 @@ public class PowerInterfaceRF implements IPowerInterface { return 0; } + + public static float getPowerRequestMJ(ForgeDirection dir, IEnergyHandler handler) { + if(handler != null && dir != null && handler.canInterface(dir)) { + return handler.receiveEnergy(dir, 99999999, true) / 10f; + } + return 0; + } + @Override public float getMinEnergyReceived(ForgeDirection dir) { return 0; @@ -55,8 +63,8 @@ public class PowerInterfaceRF implements IPowerInterface { @Override public float 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) / 10f; + } return 0; } }