æügh

src/main/java/assets/hbm/lang/de_DE.lang

@@ -149,6 +149,7 @@ container.machineCMB=CMB-Stahl Hochofen
 container.machineCoal=Verbrennungsgenerator
 container.machineDiesel=Dieselgenerator
 container.machineElectricBoiler=Elektrischer Boiler
+container.machineITER=Kernfusionsreaktor
 container.machineRefinery=Ölraffinerie
 container.machineSelenium=Hochleistungs-Sternmotor
 container.machineShredder=Brecher
@@ -2012,6 +2013,7 @@ tile.block_uranium.name=Uranblock
 tile.block_uranium_fuel.name=Urankernbrennstoffblock
 tile.block_verticium.name=Verticiumblock
 tile.block_waste.name=Atommüllblock
+tile.block_waste_painted.name=Bemalter Atommüllblock
 tile.block_weidanium.name=Weidaniumblock
 tile.block_white_phosphorus.name=Weißer Phosphorblock
 tile.block_yellowcake.name=Yellowcakeblock
@@ -2020,6 +2022,7 @@ tile.bomb_multi.name=Mehrzweckbombe
 tile.bomber.name=Abgestürtzer Bomber
 tile.book_guide.name=Hbm's Nuclear Tech Mod Handbuch [LEGACY]
 tile.boxcar.name=Güterwagon
+tile.brick_asbestos.name=Asbestziegel
 tile.brick_compound.name=Verstärkter Verbund
 tile.brick_concrete.name=Betonziegel
 tile.brick_concrete_broken.name=Gebrochene Betonziegel
@@ -2120,6 +2123,7 @@ tile.glass_uranium.name=Uranglas
 tile.gravel_diamond.name=Diamantkies
 tile.gravel_obsidian.name=Gebrochener Obsidian
 tile.hazmat.name=Strahlenschutzstoff-Block
+tile.iter.name=Kernfusionsreaktor
 tile.launch_pad.name=Raketenabschussrampe
 tile.launch_table.name=Große Startrampe
 tile.lox_barrel.name=LOX-Fass

src/main/java/assets/hbm/lang/en_US.lang

@@ -149,6 +149,7 @@ container.machineCMB=CMB Steel Furnace
 container.machineCoal=Combustion Generator
 container.machineDiesel=Diesel Generator
 container.machineElectricBoiler=Electric Boiler
+container.machineITER=Fusion Reactor
 container.machineRefinery=Oil Refinery
 container.machineSelenium=Radial Performance Engine
 container.machineShredder=Shredder
@@ -2012,6 +2013,7 @@ tile.block_uranium.name=Block of Uranium
 tile.block_uranium_fuel.name=Block of Uranium Fuel
 tile.block_verticium.name=Block of Verticium
 tile.block_waste.name=Block of Nuclear Waste
+tile.block_waste_painted.name=Painted Block of Nuclear Waste
 tile.block_weidanium.name=Block of Weidanium
 tile.block_white_phosphorus.name=Block of White Phosphorus
 tile.block_yellowcake.name=Block of Yellowcake
@@ -2020,6 +2022,7 @@ tile.bomb_multi.name=Multi Purpose Bomb
 tile.bomber.name=Crashed Bomber
 tile.book_guide.name=Hbm's Nuclear Tech Mod Manual [LEGACY]
 tile.boxcar.name=Boxcar
+tile.brick_asbestos.name=Asbestos Bricks
 tile.brick_compound.name=Compound Mesh
 tile.brick_concrete.name=Concrete Bricks
 tile.brick_concrete_broken.name=Broken Concrete Bricks
@@ -2120,6 +2123,7 @@ tile.glass_uranium.name=Uranium Glass
 tile.gravel_diamond.name=Diamond Gravel
 tile.gravel_obsidian.name=Crushed Obsidian
 tile.hazmat.name=Hazmat Cloth Block
+tile.iter.name=Fusion Reactor
 tile.launch_pad.name=Missile Launch Pad
 tile.launch_table.name=Large Launch Pad
 tile.lox_barrel.name=LOX Barrel

src/main/java/com/hbm/blocks/machine/MachineITER.java

@@ -64,7 +64,6 @@ public class MachineITER extends BlockDummyable {
 			}
 			return true;
 		} else {
-			player.addChatComponentMessage(new ChatComponentText("" + world.getBlockMetadata(x, y, z)));
 			return false;
 		}
 	}

src/main/java/com/hbm/blocks/machine/MachinePlasmaHeater.java

@@ -3,6 +3,7 @@ package com.hbm.blocks.machine;
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.main.MainRegistry;
+import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityITER;
 import com.hbm.tileentity.machine.TileEntityMachinePlasmaHeater;
 
@@ -11,6 +12,7 @@ import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public class MachinePlasmaHeater extends BlockDummyable {
 
@@ -23,6 +25,10 @@ public class MachinePlasmaHeater extends BlockDummyable {
 
 		if(meta >= 12)
 			return new TileEntityMachinePlasmaHeater();
+
+		if(meta >= 6)
+			return new TileEntityProxyCombo(false, true, true);
+		
 		return null;
 	}
 	
@@ -49,6 +55,20 @@ public class MachinePlasmaHeater extends BlockDummyable {
 		}
 	}
 
+	@Override
+	public void fillSpace(World world, int x, int y, int z, ForgeDirection dir, int o) {
+		super.fillSpace(world, x, y, z, dir, o);
+		
+		ForgeDirection side = dir.getRotation(ForgeDirection.UP);
+		
+		for(int i = 1; i < 4; i++) {
+			for(int j = -1; j < 2; j++) {
+				
+				this.makeExtra(world, x + side.offsetX * j, y + i, z + side.offsetZ * j);
+			}
+		}
+	}
+
 	@Override
 	public int[] getDimensions() {
 		return new int[] {3, 0, 8, 1, 1, 1};

src/main/java/com/hbm/inventory/MachineRecipes.java

@@ -233,6 +233,7 @@ public class MachineRecipes {
 		case STEAM: return new Object[] { FluidType.WATER, 5, 500, 50 };
 		case HOTSTEAM: return new Object[] { FluidType.STEAM, 50, 5, 100 };
 		case SUPERHOTSTEAM: return new Object[] { FluidType.HOTSTEAM, 50, 5, 150 };
+		case ULTRAHOTSTEAM: return new Object[] { FluidType.SUPERHOTSTEAM, 50, 5, 250 };
 		}
 		
 		return null;

src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java

@@ -65,6 +65,9 @@ public class GUIMachineTurbine extends GuiInfoContainer {
 		if(diFurnace.tanks[0].getTankType().name().equals(FluidType.SUPERHOTSTEAM.name())) {
 			drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 28, 14, 14);
 		}
+		if(diFurnace.tanks[0].getTankType().name().equals(FluidType.ULTRAHOTSTEAM.name())) {
+			drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 42, 14, 14);
+		}
 
 		int i = (int)diFurnace.getPowerScaled(34);
 		drawTexturedModalRect(guiLeft + 123, guiTop + 69 - i, 176, 34 - i, 7, i);

src/main/java/com/hbm/lib/RefStrings.java

@@ -3,7 +3,7 @@ package com.hbm.lib;
 public class RefStrings {
 	public static final String MODID = "hbm";
 	public static final String NAME = "Hbm's Nuclear Tech Mod";
-	public static final String VERSION = "1.0.27 BETA (3598)";
+	public static final String VERSION = "1.0.27 BETA (3605)";
 	//HBM's Beta Naming Convention:
 	//V T (X)
 	//V -> next release version

src/main/java/com/hbm/tileentity/machine/TileEntityITER.java

@@ -78,6 +78,19 @@ public class TileEntityITER extends TileEntityMachineBase implements IConsumer,
 			
 			if(isOn && power >= powerReq) {
 				power -= powerReq;
+				
+				for(int i = 0; i < 20; i++) {
+					
+					if(tanks[0].getFill() >= 10 && plasma.getFill() > 0) {
+						tanks[0].setFill(tanks[0].getFill() - 10);
+						tanks[1].setFill(tanks[1].getFill() + 1);
+						
+						if(tanks[1].getFill() > tanks[1].getMaxFill())
+							tanks[1].setFill(tanks[1].getMaxFill());
+						
+						plasma.setFill(plasma.getFill() - 1);
+					}
+				}
 			}
 			
 			/// END Processing part ///

src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java

@@ -60,6 +60,7 @@ public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase impleme
 			convert = Math.min(convert, (plasma.getMaxFill() - plasma.getFill()) * 2);
 			convert = Math.min(convert, maxConv);
 			convert = (int) Math.min(convert, power / powerReq);
+			convert = Math.max(0, convert);
 
 			tanks[0].setFill(tanks[0].getFill() - convert);
 			tanks[1].setFill(tanks[1].getFill() - convert);
@@ -117,8 +118,8 @@ public class TileEntityMachinePlasmaHeater extends TileEntityMachineBase impleme
 	
 	private void updateType() {
 		
-		if(plasma.getFill() > 0)
-			return;
+		//if(plasma.getFill() > 0)
+		//	return;
 		
 		List<FluidType> types = new ArrayList() {{ add(tanks[0].getTankType()); add(tanks[1].getTankType()); }};