+ Added Super Busses.

+ Added Breaker Boxes.
+ Added Super Jukebox. (framework)
+ Added King Bat. (framework)
+ Added Custom WAILA plugin. (framework)
+ Added lots of simple function calls to CI. (Recipe simplification)
% Rewrote the recipes for Wireless Chargers, they now require assembly.
% Cleaned up some old code.
$ Adjusted bug with pollution scrubbers using no durability and removing LOTS of pollution.
$ Greatly improved code base for pollution scrubbers.
$ Added pollution back to the Cyclotron.

2 files changed, 75 insertions, 66 deletions

diff --git a/src/Java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/Java/gtPlusPlus/core/block/general/FluidTankInfinite.java
index bbec95a28e..b979f7864b 100644
--- a/src/Java/gtPlusPlus/core/block/general/FluidTankInfinite.java
+++ b/src/Java/gtPlusPlus/core/block/general/FluidTankInfinite.java
@@ -4,7 +4,10 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.general.TileEntityInfiniteFluid;
+import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -14,12 +17,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
-
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.general.TileEntityInfiniteFluid;
-import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import net.minecraftforge.fluids.*;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidContainerItem;
+import net.minecraftforge.fluids.ItemFluidContainer;
 
 public class FluidTankInfinite extends BlockContainer {
 
@@ -68,69 +69,68 @@ public class FluidTankInfinite extends BlockContainer {
 			final int side, final float lx, final float ly, final float lz) {
 		if (world.isRemote) {
 			return true;
-		}
-		else {
+		} else {
 			TileEntityInfiniteFluid tank = (TileEntityInfiniteFluid) world.getTileEntity(x, y, z);
-			if (tank != null){
+			if (tank != null) {
 				Item handItem;
 				try {
 					handItem = player.getHeldItem().getItem();
-				}
-				catch (Throwable t){
+				} catch (Throwable t) {
 					handItem = null;
 				}
-			if (handItem != null && (handItem instanceof IFluidContainerItem || handItem instanceof ItemFluidContainer || FluidContainerRegistry.isFilledContainer(player.getHeldItem()))){
-				if (tank.tank.getFluid() == null){
-					try {
-						if (!FluidContainerRegistry.isFilledContainer(player.getHeldItem())){
-						ItemStack handItemStack = player.getHeldItem();
-						IFluidContainerItem container = (IFluidContainerItem) handItem;
-						FluidStack containerFluid = container.getFluid(handItemStack);
-						container.drain(handItemStack, container.getFluid(handItemStack).amount, true);
-						tank.tank.setFluid(containerFluid);
-						}
-						else {							
-							ItemStack handItemStack = player.getHeldItem();
-							FluidContainerRegistry.drainFluidContainer(handItemStack);
-							FluidStack containerFluid = FluidContainerRegistry.getFluidForFilledItem(handItemStack);
-							ItemStack emptyContainer = FluidContainerRegistry.drainFluidContainer(handItemStack);
-							player.setItemInUse(emptyContainer, 0);
-							
-							tank.tank.setFluid(containerFluid);
+				if (handItem != null
+						&& (handItem instanceof IFluidContainerItem || handItem instanceof ItemFluidContainer
+								|| FluidContainerRegistry.isFilledContainer(player.getHeldItem()))) {
+					if (tank.tank.getFluid() == null) {
+						try {
+							if (!FluidContainerRegistry.isFilledContainer(player.getHeldItem())) {
+								ItemStack handItemStack = player.getHeldItem();
+								IFluidContainerItem container = (IFluidContainerItem) handItem;
+								FluidStack containerFluid = container.getFluid(handItemStack);
+								container.drain(handItemStack, container.getFluid(handItemStack).amount, true);
+								tank.tank.setFluid(containerFluid);
+							} else {
+								ItemStack handItemStack = player.getHeldItem();
+								FluidContainerRegistry.drainFluidContainer(handItemStack);
+								FluidStack containerFluid = FluidContainerRegistry.getFluidForFilledItem(handItemStack);
+								ItemStack emptyContainer = FluidContainerRegistry.drainFluidContainer(handItemStack);
+								player.setItemInUse(emptyContainer, 0);
+
+								tank.tank.setFluid(containerFluid);
+							}
+						} catch (Throwable t) {
+							t.printStackTrace();
 						}
 					}
-					catch (Throwable t){
-						t.printStackTrace();
-					}
+
+				}
+				if (tank.tank.getFluid() != null) {
+					PlayerUtils.messagePlayer(player, "This tank contains " + tank.tank.getFluidAmount() + "L of "
+							+ tank.tank.getFluid().getLocalizedName());
 				}
-				
-			}
-			if (tank.tank.getFluid() != null){
-				PlayerUtils.messagePlayer(player, "This tank contains "+tank.tank.getFluidAmount()+"L of "+tank.tank.getFluid().getLocalizedName());				
 			}
 		}
+		return true;
 	}
-	return true;
-}
 
-@Override
-public int getRenderBlockPass() {
-	return 1;
-}
+	@Override
+	public int getRenderBlockPass() {
+		return 1;
+	}
 
-@Override
-public boolean isOpaqueCube() {
-	return false;
-}
+	@Override
+	public boolean isOpaqueCube() {
+		return false;
+	}
 
-@Override
-public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
-	return new TileEntityInfiniteFluid();
-}
+	@Override
+	public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
+		return new TileEntityInfiniteFluid();
+	}
 
-@Override
-public void onBlockAdded(World world, int x, int y, int z) {
-	super.onBlockAdded(world, x, y, z);
-}
+	@Override
+	public void onBlockAdded(World world, int x, int y, int z) {
+		super.onBlockAdded(world, x, y, z);
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/block/general/LightGlass.java b/src/Java/gtPlusPlus/core/block/general/LightGlass.java
index 5a265ed7ef..30da7f1d56 100644
--- a/src/Java/gtPlusPlus/core/block/general/LightGlass.java
+++ b/src/Java/gtPlusPlus/core/block/general/LightGlass.java
@@ -2,37 +2,46 @@ package gtPlusPlus.core.block.general;
 
 import java.util.Random;
 
+import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-
-import net.minecraft.block.BlockBreakable;
-import net.minecraft.block.material.Material;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockAir;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
 
-public class LightGlass extends BlockBreakable
+/*public class LightGlass extends BlockBreakable
+{*/
+public class LightGlass extends BlockAir
 {
-	private int state = 0;
+
+private int state = 0;
 	private final int a = 255;
 	private int r = 255;
 	private int g = 0;
 	private int b = 0;
 	private int hex;
 
-	public LightGlass(final Material mat, final boolean bool)
+	public LightGlass(final boolean bool)
 	{
-		super("blockMFEffect", mat, bool);
+		//super("blockMFEffect", Material.air, bool);
+		super();
 		this.setCreativeTab(AddToCreativeTab.tabBlock);
 		this.setBlockName("blockMFEffect");
 		this.setLightLevel(12F);
+		setHardness(0.1F);
+		setBlockTextureName(CORE.MODID + ":" + "blockMFEffect");
+		setStepSound(Block.soundTypeGlass); 
+		GameRegistry.registerBlock(this, "blockMFEffect");
+		
+		/*
 		this.setLightOpacity(0);
 		this.setTickRandomly(true);
-		this.setResistance(1);
+		this.setResistance(1);*/
 	}
 
 	/**
@@ -60,7 +69,7 @@ public class LightGlass extends BlockBreakable
 	@Override
 	public boolean renderAsNormalBlock()
 	{
-		return true;
+		return false;
 	}
 
 	/**
@@ -129,7 +138,7 @@ public class LightGlass extends BlockBreakable
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void randomDisplayTick(final World world, final int posX, final int posY, final int posZ, final Random random){
-		Utils.spawnFX(world, posX, posY, posZ, "smoke", "cloud");
+		//Utils.spawnFX(world, posX, posY, posZ, "smoke", "cloud");
 
 	}
 }
\ No newline at end of file