From 277c8b5cc0832d40d36fd57d1209a67434d7abf0 Mon Sep 17 00:00:00 2001 From: Chicken-Bones Date: Tue, 30 Dec 2014 21:05:22 +1000 Subject: [PATCH] Hide mob spawners and save states on servers without NEI --- src/codechicken/nei/ItemMobSpawner.java | 7 +++++-- src/codechicken/nei/LayoutManager.java | 2 +- src/codechicken/nei/NEIClientConfig.java | 3 +-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/codechicken/nei/ItemMobSpawner.java b/src/codechicken/nei/ItemMobSpawner.java index 410eb61b..21d04292 100644 --- a/src/codechicken/nei/ItemMobSpawner.java +++ b/src/codechicken/nei/ItemMobSpawner.java @@ -138,7 +138,10 @@ public class ItemMobSpawner extends ItemBlock @Override public void getSubItems(Item item, CreativeTabs tab, List list) { - for(int i : IDtoNameMap.keySet()) - list.add(new ItemStack(item, 1, i)); + if(!NEIClientConfig.hasSMPCounterPart()) + list.add(new ItemStack(item)); + else + for(int i : IDtoNameMap.keySet()) + list.add(new ItemStack(item, 1, i)); } } diff --git a/src/codechicken/nei/LayoutManager.java b/src/codechicken/nei/LayoutManager.java index 61d4c886..431f9209 100644 --- a/src/codechicken/nei/LayoutManager.java +++ b/src/codechicken/nei/LayoutManager.java @@ -617,7 +617,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH addWidget(searchField); } - if (canPerformAction("item") && visiblity.showStateButtons) { + if (canPerformAction("item") && hasSMPCounterPart() && visiblity.showStateButtons) { for (int i = 0; i < 7; i++) { addWidget(stateButtons[i]); if (isStateSaved(i)) diff --git a/src/codechicken/nei/NEIClientConfig.java b/src/codechicken/nei/NEIClientConfig.java index 23fab19c..5681657a 100644 --- a/src/codechicken/nei/NEIClientConfig.java +++ b/src/codechicken/nei/NEIClientConfig.java @@ -397,9 +397,8 @@ public class NEIClientConfig } public static void loadState(int state) { - if (!statesSaved[state]) { + if (!statesSaved[state]) return; - } NBTTagCompound statesave = global.nbt.getCompoundTag("save" + state); GuiContainer currentContainer = NEIClientUtils.getGuiContainer();