dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Container -> ContainerMenu

Browse Source
This commit is contained in:
raoulvdberge
2021-12-15 17:46:37 +01:00
parent 933c2f8511
commit ca0d0032e4
134 changed files with 561 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/refinedmods/refinedstorage/RS.java
View File

@@ -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());

60
src/main/java/com/refinedmods/refinedstorage/RSContainerMenus.java Normal file
View File

@@ -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<ControllerContainerMenu> CONTROLLER = null;
@ObjectHolder("grid")
public static final MenuType<GridContainerMenu> GRID = null;
@ObjectHolder("detector")
public static final MenuType<DetectorContainerMenu> DETECTOR = null;
@ObjectHolder("exporter")
public static final MenuType<ExporterContainerMenu> EXPORTER = null;
@ObjectHolder("external_storage")
public static final MenuType<ExternalStorageContainerMenu> EXTERNAL_STORAGE = null;
@ObjectHolder("filter")
public static final MenuType<FilterContainerMenu> FILTER = null;
@ObjectHolder("importer")
public static final MenuType<ImporterContainerMenu> IMPORTER = null;
@ObjectHolder("network_transmitter")
public static final MenuType<NetworkTransmitterContainerMenu> NETWORK_TRANSMITTER = null;
@ObjectHolder("relay")
public static final MenuType<RelayContainerMenu> RELAY = null;
@ObjectHolder("disk_drive")
public static final MenuType<DiskDriveContainerMenu> DISK_DRIVE = null;
@ObjectHolder("storage_block")
public static final MenuType<StorageContainerMenu> STORAGE_BLOCK = null;
@ObjectHolder("fluid_storage_block")
public static final MenuType<FluidStorageContainerMenu> FLUID_STORAGE_BLOCK = null;
@ObjectHolder("security_manager")
public static final MenuType<SecurityManagerContainerMenu> SECURITY_MANAGER = null;
@ObjectHolder("interface")
public static final MenuType<InterfaceContainerMenu> INTERFACE = null;
@ObjectHolder("fluid_interface")
public static final MenuType<FluidInterfaceContainerMenu> FLUID_INTERFACE = null;
@ObjectHolder("wireless_transmitter")
public static final MenuType<WirelessTransmitterContainerMenu> WIRELESS_TRANSMITTER = null;
@ObjectHolder("storage_monitor")
public static final MenuType<StorageMonitorContainerMenu> STORAGE_MONITOR = null;
@ObjectHolder("constructor")
public static final MenuType<ConstructorContainerMenu> CONSTRUCTOR = null;
@ObjectHolder("destructor")
public static final MenuType<DestructorContainerMenu> DESTRUCTOR = null;
@ObjectHolder("disk_manipulator")
public static final MenuType<DiskManipulatorContainerMenu> DISK_MANIPULATOR = null;
@ObjectHolder("crafter")
public static final MenuType<CrafterContainerMenu> CRAFTER = null;
@ObjectHolder("crafter_manager")
public static final MenuType<CrafterManagerContainerMenu> CRAFTER_MANAGER = null;
@ObjectHolder("crafting_monitor")
public static final MenuType<CraftingMonitorContainerMenu> CRAFTING_MONITOR = null;
@ObjectHolder("wireless_crafting_monitor")
public static final MenuType<CraftingMonitorContainerMenu> WIRELESS_CRAFTING_MONITOR = null;
private RSContainerMenus() {
}
}

60
src/main/java/com/refinedmods/refinedstorage/RSContainers.java
View File

@@ -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<ControllerContainer> CONTROLLER = null;
@ObjectHolder("grid")
public static final MenuType<GridContainer> GRID = null;
@ObjectHolder("detector")
public static final MenuType<DetectorContainer> DETECTOR = null;
@ObjectHolder("exporter")
public static final MenuType<ExporterContainer> EXPORTER = null;
@ObjectHolder("external_storage")
public static final MenuType<ExternalStorageContainer> EXTERNAL_STORAGE = null;
@ObjectHolder("filter")
public static final MenuType<FilterContainer> FILTER = null;
@ObjectHolder("importer")
public static final MenuType<ImporterContainer> IMPORTER = null;
@ObjectHolder("network_transmitter")
public static final MenuType<NetworkTransmitterContainer> NETWORK_TRANSMITTER = null;
@ObjectHolder("relay")
public static final MenuType<RelayContainer> RELAY = null;
@ObjectHolder("disk_drive")
public static final MenuType<DiskDriveContainer> DISK_DRIVE = null;
@ObjectHolder("storage_block")
public static final MenuType<StorageContainer> STORAGE_BLOCK = null;
@ObjectHolder("fluid_storage_block")
public static final MenuType<FluidStorageContainer> FLUID_STORAGE_BLOCK = null;
@ObjectHolder("security_manager")
public static final MenuType<SecurityManagerContainer> SECURITY_MANAGER = null;
@ObjectHolder("interface")
public static final MenuType<InterfaceContainer> INTERFACE = null;
@ObjectHolder("fluid_interface")
public static final MenuType<FluidInterfaceContainer> FLUID_INTERFACE = null;
@ObjectHolder("wireless_transmitter")
public static final MenuType<WirelessTransmitterContainer> WIRELESS_TRANSMITTER = null;
@ObjectHolder("storage_monitor")
public static final MenuType<StorageMonitorContainer> STORAGE_MONITOR = null;
@ObjectHolder("constructor")
public static final MenuType<ConstructorContainer> CONSTRUCTOR = null;
@ObjectHolder("destructor")
public static final MenuType<DestructorContainer> DESTRUCTOR = null;
@ObjectHolder("disk_manipulator")
public static final MenuType<DiskManipulatorContainer> DISK_MANIPULATOR = null;
@ObjectHolder("crafter")
public static final MenuType<CrafterContainer> CRAFTER = null;
@ObjectHolder("crafter_manager")
public static final MenuType<CrafterManagerContainer> CRAFTER_MANAGER = null;
@ObjectHolder("crafting_monitor")
public static final MenuType<CraftingMonitorContainer> CRAFTING_MONITOR = null;
@ObjectHolder("wireless_crafting_monitor")
public static final MenuType<CraftingMonitorContainer> WIRELESS_CRAFTING_MONITOR = null;
private RSContainers() {
}
}

16
src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
View File

@@ -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<ItemStack> remainingItems = recipe.getRemainingItems(inv);
NonNullList<ItemStack> remainingItems = recipe.getRemainingItems(craftingContainer);
NonNullList<ItemStack> 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) {

10
src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java
View File

@@ -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<CraftingRecipe> foundRecipe = level.getRecipeManager().getRecipeFor(RecipeType.CRAFTING, inv, level);
Optional<CraftingRecipe> 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);

8
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java
View File

@@ -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;

4
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java
View File

@@ -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());

9
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java
View File

@@ -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<ICraftingGridListener> craftingListeners = new HashSet<>();
private final List<IFilter> filters = new ArrayList<>(); private final CraftingContainer matrix = new CraftingContainer(craftingContainer, 3, 3);
private final List<IFilter> filters = new ArrayList<>();
private final CraftingContainer matrix = new CraftingContainer(craftingContainer, 3, 3);
private final List<IGridTab> 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);

6
src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java
View File

@@ -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<CraftingMonitorContainer> {
public class CraftingMonitorElementDrawers extends ElementDrawers<CraftingMonitorContainerMenu> {
private final IElementDrawer<Integer> overlayDrawer;
private final IElementDrawer<Void> errorDrawer;
public CraftingMonitorElementDrawers(BaseScreen<CraftingMonitorContainer> screen, int itemWidth, int itemHeight) {
public CraftingMonitorElementDrawers(BaseScreen<CraftingMonitorContainerMenu> screen, int itemWidth, int itemHeight) {
super(screen);
this.overlayDrawer = (matrixStack, x, y, color) -> {

4
src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java
View File

@@ -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<ConstructorBlockEntity>(
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

4
src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java
View File

@@ -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

4
src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java
View File

@@ -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>(
((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

4
src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java
View File

@@ -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);
}

4
src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java
View File

@@ -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<DestructorBlockEntity>(
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

4
src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java
View File

@@ -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<DetectorBlockEntity>(
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

4
src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java
View File

@@ -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<DiskDriveBlockEntity>(
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

4
src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java
View File

@@ -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<DiskManipulatorBlockEntity>(
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

4
src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java
View File

@@ -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<ExporterBlockEntity>(
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

4
src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java
View File

@@ -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<ExternalStorageBlockEntity>(
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

4
src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java
View File

@@ -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<FluidInterfaceBlockEntity>(
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

4
src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java
View File

@@ -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>(
((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));
}

4
src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java
View File

@@ -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<ImporterBlockEntity>(
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

4
src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java
View File

@@ -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<InterfaceBlockEntity>(
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

4
src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java
View File

@@ -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<NetworkTransmitterBlockEntity>(
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

4
src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java
View File

@@ -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<RelayBlockEntity>(
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

4
src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java
View File

@@ -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<SecurityManagerBlockEntity>(
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

4
src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java
View File

@@ -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>(
((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));
}

4
src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java
View File

@@ -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<StorageMonitorBlockEntity>(
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

4
src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java
View File

@@ -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<WirelessTransmitterBlockEntity>(
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

4
src/main/java/com/refinedmods/refinedstorage/container/AlternativesContainer.java → src/main/java/com/refinedmods/refinedstorage/container/AlternativesContainerMenu.java
View File

@@ -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);
}
}

4
src/main/java/com/refinedmods/refinedstorage/container/AmountContainer.java → src/main/java/com/refinedmods/refinedstorage/container/AmountContainerMenu.java
View File

@@ -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);

4
src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java → src/main/java/com/refinedmods/refinedstorage/container/BaseContainerMenu.java
View File

@@ -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;

8
src/main/java/com/refinedmods/refinedstorage/container/ConstructorContainer.java → src/main/java/com/refinedmods/refinedstorage/container/ConstructorContainerMenu.java
View File

@@ -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)));

13
src/main/java/com/refinedmods/refinedstorage/container/ControllerContainer.java
View File

@@ -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);
}
}

13
src/main/java/com/refinedmods/refinedstorage/container/ControllerContainerMenu.java Normal file
View File

@@ -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);
}
}

8
src/main/java/com/refinedmods/refinedstorage/container/CrafterContainer.java → src/main/java/com/refinedmods/refinedstorage/container/CrafterContainerMenu.java
View File

@@ -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));

8
src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainer.java → src/main/java/com/refinedmods/refinedstorage/container/CrafterManagerContainerMenu.java
View File

@@ -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<String, IItemHandlerModifiable> dummyInventories = new HashMap<>();
private final Map<String, Integer> headings = new HashMap<>();
@@ -34,8 +34,8 @@ public class CrafterManagerContainer extends BaseContainer {
private Map<String, Integer> 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();
}

4
src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainer.java → src/main/java/com/refinedmods/refinedstorage/container/CraftingMonitorContainerMenu.java
View File

@@ -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<CraftingMonitorContainer> type, ICraftingMonitor craftingMonitor, @Nullable CraftingMonitorBlockEntity blockEntity, Player player, int windowId) {
public CraftingMonitorContainerMenu(MenuType<CraftingMonitorContainerMenu> type, ICraftingMonitor craftingMonitor, @Nullable CraftingMonitorBlockEntity blockEntity, Player player, int windowId) {
super(type, blockEntity, player, windowId);
this.craftingMonitor = craftingMonitor;

4
src/main/java/com/refinedmods/refinedstorage/container/CraftingSettingsContainer.java → src/main/java/com/refinedmods/refinedstorage/container/CraftingSettingsContainerMenu.java
View File

@@ -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) {

8
src/main/java/com/refinedmods/refinedstorage/container/DestructorContainer.java → src/main/java/com/refinedmods/refinedstorage/container/DestructorContainerMenu.java
View File

@@ -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)));

8
src/main/java/com/refinedmods/refinedstorage/container/DetectorContainer.java → src/main/java/com/refinedmods/refinedstorage/container/DetectorContainerMenu.java
View File

@@ -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));

8
src/main/java/com/refinedmods/refinedstorage/container/DiskDriveContainer.java → src/main/java/com/refinedmods/refinedstorage/container/DiskDriveContainerMenu.java
View File

@@ -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;

8
src/main/java/com/refinedmods/refinedstorage/container/DiskManipulatorContainer.java → src/main/java/com/refinedmods/refinedstorage/container/DiskManipulatorContainerMenu.java
View File

@@ -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)));

8
src/main/java/com/refinedmods/refinedstorage/container/ExporterContainer.java → src/main/java/com/refinedmods/refinedstorage/container/ExporterContainerMenu.java
View File

@@ -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();

8
src/main/java/com/refinedmods/refinedstorage/container/ExternalStorageContainer.java → src/main/java/com/refinedmods/refinedstorage/container/ExternalStorageContainerMenu.java
View File

@@ -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));

8
src/main/java/com/refinedmods/refinedstorage/container/FilterContainer.java → src/main/java/com/refinedmods/refinedstorage/container/FilterContainerMenu.java
View File

@@ -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;

4
src/main/java/com/refinedmods/refinedstorage/container/FluidAmountContainer.java → src/main/java/com/refinedmods/refinedstorage/container/FluidAmountContainerMenu.java
View File

@@ -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);

8
src/main/java/com/refinedmods/refinedstorage/container/FluidInterfaceContainer.java → src/main/java/com/refinedmods/refinedstorage/container/FluidInterfaceContainerMenu.java
View File

@@ -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)));

8
src/main/java/com/refinedmods/refinedstorage/container/FluidStorageContainer.java → src/main/java/com/refinedmods/refinedstorage/container/FluidStorageContainerMenu.java
View File

@@ -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));

8
src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java → src/main/java/com/refinedmods/refinedstorage/container/GridContainerMenu.java
View File

@@ -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<Slot> 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;

8
src/main/java/com/refinedmods/refinedstorage/container/ImporterContainer.java → src/main/java/com/refinedmods/refinedstorage/container/ImporterContainerMenu.java
View File

@@ -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)));

8
src/main/java/com/refinedmods/refinedstorage/container/InterfaceContainer.java → src/main/java/com/refinedmods/refinedstorage/container/InterfaceContainerMenu.java
View File

@@ -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));

8
src/main/java/com/refinedmods/refinedstorage/container/NetworkTransmitterContainer.java → src/main/java/com/refinedmods/refinedstorage/container/NetworkTransmitterContainerMenu.java
View File

@@ -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));

13
src/main/java/com/refinedmods/refinedstorage/container/RelayContainer.java
View File

@@ -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);
}
}

13
src/main/java/com/refinedmods/refinedstorage/container/RelayContainerMenu.java Normal file
View File

@@ -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);
}
}

8
src/main/java/com/refinedmods/refinedstorage/container/SecurityManagerContainer.java → src/main/java/com/refinedmods/refinedstorage/container/SecurityManagerContainerMenu.java
View File

@@ -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;

8
src/main/java/com/refinedmods/refinedstorage/container/StorageContainer.java → src/main/java/com/refinedmods/refinedstorage/container/StorageContainerMenu.java
View File

@@ -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));

8
src/main/java/com/refinedmods/refinedstorage/container/StorageMonitorContainer.java → src/main/java/com/refinedmods/refinedstorage/container/StorageMonitorContainerMenu.java
View File

@@ -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));

8
src/main/java/com/refinedmods/refinedstorage/container/WirelessTransmitterContainer.java → src/main/java/com/refinedmods/refinedstorage/container/WirelessTransmitterContainerMenu.java
View File

@@ -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)));

8
src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerContainerFactory.java
View File

@@ -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<CrafterManagerContainer> {
public class CrafterManagerContainerFactory implements IContainerFactory<CrafterManagerContainerMenu> {
@Override
public CrafterManagerContainer create(int windowId, Inventory inv, FriendlyByteBuf buf) {
public CrafterManagerContainerMenu create(int windowId, Inventory inv, FriendlyByteBuf buf) {
Map<String, Integer> data = new LinkedHashMap<>();
BlockPos pos = buf.readBlockPos();
@@ -24,7 +24,7 @@ public class CrafterManagerContainerFactory implements IContainerFactory<Crafter
data.put(buf.readComponent().getString(), buf.readInt());
}
CrafterManagerContainer container = new CrafterManagerContainer((CrafterManagerBlockEntity) inv.player.level.getBlockEntity(pos), inv.player, windowId);
CrafterManagerContainerMenu container = new CrafterManagerContainerMenu((CrafterManagerBlockEntity) inv.player.level.getBlockEntity(pos), inv.player, windowId);
container.setScreenInfoProvider(new EmptyScreenInfoProvider());
container.initSlots(data);

4
src/main/java/com/refinedmods/refinedstorage/container/factory/CrafterManagerMenuProvider.java
View File

@@ -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;
@@ -52,7 +52,7 @@ public class CrafterManagerMenuProvider implements MenuProvider {
@Nullable
@Override
public AbstractContainerMenu createMenu(int windowId, Inventory playerInventory, Player playerEntity) {
CrafterManagerContainer container = new CrafterManagerContainer(blockEntity, playerEntity, windowId);
CrafterManagerContainerMenu container = new CrafterManagerContainerMenu(blockEntity, playerEntity, windowId);
container.setScreenInfoProvider(new EmptyScreenInfoProvider());
container.initSlotsServer();

10
src/main/java/com/refinedmods/refinedstorage/container/factory/CraftingMonitorContainerFactory.java
View File

@@ -1,20 +1,20 @@
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.blockentity.craftingmonitor.CraftingMonitorBlockEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.entity.player.Inventory;
import net.minecraftforge.network.IContainerFactory;
public class CraftingMonitorContainerFactory implements IContainerFactory<CraftingMonitorContainer> {
public class CraftingMonitorContainerFactory implements IContainerFactory<CraftingMonitorContainerMenu> {
@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);
}
}

8
src/main/java/com/refinedmods/refinedstorage/container/factory/CraftingMonitorMenuProvider.java
View File

@@ -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<CraftingMonitorContainer> containerType;
private final MenuType<CraftingMonitorContainerMenu> containerType;
public CraftingMonitorMenuProvider(MenuType<CraftingMonitorContainer> containerType, ICraftingMonitor craftingMonitor, @Nullable CraftingMonitorBlockEntity blockEntity) {
public CraftingMonitorMenuProvider(MenuType<CraftingMonitorContainerMenu> 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);
}
}

8
src/main/java/com/refinedmods/refinedstorage/container/factory/GridContainerFactory.java
View File

@@ -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<GridContainer> {
public class GridContainerFactory implements IContainerFactory<GridContainerMenu> {
@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<GridContainer> {
Pair<IGrid, BlockEntity> 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);
}
}

4
src/main/java/com/refinedmods/refinedstorage/container/factory/GridMenuProvider.java
View File

@@ -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();

10
src/main/java/com/refinedmods/refinedstorage/container/factory/WirelessCraftingMonitorContainerFactory.java
View File

@@ -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<CraftingMonitorContainer> {
public class WirelessCraftingMonitorContainerFactory implements IContainerFactory<CraftingMonitorContainerMenu> {
@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);
}
}

12
src/main/java/com/refinedmods/refinedstorage/integration/craftingtweaks/CraftingTweaksIntegration.java
View File

@@ -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<GridContainer> {
public static class ValidContainerPredicate implements Predicate<GridContainerMenu> {
@Override
public boolean test(GridContainer containerGrid) {
public boolean test(GridContainerMenu containerGrid) {
return containerGrid.getGrid().getGridType() == GridType.CRAFTING;
}
}
public static class GetGridStartFunction implements Function<GridContainer, Integer> {
public static class GetGridStartFunction implements Function<GridContainerMenu, Integer> {
@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;

20
src/main/java/com/refinedmods/refinedstorage/integration/jei/GridRecipeTransferHandler.java
View File

@@ -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<GridContainer, Object> {
public class GridRecipeTransferHandler implements IRecipeTransferHandler<GridContainerMenu, Object> {
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<GridCon
}
@Override
public Class<GridContainer> getContainerClass() {
return GridContainer.class;
public Class<GridContainerMenu> getContainerClass() {
return GridContainerMenu.class;
}
@Override
@@ -47,7 +47,7 @@ public class GridRecipeTransferHandler implements IRecipeTransferHandler<GridCon
}
@Override
public IRecipeTransferError transferRecipe(@Nonnull GridContainer container, Object recipe, @Nonnull IRecipeLayout recipeLayout, @Nonnull Player player, boolean maxTransfer, boolean doTransfer) {
public IRecipeTransferError transferRecipe(@Nonnull GridContainerMenu container, Object recipe, @Nonnull IRecipeLayout recipeLayout, @Nonnull Player player, boolean maxTransfer, boolean doTransfer) {
if (!(container.getScreenInfoProvider() instanceof GridScreen)) {
return null;
}
@@ -63,7 +63,7 @@ public class GridRecipeTransferHandler implements IRecipeTransferHandler<GridCon
return null;
}
private RecipeTransferCraftingGridError transferRecipeForCraftingGrid(GridContainer container, Object recipe, IRecipeLayout recipeLayout, Player player, boolean doTransfer) {
private RecipeTransferCraftingGridError transferRecipeForCraftingGrid(GridContainerMenu container, Object recipe, IRecipeLayout recipeLayout, Player player, boolean doTransfer) {
IngredientTracker tracker = createTracker(container, recipeLayout, player, doTransfer);
if (doTransfer) {
@@ -88,7 +88,7 @@ public class GridRecipeTransferHandler implements IRecipeTransferHandler<GridCon
return null;
}
private IRecipeTransferError transferRecipeForPatternGrid(GridContainer container, Object recipe, IRecipeLayout recipeLayout, Player player, boolean doTransfer) {
private IRecipeTransferError transferRecipeForPatternGrid(GridContainerMenu container, Object recipe, IRecipeLayout recipeLayout, Player player, boolean doTransfer) {
IngredientTracker tracker = createTracker(container, recipeLayout, player, doTransfer);
if (doTransfer) {
@@ -102,7 +102,7 @@ public class GridRecipeTransferHandler implements IRecipeTransferHandler<GridCon
return null;
}
private IngredientTracker createTracker(GridContainer container, IRecipeLayout recipeLayout, Player player, boolean doTransfer) {
private IngredientTracker createTracker(GridContainerMenu container, IRecipeLayout recipeLayout, Player player, boolean doTransfer) {
IngredientTracker tracker = new IngredientTracker(recipeLayout, doTransfer);
// Using IGridView#getStacks will return a *filtered* list of items in the view,
@@ -145,7 +145,7 @@ public class GridRecipeTransferHandler implements IRecipeTransferHandler<GridCon
return System.currentTimeMillis() - lastTransferTimeMs <= TRANSFER_SCROLLBAR_DELAY_MS;
}
private void moveItems(GridContainer gridContainer, Object recipe, IRecipeLayout recipeLayout, IngredientTracker tracker) {
private void moveItems(GridContainerMenu gridContainer, Object recipe, IRecipeLayout recipeLayout, IngredientTracker tracker) {
this.lastTransferTimeMs = System.currentTimeMillis();
if (gridContainer.getGrid().getGridType() == GridType.PATTERN && !(recipe instanceof CraftingRecipe)) {
@@ -155,7 +155,7 @@ public class GridRecipeTransferHandler implements IRecipeTransferHandler<GridCon
}
}
private void move(GridContainer gridContainer, IRecipeLayout recipeLayout) {
private void move(GridContainerMenu gridContainer, IRecipeLayout recipeLayout) {
RS.NETWORK_HANDLER.sendToServer(new GridTransferMessage(
recipeLayout.getItemStacks().getGuiIngredients(),
gridContainer.slots.stream().filter(s -> s.container instanceof CraftingContainer).collect(Collectors.toList())

6
src/main/java/com/refinedmods/refinedstorage/integration/jei/GuiContainerHandler.java
View File

@@ -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<AbstractContain
}
}
if (screen.getMenu() instanceof BaseContainer) {
for (FluidFilterSlot slot : ((BaseContainer) screen.getMenu()).getFluidSlots()) {
if (screen.getMenu() instanceof BaseContainerMenu) {
for (FluidFilterSlot slot : ((BaseContainerMenu) screen.getMenu()).getFluidSlots()) {
FluidStack fluidInSlot = slot.getFluidInventory().getFluid(slot.getSlotIndex());
if (!fluidInSlot.isEmpty() && RenderUtils.inBounds(slot.x, slot.y, 18, 18, mouseX, mouseY)) {

4
src/main/java/com/refinedmods/refinedstorage/item/FilterItem.java
View File

@@ -4,7 +4,7 @@ import com.refinedmods.refinedstorage.RS;
import com.refinedmods.refinedstorage.RSItems;
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.inventory.fluid.ConfiguredFluidsInFilterItemHandler;
import com.refinedmods.refinedstorage.inventory.item.ConfiguredItemsInFilterItemHandler;
import com.refinedmods.refinedstorage.render.Styles;
@@ -151,7 +151,7 @@ public class FilterItem extends Item {
@Override
public AbstractContainerMenu createMenu(int windowId, Inventory inventory, Player player) {
return new FilterContainer(player, inventory.getSelected(), windowId);
return new FilterContainerMenu(player, inventory.getSelected(), windowId);
}
});
}

14
src/main/java/com/refinedmods/refinedstorage/network/FilterUpdateMessage.java
View File

@@ -1,6 +1,6 @@
package com.refinedmods.refinedstorage.network;
import com.refinedmods.refinedstorage.container.FilterContainer;
import com.refinedmods.refinedstorage.container.FilterContainerMenu;
import com.refinedmods.refinedstorage.item.FilterItem;
import com.refinedmods.refinedstorage.util.PacketBufferUtils;
import net.minecraft.network.FriendlyByteBuf;
@@ -45,13 +45,13 @@ public class FilterUpdateMessage {
public static void handle(FilterUpdateMessage message, Supplier<NetworkEvent.Context> 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);
});
}

6
src/main/java/com/refinedmods/refinedstorage/network/SetFilterSlotMessage.java
View File

@@ -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<ResourceLocation> list = new HashSet<>(((GridNetworkNode) grid).getAllowedTagList().getAllowedItemTags().get(slot.getSlotIndex()));

6
src/main/java/com/refinedmods/refinedstorage/network/SetFluidFilterSlotMessage.java
View File

@@ -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<ResourceLocation> list = new HashSet<>(((GridNetworkNode) grid).getAllowedTagList().getAllowedFluidTags().get(slot.getSlotIndex()));

6
src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/CraftingMonitorCancelMessage.java
View File

@@ -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);
}
});
}

6
src/main/java/com/refinedmods/refinedstorage/network/craftingmonitor/WirelessCraftingMonitorSettingsUpdateMessage.java
View File

@@ -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);
}
});
}

6
src/main/java/com/refinedmods/refinedstorage/network/grid/GridClearMessage.java
View File

@@ -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);
}
});
}

6
src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingPreviewRequestMessage.java
View File

@@ -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) {

6
src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartRequestMessage.java
View File

@@ -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) {

6
src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidInsertHeldMessage.java
View File

@@ -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);

6
src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidPullMessage.java
View File

@@ -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);

6
src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemGridScrollMessage.java
View File

@@ -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<NetworkEvent.Context> 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);

6
src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInsertHeldMessage.java
View File

@@ -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);

6
src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemInventoryScrollMessage.java
View File

@@ -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<NetworkEvent.Context> 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);

6
src/main/java/com/refinedmods/refinedstorage/network/grid/GridItemPullMessage.java
View File

@@ -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);

6
src/main/java/com/refinedmods/refinedstorage/network/grid/GridProcessingTransferMessage.java
View File

@@ -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();

6
src/main/java/com/refinedmods/refinedstorage/network/grid/GridTransferMessage.java
View File

@@ -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);

6
src/main/java/com/refinedmods/refinedstorage/network/grid/PortableGridSettingsUpdateMessage.java
View File

@@ -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();

6
src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessFluidGridSettingsUpdateMessage.java
View File

@@ -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();

6
src/main/java/com/refinedmods/refinedstorage/network/grid/WirelessGridSettingsUpdateMessage.java
View File

@@ -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();

6
src/main/java/com/refinedmods/refinedstorage/network/sync/BlockEntitySynchronizationParamaterUpdateMessage.java
View File

@@ -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);
}
}
});

6
src/main/java/com/refinedmods/refinedstorage/recipe/CoverRecipe.java
View File

@@ -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<ItemStack> 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)) {

11
src/main/java/com/refinedmods/refinedstorage/recipe/HollowCoverRecipe.java
View File

@@ -15,11 +15,10 @@ import net.minecraft.world.level.Level;
import java.util.List;
public class HollowCoverRecipe extends CustomRecipe {
public static RecipeSerializer<HollowCoverRecipe> 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<ItemStack> 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)) {

6
src/main/java/com/refinedmods/refinedstorage/recipe/UpgradeWithEnchantedBookRecipe.java
View File

@@ -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);

4
src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java
View File

@@ -52,8 +52,8 @@ public abstract class BaseScreen<T extends AbstractContainerMenu> 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;

8
src/main/java/com/refinedmods/refinedstorage/screen/ConstructorScreen.java
View File

@@ -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<ConstructorContainer> {
public ConstructorScreen(ConstructorContainer container, Inventory inventory, Component title) {
super(container, 211, 137, inventory, title);
public class ConstructorScreen extends BaseScreen<ConstructorContainerMenu> {
public ConstructorScreen(ConstructorContainerMenu containerMenu, Inventory inventory, Component title) {
super(containerMenu, 211, 137, inventory, title);
}
@Override

8
src/main/java/com/refinedmods/refinedstorage/screen/ControllerScreen.java
View File

@@ -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<ControllerContainer> {
public class ControllerScreen extends BaseScreen<ControllerContainerMenu> {
private static final int VISIBLE_ROWS = 2;
private static final int ENERGY_BAR_X = 8;
@@ -26,8 +26,8 @@ public class ControllerScreen extends BaseScreen<ControllerContainer> {
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);
}

10
src/main/java/com/refinedmods/refinedstorage/screen/CrafterManagerScreen.java
View File

@@ -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<CrafterManagerContainer> implements IScreenInfoProvider {
public class CrafterManagerScreen extends BaseScreen<CrafterManagerContainerMenu> 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

8
src/main/java/com/refinedmods/refinedstorage/screen/CrafterScreen.java
View File

@@ -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<CrafterContainer> {
public CrafterScreen(CrafterContainer container, Inventory inventory, Component title) {
super(container, 211, 137, inventory, title);
public class CrafterScreen extends BaseScreen<CrafterContainerMenu> {
public CrafterScreen(CrafterContainerMenu containerMenu, Inventory inventory, Component title) {
super(containerMenu, 211, 137, inventory, title);
}
@Override

12
src/main/java/com/refinedmods/refinedstorage/screen/CraftingMonitorScreen.java
View File

@@ -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<CraftingMonitorContainer> {
public class CraftingMonitorScreen extends BaseScreen<CraftingMonitorContainerMenu> {
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<CraftingMonitorContainer> tabs;
private final TabListWidget<CraftingMonitorContainerMenu> tabs;
private final IElementDrawers drawers = new CraftingMonitorElementDrawers(this, ITEM_WIDTH, ITEM_HEIGHT);
private Button cancelButton;
private Button cancelAllButton;
private List<IGridTab> 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();

8
src/main/java/com/refinedmods/refinedstorage/screen/DestructorScreen.java
View File

@@ -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<DestructorContainer> {
public DestructorScreen(DestructorContainer container, Inventory playerInventory, Component title) {
super(container, 211, 137, playerInventory, title);
public class DestructorScreen extends BaseScreen<DestructorContainerMenu> {
public DestructorScreen(DestructorContainerMenu containerMenu, Inventory playerInventory, Component title) {
super(containerMenu, 211, 137, playerInventory, title);
}
@Override

Some files were not shown because too many files have changed in this diff Show More