Anvilcraft/redpower
3
1
Fork 0
generated from tilera/1710mod
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity

fix: all micro blocks now show in NEI

Browse source 
closes #2
This commit is contained in:
LordMZTE 2023-01-12 17:16:55 +01:00
parent e530a67fb6
commit 4b927c39f7
Signed by: LordMZTE
GPG key ID: B64802DC33A64FF6
7 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/eloraam/redpower/RedPowerNEIPlugin.java
View file

@ -47,7 +47,7 @@ public class RedPowerNEIPlugin {
public static boolean base;
public static boolean compat;
static Block micro;
private List<RedPowerNEIPlugin.ItemRange> validMicroTypes = new ArrayList();
private List<RedPowerNEIPlugin.ItemRange> 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<ItemHandsaw> saws = new ArrayList();
List<ItemHandsaw> saws = new ArrayList<>();
for (Object item : Item.itemRegistry) {
if (item instanceof ItemHandsaw) {

6
src/main/java/com/eloraam/redpower/base/ItemMicro.java
View file

@ -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);

3
src/main/java/com/eloraam/redpower/control/MicroPlacementRibbon.java
View file

@ -16,7 +16,8 @@ public class MicroPlacementRibbon extends MicroPlacementWire {
@Override
public void addCreativeItems(int hb, CreativeTabs tab, List<ItemStack> 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));

3
src/main/java/com/eloraam/redpower/machine/MicroPlacementTube.java
View file

@ -88,7 +88,8 @@ public class MicroPlacementTube implements IMicroPlacement {
@Override
public void addCreativeItems(int hb, CreativeTabs tab, List<ItemStack> 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));

1
src/main/java/com/eloraam/redpower/nei/MicroRecipeHandler.java
View file

@ -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;

3
src/main/java/com/eloraam/redpower/wiring/MicroPlacementJacket.java
View file

@ -153,7 +153,8 @@ public class MicroPlacementJacket implements IMicroPlacement {
@Override
public void addCreativeItems(int hb, CreativeTabs tab, List<ItemStack> 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));

3
src/main/java/com/eloraam/redpower/wiring/MicroPlacementWire.java
View file

@ -146,7 +146,8 @@ public class MicroPlacementWire implements IMicroPlacement {
@Override
public void addCreativeItems(int hb, CreativeTabs tab, List<ItemStack> 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));