diff options
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_ModHandler.java | 28 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java | 2 |
2 files changed, 21 insertions, 9 deletions
diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java index 4ec093bdf6..93e8137912 100644 --- a/src/main/java/gregtech/api/util/GT_ModHandler.java +++ b/src/main/java/gregtech/api/util/GT_ModHandler.java @@ -697,7 +697,7 @@ public class GT_ModHandler { boolean aExcludeGTIC2Items) { Map<ItemStack, ItemStack> aRecipesToRemove = new HashMap<>(); for (Entry<IRecipeInput, RecipeOutput> iRecipeInputRecipeOutputEntry : aIC2RecipeList.entrySet()) { - if ((iRecipeInputRecipeOutputEntry.getValue()).items.size() > 0) { + if (!iRecipeInputRecipeOutputEntry.getValue().items.isEmpty()) { for (ItemStack tStack : (iRecipeInputRecipeOutputEntry.getKey()).getInputs()) { if (GT_Utility.isStackValid(tStack)) { if (aAddGTRecipe @@ -717,11 +717,15 @@ public class GT_ModHandler { true, new ItemStack[] { GT_Utility.copyAmount( - (iRecipeInputRecipeOutputEntry.getKey()).getAmount(), + iRecipeInputRecipeOutputEntry + .getKey() + .getAmount(), tStack) }, - (ItemStack[]) - (iRecipeInputRecipeOutputEntry.getValue()).items.toArray(), + iRecipeInputRecipeOutputEntry + .getValue() + .items + .toArray(new ItemStack[0]), null, null, null, @@ -735,11 +739,15 @@ public class GT_ModHandler { true, new ItemStack[] { GT_Utility.copyAmount( - (iRecipeInputRecipeOutputEntry.getKey()).getAmount(), + iRecipeInputRecipeOutputEntry + .getKey() + .getAmount(), tStack) }, - (ItemStack[]) - (iRecipeInputRecipeOutputEntry.getValue()).items.toArray(), + iRecipeInputRecipeOutputEntry + .getValue() + .items + .toArray(new ItemStack[0]), null, null, null, @@ -755,7 +763,11 @@ public class GT_ModHandler { } if (aRemoveIC2Recipe) aRecipesToRemove.put( - tStack, ((RecipeOutput) iRecipeInputRecipeOutputEntry.getValue()).items.get(0)); + tStack, + iRecipeInputRecipeOutputEntry + .getValue() + .items + .get(0)); } } } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java index c63f2f37d9..b62d086cb2 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java @@ -73,7 +73,7 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase< return 0; } - return (Byte) signals.values().toArray()[0]; + return signals.values().iterator().next(); default: return 0; } |