remove double entries during merge conflicts

This commit is contained in:
Martin Robertz committed 2025-05-17 12:43:12 +02:00
1 parent b9743c5fc7
commit 3b9c13923f
1 file changed
-26
@@ -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<GuiType> VALUES = ImmutableList.copyOf(values());