Implemented 'disabling' of sides.

This commit is contained in:
cp committed 2014-04-21 19:52:07 +08:00
1 parent 526a46c009
commit 2c6dcf3c5f
11 files changed
+138 -34

No files matched your search

@@ -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();
}
@@ -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) {
@@ -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;
@@ -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()));
}
});
@@ -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);
@@ -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;
}
}
@@ -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();
}
@@ -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);
}
}
}
@@ -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)));
}
@@ -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;
}