+ Added Ink Sacs to Fish trap loot.

+ Added recycling recipes for all material components.
+ Added EnderIO alloys to the Alloy Blast Smelter.
- Reduced rate of Sand from Fish Trap by 5%.
- Removed some logging.
$ Fixed Tooltip of Large Sifter stating it only required 9 Sieves, now says 18 as intended.
$ Fixed Recipe Recycling not working as intended.

1 files changed, 197 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
new file mode 100644
index 0000000000..cf48516354
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java
@@ -0,0 +1,197 @@
+package gtPlusPlus.xmod.gregtech.loaders;
+
+import static gregtech.api.enums.GT_Values.M;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+import org.apache.commons.lang3.reflect.FieldUtils;
+
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.material.Material;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraft.item.ItemStack;
+
+public class RecipeGen_Recycling implements Runnable{
+
+	final Material toGenerate;
+	static Map mNameMap;
+
+	public RecipeGen_Recycling(final Material M){
+		this.toGenerate = M;
+		mNameMap = this.getNameMap();
+	}
+
+	@Override
+	public void run() {
+		generateRecipes(this.toGenerate);
+	}
+
+	public static void generateRecipes(final Material material){
+
+		Utils.LOG_INFO("Generating Recycling recipes for "+material.getLocalizedName());
+
+		final OrePrefixes[] mValidPrefixesAsString = {
+				OrePrefixes.ingot,
+				OrePrefixes.ingotHot,
+				OrePrefixes.nugget,
+				OrePrefixes.plate,
+				OrePrefixes.plateDense,
+				OrePrefixes.plateDouble,
+				OrePrefixes.plateTriple,
+				OrePrefixes.plateQuadruple,
+				OrePrefixes.plateQuintuple,
+				OrePrefixes.stick,
+				OrePrefixes.stickLong,
+				OrePrefixes.bolt,
+				OrePrefixes.screw,
+				OrePrefixes.ring,
+				OrePrefixes.rotor,
+				OrePrefixes.gearGt,
+				OrePrefixes.gearGtSmall
+		};
+
+		Utils.LOG_INFO("Found "+mValidPrefixesAsString.length+" valid OreDict prefixes.");
+		if (mValidPrefixesAsString.length >= 1){
+			for (final OrePrefixes validPrefix : mValidPrefixesAsString){
+
+				try {
+					final ItemStack tempStack = ItemUtils.getItemStackOfAmountFromOreDict(validPrefix+material.getLocalizedName(), 1);
+
+					if ((tempStack != null) && (tempStack != ItemUtils.getSimpleStack(ModItems.AAA_Broken))){
+						//mValidItems[mSlotIndex++] = tempStack;
+						final ItemStack mDust = getDust(material, validPrefix);
+						if ((mDust != null) && GT_ModHandler.addPulverisationRecipe(tempStack, mDust)){
+							Utils.LOG_INFO("Recycle Recipe: "+material.getLocalizedName()+" - Success - Recycle "+tempStack.getDisplayName()+" and obtain "+mDust.getDisplayName());
+						}
+						else {
+							Utils.LOG_INFO("Recycle Recipe: "+material.getLocalizedName()+" - Failed");
+							if (mDust == null){
+								Utils.LOG_INFO("Invalid Dust output.");
+							}
+						}
+					}
+				} catch (final Throwable t){
+					t.printStackTrace();
+					Utils.LOG_INFO("Returning Null. Throwable Info: "+t.getMessage());
+					Utils.LOG_INFO("Throwable Info: "+t.toString());
+					Utils.LOG_INFO("Throwable Info: "+t.getCause().toString());
+
+				}
+
+			}
+		}
+	}
+
+
+
+	public static ItemStack getDust(final Material aMaterial, final OrePrefixes aPrefix) {
+		return aMaterial == null ? null : getDust(aMaterial, aPrefix.mMaterialAmount);
+	}
+
+	public static ItemStack getDust(final Material aMaterial, final long aMaterialAmount) {
+		if (aMaterialAmount <= 0) {
+			return null;
+		}
+		ItemStack rStack = null;
+		if ((((aMaterialAmount % M) == 0) || (aMaterialAmount >= (M * 16)))) {
+			rStack = get(OrePrefixes.dust, aMaterial, aMaterialAmount / M);
+		}
+		if ((rStack == null) && ((((aMaterialAmount * 4) % M) == 0) || (aMaterialAmount >= (M * 8)))) {
+			rStack = get(OrePrefixes.dustSmall, aMaterial, (aMaterialAmount * 4) / M);
+		}
+		if ((rStack == null) && (((aMaterialAmount * 9) >= M))) {
+			rStack = get(OrePrefixes.dustTiny, aMaterial, (aMaterialAmount * 9) / M);
+		}
+		if (rStack == null){
+			Utils.LOG_INFO("Returning Null. Method: "+ReflectionUtils.getMethodName(0));
+			Utils.LOG_INFO("Called from method: "+ReflectionUtils.getMethodName(1));
+			Utils.LOG_INFO("Called from method: "+ReflectionUtils.getMethodName(2));
+		}
+
+		return rStack;
+	}
+
+	public static ItemStack get(final Object aName, final long aAmount) {
+		return get(aName, null, aAmount, true, true);
+	}
+
+	public static ItemStack get(final Object aName, final ItemStack aReplacement, final long aAmount) {
+		return get(aName, aReplacement, aAmount, true, true);
+	}
+
+	public static ItemStack get(final OrePrefixes aPrefix, final Object aMaterial, final long aAmount) {
+		return get(aPrefix, aMaterial, null, aAmount);
+	}
+
+	public static ItemStack get(final OrePrefixes aPrefix, final Object aMaterial, final ItemStack aReplacement,
+			final long aAmount) {
+		if (OrePrefixes.mPreventableComponents.contains(aPrefix) && aPrefix.mDisabledItems.contains(aMaterial)) {
+			return aReplacement;
+		}
+		return get(aPrefix.get(aMaterial), aReplacement, aAmount, false, true);
+	}
+
+	public static ItemStack get(final Object aName, final ItemStack aReplacement, final long aAmount,
+			final boolean aMentionPossibleTypos, final boolean aNoInvalidAmounts) {
+		if (aNoInvalidAmounts && (aAmount < 1L)) {
+			Utils.LOG_INFO("Returning Null. Method: "+ReflectionUtils.getMethodName(0));
+			Utils.LOG_INFO("Called from method: "+ReflectionUtils.getMethodName(1));
+			Utils.LOG_INFO("Called from method: "+ReflectionUtils.getMethodName(2));
+			return null;
+		}
+		if (!mNameMap.containsKey(aName.toString()) && aMentionPossibleTypos) {
+			Utils.LOG_INFO("Unknown Key for Unification, Typo? " + aName);
+		}
+		return GT_Utility.copyAmount(aAmount, new Object[]{mNameMap.get(aName.toString()),
+				getFirstOre(aName, aAmount), aReplacement});
+	}
+
+
+	public static ItemStack getFirstOre(final Object aName, final long aAmount) {
+		if (GT_Utility.isStringInvalid(aName)) {
+			Utils.LOG_INFO("Returning Null. Method: "+ReflectionUtils.getMethodName(0));
+			Utils.LOG_INFO("Called from method: "+ReflectionUtils.getMethodName(1));
+			Utils.LOG_INFO("Called from method: "+ReflectionUtils.getMethodName(2));
+			return null;
+		}
+		final ItemStack tStack = (ItemStack) mNameMap.get(aName.toString());
+		if (GT_Utility.isStackValid(tStack)) {
+			return GT_Utility.copyAmount(aAmount, new Object[]{tStack});
+		}
+		return GT_Utility.copyAmount(aAmount, getOres(aName).toArray());
+	}
+
+	public static ArrayList<ItemStack> getOres(final Object aOreName) {
+		final String aName = (aOreName == null) ? "" : aOreName.toString();
+		final ArrayList<ItemStack> rList = new ArrayList<ItemStack>();
+		if (GT_Utility.isStringValid(aName)) {
+			rList.addAll(getOres(aName));
+		}
+		return rList;
+	}
+
+	public Map getNameMap(){
+		Map<String, ItemStack> tempMap;
+		try {
+			tempMap = (Map<String, ItemStack>) FieldUtils.readStaticField(GT_OreDictUnificator.class, "sName2StackMap", true);
+			if (tempMap != null){
+				return tempMap;
+			}
+		}
+		catch (final IllegalAccessException e) {
+			e.printStackTrace();
+		}
+		Utils.LOG_INFO("Invalid map stored in GT_OreDictUnificator.class, unable to find sName2StackMap field.");
+		return null;
+	}
+
+
+
+}