+ Added recipes for all Multipickaxes.

% Improved handling of xmod item integration.
% Changed the way the Skookum Choocher works, now it's mode is toggle with shift+Rightclick.
- Removed some old textures and committed some classes I missed in earlier updates.

2 files changed, 718 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java
new file mode 100644
index 0000000000..c27ee601cb
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java
@@ -0,0 +1,456 @@
+package gtPlusPlus.xmod.gregtech.api.items.tools;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.enchants.Enchantment_Radioactivity;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.TC_Aspects.TC_AspectStack;
+import gregtech.api.interfaces.IToolStats;
+import gregtech.api.items.GT_MetaGenerated_Tool;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map.Entry;
+
+import net.minecraft.block.Block;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.item.EntityMinecart;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.potion.Potion;
+import net.minecraft.stats.AchievementList;
+import net.minecraft.stats.StatList;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraftforge.event.world.BlockEvent;
+
+/**
+ * This is an example on how you can create a Tool ItemStack, in this case a Bismuth Wrench:
+ * GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01").getToolWithStats(16, 1, Materials.Bismuth, Materials.Bismuth, null);
+ */
+public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
+	/**
+	 * All instances of this Item Class are listed here.
+	 * This gets used to register the Renderer to all Items of this Type, if useStandardMetaItemRenderer() returns true.
+	 * <p/>
+	 * You can also use the unlocalized Name gotten from getUnlocalizedName() as Key if you want to get a specific Item.
+	 */
+	public static final HashMap<String, GT_MetaGenTool> sInstances = new HashMap<String, GT_MetaGenTool>();
+
+	/* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */
+
+	public final HashMap<Short, IToolStats> mToolStats = new HashMap<Short, IToolStats>();
+
+	/**
+	 * Creates the Item using these Parameters.
+	 *
+	 * @param aUnlocalized The Unlocalized Name of this Item.
+	 */
+	public GT_MetaGenTool(String aUnlocalized) {
+		super(aUnlocalized);
+		GT_ModHandler.registerBoxableItemToToolBox(this);
+		setCreativeTab(GregTech_API.TAB_GREGTECH);
+		setMaxStackSize(1);
+		sInstances.put(getUnlocalizedName(), this);
+	}
+
+	/* ---------- FOR ADDING CUSTOM ITEMS INTO THE REMAINING 766 RANGE ---------- */
+
+	public static final Materials getPrimaryMaterialEx(ItemStack aStack) {
+		NBTTagCompound aNBT = aStack.getTagCompound();
+		if (aNBT != null) {
+			aNBT = aNBT.getCompoundTag("GT.ToolStats");
+			if (aNBT != null) return Materials.getRealMaterial(aNBT.getString("PrimaryMaterial"));
+		}
+		return Materials._NULL;
+	}
+
+	public static final Materials getSecondaryMaterialEx(ItemStack aStack) {
+		NBTTagCompound aNBT = aStack.getTagCompound();
+		if (aNBT != null) {
+			aNBT = aNBT.getCompoundTag("GT.ToolStats");
+			if (aNBT != null) return Materials.getRealMaterial(aNBT.getString("SecondaryMaterial"));
+		}
+		return Materials._NULL;
+	}
+
+	/**
+	 * This adds a Custom Item to the ending Range.
+	 *
+	 * @param aID                     The Id of the assigned Tool Class [0 - 32765] (only even Numbers allowed! Uneven ID's are empty electric Items)
+	 * @param aEnglish                The Default Localized Name of the created Item
+	 * @param aToolTip                The Default ToolTip of the created Item, you can also insert null for having no ToolTip
+	 * @param aToolStats              The Food Value of this Item. Can be null as well.
+	 * @param aOreDictNamesAndAspects The OreDict Names you want to give the Item. Also used to assign Thaumcraft Aspects.
+	 * @return An ItemStack containing the newly created Item, but without specific Stats.
+	 */
+	public final ItemStack addToolEx(int aID, String aEnglish, String aToolTip, IToolStats aToolStats, Object... aOreDictNamesAndAspects) {
+		if (aToolTip == null) aToolTip = "";
+		if (aID >= 0 && aID < 32766 && aID % 2 == 0) {
+			GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + aID + ".name", aEnglish);
+			GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + aID + ".tooltip", aToolTip);
+			GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (aID + 1) + ".name", aEnglish + " (Empty)");
+			GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (aID + 1) + ".tooltip", "You need to recharge it");
+			mToolStats.put((short) aID, aToolStats);
+			mToolStats.put((short) (aID + 1), aToolStats);
+			aToolStats.onStatsAddedToTool(this, aID);
+			ItemStack rStack = new ItemStack(this, 1, aID);
+			List<TC_AspectStack> tAspects = new ArrayList<TC_AspectStack>();
+			for (Object tOreDictNameOrAspect : aOreDictNamesAndAspects) {
+				if (tOreDictNameOrAspect instanceof TC_AspectStack)
+					((TC_AspectStack) tOreDictNameOrAspect).addToAspectList(tAspects);
+				else
+					GT_OreDictUnificator.registerOre(tOreDictNameOrAspect, rStack);
+			}
+			if (GregTech_API.sThaumcraftCompat != null)
+				GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false);
+			return rStack;
+		}
+		return null;
+	}
+
+	/**
+	 * This Function gets an ItemStack Version of this Tool
+	 *
+	 * @param aToolID            the ID of the Tool Class
+	 * @param aAmount            Amount of Items (well normally you only need 1)
+	 * @param aPrimaryMaterial   Primary Material of this Tool
+	 * @param aSecondaryMaterial Secondary (Rod/Handle) Material of this Tool
+	 * @param aElectricArray     The Electric Stats of this Tool (or null if not electric)
+	 */
+	public final ItemStack getToolWithStatsEx(int aToolID, int aAmount, Materials aPrimaryMaterial, Materials aSecondaryMaterial, long[] aElectricArray) {
+		ItemStack rStack = new ItemStack(this, aAmount, aToolID);
+		IToolStats tToolStats = getToolStats(rStack);
+		if (tToolStats != null) {
+			NBTTagCompound tMainNBT = new NBTTagCompound(), tToolNBT = new NBTTagCompound();
+			if (aPrimaryMaterial != null) {
+				tToolNBT.setString("PrimaryMaterial", aPrimaryMaterial.toString());
+				tToolNBT.setLong("MaxDamage", 100L * (long) (aPrimaryMaterial.mDurability * tToolStats.getMaxDurabilityMultiplier()));
+			}
+			if (aSecondaryMaterial != null) tToolNBT.setString("SecondaryMaterial", aSecondaryMaterial.toString());
+
+			if (aElectricArray != null) {
+				tToolNBT.setBoolean("Electric", true);
+				tToolNBT.setLong("MaxCharge", aElectricArray[0]);
+				tToolNBT.setLong("Voltage", aElectricArray[1]);
+				tToolNBT.setLong("Tier", aElectricArray[2]);
+				tToolNBT.setLong("SpecialData", aElectricArray[3]);
+			}
+
+			tMainNBT.setTag("GT.ToolStats", tToolNBT);
+			rStack.setTagCompound(tMainNBT);
+		}
+		isItemStackUsable(rStack);
+		return rStack;
+	}
+
+	/**
+	 * Called by the Block Harvesting Event within the GT_Proxy
+	 */
+	public void onHarvestBlockEvent(ArrayList<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) {
+		IToolStats tStats = getToolStats(aStack);
+		if (isItemStackUsable(aStack) && getDigSpeed(aStack, aBlock, aMetaData) > 0.0F)
+			doDamage(aStack, tStats.convertBlockDrops(aDrops, aStack, aPlayer, aBlock, aX, aY, aZ, aMetaData, aFortune, aSilkTouch, aEvent) * tStats.getToolDamagePerDropConversion());
+	}
+
+	@Override
+	public boolean onLeftClickEntity(ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) {
+		IToolStats tStats = getToolStats(aStack);
+		if (tStats == null || !isItemStackUsable(aStack)) return true;
+		GT_Utility.doSoundAtClient(tStats.getEntityHitSound(), 1, 1.0F);
+		if (super.onLeftClickEntity(aStack, aPlayer, aEntity)) return true;
+		if (aEntity.canAttackWithItem() && !aEntity.hitByEntity(aPlayer)) {
+			float tMagicDamage = tStats.getMagicDamageAgainstEntity(aEntity instanceof EntityLivingBase ? EnchantmentHelper.getEnchantmentModifierLiving(aPlayer, (EntityLivingBase) aEntity) : 0.0F, aEntity, aStack, aPlayer), tDamage = tStats.getNormalDamageAgainstEntity((float) aPlayer.getEntityAttribute(SharedMonsterAttributes.attackDamage).getAttributeValue() + getToolCombatDamage(aStack), aEntity, aStack, aPlayer);
+			if (tDamage + tMagicDamage > 0.0F) {
+				boolean tCriticalHit = aPlayer.fallDistance > 0.0F && !aPlayer.onGround && !aPlayer.isOnLadder() && !aPlayer.isInWater() && !aPlayer.isPotionActive(Potion.blindness) && aPlayer.ridingEntity == null && aEntity instanceof EntityLivingBase;
+				if (tCriticalHit && tDamage > 0.0F) tDamage *= 1.5F;
+				tDamage += tMagicDamage;
+				if (aEntity.attackEntityFrom(tStats.getDamageSource(aPlayer, aEntity), tDamage)) {
+					if (aEntity instanceof EntityLivingBase)
+						aEntity.setFire(EnchantmentHelper.getFireAspectModifier(aPlayer) * 4);
+					int tKnockcack = (aPlayer.isSprinting() ? 1 : 0) + (aEntity instanceof EntityLivingBase ? EnchantmentHelper.getKnockbackModifier(aPlayer, (EntityLivingBase) aEntity) : 0);
+					if (tKnockcack > 0) {
+						aEntity.addVelocity(-MathHelper.sin(aPlayer.rotationYaw * (float) Math.PI / 180.0F) * tKnockcack * 0.5F, 0.1D, MathHelper.cos(aPlayer.rotationYaw * (float) Math.PI / 180.0F) * tKnockcack * 0.5F);
+						aPlayer.motionX *= 0.6D;
+						aPlayer.motionZ *= 0.6D;
+						aPlayer.setSprinting(false);
+					}
+					if (tCriticalHit) aPlayer.onCriticalHit(aEntity);
+					if (tMagicDamage > 0.0F) aPlayer.onEnchantmentCritical(aEntity);
+					if (tDamage >= 18.0F) aPlayer.triggerAchievement(AchievementList.overkill);
+					aPlayer.setLastAttacker(aEntity);
+					if (aEntity instanceof EntityLivingBase)
+						EnchantmentHelper.func_151384_a((EntityLivingBase) aEntity, aPlayer);
+					EnchantmentHelper.func_151385_b(aPlayer, aEntity);
+					if (aEntity instanceof EntityLivingBase)
+						aPlayer.addStat(StatList.damageDealtStat, Math.round(tDamage * 10.0F));
+					aEntity.hurtResistantTime = Math.max(1, tStats.getHurtResistanceTime(aEntity.hurtResistantTime, aEntity));
+					aPlayer.addExhaustion(0.3F);
+					doDamage(aStack, tStats.getToolDamagePerEntityAttack());
+				}
+			}
+		}
+		if (aStack.stackSize <= 0) aPlayer.destroyCurrentEquippedItem();
+		return true;
+	}
+
+	@Override
+	public ItemStack onItemRightClick(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
+		IToolStats tStats = getToolStats(aStack);
+		if (tStats != null && tStats.canBlock()) aPlayer.setItemInUse(aStack, 72000);
+		return super.onItemRightClick(aStack, aWorld, aPlayer);
+	}
+	
+
+	@Override
+	public Long[] getFluidContainerStats(ItemStack aStack) {
+		return null;
+	}
+
+	@Override
+	public Long[] getElectricStats(ItemStack aStack) {
+		NBTTagCompound aNBT = aStack.getTagCompound();
+		if (aNBT != null) {
+			aNBT = aNBT.getCompoundTag("GT.ToolStats");
+			if (aNBT != null && aNBT.getBoolean("Electric"))
+				return new Long[]{aNBT.getLong("MaxCharge"), aNBT.getLong("Voltage"), aNBT.getLong("Tier"), aNBT.getLong("SpecialData")};
+		}
+		return null;
+	}
+
+	public float getToolCombatDamage(ItemStack aStack) {
+		IToolStats tStats = getToolStats(aStack);
+		if (tStats == null) return 0;
+		return tStats.getBaseDamage() + getPrimaryMaterial(aStack).mToolQuality;
+	}
+
+	@Override
+	public float getDigSpeed(ItemStack aStack, Block aBlock, int aMetaData) {
+		if (!isItemStackUsable(aStack)) return 0.0F;
+		IToolStats tStats = getToolStats(aStack);
+		if (tStats == null || Math.max(0, getHarvestLevel(aStack, "")) < aBlock.getHarvestLevel(aMetaData)) return 0.0F;
+		return tStats.isMinableBlock(aBlock, (byte) aMetaData) ? Math.max(Float.MIN_NORMAL, tStats.getSpeedMultiplier() * getPrimaryMaterial(aStack).mToolSpeed) : 0.0F;
+	}
+
+	@Override
+	public boolean onBlockDestroyed(ItemStack aStack, World aWorld, Block aBlock, int aX, int aY, int aZ, EntityLivingBase aPlayer) {
+		if (!isItemStackUsable(aStack)) return false;
+		IToolStats tStats = getToolStats(aStack);
+		if (tStats == null) return false;
+		GT_Utility.doSoundAtClient(tStats.getMiningSound(), 1, 1.0F);
+		doDamage(aStack, (int) Math.max(1, aBlock.getBlockHardness(aWorld, aX, aY, aZ) * tStats.getToolDamagePerBlockBreak()));
+		return getDigSpeed(aStack, aBlock, aWorld.getBlockMetadata(aX, aY, aZ)) > 0.0F;
+	}
+
+	private ItemStack getContainerItem(ItemStack aStack, boolean playSound) {
+		if (!isItemStackUsable(aStack)) return null;
+		aStack = GT_Utility.copyAmount(1, aStack);
+		IToolStats tStats = getToolStats(aStack);
+		if (tStats == null) return null;
+		doDamage(aStack, tStats.getToolDamagePerContainerCraft());
+		aStack = aStack.stackSize > 0 ? aStack : null;
+		if (playSound) {
+			//String sound = (aStack == null) ? tStats.getBreakingSound() : tStats.getCraftingSound();
+			//GT_Utility.doSoundAtClient(sound, 1, 1.0F);
+		}
+		return aStack;
+	}
+
+	public IToolStats getToolStats(ItemStack aStack) {
+		isItemStackUsable(aStack);
+		return getToolStatsInternal(aStack);
+	}
+
+	private IToolStats getToolStatsInternal(ItemStack aStack) {
+		return aStack == null ? null : mToolStats.get((short) aStack.getItemDamage());
+	}
+
+	@Override
+	public float getSaplingModifier(ItemStack aStack, World aWorld, EntityPlayer aPlayer, int aX, int aY, int aZ) {
+		IToolStats tStats = getToolStats(aStack);
+		return tStats != null && tStats.isGrafter() ? Math.min(100.0F, (1 + getHarvestLevel(aStack, "")) * 20.0F) : 0.0F;
+	}
+
+	@Override
+	public boolean canWhack(EntityPlayer aPlayer, ItemStack aStack, int aX, int aY, int aZ) {
+		if (!isItemStackUsable(aStack)) return false;
+		IToolStats tStats = getToolStats(aStack);
+		return tStats != null && tStats.isCrowbar();
+	}
+
+	@Override
+	public void onWhack(EntityPlayer aPlayer, ItemStack aStack, int aX, int aY, int aZ) {
+		IToolStats tStats = getToolStats(aStack);
+		if (tStats != null) doDamage(aStack, tStats.getToolDamagePerEntityAttack());
+	}
+
+	@Override
+	public boolean canWrench(EntityPlayer player, int x, int y, int z) {
+		System.out.println("canWrench");
+		if(player==null)return false;
+		if(player.getCurrentEquippedItem()==null)return false;
+		if (!isItemStackUsable(player.getCurrentEquippedItem())) return false;
+		IToolStats tStats = getToolStats(player.getCurrentEquippedItem());
+		return tStats != null && tStats.isWrench();
+	}
+
+	@Override
+	public void wrenchUsed(EntityPlayer player, int x, int y, int z) {
+		if(player==null)return;
+		if(player.getCurrentEquippedItem()==null)return;
+		IToolStats tStats = getToolStats(player.getCurrentEquippedItem());
+		if (tStats != null) doDamage(player.getCurrentEquippedItem(), tStats.getToolDamagePerEntityAttack());
+	}
+
+	@Override
+	public boolean canUse(ItemStack stack, EntityPlayer player, int x, int y, int z){
+		return canWrench(player, x, y, z);
+	}
+
+	@Override
+	public void used(ItemStack stack, EntityPlayer player, int x, int y, int z){
+		wrenchUsed(player, x, y, z);
+	}
+
+	@Override
+	public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) {
+		if(player==null)return false;
+		if(player.getCurrentEquippedItem()==null)return false;
+		if (!isItemStackUsable(player.getCurrentEquippedItem())) return false;
+		IToolStats tStats = getToolStats(player.getCurrentEquippedItem());
+		return tStats.isWrench();
+	}
+
+	@Override
+	public boolean canLink(EntityPlayer aPlayer, ItemStack aStack, EntityMinecart cart) {
+		if (!isItemStackUsable(aStack)) return false;
+		IToolStats tStats = getToolStats(aStack);
+		return tStats != null && tStats.isCrowbar();
+	}
+
+	@Override
+	public void onLink(EntityPlayer aPlayer, ItemStack aStack, EntityMinecart cart) {
+		IToolStats tStats = getToolStats(aStack);
+		if (tStats != null) doDamage(aStack, tStats.getToolDamagePerEntityAttack());
+	}
+
+	@Override
+	public boolean canBoost(EntityPlayer aPlayer, ItemStack aStack, EntityMinecart cart) {
+		if (!isItemStackUsable(aStack)) return false;
+		IToolStats tStats = getToolStats(aStack);
+		return tStats != null && tStats.isCrowbar();
+	}
+
+	@Override
+	public void onBoost(EntityPlayer aPlayer, ItemStack aStack, EntityMinecart cart) {
+		IToolStats tStats = getToolStats(aStack);
+		if (tStats != null) doDamage(aStack, tStats.getToolDamagePerEntityAttack());
+	}
+
+	@Override
+	public void onCreated(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
+		IToolStats tStats = getToolStats(aStack);
+		if (tStats != null && aPlayer != null) tStats.onToolCrafted(aStack, aPlayer);
+		super.onCreated(aStack, aWorld, aPlayer);
+	}
+
+	@Override
+	public boolean isFull3D() {
+		return true;
+	}
+
+	@Override
+	public boolean isItemStackUsable(ItemStack aStack) {
+		IToolStats tStats = getToolStatsInternal(aStack);
+		if (aStack.getItemDamage() % 2 == 1 || tStats == null) {
+			NBTTagCompound aNBT = aStack.getTagCompound();
+			if (aNBT != null) aNBT.removeTag("ench");
+			return false;
+		}
+		Materials aMaterial = getPrimaryMaterial(aStack);
+		HashMap<Integer, Integer> tMap = new HashMap<Integer, Integer>(), tResult = new HashMap<Integer, Integer>();
+		if (aMaterial.mEnchantmentTools != null) {
+			tMap.put(aMaterial.mEnchantmentTools.effectId, (int) aMaterial.mEnchantmentToolsLevel);
+			if (aMaterial.mEnchantmentTools == Enchantment.fortune)
+				tMap.put(Enchantment.looting.effectId, (int) aMaterial.mEnchantmentToolsLevel);
+			if (aMaterial.mEnchantmentTools == Enchantment.knockback)
+				tMap.put(Enchantment.power.effectId, (int) aMaterial.mEnchantmentToolsLevel);
+			if (aMaterial.mEnchantmentTools == Enchantment.fireAspect)
+				tMap.put(Enchantment.flame.effectId, (int) aMaterial.mEnchantmentToolsLevel);
+		}
+		Enchantment[] tEnchants = tStats.getEnchantments(aStack);
+		int[] tLevels = tStats.getEnchantmentLevels(aStack);
+		for (int i = 0; i < tEnchants.length; i++)
+			if (tLevels[i] > 0) {
+				Integer tLevel = tMap.get(tEnchants[i].effectId);
+				tMap.put(tEnchants[i].effectId, tLevel == null ? tLevels[i] : tLevel == tLevels[i] ? tLevel + 1 : Math.max(tLevel, tLevels[i]));
+			}
+		for (Entry<Integer, Integer> tEntry : tMap.entrySet()) {
+			if (tEntry.getKey() == 33 || (tEntry.getKey() == 20 && tEntry.getValue() > 2) || tEntry.getKey() == Enchantment_Radioactivity.INSTANCE.effectId)
+				tResult.put(tEntry.getKey(), tEntry.getValue());
+			else
+				switch (Enchantment.enchantmentsList[tEntry.getKey()].type) {
+				case weapon:
+					if (tStats.isWeapon()) tResult.put(tEntry.getKey(), tEntry.getValue());
+					break;
+				case all:
+					tResult.put(tEntry.getKey(), tEntry.getValue());
+					break;
+				case armor:
+				case armor_feet:
+				case armor_head:
+				case armor_legs:
+				case armor_torso:
+					break;
+				case bow:
+					if (tStats.isRangedWeapon()) tResult.put(tEntry.getKey(), tEntry.getValue());
+					break;
+				case breakable:
+					break;
+				case fishing_rod:
+					break;
+				case digger:
+					if (tStats.isMiningTool()) tResult.put(tEntry.getKey(), tEntry.getValue());
+					break;
+				}
+		}
+		EnchantmentHelper.setEnchantments(tResult, aStack);
+		return true;
+	}
+
+	@Override
+	public short getChargedMetaData(ItemStack aStack) {
+		return (short) (aStack.getItemDamage() - (aStack.getItemDamage() % 2));
+	}
+
+	@Override
+	public short getEmptyMetaData(ItemStack aStack) {
+		NBTTagCompound aNBT = aStack.getTagCompound();
+		if (aNBT != null) aNBT.removeTag("ench");
+		return (short) (aStack.getItemDamage() + 1 - (aStack.getItemDamage() % 2));
+	}
+
+	@Override
+	public int getItemEnchantability() {
+		return 0;
+	}
+
+	@Override
+	public boolean isBookEnchantable(ItemStack aStack, ItemStack aBook) {
+		return false;
+	}
+
+	@Override
+	public boolean getIsRepairable(ItemStack aStack, ItemStack aMaterial) {
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaBasicTank.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaBasicTank.java
new file mode 100644
index 0000000000..a0bf55a39a
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaBasicTank.java
@@ -0,0 +1,262 @@
+package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.gui.GT_Container_BasicTank;
+import gregtech.api.gui.GT_GUIContainer_BasicTank;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
+/**
+ * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
+ * <p/>
+ * This is the main construct for my generic Tanks. Filling and emptying behavior have to be implemented manually
+ */
+public abstract class GregtechMetaBasicTank extends GT_MetaTileEntity_TieredMachineBlock {
+
+    public FluidStack mFluid;
+    public FluidStack mInternal;
+    /**
+     * @param aInvSlotCount should be 3
+     */
+    public GregtechMetaBasicTank(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription, ITexture... aTextures) {
+        super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription, aTextures);
+    }
+
+    public GregtechMetaBasicTank(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, aInvSlotCount, aDescription, aTextures);
+    }
+
+    @Override
+    public boolean isSimpleMachine() {
+        return false;
+    }
+
+    @Override
+    public boolean isValidSlot(int aIndex) {
+        return aIndex != getStackDisplaySlot();
+    }
+
+    @Override
+    public void saveNBTData(NBTTagCompound aNBT) {
+        if (mFluid != null) aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
+    }
+
+    @Override
+    public void loadNBTData(NBTTagCompound aNBT) {
+        mFluid = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mFluid"));
+    }
+
+    public abstract boolean doesFillContainers();
+
+    public abstract boolean doesEmptyContainers();
+
+    public abstract boolean canTankBeFilled();
+
+    public abstract boolean canTankBeEmptied();
+
+    public abstract boolean displaysItemStack();
+
+    public abstract boolean displaysStackSize();
+
+    public int getInputSlot() {
+        return 0;
+    }
+
+    public int getOutputSlot() {
+        return 1;
+    }
+
+    public int getStackDisplaySlot() {
+        return 2;
+    }
+
+    public boolean isFluidInputAllowed(FluidStack aFluid) {
+        return true;
+    }
+
+    public boolean isFluidChangingAllowed() {
+        return true;
+    }
+
+    public FluidStack getFillableStack() {
+        return mFluid;
+    }
+
+    public FluidStack setFillableStack(FluidStack aFluid) {
+        mFluid = aFluid;
+        return mFluid;
+    }
+    
+    public FluidStack setInternalStack(FluidStack aFluid) {
+        mInternal = aFluid;
+        return mInternal;
+    }
+    
+    public FluidStack getInternalStack() {
+        return mInternal;
+    }
+
+    public FluidStack getDrainableStack() {
+        return mFluid;
+    }
+
+    public FluidStack setDrainableStack(FluidStack aFluid) {
+        mFluid = aFluid;
+        return mFluid;
+    }
+
+    public FluidStack getDisplayedFluid() {
+        return getDrainableStack();
+    }
+
+    @Override
+    public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+        return new GT_Container_BasicTank(aPlayerInventory, aBaseMetaTileEntity);
+    }
+
+    @Override
+    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+        return new GT_GUIContainer_BasicTank(aPlayerInventory, aBaseMetaTileEntity, getLocalName());
+    }
+
+    @Override
+    public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+        if (aBaseMetaTileEntity.isServerSide()) {
+            if (isFluidChangingAllowed() && getFillableStack() != null && getFillableStack().amount <= 0)
+                setFillableStack(null);
+            if (isFluidChangingAllowed() && getFillableStack() != null && getFillableStack().amount >= 1)
+            	setInternalStack(getFillableStack());
+            if (displaysItemStack() && getStackDisplaySlot() >= 0 && getStackDisplaySlot() < mInventory.length) {
+                if (getDisplayedFluid() == null) {
+                    if (ItemList.Display_Fluid.isStackEqual(mInventory[getStackDisplaySlot()], true, true))
+                        mInventory[getStackDisplaySlot()] = null;
+                } else {
+                    mInventory[getStackDisplaySlot()] = GT_Utility.getFluidDisplayStack(getDisplayedFluid(), displaysStackSize());
+                }
+            }
+
+            if (doesEmptyContainers()) {
+                FluidStack tFluid = GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true);
+                if (tFluid != null && isFluidInputAllowed(tFluid)) {
+                    if (getFillableStack() == null) {
+                        if (isFluidInputAllowed(tFluid) && tFluid.amount <= getCapacity()) {
+                            if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), GT_Utility.getContainerItem(mInventory[getInputSlot()], true), 1)) {
+                                setFillableStack(tFluid.copy());
+                                aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
+                            }
+                        }
+                    } else {
+                        if (tFluid.isFluidEqual(getFillableStack()) && tFluid.amount + getFillableStack().amount <= getCapacity()) {
+                            if (aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), GT_Utility.getContainerItem(mInventory[getInputSlot()], true), 1)) {
+                                getFillableStack().amount += tFluid.amount;
+                                aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (doesFillContainers()) {
+                ItemStack tOutput = GT_Utility.fillFluidContainer(getDrainableStack(), mInventory[getInputSlot()], false, true);
+                if (tOutput != null && aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), tOutput, 1)) {
+                    FluidStack tFluid = GT_Utility.getFluidForFilledItem(tOutput, true);
+                    aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
+                    if (tFluid != null) getDrainableStack().amount -= tFluid.amount;
+                    if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) setDrainableStack(null);
+                }
+            }
+        }
+    }
+
+    @Override
+    public FluidStack getFluid() {
+        return getDrainableStack();
+    }
+
+    @Override
+    public int getFluidAmount() {
+        return getDrainableStack() != null ? getDrainableStack().amount : 0;
+    }
+
+    @Override
+    public int fill(FluidStack aFluid, boolean doFill) {
+        if (aFluid == null || aFluid.getFluid().getID() <= 0 || aFluid.amount <= 0 || !canTankBeFilled() || !isFluidInputAllowed(aFluid))
+            return 0;
+
+        if (getFillableStack() == null || getFillableStack().getFluid().getID() <= 0) {
+            if (aFluid.amount <= getCapacity()) {
+                if (doFill) {
+                    setFillableStack(aFluid.copy());
+                    getBaseMetaTileEntity().markDirty();
+                }
+                return aFluid.amount;
+            }
+            if (doFill) {
+                setFillableStack(aFluid.copy());
+                getFillableStack().amount = getCapacity();
+                getBaseMetaTileEntity().markDirty();
+            }
+            return getCapacity();
+        }
+
+        if (!getFillableStack().isFluidEqual(aFluid))
+            return 0;
+
+        int space = getCapacity() - getFillableStack().amount;
+        if (aFluid.amount <= space) {
+            if (doFill) {
+                getFillableStack().amount += aFluid.amount;
+                getBaseMetaTileEntity().markDirty();
+            }
+            return aFluid.amount;
+        }
+        if (doFill)
+            getFillableStack().amount = getCapacity();
+        return space;
+    }
+
+    @Override
+    public FluidStack drain(int maxDrain, boolean doDrain) {
+        if (getDrainableStack() == null || !canTankBeEmptied()) return null;
+        if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) {
+            setDrainableStack(null);
+            getBaseMetaTileEntity().markDirty();
+            return null;
+        }
+
+        int used = maxDrain;
+        if (getDrainableStack().amount < used)
+            used = getDrainableStack().amount;
+
+        if (doDrain) {
+            getDrainableStack().amount -= used;
+            getBaseMetaTileEntity().markDirty();
+        }
+
+        FluidStack drained = getDrainableStack().copy();
+        drained.amount = used;
+
+        if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) {
+            setDrainableStack(null);
+            getBaseMetaTileEntity().markDirty();
+        }
+
+        return drained;
+    }
+
+    @Override
+    public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+        return aIndex == getOutputSlot();
+    }
+
+    @Override
+    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+        return aIndex == getInputSlot();
+    }
+}
\ No newline at end of file