Merge branch 'experimental' into lock-single-recipe

1 files changed, 43 insertions, 2 deletions

diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index fe48f6506f..ff875c4884 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -113,7 +113,7 @@ public class GregTech_API {
     /**
      * The List of Cover Behaviors for the Covers
      */
-    public static final Map<GT_ItemStack, GT_CoverBehavior> sCoverBehaviors = new ConcurrentHashMap<>();
+    public static final Map<GT_ItemStack, GT_CoverBehaviorBase<?>> sCoverBehaviors = new ConcurrentHashMap<>();
     /**
      * The List of Circuit Behaviors for the Redstone Circuit Block
      */
@@ -615,6 +615,10 @@ public class GregTech_API {
     }
 
     public static void registerCover(ItemStack aStack, ITexture aCover, GT_CoverBehavior aBehavior) {
+        registerCover(aStack, aCover, (GT_CoverBehaviorBase<?>) aBehavior);
+    }
+
+    public static void registerCover(ItemStack aStack, ITexture aCover, GT_CoverBehaviorBase<?> aBehavior) {
         if (!sCovers.containsKey(new GT_ItemStack(aStack)))
             sCovers.put(new GT_ItemStack(aStack), aCover == null || !aCover.isValidTexture() ? Textures.BlockIcons.ERROR_RENDERING[0] : aCover);
         if (aBehavior != null)
@@ -622,6 +626,10 @@ public class GregTech_API {
     }
 
     public static void registerCoverBehavior(ItemStack aStack, GT_CoverBehavior aBehavior) {
+        registerCoverBehavior(aStack, (GT_CoverBehaviorBase<?>) aBehavior);
+    }
+
+    public static void registerCoverBehavior(ItemStack aStack, GT_CoverBehaviorBase<?> aBehavior) {
         sCoverBehaviors.put(new GT_ItemStack(aStack), aBehavior == null ? sDefaultBehavior : aBehavior);
     }
 
@@ -631,6 +639,15 @@ public class GregTech_API {
      * @param aBehavior can be null
      */
     public static void registerCover(Collection<ItemStack> aStackList, ITexture aCover, GT_CoverBehavior aBehavior) {
+        registerCover(aStackList, aCover, aBehavior);
+    }
+
+    /**
+     * Registers multiple Cover Items. I use that for the OreDict Functionality.
+     *
+     * @param aBehavior can be null
+     */
+    public static void registerCover(Collection<ItemStack> aStackList, ITexture aCover, GT_CoverBehaviorBase<?> aBehavior) {
         if (aCover.isValidTexture())
             aStackList.forEach(tStack -> GregTech_API.registerCover(tStack, aCover, aBehavior));
     }
@@ -638,10 +655,24 @@ public class GregTech_API {
     /**
      * returns a Cover behavior, guaranteed to not return null after preload
      */
+    @Deprecated
     public static GT_CoverBehavior getCoverBehavior(ItemStack aStack) {
         if (aStack == null || aStack.getItem() == null)
             return sNoBehavior;
-        GT_CoverBehavior rCover = sCoverBehaviors.get(new GT_ItemStack(aStack));
+        GT_CoverBehaviorBase<?> rCover = sCoverBehaviors.get(new GT_ItemStack(aStack));
+        if (!(rCover instanceof GT_CoverBehavior) || rCover == null)
+            return sDefaultBehavior;
+        return (GT_CoverBehavior) rCover;
+    }
+
+    /**
+     * returns a Cover behavior, guaranteed to not return null after preload
+     * @return
+     */
+    public static GT_CoverBehaviorBase<?> getCoverBehaviorNew(ItemStack aStack) {
+        if (aStack == null || aStack.getItem() == null)
+            return sNoBehavior;
+        GT_CoverBehaviorBase<?> rCover = sCoverBehaviors.get(new GT_ItemStack(aStack));
         if (rCover == null)
             return sDefaultBehavior;
         return rCover;
@@ -650,6 +681,7 @@ public class GregTech_API {
     /**
      * returns a Cover behavior, guaranteed to not return null
      */
+    @Deprecated
     public static GT_CoverBehavior getCoverBehavior(int aStack) {
         if (aStack == 0)
             return sNoBehavior;
@@ -657,6 +689,15 @@ public class GregTech_API {
     }
 
     /**
+     * returns a Cover behavior, guaranteed to not return null
+     */
+    public static GT_CoverBehaviorBase<?> getCoverBehaviorNew(int aStack) {
+        if (aStack == 0)
+            return sNoBehavior;
+        return getCoverBehaviorNew(GT_Utility.intToStack(aStack));
+    }
+
+    /**
      * Register a Wrench to be usable on GregTech Machines.
      * The Wrench MUST have some kind of Durability unlike certain Buildcraft Wrenches.
      * <p/>