Merge branch 'master' into stack-type-api

This commit is contained in:
Kogepan229 committed 2025-12-21 15:03:03 +09:00
commit 54d41b59a2
7 files changed
+14 -17

No files matched your search

@@ -244,8 +244,7 @@ public class ContainerLevelTerminal extends FCBaseContainer {
}
@Override
public PrimaryGui getPrimaryGui() {
public PrimaryGui createPrimaryGui() {
ContainerOpenContext context = getOpenContext();
return new FluidPrimaryGui(
GuiType.LEVEL_TERMINAL,
@@ -22,8 +22,7 @@ public class ContainerLevelWireless extends ContainerLevelTerminal {
}
@Override
public PrimaryGui getPrimaryGui() {
public PrimaryGui createPrimaryGui() {
ContainerOpenContext context = getOpenContext();
return new FluidPrimaryGui(
GuiType.WIRELESS_LEVEL_TERMINAL,
@@ -172,8 +172,7 @@ public class ContainerSuperStockReplenisher extends AEBaseContainer
}
@Override
public PrimaryGui getPrimaryGui() {
public PrimaryGui createPrimaryGui() {
ContainerOpenContext context = getOpenContext();
return new FluidPrimaryGui(
GuiType.GUI_SUPER_STOCK_REPLENISHER,
@@ -115,7 +115,7 @@ public class CPacketFluidPatternTermBtns implements IMessage {
}
}
case MAGNET_OPEN_FILTER -> {
final PrimaryGui pGui = abc.getPrimaryGui();
final PrimaryGui pGui = abc.createPrimaryGui();
final int nextGui = abc.getSwitchAbleGuiNext();
InventoryHandler.openGui(
@@ -120,7 +120,7 @@ public class CPacketLevelTerminalCommands implements IMessage {
if (Objects.requireNonNull(message.action) == Action.EDIT) {
if (player.openContainer instanceof AEBaseContainer abc) {
final PrimaryGui pGui = abc.getPrimaryGui();
final PrimaryGui pGui = abc.createPrimaryGui();
TileEntity tile = DimensionManager.getWorld(message.dim)
.getTileEntity(message.x, message.y, message.z);
@@ -150,7 +150,7 @@ public class CPacketLevelTerminalCommands implements IMessage {
}
} else if (Objects.requireNonNull(message.action) == Action.RENAME) {
if (player.openContainer instanceof AEBaseContainer abc) {
final PrimaryGui pGui = abc.getPrimaryGui();
final PrimaryGui pGui = abc.createPrimaryGui();
TileEntity tile = DimensionManager.getWorld(message.dim)
.getTileEntity(message.x, message.y, message.z);
@@ -91,7 +91,7 @@ public class CPacketSwitchGuis implements IMessage {
}
} else {
if (cont instanceof AEBaseContainer aeBaseContainer) {
final PrimaryGui pGui = aeBaseContainer.getPrimaryGui();
final PrimaryGui pGui = aeBaseContainer.createPrimaryGui();
ContainerOpenContext context = aeBaseContainer.getOpenContext();
if (context == null) return null;
TileEntity te = context.getTile();