DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Rename screen classes

Browse Source
This commit is contained in:
DBotThePony 2022-01-23 15:34:17 +07:00
parent 72aaea3120
commit 18afbe9bb4
Signed by: DBot
GPG Key ID: DCC23B5715498507
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/ru/dbotthepony/mc/otm/Registry.java
View File

@ -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.Material;
import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.level.material.MaterialColor;
import net.minecraftforge.common.ForgeTier; import net.minecraftforge.common.ForgeTier;
import net.minecraftforge.common.Tags;
import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@ -1192,18 +1191,18 @@ public class Registry {
MenuScreens.register(BATTERY_BANK, ScreenBatteryBank::new); MenuScreens.register(BATTERY_BANK, ScreenBatteryBank::new);
MenuScreens.register(MATTER_DECOMPOSER, ScreenMatterDecomposer::new); MenuScreens.register(MATTER_DECOMPOSER, ScreenMatterDecomposer::new);
MenuScreens.register(MATTER_CAPACITOR_BANK, ScreenMatterCapacitorBank::new); MenuScreens.register(MATTER_CAPACITOR_BANK, ScreenMatterCapacitorBank::new);
MenuScreens.register(PATTERN_STORAGE, PatternStorageScreen::new); MenuScreens.register(PATTERN_STORAGE, ScreenPatternStorage::new);
MenuScreens.register(MATTER_SCANNER, MatterScannerScreen::new); MenuScreens.register(MATTER_SCANNER, ScreenMatterScanner::new);
MenuScreens.register(MATTER_PANEL, MatterPanelScreen::new); MenuScreens.register(MATTER_PANEL, MatterPanelScreen::new);
MenuScreens.register(MATTER_REPLICATOR, ScreenMatterReplicator::new); MenuScreens.register(MATTER_REPLICATOR, ScreenMatterReplicator::new);
MenuScreens.register(MATTER_BOTTLER, ScreenMatterBottler::new); MenuScreens.register(MATTER_BOTTLER, ScreenMatterBottler::new);
MenuScreens.register(DRIVE_VIEWER, ScreenDriveViewer::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(DRIVE_RACK, ScreenDriveRack::new);
MenuScreens.register(ITEM_MONITOR, ScreenItemMonitor::new); MenuScreens.register(ITEM_MONITOR, ScreenItemMonitor::new);
MenuScreens.register(ENERGY_COUNTER, ScreenEnergyCounter::new); MenuScreens.register(ENERGY_COUNTER, ScreenEnergyCounter::new);
MenuScreens.register(CHEMICAL_GENERATOR, ScreenChemicalGenerator::new); MenuScreens.register(CHEMICAL_GENERATOR, ScreenChemicalGenerator::new);
MenuScreens.register(PLATE_PRESS, PlatePressScreen::new); MenuScreens.register(PLATE_PRESS, ScreenPlatePress::new);
// OverdriveThatMatters.LOGGER.info("Registered screens"); // OverdriveThatMatters.LOGGER.info("Registered screens");
} }

2
src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/CargoCrateScreen.kt → src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenCargoCrate.kt
View File

@ -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.client.screen.panels.SlotPanel
import ru.dbotthepony.mc.otm.menu.CargoCrateMenu import ru.dbotthepony.mc.otm.menu.CargoCrateMenu
class CargoCrateScreen(menu: CargoCrateMenu, inventory: Inventory, title: Component) : MatteryScreen<CargoCrateMenu>(menu, inventory, title) { class ScreenCargoCrate(menu: CargoCrateMenu, inventory: Inventory, title: Component) : MatteryScreen<CargoCrateMenu>(menu, inventory, title) {
override fun makeMainFrame(): FramePanel { override fun makeMainFrame(): FramePanel {
val frame = FramePanel(this, null, 0f, 0f, INVENTORY_FRAME_WIDTH, 22f + 4f + 6f * 18f, getTitle()) 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) val grid = GridPanel(this, frame, 8f, 18f, 9f * 18f, 6f * 18f, 9, 6)

2
src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterScannerScreen.kt → src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenMatterScanner.kt
View File

@ -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.PowerGaugePanel
import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel 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<MenuMatterScanner>(p_97741_, p_97742_, p_97743_) { MatteryScreen<MenuMatterScanner>(p_97741_, p_97742_, p_97743_) {
override fun makeMainFrame(): FramePanel { override fun makeMainFrame(): FramePanel {
val frame = super.makeMainFrame()!! val frame = super.makeMainFrame()!!

2
src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/PatternStorageScreen.kt → src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenPatternStorage.kt
View File

@ -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.panels.SlotPanel
import ru.dbotthepony.mc.otm.client.screen.widget.PatternGaugePanel 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<MenuPatternStorage>(p_97741_, p_97742_, p_97743_) { MatteryScreen<MenuPatternStorage>(p_97741_, p_97742_, p_97743_) {
override fun makeMainFrame(): FramePanel { override fun makeMainFrame(): FramePanel {
val frame = super.makeMainFrame()!! val frame = super.makeMainFrame()!!

2
src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/PlatePressScreen.kt → src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenPlatePress.kt
View File

@ -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.client.screen.widget.ProgressGaugePanel
import ru.dbotthepony.mc.otm.menu.MenuPlatePress import ru.dbotthepony.mc.otm.menu.MenuPlatePress
class PlatePressScreen(menu: MenuPlatePress, inventory: Inventory, title: Component) : class ScreenPlatePress(menu: MenuPlatePress, inventory: Inventory, title: Component) :
MatteryScreen<MenuPlatePress>(menu, inventory, title) { MatteryScreen<MenuPlatePress>(menu, inventory, title) {
override fun makeMainFrame(): FramePanel { override fun makeMainFrame(): FramePanel {
val frame = super.makeMainFrame()!! val frame = super.makeMainFrame()!!