From 2ba1edf88d971b1fd45da5a8c82a45d609a1294f Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 16 Apr 2023 19:15:04 +0700 Subject: [PATCH] Fix imports --- .../ru/dbotthepony/mc/otm/config/ServerConfig.kt | 16 ---------------- .../ru/dbotthepony/mc/otm/config/ToolsConfig.kt | 2 +- .../ru/dbotthepony/mc/otm/registry/MRegistry.kt | 2 +- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/config/ServerConfig.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/config/ServerConfig.kt index 686a85282..f9d230094 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/config/ServerConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/config/ServerConfig.kt @@ -1,21 +1,5 @@ package ru.dbotthepony.mc.otm.config -import net.minecraftforge.common.ForgeConfigSpec -import net.minecraftforge.fml.ModLoadingContext -import net.minecraftforge.fml.config.ModConfig -import ru.dbotthepony.mc.otm.block.entity.tech.AndroidStationBlockEntity -import ru.dbotthepony.mc.otm.block.entity.tech.ChemicalGeneratorBlockEntity -import ru.dbotthepony.mc.otm.block.entity.matter.MatterBottlerBlockEntity -import ru.dbotthepony.mc.otm.block.entity.matter.MatterDecomposerBlockEntity -import ru.dbotthepony.mc.otm.block.entity.matter.MatterRecyclerBlockEntity -import ru.dbotthepony.mc.otm.block.entity.matter.MatterReplicatorBlockEntity -import ru.dbotthepony.mc.otm.block.entity.matter.MatterScannerBlockEntity -import ru.dbotthepony.mc.otm.capability.energy.BlockEnergyStorageImpl -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.defineDecimal -import ru.dbotthepony.mc.otm.item.EnergySwordItem -import ru.dbotthepony.mc.otm.registry.MNames - object ServerConfig : AbstractConfig("misc") { val LABORATORY_LAMP_LIGHT_LENGTH: Int by builder.comment("In blocks").defineInRange("LABORATORY_LAMP_LIGHT_LENGTH", 6, 1, 128) val INFINITE_EXOSUIT_UPGRADES: Boolean by builder.comment("Allows to apply the same upgrade over and over again.", "Obviously completely breaks balance.").define("INFINITE_EXOSUIT_UPGRADES", false) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/config/ToolsConfig.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/config/ToolsConfig.kt index 400405afb..4a23f9c26 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/config/ToolsConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/config/ToolsConfig.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.mc.otm.config -import ru.dbotthepony.mc.otm.item.EnergySwordItem +import ru.dbotthepony.mc.otm.item.tool.EnergySwordItem object ToolsConfig : AbstractConfig("tools") { val AXES_BREAK_LEAVES_INSTANTLY: Boolean by builder.define("AXES_BREAK_LEAVES_INSTANTLY", true) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt index 5071cb617..50af44563 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt @@ -28,7 +28,7 @@ import ru.dbotthepony.mc.otm.block.decorative.CargoCrateBlock import ru.dbotthepony.mc.otm.block.decorative.TritaniumPressurePlate import ru.dbotthepony.mc.otm.capability.matteryEnergy import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.item.EnergySwordItem +import ru.dbotthepony.mc.otm.item.tool.EnergySwordItem import ru.dbotthepony.mc.otm.registry.objects.ColoredDecorativeBlock import ru.dbotthepony.mc.otm.registry.objects.CrateProperties import ru.dbotthepony.mc.otm.registry.objects.DecorativeBlock