Remove Steam Generator code. Compiles fine, went in singleplayer and …

…no problems. Fixes #125

src/main/java/quantumcraft/core/ClientProxy.java

@@ -34,9 +34,6 @@ public Object getClientGuiElement(int ID, EntityPlayer player, World world, int
             case 7:
                 TileQCapacitor te7 = (TileQCapacitor) world.getBlockTileEntity(x,y,z);
                 return new GuiQCapacitor(new ContainerQCapacitor(player.inventory, te7));
-            case 8:
-                TileSteamGenerator te8 = (TileSteamGenerator) world.getBlockTileEntity(x,y,z);
-                return new GuiSteamGenerator(new ContainerSteamGenerator(player.inventory, te8));
         }
         return null;
 

src/main/java/quantumcraft/core/CommonProxy.java

@@ -40,9 +40,6 @@ public Object getServerGuiElement(int ID, EntityPlayer player, World world, int
                 case 7:
                     return new ContainerQCapacitor(player.inventory,
                             (TileQCapacitor) world.getBlockTileEntity(x, y, z));
-                case 8:
-                    return new ContainerSteamGenerator(player.inventory,
-                            (TileSteamGenerator) world.getBlockTileEntity(x, y, z));
             }
         } return null;
     }

src/main/java/quantumcraft/core/Config.java

@@ -45,7 +45,6 @@ public class Config {
     public static String NameBlockIOS = "machineIOS";  // Block ION Scanner
     public static String NameBlockIOH = "machineIOH";  // Block ION Harvester
     public static String NameBlockQCP = "machineQCP";  // Block Q Capacitor
-    public static String NameBlockSGN = "machineSGN";  // Block Steam Generator
     public static String NameBlockQFiberWire = "blockFiberWire";
     public static String NameBlockMCasing = "quantumMachineCasing";
     public static String NameTextureQOre = "oreQuantonium.ore";
@@ -88,7 +87,6 @@ public class Config {
     public static int BlockIOSID;
     public static int BlockIOHID;
     public static int BlockQCPID;
-    public static int BlockSGNID;
     public static int BlockFiberWireID;
     public static int BlockMCasingID;
     public static int IONForgeEnergyCost;
@@ -161,7 +159,6 @@ public static void loadPropertiesFromFile(File file) {
         BlockIOTID = config.get("Blocks", "BlockIONTunneler", 3611).getInt();
         BlockIOSID = config.get("Blocks", "BlockIONScanner", 3612).getInt();
         BlockIOHID = config.get("Blocks", "BlockIONHarvester", 3613).getInt();
-        BlockSGNID = config.get("Blocks", "BlockSteamGenerator", 3615).getInt();
 
         // DO NOT PUT ANY BLOCK IDS FROM 3630 TO 3635!
         BlockQCPID = config.get("Blocks", "BlockQCapacitor", 3630).getInt();

src/main/java/quantumcraft/core/Loader.java

@@ -11,10 +11,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
 import net.minecraftforge.common.EnumHelper;
-import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.oredict.OreDictionary;
 import quantumcraft.blocks.*;
-import quantumcraft.fluid.FluidSteam;
 import quantumcraft.items.*;
 import quantumcraft.items.tools.ItemQuantumAxe;
 import quantumcraft.items.tools.ItemQuantumPick;
@@ -63,7 +61,6 @@ public class Loader {
     public static BlockIONTunneler BlockIONTunneler;
     public static BlockIONScanner BlockIONScanner;
     public static BlockIONHarvester BlockIONHarvester;
-    public static BlockSteamGenerator BlockSteamGenerator;
     public static Block BlockMachineCasing;
     public static BlockQCapacitor[] capacitors = new BlockQCapacitor[5];
     /* OTHER BLOCKS */
@@ -78,7 +75,6 @@ public static void initAll() {
         initRenderers();
         initWGen();
         initTEs();
-        initFluids();
         initOreDict();
         CraftingManager.addCrafting();
         CraftingManager.addSmelting();
@@ -187,10 +183,6 @@ public static void initItems() {
         LanguageRegistry.addName(ItemQuantumPlating, "Quantum Plating");
     }
 
-    public static void initFluids() {
-        FluidRegistry.registerFluid(FluidSteam.fluid);
-    }
-
     public static void initBlocks() {
         OreUnbioxenium = (BlockOre) new BlockOre(Config.OreUnbioxeniumID).setCreativeTab(tabQuantumCraft)
                 .setUnlocalizedName(Config.NameOreUnbioxenium)
@@ -257,12 +249,6 @@ public static void initBlocks() {
             GameRegistry.registerBlock(BlockQCapacitor, Config.NameBlockQCP + i);
         }
         if (Config.beta.getBoolean(false)) {
-            BlockSteamGenerator =
-                    (BlockSteamGenerator) new BlockSteamGenerator(Config.BlockSGNID).setCreativeTab(tabQuantumCraft)
-                            .setUnlocalizedName(Config.NameBlockSGN);
-            LanguageRegistry.addName(BlockSteamGenerator, "Steam Generator");
-            GameRegistry.registerBlock(BlockSteamGenerator, Config.NameBlockSGN);
-
             BlockQDislocator =
                     (BlockQDislocator) new BlockQDislocator(Config.BlockQDSID).setCreativeTab(tabQuantumCraft)
                             .setUnlocalizedName(Config.NameBlockQDS);
@@ -323,7 +309,6 @@ public static void initTEs() {
         GameRegistry.registerTileEntity(TileIONScanner.class, "IONScannerTE");
         GameRegistry.registerTileEntity(TileIONTunneler.class, "IONTunnelerTE");
         GameRegistry.registerTileEntity(TileQCapacitor.class, "QCapacitorTE");
-        GameRegistry.registerTileEntity(TileSteamGenerator.class, "SteamGeneratorTE");
 
         if (hasBuildCraft()) {
             GameRegistry.registerTileEntity(TileQElectrifier.class, "QElectrifierTE");

src/main/java/quantumcraft/core/QuantumCraft.java

@@ -6,21 +6,16 @@
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import debughandler.DebugRegistry;
 import debughandler.LogHandler;
-import net.minecraft.util.Icon;
 import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.ForgeSubscribe;
 import quantumcraft.core.network.PacketHandler;
-import quantumcraft.fluid.FluidSteam;
-
-import java.util.HashMap;
 
 @Mod(modid = "QuantumCraft", name = "Quantum Craft", version = "@VERSION@", dependencies = "after:BuildCraft|Silicon")
 @NetworkMod(clientSideRequired = true, serverSideRequired = false, channels = {Config.modNetworkChannel},
@@ -55,6 +50,5 @@ public void postInit(FMLPostInitializationEvent event) {
     @ForgeSubscribe @SideOnly(Side.CLIENT)
     public void beforeTextureStitch(TextureStitchEvent.Pre event) {
         logHandler.debugPrint("preStitch called");
-        FluidSteam.fluid.setIcons(event.map.registerIcon("QuantumCraft:fluidSteam"));
     }
 }

src/main/java/quantumcraft/gui/abstractguis/GuiBase.java

@@ -10,9 +10,7 @@
 import net.minecraft.util.ResourceLocation;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
-import quantumcraft.gui.GuiSteamGenerator;
 import quantumcraft.gui.GuiTextures;
-import quantumcraft.tile.TileSteamGenerator;
 import quantumcraft.tile.abstracttiles.TileMachineBase;
 
 import java.util.ArrayList;
@@ -39,13 +37,8 @@ protected void handleHover() {
             renderTooltipText("Close this GUI", buffHX, buffHY);
         }
         if (buffHT[1]) {
-            if (this instanceof GuiSteamGenerator) {
-                renderTooltipText(((TileSteamGenerator) tile).getSteamBuffer() + " / " +
-                        ((TileSteamGenerator) tile).getSteamTankMax() + " Steam", buffHX, buffHY);
-            } else {
-                renderTooltipText(tile.getCurrentEnergy() + " / " + tile.getMaxEnergy() + " QEU", buffHX, buffHY);
-            }
-        }
+            renderTooltipText(tile.getCurrentEnergy() + " / " + tile.getMaxEnergy() + " QEU", buffHX, buffHY);
+       }
     }
 
     protected void drawBaseBG() {