+ 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.

4 files changed, 298 insertions, 68 deletions

diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index eb40fd080e..dc1239f4be 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.block;
 import cpw.mods.fml.common.registry.GameRegistry;
 
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockJukebox;
 import net.minecraft.block.material.Material;
 
 import gtPlusPlus.api.objects.Logger;
@@ -73,8 +74,10 @@ public final class ModBlocks {
 	public static Block blockPlayerDoorCustom_Glass;
 	public static Block blockPlayerDoorCustom_Ice;
 	public static Block blockPlayerDoorCustom_Cactus;
-	
+
 	public static Block blockCustomMobSpawner;
+	public static Block blockCustomSuperLight;
+	public static Block blockCustomJukebox;
 
 	public static void init() {
 		Logger.INFO("Initializing Blocks.");
@@ -86,7 +89,7 @@ public final class ModBlocks {
 	public static void registerBlocks(){
 
 		Logger.INFO("Registering Blocks.");
-		GameRegistry.registerBlock(MatterFabricatorEffectBlock = new LightGlass(Material.glass, false).setHardness(0.1F).setBlockTextureName(CORE.MODID + ":" + "blockMFEffect").setStepSound(Block.soundTypeGlass), "blockMFEffect");
+		MatterFabricatorEffectBlock = new LightGlass(false);
 
 		//Fluids
 		FluidRegistryHandler.registerFluids();
@@ -121,6 +124,9 @@ public final class ModBlocks {
 		blockPlayerDoorCustom_Glass = new PlayerDoors(Material.glass, "door_glass", false);
 		blockPlayerDoorCustom_Ice = new PlayerDoors(Material.ice, "door_ice", false);
 		blockPlayerDoorCustom_Cactus = new PlayerDoors(Material.cactus, "door_cactus", false, 0.6f, Block.soundTypeGrass, "Cactus");
+		
+		blockCustomSuperLight = new BlockSuperLight();
+		blockCustomJukebox = new Machine_SuperJukebox();
 
 	}
 
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
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java b/src/Java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java
new file mode 100644
index 0000000000..e3d9d0e646
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java
@@ -0,0 +1,215 @@
+package gtPlusPlus.core.block.machine;
+
+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 net.minecraft.block.Block;
+import net.minecraft.block.BlockJukebox;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class Machine_SuperJukebox extends BlockJukebox
+{
+    @SideOnly(Side.CLIENT)
+    private IIcon mIcon;
+
+    public Machine_SuperJukebox(){
+		this.setBlockName("blockSuperJukebox");
+		this.setCreativeTab(CreativeTabs.tabRedstone);		
+		setHardness(2.0F);
+		setResistance(10.0F);
+		setStepSound(soundTypePiston);
+		setBlockTextureName("jukebox");		
+		GameRegistry.registerBlock(this, "blockSuperJukebox");
+		LanguageRegistry.addName(this, "Sir Mixalot [Jukebox]");
+    }
+
+    /**
+     * Gets the block's texture. Args: side, meta
+     */
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(int aSide, int aMeta)
+    {
+        return aSide == 1 ? this.mIcon : this.blockIcon;
+    }
+
+    /**
+     * Called upon block activation (right click on the block.)
+     */
+    @Override
+    public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_)
+    {
+        if (aWorld.getBlockMetadata(aX, aY, aZ) == 0)
+        {
+            return false;
+        }
+        else
+        {
+            this.func_149925_e(aWorld, aX, aY, aZ);
+            return true;
+        }
+    }
+
+    /**
+     * Set the record in the {@link SuperJukebox} {@link TileEntity}.
+     */
+    @Override
+    public final void func_149926_b(World aWorld, int aX, int aY, int aZ, ItemStack aStackToSet) {
+    	setRecordInJukeBox(aWorld, aX, aY, aZ, aStackToSet);
+    }
+    
+	public void setRecordInJukeBox(World aWorld, int aX, int aY, int aZ, ItemStack aStackToSet) {
+		if (!aWorld.isRemote) {
+			TileEntitySuperJukebox tileentityjukebox = (TileEntitySuperJukebox) aWorld.getTileEntity(aX, aY, aZ);
+			if (tileentityjukebox != null) {
+				tileentityjukebox.func_145857_a(aStackToSet.copy());
+				aWorld.setBlockMetadataWithNotify(aX, aY, aZ, 1, 2);
+			}
+		}
+	}
+
+	/**
+	 * Function to handle playing of records.
+	 */
+    @Override
+    public final void func_149925_e(World aWorld, int aX, int aY, int aZ) {
+    	playerJukeboxRecord(aWorld, aX, aY, aZ);
+	}
+    
+    public void playerJukeboxRecord(World aWorld, int aX, int aY, int aZ) {
+    	if (!aWorld.isRemote) {
+			TileEntitySuperJukebox tileentityjukebox = (TileEntitySuperJukebox) aWorld.getTileEntity(aX,
+					aY, aZ);
+
+			if (tileentityjukebox != null) {
+				ItemStack itemstack = tileentityjukebox.func_145856_a();
+
+				if (itemstack != null) {
+					aWorld.playAuxSFX(1005, aX, aY, aZ, 0);
+					aWorld.playRecord((String) null, aX, aY, aZ);
+					tileentityjukebox.func_145857_a((ItemStack) null);
+					aWorld.setBlockMetadataWithNotify(aX, aY, aZ, 0, 2);
+					float f = 0.7F;
+					double d0 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
+					double d1 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.2D + 0.6D;
+					double d2 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
+					ItemStack itemstack1 = itemstack.copy();
+					EntityItem entityitem = new EntityItem(aWorld, (double) aX + d0,
+							(double) aY + d1, (double) aZ + d2, itemstack1);
+					entityitem.delayBeforeCanPickup = 10;
+					aWorld.spawnEntityInWorld(entityitem);
+				}
+			}
+		}
+    }
+
+    @Override
+    public void breakBlock(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, Block p_149749_5_, int p_149749_6_)
+    {
+        this.func_149925_e(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_);
+        super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_);
+    }
+
+    /**
+     * Drops the block items with a specified chance of dropping the specified items
+     */
+    @Override
+    public void dropBlockAsItemWithChance(World p_149690_1_, int p_149690_2_, int p_149690_3_, int p_149690_4_, int p_149690_5_, float p_149690_6_, int p_149690_7_)
+    {
+        if (!p_149690_1_.isRemote)
+        {
+            super.dropBlockAsItemWithChance(p_149690_1_, p_149690_2_, p_149690_3_, p_149690_4_, p_149690_5_, p_149690_6_, 0);
+        }
+    }
+
+    /**
+     * Returns a new instance of a block's tile entity class. Called on placing the block.
+     */
+    @Override
+    public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_)
+    {
+        return new TileEntitySuperJukebox();
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void registerBlockIcons(IIconRegister p_149651_1_)
+    {
+        this.blockIcon = p_149651_1_.registerIcon(this.getTextureName() + "_side");
+        this.mIcon = p_149651_1_.registerIcon(this.getTextureName() + "_top");
+    }
+
+    public static class TileEntitySuperJukebox extends TileEntityJukebox {
+    	
+            private ItemStack field_145858_a;
+
+            @Override
+            public void readFromNBT(NBTTagCompound aNBT)
+            {
+                super.readFromNBT(aNBT);
+
+                if (aNBT.hasKey("RecordItem", 10))
+                {
+                    this.func_145857_a(ItemStack.loadItemStackFromNBT(aNBT.getCompoundTag("RecordItem")));
+                }
+                else if (aNBT.getInteger("Record") > 0)
+                {
+                    this.func_145857_a(new ItemStack(Item.getItemById(aNBT.getInteger("Record")), 1, 0));
+                }
+            }
+
+            @Override
+            public void writeToNBT(NBTTagCompound aNBT)
+            {
+                super.writeToNBT(aNBT);
+
+                if (this.func_145856_a() != null)
+                {
+                    aNBT.setTag("RecordItem", this.func_145856_a().writeToNBT(new NBTTagCompound()));
+                    aNBT.setInteger("Record", Item.getIdFromItem(this.func_145856_a().getItem()));
+                }
+            }
+
+            /**
+             * Called to get the internal stack
+             */
+            @Override
+            public ItemStack func_145856_a()
+            {
+                return this.field_145858_a;
+            }
+
+            /**
+             * Called to get the internal stack, wraps vanilla function {@link func_145856_a}.
+             */
+            public ItemStack getCurrentRecord() {
+            	return func_145856_a();
+            }
+
+            /**
+             * Called to set the internal stack
+             */
+            @Override
+            public void func_145857_a(ItemStack p_145857_1_)
+            {
+                this.field_145858_a = p_145857_1_;
+                this.markDirty();
+            }
+
+            /**
+             * Called to set the internal stack, wraps vanilla function {@link func_145857_a}.
+             */
+            public void setCurrentRecord(ItemStack aStack) {
+            	func_145857_a(aStack);
+            }
+        }
+}
\ No newline at end of file