From 18afbe9bb4e7c1faf8749e0b30684cfa69309c70 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 23 Jan 2022 15:34:17 +0700 Subject: [PATCH] Rename screen classes --- src/main/java/ru/dbotthepony/mc/otm/Registry.java | 9 ++++----- .../screen/{CargoCrateScreen.kt => ScreenCargoCrate.kt} | 2 +- .../{MatterScannerScreen.kt => ScreenMatterScanner.kt} | 2 +- .../{PatternStorageScreen.kt => ScreenPatternStorage.kt} | 2 +- .../screen/{PlatePressScreen.kt => ScreenPlatePress.kt} | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/{CargoCrateScreen.kt => ScreenCargoCrate.kt} (92%) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/{MatterScannerScreen.kt => ScreenMatterScanner.kt} (94%) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/{PatternStorageScreen.kt => ScreenPatternStorage.kt} (93%) rename src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/{PlatePressScreen.kt => ScreenPlatePress.kt} (94%) diff --git a/src/main/java/ru/dbotthepony/mc/otm/Registry.java b/src/main/java/ru/dbotthepony/mc/otm/Registry.java index 8e13f86f9..64f7af5e7 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/Registry.java +++ b/src/main/java/ru/dbotthepony/mc/otm/Registry.java @@ -29,7 +29,6 @@ import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; import net.minecraftforge.common.ForgeTier; -import net.minecraftforge.common.Tags; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; @@ -1192,18 +1191,18 @@ public class Registry { MenuScreens.register(BATTERY_BANK, ScreenBatteryBank::new); MenuScreens.register(MATTER_DECOMPOSER, ScreenMatterDecomposer::new); MenuScreens.register(MATTER_CAPACITOR_BANK, ScreenMatterCapacitorBank::new); - MenuScreens.register(PATTERN_STORAGE, PatternStorageScreen::new); - MenuScreens.register(MATTER_SCANNER, MatterScannerScreen::new); + MenuScreens.register(PATTERN_STORAGE, ScreenPatternStorage::new); + MenuScreens.register(MATTER_SCANNER, ScreenMatterScanner::new); MenuScreens.register(MATTER_PANEL, MatterPanelScreen::new); MenuScreens.register(MATTER_REPLICATOR, ScreenMatterReplicator::new); MenuScreens.register(MATTER_BOTTLER, ScreenMatterBottler::new); MenuScreens.register(DRIVE_VIEWER, ScreenDriveViewer::new); - MenuScreens.register(CARGO_CRATE, CargoCrateScreen::new); + MenuScreens.register(CARGO_CRATE, ScreenCargoCrate::new); MenuScreens.register(DRIVE_RACK, ScreenDriveRack::new); MenuScreens.register(ITEM_MONITOR, ScreenItemMonitor::new); MenuScreens.register(ENERGY_COUNTER, ScreenEnergyCounter::new); MenuScreens.register(CHEMICAL_GENERATOR, ScreenChemicalGenerator::new); - MenuScreens.register(PLATE_PRESS, PlatePressScreen::new); + MenuScreens.register(PLATE_PRESS, ScreenPlatePress::new); // OverdriveThatMatters.LOGGER.info("Registered screens"); } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/CargoCrateScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenCargoCrate.kt similarity index 92% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/CargoCrateScreen.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenCargoCrate.kt index fb13a2196..5e643cff4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/CargoCrateScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenCargoCrate.kt @@ -7,7 +7,7 @@ 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 -class CargoCrateScreen(menu: CargoCrateMenu, inventory: Inventory, title: Component) : MatteryScreen(menu, inventory, title) { +class ScreenCargoCrate(menu: CargoCrateMenu, 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/client/screen/MatterScannerScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenMatterScanner.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterScannerScreen.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenMatterScanner.kt index c27f7133e..8e0344e31 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterScannerScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenMatterScanner.kt @@ -9,7 +9,7 @@ import ru.dbotthepony.mc.otm.client.screen.widget.PatternGaugePanel import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel -class MatterScannerScreen(p_97741_: MenuMatterScanner, p_97742_: Inventory, p_97743_: Component) : +class ScreenMatterScanner(p_97741_: MenuMatterScanner, p_97742_: Inventory, p_97743_: Component) : MatteryScreen(p_97741_, p_97742_, p_97743_) { override fun makeMainFrame(): FramePanel { val frame = super.makeMainFrame()!! diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/PatternStorageScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenPatternStorage.kt similarity index 93% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/PatternStorageScreen.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenPatternStorage.kt index e16e6aed5..f6f6577ec 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/PatternStorageScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenPatternStorage.kt @@ -7,7 +7,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel import ru.dbotthepony.mc.otm.client.screen.panels.SlotPanel import ru.dbotthepony.mc.otm.client.screen.widget.PatternGaugePanel -class PatternStorageScreen(p_97741_: MenuPatternStorage, p_97742_: Inventory, p_97743_: Component) : +class ScreenPatternStorage(p_97741_: MenuPatternStorage, p_97742_: Inventory, p_97743_: Component) : MatteryScreen(p_97741_, p_97742_, p_97743_) { override fun makeMainFrame(): FramePanel { val frame = super.makeMainFrame()!! diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/PlatePressScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenPlatePress.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/PlatePressScreen.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenPlatePress.kt index eaf3caada..f4e3d072a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/PlatePressScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenPlatePress.kt @@ -8,7 +8,7 @@ import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel import ru.dbotthepony.mc.otm.menu.MenuPlatePress -class PlatePressScreen(menu: MenuPlatePress, inventory: Inventory, title: Component) : +class ScreenPlatePress(menu: MenuPlatePress, inventory: Inventory, title: Component) : MatteryScreen(menu, inventory, title) { override fun makeMainFrame(): FramePanel { val frame = super.makeMainFrame()!!