diff --git a/src/main/java/com/eloraam/redpower/RedPowerNEIPlugin.java b/src/main/java/com/eloraam/redpower/RedPowerNEIPlugin.java index 5ede9ac..80e14e4 100644 --- a/src/main/java/com/eloraam/redpower/RedPowerNEIPlugin.java +++ b/src/main/java/com/eloraam/redpower/RedPowerNEIPlugin.java @@ -47,7 +47,7 @@ public class RedPowerNEIPlugin { public static boolean base; public static boolean compat; static Block micro; - private List validMicroTypes = new ArrayList(); + private List validMicroTypes = new ArrayList<>(); @EventHandler public void preInit(FMLPreInitializationEvent event) {} @@ -58,9 +58,7 @@ public class RedPowerNEIPlugin { @EventHandler public void postInit(FMLPostInitializationEvent event) { if (FMLCommonHandler.instance().getSide().isServer()) { - FMLLog.severe( - "[RedPowerNEIPlugin] Server env detected, disabling...", new Object[0] - ); + FMLLog.severe("[RedPowerNEIPlugin] Server env detected, disabling..."); } else { if (Loader.isModLoaded("NotEnoughItems")) { wiring = Loader.isModLoaded("RedPowerWiring"); @@ -97,7 +95,7 @@ public class RedPowerNEIPlugin { } private void loadSaws() { - List saws = new ArrayList(); + List saws = new ArrayList<>(); for (Object item : Item.itemRegistry) { if (item instanceof ItemHandsaw) { diff --git a/src/main/java/com/eloraam/redpower/base/ItemMicro.java b/src/main/java/com/eloraam/redpower/base/ItemMicro.java index 3db0542..fd68fdc 100644 --- a/src/main/java/com/eloraam/redpower/base/ItemMicro.java +++ b/src/main/java/com/eloraam/redpower/base/ItemMicro.java @@ -136,6 +136,7 @@ public class ItemMicro extends ItemBlock { } @SideOnly(Side.CLIENT) + @Override public boolean func_150936_a( World world, int x, int y, int z, int side, EntityPlayer player, ItemStack ist ) { @@ -300,8 +301,11 @@ public class ItemMicro extends ItemBlock { } @SideOnly(Side.CLIENT) + @Override public void getSubItems(Item id, CreativeTabs tab, List list) { - if (tab != CreativeExtraTabs.tabWires && tab != CreativeExtraTabs.tabMachine) { + // NEI passes null as tab + if (tab != null && tab != CreativeExtraTabs.tabWires + && tab != CreativeExtraTabs.tabMachine) { if (tab == CreativeExtraTabs.tabMicros) { for (int i = 0; i < 255; ++i) { String stub = CoverLib.getName(i); diff --git a/src/main/java/com/eloraam/redpower/control/MicroPlacementRibbon.java b/src/main/java/com/eloraam/redpower/control/MicroPlacementRibbon.java index a9b1dad..a68a776 100644 --- a/src/main/java/com/eloraam/redpower/control/MicroPlacementRibbon.java +++ b/src/main/java/com/eloraam/redpower/control/MicroPlacementRibbon.java @@ -16,7 +16,8 @@ public class MicroPlacementRibbon extends MicroPlacementWire { @Override public void addCreativeItems(int hb, CreativeTabs tab, List items) { - if (tab == CreativeExtraTabs.tabWires || tab == CreativeTabs.tabAllSearch) { + if (tab == null || tab == CreativeExtraTabs.tabWires + || tab == CreativeTabs.tabAllSearch) { switch (hb) { case 12: items.add(new ItemStack(CoverLib.blockCoverPlate, 1, 3072)); diff --git a/src/main/java/com/eloraam/redpower/machine/MicroPlacementTube.java b/src/main/java/com/eloraam/redpower/machine/MicroPlacementTube.java index 51a687e..95f28da 100644 --- a/src/main/java/com/eloraam/redpower/machine/MicroPlacementTube.java +++ b/src/main/java/com/eloraam/redpower/machine/MicroPlacementTube.java @@ -88,7 +88,8 @@ public class MicroPlacementTube implements IMicroPlacement { @Override public void addCreativeItems(int hb, CreativeTabs tab, List items) { - if (tab == CreativeExtraTabs.tabMachine || tab == CreativeTabs.tabAllSearch) { + if (tab == null || tab == CreativeExtraTabs.tabMachine + || tab == CreativeTabs.tabAllSearch) { switch (hb) { case 7: items.add(new ItemStack(CoverLib.blockCoverPlate, 1, 1792)); diff --git a/src/main/java/com/eloraam/redpower/nei/MicroRecipeHandler.java b/src/main/java/com/eloraam/redpower/nei/MicroRecipeHandler.java index ffd4050..e363ccb 100644 --- a/src/main/java/com/eloraam/redpower/nei/MicroRecipeHandler.java +++ b/src/main/java/com/eloraam/redpower/nei/MicroRecipeHandler.java @@ -8,7 +8,6 @@ import java.util.Random; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.ShapedRecipeHandler; -import codechicken.nei.recipe.TemplateRecipeHandler.CachedRecipe; import com.eloraam.redpower.RedPowerBase; import com.eloraam.redpower.base.ItemHandsaw; import com.eloraam.redpower.core.CoverLib; diff --git a/src/main/java/com/eloraam/redpower/wiring/MicroPlacementJacket.java b/src/main/java/com/eloraam/redpower/wiring/MicroPlacementJacket.java index 6611c0d..4e88e2b 100644 --- a/src/main/java/com/eloraam/redpower/wiring/MicroPlacementJacket.java +++ b/src/main/java/com/eloraam/redpower/wiring/MicroPlacementJacket.java @@ -153,7 +153,8 @@ public class MicroPlacementJacket implements IMicroPlacement { @Override public void addCreativeItems(int hb, CreativeTabs tab, List itemList) { - if (tab == CreativeExtraTabs.tabWires || tab == CreativeTabs.tabAllSearch) { + if (tab == null || tab == CreativeExtraTabs.tabWires + || tab == CreativeTabs.tabAllSearch) { switch (hb) { case 64: itemList.add(new ItemStack(CoverLib.blockCoverPlate, 1, 16386)); diff --git a/src/main/java/com/eloraam/redpower/wiring/MicroPlacementWire.java b/src/main/java/com/eloraam/redpower/wiring/MicroPlacementWire.java index 79f95b8..bdd3670 100644 --- a/src/main/java/com/eloraam/redpower/wiring/MicroPlacementWire.java +++ b/src/main/java/com/eloraam/redpower/wiring/MicroPlacementWire.java @@ -146,7 +146,8 @@ public class MicroPlacementWire implements IMicroPlacement { @Override public void addCreativeItems(int hb, CreativeTabs tab, List items) { - if (tab == CreativeExtraTabs.tabWires || tab == CreativeTabs.tabAllSearch) { + if (tab == null || tab == CreativeExtraTabs.tabWires + || tab == CreativeTabs.tabAllSearch) { switch (hb) { case 1: items.add(new ItemStack(CoverLib.blockCoverPlate, 1, 256));