Merge branch 'Ore-Drilling-T5+T6' of https://github.com/GTNewHorizons/GT5-Unofficial into Ore-Drilling-T5+T6

# Conflicts:
#	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant5.java
#	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant6.java

2 files changed, 37 insertions, 0 deletions

diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index a02e4bbf64..1986ded3f5 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -1116,6 +1116,9 @@ public enum ItemList implements IItemContainer {
     Machine_HV_Printer,
     Machine_EV_Printer,
     Machine_IV_Printer,
+    Machine_LuV_Printer,
+    Machine_ZPM_Printer,
+    Machine_UV_Printer,
 
     Machine_LV_Recycler,
     Machine_MV_Recycler,
@@ -1170,6 +1173,9 @@ public enum ItemList implements IItemContainer {
     Machine_HV_Boxinator,
     Machine_EV_Boxinator,
     Machine_IV_Boxinator,
+    Machine_LuV_Boxinator,
+    Machine_ZPM_Boxinator,
+    Machine_UV_Boxinator,
 
     Machine_LV_Unboxinator,
     Machine_MV_Unboxinator,
diff --git a/src/main/java/gregtech/api/util/GT_ProcessingArray_Manager.java b/src/main/java/gregtech/api/util/GT_ProcessingArray_Manager.java
new file mode 100644
index 0000000000..e25a0209d9
--- /dev/null
+++ b/src/main/java/gregtech/api/util/GT_ProcessingArray_Manager.java
@@ -0,0 +1,31 @@
+package gregtech.api.util;
+
+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+
+import java.util.HashMap;
+
+public class GT_ProcessingArray_Manager {
+
+    private static final HashMap<Integer, String> mMetaKeyMap = new HashMap<Integer, String>();
+    private static final HashMap<String, GT_Recipe_Map> mRecipeCache = new HashMap<String, GT_Recipe_Map>();
+
+    public static boolean registerRecipeMapForMeta(int aMeta, GT_Recipe_Map aMap) {
+        if (aMeta < 0 || aMeta > Short.MAX_VALUE || aMap == null) {
+            return false;
+        }
+        if (mMetaKeyMap.containsKey(aMeta)) {
+            return false;
+        }
+        String aMapNameKey = aMap.mUnlocalizedName;
+        mMetaKeyMap.put(aMeta, aMapNameKey);
+        if (!mRecipeCache.containsKey(aMapNameKey)) {
+            mRecipeCache.put(aMapNameKey, aMap);
+        }
+        return true;
+    }
+
+    public static GT_Recipe_Map getRecipeMapForMeta(int aMeta) {
+        return mRecipeCache.get(mMetaKeyMap.get(aMeta));
+    }
+
+}
\ No newline at end of file