From 671948754bcdb3704905d21167922d78a7e06dee Mon Sep 17 00:00:00 2001 From: Vaern Date: Sat, 4 Jun 2022 21:30:30 -0700 Subject: [PATCH] Plenty of changes --- .../nei/GasCentrifugeRecipeHandler.java | 24 +- .../container/ContainerMachineGasCent.java | 58 ++--- .../hbm/inventory/gui/GUIMachineGasCent.java | 2 +- .../recipes/GasCentrifugeRecipes.java | 36 +-- .../machine/TileEntityMachineGasCent.java | 232 +++++++++--------- .../hbm/textures/gui/centrifuge_gas.png | Bin 3362 -> 0 bytes .../gui/processing/gui_centrifuge_gas.png | Bin 0 -> 3291 bytes 7 files changed, 169 insertions(+), 183 deletions(-) delete mode 100644 src/main/resources/assets/hbm/textures/gui/centrifuge_gas.png create mode 100644 src/main/resources/assets/hbm/textures/gui/processing/gui_centrifuge_gas.png diff --git a/src/main/java/com/hbm/handler/nei/GasCentrifugeRecipeHandler.java b/src/main/java/com/hbm/handler/nei/GasCentrifugeRecipeHandler.java index 194d572d0..246a9e5fb 100644 --- a/src/main/java/com/hbm/handler/nei/GasCentrifugeRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/GasCentrifugeRecipeHandler.java @@ -22,16 +22,15 @@ public class GasCentrifugeRecipeHandler extends TemplateRecipeHandler { public class SmeltingSet extends TemplateRecipeHandler.CachedRecipe { PositionedStack input; - PositionedStack result1; - PositionedStack result2; - PositionedStack result3; + List output = new ArrayList(); - public SmeltingSet(ItemStack input, ItemStack result1, ItemStack result2, ItemStack result3) { + public SmeltingSet(ItemStack input, ItemStack[] results) { input.stackSize = 1; this.input = new PositionedStack(input, 25, 35 - 11); - this.result1 = new PositionedStack(result1, 128, 26 - 11); - this.result2 = new PositionedStack(result2, 128, 44 - 11); - this.result3 = new PositionedStack(result3, 146, 35 - 11); + + for(byte i = 0; i < results.length; i++) { + this.output.add(new PositionedStack(results[i], i % 2 == 0 ? 128 : 146, i < 2 ? 26 - 11 : 44 - 11 )); + } } @Override @@ -43,14 +42,13 @@ public class GasCentrifugeRecipeHandler extends TemplateRecipeHandler { public List getOtherStacks() { List stacks = new ArrayList(); stacks.add(fuels.get((cycleticks / 48) % fuels.size()).stack); - stacks.add(result2); - stacks.add(result3); + stacks.addAll(output); return stacks; } @Override public PositionedStack getResult() { - return result1; + return output.get(0); } } @@ -93,7 +91,7 @@ public class GasCentrifugeRecipeHandler extends TemplateRecipeHandler { if((outputId.equals("gascentprocessing")) && getClass() == GasCentrifugeRecipeHandler.class) { Map recipes = GasCentrifugeRecipes.getGasCentrifugeRecipes(); for(Map.Entry recipe : recipes.entrySet()) { - this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack) recipe.getValue()[0], (ItemStack) recipe.getValue()[1], (ItemStack) recipe.getValue()[2])); + this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack[]) recipe.getValue())); } } else { super.loadCraftingRecipes(outputId, results); @@ -106,7 +104,7 @@ public class GasCentrifugeRecipeHandler extends TemplateRecipeHandler { for(Map.Entry recipe : recipes.entrySet()) { if(NEIServerUtils.areStacksSameType((ItemStack) recipe.getValue()[0], result) || NEIServerUtils.areStacksSameType((ItemStack) recipe.getValue()[1], result) || NEIServerUtils.areStacksSameType((ItemStack) recipe.getValue()[2], result)) - this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack) recipe.getValue()[0], (ItemStack) recipe.getValue()[1], (ItemStack) recipe.getValue()[2])); + this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack[]) recipe.getValue())); } } @@ -124,7 +122,7 @@ public class GasCentrifugeRecipeHandler extends TemplateRecipeHandler { Map recipes = GasCentrifugeRecipes.getGasCentrifugeRecipes(); for(Map.Entry recipe : recipes.entrySet()) { if(compareFluidStacks(ingredient, (ItemStack) recipe.getKey())) - this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack) recipe.getValue()[0], (ItemStack) recipe.getValue()[1], (ItemStack) recipe.getValue()[2])); + this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack[]) recipe.getValue())); } } diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineGasCent.java b/src/main/java/com/hbm/inventory/container/ContainerMachineGasCent.java index d6cd0f928..26d58fac5 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineGasCent.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineGasCent.java @@ -18,27 +18,27 @@ public class ContainerMachineGasCent extends Container { gasCent = tedf; - //Battery - this.addSlotToContainer(new Slot(tedf, 0, 8, 53)); - //Fluid ID IO - this.addSlotToContainer(new Slot(tedf, 1, 30, 35)); //Output - this.addSlotToContainer(new SlotMachineOutput(tedf, 2, 133, 26)); - this.addSlotToContainer(new SlotMachineOutput(tedf, 3, 133, 44)); - this.addSlotToContainer(new SlotMachineOutput(tedf, 4, 151, 35)); - //upgrade - this.addSlotToContainer(new Slot(tedf, 5, 82, 19)); + for(int i = 0; i < 2; i++) { + for(int j = 0; j < 2; j++) { + this.addSlotToContainer(new SlotMachineOutput(tedf, j + i * 2, 133 + j * 18, 26 + i * 18)); + } + } - for(int i = 0; i < 3; i++) - { - for(int j = 0; j < 9; j++) - { + //Battery + this.addSlotToContainer(new Slot(tedf, 4, 8, 53)); + //Fluid ID IO + this.addSlotToContainer(new Slot(tedf, 5, 30, 35)); + //upgrade + this.addSlotToContainer(new Slot(tedf, 6, 82, 19)); + + for(int i = 0; i < 3; i++) { + for(int j = 0; j < 9; j++) { this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); } } - for(int i = 0; i < 9; i++) - { + for(int i = 0; i < 9; i++) { this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142)); } } @@ -51,37 +51,29 @@ public class ContainerMachineGasCent extends Container { @Override public ItemStack transferStackInSlot(EntityPlayer player, int index) { - ItemStack var3 = null; + ItemStack returnStack = null; Slot slot = (Slot) this.inventorySlots.get(index); - if (slot != null && slot.getHasStack()) - { + if(slot != null && slot.getHasStack()) { ItemStack stack = slot.getStack(); - var3 = stack.copy(); + returnStack = stack.copy(); - if (index <= 5) { - if (!this.mergeItemStack(stack, 6, this.inventorySlots.size(), true)) - { + if(index <= 6) { + if (!this.mergeItemStack(stack, 7, this.inventorySlots.size(), true)) { return null; } - } - else if (!this.mergeItemStack(stack, 0, 2, false)) - { - if (!this.mergeItemStack(stack, 3, 4, false)) - return null; + } else if(!this.mergeItemStack(stack, 4, 7, false)) { + return null; } - if (stack.stackSize == 0) - { + if (stack.stackSize == 0) { slot.putStack((ItemStack) null); - } - else - { + } else { slot.onSlotChanged(); } } - return var3; + return returnStack; } @Override diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineGasCent.java b/src/main/java/com/hbm/inventory/gui/GUIMachineGasCent.java index 9427e4045..9202e0d18 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIMachineGasCent.java +++ b/src/main/java/com/hbm/inventory/gui/GUIMachineGasCent.java @@ -15,7 +15,7 @@ import net.minecraft.util.ResourceLocation; public class GUIMachineGasCent extends GuiInfoContainer { - public static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/centrifuge_gas.png"); + public static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/processing/gui_centrifuge_gas.png"); private TileEntityMachineGasCent gasCent; public GUIMachineGasCent(InventoryPlayer invPlayer, TileEntityMachineGasCent tedf) { diff --git a/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java b/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java index 62e08f5e5..de95ef888 100644 --- a/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java @@ -14,27 +14,28 @@ import net.minecraft.item.ItemStack; public class GasCentrifugeRecipes { + //TODO: Change "String name" to I18n instead of unlocalized BS public static enum PseudoFluidType { - NONE (0, 0, "NONE", "Empty", false, (ItemStack[])null), + NONE (0, 0, null, "Empty", false, (ItemStack[])null), - NUF6 (400, 300, "LEUF6", "Natural UF6", false, new ItemStack(ModItems.nugget_u238, 1)), - LEUF6 (300, 200, "MEUF6", "Low Enriched UF6", false, new ItemStack(ModItems.nugget_u238, 1), new ItemStack(ModItems.fluorite, 1)), - MEUF6 (200, 100, "HEUF6", "Medium Enriched UF6", false, new ItemStack(ModItems.nugget_u238, 1)), - HEUF6 (300, 0, "NONE", "High Enriched UF6", true, new ItemStack(ModItems.nugget_u238, 2), new ItemStack(ModItems.nugget_u235, 1), new ItemStack(ModItems.fluorite, 1)), + HEUF6 (300, 0, NONE, "High Enriched UF6", true, new ItemStack(ModItems.nugget_u238, 2), new ItemStack(ModItems.nugget_u235, 1), new ItemStack(ModItems.fluorite, 1)), + MEUF6 (200, 100, HEUF6, "Medium Enriched UF6", false, new ItemStack(ModItems.nugget_u238, 1)), + LEUF6 (300, 200, MEUF6, "Low Enriched UF6", false, new ItemStack(ModItems.nugget_u238, 1), new ItemStack(ModItems.fluorite, 1)), + NUF6 (400, 300, LEUF6, "Natural UF6", false, new ItemStack(ModItems.nugget_u238, 1)), - PF6 (300, 0, "NONE", "Plutonium Hexafluoride", false, new ItemStack(ModItems.nugget_pu238, 1), new ItemStack(ModItems.nugget_pu_mix, 2), new ItemStack(ModItems.fluorite, 1)), - - MUD (1000, 500, "MUD_HEAVY", "Poisonous Mud", false, new ItemStack(ModItems.powder_lead, 1), new ItemStack(ModItems.dust, 1)), - MUD_HEAVY (500, 0, "NONE", "Heavy Mud Fraction", false, new ItemStack(ModItems.powder_iron, 1), new ItemStack(ModItems.dust, 1), new ItemStack(ModItems.nuclear_waste_tiny, 1)); + PF6 (300, 0, NONE, "Plutonium Hexafluoride", false, new ItemStack(ModItems.nugget_pu238, 1), new ItemStack(ModItems.nugget_pu_mix, 2), new ItemStack(ModItems.fluorite, 1)), + + MUD_HEAVY (500, 0, NONE, "Heavy Mud Fraction", false, new ItemStack(ModItems.powder_iron, 1), new ItemStack(ModItems.dust, 1), new ItemStack(ModItems.nuclear_waste_tiny, 1)), + MUD (1000, 500, MUD_HEAVY, "Poisonous Mud", false, new ItemStack(ModItems.powder_lead, 1), new ItemStack(ModItems.dust, 1)); int fluidConsumed; int fluidProduced; - String outputFluid; + PseudoFluidType outputFluid; String name; boolean isHighSpeed; ItemStack[] output; - PseudoFluidType(int fluidConsumed, int fluidProduced, String outputFluid, String name, boolean isHighSpeed, ItemStack... output) { + PseudoFluidType(int fluidConsumed, int fluidProduced, PseudoFluidType outputFluid, String name, boolean isHighSpeed, ItemStack... output) { this.fluidConsumed = fluidConsumed; this.fluidProduced = fluidProduced; this.outputFluid = outputFluid; @@ -51,8 +52,8 @@ public class GasCentrifugeRecipes { return this.fluidProduced; } - public PseudoFluidType getOutputFluid() { - return this.valueOf(this.outputFluid); + public PseudoFluidType getOutputType() { + return this.outputFluid; } public String getName() { @@ -97,8 +98,11 @@ public class GasCentrifugeRecipes { } public static void register() { - gasCent.put(new FluidStack(1200, Fluids.UF6), new ItemStack[] {new ItemStack(ModItems.nugget_u238, 11), new ItemStack(ModItems.nugget_u235, 1), new ItemStack(ModItems.fluorite, 4)}); - gasCent.put(new FluidStack(900, Fluids.PUF6), new ItemStack[] {new ItemStack(ModItems.nugget_pu238, 3), new ItemStack(ModItems.nugget_pu_mix, 6), new ItemStack(ModItems.fluorite, 3)}); - gasCent.put(new FluidStack(1000, Fluids.WATZ), new ItemStack[] {new ItemStack(ModItems.powder_iron, 1), new ItemStack(ModItems.powder_lead, 1), new ItemStack(ModItems.nuclear_waste_tiny, 1)}); + gasCent.put(new FluidStack(1200, Fluids.UF6), new ItemStack[] + {new ItemStack(ModItems.nugget_u238, 11), new ItemStack(ModItems.nugget_u235, 1), new ItemStack(ModItems.fluorite, 4)}); + gasCent.put(new FluidStack(900, Fluids.PUF6), new ItemStack[] + {new ItemStack(ModItems.nugget_pu238, 3), new ItemStack(ModItems.nugget_pu_mix, 6), new ItemStack(ModItems.fluorite, 3)}); + gasCent.put(new FluidStack(1000, Fluids.WATZ), new ItemStack[] + {new ItemStack(ModItems.powder_iron, 1), new ItemStack(ModItems.powder_lead, 1), new ItemStack(ModItems.nuclear_waste_tiny, 1), new ItemStack(ModItems.dust, 2)}); } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java index 5ca39fbc3..c097ec771 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java @@ -4,21 +4,22 @@ import java.util.HashMap; import com.hbm.blocks.BlockDummyable; import com.hbm.interfaces.IFluidAcceptor; -import com.hbm.interfaces.IFluidContainer; -import com.hbm.interfaces.Spaghetti; -import com.hbm.interfaces.Untested; import com.hbm.inventory.FluidTank; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.recipes.GasCentrifugeRecipes.PseudoFluidType; import com.hbm.items.ModItems; +import com.hbm.items.machine.IItemFluidIdentifier; import com.hbm.items.machine.ItemFluidIdentifier; import com.hbm.lib.Library; import com.hbm.packet.LoopedSoundPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.tileentity.TileEntityMachineBase; +import com.hbm.util.InventoryUtil; +import com.hbm.util.fauxpointtwelve.DirPos; import api.hbm.energy.IEnergyUser; +import api.hbm.fluid.IFluidStandardReceiver; import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -28,10 +29,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; -@Spaghetti("I still can't believe this was my idea of a 'rework'") -public class TileEntityMachineGasCent extends TileEntityMachineBase implements IEnergyUser, IFluidContainer, IFluidAcceptor { +//epic! +public class TileEntityMachineGasCent extends TileEntityMachineBase implements IEnergyUser, IFluidAcceptor, IFluidStandardReceiver { - public byte age; public long power; public int progress; public boolean isProgressing; @@ -42,11 +42,10 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I public PseudoFluidTank inputTank; public PseudoFluidTank outputTank; - private static final int[] slots_top = new int[] {0}; + private static final int[] slots_io = new int[] { 0, 2, 3, 4 }; private static final int[] slots_bottom = new int[] {2, 3, 4}; private static final int[] slots_side = new int[] { }; - @Untested private static HashMap fluidConversions = new HashMap(); static { @@ -56,7 +55,7 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I } public TileEntityMachineGasCent() { - super(6); + super(7); tank = new FluidTank(Fluids.UF6, 2000, 0); inputTank = new PseudoFluidTank(PseudoFluidType.NUF6, 8000); outputTank = new PseudoFluidTank(PseudoFluidType.LEUF6, 8000); @@ -66,10 +65,15 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I public String getName() { return "container.gasCentrifuge"; } - + + @Override + public boolean canExtractItem(int i, ItemStack itemStack, int j) { + return i < 4; + } + @Override public int[] getAccessibleSlotsFromSide(int side) { - return side == 0 ? slots_bottom : side == 1 ? slots_top : slots_side; + return slots_io; } @Override @@ -92,11 +96,6 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I inputTank.writeToNBT(nbt, "inputTank"); outputTank.writeToNBT(nbt, "outputTank"); } - - @Override - public boolean canExtractItem(int i, ItemStack itemStack, int j) { - return (i != 0 && i != 1) || j == 1; - } public int getCentrifugeProgressScaled(int i) { return (progress * i) / getProcessingSpeed(); @@ -121,31 +120,17 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I ItemStack[] list = inputTank.getTankType().getOutput(); if(this.inputTank.getTankType().getIfHighSpeed()) - if(!(slots[5] != null && slots[5].getItem() == ModItems.upgrade_gc_speed)) + if(!(slots[6] != null && slots[6].getItem() == ModItems.upgrade_gc_speed)) return false; if(list == null) return false; - if(list.length < 1 || list.length > 3) + if(list.length < 1) return false; - for(int i = 0; i < list.length; i++) { - - int slot = i + 2; - - if(slots[slot] == null) - continue; - - if(slots[slot].getItem() == list[i].getItem() && - slots[slot].getItemDamage() == list[i].getItemDamage() && - slots[slot].stackSize + list[i].stackSize <= slots[slot].getMaxStackSize()) - continue; - - return false; - } - - return true; + if(InventoryUtil.doesArrayHaveSpace(slots, 0, 3, list)) + return true; } return false; @@ -158,54 +143,42 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I inputTank.setFill(inputTank.getFill() - inputTank.getTankType().getFluidConsumed()); outputTank.setFill(outputTank.getFill() + inputTank.getTankType().getFluidProduced()); - for(byte i = 0; i < output.length && i < 3; i++) { - if(slots[i + 2] == null) { - slots[i + 2] = output[i].copy(); - } else { - slots[i + 2].stackSize += output[i].stackSize; - } - } + for(byte i = 0; i < output.length; i++) + InventoryUtil.tryAddItemToInventory(slots, 0, 3, output[i].copy()); //reference types almost got me again } private void attemptConversion() { - if(inputTank.getFill() <= inputTank.getMaxFill() && tank.getFill() > 0) { - int fill = inputTank.getMaxFill() - inputTank.getFill(); + if(inputTank.getFill() < inputTank.getMaxFill() && tank.getFill() > 0) { + int fill = Math.min(inputTank.getMaxFill() - inputTank.getFill(), tank.getFill()); - if(tank.getFill() >= fill) { - tank.setFill(tank.getFill() - fill); - inputTank.setFill(inputTank.getFill() + fill); - } else { - inputTank.setFill(inputTank.getFill() + tank.getFill()); - tank.setFill(0); - } + tank.setFill(tank.getFill() - fill); + inputTank.setFill(inputTank.getFill() + fill); } } private boolean attemptTransfer(TileEntity te) { if(te instanceof TileEntityMachineGasCent) { - TileEntityMachineGasCent gasCent = (TileEntityMachineGasCent) te; + TileEntityMachineGasCent cent = (TileEntityMachineGasCent) te; - if(gasCent.tank.getFill() == 0 && gasCent.tank.getTankType() == this.tank.getTankType()) { - if(gasCent.inputTank.getTankType() != this.outputTank.getTankType()) { - gasCent.inputTank.setTankType(this.outputTank.getTankType()); - gasCent.outputTank.setTankType(this.outputTank.getTankType().getOutputFluid()); + if(cent.tank.getFill() == 0 && cent.tank.getTankType() == tank.getTankType()) { + if(cent.inputTank.getTankType() != outputTank.getTankType()) { + cent.inputTank.setTankType(outputTank.getTankType()); + cent.outputTank.setTankType(outputTank.getTankType().getOutputType()); } - if(gasCent.inputTank.getFill() < gasCent.inputTank.getMaxFill() && this.outputTank.getFill() > 0) { - int fill = gasCent.inputTank.getMaxFill() - gasCent.inputTank.getFill(); + //God, why did I forget about the entirety of the fucking math library? + if(cent.inputTank.getFill() < cent.inputTank.getMaxFill() && outputTank.getFill() > 0) { + int fill = Math.min(cent.inputTank.getMaxFill() - cent.inputTank.getFill(), outputTank.getFill()); - if(this.outputTank.getFill() >= fill) { - this.outputTank.setFill(this.outputTank.getFill() - fill); - gasCent.inputTank.setFill(gasCent.inputTank.getFill() + fill); - } else { - gasCent.inputTank.setFill(gasCent.inputTank.getFill() + this.outputTank.getFill()); - this.outputTank.setFill(0); - } + outputTank.setFill(outputTank.getFill() - fill); + cent.inputTank.setFill(cent.inputTank.getFill() + fill); } - return false; + + return true; } } - return true; + + return false; } public void networkUnpack(NBTTagCompound data) { @@ -220,26 +193,25 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I @Override public void updateEntity() { - + if(!worldObj.isRemote) { - this.updateStandardConnections(worldObj, xCoord, yCoord, zCoord); + updateConnections(); power = Library.chargeTEFromItems(slots, 0, power, maxPower); - setTankType(1); + setTankType(5); - if(inputTank.getTankType() == PseudoFluidType.PF6 || inputTank.getTankType() == PseudoFluidType.NUF6 || inputTank.getTankType() == PseudoFluidType.MUD) { - tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); + if(fluidConversions.containsValue(inputTank.getTankType())) { + tank.updateTank(this); attemptConversion(); } if(canEnrich()) { isProgressing = true; - this.progress++; - if(slots[5] != null && slots[5].getItem() == ModItems.upgrade_gc_speed) + if(slots[6] != null && slots[6].getItem() == ModItems.upgrade_gc_speed) this.power -= 300; else this.power -= 200; @@ -251,28 +223,20 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I if(progress >= getProcessingSpeed()) enrich(); - } else { isProgressing = false; this.progress = 0; } - age++; - if(age >= 10) { - age = 0; - + if(worldObj.getTotalWorldTime() % 10 == 0) { ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset); TileEntity te = worldObj.getTileEntity(this.xCoord - dir.offsetX, this.yCoord, this.zCoord - dir.offsetZ); - if(attemptTransfer(te) && this.inputTank.getTankType() == PseudoFluidType.LEUF6) { - if(this.outputTank.getFill() >= 100 && (slots[4] == null || (slots[4].getItem() == ModItems.nugget_uranium_fuel && slots[4].stackSize + 1 <= slots[4].getMaxStackSize()))) { + //*AT THE MOMENT*, there's not really any need for a dedicated method for this. Yet. + if(!attemptTransfer(te) && this.inputTank.getTankType() == PseudoFluidType.LEUF6) { + if(this.outputTank.getFill() >= 100 && InventoryUtil.tryAddItemToInventory(slots, 0, 3, new ItemStack(ModItems.nugget_uranium_fuel)) == null) { this.outputTank.setFill(this.outputTank.getFill() - 100); - if(slots[4] == null) { - slots[4] = new ItemStack(ModItems.nugget_uranium_fuel, 1); - } else { - slots[4].stackSize += 1; - } } } } @@ -290,6 +254,26 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I PacketDispatcher.wrapper.sendToAllAround(new LoopedSoundPacket(xCoord, yCoord, zCoord), new TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 50)); } } + + private void updateConnections() { + for(DirPos pos : getConPos()) { + this.trySubscribe(worldObj, pos.getX(), pos.getY(), pos.getZ(), pos.getDir()); + + if(fluidConversions.containsValue(inputTank.getTankType())) { + this.trySubscribe(tank.getTankType(), worldObj, pos.getX(), pos.getY(), pos.getZ(), pos.getDir()); + } + } + } + + private DirPos[] getConPos() { + return new DirPos[] { + new DirPos(xCoord, yCoord - 1, zCoord, Library.NEG_Y), + new DirPos(xCoord + 1, yCoord, zCoord, Library.POS_X), + new DirPos(xCoord - 1, yCoord, zCoord, Library.NEG_X), + new DirPos(xCoord, yCoord, zCoord + 1, Library.POS_Z), + new DirPos(xCoord, yCoord, zCoord - 1, Library.NEG_Z) + }; + } @Override public void setPower(long i) { @@ -308,58 +292,62 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I } public int getProcessingSpeed() { - if(slots[5] != null && slots[5].getItem() == ModItems.upgrade_gc_speed) { + if(slots[6] != null && slots[6].getItem() == ModItems.upgrade_gc_speed) { return processingSpeed - 70; } return processingSpeed; } - + + public void setTankType(int in) { + + if(slots[in] != null && slots[in].getItem() instanceof IItemFluidIdentifier) { + IItemFluidIdentifier id = (IItemFluidIdentifier) slots[in].getItem(); + FluidType newType = id.getType(null, 0, 0, 0, slots[in]); + + if(tank.getTankType() != newType) { + PseudoFluidType pseudo = fluidConversions.get(newType); + + if(pseudo != null) { + inputTank.setTankType(pseudo); + outputTank.setTankType(pseudo.getOutputType()); + tank.setTankType(newType); + } + } + + } + } + + @Override + public void setTypeForSync(FluidType type, int index) { + tank.setTankType(type); + } + @Override public void setFillForSync(int fill, int index) { tank.setFill(fill); } @Override - public void setTypeForSync(FluidType type, int index) { - tank.setTankType(type); + public void setFluidFill(int fill, FluidType type) { + if(type == tank.getTankType()) + tank.setFill(fill); } - public void setTankType(int in) { - - if(slots[in] != null && slots[in].getItem() instanceof ItemFluidIdentifier) { - FluidType newType = ItemFluidIdentifier.getType(slots[in]); - - if(tank.getTankType() != newType) { - - PseudoFluidType pseudo = fluidConversions.get(newType); - - if(pseudo != null) { - inputTank.setTankType(pseudo); - outputTank.setTankType(pseudo.getOutputFluid()); - tank.setTankType(newType); - tank.setFill(0); - } - } - return; - } + @Override + public int getFluidFill(FluidType type) { + return tank.getTankType() == type ? tank.getFill() : 0; } @Override public int getMaxFluidFill(FluidType type) { - return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; + return tank.getTankType() == type ? tank.getMaxFill() : 0; } - + @Override - public int getFluidFill(FluidType type) { - return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; + public FluidTank[] getReceivingTanks() { + return new FluidTank[] { tank }; } - - @Override - public void setFluidFill(int i, FluidType type) { - if(type.name().equals(tank.getTankType().name())) - tank.setFill(i); - } - + AxisAlignedBB bb = null; @Override @@ -394,10 +382,14 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I public void setTankType(PseudoFluidType type) { - if(this.type.name().equals(type.name())) + if(this.type.equals(type)) return; - this.type = type; + if(type == null) + this.type = PseudoFluidType.NONE; + else + this.type = type; + this.setFill(0); } diff --git a/src/main/resources/assets/hbm/textures/gui/centrifuge_gas.png b/src/main/resources/assets/hbm/textures/gui/centrifuge_gas.png deleted file mode 100644 index 1300c56f928c03969ebe1ce3ff1f7062525e1ab5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3362 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 XG;N>O+lT(_PZ+Sl*;`bZ6BGXf`H&Ri literal 0 HcmV?d00001