diff --git a/src/main/java/codechicken/nei/NEIController.java b/src/main/java/codechicken/nei/NEIController.java index be90eae7..a360fcdb 100644 --- a/src/main/java/codechicken/nei/NEIController.java +++ b/src/main/java/codechicken/nei/NEIController.java @@ -27,7 +27,7 @@ import codechicken.nei.commands.CommandUntranslator; import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.guihook.IContainerInputHandler; import codechicken.nei.guihook.IContainerSlotClickHandler; -import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.util.EmptyContainer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -252,7 +252,7 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu // slot in GuiRecipe does not contain actual stack // and scroll should be handled by GuiRecipe, not here - if (gui instanceof GuiRecipe) return false; + if (gui.inventorySlots instanceof EmptyContainer) return false; Point mousePos = getMousePosition(); Slot mouseover = manager.window.getSlotAtPosition(mousePos.x, mousePos.y); diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipe.java b/src/main/java/codechicken/nei/recipe/GuiRecipe.java index 9aa907a1..8c9b6802 100644 --- a/src/main/java/codechicken/nei/recipe/GuiRecipe.java +++ b/src/main/java/codechicken/nei/recipe/GuiRecipe.java @@ -54,6 +54,7 @@ import codechicken.nei.scroll.ScrollBar; import codechicken.nei.scroll.ScrollBar.OverflowType; import codechicken.nei.scroll.ScrollBar.ScrollPlace; import codechicken.nei.scroll.ScrollContainer; +import codechicken.nei.util.EmptyContainer; import codechicken.nei.util.SlotInaccessible; public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOverlay, @@ -181,7 +182,7 @@ public abstract class GuiRecipe extends GuiContainer i private boolean isHeightHackApplied = false; protected GuiRecipe(GuiScreen prevgui) { - super(new ContainerRecipe()); + super(new EmptyContainer()); this.recipeTabs = new GuiRecipeTabs() { @Override @@ -191,7 +192,7 @@ public abstract class GuiRecipe extends GuiContainer i }; this.recipeCatalyst = new GuiRecipeCatalyst(); - this.slotcontainer = (ContainerRecipe) this.inventorySlots; + this.slotcontainer = (EmptyContainer) this.inventorySlots; this.prevGui = prevgui; this.firstGuiGeneral = prevgui; @@ -526,7 +527,7 @@ public abstract class GuiRecipe extends GuiContainer i @Override public Slot getSlotAtPosition(int mousex, int mousey) { final Widget activeWidget = this.container.getWidgetUnderMouse(mousex, mousey); - final ContainerRecipe slotcontainer = (ContainerRecipe) inventorySlots; + final EmptyContainer slotcontainer = (EmptyContainer) inventorySlots; slotcontainer.setActiveStack(null); if (activeWidget instanceof NEIRecipeWidget recipeWidget) { @@ -1033,7 +1034,7 @@ public abstract class GuiRecipe extends GuiContainer i private GuiOverlayButton[] overlayButtons = new GuiOverlayButton[0]; @Deprecated - public ContainerRecipe slotcontainer; + public EmptyContainer slotcontainer; @Deprecated public List getOverlayButtons() { diff --git a/src/main/java/codechicken/nei/recipe/ContainerRecipe.java b/src/main/java/codechicken/nei/util/EmptyContainer.java similarity index 93% rename from src/main/java/codechicken/nei/recipe/ContainerRecipe.java rename to src/main/java/codechicken/nei/util/EmptyContainer.java index 6a9f8b55..0d7fed5d 100644 --- a/src/main/java/codechicken/nei/recipe/ContainerRecipe.java +++ b/src/main/java/codechicken/nei/util/EmptyContainer.java @@ -1,4 +1,4 @@ -package codechicken.nei.recipe; +package codechicken.nei.util; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack; import codechicken.nei.PositionedStack; import codechicken.nei.api.ShortcutInputHandler; -public class ContainerRecipe extends Container { +public class EmptyContainer extends Container { private ItemStack activeStack = null;