refactor: Rename WaystoneSettingsScreen to WaystoneScreen

TwelveIterationMods · Dec 21, 2023 · b18e92d · b18e92d
1 parent 451e34f
commit b18e92d
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 21 deletions.
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
@@ -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 <R extends Screen> boolean isHandingScreen(Class<R> 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
@@ -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
@@ -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
@@ -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
@@ -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/...nt/gui/screen/WaystoneSettingsScreen.java → ...nes/client/gui/screen/WaystoneScreen.java b/...nt/gui/screen/WaystoneSettingsScreen.java → ...nes/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<WaystoneSettingsMenu> {
+public class WaystoneScreen extends AbstractContainerScreen<WaystoneMenu> {
 
     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<WaystoneSett
     private EditBox textField;
     private WaystoneVisbilityButton visibilityButton;
 
-    public WaystoneSettingsScreen(WaystoneSettingsMenu container, Inventory playerInventory, Component title) {
+    public WaystoneScreen(WaystoneMenu container, Inventory playerInventory, Component title) {
         super(container, playerInventory, title);
         imageHeight = 196;
         inventoryLabelY = 93;

diff --git a/shared/src/main/java/net/blay09/mods/waystones/menu/ModMenus.java b/shared/src/main/java/net/blay09/mods/waystones/menu/ModMenus.java
@@ -9,7 +9,6 @@
 import net.blay09.mods.waystones.block.entity.WaystoneBlockEntityBase;
 import net.blay09.mods.waystones.core.WarpMode;
 import net.blay09.mods.waystones.core.Waystone;
-import net.blay09.mods.waystones.core.WaystonePermissionManager;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.inventory.MenuType;
@@ -25,7 +24,7 @@ public class ModMenus {
     public static DeferredObject<MenuType<WaystoneSelectionMenu>> adminSelection;
     public static DeferredObject<MenuType<WaystoneSelectionMenu>> sharestoneSelection;
     public static DeferredObject<MenuType<WarpPlateMenu>> warpPlate;
-    public static DeferredObject<MenuType<WaystoneSettingsMenu>> waystoneSettings;
+    public static DeferredObject<MenuType<WaystoneMenu>> 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/.../waystones/menu/WaystoneSettingsMenu.java → ...y09/mods/waystones/menu/WaystoneMenu.java b/.../waystones/menu/WaystoneSettingsMenu.java → ...y09/mods/waystones/menu/WaystoneMenu.java
@@ -16,15 +16,15 @@
 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;
     private final WaystoneBlockEntityBase blockEntity;
     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
@@ -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;
         }