From 3b9c13923ff3206d1c5a97474523c90f9b662fbb Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 17 May 2025 12:43:12 +0200 Subject: [PATCH] remove double entries during merge conflicts --- .../github/inventory/gui/GuiType.java | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/src/main/java/com/glodblock/github/inventory/gui/GuiType.java b/src/main/java/com/glodblock/github/inventory/gui/GuiType.java index 70b53666..13ef02db 100644 --- a/src/main/java/com/glodblock/github/inventory/gui/GuiType.java +++ b/src/main/java/com/glodblock/github/inventory/gui/GuiType.java @@ -575,32 +575,6 @@ public enum GuiType { protected Object createClientGui(EntityPlayer player, TileEntity inv) { return new GuiPatternValueAmount(player.inventory, inv); } - }), - - GUI_PATTERN_MULTI(new PartOrItemGuiFactory<>(ITerminalHost.class) { - - @Override - protected Object createServerGui(EntityPlayer player, ITerminalHost inv) { - return new ContainerPatternMulti(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, ITerminalHost inv) { - return new GuiPatternMulti(player.inventory, inv); - } - }), - - GUI_PATTERN_ITEM_RENAMER(new PartOrItemGuiFactory<>(ITerminalHost.class) { - - @Override - protected Object createServerGui(EntityPlayer player, ITerminalHost inv) { - return new ContainerPatternItemRenamer(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, ITerminalHost inv) { - return new GuiPatternItemRenamer(player.inventory, inv); - } }); public static final List VALUES = ImmutableList.copyOf(values());