From 2c6dcf3c5faae8feb308b65ddd6f5db9feb2b8c2 Mon Sep 17 00:00:00 2001 From: cp Date: Mon, 21 Apr 2014 19:52:07 +0800 Subject: [PATCH] Implemented 'disabling' of sides. --- resources/assets/enderio/textures/gui/vat.png | Bin 2552 -> 2543 bytes .../conduit/liquid/AbstractLiquidConduit.java | 13 ++++- .../machine/AbstractMachineEntity.java | 52 ++++++++++++++---- .../machine/AbstractPoweredTaskEntity.java | 21 +++---- .../enderio/machine/GuiMachineBase.java | 6 +- .../generator/GuiStirlingGenerator.java | 2 +- .../generator/TileCombustionGenerator.java | 27 ++++++++- .../TileEntityStirlingGenerator.java | 5 +- .../enderio/machine/painter/GuiPainter.java | 10 ++++ .../machine/power/PowerDisplayUtil.java | 4 ++ .../enderio/machine/still/TileVat.java | 32 ++++++++++- 11 files changed, 138 insertions(+), 34 deletions(-) diff --git a/resources/assets/enderio/textures/gui/vat.png b/resources/assets/enderio/textures/gui/vat.png index 8bf7558785ad0dfd96598ba8be23a1e9b9ea4926..fdafa1d04c79adaf8dada9a997ba318037f62e04 100644 GIT binary patch delta 1302 zcmZ`%Yfw{X5dH2YiFp8mMAC?06p_S&2$muW!wn4}reG>4AWEVJfnwz`6zpip^+AP- zH3~I?5^e|S4nwfBG;pg4;JG>QNMe|23qw-qV*XqCgm2KYT6^E>72r`G9y0u+9qBUNu0lyNG z_|aC`wd%J)d$dDV$&15NfHT-nWAD&j1{uWup<`<;c~bO z^ID2)eWO}@5K#Q?RNXMAt^Na?#n8gf5% zt$n=Gr(?P37Ewt95lt1XOVO8EnTtKBJnji4e_krzd9a|_b)+|B0#>$_$9WA=ki@Rq zOBRr^u*YWLB z;4AWvKx*kd%i+pR9=78SOi=4KaR|zDq$VYtB+lG@1LTK3a3cFWSGoX;3%wgCc%dsp zD3C7**!7GAK=GP$=g{6EyLXIgl4{Ub?KW`$nvGhYEKqp&QZAb8IbAapEAdBUCR;Tw zE2}%}cbkBxrjTzc8-s)*CYBwBP$XIW95SBDKnM?G8*G2{!2QL&2MhBLd9Eelb43P2 z0qxO~Als7jJj5puKDufZo}_naxq^erZ%4OW$#!HoQ4wgt#r|ls>*h6$xz0u4n+KWu zp2?-f58~(kML*2EkL81mh325>RNJL}W`;W{rh|cRJ)T*wk2ShWIu9t0O5y(}oof45 zaxCp_dQ68tW{nU0Q)y#^VOL)Vz> z34fy0293BRJ?R!-9jnMBV_@E&!!_DR?<;b$Sy|siB)zg2W`bFJiv@iAv*!b&NIKoA z2=&LntBg;WswTAl?!#Cyf_yKl14h#8{cNjC|%PnlHReWg>@ z+CBl7zIHcqJ;(30M^OhY1arD_G+~Y^h(VXBM%q*07gJ&A2DC2E5xy`|Hve%gU}tFP z((+>X31LDPE}LPYu+_HENF@2*twH;hoZ9ha2ozbcHvpJe_q7BTxV|lNNsSO0@meh~ j7Sr`KyDE9>)r3A%HmUEh?(T|nVBUfQLOE6bg5&=HNwGG- delta 1297 zcmZ8fYfw@N6u$S$RY7xg0n@V5$&xk|^D*r%DQKpsfuyEw4|OYz?WLIt`QlQ$qd8ir zrCSKxGRihf$};l>J(o63jiSs-LQPk5wHy?UWT}2MyJx;1=R4>7X3jZt#_)Q)ECz$C z2LPLT@S*aCv@9O8jJG)~I537AKPoz$S>$Y{J#-qfFv7TKN=j_t&>8h1m{0sP#Z>)z#Ch0Ed*_o#Lzk4Q^-u)2g4SH|% z@Ez67vU{4`!KomkMJnW#N%S3U$EHSTJjpTpkQvMiik;>X&&XVh7MjJlX|gJw4_q(` zq^Z|P8ugY%qfc^mBAiJ$j2R+2C**V&!k>o|~L@ZIw5*KD^TX#BxAo)#pecp~uZf8v=d>K!Y|7=5;u zZa9O-c23uaY_!t|tHduW6Jb5X>e$P4QDo5ko6bifOMyNwYV z6pLYhge?_dzSFVtJc@04!BM{vqAhM*$JiC9Wm8o=PRVmqQGNG1ah!Oma)?( z7QSkN*M z%A<7CF?U*Eto{hH=7-)P?~zjz$6bNL{FRuTst)nO0jmv}r+^74p7Y~zL^j(9la#m= zEVp}?I&^S(81Stb8LoLE4@H7NW$ijC68Dnnn%I(u<95|<2XR+!S%H^l8RJp*)L;UjK*uB&P0)a z9gEflZ8eWir<5QWX0=)Cfah}vuFeg)ix&;}gAO^EX}jC-pZhu+{8VB_WfAFc5mFvM*z+~hR+y-?d_y(>9--?~woNFXdCHPk4 zWG9QI!oSaTHka*BJ4ydY=;Rc*ojd#_5+oqpG%a-6;vp=tbUFFk6o6AO5h7@~;AQlq xgU@nrl_Gv-QF0gXH7^;JJEbo0U^04*7Pk|6_Ma%png^I7Yz;H`Qc&W-e*w(PLJI%@ diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java index 103503aa..3c123994 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java @@ -9,6 +9,7 @@ import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.IPipeTile.PipeType; @@ -54,7 +55,15 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I @Override public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreDisabled) { - return getExternalHandler(direction) != null; + IFluidHandler h = getExternalHandler(direction); + if(h == null) { + return false; + } + FluidTankInfo[] info = h.getTankInfo(direction.getOpposite()); + if(info == null) { + return false; + } + return info.length > 0; } @Override @@ -110,7 +119,7 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I } IFluidHandler ext = getExternalHandler(dir); if(ext instanceof TileReservoir) { // dont push to an auto ejecting - // resevoir or we loop + // resevoir or we loop TileReservoir tr = (TileReservoir) ext; return !tr.isMultiblock() || !tr.isAutoEject(); } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 0c7230a7..1451a29f 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -59,6 +59,8 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi private int[] allSlots; + protected boolean notifyNeighbours = false; + public AbstractMachineEntity(SlotDefinition slotDefinition, Type powerType) { this.slotDefinition = slotDefinition; facing = 3; @@ -99,7 +101,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi } faceModes.put(faceHit, mode); forceClientUpdate = true; - + notifyNeighbours = true; } @Override @@ -224,6 +226,9 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi @Override public PowerReceiver getPowerReceiver(ForgeDirection side) { + if(isSideDisabled(side.ordinal())) { + return null; + } return powerHandler.getPowerReceiver(); } @@ -232,7 +237,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi return worldObj; } - protected float getPowerUsePerTick() { + public float getPowerUsePerTick() { return capacitorType.capacitor.getMaxEnergyExtracted(); } @@ -240,6 +245,9 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + if(isSideDisabled(from.ordinal())) { + return 0; + } return PowerHandlerUtil.recieveRedstoneFlux(from, powerHandler, maxReceive, simulate); } @@ -250,7 +258,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi @Override public boolean canInterface(ForgeDirection from) { - return true; + return !isSideDisabled(from.ordinal()); } @Override @@ -320,6 +328,11 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi markDirty(); } + if(notifyNeighbours) { + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, blockType); + notifyNeighbours = false; + } + } protected boolean doSideIo() { @@ -630,22 +643,41 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi @Override public int[] getAccessibleSlotsFromSide(int var1) { - ForgeDirection dir = ForgeDirection.getOrientation(var1); - IoMode mode = getIoMode(dir); - if(mode == IoMode.DISABLED) { + if(isSideDisabled(var1)) { return new int[0]; } return allSlots; } @Override - public boolean canInsertItem(int var1, ItemStack var2, int var3) { - return true; + public boolean canInsertItem(int slot, ItemStack var2, int side) { + if(isSideDisabled(side)) { + return false; + } + return slotDefinition.isInputSlot(slot); } @Override - public boolean canExtractItem(int var1, ItemStack var2, int var3) { - return true; + public boolean canExtractItem(int slot, ItemStack itemstack, int side) { + if(isSideDisabled(side)) { + return false; + } + if(!slotDefinition.isOutputSlot(slot)) { + return false; + } + if(inventory[slot] == null || inventory[slot].stackSize < itemstack.stackSize) { + return false; + } + return itemstack.getItem() == inventory[slot].getItem(); + } + + public boolean isSideDisabled(int var1) { + ForgeDirection dir = ForgeDirection.getOrientation(var1); + IoMode mode = getIoMode(dir); + if(mode == IoMode.DISABLED) { + return true; + } + return false; } public void onNeighborBlockChange(Block blockId) { diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index 126aed9d..29900b12 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -7,6 +7,7 @@ import java.util.Random; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.machine.IMachineRecipe.ResultStack; public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity implements ISidedInventory { @@ -22,6 +23,12 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im @Override public int[] getAccessibleSlotsFromSide(int var1) { + ForgeDirection dir = ForgeDirection.getOrientation(var1); + IoMode mode = getIoMode(dir); + if(mode == IoMode.DISABLED) { + return new int[0]; + } + int[] res = new int[inventory.length - slotDefinition.getNumUpgradeSlots()]; int index = 0; for (int i = 0; i < inventory.length; i++) { @@ -35,8 +42,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im @Override public boolean canInsertItem(int i, ItemStack itemstack, int j) { - - if(!slotDefinition.isInputSlot(i)) { + if(!super.canInsertItem(i, itemstack, j)) { return false; } if(!isItemValidForSlot(i, itemstack)) { @@ -48,17 +54,6 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im return inventory[i].isItemEqual(itemstack); } - @Override - public boolean canExtractItem(int i, ItemStack itemstack, int j) { - if(!slotDefinition.isOutputSlot(i)) { - return false; - } - if(inventory[i] == null || inventory[i].stackSize < itemstack.stackSize) { - return false; - } - return itemstack.getItem() == inventory[i].getItem(); - } - @Override public boolean isActive() { return currentTask == null ? false : currentTask.getProgress() > 0 && hasPower() && redstoneCheckPassed; diff --git a/src/main/java/crazypants/enderio/machine/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/GuiMachineBase.java index ad70a04f..e6b243fa 100644 --- a/src/main/java/crazypants/enderio/machine/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/GuiMachineBase.java @@ -53,8 +53,10 @@ public abstract class GuiMachineBase extends GuiContainerBase { @Override protected void updateText() { text.clear(); - text.add(PowerDisplayUtil.formatPower(tileEntity.getEnergyStored()) + "/" - + PowerDisplayUtil.formatPower(tileEntity.getCapacitor().getMaxEnergyStored()) + " " + PowerDisplayUtil.abrevation()); + text.add("Max: " + PowerDisplayUtil.formatPower(tileEntity.getPowerUsePerTick()) + " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr()); + //text.add() + text.add(PowerDisplayUtil.formatStoredPower(tileEntity.getEnergyStored(), tileEntity.getCapacitor().getMaxEnergyStored())); + } }); diff --git a/src/main/java/crazypants/enderio/machine/generator/GuiStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/GuiStirlingGenerator.java index 3c50d7bc..2e08e3fc 100644 --- a/src/main/java/crazypants/enderio/machine/generator/GuiStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/GuiStirlingGenerator.java @@ -52,7 +52,7 @@ public class GuiStirlingGenerator extends GuiMachineBase { double output = 0; if(entity.isActive()) { - output = entity.getPowerPerTick(); + output = entity.getPowerUsePerTick(); } String txt = Lang.localize("stirlingGenerator.output") + " " + PowerDisplayUtil.formatPower(output) + " " + PowerDisplayUtil.abrevation() + PowerDisplayUtil.perTickStr(); int sw = fr.getStringWidth(txt); diff --git a/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java index 157b661e..10ee788c 100644 --- a/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/TileCombustionGenerator.java @@ -79,6 +79,11 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP } private boolean doPull(ForgeDirection dir, FluidTank inputTank, boolean isCoolant) { + + if(isSideDisabled(dir.ordinal())) { + return false; + } + if(inputTank.getFluidAmount() < inputTank.getCapacity()) { BlockCoord loc = getLocation().getLocation(dir); IFluidHandler target = FluidUtil.getFluidHandler(worldObj, loc); @@ -147,7 +152,7 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP @Override public boolean canEmitPowerFrom(ForgeDirection side) { - return true; + return !isSideDisabled(side.ordinal()); } @Override @@ -335,6 +340,9 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP @Override public boolean canFill(ForgeDirection from, Fluid fluid) { + if(isSideDisabled(from.ordinal())) { + return false; + } return IronEngineCoolant.isCoolant(fluid) || IronEngineFuel.getFuelForFluid(fluid) != null; } @@ -345,6 +353,9 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP @Override public FluidTankInfo[] getTankInfo(ForgeDirection from) { + if(isSideDisabled(from.ordinal())) { + return new FluidTankInfo[0]; + } return new FluidTankInfo[] {coolantTank.getInfo(), fuelTank.getInfo()}; } @@ -407,6 +418,20 @@ public class TileCombustionGenerator extends AbstractMachineEntity implements IP return transmitted; } + @Override + public float getPowerUsePerTick() { + if(fuelTank.getFluidAmount() <= 0) { + return 0; + } + Fuel fuel = IronEngineFuel.getFuelForFluid(fuelTank.getFluid().getFluid()); + if(fuel == null) { + return 0; + } + return fuel.powerPerCycle; + } + + + } diff --git a/src/main/java/crazypants/enderio/machine/generator/TileEntityStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/TileEntityStirlingGenerator.java index e6d63a79..ee9f9cda 100644 --- a/src/main/java/crazypants/enderio/machine/generator/TileEntityStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/TileEntityStirlingGenerator.java @@ -131,9 +131,8 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement return (int)(storedEnergy * 10); } - - - public double getPowerPerTick() { + @Override + public float getPowerUsePerTick() { return ENERGY_PER_TICK * getEnergyMultiplier(); } diff --git a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java index 3f5663bf..cc003138 100644 --- a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java +++ b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java @@ -9,6 +9,7 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.GuiMachineBase; import crazypants.render.RenderUtil; +import crazypants.vecmath.Vector4f; @SideOnly(Side.CLIENT) public class GuiPainter extends GuiMachineBase { @@ -45,4 +46,13 @@ public class GuiPainter extends GuiMachineBase { return false; } + @Override + protected void renderSlotHighlight(int slot, Vector4f col) { + if(tileEntity.getSlotDefinition().isOutputSlot(slot)) { + renderSlotHighlight(col, 117,31,24,24); + } else if(slot != 1) { + super.renderSlotHighlight(slot, col); + } + } + } diff --git a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java index 0430e52b..65d951e2 100644 --- a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java +++ b/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java @@ -51,6 +51,10 @@ public class PowerDisplayUtil { FLOAT_NF.setMaximumFractionDigits(1); } + public static String formatStoredPower(double amount, double 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))); } diff --git a/src/main/java/crazypants/enderio/machine/still/TileVat.java b/src/main/java/crazypants/enderio/machine/still/TileVat.java index be4da940..d5a6ac17 100644 --- a/src/main/java/crazypants/enderio/machine/still/TileVat.java +++ b/src/main/java/crazypants/enderio/machine/still/TileVat.java @@ -59,6 +59,11 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler @Override protected boolean doPush(ForgeDirection dir) { + + if(isSideDisabled(dir.ordinal())) { + return false; + } + boolean res = super.doPush(dir); if(outputTank.getFluidAmount() > 0) { @@ -82,6 +87,11 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler @Override protected boolean doPull(ForgeDirection dir) { + + if(isSideDisabled(dir.ordinal())) { + return false; + } + boolean res = super.doPull(dir); if(inputTank.getFluidAmount() < inputTank.getCapacity()) { BlockCoord loc = getLocation().getLocation(dir); @@ -122,6 +132,10 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { + if(isSideDisabled(from.ordinal())) { + return 0; + } + if(resource == null || !canFill(from, resource.getFluid())) { return 0; } @@ -131,6 +145,9 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler @Override public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { + if(isSideDisabled(from.ordinal())) { + return null; + } if(outputTank.getFluid() == null || resource == null || !resource.isFluidEqual(outputTank.getFluid())) { return null; } @@ -140,6 +157,9 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler @Override public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { + if(isSideDisabled(from.ordinal())) { + return null; + } tanksDirty = true; return outputTank.drain(maxDrain, doDrain); } @@ -185,7 +205,9 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler @Override public boolean canFill(ForgeDirection from, Fluid fluid) { - + if(isSideDisabled(from.ordinal())) { + return false; + } if(fluid == null || (inputTank.getFluid() != null && inputTank.getFluid().getFluid().getID() != fluid.getID())) { return false; } @@ -200,11 +222,17 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler @Override public boolean canDrain(ForgeDirection from, Fluid fluid) { + if(isSideDisabled(from.ordinal())) { + return false; + } return outputTank.getFluid() != null && outputTank.getFluid().getFluid().getID() == fluid.getID(); } @Override public FluidTankInfo[] getTankInfo(ForgeDirection from) { + if(isSideDisabled(from.ordinal())) { + return new FluidTankInfo[0]; + } return new FluidTankInfo[] { inputTank.getInfo(), outputTank.getInfo() }; } @@ -257,7 +285,7 @@ public class TileVat extends AbstractPoweredTaskEntity implements IFluidHandler } @Override - protected float getPowerUsePerTick() { + public float getPowerUsePerTick() { return Config.vatPowerUserPerTick; }