i love my mug root beer

src/main/java/com/hbm/blocks/machine/rbmk/RBMKHeater.java

@@ -2,6 +2,7 @@ package com.hbm.blocks.machine.rbmk;
 
 import com.hbm.tileentity.machine.rbmk.TileEntityRBMKHeater;
 
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
@@ -16,6 +17,11 @@ public class RBMKHeater extends RBMKBase {
 		return null;
 	}
 	
+	@Override
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
+		return openInv(world, x, y, z, player, 0);
+	}
+	
 	@Override
 	public int getRenderType(){
 		return this.renderIDControl;

src/main/java/com/hbm/blocks/machine/rbmk/RBMKHeatex.java

@@ -37,6 +37,9 @@ public class RBMKHeatex extends BlockContainer implements ILookOverlay {
 	@Override
 	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float fX, float fY, float fZ) {
 		
+		if(world.isRemote)
+			return true;
+		
 		if(player.getHeldItem() != null && player.getHeldItem().getItem() instanceof IItemFluidIdentifier) {
 			IItemFluidIdentifier id = (IItemFluidIdentifier) player.getHeldItem().getItem();
 			FluidType type = id.getType(world, x, y, z, player.getHeldItem());
@@ -48,8 +51,8 @@ public class RBMKHeatex extends BlockContainer implements ILookOverlay {
 				
 				if(te instanceof TileEntityHeatex) {
 					TileEntityHeatex heatex = (TileEntityHeatex) te;
-					heatex.coolantIn.setTankType(type);
-					heatex.coolantOut.setTankType(convert);
+					heatex.coolantIn.setTankType(convert);
+					heatex.coolantOut.setTankType(type);
 					heatex.markDirty();
 					player.addChatComponentMessage(new ChatComponentText("Changed type to ").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW)).appendSibling(new ChatComponentTranslation("hbmfluid." + type.getName().toLowerCase())).appendSibling(new ChatComponentText("!")));
 				}

src/main/java/com/hbm/handler/GUIHandler.java

@@ -32,6 +32,8 @@ public class GUIHandler implements IGuiHandler {
 		if(entity instanceof TileEntityMachineRadiolysis) {		return new ContainerRadiolysis(player.inventory, (TileEntityMachineRadiolysis) entity); }
 		if(entity instanceof TileEntityMachineChemfac) {		return new ContainerChemfac(player.inventory, (TileEntityMachineChemfac) entity); }
 		if(entity instanceof TileEntityElectrolyser) {			return new ContainerElectrolyser(player.inventory, (TileEntityElectrolyser) entity); }
+
+		if(entity instanceof TileEntityRBMKHeater) {			return new ContainerRBMKHeater(player.inventory, (TileEntityRBMKHeater) entity); }
 		
 		switch(ID) {
 		case ModBlocks.guiID_test_difurnace: {
@@ -778,7 +780,7 @@ public class GUIHandler implements IGuiHandler {
 
 		case ModBlocks.guiID_rbmk_boiler: {
 			if(entity instanceof TileEntityRBMKBoiler) {
-				return new ContainerRBMKBoiler(player.inventory, (TileEntityRBMKBoiler) entity);
+				return new ContainerRBMKGeneric(player.inventory);
 			}
 			return null;
 		}
@@ -874,6 +876,8 @@ public class GUIHandler implements IGuiHandler {
 		if(entity instanceof TileEntityMachineRadiolysis) {		return new GUIRadiolysis(player.inventory, (TileEntityMachineRadiolysis) entity); }
 		if(entity instanceof TileEntityMachineChemfac) {		return new GUIChemfac(player.inventory, (TileEntityMachineChemfac) entity); }
 		if(entity instanceof TileEntityElectrolyser) { 			return new GUIElectrolyser(player.inventory, (TileEntityElectrolyser) entity); }
+
+		if(entity instanceof TileEntityRBMKHeater) { 			return new GUIRBMKHeater(player.inventory, (TileEntityRBMKHeater) entity); }
 		
 		switch(ID) {
 		case ModBlocks.guiID_test_difurnace: {

src/main/java/com/hbm/inventory/container/ContainerRBMKGeneric.java

@@ -1,19 +1,14 @@
 package com.hbm.inventory.container;
 
-import com.hbm.tileentity.machine.rbmk.TileEntityRBMKBoiler;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-public class ContainerRBMKBoiler extends Container {
+public class ContainerRBMKGeneric extends Container {
 
-	private TileEntityRBMKBoiler rbmk;
-
-	public ContainerRBMKBoiler(InventoryPlayer invPlayer, TileEntityRBMKBoiler tedf) {
-		rbmk = tedf;
+	public ContainerRBMKGeneric(InventoryPlayer invPlayer) {
 
 		for(int i = 0; i < 3; i++) {
 			for(int j = 0; j < 9; j++) {

src/main/java/com/hbm/inventory/container/ContainerRBMKHeater.java

@@ -0,0 +1,62 @@
+package com.hbm.inventory.container;
+
+import com.hbm.tileentity.machine.rbmk.TileEntityRBMKHeater;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class ContainerRBMKHeater extends Container {
+
+	private TileEntityRBMKHeater rbmk;
+
+	public ContainerRBMKHeater(InventoryPlayer invPlayer, TileEntityRBMKHeater tile) {
+		rbmk = tile;
+
+		this.addSlotToContainer(new Slot(tile, 0, 41, 45));
+
+		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 + 20));
+			}
+		}
+
+		for(int i = 0; i < 9; i++) {
+			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142 + 20));
+		}
+	}
+
+	@Override
+	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
+		ItemStack var3 = null;
+		Slot var4 = (Slot) this.inventorySlots.get(par2);
+
+		if(var4 != null && var4.getHasStack()) {
+			ItemStack var5 = var4.getStack();
+			var3 = var5.copy();
+
+			if(par2 <= rbmk.getSizeInventory() - 1) {
+				if(!this.mergeItemStack(var5, rbmk.getSizeInventory(), this.inventorySlots.size(), true)) {
+					return null;
+				}
+			} else if(!this.mergeItemStack(var5, 0, rbmk.getSizeInventory(), false)) {
+				return null;
+			}
+
+			if(var5.stackSize == 0) {
+				var4.putStack((ItemStack) null);
+			} else {
+				var4.onSlotChanged();
+			}
+		}
+
+		return var3;
+	}
+
+	@Override
+	public boolean canInteractWith(EntityPlayer player) {
+		return true;
+	}
+}

src/main/java/com/hbm/inventory/fluid/Fluids.java

@@ -187,8 +187,8 @@ public class Fluids {
 		COALGAS_LEADED =	new FluidTypeCombustible(	"COALGAS_LEADED",	0x445772, 1, 2, 0, EnumSymbol.NONE).setCombustionEnergy(FuelGrade.MEDIUM, 250_000).setHeatEnergy(((FluidTypeFlammable)COALGAS).getHeatEnergy());
 		SULFURIC_ACID =		new FluidType(				"SULFURIC_ACID",	0xB0AA64, 3, 0, 2, EnumSymbol.ACID).addTraits(FluidTrait.CORROSIVE);
 		COOLANT_HOT =		new FluidType(				"COOLANT_HOT",		0x99525E, 1, 0, 0, EnumSymbol.NONE).setTemp(600).setHeatCap(STEAM.heatCap);
-		MUG =				new FluidType(				"MUG",				0xd8fcff, 0, 0, 0, EnumSymbol.NONE).setHeatCap(1D);
-		MUG_HOT =			new FluidType(				"MUG_HOT",			0xd8fcff, 0, 0, 0, EnumSymbol.NONE).setHeatCap(MUG.heatCap).setTemp(500);
+		MUG =				new FluidType(				"MUG",				0x4B2D28, 0, 0, 0, EnumSymbol.NONE).setHeatCap(1D);
+		MUG_HOT =			new FluidType(				"MUG_HOT",			0x6B2A20, 0, 0, 0, EnumSymbol.NONE).setHeatCap(MUG.heatCap).setTemp(500);
 		
 		
 		// ^ ^ ^ ^ ^ ^ ^ ^

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

@@ -2,7 +2,7 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.inventory.container.ContainerRBMKBoiler;
+import com.hbm.inventory.container.ContainerRBMKGeneric;
 import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.Fluids;
 import com.hbm.lib.RefStrings;
@@ -22,9 +22,9 @@ public class GUIRBMKBoiler extends GuiInfoContainer {
 	private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/reactors/gui_rbmk_boiler.png");
 	private TileEntityRBMKBoiler boiler;
 
-	public GUIRBMKBoiler(InventoryPlayer invPlayer, TileEntityRBMKBoiler tedf) {
-		super(new ContainerRBMKBoiler(invPlayer, tedf));
-		boiler = tedf;
+	public GUIRBMKBoiler(InventoryPlayer invPlayer, TileEntityRBMKBoiler tile) {
+		super(new ContainerRBMKGeneric(invPlayer));
+		boiler = tile;
 		
 		this.xSize = 176;
 		this.ySize = 186;

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

@@ -0,0 +1,57 @@
+package com.hbm.inventory.gui;
+
+import org.lwjgl.opengl.GL11;
+
+import com.hbm.inventory.container.ContainerRBMKHeater;
+import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.machine.rbmk.TileEntityRBMKHeater;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+public class GUIRBMKHeater extends GuiInfoContainer {
+	
+	private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/reactors/gui_rbmk_heater.png");
+	private TileEntityRBMKHeater rod;
+
+	public GUIRBMKHeater(InventoryPlayer invPlayer, TileEntityRBMKHeater tedf) {
+		super(new ContainerRBMKHeater(invPlayer, tedf));
+		rod = tedf;
+		
+		this.xSize = 176;
+		this.ySize = 186;
+	}
+	
+	@Override
+	public void drawScreen(int mouseX, int mouseY, float f) {
+		super.drawScreen(mouseX, mouseY, f);
+
+		rod.feed.renderTankInfo(this, mouseX, mouseY, guiLeft + 68, guiTop + 24, 16, 58);
+		rod.steam.renderTankInfo(this, mouseX, mouseY, guiLeft + 126, guiTop + 24, 16, 58);
+	}
+	
+	@Override
+	protected void drawGuiContainerForegroundLayer(int i, int j) {
+		String name = this.rod.hasCustomInventoryName() ? this.rod.getInventoryName() : I18n.format(this.rod.getInventoryName());
+		
+		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);
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
+		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
+		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
+
+		rod.feed.renderTank(guiLeft + 68, guiTop + 82, this.zLevel, 14, 58);
+		rod.steam.renderTank(guiLeft + 126, guiTop + 82, this.zLevel, 14, 58);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
+
+		drawTexturedModalRect(guiLeft + 72, guiTop + 72, 176, 0, 10, 10);
+		drawTexturedModalRect(guiLeft + 130, guiTop + 72, 186, 0, 10, 10);
+	}
+}

src/main/java/com/hbm/items/ModItems.java

@@ -5006,7 +5006,7 @@ public class ModItems {
 				.setFall("hbm:step.iron_land")
 				.addResistance("fall", 0).setUnlocalizedName("bj_helmet").setTextureName(RefStrings.MODID + ":bj_helmet");
 		bj_plate = new ArmorBJ(aMatBJ, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 1000, 100).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_plate").setTextureName(RefStrings.MODID + ":bj_plate");
-		bj_plate_jetpack = new ArmorBJJetpack(aMatBJ, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 1000, 100).cloneStats((ArmorFSB) bj_helmet).hides(EnumPlayerPart.LEFT_ARM, EnumPlayerPart.RIGHT_ARM).setUnlocalizedName("bj_plate_jetpack").setTextureName(RefStrings.MODID + ":bj_plate_jetpack");
+		bj_plate_jetpack = new ArmorBJJetpack(aMatBJ, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 1000, 100).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_plate_jetpack").setTextureName(RefStrings.MODID + ":bj_plate_jetpack");
 		bj_legs = new ArmorBJ(aMatBJ, 7, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 10000000, 10000, 1000, 100).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_legs").setTextureName(RefStrings.MODID + ":bj_legs");
 		bj_boots = new ArmorBJ(aMatBJ, 7, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 1000, 100).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_boots").setTextureName(RefStrings.MODID + ":bj_boots");
 

src/main/java/com/hbm/main/ClientProxy.java

@@ -292,6 +292,7 @@ public class ClientProxy extends ServerProxy {
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKRodReaSim.class, new RenderRBMKLid());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKCooler.class, new RenderRBMKLid());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKStorage.class, new RenderRBMKLid());
+		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKHeater.class, new RenderRBMKLid());
 		//ITER
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityITER.class, new RenderITER());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachinePlasmaHeater.class, new RenderPlasmaHeater());

src/main/java/com/hbm/main/ModEventHandlerRenderer.java

@@ -88,7 +88,7 @@ public class ModEventHandlerRenderer {
 	@SubscribeEvent
 	public void onOverlayRender(RenderGameOverlayEvent.Pre event) {
 		
-		if(event.type == ElementType.AIR) {
+		if(event.type == ElementType.PORTAL) {
 			
 			Minecraft mc = Minecraft.getMinecraft();
 			

src/main/java/com/hbm/render/model/ModelArmorBJ.java

@@ -28,7 +28,6 @@ public class ModelArmorBJ extends ModelArmorBase {
 
 	@Override
 	public void render(Entity par1Entity, float par2, float par3, float par4, float par5, float par6, float par7) {
-		
 		setRotationAngles(par2, par3, par4, par5, par6, par7, par1Entity);
 		body.copyTo(jetpack);
 		

src/main/java/com/hbm/render/tileentity/RenderRBMKLid.java

@@ -7,6 +7,7 @@ import com.hbm.lib.RefStrings;
 import com.hbm.main.ResourceManager;
 import com.hbm.tileentity.machine.rbmk.TileEntityRBMKBase;
 import com.hbm.tileentity.machine.rbmk.TileEntityRBMKBoiler;
+import com.hbm.tileentity.machine.rbmk.TileEntityRBMKHeater;
 import com.hbm.tileentity.machine.rbmk.TileEntityRBMKRod;
 
 import net.minecraft.client.renderer.Tessellator;
@@ -79,7 +80,7 @@ public class RenderRBMKLid extends TileEntitySpecialRenderer {
 				cherenkov = false;
 			}
 			
-			if(control instanceof TileEntityRBMKBoiler && meta != RBMKBase.DIR_GLASS_LID.ordinal())
+			if((control instanceof TileEntityRBMKBoiler || control instanceof TileEntityRBMKHeater) && meta != RBMKBase.DIR_GLASS_LID.ordinal())
 				ResourceManager.rbmk_rods.renderPart("Lid");
 			ResourceManager.rbmk_element.renderPart("Lid");
 			GL11.glPopMatrix();

src/main/java/com/hbm/tileentity/TileMappings.java

@@ -285,11 +285,13 @@ public class TileMappings {
 		put(TileEntityRBMKModerator.class, "tileentity_rbmk_moderator");
 		put(TileEntityRBMKOutgasser.class, "tileentity_rbmk_outgasser");
 		put(TileEntityRBMKCooler.class, "tileentity_rbmk_cooler");
+		put(TileEntityRBMKHeater.class, "tileentity_rbmk_heater");
 		put(TileEntityRBMKStorage.class, "tileentity_rbmk_storage");
 		put(TileEntityCraneConsole.class, "tileentity_rbmk_crane_console");
 		put(TileEntityRBMKConsole.class, "tileentity_rbmk_console");
 		put(TileEntityRBMKInlet.class, "tileentity_rbmk_inlet");
 		put(TileEntityRBMKOutlet.class, "tileentity_rbmk_outlet");
+		put(TileEntityHeatex.class, "tileentity_rbmk_heatex");
 	}
 	
 	private static void putNetwork() {

src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityHeatex.java

@@ -71,6 +71,12 @@ public class TileEntityHeatex extends TileEntity implements IFluidAcceptor, IFlu
 		}
 	}
 	
+	public static FluidType getConversion(FluidType type) {
+		if(type == Fluids.MUG_HOT)		return Fluids.MUG;
+		if(type == Fluids.COOLANT_HOT)	return Fluids.COOLANT;
+		return Fluids.NONE;
+	}
+	
 	@Override
 	public void readFromNBT(NBTTagCompound nbt) {
 		super.readFromNBT(nbt);

src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKHeater.java

@@ -20,6 +20,8 @@ public class TileEntityRBMKHeater extends TileEntityRBMKSlottedBase implements I
 	
 	public TileEntityRBMKHeater() {
 		super(1);
+		this.feed = new FluidTank(Fluids.COOLANT, 16_000, 0);
+		this.steam = new FluidTank(Fluids.COOLANT_HOT, 16_000, 1);
 	}
 
 	@Override
@@ -36,6 +38,10 @@ public class TileEntityRBMKHeater extends TileEntityRBMKSlottedBase implements I
 	public void updateEntity() {
 		
 		if(!worldObj.isRemote) {
+			
+			feed.setType(0, slots);
+			steam.setTankType(getConversion(feed.getTankType()));
+			
 			feed.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId);
 			steam.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId);
 			

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

@@ -288,6 +288,7 @@ container.radiorec=UKW Radio
 container.rbmkBoiler=RBMK Dampfkanal
 container.rbmkControl=RBMK Steuerstäbe
 container.rbmkControlAuto=RBMK Automatische Steuerstäbe
+container.rbmkHeater=RBMK Heizer
 container.rbmkOutgasser=RBMK Bestrahlungskanal
 container.rbmkReaSim=RBMK Brennstäbe (ReaSim)
 container.rbmkRod=RBMK Brennstäbe
@@ -479,10 +480,11 @@ hbmfluid.biofuel=Biodiesel
 hbmfluid.biogas=Biogas
 hbmfluid.bitumen=Bitumen
 hbmfluid.carbondioxide=Kohlenstoffdioxid
-hbmfluid.coolant=Kühlflüssigkeit
 hbmfluid.coalgas=Kohlebenzin
 hbmfluid.coalgas_leaded=Bleikohlebenzin
 hbmfluid.coaloil=Kohleöl
+hbmfluid.coolant=Kühlflüssigkeit
+hbmfluid.coolant_hot=Heiße Kühlflüssigkeit
 hbmfluid.crackoil=Crack-Öl
 hbmfluid.cryogel=Kryogel
 hbmfluid.death=Osmiridiumlösung
@@ -510,6 +512,8 @@ hbmfluid.lightoil_crack=Crack-Leichtöl
 hbmfluid.lpg=LPG
 hbmfluid.lubricant=Schmiermittel
 hbmfluid.mercury=Quecksilber
+hbmfluid.mug=Mug Root Beer
+hbmfluid.mug_hot=Heißes Mug Root Beer
 hbmfluid.naphtha=Mitteldestillat
 hbmfluid.naphtha_crack=Crack-Mitteldestillat
 hbmfluid.nitan=NITAN© 100 Oktan Supertreibstoff

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

@@ -461,6 +461,7 @@ container.radiorec=FM Radio
 container.rbmkBoiler=RBMK Steam Channel
 container.rbmkControl=RBMK Control Rods
 container.rbmkControlAuto=RBMK Automatic Control Rods
+container.rbmkHeater=RBMK Fluid Heater
 container.rbmkOutgasser=RBMK Irradiation Channel
 container.rbmkReaSim=RBMK Fuel Rod (ReaSim)
 container.rbmkRod=RBMK Fuel Rod
@@ -677,6 +678,7 @@ hbmfluid.coalgas=Coal Gasoline
 hbmfluid.coalgas_leaded=Leaded Coal Gasoline
 hbmfluid.coaloil=Coal Oil
 hbmfluid.coolant=Coolant
+hbmfluid.coolant_hot=Hot Coolant
 hbmfluid.crackoil=Cracked Oil
 hbmfluid.cryogel=Cryogel
 hbmfluid.death=Osmiridic Solution
@@ -704,6 +706,8 @@ hbmfluid.lightoil_crack=Cracked Light Oil
 hbmfluid.lpg=LPG
 hbmfluid.lubricant=Engine Lubricant
 hbmfluid.mercury=Mercury
+hbmfluid.mug=Mug Root Beer
+hbmfluid.mug_hot=Hot Mug Root Beer
 hbmfluid.naphtha=Naphtha
 hbmfluid.naphtha_crack=Cracked Naphtha
 hbmfluid.nitan=NITAN© 100 Octane Super Fuel