From dd72e0eb1ad919bfade2c9b6b0d328b7d9f9f3e3 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 23 Jan 2022 15:36:28 +0700 Subject: [PATCH] Rename cargo crate menu --- src/main/java/ru/dbotthepony/mc/otm/Registry.java | 2 +- .../dbotthepony/mc/otm/block/entity/BlockEntityCargoCrate.kt | 4 ++-- .../ru/dbotthepony/mc/otm/client/screen/ScreenCargoCrate.kt | 4 ++-- .../mc/otm/menu/{CargoCrateMenu.kt => MenuCargoCrate.kt} | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename src/main/kotlin/ru/dbotthepony/mc/otm/menu/{CargoCrateMenu.kt => MenuCargoCrate.kt} (95%) diff --git a/src/main/java/ru/dbotthepony/mc/otm/Registry.java b/src/main/java/ru/dbotthepony/mc/otm/Registry.java index 64f7af5e7..f41f5d70c 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/Registry.java +++ b/src/main/java/ru/dbotthepony/mc/otm/Registry.java @@ -1135,7 +1135,7 @@ public class Registry { public static final MenuType MATTER_REPLICATOR = new MenuType<>(MatterReplicatorMenu::new); public static final MenuType MATTER_BOTTLER = new MenuType<>(MenuMatterBottler::new); public static final MenuType DRIVE_VIEWER = new MenuType<>(MenuDriveViewer::new); - public static final MenuType CARGO_CRATE = new MenuType<>(CargoCrateMenu::new); + public static final MenuType CARGO_CRATE = new MenuType<>(MenuCargoCrate::new); public static final MenuType DRIVE_RACK = new MenuType<>(MenuDriveRack::new); public static final MenuType ITEM_MONITOR = new MenuType<>(MenuItemMonitor::new); public static final MenuType ENERGY_COUNTER = new MenuType<>(MenuEnergyCounter::new); diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BlockEntityCargoCrate.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BlockEntityCargoCrate.kt index 03f4937c1..001e7e9ec 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BlockEntityCargoCrate.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BlockEntityCargoCrate.kt @@ -17,7 +17,7 @@ import ru.dbotthepony.mc.otm.Registry import ru.dbotthepony.mc.otm.block.BlockCargoCrate import ru.dbotthepony.mc.otm.container.MatteryContainer import ru.dbotthepony.mc.otm.ifHas -import ru.dbotthepony.mc.otm.menu.CargoCrateMenu +import ru.dbotthepony.mc.otm.menu.MenuCargoCrate import ru.dbotthepony.mc.otm.set class BlockEntityCargoCrate( @@ -72,7 +72,7 @@ class BlockEntityCargoCrate( } override fun createMenu(containerID: Int, inventory: Inventory, ply: Player): AbstractContainerMenu { - return CargoCrateMenu(containerID, inventory, this) + return MenuCargoCrate(containerID, inventory, this) } companion object { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenCargoCrate.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenCargoCrate.kt index 5e643cff4..4e2f6e403 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenCargoCrate.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenCargoCrate.kt @@ -5,9 +5,9 @@ import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel import ru.dbotthepony.mc.otm.client.screen.panels.GridPanel import ru.dbotthepony.mc.otm.client.screen.panels.SlotPanel -import ru.dbotthepony.mc.otm.menu.CargoCrateMenu +import ru.dbotthepony.mc.otm.menu.MenuCargoCrate -class ScreenCargoCrate(menu: CargoCrateMenu, inventory: Inventory, title: Component) : MatteryScreen(menu, inventory, title) { +class ScreenCargoCrate(menu: MenuCargoCrate, inventory: Inventory, title: Component) : MatteryScreen(menu, inventory, title) { override fun makeMainFrame(): FramePanel { val frame = FramePanel(this, null, 0f, 0f, INVENTORY_FRAME_WIDTH, 22f + 4f + 6f * 18f, getTitle()) val grid = GridPanel(this, frame, 8f, 18f, 9f * 18f, 6f * 18f, 9, 6) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/CargoCrateMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MenuCargoCrate.kt similarity index 95% rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/CargoCrateMenu.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/MenuCargoCrate.kt index 5d17f268b..8352d824a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/CargoCrateMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MenuCargoCrate.kt @@ -6,7 +6,7 @@ import net.minecraft.world.entity.player.Player import ru.dbotthepony.mc.otm.Registry import ru.dbotthepony.mc.otm.block.entity.BlockEntityCargoCrate -class CargoCrateMenu @JvmOverloads constructor( +class MenuCargoCrate @JvmOverloads constructor( p_38852_: Int, inventory: Inventory, tile: BlockEntityCargoCrate? = null