From aef92c8ebc3a716c0f8258328c54426b2745ec9e Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Sat, 22 Jun 2024 17:35:13 +0100 Subject: [PATCH] Remove pocket computer GUI Historically we used to have separate menu types for computers and pocket computers, as the screen had to be initialised with the correct terminal size. However, as of c49547b962186f5245a3fec457c8c53a0e8a66c1 (which was admittedly two years ago now), we have the terminal available when constructing the screen, and so the code for the two is identical. This change actually merges the two screens, replacing usages of the pocket computer UI with the computer one. --- .../java/dan200/computercraft/client/ClientRegistry.java | 1 - .../src/main/java/dan200/computercraft/shared/ModRegistry.java | 3 --- .../shared/pocket/inventory/PocketComputerMenuProvider.java | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/projects/common/src/client/java/dan200/computercraft/client/ClientRegistry.java b/projects/common/src/client/java/dan200/computercraft/client/ClientRegistry.java index 5e393cbfa..80bcee397 100644 --- a/projects/common/src/client/java/dan200/computercraft/client/ClientRegistry.java +++ b/projects/common/src/client/java/dan200/computercraft/client/ClientRegistry.java @@ -83,7 +83,6 @@ public final class ClientRegistry { */ public static void registerMainThread(RegisterItemProperty itemProperties) { MenuScreens.>register(ModRegistry.Menus.COMPUTER.get(), ComputerScreen::new); - MenuScreens.>register(ModRegistry.Menus.POCKET_COMPUTER.get(), ComputerScreen::new); MenuScreens.>register(ModRegistry.Menus.POCKET_COMPUTER_NO_TERM.get(), NoTermComputerScreen::new); MenuScreens.register(ModRegistry.Menus.TURTLE.get(), TurtleScreen::new); diff --git a/projects/common/src/main/java/dan200/computercraft/shared/ModRegistry.java b/projects/common/src/main/java/dan200/computercraft/shared/ModRegistry.java index a47d039a0..c780e3173 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/ModRegistry.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/ModRegistry.java @@ -293,9 +293,6 @@ public final class ModRegistry { public static final RegistryEntry> COMPUTER = REGISTRY.register("computer", () -> ContainerData.toType(ComputerContainerData::new, (id, inv, data) -> new ComputerMenuWithoutInventory(Menus.COMPUTER.get(), id, inv, data))); - public static final RegistryEntry> POCKET_COMPUTER = REGISTRY.register("pocket_computer", - () -> ContainerData.toType(ComputerContainerData::new, (id, inv, data) -> new ComputerMenuWithoutInventory(Menus.POCKET_COMPUTER.get(), id, inv, data))); - public static final RegistryEntry> POCKET_COMPUTER_NO_TERM = REGISTRY.register("pocket_computer_no_term", () -> ContainerData.toType(ComputerContainerData::new, (id, inv, data) -> new ComputerMenuWithoutInventory(Menus.POCKET_COMPUTER_NO_TERM.get(), id, inv, data))); diff --git a/projects/common/src/main/java/dan200/computercraft/shared/pocket/inventory/PocketComputerMenuProvider.java b/projects/common/src/main/java/dan200/computercraft/shared/pocket/inventory/PocketComputerMenuProvider.java index 7cd84af52..38aa92d9e 100644 --- a/projects/common/src/main/java/dan200/computercraft/shared/pocket/inventory/PocketComputerMenuProvider.java +++ b/projects/common/src/main/java/dan200/computercraft/shared/pocket/inventory/PocketComputerMenuProvider.java @@ -45,7 +45,7 @@ public class PocketComputerMenuProvider implements MenuProvider { @Override public AbstractContainerMenu createMenu(int id, Inventory inventory, Player entity) { return new ComputerMenuWithoutInventory( - isTypingOnly ? ModRegistry.Menus.POCKET_COMPUTER_NO_TERM.get() : ModRegistry.Menus.POCKET_COMPUTER.get(), id, inventory, + isTypingOnly ? ModRegistry.Menus.POCKET_COMPUTER_NO_TERM.get() : ModRegistry.Menus.COMPUTER.get(), id, inventory, p -> { var stack = p.getItemInHand(hand); return stack.getItem() == item && PocketComputerItem.getServerComputer(assertNonNull(entity.level().getServer()), stack) == computer;