diff --git a/src/main/java/ru/dbotthepony/mc/otm/Registry.java b/src/main/java/ru/dbotthepony/mc/otm/Registry.java index 87b77cf0d..11a7f0533 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/Registry.java +++ b/src/main/java/ru/dbotthepony/mc/otm/Registry.java @@ -1083,7 +1083,7 @@ public class Registry { 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); - public static final MenuType CHEMICAL_GENERATOR = new MenuType<>(MenuCHemicalGenerator::new); + public static final MenuType CHEMICAL_GENERATOR = new MenuType<>(MenuChemicalGenerator::new); public static final MenuType PLATE_PRESS = new MenuType<>(MenuPlatePress::new); static { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BlockEntityChemicalGenerator.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BlockEntityChemicalGenerator.kt index 7a06d6dcc..6f32c69a7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BlockEntityChemicalGenerator.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BlockEntityChemicalGenerator.kt @@ -30,7 +30,7 @@ import ru.dbotthepony.mc.otm.capability.receiveEnergy import ru.dbotthepony.mc.otm.container.MatteryContainer import ru.dbotthepony.mc.otm.core.Fraction import ru.dbotthepony.mc.otm.core.plus -import ru.dbotthepony.mc.otm.menu.MenuCHemicalGenerator +import ru.dbotthepony.mc.otm.menu.MenuChemicalGenerator import java.lang.ref.WeakReference class BlockEntityChemicalGenerator(pos: BlockPos, state: BlockState) : BlockEntityMattery(Registry.BlockEntities.CHEMICAL_GENERATOR, pos, state) { @@ -39,7 +39,7 @@ class BlockEntityChemicalGenerator(pos: BlockPos, state: BlockState) : BlockEnti } override fun createMenu(containerID: Int, inventory: Inventory, ply: Player): AbstractContainerMenu { - return MenuCHemicalGenerator(containerID, inventory, this) + return MenuChemicalGenerator(containerID, inventory, this) } private var valid = true diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenChemicalGenerator.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenChemicalGenerator.kt index 86fef4784..d21db809c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenChemicalGenerator.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ScreenChemicalGenerator.kt @@ -6,9 +6,9 @@ import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel -import ru.dbotthepony.mc.otm.menu.MenuCHemicalGenerator +import ru.dbotthepony.mc.otm.menu.MenuChemicalGenerator -class ScreenChemicalGenerator(menu: MenuCHemicalGenerator, inventory: Inventory, title: Component) : MatteryScreen(menu, inventory, title) { +class ScreenChemicalGenerator(menu: MenuChemicalGenerator, inventory: Inventory, title: Component) : MatteryScreen(menu, inventory, title) { override fun makeMainFrame(): FramePanel { val frame = super.makeMainFrame()!! diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MenuCHemicalGenerator.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MenuChemicalGenerator.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/mc/otm/menu/MenuCHemicalGenerator.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/menu/MenuChemicalGenerator.kt index dc9584ac1..d6efedef3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MenuCHemicalGenerator.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MenuChemicalGenerator.kt @@ -11,7 +11,7 @@ import ru.dbotthepony.mc.otm.menu.data.IntDataContainer import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget -class MenuCHemicalGenerator @JvmOverloads constructor(id: Int, inv: Inventory, tile: BlockEntityChemicalGenerator? = null) +class MenuChemicalGenerator @JvmOverloads constructor(id: Int, inv: Inventory, tile: BlockEntityChemicalGenerator? = null) : MatteryMenu(Registry.Menus.CHEMICAL_GENERATOR, id, inv, tile) { val container = tile?.container ?: SimpleContainer(3)