+ Added config option to adjust ingame BGM delays. (Should be working)

+ Added a Pest Killer for quick removal of Butterflies and Bats.
+ Added Hydrogen Cyanide.
% Replaced existing assets for the Bat King.
% Replaced Bat King Logic, it's now an offensive mob.
$ Fixed Bat King model scaling.

2 files changed, 142 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index b904b04556..b59facf9e2 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -18,6 +18,7 @@ import gtPlusPlus.core.block.machine.DecayablesChest;
 import gtPlusPlus.core.block.machine.FishTrap;
 import gtPlusPlus.core.block.machine.HeliumGenerator;
 import gtPlusPlus.core.block.machine.Machine_ModularityTable;
+import gtPlusPlus.core.block.machine.Machine_PestKiller;
 import gtPlusPlus.core.block.machine.Machine_PooCollector;
 import gtPlusPlus.core.block.machine.Machine_ProjectTable;
 import gtPlusPlus.core.block.machine.Machine_SuperJukebox;
@@ -91,6 +92,8 @@ public final class ModBlocks {
 	public static Block blockCustomJukebox;
 	
 	public static Block blockPooCollector;
+	
+	public static Block blockPestKiller;
 
 	public static void init() {
 		Logger.INFO("Initializing Blocks.");
@@ -142,6 +145,8 @@ public final class ModBlocks {
 		blockCustomJukebox = new Machine_SuperJukebox();
 		
 		blockPooCollector = new Machine_PooCollector();
+		
+		blockPestKiller = new Machine_PestKiller();
 
 		new BlockGenericRedstoneDetector();
 		new BlockGenericRedstoneTest();
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_PestKiller.java b/src/Java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
new file mode 100644
index 0000000000..11fa80f439
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_PestKiller.java
@@ -0,0 +1,137 @@
+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 gtPlusPlus.GTplusplus;
+import gtPlusPlus.api.interfaces.ITileTooltip;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.handler.GuiHandler;
+import gtPlusPlus.core.item.base.itemblock.ItemBlockBasicTile;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller;
+import gtPlusPlus.core.util.minecraft.InventoryUtils;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class Machine_PestKiller extends BlockContainer implements ITileTooltip
+{
+	@SideOnly(Side.CLIENT)
+	private IIcon textureTop;
+	@SideOnly(Side.CLIENT)
+	private IIcon textureBottom;
+	@SideOnly(Side.CLIENT)
+	private IIcon textureFront;
+
+	/**
+	 * Determines which tooltip is displayed within the itemblock.
+	 */
+	private final int mTooltipID = 6;
+
+	@Override
+	public int getTooltipID() {
+		return this.mTooltipID;
+	}
+
+	@SuppressWarnings("deprecation")
+	public Machine_PestKiller()
+	{
+		super(Material.wood);
+		this.setBlockName("blockPestKiller");
+		this.setHardness(5f);
+		this.setResistance(1f);
+		this.setCreativeTab(AddToCreativeTab.tabMachines);
+		GameRegistry.registerBlock(this, ItemBlockBasicTile.class, "blockPestKiller");
+		LanguageRegistry.addName(this, "Pest Killer");
+
+	}
+
+	/**
+	 * Gets the block's texture. Args: side, meta
+	 */
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(final int aSide, final int p_149691_2_)
+	{
+		return aSide == 1 ? this.textureTop : (aSide == 0 ? this.textureBottom : this.textureFront);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(final IIconRegister p_149651_1_)
+	{
+		this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
+		this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_PESTKILLER_TOP");
+		this.textureBottom = p_149651_1_.registerIcon("planks_acacia");
+		this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
+	}
+
+	/**
+	 * Called upon block activation (right click on the block.)
+	 */
+	@Override
+	public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float lx, final float ly, final float lz)
+	{
+		if (world.isRemote) {
+			return true;
+		}
+
+		final TileEntity te = world.getTileEntity(x, y, z);
+		if ((te != null) && (te instanceof TileEntityPestKiller)){
+			player.openGui(GTplusplus.instance, GuiHandler.GUI15, world, x, y, z);
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public int getRenderBlockPass() {
+		return 0;
+	}
+
+	@Override
+	public boolean isOpaqueCube() {
+		return false;
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
+		return new TileEntityPestKiller();
+	}
+
+	@Override
+	public void onBlockAdded(final World world, final int x, final int y, final int z) {
+		super.onBlockAdded(world, x, y, z);
+	}
+
+	@Override
+	public void breakBlock(final World world, final int x, final int y, final int z, final Block block, final int number) {
+		InventoryUtils.dropInventoryItems(world, x, y, z, block);
+		super.breakBlock(world, x, y, z, block, number);
+	}
+
+	@Override
+	public void onBlockPlacedBy(final World world, final int x, final int y, final int z, final EntityLivingBase entity, final ItemStack stack) {
+		if (stack.hasDisplayName()) {
+			((TileEntityPestKiller) world.getTileEntity(x,y,z)).setCustomName(stack.getDisplayName());
+		}
+	}
+
+	@Override
+	public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y, final int z) {
+		return false;
+	}
+
+}
\ No newline at end of file