Merge pull request #564 from 7pheonix/master

there is no electrolyser in Ba sing se

src/main/java/com/hbm/blocks/ModBlocks.java

@@ -949,6 +949,8 @@ public class ModBlocks {
 	public static Block machine_tower_small;
 	public static Block machine_tower_large;
 	
+	public static Block machine_electrolyser;
+
 	public static Block machine_deaerator;
 	public static final int guiID_machine_deaerator = 74;
 
@@ -2142,6 +2144,8 @@ public class ModBlocks {
 		machine_liquefactor = new MachineLiquefactor().setBlockName("machine_liquefactor").setHardness(10.0F).setResistance(20.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel");
 		machine_solidifier = new MachineSolidifier().setBlockName("machine_solidifier").setHardness(10.0F).setResistance(20.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel_machine");
 		
+		machine_electrolyser = new MachineElectrolyser().setBlockName("machine_electrolyser").setHardness(10.0F).setResistance(20.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel_machine");
+		
 		anvil_iron = new NTMAnvil(Material.iron, 1).setBlockName("anvil_iron").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_iron");
 		anvil_lead = new NTMAnvil(Material.iron, 1).setBlockName("anvil_lead").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_lead");
 		anvil_steel = new NTMAnvil(Material.iron, 2).setBlockName("anvil_steel").setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":anvil_steel");
@@ -3062,6 +3066,7 @@ public class ModBlocks {
 		GameRegistry.registerBlock(machine_deuterium_tower, machine_deuterium_tower.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_liquefactor, ItemBlockBase.class, machine_liquefactor.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_solidifier, ItemBlockBase.class, machine_solidifier.getUnlocalizedName());
+		GameRegistry.registerBlock(machine_electrolyser, machine_electrolyser.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_deaerator, machine_deaerator.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_waste_drum, machine_waste_drum.getUnlocalizedName());
 		GameRegistry.registerBlock(machine_storage_drum, machine_storage_drum.getUnlocalizedName());

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

@@ -0,0 +1,76 @@
+package com.hbm.blocks.machine;
+
+import com.hbm.blocks.BlockDummyable;
+import com.hbm.handler.MultiblockHandlerXR;
+import com.hbm.tileentity.TileEntityProxyCombo;
+import com.hbm.tileentity.machine.TileEntityElectrolyser;
+
+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 MachineElectrolyser extends BlockDummyable {
+
+	public MachineElectrolyser() {
+		super(Material.iron);
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(World world, int meta) {
+		if(meta >= 12) return new TileEntityElectrolyser();
+		if(meta >= 6) return new TileEntityProxyCombo(false, true, true);
+		return null;
+	}
+
+	@Override
+	public int[] getDimensions() {
+		return new int[] {0, 0, 4, 4, 2, 2};
+	}
+
+	@Override
+	public int getOffset() {
+		return 4;
+	}
+	
+	@Override
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
+		return this.standardOpenBehavior(world, x, y, z, player, 0);
+	}
+	
+	@Override
+	public void fillSpace(World world, int x, int y, int z, ForgeDirection dir, int o) {
+		super.fillSpace(world, x, y, z, dir, o);
+		MultiblockHandlerXR.fillSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {1, 0, 4, 4, 1, 1}, this, dir);
+		MultiblockHandlerXR.fillSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {3, -1, 4, 4, 0, 0}, this, dir);
+		MultiblockHandlerXR.fillSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {3, 0, 1, -1, -2, 2}, this, dir);
+		MultiblockHandlerXR.fillSpace(world, x + dir.offsetX * o , 3 + y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {0, 0, 1, -1, -1, 1}, this, dir);
+		MultiblockHandlerXR.fillSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {3, 0, 3, -3, -2, 2}, this, dir);
+		MultiblockHandlerXR.fillSpace(world, x + dir.offsetX * o , 3 + y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {0, 0, 3, -3, -1, 1}, this, dir);
+		MultiblockHandlerXR.fillSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {3, 0, -1, 1, -2, 2}, this, dir);
+		MultiblockHandlerXR.fillSpace(world, x + dir.offsetX * o , 3 + y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {0, 0, -1, 1, -1, 1}, this, dir);
+		MultiblockHandlerXR.fillSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {3, 0, -3, 3, -2, 2}, this, dir);
+		MultiblockHandlerXR.fillSpace(world, x + dir.offsetX * o , 3 + y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {0, 0, -3, 3, -1, 1}, this, dir);
+
+	}
+
+	@Override
+	protected boolean checkRequirement(World world, int x, int y, int z, ForgeDirection dir, int o) {
+
+		if(!MultiblockHandlerXR.checkSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, getDimensions(), x, y, z, dir)) return false;
+		if(!MultiblockHandlerXR.checkSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {1, 0, 4, 4, 1, 1}, x, y, z, dir)) return false;
+		if(!MultiblockHandlerXR.checkSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {3, -1, 4, 4, 0, 0}, x, y, z, dir)) return false;
+		if(!MultiblockHandlerXR.checkSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {3, 0, 1, -1, -2, 2}, x, y, z, dir)) return false;
+		if(!MultiblockHandlerXR.checkSpace(world, x + dir.offsetX * o , 3 +  y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {0, 0, 1, -1, -1, 1}, x, y, z, dir)) return false;
+		if(!MultiblockHandlerXR.checkSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {3, 0, 3, -3, -2, 2}, x, y, z, dir)) return false;
+		if(!MultiblockHandlerXR.checkSpace(world, x + dir.offsetX * o , 3 +  y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {0, 0, 3, -3, -1, 1}, x, y, z, dir)) return false;
+		if(!MultiblockHandlerXR.checkSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {3, 0, -1, 1, -2, 2}, x, y, z, dir)) return false;
+		if(!MultiblockHandlerXR.checkSpace(world, x + dir.offsetX * o , 3 +  y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {0, 0, -1, 1, -1, 1}, x, y, z, dir)) return false;
+		if(!MultiblockHandlerXR.checkSpace(world, x + dir.offsetX * o , y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {3, 0, -3, 3, -2, 2}, x, y, z, dir)) return false;
+		if(!MultiblockHandlerXR.checkSpace(world, x + dir.offsetX * o , 3 + y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {0, 0, -3, 3, -1, 1}, x, y, z, dir)) return false;
+		
+		return true;
+	}
+
+}

src/main/java/com/hbm/config/GeneralConfig.java

@@ -24,6 +24,7 @@ public class GeneralConfig {
 	public static boolean enableBabyMode = false;
 	public static boolean enableReflectorCompat = false;
 	public static boolean enableRenderDistCheck = true;
+	public static boolean enableCustomDashKeybind = false;
 
 	public static boolean enable528 = false;
 	public static boolean enable528ReasimBoilers = true;
@@ -57,6 +58,7 @@ public class GeneralConfig {
 		enableBabyMode = config.get(CATEGORY_GENERAL, "1.23_enableBabyMode", false).getBoolean(false);
 		enableReflectorCompat = config.get(CATEGORY_GENERAL, "1.24_enableReflectorCompat", false).getBoolean(false);
 		enableRenderDistCheck = config.get(CATEGORY_GENERAL, "1.25_enableRenderDistCheck", true).getBoolean(true);
+		enableCustomDashKeybind = config.get(CATEGORY_GENERAL, "1.26_enableCustomDashKeybind", false).getBoolean(false);
 		
 		final String CATEGORY_528 = CommonConfig.CATEGORY_528;
 

src/main/java/com/hbm/extprop/HbmPlayerProps.java

@@ -20,6 +20,8 @@ public class HbmPlayerProps implements IExtendedEntityProperties {
 	
 	private boolean[] keysPressed = new boolean[EnumKeybind.values().length];
 	
+	public boolean dashActivated = true;
+	
 	public static final int dashCooldownLength = 5;
 	public int dashCooldown = 0;
 	

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

@@ -11,6 +11,7 @@ import com.hbm.explosion.ExplosionNukeSmall;
 import com.hbm.extprop.HbmLivingProps;
 import com.hbm.extprop.HbmPlayerProps;
 import com.hbm.extprop.HbmLivingProps.ContaminationEffect;
+import com.hbm.handler.HbmKeybinds.EnumKeybind;
 import com.hbm.handler.radiation.ChunkRadiationManager;
 import com.hbm.interfaces.IArmorModDash;
 import com.hbm.items.armor.ArmorFSB;
@@ -455,6 +456,15 @@ public class EntityEffectHandler {
 					
 			int dashCount = armorDashCount + armorModDashCount;
 			
+			boolean dashActivated = false;
+			
+			
+			if(!GeneralConfig.enableCustomDashKeybind) {
+				dashActivated = !player.capabilities.isFlying && player.isSneaking();
+			} else {
+				dashActivated = props.getKeyPressed(EnumKeybind.DASH);
+			}
+					
 			//System.out.println(dashCount);
 			
 			if(dashCount * 30 < props.getStamina())
@@ -470,7 +480,7 @@ public class EntityEffectHandler {
 						
 				if(props.getDashCooldown() <= 0) {
 							
-					if(!player.capabilities.isFlying && player.isSneaking() && stamina >= perDash) {
+					if(dashActivated && stamina >= perDash) {
 
 						Vec3 lookingIn = player.getLookVec();
 						Vec3 strafeVec = player.getLookVec();

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

@@ -31,6 +31,7 @@ public class GUIHandler implements IGuiHandler {
 		if(entity instanceof TileEntityMachineSolidifier) {		return new ContainerSolidifier(player.inventory, (TileEntityMachineSolidifier) entity); }
 		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); }
 		
 		switch(ID) {
 		case ModBlocks.guiID_test_difurnace: {
@@ -872,6 +873,7 @@ public class GUIHandler implements IGuiHandler {
 		if(entity instanceof TileEntityMachineSolidifier) {		return new GUISolidifier(player.inventory, (TileEntityMachineSolidifier) entity); }
 		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); }
 		
 		switch(ID) {
 		case ModBlocks.guiID_test_difurnace: {

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

@@ -22,6 +22,7 @@ public class HbmKeybinds {
 	public static KeyBinding jetpackKey = new KeyBinding(category + ".toggleBack", Keyboard.KEY_C, category);
 	public static KeyBinding hudKey = new KeyBinding(category + ".toggleHUD", Keyboard.KEY_V, category);
 	public static KeyBinding reloadKey = new KeyBinding(category + ".reload", Keyboard.KEY_R, category);
+	public static KeyBinding dashKey = new KeyBinding(category + ".dash", Keyboard.KEY_F, category);
 
 	public static KeyBinding craneUpKey = new KeyBinding(category + ".craneMoveUp", Keyboard.KEY_UP, category);
 	public static KeyBinding craneDownKey = new KeyBinding(category + ".craneMoveDown", Keyboard.KEY_DOWN, category);
@@ -34,6 +35,7 @@ public class HbmKeybinds {
 		ClientRegistry.registerKeyBinding(jetpackKey);
 		ClientRegistry.registerKeyBinding(hudKey);
 		ClientRegistry.registerKeyBinding(reloadKey);
+		ClientRegistry.registerKeyBinding(dashKey);
 
 		ClientRegistry.registerKeyBinding(craneUpKey);
 		ClientRegistry.registerKeyBinding(craneDownKey);
@@ -57,6 +59,7 @@ public class HbmKeybinds {
 			if(last != current) {
 				PacketDispatcher.wrapper.sendToServer(new KeybindPacket(key, current));
 				props.setKeyPressed(key, current);
+				System.out.println(key);
 			}
 		}
 	}
@@ -66,6 +69,7 @@ public class HbmKeybinds {
 		TOGGLE_JETPACK,
 		TOGGLE_HEAD,
 		RELOAD,
+		DASH,
 		CRANE_UP,
 		CRANE_DOWN,
 		CRANE_LEFT,

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

@@ -0,0 +1,87 @@
+package com.hbm.inventory.container;
+
+import com.hbm.inventory.SlotMachineOutput;
+import com.hbm.tileentity.machine.TileEntityElectrolyser;
+
+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 ContainerElectrolyser extends Container {
+	
+	TileEntityElectrolyser electrolyser;
+	
+	public ContainerElectrolyser(InventoryPlayer invPlayer, TileEntityElectrolyser tile) {
+		
+		electrolyser = tile;
+		
+		//0 - battery
+		//1-2 - upgrade slots
+		
+		//3-4 - fluid ID
+		//5-10 - fluid I/O
+		//11-13 - dissolved outputs
+		
+		//14 - crystal input
+		//15 - niter input
+		//16-17 - casting slots
+		//18-23 - other material outputs
+		
+		this.addSlotToContainer(new Slot(tile, 0, 186, 109));
+		
+		this.addSlotToContainer(new Slot(tile, 1, 186, 140));
+		this.addSlotToContainer(new Slot(tile, 2, 186, 158));
+		
+		this.addSlotToContainer(new Slot(tile, 3, 6, 18));
+		this.addSlotToContainer(new SlotMachineOutput(tile, 4, 6, 54));
+		
+		this.addSlotToContainer(new Slot(tile, 5, 24, 18));
+		this.addSlotToContainer(new SlotMachineOutput(tile, 6, 24, 54));
+		
+		this.addSlotToContainer(new Slot(tile, 7, 78, 18));
+		this.addSlotToContainer(new SlotMachineOutput(tile, 8, 78, 54));
+		
+		this.addSlotToContainer(new Slot(tile, 9, 134, 18));
+		this.addSlotToContainer(new SlotMachineOutput(tile, 10, 134, 54));
+		
+		for(int i = 0; i < 3; i++) {
+			this.addSlotToContainer(new SlotMachineOutput(tile, 11+i, 154, 18+(18*i)));
+		}
+		
+		this.addSlotToContainer(new Slot(tile, 14, 10, 90));
+		
+		this.addSlotToContainer(new Slot(tile, 15, 37, 122));
+		
+		this.addSlotToContainer(new SlotMachineOutput(tile, 16, 60, 112));
+		this.addSlotToContainer(new SlotMachineOutput(tile, 16, 98, 112));
+		
+		for(int i = 0; i < 2; i++) {
+			for(int j = 0; j < 3; j++) {
+				this.addSlotToContainer(new SlotMachineOutput(tile, 17+(i*3)+j, 136+(18*i), 86+(18*j)));
+			}
+		}
+		
+		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, 165 + i * 18));
+			}
+		}
+
+		for(int i = 0; i < 9; i++) {
+			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 223));
+		}
+	}
+
+	@Override
+	public boolean canInteractWith(EntityPlayer player) {
+		return electrolyser.isUseableByPlayer(player);
+	}
+	
+	@Override
+	public ItemStack transferStackInSlot(EntityPlayer player, int index) {
+		return null;
+	}
+
+}

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

@@ -0,0 +1,51 @@
+package com.hbm.inventory.gui;
+
+import org.lwjgl.opengl.GL11;
+
+import com.hbm.inventory.container.ContainerElectrolyser;
+import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.machine.TileEntityElectrolyser;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.util.ResourceLocation;
+
+public class GUIElectrolyser extends GuiInfoContainer {
+	
+	public static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/processing/gui_electrolyser.png");
+	private TileEntityElectrolyser electrolyser;
+	
+	public GUIElectrolyser(InventoryPlayer invPlayer, TileEntityElectrolyser electrolyser) {
+		super(new ContainerElectrolyser(invPlayer, electrolyser));
+		this.electrolyser = electrolyser;
+
+		this.xSize = 210;
+		this.ySize = 247;
+	}
+	
+	@Override
+	public void drawScreen(int mouseX, int mouseY, float f) {
+		super.drawScreen(mouseX, mouseY, f);
+	}
+	
+	protected void mouseClicked(int x, int y, int i) {
+		super.mouseClicked(x, y, i);
+	}
+
+	@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);
+	}
+	
+	@Override
+	protected void drawGuiContainerForegroundLayer(int i, int j) {
+		String name = this.electrolyser.hasCustomInventoryName() ? this.electrolyser.getInventoryName() : I18n.format(this.electrolyser.getInventoryName());
+
+		this.fontRendererObj.drawString(name, (this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2) - 16, 7, 0xffffff);
+		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 94, 4210752);
+	}
+}

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

@@ -241,6 +241,7 @@ public class ClientProxy extends ServerProxy {
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineLiquefactor.class, new RenderLiquefactor());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineSolidifier.class, new RenderSolidifier());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineRadiolysis.class, new RenderRadiolysis());
+		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityElectrolyser.class, new RenderElectrolyser());
 		//AMS
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAMSBase.class, new RenderAMSBase());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAMSEmitter.class, new RenderAMSEmitter());
@@ -1631,6 +1632,7 @@ public class ClientProxy extends ServerProxy {
 		case TOGGLE_JETPACK:	return HbmKeybinds.jetpackKey.getIsKeyPressed();
 		case TOGGLE_HEAD:		return HbmKeybinds.hudKey.getIsKeyPressed();
 		case RELOAD:			return HbmKeybinds.reloadKey.getIsKeyPressed();
+		case DASH:				return HbmKeybinds.dashKey.getIsKeyPressed();
 		case CRANE_UP:			return HbmKeybinds.craneUpKey.getIsKeyPressed();
 		case CRANE_DOWN:		return HbmKeybinds.craneDownKey.getIsKeyPressed();
 		case CRANE_LEFT:		return HbmKeybinds.craneLeftKey.getIsKeyPressed();

src/main/java/com/hbm/main/ResourceManager.java

@@ -291,6 +291,9 @@ public class ResourceManager {
 	//Radiolysis
 	public static final IModelCustom radiolysis = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/radiolysis.obj"));
 	
+	//Electrolyser
+	public static final IModelCustom electrolyser = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/electrolyser.obj"));
+	
 	////Textures TEs
 	
 	public static final ResourceLocation universal = new ResourceLocation(RefStrings.MODID, "textures/models/TheGadget3_.png");
@@ -597,6 +600,9 @@ public class ResourceManager {
 	//Radiolysis
 	public static final ResourceLocation radiolysis_tex = new ResourceLocation(RefStrings.MODID, "textures/models/radiolysis.png");
 	
+	//Electrolyser
+	public static final ResourceLocation electrolyser_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/electrolyser.png");
+	
 	////Obj Items
 	
 	//Shimmer Sledge

src/main/java/com/hbm/render/item/ItemRenderLibrary.java

@@ -1237,6 +1237,17 @@ public class ItemRenderLibrary {
 			GL11.glShadeModel(GL11.GL_FLAT);
 		}});
 		
+		renderers.put(Item.getItemFromBlock(ModBlocks.machine_electrolyser), new ItemRenderBase( ) {
+			public void renderInventory() {
+				GL11.glScaled(3, 3, 3);
+			}
+			public void renderCommon() {
+				GL11.glScaled(0.5, 0.5, 0.5);
+				GL11.glShadeModel(GL11.GL_SMOOTH);
+				bindTexture(ResourceManager.electrolyser_tex); ResourceManager.electrolyser.renderAll();
+				GL11.glShadeModel(GL11.GL_FLAT);
+		}});
+		
 		renderers.put(Item.getItemFromBlock(ModBlocks.red_pylon_large), new ItemRenderBase( ) {
 		public void renderInventory() {
 			GL11.glTranslated(0, -5, 0);

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

@@ -0,0 +1,43 @@
+package com.hbm.render.tileentity;
+
+import org.lwjgl.opengl.GL11;
+
+import com.hbm.blocks.BlockDummyable;
+import com.hbm.main.ResourceManager;
+import com.hbm.tileentity.machine.TileEntityElectrolyser;
+
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.tileentity.TileEntity;
+
+public class RenderElectrolyser extends TileEntitySpecialRenderer {
+
+	@Override
+	public void renderTileEntityAt(TileEntity te, double x, double y, double z, float interp) {
+
+		TileEntityElectrolyser electrolyser = (TileEntityElectrolyser) te;
+		
+		GL11.glPushMatrix();
+		GL11.glTranslated(x + 0.5D, y, z + 0.5D);
+		
+		switch(te.getBlockMetadata() - BlockDummyable.offset) {
+		case 4: GL11.glRotatef(90, 0F, 1F, 0F); break;
+		case 3: GL11.glRotatef(180, 0F, 1F, 0F); break;
+		case 5: GL11.glRotatef(270, 0F, 1F, 0F); break;
+		case 2: GL11.glRotatef(0, 0F, 1F, 0F); break;
+		}
+		
+		GL11.glRotated(180, 0, 1, 0);
+		GL11.glEnable(GL11.GL_LIGHTING);
+		GL11.glDisable(GL11.GL_CULL_FACE);
+		GL11.glShadeModel(GL11.GL_SMOOTH);
+		
+		bindTexture(ResourceManager.electrolyser_tex);
+		ResourceManager.electrolyser.renderAll();
+		
+		GL11.glShadeModel(GL11.GL_FLAT);
+		
+		GL11.glPopMatrix();
+		
+	}
+
+}

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

@@ -250,6 +250,7 @@ public class TileMappings {
 		put(TileEntityDeuteriumTower.class, "tileentity_deuterium_tower");
 		put(TileEntityMachineLiquefactor.class, "tileentity_liquefactor");
 		put(TileEntityMachineSolidifier.class, "tileentity_solidifier");
+		put(TileEntityElectrolyser.class, "tileentity_electrolyser");
 
 		put(TileEntityMachineChemplant.class, "tileentity_chemical_plant");
 		put(TileEntityMachineChemfac.class, "tileentity_chemfac");

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

@@ -0,0 +1,187 @@
+package com.hbm.tileentity.machine;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.hbm.blocks.BlockDummyable;
+import com.hbm.interfaces.IFluidAcceptor;
+import com.hbm.interfaces.IFluidSource;
+import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
+import com.hbm.lib.Library;
+import com.hbm.tileentity.TileEntityMachineBase;
+
+import api.hbm.energy.IEnergyUser;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.init.Blocks;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class TileEntityElectrolyser extends TileEntityMachineBase implements IEnergyUser, IFluidSource, IFluidAcceptor{
+	
+	public long power;
+	public static final long maxPower = 20000000;
+	public static final int usageBase = 10000;
+	public int usage;
+	
+	public int progressFluid;
+	public static final int processFluidTimeBase = 100;
+	public int processFluidTime;
+	public int progressOre;
+	public static final int processOreTimeBase = 1000;
+	public int processOreTime;
+	
+	public FluidTank[] tanks;
+
+	public TileEntityElectrolyser() {
+		super(24);
+		tanks = new FluidTank[3];
+		tanks[0] = new FluidTank(Fluids.WATER, 16000, 0);
+		tanks[1] = new FluidTank(Fluids.HYDROGEN, 16000, 1);
+		tanks[2] = new FluidTank(Fluids.OXYGEN, 16000, 2);
+	}
+
+	@Override
+	public String getName() {
+		return "container.machineElectrolyser";
+	}
+
+	@Override
+	public void updateEntity() {
+
+		if(!worldObj.isRemote) {
+			
+			this.tanks[0].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId);
+			
+			
+			NBTTagCompound data = new NBTTagCompound();
+			data.setLong("power", this.power);
+			data.setInteger("progressFluid", this.progressFluid);
+			data.setInteger("progressOre", this.progressOre);
+			data.setInteger("usage", this.usage);
+			data.setInteger("processFluidTime", this.processFluidTime);
+			data.setInteger("processOreTime", this.processOreTime);
+			this.networkPack(data, 50);
+			
+			fillFluidInit(tanks[1].getTankType());
+			fillFluidInit(tanks[2].getTankType());
+		}
+
+	}
+	
+	@Override
+	public void fillFluidInit(FluidType type) {
+		
+		ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - BlockDummyable.offset);
+		ForgeDirection rot = dir.getRotation(ForgeDirection.UP);
+
+		fillFluid(xCoord + dir.offsetX * 5 + rot.offsetX * -1, yCoord-1, zCoord + dir.offsetZ * 5 + rot.offsetZ * -1, getTact(), type);
+		fillFluid(xCoord + dir.offsetX * 5 + rot.offsetX * -1, yCoord-1, zCoord + dir.offsetZ * 5 + rot.offsetZ * 1, getTact(), type);
+		fillFluid(xCoord + dir.offsetX * -5 + rot.offsetX * -1, yCoord-1, zCoord + dir.offsetZ * 5 + rot.offsetZ * -1, getTact(), type);
+		fillFluid(xCoord + dir.offsetX * -5 + rot.offsetX * -1, yCoord-1, zCoord + dir.offsetZ * 5 + rot.offsetZ * 1, getTact(), type);
+
+	}
+	
+	AxisAlignedBB bb = null;
+	
+	@Override
+	public AxisAlignedBB getRenderBoundingBox() {
+		
+		if(bb == null) {
+			bb = AxisAlignedBB.getBoundingBox(
+					xCoord - 3,
+					yCoord - 0,
+					zCoord - 4,
+					xCoord + 3,
+					yCoord + 4,
+					zCoord + 4
+					);
+		}
+		
+		return bb;
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public double getMaxRenderDistanceSquared() {
+		return 65536.0D;
+	}
+
+	@Override
+	public long getPower() {
+		return this.power;
+	}
+
+	@Override
+	public long getMaxPower() {
+		return maxPower;
+	}
+
+	@Override
+	public void setFillForSync(int fill, int index) {
+		tanks[index].setFill(fill);
+		
+	}
+
+	@Override
+	public void setFluidFill(int fill, FluidType type) {
+		for(int i = 0; i < 3; i++) {
+			if(type == tanks[i].getTankType())
+				tanks[i].setFill(fill);
+		}
+		
+	}
+
+	@Override
+	public void setTypeForSync(FluidType type, int index) {
+		tanks[index].setTankType(type);
+		
+	}
+
+	@Override
+	public int getFluidFill(FluidType type) {
+		for(int i = 0; i < 3; i++) {
+			if(type == tanks[i].getTankType() && tanks[i].getFill() != 0)
+				return tanks[i].getFill();
+		}
+		return 0;
+	}
+
+	@Override
+	public int getMaxFluidFill(FluidType type) {
+		for(int i = 0; i < 3; i++) {
+			if(type == tanks[i].getTankType() && tanks[i].getMaxFill() != 0)
+				return tanks[i].getMaxFill();
+		}
+		return 0;
+	}
+
+	@Override
+	public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) {
+		Library.transmitFluid(x, y, z, newTact, this, worldObj, type);
+	}
+
+	@Override
+	public boolean getTact() {
+		return worldObj.getTotalWorldTime() % 20 < 10;
+	}
+
+	@Override
+	public List<IFluidAcceptor> getFluidList(FluidType type) {
+		return new ArrayList<IFluidAcceptor>();
+	}
+
+	@Override
+	public void clearFluidList(FluidType type) {
+		return;
+	}
+
+	@Override
+	public void setPower(long power) {
+		this.power = power;
+	}
+
+}

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

@@ -652,6 +652,7 @@ hbm.key.craneMoveDown=Move Crane Backward
 hbm.key.craneMoveLeft=Move Crane Left
 hbm.key.craneMoveRight=Move Crane Right
 hbm.key.craneMoveUp=Move Crane Forward
+hbm.key.dash=Dash (Unbind from Crouch in config)
 hbm.key.toggleBack=Toggle Backpack
 hbm.key.toggleHUD=Toggle HUD
 hbm.key.reload=Reload