mirror of
https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git
synced 2026-11-17 02:45:08 +00:00
Merge remote-tracking branch 'lordIcocain/super_stoker' into dev
# Conflicts: # src/main/java/com/glodblock/github/inventory/gui/GuiType.java
This commit is contained in:
1 file changed
+13
-13
@@ -562,19 +562,6 @@ public enum GuiType {
|
||||
}
|
||||
}),
|
||||
|
||||
GUI_SUPER_STOCK_REPLENISHER(new TileGuiFactory<>(TileSuperStockReplenisher.class) {
|
||||
|
||||
@Override
|
||||
protected Object createServerGui(EntityPlayer player, TileSuperStockReplenisher inv) {
|
||||
return new ContainerSuperStockReplenisher(player.inventory, inv);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Object createClientGui(EntityPlayer player, TileSuperStockReplenisher inv) {
|
||||
return new GuiSuperStockReplenisher(player.inventory, inv);
|
||||
}
|
||||
}),
|
||||
|
||||
WIRELESS_MAGNET_FILTER(new ItemGuiFactory<>(ITerminalHost.class) {
|
||||
|
||||
@Override
|
||||
@@ -586,6 +573,19 @@ public enum GuiType {
|
||||
protected Object createClientGui(EntityPlayer player, ITerminalHost inv) {
|
||||
return new GuiMagnetFilter(player.inventory, inv);
|
||||
}
|
||||
}),
|
||||
|
||||
GUI_SUPER_STOCK_REPLENISHER(new TileGuiFactory<>(TileSuperStockReplenisher.class) {
|
||||
|
||||
@Override
|
||||
protected Object createServerGui(EntityPlayer player, TileSuperStockReplenisher inv) {
|
||||
return new ContainerSuperStockReplenisher(player.inventory, inv);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Object createClientGui(EntityPlayer player, TileSuperStockReplenisher inv) {
|
||||
return new GuiSuperStockReplenisher(player.inventory, inv);
|
||||
}
|
||||
});
|
||||
|
||||
public static final List<GuiType> VALUES = ImmutableList.copyOf(values());
|
||||
|
||||
Reference in new issue
Block a user