From ca0d0032e43d8d9b9b236acd3ce4e251359cc636 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 15 Dec 2021 17:46:37 +0100 Subject: [PATCH] Rename Container -> ContainerMenu --- .../com/refinedmods/refinedstorage/RS.java | 2 +- .../refinedstorage/RSContainerMenus.java | 60 +++++++++++++++++++ .../refinedstorage/RSContainers.java | 60 ------------------- .../apiimpl/autocrafting/CraftingPattern.java | 16 ++--- .../autocrafting/CraftingPatternFactory.java | 10 ++-- .../network/grid/handler/ItemGridHandler.java | 8 +-- .../WirelessCraftingMonitorNetworkItem.java | 4 +- .../apiimpl/network/node/GridNetworkNode.java | 9 ++- .../render/CraftingMonitorElementDrawers.java | 6 +- .../block/ConstructorBlock.java | 4 +- .../refinedstorage/block/ControllerBlock.java | 4 +- .../refinedstorage/block/CrafterBlock.java | 4 +- .../block/CraftingMonitorBlock.java | 4 +- .../refinedstorage/block/DestructorBlock.java | 4 +- .../refinedstorage/block/DetectorBlock.java | 4 +- .../refinedstorage/block/DiskDriveBlock.java | 4 +- .../block/DiskManipulatorBlock.java | 4 +- .../refinedstorage/block/ExporterBlock.java | 4 +- .../block/ExternalStorageBlock.java | 4 +- .../block/FluidInterfaceBlock.java | 4 +- .../block/FluidStorageBlock.java | 4 +- .../refinedstorage/block/ImporterBlock.java | 4 +- .../refinedstorage/block/InterfaceBlock.java | 4 +- .../block/NetworkTransmitterBlock.java | 4 +- .../refinedstorage/block/RelayBlock.java | 4 +- .../block/SecurityManagerBlock.java | 4 +- .../refinedstorage/block/StorageBlock.java | 4 +- .../block/StorageMonitorBlock.java | 4 +- .../block/WirelessTransmitterBlock.java | 4 +- ...er.java => AlternativesContainerMenu.java} | 4 +- ...ontainer.java => AmountContainerMenu.java} | 4 +- ...eContainer.java => BaseContainerMenu.java} | 4 +- ...ner.java => ConstructorContainerMenu.java} | 8 +-- .../container/ControllerContainer.java | 13 ---- .../container/ControllerContainerMenu.java | 13 ++++ ...ntainer.java => CrafterContainerMenu.java} | 8 +-- ....java => CrafterManagerContainerMenu.java} | 8 +-- ...java => CraftingMonitorContainerMenu.java} | 4 +- ...ava => CraftingSettingsContainerMenu.java} | 4 +- ...iner.java => DestructorContainerMenu.java} | 8 +-- ...tainer.java => DetectorContainerMenu.java} | 8 +-- ...ainer.java => DiskDriveContainerMenu.java} | 8 +-- ...java => DiskManipulatorContainerMenu.java} | 8 +-- ...tainer.java => ExporterContainerMenu.java} | 8 +-- ...java => ExternalStorageContainerMenu.java} | 8 +-- ...ontainer.java => FilterContainerMenu.java} | 8 +-- ...ner.java => FluidAmountContainerMenu.java} | 4 +- ....java => FluidInterfaceContainerMenu.java} | 8 +-- ...er.java => FluidStorageContainerMenu.java} | 8 +-- ...dContainer.java => GridContainerMenu.java} | 8 +-- ...tainer.java => ImporterContainerMenu.java} | 8 +-- ...ainer.java => InterfaceContainerMenu.java} | 8 +-- ...a => NetworkTransmitterContainerMenu.java} | 8 +-- .../container/RelayContainer.java | 13 ---- .../container/RelayContainerMenu.java | 13 ++++ ...java => SecurityManagerContainerMenu.java} | 8 +-- ...ntainer.java => StorageContainerMenu.java} | 8 +-- ....java => StorageMonitorContainerMenu.java} | 8 +-- ... => WirelessTransmitterContainerMenu.java} | 8 +-- .../CrafterManagerContainerFactory.java | 8 +-- .../factory/CrafterManagerMenuProvider.java | 4 +- .../CraftingMonitorContainerFactory.java | 10 ++-- .../factory/CraftingMonitorMenuProvider.java | 8 +-- .../factory/GridContainerFactory.java | 8 +-- .../container/factory/GridMenuProvider.java | 4 +- ...relessCraftingMonitorContainerFactory.java | 10 ++-- .../CraftingTweaksIntegration.java | 12 ++-- .../jei/GridRecipeTransferHandler.java | 20 +++---- .../integration/jei/GuiContainerHandler.java | 6 +- .../refinedstorage/item/FilterItem.java | 4 +- .../network/FilterUpdateMessage.java | 14 ++--- .../network/SetFilterSlotMessage.java | 6 +- .../network/SetFluidFilterSlotMessage.java | 6 +- .../CraftingMonitorCancelMessage.java | 6 +- ...sCraftingMonitorSettingsUpdateMessage.java | 6 +- .../network/grid/GridClearMessage.java | 6 +- .../GridCraftingPreviewRequestMessage.java | 6 +- .../grid/GridCraftingStartRequestMessage.java | 6 +- .../grid/GridFluidInsertHeldMessage.java | 6 +- .../network/grid/GridFluidPullMessage.java | 6 +- .../grid/GridItemGridScrollMessage.java | 6 +- .../grid/GridItemInsertHeldMessage.java | 6 +- .../grid/GridItemInventoryScrollMessage.java | 6 +- .../network/grid/GridItemPullMessage.java | 6 +- .../grid/GridProcessingTransferMessage.java | 6 +- .../network/grid/GridTransferMessage.java | 6 +- .../PortableGridSettingsUpdateMessage.java | 6 +- ...irelessFluidGridSettingsUpdateMessage.java | 6 +- .../WirelessGridSettingsUpdateMessage.java | 6 +- ...SynchronizationParamaterUpdateMessage.java | 6 +- .../refinedstorage/recipe/CoverRecipe.java | 6 +- .../recipe/HollowCoverRecipe.java | 11 ++-- .../UpgradeWithEnchantedBookRecipe.java | 6 +- .../refinedstorage/screen/BaseScreen.java | 4 +- .../screen/ConstructorScreen.java | 8 +-- .../screen/ControllerScreen.java | 8 +-- .../screen/CrafterManagerScreen.java | 10 ++-- .../refinedstorage/screen/CrafterScreen.java | 8 +-- .../screen/CraftingMonitorScreen.java | 12 ++-- .../screen/DestructorScreen.java | 8 +-- .../refinedstorage/screen/DetectorScreen.java | 8 +-- .../screen/DiskDriveScreen.java | 8 +-- .../screen/DiskManipulatorScreen.java | 8 +-- .../refinedstorage/screen/ExporterScreen.java | 8 +-- .../screen/ExternalStorageScreen.java | 8 +-- .../refinedstorage/screen/FilterScreen.java | 20 +++---- .../screen/FluidAmountScreen.java | 6 +- .../screen/FluidInterfaceScreen.java | 8 +-- .../screen/FluidStorageBlockScreen.java | 10 ++-- .../refinedstorage/screen/ImporterScreen.java | 8 +-- .../screen/InterfaceScreen.java | 8 +-- .../screen/ItemAmountScreen.java | 6 +- .../screen/NetworkTransmitterScreen.java | 8 +-- .../refinedstorage/screen/RelayScreen.java | 8 +-- .../screen/SecurityManagerScreen.java | 10 ++-- .../screen/StorageBlockScreen.java | 10 ++-- .../screen/StorageMonitorScreen.java | 8 +-- .../refinedstorage/screen/StorageScreen.java | 4 +- .../screen/WirelessTransmitterScreen.java | 8 +-- .../factory/CrafterManagerScreenFactory.java | 6 +- .../screen/factory/GridScreenFactory.java | 6 +- .../screen/grid/AlternativesScreen.java | 6 +- .../screen/grid/CraftingSettingsScreen.java | 6 +- .../screen/grid/GridScreen.java | 10 ++-- .../sidebutton/ConstructorDropSideButton.java | 4 +- .../sidebutton/CrafterModeSideButton.java | 4 +- .../DestructorPickupSideButton.java | 4 +- .../sidebutton/DetectorModeSideButton.java | 4 +- .../GridSortingDirectionSideButton.java | 4 +- .../sidebutton/GridSortingTypeSideButton.java | 4 +- .../sidebutton/GridViewTypeSideButton.java | 4 +- .../widget/sidebutton/IoModeSideButton.java | 4 +- .../refinedstorage/setup/ClientSetup.java | 56 ++++++++--------- .../refinedstorage/setup/CommonSetup.java | 42 ++++++------- 134 files changed, 561 insertions(+), 559 deletions(-) create mode 100644 src/main/java/com/refinedmods/refinedstorage/RSContainerMenus.java delete mode 100644 src/main/java/com/refinedmods/refinedstorage/RSContainers.java rename src/main/java/com/refinedmods/refinedstorage/container/{AlternativesContainer.java => AlternativesContainerMenu.java} (54%) rename src/main/java/com/refinedmods/refinedstorage/container/{AmountContainer.java => AmountContainerMenu.java} (81%) rename src/main/java/com/refinedmods/refinedstorage/container/{BaseContainer.java => BaseContainerMenu.java} (97%) rename src/main/java/com/refinedmods/refinedstorage/container/{ConstructorContainer.java => ConstructorContainerMenu.java} (80%) delete mode 100644 src/main/java/com/refinedmods/refinedstorage/container/ControllerContainer.java create mode 100644 src/main/java/com/refinedmods/refinedstorage/container/ControllerContainerMenu.java rename src/main/java/com/refinedmods/refinedstorage/container/{CrafterContainer.java => CrafterContainerMenu.java} (73%) rename src/main/java/com/refinedmods/refinedstorage/container/{CrafterManagerContainer.java => CrafterManagerContainerMenu.java} (95%) rename src/main/java/com/refinedmods/refinedstorage/container/{CraftingMonitorContainer.java => CraftingMonitorContainerMenu.java} (90%) rename src/main/java/com/refinedmods/refinedstorage/container/{CraftingSettingsContainer.java => CraftingSettingsContainerMenu.java} (89%) rename src/main/java/com/refinedmods/refinedstorage/container/{DestructorContainer.java => DestructorContainerMenu.java} (81%) rename src/main/java/com/refinedmods/refinedstorage/container/{DetectorContainer.java => DetectorContainerMenu.java} (76%) rename src/main/java/com/refinedmods/refinedstorage/container/{DiskDriveContainer.java => DiskDriveContainerMenu.java} (82%) rename src/main/java/com/refinedmods/refinedstorage/container/{DiskManipulatorContainer.java => DiskManipulatorContainerMenu.java} (85%) rename src/main/java/com/refinedmods/refinedstorage/container/{ExporterContainer.java => ExporterContainerMenu.java} (90%) rename src/main/java/com/refinedmods/refinedstorage/container/{ExternalStorageContainer.java => ExternalStorageContainerMenu.java} (76%) rename src/main/java/com/refinedmods/refinedstorage/container/{FilterContainer.java => FilterContainerMenu.java} (89%) rename src/main/java/com/refinedmods/refinedstorage/container/{FluidAmountContainer.java => FluidAmountContainerMenu.java} (79%) rename src/main/java/com/refinedmods/refinedstorage/container/{FluidInterfaceContainer.java => FluidInterfaceContainerMenu.java} (75%) rename src/main/java/com/refinedmods/refinedstorage/container/{FluidStorageContainer.java => FluidStorageContainerMenu.java} (63%) rename src/main/java/com/refinedmods/refinedstorage/container/{GridContainer.java => GridContainerMenu.java} (97%) rename src/main/java/com/refinedmods/refinedstorage/container/{ImporterContainer.java => ImporterContainerMenu.java} (82%) rename src/main/java/com/refinedmods/refinedstorage/container/{InterfaceContainer.java => InterfaceContainerMenu.java} (82%) rename src/main/java/com/refinedmods/refinedstorage/container/{NetworkTransmitterContainer.java => NetworkTransmitterContainerMenu.java} (58%) delete mode 100644 src/main/java/com/refinedmods/refinedstorage/container/RelayContainer.java create mode 100644 src/main/java/com/refinedmods/refinedstorage/container/RelayContainerMenu.java rename src/main/java/com/refinedmods/refinedstorage/container/{SecurityManagerContainer.java => SecurityManagerContainerMenu.java} (73%) rename src/main/java/com/refinedmods/refinedstorage/container/{StorageContainer.java => StorageContainerMenu.java} (65%) rename src/main/java/com/refinedmods/refinedstorage/container/{StorageMonitorContainer.java => StorageMonitorContainerMenu.java} (74%) rename src/main/java/com/refinedmods/refinedstorage/container/{WirelessTransmitterContainer.java => WirelessTransmitterContainerMenu.java} (60%) diff --git a/src/main/java/com/refinedmods/refinedstorage/RS.java b/src/main/java/com/refinedmods/refinedstorage/RS.java index e07a56113..c2c46580b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/RS.java +++ b/src/main/java/com/refinedmods/refinedstorage/RS.java @@ -48,7 +48,7 @@ public final class RS { FMLJavaModLoadingContext.get().getModEventBus().addListener(commonSetup::onCommonSetup); FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(BlockEntityType.class, commonSetup::onRegisterBlockEntities); FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(RecipeSerializer.class, commonSetup::onRegisterRecipeSerializers); - FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(MenuType.class, commonSetup::onRegisterContainers); + FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(MenuType.class, commonSetup::onRegisterMenus); FMLJavaModLoadingContext.get().getModEventBus().addListener(commonSetup::onRegisterCapabilities); FMLJavaModLoadingContext.get().getModEventBus().register(new DataGenerators()); FMLJavaModLoadingContext.get().getModEventBus().register(new CuriosIntegration()); diff --git a/src/main/java/com/refinedmods/refinedstorage/RSContainerMenus.java b/src/main/java/com/refinedmods/refinedstorage/RSContainerMenus.java new file mode 100644 index 000000000..39ee4c51b --- /dev/null +++ b/src/main/java/com/refinedmods/refinedstorage/RSContainerMenus.java @@ -0,0 +1,60 @@ +package com.refinedmods.refinedstorage; + +import com.refinedmods.refinedstorage.container.*; +import net.minecraft.world.inventory.MenuType; +import net.minecraftforge.registries.ObjectHolder; + +@ObjectHolder(RS.ID) +public final class RSContainerMenus { + @ObjectHolder("controller") + public static final MenuType CONTROLLER = null; + @ObjectHolder("grid") + public static final MenuType GRID = null; + @ObjectHolder("detector") + public static final MenuType DETECTOR = null; + @ObjectHolder("exporter") + public static final MenuType EXPORTER = null; + @ObjectHolder("external_storage") + public static final MenuType EXTERNAL_STORAGE = null; + @ObjectHolder("filter") + public static final MenuType FILTER = null; + @ObjectHolder("importer") + public static final MenuType IMPORTER = null; + @ObjectHolder("network_transmitter") + public static final MenuType NETWORK_TRANSMITTER = null; + @ObjectHolder("relay") + public static final MenuType RELAY = null; + @ObjectHolder("disk_drive") + public static final MenuType DISK_DRIVE = null; + @ObjectHolder("storage_block") + public static final MenuType STORAGE_BLOCK = null; + @ObjectHolder("fluid_storage_block") + public static final MenuType FLUID_STORAGE_BLOCK = null; + @ObjectHolder("security_manager") + public static final MenuType SECURITY_MANAGER = null; + @ObjectHolder("interface") + public static final MenuType INTERFACE = null; + @ObjectHolder("fluid_interface") + public static final MenuType FLUID_INTERFACE = null; + @ObjectHolder("wireless_transmitter") + public static final MenuType WIRELESS_TRANSMITTER = null; + @ObjectHolder("storage_monitor") + public static final MenuType STORAGE_MONITOR = null; + @ObjectHolder("constructor") + public static final MenuType CONSTRUCTOR = null; + @ObjectHolder("destructor") + public static final MenuType DESTRUCTOR = null; + @ObjectHolder("disk_manipulator") + public static final MenuType DISK_MANIPULATOR = null; + @ObjectHolder("crafter") + public static final MenuType CRAFTER = null; + @ObjectHolder("crafter_manager") + public static final MenuType CRAFTER_MANAGER = null; + @ObjectHolder("crafting_monitor") + public static final MenuType CRAFTING_MONITOR = null; + @ObjectHolder("wireless_crafting_monitor") + public static final MenuType WIRELESS_CRAFTING_MONITOR = null; + + private RSContainerMenus() { + } +} diff --git a/src/main/java/com/refinedmods/refinedstorage/RSContainers.java b/src/main/java/com/refinedmods/refinedstorage/RSContainers.java deleted file mode 100644 index 5c0b8851e..000000000 --- a/src/main/java/com/refinedmods/refinedstorage/RSContainers.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.refinedmods.refinedstorage; - -import com.refinedmods.refinedstorage.container.*; -import net.minecraft.world.inventory.MenuType; -import net.minecraftforge.registries.ObjectHolder; - -@ObjectHolder(RS.ID) -public final class RSContainers { - @ObjectHolder("controller") - public static final MenuType CONTROLLER = null; - @ObjectHolder("grid") - public static final MenuType GRID = null; - @ObjectHolder("detector") - public static final MenuType DETECTOR = null; - @ObjectHolder("exporter") - public static final MenuType EXPORTER = null; - @ObjectHolder("external_storage") - public static final MenuType EXTERNAL_STORAGE = null; - @ObjectHolder("filter") - public static final MenuType FILTER = null; - @ObjectHolder("importer") - public static final MenuType IMPORTER = null; - @ObjectHolder("network_transmitter") - public static final MenuType NETWORK_TRANSMITTER = null; - @ObjectHolder("relay") - public static final MenuType RELAY = null; - @ObjectHolder("disk_drive") - public static final MenuType DISK_DRIVE = null; - @ObjectHolder("storage_block") - public static final MenuType STORAGE_BLOCK = null; - @ObjectHolder("fluid_storage_block") - public static final MenuType FLUID_STORAGE_BLOCK = null; - @ObjectHolder("security_manager") - public static final MenuType SECURITY_MANAGER = null; - @ObjectHolder("interface") - public static final MenuType INTERFACE = null; - @ObjectHolder("fluid_interface") - public static final MenuType FLUID_INTERFACE = null; - @ObjectHolder("wireless_transmitter") - public static final MenuType WIRELESS_TRANSMITTER = null; - @ObjectHolder("storage_monitor") - public static final MenuType STORAGE_MONITOR = null; - @ObjectHolder("constructor") - public static final MenuType CONSTRUCTOR = null; - @ObjectHolder("destructor") - public static final MenuType DESTRUCTOR = null; - @ObjectHolder("disk_manipulator") - public static final MenuType DISK_MANIPULATOR = null; - @ObjectHolder("crafter") - public static final MenuType CRAFTER = null; - @ObjectHolder("crafter_manager") - public static final MenuType CRAFTER_MANAGER = null; - @ObjectHolder("crafting_monitor") - public static final MenuType CRAFTING_MONITOR = null; - @ObjectHolder("wireless_crafting_monitor") - public static final MenuType WIRELESS_CRAFTING_MONITOR = null; - - private RSContainers() { - } -} diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPattern.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPattern.java index 74ab92021..c7b524b33 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPattern.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPattern.java @@ -89,13 +89,13 @@ public class CraftingPattern implements ICraftingPattern { throw new IllegalArgumentException("The items that are taken (" + took.size() + ") should match the inputs for this pattern (" + inputs.getInputs().size() + ")"); } - CraftingContainer inv = new DummyCraftingInventory(); + CraftingContainer craftingContainer = new DummyCraftingContainer(); for (int i = 0; i < took.size(); ++i) { - inv.setItem(i, took.get(i)); + craftingContainer.setItem(i, took.get(i)); } - ItemStack result = recipe.assemble(inv); + ItemStack result = recipe.assemble(craftingContainer); if (result.isEmpty()) { throw new IllegalStateException("Cannot have empty result"); } @@ -122,13 +122,13 @@ public class CraftingPattern implements ICraftingPattern { throw new IllegalArgumentException("The items that are taken (" + took.size() + ") should match the inputs for this pattern (" + inputs.getInputs().size() + ")"); } - CraftingContainer inv = new DummyCraftingInventory(); + CraftingContainer craftingContainer = new DummyCraftingContainer(); for (int i = 0; i < took.size(); ++i) { - inv.setItem(i, took.get(i)); + craftingContainer.setItem(i, took.get(i)); } - NonNullList remainingItems = recipe.getRemainingItems(inv); + NonNullList remainingItems = recipe.getRemainingItems(craftingContainer); NonNullList sanitized = NonNullList.create(); for (ItemStack item : remainingItems) { @@ -265,8 +265,8 @@ public class CraftingPattern implements ICraftingPattern { return result; } - public static class DummyCraftingInventory extends CraftingContainer { - public DummyCraftingInventory() { + public static class DummyCraftingContainer extends CraftingContainer { + public DummyCraftingContainer() { super(new AbstractContainerMenu(null, 0) { @Override public boolean stillValid(Player player) { diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java index 3316f98a2..48af388d4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java @@ -49,19 +49,19 @@ public class CraftingPatternFactory { throw new CraftingPatternFactoryException(new TranslatableComponent("misc.refinedstorage.pattern.error.processing_no_outputs")); } } else { - CraftingContainer inv = new CraftingPattern.DummyCraftingInventory(); + CraftingContainer craftingContainer = new CraftingPattern.DummyCraftingContainer(); for (int i = 0; i < 9; ++i) { - fillCraftingInputs(inv, stack, inputs, i); + fillCraftingInputs(craftingContainer, stack, inputs, i); } - Optional foundRecipe = level.getRecipeManager().getRecipeFor(RecipeType.CRAFTING, inv, level); + Optional foundRecipe = level.getRecipeManager().getRecipeFor(RecipeType.CRAFTING, craftingContainer, level); if (foundRecipe.isPresent()) { recipe = foundRecipe.get(); - byproducts = recipe.getRemainingItems(inv); + byproducts = recipe.getRemainingItems(craftingContainer); - ItemStack output = recipe.assemble(inv); + ItemStack output = recipe.assemble(craftingContainer); if (!output.isEmpty()) { outputs.add(output); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java index 70590b153..18b2aa447 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java @@ -13,7 +13,7 @@ import com.refinedmods.refinedstorage.api.util.IComparer; import com.refinedmods.refinedstorage.api.util.StackListEntry; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.apiimpl.autocrafting.preview.ErrorCraftingPreviewElement; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.network.grid.GridCraftingPreviewResponseMessage; import com.refinedmods.refinedstorage.network.grid.GridCraftingStartResponseMessage; import net.minecraft.core.Direction; @@ -37,7 +37,7 @@ public class ItemGridHandler implements IItemGridHandler { } public static void onInventoryScroll(IItemGridHandler gridHandler, ServerPlayer player, int slot, boolean shift, boolean up, @Nullable INetwork network) { - if (player == null || !(player.containerMenu instanceof GridContainer)) { + if (player == null || !(player.containerMenu instanceof GridContainerMenu)) { return; } @@ -75,7 +75,7 @@ public class ItemGridHandler implements IItemGridHandler { } public static void onGridScroll(IItemGridHandler gridHandler, ServerPlayer player, @Nullable UUID id, boolean shift, boolean up, @Nullable INetwork network) { - if (player == null || !(player.containerMenu instanceof GridContainer)) { + if (player == null || !(player.containerMenu instanceof GridContainerMenu)) { return; } @@ -83,7 +83,7 @@ public class ItemGridHandler implements IItemGridHandler { return; } - IGrid grid = ((GridContainer) player.containerMenu).getGrid(); + IGrid grid = ((GridContainerMenu) player.containerMenu).getGrid(); int flags = EXTRACT_SINGLE; diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java index 7883dd0e4..f8e9c8a94 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.apiimpl.network.item; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.api.network.INetwork; import com.refinedmods.refinedstorage.api.network.item.INetworkItem; import com.refinedmods.refinedstorage.api.network.item.INetworkItemManager; @@ -61,7 +61,7 @@ public class WirelessCraftingMonitorNetworkItem implements INetworkItem { NetworkHooks.openGui( (ServerPlayer) player, - new CraftingMonitorMenuProvider(RSContainers.WIRELESS_CRAFTING_MONITOR, wirelessCraftingMonitor, null), slot::writePlayerSlot); + new CraftingMonitorMenuProvider(RSContainerMenus.WIRELESS_CRAFTING_MONITOR, wirelessCraftingMonitor, null), slot::writePlayerSlot); drainEnergy(RS.SERVER_CONFIG.getWirelessCraftingMonitor().getOpenUsage()); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java index ae98521e7..859f9da98 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java @@ -87,7 +87,8 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I if (!reading && slot < PROCESSING_MATRIX_SIZE) { allowedTagList.clearItemTags(slot); } - }); private final AbstractContainerMenu craftingContainer = new AbstractContainerMenu(MenuType.CRAFTING, 0) { + }); + private final AbstractContainerMenu craftingContainer = new AbstractContainerMenu(MenuType.CRAFTING, 0) { @Override public boolean stillValid(Player player) { return false; @@ -108,14 +109,16 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I } }); private final Set craftingListeners = new HashSet<>(); - private final List filters = new ArrayList<>(); private final CraftingContainer matrix = new CraftingContainer(craftingContainer, 3, 3); + private final List filters = new ArrayList<>(); + private final CraftingContainer matrix = new CraftingContainer(craftingContainer, 3, 3); private final List tabs = new ArrayList<>(); private final FilterItemHandler filter = (FilterItemHandler) new FilterItemHandler(filters, tabs).addListener(new NetworkNodeInventoryListener(this)); private final GridType type; private CraftingRecipe currentRecipe; private boolean readingInventory; private int viewType = VIEW_TYPE_NORMAL; - private int sortingDirection = SORTING_DIRECTION_DESCENDING; private final BaseItemHandler patterns = new BaseItemHandler(2) { + private int sortingDirection = SORTING_DIRECTION_DESCENDING; + private final BaseItemHandler patterns = new BaseItemHandler(2) { @Override public int getSlotLimit(int slot) { return slot == 1 ? 1 : super.getSlotLimit(slot); diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java index f89d81d29..172ea6eb2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java @@ -3,15 +3,15 @@ package com.refinedmods.refinedstorage.apiimpl.render; import com.mojang.blaze3d.systems.RenderSystem; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.api.render.IElementDrawer; -import com.refinedmods.refinedstorage.container.CraftingMonitorContainer; +import com.refinedmods.refinedstorage.container.CraftingMonitorContainerMenu; import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.client.gui.GuiComponent; -public class CraftingMonitorElementDrawers extends ElementDrawers { +public class CraftingMonitorElementDrawers extends ElementDrawers { private final IElementDrawer overlayDrawer; private final IElementDrawer errorDrawer; - public CraftingMonitorElementDrawers(BaseScreen screen, int itemWidth, int itemHeight) { + public CraftingMonitorElementDrawers(BaseScreen screen, int itemWidth, int itemHeight) { super(screen); this.overlayDrawer = (matrixStack, x, y, color) -> { diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java index 97d044efa..b795d3427 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.block.shape.ShapeCache; -import com.refinedmods.refinedstorage.container.ConstructorContainer; +import com.refinedmods.refinedstorage.container.ConstructorContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.render.ConstantsCable; import com.refinedmods.refinedstorage.blockentity.ConstructorBlockEntity; @@ -96,7 +96,7 @@ public class ConstructorBlock extends CableBlock { (ServerPlayer) player, new BlockEntityMenuProvider( new TranslatableComponent("gui.refinedstorage.constructor"), - (blockEntity, windowId, inventory, p) -> new ConstructorContainer(blockEntity, player, windowId), + (blockEntity, windowId, inventory, p) -> new ConstructorContainerMenu(blockEntity, player, windowId), pos ), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java index 38808c1f1..20090b9a3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java @@ -5,7 +5,7 @@ import com.refinedmods.refinedstorage.api.network.INetwork; import com.refinedmods.refinedstorage.api.network.NetworkType; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.apiimpl.network.Network; -import com.refinedmods.refinedstorage.container.ControllerContainer; +import com.refinedmods.refinedstorage.container.ControllerContainerMenu; import com.refinedmods.refinedstorage.blockentity.ControllerBlockEntity; import com.refinedmods.refinedstorage.util.BlockUtils; import com.refinedmods.refinedstorage.util.ColorMap; @@ -116,7 +116,7 @@ public class ControllerBlock extends BaseBlock implements EntityBlock { @Override public AbstractContainerMenu createMenu(int i, Inventory playerInventory, Player player) { - return new ControllerContainer((ControllerBlockEntity) level.getBlockEntity(pos), player, i); + return new ControllerContainerMenu((ControllerBlockEntity) level.getBlockEntity(pos), player, i); } }, pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java index 2bccbf793..618b87363 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.RSBlocks; import com.refinedmods.refinedstorage.api.network.security.Permission; -import com.refinedmods.refinedstorage.container.CrafterContainer; +import com.refinedmods.refinedstorage.container.CrafterContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.blockentity.CrafterBlockEntity; import com.refinedmods.refinedstorage.util.BlockUtils; @@ -59,7 +59,7 @@ public class CrafterBlock extends ColoredNetworkBlock { (ServerPlayer) player, new BlockEntityMenuProvider( ((CrafterBlockEntity) level.getBlockEntity(pos)).getNode().getName(), - (blockEntity, windowId, inventory, p) -> new CrafterContainer(blockEntity, player, windowId), + (blockEntity, windowId, inventory, p) -> new CrafterContainerMenu(blockEntity, player, windowId), pos ), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java index 9c3ec321d..00ee3ae84 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.RSBlocks; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.api.network.security.Permission; import com.refinedmods.refinedstorage.container.factory.CraftingMonitorMenuProvider; import com.refinedmods.refinedstorage.blockentity.craftingmonitor.CraftingMonitorBlockEntity; @@ -46,7 +46,7 @@ public class CraftingMonitorBlock extends ColoredNetworkBlock { return NetworkUtils.attempt(level, pos, player, () -> NetworkHooks.openGui( (ServerPlayer) player, - new CraftingMonitorMenuProvider(RSContainers.CRAFTING_MONITOR, blockEntity.getNode(), blockEntity), + new CraftingMonitorMenuProvider(RSContainerMenus.CRAFTING_MONITOR, blockEntity.getNode(), blockEntity), pos ), Permission.MODIFY, Permission.AUTOCRAFTING); } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java index 575d6d4af..20c37a05d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.block.shape.ShapeCache; -import com.refinedmods.refinedstorage.container.DestructorContainer; +import com.refinedmods.refinedstorage.container.DestructorContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.render.ConstantsCable; import com.refinedmods.refinedstorage.blockentity.DestructorBlockEntity; @@ -96,7 +96,7 @@ public class DestructorBlock extends CableBlock { (ServerPlayer) player, new BlockEntityMenuProvider( new TranslatableComponent("gui.refinedstorage.destructor"), - (blockEntity, windowId, inventory, p) -> new DestructorContainer(blockEntity, player, windowId), + (blockEntity, windowId, inventory, p) -> new DestructorContainerMenu(blockEntity, player, windowId), pos ), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java index 1365e0481..3836aa8fe 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.RSBlocks; -import com.refinedmods.refinedstorage.container.DetectorContainer; +import com.refinedmods.refinedstorage.container.DetectorContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.blockentity.DetectorBlockEntity; import com.refinedmods.refinedstorage.util.BlockUtils; @@ -82,7 +82,7 @@ public class DetectorBlock extends ColoredNetworkBlock { (ServerPlayer) player, new BlockEntityMenuProvider( new TranslatableComponent("gui.refinedstorage.detector"), - (blockEntity, windowId, inventory, p) -> new DetectorContainer(blockEntity, player, windowId), + (blockEntity, windowId, inventory, p) -> new DetectorContainerMenu(blockEntity, player, windowId), pos ), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java index dfde26ecf..d61e07a4b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.block; -import com.refinedmods.refinedstorage.container.DiskDriveContainer; +import com.refinedmods.refinedstorage.container.DiskDriveContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.blockentity.DiskDriveBlockEntity; import com.refinedmods.refinedstorage.util.BlockUtils; @@ -40,7 +40,7 @@ public class DiskDriveBlock extends NetworkNodeBlock { (ServerPlayer) player, new BlockEntityMenuProvider( new TranslatableComponent("gui.refinedstorage.disk_drive"), - (blockEntity, windowId, inventory, p) -> new DiskDriveContainer(blockEntity, p, windowId), + (blockEntity, windowId, inventory, p) -> new DiskDriveContainerMenu(blockEntity, p, windowId), pos ), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java index 4e6175a5e..6e2943ef5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.RSBlocks; -import com.refinedmods.refinedstorage.container.DiskManipulatorContainer; +import com.refinedmods.refinedstorage.container.DiskManipulatorContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.blockentity.DiskManipulatorBlockEntity; import com.refinedmods.refinedstorage.util.BlockUtils; @@ -41,7 +41,7 @@ public class DiskManipulatorBlock extends ColoredNetworkBlock { (ServerPlayer) player, new BlockEntityMenuProvider( new TranslatableComponent("gui.refinedstorage.disk_manipulator"), - (blockEntity, windowId, inventory, p) -> new DiskManipulatorContainer(blockEntity, p, windowId), + (blockEntity, windowId, inventory, p) -> new DiskManipulatorContainerMenu(blockEntity, p, windowId), pos ), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java index 5971df450..a1d9aa06e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.block.shape.ShapeCache; -import com.refinedmods.refinedstorage.container.ExporterContainer; +import com.refinedmods.refinedstorage.container.ExporterContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.render.ConstantsCable; import com.refinedmods.refinedstorage.blockentity.ExporterBlockEntity; @@ -120,7 +120,7 @@ public class ExporterBlock extends CableBlock { (ServerPlayer) player, new BlockEntityMenuProvider( new TranslatableComponent("gui.refinedstorage.exporter"), - (blockEntity, windowId, inventory, p) -> new ExporterContainer(blockEntity, player, windowId), + (blockEntity, windowId, inventory, p) -> new ExporterContainerMenu(blockEntity, player, windowId), pos ), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java index 2e8e46261..c30a9dceb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java @@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.api.network.node.INetworkNode; import com.refinedmods.refinedstorage.api.storage.cache.InvalidateCause; import com.refinedmods.refinedstorage.apiimpl.network.node.ExternalStorageNetworkNode; import com.refinedmods.refinedstorage.block.shape.ShapeCache; -import com.refinedmods.refinedstorage.container.ExternalStorageContainer; +import com.refinedmods.refinedstorage.container.ExternalStorageContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.render.ConstantsCable; import com.refinedmods.refinedstorage.blockentity.ExternalStorageBlockEntity; @@ -100,7 +100,7 @@ public class ExternalStorageBlock extends CableBlock { (ServerPlayer) player, new BlockEntityMenuProvider( new TranslatableComponent("gui.refinedstorage.external_storage"), - (blockEntity, windowId, inventory, p) -> new ExternalStorageContainer(blockEntity, player, windowId), + (blockEntity, windowId, inventory, p) -> new ExternalStorageContainerMenu(blockEntity, player, windowId), pos ), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java index 8170e446d..0c392b85a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.api.network.security.Permission; -import com.refinedmods.refinedstorage.container.FluidInterfaceContainer; +import com.refinedmods.refinedstorage.container.FluidInterfaceContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.blockentity.FluidInterfaceBlockEntity; import com.refinedmods.refinedstorage.util.BlockUtils; @@ -36,7 +36,7 @@ public class FluidInterfaceBlock extends NetworkNodeBlock { (ServerPlayer) player, new BlockEntityMenuProvider( new TranslatableComponent("gui.refinedstorage.fluid_interface"), - (blockEntity, windowId, inventory, p) -> new FluidInterfaceContainer(blockEntity, player, windowId), + (blockEntity, windowId, inventory, p) -> new FluidInterfaceContainerMenu(blockEntity, player, windowId), pos ), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java index c644eb767..36921f0d7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.apiimpl.network.node.storage.FluidStorageNetworkNode; import com.refinedmods.refinedstorage.apiimpl.storage.FluidStorageType; -import com.refinedmods.refinedstorage.container.FluidStorageContainer; +import com.refinedmods.refinedstorage.container.FluidStorageContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.blockentity.FluidStorageBlockEntity; import com.refinedmods.refinedstorage.util.BlockUtils; @@ -60,7 +60,7 @@ public class FluidStorageBlock extends NetworkNodeBlock { if (!level.isClientSide) { return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui((ServerPlayer) player, new BlockEntityMenuProvider( ((FluidStorageBlockEntity) level.getBlockEntity(pos)).getNode().getTitle(), - (blockEntity, windowId, inventory, p) -> new FluidStorageContainer(blockEntity, player, windowId), + (blockEntity, windowId, inventory, p) -> new FluidStorageContainerMenu(blockEntity, player, windowId), pos ), pos)); } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java index 8a5e3079b..360b5cbf4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.block.shape.ShapeCache; -import com.refinedmods.refinedstorage.container.ImporterContainer; +import com.refinedmods.refinedstorage.container.ImporterContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.render.ConstantsCable; import com.refinedmods.refinedstorage.blockentity.ImporterBlockEntity; @@ -119,7 +119,7 @@ public class ImporterBlock extends CableBlock { (ServerPlayer) player, new BlockEntityMenuProvider( new TranslatableComponent("gui.refinedstorage.importer"), - (blockEntity, windowId, inventory, p) -> new ImporterContainer(blockEntity, player, windowId), + (blockEntity, windowId, inventory, p) -> new ImporterContainerMenu(blockEntity, player, windowId), pos ), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java index 44e145476..6bf72c8f7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.api.network.security.Permission; -import com.refinedmods.refinedstorage.container.InterfaceContainer; +import com.refinedmods.refinedstorage.container.InterfaceContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.blockentity.InterfaceBlockEntity; import com.refinedmods.refinedstorage.util.BlockUtils; @@ -36,7 +36,7 @@ public class InterfaceBlock extends NetworkNodeBlock { (ServerPlayer) player, new BlockEntityMenuProvider( new TranslatableComponent("gui.refinedstorage.interface"), - (blockEntity, windowId, inventory, p) -> new InterfaceContainer(blockEntity, player, windowId), + (blockEntity, windowId, inventory, p) -> new InterfaceContainerMenu(blockEntity, player, windowId), pos ), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java index 61b22dee2..0086f62e9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.RSBlocks; -import com.refinedmods.refinedstorage.container.NetworkTransmitterContainer; +import com.refinedmods.refinedstorage.container.NetworkTransmitterContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.blockentity.NetworkTransmitterBlockEntity; import com.refinedmods.refinedstorage.util.BlockUtils; @@ -41,7 +41,7 @@ public class NetworkTransmitterBlock extends ColoredNetworkBlock { (ServerPlayer) player, new BlockEntityMenuProvider( new TranslatableComponent("gui.refinedstorage.network_transmitter"), - (blockEntity, windowId, inventory, p) -> new NetworkTransmitterContainer(blockEntity, player, windowId), + (blockEntity, windowId, inventory, p) -> new NetworkTransmitterContainerMenu(blockEntity, player, windowId), pos ), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java index 5eca097a9..15f22d29a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.RSBlocks; -import com.refinedmods.refinedstorage.container.RelayContainer; +import com.refinedmods.refinedstorage.container.RelayContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.blockentity.RelayBlockEntity; import com.refinedmods.refinedstorage.util.BlockUtils; @@ -41,7 +41,7 @@ public class RelayBlock extends ColoredNetworkBlock { (ServerPlayer) player, new BlockEntityMenuProvider( new TranslatableComponent("gui.refinedstorage.relay"), - (blockEntity, windowId, inventory, p) -> new RelayContainer(blockEntity, player, windowId), + (blockEntity, windowId, inventory, p) -> new RelayContainerMenu(blockEntity, player, windowId), pos ), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java index b719032b7..517b4b033 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.RSBlocks; import com.refinedmods.refinedstorage.api.network.security.Permission; -import com.refinedmods.refinedstorage.container.SecurityManagerContainer; +import com.refinedmods.refinedstorage.container.SecurityManagerContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.blockentity.SecurityManagerBlockEntity; import com.refinedmods.refinedstorage.util.BlockUtils; @@ -42,7 +42,7 @@ public class SecurityManagerBlock extends ColoredNetworkBlock { (ServerPlayer) player, new BlockEntityMenuProvider( new TranslatableComponent("gui.refinedstorage.security_manager"), - (blockEntity, windowId, inventory, p) -> new SecurityManagerContainer(blockEntity, player, windowId), + (blockEntity, windowId, inventory, p) -> new SecurityManagerContainerMenu(blockEntity, player, windowId), pos ), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java index 330aac4cb..11924919a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.apiimpl.network.node.storage.StorageNetworkNode; import com.refinedmods.refinedstorage.apiimpl.storage.ItemStorageType; -import com.refinedmods.refinedstorage.container.StorageContainer; +import com.refinedmods.refinedstorage.container.StorageContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.blockentity.StorageBlockEntity; import com.refinedmods.refinedstorage.util.BlockUtils; @@ -62,7 +62,7 @@ public class StorageBlock extends NetworkNodeBlock { if (!level.isClientSide) { return NetworkUtils.attemptModify(level, pos, player, () -> NetworkHooks.openGui((ServerPlayer) player, new BlockEntityMenuProvider( ((StorageBlockEntity) level.getBlockEntity(pos)).getNode().getTitle(), - (blockEntity, windowId, inventory, p) -> new StorageContainer(blockEntity, player, windowId), + (blockEntity, windowId, inventory, p) -> new StorageContainerMenu(blockEntity, player, windowId), pos ), pos)); } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java index 6f84ae29d..227a87dce 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.apiimpl.network.node.StorageMonitorNetworkNode; -import com.refinedmods.refinedstorage.container.StorageMonitorContainer; +import com.refinedmods.refinedstorage.container.StorageMonitorContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.blockentity.StorageMonitorBlockEntity; import com.refinedmods.refinedstorage.util.BlockUtils; @@ -47,7 +47,7 @@ public class StorageMonitorBlock extends NetworkNodeBlock { (ServerPlayer) player, new BlockEntityMenuProvider( new TranslatableComponent("gui.refinedstorage.storage_monitor"), - (blockEntity, windowId, inventory, p) -> new StorageMonitorContainer(blockEntity, player, windowId), + (blockEntity, windowId, inventory, p) -> new StorageMonitorContainerMenu(blockEntity, player, windowId), pos ), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java index f8db56171..20648d9fe 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.block; import com.refinedmods.refinedstorage.RSBlocks; -import com.refinedmods.refinedstorage.container.WirelessTransmitterContainer; +import com.refinedmods.refinedstorage.container.WirelessTransmitterContainerMenu; import com.refinedmods.refinedstorage.container.factory.BlockEntityMenuProvider; import com.refinedmods.refinedstorage.blockentity.WirelessTransmitterBlockEntity; import com.refinedmods.refinedstorage.util.BlockUtils; @@ -83,7 +83,7 @@ public class WirelessTransmitterBlock extends ColoredNetworkBlock { (ServerPlayer) player, new BlockEntityMenuProvider( new TranslatableComponent("gui.refinedstorage.wireless_transmitter"), - (blockEntity, windowId, inventory, p) -> new WirelessTransmitterContainer(blockEntity, player, windowId), + (blockEntity, windowId, inventory, p) -> new WirelessTransmitterContainerMenu(blockEntity, player, windowId), pos ), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/container/AlternativesContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/AlternativesContainerMenu.java similarity index 54% rename from src/main/java/com/refinedmods/refinedstorage/container/AlternativesContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/AlternativesContainerMenu.java index 59e5aa95d..03a071d50 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/AlternativesContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/AlternativesContainerMenu.java @@ -2,8 +2,8 @@ package com.refinedmods.refinedstorage.container; import net.minecraft.world.entity.player.Player; -public class AlternativesContainer extends BaseContainer { - public AlternativesContainer(Player player) { +public class AlternativesContainerMenu extends BaseContainerMenu { + public AlternativesContainerMenu(Player player) { super(null, null, player, 0); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/AmountContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/AmountContainerMenu.java similarity index 81% rename from src/main/java/com/refinedmods/refinedstorage/container/AmountContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/AmountContainerMenu.java index a46e6492d..41a7c53e8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/AmountContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/AmountContainerMenu.java @@ -6,8 +6,8 @@ import net.minecraft.world.item.ItemStack; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemStackHandler; -public class AmountContainer extends BaseContainer { - public AmountContainer(Player player, ItemStack stack) { +public class AmountContainerMenu extends BaseContainerMenu { + public AmountContainerMenu(Player player, ItemStack stack) { super(null, null, player, 0); ItemStackHandler inventory = new ItemStackHandler(1); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/BaseContainerMenu.java similarity index 97% rename from src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/BaseContainerMenu.java index 8a17aaecf..6fb9cc9c8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/BaseContainerMenu.java @@ -24,7 +24,7 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -public abstract class BaseContainer extends AbstractContainerMenu { +public abstract class BaseContainerMenu extends AbstractContainerMenu { protected final TransferManager transferManager = new TransferManager(this); @Nullable private final BaseBlockEntity blockEntity; @@ -34,7 +34,7 @@ public abstract class BaseContainer extends AbstractContainerMenu { @Nullable private BlockEntitySynchronizationWatcher listener; - protected BaseContainer(@Nullable MenuType type, @Nullable BaseBlockEntity blockEntity, Player player, int windowId) { + protected BaseContainerMenu(@Nullable MenuType type, @Nullable BaseBlockEntity blockEntity, Player player, int windowId) { super(type, windowId); this.blockEntity = blockEntity; diff --git a/src/main/java/com/refinedmods/refinedstorage/container/ConstructorContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/ConstructorContainerMenu.java similarity index 80% rename from src/main/java/com/refinedmods/refinedstorage/container/ConstructorContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/ConstructorContainerMenu.java index b26e30f9c..82901f40f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/ConstructorContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/ConstructorContainerMenu.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; import com.refinedmods.refinedstorage.blockentity.ConstructorBlockEntity; @@ -8,9 +8,9 @@ import com.refinedmods.refinedstorage.blockentity.config.IType; import net.minecraft.world.entity.player.Player; import net.minecraftforge.items.SlotItemHandler; -public class ConstructorContainer extends BaseContainer { - public ConstructorContainer(ConstructorBlockEntity constructor, Player player, int windowId) { - super(RSContainers.CONSTRUCTOR, constructor, player, windowId); +public class ConstructorContainerMenu extends BaseContainerMenu { + public ConstructorContainerMenu(ConstructorBlockEntity constructor, Player player, int windowId) { + super(RSContainerMenus.CONSTRUCTOR, constructor, player, windowId); for (int i = 0; i < 4; ++i) { addSlot(new SlotItemHandler(constructor.getNode().getUpgrades(), i, 187, 6 + (i * 18))); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/ControllerContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/ControllerContainer.java deleted file mode 100644 index 494f59a61..000000000 --- a/src/main/java/com/refinedmods/refinedstorage/container/ControllerContainer.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.refinedmods.refinedstorage.container; - -import com.refinedmods.refinedstorage.RSContainers; -import com.refinedmods.refinedstorage.blockentity.ControllerBlockEntity; -import net.minecraft.world.entity.player.Player; - -public class ControllerContainer extends BaseContainer { - public ControllerContainer(ControllerBlockEntity controller, Player player, int windowId) { - super(RSContainers.CONTROLLER, controller, player, windowId); - - addPlayerInventory(8, 99); - } -} diff --git a/src/main/java/com/refinedmods/refinedstorage/container/ControllerContainerMenu.java b/src/main/java/com/refinedmods/refinedstorage/container/ControllerContainerMenu.java new file mode 100644 index 000000000..8a5c91915 --- /dev/null +++ b/src/main/java/com/refinedmods/refinedstorage/container/ControllerContainerMenu.java @@ -0,0 +1,13 @@ +package com.refinedmods.refinedstorage.container; + +import com.refinedmods.refinedstorage.RSContainerMenus; +import com.refinedmods.refinedstorage.blockentity.ControllerBlockEntity; +import net.minecraft.world.entity.player.Player; + +public class ControllerContainerMenu extends BaseContainerMenu { + public ControllerContainerMenu(ControllerBlockEntity controller, Player player, int windowId) { + super(RSContainerMenus.CONTROLLER, controller, player, windowId); + + addPlayerInventory(8, 99); + } +} diff --git a/src/main/java/com/refinedmods/refinedstorage/container/CrafterContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/CrafterContainerMenu.java similarity index 73% rename from src/main/java/com/refinedmods/refinedstorage/container/CrafterContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/CrafterContainerMenu.java index bd05f1058..6889ada79 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/CrafterContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/CrafterContainerMenu.java @@ -1,13 +1,13 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.blockentity.CrafterBlockEntity; import net.minecraft.world.entity.player.Player; import net.minecraftforge.items.SlotItemHandler; -public class CrafterContainer extends BaseContainer { - public CrafterContainer(CrafterBlockEntity crafter, Player player, int windowId) { - super(RSContainers.CRAFTER, crafter, player, windowId); +public class CrafterContainerMenu extends BaseContainerMenu { + public CrafterContainerMenu(CrafterBlockEntity crafter, Player player, int windowId) { + super(RSContainerMenus.CRAFTER, crafter, player, windowId); for (int i = 0; i < 9; ++i) { addSlot(new SlotItemHandler(crafter.getNode().getPatternInventory(), i, 8 + (18 * i), 20)); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainerMenu.java similarity index 95% rename from src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainerMenu.java index 9c511d9da..8a6f7c342 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainerMenu.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; import com.refinedmods.refinedstorage.apiimpl.network.node.CrafterManagerNetworkNode; import com.refinedmods.refinedstorage.container.slot.CrafterManagerSlot; @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.function.Predicate; -public class CrafterManagerContainer extends BaseContainer { +public class CrafterManagerContainerMenu extends BaseContainerMenu { private final CrafterManagerNetworkNode crafterManager; private final Map dummyInventories = new HashMap<>(); private final Map headings = new HashMap<>(); @@ -34,8 +34,8 @@ public class CrafterManagerContainer extends BaseContainer { private Map containerData; private int rows; - public CrafterManagerContainer(CrafterManagerBlockEntity crafterManager, Player player, int windowId) { - super(RSContainers.CRAFTER_MANAGER, crafterManager, player, windowId); + public CrafterManagerContainerMenu(CrafterManagerBlockEntity crafterManager, Player player, int windowId) { + super(RSContainerMenus.CRAFTER_MANAGER, crafterManager, player, windowId); this.crafterManager = crafterManager.getNode(); } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainerMenu.java similarity index 90% rename from src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainerMenu.java index 01b1fa9ea..8d2e0ec6d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainerMenu.java @@ -14,11 +14,11 @@ import net.minecraft.world.item.ItemStack; import javax.annotation.Nullable; -public class CraftingMonitorContainer extends BaseContainer implements ICraftingMonitorListener { +public class CraftingMonitorContainerMenu extends BaseContainerMenu implements ICraftingMonitorListener { private final ICraftingMonitor craftingMonitor; private boolean addedListener; - public CraftingMonitorContainer(MenuType type, ICraftingMonitor craftingMonitor, @Nullable CraftingMonitorBlockEntity blockEntity, Player player, int windowId) { + public CraftingMonitorContainerMenu(MenuType type, ICraftingMonitor craftingMonitor, @Nullable CraftingMonitorBlockEntity blockEntity, Player player, int windowId) { super(type, blockEntity, player, windowId); this.craftingMonitor = craftingMonitor; diff --git a/src/main/java/com/refinedmods/refinedstorage/container/CraftingSettingsContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/CraftingSettingsContainerMenu.java similarity index 89% rename from src/main/java/com/refinedmods/refinedstorage/container/CraftingSettingsContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/CraftingSettingsContainerMenu.java index 7bd0759cc..fb71a99cc 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/CraftingSettingsContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/CraftingSettingsContainerMenu.java @@ -10,8 +10,8 @@ import net.minecraft.world.entity.player.Player; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemStackHandler; -public class CraftingSettingsContainer extends BaseContainer { - public CraftingSettingsContainer(Player player, IGridStack stack) { +public class CraftingSettingsContainerMenu extends BaseContainerMenu { + public CraftingSettingsContainerMenu(Player player, IGridStack stack) { super(null, null, player, 0); if (stack instanceof FluidGridStack) { diff --git a/src/main/java/com/refinedmods/refinedstorage/container/DestructorContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/DestructorContainerMenu.java similarity index 81% rename from src/main/java/com/refinedmods/refinedstorage/container/DestructorContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/DestructorContainerMenu.java index 746051a54..d21181684 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/DestructorContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/DestructorContainerMenu.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; import com.refinedmods.refinedstorage.blockentity.DestructorBlockEntity; @@ -8,9 +8,9 @@ import com.refinedmods.refinedstorage.blockentity.config.IType; import net.minecraft.world.entity.player.Player; import net.minecraftforge.items.SlotItemHandler; -public class DestructorContainer extends BaseContainer { - public DestructorContainer(DestructorBlockEntity destructor, Player player, int windowId) { - super(RSContainers.DESTRUCTOR, destructor, player, windowId); +public class DestructorContainerMenu extends BaseContainerMenu { + public DestructorContainerMenu(DestructorBlockEntity destructor, Player player, int windowId) { + super(RSContainerMenus.DESTRUCTOR, destructor, player, windowId); for (int i = 0; i < 4; ++i) { addSlot(new SlotItemHandler(destructor.getNode().getUpgrades(), i, 187, 6 + (i * 18))); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/DetectorContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/DetectorContainerMenu.java similarity index 76% rename from src/main/java/com/refinedmods/refinedstorage/container/DetectorContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/DetectorContainerMenu.java index ac6a04db1..c6d0677ac 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/DetectorContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/DetectorContainerMenu.java @@ -1,15 +1,15 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; import com.refinedmods.refinedstorage.blockentity.DetectorBlockEntity; import com.refinedmods.refinedstorage.blockentity.config.IType; import net.minecraft.world.entity.player.Player; -public class DetectorContainer extends BaseContainer { - public DetectorContainer(DetectorBlockEntity detector, Player player, int windowId) { - super(RSContainers.DETECTOR, detector, player, windowId); +public class DetectorContainerMenu extends BaseContainerMenu { + public DetectorContainerMenu(DetectorBlockEntity detector, Player player, int windowId) { + super(RSContainerMenus.DETECTOR, detector, player, windowId); addSlot(new FilterSlot(detector.getNode().getItemFilters(), 0, 107, 20).setEnableHandler(() -> detector.getNode().getType() == IType.ITEMS)); addSlot(new FluidFilterSlot(detector.getNode().getFluidFilters(), 0, 107, 20).setEnableHandler(() -> detector.getNode().getType() == IType.FLUIDS)); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/DiskDriveContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/DiskDriveContainerMenu.java similarity index 82% rename from src/main/java/com/refinedmods/refinedstorage/container/DiskDriveContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/DiskDriveContainerMenu.java index b95667fb1..08e135a57 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/DiskDriveContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/DiskDriveContainerMenu.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; import com.refinedmods.refinedstorage.blockentity.DiskDriveBlockEntity; @@ -8,9 +8,9 @@ import com.refinedmods.refinedstorage.blockentity.config.IType; import net.minecraft.world.entity.player.Player; import net.minecraftforge.items.SlotItemHandler; -public class DiskDriveContainer extends BaseContainer { - public DiskDriveContainer(DiskDriveBlockEntity diskDrive, Player player, int windowId) { - super(RSContainers.DISK_DRIVE, diskDrive, player, windowId); +public class DiskDriveContainerMenu extends BaseContainerMenu { + public DiskDriveContainerMenu(DiskDriveBlockEntity diskDrive, Player player, int windowId) { + super(RSContainerMenus.DISK_DRIVE, diskDrive, player, windowId); int x = 80; int y = 54; diff --git a/src/main/java/com/refinedmods/refinedstorage/container/DiskManipulatorContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/DiskManipulatorContainerMenu.java similarity index 85% rename from src/main/java/com/refinedmods/refinedstorage/container/DiskManipulatorContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/DiskManipulatorContainerMenu.java index c298ed9a5..b49ce1333 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/DiskManipulatorContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/DiskManipulatorContainerMenu.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; import com.refinedmods.refinedstorage.blockentity.DiskManipulatorBlockEntity; @@ -8,9 +8,9 @@ import com.refinedmods.refinedstorage.blockentity.config.IType; import net.minecraft.world.entity.player.Player; import net.minecraftforge.items.SlotItemHandler; -public class DiskManipulatorContainer extends BaseContainer { - public DiskManipulatorContainer(DiskManipulatorBlockEntity diskManipulator, Player player, int windowId) { - super(RSContainers.DISK_MANIPULATOR, diskManipulator, player, windowId); +public class DiskManipulatorContainerMenu extends BaseContainerMenu { + public DiskManipulatorContainerMenu(DiskManipulatorBlockEntity diskManipulator, Player player, int windowId) { + super(RSContainerMenus.DISK_MANIPULATOR, diskManipulator, player, windowId); for (int i = 0; i < 4; ++i) { addSlot(new SlotItemHandler(diskManipulator.getNode().getUpgrades(), i, 187, 6 + (i * 18))); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/ExporterContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/ExporterContainerMenu.java similarity index 90% rename from src/main/java/com/refinedmods/refinedstorage/container/ExporterContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/ExporterContainerMenu.java index e8cf92161..0ead9cadb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/ExporterContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/ExporterContainerMenu.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; import com.refinedmods.refinedstorage.item.UpgradeItem; @@ -9,12 +9,12 @@ import com.refinedmods.refinedstorage.blockentity.config.IType; import net.minecraft.world.entity.player.Player; import net.minecraftforge.items.SlotItemHandler; -public class ExporterContainer extends BaseContainer { +public class ExporterContainerMenu extends BaseContainerMenu { private final ExporterBlockEntity exporter; private boolean hasRegulatorMode; - public ExporterContainer(ExporterBlockEntity exporter, Player player, int windowId) { - super(RSContainers.EXPORTER, exporter, player, windowId); + public ExporterContainerMenu(ExporterBlockEntity exporter, Player player, int windowId) { + super(RSContainerMenus.EXPORTER, exporter, player, windowId); this.exporter = exporter; this.hasRegulatorMode = hasRegulatorMode(); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/ExternalStorageContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/ExternalStorageContainerMenu.java similarity index 76% rename from src/main/java/com/refinedmods/refinedstorage/container/ExternalStorageContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/ExternalStorageContainerMenu.java index bdbf7b28a..107bd1b1a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/ExternalStorageContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/ExternalStorageContainerMenu.java @@ -1,15 +1,15 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; import com.refinedmods.refinedstorage.blockentity.ExternalStorageBlockEntity; import com.refinedmods.refinedstorage.blockentity.config.IType; import net.minecraft.world.entity.player.Player; -public class ExternalStorageContainer extends BaseContainer { - public ExternalStorageContainer(ExternalStorageBlockEntity externalStorage, Player player, int windowId) { - super(RSContainers.EXTERNAL_STORAGE, externalStorage, player, windowId); +public class ExternalStorageContainerMenu extends BaseContainerMenu { + public ExternalStorageContainerMenu(ExternalStorageBlockEntity externalStorage, Player player, int windowId) { + super(RSContainerMenus.EXTERNAL_STORAGE, externalStorage, player, windowId); for (int i = 0; i < 9; ++i) { addSlot(new FilterSlot(externalStorage.getNode().getItemFilters(), i, 8 + (18 * i), 20).setEnableHandler(() -> externalStorage.getNode().getType() == IType.ITEMS)); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/FilterContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/FilterContainerMenu.java similarity index 89% rename from src/main/java/com/refinedmods/refinedstorage/container/FilterContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/FilterContainerMenu.java index 2f9d67750..2439cbf96 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/FilterContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/FilterContainerMenu.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; import com.refinedmods.refinedstorage.inventory.fluid.ConfiguredFluidsInFilterItemHandler; @@ -13,11 +13,11 @@ import com.refinedmods.refinedstorage.blockentity.config.IType; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -public class FilterContainer extends BaseContainer { +public class FilterContainerMenu extends BaseContainerMenu { private final ItemStack filterItem; - public FilterContainer(Player player, ItemStack filterItem, int windowId) { - super(RSContainers.FILTER, null, player, windowId); + public FilterContainerMenu(Player player, ItemStack filterItem, int windowId) { + super(RSContainerMenus.FILTER, null, player, windowId); this.filterItem = filterItem; diff --git a/src/main/java/com/refinedmods/refinedstorage/container/FluidAmountContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/FluidAmountContainerMenu.java similarity index 79% rename from src/main/java/com/refinedmods/refinedstorage/container/FluidAmountContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/FluidAmountContainerMenu.java index 4ffed58c6..110bce582 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/FluidAmountContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/FluidAmountContainerMenu.java @@ -5,8 +5,8 @@ import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; import net.minecraft.world.entity.player.Player; import net.minecraftforge.fluids.FluidStack; -public class FluidAmountContainer extends BaseContainer { - public FluidAmountContainer(Player player, FluidStack stack) { +public class FluidAmountContainerMenu extends BaseContainerMenu { + public FluidAmountContainerMenu(Player player, FluidStack stack) { super(null, null, player, 0); FluidInventory inventory = new FluidInventory(1); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/FluidInterfaceContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/FluidInterfaceContainerMenu.java similarity index 75% rename from src/main/java/com/refinedmods/refinedstorage/container/FluidInterfaceContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/FluidInterfaceContainerMenu.java index 7e22aa48c..9a032560a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/FluidInterfaceContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/FluidInterfaceContainerMenu.java @@ -1,15 +1,15 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; import com.refinedmods.refinedstorage.blockentity.FluidInterfaceBlockEntity; import net.minecraft.world.entity.player.Player; import net.minecraftforge.items.SlotItemHandler; -public class FluidInterfaceContainer extends BaseContainer { - public FluidInterfaceContainer(FluidInterfaceBlockEntity fluidInterface, Player player, int windowId) { - super(RSContainers.FLUID_INTERFACE, fluidInterface, player, windowId); +public class FluidInterfaceContainerMenu extends BaseContainerMenu { + public FluidInterfaceContainerMenu(FluidInterfaceBlockEntity fluidInterface, Player player, int windowId) { + super(RSContainerMenus.FLUID_INTERFACE, fluidInterface, player, windowId); for (int i = 0; i < 4; ++i) { addSlot(new SlotItemHandler(fluidInterface.getNode().getUpgrades(), i, 187, 6 + (i * 18))); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/FluidStorageContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/FluidStorageContainerMenu.java similarity index 63% rename from src/main/java/com/refinedmods/refinedstorage/container/FluidStorageContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/FluidStorageContainerMenu.java index cd6ffce52..f6bbea66b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/FluidStorageContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/FluidStorageContainerMenu.java @@ -1,13 +1,13 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; import com.refinedmods.refinedstorage.blockentity.FluidStorageBlockEntity; import net.minecraft.world.entity.player.Player; -public class FluidStorageContainer extends BaseContainer { - public FluidStorageContainer(FluidStorageBlockEntity fluidStorage, Player player, int windowId) { - super(RSContainers.FLUID_STORAGE_BLOCK, fluidStorage, player, windowId); +public class FluidStorageContainerMenu extends BaseContainerMenu { + public FluidStorageContainerMenu(FluidStorageBlockEntity fluidStorage, Player player, int windowId) { + super(RSContainerMenus.FLUID_STORAGE_BLOCK, fluidStorage, player, windowId); for (int i = 0; i < 9; ++i) { addSlot(new FluidFilterSlot(fluidStorage.getNode().getFilters(), i, 8 + (18 * i), 20)); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/GridContainerMenu.java similarity index 97% rename from src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/GridContainerMenu.java index 6ed88cdef..7b31b22dc 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/GridContainerMenu.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.api.network.grid.GridType; import com.refinedmods.refinedstorage.api.network.grid.ICraftingGridListener; import com.refinedmods.refinedstorage.api.network.grid.IGrid; @@ -32,7 +32,7 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -public class GridContainer extends BaseContainer implements ICraftingGridListener { +public class GridContainerMenu extends BaseContainerMenu implements ICraftingGridListener { private final IGrid grid; private IStorageCache storageCache; private IStorageCacheListener storageCacheListener; @@ -44,8 +44,8 @@ public class GridContainer extends BaseContainer implements ICraftingGridListene private List fluidPatternSlots = new ArrayList<>(); private int patternScrollOffset; - public GridContainer(IGrid grid, @Nullable BaseBlockEntity blockEntity, Player player, int windowId) { - super(RSContainers.GRID, blockEntity, player, windowId); + public GridContainerMenu(IGrid grid, @Nullable BaseBlockEntity blockEntity, Player player, int windowId) { + super(RSContainerMenus.GRID, blockEntity, player, windowId); this.grid = grid; diff --git a/src/main/java/com/refinedmods/refinedstorage/container/ImporterContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/ImporterContainerMenu.java similarity index 82% rename from src/main/java/com/refinedmods/refinedstorage/container/ImporterContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/ImporterContainerMenu.java index 791fa58ee..7ac0b1e0c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/ImporterContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/ImporterContainerMenu.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; import com.refinedmods.refinedstorage.blockentity.ImporterBlockEntity; @@ -8,9 +8,9 @@ import com.refinedmods.refinedstorage.blockentity.config.IType; import net.minecraft.world.entity.player.Player; import net.minecraftforge.items.SlotItemHandler; -public class ImporterContainer extends BaseContainer { - public ImporterContainer(ImporterBlockEntity importer, Player player, int windowId) { - super(RSContainers.IMPORTER, importer, player, windowId); +public class ImporterContainerMenu extends BaseContainerMenu { + public ImporterContainerMenu(ImporterBlockEntity importer, Player player, int windowId) { + super(RSContainerMenus.IMPORTER, importer, player, windowId); for (int i = 0; i < 4; ++i) { addSlot(new SlotItemHandler(importer.getNode().getUpgrades(), i, 187, 6 + (i * 18))); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/InterfaceContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/InterfaceContainerMenu.java similarity index 82% rename from src/main/java/com/refinedmods/refinedstorage/container/InterfaceContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/InterfaceContainerMenu.java index c115c2bac..15ad54a39 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/InterfaceContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/InterfaceContainerMenu.java @@ -1,15 +1,15 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.container.slot.OutputSlot; import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; import com.refinedmods.refinedstorage.blockentity.InterfaceBlockEntity; import net.minecraft.world.entity.player.Player; import net.minecraftforge.items.SlotItemHandler; -public class InterfaceContainer extends BaseContainer { - public InterfaceContainer(InterfaceBlockEntity blockEntity, Player player, int windowId) { - super(RSContainers.INTERFACE, blockEntity, player, windowId); +public class InterfaceContainerMenu extends BaseContainerMenu { + public InterfaceContainerMenu(InterfaceBlockEntity blockEntity, Player player, int windowId) { + super(RSContainerMenus.INTERFACE, blockEntity, player, windowId); for (int i = 0; i < 9; ++i) { addSlot(new SlotItemHandler(blockEntity.getNode().getImportItems(), i, 8 + (18 * i), 20)); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/NetworkTransmitterContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/NetworkTransmitterContainerMenu.java similarity index 58% rename from src/main/java/com/refinedmods/refinedstorage/container/NetworkTransmitterContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/NetworkTransmitterContainerMenu.java index a471d384c..fcbdfb934 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/NetworkTransmitterContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/NetworkTransmitterContainerMenu.java @@ -1,13 +1,13 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.blockentity.NetworkTransmitterBlockEntity; import net.minecraft.world.entity.player.Player; import net.minecraftforge.items.SlotItemHandler; -public class NetworkTransmitterContainer extends BaseContainer { - public NetworkTransmitterContainer(NetworkTransmitterBlockEntity networkTransmitter, Player player, int windowId) { - super(RSContainers.NETWORK_TRANSMITTER, networkTransmitter, player, windowId); +public class NetworkTransmitterContainerMenu extends BaseContainerMenu { + public NetworkTransmitterContainerMenu(NetworkTransmitterBlockEntity networkTransmitter, Player player, int windowId) { + super(RSContainerMenus.NETWORK_TRANSMITTER, networkTransmitter, player, windowId); addSlot(new SlotItemHandler(networkTransmitter.getNode().getNetworkCard(), 0, 8, 20)); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/RelayContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/RelayContainer.java deleted file mode 100644 index fef779230..000000000 --- a/src/main/java/com/refinedmods/refinedstorage/container/RelayContainer.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.refinedmods.refinedstorage.container; - -import com.refinedmods.refinedstorage.RSContainers; -import com.refinedmods.refinedstorage.blockentity.RelayBlockEntity; -import net.minecraft.world.entity.player.Player; - -public class RelayContainer extends BaseContainer { - public RelayContainer(RelayBlockEntity relay, Player player, int windowId) { - super(RSContainers.RELAY, relay, player, windowId); - - addPlayerInventory(8, 50); - } -} diff --git a/src/main/java/com/refinedmods/refinedstorage/container/RelayContainerMenu.java b/src/main/java/com/refinedmods/refinedstorage/container/RelayContainerMenu.java new file mode 100644 index 000000000..914f52e39 --- /dev/null +++ b/src/main/java/com/refinedmods/refinedstorage/container/RelayContainerMenu.java @@ -0,0 +1,13 @@ +package com.refinedmods.refinedstorage.container; + +import com.refinedmods.refinedstorage.RSContainerMenus; +import com.refinedmods.refinedstorage.blockentity.RelayBlockEntity; +import net.minecraft.world.entity.player.Player; + +public class RelayContainerMenu extends BaseContainerMenu { + public RelayContainerMenu(RelayBlockEntity relay, Player player, int windowId) { + super(RSContainerMenus.RELAY, relay, player, windowId); + + addPlayerInventory(8, 50); + } +} diff --git a/src/main/java/com/refinedmods/refinedstorage/container/SecurityManagerContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/SecurityManagerContainerMenu.java similarity index 73% rename from src/main/java/com/refinedmods/refinedstorage/container/SecurityManagerContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/SecurityManagerContainerMenu.java index a6008601e..9e2ee139e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/SecurityManagerContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/SecurityManagerContainerMenu.java @@ -1,13 +1,13 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.blockentity.SecurityManagerBlockEntity; import net.minecraft.world.entity.player.Player; import net.minecraftforge.items.SlotItemHandler; -public class SecurityManagerContainer extends BaseContainer { - public SecurityManagerContainer(SecurityManagerBlockEntity securityManager, Player player, int windowId) { - super(RSContainers.SECURITY_MANAGER, securityManager, player, windowId); +public class SecurityManagerContainerMenu extends BaseContainerMenu { + public SecurityManagerContainerMenu(SecurityManagerBlockEntity securityManager, Player player, int windowId) { + super(RSContainerMenus.SECURITY_MANAGER, securityManager, player, windowId); int x = 8; int y = 20; diff --git a/src/main/java/com/refinedmods/refinedstorage/container/StorageContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/StorageContainerMenu.java similarity index 65% rename from src/main/java/com/refinedmods/refinedstorage/container/StorageContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/StorageContainerMenu.java index 1f69f0745..6cd9e3d08 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/StorageContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/StorageContainerMenu.java @@ -1,13 +1,13 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; import com.refinedmods.refinedstorage.blockentity.StorageBlockEntity; import net.minecraft.world.entity.player.Player; -public class StorageContainer extends BaseContainer { - public StorageContainer(StorageBlockEntity storage, Player player, int windowId) { - super(RSContainers.STORAGE_BLOCK, storage, player, windowId); +public class StorageContainerMenu extends BaseContainerMenu { + public StorageContainerMenu(StorageBlockEntity storage, Player player, int windowId) { + super(RSContainerMenus.STORAGE_BLOCK, storage, player, windowId); for (int i = 0; i < 9; ++i) { addSlot(new FilterSlot(storage.getNode().getFilters(), i, 8 + (18 * i), 20)); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/StorageMonitorContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/StorageMonitorContainerMenu.java similarity index 74% rename from src/main/java/com/refinedmods/refinedstorage/container/StorageMonitorContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/StorageMonitorContainerMenu.java index 71faa8354..d98e1cf4e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/StorageMonitorContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/StorageMonitorContainerMenu.java @@ -1,15 +1,15 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; import com.refinedmods.refinedstorage.blockentity.StorageMonitorBlockEntity; import com.refinedmods.refinedstorage.blockentity.config.IType; import net.minecraft.world.entity.player.Player; -public class StorageMonitorContainer extends BaseContainer { - public StorageMonitorContainer(StorageMonitorBlockEntity storageMonitor, Player player, int windowId) { - super(RSContainers.STORAGE_MONITOR, storageMonitor, player, windowId); +public class StorageMonitorContainerMenu extends BaseContainerMenu { + public StorageMonitorContainerMenu(StorageMonitorBlockEntity storageMonitor, Player player, int windowId) { + super(RSContainerMenus.STORAGE_MONITOR, storageMonitor, player, windowId); addSlot(new FilterSlot(storageMonitor.getNode().getItemFilters(), 0, 80, 20).setEnableHandler(() -> storageMonitor.getNode().getType() == IType.ITEMS)); addSlot(new FluidFilterSlot(storageMonitor.getNode().getFluidFilters(), 0, 80, 20).setEnableHandler(() -> storageMonitor.getNode().getType() == IType.FLUIDS)); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/WirelessTransmitterContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/WirelessTransmitterContainerMenu.java similarity index 60% rename from src/main/java/com/refinedmods/refinedstorage/container/WirelessTransmitterContainer.java rename to src/main/java/com/refinedmods/refinedstorage/container/WirelessTransmitterContainerMenu.java index 42c7272ce..0bc902753 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/WirelessTransmitterContainer.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/WirelessTransmitterContainerMenu.java @@ -1,13 +1,13 @@ package com.refinedmods.refinedstorage.container; -import com.refinedmods.refinedstorage.RSContainers; +import com.refinedmods.refinedstorage.RSContainerMenus; import com.refinedmods.refinedstorage.blockentity.WirelessTransmitterBlockEntity; import net.minecraft.world.entity.player.Player; import net.minecraftforge.items.SlotItemHandler; -public class WirelessTransmitterContainer extends BaseContainer { - public WirelessTransmitterContainer(WirelessTransmitterBlockEntity wirelessTransmitter, Player player, int windowId) { - super(RSContainers.WIRELESS_TRANSMITTER, wirelessTransmitter, player, windowId); +public class WirelessTransmitterContainerMenu extends BaseContainerMenu { + public WirelessTransmitterContainerMenu(WirelessTransmitterBlockEntity wirelessTransmitter, Player player, int windowId) { + super(RSContainerMenus.WIRELESS_TRANSMITTER, wirelessTransmitter, player, windowId); for (int i = 0; i < 4; ++i) { addSlot(new SlotItemHandler(wirelessTransmitter.getNode().getUpgrades(), i, 187, 6 + (i * 18))); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java index d28196821..da97b93b6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.container.factory; -import com.refinedmods.refinedstorage.container.CrafterManagerContainer; +import com.refinedmods.refinedstorage.container.CrafterManagerContainerMenu; import com.refinedmods.refinedstorage.screen.EmptyScreenInfoProvider; import com.refinedmods.refinedstorage.blockentity.CrafterManagerBlockEntity; import net.minecraft.core.BlockPos; @@ -11,9 +11,9 @@ import net.minecraftforge.network.IContainerFactory; import java.util.LinkedHashMap; import java.util.Map; -public class CrafterManagerContainerFactory implements IContainerFactory { +public class CrafterManagerContainerFactory implements IContainerFactory { @Override - public CrafterManagerContainer create(int windowId, Inventory inv, FriendlyByteBuf buf) { + public CrafterManagerContainerMenu create(int windowId, Inventory inv, FriendlyByteBuf buf) { Map data = new LinkedHashMap<>(); BlockPos pos = buf.readBlockPos(); @@ -24,7 +24,7 @@ public class CrafterManagerContainerFactory implements IContainerFactory { +public class CraftingMonitorContainerFactory implements IContainerFactory { @Override - public CraftingMonitorContainer create(int windowId, Inventory inv, FriendlyByteBuf data) { + public CraftingMonitorContainerMenu create(int windowId, Inventory inv, FriendlyByteBuf data) { BlockPos pos = data.readBlockPos(); CraftingMonitorBlockEntity blockEntity = (CraftingMonitorBlockEntity) inv.player.level.getBlockEntity(pos); - return new CraftingMonitorContainer(RSContainers.CRAFTING_MONITOR, blockEntity.getNode(), blockEntity, inv.player, windowId); + return new CraftingMonitorContainerMenu(RSContainerMenus.CRAFTING_MONITOR, blockEntity.getNode(), blockEntity, inv.player, windowId); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/factory/CraftingMonitorMenuProvider.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/CraftingMonitorMenuProvider.java index 6174da5b4..1c0e64e79 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/factory/CraftingMonitorMenuProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/CraftingMonitorMenuProvider.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.container.factory; -import com.refinedmods.refinedstorage.container.CraftingMonitorContainer; +import com.refinedmods.refinedstorage.container.CraftingMonitorContainerMenu; import com.refinedmods.refinedstorage.blockentity.craftingmonitor.CraftingMonitorBlockEntity; import com.refinedmods.refinedstorage.blockentity.craftingmonitor.ICraftingMonitor; import net.minecraft.network.chat.Component; @@ -16,9 +16,9 @@ public class CraftingMonitorMenuProvider implements MenuProvider { private final ICraftingMonitor craftingMonitor; @Nullable private final CraftingMonitorBlockEntity blockEntity; - private final MenuType containerType; + private final MenuType containerType; - public CraftingMonitorMenuProvider(MenuType containerType, ICraftingMonitor craftingMonitor, @Nullable CraftingMonitorBlockEntity blockEntity) { + public CraftingMonitorMenuProvider(MenuType containerType, ICraftingMonitor craftingMonitor, @Nullable CraftingMonitorBlockEntity blockEntity) { this.containerType = containerType; this.craftingMonitor = craftingMonitor; this.blockEntity = blockEntity; @@ -32,6 +32,6 @@ public class CraftingMonitorMenuProvider implements MenuProvider { @Nullable @Override public AbstractContainerMenu createMenu(int windowId, Inventory playerInventory, Player playerEntity) { - return new CraftingMonitorContainer(containerType, craftingMonitor, blockEntity, playerEntity, windowId); + return new CraftingMonitorContainerMenu(containerType, craftingMonitor, blockEntity, playerEntity, windowId); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/factory/GridContainerFactory.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/GridContainerFactory.java index 9a01dd30b..9be8ee3f3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/factory/GridContainerFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/GridContainerFactory.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.container.factory; import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.apiimpl.API; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.inventory.player.PlayerSlot; import com.refinedmods.refinedstorage.blockentity.BaseBlockEntity; import net.minecraft.core.BlockPos; @@ -14,9 +14,9 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.network.IContainerFactory; import org.apache.commons.lang3.tuple.Pair; -public class GridContainerFactory implements IContainerFactory { +public class GridContainerFactory implements IContainerFactory { @Override - public GridContainer create(int windowId, Inventory inv, FriendlyByteBuf data) { + public GridContainerMenu create(int windowId, Inventory inv, FriendlyByteBuf data) { ResourceLocation id = data.readResourceLocation(); BlockPos pos = null; @@ -34,6 +34,6 @@ public class GridContainerFactory implements IContainerFactory { Pair grid = API.instance().getGridManager().createGrid(id, inv.player, stack, pos, slot); - return new GridContainer(grid.getLeft(), grid.getRight() instanceof BaseBlockEntity ? (BaseBlockEntity) grid.getRight() : null, inv.player, windowId); + return new GridContainerMenu(grid.getLeft(), grid.getRight() instanceof BaseBlockEntity ? (BaseBlockEntity) grid.getRight() : null, inv.player, windowId); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/container/factory/GridMenuProvider.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/GridMenuProvider.java index 7cebc1e2b..3745d2d60 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/factory/GridMenuProvider.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/GridMenuProvider.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.container.factory; import com.refinedmods.refinedstorage.api.network.grid.IGrid; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.screen.EmptyScreenInfoProvider; import com.refinedmods.refinedstorage.blockentity.BaseBlockEntity; import net.minecraft.network.chat.Component; @@ -30,7 +30,7 @@ public class GridMenuProvider implements MenuProvider { @Nullable @Override public AbstractContainerMenu createMenu(int windowId, Inventory inv, Player player) { - GridContainer c = new GridContainer(grid, blockEntity instanceof BaseBlockEntity ? (BaseBlockEntity) blockEntity : null, player, windowId); + GridContainerMenu c = new GridContainerMenu(grid, blockEntity instanceof BaseBlockEntity ? (BaseBlockEntity) blockEntity : null, player, windowId); c.setScreenInfoProvider(new EmptyScreenInfoProvider()); c.initSlots(); diff --git a/src/main/java/com/refinedmods/refinedstorage/container/factory/WirelessCraftingMonitorContainerFactory.java b/src/main/java/com/refinedmods/refinedstorage/container/factory/WirelessCraftingMonitorContainerFactory.java index 7ab72a1a2..6698c537c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/container/factory/WirelessCraftingMonitorContainerFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/container/factory/WirelessCraftingMonitorContainerFactory.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.container.factory; -import com.refinedmods.refinedstorage.RSContainers; -import com.refinedmods.refinedstorage.container.CraftingMonitorContainer; +import com.refinedmods.refinedstorage.RSContainerMenus; +import com.refinedmods.refinedstorage.container.CraftingMonitorContainerMenu; import com.refinedmods.refinedstorage.inventory.player.PlayerSlot; import com.refinedmods.refinedstorage.blockentity.craftingmonitor.WirelessCraftingMonitor; import net.minecraft.network.FriendlyByteBuf; @@ -9,9 +9,9 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; import net.minecraftforge.network.IContainerFactory; -public class WirelessCraftingMonitorContainerFactory implements IContainerFactory { +public class WirelessCraftingMonitorContainerFactory implements IContainerFactory { @Override - public CraftingMonitorContainer create(int windowId, Inventory inv, FriendlyByteBuf data) { + public CraftingMonitorContainerMenu create(int windowId, Inventory inv, FriendlyByteBuf data) { PlayerSlot slot = new PlayerSlot(data); @@ -19,6 +19,6 @@ public class WirelessCraftingMonitorContainerFactory implements IContainerFactor WirelessCraftingMonitor wirelessCraftingMonitor = new WirelessCraftingMonitor(stack, null, slot); - return new CraftingMonitorContainer(RSContainers.WIRELESS_CRAFTING_MONITOR, wirelessCraftingMonitor, null, inv.player, windowId); + return new CraftingMonitorContainerMenu(RSContainerMenus.WIRELESS_CRAFTING_MONITOR, wirelessCraftingMonitor, null, inv.player, windowId); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java b/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java index c6728615e..91ff0d938 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.integration.craftingtweaks; import com.refinedmods.refinedstorage.api.network.grid.GridType; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.container.slot.grid.CraftingGridSlot; import net.minecraft.nbt.CompoundTag; import net.minecraftforge.fml.InterModComms; @@ -27,7 +27,7 @@ public final class CraftingTweaksIntegration { public static void register() { CompoundTag tag = new CompoundTag(); - tag.putString("ContainerClass", GridContainer.class.getName()); + tag.putString("ContainerClass", GridContainerMenu.class.getName()); tag.putString("ValidContainerPredicate", ValidContainerPredicate.class.getName()); tag.putString("GetGridStartFunction", GetGridStartFunction.class.getName()); tag.putString("AlignToGrid", "left"); @@ -35,16 +35,16 @@ public final class CraftingTweaksIntegration { InterModComms.sendTo(ID, "RegisterProvider", () -> tag); } - public static class ValidContainerPredicate implements Predicate { + public static class ValidContainerPredicate implements Predicate { @Override - public boolean test(GridContainer containerGrid) { + public boolean test(GridContainerMenu containerGrid) { return containerGrid.getGrid().getGridType() == GridType.CRAFTING; } } - public static class GetGridStartFunction implements Function { + public static class GetGridStartFunction implements Function { @Override - public Integer apply(GridContainer containerGrid) { + public Integer apply(GridContainerMenu containerGrid) { for (int i = 0; i < containerGrid.slots.size(); i++) { if (containerGrid.slots.get(i) instanceof CraftingGridSlot) { return i; diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GridRecipeTransferHandler.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GridRecipeTransferHandler.java index d153390d2..35d7744a8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GridRecipeTransferHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GridRecipeTransferHandler.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.integration.jei; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.api.network.grid.GridType; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.network.grid.GridCraftingPreviewRequestMessage; import com.refinedmods.refinedstorage.network.grid.GridProcessingTransferMessage; import com.refinedmods.refinedstorage.network.grid.GridTransferMessage; @@ -26,7 +26,7 @@ import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; -public class GridRecipeTransferHandler implements IRecipeTransferHandler { +public class GridRecipeTransferHandler implements IRecipeTransferHandler { public static final GridRecipeTransferHandler INSTANCE = new GridRecipeTransferHandler(); private static final long TRANSFER_SCROLLBAR_DELAY_MS = 200; @@ -37,8 +37,8 @@ public class GridRecipeTransferHandler implements IRecipeTransferHandler getContainerClass() { - return GridContainer.class; + public Class getContainerClass() { + return GridContainerMenu.class; } @Override @@ -47,7 +47,7 @@ public class GridRecipeTransferHandler implements IRecipeTransferHandler s.container instanceof CraftingContainer).collect(Collectors.toList()) diff --git a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java index d3faa38a2..18afe0d1f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.integration.jei; -import com.refinedmods.refinedstorage.container.BaseContainer; +import com.refinedmods.refinedstorage.container.BaseContainerMenu; import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.screen.grid.GridScreen; @@ -49,8 +49,8 @@ public class GuiContainerHandler implements IGuiContainerHandler ctx) { Player player = ctx.get().getSender(); - if (player != null && player.containerMenu instanceof FilterContainer) { + if (player != null && player.containerMenu instanceof FilterContainerMenu) { ctx.get().enqueueWork(() -> { - FilterItem.setCompare(((FilterContainer) player.containerMenu).getFilterItem(), message.compare); - FilterItem.setMode(((FilterContainer) player.containerMenu).getFilterItem(), message.mode); - FilterItem.setModFilter(((FilterContainer) player.containerMenu).getFilterItem(), message.modFilter); - FilterItem.setName(((FilterContainer) player.containerMenu).getFilterItem(), message.name); - FilterItem.setType(((FilterContainer) player.containerMenu).getFilterItem(), message.type); + FilterItem.setCompare(((FilterContainerMenu) player.containerMenu).getFilterItem(), message.compare); + FilterItem.setMode(((FilterContainerMenu) player.containerMenu).getFilterItem(), message.mode); + FilterItem.setModFilter(((FilterContainerMenu) player.containerMenu).getFilterItem(), message.modFilter); + FilterItem.setName(((FilterContainerMenu) player.containerMenu).getFilterItem(), message.name); + FilterItem.setType(((FilterContainerMenu) player.containerMenu).getFilterItem(), message.type); }); } diff --git a/src/main/java/com/refinedmods/refinedstorage/network/SetFilterSlotMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/SetFilterSlotMessage.java index 7ec8d3011..f38ef47e7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/SetFilterSlotMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/SetFilterSlotMessage.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.network; import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.container.slot.filter.FilterSlot; import com.refinedmods.refinedstorage.container.slot.legacy.LegacyFilterSlot; import net.minecraft.network.FriendlyByteBuf; @@ -61,8 +61,8 @@ public class SetFilterSlotMessage { }; // Prevent the grid crafting matrix inventory listener from resetting the list. - if (container instanceof GridContainer) { - IGrid grid = ((GridContainer) container).getGrid(); + if (container instanceof GridContainerMenu) { + IGrid grid = ((GridContainerMenu) container).getGrid(); //exclude output slots if (grid instanceof GridNetworkNode && slot.getSlotIndex() < ((GridNetworkNode) grid).getAllowedTagList().getAllowedItemTags().size()) { Set list = new HashSet<>(((GridNetworkNode) grid).getAllowedTagList().getAllowedItemTags().get(slot.getSlotIndex())); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/SetFluidFilterSlotMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/SetFluidFilterSlotMessage.java index 041d130fe..aaa262090 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/SetFluidFilterSlotMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/SetFluidFilterSlotMessage.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.network; import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.container.slot.filter.FluidFilterSlot; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; @@ -60,8 +60,8 @@ public class SetFluidFilterSlotMessage { }; // Prevent the grid crafting matrix inventory listener from resetting the list. - if (container instanceof GridContainer) { - IGrid grid = ((GridContainer) container).getGrid(); + if (container instanceof GridContainerMenu) { + IGrid grid = ((GridContainerMenu) container).getGrid(); if (grid instanceof GridNetworkNode && slot.getSlotIndex() < ((GridNetworkNode) grid).getAllowedTagList().getAllowedFluidTags().size()) { Set list = new HashSet<>(((GridNetworkNode) grid).getAllowedTagList().getAllowedFluidTags().get(slot.getSlotIndex())); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java index 28a8ccaf1..35ee18586 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.network.craftingmonitor; -import com.refinedmods.refinedstorage.container.CraftingMonitorContainer; +import com.refinedmods.refinedstorage.container.CraftingMonitorContainerMenu; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.network.NetworkEvent; @@ -34,8 +34,8 @@ public class CraftingMonitorCancelMessage { if (player != null) { ctx.get().enqueueWork(() -> { - if (player.containerMenu instanceof CraftingMonitorContainer) { - ((CraftingMonitorContainer) player.containerMenu).getCraftingMonitor().onCancelled(player, message.taskId); + if (player.containerMenu instanceof CraftingMonitorContainerMenu) { + ((CraftingMonitorContainerMenu) player.containerMenu).getCraftingMonitor().onCancelled(player, message.taskId); } }); } diff --git a/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java index e2c1e0191..250a55107 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.network.craftingmonitor; -import com.refinedmods.refinedstorage.container.CraftingMonitorContainer; +import com.refinedmods.refinedstorage.container.CraftingMonitorContainerMenu; import com.refinedmods.refinedstorage.blockentity.craftingmonitor.WirelessCraftingMonitor; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; @@ -44,8 +44,8 @@ public class WirelessCraftingMonitorSettingsUpdateMessage { if (player != null) { ctx.get().enqueueWork(() -> { - if (player.containerMenu instanceof CraftingMonitorContainer) { - ((WirelessCraftingMonitor) ((CraftingMonitorContainer) player.containerMenu).getCraftingMonitor()).setSettings(message.tabSelected, message.tabPage); + if (player.containerMenu instanceof CraftingMonitorContainerMenu) { + ((WirelessCraftingMonitor) ((CraftingMonitorContainerMenu) player.containerMenu).getCraftingMonitor()).setSettings(message.tabSelected, message.tabPage); } }); } diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridClearMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridClearMessage.java index 5bacea0d4..28a682fba 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridClearMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridClearMessage.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.network.grid; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraftforge.network.NetworkEvent; @@ -15,8 +15,8 @@ public class GridClearMessage { ctx.get().enqueueWork(() -> { AbstractContainerMenu container = player.containerMenu; - if (container instanceof GridContainer) { - ((GridContainer) container).getGrid().onClear(player); + if (container instanceof GridContainerMenu) { + ((GridContainerMenu) container).getGrid().onClear(player); } }); } diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java index 6193637c1..9a6adbbab 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.network.grid; import com.refinedmods.refinedstorage.api.network.grid.IGrid; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; @@ -46,8 +46,8 @@ public class GridCraftingPreviewRequestMessage { ctx.get().enqueueWork(() -> { AbstractContainerMenu container = player.containerMenu; - if (container instanceof GridContainer) { - IGrid grid = ((GridContainer) container).getGrid(); + if (container instanceof GridContainerMenu) { + IGrid grid = ((GridContainerMenu) container).getGrid(); if (message.fluids) { if (grid.getFluidHandler() != null) { diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartRequestMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartRequestMessage.java index 9eea075d8..93cf146ab 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartRequestMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartRequestMessage.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.network.grid; import com.refinedmods.refinedstorage.api.network.grid.IGrid; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; @@ -42,8 +42,8 @@ public class GridCraftingStartRequestMessage { ctx.get().enqueueWork(() -> { AbstractContainerMenu container = player.containerMenu; - if (container instanceof GridContainer) { - IGrid grid = ((GridContainer) container).getGrid(); + if (container instanceof GridContainerMenu) { + IGrid grid = ((GridContainerMenu) container).getGrid(); if (message.fluids) { if (grid.getFluidHandler() != null) { diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidInsertHeldMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidInsertHeldMessage.java index 2c559d10b..a0b559ec0 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidInsertHeldMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidInsertHeldMessage.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.network.grid; import com.refinedmods.refinedstorage.api.network.grid.IGrid; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraftforge.network.NetworkEvent; @@ -16,8 +16,8 @@ public class GridFluidInsertHeldMessage { ctx.get().enqueueWork(() -> { AbstractContainerMenu container = player.containerMenu; - if (container instanceof GridContainer) { - IGrid grid = ((GridContainer) container).getGrid(); + if (container instanceof GridContainerMenu) { + IGrid grid = ((GridContainerMenu) container).getGrid(); if (grid.getFluidHandler() != null) { grid.getFluidHandler().onInsertHeldContainer(player); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidPullMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidPullMessage.java index d4bae1777..7fbe17beb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidPullMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidPullMessage.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.network.grid; import com.refinedmods.refinedstorage.api.network.grid.IGrid; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; @@ -35,8 +35,8 @@ public class GridFluidPullMessage { ctx.get().enqueueWork(() -> { AbstractContainerMenu container = player.containerMenu; - if (container instanceof GridContainer) { - IGrid grid = ((GridContainer) container).getGrid(); + if (container instanceof GridContainerMenu) { + IGrid grid = ((GridContainerMenu) container).getGrid(); if (grid.getFluidHandler() != null) { grid.getFluidHandler().onExtract(player, message.id, message.shift); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemGridScrollMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemGridScrollMessage.java index f22637bdb..362e858c9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemGridScrollMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemGridScrollMessage.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.network.grid; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.network.NetworkEvent; @@ -38,8 +38,8 @@ public class GridItemGridScrollMessage { public static void handle(GridItemGridScrollMessage message, Supplier ctx) { ctx.get().enqueueWork(() -> { ServerPlayer player = ctx.get().getSender(); - if (player != null && player.containerMenu instanceof GridContainer && ((GridContainer) player.containerMenu).getGrid().getItemHandler() != null) { - ((GridContainer) player.containerMenu).getGrid().getItemHandler().onGridScroll(player, message.id, message.shift, message.up); + if (player != null && player.containerMenu instanceof GridContainerMenu && ((GridContainerMenu) player.containerMenu).getGrid().getItemHandler() != null) { + ((GridContainerMenu) player.containerMenu).getGrid().getItemHandler().onGridScroll(player, message.id, message.shift, message.up); } }); ctx.get().setPacketHandled(true); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInsertHeldMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInsertHeldMessage.java index 5be301b53..a83daa6a9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInsertHeldMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInsertHeldMessage.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.network.grid; import com.refinedmods.refinedstorage.api.network.grid.IGrid; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; @@ -31,8 +31,8 @@ public class GridItemInsertHeldMessage { ctx.get().enqueueWork(() -> { AbstractContainerMenu container = player.containerMenu; - if (container instanceof GridContainer) { - IGrid grid = ((GridContainer) container).getGrid(); + if (container instanceof GridContainerMenu) { + IGrid grid = ((GridContainerMenu) container).getGrid(); if (grid.getItemHandler() != null) { grid.getItemHandler().onInsertHeldItem(player, message.single); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInventoryScrollMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInventoryScrollMessage.java index 07e55bc5a..72b905079 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInventoryScrollMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInventoryScrollMessage.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.network.grid; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.network.NetworkEvent; @@ -31,8 +31,8 @@ public class GridItemInventoryScrollMessage { public static void handle(GridItemInventoryScrollMessage message, Supplier ctx) { ctx.get().enqueueWork(() -> { ServerPlayer player = ctx.get().getSender(); - if (player != null && player.containerMenu instanceof GridContainer && ((GridContainer) player.containerMenu).getGrid().getItemHandler() != null) { - ((GridContainer) player.containerMenu).getGrid().getItemHandler().onInventoryScroll(player, message.slot, message.shift, message.up); + if (player != null && player.containerMenu instanceof GridContainerMenu && ((GridContainerMenu) player.containerMenu).getGrid().getItemHandler() != null) { + ((GridContainerMenu) player.containerMenu).getGrid().getItemHandler().onInventoryScroll(player, message.slot, message.shift, message.up); } }); ctx.get().setPacketHandled(true); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemPullMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemPullMessage.java index 50a169055..772ca9ca4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemPullMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemPullMessage.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.network.grid; import com.refinedmods.refinedstorage.api.network.grid.IGrid; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.inventory.AbstractContainerMenu; @@ -35,8 +35,8 @@ public class GridItemPullMessage { ctx.get().enqueueWork(() -> { AbstractContainerMenu container = player.containerMenu; - if (container instanceof GridContainer) { - IGrid grid = ((GridContainer) container).getGrid(); + if (container instanceof GridContainerMenu) { + IGrid grid = ((GridContainerMenu) container).getGrid(); if (grid.getItemHandler() != null) { grid.getItemHandler().onExtract(player, message.id, -1, message.flags); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridProcessingTransferMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridProcessingTransferMessage.java index abee14870..5cf8c9821 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridProcessingTransferMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridProcessingTransferMessage.java @@ -3,7 +3,7 @@ package com.refinedmods.refinedstorage.network.grid; import com.refinedmods.refinedstorage.api.network.grid.GridType; import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; import com.refinedmods.refinedstorage.inventory.item.BaseItemHandler; import com.refinedmods.refinedstorage.util.StackUtils; @@ -98,8 +98,8 @@ public class GridProcessingTransferMessage { if (player != null) { ctx.get().enqueueWork(() -> { - if (player.containerMenu instanceof GridContainer) { - IGrid grid = ((GridContainer) player.containerMenu).getGrid(); + if (player.containerMenu instanceof GridContainerMenu) { + IGrid grid = ((GridContainerMenu) player.containerMenu).getGrid(); if (grid.getGridType() == GridType.PATTERN) { BaseItemHandler handler = ((GridNetworkNode) grid).getProcessingMatrix(); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridTransferMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridTransferMessage.java index 52e1da78e..19c17e5fa 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridTransferMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridTransferMessage.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.network.grid; import com.refinedmods.refinedstorage.api.network.grid.GridType; import com.refinedmods.refinedstorage.api.network.grid.IGrid; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.util.StackUtils; import mezz.jei.api.gui.ingredient.IGuiIngredient; import net.minecraft.network.FriendlyByteBuf; @@ -76,8 +76,8 @@ public class GridTransferMessage { if (player != null) { ctx.get().enqueueWork(() -> { - if (player.containerMenu instanceof GridContainer) { - IGrid grid = ((GridContainer) player.containerMenu).getGrid(); + if (player.containerMenu instanceof GridContainerMenu) { + IGrid grid = ((GridContainerMenu) player.containerMenu).getGrid(); if (grid.getGridType() == GridType.CRAFTING || grid.getGridType() == GridType.PATTERN) { grid.onRecipeTransfer(player, message.recipe); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java index 1dcd500e4..abf506387 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.network.grid; import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.blockentity.grid.portable.PortableGrid; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; @@ -58,8 +58,8 @@ public class PortableGridSettingsUpdateMessage { if (player != null) { ctx.get().enqueueWork(() -> { - if (player.containerMenu instanceof GridContainer) { - IGrid grid = ((GridContainer) player.containerMenu).getGrid(); + if (player.containerMenu instanceof GridContainerMenu) { + IGrid grid = ((GridContainerMenu) player.containerMenu).getGrid(); if (grid instanceof PortableGrid) { ItemStack stack = ((PortableGrid) grid).getStack(); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java index eeb240a4c..45ee1950a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.network.grid; import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.blockentity.grid.WirelessFluidGrid; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Player; @@ -53,8 +53,8 @@ public class WirelessFluidGridSettingsUpdateMessage { if (player != null) { ctx.get().enqueueWork(() -> { - if (player.containerMenu instanceof GridContainer) { - IGrid grid = ((GridContainer) player.containerMenu).getGrid(); + if (player.containerMenu instanceof GridContainerMenu) { + IGrid grid = ((GridContainerMenu) player.containerMenu).getGrid(); if (grid instanceof WirelessFluidGrid) { ItemStack stack = ((WirelessFluidGrid) grid).getStack(); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java index ae115de0b..cde42562a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.network.grid; import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.blockentity.grid.WirelessGrid; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; @@ -58,8 +58,8 @@ public class WirelessGridSettingsUpdateMessage { if (player != null) { ctx.get().enqueueWork(() -> { - if (player.containerMenu instanceof GridContainer) { - IGrid grid = ((GridContainer) player.containerMenu).getGrid(); + if (player.containerMenu instanceof GridContainerMenu) { + IGrid grid = ((GridContainerMenu) player.containerMenu).getGrid(); if (grid instanceof WirelessGrid) { ItemStack stack = ((WirelessGrid) grid).getStack(); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/sync/BlockEntitySynchronizationParamaterUpdateMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/sync/BlockEntitySynchronizationParamaterUpdateMessage.java index f3109c71c..10e04a116 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/sync/BlockEntitySynchronizationParamaterUpdateMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/sync/BlockEntitySynchronizationParamaterUpdateMessage.java @@ -1,6 +1,6 @@ package com.refinedmods.refinedstorage.network.sync; -import com.refinedmods.refinedstorage.container.BaseContainer; +import com.refinedmods.refinedstorage.container.BaseContainerMenu; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationParameter; import net.minecraft.network.FriendlyByteBuf; @@ -46,11 +46,11 @@ public class BlockEntitySynchronizationParamaterUpdateMessage { ctx.get().enqueueWork(() -> { AbstractContainerMenu c = ctx.get().getSender().containerMenu; - if (c instanceof BaseContainer) { + if (c instanceof BaseContainerMenu) { BiConsumer consumer = message.parameter.getValueConsumer(); if (consumer != null) { - consumer.accept(((BaseContainer) c).getBlockEntity(), message.value); + consumer.accept(((BaseContainerMenu) c).getBlockEntity(), message.value); } } }); diff --git a/src/main/java/com/refinedmods/refinedstorage/recipe/CoverRecipe.java b/src/main/java/com/refinedmods/refinedstorage/recipe/CoverRecipe.java index 656731b67..ecab874ee 100644 --- a/src/main/java/com/refinedmods/refinedstorage/recipe/CoverRecipe.java +++ b/src/main/java/com/refinedmods/refinedstorage/recipe/CoverRecipe.java @@ -58,11 +58,11 @@ public class CoverRecipe extends CustomRecipe { } @Override - public boolean matches(CraftingContainer inv, Level level) { + public boolean matches(CraftingContainer craftingContainer, Level level) { List list = Lists.newArrayList(); int ingots = 0; - for (int i = 0; i < inv.getContainerSize(); ++i) { - ItemStack itemstack = inv.getItem(i); + for (int i = 0; i < craftingContainer.getContainerSize(); ++i) { + ItemStack itemstack = craftingContainer.getItem(i); if (!itemstack.isEmpty()) { list.add(itemstack); if (itemstack.is(Tags.Items.NUGGETS_IRON)) { diff --git a/src/main/java/com/refinedmods/refinedstorage/recipe/HollowCoverRecipe.java b/src/main/java/com/refinedmods/refinedstorage/recipe/HollowCoverRecipe.java index 3e9a02d78..94d987bf7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/recipe/HollowCoverRecipe.java +++ b/src/main/java/com/refinedmods/refinedstorage/recipe/HollowCoverRecipe.java @@ -15,11 +15,10 @@ import net.minecraft.world.level.Level; import java.util.List; public class HollowCoverRecipe extends CustomRecipe { - public static RecipeSerializer SERIALIZER = new SimpleRecipeSerializer<>(HollowCoverRecipe::new); - public HollowCoverRecipe(ResourceLocation idIn) { - super(idIn); + public HollowCoverRecipe(ResourceLocation id) { + super(id); } public static boolean stackMatches(ItemStack first) { @@ -46,10 +45,10 @@ public class HollowCoverRecipe extends CustomRecipe { } @Override - public boolean matches(CraftingContainer inv, Level level) { + public boolean matches(CraftingContainer craftingContainer, Level level) { List list = Lists.newArrayList(); - for (int i = 0; i < inv.getContainerSize(); ++i) { - ItemStack itemstack = inv.getItem(i); + for (int i = 0; i < craftingContainer.getContainerSize(); ++i) { + ItemStack itemstack = craftingContainer.getItem(i); if (!itemstack.isEmpty()) { list.add(itemstack); if (!stackMatches(itemstack)) { diff --git a/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java index 499065dc7..aa4e6599c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java +++ b/src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java @@ -47,9 +47,9 @@ public class UpgradeWithEnchantedBookRecipe extends ShapedRecipe { } @Override - public boolean matches(CraftingContainer inv, Level level) { - if (super.matches(inv, level)) { - ListTag enchantments = EnchantedBookItem.getEnchantments(inv.getItem(1)); + public boolean matches(CraftingContainer craftingContainer, Level level) { + if (super.matches(craftingContainer, level)) { + ListTag enchantments = EnchantedBookItem.getEnchantments(craftingContainer.getItem(1)); for (int i = 0; i < enchantments.size(); ++i) { CompoundTag enchantmentNbt = enchantments.getCompound(i); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java index ea05a652d..da5e539ad 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java @@ -52,8 +52,8 @@ public abstract class BaseScreen extends Abstra private final Logger logger = LogManager.getLogger(getClass()); private int sideButtonY; - protected BaseScreen(T container, int xSize, int ySize, Inventory inventory, Component title) { - super(container, inventory, title); + protected BaseScreen(T containerMenu, int xSize, int ySize, Inventory inventory, Component title) { + super(containerMenu, inventory, title); this.imageWidth = xSize; this.imageHeight = ySize; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java index 745662223..a37779d9b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.ConstructorContainer; +import com.refinedmods.refinedstorage.container.ConstructorContainerMenu; import com.refinedmods.refinedstorage.screen.widget.sidebutton.ConstructorDropSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; @@ -13,9 +13,9 @@ import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -public class ConstructorScreen extends BaseScreen { - public ConstructorScreen(ConstructorContainer container, Inventory inventory, Component title) { - super(container, 211, 137, inventory, title); +public class ConstructorScreen extends BaseScreen { + public ConstructorScreen(ConstructorContainerMenu containerMenu, Inventory inventory, Component title) { + super(containerMenu, 211, 137, inventory, title); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java index e6fa2682c..d378cc451 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.platform.Lighting; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.apiimpl.network.Network; -import com.refinedmods.refinedstorage.container.ControllerContainer; +import com.refinedmods.refinedstorage.container.ControllerContainerMenu; import com.refinedmods.refinedstorage.screen.widget.ScrollbarWidget; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.refinedmods.refinedstorage.blockentity.ClientNode; @@ -16,7 +16,7 @@ import net.minecraft.world.entity.player.Inventory; import java.util.List; -public class ControllerScreen extends BaseScreen { +public class ControllerScreen extends BaseScreen { private static final int VISIBLE_ROWS = 2; private static final int ENERGY_BAR_X = 8; @@ -26,8 +26,8 @@ public class ControllerScreen extends BaseScreen { private final ScrollbarWidget scrollbar; - public ControllerScreen(ControllerContainer container, Inventory inventory, Component title) { - super(container, 176, 181, inventory, title); + public ControllerScreen(ControllerContainerMenu containerMenu, Inventory inventory, Component title) { + super(containerMenu, 176, 181, inventory, title); this.scrollbar = new ScrollbarWidget(this, 157, 20, 12, 59); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java index aada57b06..1e282afa1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java @@ -5,7 +5,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.apiimpl.network.node.CrafterManagerNetworkNode; -import com.refinedmods.refinedstorage.container.CrafterManagerContainer; +import com.refinedmods.refinedstorage.container.CrafterManagerContainerMenu; import com.refinedmods.refinedstorage.container.slot.CrafterManagerSlot; import com.refinedmods.refinedstorage.screen.widget.ScrollbarWidget; import com.refinedmods.refinedstorage.screen.widget.SearchWidget; @@ -25,16 +25,16 @@ import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak; import java.util.Map; @MouseTweaksDisableWheelTweak -public class CrafterManagerScreen extends BaseScreen implements IScreenInfoProvider { +public class CrafterManagerScreen extends BaseScreen implements IScreenInfoProvider { private final CrafterManagerNetworkNode crafterManager; private ScrollbarWidget scrollbar; private SearchWidget searchField; - public CrafterManagerScreen(CrafterManagerContainer container, Inventory inventory, Component title) { - super(container, 193, 0, inventory, title); + public CrafterManagerScreen(CrafterManagerContainerMenu containerMenu, Inventory inventory, Component title) { + super(containerMenu, 193, 0, inventory, title); - this.crafterManager = ((CrafterManagerBlockEntity) container.getBlockEntity()).getNode(); + this.crafterManager = ((CrafterManagerBlockEntity) containerMenu.getBlockEntity()).getNode(); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterScreen.java index c9f9d9929..efdc147f9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/CrafterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CrafterScreen.java @@ -2,15 +2,15 @@ package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.CrafterContainer; +import com.refinedmods.refinedstorage.container.CrafterContainerMenu; import com.refinedmods.refinedstorage.util.RenderUtils; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -public class CrafterScreen extends BaseScreen { - public CrafterScreen(CrafterContainer container, Inventory inventory, Component title) { - super(container, 211, 137, inventory, title); +public class CrafterScreen extends BaseScreen { + public CrafterScreen(CrafterContainerMenu containerMenu, Inventory inventory, Component title) { + super(containerMenu, 211, 137, inventory, title); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java index d1bcbfbdb..d27f2f32b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java @@ -13,7 +13,7 @@ import com.refinedmods.refinedstorage.api.util.IFilter; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.apiimpl.render.CraftingMonitorElementDrawers; import com.refinedmods.refinedstorage.apiimpl.render.ElementDrawers; -import com.refinedmods.refinedstorage.container.CraftingMonitorContainer; +import com.refinedmods.refinedstorage.container.CraftingMonitorContainerMenu; import com.refinedmods.refinedstorage.network.craftingmonitor.CraftingMonitorCancelMessage; import com.refinedmods.refinedstorage.screen.widget.ScrollbarWidget; import com.refinedmods.refinedstorage.screen.widget.TabListWidget; @@ -36,22 +36,22 @@ import java.util.List; import java.util.Optional; import java.util.UUID; -public class CraftingMonitorScreen extends BaseScreen { +public class CraftingMonitorScreen extends BaseScreen { private static final int ROWS = 5; private static final int ITEM_WIDTH = 73; private static final int ITEM_HEIGHT = 29; private final ScrollbarWidget scrollbar; private final ICraftingMonitor craftingMonitor; - private final TabListWidget tabs; + private final TabListWidget tabs; private final IElementDrawers drawers = new CraftingMonitorElementDrawers(this, ITEM_WIDTH, ITEM_HEIGHT); private Button cancelButton; private Button cancelAllButton; private List tasks = Collections.emptyList(); - public CraftingMonitorScreen(CraftingMonitorContainer container, Inventory inventory, Component title) { - super(container, 254, 201, inventory, title); + public CraftingMonitorScreen(CraftingMonitorContainerMenu containerMenu, Inventory inventory, Component title) { + super(containerMenu, 254, 201, inventory, title); - this.craftingMonitor = container.getCraftingMonitor(); + this.craftingMonitor = containerMenu.getCraftingMonitor(); this.tabs = new TabListWidget<>(this, new ElementDrawers<>(this), () -> tasks, () -> (int) Math.floor((float) Math.max(0, tasks.size() - 1) / (float) ICraftingMonitor.TABS_PER_PAGE), craftingMonitor::getTabPage, () -> { IGridTab tab = getCurrentTab(); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java index 462b6e82f..0de7d55b1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.DestructorContainer; +import com.refinedmods.refinedstorage.container.DestructorContainerMenu; import com.refinedmods.refinedstorage.screen.widget.sidebutton.*; import com.refinedmods.refinedstorage.blockentity.DestructorBlockEntity; import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; @@ -10,9 +10,9 @@ import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -public class DestructorScreen extends BaseScreen { - public DestructorScreen(DestructorContainer container, Inventory playerInventory, Component title) { - super(container, 211, 137, playerInventory, title); +public class DestructorScreen extends BaseScreen { + public DestructorScreen(DestructorContainerMenu containerMenu, Inventory playerInventory, Component title) { + super(containerMenu, 211, 137, playerInventory, title); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java index 3ad5781fd..5ca354061 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.DetectorContainer; +import com.refinedmods.refinedstorage.container.DetectorContainerMenu; import com.refinedmods.refinedstorage.render.RenderSettings; import com.refinedmods.refinedstorage.screen.widget.sidebutton.DetectorModeSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; @@ -16,11 +16,11 @@ import net.minecraft.network.chat.TextComponent; import net.minecraft.world.entity.player.Inventory; import org.lwjgl.glfw.GLFW; -public class DetectorScreen extends BaseScreen { +public class DetectorScreen extends BaseScreen { private EditBox amountField; - public DetectorScreen(DetectorContainer container, Inventory inventory, Component title) { - super(container, 176, 137, inventory, title); + public DetectorScreen(DetectorContainerMenu containerMenu, Inventory inventory, Component title) { + super(containerMenu, 176, 137, inventory, title); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java index b34957cf8..0c08f4272 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DiskDriveScreen.java @@ -1,17 +1,17 @@ package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.vertex.PoseStack; -import com.refinedmods.refinedstorage.container.DiskDriveContainer; +import com.refinedmods.refinedstorage.container.DiskDriveContainerMenu; import com.refinedmods.refinedstorage.blockentity.DiskDriveBlockEntity; import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -public class DiskDriveScreen extends StorageScreen { - public DiskDriveScreen(DiskDriveContainer container, Inventory inventory, Component title) { +public class DiskDriveScreen extends StorageScreen { + public DiskDriveScreen(DiskDriveContainerMenu containerMenu, Inventory inventory, Component title) { super( - container, + containerMenu, inventory, title, "gui/disk_drive.png", diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java index b89e9f319..f7ac47dd5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DiskManipulatorScreen.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.DiskManipulatorContainer; +import com.refinedmods.refinedstorage.container.DiskManipulatorContainerMenu; import com.refinedmods.refinedstorage.screen.widget.sidebutton.*; import com.refinedmods.refinedstorage.blockentity.DiskManipulatorBlockEntity; import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; @@ -10,9 +10,9 @@ import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -public class DiskManipulatorScreen extends BaseScreen { - public DiskManipulatorScreen(DiskManipulatorContainer container, Inventory playerInventory, Component title) { - super(container, 211, 211, playerInventory, title); +public class DiskManipulatorScreen extends BaseScreen { + public DiskManipulatorScreen(DiskManipulatorContainerMenu containerMenu, Inventory playerInventory, Component title) { + super(containerMenu, 211, 211, playerInventory, title); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ExporterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ExporterScreen.java index 5ea6e6675..1700a8d47 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ExporterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ExporterScreen.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.ExporterContainer; +import com.refinedmods.refinedstorage.container.ExporterContainerMenu; import com.refinedmods.refinedstorage.item.UpgradeItem; import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; @@ -13,11 +13,11 @@ import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -public class ExporterScreen extends BaseScreen { +public class ExporterScreen extends BaseScreen { private boolean hasRegulatorMode; - public ExporterScreen(ExporterContainer container, Inventory playerInventory, Component title) { - super(container, 211, 137, playerInventory, title); + public ExporterScreen(ExporterContainerMenu containerMenu, Inventory playerInventory, Component title) { + super(containerMenu, 211, 137, playerInventory, title); this.hasRegulatorMode = hasRegulatorMode(); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java index 27eb6aacf..a1cf0dfa1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ExternalStorageScreen.java @@ -1,15 +1,15 @@ package com.refinedmods.refinedstorage.screen; -import com.refinedmods.refinedstorage.container.ExternalStorageContainer; +import com.refinedmods.refinedstorage.container.ExternalStorageContainerMenu; import com.refinedmods.refinedstorage.blockentity.ExternalStorageBlockEntity; import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -public class ExternalStorageScreen extends StorageScreen { - public ExternalStorageScreen(ExternalStorageContainer container, Inventory inventory, Component title) { +public class ExternalStorageScreen extends StorageScreen { + public ExternalStorageScreen(ExternalStorageContainerMenu containerMenu, Inventory inventory, Component title) { super( - container, + containerMenu, inventory, title, "gui/storage.png", diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java index ad9d5a1ac..602e7c205 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.api.util.IComparer; import com.refinedmods.refinedstorage.api.util.IFilter; -import com.refinedmods.refinedstorage.container.FilterContainer; +import com.refinedmods.refinedstorage.container.FilterContainerMenu; import com.refinedmods.refinedstorage.item.FilterItem; import com.refinedmods.refinedstorage.network.FilterUpdateMessage; import com.refinedmods.refinedstorage.render.RenderSettings; @@ -20,7 +20,7 @@ import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; import org.lwjgl.glfw.GLFW; -public class FilterScreen extends BaseScreen { +public class FilterScreen extends BaseScreen { private final ItemStack stack; private final String name; private int compare; @@ -32,16 +32,16 @@ public class FilterScreen extends BaseScreen { private Button modeButton; private EditBox nameField; - public FilterScreen(FilterContainer container, Inventory inventory, Component title) { - super(container, 176, 231, inventory, title); + public FilterScreen(FilterContainerMenu containerMenu, Inventory inventory, Component title) { + super(containerMenu, 176, 231, inventory, title); - this.stack = container.getFilterItem(); + this.stack = containerMenu.getFilterItem(); - this.compare = FilterItem.getCompare(container.getFilterItem()); - this.mode = FilterItem.getMode(container.getFilterItem()); - this.modFilter = FilterItem.isModFilter(container.getFilterItem()); - this.name = FilterItem.getFilterName(container.getFilterItem()); - this.type = FilterItem.getType(container.getFilterItem()); + this.compare = FilterItem.getCompare(containerMenu.getFilterItem()); + this.mode = FilterItem.getMode(containerMenu.getFilterItem()); + this.modFilter = FilterItem.isModFilter(containerMenu.getFilterItem()); + this.name = FilterItem.getFilterName(containerMenu.getFilterItem()); + this.type = FilterItem.getType(containerMenu.getFilterItem()); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java index 1dbf23475..e41ef0639 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FluidAmountScreen.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.screen; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.FluidAmountContainer; +import com.refinedmods.refinedstorage.container.FluidAmountContainerMenu; import com.refinedmods.refinedstorage.network.SetFluidFilterSlotMessage; import com.refinedmods.refinedstorage.util.StackUtils; import net.minecraft.client.gui.screens.Screen; @@ -14,7 +14,7 @@ import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nullable; import java.util.function.UnaryOperator; -public class FluidAmountScreen extends AmountSpecifyingScreen { +public class FluidAmountScreen extends AmountSpecifyingScreen { private final int containerSlot; private final FluidStack stack; private final int maxAmount; @@ -22,7 +22,7 @@ public class FluidAmountScreen extends AmountSpecifyingScreen alternativesScreenFactory; public FluidAmountScreen(BaseScreen parent, Player player, int containerSlot, FluidStack stack, int maxAmount, @Nullable UnaryOperator alternativesScreenFactory) { - super(parent, new FluidAmountContainer(player, stack), alternativesScreenFactory != null ? 194 : 172, 99, player.getInventory(), new TranslatableComponent("gui.refinedstorage.fluid_amount")); + super(parent, new FluidAmountContainerMenu(player, stack), alternativesScreenFactory != null ? 194 : 172, 99, player.getInventory(), new TranslatableComponent("gui.refinedstorage.fluid_amount")); this.containerSlot = containerSlot; this.stack = stack; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/FluidInterfaceScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FluidInterfaceScreen.java index edc03fb77..7776d7b7d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/FluidInterfaceScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FluidInterfaceScreen.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.apiimpl.network.node.FluidInterfaceNetworkNode; -import com.refinedmods.refinedstorage.container.FluidInterfaceContainer; +import com.refinedmods.refinedstorage.container.FluidInterfaceContainerMenu; import com.refinedmods.refinedstorage.render.FluidRenderer; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.refinedmods.refinedstorage.blockentity.FluidInterfaceBlockEntity; @@ -15,11 +15,11 @@ import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -public class FluidInterfaceScreen extends BaseScreen { +public class FluidInterfaceScreen extends BaseScreen { private static final FluidRenderer TANK_RENDERER = new FluidRenderer(FluidInterfaceNetworkNode.TANK_CAPACITY, 12, 47, 1); - public FluidInterfaceScreen(FluidInterfaceContainer container, Inventory inventory, Component title) { - super(container, 211, 204, inventory, title); + public FluidInterfaceScreen(FluidInterfaceContainerMenu containerMenu, Inventory inventory, Component title) { + super(containerMenu, 211, 204, inventory, title); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/FluidStorageBlockScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FluidStorageBlockScreen.java index cff86b59c..2d6817d4e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/FluidStorageBlockScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FluidStorageBlockScreen.java @@ -1,15 +1,15 @@ package com.refinedmods.refinedstorage.screen; -import com.refinedmods.refinedstorage.container.FluidStorageContainer; +import com.refinedmods.refinedstorage.container.FluidStorageContainerMenu; import com.refinedmods.refinedstorage.blockentity.FluidStorageBlockEntity; import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -public class FluidStorageBlockScreen extends StorageScreen { - public FluidStorageBlockScreen(FluidStorageContainer container, Inventory inventory, Component title) { +public class FluidStorageBlockScreen extends StorageScreen { + public FluidStorageBlockScreen(FluidStorageContainerMenu containerMenu, Inventory inventory, Component title) { super( - container, + containerMenu, inventory, title, "gui/storage.png", @@ -22,7 +22,7 @@ public class FluidStorageBlockScreen extends StorageScreen (long) ((FluidStorageBlockEntity) container.getBlockEntity()).getFluidStorageType().getCapacity() + () -> (long) ((FluidStorageBlockEntity) containerMenu.getBlockEntity()).getFluidStorageType().getCapacity() ); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ImporterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ImporterScreen.java index 7298394b1..841885699 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ImporterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ImporterScreen.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.ImporterContainer; +import com.refinedmods.refinedstorage.container.ImporterContainerMenu; import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.TypeSideButton; @@ -13,9 +13,9 @@ import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -public class ImporterScreen extends BaseScreen { - public ImporterScreen(ImporterContainer container, Inventory inventory, Component title) { - super(container, 211, 137, inventory, title); +public class ImporterScreen extends BaseScreen { + public ImporterScreen(ImporterContainerMenu containerMenu, Inventory inventory, Component title) { + super(containerMenu, 211, 137, inventory, title); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java index 978bc8d56..b0d006a2e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/InterfaceScreen.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.InterfaceContainer; +import com.refinedmods.refinedstorage.container.InterfaceContainerMenu; import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.refinedmods.refinedstorage.blockentity.InterfaceBlockEntity; @@ -11,9 +11,9 @@ import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -public class InterfaceScreen extends BaseScreen { - public InterfaceScreen(InterfaceContainer container, Inventory inventory, Component title) { - super(container, 211, 217, inventory, title); +public class InterfaceScreen extends BaseScreen { + public InterfaceScreen(InterfaceContainerMenu containerMenu, Inventory inventory, Component title) { + super(containerMenu, 211, 217, inventory, title); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java index 9bce8297c..3026054b3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/ItemAmountScreen.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.screen; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.AmountContainer; +import com.refinedmods.refinedstorage.container.AmountContainerMenu; import com.refinedmods.refinedstorage.network.SetFilterSlotMessage; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; @@ -14,7 +14,7 @@ import org.apache.commons.lang3.tuple.Pair; import javax.annotation.Nullable; import java.util.function.UnaryOperator; -public class ItemAmountScreen extends AmountSpecifyingScreen { +public class ItemAmountScreen extends AmountSpecifyingScreen { private final int containerSlot; private final ItemStack stack; private final int maxAmount; @@ -22,7 +22,7 @@ public class ItemAmountScreen extends AmountSpecifyingScreen { private final UnaryOperator alternativesScreenFactory; public ItemAmountScreen(BaseScreen parent, Player player, int containerSlot, ItemStack stack, int maxAmount, @Nullable UnaryOperator alternativesScreenFactory) { - super(parent, new AmountContainer(player, stack), alternativesScreenFactory != null ? 194 : 172, 99, player.getInventory(), new TranslatableComponent("gui.refinedstorage.item_amount")); + super(parent, new AmountContainerMenu(player, stack), alternativesScreenFactory != null ? 194 : 172, 99, player.getInventory(), new TranslatableComponent("gui.refinedstorage.item_amount")); this.containerSlot = containerSlot; this.stack = stack; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java index 4ab0f489d..221ff249a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/NetworkTransmitterScreen.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.NetworkTransmitterContainer; +import com.refinedmods.refinedstorage.container.NetworkTransmitterContainerMenu; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; import com.refinedmods.refinedstorage.blockentity.NetworkTransmitterBlockEntity; @@ -13,9 +13,9 @@ import net.minecraft.world.entity.player.Inventory; import java.util.Optional; -public class NetworkTransmitterScreen extends BaseScreen { - public NetworkTransmitterScreen(NetworkTransmitterContainer container, Inventory inventory, Component title) { - super(container, 176, 137, inventory, title); +public class NetworkTransmitterScreen extends BaseScreen { + public NetworkTransmitterScreen(NetworkTransmitterContainerMenu containerMenu, Inventory inventory, Component title) { + super(containerMenu, 176, 137, inventory, title); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/RelayScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/RelayScreen.java index 91c7dfbcd..fbaec917c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/RelayScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/RelayScreen.java @@ -2,16 +2,16 @@ package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.RelayContainer; +import com.refinedmods.refinedstorage.container.RelayContainerMenu; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -public class RelayScreen extends BaseScreen { - public RelayScreen(RelayContainer container, Inventory inventory, Component title) { - super(container, 176, 131, inventory, title); +public class RelayScreen extends BaseScreen { + public RelayScreen(RelayContainerMenu containerMenu, Inventory inventory, Component title) { + super(containerMenu, 176, 131, inventory, title); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java index 1b6811553..79cc85f85 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/SecurityManagerScreen.java @@ -3,7 +3,7 @@ package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; import com.refinedmods.refinedstorage.api.network.security.Permission; -import com.refinedmods.refinedstorage.container.SecurityManagerContainer; +import com.refinedmods.refinedstorage.container.SecurityManagerContainerMenu; import com.refinedmods.refinedstorage.item.SecurityCardItem; import com.refinedmods.refinedstorage.network.SecurityManagerUpdateMessage; import com.refinedmods.refinedstorage.screen.widget.CheckboxWidget; @@ -17,14 +17,14 @@ import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; -public class SecurityManagerScreen extends BaseScreen { +public class SecurityManagerScreen extends BaseScreen { private final SecurityManagerBlockEntity securityManager; private final CheckboxWidget[] permissions = new CheckboxWidget[Permission.values().length]; - public SecurityManagerScreen(SecurityManagerContainer container, Inventory inventory, Component title) { - super(container, 176, 234, inventory, title); + public SecurityManagerScreen(SecurityManagerContainerMenu containerMenu, Inventory inventory, Component title) { + super(containerMenu, 176, 234, inventory, title); - this.securityManager = (SecurityManagerBlockEntity) container.getBlockEntity(); + this.securityManager = (SecurityManagerBlockEntity) containerMenu.getBlockEntity(); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java index 045eae480..a0f7118c2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/StorageBlockScreen.java @@ -1,15 +1,15 @@ package com.refinedmods.refinedstorage.screen; -import com.refinedmods.refinedstorage.container.StorageContainer; +import com.refinedmods.refinedstorage.container.StorageContainerMenu; import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; import com.refinedmods.refinedstorage.blockentity.StorageBlockEntity; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -public class StorageBlockScreen extends StorageScreen { - public StorageBlockScreen(StorageContainer container, Inventory inventory, Component title) { +public class StorageBlockScreen extends StorageScreen { + public StorageBlockScreen(StorageContainerMenu containerMenu, Inventory inventory, Component title) { super( - container, + containerMenu, inventory, title, "gui/storage.png", @@ -22,7 +22,7 @@ public class StorageBlockScreen extends StorageScreen { StorageBlockEntity.ACCESS_TYPE ), StorageBlockEntity.STORED::getValue, - () -> (long) ((StorageBlockEntity) container.getBlockEntity()).getItemStorageType().getCapacity() + () -> (long) ((StorageBlockEntity) containerMenu.getBlockEntity()).getItemStorageType().getCapacity() ); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java index 76bbd8c14..9559d8071 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/StorageMonitorScreen.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.StorageMonitorContainer; +import com.refinedmods.refinedstorage.container.StorageMonitorContainerMenu; import com.refinedmods.refinedstorage.screen.widget.sidebutton.ExactModeSideButton; import com.refinedmods.refinedstorage.screen.widget.sidebutton.TypeSideButton; import com.refinedmods.refinedstorage.blockentity.StorageMonitorBlockEntity; @@ -10,9 +10,9 @@ import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -public class StorageMonitorScreen extends BaseScreen { - public StorageMonitorScreen(StorageMonitorContainer container, Inventory inventory, Component title) { - super(container, 211, 137, inventory, title); +public class StorageMonitorScreen extends BaseScreen { + public StorageMonitorScreen(StorageMonitorContainerMenu containerMenu, Inventory inventory, Component title) { + super(containerMenu, 211, 137, inventory, title); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java index 6057bf9e1..d96c93b16 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/StorageScreen.java @@ -25,14 +25,14 @@ public class StorageScreen extends BaseScreen storedSupplier; private final Supplier capacitySupplier; - public StorageScreen(T container, + public StorageScreen(T containerMenu, Inventory inventory, Component title, String texture, StorageScreenSynchronizationParameters parameters, Supplier storedSupplier, Supplier capacitySupplier) { - super(container, 176, 223, inventory, title); + super(containerMenu, 176, 223, inventory, title); this.texture = texture; this.parameters = parameters; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/WirelessTransmitterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/WirelessTransmitterScreen.java index 3116da56c..13ababc5a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/WirelessTransmitterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/WirelessTransmitterScreen.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.screen; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.WirelessTransmitterContainer; +import com.refinedmods.refinedstorage.container.WirelessTransmitterContainerMenu; import com.refinedmods.refinedstorage.screen.widget.sidebutton.RedstoneModeSideButton; import com.refinedmods.refinedstorage.blockentity.NetworkNodeBlockEntity; import com.refinedmods.refinedstorage.blockentity.WirelessTransmitterBlockEntity; @@ -10,9 +10,9 @@ import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -public class WirelessTransmitterScreen extends BaseScreen { - public WirelessTransmitterScreen(WirelessTransmitterContainer container, Inventory inventory, Component title) { - super(container, 211, 137, inventory, title); +public class WirelessTransmitterScreen extends BaseScreen { + public WirelessTransmitterScreen(WirelessTransmitterContainerMenu containerMenu, Inventory inventory, Component title) { + super(containerMenu, 211, 137, inventory, title); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/factory/CrafterManagerScreenFactory.java b/src/main/java/com/refinedmods/refinedstorage/screen/factory/CrafterManagerScreenFactory.java index 1dd736768..2a7471abb 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/factory/CrafterManagerScreenFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/factory/CrafterManagerScreenFactory.java @@ -1,14 +1,14 @@ package com.refinedmods.refinedstorage.screen.factory; -import com.refinedmods.refinedstorage.container.CrafterManagerContainer; +import com.refinedmods.refinedstorage.container.CrafterManagerContainerMenu; import com.refinedmods.refinedstorage.screen.CrafterManagerScreen; import net.minecraft.client.gui.screens.MenuScreens; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -public class CrafterManagerScreenFactory implements MenuScreens.ScreenConstructor { +public class CrafterManagerScreenFactory implements MenuScreens.ScreenConstructor { @Override - public CrafterManagerScreen create(CrafterManagerContainer container, Inventory playerInventory, Component title) { + public CrafterManagerScreen create(CrafterManagerContainerMenu container, Inventory playerInventory, Component title) { CrafterManagerScreen screen = new CrafterManagerScreen(container, playerInventory, title); container.setScreenInfoProvider(screen); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/factory/GridScreenFactory.java b/src/main/java/com/refinedmods/refinedstorage/screen/factory/GridScreenFactory.java index d1b439d35..7ae39d7d7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/factory/GridScreenFactory.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/factory/GridScreenFactory.java @@ -1,14 +1,14 @@ package com.refinedmods.refinedstorage.screen.factory; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.screen.grid.GridScreen; import net.minecraft.client.gui.screens.MenuScreens; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; -public class GridScreenFactory implements MenuScreens.ScreenConstructor { +public class GridScreenFactory implements MenuScreens.ScreenConstructor { @Override - public GridScreen create(GridContainer container, Inventory inv, Component title) { + public GridScreen create(GridContainerMenu container, Inventory inv, Component title) { GridScreen screen = new GridScreen(container, container.getGrid(), inv, title); container.setScreenInfoProvider(screen); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/AlternativesScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/AlternativesScreen.java index 3943f0867..551005a68 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/AlternativesScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/AlternativesScreen.java @@ -3,7 +3,7 @@ package com.refinedmods.refinedstorage.screen.grid; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.AlternativesContainer; +import com.refinedmods.refinedstorage.container.AlternativesContainerMenu; import com.refinedmods.refinedstorage.render.FluidRenderer; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.screen.widget.CheckboxWidget; @@ -33,7 +33,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -public class AlternativesScreen extends BaseScreen { +public class AlternativesScreen extends BaseScreen { private static final int VISIBLE_ROWS = 5; private final Screen parent; @@ -47,7 +47,7 @@ public class AlternativesScreen extends BaseScreen { private FluidStack fluid; private AlternativesScreen(Screen parent, Player player, Component title) { - super(new AlternativesContainer(player), 175, 143, null, title); + super(new AlternativesContainerMenu(player), 175, 143, null, title); this.parent = parent; this.scrollbar = new ScrollbarWidget(this, 155, 20, 12, 89); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java index 49a2616c4..c7eaa07ca 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/CraftingSettingsScreen.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.screen.grid; import com.refinedmods.refinedstorage.RS; -import com.refinedmods.refinedstorage.container.CraftingSettingsContainer; +import com.refinedmods.refinedstorage.container.CraftingSettingsContainerMenu; import com.refinedmods.refinedstorage.network.grid.GridCraftingPreviewRequestMessage; import com.refinedmods.refinedstorage.screen.AmountSpecifyingScreen; import com.refinedmods.refinedstorage.screen.BaseScreen; @@ -12,11 +12,11 @@ import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.world.entity.player.Player; import net.minecraftforge.fluids.FluidAttributes; -public class CraftingSettingsScreen extends AmountSpecifyingScreen { +public class CraftingSettingsScreen extends AmountSpecifyingScreen { private final IGridStack stack; public CraftingSettingsScreen(BaseScreen parent, Player player, IGridStack stack) { - super(parent, new CraftingSettingsContainer(player, stack), 172, 99, player.getInventory(), new TranslatableComponent("container.crafting")); + super(parent, new CraftingSettingsContainerMenu(player, stack), 172, 99, player.getInventory(), new TranslatableComponent("container.crafting")); this.stack = stack; } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java index 21aa3afeb..8145f671c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java @@ -10,7 +10,7 @@ import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.api.network.grid.handler.IItemGridHandler; import com.refinedmods.refinedstorage.apiimpl.network.node.GridNetworkNode; import com.refinedmods.refinedstorage.apiimpl.render.ElementDrawers; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.network.grid.*; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.screen.IScreenInfoProvider; @@ -48,10 +48,10 @@ import java.util.LinkedList; import java.util.List; @MouseTweaksDisableWheelTweak -public class GridScreen extends BaseScreen implements IScreenInfoProvider { +public class GridScreen extends BaseScreen implements IScreenInfoProvider { private static String searchQuery = ""; private final IGrid grid; - private final TabListWidget tabs; + private final TabListWidget tabs; private final int patternScrollOffsetAbsoluteMax = GridNetworkNode.PROCESSING_MATRIX_SIZE / 3 - 3; private IGridView view; private SearchWidget searchField; @@ -67,8 +67,8 @@ public class GridScreen extends BaseScreen implements IScreenInfo private int patternScrollOffsetMax; private boolean updatePatternOffset; - public GridScreen(GridContainer container, IGrid grid, Inventory inventory, Component title) { - super(container, 227, 0, inventory, title); + public GridScreen(GridContainerMenu containerMenu, IGrid grid, Inventory inventory, Component title) { + super(containerMenu, 227, 0, inventory, title); this.grid = grid; this.view = new GridViewImpl(this, getDefaultSorter(), getSorters()); diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java index b3f010155..8c1108c86 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/ConstructorDropSideButton.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; import com.mojang.blaze3d.vertex.PoseStack; -import com.refinedmods.refinedstorage.container.ConstructorContainer; +import com.refinedmods.refinedstorage.container.ConstructorContainerMenu; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.blockentity.ConstructorBlockEntity; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; @@ -9,7 +9,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.client.resources.language.I18n; public class ConstructorDropSideButton extends SideButton { - public ConstructorDropSideButton(BaseScreen screen) { + public ConstructorDropSideButton(BaseScreen screen) { super(screen); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java index 23b0306e9..e4acc1365 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/CrafterModeSideButton.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; import com.mojang.blaze3d.vertex.PoseStack; -import com.refinedmods.refinedstorage.container.CrafterContainer; +import com.refinedmods.refinedstorage.container.CrafterContainerMenu; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.blockentity.CrafterBlockEntity; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; @@ -9,7 +9,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.client.resources.language.I18n; public class CrafterModeSideButton extends SideButton { - public CrafterModeSideButton(BaseScreen screen) { + public CrafterModeSideButton(BaseScreen screen) { super(screen); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java index 8c0a70375..28d51a2b3 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java @@ -1,7 +1,7 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; import com.mojang.blaze3d.vertex.PoseStack; -import com.refinedmods.refinedstorage.container.DestructorContainer; +import com.refinedmods.refinedstorage.container.DestructorContainerMenu; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.blockentity.DestructorBlockEntity; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; @@ -9,7 +9,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.client.resources.language.I18n; public class DestructorPickupSideButton extends SideButton { - public DestructorPickupSideButton(BaseScreen screen) { + public DestructorPickupSideButton(BaseScreen screen) { super(screen); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java index 38bccd3ac..d074f7aa8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DetectorModeSideButton.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.apiimpl.network.node.DetectorNetworkNode; -import com.refinedmods.refinedstorage.container.DetectorContainer; +import com.refinedmods.refinedstorage.container.DetectorContainerMenu; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.blockentity.DetectorBlockEntity; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; @@ -10,7 +10,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.client.resources.language.I18n; public class DetectorModeSideButton extends SideButton { - public DetectorModeSideButton(BaseScreen screen) { + public DetectorModeSideButton(BaseScreen screen) { super(screen); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java index 6721ba241..6f84e1fb9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingDirectionSideButton.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.network.grid.IGrid; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.ChatFormatting; import net.minecraft.client.resources.language.I18n; @@ -10,7 +10,7 @@ import net.minecraft.client.resources.language.I18n; public class GridSortingDirectionSideButton extends SideButton { private final IGrid grid; - public GridSortingDirectionSideButton(BaseScreen screen, IGrid grid) { + public GridSortingDirectionSideButton(BaseScreen screen, IGrid grid) { super(screen); this.grid = grid; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java index c461d7d54..7ee551c54 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridSortingTypeSideButton.java @@ -3,7 +3,7 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.network.grid.GridType; import com.refinedmods.refinedstorage.api.network.grid.IGrid; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.integration.inventorytweaks.InventoryTweaksIntegration; import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.ChatFormatting; @@ -12,7 +12,7 @@ import net.minecraft.client.resources.language.I18n; public class GridSortingTypeSideButton extends SideButton { private final IGrid grid; - public GridSortingTypeSideButton(BaseScreen screen, IGrid grid) { + public GridSortingTypeSideButton(BaseScreen screen, IGrid grid) { super(screen); this.grid = grid; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java index e1c0ea00a..4b99ccf57 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/GridViewTypeSideButton.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.api.network.grid.IGrid; -import com.refinedmods.refinedstorage.container.GridContainer; +import com.refinedmods.refinedstorage.container.GridContainerMenu; import com.refinedmods.refinedstorage.screen.BaseScreen; import net.minecraft.ChatFormatting; import net.minecraft.client.resources.language.I18n; @@ -10,7 +10,7 @@ import net.minecraft.client.resources.language.I18n; public class GridViewTypeSideButton extends SideButton { private final IGrid grid; - public GridViewTypeSideButton(BaseScreen screen, IGrid grid) { + public GridViewTypeSideButton(BaseScreen screen, IGrid grid) { super(screen); this.grid = grid; diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java index 6e7b025eb..d77bc671e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/IoModeSideButton.java @@ -2,7 +2,7 @@ package com.refinedmods.refinedstorage.screen.widget.sidebutton; import com.mojang.blaze3d.vertex.PoseStack; import com.refinedmods.refinedstorage.apiimpl.network.node.diskmanipulator.DiskManipulatorNetworkNode; -import com.refinedmods.refinedstorage.container.DiskManipulatorContainer; +import com.refinedmods.refinedstorage.container.DiskManipulatorContainerMenu; import com.refinedmods.refinedstorage.screen.BaseScreen; import com.refinedmods.refinedstorage.blockentity.DiskManipulatorBlockEntity; import com.refinedmods.refinedstorage.blockentity.data.BlockEntitySynchronizationManager; @@ -10,7 +10,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.client.resources.language.I18n; public class IoModeSideButton extends SideButton { - public IoModeSideButton(BaseScreen screen) { + public IoModeSideButton(BaseScreen screen) { super(screen); } diff --git a/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java b/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java index b81bbb48d..ba461ffa7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java +++ b/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java @@ -3,8 +3,8 @@ package com.refinedmods.refinedstorage.setup; import com.refinedmods.refinedstorage.*; import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.apiimpl.network.node.cover.CoverType; -import com.refinedmods.refinedstorage.container.CrafterContainer; -import com.refinedmods.refinedstorage.container.CrafterManagerContainer; +import com.refinedmods.refinedstorage.container.CrafterContainerMenu; +import com.refinedmods.refinedstorage.container.CrafterManagerContainerMenu; import com.refinedmods.refinedstorage.container.slot.CrafterManagerSlot; import com.refinedmods.refinedstorage.item.property.ControllerItemPropertyGetter; import com.refinedmods.refinedstorage.item.property.NetworkItemPropertyGetter; @@ -161,7 +161,7 @@ public class ClientSetup { API.instance().addPatternRenderHandler(pattern -> { AbstractContainerMenu container = Minecraft.getInstance().player.containerMenu; - if (container instanceof CrafterManagerContainer) { + if (container instanceof CrafterManagerContainerMenu) { for (Slot slot : container.slots) { if (slot instanceof CrafterManagerSlot && slot.getItem() == pattern) { return true; @@ -175,7 +175,7 @@ public class ClientSetup { API.instance().addPatternRenderHandler(pattern -> { AbstractContainerMenu container = Minecraft.getInstance().player.containerMenu; - if (container instanceof CrafterContainer) { + if (container instanceof CrafterContainerMenu) { for (int i = 0; i < 9; ++i) { if (container.getSlot(i).getItem() == pattern) { return true; @@ -206,30 +206,30 @@ public class ClientSetup { public void onClientSetup(FMLClientSetupEvent e) { MinecraftForge.EVENT_BUS.register(new KeyInputListener()); - MenuScreens.register(RSContainers.FILTER, FilterScreen::new); - MenuScreens.register(RSContainers.CONTROLLER, ControllerScreen::new); - MenuScreens.register(RSContainers.DISK_DRIVE, DiskDriveScreen::new); - MenuScreens.register(RSContainers.GRID, new GridScreenFactory()); - MenuScreens.register(RSContainers.STORAGE_BLOCK, StorageBlockScreen::new); - MenuScreens.register(RSContainers.FLUID_STORAGE_BLOCK, FluidStorageBlockScreen::new); - MenuScreens.register(RSContainers.EXTERNAL_STORAGE, ExternalStorageScreen::new); - MenuScreens.register(RSContainers.IMPORTER, ImporterScreen::new); - MenuScreens.register(RSContainers.EXPORTER, ExporterScreen::new); - MenuScreens.register(RSContainers.NETWORK_TRANSMITTER, NetworkTransmitterScreen::new); - MenuScreens.register(RSContainers.RELAY, RelayScreen::new); - MenuScreens.register(RSContainers.DETECTOR, DetectorScreen::new); - MenuScreens.register(RSContainers.SECURITY_MANAGER, SecurityManagerScreen::new); - MenuScreens.register(RSContainers.INTERFACE, InterfaceScreen::new); - MenuScreens.register(RSContainers.FLUID_INTERFACE, FluidInterfaceScreen::new); - MenuScreens.register(RSContainers.WIRELESS_TRANSMITTER, WirelessTransmitterScreen::new); - MenuScreens.register(RSContainers.STORAGE_MONITOR, StorageMonitorScreen::new); - MenuScreens.register(RSContainers.CONSTRUCTOR, ConstructorScreen::new); - MenuScreens.register(RSContainers.DESTRUCTOR, DestructorScreen::new); - MenuScreens.register(RSContainers.DISK_MANIPULATOR, DiskManipulatorScreen::new); - MenuScreens.register(RSContainers.CRAFTER, CrafterScreen::new); - MenuScreens.register(RSContainers.CRAFTER_MANAGER, new CrafterManagerScreenFactory()); - MenuScreens.register(RSContainers.CRAFTING_MONITOR, CraftingMonitorScreen::new); - MenuScreens.register(RSContainers.WIRELESS_CRAFTING_MONITOR, CraftingMonitorScreen::new); + MenuScreens.register(RSContainerMenus.FILTER, FilterScreen::new); + MenuScreens.register(RSContainerMenus.CONTROLLER, ControllerScreen::new); + MenuScreens.register(RSContainerMenus.DISK_DRIVE, DiskDriveScreen::new); + MenuScreens.register(RSContainerMenus.GRID, new GridScreenFactory()); + MenuScreens.register(RSContainerMenus.STORAGE_BLOCK, StorageBlockScreen::new); + MenuScreens.register(RSContainerMenus.FLUID_STORAGE_BLOCK, FluidStorageBlockScreen::new); + MenuScreens.register(RSContainerMenus.EXTERNAL_STORAGE, ExternalStorageScreen::new); + MenuScreens.register(RSContainerMenus.IMPORTER, ImporterScreen::new); + MenuScreens.register(RSContainerMenus.EXPORTER, ExporterScreen::new); + MenuScreens.register(RSContainerMenus.NETWORK_TRANSMITTER, NetworkTransmitterScreen::new); + MenuScreens.register(RSContainerMenus.RELAY, RelayScreen::new); + MenuScreens.register(RSContainerMenus.DETECTOR, DetectorScreen::new); + MenuScreens.register(RSContainerMenus.SECURITY_MANAGER, SecurityManagerScreen::new); + MenuScreens.register(RSContainerMenus.INTERFACE, InterfaceScreen::new); + MenuScreens.register(RSContainerMenus.FLUID_INTERFACE, FluidInterfaceScreen::new); + MenuScreens.register(RSContainerMenus.WIRELESS_TRANSMITTER, WirelessTransmitterScreen::new); + MenuScreens.register(RSContainerMenus.STORAGE_MONITOR, StorageMonitorScreen::new); + MenuScreens.register(RSContainerMenus.CONSTRUCTOR, ConstructorScreen::new); + MenuScreens.register(RSContainerMenus.DESTRUCTOR, DestructorScreen::new); + MenuScreens.register(RSContainerMenus.DISK_MANIPULATOR, DiskManipulatorScreen::new); + MenuScreens.register(RSContainerMenus.CRAFTER, CrafterScreen::new); + MenuScreens.register(RSContainerMenus.CRAFTER_MANAGER, new CrafterManagerScreenFactory()); + MenuScreens.register(RSContainerMenus.CRAFTING_MONITOR, CraftingMonitorScreen::new); + MenuScreens.register(RSContainerMenus.WIRELESS_CRAFTING_MONITOR, CraftingMonitorScreen::new); ClientRegistry.registerKeyBinding(RSKeyBindings.FOCUS_SEARCH_BAR); ClientRegistry.registerKeyBinding(RSKeyBindings.CLEAR_GRID_CRAFTING_MATRIX); diff --git a/src/main/java/com/refinedmods/refinedstorage/setup/CommonSetup.java b/src/main/java/com/refinedmods/refinedstorage/setup/CommonSetup.java index 374ba3ba1..6a933cc7f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/setup/CommonSetup.java +++ b/src/main/java/com/refinedmods/refinedstorage/setup/CommonSetup.java @@ -208,28 +208,28 @@ public class CommonSetup { } @SubscribeEvent - public void onRegisterContainers(RegistryEvent.Register> e) { - e.getRegistry().register(IForgeMenuType.create((windowId, inv, data) -> new FilterContainer(inv.player, inv.getSelected(), windowId)).setRegistryName(RS.ID, "filter")); - e.getRegistry().register(IForgeMenuType.create(((windowId, inv, data) -> new ControllerContainer(null, inv.player, windowId))).setRegistryName(RS.ID, "controller")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new DiskDriveContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "disk_drive")); + public void onRegisterMenus(RegistryEvent.Register> e) { + e.getRegistry().register(IForgeMenuType.create((windowId, inv, data) -> new FilterContainerMenu(inv.player, inv.getSelected(), windowId)).setRegistryName(RS.ID, "filter")); + e.getRegistry().register(IForgeMenuType.create(((windowId, inv, data) -> new ControllerContainerMenu(null, inv.player, windowId))).setRegistryName(RS.ID, "controller")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new DiskDriveContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "disk_drive")); e.getRegistry().register(IForgeMenuType.create(new GridContainerFactory()).setRegistryName(RS.ID, "grid")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new StorageContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "storage_block")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new FluidStorageContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "fluid_storage_block")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new ExternalStorageContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "external_storage")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new ImporterContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "importer")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new ExporterContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "exporter")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new NetworkTransmitterContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "network_transmitter")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new RelayContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "relay")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new DetectorContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "detector")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new SecurityManagerContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "security_manager")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new InterfaceContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "interface")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new FluidInterfaceContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "fluid_interface")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new WirelessTransmitterContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "wireless_transmitter")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new StorageMonitorContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "storage_monitor")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new ConstructorContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "constructor")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new DestructorContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "destructor")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new DiskManipulatorContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "disk_manipulator")); - e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new CrafterContainer(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "crafter")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new StorageContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "storage_block")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new FluidStorageContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "fluid_storage_block")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new ExternalStorageContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "external_storage")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new ImporterContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "importer")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new ExporterContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "exporter")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new NetworkTransmitterContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "network_transmitter")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new RelayContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "relay")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new DetectorContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "detector")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new SecurityManagerContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "security_manager")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new InterfaceContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "interface")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new FluidInterfaceContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "fluid_interface")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new WirelessTransmitterContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "wireless_transmitter")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new StorageMonitorContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "storage_monitor")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new ConstructorContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "constructor")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new DestructorContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "destructor")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new DiskManipulatorContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "disk_manipulator")); + e.getRegistry().register(IForgeMenuType.create(new BlockEntityContainerFactory((windowId, inv, blockEntity) -> new CrafterContainerMenu(blockEntity, inv.player, windowId))).setRegistryName(RS.ID, "crafter")); e.getRegistry().register(IForgeMenuType.create(new CrafterManagerContainerFactory()).setRegistryName(RS.ID, "crafter_manager")); e.getRegistry().register(IForgeMenuType.create(new CraftingMonitorContainerFactory()).setRegistryName(RS.ID, "crafting_monitor")); e.getRegistry().register(IForgeMenuType.create(new WirelessCraftingMonitorContainerFactory()).setRegistryName(RS.ID, "wireless_crafting_monitor"));