From f902d466b3b56bee0857f49d53e1d81b3b2f185a Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Thu, 1 Sep 2022 20:56:33 +0700 Subject: [PATCH] Move extension functions around --- .../ru/dbotthepony/mc/otm/datagen/DataGen.kt | 2 +- .../blocks/MatteryBlockStateProvider.kt | 2 +- .../datagen/items/MatteryItemModelProvider.kt | 2 +- .../otm/datagen/models/MatteryModelBuilder.kt | 2 +- .../datagen/models/MatteryModelProvider.kt | 2 +- .../datagen/recipes/CraftingTableRecipes.kt | 4 +- .../mc/otm/datagen/recipes/MatteryRecipe.kt | 2 +- .../recipes/PlatePressFinishedRecipe.kt | 2 +- .../mc/otm/capability/matter/MatterTask.java | 3 +- .../otm/capability/matter/PatternState.java | 3 +- .../otm/client/screen/MatterPanelScreen.java | 4 +- src/main/kotlin/ru/dbotthepony/mc/otm/Ext.kt | 233 ------------------ .../mc/otm/android/AndroidFeature.kt | 6 +- .../mc/otm/android/AndroidFeatureType.kt | 2 +- .../mc/otm/android/AndroidResearch.kt | 6 +- .../mc/otm/android/AndroidResearchBuilder.kt | 8 +- .../mc/otm/android/AndroidResearchType.kt | 4 +- .../mc/otm/android/feature/NanobotsArmor.kt | 2 +- .../android/feature/NanobotsRegeneration.kt | 2 +- .../mc/otm/block/AndroidStationBlock.kt | 2 +- .../block/entity/AndroidStationBlockEntity.kt | 2 +- .../block/entity/BatteryBankBlockEntity.kt | 2 +- .../otm/block/entity/CargoCrateBlockEntity.kt | 5 +- .../entity/ChemicalGeneratorBlockEntity.kt | 3 +- .../block/entity/EnergyCounterBlockEntity.kt | 2 +- .../GravitationStabilizerBlockEntity.kt | 2 +- .../mc/otm/block/entity/MatteryBlockEntity.kt | 4 +- .../block/entity/MatteryPoweredBlockEntity.kt | 7 +- .../block/entity/MatteryWorkerBlockEntity.kt | 4 +- .../block/entity/PatternStorageBlockEntity.kt | 6 +- .../otm/block/entity/PlatePressBlockEntity.kt | 4 +- .../mc/otm/block/entity/RedstoneSetting.kt | 2 +- .../entity/blackhole/BlackHoleBlockEntity.kt | 2 +- .../otm/block/entity/blackhole/Explosions.kt | 2 +- .../entity/matter/MatterBottlerBlockEntity.kt | 8 +- .../matter/MatterCapacitorBankBlockEntity.kt | 4 +- .../matter/MatterDecomposerBlockEntity.kt | 5 +- .../entity/matter/MatterPanelBlockEntity.kt | 2 +- .../matter/MatterRecyclerBlockEntity.kt | 6 +- .../matter/MatterReplicatorBlockEntity.kt | 6 +- .../entity/matter/MatterScannerBlockEntity.kt | 3 +- .../entity/storage/DriveRackBlockEntity.kt | 6 +- .../entity/storage/DriveViewerBlockEntity.kt | 4 +- .../entity/storage/ItemMonitorBlockEntity.kt | 9 +- .../entity/storage/StorageBusBlockEntity.kt | 5 +- .../block/entity/storage/StorageInterfaces.kt | 3 +- .../StoragePowerSupplierBlockEntity.kt | 4 +- .../mc/otm/block/storage/StorageBusBlock.kt | 2 +- .../mc/otm/block/storage/StorageInterfaces.kt | 2 +- .../mc/otm/capability/EnergyStorageImpl.kt | 7 +- .../ru/dbotthepony/mc/otm/capability/Ext.kt | 2 +- .../otm/capability/MatteryPlayerCapability.kt | 3 +- .../capability/drive/AbstractMatteryDrive.kt | 8 +- .../otm/capability/drive/ItemMatteryDrive.kt | 4 +- .../capability/matter/MatterHandlerImpl.kt | 2 +- .../dbotthepony/mc/otm/client/MatteryGUI.kt | 5 +- .../render/blockentity/BlackHoleRenderer.kt | 2 +- .../blockentity/EnergyCounterRenderer.kt | 2 +- .../GravitationStabilizerRenderer.kt | 2 +- .../otm/client/screen/AndroidStationScreen.kt | 4 +- .../client/screen/ChemicalGeneratorScreen.kt | 3 +- .../mc/otm/client/screen/DriveViewerScreen.kt | 2 +- .../otm/client/screen/EnergyCounterScreen.kt | 2 +- .../client/screen/ExoSuitInventoryScreen.kt | 3 +- .../mc/otm/client/screen/ItemMonitorScreen.kt | 2 +- .../otm/client/screen/MatterBottlerScreen.kt | 2 +- .../mc/otm/client/screen/StorageBusScreen.kt | 3 +- .../client/screen/StorageExporterScreen.kt | 3 +- .../client/screen/StorageImporterScreen.kt | 3 +- .../screen/StoragePowerSupplierScreen.kt | 3 +- .../otm/client/screen/panels/ButtonPanel.kt | 6 +- .../otm/client/screen/panels/EditBoxPanel.kt | 2 +- .../mc/otm/client/screen/panels/Label.kt | 2 +- .../client/screen/panels/NumberInputPanel.kt | 2 +- .../mc/otm/client/screen/widget/Gauges.kt | 2 +- .../mc/otm/compat/mekanism/Tooltips.kt | 2 +- .../mc/otm/container/ItemFilter.kt | 4 +- .../dbotthepony/mc/otm/container/Iterators.kt | 2 +- .../mc/otm/container/MatteryContainer.kt | 6 +- .../mc/otm/core/CompoundTagDelegates.kt | 78 ++++++ .../dbotthepony/mc/otm/core/CompoundTagExt.kt | 61 +++++ .../ru/dbotthepony/mc/otm/core/EuclidMath.kt | 23 ++ .../kotlin/ru/dbotthepony/mc/otm/core/Ext.kt | 122 ++++++--- .../ru/dbotthepony/mc/otm/core/Formatting.kt | 2 - .../mc/otm/{ => core}/FriendlyStreams.kt | 2 +- .../mc/otm/core/ImpreciseFraction.kt | 11 +- .../mc/otm/{ => core}/UnOverengineering.kt | 2 +- .../mc/otm/data/LootTableAppender.kt | 2 +- .../otm/graph/storage/StorageNetworkGraph.kt | 2 +- .../ru/dbotthepony/mc/otm/item/BatteryItem.kt | 4 +- .../mc/otm/item/EnergySwordItem.kt | 3 +- .../mc/otm/item/ExoSuitProbeItem.kt | 2 +- .../mc/otm/item/GravitationalDisruptorItem.kt | 2 +- .../mc/otm/item/MatterCapacitorItem.kt | 2 +- .../dbotthepony/mc/otm/item/MatterDustItem.kt | 4 +- .../mc/otm/item/PatternStorageItem.kt | 4 +- .../ru/dbotthepony/mc/otm/item/PillItem.kt | 2 +- .../otm/item/PortableCondensationDriveItem.kt | 6 +- .../item/PortableGravitationStabilizerItem.kt | 2 +- .../mc/otm/item/QuantumBatteryItem.kt | 8 +- .../mc/otm/item/weapon/PlasmaRifleItem.kt | 2 +- .../mc/otm/item/weapon/PlasmaWeaponItem.kt | 5 +- .../mc/otm/matter/MatterRegistry.kt | 3 - .../mc/otm/menu/BatteryBankMenu.kt | 4 +- .../dbotthepony/mc/otm/menu/CargoCrateMenu.kt | 2 +- .../dbotthepony/mc/otm/menu/DriveRackMenu.kt | 2 +- .../mc/otm/menu/DriveViewerMenu.kt | 2 +- .../mc/otm/menu/ItemMonitorMenu.kt | 2 +- .../mc/otm/menu/MatterBottlerMenu.kt | 4 +- .../mc/otm/menu/MatterCapacitorBankMenu.kt | 2 +- .../mc/otm/menu/MatterDecomposerMenu.kt | 2 +- .../mc/otm/menu/MatterReplicatorMenu.kt | 2 +- .../mc/otm/menu/PatternStorageMenu.kt | 2 +- .../ru/dbotthepony/mc/otm/menu/Slots.kt | 2 +- .../mc/otm/menu/data/NetworkedItemView.kt | 2 +- .../mc/otm/network/FieldSynchronizer.kt | 7 +- .../ru/dbotthepony/mc/otm/recipe/Helpers.kt | 4 +- .../mc/otm/recipe/PlatePressRecipe.kt | 5 +- .../mc/otm/registry/AndroidResearch.kt | 4 +- .../mc/otm/registry/DamageSources.kt | 2 +- .../ru/dbotthepony/mc/otm/registry/MItems.kt | 2 +- .../mc/otm/saveddata/SavedCountingMap.kt | 2 +- .../mc/otm/storage/ItemStackWrapper.kt | 5 +- .../mc/otm/tests/FriendlyStreams.kt | 8 +- 124 files changed, 437 insertions(+), 488 deletions(-) delete mode 100644 src/main/kotlin/ru/dbotthepony/mc/otm/Ext.kt create mode 100644 src/main/kotlin/ru/dbotthepony/mc/otm/core/CompoundTagDelegates.kt create mode 100644 src/main/kotlin/ru/dbotthepony/mc/otm/core/CompoundTagExt.kt rename src/main/kotlin/ru/dbotthepony/mc/otm/{ => core}/FriendlyStreams.kt (99%) rename src/main/kotlin/ru/dbotthepony/mc/otm/{ => core}/UnOverengineering.kt (96%) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt index 6e251e9bf..10e63ae72 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt @@ -30,7 +30,7 @@ import ru.dbotthepony.mc.otm.datagen.models.BlockMatteryModelProvider import ru.dbotthepony.mc.otm.datagen.recipes.MatteryRecipeProvider import ru.dbotthepony.mc.otm.datagen.recipes.has import ru.dbotthepony.mc.otm.registry.* -import ru.dbotthepony.mc.otm.* +import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.datagen.lang.MatteryLanguageProvider import ru.dbotthepony.mc.otm.datagen.loot.addLootModifiers import ru.dbotthepony.mc.otm.datagen.recipes.addCraftingTableRecipes diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/MatteryBlockStateProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/MatteryBlockStateProvider.kt index 0d5458351..4857cc46b 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/MatteryBlockStateProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/MatteryBlockStateProvider.kt @@ -12,7 +12,7 @@ import ru.dbotthepony.mc.otm.datagen.DataGen import ru.dbotthepony.mc.otm.datagen.getValueNullable import ru.dbotthepony.mc.otm.datagen.toXRotBlockstate import ru.dbotthepony.mc.otm.datagen.toYRotBlockstate -import ru.dbotthepony.mc.otm.registryName +import ru.dbotthepony.mc.otm.core.registryName typealias AdvancedBlockStateFunction = (BlockState, ConfiguredModel.Builder<*>, String) -> String? private data class AdvancedBlockStateEntry(val block: Block, val func: AdvancedBlockStateFunction) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/MatteryItemModelProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/MatteryItemModelProvider.kt index 5962da99c..88fc2ec00 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/MatteryItemModelProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/MatteryItemModelProvider.kt @@ -6,7 +6,7 @@ import net.minecraftforge.client.model.generators.ItemModelProvider import net.minecraftforge.data.event.GatherDataEvent import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.datagen.DataGen -import ru.dbotthepony.mc.otm.registryName +import ru.dbotthepony.mc.otm.core.registryName private data class SimpleItemModel(val item: String, val path: ResourceLocation) { val traceback = IllegalArgumentException("Failed to register model") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelBuilder.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelBuilder.kt index f61057840..6fa6c91d5 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelBuilder.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelBuilder.kt @@ -9,7 +9,7 @@ import net.minecraft.core.Direction import net.minecraft.resources.ResourceLocation import net.minecraftforge.client.model.generators.ModelBuilder import net.minecraftforge.common.data.ExistingFileHelper -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set data class TextureSize(val width: Float, val height: Float) { constructor(arr: JsonArray) : this(arr[0].asFloat, arr[1].asFloat) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt index cf68574cb..c87fc106d 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt @@ -8,7 +8,7 @@ import net.minecraft.world.level.block.Block import net.minecraftforge.client.model.generators.ModelProvider import net.minecraftforge.data.event.GatherDataEvent import ru.dbotthepony.mc.otm.datagen.DataGen -import ru.dbotthepony.mc.otm.registryName +import ru.dbotthepony.mc.otm.core.registryName private typealias Callback = (MatteryModelProvider) -> Unit diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt index 36d922695..7fc4d0d44 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt @@ -4,8 +4,6 @@ import net.minecraft.data.recipes.FinishedRecipe import net.minecraft.data.recipes.ShapedRecipeBuilder import net.minecraft.data.recipes.ShapelessRecipeBuilder import net.minecraft.resources.ResourceLocation -import net.minecraft.tags.TagKey -import net.minecraft.world.item.Item import net.minecraft.world.item.Items import net.minecraft.world.item.crafting.Ingredient import net.minecraftforge.common.Tags @@ -15,7 +13,7 @@ import ru.dbotthepony.mc.otm.registry.MBlocks import ru.dbotthepony.mc.otm.registry.MItemTags import ru.dbotthepony.mc.otm.registry.MItems import ru.dbotthepony.mc.otm.registry.MRegistry -import ru.dbotthepony.mc.otm.registryName +import ru.dbotthepony.mc.otm.core.registryName import java.util.function.Consumer fun addCraftingTableRecipes(consumer: Consumer) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipe.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipe.kt index bf112878b..898f2760b 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipe.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipe.kt @@ -11,7 +11,7 @@ import net.minecraft.world.item.Item import net.minecraft.world.item.crafting.Ingredient import net.minecraft.world.level.ItemLike import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.registryName +import ru.dbotthepony.mc.otm.core.registryName import java.util.function.Consumer private interface RecipeCell { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressFinishedRecipe.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressFinishedRecipe.kt index d6b85c78f..89e9017b7 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressFinishedRecipe.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PlatePressFinishedRecipe.kt @@ -7,7 +7,7 @@ import net.minecraft.resources.ResourceLocation import net.minecraft.world.item.crafting.RecipeSerializer import ru.dbotthepony.mc.otm.recipe.PlatePressRecipe import ru.dbotthepony.mc.otm.recipe.PlatePressRecipeFactory -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set class PlatePressFinishedRecipe(private val recipe: PlatePressRecipe) : FinishedRecipe { override fun serializeRecipeData(it: JsonObject) { diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterTask.java b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterTask.java index 75f4b0f14..d42f81cae 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterTask.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterTask.java @@ -10,8 +10,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ForgeRegistry; -import net.minecraftforge.registries.RegistryManager; -import ru.dbotthepony.mc.otm.UnOverengineeringKt; +import ru.dbotthepony.mc.otm.core.UnOverengineeringKt; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/matter/PatternState.java b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/PatternState.java index 7cdf85a33..cb3d3b889 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/matter/PatternState.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/PatternState.java @@ -8,8 +8,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ForgeRegistry; -import net.minecraftforge.registries.RegistryManager; -import ru.dbotthepony.mc.otm.UnOverengineeringKt; +import ru.dbotthepony.mc.otm.core.UnOverengineeringKt; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.java index 5ac14491d..a6cbc3309 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.java @@ -17,8 +17,8 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -import static ru.dbotthepony.mc.otm.UnOverengineeringKt.TextComponent; -import static ru.dbotthepony.mc.otm.UnOverengineeringKt.TranslatableComponent; +import static ru.dbotthepony.mc.otm.core.UnOverengineeringKt.TextComponent; +import static ru.dbotthepony.mc.otm.core.UnOverengineeringKt.TranslatableComponent; public class MatterPanelScreen extends MatteryScreen { private static final int MODAL_WIDTH = 213; diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/Ext.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/Ext.kt deleted file mode 100644 index e71a7cbed..000000000 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/Ext.kt +++ /dev/null @@ -1,233 +0,0 @@ - -@file:Suppress("unused") - -package ru.dbotthepony.mc.otm - -import com.google.common.collect.ImmutableList -import com.google.gson.JsonElement -import com.google.gson.JsonObject -import net.minecraft.core.BlockPos -import net.minecraft.core.Direction -import net.minecraft.core.Vec3i -import net.minecraft.nbt.CompoundTag -import net.minecraft.nbt.LongArrayTag -import net.minecraft.nbt.Tag -import net.minecraft.world.Container -import net.minecraft.world.entity.Entity -import net.minecraft.world.item.ItemStack -import net.minecraft.world.phys.Vec3 -import net.minecraftforge.common.util.LazyOptional -import net.minecraftforge.items.IItemHandler -import java.util.* -import kotlin.properties.ReadWriteProperty -import kotlin.reflect.KProperty - -operator fun Direction.unaryMinus(): Direction = this.opposite -operator fun Vec3i.unaryMinus(): Vec3i = Vec3i(-x, -y, -z) -operator fun BlockPos.unaryMinus(): BlockPos = BlockPos(-x, -y, -z) - -operator fun CompoundTag.set(index: String, value: Tag) = put(index, value) -operator fun CompoundTag.set(index: String, value: Int) = putInt(index, value) -operator fun CompoundTag.set(index: String, value: Byte) = putByte(index, value) -operator fun CompoundTag.set(index: String, value: Short) = putShort(index, value) -operator fun CompoundTag.set(index: String, value: Long) = putLong(index, value) -operator fun CompoundTag.set(index: String, value: Float) = putFloat(index, value) -operator fun CompoundTag.set(index: String, value: Double) = putDouble(index, value) -operator fun CompoundTag.set(index: String, value: String) = putString(index, value) -operator fun CompoundTag.set(index: String, value: Boolean) = putBoolean(index, value) -operator fun CompoundTag.set(index: String, value: ByteArray) = putByteArray(index, value) -operator fun CompoundTag.set(index: String, value: IntArray) = putIntArray(index, value) -operator fun CompoundTag.set(index: String, value: LongArray) = putLongArray(index, value) - -@JvmInline -value class CompoundTagInt(val tag: CompoundTag) : ReadWriteProperty { - override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getInt(property.name) - override fun setValue(thisRef: Any, property: KProperty<*>, value: Int) = tag.putInt(property.name, value) -} - -@JvmInline -value class CompoundTagLong(val tag: CompoundTag) : ReadWriteProperty { - override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getLong(property.name) - override fun setValue(thisRef: Any, property: KProperty<*>, value: Long) = tag.putLong(property.name, value) -} - -@JvmInline -value class CompoundTagByte(val tag: CompoundTag) : ReadWriteProperty { - override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getByte(property.name) - override fun setValue(thisRef: Any, property: KProperty<*>, value: Byte) = tag.putByte(property.name, value) -} - -@JvmInline -value class CompoundTagShort(val tag: CompoundTag) : ReadWriteProperty { - override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getShort(property.name) - override fun setValue(thisRef: Any, property: KProperty<*>, value: Short) = tag.putShort(property.name, value) -} - -@JvmInline -value class CompoundTagFloat(val tag: CompoundTag) : ReadWriteProperty { - override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getFloat(property.name) - override fun setValue(thisRef: Any, property: KProperty<*>, value: Float) = tag.putFloat(property.name, value) -} - -@JvmInline -value class CompoundTagBoolean(val tag: CompoundTag) : ReadWriteProperty { - override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getBoolean(property.name) - override fun setValue(thisRef: Any, property: KProperty<*>, value: Boolean) = tag.putBoolean(property.name, value) -} - -@JvmInline -value class CompoundTagDouble(val tag: CompoundTag) : ReadWriteProperty { - override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getDouble(property.name) - override fun setValue(thisRef: Any, property: KProperty<*>, value: Double) = tag.putDouble(property.name, value) -} - -@JvmInline -value class CompoundTagString(val tag: CompoundTag) : ReadWriteProperty { - override fun getValue(thisRef: Any, property: KProperty<*>): String = tag.getString(property.name) - override fun setValue(thisRef: Any, property: KProperty<*>, value: String) = tag.putString(property.name, value) -} - -val EMPTY_UUID = UUID(0L, 0L) - -@JvmInline -value class CompoundTagUUID(val tag: CompoundTag) : ReadWriteProperty { - override fun getValue(thisRef: Any, property: KProperty<*>) = (tag.get(property.name) as LongArrayTag?)?.asLongArray?.let { UUID(it[0], it[1]) } ?: EMPTY_UUID - override fun setValue(thisRef: Any, property: KProperty<*>, value: UUID) = tag.putLongArray(property.name, longArrayOf(value.mostSignificantBits, value.leastSignificantBits)) -} - -val CompoundTag.ints get() = CompoundTagInt(this) -val CompoundTag.longs get() = CompoundTagLong(this) -val CompoundTag.bytes get() = CompoundTagByte(this) -val CompoundTag.shorts get() = CompoundTagShort(this) -val CompoundTag.floats get() = CompoundTagFloat(this) -val CompoundTag.doubles get() = CompoundTagDouble(this) -val CompoundTag.booleans get() = CompoundTagBoolean(this) -val CompoundTag.strings get() = CompoundTagString(this) -val CompoundTag.uuids get() = CompoundTagUUID(this) - -operator fun Container.set(index: Int, value: ItemStack) = setItem(index, value) -operator fun Container.get(index: Int): ItemStack = getItem(index) -operator fun IItemHandler.get(index: Int): ItemStack = getStackInSlot(index) - -operator fun JsonObject.set(s: String, value: JsonElement) = add(s, value) - -inline fun CompoundTag.map(s: String, consumer: (T) -> R): R? { - val tag = get(s) - - if (tag is T) { - return consumer(tag) - } - - return null -} - -inline fun CompoundTag.ifCompound(s: String, consumer: (CompoundTag) -> T): T? { - val tag = get(s) - - if (tag is CompoundTag) { - return consumer(tag) - } - - return null -} - -inline fun CompoundTag.ifHas(s: String, consumer: (Tag) -> Unit) { - val tag = get(s) - - if (tag != null) { - consumer(tag) - } -} - -inline fun CompoundTag.ifHas(s: String, type: Byte, consumer: (Tag) -> Unit) { - val tag = get(s) - - if (tag != null && tag.id == type) { - consumer(tag) - } -} - -inline fun CompoundTag.ifHas(s: String, type: Class, consumer: (T) -> Unit) { - val tag = get(s) - - if (tag != null && tag::class.java === type) { - consumer(tag as T) - } -} - -fun LazyOptional.orNull(): T? { - if (!isPresent) { - return null - } - - return resolve().orElse(null) -} - -fun LazyOptional.orThrow(): T { - if (!isPresent) { - throw IllegalStateException("Capability was expected to be not null") - } - - return resolve().orElse(null) ?: throw IllegalStateException("Capability was expected to be not null") -} - -inline fun LazyOptional.ifPresentK(lambda: (T) -> Unit) { - if (isPresent) { - val value = resolve().orElse(null) ?: throw IllegalStateException("Capability was expected to be not null") - lambda.invoke(value) - } -} - -val ItemStack.tagNotNull: CompoundTag get() = orCreateTag - -inline var Entity.position: Vec3 - get() = position() - set(value) { setPos(value) } - -inline val > T.next: T get() { - val values = enumValues() - val next = (ordinal + 1) % values.size - return values[next] -} - -inline val > T.prev: T get() { - val values = enumValues() - var next = ordinal - 1 - - if (next < 0) { - next = values.size - 1 - } - - return values[next] -} - -fun > T.next(values: Array): T { - val next = (ordinal + 1) % values.size - return values[next] -} - -fun > T.prev(values: Array): T { - var next = ordinal - 1 - - if (next < 0) { - next = values.size - 1 - } - - return values[next] -} - -inline fun ImmutableList(size: Int, initializer: (index: Int) -> T): ImmutableList { - require(size >= 0) { "Invalid list size $size" } - - return when (size) { - 0 -> ImmutableList.of() - 1 -> ImmutableList.of(initializer(0)) - else -> ImmutableList.Builder().let { - for (i in 0 until size) { - it.add(initializer(i)) - } - - it.build() - } - } -} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeature.kt index 28bc2521b..8d2995144 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeature.kt @@ -4,9 +4,9 @@ import net.minecraft.nbt.CompoundTag import net.minecraftforge.common.util.INBTSerializable import net.minecraftforge.event.entity.living.LivingHurtEvent import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability -import ru.dbotthepony.mc.otm.readNbt -import ru.dbotthepony.mc.otm.set -import ru.dbotthepony.mc.otm.writeNbt +import ru.dbotthepony.mc.otm.core.readNbt +import ru.dbotthepony.mc.otm.core.set +import ru.dbotthepony.mc.otm.core.writeNbt import java.io.InputStream import java.io.OutputStream diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeatureType.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeatureType.kt index f2e501014..c4630ae21 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeatureType.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidFeatureType.kt @@ -5,7 +5,7 @@ import net.minecraft.network.chat.ComponentContents import net.minecraft.network.chat.MutableComponent import net.minecraft.network.chat.contents.TranslatableContents import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability -import ru.dbotthepony.mc.otm.getKeyNullable +import ru.dbotthepony.mc.otm.core.getKeyNullable import ru.dbotthepony.mc.otm.registry.MRegistry open class AndroidFeatureType { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearch.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearch.kt index 97860c3dc..877147834 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearch.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearch.kt @@ -7,9 +7,9 @@ import net.minecraft.world.item.ItemStack import net.minecraftforge.common.util.INBTSerializable import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability import ru.dbotthepony.mc.otm.client.render.SkinElement -import ru.dbotthepony.mc.otm.readNbt -import ru.dbotthepony.mc.otm.set -import ru.dbotthepony.mc.otm.writeNbt +import ru.dbotthepony.mc.otm.core.readNbt +import ru.dbotthepony.mc.otm.core.set +import ru.dbotthepony.mc.otm.core.writeNbt import java.io.InputStream import java.io.OutputStream diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.kt index 43c6b481d..11404474b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchBuilder.kt @@ -6,7 +6,7 @@ import net.minecraft.ChatFormatting import net.minecraft.network.chat.Component import net.minecraft.resources.ResourceLocation import net.minecraft.world.item.ItemStack -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.client.render.SkinElement import ru.dbotthepony.mc.otm.container.iterator import ru.dbotthepony.mc.otm.registry.MRegistry @@ -335,7 +335,8 @@ class AndroidResearchBuilder( } if (experience != 0) { - builder.add(TranslatableComponent("otm.android_station.research.xp_cost", experience).withStyle( + builder.add( + TranslatableComponent("otm.android_station.research.xp_cost", experience).withStyle( if (capability.ply.experienceLevel >= experience) ChatFormatting.DARK_GREEN else @@ -346,7 +347,8 @@ class AndroidResearchBuilder( for (value in this.type.flatPrerequisites) { val instance = capability.getResearch(value) - builder.add(TranslatableComponent("android_research.status.requires", instance.screenTooltipHeader).withStyle( + builder.add( + TranslatableComponent("android_research.status.requires", instance.screenTooltipHeader).withStyle( if (instance.isResearched) ChatFormatting.DARK_GREEN else diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchType.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchType.kt index 56e9ea9fc..762070f98 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchType.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchType.kt @@ -6,9 +6,9 @@ import net.minecraft.network.chat.Component import net.minecraft.network.chat.ComponentContents import net.minecraft.network.chat.MutableComponent import net.minecraft.network.chat.contents.TranslatableContents -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability -import ru.dbotthepony.mc.otm.getKeyNullable +import ru.dbotthepony.mc.otm.core.getKeyNullable import ru.dbotthepony.mc.otm.registry.MRegistry import java.util.* import kotlin.collections.HashSet diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsArmor.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsArmor.kt index a6c46cf51..28adbae4e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsArmor.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsArmor.kt @@ -9,7 +9,7 @@ import ru.dbotthepony.mc.otm.capability.extractEnergyInnerExact import ru.dbotthepony.mc.otm.core.ImpreciseFraction import ru.dbotthepony.mc.otm.registry.AndroidFeatures import ru.dbotthepony.mc.otm.registry.StatNames -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set import kotlin.math.roundToInt class NanobotsArmor(android: MatteryPlayerCapability) : AndroidFeature(AndroidFeatures.NANOBOTS_ARMOR, android) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsRegeneration.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsRegeneration.kt index aee96f7d8..aa25381df 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsRegeneration.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/NanobotsRegeneration.kt @@ -8,7 +8,7 @@ import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability import ru.dbotthepony.mc.otm.core.ImpreciseFraction import ru.dbotthepony.mc.otm.registry.AndroidFeatures import ru.dbotthepony.mc.otm.registry.StatNames -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set import kotlin.math.roundToInt class NanobotsRegeneration(android: MatteryPlayerCapability) : AndroidFeature(AndroidFeatures.NANOBOTS_REGENERATION, android) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/AndroidStationBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/AndroidStationBlock.kt index 779fe6683..8c958eb0a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/AndroidStationBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/AndroidStationBlock.kt @@ -16,7 +16,7 @@ import net.minecraft.world.phys.shapes.CollisionContext import net.minecraft.world.phys.shapes.VoxelShape import ru.dbotthepony.mc.otm.block.entity.AndroidStationBlockEntity import ru.dbotthepony.mc.otm.capability.MatteryCapability -import ru.dbotthepony.mc.otm.orNull +import ru.dbotthepony.mc.otm.core.orNull import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/AndroidStationBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/AndroidStationBlockEntity.kt index ca6bb8e4a..dadc3dd85 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/AndroidStationBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/AndroidStationBlockEntity.kt @@ -9,7 +9,7 @@ import net.minecraft.world.entity.player.Player import net.minecraft.world.inventory.AbstractContainerMenu import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.phys.AABB -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage import ru.dbotthepony.mc.otm.core.ImpreciseFraction diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BatteryBankBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BatteryBankBlockEntity.kt index 9d45286d8..b6a0fea83 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BatteryBankBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/BatteryBankBlockEntity.kt @@ -22,7 +22,7 @@ import ru.dbotthepony.mc.otm.block.BatteryBankBlock import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.capability.* import ru.dbotthepony.mc.otm.container.MatteryContainer -import ru.dbotthepony.mc.otm.core.ImpreciseFraction +import ru.dbotthepony.mc.otm.core.* import ru.dbotthepony.mc.otm.menu.BatteryBankMenu import ru.dbotthepony.mc.otm.registry.MBlockEntities import javax.annotation.ParametersAreNonnullByDefault diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/CargoCrateBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/CargoCrateBlockEntity.kt index 4eacf3bb0..8c1017719 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/CargoCrateBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/CargoCrateBlockEntity.kt @@ -12,13 +12,12 @@ import net.minecraft.world.level.block.state.BlockState import net.minecraftforge.common.capabilities.Capability import net.minecraftforge.common.capabilities.ForgeCapabilities import net.minecraftforge.common.util.LazyOptional -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.block.CargoCrateBlock 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.registry.MBlockEntities -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set class CargoCrateBlockEntity( p_155229_: BlockPos, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ChemicalGeneratorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ChemicalGeneratorBlockEntity.kt index 4c7c813eb..7cc7b630e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ChemicalGeneratorBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ChemicalGeneratorBlockEntity.kt @@ -21,8 +21,7 @@ import ru.dbotthepony.mc.otm.* import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.capability.* import ru.dbotthepony.mc.otm.container.MatteryContainer -import ru.dbotthepony.mc.otm.core.ImpreciseFraction -import ru.dbotthepony.mc.otm.core.plus +import ru.dbotthepony.mc.otm.core.* import ru.dbotthepony.mc.otm.menu.ChemicalGeneratorMenu import ru.dbotthepony.mc.otm.registry.MBlockEntities import java.lang.ref.WeakReference diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/EnergyCounterBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/EnergyCounterBlockEntity.kt index 0ca893883..ccf4efca9 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/EnergyCounterBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/EnergyCounterBlockEntity.kt @@ -25,7 +25,7 @@ import ru.dbotthepony.mc.otm.* import ru.dbotthepony.mc.otm.block.EnergyCounterBlock import ru.dbotthepony.mc.otm.capability.* import ru.dbotthepony.mc.otm.compat.mekanism.MatteryToMekanismEnergyWrapper -import ru.dbotthepony.mc.otm.core.ImpreciseFraction +import ru.dbotthepony.mc.otm.core.* import ru.dbotthepony.mc.otm.menu.EnergyCounterMenu import ru.dbotthepony.mc.otm.network.MatteryPacket import ru.dbotthepony.mc.otm.network.WorldNetworkChannel diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/GravitationStabilizerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/GravitationStabilizerBlockEntity.kt index ae924813c..9a14c3332 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/GravitationStabilizerBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/GravitationStabilizerBlockEntity.kt @@ -9,7 +9,7 @@ import net.minecraft.world.level.Level import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.phys.AABB -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.block.BlockGravitationStabilizer import ru.dbotthepony.mc.otm.block.BlockGravitationStabilizerLens import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryBlockEntity.kt index d4b280222..b3015f563 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryBlockEntity.kt @@ -23,8 +23,8 @@ import net.minecraft.network.chat.Component import net.minecraft.world.level.Level import net.minecraftforge.common.capabilities.Capability import ru.dbotthepony.mc.otm.addPreWorldTickerOnce -import ru.dbotthepony.mc.otm.ifHas -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.ifHas +import ru.dbotthepony.mc.otm.core.set abstract class MatteryBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: BlockPos, p_155230_: BlockState) : BlockEntity(p_155228_, p_155229_, p_155230_), MenuProvider { var customDisplayName: Component? = null diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryPoweredBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryPoweredBlockEntity.kt index a097856de..1a6992a54 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryPoweredBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryPoweredBlockEntity.kt @@ -8,13 +8,12 @@ import net.minecraft.world.level.block.state.BlockState import net.minecraftforge.common.capabilities.Capability import net.minecraftforge.common.capabilities.ForgeCapabilities import net.minecraftforge.common.util.LazyOptional -import net.minecraftforge.energy.CapabilityEnergy import ru.dbotthepony.mc.otm.capability.* import ru.dbotthepony.mc.otm.container.MatteryContainer import ru.dbotthepony.mc.otm.core.ImpreciseFraction -import ru.dbotthepony.mc.otm.ifHas -import ru.dbotthepony.mc.otm.ifPresentK -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.ifHas +import ru.dbotthepony.mc.otm.core.ifPresentK +import ru.dbotthepony.mc.otm.core.set abstract class MatteryPoweredBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: BlockPos, p_155230_: BlockState) : MatteryBlockEntity(p_155228_, p_155229_, p_155230_) { abstract val energy: BlockEnergyStorageImpl diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryWorkerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryWorkerBlockEntity.kt index 381ee6ed5..8444518c4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryWorkerBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryWorkerBlockEntity.kt @@ -7,8 +7,8 @@ import net.minecraft.nbt.CompoundTag import net.minecraft.world.item.ItemStack import net.minecraft.world.level.block.Block import ru.dbotthepony.mc.otm.core.* -import ru.dbotthepony.mc.otm.map -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.map +import ru.dbotthepony.mc.otm.core.set private fun isReason(status: Any?, reason: Any) = status == null || status == reason diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/PatternStorageBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/PatternStorageBlockEntity.kt index d531dbaa1..ea0ff7f61 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/PatternStorageBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/PatternStorageBlockEntity.kt @@ -21,14 +21,14 @@ import net.minecraft.server.level.ServerLevel import net.minecraft.world.level.Level import net.minecraft.world.level.block.Block import net.minecraftforge.common.capabilities.Capability -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.capability.matter.* import ru.dbotthepony.mc.otm.graph.Graph6Node import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph -import ru.dbotthepony.mc.otm.ifHas +import ru.dbotthepony.mc.otm.core.ifHas import ru.dbotthepony.mc.otm.registry.MBlockEntities -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set import java.util.ArrayList @MethodsReturnNonnullByDefault diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/PlatePressBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/PlatePressBlockEntity.kt index e2a6e0b3b..b11e4198a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/PlatePressBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/PlatePressBlockEntity.kt @@ -12,7 +12,7 @@ import net.minecraft.world.level.block.state.BlockState import net.minecraftforge.common.capabilities.Capability import net.minecraftforge.common.capabilities.ForgeCapabilities import net.minecraftforge.common.util.LazyOptional -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage import ru.dbotthepony.mc.otm.container.MatteryContainer import ru.dbotthepony.mc.otm.container.MatteryContainerFilter @@ -20,7 +20,7 @@ import ru.dbotthepony.mc.otm.core.ImpreciseFraction import ru.dbotthepony.mc.otm.menu.PlatePressMenu import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.registry.MRecipes -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set class PlatePressBlockEntity( p_155229_: BlockPos, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/RedstoneSetting.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/RedstoneSetting.kt index bbc5a14a3..4c353f217 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/RedstoneSetting.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/RedstoneSetting.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.block.entity import net.minecraft.network.chat.Component -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent enum class RedstoneSetting(val label: Component, val description: Component) { IGNORED(TranslatableComponent("otm.gui.redstone.ignored"), TranslatableComponent("otm.gui.redstone.ignored.description")), diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleBlockEntity.kt index f9f828478..9a9a0e7e5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleBlockEntity.kt @@ -31,7 +31,7 @@ import ru.dbotthepony.mc.otm.matter.getMatterValue import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.registry.MItems import ru.dbotthepony.mc.otm.registry.MRegistry -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set import kotlin.math.roundToInt import kotlin.math.sqrt diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/Explosions.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/Explosions.kt index c5cb83b06..6658bee64 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/Explosions.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/Explosions.kt @@ -23,7 +23,7 @@ import ru.dbotthepony.mc.otm.block.BlockExplosionDebugger import ru.dbotthepony.mc.otm.core.* import ru.dbotthepony.mc.otm.core.Vector import ru.dbotthepony.mc.otm.registry.MRegistry -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set import java.util.* import kotlin.collections.ArrayList import kotlin.collections.HashMap diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt index bdfe096af..3df8e9272 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt @@ -15,7 +15,7 @@ import net.minecraft.world.level.block.state.BlockState import net.minecraftforge.common.capabilities.Capability import net.minecraftforge.common.util.LazyOptional import net.minecraftforge.items.CapabilityItemHandler -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.block.matter.MatterBottlerBlock import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity import ru.dbotthepony.mc.otm.block.entity.WorkerState @@ -29,11 +29,11 @@ import ru.dbotthepony.mc.otm.core.ImpreciseFraction import ru.dbotthepony.mc.otm.graph.Graph6Node import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph -import ru.dbotthepony.mc.otm.ifHas +import ru.dbotthepony.mc.otm.core.ifHas import ru.dbotthepony.mc.otm.menu.MatterBottlerMenu -import ru.dbotthepony.mc.otm.orNull +import ru.dbotthepony.mc.otm.core.orNull import ru.dbotthepony.mc.otm.registry.MBlockEntities -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set class MatterBottlerBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : MatteryPoweredBlockEntity(MBlockEntities.MATTER_BOTTLER, p_155229_, p_155230_), IMatterGraphNode { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterCapacitorBankBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterCapacitorBankBlockEntity.kt index 5a87cf830..16a61ba03 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterCapacitorBankBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterCapacitorBankBlockEntity.kt @@ -15,7 +15,7 @@ import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.state.BlockState import net.minecraftforge.common.capabilities.Capability import net.minecraftforge.common.util.LazyOptional -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.block.BatteryBankBlock import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity import ru.dbotthepony.mc.otm.capability.MatteryCapability @@ -28,7 +28,7 @@ import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph import ru.dbotthepony.mc.otm.menu.MatterCapacitorBankMenu import ru.dbotthepony.mc.otm.registry.MBlockEntities -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set import javax.annotation.ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt index 0c8400f15..e0424ec1f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt @@ -15,7 +15,7 @@ import net.minecraftforge.common.capabilities.Capability import net.minecraftforge.common.capabilities.ForgeCapabilities import net.minecraftforge.common.util.LazyOptional import net.minecraftforge.items.IItemHandler -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage @@ -30,7 +30,7 @@ import ru.dbotthepony.mc.otm.core.set import ru.dbotthepony.mc.otm.graph.Graph6Node import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph -import ru.dbotthepony.mc.otm.ifHas +import ru.dbotthepony.mc.otm.core.ifHas import ru.dbotthepony.mc.otm.item.MatterDustItem import ru.dbotthepony.mc.otm.matter.baselineComplexityDecomposeTicks import ru.dbotthepony.mc.otm.matter.canDecompose @@ -38,7 +38,6 @@ import ru.dbotthepony.mc.otm.matter.getMatterValue import ru.dbotthepony.mc.otm.menu.MatterDecomposerMenu import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.registry.MItems -import ru.dbotthepony.mc.otm.set fun moveMatterAsDustIntoContainer(_matterValue: ImpreciseFraction, container: MatteryContainer, OUTPUT_DUST_MAIN: Int, OUTPUT_DUST_STACKING: Int): ImpreciseFraction { var matterValue = _matterValue diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterPanelBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterPanelBlockEntity.kt index ac0da2868..d26a57718 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterPanelBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterPanelBlockEntity.kt @@ -23,7 +23,7 @@ import net.minecraft.network.chat.Component import net.minecraft.server.level.ServerLevel import net.minecraft.world.level.Level import net.minecraftforge.common.capabilities.Capability -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity import ru.dbotthepony.mc.otm.graph.Graph6Node import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt index e29f1a301..32ad74dc3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt @@ -14,7 +14,7 @@ import net.minecraft.world.level.block.state.BlockState import net.minecraftforge.common.capabilities.Capability import net.minecraftforge.common.capabilities.ForgeCapabilities import net.minecraftforge.common.util.LazyOptional -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage @@ -28,10 +28,10 @@ import ru.dbotthepony.mc.otm.graph.Graph6Node import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph import ru.dbotthepony.mc.otm.item.MatterDustItem -import ru.dbotthepony.mc.otm.map +import ru.dbotthepony.mc.otm.core.map import ru.dbotthepony.mc.otm.menu.MatterRecyclerMenu import ru.dbotthepony.mc.otm.registry.MBlockEntities -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set class MatterRecyclerBlockEntity(blockPos: BlockPos, blockState: BlockState) : MatteryWorkerBlockEntity(MBlockEntities.MATTER_RECYCLER, blockPos, blockState, ::Job), IMatterGraphNode { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt index c7eec86c1..ea4739a2a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt @@ -14,7 +14,7 @@ import net.minecraft.world.level.block.state.BlockState import net.minecraftforge.common.capabilities.Capability import net.minecraftforge.common.capabilities.ForgeCapabilities import net.minecraftforge.common.util.LazyOptional -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage @@ -26,12 +26,12 @@ import ru.dbotthepony.mc.otm.core.getImpreciseFraction import ru.dbotthepony.mc.otm.graph.Graph6Node import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph -import ru.dbotthepony.mc.otm.map +import ru.dbotthepony.mc.otm.core.map import ru.dbotthepony.mc.otm.matter.baselineComplexityReplicateTicks import ru.dbotthepony.mc.otm.matter.getMatterValue import ru.dbotthepony.mc.otm.menu.MatterReplicatorMenu import ru.dbotthepony.mc.otm.registry.MBlockEntities -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set class MatterReplicatorBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : MatteryWorkerBlockEntity(MBlockEntities.MATTER_REPLICATOR, p_155229_, p_155230_, ::ReplicatorJob), IMatterGraphNode { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterScannerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterScannerBlockEntity.kt index 6ef44800b..cfa8e5e8b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterScannerBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterScannerBlockEntity.kt @@ -14,8 +14,7 @@ import net.minecraft.world.level.block.state.BlockState import net.minecraftforge.common.capabilities.Capability import net.minecraftforge.common.capabilities.ForgeCapabilities import net.minecraftforge.common.util.LazyOptional -import net.minecraftforge.items.CapabilityItemHandler -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveRackBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveRackBlockEntity.kt index 2e2e46026..bdbf858b5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveRackBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveRackBlockEntity.kt @@ -13,16 +13,16 @@ import net.minecraft.world.level.Level import net.minecraft.world.level.block.state.BlockState import net.minecraftforge.common.capabilities.Capability import net.minecraftforge.common.util.LazyOptional -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity import ru.dbotthepony.mc.otm.graph.storage.BasicStorageGraphNode import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage import ru.dbotthepony.mc.otm.container.MatteryContainer import ru.dbotthepony.mc.otm.core.ImpreciseFraction -import ru.dbotthepony.mc.otm.ifHas +import ru.dbotthepony.mc.otm.core.ifHas import ru.dbotthepony.mc.otm.menu.DriveRackMenu -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set import ru.dbotthepony.mc.otm.graph.storage.StorageNetworkGraph import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.storage.* diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveViewerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveViewerBlockEntity.kt index a1075a2e6..d59a2ded3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveViewerBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/DriveViewerBlockEntity.kt @@ -11,7 +11,7 @@ import net.minecraft.world.item.ItemStack import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.state.BlockState import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity import ru.dbotthepony.mc.otm.block.storage.DriveViewerBlock import ru.dbotthepony.mc.otm.block.entity.WorkerState @@ -20,7 +20,7 @@ import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage import ru.dbotthepony.mc.otm.container.MatteryContainer import ru.dbotthepony.mc.otm.menu.DriveViewerMenu import ru.dbotthepony.mc.otm.registry.MBlockEntities -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set import javax.annotation.ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/ItemMonitorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/ItemMonitorBlockEntity.kt index 4aefec61e..eae1e3bd4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/ItemMonitorBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/ItemMonitorBlockEntity.kt @@ -26,26 +26,25 @@ import net.minecraftforge.common.util.INBTSerializable import net.minecraftforge.common.util.LazyOptional import net.minecraftforge.network.NetworkEvent import org.apache.logging.log4j.LogManager -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.container.MatteryContainer -import ru.dbotthepony.mc.otm.get +import ru.dbotthepony.mc.otm.core.get import ru.dbotthepony.mc.otm.graph.storage.BasicStorageGraphNode import ru.dbotthepony.mc.otm.graph.storage.StorageNetworkGraph -import ru.dbotthepony.mc.otm.ifHas +import ru.dbotthepony.mc.otm.core.ifHas import ru.dbotthepony.mc.otm.menu.ItemMonitorMenu import ru.dbotthepony.mc.otm.network.MatteryPacket import ru.dbotthepony.mc.otm.registry.MBlockEntities -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set import ru.dbotthepony.mc.otm.storage.* import java.math.BigInteger import java.util.* import java.util.function.Supplier import kotlin.collections.HashMap -import kotlin.collections.HashSet class ItemMonitorPlayerSettings : INBTSerializable, MatteryPacket { enum class RefillSource(val component: Component) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageBusBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageBusBlockEntity.kt index e073ba5da..1ba36b88d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageBusBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageBusBlockEntity.kt @@ -25,10 +25,7 @@ import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage import ru.dbotthepony.mc.otm.container.ItemFilter -import ru.dbotthepony.mc.otm.core.ImpreciseFraction -import ru.dbotthepony.mc.otm.core.isPositive -import ru.dbotthepony.mc.otm.core.isZero -import ru.dbotthepony.mc.otm.core.plus +import ru.dbotthepony.mc.otm.core.* import ru.dbotthepony.mc.otm.graph.Graph6Node import ru.dbotthepony.mc.otm.graph.GraphNodeListener import ru.dbotthepony.mc.otm.graph.storage.BasicStorageGraphNode diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageInterfaces.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageInterfaces.kt index 729105d70..a2a63c5ff 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageInterfaces.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StorageInterfaces.kt @@ -23,8 +23,7 @@ import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity import ru.dbotthepony.mc.otm.capability.* import ru.dbotthepony.mc.otm.container.ItemFilter -import ru.dbotthepony.mc.otm.core.ImpreciseFraction -import ru.dbotthepony.mc.otm.core.plus +import ru.dbotthepony.mc.otm.core.* import ru.dbotthepony.mc.otm.graph.Graph6Node import ru.dbotthepony.mc.otm.graph.GraphNodeListener import ru.dbotthepony.mc.otm.graph.storage.BasicStorageGraphNode diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StoragePowerSupplierBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StoragePowerSupplierBlockEntity.kt index 5194289da..ab7eec48b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StoragePowerSupplierBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/storage/StoragePowerSupplierBlockEntity.kt @@ -13,7 +13,7 @@ import net.minecraft.world.level.block.state.BlockState import net.minecraftforge.common.capabilities.Capability import net.minecraftforge.common.util.LazyOptional import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.block.entity.MatteryPoweredBlockEntity import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.WorkerEnergyStorage @@ -24,7 +24,7 @@ import ru.dbotthepony.mc.otm.graph.storage.StorageNetworkGraph import ru.dbotthepony.mc.otm.menu.StoragePowerSupplierMenu import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.registry.MNames -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set class StoragePowerSupplierBlockEntity(blockPos: BlockPos, blockState: BlockState) : MatteryPoweredBlockEntity(MBlockEntities.STORAGE_POWER_SUPPLIER, blockPos, blockState) { override val defaultDisplayName: Component diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/StorageBusBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/StorageBusBlock.kt index f9fae0cf3..baf657dbf 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/StorageBusBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/StorageBusBlock.kt @@ -22,7 +22,7 @@ import ru.dbotthepony.mc.otm.block.StorageCableBlock import ru.dbotthepony.mc.otm.block.entity.storage.StorageBusBlockEntity import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes -import ru.dbotthepony.mc.otm.unaryMinus +import ru.dbotthepony.mc.otm.core.unaryMinus class StorageBusBlock : RotatableMatteryBlock(), EntityBlock { override val hasFreeRotation: Boolean get() = true diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/StorageInterfaces.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/StorageInterfaces.kt index 62196cf8b..35a169791 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/StorageInterfaces.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/StorageInterfaces.kt @@ -23,7 +23,7 @@ import ru.dbotthepony.mc.otm.block.entity.storage.StorageExporterBlockEntity import ru.dbotthepony.mc.otm.block.entity.storage.StorageImporterBlockEntity import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes -import ru.dbotthepony.mc.otm.unaryMinus +import ru.dbotthepony.mc.otm.core.unaryMinus class StorageImporterBlock : RotatableMatteryBlock(), EntityBlock { override val hasFreeRotation: Boolean get() = true diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/EnergyStorageImpl.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/EnergyStorageImpl.kt index d8c4d90a4..661685bea 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/EnergyStorageImpl.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/EnergyStorageImpl.kt @@ -12,12 +12,11 @@ import net.minecraftforge.common.capabilities.ForgeCapabilities import net.minecraftforge.common.capabilities.ICapabilityProvider import net.minecraftforge.common.util.INBTSerializable import net.minecraftforge.common.util.LazyOptional -import net.minecraftforge.energy.CapabilityEnergy import ru.dbotthepony.mc.otm.compat.mekanism.MatteryToMekanismEnergyWrapper import ru.dbotthepony.mc.otm.core.ImpreciseFraction -import ru.dbotthepony.mc.otm.ifHas -import ru.dbotthepony.mc.otm.set -import ru.dbotthepony.mc.otm.tagNotNull +import ru.dbotthepony.mc.otm.core.ifHas +import ru.dbotthepony.mc.otm.core.set +import ru.dbotthepony.mc.otm.core.tagNotNull private enum class EnergyFlow { INPUT, OUTPUT, BI_DIRECTIONAL diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt index 3207d6527..171556ca2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt @@ -10,7 +10,7 @@ import net.minecraftforge.fml.ModList import ru.dbotthepony.mc.otm.compat.mekanism.getMekanismEnergySided import ru.dbotthepony.mc.otm.compat.mekanism.mekanismEnergy import ru.dbotthepony.mc.otm.core.ImpreciseFraction -import ru.dbotthepony.mc.otm.orNull +import ru.dbotthepony.mc.otm.core.orNull val ICapabilityProvider.matteryPlayer: MatteryPlayerCapability? get() = getCapability(MatteryCapability.MATTERY_PLAYER).orNull() diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt index 2de4a936d..d2d8912b8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt @@ -2,7 +2,6 @@ package ru.dbotthepony.mc.otm.capability import it.unimi.dsi.fastutil.objects.ObjectArraySet import net.minecraft.ChatFormatting -import net.minecraft.advancements.CriteriaTriggers import net.minecraft.core.Direction import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.ListTag @@ -39,7 +38,7 @@ import ru.dbotthepony.mc.otm.android.AndroidFeatureType import ru.dbotthepony.mc.otm.android.AndroidResearch import ru.dbotthepony.mc.otm.android.AndroidResearchType import ru.dbotthepony.mc.otm.container.MatteryContainer -import ru.dbotthepony.mc.otm.core.ImpreciseFraction +import ru.dbotthepony.mc.otm.core.* import ru.dbotthepony.mc.otm.menu.ExoSuitInventoryMenu import ru.dbotthepony.mc.otm.network.* import ru.dbotthepony.mc.otm.registry.AndroidFeatures diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/AbstractMatteryDrive.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/AbstractMatteryDrive.kt index a9039d0c9..66af62358 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/AbstractMatteryDrive.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/AbstractMatteryDrive.kt @@ -1,21 +1,17 @@ package ru.dbotthepony.mc.otm.capability.drive -import it.unimi.dsi.fastutil.longs.Long2ObjectAVLTreeMap -import it.unimi.dsi.fastutil.objects.Object2ObjectAVLTreeMap import it.unimi.dsi.fastutil.objects.ObjectArraySet import kotlin.jvm.JvmOverloads import java.util.UUID import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.ListTag -import net.minecraft.nbt.LongTag import net.minecraft.nbt.Tag import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.core.BigInteger -import ru.dbotthepony.mc.otm.core.ImpreciseFraction import ru.dbotthepony.mc.otm.core.isPositive import ru.dbotthepony.mc.otm.core.serializeNBT -import ru.dbotthepony.mc.otm.ifHas -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.ifHas +import ru.dbotthepony.mc.otm.core.set import ru.dbotthepony.mc.otm.storage.* import java.math.BigInteger import java.util.ArrayList diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/ItemMatteryDrive.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/ItemMatteryDrive.kt index 74a66ad21..f9b5eec28 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/ItemMatteryDrive.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/drive/ItemMatteryDrive.kt @@ -6,12 +6,10 @@ import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack import net.minecraft.world.item.Items import net.minecraftforge.registries.ForgeRegistries -import net.minecraftforge.registries.RegistryManager import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.core.BigInteger -import ru.dbotthepony.mc.otm.core.ImpreciseFraction import ru.dbotthepony.mc.otm.core.serializeNBT -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set import ru.dbotthepony.mc.otm.storage.IStorageTuple import ru.dbotthepony.mc.otm.storage.ItemStackWrapper import ru.dbotthepony.mc.otm.storage.StorageStackType diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/MatterHandlerImpl.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/MatterHandlerImpl.kt index 45a24fc9a..056bbfc91 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/MatterHandlerImpl.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/MatterHandlerImpl.kt @@ -4,7 +4,7 @@ import net.minecraft.nbt.CompoundTag import net.minecraftforge.common.util.INBTSerializable import net.minecraftforge.common.util.LazyOptional import ru.dbotthepony.mc.otm.core.ImpreciseFraction -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set open class MatterHandlerImpl @JvmOverloads constructor( protected val listener: Runnable?, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt index c5d02ded5..d8080072d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt @@ -18,14 +18,13 @@ import net.minecraftforge.client.gui.overlay.GuiOverlayManager import net.minecraftforge.eventbus.api.EventPriority import net.minecraftforge.eventbus.api.SubscribeEvent import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.TextComponent -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability import ru.dbotthepony.mc.otm.capability.matteryPlayer import ru.dbotthepony.mc.otm.client.render.* import ru.dbotthepony.mc.otm.core.RGBAColor -import ru.dbotthepony.mc.otm.ifPresentK +import ru.dbotthepony.mc.otm.core.ifPresentK import java.util.* object MatteryGUI { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BlackHoleRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BlackHoleRenderer.kt index 1c4715b39..d0e455e9c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BlackHoleRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BlackHoleRenderer.kt @@ -11,7 +11,7 @@ import net.minecraft.client.renderer.blockentity.BlockEntityRenderer import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider import net.minecraft.world.phys.Vec3 import org.lwjgl.opengl.GL30 -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.block.entity.GravitationStabilizerBlockEntity import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleBlockEntity import ru.dbotthepony.mc.otm.capability.matteryPlayer diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/EnergyCounterRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/EnergyCounterRenderer.kt index 2d299b81c..e6cf2ac62 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/EnergyCounterRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/EnergyCounterRenderer.kt @@ -6,7 +6,7 @@ import net.minecraft.client.renderer.MultiBufferSource import net.minecraft.client.renderer.blockentity.BlockEntityRenderer import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider import net.minecraft.core.Direction -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.block.EnergyCounterBlock import ru.dbotthepony.mc.otm.block.entity.EnergyCounterBlockEntity import ru.dbotthepony.mc.otm.client.render.* diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/GravitationStabilizerRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/GravitationStabilizerRenderer.kt index f4f2e2429..79dd06175 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/GravitationStabilizerRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/GravitationStabilizerRenderer.kt @@ -10,7 +10,7 @@ import net.minecraft.client.renderer.blockentity.BlockEntityRenderer import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider import net.minecraft.client.renderer.texture.OverlayTexture import net.minecraft.core.Direction -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.block.BlackHoleBlock import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.GravitationStabilizerBlockEntity diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.kt index 4760d6eb1..a82248570 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.kt @@ -11,7 +11,7 @@ import net.minecraft.client.resources.sounds.SimpleSoundInstance import net.minecraft.network.chat.Component import net.minecraft.sounds.SoundEvents import net.minecraft.world.entity.player.Inventory -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.android.AndroidResearch import ru.dbotthepony.mc.otm.android.AndroidResearchType import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability @@ -24,7 +24,7 @@ import ru.dbotthepony.mc.otm.client.render.drawRect import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel import ru.dbotthepony.mc.otm.core.RGBAColor -import ru.dbotthepony.mc.otm.ifPresentK +import ru.dbotthepony.mc.otm.core.ifPresentK import ru.dbotthepony.mc.otm.menu.AndroidStationMenu import ru.dbotthepony.mc.otm.network.MatteryPlayerNetworkChannel import ru.dbotthepony.mc.otm.network.AndroidResearchRequestPacket diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ChemicalGeneratorScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ChemicalGeneratorScreen.kt index 0f6a6ffe3..af265b0ec 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ChemicalGeneratorScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ChemicalGeneratorScreen.kt @@ -2,9 +2,8 @@ package ru.dbotthepony.mc.otm.client.screen import net.minecraft.network.chat.Component import net.minecraft.world.entity.player.Inventory -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent 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.client.screen.widget.WidePowerGaugePanel import ru.dbotthepony.mc.otm.menu.ChemicalGeneratorMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/DriveViewerScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/DriveViewerScreen.kt index 6700bd60a..f3e12490c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/DriveViewerScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/DriveViewerScreen.kt @@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.PoseStack import net.minecraft.network.chat.Component import net.minecraft.world.entity.player.Inventory import net.minecraft.world.item.ItemStack -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel import ru.dbotthepony.mc.otm.item.PortableCondensationDriveItem diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/EnergyCounterScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/EnergyCounterScreen.kt index 9caf1f4b5..54c8dc5d3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/EnergyCounterScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/EnergyCounterScreen.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.client.screen import net.minecraft.network.chat.Component import net.minecraft.world.entity.player.Inventory -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.core.formatPower import ru.dbotthepony.mc.otm.menu.EnergyCounterMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoSuitInventoryScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoSuitInventoryScreen.kt index cac0ee43c..30f142f04 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoSuitInventoryScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoSuitInventoryScreen.kt @@ -3,9 +3,8 @@ package ru.dbotthepony.mc.otm.client.screen import com.mojang.blaze3d.vertex.PoseStack import it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap import it.unimi.dsi.fastutil.ints.Int2ObjectFunction -import net.minecraft.client.gui.screens.inventory.InventoryScreen import net.minecraft.world.inventory.Slot -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.client.render.element import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.menu.ExoSuitInventoryMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ItemMonitorScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ItemMonitorScreen.kt index cba5b969d..70ee942a8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ItemMonitorScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ItemMonitorScreen.kt @@ -8,7 +8,7 @@ import net.minecraft.world.entity.player.Inventory import net.minecraft.world.item.ItemStack import net.minecraft.world.item.Items import org.lwjgl.opengl.GL11 -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.block.entity.storage.ItemMonitorPlayerSettings import ru.dbotthepony.mc.otm.client.render.UVWindingOrder import ru.dbotthepony.mc.otm.client.render.Widgets8 diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterBottlerScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterBottlerScreen.kt index 869172e13..4e42721fa 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterBottlerScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatterBottlerScreen.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.client.screen import net.minecraft.network.chat.Component import net.minecraft.world.entity.player.Inventory -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.widget.MatterGaugePanel import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageBusScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageBusScreen.kt index 342a0dfea..ce186d984 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageBusScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageBusScreen.kt @@ -2,9 +2,8 @@ package ru.dbotthepony.mc.otm.client.screen import net.minecraft.network.chat.Component import net.minecraft.world.entity.player.Inventory -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent 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.WidePowerGaugePanel import ru.dbotthepony.mc.otm.menu.StorageBusMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageExporterScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageExporterScreen.kt index 7ea5b4169..12fadc33e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageExporterScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageExporterScreen.kt @@ -2,9 +2,8 @@ package ru.dbotthepony.mc.otm.client.screen import net.minecraft.network.chat.Component import net.minecraft.world.entity.player.Inventory -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent 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.WidePowerGaugePanel import ru.dbotthepony.mc.otm.menu.StorageExporterMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageImporterScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageImporterScreen.kt index d6aff0902..866f259f6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageImporterScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StorageImporterScreen.kt @@ -2,9 +2,8 @@ package ru.dbotthepony.mc.otm.client.screen import net.minecraft.network.chat.Component import net.minecraft.world.entity.player.Inventory -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent 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.WidePowerGaugePanel import ru.dbotthepony.mc.otm.menu.StorageImporterMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StoragePowerSupplierScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StoragePowerSupplierScreen.kt index 7e0f0d90e..a8ba11059 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StoragePowerSupplierScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/StoragePowerSupplierScreen.kt @@ -2,9 +2,8 @@ package ru.dbotthepony.mc.otm.client.screen import net.minecraft.network.chat.Component import net.minecraft.world.entity.player.Inventory -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent 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.WidePowerGaugePanel import ru.dbotthepony.mc.otm.core.formatPower diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ButtonPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ButtonPanel.kt index b07c2e14a..1024a0f6c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ButtonPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ButtonPanel.kt @@ -8,12 +8,12 @@ import net.minecraft.client.gui.components.Button.OnPress import net.minecraft.client.resources.sounds.SimpleSoundInstance import net.minecraft.network.chat.Component import net.minecraft.sounds.SoundEvents -import ru.dbotthepony.mc.otm.TextComponent +import ru.dbotthepony.mc.otm.core.TextComponent import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.render.* import ru.dbotthepony.mc.otm.client.screen.MatteryScreen -import ru.dbotthepony.mc.otm.next -import ru.dbotthepony.mc.otm.prev +import ru.dbotthepony.mc.otm.core.next +import ru.dbotthepony.mc.otm.core.prev import java.util.* import kotlin.collections.ArrayList import kotlin.reflect.KMutableProperty0 diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditBoxPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditBoxPanel.kt index 25c472cec..b5f7a3b42 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditBoxPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditBoxPanel.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.client.screen.panels import net.minecraft.client.gui.components.EditBox import net.minecraft.network.chat.Component -import ru.dbotthepony.mc.otm.TextComponent +import ru.dbotthepony.mc.otm.core.TextComponent import ru.dbotthepony.mc.otm.client.screen.MatteryScreen open class EditBoxPanel( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/Label.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/Label.kt index 19dc546fc..92e95a7f0 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/Label.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/Label.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.client.screen.panels import com.mojang.blaze3d.vertex.PoseStack import net.minecraft.network.chat.Component -import ru.dbotthepony.mc.otm.TextComponent +import ru.dbotthepony.mc.otm.core.TextComponent import ru.dbotthepony.mc.otm.core.RGBAColor import ru.dbotthepony.mc.otm.client.screen.MatteryScreen diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/NumberInputPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/NumberInputPanel.kt index 86410a442..e8ab11c7a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/NumberInputPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/NumberInputPanel.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.client.screen.panels import net.minecraft.network.chat.Component -import ru.dbotthepony.mc.otm.TextComponent +import ru.dbotthepony.mc.otm.core.TextComponent import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.menu.widget.NumberPlayerInputWidget import java.math.BigDecimal diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/Gauges.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/Gauges.kt index 649ccb3b1..5ea9b5862 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/Gauges.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/Gauges.kt @@ -4,7 +4,7 @@ import com.mojang.blaze3d.systems.RenderSystem import com.mojang.blaze3d.vertex.PoseStack import net.minecraft.ChatFormatting import net.minecraft.network.chat.Component -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.client.render.* import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/mekanism/Tooltips.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/mekanism/Tooltips.kt index dc840a76d..d4558d04a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/mekanism/Tooltips.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/mekanism/Tooltips.kt @@ -4,7 +4,7 @@ import mekanism.common.registries.MekanismItems import net.minecraft.ChatFormatting import net.minecraftforge.event.entity.player.ItemTooltipEvent import net.minecraftforge.eventbus.api.SubscribeEvent -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.capability.isMekanismLoaded private val BLACKHOLE_IMMUNITY = TranslatableComponent("otm.item.blackhole_immunity").withStyle(ChatFormatting.DARK_GRAY) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/ItemFilter.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/ItemFilter.kt index f96b4eacd..cca0c9991 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/ItemFilter.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/ItemFilter.kt @@ -11,10 +11,10 @@ import net.minecraftforge.common.util.INBTSerializable import net.minecraftforge.network.NetworkEvent import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.client.minecraft -import ru.dbotthepony.mc.otm.ifHas +import ru.dbotthepony.mc.otm.core.ifHas import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.network.MatteryPacket -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set import java.util.Arrays import java.util.LinkedList import java.util.function.Supplier diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/Iterators.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/Iterators.kt index f067db281..4d80d79e6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/Iterators.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/Iterators.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.container import net.minecraft.world.Container import net.minecraft.world.item.ItemStack import net.minecraftforge.common.capabilities.Capability -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set import java.util.function.Consumer class ContainerIteratorItemStack(private val container: Container) : MutableIterator, Iterable { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/MatteryContainer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/MatteryContainer.kt index 7396cabc4..fb41c3afe 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/MatteryContainer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/MatteryContainer.kt @@ -9,9 +9,9 @@ import kotlin.jvm.JvmOverloads import net.minecraft.world.entity.player.Player import net.minecraft.world.level.block.entity.BlockEntity import net.minecraftforge.common.capabilities.Capability -import ru.dbotthepony.mc.otm.get -import ru.dbotthepony.mc.otm.ifHas -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.core.ifHas +import ru.dbotthepony.mc.otm.core.set import java.util.* import java.util.function.Consumer diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/CompoundTagDelegates.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/CompoundTagDelegates.kt new file mode 100644 index 000000000..828ff6520 --- /dev/null +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/CompoundTagDelegates.kt @@ -0,0 +1,78 @@ +package ru.dbotthepony.mc.otm.core + +import net.minecraft.nbt.CompoundTag +import net.minecraft.nbt.LongArrayTag +import java.util.* +import kotlin.properties.ReadWriteProperty +import kotlin.reflect.KProperty + +@JvmInline +value class CompoundTagInt(val tag: CompoundTag) : ReadWriteProperty { + override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getInt(property.name) + override fun setValue(thisRef: Any, property: KProperty<*>, value: Int) = tag.putInt(property.name, value) +} + +@JvmInline +value class CompoundTagLong(val tag: CompoundTag) : ReadWriteProperty { + override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getLong(property.name) + override fun setValue(thisRef: Any, property: KProperty<*>, value: Long) = tag.putLong(property.name, value) +} + +@JvmInline +value class CompoundTagByte(val tag: CompoundTag) : ReadWriteProperty { + override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getByte(property.name) + override fun setValue(thisRef: Any, property: KProperty<*>, value: Byte) = tag.putByte(property.name, value) +} + +@JvmInline +value class CompoundTagShort(val tag: CompoundTag) : ReadWriteProperty { + override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getShort(property.name) + override fun setValue(thisRef: Any, property: KProperty<*>, value: Short) = tag.putShort(property.name, value) +} + +@JvmInline +value class CompoundTagFloat(val tag: CompoundTag) : ReadWriteProperty { + override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getFloat(property.name) + override fun setValue(thisRef: Any, property: KProperty<*>, value: Float) = tag.putFloat(property.name, value) +} + +@JvmInline +value class CompoundTagBoolean(val tag: CompoundTag) : ReadWriteProperty { + override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getBoolean(property.name) + override fun setValue(thisRef: Any, property: KProperty<*>, value: Boolean) = tag.putBoolean(property.name, value) +} + +@JvmInline +value class CompoundTagDouble(val tag: CompoundTag) : ReadWriteProperty { + override fun getValue(thisRef: Any, property: KProperty<*>) = tag.getDouble(property.name) + override fun setValue(thisRef: Any, property: KProperty<*>, value: Double) = tag.putDouble(property.name, value) +} + +@JvmInline +value class CompoundTagString(val tag: CompoundTag) : ReadWriteProperty { + override fun getValue(thisRef: Any, property: KProperty<*>): String = tag.getString(property.name) + override fun setValue(thisRef: Any, property: KProperty<*>, value: String) = tag.putString(property.name, value) +} + +val EMPTY_UUID = UUID(0L, 0L) + +@JvmInline +value class CompoundTagUUID(val tag: CompoundTag) : ReadWriteProperty { + override fun getValue(thisRef: Any, property: KProperty<*>) = (tag.get(property.name) as LongArrayTag?)?.asLongArray?.let { + UUID( + it[0], + it[1] + ) + } ?: EMPTY_UUID + override fun setValue(thisRef: Any, property: KProperty<*>, value: UUID) = tag.putLongArray(property.name, longArrayOf(value.mostSignificantBits, value.leastSignificantBits)) +} + +val CompoundTag.ints get() = CompoundTagInt(this) +val CompoundTag.longs get() = CompoundTagLong(this) +val CompoundTag.bytes get() = CompoundTagByte(this) +val CompoundTag.shorts get() = CompoundTagShort(this) +val CompoundTag.floats get() = CompoundTagFloat(this) +val CompoundTag.doubles get() = CompoundTagDouble(this) +val CompoundTag.booleans get() = CompoundTagBoolean(this) +val CompoundTag.strings get() = CompoundTagString(this) +val CompoundTag.uuids get() = CompoundTagUUID(this) \ No newline at end of file diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/CompoundTagExt.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/CompoundTagExt.kt new file mode 100644 index 000000000..7c78e7105 --- /dev/null +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/CompoundTagExt.kt @@ -0,0 +1,61 @@ +package ru.dbotthepony.mc.otm.core + +import net.minecraft.nbt.CompoundTag +import net.minecraft.nbt.Tag + +operator fun CompoundTag.set(index: String, value: Tag) = put(index, value) +operator fun CompoundTag.set(index: String, value: Int) = putInt(index, value) +operator fun CompoundTag.set(index: String, value: Byte) = putByte(index, value) +operator fun CompoundTag.set(index: String, value: Short) = putShort(index, value) +operator fun CompoundTag.set(index: String, value: Long) = putLong(index, value) +operator fun CompoundTag.set(index: String, value: Float) = putFloat(index, value) +operator fun CompoundTag.set(index: String, value: Double) = putDouble(index, value) +operator fun CompoundTag.set(index: String, value: String) = putString(index, value) +operator fun CompoundTag.set(index: String, value: Boolean) = putBoolean(index, value) +operator fun CompoundTag.set(index: String, value: ByteArray) = putByteArray(index, value) +operator fun CompoundTag.set(index: String, value: IntArray) = putIntArray(index, value) +operator fun CompoundTag.set(index: String, value: LongArray) = putLongArray(index, value) + +inline fun CompoundTag.map(s: String, consumer: (T) -> R): R? { + val tag = get(s) + + if (tag is T) { + return consumer(tag) + } + + return null +} + +inline fun CompoundTag.ifCompound(s: String, consumer: (CompoundTag) -> T): T? { + val tag = get(s) + + if (tag is CompoundTag) { + return consumer(tag) + } + + return null +} + +inline fun CompoundTag.ifHas(s: String, consumer: (Tag) -> Unit) { + val tag = get(s) + + if (tag != null) { + consumer(tag) + } +} + +inline fun CompoundTag.ifHas(s: String, type: Byte, consumer: (Tag) -> Unit) { + val tag = get(s) + + if (tag != null && tag.id == type) { + consumer(tag) + } +} + +inline fun CompoundTag.ifHas(s: String, type: Class, consumer: (T) -> Unit) { + val tag = get(s) + + if (tag != null && tag::class.java === type) { + consumer(tag as T) + } +} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/EuclidMath.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/EuclidMath.kt index 348a52b90..e73b62447 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/EuclidMath.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/EuclidMath.kt @@ -2,7 +2,9 @@ package ru.dbotthepony.mc.otm.core import com.mojang.math.Quaternion import com.mojang.math.Vector3f +import net.minecraft.core.BlockPos import net.minecraft.core.Direction +import net.minecraft.core.Vec3i import net.minecraft.world.phys.Vec3 import kotlin.math.* @@ -338,6 +340,7 @@ fun bezierCurve(t: Double, vararg values: Vector): Vector { } } } + fun bezierCurve(t: Double, values: DoubleArray): Double { when (values.size) { 0, 1 -> throw IllegalArgumentException("Provided array has only ${values.size} entries in it") @@ -359,3 +362,23 @@ fun bezierCurve(t: Double, values: DoubleArray): Double { } } } + +operator fun BlockPos.plus(direction: Vec3i): BlockPos = this.offset(direction) +operator fun BlockPos.plus(direction: Direction): BlockPos = this.offset(direction.normal) +operator fun BlockPos.minus(direction: Vec3i): BlockPos = this.subtract(direction) +operator fun BlockPos.minus(direction: Direction): BlockPos = this.subtract(direction.normal) + +operator fun Vec3i.plus(direction: Vec3i): Vec3i = this.offset(direction) +operator fun Vec3i.plus(direction: Direction): Vec3i = this.offset(direction.normal) +operator fun Vec3i.minus(direction: Vec3i): Vec3i = this.subtract(direction) +operator fun Vec3i.minus(direction: Direction): Vec3i = this.subtract(direction.normal) +operator fun Vec3i.times(int: Int): Vec3i = this.multiply(int) +operator fun Vec3i.times(double: Double): Vector = Vector(x * double, y * double, z * double) + +fun BlockPos.asVector(): Vector { + return Vector(x + 0.5, y + 0.5, z + 0.5) +} + +operator fun Direction.unaryMinus(): Direction = this.opposite +operator fun Vec3i.unaryMinus(): Vec3i = Vec3i(-x, -y, -z) +operator fun BlockPos.unaryMinus(): BlockPos = BlockPos(-x, -y, -z) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt index 569d8e7c8..c9a9e6c94 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt @@ -3,31 +3,21 @@ package ru.dbotthepony.mc.otm.core -import net.minecraft.core.BlockPos -import net.minecraft.core.Direction -import net.minecraft.core.Vec3i +import com.google.common.collect.ImmutableList +import com.google.gson.JsonElement +import com.google.gson.JsonObject import net.minecraft.nbt.ByteArrayTag +import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.Tag import net.minecraft.network.FriendlyByteBuf +import net.minecraft.world.Container +import net.minecraft.world.entity.Entity +import net.minecraft.world.item.ItemStack +import net.minecraft.world.phys.Vec3 +import net.minecraftforge.common.util.LazyOptional +import net.minecraftforge.items.IItemHandler import java.math.BigInteger -operator fun BlockPos.plus(direction: Vec3i): BlockPos = this.offset(direction) -operator fun BlockPos.plus(direction: Direction): BlockPos = this.offset(direction.normal) -operator fun BlockPos.minus(direction: Vec3i): BlockPos = this.subtract(direction) -operator fun BlockPos.minus(direction: Direction): BlockPos = this.subtract(direction.normal) - -operator fun Vec3i.plus(direction: Vec3i): Vec3i = this.offset(direction) -operator fun Vec3i.plus(direction: Direction): Vec3i = this.offset(direction.normal) -operator fun Vec3i.minus(direction: Vec3i): Vec3i = this.subtract(direction) -operator fun Vec3i.minus(direction: Direction): Vec3i = this.subtract(direction.normal) - -operator fun Vec3i.times(int: Int): Vec3i = this.multiply(int) -operator fun Vec3i.times(double: Double): Vector = Vector(x * double, y * double, z * double) - -fun BlockPos.asVector(): Vector { - return Vector(x + 0.5, y + 0.5, z + 0.5) -} - /** * Performs type check+cast and sums two numbers. * @@ -213,14 +203,6 @@ fun Number.toImpreciseFraction(): ImpreciseFraction { } } -fun Float.toImpreciseFraction() = ImpreciseFraction(this) -fun Double.toImpreciseFraction() = ImpreciseFraction(this) -fun Int.toImpreciseFraction() = ImpreciseFraction(this) -fun Byte.toImpreciseFraction() = ImpreciseFraction(this) -fun Short.toImpreciseFraction() = ImpreciseFraction(this) -fun Long.toImpreciseFraction() = ImpreciseFraction(this) -fun ImpreciseFraction.toImpreciseFraction() = this - fun BigInteger(tag: Tag?): BigInteger { if (tag !is ByteArrayTag) return BigInteger.ZERO @@ -237,3 +219,87 @@ fun FriendlyByteBuf.writeBigInteger(value: BigInteger) { } fun FriendlyByteBuf.readBigInteger(byteLimit: Int = 128) = BigInteger(readByteArray(byteLimit)) + +operator fun Container.set(index: Int, value: ItemStack) = setItem(index, value) +operator fun Container.get(index: Int): ItemStack = getItem(index) + +operator fun IItemHandler.get(index: Int): ItemStack = getStackInSlot(index) + +operator fun JsonObject.set(s: String, value: JsonElement) = add(s, value) + +fun LazyOptional.orNull(): T? { + if (!isPresent) { + return null + } + + return resolve().orElse(null) +} + +fun LazyOptional.orThrow(): T { + if (!isPresent) { + throw IllegalStateException("Capability was expected to be not null") + } + + return resolve().get() ?: throw IllegalStateException("Capability was expected to be not null") +} + +inline fun LazyOptional.ifPresentK(lambda: (T) -> Unit) { + if (isPresent) { + val value = resolve().orElse(null) ?: throw IllegalStateException("Capability was expected to be not null") + lambda.invoke(value) + } +} + +val ItemStack.tagNotNull: CompoundTag get() = orCreateTag + +inline var Entity.position: Vec3 + get() = position() + set(value) { setPos(value) } + +inline val > T.next: T get() { + val values = enumValues() + val next = (ordinal + 1) % values.size + return values[next] +} + +inline val > T.prev: T get() { + val values = enumValues() + var next = ordinal - 1 + + if (next < 0) { + next = values.size - 1 + } + + return values[next] +} + +fun > T.next(values: Array): T { + val next = (ordinal + 1) % values.size + return values[next] +} + +fun > T.prev(values: Array): T { + var next = ordinal - 1 + + if (next < 0) { + next = values.size - 1 + } + + return values[next] +} + +inline fun ImmutableList(size: Int, initializer: (index: Int) -> T): ImmutableList { + require(size >= 0) { "Invalid list size $size" } + + return when (size) { + 0 -> ImmutableList.of() + 1 -> ImmutableList.of(initializer(0)) + else -> ImmutableList.Builder().let { + for (i in 0 until size) { + it.add(initializer(i)) + } + + it.build() + } + } +} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/Formatting.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/Formatting.kt index ecb9d6f78..27a892f8a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/Formatting.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/Formatting.kt @@ -2,8 +2,6 @@ package ru.dbotthepony.mc.otm.core import com.google.common.collect.ImmutableList import net.minecraft.network.chat.Component -import ru.dbotthepony.mc.otm.TextComponent -import ru.dbotthepony.mc.otm.TranslatableComponent import java.math.BigDecimal import java.math.BigInteger diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/FriendlyStreams.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/FriendlyStreams.kt similarity index 99% rename from src/main/kotlin/ru/dbotthepony/mc/otm/FriendlyStreams.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/core/FriendlyStreams.kt index 90cba80aa..b0125637b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/FriendlyStreams.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/FriendlyStreams.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm +package ru.dbotthepony.mc.otm.core import io.netty.handler.codec.EncoderException import net.minecraft.nbt.CompoundTag diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/ImpreciseFraction.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/ImpreciseFraction.kt index b045dde31..e84b3e9de 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/ImpreciseFraction.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/ImpreciseFraction.kt @@ -5,10 +5,6 @@ import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.StringTag import net.minecraft.nbt.Tag import net.minecraft.network.FriendlyByteBuf -import ru.dbotthepony.mc.otm.readDouble -import ru.dbotthepony.mc.otm.readVarIntLE -import ru.dbotthepony.mc.otm.writeDouble -import ru.dbotthepony.mc.otm.writeVarIntLE import java.io.InputStream import java.io.OutputStream import java.math.BigDecimal @@ -666,3 +662,10 @@ fun CompoundTag.getImpreciseFraction(key: String) = ImpreciseFraction.deserializ fun CompoundTag.putImpreciseFraction(key: String, value: ImpreciseFraction) = put(key, value.serializeNBT()) operator fun CompoundTag.set(key: String, value: ImpreciseFraction) = putImpreciseFraction(key, value) +fun Float.toImpreciseFraction() = ImpreciseFraction(this) +fun Double.toImpreciseFraction() = ImpreciseFraction(this) +fun Int.toImpreciseFraction() = ImpreciseFraction(this) +fun Byte.toImpreciseFraction() = ImpreciseFraction(this) +fun Short.toImpreciseFraction() = ImpreciseFraction(this) +fun Long.toImpreciseFraction() = ImpreciseFraction(this) +fun ImpreciseFraction.toImpreciseFraction() = this \ No newline at end of file diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/UnOverengineering.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/UnOverengineering.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/mc/otm/UnOverengineering.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/core/UnOverengineering.kt index 4a48fdd83..276203b8e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/UnOverengineering.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/UnOverengineering.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm +package ru.dbotthepony.mc.otm.core import net.minecraft.network.FriendlyByteBuf import net.minecraft.network.chat.MutableComponent diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/data/LootTableAppender.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/data/LootTableAppender.kt index 68b92888d..47a4e6b68 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/data/LootTableAppender.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/data/LootTableAppender.kt @@ -17,7 +17,7 @@ import net.minecraft.world.level.storage.loot.predicates.LootItemCondition import net.minecraftforge.common.loot.IGlobalLootModifier import net.minecraftforge.common.loot.LootModifier import net.minecraftforge.registries.ForgeRegistries -import ru.dbotthepony.mc.otm.registryName +import ru.dbotthepony.mc.otm.core.registryName // 1.19 do be like overengineering already overengineered stuff beyond any recognition private fun getJson(it: Dynamic): JsonElement { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/graph/storage/StorageNetworkGraph.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/graph/storage/StorageNetworkGraph.kt index d53d90d52..87422a09a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/graph/storage/StorageNetworkGraph.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/graph/storage/StorageNetworkGraph.kt @@ -10,7 +10,7 @@ import ru.dbotthepony.mc.otm.capability.IMatteryEnergyStorage import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.graph.Abstract6Graph import ru.dbotthepony.mc.otm.graph.Graph6Node -import ru.dbotthepony.mc.otm.orNull +import ru.dbotthepony.mc.otm.core.orNull import ru.dbotthepony.mc.otm.storage.* import java.util.LinkedList diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/BatteryItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/BatteryItem.kt index e392d9476..7065ae104 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/BatteryItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/BatteryItem.kt @@ -10,12 +10,12 @@ import net.minecraft.world.item.TooltipFlag import net.minecraft.world.level.Level import net.minecraftforge.common.capabilities.ICapabilityProvider import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.capability.EnergyCapacitorItem import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.core.ImpreciseFraction import ru.dbotthepony.mc.otm.core.formatPower -import ru.dbotthepony.mc.otm.ifPresentK +import ru.dbotthepony.mc.otm.core.ifPresentK class BatteryItem : Item { private inner class BatteryMatteryCapability(stack: ItemStack) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/EnergySwordItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/EnergySwordItem.kt index f510b065f..a71176ad2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/EnergySwordItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/EnergySwordItem.kt @@ -22,8 +22,7 @@ import net.minecraft.world.level.material.Material import net.minecraftforge.common.capabilities.ICapabilityProvider import ru.dbotthepony.mc.otm.* import ru.dbotthepony.mc.otm.capability.* -import ru.dbotthepony.mc.otm.core.ImpreciseFraction -import ru.dbotthepony.mc.otm.core.formatPower +import ru.dbotthepony.mc.otm.core.* import ru.dbotthepony.mc.otm.registry.EMPDamageSource class EnergySwordItem : Item(Properties().stacksTo(1).rarity(Rarity.RARE).tab(OverdriveThatMatters.INSTANCE.CREATIVE_TAB)) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoSuitProbeItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoSuitProbeItem.kt index ca8a10461..e9b80a138 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoSuitProbeItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ExoSuitProbeItem.kt @@ -10,7 +10,7 @@ import net.minecraft.world.entity.player.Player import net.minecraft.world.item.* import net.minecraft.world.level.Level import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.addPostTickTimer import ru.dbotthepony.mc.otm.capability.matteryPlayer import ru.dbotthepony.mc.otm.client.minecraft diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/GravitationalDisruptorItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/GravitationalDisruptorItem.kt index 31726c74a..df6c8e937 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/GravitationalDisruptorItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/GravitationalDisruptorItem.kt @@ -8,7 +8,7 @@ import net.minecraft.network.chat.Component import net.minecraft.world.item.Item import net.minecraft.world.item.Rarity import net.minecraft.world.level.Level -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent class GravitationalDisruptorItem : Item(Properties().tab(OverdriveThatMatters.INSTANCE.CREATIVE_TAB).stacksTo(1).rarity(Rarity.EPIC)) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterCapacitorItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterCapacitorItem.kt index 86fef7b4d..d7bdd7b49 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterCapacitorItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterCapacitorItem.kt @@ -14,7 +14,7 @@ import net.minecraftforge.common.capabilities.Capability import net.minecraftforge.common.capabilities.ICapabilityProvider import net.minecraftforge.common.util.LazyOptional import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.matter.IMatterHandler import ru.dbotthepony.mc.otm.capability.matter.MatterDirection diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterDustItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterDustItem.kt index e2bb0dc54..8461b09f3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterDustItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatterDustItem.kt @@ -7,11 +7,11 @@ import net.minecraft.world.item.ItemStack import net.minecraft.world.item.TooltipFlag import net.minecraft.world.level.Level import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.core.ImpreciseFraction import ru.dbotthepony.mc.otm.matter.IMatterItem import ru.dbotthepony.mc.otm.matter.MatterTuple -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set class MatterDustItem : Item(Properties().tab(OverdriveThatMatters.INSTANCE.CREATIVE_TAB).stacksTo(64)), IMatterItem { private fun matter(stack: ItemStack): ImpreciseFraction { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/PatternStorageItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/PatternStorageItem.kt index 8c15cc9e4..d0b542d6d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/PatternStorageItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/PatternStorageItem.kt @@ -14,9 +14,9 @@ import net.minecraft.network.chat.Component import net.minecraft.world.item.Item import net.minecraft.world.level.Level import net.minecraftforge.common.capabilities.Capability -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.capability.matter.* -import ru.dbotthepony.mc.otm.ifHas +import ru.dbotthepony.mc.otm.core.ifHas import java.util.* class PatternStorageItem : Item { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/PillItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/PillItem.kt index 8060e36a6..ac7026454 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/PillItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/PillItem.kt @@ -13,7 +13,7 @@ import net.minecraft.world.item.* import net.minecraft.world.level.Level import net.minecraftforge.common.util.FakePlayer import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.capability.MatteryCapability enum class PillType { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/PortableCondensationDriveItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/PortableCondensationDriveItem.kt index 746d2b61a..fedb6b256 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/PortableCondensationDriveItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/PortableCondensationDriveItem.kt @@ -21,12 +21,10 @@ import net.minecraftforge.event.ForgeEventFactory import net.minecraftforge.eventbus.api.SubscribeEvent import net.minecraftforge.event.entity.player.EntityItemPickupEvent import net.minecraftforge.eventbus.api.EventPriority -import ru.dbotthepony.mc.otm.TextComponent +import ru.dbotthepony.mc.otm.core.TextComponent import ru.dbotthepony.mc.otm.capability.drive.DrivePool import ru.dbotthepony.mc.otm.container.ItemFilter -import ru.dbotthepony.mc.otm.core.ImpreciseFraction -import ru.dbotthepony.mc.otm.ifHas -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.ifHas import java.math.BigInteger import java.util.* diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/PortableGravitationStabilizerItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/PortableGravitationStabilizerItem.kt index bf7522b40..16c39dc80 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/PortableGravitationStabilizerItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/PortableGravitationStabilizerItem.kt @@ -12,7 +12,7 @@ import net.minecraft.world.item.crafting.Ingredient import net.minecraft.world.level.Level import net.minecraftforge.client.extensions.common.IClientItemExtensions import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.client.model.GravitationStabilizerModel import java.util.function.Consumer diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/QuantumBatteryItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/QuantumBatteryItem.kt index 01fada0aa..9915197ba 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/QuantumBatteryItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/QuantumBatteryItem.kt @@ -3,7 +3,6 @@ package ru.dbotthepony.mc.otm.item import net.minecraft.ChatFormatting import net.minecraft.core.Direction import net.minecraft.nbt.CompoundTag -import net.minecraft.nbt.IntTag import net.minecraft.network.chat.Component import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack @@ -13,13 +12,11 @@ import net.minecraft.world.level.Level import net.minecraftforge.common.capabilities.Capability import net.minecraftforge.common.capabilities.ForgeCapabilities import net.minecraftforge.common.capabilities.ICapabilityProvider -import net.minecraftforge.common.util.INBTSerializable import net.minecraftforge.common.util.LazyOptional import ru.dbotthepony.mc.otm.* import ru.dbotthepony.mc.otm.capability.IMatteryEnergyStorage import ru.dbotthepony.mc.otm.capability.MatteryCapability -import ru.dbotthepony.mc.otm.core.ImpreciseFraction -import ru.dbotthepony.mc.otm.core.formatPower +import ru.dbotthepony.mc.otm.core.* import ru.dbotthepony.mc.otm.saveddata.SavedCountingMap import ru.dbotthepony.mc.otm.saveddata.SavedMapDelegate @@ -209,7 +206,8 @@ class QuantumBatteryItem : Item { components.add(TranslatableComponent("otm.item.quantum_battery.creative2").withStyle(ChatFormatting.DARK_GRAY)) } else { components.add(TranslatableComponent("otm.item.power.normal.storage", power.batteryLevel.formatPower(), capacity!!.formatPower()).withStyle(ChatFormatting.GRAY)) - components.add(TranslatableComponent( + components.add( + TranslatableComponent( "otm.item.power.normal.throughput", throughput!!.formatPower(), throughput.formatPower() diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/PlasmaRifleItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/PlasmaRifleItem.kt index f13e00e28..86a5c6de9 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/PlasmaRifleItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/PlasmaRifleItem.kt @@ -10,7 +10,7 @@ import ru.dbotthepony.mc.otm.capability.extractEnergyInnerExact import ru.dbotthepony.mc.otm.core.* import ru.dbotthepony.mc.otm.core.Vector import ru.dbotthepony.mc.otm.entity.PlasmaProjectile -import ru.dbotthepony.mc.otm.position +import ru.dbotthepony.mc.otm.core.position import ru.dbotthepony.mc.otm.registry.MSoundEvents import java.util.* import kotlin.math.PI diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/PlasmaWeaponItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/PlasmaWeaponItem.kt index 8ff4602c0..6dc3909b4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/PlasmaWeaponItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/PlasmaWeaponItem.kt @@ -15,12 +15,9 @@ import net.minecraftforge.common.capabilities.ForgeCapabilities import net.minecraftforge.common.capabilities.ICapabilityProvider import net.minecraftforge.common.util.INBTSerializable import net.minecraftforge.common.util.LazyOptional -import net.minecraftforge.energy.CapabilityEnergy import ru.dbotthepony.mc.otm.* import ru.dbotthepony.mc.otm.capability.* -import ru.dbotthepony.mc.otm.core.ImpreciseFraction -import ru.dbotthepony.mc.otm.core.bezierCurve -import ru.dbotthepony.mc.otm.core.formatPower +import ru.dbotthepony.mc.otm.core.* import ru.dbotthepony.mc.otm.registry.MSoundEvents import kotlin.reflect.KClass diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterRegistry.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterRegistry.kt index a4b47044a..bd5b1915c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterRegistry.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterRegistry.kt @@ -4,14 +4,11 @@ import com.mojang.blaze3d.platform.InputConstants import net.minecraft.ChatFormatting import net.minecraft.client.Minecraft import net.minecraft.network.FriendlyByteBuf -import net.minecraft.server.dedicated.DedicatedServer import net.minecraft.server.level.ServerPlayer import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack import net.minecraftforge.event.entity.player.ItemTooltipEvent import net.minecraftforge.event.entity.player.PlayerEvent -import net.minecraftforge.event.server.ServerStartedEvent -import net.minecraftforge.event.server.ServerStoppingEvent import net.minecraftforge.eventbus.api.SubscribeEvent import net.minecraftforge.network.NetworkEvent import net.minecraftforge.network.PacketDistributor diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/BatteryBankMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/BatteryBankMenu.kt index 9cb34abd8..9cd7da508 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/BatteryBankMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/BatteryBankMenu.kt @@ -7,10 +7,10 @@ import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.block.entity.BatteryBankBlockEntity import net.minecraft.world.SimpleContainer import net.minecraft.world.inventory.Slot -import ru.dbotthepony.mc.otm.ImmutableList +import ru.dbotthepony.mc.otm.core.ImmutableList import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget import ru.dbotthepony.mc.otm.capability.MatteryCapability -import ru.dbotthepony.mc.otm.orNull +import ru.dbotthepony.mc.otm.core.orNull import ru.dbotthepony.mc.otm.registry.MMenus class BatteryBankMenu @JvmOverloads constructor( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/CargoCrateMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/CargoCrateMenu.kt index 01697b220..ca384b4ff 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/CargoCrateMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/CargoCrateMenu.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.menu import net.minecraft.world.SimpleContainer import net.minecraft.world.entity.player.Inventory import net.minecraft.world.entity.player.Player -import ru.dbotthepony.mc.otm.ImmutableList +import ru.dbotthepony.mc.otm.core.ImmutableList import ru.dbotthepony.mc.otm.block.entity.CargoCrateBlockEntity import ru.dbotthepony.mc.otm.registry.MMenus diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveRackMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveRackMenu.kt index 5d2d5451d..c65d34795 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveRackMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveRackMenu.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.menu import net.minecraft.world.SimpleContainer import net.minecraft.world.entity.player.Inventory import net.minecraft.world.inventory.Slot -import ru.dbotthepony.mc.otm.ImmutableList +import ru.dbotthepony.mc.otm.core.ImmutableList import ru.dbotthepony.mc.otm.block.entity.storage.DriveRackBlockEntity import ru.dbotthepony.mc.otm.registry.MMenus diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.kt index f0ba4fe8c..8656ee98d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/DriveViewerMenu.kt @@ -11,7 +11,7 @@ import ru.dbotthepony.mc.otm.block.entity.storage.DriveViewerBlockEntity import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.drive.IMatteryDrive import ru.dbotthepony.mc.otm.container.ItemFilter -import ru.dbotthepony.mc.otm.ifPresentK +import ru.dbotthepony.mc.otm.core.ifPresentK import ru.dbotthepony.mc.otm.item.PortableCondensationDriveItem import ru.dbotthepony.mc.otm.menu.data.INetworkedItemViewProvider import ru.dbotthepony.mc.otm.menu.data.NetworkedItemView diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ItemMonitorMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ItemMonitorMenu.kt index f6a840f38..f19022acb 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ItemMonitorMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ItemMonitorMenu.kt @@ -10,7 +10,7 @@ import net.minecraft.world.item.ItemStack import net.minecraftforge.network.PacketDistributor import ru.dbotthepony.mc.otm.block.entity.storage.ItemMonitorBlockEntity import ru.dbotthepony.mc.otm.block.entity.storage.ItemMonitorPlayerSettings -import ru.dbotthepony.mc.otm.get +import ru.dbotthepony.mc.otm.core.get import ru.dbotthepony.mc.otm.menu.data.INetworkedItemViewProvider import ru.dbotthepony.mc.otm.menu.data.NetworkedItemView import ru.dbotthepony.mc.otm.network.MenuNetworkChannel diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.kt index 44920deb3..242a84bb4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.kt @@ -4,13 +4,13 @@ import net.minecraft.world.SimpleContainer import net.minecraft.world.entity.player.Inventory import net.minecraft.world.inventory.Slot import net.minecraft.world.item.ItemStack -import ru.dbotthepony.mc.otm.ImmutableList +import ru.dbotthepony.mc.otm.core.ImmutableList import ru.dbotthepony.mc.otm.block.entity.matter.MatterBottlerBlockEntity import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.menu.widget.BooleanPlayerInputWidget import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget -import ru.dbotthepony.mc.otm.orNull +import ru.dbotthepony.mc.otm.core.orNull import ru.dbotthepony.mc.otm.registry.MMenus class MatterBottlerMenu @JvmOverloads constructor( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterCapacitorBankMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterCapacitorBankMenu.kt index b20cd9789..e8fa42f17 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterCapacitorBankMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterCapacitorBankMenu.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.menu import net.minecraft.world.SimpleContainer import net.minecraft.world.entity.player.Inventory import net.minecraft.world.inventory.Slot -import ru.dbotthepony.mc.otm.ImmutableList +import ru.dbotthepony.mc.otm.core.ImmutableList import ru.dbotthepony.mc.otm.block.entity.matter.MatterCapacitorBankBlockEntity import ru.dbotthepony.mc.otm.core.ImpreciseFraction import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterDecomposerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterDecomposerMenu.kt index 2d1d57858..38d1f3391 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterDecomposerMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterDecomposerMenu.kt @@ -11,7 +11,7 @@ import net.minecraft.world.inventory.Slot import net.minecraft.world.item.ItemStack import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.matter.canDecompose -import ru.dbotthepony.mc.otm.orNull +import ru.dbotthepony.mc.otm.core.orNull import ru.dbotthepony.mc.otm.registry.MMenus class MatterDecomposerMenu @JvmOverloads constructor( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterReplicatorMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterReplicatorMenu.kt index 73f509ba6..39e16d5d3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterReplicatorMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatterReplicatorMenu.kt @@ -7,7 +7,7 @@ import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget import net.minecraft.world.SimpleContainer import net.minecraft.world.inventory.Slot -import ru.dbotthepony.mc.otm.ImmutableList +import ru.dbotthepony.mc.otm.core.ImmutableList import ru.dbotthepony.mc.otm.registry.MMenus class MatterReplicatorMenu @JvmOverloads constructor( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/PatternStorageMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/PatternStorageMenu.kt index bb64c1874..b26c70b99 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/PatternStorageMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/PatternStorageMenu.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.menu import net.minecraft.world.SimpleContainer import net.minecraft.world.entity.player.Inventory import net.minecraft.world.inventory.Slot -import ru.dbotthepony.mc.otm.ImmutableList +import ru.dbotthepony.mc.otm.core.ImmutableList import ru.dbotthepony.mc.otm.block.entity.PatternStorageBlockEntity import ru.dbotthepony.mc.otm.core.ImpreciseFraction import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/Slots.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/Slots.kt index b0ebffbb5..df7e019eb 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/Slots.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/Slots.kt @@ -7,7 +7,7 @@ import net.minecraftforge.common.capabilities.ForgeCapabilities import net.minecraftforge.energy.CapabilityEnergy import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.matter.MatterDirection -import ru.dbotthepony.mc.otm.ifPresentK +import ru.dbotthepony.mc.otm.core.ifPresentK open class MatterySlot @JvmOverloads constructor(p_40223_: Container, index: Int, x: Int = 0, y: Int = 0) : Slot(p_40223_, index, x, y) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/data/NetworkedItemView.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/data/NetworkedItemView.kt index f13cadc5b..1da47bdb9 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/data/NetworkedItemView.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/data/NetworkedItemView.kt @@ -17,7 +17,7 @@ import ru.dbotthepony.mc.otm.core.readBigInteger import ru.dbotthepony.mc.otm.core.writeBigInteger import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.network.* -import ru.dbotthepony.mc.otm.registryName +import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.storage.* import java.math.BigInteger import java.util.* diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/FieldSynchronizer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/FieldSynchronizer.kt index d7943d2bb..6ad6e783b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/FieldSynchronizer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/FieldSynchronizer.kt @@ -2,10 +2,7 @@ package ru.dbotthepony.mc.otm.network import it.unimi.dsi.fastutil.io.FastByteArrayOutputStream import net.minecraft.world.item.ItemStack -import ru.dbotthepony.mc.otm.* -import ru.dbotthepony.mc.otm.core.ImpreciseFraction -import ru.dbotthepony.mc.otm.core.readImpreciseFraction -import ru.dbotthepony.mc.otm.core.writeImpreciseFraction +import ru.dbotthepony.mc.otm.core.* import java.io.DataInputStream import java.io.DataOutputStream import java.io.InputStream @@ -13,8 +10,6 @@ import java.math.BigDecimal import java.util.* import kotlin.collections.ArrayList import kotlin.properties.ReadWriteProperty -import kotlin.reflect.KClass -import kotlin.reflect.KMutableProperty import kotlin.reflect.KMutableProperty0 import kotlin.reflect.KProperty diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/Helpers.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/Helpers.kt index 613795358..b4a9b54ca 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/Helpers.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/Helpers.kt @@ -7,8 +7,8 @@ import net.minecraft.resources.ResourceLocation import net.minecraft.world.item.ItemStack import net.minecraft.world.item.Items import net.minecraftforge.registries.ForgeRegistries -import ru.dbotthepony.mc.otm.registryName -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.core.set fun stackFromJson(obj: JsonElement, field: String = ""): ItemStack { if (obj is JsonPrimitive) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PlatePressRecipe.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PlatePressRecipe.kt index e4e7dfd37..88e403183 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PlatePressRecipe.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PlatePressRecipe.kt @@ -15,10 +15,9 @@ import net.minecraft.world.level.Level import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.block.entity.PlatePressBlockEntity -import ru.dbotthepony.mc.otm.get -import ru.dbotthepony.mc.otm.registry.MNames +import ru.dbotthepony.mc.otm.core.get import ru.dbotthepony.mc.otm.registry.MRecipes -import ru.dbotthepony.mc.otm.registryName +import ru.dbotthepony.mc.otm.core.registryName class PlatePressRecipe( private val id: ResourceLocation, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/AndroidResearch.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/AndroidResearch.kt index 956568741..96a1978a1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/AndroidResearch.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/AndroidResearch.kt @@ -8,8 +8,8 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext import net.minecraftforge.registries.DeferredRegister import net.minecraftforge.registries.RegistryObject import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.TextComponent -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TextComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.android.AndroidResearchBuilder import ru.dbotthepony.mc.otm.android.AndroidResearchType import ru.dbotthepony.mc.otm.android.feature.NanobotsArmor diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/DamageSources.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/DamageSources.kt index e2c54aa84..ed4425028 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/DamageSources.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/DamageSources.kt @@ -6,7 +6,7 @@ import net.minecraft.world.entity.Entity import net.minecraft.world.entity.LivingEntity import net.minecraft.world.item.ItemStack import net.minecraft.world.phys.Vec3 -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent class ImmutableDamageSource(private val parent: DamageSource) : DamageSource(parent.msgId) { override fun equals(other: Any?): Boolean { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt index 0cd5bfc60..8400e18a8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt @@ -14,7 +14,7 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext import net.minecraftforge.registries.DeferredRegister import net.minecraftforge.registries.ForgeRegistries import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.TranslatableComponent +import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.core.ImpreciseFraction import ru.dbotthepony.mc.otm.item.* import ru.dbotthepony.mc.otm.item.weapon.PlasmaRifleItem diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/saveddata/SavedCountingMap.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/saveddata/SavedCountingMap.kt index 39c570b7d..60031c7de 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/saveddata/SavedCountingMap.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/saveddata/SavedCountingMap.kt @@ -8,7 +8,7 @@ import net.minecraft.nbt.ListTag import net.minecraft.nbt.Tag import net.minecraft.world.level.saveddata.SavedData import org.apache.logging.log4j.LogManager -import ru.dbotthepony.mc.otm.set +import ru.dbotthepony.mc.otm.core.set class SavedMapDelegate(val parent: SavedCountingMap>?, val index: Int, value: V) { constructor(value: V) : this(null, -1, value) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/storage/ItemStackWrapper.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/storage/ItemStackWrapper.kt index c8c046fa2..4ba6e3e5d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/storage/ItemStackWrapper.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/storage/ItemStackWrapper.kt @@ -1,13 +1,10 @@ package ru.dbotthepony.mc.otm.storage import net.minecraft.network.FriendlyByteBuf -import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack -import net.minecraftforge.registries.ForgeRegistries -import net.minecraftforge.registries.ForgeRegistry import org.jetbrains.annotations.ApiStatus import ru.dbotthepony.mc.otm.core.* -import ru.dbotthepony.mc.otm.registryName +import ru.dbotthepony.mc.otm.core.registryName import java.math.BigInteger /** diff --git a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/FriendlyStreams.kt b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/FriendlyStreams.kt index 1d5fcc692..61525fff7 100644 --- a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/FriendlyStreams.kt +++ b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/FriendlyStreams.kt @@ -5,10 +5,10 @@ import it.unimi.dsi.fastutil.io.FastByteArrayOutputStream import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test -import ru.dbotthepony.mc.otm.readInt -import ru.dbotthepony.mc.otm.readVarIntLE -import ru.dbotthepony.mc.otm.writeInt -import ru.dbotthepony.mc.otm.writeVarIntLE +import ru.dbotthepony.mc.otm.core.readInt +import ru.dbotthepony.mc.otm.core.readVarIntLE +import ru.dbotthepony.mc.otm.core.writeInt +import ru.dbotthepony.mc.otm.core.writeVarIntLE object FriendlyStreams { @Test