+ Added Bombs.

% Made RAW collectors produce 10x less.
$ Fixed tooltips on RAW collectors.
$ Fixed a bug regarding STARTUP_PHASE.

4 files changed, 151 insertions, 12 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index ed1df1f333..bb2ab8ae47 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -61,6 +61,7 @@ import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoil;
 import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoilWire;
 import gtPlusPlus.core.item.general.throwables.ItemHydrofluoricAcidPotion;
 import gtPlusPlus.core.item.general.throwables.ItemSulfuricAcidPotion;
+import gtPlusPlus.core.item.general.throwables.ItemThrowableBomb;
 import gtPlusPlus.core.item.init.ItemsFoods;
 import gtPlusPlus.core.item.materials.DustDecayable;
 import gtPlusPlus.core.item.tool.misc.DebugScanner;
@@ -338,6 +339,11 @@ public final class ModItems {
 
 	public static ItemDummyResearch itemDummyResearch;
 
+	public static CoreItem itemBombCasing;
+	public static CoreItem itemBombUnf;
+	public static CoreItem itemDetCable;
+	public static ItemThrowableBomb itemBomb;
+
 	static {
 		Logger.INFO("Items!");
 		//Default item used when recipes fail, handy for debugging. Let's make sure they exist when this class is called upon.
@@ -889,6 +895,16 @@ public final class ModItems {
 		//Farm Animal Fun
 		new AgriculturalChem();
 		
+		
+		//Bombs
+		itemBombCasing = new CoreItem("itemBombCasing", "Bomb Casing", tabMisc);
+		itemBombCasing.setTextureName(CORE.MODID + ":bomb_casing");		
+		itemBombUnf = new CoreItem("itemBombUnf", "Bomb (unf)", tabMisc);
+		itemBombUnf.setTextureName(CORE.MODID + ":bomb_casing");		
+		itemDetCable = new CoreItem("itemDetCable", "Det. Cable", tabMisc);
+		itemDetCable.setTextureName("string");		
+		itemBomb = new ItemThrowableBomb();
+		
 		//Only used for debugging.
 		/*if (CORE.DEVENV) {
 			new ConnectedBlockFinder();
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
index c271ab39d0..b26ac67225 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java
@@ -22,7 +22,7 @@ public class ItemBlockMeta extends ItemBlockWithMetadata
 	{
 		super(aBlock, aBlock);
 		this.mBlock = aBlock;
-		this.setMaxDamage(15);
+		this.setMaxDamage(0);
 		this.setHasSubtypes(true);
 		if (aBlock instanceof ITileTooltip) {
 			ITileTooltip aTooltip = (ITileTooltip) aBlock;
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java b/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java
index eb22f8fa07..5ef72b6f17 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemControlCore.java
@@ -17,7 +17,7 @@ import gtPlusPlus.core.lib.CORE;
 
 public class ItemControlCore extends Item {
 
-	public IIcon[] icons = new IIcon[10];
+	public static IIcon[] icons = new IIcon[10];
 
 	public ItemControlCore() {
 		super();
@@ -31,16 +31,16 @@ public class ItemControlCore extends Item {
 
 	@Override
 	public void registerIcons(IIconRegister reg) {
-		this.icons[0] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_0");
-		this.icons[1] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_1");
-		this.icons[2] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_2");
-		this.icons[3] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_3");
-		this.icons[4] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_4");
-		this.icons[5] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_5");
-		this.icons[6] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_6");
-		this.icons[7] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_7");
-		this.icons[8] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_8");
-		this.icons[9] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_9");
+		icons[0] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_0");
+		icons[1] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_1");
+		icons[2] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_2");
+		icons[3] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_3");
+		icons[4] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_4");
+		icons[5] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_5");
+		icons[6] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_6");
+		icons[7] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_7");
+		icons[8] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_8");
+		icons[9] = reg.registerIcon(CORE.MODID + ":" + "controlcore/Core_9");
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java b/src/Java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java
new file mode 100644
index 0000000000..9467c3a58c
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java
@@ -0,0 +1,123 @@
+package gtPlusPlus.core.item.general.throwables;
+
+import java.util.List;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.entity.projectile.EntityThrowableBomb;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.item.base.CoreItem;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.NBTUtils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumRarity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class ItemThrowableBomb extends CoreItem {
+
+	private static AutoMap<ItemStack> mLighters = new AutoMap<ItemStack>();
+	public static IIcon[] icons = new IIcon[10];
+	
+	public ItemThrowableBomb() {
+		super("gtpp.throwable.bomb", "Bomb", AddToCreativeTab.tabMisc, 16, 0, new String[] {"Just like Bomberman", "Have a fire source in inventory to prime"}, EnumRarity.uncommon, EnumChatFormatting.GRAY, false, null);
+		this.setHasSubtypes(true);
+	}
+	
+	@Override
+	public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer player) {
+		
+		if (mLighters.isEmpty()) {
+			mLighters.put(ItemUtils.getSimpleStack(Items.flint_and_steel));
+			mLighters.put(ItemList.Tool_Lighter_Invar_Full.get(1));
+			mLighters.put(ItemList.Tool_Lighter_Invar_Used.get(1));
+			mLighters.put(ItemList.Tool_Lighter_Platinum_Full.get(1));
+			mLighters.put(ItemList.Tool_Lighter_Platinum_Used.get(1));
+			mLighters.put(ItemUtils.getSimpleStack(ModItems.itemBasicFireMaker));
+		}
+		
+		//Unlit
+		if (item.getItemDamage() == 0) {
+			boolean hasLighter = false;
+			for (ItemStack aPlaySlot : player.inventory.mainInventory) {
+				if (aPlaySlot != null) {
+					for (ItemStack aLighter : mLighters) {
+						if (GT_Utility.areStacksEqual(aPlaySlot, aLighter)) {
+							hasLighter = true;
+							break;
+						}					
+					}
+				}
+			}		
+			if (hasLighter) {
+				item.setItemDamage(1);
+			}
+		}
+		//Lit
+		else if (item.getItemDamage() == 1) {
+			if (!player.capabilities.isCreativeMode) {
+				--item.stackSize;
+			}
+			world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
+			if (!world.isRemote) {
+				world.spawnEntityInWorld(new EntityThrowableBomb(world, player));
+			}
+			/*if (item.stackSize <= 0) {
+				item = null;
+			}*/
+		}
+		return item;		
+	}
+	
+
+
+	@Override
+	public void registerIcons(IIconRegister reg) {
+		icons[0] = reg.registerIcon(CORE.MODID + ":" + "bomb");
+		icons[1] = reg.registerIcon(CORE.MODID + ":" + "bomb_lit");
+	}
+
+	@Override
+	public IIcon getIconFromDamage(int meta) {
+		return this.icons[meta];
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	@Override
+	public void getSubItems(Item item, CreativeTabs tab, List list) {
+		for (int i = 0; i < 2; i ++) {
+			list.add(new ItemStack(item, 1, i));
+		}
+	}
+
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) {
+		String aLitStatus = "unlit";
+		if (stack.getItemDamage() == 0) {
+			aLitStatus = EnumChatFormatting.BLUE+"Unlit";
+		}
+		else if (stack.getItemDamage() == 1) {
+			aLitStatus = EnumChatFormatting.RED+"Lit";
+		}		
+		list.add(EnumChatFormatting.GOLD+"Fuse Status: "+aLitStatus);
+		super.addInformation(stack, aPlayer, list, bool);
+	}
+
+	@Override
+	public String getItemStackDisplayName(ItemStack p_77653_1_) {
+		// TODO Auto-generated method stub
+		return super.getItemStackDisplayName(p_77653_1_);
+	}
+	
+	
+	
+}
\ No newline at end of file