+ Gave Tokens icons.

$ Fixed some invalid recipe logging for recipes that contained nulls.
$ Fixed Custom ores not having a default texture.
% Moved Pump Logging, it was moved to WARNING from INFO.
- Removed most of old Pump tool code.

4 files changed, 1 insertions, 452 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
index 31347e0b22..ca795e40d1 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java
@@ -13,11 +13,6 @@ import gtPlusPlus.core.lib.CORE;
 public final class TexturesGtTools {
 
 	public final static CustomIcon SKOOKUM_CHOOCHER = new CustomIcon("iconsets/SKOOKUMCHOOCHER");
-	public final static CustomIcon PUMP = new CustomIcon("iconsets/PUMP");
-
-
-
-
 
 
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
index 47c1f35f93..d228fdc04a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java
@@ -16,7 +16,6 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechToolDictNames;
 import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_Choocher;
-import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_Pump;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
@@ -25,13 +24,11 @@ import net.minecraftforge.fluids.FluidStack;
 public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
 
 	public static final short SKOOKUM_CHOOCHER = 7734;
-	public static final short HAND_PUMP = 7736;
 	public static GT_MetaGenerated_Tool INSTANCE;
 
 	public MetaGeneratedGregtechTools() {
 		super("plusplus.metatool.01");
 		INSTANCE = this;
-
 		//Skookum Choocher
 		GregTech_API.registerTool(
 				this.addTool(
@@ -45,89 +42,6 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool {
 								new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
 								new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)}),
 				GregTech_API.sWrenchList);
-
-		//Pump
-		this.addTool(
-				HAND_PUMP,
-				"Electric Pump",
-				"Holds Fluids from GT Machines.",
-				new TOOL_Gregtech_Pump(),
-				new Object[]{GregtechToolDictNames.craftingToolHandPump,
-						new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L),
-						new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L),
-						new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)});
-		this.setFluidContainerStats(HAND_PUMP, 16000L, 16L);
-	}
-
-	
-
-	public final ConcurrentHashMap<Short, Long[]> mFluidContainerStats = new ConcurrentHashMap<Short, Long[]>();
-	
-	public final MetaGeneratedGregtechTools setFluidContainerStats(int aMetaValue, long aCapacity, long aStacksize) {
-		if (aMetaValue >= 0) {
-			if (aCapacity > 0L) {
-				this.mFluidContainerStats.put(Short.valueOf((short) aMetaValue),
-						new Long[]{Long.valueOf(aCapacity), Long.valueOf(Math.max(1L, aStacksize))});
-			}
-			return this;
-		} else {
-			return this;
-		}
-	}
-
-	@Override
-	public final Long[] getFluidContainerStats(ItemStack aStack) {
-		return (Long[]) this.mFluidContainerStats.get(Short.valueOf((short) aStack.getItemDamage()));
-	}
-	
-
-	@SuppressWarnings("unchecked")
-	private ConcurrentHashMap<Short, ArrayList<IItemBehaviour<GT_MetaBase_Item>>> getItemBehaviours() {
-		try {			
-			ConcurrentHashMap<Short, ArrayList<IItemBehaviour<GT_MetaBase_Item>>> aItemBehaviors;
-			aItemBehaviors = (ConcurrentHashMap<Short, ArrayList<IItemBehaviour<GT_MetaBase_Item>>>) ReflectionUtils.getField(getClass(), "mItemBehaviors").get(this);
-			return aItemBehaviors != null ? aItemBehaviors : null;
-		} catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) {
-			return null;
-		}
-	}
-
-	@Override
-	public ItemStack onItemRightClick(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
-		Logger.INFO("Item Right Click");
-		this.use(aStack, 0.0D, aPlayer);
-		this.isItemStackUsable(aStack);
-		ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = (ArrayList<IItemBehaviour<GT_MetaBase_Item>>) this.getItemBehaviours().get(Short.valueOf((short) this.getDamage(aStack)));
-		try {
-			IItemBehaviour<GT_MetaBase_Item> tBehavior;
-			if (tList != null) {				
-				for (IItemBehaviour<GT_MetaBase_Item> g : tList) {
-					if (g != null) {
-						if (g instanceof TOOL_Gregtech_Pump) {
-							TOOL_Gregtech_Pump t = (TOOL_Gregtech_Pump) g;
-							if (t != null) {
-								Logger.INFO("Right clicked with Pump tool.");
-								aStack = g.onItemRightClick(this, aStack, aWorld, aPlayer);
-								FluidStack f = t.getBehaviour().getStoredFluid();
-								if (f != null) {
-									Logger.INFO("Found Fluid '"+f.getLocalizedName()+"', trying to set fluid contents of tool.");
-									this.setFluidContent(aStack, f);
-								}
-							}
-						}
-						else {
-							aStack = g.onItemRightClick(this, aStack, aWorld, aPlayer);
-						}
-					}
-				}
-			}
-		} catch (Throwable arg6) {
-			if (GT_Values.D1) {
-				arg6.printStackTrace(GT_Log.err);
-			}
-		}
-		return aStack;
-	}
-	
+	}	
 
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Pump.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Pump.java
deleted file mode 100644
index 1c48c7401f..0000000000
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Pump.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package gtPlusPlus.xmod.gregtech.common.items.behaviours;
-
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.fluids.FluidStack;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_MetaBase_Item;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.items.behaviors.Behaviour_None;
-import gtPlusPlus.api.objects.Logger;
-
-public class Behaviour_Pump
-extends Behaviour_None {
-
-	private final int mCosts;
-	private FluidStack mStoredFluid;
-	private final String mTooltip = GT_LanguageManager.addStringLocalization("gt.behaviour.pump", "Sucks in Machine Input Fluid tank contents on Rightclick");
-
-	public Behaviour_Pump(final int aCosts) {
-		this.mCosts = aCosts;
-	}
-
-	@Override
-	public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer, final World aWorld, final int aX, final int aY, final int aZ, final int aSide, final float hitX, final float hitY, final float hitZ) {
-		if (aWorld.isRemote) {
-			return false;
-		}
-		else {
-			final Block aBlock = aWorld.getBlock(aX, aY, aZ);
-			if (aBlock == null) {
-				return false;
-			}
-			//final byte aMeta = (byte) aWorld.getBlockMetadata(aX, aY, aZ);
-			TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-			if (tTileEntity == null) {
-				return false;
-			}
-			if ((tTileEntity instanceof IGregTechTileEntity)) {
-				Logger.INFO("Right Clicking on GT Tile - Behaviour Class.");
-				if (((IGregTechTileEntity) tTileEntity).getTimer() < 50L) {
-					Logger.INFO("Returning False - Behaviour Class. Timer < 50");
-					return false;
-				}
-				else if ((!aWorld.isRemote) && (!((IGregTechTileEntity) tTileEntity).isUseableByPlayer(aPlayer))) {
-					Logger.INFO("Returning True - Behaviour Class. NotUsable()");
-					return true;
-				}
-				else {
-					Logger.INFO("Trying to find Stored Fluid - Behaviour Class.");
-					FluidStack aStored = getStoredFluidOfGTMachine((IGregTechTileEntity)tTileEntity);
-					if (aStored != null) {
-						this.mStoredFluid = aStored;
-						boolean b = setStoredFluidOfGTMachine((IGregTechTileEntity)tTileEntity);
-						Logger.INFO("Cleared Tank? "+b);
-						Logger.INFO("Returning True - Behaviour Class.");
-						return true;						
-					}
-					else {
-						Logger.INFO("Found no valid Fluidstack - Behaviour Class.");
-					}
-				}
-
-			}
-		}
-		Logger.INFO("Returning False - Behaviour Class.");
-		return false;
-	}
-
-	public List<String> getAdditionalToolTips(final GT_MetaBase_Item aItem, final List<String> aList, final ItemStack aStack) {
-		aList.add(this.mTooltip);
-		aList.add("Stored Fluid: "+(mStoredFluid != null ? mStoredFluid.getLocalizedName()+" - "+mStoredFluid.amount+"L" : "None"));		
-		return aList;
-	}
-
-	@Override
-	public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
-		// TODO Auto-generated method stub
-		return super.onItemRightClick(aItem, aStack, aWorld, aPlayer);
-	}
-
-	@Override
-	public void onUpdate(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer,
-			boolean aIsInHand) {
-		// TODO Auto-generated method stub
-		super.onUpdate(aItem, aStack, aWorld, aPlayer, aTimer, aIsInHand);
-	}
-
-	public FluidStack getStoredFluidOfGTMachine(IGregTechTileEntity aTileEntity) {
-		if (aTileEntity == null) {
-			return null;
-		}
-		final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();;
-		if (aMetaTileEntity == null) {
-			return null;
-		}
-		if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicTank) {
-			Logger.INFO("Tile Was Instanceof BasicTank.");
-			return getStoredFluidOfGTMachine((GT_MetaTileEntity_BasicTank) aMetaTileEntity);
-		}
-		else {
-			return null;
-		}
-	}
-
-	public FluidStack getStoredFluidOfGTMachine(GT_MetaTileEntity_BasicTank aTileEntity) {	
-		FluidStack f = aTileEntity.mFluid;
-		Logger.INFO("Returning Fluid stack from tile. Found: "+(f != null ? f.getLocalizedName()+" - "+f.amount+"L" : "Nothing"));		
-		return f.copy();
-	}
-
-	public boolean setStoredFluidOfGTMachine(IGregTechTileEntity aTileEntity) {
-		Logger.INFO("Trying to clear Tile's tank. - Behaviour Class. [1]");
-		if (aTileEntity == null) {
-			return false;
-		}
-		final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();;
-		if (aMetaTileEntity == null) {
-			return false;
-		}
-		if (aMetaTileEntity instanceof GT_MetaTileEntity_BasicTank) {
-			Logger.INFO("Trying to clear Tile's tank. - Behaviour Class. [2]");
-			return setStoredFluidOfGTMachine((IGregTechTileEntity) aMetaTileEntity);
-		}
-		else {
-			return false;
-		}
-	}
-
-	public boolean setStoredFluidOfGTMachine(GT_MetaTileEntity_BasicTank aTileEntity) {
-		try {
-			aTileEntity.mFluid = null;	
-			boolean b = aTileEntity.mFluid == null;
-			Logger.INFO("Trying to clear Tile's tank. - Behaviour Class. [3] "+b);
-			return aTileEntity.mFluid == null;
-		}
-		catch (Throwable t) {
-			Logger.INFO("Trying to clear Tile's tank. FAILED - Behaviour Class. [x]");
-			return false;
-		}
-	}
-
-	public synchronized final FluidStack getStoredFluid() {
-		return mStoredFluid;
-	}
-
-	public synchronized final void setStoredFluid(FluidStack mStoredFluid) {
-		this.mStoredFluid = mStoredFluid;
-	}
-}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Pump.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Pump.java
deleted file mode 100644
index 731e742f2a..0000000000
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_Pump.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package gtPlusPlus.xmod.gregtech.common.tools;
-
-import java.util.Arrays;
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.monster.EntityIronGolem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.stats.AchievementList;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IChatComponent;
-import net.minecraft.world.World;
-import gregtech.GT_Mod;
-import gregtech.api.GregTech_API;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.common.tools.GT_Tool;
-
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
-import gtPlusPlus.xmod.gregtech.common.items.behaviours.Behaviour_Pump;
-import net.minecraftforge.event.world.BlockEvent;
-import net.minecraftforge.fluids.FluidStack;
-
-public class TOOL_Gregtech_Pump
-extends GT_Tool {
-
-	public static final List<String> mEffectiveList = Arrays.asList(new String[]{EntityIronGolem.class.getName(), "EntityTowerGuardian"});
-	private final Behaviour_Pump mBehaviour;
-	private FluidStack mStoredFluid;
-	
-	public TOOL_Gregtech_Pump() {
-		mBehaviour = new Behaviour_Pump(100);
-		//this.setFluidContainerStats(32000, 16000L, 16L);
-	}
-
-	@Override
-	public float getNormalDamageAgainstEntity(final float aOriginalDamage, final Entity aEntity, final ItemStack aStack, final EntityPlayer aPlayer) {
-		String tName = aEntity.getClass().getName();
-		tName = tName.substring(tName.lastIndexOf(".") + 1);
-		return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage;
-	}
-	
-	public Behaviour_Pump getBehaviour() {
-		return this.mBehaviour;
-	}
-
-	@Override
-	public int getToolDamagePerBlockBreak() {
-		return 1000;
-	}
-
-	@Override
-	public int getToolDamagePerDropConversion() {
-		return 100;
-	}
-
-	@Override
-	public int getToolDamagePerContainerCraft() {
-		return 400;
-	}
-
-	@Override
-	public int getToolDamagePerEntityAttack() {
-		return 1000;
-	}
-
-	@Override
-	public int getBaseQuality() {
-		return 1;
-	}
-
-	@Override
-	public float getBaseDamage() {
-		return 0.0F;
-	}
-
-	@Override
-	public float getSpeedMultiplier() {
-		return 1.0F;
-	}
-
-	@Override
-	public float getMaxDurabilityMultiplier() {
-		return 1.5F;
-	}
-
-	@Override
-	public String getCraftingSound() {
-		return GregTech_API.sSoundList.get(Integer.valueOf(1));
-	}
-
-	@Override
-	public String getEntityHitSound() {
-		return GregTech_API.sSoundList.get(Integer.valueOf(2));
-	}
-
-	@Override
-	public String getBreakingSound() {
-		return GregTech_API.sSoundList.get(Integer.valueOf(0));
-	}
-
-	@Override
-	public String getMiningSound() {
-		return null;
-	}
-
-	@Override
-	public boolean canBlock() {
-		return false;
-	}
-
-	public boolean isWrench(){
-		return false;
-	}
-
-	@Override
-	public boolean isCrowbar() {
-		return false;
-	}
-
-	@Override
-	public boolean isWeapon() {
-		return true;
-	}
-
-	@Override
-	public boolean isMinableBlock(final Block aBlock, final byte aMetaData) {
-		return false;
-	}
-
-	@Override
-	public int convertBlockDrops(final List<ItemStack> aDrops, final ItemStack aStack, final EntityPlayer aPlayer, final Block aBlock, final int aX, final int aY, final int aZ, final byte aMetaData, final int aFortune, final boolean aSilkTouch, final BlockEvent.HarvestDropsEvent aEvent) {
-		int rConversions = 0;		
-		return rConversions;
-	}
-
-	@Override
-	public ItemStack getBrokenItem(final ItemStack aStack) {
-		return null;
-	}
-
-	@Override
-	public IIconContainer getIcon(final boolean aIsToolHead, final ItemStack aStack) {
-		return TexturesGtTools.PUMP;
-	}
-
-	@Override
-	public short[] getRGBa(final boolean aIsToolHead, final ItemStack aStack) {
-		return GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa;
-	}
-
-	@Override
-	public void onToolCrafted(final ItemStack aStack, final EntityPlayer aPlayer) {
-		super.onToolCrafted(aStack, aPlayer);
-		aPlayer.triggerAchievement(AchievementList.buildSword);
-		try {
-			GT_Mod.achievements.issueAchievement(aPlayer, "tools");
-			GT_Mod.achievements.issueAchievement(aPlayer, "unitool");
-		} catch (final Exception e) {
-		}
-	}
-
-	@Override
-	public IChatComponent getDeathMessage(final EntityLivingBase aPlayer, final EntityLivingBase aEntity) {
-		return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got pumped by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE);
-	}
-
-	@Override
-	public void onStatsAddedToTool(final GT_MetaGenerated_Tool aItem, final int aID) {
-		aItem.addItemBehavior(aID, mBehaviour);
-	}
-
-	@Override
-	public boolean isGrafter() {
-		return false;
-	}
-
-	@Override
-	public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World worldObj,
-			int aX, int aY, int aZ) {
-		return 0f;
-	}
-
-	@Override
-	public boolean isChainsaw() {
-		return false;
-	}
-
-	@Override
-	public boolean isMiningTool() {
-		return false;
-	}
-
-	@Override
-	public boolean isRangedWeapon() {
-		return false;
-	}
-	
-}