From 671948754bcdb3704905d21167922d78a7e06dee Mon Sep 17 00:00:00 2001
From: Vaern <masondrown@gmail.com>
Date: Sat, 4 Jun 2022 21:30:30 -0700
Subject: [PATCH 1/2] 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<PositionedStack> 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<PositionedStack> getOtherStacks() {
 			List<PositionedStack> stacks = new ArrayList<PositionedStack>();
 			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<Object, Object[]> recipes = GasCentrifugeRecipes.getGasCentrifugeRecipes();
 			for(Map.Entry<Object, Object[]> 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<Object, Object[]> 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<Object, Object[]> recipes = GasCentrifugeRecipes.getGasCentrifugeRecipes();
 		for(Map.Entry<Object, Object[]> 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<FluidType, PseudoFluidType> 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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
KR(|SI%s&Ctm?<m(

diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_centrifuge_gas.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_centrifuge_gas.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bffb3be6fbe58d4edc3a1a81ebfc7a2271dd180
GIT binary patch
literal 3291
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
XG;N>O+lT(_PZ+Sl*;`bZ6BGXf`H&Ri

literal 0
HcmV?d00001


From cfe90f281ad7f1986de82ca72e5189f55d416650 Mon Sep 17 00:00:00 2001
From: Vaern <masondrown@gmail.com>
Date: Sun, 5 Jun 2022 20:32:47 -0700
Subject: [PATCH 2/2] plenty more changes; RBMK rounding errors fixed

---
 .../nei/GasCentrifugeRecipeHandler.java       |  71 +++++++++---
 .../container/ContainerMachineGasCent.java    |  12 +-
 .../hbm/inventory/gui/GUIMachineGasCent.java  | 105 +++++++++++-------
 .../recipes/GasCentrifugeRecipes.java         |  53 +++++----
 .../java/com/hbm/main/CraftingManager.java    |   2 +-
 .../machine/TileEntityMachineGasCent.java     |  27 ++---
 .../machine/rbmk/TileEntityRBMKBoiler.java    |  31 ++++--
 src/main/resources/assets/hbm/lang/en_US.lang |   8 ++
 .../gui/nei/gui_nei_centrifuge_gas.png        | Bin 0 -> 2391 bytes
 .../gui/processing/gui_centrifuge_gas.png     | Bin 3291 -> 2501 bytes
 10 files changed, 195 insertions(+), 114 deletions(-)
 create mode 100644 src/main/resources/assets/hbm/textures/gui/nei/gui_nei_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 246a9e5fb..8fdda9e8a 100644
--- a/src/main/java/com/hbm/handler/nei/GasCentrifugeRecipeHandler.java
+++ b/src/main/java/com/hbm/handler/nei/GasCentrifugeRecipeHandler.java
@@ -1,18 +1,27 @@
 package com.hbm.handler.nei;
 
+import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect;
+
 import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import com.hbm.handler.nei.AnvilRecipeHandler.RecipeSet;
 import com.hbm.inventory.gui.GUIMachineGasCent;
 import com.hbm.inventory.recipes.GasCentrifugeRecipes;
 import com.hbm.inventory.recipes.MachineRecipes;
+import com.hbm.lib.RefStrings;
 
 import codechicken.nei.NEIServerUtils;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.TemplateRecipeHandler;
+import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect;
+import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRectHandler;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
@@ -23,13 +32,17 @@ public class GasCentrifugeRecipeHandler extends TemplateRecipeHandler {
 	public class SmeltingSet extends TemplateRecipeHandler.CachedRecipe {
 		PositionedStack input;
 		List<PositionedStack> output = new ArrayList();
+		boolean isHighSpeed;
+		int centNumber;
 
-		public SmeltingSet(ItemStack input, ItemStack[] results) {
+		public SmeltingSet(ItemStack input, ItemStack[] results, boolean isHighSpeed, int centNumber) {
 			input.stackSize = 1;
-			this.input = new PositionedStack(input, 25, 35 - 11);
+			this.input = new PositionedStack(input, 52 - 5, 35 - 11);
+			this.isHighSpeed = isHighSpeed;
+			this.centNumber = centNumber;
 			
 			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 ));
+				this.output.add(new PositionedStack(results[i], i % 2 == 0 ? 134 - 5 : 152 - 5, i < 2 ? 26 - 11 : 44 - 11 ));
 			}
 		}
 
@@ -68,12 +81,7 @@ public class GasCentrifugeRecipeHandler extends TemplateRecipeHandler {
 
 	@Override
 	public String getGuiTexture() {
-		return GUIMachineGasCent.texture.toString();
-	}
-
-	@Override
-	public Class<? extends GuiContainer> getGuiClass() {
-		return GUIMachineGasCent.class;
+		return RefStrings.MODID + ":textures/gui/nei/gui_nei_centrifuge_gas.png";
 	}
 
 	@Override
@@ -91,7 +99,7 @@ public class GasCentrifugeRecipeHandler extends TemplateRecipeHandler {
 		if((outputId.equals("gascentprocessing")) && getClass() == GasCentrifugeRecipeHandler.class) {
 			Map<Object, Object[]> recipes = GasCentrifugeRecipes.getGasCentrifugeRecipes();
 			for(Map.Entry<Object, Object[]> recipe : recipes.entrySet()) {
-				this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack[]) recipe.getValue()));
+				this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack[]) recipe.getValue()[0], (boolean) recipe.getValue()[1], (int) recipe.getValue()[2]));
 			}
 		} else {
 			super.loadCraftingRecipes(outputId, results);
@@ -102,9 +110,9 @@ public class GasCentrifugeRecipeHandler extends TemplateRecipeHandler {
 	public void loadCraftingRecipes(ItemStack result) {
 		Map<Object, Object[]> recipes = GasCentrifugeRecipes.getGasCentrifugeRecipes();
 		for(Map.Entry<Object, Object[]> 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()));
+			if(NEIServerUtils.areStacksSameType(((ItemStack[]) recipe.getValue()[0])[0], result) || NEIServerUtils.areStacksSameType(((ItemStack[]) recipe.getValue()[0])[1], result)
+					|| NEIServerUtils.areStacksSameType(((ItemStack[]) recipe.getValue()[0])[2], result) || NEIServerUtils.areStacksSameType(((ItemStack[]) recipe.getValue()[0])[3], result))
+				this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack[]) recipe.getValue()[0], (boolean) recipe.getValue()[1], (int) recipe.getValue()[2]));
 		}
 	}
 
@@ -122,7 +130,7 @@ public class GasCentrifugeRecipeHandler extends TemplateRecipeHandler {
 		Map<Object, Object[]> recipes = GasCentrifugeRecipes.getGasCentrifugeRecipes();
 		for(Map.Entry<Object, Object[]> recipe : recipes.entrySet()) {
 			if(compareFluidStacks(ingredient, (ItemStack) recipe.getKey()))
-				this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack[]) recipe.getValue()));
+				this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack[]) recipe.getValue()[0], (boolean) recipe.getValue()[1], (int) recipe.getValue()[2]));
 		}
 	}
 
@@ -133,11 +141,42 @@ public class GasCentrifugeRecipeHandler extends TemplateRecipeHandler {
 	@Override
 	public void drawExtras(int recipe) {
 		drawProgressBar(3, 51 - 45, 176, 0, 16, 34, 480, 7);
-		drawProgressBar(69, 26, 208, 0, 33, 12, 200, 0);
+		
+		SmeltingSet set = (SmeltingSet) this.arecipes.get(recipe);
+		
+		drawProgressBar(79 - 5, 28 - 11, 208, 0, 44, 37, set.isHighSpeed ? 150 - 70 : 150, 0);
+		
+		FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
+		
+		String centrifuges = set.centNumber + " G. Cents";
+		fontRenderer.drawString(centrifuges, (50 - fontRenderer.getStringWidth(centrifuges) / 2), 21 - 11, 65280);
 	}
+	
+	public LinkedList<RecipeTransferRect> transferRectsRec = new LinkedList<RecipeTransferRect>();
+	public LinkedList<RecipeTransferRect> transferRectsGui = new LinkedList<RecipeTransferRect>();
+	public LinkedList<Class<? extends GuiContainer>> guiRec = new LinkedList<Class<? extends GuiContainer>>();
+	public LinkedList<Class<? extends GuiContainer>> guiGui = new LinkedList<Class<? extends GuiContainer>>();
 
 	@Override
 	public void loadTransferRects() {
-		transferRects.add(new RecipeTransferRect(new Rectangle(69, 26, 32, 12), "gascentprocessing"));
+		transferRectsGui = new LinkedList<RecipeTransferRect>();
+		guiGui = new LinkedList<Class<? extends GuiContainer>>();
+		
+		transferRects.add(new RecipeTransferRect(new Rectangle(79 - 5, 26 - 11, 44, 40), "gascentprocessing"));
+		transferRectsGui.add(new RecipeTransferRect(new Rectangle(70 - 5, 36 - 11, 36, 12), "gascentprocessing"));
+		
+		guiGui.add(GUIMachineGasCent.class);
+		RecipeTransferRectHandler.registerRectsToGuis(getRecipeTransferRectGuis(), transferRects);
+		RecipeTransferRectHandler.registerRectsToGuis(guiGui, transferRectsGui);
+	}
+	
+	@Override
+	public void drawBackground(int recipe) {
+		super.drawBackground(recipe);
+		
+		SmeltingSet set = (SmeltingSet) this.arecipes.get(recipe);
+		
+		if(set.isHighSpeed)
+			drawTexturedModalRect(30 - 5, 35 - 11, 192, 0, 16, 16);
 	}
 }
diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineGasCent.java b/src/main/java/com/hbm/inventory/container/ContainerMachineGasCent.java
index 26d58fac5..6381575fb 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerMachineGasCent.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerMachineGasCent.java
@@ -21,25 +21,25 @@ public class ContainerMachineGasCent extends Container {
 		//Output
 		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));
+				this.addSlotToContainer(new SlotMachineOutput(tedf, j + i * 2, 71 + j * 18, 53 + i * 18));
 			}
 		}
 		
 		//Battery
-		this.addSlotToContainer(new Slot(tedf, 4, 8, 53));
+		this.addSlotToContainer(new Slot(tedf, 4, 182, 71));
 		//Fluid ID IO
-		this.addSlotToContainer(new Slot(tedf, 5, 30, 35));
+		this.addSlotToContainer(new Slot(tedf, 5, 91, 15));
 		//upgrade
-		this.addSlotToContainer(new Slot(tedf, 6, 82, 19));
+		this.addSlotToContainer(new Slot(tedf, 6, 69, 15));
 		
 		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));
+				this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 122 + i * 18));
 			}
 		}
 		
 		for(int i = 0; i < 9; i++) {
-			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142));
+			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 180));
 		}
 	}
 	
diff --git a/src/main/java/com/hbm/inventory/gui/GUIMachineGasCent.java b/src/main/java/com/hbm/inventory/gui/GUIMachineGasCent.java
index 9202e0d18..8577cbbcd 100644
--- a/src/main/java/com/hbm/inventory/gui/GUIMachineGasCent.java
+++ b/src/main/java/com/hbm/inventory/gui/GUIMachineGasCent.java
@@ -9,8 +9,10 @@ import com.hbm.tileentity.machine.TileEntityMachineGasCent;
 import com.hbm.util.I18nUtil;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
 
 public class GUIMachineGasCent extends GuiInfoContainer {
@@ -22,31 +24,42 @@ public class GUIMachineGasCent extends GuiInfoContainer {
 		super(new ContainerMachineGasCent(invPlayer, tedf));
 		gasCent = tedf;
 
-		this.xSize = 176;
-		this.ySize = 168;
+		this.xSize = 206;
+		this.ySize = 204;
 	}
 	
 	@Override
 	public void drawScreen(int mouseX, int mouseY, float f) {
 		super.drawScreen(mouseX, mouseY, f);
 		
-		this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 58, guiTop + 30, 8, 33, mouseX, mouseY, new String[] {gasCent.inputTank.getTankType().getName(), gasCent.inputTank.getFill() + " / " + gasCent.inputTank.getMaxFill() + " mB"});
-		this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 114, guiTop + 30, 8, 33, mouseX, mouseY, new String[] {gasCent.outputTank.getTankType().getName(), gasCent.outputTank.getFill() + " / " + gasCent.outputTank.getMaxFill() + " mB"});
+		String[] inTankInfo = new String[] {gasCent.inputTank.getTankType().getName(), gasCent.inputTank.getFill() + " / " + gasCent.inputTank.getMaxFill() + " mB"};
+		if(gasCent.inputTank.getTankType().getIfHighSpeed()) {
+			if(gasCent.getProcessingSpeed() > gasCent.processingSpeed - 70)
+				inTankInfo[0] = EnumChatFormatting.DARK_RED + inTankInfo[0];
+			else
+				inTankInfo[0] = EnumChatFormatting.GOLD + inTankInfo[0];
+		}
+		String[] outTankInfo = new String[] {gasCent.outputTank.getTankType().getName(), gasCent.outputTank.getFill() + " / " + gasCent.outputTank.getMaxFill() + " mB"};
+		if(gasCent.outputTank.getTankType().getIfHighSpeed())
+			outTankInfo[0] = EnumChatFormatting.GOLD + outTankInfo[0];
 		
-		this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 51 - 34, 16, 34, gasCent.power, gasCent.maxPower);
+		this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 15, guiTop + 15, 24, 55, mouseX, mouseY, inTankInfo);
+		this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 137, guiTop + 15, 25, 55, mouseX, mouseY, outTankInfo);
+		
+		this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 182, guiTop + 69 - 52, 16, 52, gasCent.power, gasCent.maxPower);
 		
 		String[] enrichmentText = I18nUtil.resolveKeyArray("desc.gui.gasCent.enrichment");
-		this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 16, 16, 16, guiLeft - 8, guiTop + 16 + 16, enrichmentText);
+		this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 12, guiTop + 16, 16, 16, guiLeft - 8, guiTop + 16 + 16, enrichmentText);
 		
 		String[] transferText = I18nUtil.resolveKeyArray("desc.gui.gasCent.output");
-		this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 32, 16, 16, guiLeft - 8, guiTop + 32 + 16, transferText);
+		this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 12, guiTop + 32, 16, 16, guiLeft - 8, guiTop + 32 + 16, transferText);
 	}
 	
 	@Override
 	protected void drawGuiContainerForegroundLayer(int i, int j) {
 		String name = this.gasCent.hasCustomInventoryName() ? this.gasCent.getInventoryName() : I18n.format(this.gasCent.getInventoryName());
 		
-		this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752);
+		//this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752);
 		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
 	}
 	
@@ -56,44 +69,50 @@ public class GUIMachineGasCent extends GuiInfoContainer {
 		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
 		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
 
-		int i = (int)gasCent.getPowerRemainingScaled(34);
-		drawTexturedModalRect(guiLeft + 8, guiTop + 51 - i, 176, 34 - i, 16, i);
+		int i = (int)gasCent.getPowerRemainingScaled(52);
+		drawTexturedModalRect(guiLeft + 182, guiTop + 69 - i, 206, 52 - i, 16, i);
 
-		int j = (int)gasCent.getCentrifugeProgressScaled(33);
-		drawTexturedModalRect(guiLeft + 74, guiTop + 37, 208, 0, j, 12);
+		int j = (int)gasCent.getCentrifugeProgressScaled(36);
+		drawTexturedModalRect(guiLeft + 70, guiTop + 35, 206, 52, j, 13);
 		
-		int a = gasCent.getTankScaled(31, 0);
-		switch (gasCent.inputTank.getTankType()) {
-			case PF6:
-				drawTexturedModalRect(guiLeft + 58, guiTop + 62 - a, 200, 31 - a, 8, a);
-				break;
-			case MUD:
-				drawTexturedModalRect(guiLeft + 58, guiTop + 62 - a, 192, 63 - a, 8, a);
-				break;
-			case MUD_HEAVY:
-				drawTexturedModalRect(guiLeft + 58, guiTop + 62 - a, 192, 63 - a, 8, a);
-				break;
-			case NONE:
-				break;
-			default:
-				drawTexturedModalRect(guiLeft + 58, guiTop + 62 - a, 192, 31 - a, 8, a);
-		}
+		this.renderTank(guiLeft + 16, guiTop + 16, this.zLevel, 6, 52, gasCent.inputTank.getFill(), gasCent.inputTank.getMaxFill());
+		this.renderTank(guiLeft + 32, guiTop + 16, this.zLevel, 6, 52, gasCent.inputTank.getFill(), gasCent.inputTank.getMaxFill());
 		
-		int b = gasCent.getTankScaled(31, 1);
-		switch (gasCent.outputTank.getTankType()) {
-			case PF6:
-				drawTexturedModalRect(guiLeft + 114, guiTop + 62 - b, 200, 31 - b, 8, b);
-				break;
-			case MUD_HEAVY:
-				drawTexturedModalRect(guiLeft + 114, guiTop + 62 - b, 192, 63 - b, 8, b);
-				break;
-			case NONE:
-				break;
-			default:
-				drawTexturedModalRect(guiLeft + 114, guiTop + 62 - b, 192, 31 - b, 8, b);
-		}
+		this.renderTank(guiLeft + 138, guiTop + 16, this.zLevel, 6, 52, gasCent.outputTank.getFill(), gasCent.outputTank.getMaxFill());
+		this.renderTank(guiLeft + 154, guiTop + 16, this.zLevel, 6, 52, gasCent.outputTank.getFill(), gasCent.outputTank.getMaxFill());
 		
-		this.drawInfoPanel(guiLeft - 16, guiTop + 16, 16, 16, 3);
-		this.drawInfoPanel(guiLeft - 16, guiTop + 32, 16, 16, 2);
+		this.drawInfoPanel(guiLeft - 12, guiTop + 16, 16, 16, 3);
+		this.drawInfoPanel(guiLeft - 12, guiTop + 32, 16, 16, 2);
+	}
+	
+	public void renderTank(int x, int y, double z, int width, int height, int fluid, int maxFluid) {
+		
+		GL11.glEnable(GL11.GL_BLEND);
+		
+		y += height;
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(gasCent.tank.getTankType().getTexture());
+		
+		int i = (fluid * height) / maxFluid;
+		
+		double minX = x;
+		double maxX = x + width;
+		double minY = y - height;
+		double maxY = y - (height - i);
+		
+		double minV = 1D;
+		double maxV = 1D - i / 16D;
+		double minU = 0D;
+		double maxU = width / 16D;
+		
+		Tessellator tessellator = Tessellator.instance;
+		tessellator.startDrawingQuads();
+		tessellator.addVertexWithUV(minX, maxY, z, minU, maxV);
+		tessellator.addVertexWithUV(maxX, maxY, z, maxU, maxV);
+		tessellator.addVertexWithUV(maxX, minY, z, maxU, minV);
+		tessellator.addVertexWithUV(minX, minY, z, minU, minV);
+		tessellator.draw();
+
+		GL11.glDisable(GL11.GL_BLEND);
 	}
 }
diff --git a/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java b/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java
index de95ef888..a7b78c542 100644
--- a/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java
+++ b/src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java
@@ -9,37 +9,41 @@ import com.hbm.inventory.FluidStack;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemFluidIcon;
+import com.hbm.util.I18nUtil;
+import com.hbm.util.Tuple.Pair;
 
 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,		null,		"Empty",					false,	(ItemStack[])null),
+		NONE		(0,		0,		null,		false,	(ItemStack[])null),
 		
-		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)),
+		HEUF6		(300,	0,		NONE,		true,	new ItemStack(ModItems.nugget_u238, 2), new ItemStack(ModItems.nugget_u235, 1), new ItemStack(ModItems.fluorite, 1)),
+		MEUF6		(200,	100,	HEUF6,		false,	new ItemStack(ModItems.nugget_u238, 1)),
+		LEUF6 		(300,	200,	MEUF6,		false,	new ItemStack(ModItems.nugget_u238, 1), new ItemStack(ModItems.fluorite, 1)),
+		NUF6 		(400,	300,	LEUF6,		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)),
+		PF6			(300,	0,		NONE,		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));
+		MUD_HEAVY	(500,	0,		NONE,		false,	new ItemStack(ModItems.powder_iron, 1), new ItemStack(ModItems.dust, 1), new ItemStack(ModItems.nuclear_waste_tiny, 1)),
+		MUD			(1000,	500,	MUD_HEAVY,	false,	new ItemStack(ModItems.powder_lead, 1), new ItemStack(ModItems.dust, 1));
+		
+		//TODO for bob: consider more fluid types
+		//Schraranium Trisulfide for more schrab-containing, pre-SILEX processing using the crystals?
+		//Gaseous Nuclear Waste: because why not? Large inputs could output Xe-135 and maybe some other fun stuff...
+		//
 		
 		int fluidConsumed;
 		int fluidProduced;
 		PseudoFluidType outputFluid;
-		String name;
 		boolean isHighSpeed;
 		ItemStack[] output;
 		
-		PseudoFluidType(int fluidConsumed, int fluidProduced, PseudoFluidType outputFluid, String name, boolean isHighSpeed, ItemStack... output) {
+		PseudoFluidType(int fluidConsumed, int fluidProduced, PseudoFluidType outputFluid, boolean isHighSpeed, ItemStack... output) {
 			this.fluidConsumed = fluidConsumed;
 			this.fluidProduced = fluidProduced;
 			this.outputFluid = outputFluid;
-			this.name = name;
 			this.isHighSpeed = isHighSpeed; 
 			this.output = output;
 		}
@@ -57,7 +61,7 @@ public class GasCentrifugeRecipes {
 		}
 		
 		public String getName() {
-			return this.name;
+			return I18nUtil.resolveKey("hbmpseudofluid.".concat(this.toString().toLowerCase()));
 		}
 		
 		public boolean getIfHighSpeed() {
@@ -71,7 +75,8 @@ public class GasCentrifugeRecipes {
 	};
 		
 	/* Recipe NEI Handler */
-	private static Map<FluidStack, ItemStack[]> gasCent = new HashMap();
+	//Fluid input; ItemStack[] outputs, isHighSpeed, # of centrifuges
+	private static Map<FluidStack, Object[]> gasCent = new HashMap();
 	
 	//Iterators are lots of fun
 	public static Map<Object, Object[]> getGasCentrifugeRecipes() {
@@ -79,10 +84,10 @@ public class GasCentrifugeRecipes {
 		Iterator itr = gasCent.entrySet().iterator();
 		
 		while(itr.hasNext()) {
-			Map.Entry entry = (Entry) itr.next();
+			Map.Entry<Object, Object[]> entry = (Entry) itr.next();
 			FluidStack input = (FluidStack) entry.getKey();
 			ItemStack[] out = new ItemStack[4];
-			ItemStack[] outputs = (ItemStack[]) entry.getValue();		
+			ItemStack[] outputs = (ItemStack[]) entry.getValue()[0];
 			
 			for(int j = 0; j < outputs.length; j++) {
 				out[j] = outputs[j].copy();
@@ -91,18 +96,20 @@ public class GasCentrifugeRecipes {
 				if(out[j] == null)
 					out[j] = new ItemStack(ModItems.nothing);
 			
-			recipes.put(ItemFluidIcon.make(input.type, input.fill), outputs);
+			recipes.put(ItemFluidIcon.make(input.type, input.fill), new Object[] { out, entry.getValue()[1], entry.getValue()[2] });
 		}
 		
 		return recipes;
 	}
 	
 	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), new ItemStack(ModItems.dust, 2)});
+		gasCent.put(new FluidStack(1200, Fluids.UF6), new Object[] { new ItemStack[] 
+				{new ItemStack(ModItems.nugget_u238, 11), new ItemStack(ModItems.nugget_u235, 1), new ItemStack(ModItems.fluorite, 4)}, true, 4 });
+		gasCent.put(new FluidStack(1200, Fluids.UF6), new Object[] { new ItemStack[] 
+				{new ItemStack(ModItems.nugget_u238, 6), new ItemStack(ModItems.nugget_uranium_fuel, 2), new ItemStack(ModItems.fluorite, 4)}, false, 2 });
+		gasCent.put(new FluidStack(900, Fluids.PUF6), new Object[] { new ItemStack[] 
+				{new ItemStack(ModItems.nugget_pu238, 3), new ItemStack(ModItems.nugget_pu_mix, 6), new ItemStack(ModItems.fluorite, 3)}, false, 1 });
+		gasCent.put(new FluidStack(1000, Fluids.WATZ), new Object[] { 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)}, false, 2 });
 	}
 }
diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java
index 66f82c33b..d67fc1072 100644
--- a/src/main/java/com/hbm/main/CraftingManager.java
+++ b/src/main/java/com/hbm/main/CraftingManager.java
@@ -767,7 +767,7 @@ public class CraftingManager {
 		addRecipeAuto(new ItemStack(ModItems.upgrade_centrifuge, 1), new Object[] { "PHP", "PUP", "DTD", 'P', ModItems.centrifuge_element, 'H', Blocks.hopper, 'U', ModItems.upgrade_shredder, 'D', ANY_PLASTIC.ingot(), 'T', ModBlocks.machine_transformer });
 		addRecipeAuto(new ItemStack(ModItems.upgrade_crystallizer, 1), new Object[] { "PHP", "CUC", "DTD", 'P', new ItemStack(ModItems.fluid_barrel_full, 1, Fluids.ACID.getID()), 'H', ModItems.circuit_targeting_tier4, 'C', ModBlocks.barrel_steel, 'U', ModItems.upgrade_centrifuge, 'D', ModItems.motor, 'T', ModBlocks.machine_transformer });
 		addRecipeAuto(new ItemStack(ModItems.upgrade_screm, 1), new Object[] { "SUS", "SCS", "SUS", 'S', STEEL.plate(), 'U', ModItems.upgrade_template, 'C', ModItems.crystal_xen });
-		addRecipeAuto(new ItemStack(ModItems.upgrade_gc_speed, 1), new Object[] {"GNG", "RUR", "GMG", 'R', RUBBER.ingot(), 'M', ModItems.motor, 'G', ModItems.coil_gold, 'N', TCALLOY.ingot(), 'U', ModItems.upgrade_template});
+		addRecipeAuto(new ItemStack(ModItems.upgrade_gc_speed, 1), new Object[] {"GNG", "RUR", "GMG", 'R', RUBBER.ingot(), 'M', ModItems.motor, 'G', ModItems.coil_gold, 'N', TCALLOY.ingot(), 'U', ModItems.upgrade_template}); //TODO: gate this behind the upwards gate of the oil chain when it exists
 		
 		addRecipeAuto(new ItemStack(ModItems.mech_key, 1), new Object[] { "MCM", "MKM", "MMM", 'M', ModItems.ingot_meteorite_forged, 'C', ModItems.coin_maskman, 'K', ModItems.key });
 		addRecipeAuto(new ItemStack(ModItems.spawn_ufo, 1), new Object[] { "MMM", "DCD", "MMM", 'M', ModItems.ingot_meteorite, 'D', DNT.ingot(), 'C', ModItems.coin_worm });
diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java
index c097ec771..6dcf61f47 100644
--- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java
+++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineGasCent.java
@@ -42,9 +42,7 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I
 	public PseudoFluidTank inputTank;
 	public PseudoFluidTank outputTank;
 	
-	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[] { };
+	private static final int[] slots_io = new int[] { 0, 1, 2, 3 };
 	
 	private static HashMap<FluidType, PseudoFluidType> fluidConversions = new HashMap();
 	
@@ -105,15 +103,6 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I
 		return (power * i) / maxPower;
 	}
 	
-	public int getTankScaled(int i, int id) {
-		if(id == 0) {
-			return (this.inputTank.getFill() * i) / inputTank.getMaxFill();
-		} else if(id == 1) {
-			return (this.outputTank.getFill() * i) / outputTank.getMaxFill();
-		}
-		return i;
-	}
-	
 	private boolean canEnrich() {
 		if(power > 0 && this.inputTank.getFill() >= inputTank.getTankType().getFluidConsumed() && this.outputTank.getFill() + this.inputTank.getTankType().getFluidProduced() <= outputTank.getMaxFill()) {
 			
@@ -161,7 +150,7 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I
 			TileEntityMachineGasCent cent = (TileEntityMachineGasCent) te;
 			
 			if(cent.tank.getFill() == 0 && cent.tank.getTankType() == tank.getTankType()) {
-				if(cent.inputTank.getTankType() != outputTank.getTankType()) {
+				if(cent.inputTank.getTankType() != outputTank.getTankType() && outputTank.getTankType() != PseudoFluidType.NONE) {
 					cent.inputTank.setTankType(outputTank.getTankType());
 					cent.outputTank.setTankType(outputTank.getTankType().getOutputType());
 				}
@@ -198,11 +187,11 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I
 			
 			updateConnections();
 
-			power = Library.chargeTEFromItems(slots, 0, power, maxPower);
+			power = Library.chargeTEFromItems(slots, 4, power, maxPower);
 			setTankType(5);
+			tank.updateTank(this);
 			
 			if(fluidConversions.containsValue(inputTank.getTankType())) {
-				tank.updateTank(this);
 				attemptConversion();
 			}
 			
@@ -235,8 +224,12 @@ public class TileEntityMachineGasCent extends TileEntityMachineBase implements I
 				
 				//*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);
+					ItemStack[] converted = new ItemStack[] { new ItemStack(ModItems.nugget_uranium_fuel, 6), new ItemStack(ModItems.fluorite) };
+					
+					if(this.outputTank.getFill() >= 600 && InventoryUtil.doesArrayHaveSpace(slots, 0, 3, converted)) {
+						this.outputTank.setFill(this.outputTank.getFill() - 600);
+						for(ItemStack stack : converted)
+							InventoryUtil.tryAddItemToInventory(slots, 0, 3, stack);
 					}
 				}
 			}
diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java
index b89800e81..985666099 100644
--- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java
+++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java
@@ -47,17 +47,32 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I
 			double heatProvided = this.heat - heatCap;
 			
 			if(heatProvided > 0) {
-				int waterUsed = (int)Math.floor(heatProvided / RBMKDials.getBoilerHeatConsumption(worldObj));
-				waterUsed = Math.min(waterUsed, feed.getFill());
-				feed.setFill(feed.getFill() - waterUsed);
-				int steamProduced = (int)Math.floor((waterUsed * 100) / getFactorFromSteam(steam.getTankType()));
-				steam.setFill(steam.getFill() + steamProduced);
+				double HEAT_PER_MB_WATER = RBMKDials.getBoilerHeatConsumption(worldObj);
+				double steamFactor = getFactorFromSteam(steam.getTankType());
+				int waterUsed;
+				int steamProduced;
 				
-				if(steam.getFill() > steam.getMaxFill()) {
-					steam.setFill(steam.getMaxFill());
+				if(steam.getTankType() == Fluids.ULTRAHOTSTEAM) {
+					steamProduced = (int)Math.floor((heatProvided / HEAT_PER_MB_WATER) * 100D / steamFactor);
+					waterUsed = (int)Math.floor(steamProduced / 100D * steamFactor);
+					
+					if(feed.getFill() < waterUsed) {
+						steamProduced = (int)Math.floor(feed.getFill() * 100D / steamFactor);
+						waterUsed = (int)Math.floor(steamProduced / 100D * steamFactor);
+					}
+				} else {
+					waterUsed = (int)Math.floor(heatProvided / HEAT_PER_MB_WATER);
+					waterUsed = Math.min(waterUsed, feed.getFill());
+					steamProduced = (int)Math.floor((waterUsed * 100D) / steamFactor);
 				}
 				
-				this.heat -= waterUsed * RBMKDials.getBoilerHeatConsumption(worldObj);
+				feed.setFill(feed.getFill() - waterUsed);
+				steam.setFill(steam.getFill() + steamProduced);
+				
+				if(steam.getFill() > steam.getMaxFill())
+					steam.setFill(steam.getMaxFill());
+				
+				this.heat -= waterUsed * HEAT_PER_MB_WATER;
 			}
 			
 			fillFluidInit(steam.getTankType());
diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang
index fe780307e..16bf8e684 100644
--- a/src/main/resources/assets/hbm/lang/en_US.lang
+++ b/src/main/resources/assets/hbm/lang/en_US.lang
@@ -758,6 +758,14 @@ hbmfluid.water=Water
 hbmfluid.watz=Poisonous Mud
 hbmfluid.xenon=Xenon Gas
 hbmfluid.xpjuice=Experience Juice
+hbmpseudofluid.none=Empty
+hbmpseudofluid.heuf6=Highly Enriched UF6
+hbmpseudofluid.meuf6=Medium Enriched UF6
+hbmpseudofluid.leuf6=Low Enriched UF6
+hbmpseudofluid.nuf6=Natural UF6
+hbmpseudofluid.pf6=Plutonium Hexafluoride
+hbmpseudofluid.mud_heavy=Heavy Sludge Fraction
+hbmpseudofluid.mud=Poisonous Sludge Gas
 
 info.coil=Coil Strength
 info.templatefolder=Created with %s
diff --git a/src/main/resources/assets/hbm/textures/gui/nei/gui_nei_centrifuge_gas.png b/src/main/resources/assets/hbm/textures/gui/nei/gui_nei_centrifuge_gas.png
new file mode 100644
index 0000000000000000000000000000000000000000..b291ba662721101527385e9bc323a533ef73432f
GIT binary patch
literal 2391
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
BVA%iw

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_centrifuge_gas.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_centrifuge_gas.png
index 6bffb3be6fbe58d4edc3a1a81ebfc7a2271dd180..418254967527818b3a5a414ef65faad8bc121a9a 100644
GIT binary patch
literal 2501
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

literal 3291
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
XG;N>O+lT(_PZ+Sl*;`bZ6BGXf`H&Ri