From b18e92d3debb114ae008be1e17f972cbb9c40cdf Mon Sep 17 00:00:00 2001 From: BlayTheNinth <1933180+BlayTheNinth@users.noreply.github.com> Date: Thu, 21 Dec 2023 12:43:35 +0100 Subject: [PATCH] refactor: Rename WaystoneSettingsScreen to WaystoneScreen --- .../mods/waystones/compat/rei/WaystonesOverlayDecider.java | 4 ++-- .../waystones/block/entity/LandingStoneBlockEntity.java | 5 ++--- .../mods/waystones/block/entity/SharestoneBlockEntity.java | 4 ++-- .../mods/waystones/block/entity/WaystoneBlockEntity.java | 4 ++-- .../java/net/blay09/mods/waystones/client/ModScreens.java | 2 +- .../{WaystoneSettingsScreen.java => WaystoneScreen.java} | 6 +++--- .../main/java/net/blay09/mods/waystones/menu/ModMenus.java | 7 +++---- .../menu/{WaystoneSettingsMenu.java => WaystoneMenu.java} | 4 ++-- .../waystones/network/message/EditWaystoneMessage.java | 4 ++-- 9 files changed, 19 insertions(+), 21 deletions(-) rename shared/src/main/java/net/blay09/mods/waystones/client/gui/screen/{WaystoneSettingsScreen.java => WaystoneScreen.java} (95%) rename shared/src/main/java/net/blay09/mods/waystones/menu/{WaystoneSettingsMenu.java => WaystoneMenu.java} (94%) diff --git a/fabric/src/main/java/net/blay09/mods/waystones/compat/rei/WaystonesOverlayDecider.java b/fabric/src/main/java/net/blay09/mods/waystones/compat/rei/WaystonesOverlayDecider.java index 62b4c25f..e53511fd 100644 --- a/fabric/src/main/java/net/blay09/mods/waystones/compat/rei/WaystonesOverlayDecider.java +++ b/fabric/src/main/java/net/blay09/mods/waystones/compat/rei/WaystonesOverlayDecider.java @@ -2,14 +2,14 @@ import me.shedaniel.rei.api.client.registry.screen.OverlayDecider; import net.blay09.mods.waystones.client.gui.screen.WaystoneSelectionScreen; -import net.blay09.mods.waystones.client.gui.screen.WaystoneSettingsScreen; +import net.blay09.mods.waystones.client.gui.screen.WaystoneScreen; import net.minecraft.client.gui.screens.Screen; import net.minecraft.world.InteractionResult; class WaystonesOverlayDecider implements OverlayDecider { @Override public boolean isHandingScreen(Class aClass) { - return WaystoneSelectionScreen.class == aClass || WaystoneSettingsScreen.class == aClass; + return WaystoneSelectionScreen.class == aClass || WaystoneScreen.class == aClass; } @Override diff --git a/shared/src/main/java/net/blay09/mods/waystones/block/entity/LandingStoneBlockEntity.java b/shared/src/main/java/net/blay09/mods/waystones/block/entity/LandingStoneBlockEntity.java index 43a04f81..7d8a4a39 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/block/entity/LandingStoneBlockEntity.java +++ b/shared/src/main/java/net/blay09/mods/waystones/block/entity/LandingStoneBlockEntity.java @@ -4,8 +4,7 @@ import net.blay09.mods.waystones.api.WaystoneTypes; import net.blay09.mods.waystones.core.Waystone; import net.blay09.mods.waystones.core.WaystonePermissionManager; -import net.blay09.mods.waystones.menu.ModMenus; -import net.blay09.mods.waystones.menu.WaystoneSettingsMenu; +import net.blay09.mods.waystones.menu.WaystoneMenu; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; @@ -40,7 +39,7 @@ public Component getDisplayName() { @Override public AbstractContainerMenu createMenu(int windowId, Inventory inventory, Player player) { final var error = WaystonePermissionManager.mayEditWaystone(player, player.level(), getWaystone()); - return new WaystoneSettingsMenu(windowId, getWaystone(), LandingStoneBlockEntity.this, dataAccess, inventory, error.isEmpty()); + return new WaystoneMenu(windowId, getWaystone(), LandingStoneBlockEntity.this, dataAccess, inventory, error.isEmpty()); } @Override diff --git a/shared/src/main/java/net/blay09/mods/waystones/block/entity/SharestoneBlockEntity.java b/shared/src/main/java/net/blay09/mods/waystones/block/entity/SharestoneBlockEntity.java index bed8b31a..4904b13c 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/block/entity/SharestoneBlockEntity.java +++ b/shared/src/main/java/net/blay09/mods/waystones/block/entity/SharestoneBlockEntity.java @@ -7,7 +7,7 @@ import net.blay09.mods.waystones.api.WaystoneTypes; import net.blay09.mods.waystones.menu.ModMenus; import net.blay09.mods.waystones.menu.WaystoneSelectionMenu; -import net.blay09.mods.waystones.menu.WaystoneSettingsMenu; +import net.blay09.mods.waystones.menu.WaystoneMenu; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; @@ -75,7 +75,7 @@ public Component getDisplayName() { @Override public AbstractContainerMenu createMenu(int windowId, Inventory inventory, Player player) { final var error = WaystonePermissionManager.mayEditWaystone(player, player.level(), getWaystone()); - return new WaystoneSettingsMenu(windowId, getWaystone(), SharestoneBlockEntity.this, dataAccess, inventory, error.isEmpty()); + return new WaystoneMenu(windowId, getWaystone(), SharestoneBlockEntity.this, dataAccess, inventory, error.isEmpty()); } @Override diff --git a/shared/src/main/java/net/blay09/mods/waystones/block/entity/WaystoneBlockEntity.java b/shared/src/main/java/net/blay09/mods/waystones/block/entity/WaystoneBlockEntity.java index 0de55c52..3c008ee0 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/block/entity/WaystoneBlockEntity.java +++ b/shared/src/main/java/net/blay09/mods/waystones/block/entity/WaystoneBlockEntity.java @@ -6,7 +6,7 @@ import net.blay09.mods.waystones.core.WaystonePermissionManager; import net.blay09.mods.waystones.menu.ModMenus; import net.blay09.mods.waystones.menu.WaystoneSelectionMenu; -import net.blay09.mods.waystones.menu.WaystoneSettingsMenu; +import net.blay09.mods.waystones.menu.WaystoneMenu; import net.blay09.mods.waystones.core.WarpMode; import net.blay09.mods.waystones.api.WaystoneTypes; import net.minecraft.core.BlockPos; @@ -65,7 +65,7 @@ public Component getDisplayName() { @Override public AbstractContainerMenu createMenu(int windowId, Inventory inventory, Player player) { final var error = WaystonePermissionManager.mayEditWaystone(player, player.level(), getWaystone()); - return new WaystoneSettingsMenu(windowId, getWaystone(), WaystoneBlockEntity.this, dataAccess, inventory, error.isEmpty()); + return new WaystoneMenu(windowId, getWaystone(), WaystoneBlockEntity.this, dataAccess, inventory, error.isEmpty()); } @Override diff --git a/shared/src/main/java/net/blay09/mods/waystones/client/ModScreens.java b/shared/src/main/java/net/blay09/mods/waystones/client/ModScreens.java index 2a91c1cc..f1a47253 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/client/ModScreens.java +++ b/shared/src/main/java/net/blay09/mods/waystones/client/ModScreens.java @@ -13,7 +13,7 @@ public static void initialize(BalmScreens screens) { screens.registerScreen(ModMenus.inventorySelection::get, WaystoneSelectionScreen::new); screens.registerScreen(ModMenus.sharestoneSelection::get, SharestoneSelectionScreen::new); screens.registerScreen(ModMenus.warpPlate::get, WarpPlateScreen::new); - screens.registerScreen(ModMenus.waystoneSettings::get, WaystoneSettingsScreen::new); + screens.registerScreen(ModMenus.waystoneSettings::get, WaystoneScreen::new); screens.registerScreen(ModMenus.adminSelection::get, AdminSelectionScreen::new); } } diff --git a/shared/src/main/java/net/blay09/mods/waystones/client/gui/screen/WaystoneSettingsScreen.java b/shared/src/main/java/net/blay09/mods/waystones/client/gui/screen/WaystoneScreen.java similarity index 95% rename from shared/src/main/java/net/blay09/mods/waystones/client/gui/screen/WaystoneSettingsScreen.java rename to shared/src/main/java/net/blay09/mods/waystones/client/gui/screen/WaystoneScreen.java index 851d2514..ad1901fd 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/client/gui/screen/WaystoneSettingsScreen.java +++ b/shared/src/main/java/net/blay09/mods/waystones/client/gui/screen/WaystoneScreen.java @@ -5,7 +5,7 @@ import net.blay09.mods.waystones.Waystones; import net.blay09.mods.waystones.client.gui.widget.ITooltipProvider; import net.blay09.mods.waystones.client.gui.widget.WaystoneVisbilityButton; -import net.blay09.mods.waystones.menu.WaystoneSettingsMenu; +import net.blay09.mods.waystones.menu.WaystoneMenu; import net.blay09.mods.waystones.network.message.EditWaystoneMessage; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; @@ -24,7 +24,7 @@ import java.util.List; import java.util.Optional; -public class WaystoneSettingsScreen extends AbstractContainerScreen { +public class WaystoneScreen extends AbstractContainerScreen { private static final ResourceLocation WAYSTONE_GUI_TEXTURES = new ResourceLocation(Waystones.MOD_ID, "textures/gui/menu/waystone.png"); @@ -33,7 +33,7 @@ public class WaystoneSettingsScreen extends AbstractContainerScreen> adminSelection; public static DeferredObject> sharestoneSelection; public static DeferredObject> warpPlate; - public static DeferredObject> waystoneSettings; + public static DeferredObject> waystoneSettings; public static void initialize(BalmMenus menus) { waystoneSelection = menus.registerMenu(id("waystone_selection"), (windowId, inventory, buf) -> { @@ -91,14 +90,14 @@ public static void initialize(BalmMenus menus) { return null; }); - waystoneSettings = menus.registerMenu(id("waystone_settings"), (windowId, inv, data) -> { + waystoneSettings = menus.registerMenu(id("waystone"), (windowId, inv, data) -> { final var pos = data.readBlockPos(); final var waystone = Waystone.read(data); final var canEdit = data.readBoolean(); BlockEntity blockEntity = inv.player.level().getBlockEntity(pos); if (blockEntity instanceof WaystoneBlockEntityBase waystoneBlockEntity) { - return new WaystoneSettingsMenu(windowId, waystone, waystoneBlockEntity, waystoneBlockEntity.getContainerData(), inv, canEdit); + return new WaystoneMenu(windowId, waystone, waystoneBlockEntity, waystoneBlockEntity.getContainerData(), inv, canEdit); } return null; diff --git a/shared/src/main/java/net/blay09/mods/waystones/menu/WaystoneSettingsMenu.java b/shared/src/main/java/net/blay09/mods/waystones/menu/WaystoneMenu.java similarity index 94% rename from shared/src/main/java/net/blay09/mods/waystones/menu/WaystoneSettingsMenu.java rename to shared/src/main/java/net/blay09/mods/waystones/menu/WaystoneMenu.java index f39b3a65..2db9910a 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/menu/WaystoneSettingsMenu.java +++ b/shared/src/main/java/net/blay09/mods/waystones/menu/WaystoneMenu.java @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.List; -public class WaystoneSettingsMenu extends AbstractContainerMenu { +public class WaystoneMenu extends AbstractContainerMenu { private final Player player; private final IWaystone waystone; @@ -24,7 +24,7 @@ public class WaystoneSettingsMenu extends AbstractContainerMenu { private final ContainerData containerData; private final boolean canEdit; - public WaystoneSettingsMenu(int windowId, IWaystone waystone, WaystoneBlockEntityBase blockEntity, ContainerData containerData, Inventory playerInventory, boolean canEdit) { + public WaystoneMenu(int windowId, IWaystone waystone, WaystoneBlockEntityBase blockEntity, ContainerData containerData, Inventory playerInventory, boolean canEdit) { super(ModMenus.waystoneSettings.get(), windowId); this.player = playerInventory.player; this.waystone = waystone; diff --git a/shared/src/main/java/net/blay09/mods/waystones/network/message/EditWaystoneMessage.java b/shared/src/main/java/net/blay09/mods/waystones/network/message/EditWaystoneMessage.java index a2ff1ce1..08bd60b1 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/network/message/EditWaystoneMessage.java +++ b/shared/src/main/java/net/blay09/mods/waystones/network/message/EditWaystoneMessage.java @@ -5,7 +5,7 @@ import net.blay09.mods.waystones.api.WaystoneVisibility; import net.blay09.mods.waystones.config.WaystonesConfig; import net.blay09.mods.waystones.core.*; -import net.blay09.mods.waystones.menu.WaystoneSettingsMenu; +import net.blay09.mods.waystones.menu.WaystoneMenu; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.MinecraftServer; @@ -45,7 +45,7 @@ public static void handle(ServerPlayer player, EditWaystoneMessage message) { return; } - if (!(player.containerMenu instanceof WaystoneSettingsMenu settingsMenu)) { + if (!(player.containerMenu instanceof WaystoneMenu settingsMenu)) { return; }