Merge addon sources

5 files changed, 0 insertions, 692 deletions

diff --git a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java b/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java
deleted file mode 100644
index 9431739c45..0000000000
--- a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/GregtechItemContainer.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.interfaces;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-public interface GregtechItemContainer {
-
-    public Item getItem();
-
-    public Block getBlock();
-
-    public boolean isStackEqual(Object aStack);
-
-    public boolean isStackEqual(Object aStack, boolean aWildcard, boolean aIgnoreNBT);
-
-    public ItemStack get(long aAmount, Object... aReplacements);
-
-    public ItemStack getWildcard(long aAmount, Object... aReplacements);
-
-    public ItemStack getUndamaged(long aAmount, Object... aReplacements);
-
-    public ItemStack getAlmostBroken(long aAmount, Object... aReplacements);
-
-    public ItemStack getWithDamage(long aAmount, long aMetaValue, Object... aReplacements);
-
-    public GregtechItemContainer set(Item aItem);
-
-    public GregtechItemContainer set(ItemStack aStack);
-
-    public GregtechItemContainer registerOre(Object... aOreNames);
-
-    public GregtechItemContainer registerWildcardAsOre(Object... aOreNames);
-
-    public ItemStack getWithCharge(long aAmount, int aEnergy, Object... aReplacements);
-
-    public ItemStack getWithName(long aAmount, String aDisplayName, Object... aReplacements);
-
-    public boolean hasBeenSet();
-}
diff --git a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
deleted file mode 100644
index faa39dadc3..0000000000
--- a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ /dev/null
@@ -1,380 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
-
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-
-import gregtech.api.enums.Materials;
-import gtPlusPlus.core.material.Material;
-
-@SuppressWarnings("UnusedReturnValue")
-public interface IGregtech_RecipeAdder {
-
-    /**
-     * Adds a Coke Oven Recipe
-     *
-     * @param aInput1      = first Input (not null, and respects StackSize)
-     * @param aInput2      = second Input (can be null, and respects StackSize)
-     * @param aFluidOutput = Output of the Creosote (not null, and respects StackSize)
-     * @param aFluidInput  = fluid Input (can be null, and respects StackSize)
-     * @param aOutput      = Output of the Coal/coke (can be null, and respects StackSize)
-     * @param aDuration    = Duration (must be >= 0)
-     * @param aEUt         = EU needed for heating up (must be >= 0)
-     * @return true if the Recipe got added, otherwise false.
-     */
-    boolean addCokeOvenRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput,
-        ItemStack aOutput, int aDuration, int aEUt);
-
-    boolean addCokeOvenRecipe(int aCircuit, ItemStack aInput2, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs,
-        ItemStack[] aOutputs, int aDuration, int aEUt);
-
-    boolean addCokeOvenRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack[] aFluidInputs,
-        FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int aDuration, int aEUt);
-
-    /**
-     * Adds a Matter Fabricator Recipe
-     *
-     * @param aFluidOutput = Output of the UU-Matter (not null, and respects StackSize)
-     * @param aFluidInput  = fluid Input (can be UU_Amp or null, and respects StackSize)
-     * @param aDuration    = Duration (must be >= 0)
-     * @param aEUt         = EU needed for heating up (must be >= 0)
-     * @return true if the Recipe got added, otherwise false.
-     */
-    @Deprecated
-    boolean addMatterFabricatorRecipe(FluidStack aFluidInput, FluidStack aFluidOutput, int aDuration, int aEUt);
-
-    /**
-     * Adds a Recipe for the Dehydrator. (up to 9 Outputs)
-     *
-     * @param aInput       = ItemStack[] (not null, and respects StackSize)
-     * @param aFluidInput  = fluid Input (can be UU_Amp or null, and respects StackSize)
-     * @param aFluidOutput = Output of the UU-Matter (not null, and respects StackSize)
-     * @param aOutputItems = ItemStack[] (not null, and respects StackSize)
-     * @param aChances     = Output Change (can be == 0)
-     * @param aDuration    = Duration (must be >= 0)
-     * @param aEUt         = EU needed for heating up (must be >= 0)
-     * @return true if the Recipe got added, otherwise false.
-     */
-    boolean addDehydratorRecipe(ItemStack[] aInput, FluidStack aFluidInput, FluidStack aFluidOutput,
-        ItemStack[] aOutputItems, int[] aChances, int aDuration, int aEUt);
-
-    /**
-     * Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs)
-     *
-     * @param aInput    = ItemStack[] (not null, and respects StackSize)
-     * @param aOutput   = Output of the Molten Metal (not null, and respects StackSize)
-     * @param aChance   = Output Chance (can be == 0)
-     * @param aDuration = Duration (must be >= 0)
-     * @param aEUt      = EU per tick needed for heating up (must be >= 0)
-     * @return true if the Recipe got added, otherwise false.
-     */
-
-    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aOutput, int aChance, int aDuration, int aEUt);
-
-    /**
-     * Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs)
-     *
-     * @param aInput      = ItemStack[] (not null, and respects StackSize)
-     * @param aInputFluid = Input of a fluid (can be null, and respects StackSize)
-     * @param aOutput     = Output of the Molten Metal (not null, and respects StackSize)
-     * @param aChance     = Output Chance (can be == 0)
-     * @param aDuration   = Duration (must be >= 0)
-     * @param aEUt        = EU per tick needed for heating up (must be >= 0)
-     * @return true if the Recipe got added, otherwise false.
-     */
-
-    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, int aChance,
-        int aDuration, int aEUt);
-
-    /**
-     * Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs, More than 1 Fluids)
-     *
-     * @param aInput      = ItemStack[] (not null, and respects StackSize)
-     * @param aInputFluid = FluidStack[] (can be null, and respects StackSize)
-     * @param aOutput     = Output of the Molten Metal (not null, and respects StackSize)
-     * @param aChance     = Output Chance (can be == 0)
-     * @param aDuration   = Duration (must be >= 0)
-     * @param aEUt        = EU per tick needed for heating up (must be >= 0)
-     * @return true if the Recipe got added, otherwise false.
-     */
-
-    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput, int aChance,
-        int aDuration, int aEUt);
-
-    /**
-     * Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs)
-     *
-     * @param aInput       = ItemStack[] (not null, and respects StackSize)
-     * @param aInputFluid  = Input of a fluid (can be null, and respects StackSize)
-     * @param aOutput      = Output of the Molten Metal (not null, and respects StackSize)
-     * @param aOutputStack = Item Output (Can be null)
-     * @param aChance      = Output Chance (can be == 0)
-     * @param aDuration    = Duration (must be >= 0)
-     * @param aEUt         = EU per tick needed for heating up (must be >= 0)
-     * @return true if the Recipe got added, otherwise false.
-     */
-
-    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
-        ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt);
-
-    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, int aChance,
-        int aDuration, int aEUt, int aSpecialValue);
-
-    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
-        ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue, boolean aOptimizeRecipe);
-
-    /**
-     * Adds a Recipe for the Alloy Blast Smelter. (up to 9 Inputs, More than 1 fluids)
-     *
-     * @param aInput       = ItemStack[] (not null, and respects StackSize)
-     * @param aInputFluid  = FluidStack[] (can be null, and respects StackSize)
-     * @param aOutput      = Output of the Molten Metal (not null, and respects StackSize)
-     * @param aOutputStack = Item Output (Can be null)
-     * @param aChance      = Output Chance (can be == 0)
-     * @param aDuration    = Duration (must be >= 0)
-     * @param aEUt         = EU per tick needed for heating up (must be >= 0)
-     * @return true if the Recipe got added, otherwise false.
-     */
-
-    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
-        ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt);
-
-    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput, int aChance,
-        int aDuration, int aEUt, int aSpecialValue);
-
-    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
-        ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue, boolean aOptimizeRecipe);
-
-    /**
-     * Adds a Recipe for the LFTRr. (up to 9 Inputs)
-     *
-     * @param aInput        = ItemStack[] (not null, and respects StackSize)
-     * @param aInputFluid   = Input of a fluid (can be null, and respects StackSize)
-     * @param aOutput       = Output of the Molten Salts (not null, and respects StackSize)
-     * @param aOutputStack  = Item Output (Can be null)
-     * @param aChance       = Output Chance (can be == 0)
-     * @param aDuration     = Duration (must be >= 0)
-     * @param aEUt          = EU per tick needed for heating up (must be >= 0)
-     * @param aSpecialValue = Power produced in EU/t per dynamo
-     * @return true if the Recipe got added, otherwise false.
-     */
-
-    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
-        ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue);
-
-    /**
-     * Adds a Recipe for the Quantum Force Smelter (up to 9 Inputs)
-     *
-     *
-     **/
-    boolean addQuantumTransformerRecipe(ItemStack[] aInput, FluidStack[] aFluidInput, FluidStack[] aFluidOutput,
-        ItemStack[] aOutputStack, int[] aChances, int aDuration, int aEUt, int aSpecialValue);
-
-    /**
-     * Adds a Recipe for the LFTRr. (up to 9 Inputs, More than 1 fluids)
-     *
-     * @param aInput        = ItemStack[] (not null, and respects StackSize)
-     * @param aInputFluid   = FluidStack[] (can be null, and respects StackSize)
-     * @param aOutput       = Output of the Molten Salts (not null, and respects StackSize)
-     * @param aOutputStack  = Item Output (Can be null)
-     * @param aChance       = Output Chance (can be == 0)
-     * @param aDuration     = Duration (must be >= 0)
-     * @param aEUt          = EU per tick needed for heating up (must be >= 0)
-     * @param aSpecialValue = Power produced in EU/t per dynamo
-     * @return true if the Recipe got added, otherwise false.
-     */
-    @Deprecated
-    boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
-        ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue);
-
-    /**
-     * Adds a custom Semifluid fuel for the GT++ SemiFluid Generators.
-     * 
-     * @param aFuelItem  - A Fluidstack to be consumed.
-     * @param aFuelValue - Fuel value in thousands (1 = 1000)
-     * @return - Was the Fuel added?
-     */
-    boolean addSemifluidFuel(FluidStack aFuelItem, int aFuelValue);
-
-    /**
-     * Adds a custom Semifluid fuel for the GT++ SemiFluid Generators.
-     * 
-     * @param aFuelItem  - A Fluidstack to be consumed.
-     * @param aFuelValue - Fuel value in thousands (1 = 1000)
-     * @return - Was the Fuel added?
-     */
-    boolean addSemifluidFuel(ItemStack aFuelItem, int aFuelValue);
-
-    boolean addFissionFuel(FluidStack aInput1, FluidStack aInput2, FluidStack aInput3, FluidStack aInput4,
-        FluidStack aInput5, FluidStack aInput6, FluidStack aInput7, FluidStack aInput8, FluidStack aInput9,
-        FluidStack aOutput1, FluidStack aOutput2, int aDuration, int aEUt);
-
-    boolean addFissionFuel(boolean aOptimise, FluidStack aInput1, FluidStack aInput2, FluidStack aInput3,
-        FluidStack aInput4, FluidStack aInput5, FluidStack aInput6, FluidStack aInput7, FluidStack aInput8,
-        FluidStack aInput9, FluidStack aOutput1, FluidStack aOutput2, int aDuration, int aEUt);
-
-    boolean addCyclotronRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, FluidStack aFluidOutput,
-        int[] aChances, int aDuration, int aEUt, int aSpecialValue);
-
-    boolean addCyclotronRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack[] aOutput,
-        FluidStack aFluidOutput, int[] aChances, int aDuration, int aEUt, int aSpecialValue);
-
-    @Deprecated
-    boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4,
-        FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3,
-        ItemStack aOutput4, int aDuration, int aEUt);
-
-    boolean addMultiblockCentrifugeRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs,
-        ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick, int aSpecial);
-
-    boolean addMultiblockElectrolyzerRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs,
-        ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick, int aSpecial);
-
-    boolean addAdvancedFreezerRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs,
-        ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick, int aSpecial);
-
-    @Deprecated
-    boolean addSixSlotAssemblingRecipe(ItemStack[] aInputs, FluidStack aInputFluid, ItemStack aOutput1, int aDuration,
-        int aEUt);
-
-    /**
-     * Adds an Assemblyline Recipe
-     *
-     * @param aInputs      must be != null, 4-16 inputs
-     * @param aFluidInputs 0-4 fluids
-     * @param aOutput      must be != null
-     * @param aDuration    must be > 0
-     * @param aEUt         should be > 0
-     */
-    @Deprecated
-    boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, ItemStack[] aInputs,
-        FluidStack[] aFluidInputs, ItemStack aOutput, int aDuration, int aEUt);
-
-    /**
-     * Adds a Assemblyline Recipe
-     *
-     * @param aInputs elements should be: ItemStack for single item; ItemStack[] for multiple equivalent items;
-     *                {OreDict, amount} for oredict.
-     */
-    @Deprecated
-    boolean addAssemblylineRecipe(ItemStack aResearchItem, int aResearchTime, Object[] aInputs,
-        FluidStack[] aFluidInputs, ItemStack aOutput1, int aDuration, int aEUt);
-
-    @Deprecated
-    boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid,
-        ItemStack output, int time, int eu);
-
-    @Deprecated
-    boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid,
-        ItemStack output, Object object, int time, int eu);
-
-    @Deprecated
-    boolean addChemicalRecipe(ItemStack input1, ItemStack input2, FluidStack inputFluid, FluidStack outputFluid,
-        ItemStack output, ItemStack object, int time);
-
-    @Deprecated
-    boolean addChemicalRecipe(ItemStack input1, ItemStack input2, int aCircuit, FluidStack inputFluid,
-        FluidStack outputFluid, ItemStack output, ItemStack output2, int time, int eu);
-
-    @Deprecated
-    boolean addMultiblockChemicalRecipe(ItemStack[] itemStacks, FluidStack[] fluidStacks, FluidStack[] fluidStacks2,
-        ItemStack[] outputs, int time, int eu);
-
-    @Deprecated
-    boolean addCompressorRecipe(ItemStack aInput1, ItemStack aOutput1, int aDuration, int aEUt);
-
-    @Deprecated
-    boolean addBrewingRecipe(ItemStack aIngredient, FluidStack aInput, FluidStack aOutput, int aTime, int aEu,
-        boolean aHidden);
-
-    @Deprecated
-    boolean addBrewingRecipe(int aCircuit, FluidStack aInput, FluidStack aOutput, int aTime, int aEu, boolean aHidden);
-
-    @Deprecated
-    boolean addSmeltingAndAlloySmeltingRecipe(ItemStack aDust, ItemStack aOutput);
-
-    @Deprecated
-    boolean addFluidExtractionRecipe(ItemStack input, FluidStack output, int aTime, int aEu);
-
-    @Deprecated
-    boolean addFluidExtractionRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidOut, int aTime,
-        int aEu);
-
-    @Deprecated
-    boolean addFluidCannerRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidIn);
-
-    @Deprecated
-    boolean addFluidCannerRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidIn,
-        FluidStack rFluidOut);
-
-    @Deprecated
-    boolean addFluidCannerRecipe(ItemStack aContainer, ItemStack aFullContainer, FluidStack rFluidIn,
-        FluidStack rFluidOut, int aTime, int aEu);
-
-    boolean addVacuumFurnaceRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput,
-        FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt, int aLevel);
-
-    boolean addVacuumFurnaceRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, ItemStack[] aOutputs,
-        FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aLevel);
-
-    @Deprecated
-    boolean addUvLaserRecipe(ItemStack aInput1, ItemStack aOutput, int time, long eu);
-
-    boolean addChemicalPlantRecipe(ItemStack[] aInputs, FluidStack[] aInputFluids, ItemStack[] aOutputs,
-        FluidStack[] aFluidOutputs, int time, long eu, int aTier);
-
-    boolean addChemicalPlantRecipe(ItemStack[] aInputs, FluidStack[] aInputFluids, ItemStack[] aOutputs,
-        FluidStack[] aFluidOutputs, int[] aChances, int time, long eu, int aTier);
-
-    @Deprecated
-    boolean addBlastRecipe(ItemStack[] aInputs, FluidStack[] aInputFluids, ItemStack[] aOutputs,
-        FluidStack[] aFluidOutputs, int time, long eu, int aHeat);
-
-    @Deprecated
-    boolean addPyrolyseRecipe(ItemStack aInput, FluidStack aFluidInput, int intCircuit, ItemStack aOutput,
-        FluidStack aFluidOutput, int aDuration, int aEUt);
-
-    @Deprecated
-    boolean addExtractorRecipe(ItemStack aInput, ItemStack aOutput, int aDuration, int aEUt);
-
-    @Deprecated
-    boolean addExtractorRecipe(ItemStack aInput, ItemStack aOutput, int aChance, int aDuration, int aEUt);
-
-    @Deprecated
-    boolean addDistilleryRecipe(ItemStack aCircuit, FluidStack aInput, FluidStack aOutput, ItemStack aSolidOutput,
-        int aDuration, int aEUt, boolean aHidden);
-
-    @Deprecated
-    boolean addPulverisationRecipe(final ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2,
-        final ItemStack aOutput3);
-
-    boolean addMillingRecipe(Materials aMat, int aEU);
-
-    boolean addMillingRecipe(Material aMat, int aEU);
-
-    boolean addFlotationRecipe(Materials aMat, ItemStack aXanthate, FluidStack[] aInputFluids,
-        FluidStack[] aOutputFluids, int aTime, int aEU);
-
-    boolean addFlotationRecipe(Material aMat, ItemStack aXanthate, FluidStack[] aInputFluids,
-        FluidStack[] aOutputFluids, int aTime, int aEU);
-
-    @Deprecated
-    boolean addpackagerRecipe(ItemStack aRecipeType, ItemStack aInput1, ItemStack aInput2, ItemStack aOutputStack1);
-
-    boolean addFuelForRTG(ItemStack aFuelPellet, int aFuelDays, int aVoltage);
-
-    boolean addColdTrapRecipe(int aCircuit, ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs,
-        int[] aChances, FluidStack aFluidOutput, int aTime, int aEU);
-
-    boolean addReactorProcessingUnitRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput,
-        ItemStack[] aOutputs, int[] aChances, FluidStack aFluidOutput, int aTime, int aEU);
-
-    @Deprecated
-    boolean addFluidHeaterRecipe(ItemStack aCircuit, FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt);
-
-    @Deprecated
-    boolean addVacuumFreezerRecipe(ItemStack aInput, ItemStack aOutput, int aDuration, int aEU);
-
-    boolean addMolecularTransformerRecipe(ItemStack aInput, ItemStack aOutput, int aDuration, int aEU);
-
-    boolean addMolecularTransformerRecipe(ItemStack aInput, ItemStack aOutput, int aDuration, int aEU, int aAmps);
-}
diff --git a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java b/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
deleted file mode 100644
index 545a97288f..0000000000
--- a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ItemBehaviour.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
-
-import java.util.List;
-
-import net.minecraft.dispenser.IBlockSource;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-import gregtech.api.enums.SubTag;
-import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_Base;
-
-public interface Interface_ItemBehaviour<E extends Item> {
-
-    public boolean onLeftClickEntity(E aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity);
-
-    public boolean onItemUse(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
-        int aSide, float hitX, float hitY, float hitZ);
-
-    public boolean onItemUseFirst(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
-        int aSide, float hitX, float hitY, float hitZ);
-
-    public ItemStack onItemRightClick(E aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer);
-
-    public List<String> getAdditionalToolTips(E aItem, List<String> aList, ItemStack aStack);
-
-    public void onUpdate(E aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand);
-
-    public boolean isItemStackUsable(E aItem, ItemStack aStack);
-
-    public boolean canDispense(E aItem, IBlockSource aSource, ItemStack aStack);
-
-    public ItemStack onDispense(E aItem, IBlockSource aSource, ItemStack aStack);
-
-    public boolean hasProjectile(Gregtech_MetaItem_Base aItem, SubTag aProjectileType, ItemStack aStack);
-
-    public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld, double aX,
-        double aY, double aZ);
-
-    public EntityArrow getProjectile(E aItem, SubTag aProjectileType, ItemStack aStack, World aWorld,
-        EntityLivingBase aEntity, float aSpeed);
-}
diff --git a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java b/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
deleted file mode 100644
index 6ae25525bd..0000000000
--- a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_OreRecipeRegistrator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
-
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.Materials;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-
-public interface Interface_OreRecipeRegistrator {
-
-    /**
-     * Contains a Code Fragment, used in the OrePrefix to register Recipes. Better than using a switch/case, like I did
-     * before.
-     *
-     * @param aPrefix   always != null
-     * @param aMaterial always != null, and can be == _NULL if the Prefix is Self Referencing or not Material based!
-     * @param aStack    always != null
-     */
-    public void registerOre(GregtechOrePrefixes aPrefix, GT_Materials aMaterial, String aOreDictName, String aModName,
-        ItemStack aStack);
-
-    public void registerOre(GregtechOrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
-        ItemStack copyAmount);
-}
diff --git a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java b/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
deleted file mode 100644
index 97d952d4a1..0000000000
--- a/gtpp/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/Interface_ToolStats.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.interfaces.internal;
-
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.DamageSource;
-import net.minecraftforge.event.world.BlockEvent;
-
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.interfaces.IToolStats;
-import gregtech.api.items.GT_MetaGenerated_Tool;
-import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaTool;
-
-/**
- * The Stats for GT Tools. Not including any Material Modifiers.
- * <p/>
- * And this is supposed to not have any ItemStack Parameters as these are generic Stats.
- */
-public interface Interface_ToolStats extends IToolStats {
-
-    /**
-     * Called when aPlayer crafts this Tool
-     */
-    @Override
-    public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer);
-
-    /**
-     * Called when this gets added to a Tool Item
-     */
-    public void onStatsAddedToTool(Gregtech_MetaTool gregtech_MetaTool, int aID);
-
-    /**
-     * @return Damage the Tool receives when breaking a Block. 100 is one Damage Point (or 100 EU).
-     */
-    @Override
-    public int getToolDamagePerBlockBreak();
-
-    /**
-     * @return Damage the Tool receives when converting the drops of a Block. 100 is one Damage Point (or 100 EU).
-     */
-    @Override
-    public int getToolDamagePerDropConversion();
-
-    /**
-     * @return Damage the Tool receives when being used as Container Item. 100 is one use, however it is usually 8 times
-     *         more than normal.
-     */
-    @Override
-    public int getToolDamagePerContainerCraft();
-
-    /**
-     * @return Damage the Tool receives when being used as Weapon, 200 is the normal Value, 100 for actual Weapons.
-     */
-    @Override
-    public int getToolDamagePerEntityAttack();
-
-    /**
-     * @return Basic Quality of the Tool, 0 is normal. If increased, it will increase the general quality of all Tools
-     *         of this Type. Decreasing is also possible.
-     */
-    @Override
-    public int getBaseQuality();
-
-    /**
-     * @return The Damage Bonus for this Type of Tool against Mobs. 1.0F is normal punch.
-     */
-    @Override
-    public float getBaseDamage();
-
-    /**
-     * @return This gets the Hurt Resistance time for Entities getting hit. (always does 1 as minimum)
-     */
-    @Override
-    public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity);
-
-    /**
-     * @return This is a multiplier for the Tool Speed. 1.0F = no special Speed.
-     */
-    @Override
-    public float getSpeedMultiplier();
-
-    /**
-     * @return This is a multiplier for the Tool Speed. 1.0F = no special Durability.
-     */
-    @Override
-    public float getMaxDurabilityMultiplier();
-
-    @Override
-    public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity);
-
-    @Override
-    public String getMiningSound();
-
-    @Override
-    public String getCraftingSound();
-
-    @Override
-    public String getEntityHitSound();
-
-    @Override
-    public String getBreakingSound();
-
-    @Override
-    public Enchantment[] getEnchantments(ItemStack aStack);
-
-    @Override
-    public int[] getEnchantmentLevels(ItemStack aStack);
-
-    /**
-     * @return If this Tool can be used for blocking Damage like a Sword.
-     */
-    @Override
-    public boolean canBlock();
-
-    /**
-     * @return If this Tool can be used as an RC Crowbar.
-     */
-    @Override
-    public boolean isCrowbar();
-
-    /**
-     * @return If this Tool can be used as an BC Wrench.
-     */
-    @Override
-    public boolean isWrench();
-
-    /**
-     * @return If this Tool can be used as Weapon i.e. if that is the main purpose.
-     */
-    @Override
-    public boolean isWeapon();
-
-    /**
-     * @return If this Tool is a Ranged Weapon. Return false at isWeapon unless you have a Blade attached to your
-     *         Bow/Gun or something
-     */
-    @Override
-    public boolean isRangedWeapon();
-
-    /**
-     * @return If this Tool can be used as Weapon i.e. if that is the main purpose.
-     */
-    @Override
-    public boolean isMiningTool();
-
-    /**
-     * aBlock.getHarvestTool(aMetaData) can return the following Values for example. "axe", "pickaxe", "sword",
-     * "shovel", "hoe", "grafter", "saw", "wrench", "crowbar", "file", "hammer", "plow", "plunger", "scoop",
-     * "screwdriver", "sense", "scythe", "softhammer", "cutter", "plasmatorch"
-     *
-     * @return If this is a minable Block. Tool Quality checks (like Diamond Tier or something) are separate from this
-     *         check.
-     */
-    @Override
-    public boolean isMinableBlock(Block aBlock, byte aMetaData);
-
-    /**
-     * This lets you modify the Drop List, when this type of Tool has been used.
-     *
-     * @return the Amount of modified Items.
-     */
-    @Override
-    public int convertBlockDrops(List<ItemStack> aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX,
-        int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent);
-
-    /**
-     * @return Returns a broken Version of the Item.
-     */
-    @Override
-    public ItemStack getBrokenItem(ItemStack aStack);
-
-    /**
-     * @return the Damage actually done to the Mob.
-     */
-    @Override
-    public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
-        EntityPlayer aPlayer);
-
-    /**
-     * @return the Damage actually done to the Mob.
-     */
-    @Override
-    public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack,
-        EntityPlayer aPlayer);
-
-    @Override
-    public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack);
-
-    @Override
-    public short[] getRGBa(boolean aIsToolHead, ItemStack aStack);
-
-    /**
-     * Called when this gets added to a Tool Item
-     */
-    @Override
-    public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID);
-}