diff --git a/gradle.properties b/gradle.properties index ef09c8011..e0e6236bb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,7 @@ mixin_version=0.8.5 neogradle.subsystems.parchment.minecraftVersion=1.21.1 neogradle.subsystems.parchment.mappingsVersion=2024.11.17 -kommons_version=3.6.0 +kommons_version=3.9.1 caffeine_cache_version=3.1.5 jei_version=19.16.4.171 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 5817f4177..ac855ec46 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt @@ -24,17 +24,17 @@ import net.neoforged.neoforge.data.event.GatherDataEvent import net.neoforged.neoforge.registries.NeoForgeRegistries import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.player.android.AndroidResearchDataProvider -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.math.yRotationBlockstateNorth -import ru.dbotthepony.mc.otm.core.util.WriteOnce +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.math.yRotationBlockstateNorth +import ru.dbotthepony.mc.otm.util.WriteOnce import ru.dbotthepony.mc.otm.datagen.blocks.BatteryBankProvider import ru.dbotthepony.mc.otm.datagen.blocks.MatterBankProvider import ru.dbotthepony.mc.otm.datagen.blocks.MatteryBlockStateProvider import ru.dbotthepony.mc.otm.datagen.items.MatteryItemModelProvider import ru.dbotthepony.mc.otm.datagen.lang.AddEnglishLanguage import ru.dbotthepony.mc.otm.datagen.models.MatteryBlockModelProvider -import ru.dbotthepony.mc.otm.core.registryName -import ru.dbotthepony.mc.otm.core.util.GJRAND64RandomSource +import ru.dbotthepony.mc.otm.util.registryName +import ru.dbotthepony.mc.otm.util.GJRAND64RandomSource import ru.dbotthepony.mc.otm.data.FlywheelMaterialDataProvider import ru.dbotthepony.mc.otm.datagen.advancements.addAdvancements import ru.dbotthepony.mc.otm.datagen.advancements.addAndroidAdvancements diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt index 249085671..4f8c8c4fc 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt @@ -9,11 +9,11 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties import net.neoforged.neoforge.client.model.generators.BlockModelBuilder import net.neoforged.neoforge.client.model.generators.ConfiguredModel import net.neoforged.neoforge.client.model.generators.ModelFile -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom -import ru.dbotthepony.mc.otm.core.math.xRotationBlockstateNorth -import ru.dbotthepony.mc.otm.core.math.yRotationBlockstateNorth -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.math.xRotationBlockstateNorth +import ru.dbotthepony.mc.otm.util.math.yRotationBlockstateNorth +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.blocks.MatteryBlockStateProvider import ru.dbotthepony.mc.otm.datagen.items.MatteryItemModelProvider import ru.dbotthepony.mc.otm.datagen.models.MatteryBlockModelProvider diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/FlywheelData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/FlywheelData.kt index 7944ca425..b53854fb2 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/FlywheelData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/FlywheelData.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.datagen import net.neoforged.neoforge.common.Tags -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.data.FlywheelMaterialDataProvider import ru.dbotthepony.mc.otm.registry.MBlockTags diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/MatterData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/MatterData.kt index 7958800d9..d7dbe0b7c 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/MatterData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/MatterData.kt @@ -4,7 +4,7 @@ import net.minecraft.tags.ItemTags import net.minecraft.world.item.Item import net.minecraft.world.item.Items import net.neoforged.neoforge.common.Tags -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.matter.MatterDataProvider import ru.dbotthepony.mc.otm.registry.MItemTags import ru.dbotthepony.mc.otm.registry.game.MItems diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/ResearchData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/ResearchData.kt index 387c7a582..12dbc6f87 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/ResearchData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/ResearchData.kt @@ -8,8 +8,8 @@ import ru.dbotthepony.mc.otm.player.android.AndroidResearchDescriptions import ru.dbotthepony.mc.otm.player.android.AndroidResearchResults import ru.dbotthepony.mc.otm.player.android.AndroidResearchType import ru.dbotthepony.mc.otm.client.render.ResearchIcons -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.datagen.lang.MatteryLanguageProvider import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures import ru.dbotthepony.mc.otm.registry.MItemTags diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/WorldGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/WorldGen.kt index 533ebfc19..e49860a01 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/WorldGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/WorldGen.kt @@ -25,7 +25,7 @@ import net.minecraft.world.level.levelgen.placement.RarityFilter import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest import net.neoforged.neoforge.common.world.BiomeModifier import net.neoforged.neoforge.registries.NeoForgeRegistries -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.data.world.BooleanProvider import ru.dbotthepony.mc.otm.data.world.OneOfFloatProvider import ru.dbotthepony.mc.otm.registry.MRegistries diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AdvancementData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AdvancementData.kt index e25459b5a..bf6eea17a 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AdvancementData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AdvancementData.kt @@ -7,7 +7,7 @@ import net.minecraft.advancements.AdvancementType import net.minecraft.advancements.critereon.InventoryChangeTrigger import net.minecraft.world.item.DyeColor import net.minecraft.world.item.ItemStack -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.lang.MatteryLanguageProvider import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.registry.MItemTags diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/Helpers.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/Helpers.kt index d68c23aae..0a0552cff 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/Helpers.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/Helpers.kt @@ -18,7 +18,7 @@ import net.minecraft.tags.TagKey import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack import net.minecraft.world.level.ItemLike -import ru.dbotthepony.mc.otm.core.TextComponent +import ru.dbotthepony.mc.otm.util.TextComponent import ru.dbotthepony.mc.otm.datagen.modLocation import java.util.function.Consumer diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt index 2c816b4a3..dea7f5d24 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt @@ -7,9 +7,9 @@ import net.minecraft.advancements.critereon.ItemPredicate import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack import net.minecraft.world.item.Items -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.key -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.key +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.lang.MatteryLanguageProvider import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.registry.game.MItems diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/Banks.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/Banks.kt index 542aeab1a..2a3097aa5 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/Banks.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/Banks.kt @@ -5,9 +5,9 @@ import net.minecraft.world.level.block.Block import net.neoforged.neoforge.client.model.generators.BlockStateProvider import net.neoforged.neoforge.client.model.generators.ConfiguredModel import net.neoforged.neoforge.data.event.GatherDataEvent -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom -import ru.dbotthepony.mc.otm.core.math.yRotationBlockstateNorth +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.math.yRotationBlockstateNorth import ru.dbotthepony.mc.otm.datagen.DataGen import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.registry.game.MBlocks diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt index 13b574356..58a80a8db 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt @@ -9,14 +9,14 @@ import ru.dbotthepony.mc.otm.block.entity.WorkerState import ru.dbotthepony.mc.otm.block.matter.MatterBottlerBlock import ru.dbotthepony.mc.otm.block.tech.AndroidChargerBlock import ru.dbotthepony.mc.otm.block.tech.EssenceStorageBlock -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom -import ru.dbotthepony.mc.otm.core.math.xRotationBlockstateNorth -import ru.dbotthepony.mc.otm.core.math.xRotationBlockstateSouth -import ru.dbotthepony.mc.otm.core.math.yRotationBlockstateNorth -import ru.dbotthepony.mc.otm.core.math.yRotationBlockstateSouth -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.math.xRotationBlockstateNorth +import ru.dbotthepony.mc.otm.util.math.xRotationBlockstateSouth +import ru.dbotthepony.mc.otm.util.math.yRotationBlockstateNorth +import ru.dbotthepony.mc.otm.util.math.yRotationBlockstateSouth +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.registry.game.MBlocks import ru.dbotthepony.mc.otm.registry.MNames diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/ComplexBlockStates.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/ComplexBlockStates.kt index a008dd8e3..809965eb5 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/ComplexBlockStates.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/ComplexBlockStates.kt @@ -5,9 +5,9 @@ import ru.dbotthepony.mc.otm.block.tech.EnergyCounterBlock import ru.dbotthepony.mc.otm.block.entity.WorkerState import ru.dbotthepony.mc.otm.block.matter.PatternStorageBlock import ru.dbotthepony.mc.otm.block.storage.DriveViewerBlock -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom -import ru.dbotthepony.mc.otm.core.math.yRotationBlockstateNorth -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.math.yRotationBlockstateNorth +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.registry.game.MBlocks 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 434aa56ed..e2551b46b 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 @@ -9,11 +9,11 @@ import net.neoforged.neoforge.client.model.generators.BlockStateProvider import net.neoforged.neoforge.client.model.generators.ConfiguredModel import net.neoforged.neoforge.data.event.GatherDataEvent import ru.dbotthepony.mc.otm.block.entity.WorkerState -import ru.dbotthepony.mc.otm.core.getValueNullable -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom -import ru.dbotthepony.mc.otm.core.math.xRotationBlockstateNorth -import ru.dbotthepony.mc.otm.core.math.yRotationBlockstateNorth -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.getValueNullable +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.math.xRotationBlockstateNorth +import ru.dbotthepony.mc.otm.util.math.yRotationBlockstateNorth +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.DataGen import ru.dbotthepony.mc.otm.datagen.modLocation import java.util.* diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt index 94c9b76ab..433ac243f 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt @@ -1,8 +1,8 @@ package ru.dbotthepony.mc.otm.datagen.items import net.minecraft.world.item.DyeColor -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.registry.game.MItems import ru.dbotthepony.mc.otm.registry.MRegistry 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 e4fd7ba3b..a29a176f6 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 @@ -9,8 +9,8 @@ import net.minecraft.world.item.Item import net.neoforged.neoforge.client.model.generators.ItemModelProvider import net.neoforged.neoforge.data.event.GatherDataEvent import org.apache.logging.log4j.LogManager -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.DataGen import ru.dbotthepony.mc.otm.datagen.modLocation import java.util.LinkedList diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/MatteryLanguageProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/MatteryLanguageProvider.kt index 7aabd86cc..483768934 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/MatteryLanguageProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/MatteryLanguageProvider.kt @@ -17,7 +17,7 @@ import net.neoforged.neoforge.common.data.LanguageProvider import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.player.android.AndroidFeatureType import ru.dbotthepony.mc.otm.player.android.AndroidResearchType -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.datagen.DataGen import ru.dbotthepony.mc.otm.registry.objects.ColoredDecorativeBlock diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootModifiersData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootModifiersData.kt index d186819db..9c8e40ffa 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootModifiersData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootModifiersData.kt @@ -11,8 +11,8 @@ import net.minecraft.world.level.storage.loot.LootTable import net.minecraft.world.level.storage.loot.predicates.LootItemCondition import net.neoforged.neoforge.common.loot.AddTableLootModifier import net.neoforged.neoforge.common.loot.LootTableIdCondition -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.data.world.UniformDecimal import ru.dbotthepony.mc.otm.data.condition.ChanceWithPlaytimeCondition import ru.dbotthepony.mc.otm.data.condition.HasExoPackCondition diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTables.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTables.kt index 2adc06560..e3c32e8af 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTables.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTables.kt @@ -8,7 +8,6 @@ import it.unimi.dsi.fastutil.objects.Reference2ObjectFunction import net.minecraft.advancements.critereon.StatePropertiesPredicate import net.minecraft.core.HolderLookup import net.minecraft.core.WritableRegistry -import net.minecraft.data.DataGenerator import net.minecraft.data.loot.LootTableProvider import net.minecraft.data.loot.LootTableSubProvider import net.minecraft.resources.ResourceKey @@ -28,7 +27,7 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets import net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition import net.minecraft.world.level.storage.loot.providers.number.ConstantValue import net.neoforged.neoforge.data.event.GatherDataEvent -import ru.dbotthepony.mc.otm.core.stream +import ru.dbotthepony.kommons.collect.stream import ru.dbotthepony.mc.otm.data.loot.CopyTileNbtFunction import java.util.concurrent.CompletableFuture diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt index 29b378bf5..74e28de18 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.datagen.loot import net.minecraft.util.valueproviders.UniformInt import net.minecraft.world.item.Items import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.data.world.UniformDecimal import ru.dbotthepony.mc.otm.datagen.modLootTable import ru.dbotthepony.mc.otm.item.ProceduralBatteryItem diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt index a6904cc36..33e8e22c5 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt @@ -15,7 +15,7 @@ import net.minecraft.world.level.storage.loot.functions.ApplyBonusCount import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction import net.minecraft.world.level.storage.loot.predicates.ExplosionCondition import net.minecraft.world.level.storage.loot.predicates.MatchTool -import ru.dbotthepony.mc.otm.core.lookupOrThrow +import ru.dbotthepony.mc.otm.util.lookupOrThrow import ru.dbotthepony.mc.otm.data.loot.Int2NumberProvider import ru.dbotthepony.mc.otm.registry.game.MBlocks import ru.dbotthepony.mc.otm.registry.game.MItems diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/VaultLoot.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/VaultLoot.kt index 60513be93..35020940b 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/VaultLoot.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/VaultLoot.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.datagen.loot import net.minecraft.util.valueproviders.UniformInt import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.data.world.UniformDecimal import ru.dbotthepony.mc.otm.datagen.modLootTable import ru.dbotthepony.mc.otm.item.ProceduralBatteryItem 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 c86b884e0..2ce24689f 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 @@ -6,7 +6,7 @@ import net.minecraft.world.level.block.WaterloggedTransparentBlock import net.neoforged.neoforge.client.model.generators.BlockModelProvider import net.neoforged.neoforge.data.event.GatherDataEvent import ru.dbotthepony.mc.otm.datagen.DataGen -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.modLocation import java.util.LinkedList diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CookingRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CookingRecipes.kt index ea5a775a1..9bfd82fb3 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CookingRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CookingRecipes.kt @@ -8,7 +8,7 @@ import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack import net.minecraft.world.item.crafting.Ingredient import net.minecraft.world.level.ItemLike -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.registry.MItemTags import ru.dbotthepony.mc.otm.registry.game.MItems 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 85a152684..a6a58bfbc 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 @@ -13,12 +13,12 @@ import net.neoforged.neoforge.common.conditions.NotCondition import net.neoforged.neoforge.common.conditions.TagEmptyCondition import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity import ru.dbotthepony.mc.otm.config.CablesConfig -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.registry.game.MBlocks import ru.dbotthepony.mc.otm.registry.MItemTags import ru.dbotthepony.mc.otm.registry.game.MItems import ru.dbotthepony.mc.otm.registry.MRegistry -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.recipe.UpgradeRecipe diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt index f4bf0eb48..ca9dab5b8 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt @@ -8,7 +8,7 @@ import net.minecraft.world.item.Items import net.minecraft.world.item.crafting.Ingredient import net.minecraft.world.level.ItemLike import net.neoforged.neoforge.common.Tags -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.registry.game.MBlocks import ru.dbotthepony.mc.otm.registry.MItemTags diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatterEntanglerRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatterEntanglerRecipes.kt index d57c2ee3d..3de9615db 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatterEntanglerRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatterEntanglerRecipes.kt @@ -6,7 +6,7 @@ import net.minecraft.world.item.ItemStack import net.minecraft.world.item.crafting.Ingredient import net.minecraft.world.item.crafting.ShapedRecipePattern import net.neoforged.neoforge.common.Tags -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.recipe.MatterEntanglerRecipe import ru.dbotthepony.mc.otm.registry.MItemTags 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 4e78d5d12..d4c74e443 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 @@ -17,7 +17,7 @@ import net.minecraft.world.item.crafting.ShapedRecipe import net.minecraft.world.level.ItemLike import net.neoforged.neoforge.common.conditions.ICondition import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.recipe.UpgradeRecipe diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt index c0d019828..86cc8ac03 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/MatteryRecipeProvider.kt @@ -24,8 +24,8 @@ import net.minecraft.world.item.crafting.ShapedRecipePattern import net.minecraft.world.level.ItemLike import net.neoforged.neoforge.common.conditions.ICondition import net.neoforged.neoforge.data.event.GatherDataEvent -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.recipe.MicrowaveRecipe import ru.dbotthepony.mc.otm.recipe.PlatePressRecipe diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt index 62d0063f1..58dfc387d 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt @@ -13,7 +13,7 @@ import net.minecraft.world.item.Items import net.minecraft.world.item.crafting.Ingredient import net.neoforged.fml.ModList import net.neoforged.neoforge.common.conditions.ModLoadedCondition -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.recipe.PainterArmorDyeRecipe import ru.dbotthepony.mc.otm.recipe.PainterRecipe diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ShapelessRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ShapelessRecipes.kt index cfbda0e05..4ea181f69 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ShapelessRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/ShapelessRecipes.kt @@ -11,7 +11,7 @@ import net.minecraft.world.item.Items import net.minecraft.world.item.crafting.Ingredient import net.minecraft.world.level.ItemLike import net.neoforged.neoforge.common.Tags -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.registry.MItemTags import ru.dbotthepony.mc.otm.registry.game.MItems diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/SuspiciousRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/SuspiciousRecipes.kt index e8b38fc4a..0953289be 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/SuspiciousRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/SuspiciousRecipes.kt @@ -7,7 +7,7 @@ import net.minecraft.data.recipes.SimpleCookingRecipeBuilder import net.minecraft.world.item.ItemStack import net.minecraft.world.item.crafting.Ingredient import net.neoforged.neoforge.common.Tags -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.registry.game.MItems diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt index 6f0af90f0..f83635cd4 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt @@ -6,7 +6,7 @@ import net.minecraft.world.effect.MobEffects import net.minecraft.world.item.Items import net.neoforged.neoforge.common.Tags import ru.dbotthepony.kommons.collect.flatMap -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.registry.MBlockTags import ru.dbotthepony.mc.otm.registry.game.MBlocks import ru.dbotthepony.mc.otm.registry.game.MFluids diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt index a46d37997..763ba98c9 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt @@ -20,7 +20,7 @@ import net.neoforged.neoforge.common.Tags import net.neoforged.neoforge.data.event.GatherDataEvent import net.neoforged.neoforge.registries.NeoForgeRegistries import ru.dbotthepony.mc.otm.player.MatteryPlayer -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.datagen.DataGen import java.util.EnumMap import java.util.stream.Stream diff --git a/src/main/java/ru/dbotthepony/mc/otm/mixin/BlockEntityMixin.java b/src/main/java/ru/dbotthepony/mc/otm/mixin/BlockEntityMixin.java index baeaf78c9..b2a36d849 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/mixin/BlockEntityMixin.java +++ b/src/main/java/ru/dbotthepony/mc/otm/mixin/BlockEntityMixin.java @@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import ru.dbotthepony.mc.otm.core.multiblock.GlobalBlockEntityRemovalListener; +import ru.dbotthepony.mc.otm.multiblock.GlobalBlockEntityRemovalListener; // because i know // someone diff --git a/src/main/java/ru/dbotthepony/mc/otm/mixin/LevelMixin.java b/src/main/java/ru/dbotthepony/mc/otm/mixin/LevelMixin.java index 9930b5a28..442caca8b 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/mixin/LevelMixin.java +++ b/src/main/java/ru/dbotthepony/mc/otm/mixin/LevelMixin.java @@ -5,8 +5,8 @@ import net.minecraft.world.level.Level; import net.neoforged.fml.ModList; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; -import ru.dbotthepony.mc.otm.core.IMatteryLevel; -import ru.dbotthepony.mc.otm.core.util.GJRAND64RandomSource; +import ru.dbotthepony.mc.otm.util.IMatteryLevel; +import ru.dbotthepony.mc.otm.util.GJRAND64RandomSource; @Mixin(Level.class) public abstract class LevelMixin implements IMatteryLevel { diff --git a/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinAbstractHurtingProjectile.java b/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinAbstractHurtingProjectile.java index a91002d1d..23de9cd3d 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinAbstractHurtingProjectile.java +++ b/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinAbstractHurtingProjectile.java @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import ru.dbotthepony.mc.otm.player.IMatteryPlayer; -import ru.dbotthepony.mc.otm.core.IMatteryLevel; +import ru.dbotthepony.mc.otm.util.IMatteryLevel; import ru.dbotthepony.mc.otm.registry.game.MSoundEvents; @Mixin(AbstractHurtingProjectile.class) diff --git a/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinLivingEntity.java b/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinLivingEntity.java index 23a6aafc4..8389723e2 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinLivingEntity.java +++ b/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinLivingEntity.java @@ -13,8 +13,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import ru.dbotthepony.mc.otm.player.IMatteryPlayer; import ru.dbotthepony.mc.otm.config.ServerConfig; -import ru.dbotthepony.mc.otm.core.util.ExperienceUtilsKt; import ru.dbotthepony.mc.otm.registry.game.MItems; +import ru.dbotthepony.mc.otm.util.ExperienceUtilsKt; @SuppressWarnings("ConstantConditions") @Mixin(LivingEntity.class) diff --git a/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShape.java b/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShape.java index daadec952..488f26212 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShape.java +++ b/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShape.java @@ -5,7 +5,7 @@ import net.minecraft.core.Direction; import net.minecraft.world.phys.shapes.BooleanOp; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import ru.dbotthepony.mc.otm.core.math.BlockRotation; +import ru.dbotthepony.mc.otm.util.math.BlockRotation; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/GlobalEventHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/GlobalEventHandler.kt index a2ab1da3f..0ac9c1136 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/GlobalEventHandler.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/GlobalEventHandler.kt @@ -19,12 +19,12 @@ import net.neoforged.neoforge.event.tick.ServerTickEvent import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.capability.AbstractProfiledStorage import ru.dbotthepony.mc.otm.client.minecraft -import ru.dbotthepony.mc.otm.core.collect.WeakHashSet -import ru.dbotthepony.mc.otm.core.util.AtomicallyInvalidatedLazy -import ru.dbotthepony.mc.otm.core.util.GJRAND64RandomSource -import ru.dbotthepony.mc.otm.core.util.IConditionalTickable -import ru.dbotthepony.mc.otm.core.util.ITickable -import ru.dbotthepony.mc.otm.core.util.TickList +import ru.dbotthepony.mc.otm.util.collect.WeakHashSet +import ru.dbotthepony.mc.otm.util.AtomicallyInvalidatedLazy +import ru.dbotthepony.mc.otm.util.GJRAND64RandomSource +import ru.dbotthepony.mc.otm.util.IConditionalTickable +import ru.dbotthepony.mc.otm.util.ITickable +import ru.dbotthepony.mc.otm.util.TickList import ru.dbotthepony.mc.otm.graph.GraphNodeList import java.lang.ref.Cleaner import java.util.* diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/SystemTime.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/SystemTime.kt index 2f831c00b..e4876a7ed 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/SystemTime.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/SystemTime.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm import net.minecraft.util.TimeSource -import ru.dbotthepony.mc.otm.core.util.formatTickDuration +import ru.dbotthepony.mc.otm.util.formatTickDuration import java.util.function.LongSupplier /** diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/MatteryBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/MatteryBlock.kt index ffe8b684a..c0e208ba6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/MatteryBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/MatteryBlock.kt @@ -36,16 +36,16 @@ import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.block.entity.IRedstoneControlled import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity import ru.dbotthepony.mc.otm.block.entity.WorkerState -import ru.dbotthepony.mc.otm.core.TooltipList -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.asSupplier -import ru.dbotthepony.mc.otm.core.collect.SupplierMap -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom -import ru.dbotthepony.mc.otm.core.math.component1 -import ru.dbotthepony.mc.otm.core.math.component2 -import ru.dbotthepony.mc.otm.core.math.component3 -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.TooltipList +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.asSupplier +import ru.dbotthepony.mc.otm.util.collect.SupplierMap +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.math.component1 +import ru.dbotthepony.mc.otm.util.math.component2 +import ru.dbotthepony.mc.otm.util.math.component3 +import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.once import java.util.concurrent.Callable import java.util.function.Function diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/RotatableMatteryBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/RotatableMatteryBlock.kt index 0ada6df7d..e589eb94e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/RotatableMatteryBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/RotatableMatteryBlock.kt @@ -6,9 +6,9 @@ import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.Rotation import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.block.state.StateDefinition -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotation -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotation +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom open class RotatableMatteryBlock(properties: Properties = DEFAULT_PROPERTIES) : MatteryBlock(properties) { init { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/CargoCrateBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/CargoCrateBlock.kt index 09826b342..5d8dbcf8e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/CargoCrateBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/CargoCrateBlock.kt @@ -19,7 +19,7 @@ import net.minecraft.world.phys.shapes.Shapes import net.minecraft.world.phys.shapes.VoxelShape import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.decorative.CargoCrateBlockEntity -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.shapes.BlockShapes class CargoCrateBlock(val color: DyeColor?) : RotatableMatteryBlock( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/ComputerTerminalBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/ComputerTerminalBlock.kt index c51b064ce..643433e39 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/ComputerTerminalBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/ComputerTerminalBlock.kt @@ -4,15 +4,12 @@ import net.minecraft.ChatFormatting import net.minecraft.core.BlockPos import net.minecraft.core.Direction import net.minecraft.server.level.ServerLevel -import net.minecraft.sounds.SoundEvent import net.minecraft.sounds.SoundEvents import net.minecraft.sounds.SoundSource import net.minecraft.util.RandomSource -import net.minecraft.util.StringRepresentable import net.minecraft.world.InteractionResult import net.minecraft.world.entity.player.Player import net.minecraft.world.item.DyeColor -import net.minecraft.world.item.context.BlockPlaceContext import net.minecraft.world.level.BlockGetter import net.minecraft.world.level.Level import net.minecraft.world.level.block.Block @@ -28,10 +25,10 @@ import net.minecraft.world.phys.shapes.CollisionContext import net.minecraft.world.phys.shapes.VoxelShape import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.plus -import ru.dbotthepony.mc.otm.core.set +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.plus +import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.item.tool.RedstoneInteractorItem import ru.dbotthepony.mc.otm.shapes.BlockShapes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/EngineBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/EngineBlock.kt index 0e8270f7f..8d2710f08 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/EngineBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/EngineBlock.kt @@ -14,9 +14,9 @@ import net.minecraft.world.level.material.PushReaction import net.minecraft.world.phys.shapes.CollisionContext import net.minecraft.world.phys.shapes.VoxelShape import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom import ru.dbotthepony.mc.otm.shapes.BlockShapes class EngineBlock : RotatableMatteryBlock(Properties.of().mapColor(MapColor.COLOR_ORANGE).sound(SoundType.VAULT).explosionResistance(14f).destroyTime(2.5f).requiresCorrectToolForDrops().pushReaction(PushReaction.NORMAL)) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/FluidTankBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/FluidTankBlock.kt index 0b059e733..82ab1f6fd 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/FluidTankBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/FluidTankBlock.kt @@ -2,7 +2,6 @@ package ru.dbotthepony.mc.otm.block.decorative import net.minecraft.core.BlockPos import net.minecraft.world.InteractionHand -import net.minecraft.world.InteractionResult import net.minecraft.world.ItemInteractionResult import net.minecraft.world.entity.player.Player import net.minecraft.world.item.ItemStack @@ -20,7 +19,7 @@ import net.neoforged.neoforge.fluids.FluidUtil import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.decorative.FluidTankBlockEntity import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.shapes.BlockShapes class FluidTankBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/GrillBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/GrillBlock.kt index e11287d5f..bdbf55b5c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/GrillBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/GrillBlock.kt @@ -19,10 +19,10 @@ import net.minecraft.world.level.block.state.properties.EnumProperty import net.minecraft.world.level.material.MapColor import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.decorative.GrillBlockEntity -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.component1 -import ru.dbotthepony.mc.otm.core.math.component2 -import ru.dbotthepony.mc.otm.core.math.component3 +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.component1 +import ru.dbotthepony.mc.otm.util.math.component2 +import ru.dbotthepony.mc.otm.util.math.component3 import kotlin.math.absoluteValue class GrillBlock(val color: DyeColor?) : RotatableMatteryBlock(Properties.of().mapColor(color?.mapColor ?: MapColor.METAL).destroyTime(0.75f).explosionResistance(10.0f)), EntityBlock { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/HoloSignBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/HoloSignBlock.kt index 6f878c493..0e9ec559e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/HoloSignBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/HoloSignBlock.kt @@ -9,8 +9,8 @@ import net.minecraft.world.phys.shapes.CollisionContext import net.minecraft.world.phys.shapes.VoxelShape import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.decorative.HoloSignBlockEntity -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom import ru.dbotthepony.mc.otm.shapes.BlockShapes class HoloSignBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/InfiniteWaterSourceBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/InfiniteWaterSourceBlock.kt index e213743bf..7c8a661d1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/InfiniteWaterSourceBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/InfiniteWaterSourceBlock.kt @@ -2,7 +2,6 @@ package ru.dbotthepony.mc.otm.block.decorative import net.minecraft.core.BlockPos import net.minecraft.world.InteractionHand -import net.minecraft.world.InteractionResult import net.minecraft.world.ItemInteractionResult import net.minecraft.world.entity.player.Player import net.minecraft.world.item.ItemStack @@ -23,7 +22,7 @@ import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.entity.decorative.InfiniteWaterSourceBlockEntity import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.shapes.BlockShapes class InfiniteWaterSourceBlock : RotatableMatteryBlock( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/LaboratoryLamp.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/LaboratoryLamp.kt index a740b7173..cc4fbf8ec 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/LaboratoryLamp.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/LaboratoryLamp.kt @@ -20,11 +20,11 @@ import net.minecraft.world.phys.shapes.CollisionContext import net.minecraft.world.phys.shapes.Shapes import net.minecraft.world.phys.shapes.VoxelShape import ru.dbotthepony.mc.otm.config.ServerConfig -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom -import ru.dbotthepony.mc.otm.core.math.blockRotation -import ru.dbotthepony.mc.otm.core.math.plus +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.math.blockRotation +import ru.dbotthepony.mc.otm.util.math.plus import ru.dbotthepony.mc.otm.once import ru.dbotthepony.mc.otm.registry.game.MBlocks diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/PainterBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/PainterBlock.kt index 5aa3710e0..7afc3648d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/PainterBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/PainterBlock.kt @@ -2,7 +2,6 @@ package ru.dbotthepony.mc.otm.block.decorative import net.minecraft.core.BlockPos import net.minecraft.world.InteractionHand -import net.minecraft.world.InteractionResult import net.minecraft.world.ItemInteractionResult import net.minecraft.world.entity.player.Player import net.minecraft.world.item.ItemStack @@ -20,7 +19,7 @@ import net.neoforged.neoforge.fluids.FluidUtil import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.decorative.PainterBlockEntity import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.shapes.BlockShapes class PainterBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/StarChairBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/StarChairBlock.kt index 1485e73b5..cc3a70d4b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/StarChairBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/StarChairBlock.kt @@ -14,10 +14,10 @@ import net.minecraft.world.phys.shapes.VoxelShape import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.AABB -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom -import ru.dbotthepony.mc.otm.core.math.plus +import ru.dbotthepony.mc.otm.util.AABB +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.math.plus import ru.dbotthepony.mc.otm.entity.RideableDummy import ru.dbotthepony.mc.otm.shapes.BlockShapes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumDoorBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumDoorBlock.kt index bb8ee8231..3ebd38a98 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumDoorBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumDoorBlock.kt @@ -16,9 +16,8 @@ import net.minecraft.world.level.block.DoorBlock import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.block.state.properties.BlockSetType import net.minecraft.world.level.material.PushReaction -import ru.dbotthepony.mc.otm.core.TooltipList -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.collect.iteratorOf +import ru.dbotthepony.mc.otm.util.TooltipList +import ru.dbotthepony.mc.otm.util.TranslatableComponent import java.util.* import kotlin.jvm.optionals.getOrNull diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumPressurePlate.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumPressurePlate.kt index a21825754..fe27592c1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumPressurePlate.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumPressurePlate.kt @@ -14,14 +14,13 @@ import net.minecraft.world.level.Level import net.minecraft.world.level.block.BasePressurePlateBlock import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.SoundType -import net.minecraft.world.level.block.state.BlockBehaviour import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.block.state.StateDefinition import net.minecraft.world.level.block.state.properties.BlockSetType import net.minecraft.world.level.block.state.properties.BlockStateProperties -import ru.dbotthepony.mc.otm.core.TooltipList -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.TooltipList +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.get import java.util.Optional import kotlin.jvm.optionals.getOrNull diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumTrapdoorBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumTrapdoorBlock.kt index 864856a1b..773851a7b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumTrapdoorBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/TritaniumTrapdoorBlock.kt @@ -16,9 +16,8 @@ import net.minecraft.world.level.BlockGetter import net.minecraft.world.level.block.TrapDoorBlock import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.block.state.properties.BlockSetType -import ru.dbotthepony.mc.otm.core.TooltipList -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.collect.iteratorOf +import ru.dbotthepony.mc.otm.util.TooltipList +import ru.dbotthepony.mc.otm.util.TranslatableComponent import java.util.* import kotlin.jvm.optionals.getOrNull diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ExperienceStorage.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ExperienceStorage.kt index 3a0af5351..bceb1e912 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ExperienceStorage.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ExperienceStorage.kt @@ -16,7 +16,7 @@ import net.neoforged.neoforge.fluids.FluidStack import net.neoforged.neoforge.fluids.capability.IFluidHandler import ru.dbotthepony.mc.otm.block.INeighbourChangeListener import ru.dbotthepony.mc.otm.block.entity.tech.EssenceStorageBlockEntity -import ru.dbotthepony.mc.otm.core.math.plus +import ru.dbotthepony.mc.otm.util.math.plus import ru.dbotthepony.mc.otm.registry.game.MFluids import java.util.function.DoubleSupplier diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/Jobs.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/Jobs.kt index 1caa0e725..434b79133 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/Jobs.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/Jobs.kt @@ -12,11 +12,11 @@ import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.capability.IMatteryUpgrade import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage import ru.dbotthepony.mc.otm.config.MachinesConfig -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.weakEqualDoubles -import ru.dbotthepony.mc.otm.core.math.weakGreaterThan -import ru.dbotthepony.mc.otm.core.math.weakLessThan -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.math.weakEqualDoubles +import ru.dbotthepony.mc.otm.util.math.weakGreaterThan +import ru.dbotthepony.mc.otm.util.math.weakLessThan +import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.data.codec.DecimalCodec private fun isReason(status: Any?, reason: Any) = status == null || status == reason 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 ac5458346..2dcac2393 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 @@ -44,15 +44,15 @@ import ru.dbotthepony.mc.otm.block.INeighbourChangeListener import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage -import ru.dbotthepony.mc.otm.core.collect.WeakHashSet -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotation -import ru.dbotthepony.mc.otm.core.math.RelativeSide -import ru.dbotthepony.mc.otm.core.math.plus -import ru.dbotthepony.mc.otm.core.util.IntCounter -import ru.dbotthepony.mc.otm.core.util.Savetables -import ru.dbotthepony.mc.otm.core.util.TickList -import ru.dbotthepony.mc.otm.core.util.countingLazy +import ru.dbotthepony.mc.otm.util.collect.WeakHashSet +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotation +import ru.dbotthepony.mc.otm.util.math.RelativeSide +import ru.dbotthepony.mc.otm.util.math.plus +import ru.dbotthepony.mc.otm.util.IntCounter +import ru.dbotthepony.mc.otm.util.Savetables +import ru.dbotthepony.mc.otm.util.TickList +import ru.dbotthepony.mc.otm.util.countingLazy import ru.dbotthepony.mc.otm.network.BlockEntitySyncPacket import ru.dbotthepony.mc.otm.network.syncher.SynchableGroup import ru.dbotthepony.mc.otm.once diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryDeviceBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryDeviceBlockEntity.kt index a0c42c6b0..a57dbb5e4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryDeviceBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryDeviceBlockEntity.kt @@ -4,9 +4,7 @@ import com.google.common.collect.ImmutableSet import net.minecraft.core.BlockPos import net.minecraft.core.HolderLookup import net.minecraft.nbt.CompoundTag -import net.minecraft.nbt.NbtOps import net.minecraft.network.chat.Component -import net.minecraft.network.chat.ComponentSerialization import net.minecraft.server.level.ServerLevel import net.minecraft.world.MenuProvider import net.minecraft.world.entity.player.Inventory @@ -32,15 +30,13 @@ import ru.dbotthepony.mc.otm.capability.item.UnmodifiableItemHandler import ru.dbotthepony.mc.otm.capability.moveBetweenSlots import ru.dbotthepony.mc.otm.capability.moveEnergy import ru.dbotthepony.mc.otm.capability.moveFluid -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.getValue -import ru.dbotthepony.mc.otm.core.immutableMap -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.RelativeSide -import ru.dbotthepony.mc.otm.core.nbt.set -import ru.dbotthepony.mc.otm.core.util.ITickable +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.getValue +import ru.dbotthepony.kommons.guava.immutableMap +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.math.RelativeSide +import ru.dbotthepony.mc.otm.util.ITickable import ru.dbotthepony.mc.otm.once -import kotlin.jvm.optionals.getOrNull /** * Device block entity base, implementing [MenuProvider] and [IRedstoneControlled], and also tracks custom display name 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 1f53db539..a120aeee4 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,7 +8,7 @@ import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage import ru.dbotthepony.mc.otm.capability.extractEnergy import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal abstract class MatteryPoweredBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: BlockPos, p_155230_: BlockState) : MatteryDeviceBlockEntity(p_155228_, p_155229_, p_155230_) { val batteryContainer = SlottedContainer.simple(1, AutomationFilters.DISCHARGABLE.filteredProvider, ::markDirtyFast).also(::addDroppableContainer) 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 4df7cc662..d2456b661 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 @@ -6,23 +6,17 @@ import net.minecraft.core.BlockPos import net.minecraft.core.HolderLookup import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.ListTag -import net.minecraft.network.chat.Component -import net.minecraft.world.item.ItemStack -import net.minecraft.world.item.TooltipFlag -import net.minecraft.world.level.BlockGetter import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.entity.BlockEntityType import net.minecraft.world.level.block.state.BlockState -import org.apache.logging.log4j.LogManager +import ru.dbotthepony.kommons.guava.immutableList import ru.dbotthepony.mc.otm.capability.IMatteryUpgrade import ru.dbotthepony.mc.otm.capability.UpgradeType import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage -import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage import ru.dbotthepony.mc.otm.container.UpgradeContainer -import ru.dbotthepony.mc.otm.core.immutableList -import ru.dbotthepony.mc.otm.core.nbt.getCompoundList -import ru.dbotthepony.mc.otm.core.nbt.set -import ru.dbotthepony.mc.otm.core.util.countingLazy +import ru.dbotthepony.mc.otm.util.getCompoundList +import ru.dbotthepony.mc.otm.util.set +import ru.dbotthepony.mc.otm.util.countingLazy /** * Simple machine, which can work on only one job type. diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MultiblockTestBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MultiblockTestBlockEntity.kt index 696ce3ba3..0160e5c8e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MultiblockTestBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MultiblockTestBlockEntity.kt @@ -6,9 +6,9 @@ import net.minecraft.world.level.block.Blocks import net.minecraft.world.level.block.entity.FurnaceBlockEntity import net.minecraft.world.level.block.entity.HopperBlockEntity import net.minecraft.world.level.block.state.BlockState -import ru.dbotthepony.mc.otm.core.multiblock.MultiblockStatus -import ru.dbotthepony.mc.otm.core.multiblock.multiblockEntity -import ru.dbotthepony.mc.otm.core.multiblock.shapedMultiblock +import ru.dbotthepony.mc.otm.multiblock.MultiblockStatus +import ru.dbotthepony.mc.otm.multiblock.multiblockEntity +import ru.dbotthepony.mc.otm.multiblock.shapedMultiblock import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.registry.game.MBlocks diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/RedstoneControl.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/RedstoneControl.kt index 18d47149f..1f4510bc1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/RedstoneControl.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/RedstoneControl.kt @@ -7,8 +7,8 @@ import ru.dbotthepony.mc.otm.network.syncher.SynchableGroup import ru.dbotthepony.kommons.util.Listenable import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue -import ru.dbotthepony.mc.otm.core.nbt.mapString -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.mapString +import ru.dbotthepony.mc.otm.util.set import java.util.function.Consumer interface IRedstoneControlled { 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 14569fe14..78352985d 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.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import java.util.function.IntPredicate import java.util.function.Predicate 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 c94c15b68..8eec319b6 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 @@ -20,9 +20,9 @@ import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.levelgen.structure.BoundingBox import net.minecraft.world.phys.AABB import net.minecraft.world.phys.Vec3 -import net.neoforged.api.distmarker.Dist -import net.neoforged.api.distmarker.OnlyIn import net.neoforged.neoforge.common.Tags +import ru.dbotthepony.kommons.collect.addAll +import ru.dbotthepony.kommons.collect.map import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.mc.otm.block.BlackHoleBlock @@ -31,30 +31,25 @@ import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.sound.BlackHoleAmbientSoundInstance import ru.dbotthepony.mc.otm.config.ServerConfig -import ru.dbotthepony.mc.otm.core.addAll -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.damageType -import ru.dbotthepony.mc.otm.core.getExplosionResistance -import ru.dbotthepony.mc.otm.core.gracefulBlockBreak -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.plus +import ru.dbotthepony.mc.otm.util.damageType +import ru.dbotthepony.mc.otm.util.getExplosionResistance +import ru.dbotthepony.mc.otm.util.gracefulBlockBreak +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.math.plus import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.registry.game.MItems -import ru.dbotthepony.mc.otm.core.math.getSphericalBlockPositions -import ru.dbotthepony.mc.otm.core.math.times -import ru.dbotthepony.mc.otm.core.nbt.map -import ru.dbotthepony.mc.otm.core.nbt.set -import ru.dbotthepony.mc.otm.core.otmRandom -import ru.dbotthepony.mc.otm.isClient +import ru.dbotthepony.mc.otm.util.math.getSphericalBlockPositions +import ru.dbotthepony.mc.otm.util.math.times +import ru.dbotthepony.mc.otm.util.map +import ru.dbotthepony.mc.otm.util.set +import ru.dbotthepony.mc.otm.util.otmRandom import ru.dbotthepony.mc.otm.matter.MatterManager import ru.dbotthepony.mc.otm.registry.MDamageTypes import ru.dbotthepony.mc.otm.registry.MatteryDamageSource -import ru.dbotthepony.mc.otm.runIfClient import ru.dbotthepony.mc.otm.triggers.BlackHoleTrigger import kotlin.math.pow import kotlin.math.roundToInt import kotlin.math.sqrt -import kotlin.properties.Delegates class BlackHoleBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : MatteryBlockEntity(MBlockEntities.BLACK_HOLE, p_155229_, p_155230_) { var mass by syncher.decimal(ServerConfig.Blackhole.BASELINE_MASS, setter = setter@{ field, mass -> diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleGeneratorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleGeneratorBlockEntity.kt index 84c9bba76..9f027824b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleGeneratorBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleGeneratorBlockEntity.kt @@ -9,6 +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.neoforged.neoforge.capabilities.Capabilities +import ru.dbotthepony.kommons.collect.map import ru.dbotthepony.kommons.collect.toList import ru.dbotthepony.kommons.util.DelegateSetter import ru.dbotthepony.kommons.util.getValue @@ -23,19 +24,18 @@ import ru.dbotthepony.mc.otm.capability.energy.CombinedProfiledEnergyStorage import ru.dbotthepony.mc.otm.capability.matter.CombinedProfiledMatterStorage import ru.dbotthepony.mc.otm.config.MachinesConfig import ru.dbotthepony.mc.otm.config.ServerConfig -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.multiblock.ShapedMultiblock -import ru.dbotthepony.mc.otm.core.getBlockStateNow -import ru.dbotthepony.mc.otm.core.immutableList -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.plus -import ru.dbotthepony.mc.otm.core.math.times -import ru.dbotthepony.mc.otm.core.multiblock.BlockEntityTag -import ru.dbotthepony.mc.otm.core.multiblock.MultiblockStatus -import ru.dbotthepony.mc.otm.core.multiblock.shapedMultiblock -import ru.dbotthepony.mc.otm.core.otmRandom -import ru.dbotthepony.mc.otm.core.util.InvalidableLazy +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.multiblock.ShapedMultiblock +import ru.dbotthepony.mc.otm.util.getBlockStateNow +import ru.dbotthepony.kommons.guava.immutableList +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.math.plus +import ru.dbotthepony.mc.otm.util.math.times +import ru.dbotthepony.mc.otm.multiblock.BlockEntityTag +import ru.dbotthepony.mc.otm.multiblock.MultiblockStatus +import ru.dbotthepony.mc.otm.multiblock.shapedMultiblock +import ru.dbotthepony.mc.otm.util.otmRandom +import ru.dbotthepony.mc.otm.util.InvalidableLazy import ru.dbotthepony.mc.otm.menu.tech.BlackHoleGeneratorMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.registry.MBlockTags diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableBlockEntity.kt index 0aabce3b9..e3cd1261b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableBlockEntity.kt @@ -16,13 +16,13 @@ import ru.dbotthepony.mc.otm.capability.FlowDirection import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage import ru.dbotthepony.mc.otm.config.CablesConfig -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotation -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.RelativeSide -import ru.dbotthepony.mc.otm.core.set -import ru.dbotthepony.mc.otm.core.util.TickList -import ru.dbotthepony.mc.otm.core.util.countingLazy +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotation +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.math.RelativeSide +import ru.dbotthepony.mc.otm.util.set +import ru.dbotthepony.mc.otm.util.TickList +import ru.dbotthepony.mc.otm.util.countingLazy import ru.dbotthepony.mc.otm.graph.GraphNode import ru.dbotthepony.mc.otm.once import ru.dbotthepony.mc.otm.onceServer diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableGraph.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableGraph.kt index e5cde9bfe..6b4155906 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableGraph.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/cable/EnergyCableGraph.kt @@ -4,23 +4,20 @@ import it.unimi.dsi.fastutil.ints.IntRBTreeSet import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap import it.unimi.dsi.fastutil.objects.ReferenceArraySet import it.unimi.dsi.fastutil.objects.ReferenceLinkedOpenHashSet -import net.minecraft.core.Direction import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.SERVER_IS_LIVE import ru.dbotthepony.mc.otm.UNIVERSE_TICKS import ru.dbotthepony.mc.otm.capability.receiveEnergy import ru.dbotthepony.mc.otm.config.CablesConfig -import ru.dbotthepony.mc.otm.core.addAll -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.collect.reduce -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.RelativeSide -import ru.dbotthepony.mc.otm.core.otmRandom -import ru.dbotthepony.mc.otm.core.shuffle +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.kommons.collect.reduce +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.math.RelativeSide +import ru.dbotthepony.mc.otm.util.otmRandom +import ru.dbotthepony.mc.otm.util.shuffle import ru.dbotthepony.mc.otm.graph.GraphNodeList import ru.dbotthepony.mc.otm.onceServer import java.util.* -import java.util.concurrent.atomic.AtomicLong import kotlin.collections.ArrayList import kotlin.collections.HashSet import kotlin.collections.LinkedHashSet diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/BreakableContainerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/BreakableContainerBlockEntity.kt index d5dfd0d08..e10c6f574 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/BreakableContainerBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/BreakableContainerBlockEntity.kt @@ -5,7 +5,7 @@ import net.minecraft.core.HolderLookup import net.minecraft.nbt.CompoundTag import net.minecraft.world.level.block.state.BlockState import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity -import ru.dbotthepony.mc.otm.core.util.BlockLootTableHolder +import ru.dbotthepony.mc.otm.util.BlockLootTableHolder import ru.dbotthepony.mc.otm.registry.game.MBlockEntities class BreakableContainerBlockEntity(blockPos: BlockPos, blockState: BlockState) : MatteryBlockEntity(MBlockEntities.BREAKABLE, blockPos, blockState) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/CargoCrateBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/CargoCrateBlockEntity.kt index 8808638ab..9dd7f6584 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/CargoCrateBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/CargoCrateBlockEntity.kt @@ -21,10 +21,10 @@ import ru.dbotthepony.mc.otm.capability.IQuickStackContainer import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.container.slotted.FilteredContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.otmRandom +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.otmRandom import ru.dbotthepony.mc.otm.menu.MatteryMenuSlot -import ru.dbotthepony.mc.otm.core.util.BlockLootTableHolder +import ru.dbotthepony.mc.otm.util.BlockLootTableHolder import ru.dbotthepony.mc.otm.menu.decorative.CargoCrateMenu import ru.dbotthepony.mc.otm.menu.makeSlots import ru.dbotthepony.mc.otm.registry.game.MBlockEntities diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/FluidTankBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/FluidTankBlockEntity.kt index ffa775373..99b0b3a5f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/FluidTankBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/FluidTankBlockEntity.kt @@ -14,18 +14,15 @@ import net.neoforged.neoforge.fluids.capability.IFluidHandler import org.apache.logging.log4j.LogManager import ru.dbotthepony.kommons.util.ListenableDelegate import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity -import ru.dbotthepony.mc.otm.capability.item.CombinedItemHandler import ru.dbotthepony.mc.otm.capability.fluid.BlockMatteryFluidHandler import ru.dbotthepony.mc.otm.capability.moveFluid import ru.dbotthepony.mc.otm.config.ItemsConfig import ru.dbotthepony.mc.otm.container.get -import ru.dbotthepony.mc.otm.container.slotted.AutomationFilter import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters -import ru.dbotthepony.mc.otm.container.slotted.ContainerSlot import ru.dbotthepony.mc.otm.container.slotted.FilteredContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.isNotSameAs +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.isNotSameAs import ru.dbotthepony.mc.otm.menu.decorative.FluidTankMenu import ru.dbotthepony.mc.otm.network.wrap import ru.dbotthepony.mc.otm.registry.game.MBlockEntities diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/GrillBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/GrillBlockEntity.kt index 529c4aaa6..47c334d45 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/GrillBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/GrillBlockEntity.kt @@ -20,24 +20,22 @@ import net.minecraft.world.item.crafting.SmokingRecipe import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.state.BlockState import ru.dbotthepony.kommons.util.Delegate -import ru.dbotthepony.kommons.util.KOptional import ru.dbotthepony.mc.otm.block.IBlockWithCustomName import ru.dbotthepony.mc.otm.block.decorative.GrillBlock import ru.dbotthepony.mc.otm.block.entity.ExperienceStorage import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity import ru.dbotthepony.mc.otm.config.MachinesConfig -import ru.dbotthepony.mc.otm.container.set import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters import ru.dbotthepony.mc.otm.container.slotted.ContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.math.component1 -import ru.dbotthepony.mc.otm.core.math.component2 -import ru.dbotthepony.mc.otm.core.math.component3 -import ru.dbotthepony.mc.otm.core.set -import ru.dbotthepony.mc.otm.core.util.countingLazy +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.math.component1 +import ru.dbotthepony.mc.otm.util.math.component2 +import ru.dbotthepony.mc.otm.util.math.component3 +import ru.dbotthepony.mc.otm.util.set +import ru.dbotthepony.mc.otm.util.countingLazy import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.menu.decorative.GrillMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/HoloSignBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/HoloSignBlockEntity.kt index 748ec5811..6af5aae65 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/HoloSignBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/HoloSignBlockEntity.kt @@ -18,9 +18,9 @@ import ru.dbotthepony.mc.otm.block.entity.IRedstoneControlled import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity import ru.dbotthepony.mc.otm.block.entity.SynchronizedRedstoneControl import ru.dbotthepony.mc.otm.client.minecraft -import ru.dbotthepony.mc.otm.core.math.component1 -import ru.dbotthepony.mc.otm.core.math.component2 -import ru.dbotthepony.mc.otm.core.math.component3 +import ru.dbotthepony.mc.otm.util.math.component1 +import ru.dbotthepony.mc.otm.util.math.component2 +import ru.dbotthepony.mc.otm.util.math.component3 import ru.dbotthepony.mc.otm.menu.decorative.HoloSignMenu import ru.dbotthepony.mc.otm.once import ru.dbotthepony.mc.otm.registry.game.MBlockEntities diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/InfiniteWaterSourceBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/InfiniteWaterSourceBlockEntity.kt index 2322d0b05..9cd44e93a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/InfiniteWaterSourceBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/InfiniteWaterSourceBlockEntity.kt @@ -7,7 +7,7 @@ import net.neoforged.neoforge.capabilities.Capabilities import net.neoforged.neoforge.fluids.FluidStack import net.neoforged.neoforge.fluids.capability.IFluidHandler import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity -import ru.dbotthepony.mc.otm.core.math.RelativeSide +import ru.dbotthepony.mc.otm.util.math.RelativeSide import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import java.util.function.Consumer diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/PainterBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/PainterBlockEntity.kt index 321fe0f6d..fea003667 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/PainterBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/PainterBlockEntity.kt @@ -20,11 +20,11 @@ import net.neoforged.neoforge.fluids.capability.IFluidHandler import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity import ru.dbotthepony.mc.otm.container.slotted.ContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.immutableList -import ru.dbotthepony.mc.otm.core.immutableMap -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.nbt.mapPresent -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.kommons.guava.immutableList +import ru.dbotthepony.kommons.guava.immutableMap +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.mapPresent +import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.menu.decorative.PainterMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import java.util.* 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 91e8d4d20..84f29f5bf 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 @@ -26,8 +26,8 @@ import ru.dbotthepony.mc.otm.container.slotted.FilteredContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer import ru.dbotthepony.mc.otm.menu.matter.MatterBottlerMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.util.countingLazy +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.countingLazy import ru.dbotthepony.mc.otm.graph.matter.SimpleMatterNode import java.util.function.BooleanSupplier 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 40d188eb6..91f15a357 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 @@ -18,8 +18,8 @@ import ru.dbotthepony.mc.otm.capability.matter.IMatterStorage import ru.dbotthepony.mc.otm.capability.matter.ProfiledMatterStorage import ru.dbotthepony.mc.otm.container.slotted.ContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.immutableList -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.kommons.guava.immutableList +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.graph.matter.SimpleMatterNode import ru.dbotthepony.mc.otm.menu.matter.MatterCapacitorBankMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities 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 2d839bc95..eeb1740f2 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 @@ -22,11 +22,10 @@ import ru.dbotthepony.mc.otm.capability.matter.MatterStorageImpl import ru.dbotthepony.mc.otm.capability.matter.ProfiledMatterStorage import ru.dbotthepony.mc.otm.config.MachinesConfig import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters -import ru.dbotthepony.mc.otm.container.slotted.ContainerSlot import ru.dbotthepony.mc.otm.container.slotted.FilteredContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.otmRandom +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.otmRandom import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.graph.matter.SimpleMatterNode diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterEntanglerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterEntanglerBlockEntity.kt index e0e4857ef..4b9ba0cc0 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterEntanglerBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterEntanglerBlockEntity.kt @@ -29,12 +29,12 @@ import ru.dbotthepony.mc.otm.container.IEnhancedCraftingContainer import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters import ru.dbotthepony.mc.otm.container.slotted.FilteredContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.SimpleCache -import ru.dbotthepony.mc.otm.core.collect.filter -import ru.dbotthepony.mc.otm.core.collect.forEach -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.collect.toList -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.SimpleCache +import ru.dbotthepony.kommons.collect.filter +import ru.dbotthepony.kommons.collect.forEach +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.kommons.collect.toList +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.container.ItemStackKey import ru.dbotthepony.mc.otm.container.asKey import ru.dbotthepony.mc.otm.data.codec.DecimalCodec 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 8a5dc7ad7..d572f3d9f 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 @@ -17,11 +17,11 @@ import ru.dbotthepony.mc.otm.capability.matter.IReplicationTaskProvider import ru.dbotthepony.mc.otm.capability.matter.PatternState import ru.dbotthepony.mc.otm.capability.matter.ReplicationTask import ru.dbotthepony.mc.otm.capability.matter.ReplicationTaskAllocation -import ru.dbotthepony.mc.otm.core.collect.WeakHashSet -import ru.dbotthepony.mc.otm.core.nbt.getCompoundList -import ru.dbotthepony.mc.otm.core.nbt.map -import ru.dbotthepony.mc.otm.core.nbt.set -import ru.dbotthepony.mc.otm.core.util.ItemSorter +import ru.dbotthepony.mc.otm.util.collect.WeakHashSet +import ru.dbotthepony.mc.otm.util.getCompoundList +import ru.dbotthepony.mc.otm.util.map +import ru.dbotthepony.mc.otm.util.set +import ru.dbotthepony.mc.otm.util.ItemSorter import ru.dbotthepony.mc.otm.graph.matter.SimpleMatterNode import ru.dbotthepony.mc.otm.menu.IItemSortingSettings import ru.dbotthepony.mc.otm.menu.matter.MatterPanelMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReconstructorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReconstructorBlockEntity.kt index 49ef44425..2dcc43ef0 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReconstructorBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReconstructorBlockEntity.kt @@ -27,9 +27,9 @@ import ru.dbotthepony.mc.otm.config.MachinesConfig import ru.dbotthepony.mc.otm.container.UpgradeContainer import ru.dbotthepony.mc.otm.container.slotted.FilteredContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.otmRandom -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.otmRandom +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.graph.matter.MatterNode import ru.dbotthepony.mc.otm.matter.IMatterValue import ru.dbotthepony.mc.otm.matter.MatterManager 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 e93ebf9e9..813e49d22 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 @@ -23,9 +23,9 @@ import ru.dbotthepony.mc.otm.capability.matter.ProfiledMatterStorage import ru.dbotthepony.mc.otm.config.MachinesConfig import ru.dbotthepony.mc.otm.container.slotted.ContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.nextDecimal -import ru.dbotthepony.mc.otm.core.otmRandom +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.nextDecimal +import ru.dbotthepony.mc.otm.util.otmRandom import ru.dbotthepony.mc.otm.graph.matter.MatterGraph import ru.dbotthepony.mc.otm.item.matter.MatterDustItem import ru.dbotthepony.mc.otm.menu.matter.MatterRecyclerMenu 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 d472058ae..0d99da45b 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 @@ -27,8 +27,8 @@ import ru.dbotthepony.mc.otm.capability.matter.* import ru.dbotthepony.mc.otm.config.MachinesConfig import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.otmRandom +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.otmRandom import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.graph.matter.MatterNode diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/PatternStorageBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/PatternStorageBlockEntity.kt index 3948d6d64..4f9158f38 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/PatternStorageBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/PatternStorageBlockEntity.kt @@ -12,14 +12,13 @@ import net.minecraft.world.inventory.AbstractContainerMenu import ru.dbotthepony.mc.otm.menu.matter.PatternStorageMenu import net.minecraft.world.level.Level import net.minecraft.world.level.block.Block +import ru.dbotthepony.kommons.collect.filterNotNull import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity import ru.dbotthepony.mc.otm.capability.matter.* import ru.dbotthepony.mc.otm.container.slotted.ContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.collect.filterNotNull -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.filterNotNull -import ru.dbotthepony.mc.otm.core.isNotEmpty +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.mc.otm.util.isNotEmpty import ru.dbotthepony.mc.otm.graph.matter.SimpleMatterNode import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import java.util.stream.Stream 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 2e01e7368..4a1c55acc 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 @@ -18,9 +18,9 @@ import ru.dbotthepony.mc.otm.capability.energy.ProfiledEnergyStorage import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage import ru.dbotthepony.mc.otm.config.MachinesConfig import ru.dbotthepony.mc.otm.container.EnhancedContainer -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.util.ItemStorageStackSorter +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.ItemStorageStackSorter import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.menu.storage.DriveViewerMenu import java.util.UUID 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 26d051e29..285f684e0 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 @@ -32,14 +32,12 @@ import ru.dbotthepony.mc.otm.container.CombinedContainer import ru.dbotthepony.mc.otm.container.EnhancedContainer import ru.dbotthepony.mc.otm.container.IEnhancedCraftingContainer import ru.dbotthepony.mc.otm.container.util.slotIterator -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.collect.toList -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.nbt.map -import ru.dbotthepony.mc.otm.core.nbt.mapString -import ru.dbotthepony.mc.otm.core.nbt.set -import ru.dbotthepony.mc.otm.core.util.ItemStorageStackSorter +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.map +import ru.dbotthepony.mc.otm.util.mapString +import ru.dbotthepony.mc.otm.util.set +import ru.dbotthepony.mc.otm.util.ItemStorageStackSorter import ru.dbotthepony.mc.otm.graph.storage.StorageGraph import ru.dbotthepony.mc.otm.graph.storage.StorageNode import ru.dbotthepony.mc.otm.menu.storage.ItemMonitorMenu 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 056d2e832..59a88a17e 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 @@ -24,14 +24,15 @@ import ru.dbotthepony.mc.otm.capability.energy.ProfiledEnergyStorage import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage import ru.dbotthepony.mc.otm.config.MachinesConfig import ru.dbotthepony.mc.otm.container.ItemFilterSet -import ru.dbotthepony.mc.otm.core.* -import ru.dbotthepony.mc.otm.core.math.RelativeSide -import ru.dbotthepony.mc.otm.core.math.isPositive -import ru.dbotthepony.mc.otm.core.math.toIntSafe +import ru.dbotthepony.mc.otm.util.math.RelativeSide +import ru.dbotthepony.mc.otm.util.math.isPositive +import ru.dbotthepony.mc.otm.util.math.toIntSafe import ru.dbotthepony.mc.otm.graph.storage.StorageNode import ru.dbotthepony.mc.otm.menu.storage.StorageBusMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.storage.* +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.isNotEmpty import java.math.BigInteger import java.util.* import java.util.function.Consumer 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 d6573d11b..52c5d7235 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 @@ -24,9 +24,9 @@ import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage import ru.dbotthepony.mc.otm.config.EnergyBalanceValues import ru.dbotthepony.mc.otm.config.MachinesConfig import ru.dbotthepony.mc.otm.container.ItemFilterSet -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.math.RelativeSide +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.math.RelativeSide import ru.dbotthepony.mc.otm.graph.storage.StorageNode import ru.dbotthepony.mc.otm.menu.storage.StorageImporterExporterMenu import ru.dbotthepony.mc.otm.once 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 e1ae25b88..d3671ef50 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 @@ -11,7 +11,7 @@ import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage import ru.dbotthepony.mc.otm.capability.energy.transferChecked import ru.dbotthepony.mc.otm.config.MachinesConfig -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.graph.storage.StorageNode import ru.dbotthepony.mc.otm.menu.storage.StoragePowerSupplierMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/AbstractPoweredFurnaceBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/AbstractPoweredFurnaceBlockEntity.kt index e92851a9f..74fcd9fa6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/AbstractPoweredFurnaceBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/AbstractPoweredFurnaceBlockEntity.kt @@ -34,9 +34,9 @@ import ru.dbotthepony.mc.otm.container.balance import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters import ru.dbotthepony.mc.otm.container.slotted.FilteredContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.SimpleCache -import ru.dbotthepony.mc.otm.core.immutableList -import ru.dbotthepony.mc.otm.core.otmRandom +import ru.dbotthepony.mc.otm.util.SimpleCache +import ru.dbotthepony.kommons.guava.immutableList +import ru.dbotthepony.mc.otm.util.otmRandom import ru.dbotthepony.mc.otm.container.ItemStackKey import ru.dbotthepony.mc.otm.container.asKey import ru.dbotthepony.mc.otm.menu.tech.PoweredFurnaceMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/AndroidChargerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/AndroidChargerBlockEntity.kt index 0d43df6e5..1f846df59 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/AndroidChargerBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/AndroidChargerBlockEntity.kt @@ -16,9 +16,9 @@ import ru.dbotthepony.mc.otm.capability.energy.ProxiedEnergyStorage import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage import ru.dbotthepony.mc.otm.player.matteryPlayer import ru.dbotthepony.mc.otm.config.MachinesConfig -import ru.dbotthepony.mc.otm.core.getEntitiesInEllipsoid -import ru.dbotthepony.mc.otm.core.otmRandom -import ru.dbotthepony.mc.otm.core.shuffle +import ru.dbotthepony.mc.otm.util.getEntitiesInEllipsoid +import ru.dbotthepony.mc.otm.util.otmRandom +import ru.dbotthepony.mc.otm.util.shuffle import ru.dbotthepony.mc.otm.menu.tech.AndroidChargerMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/AndroidStationBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/AndroidStationBlockEntity.kt index 4631cb468..3b03d83ba 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/AndroidStationBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/AndroidStationBlockEntity.kt @@ -16,10 +16,10 @@ import ru.dbotthepony.mc.otm.capability.energy.WorkerEnergyStorage import ru.dbotthepony.mc.otm.player.matteryPlayer import ru.dbotthepony.mc.otm.capability.moveEnergy import ru.dbotthepony.mc.otm.config.MachinesConfig -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.otmRandom -import ru.dbotthepony.mc.otm.core.shuffle -import ru.dbotthepony.mc.otm.core.util.countingLazy +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.otmRandom +import ru.dbotthepony.mc.otm.util.shuffle +import ru.dbotthepony.mc.otm.util.countingLazy import ru.dbotthepony.mc.otm.menu.tech.AndroidStationMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BatteryBankBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BatteryBankBlockEntity.kt index 882eea52d..fb35ea42e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BatteryBankBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/BatteryBankBlockEntity.kt @@ -13,7 +13,6 @@ import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.kommons.util.value import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.energy import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage import ru.dbotthepony.mc.otm.capability.energy.ProfiledEnergyStorage @@ -21,15 +20,13 @@ import ru.dbotthepony.mc.otm.capability.energyStoredMattery import ru.dbotthepony.mc.otm.capability.matteryEnergy import ru.dbotthepony.mc.otm.capability.maxEnergyStoredMattery import ru.dbotthepony.mc.otm.capability.transcieveEnergy -import ru.dbotthepony.mc.otm.container.slotRange -import ru.dbotthepony.mc.otm.container.slotted.ContainerSlot import ru.dbotthepony.mc.otm.container.slotted.FilteredContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.immutableList -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.otmRandom -import ru.dbotthepony.mc.otm.core.shuffle +import ru.dbotthepony.kommons.guava.immutableList +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.otmRandom +import ru.dbotthepony.mc.otm.util.shuffle import ru.dbotthepony.mc.otm.menu.tech.BatteryBankMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import java.util.function.Supplier diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/ChemicalGeneratorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/ChemicalGeneratorBlockEntity.kt index f37b9ff4d..9267868b4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/ChemicalGeneratorBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/ChemicalGeneratorBlockEntity.kt @@ -16,7 +16,7 @@ import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer import ru.dbotthepony.mc.otm.menu.tech.ChemicalGeneratorMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal class ChemicalGeneratorBlockEntity(pos: BlockPos, state: BlockState) : MatteryDeviceBlockEntity(MBlockEntities.CHEMICAL_GENERATOR, pos, state) { override fun createMenu(containerID: Int, inventory: Inventory, ply: Player): AbstractContainerMenu { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyCounterBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyCounterBlockEntity.kt index 2b1bb16e0..4f9751cb8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyCounterBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyCounterBlockEntity.kt @@ -17,17 +17,18 @@ import ru.dbotthepony.mc.otm.block.tech.EnergyCounterBlock import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity import ru.dbotthepony.mc.otm.capability.* import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage -import ru.dbotthepony.mc.otm.core.* -import ru.dbotthepony.mc.otm.core.chart.DecimalHistoryChart -import ru.dbotthepony.mc.otm.core.math.BlockRotation -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.RelativeSide -import ru.dbotthepony.mc.otm.core.nbt.getDecimal -import ru.dbotthepony.mc.otm.core.nbt.mapPresent -import ru.dbotthepony.mc.otm.core.nbt.set -import ru.dbotthepony.mc.otm.core.util.countingLazy +import ru.dbotthepony.mc.otm.util.chart.DecimalHistoryChart +import ru.dbotthepony.mc.otm.util.math.BlockRotation +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.math.RelativeSide +import ru.dbotthepony.mc.otm.util.getDecimal +import ru.dbotthepony.mc.otm.util.mapPresent +import ru.dbotthepony.mc.otm.util.set +import ru.dbotthepony.mc.otm.util.countingLazy import ru.dbotthepony.mc.otm.menu.tech.EnergyCounterMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.get class EnergyCounterBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : MatteryDeviceBlockEntity(MBlockEntities.ENERGY_COUNTER, p_155229_, p_155230_) { var passed by syncher.decimal() diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyHatchBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyHatchBlockEntity.kt index 733cdb3ea..50a47d149 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyHatchBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyHatchBlockEntity.kt @@ -4,7 +4,6 @@ import net.minecraft.core.BlockPos import net.minecraft.world.entity.player.Inventory import net.minecraft.world.entity.player.Player import net.minecraft.world.inventory.AbstractContainerMenu -import net.minecraft.world.item.ItemStack import net.minecraft.world.level.block.entity.BlockEntityType import net.minecraft.world.level.block.state.BlockState import net.neoforged.neoforge.capabilities.Capabilities @@ -18,8 +17,8 @@ import ru.dbotthepony.mc.otm.config.EnergyBalanceValues import ru.dbotthepony.mc.otm.config.MachinesConfig import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.math.RelativeSide -import ru.dbotthepony.mc.otm.core.multiblock.BlockEntityTag +import ru.dbotthepony.mc.otm.util.math.RelativeSide +import ru.dbotthepony.mc.otm.multiblock.BlockEntityTag import ru.dbotthepony.mc.otm.menu.tech.EnergyHatchMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyInterfaceBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyInterfaceBlockEntity.kt index 8b8185fdd..a853c9c66 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyInterfaceBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyInterfaceBlockEntity.kt @@ -4,7 +4,6 @@ import net.minecraft.core.BlockPos import net.minecraft.world.entity.player.Inventory import net.minecraft.world.entity.player.Player import net.minecraft.world.inventory.AbstractContainerMenu -import net.minecraft.world.item.ItemStack import net.minecraft.world.level.block.entity.BlockEntityType import net.minecraft.world.level.block.state.BlockState import net.neoforged.neoforge.capabilities.Capabilities @@ -20,12 +19,12 @@ import ru.dbotthepony.mc.otm.capability.energy.ProfiledEnergyStorage import ru.dbotthepony.mc.otm.capability.moveEnergy import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.math.RelativeSide -import ru.dbotthepony.mc.otm.core.multiblock.BlockEntityTag -import ru.dbotthepony.mc.otm.core.multiblock.IMultiblockAccess -import ru.dbotthepony.mc.otm.core.multiblock.IMultiblockListener -import ru.dbotthepony.mc.otm.core.otmRandom -import ru.dbotthepony.mc.otm.core.util.InvalidableLazy +import ru.dbotthepony.mc.otm.util.math.RelativeSide +import ru.dbotthepony.mc.otm.multiblock.BlockEntityTag +import ru.dbotthepony.mc.otm.multiblock.IMultiblockAccess +import ru.dbotthepony.mc.otm.multiblock.IMultiblockListener +import ru.dbotthepony.mc.otm.util.otmRandom +import ru.dbotthepony.mc.otm.util.InvalidableLazy import ru.dbotthepony.mc.otm.registry.game.MBlockEntities class EnergyInterfaceBlockEntity( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyServoBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyServoBlockEntity.kt index 0e60cf388..e917c8a86 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyServoBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EnergyServoBlockEntity.kt @@ -20,7 +20,7 @@ import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters import ru.dbotthepony.mc.otm.container.slotted.FilteredContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer import ru.dbotthepony.mc.otm.container.slotted.and -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.menu.tech.EnergyServoMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EssenceStorageBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EssenceStorageBlockEntity.kt index f30aece84..9706ace32 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EssenceStorageBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/EssenceStorageBlockEntity.kt @@ -27,11 +27,11 @@ import ru.dbotthepony.mc.otm.container.EnhancedContainer import ru.dbotthepony.mc.otm.container.slotted.ContainerSlot import ru.dbotthepony.mc.otm.container.slotted.FilteredContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.getEntitiesInEllipsoid -import ru.dbotthepony.mc.otm.core.lookupOrThrow -import ru.dbotthepony.mc.otm.core.math.Vector -import ru.dbotthepony.mc.otm.core.otmRandom -import ru.dbotthepony.mc.otm.core.util.countingLazy +import ru.dbotthepony.mc.otm.util.getEntitiesInEllipsoid +import ru.dbotthepony.mc.otm.util.lookupOrThrow +import ru.dbotthepony.mc.otm.util.math.Vector +import ru.dbotthepony.mc.otm.util.otmRandom +import ru.dbotthepony.mc.otm.util.countingLazy import ru.dbotthepony.mc.otm.item.consumables.EssenceCapsuleItem import ru.dbotthepony.mc.otm.item.EssenceServoItem import ru.dbotthepony.mc.otm.menu.tech.EssenceStorageMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/FlywheelBatteryBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/FlywheelBatteryBlockEntity.kt index 13fee1bae..3adf478c7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/FlywheelBatteryBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/FlywheelBatteryBlockEntity.kt @@ -4,30 +4,26 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectFunction import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap import it.unimi.dsi.fastutil.objects.Reference2IntMap import net.minecraft.core.BlockPos -import net.minecraft.core.SectionPos import net.minecraft.core.Vec3i import net.minecraft.world.entity.player.Inventory import net.minecraft.world.entity.player.Player import net.minecraft.world.inventory.AbstractContainerMenu import net.minecraft.world.level.block.Block -import net.minecraft.world.level.block.Blocks import net.minecraft.world.level.block.state.BlockState -import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity import ru.dbotthepony.mc.otm.capability.FlowDirection import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage import ru.dbotthepony.mc.otm.capability.energy.ProfiledEnergyStorage import ru.dbotthepony.mc.otm.config.MachinesConfig -import ru.dbotthepony.mc.otm.core.getBlockStateNow -import ru.dbotthepony.mc.otm.core.getChunkNow -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.plus -import ru.dbotthepony.mc.otm.core.math.times -import ru.dbotthepony.mc.otm.core.multiblock.MultiblockStatus -import ru.dbotthepony.mc.otm.core.multiblock.ShapedMultiblock -import ru.dbotthepony.mc.otm.core.multiblock.ShapedMultiblockFactory -import ru.dbotthepony.mc.otm.core.multiblock.Strategy -import ru.dbotthepony.mc.otm.core.multiblock.shapedMultiblock +import ru.dbotthepony.mc.otm.util.getChunkNow +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.math.plus +import ru.dbotthepony.mc.otm.util.math.times +import ru.dbotthepony.mc.otm.multiblock.MultiblockStatus +import ru.dbotthepony.mc.otm.multiblock.ShapedMultiblock +import ru.dbotthepony.mc.otm.multiblock.ShapedMultiblockFactory +import ru.dbotthepony.mc.otm.multiblock.Strategy +import ru.dbotthepony.mc.otm.multiblock.shapedMultiblock import ru.dbotthepony.mc.otm.data.FlywheelMaterials import ru.dbotthepony.mc.otm.menu.tech.FlywheelBatteryMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/GravitationStabilizerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/GravitationStabilizerBlockEntity.kt index a71a439e0..246743ef7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/GravitationStabilizerBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/GravitationStabilizerBlockEntity.kt @@ -12,10 +12,10 @@ import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity import ru.dbotthepony.mc.otm.block.entity.WorkerState import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleBlockEntity import ru.dbotthepony.mc.otm.block.tech.BlockGravitationStabilizer -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom -import ru.dbotthepony.mc.otm.core.math.plus -import ru.dbotthepony.mc.otm.core.math.times +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.math.plus +import ru.dbotthepony.mc.otm.util.math.times import ru.dbotthepony.mc.otm.registry.game.MBlockEntities class GravitationStabilizerBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : MatteryDeviceBlockEntity( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/ItemHatchBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/ItemHatchBlockEntity.kt index 848bb0138..3bd4fec1f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/ItemHatchBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/ItemHatchBlockEntity.kt @@ -11,7 +11,7 @@ import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity import ru.dbotthepony.mc.otm.block.entity.decorative.CargoCrateBlockEntity import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.multiblock.BlockEntityTag +import ru.dbotthepony.mc.otm.multiblock.BlockEntityTag import ru.dbotthepony.mc.otm.menu.tech.ItemHatchMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/MatterHatchBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/MatterHatchBlockEntity.kt index 032d2685b..ff9aef157 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/MatterHatchBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/MatterHatchBlockEntity.kt @@ -4,7 +4,6 @@ import net.minecraft.core.BlockPos import net.minecraft.world.entity.player.Inventory import net.minecraft.world.entity.player.Player import net.minecraft.world.inventory.AbstractContainerMenu -import net.minecraft.world.item.ItemStack import net.minecraft.world.level.block.entity.BlockEntityType import net.minecraft.world.level.block.state.BlockState import net.neoforged.neoforge.capabilities.Capabilities @@ -17,8 +16,8 @@ import ru.dbotthepony.mc.otm.capability.moveMatter import ru.dbotthepony.mc.otm.config.MachinesConfig import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.multiblock.BlockEntityTag +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.multiblock.BlockEntityTag import ru.dbotthepony.mc.otm.menu.tech.MatterHatchMenu import ru.dbotthepony.mc.otm.registry.game.MBlockEntities diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/PlatePressBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/PlatePressBlockEntity.kt index 3f1c9ca45..4cd184beb 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/PlatePressBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/PlatePressBlockEntity.kt @@ -23,8 +23,8 @@ import ru.dbotthepony.mc.otm.container.balance import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters import ru.dbotthepony.mc.otm.container.slotted.FilteredContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.SimpleCache -import ru.dbotthepony.mc.otm.core.otmRandom +import ru.dbotthepony.mc.otm.util.SimpleCache +import ru.dbotthepony.mc.otm.util.otmRandom import ru.dbotthepony.mc.otm.container.ItemStackKey import ru.dbotthepony.mc.otm.container.asKey import ru.dbotthepony.mc.otm.menu.tech.PlatePressMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterBottlerBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterBottlerBlock.kt index d321120be..2600bdbbd 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterBottlerBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterBottlerBlock.kt @@ -20,7 +20,7 @@ import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.entity.WorkerState import ru.dbotthepony.mc.otm.block.entity.matter.MatterBottlerBlockEntity import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterCapacitorBankBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterCapacitorBankBlock.kt index 4b5d8dfbf..d408ef6ae 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterCapacitorBankBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterCapacitorBankBlock.kt @@ -1,23 +1,18 @@ package ru.dbotthepony.mc.otm.block.matter import net.minecraft.core.BlockPos -import net.minecraft.core.Direction import net.minecraft.world.item.DyeColor -import net.minecraft.world.item.context.BlockPlaceContext import net.minecraft.world.level.BlockGetter -import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.EntityBlock import net.minecraft.world.level.block.entity.BlockEntity import net.minecraft.world.level.block.state.BlockState -import net.minecraft.world.level.block.state.StateDefinition import net.minecraft.world.phys.shapes.CollisionContext import net.minecraft.world.phys.shapes.VoxelShape -import ru.dbotthepony.mc.otm.block.tech.BatteryBankBlock import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.entity.matter.MatterCapacitorBankBlockEntity import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.shapes.BlockShapes class MatterCapacitorBankBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterDecomposerBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterDecomposerBlock.kt index d78253b1b..eff1b8530 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterDecomposerBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterDecomposerBlock.kt @@ -18,7 +18,7 @@ import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.entity.WorkerState import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterEntanglerBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterEntanglerBlock.kt index 9c7d9bbf5..de4172b47 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterEntanglerBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterEntanglerBlock.kt @@ -16,7 +16,7 @@ import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.WorkerState import ru.dbotthepony.mc.otm.block.entity.matter.MatterEntanglerBlockEntity import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.shapes.BlockShapes class MatterEntanglerBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterPanelBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterPanelBlock.kt index 5735112de..3d2576554 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterPanelBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterPanelBlock.kt @@ -14,9 +14,9 @@ import net.minecraft.world.phys.shapes.CollisionContext import net.minecraft.world.item.context.BlockPlaceContext import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.addSimpleDescription -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotation -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotation +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom class MatterPanelBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { init { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReconstructorBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReconstructorBlock.kt index dca3b66c0..e5f3f8795 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReconstructorBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReconstructorBlock.kt @@ -15,7 +15,7 @@ import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.entity.matter.MatterReconstructorBlockEntity import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.shapes.BlockShapes class MatterReconstructorBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterRecyclerBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterRecyclerBlock.kt index 4549c60df..1bab7f616 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterRecyclerBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterRecyclerBlock.kt @@ -18,7 +18,7 @@ import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.entity.matter.MatterRecyclerBlockEntity import ru.dbotthepony.mc.otm.block.entity.WorkerState import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReplicatorBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReplicatorBlock.kt index 7a2d80f67..b9f272e93 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReplicatorBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReplicatorBlock.kt @@ -18,7 +18,7 @@ import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.entity.matter.MatterReplicatorBlockEntity import ru.dbotthepony.mc.otm.block.entity.WorkerState import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterScannerBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterScannerBlock.kt index 4ca28ea21..8ad5e986e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterScannerBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterScannerBlock.kt @@ -18,7 +18,7 @@ import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.entity.matter.MatterScannerBlockEntity import ru.dbotthepony.mc.otm.block.entity.WorkerState import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/PatternStorageBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/PatternStorageBlock.kt index 59cd5b296..91d9ac16b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/PatternStorageBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/PatternStorageBlock.kt @@ -1,10 +1,8 @@ package ru.dbotthepony.mc.otm.block.matter import net.minecraft.core.BlockPos -import net.minecraft.world.Containers import net.minecraft.world.item.context.BlockPlaceContext import net.minecraft.world.level.BlockGetter -import net.minecraft.world.level.Level import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.EntityBlock import net.minecraft.world.level.block.entity.BlockEntity @@ -17,7 +15,7 @@ import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.entity.matter.PatternStorageBlockEntity import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.shapes.BlockShapes class PatternStorageBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/DriveRackBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/DriveRackBlock.kt index 19bb7bdeb..9c09be91b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/DriveRackBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/DriveRackBlock.kt @@ -13,7 +13,7 @@ import net.minecraft.world.phys.shapes.VoxelShape import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.storage.DriveRackBlockEntity import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/DriveViewerBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/DriveViewerBlock.kt index 1062ae033..2ad963d21 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/DriveViewerBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/DriveViewerBlock.kt @@ -19,7 +19,7 @@ import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.storage.DriveViewerBlockEntity import ru.dbotthepony.mc.otm.block.entity.WorkerState import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/ItemMonitorBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/ItemMonitorBlock.kt index c494f0ebb..866d01207 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/ItemMonitorBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/ItemMonitorBlock.kt @@ -14,7 +14,7 @@ import net.minecraft.world.phys.shapes.VoxelShape import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.storage.ItemMonitorBlockEntity import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes 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 82df31e5e..38c415a92 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 @@ -18,12 +18,12 @@ import net.minecraft.world.phys.shapes.VoxelShape import ru.dbotthepony.mc.otm.block.CableBlock import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.storage.StorageBusBlockEntity -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotation -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotation +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes -import ru.dbotthepony.mc.otm.core.math.unaryMinus +import ru.dbotthepony.mc.otm.util.math.unaryMinus class StorageBusBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { init { 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 961c409dd..a9a7e0e6c 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 @@ -19,12 +19,12 @@ import ru.dbotthepony.mc.otm.block.CableBlock import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.storage.StorageExporterBlockEntity import ru.dbotthepony.mc.otm.block.entity.storage.StorageImporterBlockEntity -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotation -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotation +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes -import ru.dbotthepony.mc.otm.core.math.unaryMinus +import ru.dbotthepony.mc.otm.util.math.unaryMinus class StorageImporterBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { init { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/StoragePowerSupplierBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/StoragePowerSupplierBlock.kt index 1bdecc8aa..a4afc3071 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/StoragePowerSupplierBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/StoragePowerSupplierBlock.kt @@ -14,7 +14,7 @@ import net.minecraft.world.phys.shapes.VoxelShape import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.storage.StoragePowerSupplierBlockEntity import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/AbstractPoweredFurnaceBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/AbstractPoweredFurnaceBlock.kt index 5211feff7..6d1679d03 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/AbstractPoweredFurnaceBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/AbstractPoweredFurnaceBlock.kt @@ -22,7 +22,7 @@ import ru.dbotthepony.mc.otm.block.entity.tech.PoweredBlastFurnaceBlockEntity import ru.dbotthepony.mc.otm.block.entity.tech.PoweredFurnaceBlockEntity import ru.dbotthepony.mc.otm.block.entity.tech.PoweredSmokerBlockEntity import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.shapes.BlockShape import ru.dbotthepony.mc.otm.shapes.BlockShapes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/AndroidChargerBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/AndroidChargerBlock.kt index 8938adb19..dc43fe0a7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/AndroidChargerBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/AndroidChargerBlock.kt @@ -1,6 +1,5 @@ package ru.dbotthepony.mc.otm.block.tech -import net.minecraft.ChatFormatting import net.minecraft.core.BlockPos import net.minecraft.util.StringRepresentable import net.minecraft.world.entity.LivingEntity @@ -28,10 +27,9 @@ import ru.dbotthepony.mc.otm.block.entity.tech.AndroidChargerBlockEntity import ru.dbotthepony.mc.otm.block.entity.tech.AndroidChargerMiddleBlockEntity import ru.dbotthepony.mc.otm.block.entity.tech.AndroidChargerTopBlockEntity import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.gracefulBlockBreak -import ru.dbotthepony.mc.otm.core.math.plus +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.gracefulBlockBreak +import ru.dbotthepony.mc.otm.util.math.plus import ru.dbotthepony.mc.otm.oncePre import ru.dbotthepony.mc.otm.shapes.BlockShapes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BatteryBankBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BatteryBankBlock.kt index 81d00aad0..f8cac192d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BatteryBankBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BatteryBankBlock.kt @@ -16,7 +16,7 @@ import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.entity.tech.BatteryBankBlockEntity import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BlackHoleGeneratorBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BlackHoleGeneratorBlock.kt index b52cd2e81..98a1cbe42 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BlackHoleGeneratorBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BlackHoleGeneratorBlock.kt @@ -14,9 +14,9 @@ import net.minecraft.world.level.material.MapColor import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleBlockEntity import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleGeneratorBlockEntity -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom -import ru.dbotthepony.mc.otm.core.math.plus -import ru.dbotthepony.mc.otm.core.math.times +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.math.plus +import ru.dbotthepony.mc.otm.util.math.times class BlackHoleGeneratorBlock : RotatableMatteryBlock(Properties.of().mapColor(MapColor.METAL).sound(SoundType.NETHERITE_BLOCK).requiresCorrectToolForDrops().destroyTime(2.5f).explosionResistance(160.0f)), EntityBlock { override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/ChemicalGeneratorBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/ChemicalGeneratorBlock.kt index 7dda03ff0..eba1af8d8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/ChemicalGeneratorBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/ChemicalGeneratorBlock.kt @@ -18,7 +18,7 @@ import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.entity.tech.ChemicalGeneratorBlockEntity import ru.dbotthepony.mc.otm.block.entity.WorkerState import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/CobblerBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/CobblerBlock.kt index 84fe20bed..6a7749070 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/CobblerBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/CobblerBlock.kt @@ -16,7 +16,7 @@ import net.minecraft.world.phys.shapes.VoxelShape import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.getShapeForEachState import ru.dbotthepony.mc.otm.block.entity.tech.CobblerBlockEntity -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.shapes.BlockShapes class CobblerBlock(val color: DyeColor?) : RotatableMatteryBlock(Properties.of().mapColor(color?.mapColor ?: MapColor.METAL).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().destroyTime(1.5f).explosionResistance(25.0f)), EntityBlock { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/EnergyCounterBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/EnergyCounterBlock.kt index f3ceca6f8..8a59d7980 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/EnergyCounterBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/EnergyCounterBlock.kt @@ -21,8 +21,8 @@ import net.minecraft.world.phys.shapes.VoxelShape import ru.dbotthepony.mc.otm.block.MatteryBlock import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.entity.tech.EnergyCounterBlockEntity -import ru.dbotthepony.mc.otm.core.asSupplier -import ru.dbotthepony.mc.otm.core.collect.SupplierMap +import ru.dbotthepony.mc.otm.util.asSupplier +import ru.dbotthepony.mc.otm.util.collect.SupplierMap import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes import java.util.concurrent.Callable diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/EnergyServoBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/EnergyServoBlock.kt index 6ec7fa3b3..750871bf3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/EnergyServoBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/EnergyServoBlock.kt @@ -15,7 +15,7 @@ import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.entity.tech.EnergyServoBlockEntity import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/EssenceStorageBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/EssenceStorageBlock.kt index b6187b6bf..45a62a6f4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/EssenceStorageBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/EssenceStorageBlock.kt @@ -30,11 +30,10 @@ import ru.dbotthepony.mc.otm.block.entity.tech.EssenceStorageBlockEntity import ru.dbotthepony.mc.otm.block.getShapeForEachState import ru.dbotthepony.mc.otm.client.isShiftDown import ru.dbotthepony.mc.otm.client.minecraft -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.util.getLevelFromXp +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.getLevelFromXp import ru.dbotthepony.mc.otm.item.EssenceServoItem -import ru.dbotthepony.mc.otm.registry.game.MItems import ru.dbotthepony.mc.otm.shapes.BlockShapes class EssenceStorageBlock(val color: DyeColor?) : RotatableMatteryBlock(Properties.of().mapColor(color?.mapColor ?: MapColor.METAL).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().destroyTime(1.5f).explosionResistance(60.0f)), EntityBlock { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/GravitationStabilizerBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/GravitationStabilizerBlock.kt index a80c20ff4..670ea37df 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/GravitationStabilizerBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/GravitationStabilizerBlock.kt @@ -28,12 +28,12 @@ import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.entity.tech.GravitationStabilizerBlockEntity import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleBlockEntity import ru.dbotthepony.mc.otm.block.entity.WorkerState -import ru.dbotthepony.mc.otm.core.collect.SupplierList -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom -import ru.dbotthepony.mc.otm.core.math.plus -import ru.dbotthepony.mc.otm.core.math.times -import ru.dbotthepony.mc.otm.core.runInBackground +import ru.dbotthepony.mc.otm.util.collect.SupplierList +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.math.plus +import ru.dbotthepony.mc.otm.util.math.times +import ru.dbotthepony.mc.otm.util.runInBackground import ru.dbotthepony.mc.otm.oncePre import ru.dbotthepony.mc.otm.registry.game.MBlockEntities import ru.dbotthepony.mc.otm.registry.game.MBlocks diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/HatchBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/HatchBlock.kt index d0b1cd89c..92dd3f1cb 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/HatchBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/HatchBlock.kt @@ -13,7 +13,7 @@ import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.material.MapColor import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent class HatchBlock(val factory: BlockEntityType.BlockEntitySupplier, val needsTicking: Boolean = false) : RotatableMatteryBlock(Properties.of().mapColor(MapColor.METAL).sound( SoundType.VAULT).requiresCorrectToolForDrops().destroyTime(2.5f).explosionResistance(80.0f)), EntityBlock { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PhantomAttractorBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PhantomAttractorBlock.kt index 8cbc0395f..ac765b74e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PhantomAttractorBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PhantomAttractorBlock.kt @@ -28,10 +28,10 @@ import net.neoforged.neoforge.event.EventHooks import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.addSimpleDescription import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.AABB -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.minus -import ru.dbotthepony.mc.otm.core.math.plus +import ru.dbotthepony.mc.otm.util.AABB +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.minus +import ru.dbotthepony.mc.otm.util.math.plus import ru.dbotthepony.mc.otm.once import ru.dbotthepony.mc.otm.registry.game.MBlocks import ru.dbotthepony.mc.otm.shapes.BlockShapes @@ -52,7 +52,8 @@ class PhantomAttractorBlock : RotatableMatteryBlock(Properties.of().mapColor(Map if (level.getEntitiesOfClass(Phantom::class.java, AABB( blockPos - BlockPos(20, 20, 20), blockPos + BlockPos(20, 20, 20), - )).size > 4) { + ) + ).size > 4) { return } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PlatePressBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PlatePressBlock.kt index cc6606a5e..5a917e9c4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PlatePressBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PlatePressBlock.kt @@ -19,7 +19,7 @@ import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.WorkerState import ru.dbotthepony.mc.otm.block.entity.tech.PlatePressBlockEntity import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.shapes.BlockShapes class PlatePressBlock(val color: DyeColor?, val isTwin: Boolean = false) : RotatableMatteryBlock(Properties.of().mapColor(color?.mapColor ?: MapColor.METAL).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().destroyTime(1.5f).explosionResistance(25.0f)), EntityBlock { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/AbstractProfiledStorage.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/AbstractProfiledStorage.kt index 9e93d3166..10b8d7255 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/AbstractProfiledStorage.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/AbstractProfiledStorage.kt @@ -4,10 +4,10 @@ import it.unimi.dsi.fastutil.objects.ObjectArrayList import net.minecraft.core.HolderLookup import net.minecraft.nbt.CompoundTag import net.neoforged.neoforge.common.util.INBTSerializable -import ru.dbotthepony.mc.otm.core.chart.DecimalHistoryChart -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.nbt.map -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.chart.DecimalHistoryChart +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.map +import ru.dbotthepony.mc.otm.util.set abstract class AbstractProfiledStorage(val parent: P) : IProfiledStorage, INBTSerializable { final override val received = DecimalHistoryChart(ticks = HISTORY_SIZE) 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 644e715c1..ef4949714 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt @@ -24,15 +24,14 @@ import ru.dbotthepony.mc.otm.compat.curios.curiosStream import ru.dbotthepony.mc.otm.compat.curios.isCuriosLoaded import ru.dbotthepony.mc.otm.container.util.awareStream import ru.dbotthepony.mc.otm.container.util.iterator -import ru.dbotthepony.mc.otm.core.collect.AwareItemStack -import ru.dbotthepony.mc.otm.core.collect.ContainerItemStackEntry -import ru.dbotthepony.mc.otm.core.collect.concatIterators -import ru.dbotthepony.mc.otm.core.collect.emptyIterator -import ru.dbotthepony.mc.otm.core.collect.filter -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.util.formatFluidLevel +import ru.dbotthepony.mc.otm.util.collect.AwareItemStack +import ru.dbotthepony.mc.otm.util.collect.ContainerItemStackEntry +import ru.dbotthepony.kommons.collect.concatIterators +import ru.dbotthepony.kommons.collect.filter +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.formatFluidLevel import ru.dbotthepony.mc.otm.player.matteryPlayer import java.util.stream.Stream diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/FlowDirection.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/FlowDirection.kt index 38e798d47..d58e32918 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/FlowDirection.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/FlowDirection.kt @@ -4,7 +4,7 @@ import com.google.common.collect.ImmutableSet import net.minecraft.network.chat.Component import net.minecraft.network.chat.MutableComponent import net.minecraft.util.StringRepresentable -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import java.util.Collections import java.util.EnumSet import java.util.function.Predicate diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/IProfiledStorage.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/IProfiledStorage.kt index 0d2109e66..8938a7f59 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/IProfiledStorage.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/IProfiledStorage.kt @@ -1,8 +1,8 @@ package ru.dbotthepony.mc.otm.capability -import ru.dbotthepony.mc.otm.core.chart.CombinedDecimalHistoryChart -import ru.dbotthepony.mc.otm.core.chart.IHistoryChart -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.chart.CombinedDecimalHistoryChart +import ru.dbotthepony.mc.otm.util.chart.IHistoryChart +import ru.dbotthepony.mc.otm.util.math.Decimal interface IProfiledStorage { val received: IHistoryChart diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Upgrades.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Upgrades.kt index 0bccbbc74..18483da60 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Upgrades.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Upgrades.kt @@ -3,15 +3,15 @@ package ru.dbotthepony.mc.otm.capability import net.minecraft.ChatFormatting import net.minecraft.network.chat.Component import net.minecraft.world.item.Item +import ru.dbotthepony.kommons.guava.immutableSet import ru.dbotthepony.mc.otm.client.ShiftPressedCond import ru.dbotthepony.mc.otm.config.MachinesConfig -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.collect.SupplierList -import ru.dbotthepony.mc.otm.core.immutableSet -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.util.formatMatter -import ru.dbotthepony.mc.otm.core.util.formatPower +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.collect.SupplierList +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.formatMatter +import ru.dbotthepony.mc.otm.util.formatPower /** * Upgrades merge by sum of their effects @@ -200,16 +200,14 @@ enum class UpgradeType { fun set() = sets[flag] companion object { - private val cached = values() - - private val sets = Array(2 shl cached.size) { + private val sets = Array(2 shl entries.size) { immutableSet { - for (u in values()) if (it.and(u.flag) != 0) accept(u) + for (u in entries) if (it.and(u.flag) != 0) accept(u) } } @JvmField - val ALL = set(*values()) + val ALL = set(*entries.toTypedArray()) @JvmField val BASIC = set(SPEED, ENERGY_STORAGE, ENERGY_CONSUMPTION, ENERGY_THROUGHPUT) 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 29a0f5855..287a89722 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 @@ -2,22 +2,17 @@ package ru.dbotthepony.mc.otm.capability.drive import it.unimi.dsi.fastutil.objects.Object2ObjectOpenCustomHashMap import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap -import it.unimi.dsi.fastutil.objects.ObjectArraySet import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet import net.minecraft.core.HolderLookup import net.minecraft.core.HolderLookup.Provider -import kotlin.jvm.JvmOverloads import java.util.UUID import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.ListTag import net.minecraft.nbt.Tag -import org.apache.logging.log4j.LogManager -import ru.dbotthepony.mc.otm.core.* -import ru.dbotthepony.mc.otm.core.math.BigInteger -import ru.dbotthepony.mc.otm.core.math.isPositive -import ru.dbotthepony.mc.otm.core.math.serializeNBT -import ru.dbotthepony.mc.otm.core.nbt.map -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.math.BigInteger +import ru.dbotthepony.mc.otm.util.math.isPositive +import ru.dbotthepony.mc.otm.util.math.serializeNBT +import ru.dbotthepony.mc.otm.util.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 f38073b4c..e3fec011f 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 @@ -4,9 +4,9 @@ import net.minecraft.core.HolderLookup import net.minecraft.nbt.CompoundTag import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack -import ru.dbotthepony.mc.otm.core.math.BigInteger -import ru.dbotthepony.mc.otm.core.math.serializeNBT -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.math.BigInteger +import ru.dbotthepony.mc.otm.util.math.serializeNBT +import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.storage.IStorageTuple import ru.dbotthepony.mc.otm.storage.ItemStorageStack import ru.dbotthepony.mc.otm.storage.StorageStack diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/BatteryBackedEnergyStorage.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/BatteryBackedEnergyStorage.kt index b24020479..87b42d762 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/BatteryBackedEnergyStorage.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/BatteryBackedEnergyStorage.kt @@ -14,9 +14,9 @@ import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.mc.otm.capability.FlowDirection import ru.dbotthepony.mc.otm.capability.extractEnergy import ru.dbotthepony.mc.otm.capability.receiveEnergy -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.nbt.getDecimal -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.getDecimal +import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.registry.StatNames import ru.dbotthepony.mc.otm.triggers.AndroidBatteryTrigger import ru.dbotthepony.mc.otm.triggers.ExopackBatterySlotTrigger diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/BlockEnergyStorageImpl.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/BlockEnergyStorageImpl.kt index ded418754..b3cd075c7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/BlockEnergyStorageImpl.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/BlockEnergyStorageImpl.kt @@ -9,9 +9,9 @@ import net.neoforged.neoforge.common.util.INBTSerializable import ru.dbotthepony.mc.otm.capability.FlowDirection import ru.dbotthepony.mc.otm.config.EnergyBalanceValues import ru.dbotthepony.mc.otm.config.VerboseEnergyBalanceValues -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.nbt.mapPresent -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.mapPresent +import ru.dbotthepony.mc.otm.util.set open class BlockEnergyStorageImpl( protected val listener: () -> Unit, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/CombinedEnergyStorage.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/CombinedEnergyStorage.kt index fcdeacfb6..3c6773f18 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/CombinedEnergyStorage.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/CombinedEnergyStorage.kt @@ -2,10 +2,10 @@ package ru.dbotthepony.mc.otm.capability.energy import net.minecraft.util.RandomSource import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.collect.reduce -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.util.CapabilityListIterator +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.kommons.collect.reduce +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.CapabilityListIterator import java.util.function.Supplier open class CombinedEnergyStorage( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/CombinedProfiledEnergyStorage.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/CombinedProfiledEnergyStorage.kt index 34c4e4204..b7b9a7d1e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/CombinedProfiledEnergyStorage.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/CombinedProfiledEnergyStorage.kt @@ -4,19 +4,19 @@ import net.minecraft.util.RandomSource import ru.dbotthepony.mc.otm.capability.AbstractProfiledStorage import ru.dbotthepony.mc.otm.capability.FlowDirection import ru.dbotthepony.mc.otm.capability.IProfiledStorage -import ru.dbotthepony.mc.otm.core.chart.CombinedDecimalHistoryChart -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.collect.reduce -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.util.ITickable +import ru.dbotthepony.mc.otm.util.chart.CombinedDecimalHistoryChart +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.kommons.collect.reduce +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.ITickable import java.util.function.Supplier -import java.util.random.RandomGenerator class CombinedProfiledEnergyStorage( energyFlow: FlowDirection, provider: Supplier>>, random: Supplier = Supplier { null } -) : CombinedEnergyStorage(energyFlow, provider, random), IProfiledMatteryEnergyStorage, IProfiledStorage.Combined, ITickable { +) : CombinedEnergyStorage(energyFlow, provider, random), IProfiledMatteryEnergyStorage, IProfiledStorage.Combined, + ITickable { override val received = CombinedDecimalHistoryChart(Supplier { this.provider.get().iterator().map { (it as ProfiledEnergyStorage<*>).received } }, ticks = AbstractProfiledStorage.HISTORY_SIZE) override val transferred = CombinedDecimalHistoryChart(Supplier { this.provider.get().iterator().map { (it as ProfiledEnergyStorage<*>).transferred } }, ticks = AbstractProfiledStorage.HISTORY_SIZE) override val receivedThisTick: Decimal diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/IEnergyStorageImpl.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/IEnergyStorageImpl.kt index 28fa9e8cc..6cfdd8f79 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/IEnergyStorageImpl.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/IEnergyStorageImpl.kt @@ -5,9 +5,9 @@ import net.minecraft.network.chat.Component import net.neoforged.neoforge.energy.IEnergyStorage import ru.dbotthepony.mc.otm.capability.FlowDirection import ru.dbotthepony.mc.otm.client.ShiftPressedCond -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.util.formatPower +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.formatPower sealed interface IEnergyStorageImpl { val maxInput: Decimal? diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/IMatteryEnergyStorage.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/IMatteryEnergyStorage.kt index 2fad6fb07..5698d9863 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/IMatteryEnergyStorage.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/IMatteryEnergyStorage.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.capability.energy import net.neoforged.neoforge.energy.IEnergyStorage import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.mc.otm.capability.IProfiledStorage import java.math.BigInteger diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/ItemEnergyStorageImpl.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/ItemEnergyStorageImpl.kt index ac70bc9d4..095b59622 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/ItemEnergyStorageImpl.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/ItemEnergyStorageImpl.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.capability.energy import net.minecraft.world.item.ItemStack import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.registry.game.MDataComponentTypes abstract class ItemEnergyStorageImpl(val itemStack: ItemStack) : IMatteryEnergyStorage, IEnergyStorageImpl { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/ProfiledEnergyStorage.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/ProfiledEnergyStorage.kt index 1bd03806c..84ad0cbf5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/ProfiledEnergyStorage.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/ProfiledEnergyStorage.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.capability.energy import ru.dbotthepony.mc.otm.capability.AbstractProfiledStorage import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal class ProfiledEnergyStorage(parent: E) : AbstractProfiledStorage(parent), IProfiledMatteryEnergyStorage { override fun extractEnergy(howMuch: Decimal, simulate: Boolean): Decimal { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/ProxiedEnergyStorage.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/ProxiedEnergyStorage.kt index e6bad2d75..4c6e7f039 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/ProxiedEnergyStorage.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/ProxiedEnergyStorage.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.capability.energy import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal class ProxiedEnergyStorage(var parent: T? = null) : IMatteryEnergyStorage { override fun extractEnergy(howMuch: Decimal, simulate: Boolean): Decimal { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/AbstractMatteryFluidHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/AbstractMatteryFluidHandler.kt index 7799e9397..81a2d585e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/AbstractMatteryFluidHandler.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/AbstractMatteryFluidHandler.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.capability.fluid import net.neoforged.neoforge.fluids.FluidStack import net.neoforged.neoforge.fluids.capability.IFluidHandler import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.core.isNotEmpty +import ru.dbotthepony.mc.otm.util.isNotEmpty abstract class AbstractMatteryFluidHandler : IFluidHandler { abstract var fluid: FluidStack diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/BlockMatteryFluidHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/BlockMatteryFluidHandler.kt index 802c1198d..35b5e5fcf 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/BlockMatteryFluidHandler.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/BlockMatteryFluidHandler.kt @@ -5,7 +5,6 @@ import net.minecraft.core.component.DataComponents import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.Tag import net.minecraft.resources.ResourceLocation -import net.minecraft.world.item.BlockItem import net.minecraft.world.item.ItemStack import net.minecraft.world.item.component.CustomData import net.neoforged.neoforge.common.util.INBTSerializable @@ -14,7 +13,7 @@ import ru.dbotthepony.kommons.util.Delegate import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.mc.otm.Registries -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.set import java.util.function.IntSupplier /** diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/CombinedMatterStorage.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/CombinedMatterStorage.kt index 433a36e46..6be0fef47 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/CombinedMatterStorage.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/CombinedMatterStorage.kt @@ -2,10 +2,10 @@ package ru.dbotthepony.mc.otm.capability.matter import net.minecraft.util.RandomSource import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.collect.reduce -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.util.CapabilityListIterator +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.kommons.collect.reduce +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.CapabilityListIterator import java.util.function.Supplier open class CombinedMatterStorage( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/CombinedProfiledMatterStorage.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/CombinedProfiledMatterStorage.kt index b436d9fc5..dfe38751f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/CombinedProfiledMatterStorage.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/CombinedProfiledMatterStorage.kt @@ -4,13 +4,12 @@ import net.minecraft.util.RandomSource import ru.dbotthepony.mc.otm.capability.AbstractProfiledStorage import ru.dbotthepony.mc.otm.capability.FlowDirection import ru.dbotthepony.mc.otm.capability.IProfiledStorage -import ru.dbotthepony.mc.otm.core.chart.CombinedDecimalHistoryChart -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.collect.reduce -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.util.ITickable +import ru.dbotthepony.mc.otm.util.chart.CombinedDecimalHistoryChart +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.kommons.collect.reduce +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.ITickable import java.util.function.Supplier -import java.util.random.RandomGenerator class CombinedProfiledMatterStorage( matterFlow: FlowDirection, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/IMatterStorage.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/IMatterStorage.kt index 6fddd7aa3..89ad582ee 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/IMatterStorage.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/IMatterStorage.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.capability.matter import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.mc.otm.capability.IProfiledStorage import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/IPatternStorage.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/IPatternStorage.kt index d5ebbd7fb..81cb46ed5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/IPatternStorage.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/IPatternStorage.kt @@ -7,7 +7,7 @@ import net.minecraft.world.item.Item.TooltipContext import net.minecraft.world.item.ItemStack import net.minecraft.world.item.TooltipFlag import ru.dbotthepony.kommons.math.RGBAColor -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import java.util.* import java.util.function.Predicate import java.util.stream.Collectors diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/MatterStorageImpl.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/MatterStorageImpl.kt index 9e361793c..e8b748f54 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/MatterStorageImpl.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/MatterStorageImpl.kt @@ -6,8 +6,8 @@ import net.neoforged.neoforge.common.util.INBTSerializable import ru.dbotthepony.mc.otm.config.EnergyBalanceValues import ru.dbotthepony.mc.otm.config.VerboseEnergyBalanceValues import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.set open class MatterStorageImpl( protected val listener: Runnable?, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/PatternState.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/PatternState.kt index acd50d631..2a58ce623 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/PatternState.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/PatternState.kt @@ -7,8 +7,8 @@ import net.minecraft.core.registries.BuiltInRegistries import net.minecraft.network.FriendlyByteBuf import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack -import ru.dbotthepony.mc.otm.core.util.readBinaryJsonWithCodec -import ru.dbotthepony.mc.otm.core.util.writeBinaryJsonWithCodec +import ru.dbotthepony.mc.otm.util.readBinaryJsonWithCodec +import ru.dbotthepony.mc.otm.util.writeBinaryJsonWithCodec import java.util.* data class PatternState( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/ProfiledMatterStorage.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/ProfiledMatterStorage.kt index f00cf356d..c8c85a689 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/ProfiledMatterStorage.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/ProfiledMatterStorage.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.capability.matter import ru.dbotthepony.mc.otm.capability.AbstractProfiledStorage import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal class ProfiledMatterStorage(parent: M) : AbstractProfiledStorage(parent), IMatterStorage { override var storedMatter by parent::storedMatter diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/ReplicationTask.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/ReplicationTask.kt index 059022f22..889d49000 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/ReplicationTask.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/matter/ReplicationTask.kt @@ -10,8 +10,8 @@ import net.minecraft.nbt.Tag import net.minecraft.network.FriendlyByteBuf import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack -import ru.dbotthepony.mc.otm.core.util.readBinaryJsonWithCodec -import ru.dbotthepony.mc.otm.core.util.writeBinaryJsonWithCodec +import ru.dbotthepony.mc.otm.util.readBinaryJsonWithCodec +import ru.dbotthepony.mc.otm.util.writeBinaryJsonWithCodec import java.util.Optional import java.util.UUID diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/AndroidMenuKeyMapping.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/AndroidMenuKeyMapping.kt index c7db0d6c0..a2464fbf3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/AndroidMenuKeyMapping.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/AndroidMenuKeyMapping.kt @@ -17,9 +17,9 @@ import ru.dbotthepony.mc.otm.player.matteryPlayer import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.render.RenderGravity import ru.dbotthepony.kommons.math.RGBAColor -import ru.dbotthepony.mc.otm.core.math.angleDifference -import ru.dbotthepony.mc.otm.core.math.normalizeAngle -import ru.dbotthepony.mc.otm.core.util.formatTickDuration +import ru.dbotthepony.mc.otm.util.math.angleDifference +import ru.dbotthepony.mc.otm.util.math.normalizeAngle +import ru.dbotthepony.mc.otm.util.formatTickDuration import ru.dbotthepony.mc.otm.milliTimeD import ru.dbotthepony.mc.otm.network.SwitchAndroidFeaturePacket import java.util.stream.Collectors @@ -228,8 +228,8 @@ object AndroidMenuKeyMapping : KeyMapping("key.otm.android_menu", KeyConflictCon wrap.drawArc( minecraft.window.guiScaledWidth / 2f, minecraft.window.guiScaledHeight / 2f, - ru.dbotthepony.mc.otm.core.math.linearInterpolation(lastSelectProgressGlobal, size, size * 1.2f), - ru.dbotthepony.mc.otm.core.math.linearInterpolation(lastSelectProgressGlobal, size * 0.3f, size * 0.4f), + ru.dbotthepony.mc.otm.util.math.linearInterpolation(lastSelectProgressGlobal, size, size * 1.2f), + ru.dbotthepony.mc.otm.util.math.linearInterpolation(lastSelectProgressGlobal, size * 0.3f, size * 0.4f), startDegree = lastSelectedDegree!!, endDegree = lastSelectedDegree!! + degreePerSlice diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientEventHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientEventHandler.kt index c16fac903..fe31e4596 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientEventHandler.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientEventHandler.kt @@ -17,6 +17,7 @@ import net.neoforged.neoforge.client.event.MovementInputUpdateEvent import net.neoforged.neoforge.client.event.ScreenEvent import net.neoforged.neoforge.event.entity.player.ItemTooltipEvent import net.neoforged.neoforge.network.PacketDistributor +import ru.dbotthepony.kommons.collect.addAll import ru.dbotthepony.mc.otm.config.ClientConfig import ru.dbotthepony.mc.otm.player.android.feature.JumpBoostFeature import ru.dbotthepony.mc.otm.player.MatteryPlayer @@ -31,9 +32,8 @@ import ru.dbotthepony.mc.otm.client.screen.panels.Panel2Widget import ru.dbotthepony.mc.otm.client.screen.panels.button.ButtonPanel import ru.dbotthepony.mc.otm.compat.vanilla.InventoryScrollPacket import ru.dbotthepony.mc.otm.compat.cos.isCosmeticArmorScreen -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.addAll -import ru.dbotthepony.mc.otm.core.math.integerDivisionUp +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.math.integerDivisionUp import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures import java.util.WeakHashMap diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientTickHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientTickHandler.kt index e760361c3..285829bec 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientTickHandler.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientTickHandler.kt @@ -5,10 +5,10 @@ import net.neoforged.neoforge.client.event.ClientTickEvent import net.neoforged.neoforge.client.event.RenderFrameEvent import org.apache.logging.log4j.LogManager import org.lwjgl.glfw.GLFW -import ru.dbotthepony.mc.otm.core.util.IConditionalTickable -import ru.dbotthepony.mc.otm.core.util.ITickable -import ru.dbotthepony.mc.otm.core.util.TickList -import ru.dbotthepony.mc.otm.core.util.WriteOnce +import ru.dbotthepony.mc.otm.util.IConditionalTickable +import ru.dbotthepony.mc.otm.util.ITickable +import ru.dbotthepony.mc.otm.util.TickList +import ru.dbotthepony.mc.otm.util.WriteOnce import ru.dbotthepony.mc.otm.isClient import java.util.function.LongSupplier 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 b9fbe68db..f73bef157 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt @@ -24,19 +24,19 @@ import net.neoforged.neoforge.client.event.ScreenEvent import net.neoforged.neoforge.client.gui.VanillaGuiLayers import net.neoforged.neoforge.common.ItemAbilities import ru.dbotthepony.mc.otm.player.android.feature.NanobotsArmorFeature -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.player.MatteryPlayer import ru.dbotthepony.mc.otm.player.matteryPlayer import ru.dbotthepony.mc.otm.client.render.* import ru.dbotthepony.mc.otm.client.render.sprites.MatteryAtlas import ru.dbotthepony.mc.otm.client.render.sprites.MatterySprite import ru.dbotthepony.mc.otm.config.ClientConfig -import ru.dbotthepony.mc.otm.core.TextComponent +import ru.dbotthepony.mc.otm.util.TextComponent import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.mc.otm.OverdriveThatMatters.loc -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.random -import ru.dbotthepony.mc.otm.core.util.formatPower +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.random +import ru.dbotthepony.mc.otm.util.formatPower import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures import java.util.* import kotlin.math.PI diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryTooltipComponents.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryTooltipComponents.kt index 68f5bf7d9..1f420aefa 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryTooltipComponents.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryTooltipComponents.kt @@ -13,7 +13,7 @@ import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage import ru.dbotthepony.mc.otm.capability.matter.IMatterStorage import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.render.WidgetLocation -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import kotlin.math.ceil object MatteryTooltipComponents { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/FontRendering.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/FontRendering.kt index 02e7e428d..78d1601a0 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/FontRendering.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/FontRendering.kt @@ -7,11 +7,11 @@ import net.minecraft.client.renderer.MultiBufferSource import net.minecraft.network.chat.Component import net.minecraft.util.FormattedCharSequence import org.joml.Matrix4f -import ru.dbotthepony.mc.otm.core.FloatSupplier +import ru.dbotthepony.mc.otm.util.FloatSupplier import ru.dbotthepony.kommons.math.RGBAColor -import ru.dbotthepony.mc.otm.core.math.component1 -import ru.dbotthepony.mc.otm.core.math.component2 -import ru.dbotthepony.mc.otm.core.math.component3 +import ru.dbotthepony.mc.otm.util.math.component1 +import ru.dbotthepony.mc.otm.util.math.component2 +import ru.dbotthepony.mc.otm.util.math.component3 private val buffer = DynamicBufferSource(vertexSorting = VertexSorting.ORTHOGRAPHIC_Z) private fun buffer() = buffer diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/GlitchRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/GlitchRenderer.kt index de9cd3653..dcfbc2ef4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/GlitchRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/GlitchRenderer.kt @@ -14,7 +14,7 @@ import org.joml.Matrix4f import ru.dbotthepony.mc.otm.player.MatteryPlayer import ru.dbotthepony.mc.otm.player.matteryPlayer import ru.dbotthepony.mc.otm.client.minecraft -import ru.dbotthepony.mc.otm.core.math.linearInterpolation +import ru.dbotthepony.mc.otm.util.math.linearInterpolation import ru.dbotthepony.mc.otm.milliTime import java.lang.ref.WeakReference import kotlin.math.absoluteValue diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/MultiblockRendering.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/MultiblockRendering.kt index 327032fc9..9c892d934 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/MultiblockRendering.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/MultiblockRendering.kt @@ -11,12 +11,12 @@ import net.minecraft.client.renderer.RenderType import net.minecraft.core.BlockPos import org.lwjgl.opengl.GL11.GL_LESS import ru.dbotthepony.kommons.math.RGBAColor -import ru.dbotthepony.mc.otm.core.math.component1 -import ru.dbotthepony.mc.otm.core.math.component2 -import ru.dbotthepony.mc.otm.core.math.component3 -import ru.dbotthepony.mc.otm.core.math.minus -import ru.dbotthepony.mc.otm.core.multiblock.IMultiblockAccess -import ru.dbotthepony.mc.otm.core.multiblock.NodeStatus +import ru.dbotthepony.mc.otm.util.math.component1 +import ru.dbotthepony.mc.otm.util.math.component2 +import ru.dbotthepony.mc.otm.util.math.component3 +import ru.dbotthepony.mc.otm.util.math.minus +import ru.dbotthepony.mc.otm.multiblock.IMultiblockAccess +import ru.dbotthepony.mc.otm.multiblock.NodeStatus private val UNKNOWN = RGBAColor.YELLOW.copy(alpha = 0.5f) private val VALID = RGBAColor.DARK_GREEN.copy(alpha = 0.5f) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderExtensions.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderExtensions.kt index fc9479891..52744de98 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderExtensions.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderExtensions.kt @@ -8,11 +8,11 @@ import org.joml.Matrix3f import org.joml.Matrix4f import org.joml.Vector3f import ru.dbotthepony.kommons.math.RGBAColor -import ru.dbotthepony.mc.otm.core.math.IAngle -import ru.dbotthepony.mc.otm.core.math.Vector -import ru.dbotthepony.mc.otm.core.math.rotateAroundPoint -import ru.dbotthepony.mc.otm.core.math.rotateAroundThis -import ru.dbotthepony.mc.otm.core.math.translation +import ru.dbotthepony.mc.otm.util.math.IAngle +import ru.dbotthepony.mc.otm.util.math.Vector +import ru.dbotthepony.mc.otm.util.math.rotateAroundPoint +import ru.dbotthepony.mc.otm.util.math.rotateAroundThis +import ru.dbotthepony.mc.otm.util.math.translation val tesselator: Tesselator get() = Tesselator.getInstance() diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderGravity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderGravity.kt index 33a72244a..3982e87fc 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderGravity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderGravity.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.client.render import net.minecraft.client.gui.Font import net.minecraft.network.chat.Component import net.minecraft.util.FormattedCharSequence -import ru.dbotthepony.mc.otm.core.FloatSupplier +import ru.dbotthepony.mc.otm.util.FloatSupplier import kotlin.math.roundToInt private operator fun FloatSupplier.div(other: Float): Float { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderHelper.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderHelper.kt index c4d3a331a..232ec41f9 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderHelper.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderHelper.kt @@ -18,7 +18,7 @@ import org.lwjgl.opengl.GL11.GL_LESS import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.client.minecraft -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import java.util.* import kotlin.collections.ArrayDeque import kotlin.math.PI diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ResearchIcons.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ResearchIcons.kt index 05d050374..21f4469d0 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ResearchIcons.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ResearchIcons.kt @@ -5,7 +5,7 @@ import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.client.render.sprites.AbstractMatterySprite import ru.dbotthepony.mc.otm.client.render.sprites.GridAtlas import ru.dbotthepony.mc.otm.client.render.sprites.sprite -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation object ResearchIcons { val ICON_TRANSFER: AbstractMatterySprite diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ShockwaveRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ShockwaveRenderer.kt index 6178ec9f9..bf1aeaebe 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ShockwaveRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ShockwaveRenderer.kt @@ -8,12 +8,12 @@ import net.minecraft.client.renderer.GameRenderer import net.neoforged.neoforge.client.event.RenderLevelStageEvent import org.lwjgl.opengl.GL11.GL_LESS import ru.dbotthepony.mc.otm.config.PlayerConfig -import ru.dbotthepony.mc.otm.core.math.Vector -import ru.dbotthepony.mc.otm.core.math.component1 -import ru.dbotthepony.mc.otm.core.math.component2 -import ru.dbotthepony.mc.otm.core.math.component3 -import ru.dbotthepony.mc.otm.core.math.linearInterpolation -import ru.dbotthepony.mc.otm.core.math.rotateX +import ru.dbotthepony.mc.otm.util.math.Vector +import ru.dbotthepony.mc.otm.util.math.component1 +import ru.dbotthepony.mc.otm.util.math.component2 +import ru.dbotthepony.mc.otm.util.math.component3 +import ru.dbotthepony.mc.otm.util.math.linearInterpolation +import ru.dbotthepony.mc.otm.util.math.rotateX import ru.dbotthepony.mc.otm.network.ShockwaveEffectPacket import ru.dbotthepony.mc.otm.secondTimeD import kotlin.math.PI diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetLocation.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetLocation.kt index bbd38299b..2b55c6bf8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetLocation.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetLocation.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.client.render import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.client.render.sprites.MatteryAtlas -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation object WidgetLocation { val STORAGE_CONTROLS = MatteryAtlas(ResourceLocation(OverdriveThatMatters.MOD_ID, "textures/gui/widgets/storage_controls.png"), 90f, 90f) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt index ec3f41496..51ccf72fa 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt @@ -2,8 +2,8 @@ package ru.dbotthepony.mc.otm.client.render import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.core.immutableMap -import ru.dbotthepony.mc.otm.core.math.RelativeSide +import ru.dbotthepony.kommons.guava.immutableMap +import ru.dbotthepony.mc.otm.util.math.RelativeSide object Widgets18 { private val storageGrid = WidgetLocation.STORAGE_CONTROLS.grid(rows = 5, columns = 5) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets8.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets8.kt index f1ee262d2..2c65156e2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets8.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets8.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.client.render import net.minecraft.resources.ResourceLocation import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.client.render.sprites.GridAtlas -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation object Widgets8 { private val GRID = WidgetLocation.WIDGET_8.grid(columns = 8, rows = 4) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BankRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BankRenderer.kt index daa1e37d5..4b8116cb4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BankRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BankRenderer.kt @@ -20,14 +20,12 @@ import ru.dbotthepony.mc.otm.client.render.DynamicBufferSource import ru.dbotthepony.mc.otm.client.render.UVWindingOrder import ru.dbotthepony.mc.otm.client.render.WidgetLocation import ru.dbotthepony.mc.otm.client.render.sprites.AbstractMatterySprite -import ru.dbotthepony.mc.otm.client.screen.widget.MatterGaugePanel -import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.immutableList -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom -import ru.dbotthepony.mc.otm.core.math.rotate -import ru.dbotthepony.mc.otm.core.math.rotateY +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.kommons.guava.immutableList +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.math.rotate +import ru.dbotthepony.mc.otm.util.math.rotateY import ru.dbotthepony.mc.otm.nanoTime import java.util.function.Supplier import kotlin.math.PI 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 fbbcdcc2e..b014bfa28 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 @@ -12,7 +12,7 @@ import net.minecraft.world.phys.AABB import net.minecraft.world.phys.Vec3 import org.joml.Matrix4f import org.lwjgl.opengl.GL30 -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.block.entity.tech.GravitationStabilizerBlockEntity import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleBlockEntity import ru.dbotthepony.mc.otm.player.matteryPlayer @@ -20,17 +20,17 @@ import ru.dbotthepony.mc.otm.client.ShiftPressedCond import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.render.* import ru.dbotthepony.kommons.math.RGBAColor -import ru.dbotthepony.mc.otm.core.AABB -import ru.dbotthepony.mc.otm.core.math.VECTOR_FORWARD -import ru.dbotthepony.mc.otm.core.math.VECTOR_RIGHT -import ru.dbotthepony.mc.otm.core.math.VECTOR_UP -import ru.dbotthepony.mc.otm.core.math.Vector -import ru.dbotthepony.mc.otm.core.math.asMutableAngle -import ru.dbotthepony.mc.otm.core.math.asVector -import ru.dbotthepony.mc.otm.core.math.minus -import ru.dbotthepony.mc.otm.core.math.rotateAroundAxis -import ru.dbotthepony.mc.otm.core.math.times -import ru.dbotthepony.mc.otm.core.util.formatMatter +import ru.dbotthepony.mc.otm.util.AABB +import ru.dbotthepony.mc.otm.util.math.VECTOR_FORWARD +import ru.dbotthepony.mc.otm.util.math.VECTOR_RIGHT +import ru.dbotthepony.mc.otm.util.math.VECTOR_UP +import ru.dbotthepony.mc.otm.util.math.Vector +import ru.dbotthepony.mc.otm.util.math.asMutableAngle +import ru.dbotthepony.mc.otm.util.math.asVector +import ru.dbotthepony.mc.otm.util.math.minus +import ru.dbotthepony.mc.otm.util.math.rotateAroundAxis +import ru.dbotthepony.mc.otm.util.math.times +import ru.dbotthepony.mc.otm.util.formatMatter import ru.dbotthepony.mc.otm.registry.game.MItems import kotlin.math.PI import kotlin.math.pow 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 741f3f925..e1adfad05 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 @@ -7,21 +7,19 @@ import net.minecraft.client.renderer.blockentity.BlockEntityRenderer import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider import net.minecraft.core.Direction import net.minecraft.network.chat.Component -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.block.tech.EnergyCounterBlock import ru.dbotthepony.mc.otm.block.entity.tech.EnergyCounterBlockEntity import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.render.* -import ru.dbotthepony.mc.otm.core.TextComponent +import ru.dbotthepony.mc.otm.util.TextComponent import ru.dbotthepony.kommons.math.RGBAColor -import ru.dbotthepony.mc.otm.core.RandomSource2Generator -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.asAngle -import ru.dbotthepony.mc.otm.core.math.clusterize -import ru.dbotthepony.mc.otm.core.util.formatPower -import ru.dbotthepony.mc.otm.core.math.times -import ru.dbotthepony.mc.otm.core.util.GJRAND64RandomSource -import java.util.Random +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.math.asAngle +import ru.dbotthepony.mc.otm.util.math.clusterize +import ru.dbotthepony.mc.otm.util.formatPower +import ru.dbotthepony.mc.otm.util.math.times +import ru.dbotthepony.mc.otm.util.GJRAND64RandomSource import kotlin.math.PI import kotlin.math.absoluteValue diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/FluidTankRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/FluidTankRenderer.kt index 211d458e5..c0b43b813 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/FluidTankRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/FluidTankRenderer.kt @@ -27,7 +27,7 @@ import ru.dbotthepony.mc.otm.client.render.normal import ru.dbotthepony.mc.otm.client.render.overlayCoords import ru.dbotthepony.mc.otm.client.render.uv import ru.dbotthepony.mc.otm.client.render.vertex -import ru.dbotthepony.mc.otm.core.math.linearInterpolation +import ru.dbotthepony.mc.otm.util.math.linearInterpolation import ru.dbotthepony.mc.otm.registry.game.MBlocks class FluidTankRenderer(private val context: BlockEntityRendererProvider.Context) : BlockEntityRenderer { 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 b0f17a1f6..278a8cff7 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 @@ -11,7 +11,7 @@ import net.minecraft.client.renderer.texture.OverlayTexture import net.minecraft.core.Direction import net.minecraft.world.phys.AABB import org.joml.Matrix4f -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.block.BlackHoleBlock import ru.dbotthepony.mc.otm.block.entity.tech.GravitationStabilizerBlockEntity import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleBlockEntity @@ -19,20 +19,21 @@ import ru.dbotthepony.mc.otm.block.entity.WorkerState import ru.dbotthepony.mc.otm.client.ShiftPressedCond import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.render.* -import ru.dbotthepony.mc.otm.core.* -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.mc.otm.block.entity.tech.GravitationStabilizerBlockEntity.Companion.RANGE -import ru.dbotthepony.mc.otm.core.math.VECTOR_DOWN -import ru.dbotthepony.mc.otm.core.math.VECTOR_FORWARD -import ru.dbotthepony.mc.otm.core.math.VECTOR_RIGHT -import ru.dbotthepony.mc.otm.core.math.VECTOR_UP -import ru.dbotthepony.mc.otm.core.math.Vector -import ru.dbotthepony.mc.otm.core.math.asAngle -import ru.dbotthepony.mc.otm.core.math.plus -import ru.dbotthepony.mc.otm.core.math.rotateAroundAxis -import ru.dbotthepony.mc.otm.core.math.times -import ru.dbotthepony.mc.otm.core.util.formatMatter +import ru.dbotthepony.mc.otm.util.math.VECTOR_DOWN +import ru.dbotthepony.mc.otm.util.math.VECTOR_FORWARD +import ru.dbotthepony.mc.otm.util.math.VECTOR_RIGHT +import ru.dbotthepony.mc.otm.util.math.VECTOR_UP +import ru.dbotthepony.mc.otm.util.math.Vector +import ru.dbotthepony.mc.otm.util.math.asAngle +import ru.dbotthepony.mc.otm.util.math.plus +import ru.dbotthepony.mc.otm.util.math.rotateAroundAxis +import ru.dbotthepony.mc.otm.util.math.times +import ru.dbotthepony.mc.otm.util.formatMatter +import ru.dbotthepony.mc.otm.util.AABB +import ru.dbotthepony.mc.otm.util.get import kotlin.math.PI class GravitationStabilizerRenderer(private val context: BlockEntityRendererProvider.Context) : BlockEntityRenderer { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/HoloSignRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/HoloSignRenderer.kt index 999062414..985868071 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/HoloSignRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/HoloSignRenderer.kt @@ -7,16 +7,15 @@ import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider import net.minecraft.network.chat.MutableComponent import ru.dbotthepony.mc.otm.block.entity.decorative.HoloSignBlockEntity import ru.dbotthepony.mc.otm.client.font -import ru.dbotthepony.mc.otm.client.render.DynamicBufferSource import ru.dbotthepony.mc.otm.client.render.RenderGravity import ru.dbotthepony.mc.otm.client.render.draw -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.mc.otm.client.MatteryGUI.SMALL_FONT_STYLE import ru.dbotthepony.mc.otm.client.MatteryGUI.STANDARD_FONT_STYLE -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.math.rotateWithBlockFacing +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.math.rotateWithBlockFacing class HoloSignRenderer(private val context: BlockEntityRendererProvider.Context) : BlockEntityRenderer { override fun render( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/MatterReplicatorRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/MatterReplicatorRenderer.kt index 6eaa4d807..611b65700 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/MatterReplicatorRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/MatterReplicatorRenderer.kt @@ -5,7 +5,6 @@ import com.mojang.blaze3d.platform.GlStateManager.SourceFactor import com.mojang.blaze3d.systems.RenderSystem import com.mojang.blaze3d.vertex.PoseStack import net.minecraft.client.renderer.MultiBufferSource -import net.minecraft.client.renderer.block.model.ItemTransforms import net.minecraft.client.renderer.blockentity.BlockEntityRenderer import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider import net.minecraft.core.particles.DustParticleOptions @@ -17,12 +16,12 @@ import ru.dbotthepony.mc.otm.block.entity.WorkerState import ru.dbotthepony.mc.otm.block.entity.matter.MatterReplicatorBlockEntity import ru.dbotthepony.mc.otm.client.render.DynamicBufferSource import ru.dbotthepony.mc.otm.client.render.lockBlendFunc -import ru.dbotthepony.mc.otm.core.math.component1 -import ru.dbotthepony.mc.otm.core.math.component2 -import ru.dbotthepony.mc.otm.core.math.component3 -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.normalizeAngleDeg -import ru.dbotthepony.mc.otm.core.math.rotateYDegrees +import ru.dbotthepony.mc.otm.util.math.component1 +import ru.dbotthepony.mc.otm.util.math.component2 +import ru.dbotthepony.mc.otm.util.math.component3 +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.normalizeAngleDeg +import ru.dbotthepony.mc.otm.util.math.rotateYDegrees import ru.dbotthepony.mc.otm.isPaused class MatterReplicatorRenderer(private val context: BlockEntityRendererProvider.Context) : BlockEntityRenderer { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/PoweredSmokerRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/PoweredSmokerRenderer.kt index 228fd4b52..e469511d5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/PoweredSmokerRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/PoweredSmokerRenderer.kt @@ -6,10 +6,10 @@ import net.minecraft.client.renderer.blockentity.BlockEntityRenderer import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider import net.minecraft.world.item.ItemDisplayContext import ru.dbotthepony.mc.otm.block.entity.tech.AbstractPoweredFurnaceBlockEntity -import ru.dbotthepony.mc.otm.core.math.normalizeAngle -import ru.dbotthepony.mc.otm.core.math.rotateY -import ru.dbotthepony.mc.otm.core.math.yRotationNorth -import ru.dbotthepony.mc.otm.core.math.yRotationSouth +import ru.dbotthepony.mc.otm.util.math.normalizeAngle +import ru.dbotthepony.mc.otm.util.math.rotateY +import ru.dbotthepony.mc.otm.util.math.yRotationNorth +import ru.dbotthepony.mc.otm.util.math.yRotationSouth class PoweredSmokerRenderer(private val context: BlockEntityRendererProvider.Context) : BlockEntityRenderer> { override fun render(tile: AbstractPoweredFurnaceBlockEntity<*, *>, partialTick: Float, pose: PoseStack, buffers: MultiBufferSource, packedLight: Int, packedOverlay: Int) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/entity/RogueAndroidRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/entity/RogueAndroidRenderer.kt index 9f7340a4d..3ae19db0a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/entity/RogueAndroidRenderer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/entity/RogueAndroidRenderer.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.client.render.entity import net.minecraft.client.model.HumanoidModel import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import net.minecraft.client.model.PlayerModel import net.minecraft.client.renderer.entity.EntityRendererProvider diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/AbstractMatterySprite.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/AbstractMatterySprite.kt index 7e3183fbe..6a03432c5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/AbstractMatterySprite.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/AbstractMatterySprite.kt @@ -21,7 +21,7 @@ import ru.dbotthepony.mc.otm.client.render.color import ru.dbotthepony.mc.otm.client.render.renderTexturedRect import ru.dbotthepony.mc.otm.client.render.uv import ru.dbotthepony.mc.otm.client.render.vertex -import ru.dbotthepony.mc.otm.core.math.linearInterpolation +import ru.dbotthepony.mc.otm.util.math.linearInterpolation import java.util.concurrent.ConcurrentHashMap sealed class AbstractMatterySprite : IGUIRenderable, IUVCoords { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/SpriteType.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/SpriteType.kt index c81bfb36f..d523968fa 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/SpriteType.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/SpriteType.kt @@ -5,8 +5,8 @@ import com.google.gson.JsonPrimitive import com.google.gson.JsonSyntaxException import net.minecraft.network.FriendlyByteBuf import net.minecraft.resources.ResourceLocation +import ru.dbotthepony.kommons.gson.set import ru.dbotthepony.mc.otm.client.render.UVWindingOrder -import ru.dbotthepony.mc.otm.core.set enum class SpriteType { SINGLE { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExopackInventoryScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExopackInventoryScreen.kt index 5732aeeab..ce5c9d0f1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExopackInventoryScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExopackInventoryScreen.kt @@ -10,7 +10,7 @@ import ru.dbotthepony.mc.otm.client.moveMousePosScaled import ru.dbotthepony.mc.otm.client.render.ItemStackIcon import ru.dbotthepony.mc.otm.client.render.RenderGravity import ru.dbotthepony.mc.otm.client.render.Widgets18 -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.client.render.sprites.sprite import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.panels.button.ButtonPanel @@ -23,7 +23,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.util.GridPanel import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel import ru.dbotthepony.mc.otm.client.setMousePos import ru.dbotthepony.mc.otm.client.shouldOpenVanillaInventory -import ru.dbotthepony.mc.otm.core.math.integerDivisionDown +import ru.dbotthepony.mc.otm.util.math.integerDivisionDown import ru.dbotthepony.mc.otm.menu.ExopackInventoryMenu import ru.dbotthepony.mc.otm.menu.QuickMoveInput import ru.dbotthepony.mc.otm.network.ExopackMenuOpen diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatteryScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatteryScreen.kt index 9d6e04aea..637f360db 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatteryScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/MatteryScreen.kt @@ -46,10 +46,10 @@ import ru.dbotthepony.mc.otm.client.screen.widget.TallHorizontalProfiledPowerGau import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel import ru.dbotthepony.mc.otm.client.screen.widget.WideProfiledPowerGaugePanel import ru.dbotthepony.mc.otm.config.ClientConfig -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.math.component1 -import ru.dbotthepony.mc.otm.core.math.component2 -import ru.dbotthepony.mc.otm.core.math.integerDivisionDown +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.math.component1 +import ru.dbotthepony.mc.otm.util.math.component2 +import ru.dbotthepony.mc.otm.util.math.integerDivisionDown import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.menu.MatteryMenuSlot import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/decorative/HoloSignScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/decorative/HoloSignScreen.kt index f82987077..2b9f315d1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/decorative/HoloSignScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/decorative/HoloSignScreen.kt @@ -8,7 +8,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.Dock import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel import ru.dbotthepony.mc.otm.client.screen.panels.button.makeDeviceControls import ru.dbotthepony.mc.otm.client.screen.panels.input.NetworkedStringInputPanel -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.mc.otm.block.entity.decorative.HoloSignBlockEntity import ru.dbotthepony.mc.otm.client.MatteryGUI.SMALL_FONT_STYLE diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/decorative/PainterScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/decorative/PainterScreen.kt index 7fcc7edb8..ab28f70fa 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/decorative/PainterScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/decorative/PainterScreen.kt @@ -9,6 +9,7 @@ import net.minecraft.world.item.ItemStack import net.minecraft.world.item.Items import net.neoforged.neoforge.common.Tags import ru.dbotthepony.kommons.math.RGBAColor +import ru.dbotthepony.kommons.util.map import ru.dbotthepony.mc.otm.block.entity.decorative.PainterBlockEntity import ru.dbotthepony.mc.otm.client.render.FlatRectangleIcon import ru.dbotthepony.mc.otm.client.render.IGUIRenderable @@ -25,10 +26,10 @@ import ru.dbotthepony.mc.otm.client.screen.panels.button.DeviceControls import ru.dbotthepony.mc.otm.client.screen.panels.slot.AbstractSlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.slot.SlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.util.ScrollableCanvasPanel -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.map -import ru.dbotthepony.mc.otm.core.util.CreativeMenuItemComparator +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.map +import ru.dbotthepony.mc.otm.util.CreativeMenuItemComparator import ru.dbotthepony.mc.otm.menu.decorative.PainterMenu class PainterScreen(menu: PainterMenu, inventory: Inventory, title: Component) : MatteryScreen(menu, inventory, title) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterBottlerScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterBottlerScreen.kt index 622954e65..3b3844eb5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterBottlerScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterBottlerScreen.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.client.screen.matter import net.minecraft.network.chat.Component import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.client.screen.MatteryScreen -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.panels.button.ButtonPanel import ru.dbotthepony.mc.otm.client.screen.panels.button.makeDeviceControls diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterPanelScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterPanelScreen.kt index 10e92f514..50f26c6e7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterPanelScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/matter/MatterPanelScreen.kt @@ -18,15 +18,15 @@ import ru.dbotthepony.mc.otm.client.screen.panels.input.TextInputPanel import ru.dbotthepony.mc.otm.client.screen.panels.slot.AbstractSlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.util.DiscreteScrollBarPanel import ru.dbotthepony.mc.otm.client.screen.panels.util.ScrollBarConstants -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.kommons.util.Delegate import ru.dbotthepony.mc.otm.client.screen.panels.button.BooleanButtonPanel -import ru.dbotthepony.mc.otm.core.math.integerDivisionDown -import ru.dbotthepony.mc.otm.core.util.ItemSorter -import ru.dbotthepony.mc.otm.core.util.formatMatter -import ru.dbotthepony.mc.otm.core.util.formatTickDuration +import ru.dbotthepony.mc.otm.util.math.integerDivisionDown +import ru.dbotthepony.mc.otm.util.ItemSorter +import ru.dbotthepony.mc.otm.util.formatMatter +import ru.dbotthepony.mc.otm.util.formatTickDuration import ru.dbotthepony.mc.otm.matter.MatterManager import ru.dbotthepony.mc.otm.menu.matter.MatterPanelMenu import ru.dbotthepony.mc.otm.menu.matter.ReplicationRequestPacket @@ -174,7 +174,8 @@ class MatterPanelScreen( if (isPatternView) { menu.patternsFiltered.getOrNull(index)?.let { - list.add(TranslatableComponent( + list.add( + TranslatableComponent( "otm.item.pattern.research", String.format("%.2f", it.researchPercent * 100.0) ).withStyle(ChatFormatting.AQUA)) @@ -184,12 +185,14 @@ class MatterPanelScreen( val required = ceil(1.0 / researchAdvance).toInt() val researched = (required.toDouble() * it.researchPercent).toInt() - list.add(TranslatableComponent( + list.add( + TranslatableComponent( "otm.item.pattern.research.item_count", researched, required ).withStyle(ChatFormatting.DARK_GRAY)) - list.add(TranslatableComponent( + list.add( + TranslatableComponent( "otm.item.pattern.research.advance", String.format("%.2f", researchAdvance * 100.0) ).withStyle(ChatFormatting.DARK_GRAY)) @@ -340,7 +343,8 @@ class MatterPanelScreen( override fun getItemStackTooltip(stack: ItemStack): MutableList { return super.getItemStackTooltip(stack).toMutableList().also { - it.add(TranslatableComponent( + it.add( + TranslatableComponent( "otm.item.pattern.research", String.format("%.2f", pattern.researchPercent * 100.0) ).withStyle(ChatFormatting.AQUA)) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/AbstractHistoryGraphPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/AbstractHistoryGraphPanel.kt index 45a1ac75b..ff25f103f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/AbstractHistoryGraphPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/AbstractHistoryGraphPanel.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.client.screen.panels import ru.dbotthepony.mc.otm.client.screen.MatteryScreen -import ru.dbotthepony.mc.otm.core.chart.AbstractHistoryChart +import ru.dbotthepony.mc.otm.util.chart.AbstractHistoryChart abstract class AbstractHistoryGraphPanel, G : AbstractHistoryChart, V : Any>( screen: S, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ColorPicker.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ColorPicker.kt index c12c706f1..b19daa55a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ColorPicker.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ColorPicker.kt @@ -17,10 +17,10 @@ import ru.dbotthepony.mc.otm.client.render.WidgetLocation import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.client.screen.panels.button.AbstractButtonPanel import ru.dbotthepony.mc.otm.client.screen.panels.input.TextInputPanel -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.kommons.math.RGBAColor -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import java.util.function.Consumer import java.util.function.Supplier import kotlin.math.roundToInt diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/DecimalHistoryChartPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/DecimalHistoryChartPanel.kt index dfc9287ab..ee4190f33 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/DecimalHistoryChartPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/DecimalHistoryChartPanel.kt @@ -8,14 +8,13 @@ import ru.dbotthepony.mc.otm.client.render.ChartMouseLabels import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.render.renderChart import ru.dbotthepony.mc.otm.client.screen.MatteryScreen -import ru.dbotthepony.mc.otm.core.RandomSource2Generator -import ru.dbotthepony.mc.otm.core.chart.DecimalHistoryChart -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.clusterize -import ru.dbotthepony.mc.otm.core.util.formatPower -import ru.dbotthepony.mc.otm.core.util.formatTickDuration +import ru.dbotthepony.mc.otm.util.chart.DecimalHistoryChart +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.math.clusterize +import ru.dbotthepony.mc.otm.util.formatPower +import ru.dbotthepony.mc.otm.util.formatTickDuration import kotlin.math.absoluteValue open class DecimalHistoryChartPanel>( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.kt index 0228f172b..fe77e3445 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EditablePanel.kt @@ -13,7 +13,6 @@ import net.minecraft.client.gui.navigation.ScreenRectangle import net.minecraft.client.gui.screens.Screen import net.minecraft.network.chat.Component import org.apache.logging.log4j.LogManager -import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.mc.otm.SystemTime import ru.dbotthepony.mc.otm.client.CursorType import ru.dbotthepony.mc.otm.client.render.MGUIGraphics @@ -26,9 +25,9 @@ import ru.dbotthepony.mc.otm.client.render.popScissorRect import ru.dbotthepony.mc.otm.client.render.pushScissorRect import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.client.screen.panels.input.QueryUserPanel -import ru.dbotthepony.mc.otm.core.collect.concatIterators -import ru.dbotthepony.mc.otm.core.collect.flatMap -import ru.dbotthepony.mc.otm.core.util.GJRAND64RandomSource +import ru.dbotthepony.kommons.collect.concatIterators +import ru.dbotthepony.kommons.collect.flatMap +import ru.dbotthepony.mc.otm.util.GJRAND64RandomSource import java.util.* import java.util.concurrent.CopyOnWriteArrayList import java.util.function.Predicate diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EffectListPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EffectListPanel.kt index 40d553e7b..309515373 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EffectListPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EffectListPanel.kt @@ -15,10 +15,10 @@ import ru.dbotthepony.mc.otm.client.render.determineTooltipPosition import ru.dbotthepony.mc.otm.client.render.sprites.sprite import ru.dbotthepony.mc.otm.client.screen.panels.util.DiscreteScrollBarPanel import ru.dbotthepony.kommons.math.RGBAColor -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.util.formatTickDuration -import ru.dbotthepony.mc.otm.core.math.integerDivisionDown +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.formatTickDuration +import ru.dbotthepony.mc.otm.util.math.integerDivisionDown import java.util.stream.Collectors open class EffectListPanel @JvmOverloads constructor( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EntityRendererPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EntityRendererPanel.kt index 9a3a55d20..cb44a94f8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EntityRendererPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EntityRendererPanel.kt @@ -16,7 +16,7 @@ import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.client.screen.panels.button.ButtonPanel import ru.dbotthepony.mc.otm.compat.cos.CosmeticToggleRenderButton import ru.dbotthepony.mc.otm.compat.cos.isCosmeticArmorLoaded -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.kommons.util.Delegate import ru.dbotthepony.mc.otm.client.screen.panels.button.BooleanButtonPanel @@ -98,7 +98,8 @@ private fun createExopackAppearanceWindow(screen: MatteryScreen<*>, matteryPlaye screen, callback = { PacketDistributor.sendToServer(SetExopackColorPacket(it)) }, color = matteryPlayer.exopackColor ?: RGBAColor.WHITE, - title = TranslatableComponent("otm.gui.exopack.change_color")) + title = TranslatableComponent("otm.gui.exopack.change_color") + ) }).also { it.dock = Dock.TOP it.dockTop = 2f diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/FramePanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/FramePanel.kt index ffd174fd4..ea176e2c8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/FramePanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/FramePanel.kt @@ -12,7 +12,7 @@ import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.render.* import ru.dbotthepony.mc.otm.client.render.sprites.StretchingRectangleElement import ru.dbotthepony.mc.otm.client.screen.panels.button.AbstractButtonPanel -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.kommons.math.RGBAColor open class FramePanel( 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 b0d99bba3..bfee71dce 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 @@ -4,7 +4,7 @@ import net.minecraft.client.gui.screens.Screen import net.minecraft.network.chat.Component import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.render.RenderGravity -import ru.dbotthepony.mc.otm.core.TextComponent +import ru.dbotthepony.mc.otm.util.TextComponent import ru.dbotthepony.kommons.math.RGBAColor open class Label( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/NetworkedItemGridPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/NetworkedItemGridPanel.kt index 24bb4c00a..ccb670b56 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/NetworkedItemGridPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/NetworkedItemGridPanel.kt @@ -10,10 +10,10 @@ import ru.dbotthepony.mc.otm.client.screen.panels.slot.AbstractSlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.util.DiscreteScrollBarPanel import ru.dbotthepony.mc.otm.client.screen.panels.util.GridPanel import ru.dbotthepony.mc.otm.client.screen.panels.util.ScrollBarConstants -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.math.integerDivisionDown -import ru.dbotthepony.mc.otm.core.util.formatReadableNumber -import ru.dbotthepony.mc.otm.core.util.formatSiComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.math.integerDivisionDown +import ru.dbotthepony.mc.otm.util.formatReadableNumber +import ru.dbotthepony.mc.otm.util.formatSiComponent import ru.dbotthepony.mc.otm.menu.data.NetworkedItemView import ru.dbotthepony.mc.otm.storage.StorageStack diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/QuickStackControlsPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/QuickStackControlsPanel.kt index c0616b598..c191eec3d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/QuickStackControlsPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/QuickStackControlsPanel.kt @@ -9,8 +9,8 @@ import ru.dbotthepony.mc.otm.client.render.IGUIRenderable import ru.dbotthepony.mc.otm.client.render.Widgets18 import ru.dbotthepony.mc.otm.client.screen.panels.button.ButtonPanel import ru.dbotthepony.mc.otm.client.screen.panels.util.GridPanel -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.menu.QuickMoveInput import ru.dbotthepony.mc.otm.network.QuickStackPacket import java.util.function.IntConsumer diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/BooleanButtonPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/BooleanButtonPanel.kt index 8d7e30b96..a9f4dbab3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/BooleanButtonPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/BooleanButtonPanel.kt @@ -12,8 +12,8 @@ import ru.dbotthepony.mc.otm.client.render.IGUIRenderable import ru.dbotthepony.mc.otm.client.render.UVWindingOrder import ru.dbotthepony.mc.otm.client.render.Widgets15 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.menu.input.IPlayerInputWithFeedback abstract class BooleanButtonPanel( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/Buttons.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/Buttons.kt index d94a736cc..b2ce06bda 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/Buttons.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/Buttons.kt @@ -6,7 +6,6 @@ import net.minecraft.network.chat.Component import net.minecraft.world.item.ItemStack import net.minecraft.world.item.Items import ru.dbotthepony.kommons.util.Delegate -import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.kommons.util.value import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity import ru.dbotthepony.mc.otm.block.entity.RedstoneSetting @@ -30,12 +29,12 @@ import ru.dbotthepony.mc.otm.client.screen.panels.slot.SlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.util.GridPanel import ru.dbotthepony.mc.otm.client.screen.tech.EssenceStorageScreen import ru.dbotthepony.mc.otm.config.ClientConfig -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.immutableList -import ru.dbotthepony.mc.otm.core.math.RelativeSide -import ru.dbotthepony.mc.otm.core.util.ItemStackSorter -import ru.dbotthepony.mc.otm.core.util.getLevelFromXp +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.kommons.guava.immutableList +import ru.dbotthepony.mc.otm.util.math.RelativeSide +import ru.dbotthepony.mc.otm.util.ItemStackSorter +import ru.dbotthepony.mc.otm.util.getLevelFromXp import ru.dbotthepony.mc.otm.menu.MatteryMenuSlot import ru.dbotthepony.mc.otm.menu.QuickMoveInput import ru.dbotthepony.mc.otm.menu.SortInput diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/EnumButtonPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/EnumButtonPanel.kt index c156f0ba2..2d1d73d5b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/EnumButtonPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/EnumButtonPanel.kt @@ -13,9 +13,10 @@ import ru.dbotthepony.mc.otm.client.playGuiClickSound import ru.dbotthepony.mc.otm.client.render.IGUIRenderable import ru.dbotthepony.mc.otm.client.render.UVWindingOrder import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel -import ru.dbotthepony.mc.otm.core.* import ru.dbotthepony.mc.otm.menu.input.IPlayerInputWithFeedback import ru.dbotthepony.mc.otm.network.MatteryStreamCodec +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import java.util.* import java.util.function.Predicate import kotlin.collections.ArrayList diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/NumberInputPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/NumberInputPanel.kt index b103a7f7c..1d4122553 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/NumberInputPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/NumberInputPanel.kt @@ -8,8 +8,8 @@ import ru.dbotthepony.mc.otm.client.screen.panels.Dock import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel import ru.dbotthepony.mc.otm.client.screen.panels.button.ButtonPanel import ru.dbotthepony.mc.otm.client.screen.panels.util.HeightControls -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.math.Decimal abstract class NumberInputPanel( screen: S, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/QueryUserPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/QueryUserPanel.kt index b21826fc4..f8e2a12b7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/QueryUserPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/QueryUserPanel.kt @@ -9,7 +9,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel import ru.dbotthepony.mc.otm.client.screen.panels.Label import ru.dbotthepony.mc.otm.client.screen.panels.button.ButtonPanel -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent open class QueryUserPanel( screen: S, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/TextInputPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/TextInputPanel.kt index 7caf0e526..91f7a54dc 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/TextInputPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/input/TextInputPanel.kt @@ -14,6 +14,7 @@ import net.minecraft.client.gui.screens.Screen import net.minecraft.client.renderer.GameRenderer import net.minecraft.network.chat.Component import org.joml.Vector2i +import ru.dbotthepony.kommons.collect.addAll import ru.dbotthepony.mc.otm.client.CursorType import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.isCtrlDown @@ -25,10 +26,7 @@ import ru.dbotthepony.mc.otm.client.render.RenderGravity import ru.dbotthepony.mc.otm.client.render.tesselator import ru.dbotthepony.mc.otm.client.screen.panels.DockProperty import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.addAll -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.collect.reduce +import ru.dbotthepony.mc.otm.util.TextComponent import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.mc.otm.client.render.vertex import ru.dbotthepony.mc.otm.milliTime @@ -957,7 +955,7 @@ open class TextInputPanel( return true } - var index = cursorRow + (0 until cursorLine).iterator().map { this[it]?.length ?: 0 }.reduce(0, Int::plus) + var index = cursorRow + (0 until cursorLine).sumOf { this[it]?.length ?: 0 } val insert = minecraft.keyboardHandler.clipboard.replace("\t", " ").filter { acceptsCharacter(it, 0, index++) }.split(NEWLINES).toMutableList() val actualLastSize = insert.lastOrNull()?.length ?: 0 val line = this[cursorLine] @@ -1009,7 +1007,7 @@ open class TextInputPanel( } } } else { - var index = cursorRow + (0 until cursorLine).iterator().map { this[it]?.length ?: 0 }.reduce(0, Int::plus) + var index = cursorRow + (0 until cursorLine).sumOf { this[it]?.length ?: 0 } val insert = minecraft.keyboardHandler.clipboard.replace("\t", " ").replace(NEWLINES, "").filter { acceptsCharacter(it, 0, index++) } val line = this[cursorLine] diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/SlotPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/SlotPanel.kt index 3ebc0be4a..16754837e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/SlotPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/SlotPanel.kt @@ -9,7 +9,6 @@ import net.minecraft.network.chat.Component import net.minecraft.world.inventory.AbstractContainerMenu import net.minecraft.world.inventory.Slot import net.minecraft.world.item.ItemStack -import net.minecraft.world.item.Items import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.mc.otm.client.render.MGUIGraphics @@ -21,13 +20,11 @@ import ru.dbotthepony.mc.otm.compat.itemborders.isItemBordersLoaded import ru.dbotthepony.mc.otm.compat.itemborders.renderSlotBorder import ru.dbotthepony.mc.otm.container.IFilteredContainerSlot import ru.dbotthepony.mc.otm.container.ItemFilter -import ru.dbotthepony.mc.otm.container.ItemStackKey import ru.dbotthepony.mc.otm.container.util.containerSlotOrNull -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.isNotEmpty +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.isNotEmpty import ru.dbotthepony.mc.otm.menu.UserFilteredMenuSlot -import javax.annotation.Nonnull import kotlin.math.roundToInt open class SlotPanel, out T : Slot>( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/AnalogScrollBarPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/AnalogScrollBarPanel.kt index 01906679d..58f1f3949 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/AnalogScrollBarPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/AnalogScrollBarPanel.kt @@ -6,7 +6,7 @@ import ru.dbotthepony.mc.otm.client.CursorType import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel import ru.dbotthepony.mc.otm.client.screen.panels.slot.AbstractSlotPanel -import ru.dbotthepony.mc.otm.core.math.linearInterpolation +import ru.dbotthepony.mc.otm.util.math.linearInterpolation import ru.dbotthepony.mc.otm.milliTimeD import kotlin.math.roundToInt diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/GridPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/GridPanel.kt index 28b32a5fd..b038b86dc 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/GridPanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/GridPanel.kt @@ -5,10 +5,6 @@ import ru.dbotthepony.mc.otm.client.render.RenderGravity import ru.dbotthepony.mc.otm.client.screen.panels.Dock import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel import ru.dbotthepony.mc.otm.client.screen.panels.slot.AbstractSlotPanel -import ru.dbotthepony.mc.otm.core.collect.filter -import ru.dbotthepony.mc.otm.core.collect.maybe -import java.util.stream.IntStream -import java.util.stream.Stream import kotlin.math.max open class GridPanel( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/ScrollBarConstants.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/ScrollBarConstants.kt index b079bdbc1..a5af66379 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/ScrollBarConstants.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/ScrollBarConstants.kt @@ -4,7 +4,7 @@ import net.minecraft.resources.ResourceLocation import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.client.render.sprites.MatteryAtlas import ru.dbotthepony.mc.otm.client.render.sprites.sprite -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation object ScrollBarConstants { const val WIDTH = 14f diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveRackScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveRackScreen.kt index a47d52d35..138fabb4b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveRackScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveRackScreen.kt @@ -16,7 +16,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.slot.AbstractSlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.slot.SlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.util.GridPanel import ru.dbotthepony.mc.otm.client.screen.widget.WidePowerGaugePanel -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent class DriveRackScreen(menu: DriveRackMenu, inventory: Inventory, title: Component) : MatteryScreen(menu, inventory, title) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveViewerScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveViewerScreen.kt index 5a6a5ffa9..030eb2af4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveViewerScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/DriveViewerScreen.kt @@ -7,7 +7,7 @@ import net.minecraft.world.item.Items import ru.dbotthepony.kommons.util.Delegate import ru.dbotthepony.mc.otm.client.render.ItemStackIcon import ru.dbotthepony.mc.otm.client.screen.MatteryScreen -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.panels.button.BooleanButtonPanel import ru.dbotthepony.mc.otm.client.screen.panels.button.DeviceControls @@ -17,7 +17,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.slot.FilterSlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.slot.SlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.util.GridPanel import ru.dbotthepony.mc.otm.client.screen.widget.WideProfiledPowerGaugePanel -import ru.dbotthepony.mc.otm.core.util.ItemStorageStackSorter +import ru.dbotthepony.mc.otm.util.ItemStorageStackSorter import ru.dbotthepony.mc.otm.item.PortableCondensationDriveItem import ru.dbotthepony.mc.otm.menu.storage.DriveViewerMenu import ru.dbotthepony.mc.otm.registry.game.MItems diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/ItemMonitorScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/ItemMonitorScreen.kt index 29ab44e11..bd6bca578 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/ItemMonitorScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/ItemMonitorScreen.kt @@ -23,8 +23,8 @@ import ru.dbotthepony.mc.otm.client.screen.panels.util.DiscreteScrollBarPanel import ru.dbotthepony.mc.otm.client.screen.panels.util.GridPanel import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel import ru.dbotthepony.mc.otm.client.screen.widget.WideProfiledPowerGaugePanel -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.util.ItemStorageStackSorter +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.ItemStorageStackSorter import ru.dbotthepony.mc.otm.menu.storage.ItemMonitorMenu import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageBusScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageBusScreen.kt index 21b3bafdb..890668cff 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageBusScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageBusScreen.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.client.screen.storage import net.minecraft.network.chat.Component import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.client.screen.MatteryScreen -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.panels.button.BooleanButtonPanel import ru.dbotthepony.mc.otm.client.screen.panels.button.DeviceControls diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageImporterExporterScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageImporterExporterScreen.kt index 4b1669648..0f34db081 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageImporterExporterScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StorageImporterExporterScreen.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.client.screen.storage import net.minecraft.network.chat.Component import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.client.screen.MatteryScreen -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.panels.button.BooleanButtonPanel import ru.dbotthepony.mc.otm.client.screen.panels.button.makeDeviceControls diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StoragePowerSupplierScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StoragePowerSupplierScreen.kt index f6cd39c54..206ee48b9 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StoragePowerSupplierScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/storage/StoragePowerSupplierScreen.kt @@ -4,14 +4,14 @@ import net.minecraft.network.chat.Component import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.client.ShiftPressedCond import ru.dbotthepony.mc.otm.client.screen.MatteryScreen -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.panels.button.makeDeviceControls import ru.dbotthepony.mc.otm.client.screen.panels.slot.AbstractSlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.slot.BatterySlotPanel import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel import ru.dbotthepony.mc.otm.client.screen.widget.TallHorizontalPowerGaugePanel -import ru.dbotthepony.mc.otm.core.util.formatPower +import ru.dbotthepony.mc.otm.util.formatPower import ru.dbotthepony.mc.otm.menu.storage.StoragePowerSupplierMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidChargerScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidChargerScreen.kt index a7e6b9fb4..4913daf86 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidChargerScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidChargerScreen.kt @@ -14,7 +14,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.SpritePanel import ru.dbotthepony.mc.otm.client.screen.panels.button.BooleanButtonPanel import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel import ru.dbotthepony.mc.otm.client.screen.widget.TallHorizontalProfiledPowerGaugePanel -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.menu.tech.AndroidChargerMenu class AndroidChargerScreen(menu: AndroidChargerMenu, inventory: Inventory, title: Component) : MatteryScreen(menu, inventory, title) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidStationScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidStationScreen.kt index 09ef63314..f64aa2710 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidStationScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/AndroidStationScreen.kt @@ -7,11 +7,10 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap import net.minecraft.ChatFormatting import net.minecraft.client.Minecraft import net.minecraft.network.chat.Component -import net.minecraft.util.RandomSource import net.minecraft.world.entity.player.Inventory import net.minecraft.world.item.ItemStack import net.neoforged.neoforge.network.PacketDistributor -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.player.android.AndroidResearch import ru.dbotthepony.mc.otm.player.android.AndroidResearchManager import ru.dbotthepony.mc.otm.player.android.AndroidResearchType @@ -35,7 +34,6 @@ import ru.dbotthepony.mc.otm.config.MachinesConfig import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.mc.otm.player.matteryPlayer import ru.dbotthepony.mc.otm.client.screen.panels.button.BooleanButtonPanel -import ru.dbotthepony.mc.otm.core.nextFloat import ru.dbotthepony.mc.otm.menu.tech.AndroidStationMenu import ru.dbotthepony.mc.otm.network.AndroidResearchRequestPacket import java.util.* diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/BlackHoleGeneratorScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/BlackHoleGeneratorScreen.kt index 3be4a74c6..d7793da4a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/BlackHoleGeneratorScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/BlackHoleGeneratorScreen.kt @@ -15,9 +15,9 @@ import ru.dbotthepony.mc.otm.client.screen.panels.input.DecimalInputPanel import ru.dbotthepony.mc.otm.client.screen.panels.util.makeButtonLabel import ru.dbotthepony.mc.otm.client.screen.widget.ProfiledMatterGaugePanel import ru.dbotthepony.mc.otm.client.screen.widget.ProfiledPowerGaugePanel -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.menu.tech.BlackHoleGeneratorMenu import java.util.function.Supplier diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/ChemicalGeneratorScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/ChemicalGeneratorScreen.kt index 2e631ddc0..89bbf868c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/ChemicalGeneratorScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/ChemicalGeneratorScreen.kt @@ -6,7 +6,7 @@ import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.client.screen.panels.FramePanel import ru.dbotthepony.mc.otm.client.screen.panels.button.makeDeviceControls -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.client.screen.panels.slot.BatterySlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.slot.SlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.slot.UserFilteredSlotPanel diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EnergyCounterScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EnergyCounterScreen.kt index 8ddd297a5..8b4d8a49e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EnergyCounterScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EnergyCounterScreen.kt @@ -7,14 +7,14 @@ import ru.dbotthepony.mc.otm.client.ShiftPressedCond import ru.dbotthepony.mc.otm.client.render.TextIcon import ru.dbotthepony.mc.otm.client.render.Widgets18 import ru.dbotthepony.mc.otm.client.screen.MatteryScreen -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.client.screen.panels.* import ru.dbotthepony.mc.otm.client.screen.panels.button.BooleanButtonPanel import ru.dbotthepony.mc.otm.client.screen.panels.button.ButtonPanel import ru.dbotthepony.mc.otm.client.screen.panels.button.makeDeviceControls import ru.dbotthepony.mc.otm.client.screen.panels.input.TextInputPanel -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.util.formatPower +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.formatPower import ru.dbotthepony.mc.otm.menu.tech.EnergyCounterMenu class EnergyCounterScreen(menu: EnergyCounterMenu, inventory: Inventory, title: Component) : MatteryScreen(menu, inventory, title) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EssenceStorageScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EssenceStorageScreen.kt index 46a1d4ed4..2a57d70db 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EssenceStorageScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EssenceStorageScreen.kt @@ -23,12 +23,12 @@ import ru.dbotthepony.mc.otm.client.screen.panels.input.TextInputPanel import ru.dbotthepony.mc.otm.client.screen.panels.slot.SlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.slot.UserFilteredSlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.util.HorizontalStripPanel -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.util.getLevelFromXp -import ru.dbotthepony.mc.otm.core.util.getTotalXpRequiredForLevel -import ru.dbotthepony.mc.otm.core.util.getXpRequiredForLevelUp +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.getLevelFromXp +import ru.dbotthepony.mc.otm.util.getTotalXpRequiredForLevel +import ru.dbotthepony.mc.otm.util.getXpRequiredForLevelUp import ru.dbotthepony.mc.otm.menu.tech.EssenceStorageMenu import ru.dbotthepony.mc.otm.registry.game.MItems diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/FlywheelBatteryScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/FlywheelBatteryScreen.kt index c107b1b9c..0e4872172 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/FlywheelBatteryScreen.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/FlywheelBatteryScreen.kt @@ -4,12 +4,10 @@ import net.minecraft.ChatFormatting import net.minecraft.network.chat.Component import net.minecraft.world.entity.player.Inventory import net.minecraft.world.item.ItemStack -import net.minecraft.world.item.Items import ru.dbotthepony.mc.otm.client.ShiftPressedCond import ru.dbotthepony.mc.otm.client.render.RenderGravity import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.client.screen.panels.Dock -import ru.dbotthepony.mc.otm.client.screen.panels.DockProperty import ru.dbotthepony.mc.otm.client.screen.panels.DockResizeMode import ru.dbotthepony.mc.otm.client.screen.panels.DynamicLabel import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel @@ -18,8 +16,8 @@ import ru.dbotthepony.mc.otm.client.screen.panels.Label import ru.dbotthepony.mc.otm.client.screen.panels.slot.AbstractSlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.util.BackgroundPanel import ru.dbotthepony.mc.otm.client.screen.widget.TallHorizontalProfiledPowerGaugePanel -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.util.formatPower +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.formatPower import ru.dbotthepony.mc.otm.menu.tech.FlywheelBatteryMenu import java.util.function.Supplier diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/FluidGaugePanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/FluidGaugePanel.kt index 8f69246a7..47fb5ec2f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/FluidGaugePanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/FluidGaugePanel.kt @@ -22,13 +22,13 @@ import ru.dbotthepony.mc.otm.client.render.tesselator import ru.dbotthepony.mc.otm.client.render.uv import ru.dbotthepony.mc.otm.client.render.vertex import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.math.linearInterpolation -import ru.dbotthepony.mc.otm.core.registryName -import ru.dbotthepony.mc.otm.core.util.formatFluidLevel +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.math.linearInterpolation +import ru.dbotthepony.mc.otm.util.registryName +import ru.dbotthepony.mc.otm.util.formatFluidLevel import ru.dbotthepony.mc.otm.menu.widget.FluidGaugeWidget open class FluidGaugePanel( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/MatterGaugePanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/MatterGaugePanel.kt index 889bf0322..6d6abbe96 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/MatterGaugePanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/MatterGaugePanel.kt @@ -19,12 +19,11 @@ import ru.dbotthepony.mc.otm.client.render.uv import ru.dbotthepony.mc.otm.client.render.vertex import ru.dbotthepony.mc.otm.client.screen.panels.DockResizeMode import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.util.formatHistory -import ru.dbotthepony.mc.otm.core.util.formatMatterLevel +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.formatHistory +import ru.dbotthepony.mc.otm.util.formatMatterLevel import ru.dbotthepony.mc.otm.menu.widget.IProfiledLevelGaugeWidget import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget -import ru.dbotthepony.mc.otm.menu.widget.ProfiledLevelGaugeWidget import ru.dbotthepony.mc.otm.nanoTime import kotlin.math.absoluteValue import kotlin.math.cos diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/PatternGaugePanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/PatternGaugePanel.kt index 669a3d969..9f8c990d2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/PatternGaugePanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/PatternGaugePanel.kt @@ -5,7 +5,7 @@ import net.minecraft.network.chat.Component import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.render.WidgetLocation import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget open class PatternGaugePanel @JvmOverloads constructor( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/PowerGaugePanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/PowerGaugePanel.kt index 62d314624..35186715c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/PowerGaugePanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/PowerGaugePanel.kt @@ -6,12 +6,12 @@ import net.minecraft.network.chat.FormattedText import net.minecraft.world.inventory.tooltip.TooltipComponent import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.ShiftPressedCond -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.client.render.* import ru.dbotthepony.mc.otm.client.screen.panels.DockResizeMode import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel -import ru.dbotthepony.mc.otm.core.util.formatHistory -import ru.dbotthepony.mc.otm.core.util.formatPowerLevel +import ru.dbotthepony.mc.otm.util.formatHistory +import ru.dbotthepony.mc.otm.util.formatPowerLevel import ru.dbotthepony.mc.otm.menu.widget.IProfiledLevelGaugeWidget import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/ProgressGaugePanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/ProgressGaugePanel.kt index 5f197dbef..8dd0ae835 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/ProgressGaugePanel.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/ProgressGaugePanel.kt @@ -14,8 +14,8 @@ import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel import ru.dbotthepony.mc.otm.client.screen.panels.button.AbstractButtonPanel import ru.dbotthepony.mc.otm.compat.jei.JEIPlugin import ru.dbotthepony.mc.otm.compat.jei.isJeiLoaded -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.menu.widget.IProgressGaugeWidget import java.util.function.Supplier import kotlin.math.roundToInt diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/condensed_creative/CondensedCreativeCompat.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/condensed_creative/CondensedCreativeCompat.kt index a7950944d..76da4b69e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/condensed_creative/CondensedCreativeCompat.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/condensed_creative/CondensedCreativeCompat.kt @@ -13,7 +13,7 @@ import net.minecraft.world.level.material.Fluids import net.neoforged.neoforge.capabilities.Capabilities import net.neoforged.neoforge.fluids.FluidStack import net.neoforged.neoforge.fluids.capability.IFluidHandler -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.registry.game.MCreativeTabs import ru.dbotthepony.mc.otm.registry.game.MItems import ru.dbotthepony.mc.otm.registry.MRegistry diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt index f4539471c..0cb56a423 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt @@ -26,9 +26,9 @@ import ru.dbotthepony.mc.otm.compat.cos.CosmeticToggleButton.Companion.BUTTON_AC import ru.dbotthepony.mc.otm.compat.cos.CosmeticToggleButton.Companion.BUTTON_INACTIVE import ru.dbotthepony.mc.otm.container.util.awareStream import ru.dbotthepony.mc.otm.container.util.iterator -import ru.dbotthepony.mc.otm.core.collect.AwareItemStack -import ru.dbotthepony.mc.otm.core.collect.emptyIterator +import ru.dbotthepony.mc.otm.util.collect.AwareItemStack import ru.dbotthepony.mc.otm.menu.MatteryMenuSlot +import java.util.Collections.emptyIterator import java.util.stream.Stream val isCosmeticArmorLoaded by lazy { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt index 34c6e904c..d236113c1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt @@ -22,17 +22,16 @@ import ru.dbotthepony.mc.otm.client.screen.panels.button.ButtonPanel import ru.dbotthepony.mc.otm.client.screen.panels.slot.SlotPanel import ru.dbotthepony.mc.otm.container.util.awareStream import ru.dbotthepony.mc.otm.container.util.iterator -import ru.dbotthepony.mc.otm.core.collect.AwareItemStack -import ru.dbotthepony.mc.otm.core.collect.concatIterators -import ru.dbotthepony.mc.otm.core.collect.emptyIterator +import ru.dbotthepony.mc.otm.util.collect.AwareItemStack +import ru.dbotthepony.kommons.collect.concatIterators import ru.dbotthepony.mc.otm.menu.PlayerSlot import top.theillusivec4.curios.api.CuriosApi import top.theillusivec4.curios.api.CuriosCapability import top.theillusivec4.curios.api.event.SlotModifiersUpdatedEvent import top.theillusivec4.curios.common.inventory.CosmeticCurioSlot import top.theillusivec4.curios.common.inventory.CurioSlot -import top.theillusivec4.curios.common.network.client.CPacketOpenCurios import top.theillusivec4.curios.common.network.client.CPacketToggleRender +import java.util.Collections.emptyIterator import java.util.stream.Stream import kotlin.collections.ArrayList diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterBottlerProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterBottlerProvider.kt index 463e215fe..aa01feb1a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterBottlerProvider.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterBottlerProvider.kt @@ -6,7 +6,7 @@ import ru.dbotthepony.mc.otm.block.entity.WorkerState import ru.dbotthepony.mc.otm.block.entity.matter.MatterBottlerBlockEntity import ru.dbotthepony.mc.otm.compat.jade.JadeTagKeys import ru.dbotthepony.mc.otm.compat.jade.JadeUids -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.kommons.math.RGBAColor import snownee.jade.api.BlockAccessor import snownee.jade.api.IBlockComponentProvider diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterReconstructorProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterReconstructorProvider.kt index a1d4177c9..696a6643b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterReconstructorProvider.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterReconstructorProvider.kt @@ -5,7 +5,7 @@ import net.minecraft.resources.ResourceLocation import ru.dbotthepony.mc.otm.block.entity.matter.MatterReconstructorBlockEntity import ru.dbotthepony.mc.otm.compat.jade.JadeTagKeys import ru.dbotthepony.mc.otm.compat.jade.JadeUids -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.kommons.math.RGBAColor import snownee.jade.api.BlockAccessor import snownee.jade.api.IBlockComponentProvider diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterStorageProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterStorageProvider.kt index 5c2769876..3273d3150 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterStorageProvider.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterStorageProvider.kt @@ -10,12 +10,12 @@ import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.compat.jade.JadeColors import ru.dbotthepony.mc.otm.compat.jade.JadeTagKeys import ru.dbotthepony.mc.otm.compat.jade.JadeUids -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.getCapability -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.nbt.getDecimal -import ru.dbotthepony.mc.otm.core.nbt.putDecimal -import ru.dbotthepony.mc.otm.core.util.formatMatter +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.getCapability +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.getDecimal +import ru.dbotthepony.mc.otm.util.putDecimal +import ru.dbotthepony.mc.otm.util.formatMatter import snownee.jade.api.BlockAccessor import snownee.jade.api.IBlockComponentProvider import snownee.jade.api.IServerDataProvider diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryEnergyProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryEnergyProvider.kt index d4291dbb6..9ae99a619 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryEnergyProvider.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryEnergyProvider.kt @@ -8,14 +8,14 @@ import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.compat.jade.JadeColors import ru.dbotthepony.mc.otm.compat.jade.JadeTagKeys import ru.dbotthepony.mc.otm.compat.jade.JadeUids -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.mc.otm.capability.IProfiledStorage -import ru.dbotthepony.mc.otm.core.getCapability -import ru.dbotthepony.mc.otm.core.nbt.getDecimal -import ru.dbotthepony.mc.otm.core.nbt.putDecimal -import ru.dbotthepony.mc.otm.core.util.formatPower +import ru.dbotthepony.mc.otm.util.getCapability +import ru.dbotthepony.mc.otm.util.getDecimal +import ru.dbotthepony.mc.otm.util.putDecimal +import ru.dbotthepony.mc.otm.util.formatPower import snownee.jade.api.* import snownee.jade.api.config.IPluginConfig import snownee.jade.api.ui.BoxStyle diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryWorkerProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryWorkerProvider.kt index 1bdfc8c62..9ea73c0e6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryWorkerProvider.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryWorkerProvider.kt @@ -9,8 +9,8 @@ import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity import ru.dbotthepony.mc.otm.compat.jade.JadeTagKeys import ru.dbotthepony.mc.otm.compat.jade.JadeUids import ru.dbotthepony.kommons.math.RGBAColor -import ru.dbotthepony.mc.otm.core.nbt.getCompoundList -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.getCompoundList +import ru.dbotthepony.mc.otm.util.set import snownee.jade.api.BlockAccessor import snownee.jade.api.IBlockComponentProvider import snownee.jade.api.IServerDataProvider diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/ExopackInventoryTransferHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/ExopackInventoryTransferHandler.kt index 894507bcc..0924f220b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/ExopackInventoryTransferHandler.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/ExopackInventoryTransferHandler.kt @@ -1,5 +1,6 @@ package ru.dbotthepony.mc.otm.compat.jei +import com.google.common.collect.ImmutableList import it.unimi.dsi.fastutil.ints.Int2IntArrayMap import it.unimi.dsi.fastutil.ints.IntArraySet import mezz.jei.api.constants.RecipeTypes @@ -15,8 +16,7 @@ import net.minecraft.world.inventory.MenuType import net.minecraft.world.inventory.Slot import net.minecraft.world.item.crafting.CraftingRecipe import net.minecraft.world.item.crafting.RecipeHolder -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.toImmutableList +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.menu.ExopackInventoryMenu import java.util.* import kotlin.collections.ArrayList @@ -116,9 +116,9 @@ class ExopackInventoryTransferHandler(private val helper: IRecipeTransferHandler } } - val outputs = recipeSlots.getSlotViews(RecipeIngredientRole.OUTPUT).toImmutableList() - val catalysts = recipeSlots.getSlotViews(RecipeIngredientRole.CATALYST).toImmutableList() - val render = recipeSlots.getSlotViews(RecipeIngredientRole.RENDER_ONLY).toImmutableList() + val outputs = ImmutableList.copyOf(recipeSlots.getSlotViews(RecipeIngredientRole.OUTPUT)) + val catalysts = ImmutableList.copyOf(recipeSlots.getSlotViews(RecipeIngredientRole.CATALYST)) + val render = ImmutableList.copyOf(recipeSlots.getSlotViews(RecipeIngredientRole.RENDER_ONLY)) val combine = ArrayList(filteredInputs.size + outputs.size + render.size) @@ -126,7 +126,7 @@ class ExopackInventoryTransferHandler(private val helper: IRecipeTransferHandler combine.addAll(outputs) combine.addAll(render) - val combined = combine.toImmutableList() + val combined = ImmutableList.copyOf(combine) val newView = object : IRecipeSlotsView { override fun getSlotViews(): List { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/Gauges.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/Gauges.kt index c028fd93d..e90b8eede 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/Gauges.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/Gauges.kt @@ -5,10 +5,10 @@ import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.ShiftPressedCond import ru.dbotthepony.mc.otm.client.screen.widget.MatterGaugePanel import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.util.formatMatter -import ru.dbotthepony.mc.otm.core.util.formatPower +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.formatMatter +import ru.dbotthepony.mc.otm.util.formatPower import ru.dbotthepony.mc.otm.systemTime fun renderMatterGauge( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/JEIPlugin.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/JEIPlugin.kt index ddd5d501d..3df134a61 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/JEIPlugin.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/JEIPlugin.kt @@ -23,11 +23,11 @@ import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.client.screen.panels.slot.AbstractSlotPanel import ru.dbotthepony.mc.otm.client.screen.widget.FluidGaugePanel -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.collect.filter -import ru.dbotthepony.mc.otm.core.collect.filterIsInstance -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.collect.toList +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.kommons.collect.filter +import ru.dbotthepony.kommons.collect.filterIsInstance +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.kommons.collect.toList import ru.dbotthepony.mc.otm.menu.decorative.PainterMenu import ru.dbotthepony.mc.otm.menu.matter.MatterEntanglerMenu import ru.dbotthepony.mc.otm.menu.tech.PlatePressMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/MatterEntanglerRecipeCategory.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/MatterEntanglerRecipeCategory.kt index ad5a89b81..f755661e5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/MatterEntanglerRecipeCategory.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/MatterEntanglerRecipeCategory.kt @@ -17,8 +17,8 @@ import ru.dbotthepony.mc.otm.client.render.ItemStackIcon import ru.dbotthepony.mc.otm.client.screen.panels.slot.AbstractSlotPanel import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel import ru.dbotthepony.mc.otm.config.MachinesConfig -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.recipe.IMatterEntanglerRecipe import ru.dbotthepony.mc.otm.recipe.get import ru.dbotthepony.mc.otm.recipe.height diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/MicrowaveRecipeCategory.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/MicrowaveRecipeCategory.kt index be053129d..2f3d22a13 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/MicrowaveRecipeCategory.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/MicrowaveRecipeCategory.kt @@ -17,9 +17,9 @@ import ru.dbotthepony.mc.otm.client.render.RenderGravity import ru.dbotthepony.mc.otm.client.screen.panels.slot.AbstractSlotPanel import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel import ru.dbotthepony.kommons.math.RGBAColor -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.recipe.MicrowaveRecipe import ru.dbotthepony.mc.otm.registry.game.MItems import kotlin.math.roundToInt diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PainterRecipeCategory.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PainterRecipeCategory.kt index 9404a174a..325f58be1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PainterRecipeCategory.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PainterRecipeCategory.kt @@ -17,7 +17,7 @@ import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.render.ItemStackIcon import ru.dbotthepony.mc.otm.client.screen.panels.slot.AbstractSlotPanel import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.recipe.PainterRecipe import ru.dbotthepony.mc.otm.registry.game.MItems import ru.dbotthepony.mc.otm.registry.MNames diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/Panel2ClickableIngredient.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/Panel2ClickableIngredient.kt index 61c1a4f18..b84e21cda 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/Panel2ClickableIngredient.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/Panel2ClickableIngredient.kt @@ -5,7 +5,6 @@ import mezz.jei.api.ingredients.ITypedIngredient import mezz.jei.api.runtime.IClickableIngredient import net.minecraft.client.renderer.Rect2i import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel -import ru.dbotthepony.mc.otm.core.filterNotNull import java.util.* class Panel2ClickableIngredient

, T>(val panel: P, val ingredient: ITypedIngredient) : IClickableIngredient { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PlatePressRecipeCategory.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PlatePressRecipeCategory.kt index 7d416c334..703336b61 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PlatePressRecipeCategory.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/PlatePressRecipeCategory.kt @@ -17,9 +17,9 @@ import ru.dbotthepony.mc.otm.client.render.RenderGravity import ru.dbotthepony.mc.otm.client.screen.panels.slot.AbstractSlotPanel import ru.dbotthepony.mc.otm.client.screen.widget.ProgressGaugePanel import ru.dbotthepony.kommons.math.RGBAColor -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.recipe.PlatePressRecipe import ru.dbotthepony.mc.otm.registry.game.MItems import kotlin.math.roundToInt diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/vanilla/ExtendedInventoryHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/vanilla/ExtendedInventoryHandler.kt index 0c5da9a7d..7ce59ff5e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/vanilla/ExtendedInventoryHandler.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/vanilla/ExtendedInventoryHandler.kt @@ -20,7 +20,7 @@ import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.player.MatteryPlayer import ru.dbotthepony.mc.otm.player.matteryPlayer -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.menu.MatteryMenuSlot import java.util.* diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/config/AbstractConfig.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/config/AbstractConfig.kt index a74463904..599714d60 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/config/AbstractConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/config/AbstractConfig.kt @@ -6,8 +6,8 @@ import net.neoforged.neoforge.common.ModConfigSpec import ru.dbotthepony.kommons.util.Delegate import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.util.WriteOnce +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.WriteOnce abstract class AbstractConfig(private val configName: String, private val type: ModConfig.Type = ModConfig.Type.SERVER) { var spec: ModConfigSpec by WriteOnce() diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/config/BalanceValues.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/config/BalanceValues.kt index ea3cbac7d..590f676c8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/config/BalanceValues.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/config/BalanceValues.kt @@ -1,6 +1,6 @@ package ru.dbotthepony.mc.otm.config -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal interface EnergyBalanceValues { val energyCapacity: Decimal diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/config/CablesConfig.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/config/CablesConfig.kt index ad00a469f..82fb498b7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/config/CablesConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/config/CablesConfig.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.config import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal object CablesConfig : AbstractConfig("cables") { enum class E(throughput: Decimal) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/config/DecimalConfigValue.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/config/DecimalConfigValue.kt index 457e734c9..d4178b523 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/config/DecimalConfigValue.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/config/DecimalConfigValue.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.config import net.neoforged.neoforge.common.ModConfigSpec -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal class DecimalConfigValue( parent: ModConfigSpec.ConfigValue, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/config/ExopackConfig.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/config/ExopackConfig.kt index 99f6fc655..8d864616d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/config/ExopackConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/config/ExopackConfig.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.config import ru.dbotthepony.kommons.util.getValue -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal object ExopackConfig : AbstractConfig("exopack") { val ENERGY_CAPACITY by builder diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/config/ItemsConfig.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/config/ItemsConfig.kt index 84e8bdb68..ed0fe7050 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/config/ItemsConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/config/ItemsConfig.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.config import ru.dbotthepony.kommons.util.getValue -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.registry.MNames object ItemsConfig : AbstractConfig("items") { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/config/MachinesConfig.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/config/MachinesConfig.kt index 3eb517494..6c6903e83 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/config/MachinesConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/config/MachinesConfig.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.config import ru.dbotthepony.kommons.util.getValue -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.registry.MNames object MachinesConfig : AbstractConfig("machines") { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/ObservedConfigList.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/config/ObservedConfigList.kt similarity index 95% rename from src/main/kotlin/ru/dbotthepony/mc/otm/ObservedConfigList.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/config/ObservedConfigList.kt index a227a6282..08a5730ba 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/ObservedConfigList.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/config/ObservedConfigList.kt @@ -1,10 +1,7 @@ -package ru.dbotthepony.mc.otm +package ru.dbotthepony.mc.otm.config import it.unimi.dsi.fastutil.ints.IntArrayList -import net.minecraft.core.Registry -import net.minecraft.resources.ResourceLocation import net.neoforged.neoforge.common.ModConfigSpec -import ru.dbotthepony.mc.otm.config.getValue import java.util.LinkedList abstract class ObservedConfigList(val parent: ModConfigSpec.ConfigValue>, private val allowNulls: Boolean = false) : AbstractMutableList(), RandomAccess { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/config/PlayerConfig.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/config/PlayerConfig.kt index d903cad0e..c27d4ffaa 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/config/PlayerConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/config/PlayerConfig.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.config import ru.dbotthepony.kommons.util.getValue -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal object PlayerConfig : AbstractConfig("player") { init { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/config/ServerConfig.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/config/ServerConfig.kt index df5193062..bee639a66 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/config/ServerConfig.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/config/ServerConfig.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.config import ru.dbotthepony.kommons.util.getValue -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal object ServerConfig : AbstractConfig("misc") { val LABORATORY_LAMP_LIGHT_LENGTH: Int by builder.comment("In blocks").defineInRange("LABORATORY_LAMP_LIGHT_LENGTH", 6, 1, 128) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/BitmapTrackingContainer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/BitmapTrackingContainer.kt index 136990472..579e75cab 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/BitmapTrackingContainer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/BitmapTrackingContainer.kt @@ -4,8 +4,8 @@ import it.unimi.dsi.fastutil.ints.IntCollection import net.minecraft.world.item.ItemStack import ru.dbotthepony.kommons.collect.iterateClearBits import ru.dbotthepony.kommons.collect.iterateSetBits -import ru.dbotthepony.mc.otm.core.collect.IntRange2Set -import ru.dbotthepony.mc.otm.core.collect.map +import ru.dbotthepony.mc.otm.util.collect.IntRange2Set +import ru.dbotthepony.kommons.collect.map import java.util.* abstract class BitmapTrackingContainer : IEnhancedContainer { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/CombinedContainer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/CombinedContainer.kt index ee5065ed5..320152873 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/CombinedContainer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/CombinedContainer.kt @@ -3,7 +3,6 @@ package ru.dbotthepony.mc.otm.container import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap import com.google.common.collect.ImmutableSet -import it.unimi.dsi.fastutil.ints.IntAVLTreeSet import it.unimi.dsi.fastutil.ints.IntArrayList import it.unimi.dsi.fastutil.ints.IntOpenHashSet import it.unimi.dsi.fastutil.ints.IntSet @@ -11,16 +10,14 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectFunction import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap import net.minecraft.world.Container import net.minecraft.world.entity.player.Player -import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack -import ru.dbotthepony.mc.otm.container.util.containerSlot +import ru.dbotthepony.kommons.collect.concatIterators +import ru.dbotthepony.kommons.collect.filter +import ru.dbotthepony.kommons.collect.flatMap +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.kommons.collect.stream import ru.dbotthepony.mc.otm.container.util.iterator -import ru.dbotthepony.mc.otm.core.collect.concatIterators -import ru.dbotthepony.mc.otm.core.collect.filter -import ru.dbotthepony.mc.otm.core.collect.flatMap -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.stream +import ru.dbotthepony.mc.otm.util.isNotEmpty import java.util.stream.Stream class CombinedContainer(containers: Stream, Iterable>>) : ISlottedContainer { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/ContainerHelpers.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/ContainerHelpers.kt index 6cee3f401..1eafcf2fa 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/ContainerHelpers.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/ContainerHelpers.kt @@ -4,12 +4,9 @@ import it.unimi.dsi.fastutil.ints.IntAVLTreeSet import it.unimi.dsi.fastutil.ints.IntArrayList import it.unimi.dsi.fastutil.ints.IntArraySet import it.unimi.dsi.fastutil.ints.IntCollection -import it.unimi.dsi.fastutil.ints.IntIterable -import it.unimi.dsi.fastutil.ints.IntIterator import it.unimi.dsi.fastutil.ints.IntList import it.unimi.dsi.fastutil.ints.IntOpenHashSet import it.unimi.dsi.fastutil.ints.IntSet -import it.unimi.dsi.fastutil.ints.IntSortedSet import it.unimi.dsi.fastutil.objects.Object2ObjectFunction import it.unimi.dsi.fastutil.objects.Object2ObjectOpenCustomHashMap import it.unimi.dsi.fastutil.objects.ObjectArrayList @@ -19,16 +16,16 @@ import net.minecraft.world.item.ItemStack import net.minecraft.world.item.enchantment.EnchantmentEffectComponents import net.minecraft.world.item.enchantment.EnchantmentHelper import net.neoforged.neoforge.fluids.capability.IFluidHandler +import ru.dbotthepony.kommons.collect.addAll +import ru.dbotthepony.kommons.collect.filter +import ru.dbotthepony.kommons.collect.toList +import ru.dbotthepony.kommons.util.map import ru.dbotthepony.mc.otm.container.util.ItemStackHashStrategy import ru.dbotthepony.mc.otm.container.util.containerSlot import ru.dbotthepony.mc.otm.container.util.slotIterator -import ru.dbotthepony.mc.otm.core.addAll -import ru.dbotthepony.mc.otm.core.collect.IntRange2Set -import ru.dbotthepony.mc.otm.core.collect.filter -import ru.dbotthepony.mc.otm.core.collect.toList -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.map -import ru.dbotthepony.mc.otm.core.util.ItemStackSorter +import ru.dbotthepony.mc.otm.util.collect.IntRange2Set +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.ItemStackSorter import kotlin.math.roundToInt @Suppress("nothing_to_inline") diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/EnhancedContainer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/EnhancedContainer.kt index 630016b90..9fafb973b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/EnhancedContainer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/EnhancedContainer.kt @@ -1,6 +1,5 @@ package ru.dbotthepony.mc.otm.container -import it.unimi.dsi.fastutil.ints.IntCollection import it.unimi.dsi.fastutil.ints.IntOpenHashSet import net.minecraft.core.HolderLookup.Provider import net.minecraft.nbt.CompoundTag @@ -13,14 +12,9 @@ import net.minecraft.world.entity.player.Player import net.minecraft.world.item.ItemStack import net.neoforged.neoforge.common.util.INBTSerializable import org.apache.logging.log4j.LogManager -import ru.dbotthepony.kommons.collect.iterateClearBits -import ru.dbotthepony.kommons.collect.iterateSetBits import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.collect.IntRange2Set -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.nbt.set -import java.util.BitSet +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.set /** * Flexible base implementation of [IEnhancedContainer], designed to be inherited, or used as-is diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/IContainerSlot.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/IContainerSlot.kt index f5f8e26d2..207a08ba6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/IContainerSlot.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/IContainerSlot.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.container import net.minecraft.world.Container import net.minecraft.world.item.ItemStack import ru.dbotthepony.kommons.util.Delegate -import ru.dbotthepony.mc.otm.core.isNotEmpty +import ru.dbotthepony.mc.otm.util.isNotEmpty /** * While this somewhat similar to [net.minecraft.world.inventory.Slot], this slot is not meant diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/IEnhancedContainer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/IEnhancedContainer.kt index c201a4bb8..fbdec0bc1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/IEnhancedContainer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/IEnhancedContainer.kt @@ -9,10 +9,9 @@ import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack import net.minecraft.world.item.Items import net.minecraft.world.item.crafting.RecipeInput -import ru.dbotthepony.mc.otm.core.collect.any -import ru.dbotthepony.mc.otm.core.collect.filter -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.isNotEmpty +import ru.dbotthepony.kommons.collect.filter +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.mc.otm.util.isNotEmpty import java.util.function.Predicate import java.util.stream.Stream import java.util.stream.StreamSupport @@ -243,14 +242,14 @@ interface IEnhancedContainer : Container, RecipeInput, I if (Items.AIR in items && hasEmptySlots) return true - return iterator().any { it.item in items } + return any { it.item in items } } override fun hasAnyMatching(predicate: Predicate): Boolean { if (predicate.test(ItemStack.EMPTY) && hasEmptySlots) return true - return iterator().any(predicate) + return any(predicate::test) } fun toList(): MutableList { 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 762b65a94..73a715347 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/ItemFilter.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/ItemFilter.kt @@ -8,12 +8,11 @@ import com.mojang.serialization.MapCodec import net.minecraft.core.component.DataComponentPatch import net.minecraft.core.registries.BuiltInRegistries import net.minecraft.core.registries.Registries -import net.minecraft.resources.ResourceLocation import net.minecraft.tags.TagKey import net.minecraft.world.item.ItemStack import net.minecraft.world.item.Items import net.neoforged.bus.api.IEventBus -import ru.dbotthepony.mc.otm.core.isNotEmpty +import ru.dbotthepony.mc.otm.util.isNotEmpty import ru.dbotthepony.mc.otm.registry.MBuiltInRegistries import ru.dbotthepony.mc.otm.registry.MDeferredRegister import ru.dbotthepony.mc.otm.registry.MRegistries diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/ItemStackKey.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/ItemStackKey.kt index 9fc344f59..7ff26a585 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/ItemStackKey.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/ItemStackKey.kt @@ -9,8 +9,7 @@ import net.minecraft.core.component.DataComponentPatch import net.minecraft.core.registries.BuiltInRegistries import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack -import net.minecraft.world.item.Items -import ru.dbotthepony.mc.otm.core.getHolder +import ru.dbotthepony.mc.otm.util.getHolder class ItemStackKey(val item: Item, val components: DataComponentPatch) : ItemFilter { // make copy of original itemstack because there is no copy() method on DataComponentMap, which is returned by ItemStack#getComponents diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/UpgradeContainer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/UpgradeContainer.kt index e3dae88f8..3fce1f4e1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/UpgradeContainer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/UpgradeContainer.kt @@ -6,9 +6,9 @@ import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.UpgradeType import ru.dbotthepony.mc.otm.config.EnergyBalanceValues import ru.dbotthepony.mc.otm.config.VerboseEnergyBalanceValues -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.collect.reduce -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.kommons.collect.reduce +import ru.dbotthepony.mc.otm.util.math.Decimal import java.util.function.BooleanSupplier import kotlin.math.pow diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/AutomationFilters.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/AutomationFilters.kt index b6d5e95a4..b09093525 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/AutomationFilters.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/AutomationFilters.kt @@ -5,8 +5,8 @@ import net.neoforged.neoforge.capabilities.Capabilities import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.fluid.stream import ru.dbotthepony.mc.otm.container.IContainerSlot -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.math.Decimal enum class AutomationFilters : AutomationFilter { ONLY_OUT { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/ContainerSlot.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/ContainerSlot.kt index 178ee81f5..ec1139e49 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/ContainerSlot.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/ContainerSlot.kt @@ -1,19 +1,15 @@ package ru.dbotthepony.mc.otm.container.slotted import net.minecraft.core.HolderLookup -import net.minecraft.core.registries.BuiltInRegistries import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.NbtOps -import net.minecraft.resources.ResourceLocation import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack import net.neoforged.neoforge.common.util.INBTSerializable import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.container.IAutomatedContainerSlot -import ru.dbotthepony.mc.otm.container.IFilteredAutomatedContainerSlot -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.nbt.set -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.data.getOrNull open class ContainerSlot( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/FilteredContainerSlot.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/FilteredContainerSlot.kt index 11a59da02..1dbcc3b76 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/FilteredContainerSlot.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/FilteredContainerSlot.kt @@ -1,18 +1,14 @@ package ru.dbotthepony.mc.otm.container.slotted import net.minecraft.core.HolderLookup -import net.minecraft.core.registries.BuiltInRegistries import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.NbtOps -import net.minecraft.resources.ResourceLocation import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.container.IFilteredAutomatedContainerSlot import ru.dbotthepony.mc.otm.container.ItemFilter -import ru.dbotthepony.mc.otm.core.nbt.set -import ru.dbotthepony.mc.otm.core.registryName -import java.util.Collections +import ru.dbotthepony.mc.otm.util.set open class FilteredContainerSlot( container: SlottedContainer, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/SlottedContainer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/SlottedContainer.kt index 50fe19366..e1561b3b9 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/SlottedContainer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/SlottedContainer.kt @@ -20,14 +20,12 @@ import ru.dbotthepony.kommons.util.Either import ru.dbotthepony.mc.otm.container.BitmapTrackingContainer import ru.dbotthepony.mc.otm.container.EnhancedContainer import ru.dbotthepony.mc.otm.container.IAutomatedContainer -import ru.dbotthepony.mc.otm.container.IAutomatedContainerSlot import ru.dbotthepony.mc.otm.container.IFilteredContainerSlot import ru.dbotthepony.mc.otm.container.ItemFilter import ru.dbotthepony.mc.otm.container.balance -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.data.codec.minRange -import java.util.BitSet import java.util.function.Predicate import kotlin.reflect.KClass diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/util/ContainerSpliterator.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/util/ContainerSpliterator.kt index e3f7c6216..53faf94fe 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/util/ContainerSpliterator.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/util/ContainerSpliterator.kt @@ -5,8 +5,8 @@ import it.unimi.dsi.fastutil.objects.ObjectSpliterators import net.minecraft.world.Container import net.minecraft.world.item.ItemStack import ru.dbotthepony.mc.otm.container.get -import ru.dbotthepony.mc.otm.core.collect.AwareItemStack -import ru.dbotthepony.mc.otm.core.collect.ContainerItemStackEntry +import ru.dbotthepony.mc.otm.util.collect.AwareItemStack +import ru.dbotthepony.mc.otm.util.collect.ContainerItemStackEntry import java.util.stream.Stream import java.util.stream.StreamSupport diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/util/ItemHandlerSpliterator.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/util/ItemHandlerSpliterator.kt index 9227b3b39..823c3528c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/util/ItemHandlerSpliterator.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/util/ItemHandlerSpliterator.kt @@ -4,10 +4,10 @@ import it.unimi.dsi.fastutil.objects.ObjectSpliterator import it.unimi.dsi.fastutil.objects.ObjectSpliterators import net.minecraft.world.item.ItemStack import net.neoforged.neoforge.items.IItemHandler -import ru.dbotthepony.mc.otm.core.collect.AwareItemStack -import ru.dbotthepony.mc.otm.core.collect.ItemHandlerItemStackEntry -import ru.dbotthepony.mc.otm.core.collect.filter -import ru.dbotthepony.mc.otm.core.isNotEmpty +import ru.dbotthepony.mc.otm.util.collect.AwareItemStack +import ru.dbotthepony.mc.otm.util.collect.ItemHandlerItemStackEntry +import ru.dbotthepony.kommons.collect.filter +import ru.dbotthepony.mc.otm.util.isNotEmpty import java.util.* import java.util.stream.Stream import java.util.stream.StreamSupport diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/util/Iterators.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/util/Iterators.kt index c5af49249..962a41170 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/util/Iterators.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/util/Iterators.kt @@ -2,14 +2,13 @@ package ru.dbotthepony.mc.otm.container.util import net.minecraft.world.Container import net.minecraft.world.inventory.Slot -import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack import ru.dbotthepony.mc.otm.container.IContainerSlot import ru.dbotthepony.mc.otm.container.IEnhancedContainer import ru.dbotthepony.mc.otm.container.get -import ru.dbotthepony.mc.otm.core.collect.filter -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.isNotEmpty +import ru.dbotthepony.kommons.collect.filter +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.mc.otm.util.isNotEmpty fun Container.containerSlot(slot: Int): IContainerSlot { if (this is IEnhancedContainer<*>) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/ByteSupplier.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/ByteSupplier.kt deleted file mode 100644 index 77714b552..000000000 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/ByteSupplier.kt +++ /dev/null @@ -1,5 +0,0 @@ -package ru.dbotthepony.mc.otm.core - -interface ByteSupplier { - fun getAsByte(): Byte -} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt deleted file mode 100644 index c099f54d9..000000000 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/Ext.kt +++ /dev/null @@ -1,616 +0,0 @@ - -@file:Suppress("unused") - -package ru.dbotthepony.mc.otm.core - -import com.github.benmanes.caffeine.cache.Cache -import com.github.benmanes.caffeine.cache.Caffeine -import com.github.benmanes.caffeine.cache.Scheduler -import com.google.common.collect.ImmutableList -import com.google.common.collect.ImmutableMap -import com.google.common.collect.ImmutableMultimap -import com.google.common.collect.ImmutableSet -import com.google.gson.JsonElement -import com.google.gson.JsonObject -import com.google.gson.JsonPrimitive -import it.unimi.dsi.fastutil.objects.ObjectComparators -import net.minecraft.Util -import net.minecraft.core.BlockPos -import net.minecraft.core.Holder -import net.minecraft.core.HolderLookup -import net.minecraft.core.IdMap -import net.minecraft.core.Registry -import net.minecraft.core.SectionPos -import net.minecraft.core.registries.BuiltInRegistries -import net.minecraft.network.FriendlyByteBuf -import net.minecraft.network.RegistryFriendlyByteBuf -import net.minecraft.network.chat.Component -import net.minecraft.network.chat.ComponentContents -import net.minecraft.network.chat.ComponentSerialization -import net.minecraft.network.chat.contents.TranslatableContents -import net.minecraft.resources.ResourceKey -import net.minecraft.resources.ResourceLocation -import net.minecraft.tags.TagKey -import net.minecraft.world.entity.Entity -import net.minecraft.world.item.Item -import net.minecraft.world.item.ItemStack -import net.minecraft.world.item.component.ItemAttributeModifiers -import net.minecraft.world.item.crafting.CraftingInput -import net.minecraft.world.item.crafting.RecipeInput -import net.minecraft.world.level.BlockGetter -import net.minecraft.world.level.ChunkPos -import net.minecraft.world.level.Level -import net.minecraft.world.level.LevelAccessor -import net.minecraft.world.level.block.Block -import net.minecraft.world.level.block.Blocks -import net.minecraft.world.level.block.entity.BlockEntity -import net.minecraft.world.level.block.state.BlockState -import net.minecraft.world.level.block.state.StateHolder -import net.minecraft.world.level.block.state.properties.Property -import net.minecraft.world.level.chunk.ChunkSource -import net.minecraft.world.level.chunk.LevelChunk -import net.minecraft.world.phys.Vec3 -import net.neoforged.neoforge.fluids.FluidStack -import net.neoforged.neoforge.items.IItemHandler -import ru.dbotthepony.mc.otm.core.math.BlockRotation -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom -import ru.dbotthepony.mc.otm.core.math.Vector -import ru.dbotthepony.mc.otm.core.util.readVarIntLE -import ru.dbotthepony.mc.otm.core.util.writeVarIntLE -import java.io.InputStream -import java.io.OutputStream -import java.lang.ref.Reference -import java.math.BigInteger -import java.time.Duration -import java.util.* -import java.util.concurrent.Callable -import java.util.concurrent.Future -import java.util.function.Consumer -import java.util.function.Supplier -import java.util.stream.Stream -import java.util.stream.StreamSupport -import kotlin.NoSuchElementException -import kotlin.enums.EnumEntries -import kotlin.jvm.optionals.getOrNull -import kotlin.reflect.KProperty - -operator fun RecipeInput.get(index: Int): ItemStack = getItem(index) -operator fun CraftingInput.get(x: Int, y: Int): ItemStack = getItem(x, y) - -operator fun CraftingInput.Positioned.get(x: Int, y: Int): ItemStack { - val actualX = x - left - val actualY = y - top - - if (actualX !in 0 until input.width() || actualY !in 0 until input.height()) - return ItemStack.EMPTY - - return input.getItem(actualX, actualY) -} - -fun FriendlyByteBuf.writeBigInteger(value: BigInteger) { - writeByteArray(value.toByteArray()) -} - -fun FriendlyByteBuf.readBigInteger(byteLimit: Int = 128) = BigInteger(readByteArray(byteLimit)) - -fun Map<*, V>.asLambdaSupplierArray(): Array<() -> V> { - val result = arrayOfNulls<() -> V>(size) - var i = 0 - - for (k in keys) { - result[i++] = { this[k] ?: throw ConcurrentModificationException("Key $k is no longer present in map $this") } - } - - return result as Array<() -> V> -} - -fun Map<*, V>.asSupplierArray(): Array> { - val result = arrayOfNulls>(size) - var i = 0 - - for (k in keys) { - result[i++] = { this[k] ?: throw ConcurrentModificationException("Key $k is no longer present in map $this") } - } - - return result as Array> -} - -fun Future.asSupplier(): Supplier { - return Supplier { get() } -} - -fun runInBackground(block: Callable): Future { - return Util.backgroundExecutor().submit(block) -} - -operator fun IItemHandler.get(index: Int): ItemStack = getStackInSlot(index) - -operator fun JsonObject.set(s: String, value: JsonElement) = add(s, value) -operator fun JsonObject.set(s: String, value: String) = add(s, JsonPrimitive(value)) -operator fun JsonObject.set(s: String, value: Number) = add(s, JsonPrimitive(value)) -operator fun JsonObject.set(s: String, value: Boolean) = add(s, JsonPrimitive(value)) - -fun LevelAccessor.getBlockStateNow(pos: BlockPos): BlockState { - return getBlockStateNowOrNull(pos) ?: Blocks.AIR.defaultBlockState() -} - -fun LevelAccessor.getBlockStateNowOrNull(pos: BlockPos): BlockState? { - return chunkSource.getChunkNow(SectionPos.blockToSectionCoord(pos.x), SectionPos.blockToSectionCoord(pos.z))?.getBlockState(pos) -} - -fun LevelAccessor.getBlockEntityNow(pos: BlockPos): BlockEntity? { - return chunkSource.getChunkNow(SectionPos.blockToSectionCoord(pos.x), SectionPos.blockToSectionCoord(pos.z))?.getBlockEntity(pos) -} - -fun ChunkSource.getChunkNow(pos: BlockPos): LevelChunk? { - return getChunkNow(SectionPos.blockToSectionCoord(pos.x), SectionPos.blockToSectionCoord(pos.z)) -} - -fun ChunkSource.getChunkNow(pos: ChunkPos): LevelChunk? { - return getChunkNow(pos.x, pos.z) -} - -inline val FluidStack.isNotEmpty get() = !isEmpty -inline val ItemStack.isNotEmpty get() = !isEmpty - -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() - } - } -} - -inline fun immutableMap(initializer: ImmutableMap.Builder.() -> Unit): ImmutableMap { - val builder = ImmutableMap.Builder() - initializer.invoke(builder) - return builder.build() -} - -inline fun immutableMultimap(initializer: ImmutableMultimap.Builder.() -> Unit): ImmutableMultimap { - val builder = ImmutableMultimap.Builder() - initializer.invoke(builder) - return builder.build() -} - -inline fun immutableSet(initializer: Consumer.() -> Unit): ImmutableSet { - val builder = ImmutableSet.Builder() - initializer.invoke(builder::add) - return builder.build() -} - -inline fun immutableList(initializer: Consumer.() -> Unit): ImmutableList { - val builder = ImmutableList.Builder() - initializer.invoke(builder::add) - return builder.build() -} - -fun immutableList(a: V, vararg values: V): ImmutableList { - val builder = ImmutableList.Builder() - builder.add(a) - builder.addAll(values.iterator()) - return builder.build() -} - -inline fun itemAttributes(builder: ItemAttributeModifiers.Builder.() -> Unit): ItemAttributeModifiers { - val value = ItemAttributeModifiers.builder() - builder(value) - return value.build() -} - -fun FriendlyByteBuf.writeType(registry: IdMap, value: T) { - writeInt(registry.getId(value)) -} - -fun FriendlyByteBuf.writeBlockType(value: Block) { - writeType(BuiltInRegistries.BLOCK, value) -} - -fun FriendlyByteBuf.writeBlockState(value: BlockState) { - writeVarInt(Block.BLOCK_STATE_REGISTRY.getIdOrThrow(value)) -} - -fun FriendlyByteBuf.writeItemType(value: Item) { - writeType(BuiltInRegistries.ITEM, value) -} - -fun RegistryFriendlyByteBuf.writeItem(value: ItemStack) { - ItemStack.OPTIONAL_STREAM_CODEC.encode(this, value) -} - -fun RegistryFriendlyByteBuf.writeComponent(value: Component) { - ComponentSerialization.STREAM_CODEC.encode(this, value) -} - -fun OutputStream.writeItemType(value: Item) { - writeVarIntLE(BuiltInRegistries.ITEM.getId(value)) -} - -fun > FriendlyByteBuf.readEnum(entries: EnumEntries): E { - return entries[readVarInt()] -} - -fun FriendlyByteBuf.readType(registry: IdMap): T { - val id = readInt() - return registry.byId(id) ?: throw NoSuchElementException("No such entry with ID $id") -} - -fun FriendlyByteBuf.readBlockType(): Block { - return readType(BuiltInRegistries.BLOCK) -} - -fun FriendlyByteBuf.readBlockState(): BlockState { - return Block.BLOCK_STATE_REGISTRY.byIdOrThrow(readVarInt()) -} - -fun FriendlyByteBuf.readItemType(): Item { - return readType(BuiltInRegistries.ITEM) -} - -fun RegistryFriendlyByteBuf.readItem(): ItemStack { - return ItemStack.OPTIONAL_STREAM_CODEC.decode(this) -} - -fun RegistryFriendlyByteBuf.readComponent(): Component { - return ComponentSerialization.STREAM_CODEC.decode(this) -} - -fun InputStream.readItemType(): Item { - return BuiltInRegistries.ITEM.byId(readVarIntLE()) -} - -operator fun > StateHolder<*, *>.get(property: Property): T { - return getValue(property) -} - -operator fun StateHolder<*, *>.get(property: BlockRotationFreedom): BlockRotation { - return getValue(property.property) -} - -operator fun , T : Comparable> S.set(property: Property, value: T): S { - return setValue(property, value) as S -} - -fun List.toImmutableList(): List { - return ImmutableList.copyOf(this) -} - -operator fun (() -> R).getValue(thisRef: Any, property: KProperty<*>): R { - return invoke() -} - -fun BlockState.getExplosionResistance(level: BlockGetter, pos: BlockPos): Float { - return try { - getExplosionResistance(level, pos, null) - } catch (err: NullPointerException) { - block.explosionResistance - // Потому что возможно какой-либо мод не ожидает что Explosion == null - // особенно учитывая что интерфейс IForgeBlock не имеет @ParamsAreNonnullByDefault - // и аргумент не помечен как @Nullable - // тем самым имеет тип Explosion! который указывается как Explosion? .. Explosion!! - } catch (err: IllegalArgumentException) { - block.explosionResistance - } -} - -fun Level.gracefulBlockBreak(blockPos: BlockPos, block: BlockState = getBlockState(blockPos)) { - val tile = getBlockEntity(blockPos) - val state = block.fluidState.createLegacyBlock() - block.onRemove(this, blockPos, state, false) - Block.dropResources(block, this, blockPos, tile) - block.block.destroy(this, blockPos, block) - setBlock(blockPos, state, Block.UPDATE_ALL) -} - -fun MutableCollection.addAll(elements: Iterator) { - for (item in elements) { - add(item) - } -} - -fun MutableCollection.addAll(elements: Stream) { - for (item in elements) { - add(item) - } -} - -fun Iterable.stream(): Stream { - return StreamSupport.stream(this.spliterator(), false) -} - -fun Iterator.stream(): Stream { - return StreamSupport.stream(Spliterators.spliteratorUnknownSize(this, 0), false) -} - -fun Entity.genericPositions(): Collection { - return listOf( - position, - eyePosition, - boundingBox.center - ) -} - -fun ResourceLocation.toUUID(): UUID { - return toString().toUUID() -} - -fun String.toUUID(): UUID { - return UUID.nameUUIDFromBytes(toByteArray(Charsets.UTF_8)) -} - -fun Collection.probablyParallelStream(): Stream { - if (size >= 400) { - // TODO: https://github.com/MinecraftForge/EventBus/issues/44 - return stream() - } - - return stream() -} - -fun Array.stream(): Stream = Arrays.stream(this) - -@Suppress("unchecked_cast") -fun Stream.filterNotNull(): Stream { - return filter { it != null } as Stream -} - -@Suppress("unchecked_cast") -inline fun Stream<*>.filterIsInstance(): Stream { - return filter { it is T } as Stream -} - -inline fun MutableList>.forValidRefs(fn: (T) -> Unit) { - val iterator = listIterator() - - for (value in iterator) { - val get = value.get() - - if (get == null) { - iterator.remove() - } else { - fn.invoke(get) - } - } -} - -inline fun MutableList>.forValidRefsBreak(fn: (T) -> Boolean) { - val iterator = listIterator() - - for (value in iterator) { - val get = value.get() - - if (get == null) { - iterator.remove() - } else { - if (fn.invoke(get)) { - break - } - } - } -} - -val ComponentContents.key: String - get() = (this as? TranslatableContents ?: throw ClassCastException("$this is not a TranslatableContents")).key - -fun > BlockState.getValueNullable(prop: Property): T? { - if (hasProperty(prop)) { - return getValue(prop) - } - - return null -} - -fun Stream.asIterable(): Iterable { - return object : Iterable { - override fun iterator(): Iterator { - return this@asIterable.iterator() - } - } -} - -fun Comparator.nullsFirst(): Comparator { - return Comparator.nullsFirst(this) -} - -fun Comparator.nullsLast(): Comparator { - return Comparator.nullsLast(this) -} - -class MappedComparator(private val parent: Comparator, private val mapper: (T) -> O) : Comparator { - override fun compare(o1: T, o2: T): Int { - return parent.compare(mapper.invoke(o1), mapper.invoke(o2)) - } - - override fun equals(other: Any?): Boolean { - return other is MappedComparator<*, *> && parent == other.parent - } - - override fun hashCode(): Int { - return parent.hashCode() - } - - override fun toString(): String { - return "MappedComparator[$parent]" - } -} - -fun Comparator.map(mapper: (B) -> A): Comparator { - return MappedComparator(this, mapper) -} - -fun Comparator.suppliers(): Comparator> { - return MappedComparator(this) { it.get() } -} - -/** - * Returns applicable index to put [element] into [List] determined by [comparator], optionally specifying ranges as [fromIndex] and [toIndex] - * - * If [List] is not sorted, result of this function is undefined - */ -fun List.searchInsertionIndex(element: E, comparator: Comparator, fromIndex: Int = 0, toIndex: Int = size): Int { - require(toIndex >= fromIndex) { "Invalid range: to $toIndex >= from $fromIndex" } - require(fromIndex >= 0) { "Invalid from index: $fromIndex" } - require(toIndex >= 0) { "Invalid to index: $toIndex" } - require(fromIndex <= size) { "Invalid from index: $fromIndex (list size $size)" } - require(toIndex <= size) { "Invalid to index: $toIndex (list size $size)" } - - if (fromIndex == size || fromIndex == toIndex || comparator.compare(element, this[fromIndex]) <= 0) { - return fromIndex - } - - // линейный поиск если границы маленькие - if (toIndex - fromIndex <= 10) { - for (i in fromIndex + 1 until toIndex) { - val compare = comparator.compare(element, this[i]) - - if (compare <= 0) { - return i - } - } - - return size - } else { - // двоичный поиск - var lower = fromIndex - var upper = toIndex - 1 - - while (upper - lower >= 10) { - val middle = (upper + lower) / 2 - val compare = comparator.compare(element, this[middle]) - - if (compare == 0) { - return middle - } else if (compare < 0) { - upper = middle - } else { - lower = middle - } - } - - return searchInsertionIndex(element, comparator, lower, upper + 1) - } -} - -/** - * Inserts [element] into [MutableList] at index determined by [comparator] - * - * If [MutableList] is not sorted, result of this function is undefined - */ -fun MutableList.addSorted(element: E, comparator: Comparator) { - add(searchInsertionIndex(element, comparator), element) -} - -/** - * Inserts [element] into [MutableList] at index determined by comparing values themselves - * - * If [MutableList] is not sorted, result of this function is undefined - */ -fun > MutableList.addSorted(element: E) { - add(searchInsertionIndex(element, ObjectComparators.NATURAL_COMPARATOR), element) -} - -fun lazy2(a: () -> A, b: A.() -> B): Supplier { - val first = lazy(a) - return Supplier { b.invoke(first.value) } -} - -fun HolderLookup.Provider.lookupOrThrow(key: ResourceKey): Holder { - return lookupOrThrow(key.registryKey()).getOrThrow(key) -} - -fun Registry.getHolder(value: T): Holder? { - // this is so stupid - return getHolder(getResourceKey(value).getOrNull() ?: return null).getOrNull() -} - -fun Registry.getHolderOrThrow(value: T): Holder { - // this is so stupid - return getHolder(getResourceKey(value).orElseThrow()).orElseThrow() -} - -// forge registry functionality emulation on vanilla registry -fun Registry.getReverseTag(value: T): Stream> { - return getHolder(value)?.tags() ?: Stream.empty() -} - -// forge > neoforge moment -infix fun FluidStack.isSameFluidSameComponents(other: FluidStack): Boolean { - return FluidStack.isSameFluidSameComponents(this, other) -} - -infix fun FluidStack.isSameFluid(other: FluidStack): Boolean { - return FluidStack.isSameFluid(this, other) -} - -infix fun FluidStack.isNotSameFluidSameComponents(other: FluidStack): Boolean { - return !FluidStack.isSameFluidSameComponents(this, other) -} - -infix fun FluidStack.isNotSameFluid(other: FluidStack): Boolean { - return !FluidStack.isSameFluid(this, other) -} - -infix fun FluidStack.isSameAs(other: FluidStack): Boolean { - return FluidStack.isSameFluidSameComponents(this, other) && amount == other.amount -} - -infix fun FluidStack.isNotSameAs(other: FluidStack): Boolean { - return !FluidStack.isSameFluidSameComponents(this, other) && amount == other.amount -} - -fun SimpleCache(size: Long, freshness: Duration): Cache { - return Caffeine.newBuilder() - .maximumSize(size) - .scheduler(Scheduler.systemScheduler()) - .executor(Util.backgroundExecutor()) - .expireAfterWrite(freshness) - .build() -} - -fun SimpleCache(freshness: Duration): Cache { - return SimpleCache(16384L, freshness) -} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/IMatteryLevel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/IMatteryLevel.kt deleted file mode 100644 index 383f1c521..000000000 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/IMatteryLevel.kt +++ /dev/null @@ -1,29 +0,0 @@ -package ru.dbotthepony.mc.otm.core - -import net.minecraft.util.RandomSource -import net.minecraft.world.level.Level -import net.neoforged.fml.ModList - -interface IMatteryLevel { - val otmRandom: RandomSource? -} - -/** - * OTM provided [RandomSource], which has better statistical parameters - * - * Original Minecraft use LCG, which may show bad behavior when repeatedly sampled *a lot*, - * which is what [Level]'s random is used for. OTM provided PRNG should behave better in this scenario. - * - * The way OTM uses random generator in its code will quickly cause LCG used in Minecraft to show its bias - * because LCG in minecraft samples its highest 48 bits, which gives us at best 2^16 period in the lowest bit returned by LCG. - * Which it doesn't sound bad, it quickly causes RNG become biased the quicker/more it is sampled on each tick, especially considering - * some may use `level.random.nextInt(chance) == 0` to determine chance of something happening, - * which will get extremely biased on heavy RNG congested environment - * If we avoid sampling Level's generator this much, we won't suffer from bias in our own code, as well as avoid biasing other mods this much. - * - * The "2^16 period" problem is also might be the reason why Entities get their own instance of RandomSource, - * and Mob Goals use random exactly the way described above (`nextInt(chance)`), which can and will suffer - * from bias the moment mob exists in world for more than 2^16 ticks (but actual bias will happen sooner - * because RNG is not sampled only once per tick, obviously) - */ -val Level.otmRandom: RandomSource get() = (this as IMatteryLevel).otmRandom ?: random diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/RandomSource2Generator.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/RandomSource2Generator.kt deleted file mode 100644 index 323cd254b..000000000 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/RandomSource2Generator.kt +++ /dev/null @@ -1,30 +0,0 @@ -package ru.dbotthepony.mc.otm.core - -import net.minecraft.util.RandomSource -import java.util.random.RandomGenerator - -class RandomSource2Generator(private val parent: RandomSource) : RandomGenerator { - override fun nextLong(): Long { - return parent.nextLong() - } - - override fun nextInt(): Int { - return parent.nextInt() - } - - override fun nextFloat(): Float { - return parent.nextFloat() - } - - override fun nextDouble(): Double { - return parent.nextDouble() - } - - override fun nextBoolean(): Boolean { - return parent.nextBoolean() - } - - override fun nextGaussian(): Double { - return parent.nextGaussian() - } -} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/ShortSupplier.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/ShortSupplier.kt deleted file mode 100644 index e8952d63a..000000000 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/ShortSupplier.kt +++ /dev/null @@ -1,5 +0,0 @@ -package ru.dbotthepony.mc.otm.core - -interface ShortSupplier { - fun getAsShort(): Short -} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/StreamyIterators.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/StreamyIterators.kt deleted file mode 100644 index 089d6c5da..000000000 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/StreamyIterators.kt +++ /dev/null @@ -1,415 +0,0 @@ -package ru.dbotthepony.mc.otm.core.collect - -import it.unimi.dsi.fastutil.ints.Int2IntFunction -import it.unimi.dsi.fastutil.ints.IntIterator -import it.unimi.dsi.fastutil.ints.IntIterators -import it.unimi.dsi.fastutil.objects.ObjectIterators -import ru.dbotthepony.mc.otm.core.addAll -import java.util.Optional -import java.util.Spliterator -import java.util.Spliterators -import java.util.function.BinaryOperator -import java.util.function.IntPredicate -import java.util.function.Predicate -import java.util.function.Supplier -import java.util.stream.Collector -import java.util.stream.Stream -import java.util.stream.StreamSupport - -// Purpose of Stream API over Iterators is that it is simple enough for JIT to inline most of it, -// unlike actual Streams. - -// We lose only one (actual) element of Stream API here: ability to parallelize work, -// except it doesn't (properly) work in Minecraft (Forge) either, due to classloader bug: -// https://github.com/MinecraftForge/EventBus/issues/44 - -// Aside parallel work, unimplemented Stream API elements can be easily implemented when required - -private class FilteringIterator(private val parent: Iterator, private val predicate: Predicate, private var value: T) : MutableIterator { - private var hasValue = true - private var returned = false - - override fun hasNext(): Boolean { - return hasValue - } - - override fun next(): T { - if (!hasValue) throw NoSuchElementException() - hasValue = false - returned = true - - val value = this.value - - while (parent.hasNext()) { - val next = parent.next() - - if (predicate.test(next)) { - hasValue = true - this.value = next - break - } - } - - return value - } - - override fun remove() { - if (!returned) throw NoSuchElementException() - returned = false - (parent as MutableIterator).remove() - } -} - -private class MappingIterator(private val parent: Iterator, private val mapper: (T) -> R) : MutableIterator { - override fun hasNext(): Boolean { - return parent.hasNext() - } - - override fun next(): R { - return mapper.invoke(parent.next()) - } - - override fun remove() { - (parent as MutableIterator).remove() - } -} - -private class FlatMappingIterator(private val parent: Iterator, private val mapper: (T) -> Iterator) : MutableIterator { - private var current: Iterator = mapper.invoke(parent.next()) - private var last: Iterator? = null - - init { - while (!current.hasNext() && parent.hasNext()) { - current = mapper.invoke(parent.next()) - } - } - - override fun hasNext(): Boolean { - return current.hasNext() - } - - override fun next(): R { - if (!current.hasNext()) - throw NoSuchElementException() - - val v = current.next() - last = current - - while (!current.hasNext() && parent.hasNext()) { - current = mapper.invoke(parent.next()) - } - - return v - } - - override fun remove() { - (last as MutableIterator? ?: throw NoSuchElementException()).remove() - last = null - } -} - -private class LimitingIterator(private val parent: Iterator, private val limit: Long) : Iterator { - init { - require(limit > 0) { "Invalid limit $limit" } - } - - private var found = 0L - - override fun hasNext(): Boolean { - return found < limit && parent.hasNext() - } - - override fun next(): T { - if (found >= limit) - throw NoSuchElementException() - - return parent.next() - } -} - -private class SkippingIterator(private val parent: Iterator, skip: Long) : MutableIterator { - init { - require(skip >= 0) { "Invalid skip amount $skip" } - } - - private var found = skip - private var returned = false - - override fun hasNext(): Boolean { - while (parent.hasNext() && found > 0L) { - found-- - parent.next() - } - - return parent.hasNext() - } - - override fun next(): T { - if (!hasNext()) - throw NoSuchElementException() - - val v = parent.next() - returned = true - return v - } - - override fun remove() { - if (!returned) { - throw NoSuchElementException() - } - - returned = false - (parent as MutableIterator).remove() - } -} - -fun concatIterators(): MutableIterator { - return ObjectIterators.EMPTY_ITERATOR as MutableIterator -} - -fun concatIterators(a: Iterator): MutableIterator { - return a as MutableIterator -} - -fun concatIterators(iterators: Iterable>): MutableIterator { - return iterators.iterator().flatMap { it } -} - -fun concatIterators(vararg iterators: Iterator): MutableIterator { - return iterators.iterator().flatMap { it } -} - -/** - * Filters elements of [this] iterator - * - * Resulting [Iterator] is [MutableIterator] if [this] is - */ -fun Iterator.filter(condition: Predicate): MutableIterator { - while (hasNext()) { - val v = next() - - if (condition.test(v)) { - return FilteringIterator(this, condition, v) - } - } - - return emptyIterator() -} - -/** - * Maps elements of [this] iterator from values of [T] to [R] using function [mapper] - * - * Resulting [Iterator] is [MutableIterator] if [this] is - */ -fun Iterator.map(mapper: (T) -> R): MutableIterator { - if (!hasNext()) { - return emptyIterator() - } - - return MappingIterator(this, mapper) -} - -/** - * Maps elements of [this] iterator from type [T] to other iterators of type [R] using function [mapper] - * - * Resulting [Iterator] is [MutableIterator] if [this] is - */ -fun Iterator.flatMap(mapper: (T) -> Iterator): MutableIterator { - if (!hasNext()) { - return emptyIterator() - } - - return FlatMappingIterator(this, mapper) -} - -inline fun Iterator.reduce(identity: T, reducer: (T, T) -> T): T { - var result = identity - while (hasNext()) result = reducer.invoke(result, next()) - return result -} - -fun Iterator.filterNotNull(): MutableIterator = filter { it != null } as MutableIterator - -inline fun Iterator<*>.filterIsInstance(): MutableIterator = filter { it is T } as MutableIterator - -fun Iterator.any(predicate: Predicate): Boolean { - while (hasNext()) - if (predicate.test(next())) - return true - - return false -} - -inline fun Iterator.any(predicate: (T) -> Boolean): Boolean { - while (hasNext()) - if (predicate.invoke(next())) - return true - - return false -} - -fun Iterator.all(predicate: Predicate): Boolean { - while (hasNext()) - if (!predicate.test(next())) - return false - - return true -} - -inline fun Iterator.all(predicate: (T) -> Boolean): Boolean { - while (hasNext()) - if (!predicate.invoke(next())) - return false - - return true -} - -fun Iterator.none(predicate: Predicate): Boolean { - while (hasNext()) - if (predicate.test(next())) - return false - - return true -} - -inline fun Iterator.none(predicate: (T) -> Boolean): Boolean { - while (hasNext()) - if (predicate.invoke(next())) - return false - - return true -} - -fun Iterator.collect(collector: Collector): R { - val accumulator = collector.accumulator() - val instance = collector.supplier().get() - - for (value in this) { - accumulator.accept(instance, value) - } - - return collector.finisher().apply(instance) -} - -fun Iterator.toList(expectedSize: Int = 16): MutableList { - val result = ArrayList(expectedSize) - result.addAll(this) - return result -} - -fun Iterator.toImmutableList(expectedSize: Int = 16): List { - if (!hasNext()) - return emptyList() - - return toList(expectedSize) -} - -fun Iterator.find(): Optional { - if (hasNext()) { - return Optional.of(next()) - } - - return Optional.empty() -} - -fun Iterator.limit(limit: Long): Iterator = LimitingIterator(this, limit) -fun Iterator.skip(skip: Long): Iterator = if (skip == 0L) this else SkippingIterator(this, skip) - -inline fun Iterator.forEach(action: (T) -> Unit) { - for (value in this) { - action.invoke(value) - } -} - -fun Iterator.min(comparator: Comparator): Optional { - if (!hasNext()) { - return Optional.empty() - } - - var min = next() - - for (value in this) { - if (comparator.compare(min, value) > 0) { - min = value - } - } - - return Optional.of(min) -} - -fun Iterator.max(comparator: Comparator): Optional { - if (!hasNext()) { - return Optional.empty() - } - - var max = next() - - for (value in this) { - if (comparator.compare(max, value) < 0) { - max = value - } - } - - return Optional.of(max) -} - -fun Iterator.peek(peeker: (T) -> Unit): MutableIterator { - return object : MutableIterator { - override fun hasNext(): Boolean { - return this@peek.hasNext() - } - - override fun next(): T { - return this@peek.next().also(peeker) - } - - override fun remove() { - (this@peek as MutableIterator).remove() - } - } -} - -fun Iterator.maybe(): T? { - return if (hasNext()) - next() - else - null -} - -fun emptyIterator(): MutableIterator { - return ObjectIterators.emptyIterator() -} - -fun iteratorOf(value: T): MutableIterator { - return ObjectIterators.singleton(value) -} - -fun iteratorOf(vararg value: T): MutableIterator { - return ObjectIterators.wrap(value) -} - -fun Iterator.toStream(): Stream { - return StreamSupport.stream(Spliterators.spliteratorUnknownSize(this, 0), false) -} - -fun Iterator.allEqual(): Boolean { - if (hasNext()) { - val v = next() - - while (hasNext()) { - if (v != next()) { - return false - } - } - - return true - } - - return false -} - -fun Iterator.count(): Long { - var count = 0L - while (hasNext()) count++ - return count -} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/NotNullVar.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/NotNullVar.kt deleted file mode 100644 index fcaa33016..000000000 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/NotNullVar.kt +++ /dev/null @@ -1,32 +0,0 @@ -package ru.dbotthepony.mc.otm.core.util - -import ru.dbotthepony.kommons.util.Delegate -import ru.dbotthepony.kommons.util.KOptional -import kotlin.properties.Delegates -import kotlin.properties.ReadWriteProperty -import kotlin.reflect.KProperty - -/** - * Different from [Delegates.notNull] by allowing [V] to be nullable - */ -class NotNullVar : Delegate, ReadWriteProperty { - private var value: KOptional = KOptional() - - override fun accept(t: V) { - value = KOptional(t) - } - - override fun get(): V { - value.ifPresent { return it } - throw IllegalStateException("Uninitialized variable") - } - - override fun getValue(thisRef: Any?, property: KProperty<*>): V { - value.ifPresent { return it } - throw IllegalStateException("Uninitialized variable ${property.name}") - } - - override fun setValue(thisRef: Any?, property: KProperty<*>, value: V) { - accept(value) - } -} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/data/Ext.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/data/Ext.kt index 6660f58a2..8749a7f71 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/data/Ext.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/data/Ext.kt @@ -12,7 +12,7 @@ import net.minecraft.world.entity.player.Player import net.minecraft.world.level.storage.loot.LootContext import net.minecraft.world.level.storage.loot.parameters.LootContextParam import net.minecraft.world.level.storage.loot.parameters.LootContextParams -import ru.dbotthepony.mc.otm.core.mapOrNull +import ru.dbotthepony.mc.otm.util.mapOrNull import java.util.Optional import kotlin.reflect.KProperty1 diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/data/FlywheelMaterialDataProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/data/FlywheelMaterialDataProvider.kt index 229c1a964..570d5667f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/data/FlywheelMaterialDataProvider.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/data/FlywheelMaterialDataProvider.kt @@ -7,13 +7,11 @@ import net.minecraft.data.PackOutput import net.minecraft.tags.TagKey import net.minecraft.world.level.block.Block import net.neoforged.neoforge.data.event.GatherDataEvent -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.registryName -import ru.dbotthepony.mc.otm.core.toJsonStrict -import ru.dbotthepony.mc.otm.core.util.WriteOnce -import ru.dbotthepony.mc.otm.matter.AbstractRegistryAction -import ru.dbotthepony.mc.otm.matter.MatterManager +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.registryName +import ru.dbotthepony.mc.otm.util.toJsonStrict +import ru.dbotthepony.mc.otm.util.WriteOnce import java.util.concurrent.CompletableFuture open class FlywheelMaterialDataProvider(val modid: String, val location: String? = null) : DataProvider { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/data/FlywheelMaterials.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/data/FlywheelMaterials.kt index 50388d03a..c7facd7cc 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/data/FlywheelMaterials.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/data/FlywheelMaterials.kt @@ -34,16 +34,16 @@ import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.SERVER_IS_LIVE import ru.dbotthepony.mc.otm.client.isShiftDown import ru.dbotthepony.mc.otm.client.minecraft -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.util.readDecimal -import ru.dbotthepony.mc.otm.core.util.writeDecimal -import ru.dbotthepony.mc.otm.core.readBlockType -import ru.dbotthepony.mc.otm.core.registryName -import ru.dbotthepony.mc.otm.core.util.formatPower -import ru.dbotthepony.mc.otm.core.writeBlockType +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.readDecimal +import ru.dbotthepony.mc.otm.util.writeDecimal +import ru.dbotthepony.mc.otm.util.readBlockType +import ru.dbotthepony.mc.otm.util.registryName +import ru.dbotthepony.mc.otm.util.formatPower +import ru.dbotthepony.mc.otm.util.writeBlockType import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import ru.dbotthepony.mc.otm.data.codec.minRange diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/data/codec/CodecList.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/data/codec/CodecList.kt index b65e731d5..705d6083e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/data/codec/CodecList.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/data/codec/CodecList.kt @@ -5,7 +5,7 @@ import com.mojang.datafixers.util.Pair import com.mojang.serialization.Codec import com.mojang.serialization.DataResult import com.mojang.serialization.DynamicOps -import ru.dbotthepony.mc.otm.core.stream +import ru.dbotthepony.kommons.collect.stream import java.util.stream.Stream class CodecList(codecs: Stream>) : Codec { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/data/codec/DecimalCodec.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/data/codec/DecimalCodec.kt index 029e5e35d..2f059ffc8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/data/codec/DecimalCodec.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/data/codec/DecimalCodec.kt @@ -8,8 +8,8 @@ import it.unimi.dsi.fastutil.bytes.ByteArrayList import net.minecraft.nbt.NbtOps import net.minecraft.network.FriendlyByteBuf import net.minecraft.network.codec.StreamCodec -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.Decimal.Companion.fromByteArray +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal.Companion.fromByteArray import ru.dbotthepony.mc.otm.network.wrap import java.nio.ByteBuffer diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/data/codec/PredicatedCodecList.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/data/codec/PredicatedCodecList.kt index 0ecbba727..cab26f5d7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/data/codec/PredicatedCodecList.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/data/codec/PredicatedCodecList.kt @@ -5,7 +5,7 @@ import com.mojang.datafixers.util.Pair import com.mojang.serialization.Codec import com.mojang.serialization.DataResult import com.mojang.serialization.DynamicOps -import ru.dbotthepony.mc.otm.core.stream +import ru.dbotthepony.kommons.collect.stream import java.util.function.Predicate import java.util.stream.Stream diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/data/condition/ItemInInventoryCondition.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/data/condition/ItemInInventoryCondition.kt index bd8f4e23a..5f9c68dde 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/data/condition/ItemInInventoryCondition.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/data/condition/ItemInInventoryCondition.kt @@ -9,7 +9,7 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams import net.minecraft.world.level.storage.loot.predicates.LootItemCondition import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType import ru.dbotthepony.mc.otm.capability.items -import ru.dbotthepony.mc.otm.core.collect.filter +import ru.dbotthepony.kommons.collect.filter import ru.dbotthepony.mc.otm.data.get import ru.dbotthepony.mc.otm.registry.data.MLootItemConditions diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/data/loot/CopyTileNbtFunction.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/data/loot/CopyTileNbtFunction.kt index 1371d1644..24c3df4ca 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/data/loot/CopyTileNbtFunction.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/data/loot/CopyTileNbtFunction.kt @@ -14,10 +14,10 @@ import net.minecraft.world.level.storage.loot.LootContext import net.minecraft.world.level.storage.loot.functions.LootItemFunction import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType import net.minecraft.world.level.storage.loot.parameters.LootContextParams +import ru.dbotthepony.kommons.collect.stream import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity -import ru.dbotthepony.mc.otm.core.fromNbt -import ru.dbotthepony.mc.otm.core.nbt.set -import ru.dbotthepony.mc.otm.core.stream +import ru.dbotthepony.mc.otm.util.fromNbt +import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.registry.data.MItemFunctionTypes import java.util.* import java.util.stream.Stream diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/data/world/DecimalProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/data/world/DecimalProvider.kt index fc733d3f3..36e0124c1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/data/world/DecimalProvider.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/data/world/DecimalProvider.kt @@ -7,8 +7,8 @@ import com.mojang.serialization.codecs.RecordCodecBuilder import net.minecraft.util.RandomSource import net.neoforged.bus.api.IEventBus import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.nextDecimal +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.nextDecimal import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import ru.dbotthepony.mc.otm.registry.MBuiltInRegistries import ru.dbotthepony.mc.otm.registry.MDeferredRegister diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/Loader.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/Loader.kt index d0d3a5e50..5d9d163fc 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/Loader.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/Loader.kt @@ -5,7 +5,7 @@ import net.minecraft.network.syncher.EntityDataSerializers import net.minecraft.network.syncher.SynchedEntityData import net.minecraft.resources.ResourceKey import net.minecraft.core.registries.Registries -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import net.minecraft.world.level.storage.loot.LootTable import net.minecraft.sounds.SoundEvent import net.minecraft.sounds.SoundEvents @@ -118,7 +118,8 @@ class Loader(type: EntityType, level: Level) : Monster(type, level) { override fun getDefaultLootTable(): ResourceKey { return ResourceKey.create(Registries.LOOT_TABLE, - ResourceLocation(OverdriveThatMatters.MOD_ID, "entities/loader")) + ResourceLocation(OverdriveThatMatters.MOD_ID, "entities/loader") + ) } override fun aiStep() { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/MinecartCargoCrate.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/MinecartCargoCrate.kt index ee09e29ff..19945200d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/MinecartCargoCrate.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/MinecartCargoCrate.kt @@ -19,8 +19,8 @@ import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.gameevent.GameEvent import ru.dbotthepony.mc.otm.block.decorative.CargoCrateBlock import ru.dbotthepony.mc.otm.block.entity.decorative.CargoCrateBlockEntity -import ru.dbotthepony.mc.otm.core.otmRandom -import ru.dbotthepony.mc.otm.core.position +import ru.dbotthepony.mc.otm.util.otmRandom +import ru.dbotthepony.mc.otm.util.position import ru.dbotthepony.mc.otm.menu.decorative.MinecartCargoCrateMenu import ru.dbotthepony.mc.otm.registry.game.MItems import ru.dbotthepony.mc.otm.registry.MRegistry diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/PlasmaProjectile.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/PlasmaProjectile.kt index 993834eca..26931ef23 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/PlasmaProjectile.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/PlasmaProjectile.kt @@ -12,7 +12,7 @@ import net.minecraft.world.phys.BlockHitResult import net.minecraft.world.phys.EntityHitResult import net.minecraft.world.phys.HitResult import net.neoforged.neoforge.event.EventHooks -import ru.dbotthepony.mc.otm.core.damageType +import ru.dbotthepony.mc.otm.util.damageType import ru.dbotthepony.mc.otm.registry.MDamageTypes import ru.dbotthepony.mc.otm.registry.game.MEntityTypes import ru.dbotthepony.mc.otm.registry.MatteryDamageSource diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/SpawnModifiers.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/SpawnModifiers.kt index 27a843a12..3ce9e55c1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/entity/SpawnModifiers.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/entity/SpawnModifiers.kt @@ -4,10 +4,9 @@ import net.minecraft.world.entity.EquipmentSlot import net.minecraft.world.entity.monster.WitherSkeleton import net.minecraft.world.item.ItemStack import net.minecraft.world.item.Items -import net.neoforged.bus.api.SubscribeEvent import net.neoforged.neoforge.event.entity.EntityJoinLevelEvent import ru.dbotthepony.mc.otm.config.ServerConfig -import ru.dbotthepony.mc.otm.core.otmRandom +import ru.dbotthepony.mc.otm.util.otmRandom import ru.dbotthepony.mc.otm.registry.game.MItems diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/graph/GraphNode.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/graph/GraphNode.kt index 6d549245e..6f81eb9b6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/graph/GraphNode.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/graph/GraphNode.kt @@ -7,12 +7,11 @@ import net.minecraft.core.Direction import net.minecraft.core.SectionPos import net.minecraft.server.level.ServerLevel import net.minecraft.world.level.block.entity.BlockEntity -import net.minecraft.world.level.block.state.BlockState import net.neoforged.neoforge.capabilities.BlockCapability import ru.dbotthepony.mc.otm.addTicker -import ru.dbotthepony.mc.otm.core.math.plus -import ru.dbotthepony.mc.otm.core.util.IConditionalTickable -import ru.dbotthepony.mc.otm.core.util.ITickable +import ru.dbotthepony.mc.otm.util.math.plus +import ru.dbotthepony.mc.otm.util.IConditionalTickable +import ru.dbotthepony.mc.otm.util.ITickable import java.util.* import kotlin.collections.ArrayList diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/graph/GraphNodeList.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/graph/GraphNodeList.kt index b252ac164..c9603c1b3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/graph/GraphNodeList.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/graph/GraphNodeList.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.graph -import ru.dbotthepony.mc.otm.core.util.IConditionalTickable -import ru.dbotthepony.mc.otm.core.util.ITickable +import ru.dbotthepony.mc.otm.util.IConditionalTickable +import ru.dbotthepony.mc.otm.util.ITickable import java.lang.ref.WeakReference import java.util.* import kotlin.collections.ArrayDeque diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/graph/matter/MatterGraph.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/graph/matter/MatterGraph.kt index 0518c56e2..60649ae78 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/graph/matter/MatterGraph.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/graph/matter/MatterGraph.kt @@ -4,8 +4,8 @@ import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet import net.minecraft.world.item.Item import ru.dbotthepony.mc.otm.capability.FlowDirection import ru.dbotthepony.mc.otm.capability.matter.* -import ru.dbotthepony.mc.otm.core.filterNotNull -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.kommons.collect.filterNotNull +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.graph.GraphNodeList import java.util.* import java.util.function.Predicate 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 281cdc63f..a6c3fe4be 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/BatteryItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/BatteryItem.kt @@ -19,14 +19,18 @@ import ru.dbotthepony.mc.otm.capability.energy.getBarColor import ru.dbotthepony.mc.otm.capability.energy.getBarWidth import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.config.ItemsConfig -import ru.dbotthepony.mc.otm.core.* -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.player.matteryPlayer import ru.dbotthepony.mc.otm.registry.CapabilitiesRegisterListener import ru.dbotthepony.mc.otm.registry.MDamageTypes import ru.dbotthepony.mc.otm.registry.game.MDataComponentTypes import ru.dbotthepony.mc.otm.registry.MatteryDamageSource import ru.dbotthepony.mc.otm.runIfClient +import ru.dbotthepony.mc.otm.util.TooltipList +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.damageType +import ru.dbotthepony.mc.otm.util.otmRandom +import ru.dbotthepony.mc.otm.util.playClickSound import kotlin.math.roundToInt open class BatteryItem : MatteryItem, CapabilitiesRegisterListener { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ChestUpgraderItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ChestUpgraderItem.kt index 6bd0e3f4d..ed82264a2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ChestUpgraderItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ChestUpgraderItem.kt @@ -22,7 +22,7 @@ import ru.dbotthepony.mc.otm.block.decorative.CargoCrateBlock import ru.dbotthepony.mc.otm.block.entity.decorative.CargoCrateBlockEntity import ru.dbotthepony.mc.otm.container.get import ru.dbotthepony.mc.otm.container.set -import ru.dbotthepony.mc.otm.core.math.Vector +import ru.dbotthepony.mc.otm.util.math.Vector import ru.dbotthepony.mc.otm.entity.MinecartCargoCrate import ru.dbotthepony.mc.otm.registry.game.MEntityTypes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ConfiguratorItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ConfiguratorItem.kt index b7799e9df..bd8ca81a9 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ConfiguratorItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ConfiguratorItem.kt @@ -13,8 +13,8 @@ import net.minecraft.world.item.context.UseOnContext import net.minecraft.world.level.Level import net.minecraft.world.level.block.Blocks import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.registry.game.MDataComponentTypes import ru.dbotthepony.mc.otm.server.sendActionBarMessage diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/EssenceServoItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/EssenceServoItem.kt index 0ca9ed30e..69c8e7e12 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/EssenceServoItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/EssenceServoItem.kt @@ -13,7 +13,7 @@ import net.minecraft.world.item.TooltipFlag import net.minecraft.world.item.context.UseOnContext import net.minecraft.world.level.Level import ru.dbotthepony.mc.otm.block.entity.tech.EssenceStorageBlockEntity -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent class EssenceServoItem : MatteryItem(Properties().stacksTo(64)) { init { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/FluidCapsuleItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/FluidCapsuleItem.kt index 7822330e7..21d1602ab 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/FluidCapsuleItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/FluidCapsuleItem.kt @@ -29,15 +29,15 @@ import net.neoforged.neoforge.common.SoundActions import net.neoforged.neoforge.fluids.FluidStack import net.neoforged.neoforge.fluids.FluidUtil import net.neoforged.neoforge.fluids.capability.IFluidHandler +import ru.dbotthepony.kommons.collect.any import ru.dbotthepony.mc.otm.capability.fluid.ItemMatteryFluidHandler import ru.dbotthepony.mc.otm.capability.fluid.iterator import ru.dbotthepony.mc.otm.capability.moveFluid import ru.dbotthepony.mc.otm.container.get -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.collect.any -import ru.dbotthepony.mc.otm.core.immutableList -import ru.dbotthepony.mc.otm.core.immutableMap -import ru.dbotthepony.mc.otm.core.isNotEmpty +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.kommons.guava.immutableList +import ru.dbotthepony.kommons.guava.immutableMap +import ru.dbotthepony.mc.otm.util.isNotEmpty import ru.dbotthepony.mc.otm.registry.CapabilitiesRegisterListener import java.util.function.IntSupplier 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 b2ac1e5c8..e1887c7c6 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.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent class GravitationalDisruptorItem : Item(Properties().stacksTo(1).rarity(Rarity.EPIC)) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatteryItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatteryItem.kt index 2670c9320..566750ec8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatteryItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/MatteryItem.kt @@ -1,14 +1,12 @@ package ru.dbotthepony.mc.otm.item -import it.unimi.dsi.fastutil.objects.ObjectIterators import net.minecraft.ChatFormatting import net.minecraft.network.chat.Component import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack import net.minecraft.world.item.TooltipFlag -import net.minecraft.world.level.Level -import ru.dbotthepony.mc.otm.core.TooltipList -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TooltipList +import ru.dbotthepony.mc.otm.util.TranslatableComponent open class MatteryItem(properties: Properties) : Item(properties) { val tooltips = TooltipList() 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 26250d8a3..30b593bef 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/PortableCondensationDriveItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/PortableCondensationDriveItem.kt @@ -14,7 +14,7 @@ import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.drive.DrivePool import ru.dbotthepony.mc.otm.capability.drive.ItemMatteryDrive import ru.dbotthepony.mc.otm.container.ItemFilterSet -import ru.dbotthepony.mc.otm.core.TextComponent +import ru.dbotthepony.mc.otm.util.TextComponent import ru.dbotthepony.mc.otm.isServerThread import ru.dbotthepony.mc.otm.registry.CapabilitiesRegisterListener import ru.dbotthepony.mc.otm.registry.game.MDataComponentTypes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ProceduralBatteryItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ProceduralBatteryItem.kt index 8ccf8585a..566b5d88c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ProceduralBatteryItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ProceduralBatteryItem.kt @@ -16,8 +16,8 @@ import ru.dbotthepony.mc.otm.capability.energy.batteryLevel import ru.dbotthepony.mc.otm.capability.energy.getBarColor import ru.dbotthepony.mc.otm.capability.energy.getBarWidth import ru.dbotthepony.mc.otm.capability.matteryEnergy -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.data.world.DecimalProvider import ru.dbotthepony.mc.otm.registry.CapabilitiesRegisterListener import ru.dbotthepony.mc.otm.registry.game.MDataComponentTypes 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 270b8ab3f..f05534d5b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/QuantumBatteryItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/QuantumBatteryItem.kt @@ -33,17 +33,17 @@ import ru.dbotthepony.mc.otm.capability.energy.getBarColor import ru.dbotthepony.mc.otm.capability.energy.getBarWidth import ru.dbotthepony.mc.otm.capability.matteryEnergy import ru.dbotthepony.mc.otm.config.EnergyBalanceValues -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.collect.filter -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.nbt.getDecimal -import ru.dbotthepony.mc.otm.core.util.readDecimal -import ru.dbotthepony.mc.otm.core.nbt.set -import ru.dbotthepony.mc.otm.core.util.writeDecimal -import ru.dbotthepony.mc.otm.core.nextUUID -import ru.dbotthepony.mc.otm.core.util.formatPower +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.kommons.collect.filter +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.getDecimal +import ru.dbotthepony.mc.otm.util.readDecimal +import ru.dbotthepony.mc.otm.util.set +import ru.dbotthepony.mc.otm.util.writeDecimal +import ru.dbotthepony.mc.otm.util.nextUUID +import ru.dbotthepony.mc.otm.util.formatPower import ru.dbotthepony.mc.otm.isClientThread import ru.dbotthepony.mc.otm.isServerThread import ru.dbotthepony.mc.otm.lazyPerServer diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/SimpleUpgrade.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/SimpleUpgrade.kt index e3fe8dc83..6fbdfdbd0 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/SimpleUpgrade.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/SimpleUpgrade.kt @@ -5,7 +5,7 @@ import ru.dbotthepony.mc.otm.capability.IMatteryUpgrade import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.UpgradeType import ru.dbotthepony.mc.otm.capability.addUpgradeTooltipLines -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.registry.CapabilitiesRegisterListener class SimpleUpgrade( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/SingleUseBatteryItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/SingleUseBatteryItem.kt index b1b172ad7..187cd6762 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/SingleUseBatteryItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/SingleUseBatteryItem.kt @@ -12,8 +12,8 @@ import ru.dbotthepony.mc.otm.capability.energy.getBarWidth import ru.dbotthepony.mc.otm.capability.matteryEnergy import ru.dbotthepony.mc.otm.config.EnergyBalanceValues import ru.dbotthepony.mc.otm.config.ItemsConfig -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.registry.CapabilitiesRegisterListener open class SingleUseBatteryItem( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/armor/PortableGravitationStabilizerItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/armor/PortableGravitationStabilizerItem.kt index 5aa1f02d5..3a3b15602 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/armor/PortableGravitationStabilizerItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/armor/PortableGravitationStabilizerItem.kt @@ -12,7 +12,7 @@ import net.minecraft.world.item.TooltipFlag import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions import net.neoforged.neoforge.client.extensions.common.RegisterClientExtensionsEvent import ru.dbotthepony.mc.otm.client.model.GravitationStabilizerModel -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.registry.ClientExtensionsListener import ru.dbotthepony.mc.otm.registry.game.MArmorMaterials diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/block/EnergyCableItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/block/EnergyCableItem.kt index 996d724fe..a0355eb81 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/block/EnergyCableItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/block/EnergyCableItem.kt @@ -6,7 +6,7 @@ import net.minecraft.world.item.BlockItem import net.minecraft.world.item.ItemStack import net.minecraft.world.item.TooltipFlag import ru.dbotthepony.mc.otm.config.CablesConfig -import ru.dbotthepony.mc.otm.core.util.formatPower +import ru.dbotthepony.mc.otm.util.formatPower import ru.dbotthepony.mc.otm.registry.game.MBlocks class EnergyCableItem(val conf: CablesConfig.E, properties: Properties) : BlockItem(MBlocks.ENERGY_CABLES[conf]!!, properties) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/block/FluidTankItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/block/FluidTankItem.kt index a2a0135ae..a013bab59 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/block/FluidTankItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/block/FluidTankItem.kt @@ -16,8 +16,8 @@ import ru.dbotthepony.mc.otm.block.decorative.FluidTankBlock import ru.dbotthepony.mc.otm.block.entity.decorative.FluidTankBlockEntity import ru.dbotthepony.mc.otm.capability.fluid.BlockMatteryFluidHandler import ru.dbotthepony.mc.otm.client.render.blockentity.FluidTankRenderer -import ru.dbotthepony.mc.otm.core.TooltipList -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TooltipList +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.item.FluidCapsuleItem import ru.dbotthepony.mc.otm.registry.CapabilitiesRegisterListener import ru.dbotthepony.mc.otm.registry.ClientExtensionsListener diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/EssenceCapsuleItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/EssenceCapsuleItem.kt index 9d7ddbbdd..4a1febaef 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/EssenceCapsuleItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/EssenceCapsuleItem.kt @@ -16,9 +16,9 @@ import net.minecraft.world.level.Level import ru.dbotthepony.mc.otm.player.matteryPlayer import ru.dbotthepony.mc.otm.client.isShiftDown import ru.dbotthepony.mc.otm.client.minecraft -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.otmRandom -import ru.dbotthepony.mc.otm.core.util.getLevelFromXp +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.otmRandom +import ru.dbotthepony.mc.otm.util.getLevelFromXp import ru.dbotthepony.mc.otm.item.MatteryItem import ru.dbotthepony.mc.otm.registry.game.MDataComponentTypes import ru.dbotthepony.mc.otm.runIfClient @@ -43,8 +43,10 @@ class EssenceCapsuleItem(private val digital: Boolean) : MatteryItem(Properties( if (runIfClient(false) { minecraft.window.isShiftDown }) { components.add(TranslatableComponent("otm.gui.experience", itemStack.getOrDefault(MDataComponentTypes.EXPERIENCE, 0L)).withStyle(ChatFormatting.GRAY)) } else { - components.add(TranslatableComponent("otm.gui.experience_levels", getLevelFromXp(itemStack.getOrDefault( - MDataComponentTypes.EXPERIENCE, 0L))).withStyle(ChatFormatting.GRAY)) + components.add( + TranslatableComponent("otm.gui.experience_levels", getLevelFromXp(itemStack.getOrDefault( + MDataComponentTypes.EXPERIENCE, 0L)) + ).withStyle(ChatFormatting.GRAY)) } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/HealPillItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/HealPillItem.kt index 85012551a..b5239817f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/HealPillItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/HealPillItem.kt @@ -12,7 +12,7 @@ import net.minecraft.world.item.Rarity import net.minecraft.world.item.UseAnim import net.minecraft.world.level.Level import ru.dbotthepony.mc.otm.player.matteryPlayer -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.item.MatteryItem class HealPillItem : MatteryItem(Properties().stacksTo(64).rarity(Rarity.UNCOMMON)) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/ImperfectBreadItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/ImperfectBreadItem.kt index 089de13fc..60a357e77 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/ImperfectBreadItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/ImperfectBreadItem.kt @@ -8,9 +8,9 @@ import net.minecraft.world.entity.LivingEntity import net.minecraft.world.entity.item.ItemEntity import net.minecraft.world.item.ItemStack import net.minecraft.world.level.Level -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.otmRandom -import ru.dbotthepony.mc.otm.core.position +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.otmRandom +import ru.dbotthepony.mc.otm.util.position import ru.dbotthepony.mc.otm.entity.BreadMonster import ru.dbotthepony.mc.otm.item.MatteryItem import ru.dbotthepony.mc.otm.registry.game.MDataComponentTypes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/NotNormalFood.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/NotNormalFood.kt index 106e3e0ba..2a7e63066 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/NotNormalFood.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/NotNormalFood.kt @@ -20,8 +20,8 @@ import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent.EntityInte import ru.dbotthepony.mc.otm.player.matteryPlayer import ru.dbotthepony.mc.otm.client.isShiftDown import ru.dbotthepony.mc.otm.client.minecraft -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.damageType +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.damageType import ru.dbotthepony.mc.otm.item.MatteryItem import ru.dbotthepony.mc.otm.registry.MDamageTypes import ru.dbotthepony.mc.otm.registry.MatteryDamageSource diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/NotNormalPill.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/NotNormalPill.kt index bba61327c..4c9e1a0e8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/NotNormalPill.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/NotNormalPill.kt @@ -7,9 +7,9 @@ import net.minecraft.world.entity.LivingEntity import net.minecraft.world.entity.player.Player import net.minecraft.world.item.* import net.minecraft.world.level.Level -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.player.matteryPlayer -import ru.dbotthepony.mc.otm.core.damageType +import ru.dbotthepony.mc.otm.util.damageType import ru.dbotthepony.mc.otm.item.MatteryItem import ru.dbotthepony.mc.otm.registry.MDamageTypes import ru.dbotthepony.mc.otm.registry.MatteryDamageSource diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/PillItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/PillItem.kt index ae82e1f30..76a4c3b1c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/PillItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/consumables/PillItem.kt @@ -11,7 +11,7 @@ import net.minecraft.world.item.Rarity import net.minecraft.world.item.UseAnim import net.minecraft.world.level.Level import ru.dbotthepony.mc.otm.player.matteryPlayer -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.item.MatteryItem enum class PillType { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/AbstractExopackSlotUpgradeItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/AbstractExopackSlotUpgradeItem.kt index dd15524c2..88beff626 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/AbstractExopackSlotUpgradeItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/AbstractExopackSlotUpgradeItem.kt @@ -17,12 +17,11 @@ import net.minecraft.world.level.Level import ru.dbotthepony.mc.otm.config.ServerConfig import ru.dbotthepony.mc.otm.player.matteryPlayer import ru.dbotthepony.mc.otm.client.minecraft -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.isExplosion -import ru.dbotthepony.mc.otm.core.isFire -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.nextUUID -import ru.dbotthepony.mc.otm.core.otmRandom +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.isExplosion +import ru.dbotthepony.mc.otm.util.isFire +import ru.dbotthepony.mc.otm.util.nextUUID +import ru.dbotthepony.mc.otm.util.otmRandom import ru.dbotthepony.mc.otm.registry.game.MItems import ru.dbotthepony.mc.otm.runIfClient import ru.dbotthepony.mc.otm.triggers.ExopackSlotsExpandedTrigger diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExopackProbeItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExopackProbeItem.kt index 975a54a39..09bd9e88e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExopackProbeItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExopackProbeItem.kt @@ -9,11 +9,11 @@ import net.minecraft.world.entity.LivingEntity import net.minecraft.world.entity.player.Player import net.minecraft.world.item.* import net.minecraft.world.level.Level -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.onceServer import ru.dbotthepony.mc.otm.player.matteryPlayer import ru.dbotthepony.mc.otm.client.minecraft -import ru.dbotthepony.mc.otm.core.damageType +import ru.dbotthepony.mc.otm.util.damageType import ru.dbotthepony.mc.otm.registry.MDamageTypes import ru.dbotthepony.mc.otm.registry.MatteryDamageSource import ru.dbotthepony.mc.otm.runIfClient diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExopackSlotUpgradeItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExopackSlotUpgradeItem.kt index ef1c5981c..8e7503797 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExopackSlotUpgradeItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExopackSlotUpgradeItem.kt @@ -2,8 +2,8 @@ package ru.dbotthepony.mc.otm.item.exopack import net.minecraft.world.item.ItemStack import net.minecraft.world.item.Rarity -import ru.dbotthepony.mc.otm.core.registryName -import ru.dbotthepony.mc.otm.core.toUUID +import ru.dbotthepony.mc.otm.util.registryName +import ru.dbotthepony.mc.otm.util.toUUID import java.util.UUID class ExopackSlotUpgradeItem : AbstractExopackSlotUpgradeItem { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExopackUpgradeItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExopackUpgradeItem.kt index 1db813729..d018a4565 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExopackUpgradeItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ExopackUpgradeItem.kt @@ -16,7 +16,7 @@ import net.minecraft.world.level.Level import ru.dbotthepony.mc.otm.player.MatteryPlayer import ru.dbotthepony.mc.otm.player.matteryPlayer import ru.dbotthepony.mc.otm.client.minecraft -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.runIfClient class ExopackUpgradeItem( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ProceduralExopackSlotUpgradeItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ProceduralExopackSlotUpgradeItem.kt index eb34e4a35..771359b65 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ProceduralExopackSlotUpgradeItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/ProceduralExopackSlotUpgradeItem.kt @@ -11,7 +11,7 @@ import net.minecraft.world.item.TooltipFlag import net.minecraft.world.level.storage.loot.LootContext import net.minecraft.world.level.storage.loot.functions.LootItemFunction import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.registry.game.MDataComponentTypes import ru.dbotthepony.mc.otm.registry.data.MItemFunctionTypes import java.util.* diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/CreativePatternItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/CreativePatternItem.kt index 18d3b215f..77264ba03 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/CreativePatternItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/CreativePatternItem.kt @@ -13,7 +13,7 @@ import ru.dbotthepony.mc.otm.capability.matter.PatternState import ru.dbotthepony.mc.otm.capability.matter.IPatternStorage import ru.dbotthepony.mc.otm.capability.matter.PatternInsertFailure import ru.dbotthepony.mc.otm.capability.matter.PatternInsertStatus -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.registry.CapabilitiesRegisterListener import ru.dbotthepony.mc.otm.matter.MatterManager import java.util.* diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/GoldDiskItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/GoldDiskItem.kt index dcdfda6c4..be64d0f0c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/GoldDiskItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/GoldDiskItem.kt @@ -10,15 +10,15 @@ import net.minecraft.world.item.TooltipFlag import net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction import net.minecraft.world.level.storage.loot.functions.SetComponentsFunction import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent +import ru.dbotthepony.kommons.collect.stream import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.matter.IPatternStorage import ru.dbotthepony.mc.otm.capability.matter.PatternInsertFailure import ru.dbotthepony.mc.otm.capability.matter.PatternInsertStatus import ru.dbotthepony.mc.otm.capability.matter.PatternState import ru.dbotthepony.mc.otm.capability.matter.gatherTooltip -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.stream +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.item.MatteryItem import ru.dbotthepony.mc.otm.registry.CapabilitiesRegisterListener import ru.dbotthepony.mc.otm.registry.game.MDataComponentTypes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterCapacitorItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterCapacitorItem.kt index 03b9ead37..4c2cf1389 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterCapacitorItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterCapacitorItem.kt @@ -10,9 +10,9 @@ import ru.dbotthepony.mc.otm.capability.matter.IMatterStorage import ru.dbotthepony.mc.otm.capability.matter.getBarColor import ru.dbotthepony.mc.otm.capability.matter.getBarWidth import ru.dbotthepony.mc.otm.client.ShiftPressedCond -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.util.formatMatter +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.formatMatter import ru.dbotthepony.mc.otm.registry.CapabilitiesRegisterListener import ru.dbotthepony.mc.otm.item.MatteryItem import ru.dbotthepony.mc.otm.registry.game.MDataComponentTypes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterDustItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterDustItem.kt index e8060499d..d28d2caf3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterDustItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/MatterDustItem.kt @@ -19,8 +19,8 @@ import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType import ru.dbotthepony.mc.otm.config.ItemsConfig import ru.dbotthepony.mc.otm.container.IEnhancedContainer import ru.dbotthepony.mc.otm.container.set -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.matter.IMatterItem import ru.dbotthepony.mc.otm.data.world.DecimalProvider import ru.dbotthepony.mc.otm.matter.IMatterValue diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/PatternStorageItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/PatternStorageItem.kt index ee85ced91..1758625b1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/PatternStorageItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/matter/PatternStorageItem.kt @@ -17,7 +17,7 @@ import ru.dbotthepony.mc.otm.capability.matter.PatternState import ru.dbotthepony.mc.otm.capability.matter.gatherTooltip import ru.dbotthepony.mc.otm.capability.matter.getBarColor import ru.dbotthepony.mc.otm.capability.matter.getBarWidth -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.item.MatteryItem import ru.dbotthepony.mc.otm.registry.CapabilitiesRegisterListener import ru.dbotthepony.mc.otm.registry.game.MDataComponentTypes diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/ExplosiveHammerItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/ExplosiveHammerItem.kt index 624f890ff..0e9b1aab0 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/ExplosiveHammerItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/ExplosiveHammerItem.kt @@ -36,12 +36,19 @@ import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent import net.neoforged.neoforge.event.level.BlockEvent import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity import ru.dbotthepony.mc.otm.config.ToolsConfig -import ru.dbotthepony.mc.otm.core.* -import ru.dbotthepony.mc.otm.core.math.* +import ru.dbotthepony.mc.otm.util.math.* import ru.dbotthepony.mc.otm.registry.MDamageTypes import ru.dbotthepony.mc.otm.registry.game.MDataComponentTypes import ru.dbotthepony.mc.otm.registry.MatteryDamageSource import ru.dbotthepony.mc.otm.triggers.NailedEntityTrigger +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.damageType +import ru.dbotthepony.mc.otm.util.getExplosionResistance +import ru.dbotthepony.mc.otm.util.gracefulBlockBreak +import ru.dbotthepony.mc.otm.util.isExplosion +import ru.dbotthepony.mc.otm.util.itemAttributes +import ru.dbotthepony.mc.otm.util.otmRandom +import ru.dbotthepony.mc.otm.util.position import java.util.function.Predicate class ExplosiveHammerItem(durability: Int = 512) : Item(Properties().stacksTo(1).fireResistant().durability(durability)) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/RedstoneInteractorItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/RedstoneInteractorItem.kt index 2007269da..57990ca9f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/RedstoneInteractorItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/RedstoneInteractorItem.kt @@ -18,12 +18,12 @@ import net.minecraft.world.level.Level import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.gameevent.GameEvent import net.neoforged.neoforge.event.entity.player.UseItemOnBlockEvent -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.math.component1 -import ru.dbotthepony.mc.otm.core.math.component2 -import ru.dbotthepony.mc.otm.core.math.component3 -import ru.dbotthepony.mc.otm.core.math.plus -import ru.dbotthepony.mc.otm.core.util.TickList +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.math.component1 +import ru.dbotthepony.mc.otm.util.math.component2 +import ru.dbotthepony.mc.otm.util.math.component3 +import ru.dbotthepony.mc.otm.util.math.plus +import ru.dbotthepony.mc.otm.util.TickList import ru.dbotthepony.mc.otm.item.MatteryItem import ru.dbotthepony.mc.otm.registry.game.MDataComponentTypes import ru.dbotthepony.mc.otm.once diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/EnergySwordItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/EnergySwordItem.kt index bf4d16672..2975220ed 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/EnergySwordItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/EnergySwordItem.kt @@ -26,14 +26,14 @@ import ru.dbotthepony.mc.otm.capability.energy.getBarColor import ru.dbotthepony.mc.otm.capability.energy.getBarWidth import ru.dbotthepony.mc.otm.capability.matteryEnergy import ru.dbotthepony.mc.otm.player.matteryPlayer -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.damageType -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.damageType +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.config.DecimalConfigValue import ru.dbotthepony.mc.otm.config.defineDecimal -import ru.dbotthepony.mc.otm.core.nextVariance -import ru.dbotthepony.mc.otm.core.otmRandom -import ru.dbotthepony.mc.otm.core.util.WriteOnce +import ru.dbotthepony.mc.otm.util.nextVariance +import ru.dbotthepony.mc.otm.util.otmRandom +import ru.dbotthepony.mc.otm.util.WriteOnce import ru.dbotthepony.mc.otm.item.MatteryItem import ru.dbotthepony.mc.otm.item.addSimpleDescription import ru.dbotthepony.mc.otm.registry.CapabilitiesRegisterListener diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/FallingSunItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/FallingSunItem.kt index 0b7042e3b..7877710f6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/FallingSunItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/FallingSunItem.kt @@ -26,14 +26,14 @@ import ru.dbotthepony.mc.otm.capability.energy.getBarColor import ru.dbotthepony.mc.otm.capability.energy.getBarWidth import ru.dbotthepony.mc.otm.capability.matteryEnergy import ru.dbotthepony.mc.otm.player.matteryPlayer -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.damageType -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.damageType +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.config.DecimalConfigValue import ru.dbotthepony.mc.otm.config.defineDecimal -import ru.dbotthepony.mc.otm.core.nextVariance -import ru.dbotthepony.mc.otm.core.otmRandom -import ru.dbotthepony.mc.otm.core.util.WriteOnce +import ru.dbotthepony.mc.otm.util.nextVariance +import ru.dbotthepony.mc.otm.util.otmRandom +import ru.dbotthepony.mc.otm.util.WriteOnce import ru.dbotthepony.mc.otm.item.MatteryItem import ru.dbotthepony.mc.otm.item.addSimpleDescription import ru.dbotthepony.mc.otm.registry.CapabilitiesRegisterListener diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/VelocityCalculation.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/VelocityCalculation.kt index a63d7e5be..c8b9d97bc 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/VelocityCalculation.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/VelocityCalculation.kt @@ -3,8 +3,8 @@ package ru.dbotthepony.mc.otm.item.weapon import net.minecraft.util.Mth import net.minecraft.world.entity.Entity import net.minecraft.world.phys.Vec3 -import ru.dbotthepony.mc.otm.core.math.plus -import ru.dbotthepony.mc.otm.core.math.times +import ru.dbotthepony.mc.otm.util.math.plus +import ru.dbotthepony.mc.otm.util.math.times import java.util.* import kotlin.math.PI import kotlin.math.cos diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/ComputeAction.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/ComputeAction.kt index 9bbe9b673..74f3dc09f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/ComputeAction.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/ComputeAction.kt @@ -12,7 +12,7 @@ import net.minecraft.core.registries.BuiltInRegistries import net.minecraft.resources.ResourceLocation import net.minecraft.tags.TagKey import net.minecraft.world.item.Item -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import ru.dbotthepony.mc.otm.data.codec.PredicatedCodecList import ru.dbotthepony.mc.otm.registry.MBuiltInRegistries diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/IMatterFunction.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/IMatterFunction.kt index 69a634136..5d2943609 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/IMatterFunction.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/IMatterFunction.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.matter import net.neoforged.bus.api.IEventBus import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.matter.SimpleMatterFunction.DecimalFunction import ru.dbotthepony.mc.otm.matter.SimpleMatterFunction.DoubleFunction import ru.dbotthepony.mc.otm.matter.SimpleMatterFunction.IntFunction diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/IMatterValue.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/IMatterValue.kt index 5c87223a9..617f94faa 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/IMatterValue.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/IMatterValue.kt @@ -1,11 +1,11 @@ package ru.dbotthepony.mc.otm.matter import net.minecraft.network.FriendlyByteBuf -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.util.readDecimal -import ru.dbotthepony.mc.otm.core.util.writeDecimal -import ru.dbotthepony.mc.otm.core.util.readDouble -import ru.dbotthepony.mc.otm.core.util.writeDouble +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.readDecimal +import ru.dbotthepony.mc.otm.util.writeDecimal +import ru.dbotthepony.mc.otm.util.readDouble +import ru.dbotthepony.mc.otm.util.writeDouble import java.io.InputStream import java.io.OutputStream diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/InsertAction.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/InsertAction.kt index 36ed93f7c..fd1975098 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/InsertAction.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/InsertAction.kt @@ -7,7 +7,7 @@ import com.mojang.serialization.codecs.RecordCodecBuilder import net.minecraft.resources.ResourceLocation import net.minecraft.tags.TagKey import net.minecraft.world.item.Item -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import java.util.Optional diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterDataProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterDataProvider.kt index 5406c79ad..1abb67a1a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterDataProvider.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterDataProvider.kt @@ -9,11 +9,11 @@ import net.minecraft.tags.TagKey import net.minecraft.world.item.Item import net.minecraft.world.level.ItemLike import net.neoforged.neoforge.data.event.GatherDataEvent -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.util.WriteOnce -import ru.dbotthepony.mc.otm.core.registryName -import ru.dbotthepony.mc.otm.core.toJsonStrict +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.WriteOnce +import ru.dbotthepony.mc.otm.util.registryName +import ru.dbotthepony.mc.otm.util.toJsonStrict import java.util.* import java.util.concurrent.CompletableFuture import java.util.function.Consumer diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt index 001216ca1..53d041ed6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt @@ -64,7 +64,6 @@ import net.neoforged.neoforge.event.server.ServerStartedEvent import net.neoforged.neoforge.network.PacketDistributor import net.neoforged.neoforge.network.connection.ConnectionType import net.neoforged.neoforge.network.handling.IPayloadContext -import net.neoforged.neoforge.registries.DeferredRegister import net.neoforged.neoforge.server.command.EnumArgument import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.MINECRAFT_SERVER @@ -80,26 +79,24 @@ import ru.dbotthepony.mc.otm.config.ClientConfig import ru.dbotthepony.mc.otm.container.EnhancedContainer import ru.dbotthepony.mc.otm.container.IEnhancedCraftingContainer import ru.dbotthepony.mc.otm.container.util.stream -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.collect.any -import ru.dbotthepony.mc.otm.core.collect.filter -import ru.dbotthepony.mc.otm.core.filterNotNull -import ru.dbotthepony.mc.otm.core.getReverseTag -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.isZero -import ru.dbotthepony.mc.otm.core.readComponent -import ru.dbotthepony.mc.otm.core.readItemType -import ru.dbotthepony.mc.otm.core.registryName -import ru.dbotthepony.mc.otm.core.stream -import ru.dbotthepony.mc.otm.core.util.formatMatter -import ru.dbotthepony.mc.otm.core.util.formatMatterFull -import ru.dbotthepony.mc.otm.core.util.formatSiComponent -import ru.dbotthepony.mc.otm.core.util.formatTickDuration -import ru.dbotthepony.mc.otm.core.writeComponent -import ru.dbotthepony.mc.otm.core.writeItemType +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.kommons.collect.filterNotNull +import ru.dbotthepony.kommons.collect.stream +import ru.dbotthepony.mc.otm.util.getReverseTag +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.math.isZero +import ru.dbotthepony.mc.otm.util.readComponent +import ru.dbotthepony.mc.otm.util.readItemType +import ru.dbotthepony.mc.otm.util.registryName +import ru.dbotthepony.mc.otm.util.formatMatter +import ru.dbotthepony.mc.otm.util.formatMatterFull +import ru.dbotthepony.mc.otm.util.formatSiComponent +import ru.dbotthepony.mc.otm.util.formatTickDuration +import ru.dbotthepony.mc.otm.util.writeComponent +import ru.dbotthepony.mc.otm.util.writeItemType import ru.dbotthepony.mc.otm.matter.MatterManager.Finder import ru.dbotthepony.mc.otm.milliTime import ru.dbotthepony.mc.otm.onceServer @@ -1345,16 +1342,22 @@ object MatterManager { if (matter.matter != matterSized.matter || matter.complexity != matterSized.complexity) { event.toolTip.add( TranslatableComponent("otm.gui.matter.format_and_complexity2", - matter.matter.formatMatterFull(formatAsReadable = formatMatterAsReadable), - matterSized.matter.formatMatter(formatAsReadable = formatMatterAsReadable), - if (matter.complexity > 1000.0) formatTickDuration(matter.complexity.roundToInt(), true) else matter.complexity.formatSiComponent(TranslatableComponent("otm.gui.ticks")), - if (matterSized.complexity > 1000.0) formatTickDuration(matterSized.complexity.roundToInt(), true) else matterSized.complexity.formatSiComponent(TranslatableComponent("otm.gui.ticks")), + matter.matter.formatMatterFull(formatAsReadable = formatMatterAsReadable), + matterSized.matter.formatMatter(formatAsReadable = formatMatterAsReadable), + if (matter.complexity > 1000.0) formatTickDuration(matter.complexity.roundToInt(), true) else matter.complexity.formatSiComponent( + TranslatableComponent("otm.gui.ticks") + ), + if (matterSized.complexity > 1000.0) formatTickDuration(matterSized.complexity.roundToInt(), true) else matterSized.complexity.formatSiComponent( + TranslatableComponent("otm.gui.ticks") + ), ).withStyle(ChatFormatting.AQUA)) } else { event.toolTip.add( TranslatableComponent("otm.gui.matter.format_and_complexity", - matter.matter.formatMatterFull(formatAsReadable = formatMatterAsReadable), - if (matter.complexity > 1000.0) formatTickDuration(matter.complexity.roundToInt(), true) else matter.complexity.formatSiComponent(TranslatableComponent("otm.gui.ticks")), + matter.matter.formatMatterFull(formatAsReadable = formatMatterAsReadable), + if (matter.complexity > 1000.0) formatTickDuration(matter.complexity.roundToInt(), true) else matter.complexity.formatSiComponent( + TranslatableComponent("otm.gui.ticks") + ), ).withStyle(ChatFormatting.AQUA)) } } else { @@ -1628,11 +1631,11 @@ object MatterManager { .executes { dumpRegistry(it, it.getArgument("mode", DumpFilter::class.java), StringArgumentType.getString(it, "mod")) } .suggests { context, builder -> val startingWith = builder.input.substring(builder.start).lowercase() - ModList.get().mods.iterator() + ModList.get().mods.stream() .filter { it.modId.startsWith(startingWith) } - .filter { key -> BuiltInRegistries.ITEM.entrySet().iterator() + .filter { key -> BuiltInRegistries.ITEM.entrySet().stream() .filter { it.key.location().namespace == key.namespace } - .any { !Registry.isBlacklisted(it.value) } } + .anyMatch { !Registry.isBlacklisted(it.value) } } .forEach { builder.suggest(it.modId, TextComponent(it.displayName)) } builder.buildFuture() }) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/RegistryEntries.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/RegistryEntries.kt index fcc57f483..1be347029 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/RegistryEntries.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/RegistryEntries.kt @@ -4,8 +4,8 @@ import com.mojang.datafixers.util.Either import net.minecraft.resources.ResourceLocation import net.minecraft.tags.TagKey import net.minecraft.world.item.Item -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.math.Decimal interface IRegistryEntry : IMatterValue { val name: Either> diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/UpdateAction.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/UpdateAction.kt index 9849df8aa..5b5e6aaa4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/UpdateAction.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/UpdateAction.kt @@ -8,7 +8,7 @@ import com.mojang.serialization.codecs.RecordCodecBuilder import net.minecraft.resources.ResourceLocation import net.minecraft.tags.TagKey import net.minecraft.world.item.Item -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import ru.dbotthepony.mc.otm.data.codec.simpleCodec import ru.dbotthepony.mc.otm.registry.MBuiltInRegistries diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ISortingSettings.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ISortingSettings.kt index aae04954d..dffdbe39f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ISortingSettings.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/ISortingSettings.kt @@ -7,11 +7,11 @@ import net.minecraft.world.item.ItemStack import net.neoforged.neoforge.common.util.INBTSerializable import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue -import ru.dbotthepony.mc.otm.core.nbt.getBoolean -import ru.dbotthepony.mc.otm.core.nbt.mapString -import ru.dbotthepony.mc.otm.core.nbt.set -import ru.dbotthepony.mc.otm.core.util.ItemSorter -import ru.dbotthepony.mc.otm.core.util.ItemStackSorter +import ru.dbotthepony.mc.otm.util.getBoolean +import ru.dbotthepony.mc.otm.util.mapString +import ru.dbotthepony.mc.otm.util.set +import ru.dbotthepony.mc.otm.util.ItemSorter +import ru.dbotthepony.mc.otm.util.ItemStackSorter import ru.dbotthepony.mc.otm.menu.input.BooleanInputWithFeedback import ru.dbotthepony.mc.otm.menu.input.EnumInputWithFeedback diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt index 4a27b275c..45fbc1c20 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/MatteryMenu.kt @@ -12,7 +12,6 @@ import net.minecraft.network.RegistryFriendlyByteBuf import net.minecraft.network.protocol.common.custom.CustomPacketPayload import net.minecraft.resources.ResourceLocation import net.minecraft.server.level.ServerPlayer -import net.minecraft.util.RandomSource import net.minecraft.world.entity.player.Inventory import net.minecraft.world.entity.player.Player import net.minecraft.world.inventory.AbstractContainerMenu @@ -37,13 +36,11 @@ import ru.dbotthepony.mc.otm.compat.cos.cosmeticArmorSlots import ru.dbotthepony.mc.otm.compat.curios.curiosSlots import ru.dbotthepony.mc.otm.compat.curios.isCurioSlot import ru.dbotthepony.mc.otm.container.IEnhancedContainer -import ru.dbotthepony.mc.otm.container.IFilteredContainerSlot -import ru.dbotthepony.mc.otm.container.util.containerSlotOrNull -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.collect.ConditionalSet -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.collect.ConditionalSet +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.entity.checkCanInteract -import ru.dbotthepony.mc.otm.core.util.GJRAND64RandomSource +import ru.dbotthepony.mc.otm.util.GJRAND64RandomSource import ru.dbotthepony.mc.otm.menu.input.BooleanInputWithFeedback import ru.dbotthepony.mc.otm.menu.widget.ProfiledLevelGaugeWidget import ru.dbotthepony.mc.otm.network.MatteryStreamCodec diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/QuickMoveInput.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/QuickMoveInput.kt index 3d49f5cd8..bd7c1f38a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/QuickMoveInput.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/QuickMoveInput.kt @@ -4,15 +4,13 @@ import net.minecraft.network.chat.Component import net.minecraft.world.entity.player.Player import net.minecraft.world.inventory.Slot import net.minecraft.world.item.ItemStack -import net.minecraft.world.item.Items import ru.dbotthepony.mc.otm.client.render.Widgets18 import ru.dbotthepony.mc.otm.client.render.sprites.AbstractMatterySprite import ru.dbotthepony.mc.otm.container.IFilteredContainerSlot import ru.dbotthepony.mc.otm.container.util.containerSlotOrNull -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.isNotEmpty +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.isNotEmpty import ru.dbotthepony.mc.otm.container.ItemStackKey -import ru.dbotthepony.mc.otm.container.asKey import ru.dbotthepony.mc.otm.container.asKeyOrNull class QuickMoveInput(private val menu: MatteryMenu, val from: Collection, val to: Collection, val mode: Mode, val dontTouchFilteredSlots: Boolean = true) { 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 b79fce98b..74733ebde 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/Slots.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/Slots.kt @@ -5,11 +5,9 @@ import net.minecraft.world.Container import net.minecraft.world.SimpleContainer import net.minecraft.world.entity.player.Player import net.minecraft.world.inventory.Slot -import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack import ru.dbotthepony.kommons.util.Delegate import ru.dbotthepony.kommons.util.getValue -import ru.dbotthepony.kommons.util.value import ru.dbotthepony.mc.otm.capability.FlowDirection import ru.dbotthepony.mc.otm.capability.IMatteryUpgrade import ru.dbotthepony.mc.otm.capability.MatteryCapability @@ -23,11 +21,10 @@ import ru.dbotthepony.mc.otm.container.ItemFilter import ru.dbotthepony.mc.otm.container.ItemFilterSet import ru.dbotthepony.mc.otm.container.UpgradeContainer import ru.dbotthepony.mc.otm.container.util.containerSlotOrNull -import ru.dbotthepony.mc.otm.core.collect.ConditionalEnumSet -import ru.dbotthepony.mc.otm.core.immutableList -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.menu.input.BooleanInputWithFeedback +import ru.dbotthepony.mc.otm.util.collect.ConditionalEnumSet +import ru.dbotthepony.kommons.guava.immutableList +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.menu.input.InstantBooleanInput import ru.dbotthepony.mc.otm.menu.input.ItemFilterInput import ru.dbotthepony.mc.otm.network.StreamCodecs 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 857f422f2..3bdc67341 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 @@ -16,17 +16,17 @@ import net.minecraft.world.inventory.ClickType import net.minecraft.world.item.ItemStack import net.neoforged.neoforge.network.PacketDistributor import net.neoforged.neoforge.network.handling.IPayloadContext +import ru.dbotthepony.kommons.collect.addSorted +import ru.dbotthepony.kommons.util.map import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.client.minecraft -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.addSorted -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.map -import ru.dbotthepony.mc.otm.core.readBigInteger -import ru.dbotthepony.mc.otm.core.writeBigInteger +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.map +import ru.dbotthepony.mc.otm.util.readBigInteger +import ru.dbotthepony.mc.otm.util.writeBigInteger import ru.dbotthepony.mc.otm.menu.MatteryMenu -import ru.dbotthepony.mc.otm.network.* -import ru.dbotthepony.mc.otm.core.util.ItemStorageStackSorter +import ru.dbotthepony.mc.otm.util.ItemStorageStackSorter import ru.dbotthepony.mc.otm.storage.* import java.math.BigInteger import java.util.* diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/GrillMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/GrillMenu.kt index 57a021e42..9d4c06cf4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/GrillMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/GrillMenu.kt @@ -12,7 +12,7 @@ import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.mc.otm.block.entity.decorative.GrillBlockEntity import ru.dbotthepony.mc.otm.container.slotted.ContainerSlot import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.immutableList +import ru.dbotthepony.kommons.guava.immutableList import ru.dbotthepony.mc.otm.menu.ChemicalFuelMenuSlot import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.menu.MatteryMenuSlot diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/PainterMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/PainterMenu.kt index ec7eec0dc..07394bf6b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/PainterMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/decorative/PainterMenu.kt @@ -1,7 +1,6 @@ package ru.dbotthepony.mc.otm.menu.decorative import net.minecraft.tags.ItemTags -import net.minecraft.world.SimpleContainer import net.minecraft.world.entity.player.Inventory import net.minecraft.world.entity.player.Player import net.minecraft.world.item.* @@ -10,19 +9,18 @@ import net.minecraft.world.level.material.Fluids import net.neoforged.neoforge.capabilities.Capabilities import net.neoforged.neoforge.fluids.FluidStack import net.neoforged.neoforge.fluids.capability.IFluidHandler +import ru.dbotthepony.kommons.collect.addAll +import ru.dbotthepony.kommons.collect.filter +import ru.dbotthepony.kommons.collect.maybe import ru.dbotthepony.kommons.util.Listenable import ru.dbotthepony.kommons.util.ListenableDelegate import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.mc.otm.block.entity.decorative.PainterBlockEntity import ru.dbotthepony.mc.otm.player.matteryPlayer -import ru.dbotthepony.mc.otm.container.set import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.addAll -import ru.dbotthepony.mc.otm.core.collect.SupplierMap -import ru.dbotthepony.mc.otm.core.collect.filter -import ru.dbotthepony.mc.otm.core.collect.maybe -import ru.dbotthepony.mc.otm.core.isNotEmpty +import ru.dbotthepony.mc.otm.util.collect.SupplierMap +import ru.dbotthepony.mc.otm.util.isNotEmpty import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.menu.MatteryMenuSlot import ru.dbotthepony.mc.otm.menu.input.BooleanInputWithFeedback diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/DecimalInputWithFeedback.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/DecimalInputWithFeedback.kt index 0dfd22338..fb9f076a6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/DecimalInputWithFeedback.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/DecimalInputWithFeedback.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.menu.input import ru.dbotthepony.kommons.util.Delegate -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import ru.dbotthepony.mc.otm.menu.MatteryMenu import java.util.function.Supplier diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/EnergyConfigPlayerInput.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/EnergyConfigPlayerInput.kt index a04f1647d..020b9826e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/EnergyConfigPlayerInput.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/EnergyConfigPlayerInput.kt @@ -4,8 +4,8 @@ import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.core.immutableMap -import ru.dbotthepony.mc.otm.core.math.RelativeSide +import ru.dbotthepony.kommons.guava.immutableMap +import ru.dbotthepony.mc.otm.util.math.RelativeSide import ru.dbotthepony.mc.otm.menu.MatteryMenu /** diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/FluidConfigPlayerInput.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/FluidConfigPlayerInput.kt index bad7e36a7..6f64912f8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/FluidConfigPlayerInput.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/FluidConfigPlayerInput.kt @@ -4,8 +4,8 @@ import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.core.immutableMap -import ru.dbotthepony.mc.otm.core.math.RelativeSide +import ru.dbotthepony.kommons.guava.immutableMap +import ru.dbotthepony.mc.otm.util.math.RelativeSide import ru.dbotthepony.mc.otm.menu.MatteryMenu /** diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/ItemConfigPlayerInput.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/ItemConfigPlayerInput.kt index aee23e740..dadacdbf7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/ItemConfigPlayerInput.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/ItemConfigPlayerInput.kt @@ -3,9 +3,8 @@ package ru.dbotthepony.mc.otm.menu.input import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity -import ru.dbotthepony.mc.otm.capability.FlowDirection -import ru.dbotthepony.mc.otm.core.immutableMap -import ru.dbotthepony.mc.otm.core.math.RelativeSide +import ru.dbotthepony.kommons.guava.immutableMap +import ru.dbotthepony.mc.otm.util.math.RelativeSide import ru.dbotthepony.mc.otm.menu.MatteryMenu /** diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/ItemFilterInput.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/ItemFilterInput.kt index e944af6a6..2ed372a18 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/ItemFilterInput.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/ItemFilterInput.kt @@ -4,7 +4,7 @@ import net.minecraft.world.entity.player.Player import ru.dbotthepony.kommons.util.Delegate import ru.dbotthepony.mc.otm.container.ItemFilter import ru.dbotthepony.mc.otm.container.ItemFilterSet -import ru.dbotthepony.mc.otm.core.immutableList +import ru.dbotthepony.kommons.guava.immutableList import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.network.StreamCodecs import java.util.function.Predicate diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterCapacitorBankMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterCapacitorBankMenu.kt index 1d76d930d..55c14fd41 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterCapacitorBankMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterCapacitorBankMenu.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.menu.matter import net.minecraft.world.entity.player.Inventory -import ru.dbotthepony.mc.otm.core.immutableList +import ru.dbotthepony.kommons.guava.immutableList import ru.dbotthepony.mc.otm.block.entity.matter.MatterCapacitorBankBlockEntity import ru.dbotthepony.mc.otm.block.entity.tech.BatteryBankBlockEntity import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterEntanglerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterEntanglerMenu.kt index aa99a86c9..f8b44e836 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterEntanglerMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterEntanglerMenu.kt @@ -9,7 +9,7 @@ import ru.dbotthepony.mc.otm.block.entity.matter.MatterEntanglerBlockEntity import ru.dbotthepony.mc.otm.container.set import ru.dbotthepony.mc.otm.container.slotted.AutomationFilters import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.isNotEmpty +import ru.dbotthepony.mc.otm.util.isNotEmpty import ru.dbotthepony.mc.otm.item.IQuantumLinked import ru.dbotthepony.mc.otm.menu.MatteryMenuSlot import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterPanelMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterPanelMenu.kt index f51b3864d..62136c96d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterPanelMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterPanelMenu.kt @@ -10,16 +10,17 @@ import net.minecraft.world.item.Item import net.neoforged.neoforge.network.PacketDistributor import net.neoforged.neoforge.network.handling.IPayloadContext import org.apache.logging.log4j.LogManager +import ru.dbotthepony.kommons.collect.addSorted import ru.dbotthepony.kommons.util.getValue +import ru.dbotthepony.kommons.util.map import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.block.entity.matter.MatterPanelBlockEntity import ru.dbotthepony.mc.otm.capability.matter.* import ru.dbotthepony.mc.otm.client.minecraft -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.addSorted -import ru.dbotthepony.mc.otm.core.map -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.util.writeCollection +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.map +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.writeCollection import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphListener import ru.dbotthepony.mc.otm.graph.matter.MatterGraph import ru.dbotthepony.mc.otm.menu.IItemSortingSettings diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterReplicatorMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterReplicatorMenu.kt index a4824823a..5ff733a6a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterReplicatorMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterReplicatorMenu.kt @@ -8,9 +8,8 @@ import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget import ru.dbotthepony.mc.otm.container.CombinedContainer import ru.dbotthepony.mc.otm.container.EnhancedContainer -import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.immutableList -import ru.dbotthepony.mc.otm.core.isNotEmpty +import ru.dbotthepony.kommons.guava.immutableList +import ru.dbotthepony.mc.otm.util.isNotEmpty import ru.dbotthepony.mc.otm.menu.OutputMenuSlot import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu import ru.dbotthepony.mc.otm.menu.input.EnergyConfigPlayerInput diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterScannerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterScannerMenu.kt index 85157fb8d..8659a15ed 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterScannerMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterScannerMenu.kt @@ -7,7 +7,7 @@ import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget import ru.dbotthepony.mc.otm.menu.widget.LevelGaugeWidget import net.minecraft.world.item.ItemStack import ru.dbotthepony.mc.otm.container.EnhancedContainer -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.matter.MatterManager import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu import ru.dbotthepony.mc.otm.menu.MatteryMenuSlot diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/PatternStorageMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/PatternStorageMenu.kt index 2ddc1a530..50dd8ca70 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/PatternStorageMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/PatternStorageMenu.kt @@ -1,11 +1,10 @@ package ru.dbotthepony.mc.otm.menu.matter -import net.minecraft.world.SimpleContainer import net.minecraft.world.entity.player.Inventory -import ru.dbotthepony.mc.otm.core.immutableList +import ru.dbotthepony.kommons.guava.immutableList import ru.dbotthepony.mc.otm.block.entity.matter.PatternStorageBlockEntity import ru.dbotthepony.mc.otm.container.EnhancedContainer -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.menu.PatternMenuSlot import ru.dbotthepony.mc.otm.menu.input.ItemConfigPlayerInput diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/DriveViewerMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/DriveViewerMenu.kt index 1e10b89dc..f0f200bbb 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/DriveViewerMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/DriveViewerMenu.kt @@ -12,10 +12,8 @@ import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.drive.IMatteryDrive import ru.dbotthepony.mc.otm.capability.energy.ProfiledEnergyStorage import ru.dbotthepony.mc.otm.container.EnhancedContainer -import ru.dbotthepony.mc.otm.container.ItemFilter import ru.dbotthepony.mc.otm.container.ItemFilterSet -import ru.dbotthepony.mc.otm.core.immutableList -import ru.dbotthepony.mc.otm.core.util.ItemStorageStackSorter +import ru.dbotthepony.mc.otm.util.ItemStorageStackSorter import ru.dbotthepony.mc.otm.item.PortableCondensationDriveItem import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu import ru.dbotthepony.mc.otm.menu.MatteryMenuSlot @@ -26,7 +24,6 @@ import ru.dbotthepony.mc.otm.menu.input.EnergyConfigPlayerInput import ru.dbotthepony.mc.otm.menu.input.EnumInputWithFeedback import ru.dbotthepony.mc.otm.menu.input.ItemFilterInput import ru.dbotthepony.mc.otm.menu.widget.ProfiledLevelGaugeWidget -import ru.dbotthepony.mc.otm.network.StreamCodecs import ru.dbotthepony.mc.otm.registry.game.MMenus import ru.dbotthepony.mc.otm.storage.ItemStorageStack import ru.dbotthepony.mc.otm.storage.StorageStack diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/ItemMonitorMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/ItemMonitorMenu.kt index 2bba0944a..6f16a5557 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/ItemMonitorMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/storage/ItemMonitorMenu.kt @@ -12,9 +12,9 @@ import ru.dbotthepony.mc.otm.block.entity.storage.IItemMonitorPlayerSettings import ru.dbotthepony.mc.otm.block.entity.storage.ItemMonitorBlockEntity import ru.dbotthepony.mc.otm.block.entity.storage.ItemMonitorPlayerSettings import ru.dbotthepony.mc.otm.container.get -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.collect.reduce -import ru.dbotthepony.mc.otm.core.isNotEmpty +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.kommons.collect.reduce +import ru.dbotthepony.mc.otm.util.isNotEmpty import ru.dbotthepony.mc.otm.menu.MatteryPoweredMenu import ru.dbotthepony.mc.otm.menu.MatteryMenuSlot import ru.dbotthepony.mc.otm.menu.QuickMoveInput diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BatteryBankMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BatteryBankMenu.kt index 0c35515f1..0a31824c8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BatteryBankMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BatteryBankMenu.kt @@ -1,15 +1,12 @@ package ru.dbotthepony.mc.otm.menu.tech -import net.minecraft.world.Container import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.block.entity.tech.BatteryBankBlockEntity -import net.minecraft.world.SimpleContainer import ru.dbotthepony.mc.otm.block.entity.RedstoneSetting import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.immutableList +import ru.dbotthepony.kommons.guava.immutableList import ru.dbotthepony.mc.otm.menu.BatteryMenuSlot import ru.dbotthepony.mc.otm.menu.MatteryMenu -import ru.dbotthepony.mc.otm.menu.MatteryMenuSlot import ru.dbotthepony.mc.otm.menu.input.EnergyConfigPlayerInput import ru.dbotthepony.mc.otm.menu.input.EnumInputWithFeedback import ru.dbotthepony.mc.otm.menu.input.ItemConfigPlayerInput diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BlackHoleGeneratorMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BlackHoleGeneratorMenu.kt index 56e4f2a6e..4a7cac4da 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BlackHoleGeneratorMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/BlackHoleGeneratorMenu.kt @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.menu.tech import net.minecraft.world.entity.player.Inventory import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleGeneratorBlockEntity -import ru.dbotthepony.mc.otm.core.multiblock.MultiblockStatus +import ru.dbotthepony.mc.otm.multiblock.MultiblockStatus import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.menu.input.BooleanInputWithFeedback import ru.dbotthepony.mc.otm.menu.input.DecimalInputWithFeedback diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EnergyCounterMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EnergyCounterMenu.kt index e95e7e6e2..75dc98573 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EnergyCounterMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EnergyCounterMenu.kt @@ -8,9 +8,9 @@ import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.mc.otm.block.entity.RedstoneSetting import ru.dbotthepony.mc.otm.block.tech.EnergyCounterBlock import ru.dbotthepony.mc.otm.block.entity.tech.EnergyCounterBlockEntity -import ru.dbotthepony.mc.otm.core.chart.DecimalHistoryChart -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.toDecimal +import ru.dbotthepony.mc.otm.util.chart.DecimalHistoryChart +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.math.toDecimal import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.menu.input.BooleanInputWithFeedback import ru.dbotthepony.mc.otm.menu.input.EnumInputWithFeedback diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EssenceStorageMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EssenceStorageMenu.kt index 1c362f84d..f058f7ad7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EssenceStorageMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/EssenceStorageMenu.kt @@ -1,7 +1,6 @@ package ru.dbotthepony.mc.otm.menu.tech import net.minecraft.server.level.ServerPlayer -import net.minecraft.world.SimpleContainer import net.minecraft.world.entity.player.Inventory import net.minecraft.world.item.ItemStack import net.minecraft.world.item.enchantment.EnchantmentEffectComponents @@ -11,7 +10,7 @@ import ru.dbotthepony.mc.otm.block.entity.RedstoneSetting import ru.dbotthepony.mc.otm.block.entity.tech.EssenceStorageBlockEntity import ru.dbotthepony.mc.otm.container.EnhancedContainer import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.util.getTotalXpRequiredForLevel +import ru.dbotthepony.mc.otm.util.getTotalXpRequiredForLevel import ru.dbotthepony.mc.otm.item.consumables.EssenceCapsuleItem import ru.dbotthepony.mc.otm.item.EssenceServoItem import ru.dbotthepony.mc.otm.menu.MatteryMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/FlywheelBatteryMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/FlywheelBatteryMenu.kt index 66de4494e..81da04ded 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/FlywheelBatteryMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/FlywheelBatteryMenu.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.menu.tech import net.minecraft.world.entity.player.Inventory import net.minecraft.world.level.block.Blocks import ru.dbotthepony.mc.otm.block.entity.tech.FlywheelBatteryBlockEntity -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.menu.widget.ProfiledLevelGaugeWidget import ru.dbotthepony.mc.otm.network.MatteryStreamCodec diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/PlatePressMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/PlatePressMenu.kt index ed4eccf7c..34be3886f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/PlatePressMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/PlatePressMenu.kt @@ -2,14 +2,13 @@ package ru.dbotthepony.mc.otm.menu.tech import mezz.jei.api.recipe.RecipeType import net.minecraft.server.level.ServerPlayer -import net.minecraft.world.SimpleContainer import net.minecraft.world.entity.player.Inventory import net.minecraft.world.inventory.MenuType import ru.dbotthepony.mc.otm.block.entity.tech.PlatePressBlockEntity import ru.dbotthepony.mc.otm.compat.jei.PlatePressRecipeCategory import ru.dbotthepony.mc.otm.container.EnhancedContainer import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.immutableList +import ru.dbotthepony.kommons.guava.immutableList import ru.dbotthepony.mc.otm.menu.OutputMenuSlot import ru.dbotthepony.mc.otm.menu.MatteryMenuSlot import ru.dbotthepony.mc.otm.menu.input.BooleanInputWithFeedback diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/PoweredFurnaceMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/PoweredFurnaceMenu.kt index 024b854c1..5f53cbc23 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/PoweredFurnaceMenu.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/PoweredFurnaceMenu.kt @@ -1,13 +1,10 @@ package ru.dbotthepony.mc.otm.menu.tech -import com.google.common.collect.ImmutableList import mezz.jei.api.constants.RecipeTypes import mezz.jei.api.recipe.RecipeType import net.minecraft.server.level.ServerPlayer import net.minecraft.world.entity.player.Inventory import net.minecraft.world.inventory.MenuType -import net.minecraft.world.item.crafting.Recipe -import net.minecraft.world.item.crafting.SingleRecipeInput import ru.dbotthepony.mc.otm.block.entity.tech.AbstractPoweredFurnaceBlockEntity import ru.dbotthepony.mc.otm.block.entity.tech.PoweredBlastFurnaceBlockEntity import ru.dbotthepony.mc.otm.block.entity.tech.PoweredFurnaceBlockEntity @@ -15,9 +12,8 @@ import ru.dbotthepony.mc.otm.block.entity.tech.PoweredSmokerBlockEntity import ru.dbotthepony.mc.otm.compat.jei.MicrowaveRecipeCategory import ru.dbotthepony.mc.otm.container.EnhancedContainer import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.immutableList +import ru.dbotthepony.kommons.guava.immutableList import ru.dbotthepony.mc.otm.menu.OutputMenuSlot -import ru.dbotthepony.mc.otm.menu.MatteryMenuSlot import ru.dbotthepony.mc.otm.menu.UserFilteredMenuSlot import ru.dbotthepony.mc.otm.menu.input.BooleanInputWithFeedback import ru.dbotthepony.mc.otm.menu.input.EnergyConfigPlayerInput @@ -28,7 +24,6 @@ import ru.dbotthepony.mc.otm.menu.widget.ProfiledLevelGaugeWidget import ru.dbotthepony.mc.otm.menu.widget.ProgressGaugeWidget import ru.dbotthepony.mc.otm.menu.widget.TakeExperienceWidget import ru.dbotthepony.mc.otm.registry.game.MMenus -import ru.dbotthepony.mc.otm.registry.game.MRecipes import java.util.function.Supplier class PoweredFurnaceMenu( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/CombinedProfiledLevelGaugeWidget.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/CombinedProfiledLevelGaugeWidget.kt index 874abec13..d93434968 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/CombinedProfiledLevelGaugeWidget.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/CombinedProfiledLevelGaugeWidget.kt @@ -7,9 +7,9 @@ import ru.dbotthepony.mc.otm.capability.AbstractProfiledStorage.Companion.HISTOR import ru.dbotthepony.mc.otm.capability.IProfiledStorage import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage import ru.dbotthepony.mc.otm.capability.matter.IMatterStorage -import ru.dbotthepony.mc.otm.core.chart.CombinedDecimalHistoryChart -import ru.dbotthepony.mc.otm.core.chart.DecimalHistoryChart -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.chart.CombinedDecimalHistoryChart +import ru.dbotthepony.mc.otm.util.chart.DecimalHistoryChart +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.network.StreamCodecs import ru.dbotthepony.mc.otm.network.syncher.SynchableGroup diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/LevelGaugeWidget.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/LevelGaugeWidget.kt index d640e1198..06f51f347 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/LevelGaugeWidget.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/LevelGaugeWidget.kt @@ -4,7 +4,7 @@ import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage import ru.dbotthepony.mc.otm.capability.matter.IMatterStorage import ru.dbotthepony.mc.otm.capability.matter.IPatternStorage -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.network.StreamCodecs import ru.dbotthepony.mc.otm.network.syncher.SynchableGroup diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/ProfiledLevelGaugeWidget.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/ProfiledLevelGaugeWidget.kt index 2a510d706..770d82f88 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/ProfiledLevelGaugeWidget.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/ProfiledLevelGaugeWidget.kt @@ -6,8 +6,8 @@ import ru.dbotthepony.mc.otm.capability.AbstractProfiledStorage.Companion.HISTOR import ru.dbotthepony.mc.otm.capability.IProfiledStorage import ru.dbotthepony.mc.otm.capability.energy.IMatteryEnergyStorage import ru.dbotthepony.mc.otm.capability.matter.IMatterStorage -import ru.dbotthepony.mc.otm.core.chart.DecimalHistoryChart -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.chart.DecimalHistoryChart +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.menu.MatteryMenu import ru.dbotthepony.mc.otm.network.StreamCodecs import ru.dbotthepony.mc.otm.network.syncher.SynchableGroup diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/ProgressGaugeWidget.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/ProgressGaugeWidget.kt index f52f0839d..7828d0da3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/ProgressGaugeWidget.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/ProgressGaugeWidget.kt @@ -4,7 +4,7 @@ import ru.dbotthepony.mc.otm.network.syncher.SynchableGroup import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.mc.otm.block.entity.MachineJobEventLoop import ru.dbotthepony.mc.otm.block.entity.MatteryWorkerBlockEntity -import ru.dbotthepony.mc.otm.core.FloatSupplier +import ru.dbotthepony.mc.otm.util.FloatSupplier import ru.dbotthepony.mc.otm.menu.MatteryMenu import java.util.function.BooleanSupplier diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockEntitySet.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockEntitySet.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockEntitySet.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockEntitySet.kt index 9e47845f9..c59e29756 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockEntitySet.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockEntitySet.kt @@ -1,8 +1,8 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap import net.minecraft.world.level.block.entity.BlockEntity -import java.util.Collections +import java.util.* class BlockEntitySet(private val listener: GlobalBlockEntityRemovalListener, val tag: BlockEntityTag) { private val items = Reference2IntOpenHashMap() diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockEntityTag.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockEntityTag.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockEntityTag.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockEntityTag.kt index ee723d051..f247f3fe6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockEntityTag.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockEntityTag.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import net.minecraft.world.level.block.entity.BlockEntity import java.util.function.Predicate diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockPredicate.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockPredicate.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockPredicate.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockPredicate.kt index 5dc8d8346..7e68047fe 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/BlockPredicate.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/BlockPredicate.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import com.google.common.collect.ImmutableSet import net.minecraft.core.BlockPos @@ -7,7 +7,7 @@ import net.minecraft.world.level.LevelAccessor import net.minecraft.world.level.block.Rotation import net.minecraft.world.level.block.entity.BlockEntity import net.minecraft.world.level.block.state.BlockState -import ru.dbotthepony.mc.otm.core.math.plus +import ru.dbotthepony.mc.otm.util.math.plus fun interface BlockPredicate { fun test(pos: BlockPos, access: LevelAccessor, blockState: BlockState, blockEntity: Lazy): Boolean diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/GlobalBlockEntityRemovalListener.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/GlobalBlockEntityRemovalListener.kt similarity index 92% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/GlobalBlockEntityRemovalListener.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/GlobalBlockEntityRemovalListener.kt index 4d4b2af79..92a729c5c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/GlobalBlockEntityRemovalListener.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/GlobalBlockEntityRemovalListener.kt @@ -1,8 +1,8 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import net.minecraft.world.level.Level import net.minecraft.world.level.block.entity.BlockEntity -import ru.dbotthepony.mc.otm.core.collect.WeakHashSet +import ru.dbotthepony.mc.otm.util.collect.WeakHashSet import java.util.* interface GlobalBlockEntityRemovalListener { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockAccess.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockAccess.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockAccess.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockAccess.kt index 553c01a21..62f04257b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockAccess.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockAccess.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import it.unimi.dsi.fastutil.objects.Reference2IntMap import net.minecraft.core.BlockPos diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockListener.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockListener.kt similarity index 76% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockListener.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockListener.kt index cf751d8d1..2314bb1db 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockListener.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockListener.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock interface IMultiblockListener { fun onAddedToMultiblock(multiblock: IMultiblockAccess) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockNode.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockNode.kt similarity index 82% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockNode.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockNode.kt index 191c8a578..338fe3c86 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/IMultiblockNode.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/IMultiblockNode.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import net.minecraft.core.BlockPos import net.minecraft.world.level.block.state.BlockState diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/MultiblockListenerSet.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/MultiblockListenerSet.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/MultiblockListenerSet.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/MultiblockListenerSet.kt index 1b4050b31..b1ad34462 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/MultiblockListenerSet.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/MultiblockListenerSet.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/MultiblockStatus.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/MultiblockStatus.kt similarity index 91% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/MultiblockStatus.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/MultiblockStatus.kt index c5967765c..3f9b01044 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/MultiblockStatus.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/MultiblockStatus.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock enum class MultiblockStatus { /** diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/NodeStatus.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/NodeStatus.kt similarity index 54% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/NodeStatus.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/NodeStatus.kt index 0634d57c6..e013b91ee 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/NodeStatus.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/NodeStatus.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock enum class NodeStatus { UNKNOWN, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblock.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblock.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblock.kt index b64e544e0..12684535b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblock.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap @@ -16,14 +16,12 @@ import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.chunk.LevelChunk import net.minecraft.world.phys.AABB import ru.dbotthepony.kommons.util.Listenable -import ru.dbotthepony.mc.otm.core.collect.collect -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.getBlockEntityNow -import ru.dbotthepony.mc.otm.core.getBlockStateNowOrNull -import ru.dbotthepony.mc.otm.core.math.Vector -import ru.dbotthepony.mc.otm.core.math.compareTo -import ru.dbotthepony.mc.otm.core.math.plus -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.getBlockEntityNow +import ru.dbotthepony.mc.otm.util.getBlockStateNowOrNull +import ru.dbotthepony.mc.otm.util.math.Vector +import ru.dbotthepony.mc.otm.util.math.compareTo +import ru.dbotthepony.mc.otm.util.math.plus +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.network.syncher.IRemoteState import ru.dbotthepony.mc.otm.network.syncher.ISynchable import java.io.Closeable @@ -36,7 +34,8 @@ import kotlin.collections.HashMap /** * [close] MUST be called when multiblock goes out of scope */ -class ShapedMultiblock(pos: BlockPos, factory: ShapedMultiblockFactory) : IMultiblockAccess, ISynchable, Closeable, GlobalBlockEntityRemovalListener { +class ShapedMultiblock(pos: BlockPos, factory: ShapedMultiblockFactory) : IMultiblockAccess, ISynchable, Closeable, + GlobalBlockEntityRemovalListener { override var isValid: MultiblockStatus = MultiblockStatus.INVALID private set @@ -69,8 +68,10 @@ class ShapedMultiblock(pos: BlockPos, factory: ShapedMultiblockFactory) : IMulti override val hasRemotes: Boolean get() = remotes.isNotEmpty() - private inner class Config(override val currentDirection: Direction, val pos: BlockPos, parts: Collection) : IMultiblockAccess, ISynchable, GlobalBlockEntityRemovalListener, Comparable { - private inner class Part private constructor(override val pos: BlockPos, val prototype: ShapedMultiblockFactory.Part, val chunkPos: ChunkPos) : Comparable, IMultiblockNode { + private inner class Config(override val currentDirection: Direction, val pos: BlockPos, parts: Collection) : IMultiblockAccess, ISynchable, + GlobalBlockEntityRemovalListener, Comparable { + private inner class Part private constructor(override val pos: BlockPos, val prototype: ShapedMultiblockFactory.Part, val chunkPos: ChunkPos) : Comparable, + IMultiblockNode { constructor(pos: BlockPos, prototype: ShapedMultiblockFactory.Part) : this(pos, prototype, ChunkPos(pos)) var index = -1 @@ -80,7 +81,7 @@ class ShapedMultiblock(pos: BlockPos, factory: ShapedMultiblockFactory) : IMulti private val assignedBlockEntityLists = ArrayList>(prototype.blockEntityTags.size) private val assignedBlockStateLists = ArrayList>() private val assignedBlockLists = ArrayList>() - private val children: ImmutableList by lazy(LazyThreadSafetyMode.NONE) { prototype.children.iterator().map { Part(pos, it, chunkPos) }.collect(ImmutableList.toImmutableList()) } + private val children: ImmutableList by lazy(LazyThreadSafetyMode.NONE) { prototype.children.stream().map { Part(pos, it, chunkPos) }.collect(ImmutableList.toImmutableList()) } override fun compareTo(other: Part): Int { return chunkPos.compareTo(other.chunkPos) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblockBuilder.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblockBuilder.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblockBuilder.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblockBuilder.kt index 0fde89cc3..7ccc86684 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblockBuilder.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblockBuilder.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableSet @@ -6,17 +6,13 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap import it.unimi.dsi.fastutil.objects.ObjectArraySet import net.minecraft.core.BlockPos import net.minecraft.core.Direction -import net.minecraft.core.SectionPos import net.minecraft.core.Vec3i import net.minecraft.tags.TagKey import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.state.BlockState -import net.minecraft.world.level.chunk.status.ChunkStatus -import ru.dbotthepony.mc.otm.core.collect.collect -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.getBlockStateNow -import ru.dbotthepony.mc.otm.core.math.RelativeSide -import ru.dbotthepony.mc.otm.core.math.plus +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.mc.otm.util.math.RelativeSide +import ru.dbotthepony.mc.otm.util.math.plus import java.util.function.Predicate inline fun shapedMultiblock(configurator: ShapedMultiblockBuilder.Node.() -> Unit): ShapedMultiblockFactory { @@ -362,6 +358,6 @@ class ShapedMultiblockBuilder { * Created factory does not share reference(s) to this builder, and this builder can be mutated further without consequences. */ fun build(): ShapedMultiblockFactory { - return ShapedMultiblockFactory(nodes.values.iterator().map { it.build() }.collect(ImmutableSet.toImmutableSet()), ImmutableList.copyOf(customChecks)) + return ShapedMultiblockFactory(nodes.values.stream().map { it.build() }.collect(ImmutableSet.toImmutableSet()), ImmutableList.copyOf(customChecks)) } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblockFactory.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblockFactory.kt similarity index 61% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblockFactory.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblockFactory.kt index b39ca1bce..1d76fa395 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/ShapedMultiblockFactory.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/ShapedMultiblockFactory.kt @@ -1,12 +1,11 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableSet import net.minecraft.core.BlockPos import net.minecraft.world.level.block.Rotation import net.minecraft.world.level.block.state.BlockState -import ru.dbotthepony.mc.otm.core.collect.collect -import ru.dbotthepony.mc.otm.core.collect.map +import ru.dbotthepony.kommons.collect.map import java.util.function.Predicate class ShapedMultiblockFactory(val north: ImmutableSet, val customChecks: ImmutableList>) { @@ -28,7 +27,7 @@ class ShapedMultiblockFactory(val north: ImmutableSet, val customChecks: I return ShapedMultiblock(pos, this) } - val south: ImmutableSet = north.iterator().map { it.copy(pos = it.pos.rotate(Rotation.CLOCKWISE_180)) }.collect(ImmutableSet.toImmutableSet()) - val west: ImmutableSet = north.iterator().map { it.copy(pos = it.pos.rotate(Rotation.COUNTERCLOCKWISE_90)) }.collect(ImmutableSet.toImmutableSet()) - val east: ImmutableSet = north.iterator().map { it.copy(pos = it.pos.rotate(Rotation.CLOCKWISE_90)) }.collect(ImmutableSet.toImmutableSet()) + val south: ImmutableSet = north.stream().map { it.copy(pos = it.pos.rotate(Rotation.CLOCKWISE_180)) }.collect(ImmutableSet.toImmutableSet()) + val west: ImmutableSet = north.stream().map { it.copy(pos = it.pos.rotate(Rotation.COUNTERCLOCKWISE_90)) }.collect(ImmutableSet.toImmutableSet()) + val east: ImmutableSet = north.stream().map { it.copy(pos = it.pos.rotate(Rotation.CLOCKWISE_90)) }.collect(ImmutableSet.toImmutableSet()) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/Strategy.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/Strategy.kt similarity index 93% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/Strategy.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/Strategy.kt index 0cde129fc..0fced2e22 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/multiblock/Strategy.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/multiblock/Strategy.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.multiblock +package ru.dbotthepony.mc.otm.multiblock enum class Strategy { /** diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/AndroidPackets.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/AndroidPackets.kt index d008ccdae..43aace005 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/AndroidPackets.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/AndroidPackets.kt @@ -21,14 +21,13 @@ import ru.dbotthepony.mc.otm.client.MatteryGUI import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.render.GlitchRenderer import ru.dbotthepony.mc.otm.config.PlayerConfig -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.readComponent -import ru.dbotthepony.mc.otm.core.writeComponent +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.readComponent +import ru.dbotthepony.mc.otm.util.writeComponent import ru.dbotthepony.mc.otm.menu.tech.AndroidStationMenu import ru.dbotthepony.mc.otm.onceServer import ru.dbotthepony.mc.otm.registry.MBuiltInRegistries import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures -import ru.dbotthepony.mc.otm.registry.MRegistry import ru.dbotthepony.mc.otm.registry.game.MSoundEvents class AndroidFeatureSyncPacket(val type: AndroidFeatureType<*>, val data: ByteArrayList) : CustomPacketPayload { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/BlockEntitySyncPacket.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/BlockEntitySyncPacket.kt index 6a9aff743..0bd0bfec3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/BlockEntitySyncPacket.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/BlockEntitySyncPacket.kt @@ -15,9 +15,9 @@ import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.onceClient -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.collect.reduce +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.kommons.collect.reduce import java.util.* import kotlin.collections.ArrayList diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerPackets.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerPackets.kt index 2c796bf21..53a0db8a5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerPackets.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerPackets.kt @@ -28,19 +28,19 @@ import ru.dbotthepony.mc.otm.container.IFilteredContainerSlot import ru.dbotthepony.mc.otm.container.get import ru.dbotthepony.mc.otm.container.set import ru.dbotthepony.mc.otm.container.util.containerSlotOrNull -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.math.Vector -import ru.dbotthepony.mc.otm.core.math.component1 -import ru.dbotthepony.mc.otm.core.math.component2 -import ru.dbotthepony.mc.otm.core.math.component3 -import ru.dbotthepony.mc.otm.core.math.minus -import ru.dbotthepony.mc.otm.core.math.plus -import ru.dbotthepony.mc.otm.core.math.toRadians -import ru.dbotthepony.mc.otm.core.otmRandom -import ru.dbotthepony.mc.otm.core.position -import ru.dbotthepony.mc.otm.core.readEnum -import ru.dbotthepony.mc.otm.core.readItem -import ru.dbotthepony.mc.otm.core.writeItem +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.math.Vector +import ru.dbotthepony.mc.otm.util.math.component1 +import ru.dbotthepony.mc.otm.util.math.component2 +import ru.dbotthepony.mc.otm.util.math.component3 +import ru.dbotthepony.mc.otm.util.math.minus +import ru.dbotthepony.mc.otm.util.math.plus +import ru.dbotthepony.mc.otm.util.math.toRadians +import ru.dbotthepony.mc.otm.util.otmRandom +import ru.dbotthepony.mc.otm.util.position +import ru.dbotthepony.mc.otm.util.readEnum +import ru.dbotthepony.mc.otm.util.readItem +import ru.dbotthepony.mc.otm.util.writeItem import ru.dbotthepony.mc.otm.entity.checkCanInteract import ru.dbotthepony.mc.otm.menu.ExopackInventoryMenu import ru.dbotthepony.mc.otm.menu.QuickMoveInput diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/MenuDataPacket.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/MenuDataPacket.kt index 7da35ccbb..5814db1ba 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/MenuDataPacket.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/MenuDataPacket.kt @@ -7,7 +7,7 @@ import net.minecraft.network.protocol.common.custom.CustomPacketPayload import net.neoforged.neoforge.network.handling.IPayloadContext import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.player.matteryPlayer -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.menu.ExopackInventoryMenu import ru.dbotthepony.mc.otm.menu.MatteryMenu diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/SetCarriedPacket.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/SetCarriedPacket.kt index 24651ff9b..1a6679e8b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/SetCarriedPacket.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/SetCarriedPacket.kt @@ -7,9 +7,9 @@ import net.minecraft.world.item.ItemStack import net.neoforged.neoforge.network.handling.IPayloadContext import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.client.minecraft -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.readItem -import ru.dbotthepony.mc.otm.core.writeItem +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.readItem +import ru.dbotthepony.mc.otm.util.writeItem class SetCarriedPacket(val item: ItemStack) : CustomPacketPayload { fun write(buff: RegistryFriendlyByteBuf) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/ShockwaveEffectPacket.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/ShockwaveEffectPacket.kt index b5b125ca7..a2a1d1609 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/ShockwaveEffectPacket.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/ShockwaveEffectPacket.kt @@ -6,8 +6,8 @@ import net.minecraft.network.protocol.common.custom.CustomPacketPayload import net.neoforged.neoforge.network.handling.IPayloadContext import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.client.render.ShockwaveRenderer -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.math.Vector +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.math.Vector class ShockwaveEffectPacket(val pos: Vector) : CustomPacketPayload { fun write(buff: FriendlyByteBuf) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/SmokeParticlesPacket.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/SmokeParticlesPacket.kt index 5d87e004a..56cdbede2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/SmokeParticlesPacket.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/SmokeParticlesPacket.kt @@ -12,8 +12,8 @@ import net.neoforged.neoforge.network.PacketDistributor import net.neoforged.neoforge.network.handling.IPayloadContext import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.client.minecraft -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.otmRandom +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.otmRandom class SmokeParticlesPacket(val x: Double, val y: Double, val z: Double) : CustomPacketPayload { fun write(buff: FriendlyByteBuf) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/StreamCodecs.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/StreamCodecs.kt index 7479ced2e..7bad07d07 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/StreamCodecs.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/StreamCodecs.kt @@ -10,12 +10,12 @@ import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.state.BlockState import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.mc.otm.container.ItemFilter -import ru.dbotthepony.mc.otm.core.util.readDecimal -import ru.dbotthepony.mc.otm.core.util.writeDecimal -import ru.dbotthepony.mc.otm.core.readBlockType -import ru.dbotthepony.mc.otm.core.readItemType -import ru.dbotthepony.mc.otm.core.writeBlockType -import ru.dbotthepony.mc.otm.core.writeItemType +import ru.dbotthepony.mc.otm.util.readDecimal +import ru.dbotthepony.mc.otm.util.writeDecimal +import ru.dbotthepony.mc.otm.util.readBlockType +import ru.dbotthepony.mc.otm.util.readItemType +import ru.dbotthepony.mc.otm.util.writeBlockType +import ru.dbotthepony.mc.otm.util.writeItemType import java.util.* object StreamCodecs { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/syncher/DynamicSynchableGroup.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/syncher/DynamicSynchableGroup.kt index ebfcf27dd..4d72a71c7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/syncher/DynamicSynchableGroup.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/syncher/DynamicSynchableGroup.kt @@ -5,10 +5,9 @@ import it.unimi.dsi.fastutil.ints.IntArraySet import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet import net.minecraft.network.RegistryFriendlyByteBuf import ru.dbotthepony.kommons.util.KOptional -import ru.dbotthepony.mc.otm.core.IDAllocator +import ru.dbotthepony.mc.otm.util.IDAllocator import java.io.Closeable import java.util.concurrent.ConcurrentLinkedQueue -import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.atomic.AtomicBoolean /** @@ -270,6 +269,7 @@ class DynamicSynchableGroup( if (value2slot.isNotEmpty()) { value2slot.clear() id2slot.clear() + idAllocator.reset() remoteStates.toTypedArray().forEach { it.clear() } } @@ -320,6 +320,7 @@ class DynamicSynchableGroup( val slot = value2slot.remove(element)!! checkNotNull(id2slot.remove(slot.id)) remoteStates.forEach { it.remove(slot) } + idAllocator.release(slot.id) return true } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/syncher/SynchableGroup.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/syncher/SynchableGroup.kt index 9e7f0749c..8e3a0a2fd 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/syncher/SynchableGroup.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/syncher/SynchableGroup.kt @@ -18,9 +18,9 @@ import ru.dbotthepony.kommons.util.Listenable import ru.dbotthepony.kommons.util.ListenableDelegate import ru.dbotthepony.kommons.util.Observer import ru.dbotthepony.mc.otm.OTM_CLEANER -import ru.dbotthepony.mc.otm.core.collect.filterNotNull -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.kommons.collect.filterNotNull +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.network.ItemStackCodec import ru.dbotthepony.mc.otm.network.MatteryStreamCodec import ru.dbotthepony.mc.otm.network.StreamCodecs diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryFoodData.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryFoodData.kt index cc547f8e6..a44fc8c96 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryFoodData.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryFoodData.kt @@ -12,10 +12,10 @@ import net.minecraft.world.food.FoodProperties import net.minecraft.world.level.GameRules import ru.dbotthepony.mc.otm.config.IFoodRegenerationValues import ru.dbotthepony.mc.otm.config.PlayerConfig -import ru.dbotthepony.mc.otm.core.damageType -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.nbt.getDecimal -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.damageType +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.getDecimal +import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.registry.MDamageTypes import kotlin.math.max import kotlin.math.min diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt index 7f488e078..d5746d439 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt @@ -31,7 +31,6 @@ import net.minecraft.world.entity.boss.wither.WitherBoss import net.minecraft.world.entity.player.Inventory import net.minecraft.world.entity.player.Player import net.minecraft.world.food.FoodProperties -import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack import net.minecraft.world.item.ProjectileWeaponItem import net.minecraft.world.item.crafting.RecipeManager @@ -58,7 +57,6 @@ import ru.dbotthepony.mc.otm.network.syncher.SynchableGroup import ru.dbotthepony.kommons.util.ListenableDelegate import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue -import ru.dbotthepony.kommons.util.value import ru.dbotthepony.mc.otm.* import ru.dbotthepony.mc.otm.player.android.AndroidFeature import ru.dbotthepony.mc.otm.player.android.AndroidFeatureType @@ -80,26 +78,19 @@ import ru.dbotthepony.mc.otm.config.PlayerConfig import ru.dbotthepony.mc.otm.config.ExopackConfig import ru.dbotthepony.mc.otm.container.CombinedContainer import ru.dbotthepony.mc.otm.container.EnhancedContainer -import ru.dbotthepony.mc.otm.container.IContainerSlot import ru.dbotthepony.mc.otm.container.IEnhancedContainer -import ru.dbotthepony.mc.otm.container.IFilteredContainerSlot import ru.dbotthepony.mc.otm.container.ItemFilter -import ru.dbotthepony.mc.otm.container.get -import ru.dbotthepony.mc.otm.container.slotted.ContainerSlot -import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer import ru.dbotthepony.mc.otm.container.util.slotIterator import ru.dbotthepony.mc.otm.container.vanishCursedItems -import ru.dbotthepony.mc.otm.core.* -import ru.dbotthepony.mc.otm.core.collect.UUIDIntModifiersMap -import ru.dbotthepony.mc.otm.core.collect.filter -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.RGBColorDFUCodec -import ru.dbotthepony.mc.otm.core.math.minus -import ru.dbotthepony.mc.otm.core.nbt.getCompoundList -import ru.dbotthepony.mc.otm.core.nbt.getStringList -import ru.dbotthepony.mc.otm.core.nbt.set -import ru.dbotthepony.mc.otm.core.util.Savetables -import ru.dbotthepony.mc.otm.core.util.TickList +import ru.dbotthepony.mc.otm.util.collect.UUIDIntModifiersMap +import ru.dbotthepony.kommons.collect.filter +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.math.RGBColorDFUCodec +import ru.dbotthepony.mc.otm.util.math.minus +import ru.dbotthepony.mc.otm.util.getCompoundList +import ru.dbotthepony.mc.otm.util.set +import ru.dbotthepony.mc.otm.util.Savetables +import ru.dbotthepony.mc.otm.util.TickList import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.menu.ExopackInventoryMenu import ru.dbotthepony.mc.otm.menu.IItemStackSortingSettings @@ -109,7 +100,6 @@ import ru.dbotthepony.mc.otm.registry.MBuiltInRegistries import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures import ru.dbotthepony.mc.otm.registry.MDamageTypes import ru.dbotthepony.mc.otm.registry.game.MItems -import ru.dbotthepony.mc.otm.registry.MRegistry import ru.dbotthepony.mc.otm.registry.MatteryDamageSource import ru.dbotthepony.mc.otm.triggers.AndroidResearchTrigger import ru.dbotthepony.mc.otm.triggers.AndroidTravelUnderwater @@ -122,8 +112,12 @@ import ru.dbotthepony.mc.otm.triggers.ExopackGainedEnderAccessTrigger import ru.dbotthepony.mc.otm.triggers.ExopackGainedSmeltingTrigger import ru.dbotthepony.mc.otm.triggers.ExopackObtainedTrigger import ru.dbotthepony.mc.otm.triggers.ExopackSlotsExpandedTrigger -import ru.dbotthepony.mc.otm.triggers.MatteryInventoryChangeTrigger -import java.io.Closeable +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.damageType +import ru.dbotthepony.mc.otm.util.isNotEmpty +import ru.dbotthepony.mc.otm.util.otmRandom +import ru.dbotthepony.mc.otm.util.position import java.util.* import java.util.stream.Stream import kotlin.collections.ArrayDeque diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidFeature.kt index b225be0e1..90544c63c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidFeature.kt @@ -8,7 +8,7 @@ import ru.dbotthepony.mc.otm.network.syncher.SynchableGroup import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.mc.otm.player.MatteryPlayer -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.set abstract class AndroidFeature(val type: AndroidFeatureType<*>, val android: MatteryPlayer) : INBTSerializable { val ply get() = android.ply diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidFeatureType.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidFeatureType.kt index 1b32d9d96..00a6f3dd2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidFeatureType.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/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.player.MatteryPlayer -import ru.dbotthepony.mc.otm.core.getKeyNullable +import ru.dbotthepony.mc.otm.util.getKeyNullable import ru.dbotthepony.mc.otm.registry.MBuiltInRegistries import ru.dbotthepony.mc.otm.registry.MRegistry diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearch.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearch.kt index 8e3675772..a1668b1cf 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearch.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearch.kt @@ -15,10 +15,10 @@ import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.player.MatteryPlayer import ru.dbotthepony.mc.otm.capability.awareItemsStream -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.registryName -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.registryName +import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.milliTime import ru.dbotthepony.mc.otm.triggers.AndroidResearchTrigger import kotlin.math.absoluteValue diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearchDataProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearchDataProvider.kt index 492295d78..1cafc908a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearchDataProvider.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearchDataProvider.kt @@ -7,8 +7,8 @@ import net.minecraft.data.DataProvider import net.minecraft.data.PackOutput import net.minecraft.resources.ResourceLocation import net.neoforged.neoforge.data.event.GatherDataEvent -import ru.dbotthepony.mc.otm.core.toJsonStrict -import ru.dbotthepony.mc.otm.core.util.WriteOnce +import ru.dbotthepony.mc.otm.util.toJsonStrict +import ru.dbotthepony.mc.otm.util.WriteOnce import java.util.Collections import java.util.LinkedList import java.util.concurrent.CompletableFuture diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearchDescription.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearchDescription.kt index 4b9e51cce..0b23200c2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearchDescription.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearchDescription.kt @@ -10,9 +10,9 @@ import net.neoforged.bus.api.IEventBus import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.client.ShiftPressedCond import ru.dbotthepony.mc.otm.config.PlayerConfig -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.util.formatPower +import ru.dbotthepony.mc.otm.util.TextComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.formatPower import ru.dbotthepony.mc.otm.registry.MBuiltInRegistries import ru.dbotthepony.mc.otm.registry.MDeferredRegister import ru.dbotthepony.mc.otm.registry.MRegistries diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearchManager.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearchManager.kt index eaaeb6ef4..6b2bc9104 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearchManager.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearchManager.kt @@ -19,16 +19,17 @@ import net.neoforged.neoforge.event.OnDatapackSyncEvent import net.neoforged.neoforge.network.PacketDistributor import net.neoforged.neoforge.network.handling.IPayloadContext import org.apache.logging.log4j.LogManager +import ru.dbotthepony.kommons.gson.set import ru.dbotthepony.mc.otm.MINECRAFT_SERVER import ru.dbotthepony.mc.otm.NULLABLE_MINECRAFT_SERVER import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.SERVER_IS_LIVE import ru.dbotthepony.mc.otm.player.matteryPlayer -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.fromJsonStrict -import ru.dbotthepony.mc.otm.core.fromNetwork -import ru.dbotthepony.mc.otm.core.set -import ru.dbotthepony.mc.otm.core.toNetwork +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.fromJsonStrict +import ru.dbotthepony.mc.otm.util.fromNetwork +import ru.dbotthepony.mc.otm.util.set +import ru.dbotthepony.mc.otm.util.toNetwork import ru.dbotthepony.mc.otm.onceServer import java.util.* diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearchType.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearchType.kt index e7fb141cd..ef416ef85 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearchType.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearchType.kt @@ -21,8 +21,8 @@ import net.minecraft.world.item.crafting.Ingredient import net.minecraft.world.level.ItemLike import ru.dbotthepony.mc.otm.client.render.sprites.AbstractMatterySprite import ru.dbotthepony.mc.otm.client.render.sprites.SpriteType -import ru.dbotthepony.mc.otm.core.collect.ListSet -import ru.dbotthepony.mc.otm.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.collect.ListSet +import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.data.codec.JsonElementCodec import ru.dbotthepony.mc.otm.isClient import java.util.Optional diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidSwitchableFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidSwitchableFeature.kt index 04a67138c..0fcff37bb 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidSwitchableFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidSwitchableFeature.kt @@ -10,7 +10,7 @@ import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.mc.otm.player.MatteryPlayer import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.minecraft -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.set abstract class AndroidSwitchableFeature(type: AndroidFeatureType<*>, android: MatteryPlayer) : AndroidFeature(type, android) { var isActive by syncher.boolean(setter = setter@{ access, value -> diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/AttackBoostFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/AttackBoostFeature.kt index c37ae67b8..9d633a3f7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/AttackBoostFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/AttackBoostFeature.kt @@ -5,7 +5,7 @@ import net.minecraft.world.entity.ai.attributes.Attributes import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.player.android.AndroidFeature import ru.dbotthepony.mc.otm.player.MatteryPlayer -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures class AttackBoostFeature(android: MatteryPlayer) : AndroidFeature(AndroidFeatures.ATTACK_BOOST, android) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/EnderTeleporterFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/EnderTeleporterFeature.kt index 23975234c..a6b6d88fa 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/EnderTeleporterFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/EnderTeleporterFeature.kt @@ -35,21 +35,21 @@ import ru.dbotthepony.mc.otm.client.render.ResearchIcons import ru.dbotthepony.mc.otm.client.render.linesIgnoreZRenderType import ru.dbotthepony.mc.otm.client.render.sprites.sprite import ru.dbotthepony.mc.otm.config.PlayerConfig -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.genericPositions -import ru.dbotthepony.mc.otm.core.holder -import ru.dbotthepony.mc.otm.core.isFall -import ru.dbotthepony.mc.otm.core.math.Vector -import ru.dbotthepony.mc.otm.core.math.asVector -import ru.dbotthepony.mc.otm.core.math.component1 -import ru.dbotthepony.mc.otm.core.math.component2 -import ru.dbotthepony.mc.otm.core.math.component3 -import ru.dbotthepony.mc.otm.core.math.plus -import ru.dbotthepony.mc.otm.core.math.rotateXDegrees -import ru.dbotthepony.mc.otm.core.math.rotateYDegrees -import ru.dbotthepony.mc.otm.core.math.shortestDistanceBetween -import ru.dbotthepony.mc.otm.core.math.times -import ru.dbotthepony.mc.otm.core.otmRandom +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.genericPositions +import ru.dbotthepony.mc.otm.util.holder +import ru.dbotthepony.mc.otm.util.isFall +import ru.dbotthepony.mc.otm.util.math.Vector +import ru.dbotthepony.mc.otm.util.math.asVector +import ru.dbotthepony.mc.otm.util.math.component1 +import ru.dbotthepony.mc.otm.util.math.component2 +import ru.dbotthepony.mc.otm.util.math.component3 +import ru.dbotthepony.mc.otm.util.math.plus +import ru.dbotthepony.mc.otm.util.math.rotateXDegrees +import ru.dbotthepony.mc.otm.util.math.rotateYDegrees +import ru.dbotthepony.mc.otm.util.math.shortestDistanceBetween +import ru.dbotthepony.mc.otm.util.math.times +import ru.dbotthepony.mc.otm.util.otmRandom import ru.dbotthepony.mc.otm.milliTime import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures import ru.dbotthepony.mc.otm.triggers.EnderTeleporterFallDeathTrigger diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/ExtendedReachFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/ExtendedReachFeature.kt index 7c80cab46..b93efe005 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/ExtendedReachFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/ExtendedReachFeature.kt @@ -5,7 +5,7 @@ import net.minecraft.world.entity.ai.attributes.Attributes import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.player.android.AndroidFeature import ru.dbotthepony.mc.otm.player.MatteryPlayer -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures class ExtendedReachFeature(android: MatteryPlayer) : AndroidFeature(AndroidFeatures.EXTENDED_REACH, android) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/FallDampenersFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/FallDampenersFeature.kt index 9e2cc4ea2..c833ff9ff 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/FallDampenersFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/FallDampenersFeature.kt @@ -5,7 +5,7 @@ import net.neoforged.neoforge.event.entity.living.LivingIncomingDamageEvent import ru.dbotthepony.mc.otm.player.android.AndroidFeature import ru.dbotthepony.mc.otm.player.MatteryPlayer import ru.dbotthepony.mc.otm.config.PlayerConfig -import ru.dbotthepony.mc.otm.core.isFall +import ru.dbotthepony.mc.otm.util.isFall import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures import ru.dbotthepony.mc.otm.triggers.FallDampenersSaveTrigger diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/ItemMagnetFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/ItemMagnetFeature.kt index abd1d7f60..494c06f7d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/ItemMagnetFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/ItemMagnetFeature.kt @@ -18,13 +18,13 @@ import ru.dbotthepony.mc.otm.capability.energy.extractEnergyExact import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.render.ResearchIcons -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.math.Vector -import ru.dbotthepony.mc.otm.core.getEntitiesInEllipsoid -import ru.dbotthepony.mc.otm.core.math.minus -import ru.dbotthepony.mc.otm.core.math.plus -import ru.dbotthepony.mc.otm.core.position -import ru.dbotthepony.mc.otm.core.math.times +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.math.Vector +import ru.dbotthepony.mc.otm.util.getEntitiesInEllipsoid +import ru.dbotthepony.mc.otm.util.math.minus +import ru.dbotthepony.mc.otm.util.math.plus +import ru.dbotthepony.mc.otm.util.position +import ru.dbotthepony.mc.otm.util.math.times import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures import java.util.UUID import java.util.WeakHashMap diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/JumpBoostFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/JumpBoostFeature.kt index c53c7742a..0b21c1708 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/JumpBoostFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/JumpBoostFeature.kt @@ -13,8 +13,8 @@ import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.render.ResearchIcons import ru.dbotthepony.mc.otm.config.PlayerConfig import ru.dbotthepony.mc.otm.config.ClientConfig -import ru.dbotthepony.mc.otm.core.math.Vector -import ru.dbotthepony.mc.otm.core.math.plus +import ru.dbotthepony.mc.otm.util.math.Vector +import ru.dbotthepony.mc.otm.util.math.plus import ru.dbotthepony.mc.otm.network.SmokeParticlesPacket import ru.dbotthepony.mc.otm.network.TriggerJumpBoostPacket import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/LimbOverclockingFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/LimbOverclockingFeature.kt index 66c5cde75..bdadecd9e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/LimbOverclockingFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/LimbOverclockingFeature.kt @@ -8,7 +8,7 @@ import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.player.android.AndroidFeature import ru.dbotthepony.mc.otm.player.MatteryPlayer import ru.dbotthepony.mc.otm.player.matteryPlayer -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures class LimbOverclockingFeature(android: MatteryPlayer) : AndroidFeature(AndroidFeatures.LIMB_OVERCLOCKING, android) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/NanobotsArmorFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/NanobotsArmorFeature.kt index 732677573..08de370a5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/NanobotsArmorFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/NanobotsArmorFeature.kt @@ -10,11 +10,11 @@ import ru.dbotthepony.kommons.util.setValue import ru.dbotthepony.mc.otm.player.android.AndroidFeature import ru.dbotthepony.mc.otm.player.MatteryPlayer import ru.dbotthepony.mc.otm.capability.energy.extractEnergyExact -import ru.dbotthepony.mc.otm.core.isBypassArmor -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.isBypassArmor +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures import ru.dbotthepony.mc.otm.registry.StatNames -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.onceServer import ru.dbotthepony.mc.otm.triggers.NanobotsArmorTrigger import kotlin.math.roundToInt diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/NanobotsRegenerationFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/NanobotsRegenerationFeature.kt index 1e3817629..03136d89a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/NanobotsRegenerationFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/NanobotsRegenerationFeature.kt @@ -10,7 +10,7 @@ import ru.dbotthepony.mc.otm.player.android.AndroidFeature import ru.dbotthepony.mc.otm.player.MatteryPlayer import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures import ru.dbotthepony.mc.otm.registry.StatNames -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.set import kotlin.math.roundToInt class NanobotsRegenerationFeature(android: MatteryPlayer) : AndroidFeature(AndroidFeatures.NANOBOTS_REGENERATION, android) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/ShockwaveFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/ShockwaveFeature.kt index a7d3eb6d6..477c21b48 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/ShockwaveFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/ShockwaveFeature.kt @@ -13,17 +13,17 @@ import ru.dbotthepony.mc.otm.capability.energy.extractEnergyExact import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.render.ResearchIcons import ru.dbotthepony.mc.otm.config.PlayerConfig -import ru.dbotthepony.mc.otm.core.damageType -import ru.dbotthepony.mc.otm.core.getEntitiesInEllipsoid -import ru.dbotthepony.mc.otm.core.getExplosionResistance +import ru.dbotthepony.mc.otm.util.damageType +import ru.dbotthepony.mc.otm.util.getEntitiesInEllipsoid +import ru.dbotthepony.mc.otm.util.getExplosionResistance import ru.dbotthepony.kommons.math.RGBAColor -import ru.dbotthepony.mc.otm.core.math.Vector -import ru.dbotthepony.mc.otm.core.math.getEllipsoidBlockPositions -import ru.dbotthepony.mc.otm.core.math.minus -import ru.dbotthepony.mc.otm.core.math.plus -import ru.dbotthepony.mc.otm.core.math.roundToIntVector -import ru.dbotthepony.mc.otm.core.math.times -import ru.dbotthepony.mc.otm.core.position +import ru.dbotthepony.mc.otm.util.math.Vector +import ru.dbotthepony.mc.otm.util.math.getEllipsoidBlockPositions +import ru.dbotthepony.mc.otm.util.math.minus +import ru.dbotthepony.mc.otm.util.math.plus +import ru.dbotthepony.mc.otm.util.math.roundToIntVector +import ru.dbotthepony.mc.otm.util.math.times +import ru.dbotthepony.mc.otm.util.position import ru.dbotthepony.mc.otm.network.ShockwaveEffectPacket import ru.dbotthepony.mc.otm.network.TriggerShockwavePacket import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/StepAssistFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/StepAssistFeature.kt index 08cb9cc6a..59383f64e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/StepAssistFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/StepAssistFeature.kt @@ -8,7 +8,7 @@ import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.render.ResearchIcons import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures class StepAssistFeature(android: MatteryPlayer) : AndroidSwitchableFeature(AndroidFeatures.STEP_ASSIST, android) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/SwimBoostersFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/SwimBoostersFeature.kt index 2cd1a933e..dfa56cb0f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/SwimBoostersFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/SwimBoostersFeature.kt @@ -9,7 +9,7 @@ import ru.dbotthepony.mc.otm.client.render.ResearchIcons import ru.dbotthepony.mc.otm.config.PlayerConfig import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures class SwimBoostersFeature(android: MatteryPlayer) : AndroidSwitchableFeature(AndroidFeatures.SWIM_BOOSTERS, android) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/Ext.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/Ext.kt index 39713b74c..520726504 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/Ext.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/Ext.kt @@ -3,8 +3,8 @@ package ru.dbotthepony.mc.otm.recipe import net.minecraft.world.item.crafting.CraftingInput import net.minecraft.world.item.crafting.Ingredient import net.minecraft.world.item.crafting.ShapedRecipePattern -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.isNotEmpty +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.isNotEmpty val ShapedRecipePattern.isIncomplete: Boolean get() = ingredients().any { it.items.size == 1 && it.hasNoItems() } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatterEntanglerRecipe.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatterEntanglerRecipe.kt index 64e322653..0e3cd3295 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatterEntanglerRecipe.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatterEntanglerRecipe.kt @@ -18,9 +18,9 @@ import net.minecraft.world.item.crafting.ShapedRecipePattern import net.minecraft.world.level.Level import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.matteryEnergy -import ru.dbotthepony.mc.otm.core.collect.filterNotNull -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.kommons.collect.filterNotNull +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.network.StreamCodecs diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatteryCookingRecipe.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatteryCookingRecipe.kt index 195acbbbd..fc2ce5af0 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatteryCookingRecipe.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatteryCookingRecipe.kt @@ -13,7 +13,7 @@ import net.minecraft.world.item.ItemStack import net.minecraft.world.item.crafting.* import net.minecraft.world.level.Level import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.network.StreamCodecs import ru.dbotthepony.mc.otm.network.streamCodec diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PainterRecipe.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PainterRecipe.kt index 7fde31efa..32e3fa039 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PainterRecipe.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PainterRecipe.kt @@ -25,7 +25,7 @@ import net.minecraft.world.item.crafting.RecipeSerializer import net.minecraft.world.item.crafting.RecipeType import net.minecraft.world.level.Level import ru.dbotthepony.mc.otm.block.entity.decorative.PainterBlockEntity -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.data.codec.PredicatedCodecList import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.network.MatteryStreamCodec 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 a3b0694ca..df08db812 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PlatePressRecipe.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PlatePressRecipe.kt @@ -20,9 +20,9 @@ import net.minecraft.world.item.crafting.RecipeType import net.minecraft.world.level.Level import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.container.get -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.registry.game.MRecipes -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.network.streamCodec import ru.dbotthepony.mc.otm.registry.game.MItems diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/UpgradeRecipe.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/UpgradeRecipe.kt index d91fb4d13..fffcf03c5 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/UpgradeRecipe.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/UpgradeRecipe.kt @@ -22,8 +22,8 @@ import net.minecraft.world.item.enchantment.ItemEnchantments import net.minecraft.world.level.Level import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.matter.PatternState -import ru.dbotthepony.mc.otm.core.nbt.set -import ru.dbotthepony.mc.otm.core.registryName +import ru.dbotthepony.mc.otm.util.set +import ru.dbotthepony.mc.otm.util.registryName import java.util.Optional import java.util.UUID diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockTags.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockTags.kt index 876128ac1..0d313a77a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockTags.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockTags.kt @@ -4,7 +4,7 @@ import net.minecraft.tags.BlockTags import net.minecraft.tags.TagKey import net.minecraft.world.level.block.Block import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation @Suppress("unused") object MBlockTags { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBuiltInRegistries.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBuiltInRegistries.kt index c8e272e5a..722a23cb4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBuiltInRegistries.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBuiltInRegistries.kt @@ -6,7 +6,7 @@ import net.neoforged.bus.api.IEventBus import net.neoforged.neoforge.registries.NewRegistryEvent import net.neoforged.neoforge.registries.RegistryBuilder import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import kotlin.reflect.KProperty object MBuiltInRegistries { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MDamageTypes.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MDamageTypes.kt index e5c33b076..908e64101 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MDamageTypes.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MDamageTypes.kt @@ -5,7 +5,7 @@ import net.minecraft.resources.ResourceKey import net.minecraft.resources.ResourceLocation import net.minecraft.world.damagesource.DamageType import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation object MDamageTypes { private fun register(name: String): ResourceKey = ResourceKey.create(Registries.DAMAGE_TYPE, ResourceLocation(OverdriveThatMatters.MOD_ID, name)) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MDeferredRegister.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MDeferredRegister.kt index b35c37892..b62f9e50c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MDeferredRegister.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MDeferredRegister.kt @@ -19,8 +19,8 @@ import net.neoforged.neoforge.registries.RegisterEvent import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.SystemTime -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.collect.SupplierMap +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.collect.SupplierMap import java.util.* import java.util.concurrent.FutureTask import java.util.concurrent.locks.LockSupport diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItemTags.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItemTags.kt index a3bd24319..b23eb4746 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItemTags.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItemTags.kt @@ -5,7 +5,7 @@ import net.minecraft.tags.ItemTags import net.minecraft.tags.TagKey import net.minecraft.world.item.Item import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation @Suppress("unused") object MItemTags { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt index c3ebab17d..6b17b1f2f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.registry import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation object MNames { const val REDSTONE_LAMP_INVERTED = "redstone_lamp_inverted" diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistries.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistries.kt index 6268477c3..5e0656d60 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistries.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistries.kt @@ -4,7 +4,7 @@ import net.minecraft.core.Registry import net.minecraft.resources.ResourceKey import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.container.ItemFilter -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.data.world.BooleanProvider import ru.dbotthepony.mc.otm.data.world.DecimalProvider import ru.dbotthepony.mc.otm.matter.AbstractRegistryAction diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt index c15342aa9..ccb666bc1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt @@ -38,8 +38,8 @@ import ru.dbotthepony.mc.otm.block.decorative.StarChairBlock import ru.dbotthepony.mc.otm.block.decorative.TritaniumPressurePlate import ru.dbotthepony.mc.otm.capability.matteryEnergy import ru.dbotthepony.mc.otm.client.MatteryGUI -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.isClient import ru.dbotthepony.mc.otm.item.armor.TritaniumArmorItem import ru.dbotthepony.mc.otm.item.weapon.EnergySwordItem diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MatteryDamageSource.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MatteryDamageSource.kt index 5df0479ef..210b3a527 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MatteryDamageSource.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MatteryDamageSource.kt @@ -9,7 +9,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.core.TranslatableComponent +import ru.dbotthepony.mc.otm.util.TranslatableComponent class MatteryDamageSource( type: Holder, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MArmorMaterials.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MArmorMaterials.kt index 747c82107..dee0b1d57 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MArmorMaterials.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MArmorMaterials.kt @@ -7,7 +7,7 @@ import net.minecraft.world.item.ArmorMaterial import net.minecraft.world.item.crafting.Ingredient import net.neoforged.bus.api.IEventBus import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.registry.MDeferredRegister import ru.dbotthepony.mc.otm.registry.MItemTags diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlockEntities.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlockEntities.kt index b5f8e80df..bfdc26c60 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlockEntities.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlockEntities.kt @@ -30,7 +30,7 @@ import ru.dbotthepony.mc.otm.block.entity.tech.GravitationStabilizerBlockEntity import ru.dbotthepony.mc.otm.block.entity.tech.PlatePressBlockEntity import ru.dbotthepony.mc.otm.client.render.blockentity.* import ru.dbotthepony.mc.otm.config.CablesConfig -import ru.dbotthepony.mc.otm.core.collect.SupplierMap +import ru.dbotthepony.mc.otm.util.collect.SupplierMap import ru.dbotthepony.mc.otm.registry.MDeferredRegister import ru.dbotthepony.mc.otm.registry.MNames import ru.dbotthepony.mc.otm.registry.MRegistry diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlocks.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlocks.kt index 8a4558eae..a072c0c93 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlocks.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MBlocks.kt @@ -91,15 +91,13 @@ import ru.dbotthepony.mc.otm.block.tech.PoweredFurnaceBlock import ru.dbotthepony.mc.otm.block.tech.PoweredSmokerBlock import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.config.CablesConfig -import ru.dbotthepony.mc.otm.core.collect.SupplierList -import ru.dbotthepony.mc.otm.core.collect.SupplierMap -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.collect.SupplierList +import ru.dbotthepony.mc.otm.util.collect.SupplierMap +import ru.dbotthepony.mc.otm.util.get import ru.dbotthepony.mc.otm.registry.MDeferredRegister import ru.dbotthepony.mc.otm.registry.MNames import ru.dbotthepony.mc.otm.registry.MRegistry import java.util.Collections -import java.util.EnumMap -import java.util.HashMap import java.util.LinkedHashMap import java.util.function.Supplier diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt index 158c6295e..3f1c0a6a9 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MCreativeTabs.kt @@ -18,10 +18,10 @@ import net.neoforged.neoforge.fluids.capability.IFluidHandler import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.capability.MatteryCapability import ru.dbotthepony.mc.otm.capability.matteryEnergy -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.registryName -import ru.dbotthepony.mc.otm.core.util.CreativeMenuItemComparator +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.TranslatableComponent +import ru.dbotthepony.mc.otm.util.registryName +import ru.dbotthepony.mc.otm.util.CreativeMenuItemComparator import ru.dbotthepony.mc.otm.registry.MDeferredRegister import ru.dbotthepony.mc.otm.registry.MRegistry import ru.dbotthepony.mc.otm.registry.game.MItems.BATTERY_CREATIVE diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MDataComponentTypes.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MDataComponentTypes.kt index 92fbcbfcc..2a6ab824e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MDataComponentTypes.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MDataComponentTypes.kt @@ -15,7 +15,7 @@ import net.neoforged.neoforge.fluids.SimpleFluidContent import ru.dbotthepony.mc.otm.capability.FlowDirection import ru.dbotthepony.mc.otm.capability.matter.PatternState import ru.dbotthepony.mc.otm.container.ItemFilterSet -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import ru.dbotthepony.mc.otm.item.tool.RedstoneInteractorItem import ru.dbotthepony.mc.otm.network.StreamCodecs diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MFluids.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MFluids.kt index a7f8efc3a..d00d26b2f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MFluids.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MFluids.kt @@ -11,7 +11,7 @@ import net.neoforged.neoforge.fluids.BaseFlowingFluid import net.neoforged.neoforge.fluids.FluidType import net.neoforged.neoforge.registries.NeoForgeRegistries import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.registry.MDeferredRegister import java.util.function.Consumer diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt index e287a6d0d..b55158acf 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt @@ -32,9 +32,9 @@ import ru.dbotthepony.mc.otm.player.MatteryPlayer import ru.dbotthepony.mc.otm.capability.UpgradeType import ru.dbotthepony.mc.otm.config.CablesConfig import ru.dbotthepony.mc.otm.config.ItemsConfig -import ru.dbotthepony.mc.otm.core.collect.SupplierList -import ru.dbotthepony.mc.otm.core.collect.SupplierMap -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.collect.SupplierList +import ru.dbotthepony.mc.otm.util.collect.SupplierMap +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.item.BatteryItem import ru.dbotthepony.mc.otm.item.ChestUpgraderItem import ru.dbotthepony.mc.otm.item.ConfiguratorItem diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MRecipes.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MRecipes.kt index f1312c23b..5f807ca86 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MRecipes.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MRecipes.kt @@ -5,7 +5,7 @@ import net.minecraft.world.item.crafting.Recipe import net.minecraft.world.item.crafting.RecipeType import net.neoforged.bus.api.IEventBus import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.recipe.* import ru.dbotthepony.mc.otm.registry.MDeferredRegister diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/SuspiciousFoods.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/SuspiciousFoods.kt index c49f84a86..70607c1cd 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/SuspiciousFoods.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/SuspiciousFoods.kt @@ -6,8 +6,8 @@ import net.minecraft.world.entity.EntityType import net.minecraft.world.item.Item import net.minecraft.world.item.Items import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.ResourceLocation -import ru.dbotthepony.mc.otm.core.collect.SupplierList +import ru.dbotthepony.mc.otm.util.ResourceLocation +import ru.dbotthepony.mc.otm.util.collect.SupplierList import ru.dbotthepony.mc.otm.item.consumables.NotNormalFood import ru.dbotthepony.mc.otm.registry.MDeferredRegister diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/ColoredDecorativeBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/ColoredDecorativeBlock.kt index bf904c2da..5e1c43121 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/ColoredDecorativeBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/ColoredDecorativeBlock.kt @@ -5,7 +5,7 @@ import net.minecraft.world.item.DyeColor import net.minecraft.world.item.Item import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.state.BlockBehaviour -import ru.dbotthepony.mc.otm.core.collect.SupplierMap +import ru.dbotthepony.mc.otm.util.collect.SupplierMap import ru.dbotthepony.mc.otm.registry.MDeferredRegister import ru.dbotthepony.mc.otm.registry.MRegistry import java.util.EnumMap diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/DecorativeBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/DecorativeBlock.kt index ad9f51052..80ba5bafe 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/DecorativeBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/DecorativeBlock.kt @@ -13,10 +13,10 @@ import net.minecraft.world.phys.shapes.CollisionContext import net.minecraft.world.phys.shapes.VoxelShape import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.getShapeForEachState -import ru.dbotthepony.mc.otm.core.collect.SupplierMap -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.math.BlockRotationFreedom -import ru.dbotthepony.mc.otm.core.util.WriteOnce +import ru.dbotthepony.mc.otm.util.collect.SupplierMap +import ru.dbotthepony.mc.otm.util.get +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.WriteOnce import ru.dbotthepony.mc.otm.registry.MDeferredRegister import ru.dbotthepony.mc.otm.registry.MRegistry import ru.dbotthepony.mc.otm.shapes.BlockShape diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/StripedColoredDecorativeBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/StripedColoredDecorativeBlock.kt index 63f2b57cb..3136980e9 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/StripedColoredDecorativeBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/StripedColoredDecorativeBlock.kt @@ -6,8 +6,8 @@ import net.minecraft.world.item.BlockItem import net.minecraft.world.item.DyeColor import net.minecraft.world.item.Item import net.minecraft.world.level.block.Block -import ru.dbotthepony.mc.otm.core.collect.SupplierList -import ru.dbotthepony.mc.otm.core.collect.SupplierMap +import ru.dbotthepony.mc.otm.util.collect.SupplierList +import ru.dbotthepony.mc.otm.util.collect.SupplierMap import ru.dbotthepony.mc.otm.registry.MDeferredRegister import java.util.EnumMap import java.util.function.Supplier diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/storage/ItemStorageStack.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/storage/ItemStorageStack.kt index a2afdabd3..3fe2f398b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/storage/ItemStorageStack.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/storage/ItemStorageStack.kt @@ -4,9 +4,8 @@ import net.minecraft.network.chat.Component import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack import ru.dbotthepony.kommons.util.getValue -import ru.dbotthepony.mc.otm.core.getValue -import ru.dbotthepony.mc.otm.core.lazy2 -import ru.dbotthepony.mc.otm.core.math.toIntSafe +import ru.dbotthepony.mc.otm.util.lazy2 +import ru.dbotthepony.mc.otm.util.math.toIntSafe import java.math.BigInteger class ItemStorageStack private constructor(private val stack: ItemStack, count: BigInteger, mark: Nothing?) : StorageStack(count) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/storage/StorageStack.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/storage/StorageStack.kt index ddf49249b..b2dfb26a1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/storage/StorageStack.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/storage/StorageStack.kt @@ -5,11 +5,11 @@ import net.minecraft.network.RegistryFriendlyByteBuf import net.minecraft.world.item.ItemStack import net.neoforged.bus.api.IEventBus import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.readBigInteger -import ru.dbotthepony.mc.otm.core.readItem -import ru.dbotthepony.mc.otm.core.writeBigInteger -import ru.dbotthepony.mc.otm.core.writeItem +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.readBigInteger +import ru.dbotthepony.mc.otm.util.readItem +import ru.dbotthepony.mc.otm.util.writeBigInteger +import ru.dbotthepony.mc.otm.util.writeItem import ru.dbotthepony.mc.otm.registry.MDeferredRegister import ru.dbotthepony.mc.otm.registry.MRegistries import java.math.BigInteger diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/storage/VirtualComponent.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/storage/VirtualComponent.kt index a363a609f..2dd7858a2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/storage/VirtualComponent.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/storage/VirtualComponent.kt @@ -7,8 +7,8 @@ import it.unimi.dsi.fastutil.objects.ObjectAVLTreeSet import it.unimi.dsi.fastutil.objects.ObjectArrayList import it.unimi.dsi.fastutil.objects.ObjectArraySet import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet -import ru.dbotthepony.mc.otm.core.math.isPositive -import ru.dbotthepony.mc.otm.core.math.isZero +import ru.dbotthepony.mc.otm.util.math.isPositive +import ru.dbotthepony.mc.otm.util.math.isZero import java.math.BigInteger import java.util.* import java.util.stream.Stream diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/AndroidResearchTrigger.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/AndroidResearchTrigger.kt index 8b71b4b85..b1e0f4637 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/AndroidResearchTrigger.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/AndroidResearchTrigger.kt @@ -7,7 +7,7 @@ import net.minecraft.resources.ResourceLocation import net.minecraft.server.level.ServerPlayer import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.player.android.AndroidResearchType -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import java.util.* import java.util.function.Predicate diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/AndroidTravelUnderwater.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/AndroidTravelUnderwater.kt index 25955a8e9..3f5228c8b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/AndroidTravelUnderwater.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/AndroidTravelUnderwater.kt @@ -6,7 +6,7 @@ import net.minecraft.advancements.critereon.ContextAwarePredicate import net.minecraft.resources.ResourceLocation import net.minecraft.server.level.ServerPlayer import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.data.codec.minRange import java.util.* diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/ExopackTriggers.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/ExopackTriggers.kt index 98228bd13..faf3c187b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/ExopackTriggers.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/ExopackTriggers.kt @@ -6,7 +6,7 @@ import net.minecraft.advancements.critereon.ContextAwarePredicate import net.minecraft.resources.ResourceLocation import net.minecraft.server.level.ServerPlayer import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import java.util.* val ExopackObtainedTrigger = SingletonTrigger(ResourceLocation(OverdriveThatMatters.MOD_ID, "exopack_obtained")) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/KillAsAndroidTrigger.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/KillAsAndroidTrigger.kt index ca973c252..bec5db37d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/KillAsAndroidTrigger.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/KillAsAndroidTrigger.kt @@ -13,7 +13,7 @@ import net.neoforged.neoforge.event.entity.living.LivingDeathEvent import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.player.MatteryPlayer import ru.dbotthepony.mc.otm.player.matteryPlayer -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.data.codec.SingletonCodec import ru.dbotthepony.mc.otm.registry.MBuiltInRegistries import ru.dbotthepony.mc.otm.registry.MRegistry diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MCriterionTrigger.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MCriterionTrigger.kt index 6aee75154..b5be0f6aa 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MCriterionTrigger.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MCriterionTrigger.kt @@ -13,8 +13,7 @@ import net.minecraft.advancements.critereon.EntityPredicate import net.minecraft.resources.ResourceLocation import net.minecraft.server.PlayerAdvancements import net.minecraft.server.level.ServerPlayer -import ru.dbotthepony.mc.otm.core.collect.filter -import ru.dbotthepony.mc.otm.core.collect.toImmutableList +import ru.dbotthepony.kommons.collect.filter import java.util.* import java.util.function.Predicate @@ -46,9 +45,9 @@ abstract class MCriterionTrigger.AbstractInstance>(val val context = EntityPredicate.createContext(player, player) - listeners.iterator() + listeners.stream() .filter { predicate.test(it.trigger) && it.trigger.playerPredicate.map { it.matches(context) }.orElse(true) } - .toImmutableList() + .toList() .forEach { it.run(advancements) } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MatteryInventoryChangeTrigger.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MatteryInventoryChangeTrigger.kt index 9170b5d7f..68ce0c16f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MatteryInventoryChangeTrigger.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MatteryInventoryChangeTrigger.kt @@ -17,7 +17,7 @@ import net.minecraft.world.item.ItemStack import ru.dbotthepony.mc.otm.player.matteryPlayer import ru.dbotthepony.mc.otm.container.get import ru.dbotthepony.mc.otm.container.util.iterator -import ru.dbotthepony.mc.otm.core.isNotEmpty +import ru.dbotthepony.mc.otm.util.isNotEmpty import java.util.stream.Stream private typealias TriggerSet = ObjectOpenHashSet> diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/NanobotsArmorTrigger.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/NanobotsArmorTrigger.kt index 812e32188..e2be4eb79 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/NanobotsArmorTrigger.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/NanobotsArmorTrigger.kt @@ -6,7 +6,7 @@ import net.minecraft.advancements.critereon.ContextAwarePredicate import net.minecraft.advancements.critereon.MinMaxBounds.Doubles import net.minecraft.server.level.ServerPlayer import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation import java.util.* object NanobotsArmorTrigger : MCriterionTrigger(ResourceLocation(OverdriveThatMatters.MOD_ID, "nanobots_armor")) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/SimpleTriggers.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/SimpleTriggers.kt index 8ca0ee327..6e7e06071 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/SimpleTriggers.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/triggers/SimpleTriggers.kt @@ -1,7 +1,7 @@ package ru.dbotthepony.mc.otm.triggers import ru.dbotthepony.mc.otm.OverdriveThatMatters -import ru.dbotthepony.mc.otm.core.ResourceLocation +import ru.dbotthepony.mc.otm.util.ResourceLocation val BlackHoleTrigger = SingletonTrigger(ResourceLocation(OverdriveThatMatters.MOD_ID, "black_hole_pull")) val FallDampenersSaveTrigger = SingletonTrigger(ResourceLocation(OverdriveThatMatters.MOD_ID, "fall_dampeners_save")) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/AtomicallyInvalidatedLazy.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/AtomicallyInvalidatedLazy.kt similarity index 91% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/AtomicallyInvalidatedLazy.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/AtomicallyInvalidatedLazy.kt index d8c7c0593..1b499570b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/AtomicallyInvalidatedLazy.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/AtomicallyInvalidatedLazy.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.locks.ReentrantLock @@ -7,7 +7,8 @@ import java.util.function.IntSupplier /** * If synchronization is not required, [CounterInvalidatedLazy] should be used instead. */ -class AtomicallyInvalidatedLazy(private val invalidator: IntSupplier, private val initializer: () -> V) : InvalidableLazy { +class AtomicallyInvalidatedLazy(private val invalidator: IntSupplier, private val initializer: () -> V) : + InvalidableLazy { constructor(invalidator: AtomicInteger, initializer: () -> V) : this(invalidator::get, initializer) @Volatile diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/BinaryJson.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/BinaryJson.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/BinaryJson.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/BinaryJson.kt index bd2ae665c..bb2aa939d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/BinaryJson.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/BinaryJson.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import com.google.common.collect.ImmutableList import com.google.gson.JsonArray @@ -8,8 +8,7 @@ import com.google.gson.JsonObject import com.google.gson.JsonParseException import com.google.gson.JsonPrimitive import com.google.gson.JsonSyntaxException -import net.minecraft.nbt.NbtAccounter -import ru.dbotthepony.mc.otm.core.collect.stream +import ru.dbotthepony.mc.otm.util.collect.stream import java.io.InputStream import java.io.OutputStream import java.util.function.Predicate @@ -182,7 +181,8 @@ private enum class BinaryElementType(private val predicate: Predicate = ImmutableList.of( NULL, DOUBLE, BOOLEAN, INT, STRING, OBJECT, - DOUBLE_ARRAY, INT_ARRAY, BOOLEAN_ARRAY, ARRAY) + DOUBLE_ARRAY, INT_ARRAY, BOOLEAN_ARRAY, ARRAY + ) } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/BlockLootTableHolder.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/BlockLootTableHolder.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/BlockLootTableHolder.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/BlockLootTableHolder.kt index af2fca337..70d731501 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/BlockLootTableHolder.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/BlockLootTableHolder.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import net.minecraft.advancements.CriteriaTriggers import net.minecraft.core.BlockPos @@ -24,8 +24,6 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams import net.minecraft.world.phys.Vec3 import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity.Companion.LOOT_TABLE_KEY import ru.dbotthepony.mc.otm.block.entity.MatteryBlockEntity.Companion.LOOT_TABLE_SEED_KEY -import ru.dbotthepony.mc.otm.core.getBlockEntityNow -import ru.dbotthepony.mc.otm.core.otmRandom class BlockLootTableHolder(private val listener: Runnable = Runnable { }) { private var ignoreListener = false diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/ByteBufExtensions.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/ByteBufExtensions.kt similarity index 89% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/ByteBufExtensions.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/ByteBufExtensions.kt index de70fb81c..3af54e64d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/ByteBufExtensions.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/ByteBufExtensions.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import com.google.gson.JsonElement import com.mojang.serialization.Codec @@ -8,10 +8,7 @@ import io.netty.buffer.ByteBufInputStream import io.netty.buffer.ByteBufOutputStream import io.netty.handler.codec.DecoderException import io.netty.handler.codec.EncoderException -import net.minecraft.nbt.NbtAccounter import net.minecraft.network.FriendlyByteBuf -import net.minecraft.network.RegistryFriendlyByteBuf -import net.minecraft.network.chat.Component fun FriendlyByteBuf.readBinaryJson(): JsonElement { return ByteBufInputStream(this).readBinaryJson() diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/CapabilityListIterator.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/CapabilityListIterator.kt similarity index 88% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/CapabilityListIterator.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/CapabilityListIterator.kt index 086c911b7..eae0f56c9 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/CapabilityListIterator.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/CapabilityListIterator.kt @@ -1,9 +1,7 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util -import it.unimi.dsi.fastutil.objects.ObjectArrayList import net.minecraft.util.RandomSource -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.shuffle +import ru.dbotthepony.mc.otm.util.math.Decimal import java.util.function.Supplier class CapabilityListIterator( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/nbt/CompoundTagDelegates.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/CompoundTagDelegates.kt similarity index 98% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/nbt/CompoundTagDelegates.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/CompoundTagDelegates.kt index 7b6161557..6c60b8999 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/nbt/CompoundTagDelegates.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/CompoundTagDelegates.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.nbt +package ru.dbotthepony.mc.otm.util import net.minecraft.nbt.CompoundTag import java.util.* diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/nbt/CompoundTagExt.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/CompoundTagExt.kt similarity index 91% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/nbt/CompoundTagExt.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/CompoundTagExt.kt index eaec30837..72a10855b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/nbt/CompoundTagExt.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/CompoundTagExt.kt @@ -1,28 +1,19 @@ -package ru.dbotthepony.mc.otm.core.nbt +package ru.dbotthepony.mc.otm.util import com.google.gson.JsonElement import it.unimi.dsi.fastutil.io.FastByteArrayInputStream import it.unimi.dsi.fastutil.io.FastByteArrayOutputStream import net.minecraft.nbt.ByteArrayTag -import net.minecraft.nbt.ByteTag import net.minecraft.nbt.CompoundTag -import net.minecraft.nbt.DoubleTag -import net.minecraft.nbt.FloatTag import net.minecraft.nbt.IntArrayTag -import net.minecraft.nbt.IntTag import net.minecraft.nbt.ListTag import net.minecraft.nbt.LongArrayTag -import net.minecraft.nbt.LongTag import net.minecraft.nbt.NbtAccounter import net.minecraft.nbt.NbtUtils import net.minecraft.nbt.NumericTag -import net.minecraft.nbt.ShortTag import net.minecraft.nbt.StringTag import net.minecraft.nbt.Tag -import net.minecraft.world.item.ItemStack -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.util.readBinaryJson -import ru.dbotthepony.mc.otm.core.util.writeBinaryJson +import ru.dbotthepony.mc.otm.util.math.Decimal import java.util.UUID operator fun CompoundTag.set(index: String, value: Tag) = put(index, value) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/CounterInvalidatedLazy.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/CounterInvalidatedLazy.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/CounterInvalidatedLazy.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/CounterInvalidatedLazy.kt index 908cfaaf6..d2e0bdc53 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/CounterInvalidatedLazy.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/CounterInvalidatedLazy.kt @@ -1,7 +1,6 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import java.util.concurrent.atomic.AtomicInteger -import java.util.function.IntConsumer import java.util.function.IntSupplier /** @@ -31,7 +30,8 @@ fun countingLazy(invalidator: AtomicInteger, initializer: () -> V): Invalida * * For synchronized use case, [AtomicallyInvalidatedLazy] should be used */ -class CounterInvalidatedLazy(private val invalidator: IntSupplier, private val initializer: () -> V) : InvalidableLazy { +class CounterInvalidatedLazy(private val invalidator: IntSupplier, private val initializer: () -> V) : + InvalidableLazy { constructor(invalidator: AtomicInteger, initializer: () -> V) : this(invalidator::get, initializer) private var thisCounter = -1 diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/LevelExt.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/EntityUtils.kt similarity index 91% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/LevelExt.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/EntityUtils.kt index 380041135..e5dcefb2a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/LevelExt.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/EntityUtils.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core +package ru.dbotthepony.mc.otm.util import net.minecraft.sounds.SoundEvents import net.minecraft.sounds.SoundSource @@ -6,13 +6,12 @@ import net.minecraft.world.entity.Entity import net.minecraft.world.entity.player.Player import net.minecraft.world.level.Level import net.minecraft.world.phys.AABB -import ru.dbotthepony.mc.otm.core.math.Vector -import ru.dbotthepony.mc.otm.core.math.component1 -import ru.dbotthepony.mc.otm.core.math.component2 -import ru.dbotthepony.mc.otm.core.math.component3 -import ru.dbotthepony.mc.otm.core.math.minus -import ru.dbotthepony.mc.otm.core.math.plus -import java.util.LinkedList +import ru.dbotthepony.mc.otm.util.math.Vector +import ru.dbotthepony.mc.otm.util.math.component1 +import ru.dbotthepony.mc.otm.util.math.component2 +import ru.dbotthepony.mc.otm.util.math.component3 +import ru.dbotthepony.mc.otm.util.math.minus +import ru.dbotthepony.mc.otm.util.math.plus import java.util.function.Predicate import kotlin.math.pow diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/ExperienceUtils.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/ExperienceUtils.kt similarity index 87% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/ExperienceUtils.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/ExperienceUtils.kt index 5d979d0f4..23b93604c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/ExperienceUtils.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/ExperienceUtils.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import it.unimi.dsi.fastutil.longs.LongArrayList import net.minecraft.world.entity.player.Player @@ -49,7 +49,10 @@ fun getTotalXpRequiredForLevel(level: Int): Long { if (totalLevelsTable.size <= level) { synchronized(totalLevelsTable) { while (totalLevelsTable.size <= level) { - totalLevelsTable.add(totalLevelsTable.getLong(totalLevelsTable.size - 1) + getXpRequiredForLevelUp(totalLevelsTable.size - 1)) + totalLevelsTable.add( + totalLevelsTable.getLong(totalLevelsTable.size - 1) + getXpRequiredForLevelUp( + totalLevelsTable.size - 1) + ) } } } @@ -66,7 +69,10 @@ fun getLevelFromXp(experience: Long): Int { if (totalLevelsTable.getLong(totalLevelsTable.size - 1) < experience) { synchronized(totalLevelsTable) { while (totalLevelsTable.getLong(totalLevelsTable.size - 1) < experience) { - totalLevelsTable.add(totalLevelsTable.getLong(totalLevelsTable.size - 1) + getXpRequiredForLevelUp(totalLevelsTable.size - 1)) + totalLevelsTable.add( + totalLevelsTable.getLong(totalLevelsTable.size - 1) + getXpRequiredForLevelUp( + totalLevelsTable.size - 1) + ) } } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/FloatSupplier.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/FloatSupplier.kt similarity index 62% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/FloatSupplier.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/FloatSupplier.kt index 79c5bdd98..f6f505a56 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/FloatSupplier.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/FloatSupplier.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core +package ru.dbotthepony.mc.otm.util fun interface FloatSupplier { fun getAsFloat(): Float diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/Formatting.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/Formatting.kt similarity index 93% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/Formatting.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/Formatting.kt index 411b081c6..ad4c70945 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/Formatting.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/Formatting.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import com.mojang.datafixers.util.Either import it.unimi.dsi.fastutil.chars.CharArrayList @@ -13,12 +13,10 @@ import ru.dbotthepony.mc.otm.THREAD_LOCAL_RANDOM import ru.dbotthepony.mc.otm.client.render.ChartLevelLabels import ru.dbotthepony.mc.otm.client.render.ChartTooltipElement import ru.dbotthepony.mc.otm.config.ClientConfig -import ru.dbotthepony.mc.otm.core.TextComponent -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.clusterize -import ru.dbotthepony.mc.otm.core.math.isNegative -import ru.dbotthepony.mc.otm.core.math.isZero +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.math.clusterize +import ru.dbotthepony.mc.otm.util.math.isNegative +import ru.dbotthepony.mc.otm.util.math.isZero import ru.dbotthepony.mc.otm.menu.widget.IProfiledLevelGaugeWidget import java.math.BigInteger import java.util.function.BooleanSupplier @@ -214,15 +212,23 @@ fun Decimal.formatSiComponent(suffix: Any = "", decimalPlaces: Int = 3, formatAs return TranslatableComponent(prefix.neighbour(bias).formatLocaleKey, (this / prefix.decimal).toString(decimalPlaces), suffix) } -fun Int.formatPower(decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = formatSiComponent(TranslatableComponent("otm.gui.power.name"), decimalPlaces, formatAsReadable = formatAsReadable) -fun Int.formatFluid(decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = formatSiComponent(TranslatableComponent("otm.gui.fluid.name"), decimalPlaces, formatAsReadable = formatAsReadable, bias = -1) -fun Decimal.formatPower(decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = formatSiComponent(TranslatableComponent("otm.gui.power.name"), decimalPlaces, formatAsReadable = formatAsReadable) -fun Decimal.formatMatter(decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = formatSiComponent(TranslatableComponent("otm.gui.matter.name"), decimalPlaces, formatAsReadable = formatAsReadable) -fun Decimal.formatMatterFull(decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = TranslatableComponent("otm.gui.matter.format", formatSiComponent(TranslatableComponent("otm.gui.matter.name"), decimalPlaces, formatAsReadable = formatAsReadable)) +fun Int.formatPower(decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = formatSiComponent( + TranslatableComponent("otm.gui.power.name"), decimalPlaces, formatAsReadable = formatAsReadable) +fun Int.formatFluid(decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = formatSiComponent( + TranslatableComponent("otm.gui.fluid.name"), decimalPlaces, formatAsReadable = formatAsReadable, bias = -1) +fun Decimal.formatPower(decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = formatSiComponent( + TranslatableComponent("otm.gui.power.name"), decimalPlaces, formatAsReadable = formatAsReadable) +fun Decimal.formatMatter(decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = formatSiComponent( + TranslatableComponent("otm.gui.matter.name"), decimalPlaces, formatAsReadable = formatAsReadable) +fun Decimal.formatMatterFull(decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = TranslatableComponent("otm.gui.matter.format", formatSiComponent( + TranslatableComponent("otm.gui.matter.name"), decimalPlaces, formatAsReadable = formatAsReadable)) -fun BigInteger.formatPower(decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = formatSiComponent(TranslatableComponent("otm.gui.power.name"), decimalPlaces, formatAsReadable = formatAsReadable) -fun BigInteger.formatMatter(decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = formatSiComponent(TranslatableComponent("otm.gui.matter.name"), decimalPlaces, formatAsReadable = formatAsReadable) -fun BigInteger.formatMatterFull(decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = TranslatableComponent("otm.gui.matter.format", formatSiComponent(TranslatableComponent("otm.gui.matter.name"), decimalPlaces, formatAsReadable = formatAsReadable)) +fun BigInteger.formatPower(decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = formatSiComponent( + TranslatableComponent("otm.gui.power.name"), decimalPlaces, formatAsReadable = formatAsReadable) +fun BigInteger.formatMatter(decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = formatSiComponent( + TranslatableComponent("otm.gui.matter.name"), decimalPlaces, formatAsReadable = formatAsReadable) +fun BigInteger.formatMatterFull(decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = TranslatableComponent("otm.gui.matter.format", formatSiComponent( + TranslatableComponent("otm.gui.matter.name"), decimalPlaces, formatAsReadable = formatAsReadable)) fun formatPowerLevel(a: Decimal, b: Decimal, decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = TranslatableComponent("otm.gui.level", a.formatPower(decimalPlaces, formatAsReadable = formatAsReadable), b.formatPower(decimalPlaces, formatAsReadable = formatAsReadable)) fun formatMatterLevel(a: Decimal, b: Decimal, decimalPlaces: Int = 3, formatAsReadable: BooleanSupplier = never) = TranslatableComponent("otm.gui.level", a.formatMatter(decimalPlaces, formatAsReadable = formatAsReadable), b.formatMatter(decimalPlaces, formatAsReadable = formatAsReadable)) @@ -555,12 +561,14 @@ private fun formatHistoryChart( val deltaColor = if (delta.isZero) ChatFormatting.GRAY else if (delta.isPositive) ChatFormatting.DARK_GREEN else ChatFormatting.DARK_RED - result.add(Either.left(TranslatableComponent( + result.add(Either.left( + TranslatableComponent( "otm.gui.diff", delta.formatSiComponent(suffix, decimals, formatAsReadable = verbose, bias = bias).copy().withStyle(deltaColor), incoming.formatSiComponent(suffix, decimals, formatAsReadable = verbose, bias = bias).copy().withStyle(ChatFormatting.DARK_GREEN), outgoing.formatSiComponent(suffix, decimals, formatAsReadable = verbose, bias = bias).copy().withStyle(ChatFormatting.DARK_RED), - ))) + ) + )) } run { @@ -570,12 +578,14 @@ private fun formatHistoryChart( val deltaColor = if (delta.isZero) ChatFormatting.GRAY else if (delta.isPositive) ChatFormatting.DARK_GREEN else ChatFormatting.DARK_RED - result.add(Either.left(TranslatableComponent( + result.add(Either.left( + TranslatableComponent( "otm.gui.diff", delta.formatSiComponent(suffix, decimals, formatAsReadable = verbose, bias = bias).copy().withStyle(deltaColor), incoming.formatSiComponent(suffix, decimals, formatAsReadable = verbose, bias = bias).copy().withStyle(ChatFormatting.DARK_GREEN), outgoing.formatSiComponent(suffix, decimals, formatAsReadable = verbose, bias = bias).copy().withStyle(ChatFormatting.DARK_RED), - ))) + ) + )) } result.add(Either.right(ChartTooltipElement(charts, if (verbose.asBoolean) 200f else 100f, if (verbose.asBoolean) 120f else 60f, levelLabels = labels))) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/FriendlyStreams.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/FriendlyStreams.kt similarity index 68% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/FriendlyStreams.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/FriendlyStreams.kt index a97d9f517..140bcf746 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/FriendlyStreams.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/FriendlyStreams.kt @@ -1,81 +1,26 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import io.netty.handler.codec.EncoderException +import net.minecraft.core.IdMap import net.minecraft.core.registries.BuiltInRegistries import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.NbtAccounter import net.minecraft.nbt.NbtIo import net.minecraft.network.FriendlyByteBuf +import net.minecraft.network.RegistryFriendlyByteBuf import net.minecraft.network.chat.Component -import net.minecraft.resources.ResourceLocation +import net.minecraft.network.chat.ComponentSerialization import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack -import net.minecraft.world.level.material.Fluid -import net.neoforged.neoforge.fluids.FluidStack -import ru.dbotthepony.mc.otm.core.math.Decimal +import net.minecraft.world.level.block.Block +import net.minecraft.world.level.block.state.BlockState +import ru.dbotthepony.mc.otm.util.math.Decimal import java.io.* import java.math.BigDecimal import java.math.BigInteger +import kotlin.enums.EnumEntries import kotlin.math.absoluteValue -// But seriously, Mojang, why would you need to derive from ByteBuf directly, when you can implement -// your own InputStream and OutputStream, since ByteBuf is meant to be operated on most time like a stream anyway? - -// netty ByteBuf -> netty ByteBufInputStream -> Minecraft FriendlyInputStream - -fun OutputStream.writeNbt(value: CompoundTag) { - try { - NbtIo.write(value, if (this is DataOutputStream) this else DataOutputStream(this)) - } catch (ioexception: IOException) { - throw EncoderException(ioexception) - } -} - -fun InputStream.readNbt(): CompoundTag { - return try { - NbtIo.read(if (this is DataInputStream) this else DataInputStream(this)) - } catch (ioexception: IOException) { - throw EncoderException(ioexception) - } -} - -fun OutputStream.writeBigDecimal(value: BigDecimal) { - writeInt(value.scale()) - val bytes = value.unscaledValue().toByteArray() - writeVarIntLE(bytes.size) - write(bytes) -} - -fun InputStream.readBigDecimal(): BigDecimal { - val scale = readInt() - val size = readVarIntLE() - require(size >= 0) { "Negative payload size: $size" } - val bytes = ByteArray(size) - read(bytes) - return BigDecimal(BigInteger(bytes), scale) -} - -fun S.writeCollection(collection: Collection, writer: S.(V) -> Unit) { - writeVarIntLE(collection.size) - - for (value in collection) { - writer(this, value) - } -} - -fun > S.readCollection(reader: S.() -> V, factory: (Int) -> C): C { - val size = readVarIntLE() - val collection = factory.invoke(size) - - for (i in 0 until size) { - collection.add(reader(this)) - } - - return collection -} - -fun S.readCollection(reader: S.() -> V) = readCollection(reader, ::ArrayList) - fun OutputStream.writeInt(value: Int) { if (this is DataOutput) { writeInt(value) @@ -257,3 +202,70 @@ fun OutputStream.writeDecimal(value: Decimal) { writeVarIntLE(bytes.size) write(bytes) } + +fun FriendlyByteBuf.writeType(registry: IdMap, value: T) { + writeInt(registry.getId(value)) +} + +fun FriendlyByteBuf.writeBlockType(value: Block) { + writeType(BuiltInRegistries.BLOCK, value) +} + +fun FriendlyByteBuf.writeBlockState(value: BlockState) { + writeVarInt(Block.BLOCK_STATE_REGISTRY.getIdOrThrow(value)) +} + +fun FriendlyByteBuf.writeItemType(value: Item) { + writeType(BuiltInRegistries.ITEM, value) +} + +fun RegistryFriendlyByteBuf.writeItem(value: ItemStack) { + ItemStack.OPTIONAL_STREAM_CODEC.encode(this, value) +} + +fun RegistryFriendlyByteBuf.writeComponent(value: Component) { + ComponentSerialization.STREAM_CODEC.encode(this, value) +} + +fun OutputStream.writeItemType(value: Item) { + writeVarIntLE(BuiltInRegistries.ITEM.getId(value)) +} + +fun > FriendlyByteBuf.readEnum(entries: EnumEntries): E { + return entries[readVarInt()] +} + +fun FriendlyByteBuf.readType(registry: IdMap): T { + val id = readInt() + return registry.byId(id) ?: throw NoSuchElementException("No such entry with ID $id") +} + +fun FriendlyByteBuf.readBlockType(): Block { + return readType(BuiltInRegistries.BLOCK) +} + +fun FriendlyByteBuf.readBlockState(): BlockState { + return Block.BLOCK_STATE_REGISTRY.byIdOrThrow(readVarInt()) +} + +fun FriendlyByteBuf.readItemType(): Item { + return readType(BuiltInRegistries.ITEM) +} + +fun RegistryFriendlyByteBuf.readItem(): ItemStack { + return ItemStack.OPTIONAL_STREAM_CODEC.decode(this) +} + +fun RegistryFriendlyByteBuf.readComponent(): Component { + return ComponentSerialization.STREAM_CODEC.decode(this) +} + +fun InputStream.readItemType(): Item { + return BuiltInRegistries.ITEM.byId(readVarIntLE()) +} + +fun FriendlyByteBuf.writeBigInteger(value: BigInteger) { + writeByteArray(value.toByteArray()) +} + +fun FriendlyByteBuf.readBigInteger(byteLimit: Int = 128) = BigInteger(readByteArray(byteLimit)) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/GJRAND64RandomSource.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/GJRAND64RandomSource.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/GJRAND64RandomSource.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/GJRAND64RandomSource.kt index f26a4aaae..3bc28242d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/GJRAND64RandomSource.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/GJRAND64RandomSource.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import net.minecraft.util.Mth import net.minecraft.util.RandomSource diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/HashedWeakReference.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/HashedWeakReference.kt similarity index 93% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/HashedWeakReference.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/HashedWeakReference.kt index e73cd4c45..8fabe13a6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/HashedWeakReference.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/HashedWeakReference.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import java.lang.ref.ReferenceQueue import java.lang.ref.WeakReference diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/IConditionalTickable.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/IConditionalTickable.kt similarity index 95% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/IConditionalTickable.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/IConditionalTickable.kt index f100b383f..a89acfc6f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/IConditionalTickable.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/IConditionalTickable.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import java.util.function.BooleanSupplier diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/IDAllocator.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/IDAllocator.kt similarity index 95% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/IDAllocator.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/IDAllocator.kt index c66de7b2f..9fa5b05ff 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/IDAllocator.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/IDAllocator.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core +package ru.dbotthepony.mc.otm.util import it.unimi.dsi.fastutil.ints.IntAVLTreeSet diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/IRandomSourceGenerator.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/IRandomSourceGenerator.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/IRandomSourceGenerator.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/IRandomSourceGenerator.kt index cd0fa1e47..f3dd168d9 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/IRandomSourceGenerator.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/IRandomSourceGenerator.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import net.minecraft.util.RandomSource import java.util.random.RandomGenerator diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/ITickable.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/ITickable.kt similarity index 81% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/ITickable.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/ITickable.kt index 97e828be0..796b7cc60 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/ITickable.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/ITickable.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util /** * Represents something that can tick without any additional context diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/IntCounter.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/IntCounter.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/IntCounter.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/IntCounter.kt index b9dab2547..ab0489331 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/IntCounter.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/IntCounter.kt @@ -1,9 +1,8 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import ru.dbotthepony.kommons.util.Listenable import java.util.function.BooleanSupplier import java.util.function.Consumer -import java.util.function.IntConsumer import java.util.function.IntSupplier class IntCounter : IntSupplier, Listenable { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/InvalidableLazy.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/InvalidableLazy.kt similarity index 93% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/InvalidableLazy.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/InvalidableLazy.kt index 4e93f08b0..55d6899c4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/InvalidableLazy.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/InvalidableLazy.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import ru.dbotthepony.kommons.util.KOptional diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/ItemSorter.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/ItemSorter.kt similarity index 91% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/ItemSorter.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/ItemSorter.kt index a0e9ca6dd..4cec7ab5c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/ItemSorter.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/ItemSorter.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import it.unimi.dsi.fastutil.objects.Reference2IntFunction import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap @@ -8,12 +8,10 @@ import net.minecraft.world.item.CreativeModeTabs import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack import net.neoforged.neoforge.common.CreativeModeTabRegistry +import ru.dbotthepony.kommons.util.nullsFirst +import ru.dbotthepony.kommons.util.nullsLast import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.render.IGUIRenderable -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.nullsFirst -import ru.dbotthepony.mc.otm.core.nullsLast -import ru.dbotthepony.mc.otm.core.registryName import ru.dbotthepony.mc.otm.matter.MatterManager import ru.dbotthepony.mc.otm.storage.ItemStorageStack import ru.dbotthepony.mc.otm.client.render.Widgets18 @@ -160,8 +158,14 @@ enum class ItemSorter(comparator: Comparator, private val sTitle: Componen NAME(ItemLocalizedNameComparator.thenComparing(CreativeMenuItemComparator), TranslatableComponent("otm.gui.sorting.name"), lazy { Widgets18.SORT_ALPHABET }), ID(ItemIDComparator.thenComparing(CreativeMenuItemComparator), TranslatableComponent("otm.gui.sorting.id"), lazy { Widgets18.SORT_ID }), MOD(ItemModComparator.thenComparing(CreativeMenuItemComparator), TranslatableComponent("otm.gui.sorting.modid"), lazy { Widgets18.SORT_MODID }), - MATTER_VALUE(MatterValueComparator.thenComparing(MatterComplexityComparator).thenComparing(CreativeMenuItemComparator), TranslatableComponent("otm.gui.sorting.matter_value"), lazy { Widgets18.SORT_MATTER_VALUE }), - MATTER_COMPLEXITY(MatterComplexityComparator.thenComparing(MatterValueComparator).thenComparing(CreativeMenuItemComparator), TranslatableComponent("otm.gui.sorting.matter_complexity"), lazy { Widgets18.SORT_MATTER_COMPLEXITY }), + MATTER_VALUE( + MatterValueComparator.thenComparing(MatterComplexityComparator).thenComparing( + CreativeMenuItemComparator + ), TranslatableComponent("otm.gui.sorting.matter_value"), lazy { Widgets18.SORT_MATTER_VALUE }), + MATTER_COMPLEXITY( + MatterComplexityComparator.thenComparing(MatterValueComparator).thenComparing( + CreativeMenuItemComparator + ), TranslatableComponent("otm.gui.sorting.matter_complexity"), lazy { Widgets18.SORT_MATTER_COMPLEXITY }), ; val icon: IGUIRenderable by icon diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/util/LevelUtils.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/LevelUtils.kt new file mode 100644 index 000000000..fff8c4b32 --- /dev/null +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/LevelUtils.kt @@ -0,0 +1,73 @@ +package ru.dbotthepony.mc.otm.util + +import net.minecraft.core.BlockPos +import net.minecraft.core.SectionPos +import net.minecraft.util.RandomSource +import net.minecraft.world.level.ChunkPos +import net.minecraft.world.level.Level +import net.minecraft.world.level.LevelAccessor +import net.minecraft.world.level.block.Block +import net.minecraft.world.level.block.Blocks +import net.minecraft.world.level.block.entity.BlockEntity +import net.minecraft.world.level.block.state.BlockState +import net.minecraft.world.level.chunk.ChunkSource +import net.minecraft.world.level.chunk.LevelChunk + +fun LevelAccessor.getBlockStateNow(pos: BlockPos): BlockState { + return getBlockStateNowOrNull(pos) ?: Blocks.AIR.defaultBlockState() +} + +fun LevelAccessor.getBlockStateNowOrNull(pos: BlockPos): BlockState? { + return chunkSource.getChunkNow( + SectionPos.blockToSectionCoord(pos.x), + SectionPos.blockToSectionCoord(pos.z) + )?.getBlockState(pos) +} + +fun LevelAccessor.getBlockEntityNow(pos: BlockPos): BlockEntity? { + return chunkSource.getChunkNow( + SectionPos.blockToSectionCoord(pos.x), + SectionPos.blockToSectionCoord(pos.z) + )?.getBlockEntity(pos) +} + +fun ChunkSource.getChunkNow(pos: BlockPos): LevelChunk? { + return getChunkNow(SectionPos.blockToSectionCoord(pos.x), SectionPos.blockToSectionCoord(pos.z)) +} + +fun ChunkSource.getChunkNow(pos: ChunkPos): LevelChunk? { + return getChunkNow(pos.x, pos.z) +} + +interface IMatteryLevel { + val otmRandom: RandomSource? +} + +/** + * OTM provided [RandomSource], which has better statistical parameters + * + * Original Minecraft use LCG, which may show bad behavior when repeatedly sampled *a lot*, + * which is what [Level]'s random is used for. OTM provided PRNG should behave better in this scenario. + * + * The way OTM uses random generator in its code will quickly cause LCG used in Minecraft to show its bias + * because LCG in minecraft samples its highest 48 bits, which gives us at best 2^16 period in the lowest bit returned by LCG. + * Which it doesn't sound bad, it quickly causes RNG become biased the quicker/more it is sampled on each tick, especially considering + * some may use `level.random.nextInt(chance) == 0` to determine chance of something happening, + * which will get extremely biased on heavy RNG congested environment + * If we avoid sampling Level's generator this much, we won't suffer from bias in our own code, as well as avoid biasing other mods this much. + * + * The "2^16 period" problem is also might be the reason why Entities get their own instance of RandomSource, + * and Mob Goals use random exactly the way described above (`nextInt(chance)`), which can and will suffer + * from bias the moment mob exists in world for more than 2^16 ticks (but actual bias will happen sooner + * because RNG is not sampled only once per tick, obviously) + */ +val Level.otmRandom: RandomSource get() = (this as IMatteryLevel).otmRandom ?: random + +fun Level.gracefulBlockBreak(blockPos: BlockPos, block: BlockState = getBlockState(blockPos)) { + val tile = getBlockEntity(blockPos) + val state = block.fluidState.createLegacyBlock() + block.onRemove(this, blockPos, state, false) + Block.dropResources(block, this, blockPos, tile) + block.block.destroy(this, blockPos, block) + setBlock(blockPos, state, Block.UPDATE_ALL) +} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/LootTableUtils.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/LootTableUtils.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/LootTableUtils.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/LootTableUtils.kt index 8821690ee..a77bf82ce 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/LootTableUtils.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/LootTableUtils.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import it.unimi.dsi.fastutil.ints.IntArrayList import net.minecraft.util.Mth @@ -12,8 +12,6 @@ import org.apache.logging.log4j.LogManager import ru.dbotthepony.mc.otm.container.IEnhancedContainer import ru.dbotthepony.mc.otm.container.get import ru.dbotthepony.mc.otm.container.set -import ru.dbotthepony.mc.otm.core.isNotEmpty -import ru.dbotthepony.mc.otm.core.shuffle import java.util.stream.Collectors import java.util.stream.IntStream import kotlin.math.min diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/RandomUtils.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/RandomUtils.kt similarity index 98% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/RandomUtils.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/RandomUtils.kt index cf7da7c9a..b4a152927 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/RandomUtils.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/RandomUtils.kt @@ -1,9 +1,9 @@ -package ru.dbotthepony.mc.otm.core +package ru.dbotthepony.mc.otm.util import it.unimi.dsi.fastutil.ints.IntList import net.minecraft.Util import net.minecraft.util.RandomSource -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import java.math.BigInteger import java.util.* import java.util.random.RandomGenerator diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/Savetables.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/Savetables.kt similarity index 98% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/Savetables.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/Savetables.kt index 9f2e734b6..ffea92c63 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/Savetables.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/Savetables.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import com.google.common.collect.ImmutableList import com.mojang.serialization.Codec @@ -18,12 +18,10 @@ import net.minecraft.nbt.Tag import net.minecraft.resources.ResourceLocation import net.neoforged.neoforge.common.util.INBTSerializable import org.apache.logging.log4j.LogManager +import ru.dbotthepony.kommons.guava.immutableList import ru.dbotthepony.kommons.util.Delegate -import ru.dbotthepony.mc.otm.core.get -import ru.dbotthepony.mc.otm.core.immutableList -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.Vector -import ru.dbotthepony.mc.otm.core.nbt.set +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Vector import java.util.function.Supplier import kotlin.jvm.optionals.getOrNull import kotlin.reflect.KMutableProperty0 @@ -303,7 +301,8 @@ class Savetables : INBTSerializable { } } - inner class Stateful(private val prop: Supplier, override val name: String, override val type: Class) : Entry { + inner class Stateful(private val prop: Supplier, override val name: String, override val type: Class) : + Entry { constructor(field: KProperty0, name: String = field.name, type: Class) : this(field::get, name, type) init { @@ -349,7 +348,8 @@ class Savetables : INBTSerializable { } } - inner class Stateless(private val prop: Delegate, override val name: String, override val type: Class) : Entry { + inner class Stateless(private val prop: Delegate, override val name: String, override val type: Class) : + Entry { constructor(field: KMutableProperty0, name: String = field.name, type: Class) : this(Delegate.Of(field), name, type) init { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/SiPrefix.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/SiPrefix.kt similarity index 95% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/SiPrefix.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/SiPrefix.kt index 7f4507279..421a457c8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/SiPrefix.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/SiPrefix.kt @@ -1,10 +1,9 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import com.google.common.collect.ImmutableList import net.minecraft.network.chat.Component -import ru.dbotthepony.mc.otm.core.TranslatableComponent -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.math.isZero +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.math.isZero import java.math.BigInteger import kotlin.math.absoluteValue diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/TickList.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/TickList.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/TickList.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/TickList.kt index 3077e2350..c7f9304b1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/TickList.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/TickList.kt @@ -1,6 +1,5 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util -import it.unimi.dsi.fastutil.objects.ObjectArrayList import it.unimi.dsi.fastutil.objects.ObjectArraySet import org.apache.logging.log4j.LogManager import java.util.* diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/TooltipList.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/TooltipList.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/TooltipList.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/TooltipList.kt index 0ab1d1033..5a56a4a87 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/TooltipList.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/TooltipList.kt @@ -1,12 +1,10 @@ -package ru.dbotthepony.mc.otm.core +package ru.dbotthepony.mc.otm.util import net.minecraft.ChatFormatting -import net.minecraft.core.HolderLookup import net.minecraft.core.component.DataComponents import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.Tag import net.minecraft.network.chat.Component -import net.minecraft.world.item.BlockItem import net.minecraft.world.item.DyeColor import net.minecraft.world.item.Item.TooltipContext import net.minecraft.world.item.ItemStack @@ -24,11 +22,7 @@ import ru.dbotthepony.mc.otm.client.isShiftDown import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.config.ClientConfig import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.nbt.map -import ru.dbotthepony.mc.otm.core.nbt.mapPresent -import ru.dbotthepony.mc.otm.core.util.formatMatter -import ru.dbotthepony.mc.otm.core.util.formatPower +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.runIfClient class TooltipList { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/UnOverengineering.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/UnOverengineering.kt similarity index 91% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/UnOverengineering.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/UnOverengineering.kt index 075efdc25..fae55621f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/UnOverengineering.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/UnOverengineering.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core +package ru.dbotthepony.mc.otm.util import com.google.gson.JsonElement import com.google.gson.JsonSyntaxException @@ -19,7 +19,6 @@ import net.minecraft.network.chat.Component import net.minecraft.network.chat.MutableComponent import net.minecraft.network.chat.contents.PlainTextContents import net.minecraft.network.chat.contents.TranslatableContents -import net.minecraft.network.chat.contents.TranslatableContents.isAllowedPrimitiveArgument import net.minecraft.resources.ResourceKey import net.minecraft.resources.ResourceLocation import net.minecraft.sounds.SoundEvent @@ -33,8 +32,8 @@ import net.minecraft.world.level.material.Fluid import net.minecraft.world.phys.AABB import net.minecraft.world.phys.Vec3 import net.neoforged.neoforge.capabilities.BlockCapability -import ru.dbotthepony.mc.otm.core.util.readBinaryJson -import ru.dbotthepony.mc.otm.core.util.writeBinaryJson +import ru.dbotthepony.mc.otm.util.readBinaryJson +import ru.dbotthepony.mc.otm.util.writeBinaryJson import kotlin.jvm.optionals.getOrNull // because doing it inline is ugly @@ -81,11 +80,21 @@ fun Codec.fromNetwork(buff: FriendlyByteBuf): V { // 1.19 being 1.19 fun TranslatableComponent(key: String, vararg values: Any): MutableComponent { // thanks NeoFrogge NeoForge NeonForges - return MutableComponent.create(TranslatableContents(key, null, values.map { if (it !is Component && !isAllowedPrimitiveArgument(it)) it.toString() else it }.toTypedArray())) + return MutableComponent.create( + TranslatableContents( + key, + null, + values.map { + if (it !is Component && !TranslatableContents.isAllowedPrimitiveArgument( + it + ) + ) it.toString() else it + }.toTypedArray() + ) + ) } fun TextComponent(value: String): MutableComponent = MutableComponent.create(PlainTextContents.create(value)) - fun Registry.getKeyNullable(value: T): ResourceLocation? { val key = getResourceKey(value) @@ -108,14 +117,13 @@ inline val DamageSource.isFall get() = `is`(DamageTypeTags.IS_FALL) inline val DamageSource.isBypassArmor get() = `is`(DamageTypeTags.BYPASSES_ARMOR) inline val DamageSource.isExplosion get() = `is`(DamageTypeTags.IS_EXPLOSION) inline val DamageSource.isFire get() = `is`(DamageTypeTags.IS_FIRE) - fun RegistryAccess.damageType(key: ResourceKey): Holder { return registryOrThrow(Registries.DAMAGE_TYPE).getHolderOrThrow(key) } // 1.21 :help_me: -fun ResourceLocation(namespace: String, path: String): ResourceLocation = ResourceLocation.fromNamespaceAndPath(namespace, path) - +fun ResourceLocation(namespace: String, path: String): ResourceLocation = + ResourceLocation.fromNamespaceAndPath(namespace, path) fun DataResult.mapOrNull(map: (IN) -> OUT): OUT? { return result().map(map).orElse(null) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/util/Utils.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/Utils.kt new file mode 100644 index 000000000..4cae7e01d --- /dev/null +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/Utils.kt @@ -0,0 +1,206 @@ + +@file:Suppress("unused") + +package ru.dbotthepony.mc.otm.util + +import com.github.benmanes.caffeine.cache.Cache +import com.github.benmanes.caffeine.cache.Caffeine +import com.github.benmanes.caffeine.cache.Scheduler +import com.google.common.collect.ImmutableList +import com.google.gson.JsonElement +import com.google.gson.JsonObject +import com.google.gson.JsonPrimitive +import net.minecraft.Util +import net.minecraft.core.BlockPos +import net.minecraft.core.Holder +import net.minecraft.core.HolderLookup +import net.minecraft.core.Registry +import net.minecraft.network.FriendlyByteBuf +import net.minecraft.network.chat.ComponentContents +import net.minecraft.network.chat.contents.TranslatableContents +import net.minecraft.resources.ResourceKey +import net.minecraft.resources.ResourceLocation +import net.minecraft.tags.TagKey +import net.minecraft.world.entity.Entity +import net.minecraft.world.item.ItemStack +import net.minecraft.world.item.component.ItemAttributeModifiers +import net.minecraft.world.item.crafting.CraftingInput +import net.minecraft.world.item.crafting.RecipeInput +import net.minecraft.world.level.BlockGetter +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.level.block.state.StateHolder +import net.minecraft.world.level.block.state.properties.Property +import net.minecraft.world.phys.Vec3 +import net.neoforged.neoforge.fluids.FluidStack +import net.neoforged.neoforge.items.IItemHandler +import ru.dbotthepony.mc.otm.util.math.BlockRotation +import ru.dbotthepony.mc.otm.util.math.BlockRotationFreedom +import ru.dbotthepony.mc.otm.util.math.Vector +import java.lang.ref.Reference +import java.math.BigInteger +import java.time.Duration +import java.util.* +import java.util.concurrent.Callable +import java.util.concurrent.Future +import java.util.function.Supplier +import java.util.stream.Stream +import java.util.stream.StreamSupport +import kotlin.jvm.optionals.getOrNull +import kotlin.reflect.KProperty + +operator fun RecipeInput.get(index: Int): ItemStack = getItem(index) +operator fun CraftingInput.get(x: Int, y: Int): ItemStack = getItem(x, y) + +operator fun CraftingInput.Positioned.get(x: Int, y: Int): ItemStack { + val actualX = x - left + val actualY = y - top + + if (actualX !in 0 until input.width() || actualY !in 0 until input.height()) + return ItemStack.EMPTY + + return input.getItem(actualX, actualY) +} + +fun Future.asSupplier(): Supplier { + return Supplier { get() } +} + +fun runInBackground(block: Callable): Future { + return Util.backgroundExecutor().submit(block) +} + +operator fun IItemHandler.get(index: Int): ItemStack = getStackInSlot(index) + +inline val FluidStack.isNotEmpty get() = !isEmpty +inline val ItemStack.isNotEmpty get() = !isEmpty + +inline var Entity.position: Vec3 + get() = position() + set(value) { setPos(value) } + +inline fun itemAttributes(builder: ItemAttributeModifiers.Builder.() -> Unit): ItemAttributeModifiers { + val value = ItemAttributeModifiers.builder() + builder(value) + return value.build() +} + +operator fun > StateHolder<*, *>.get(property: Property): T { + return getValue(property) +} + +operator fun StateHolder<*, *>.get(property: BlockRotationFreedom): BlockRotation { + return getValue(property.property) +} + +fun , T : Comparable> S.set(property: Property, value: T): S { + return setValue(property, value) as S +} + +operator fun (() -> R).getValue(thisRef: Any, property: KProperty<*>): R { + return invoke() +} + +fun BlockState.getExplosionResistance(level: BlockGetter, pos: BlockPos): Float { + return try { + getExplosionResistance(level, pos, null) + } catch (err: NullPointerException) { + block.explosionResistance + // Потому что возможно какой-либо мод не ожидает что Explosion == null + // особенно учитывая что интерфейс IForgeBlock не имеет @ParamsAreNonnullByDefault + // и аргумент не помечен как @Nullable + // тем самым имеет тип Explosion! который указывается как Explosion? .. Explosion!! + } catch (err: IllegalArgumentException) { + block.explosionResistance + } +} + +fun Entity.genericPositions(): Collection { + return listOf( + position, + eyePosition, + boundingBox.center + ) +} + +fun ResourceLocation.toUUID(): UUID { + return toString().toUUID() +} + +fun String.toUUID(): UUID { + return UUID.nameUUIDFromBytes(toByteArray(Charsets.UTF_8)) +} + +val ComponentContents.key: String + get() = (this as? TranslatableContents ?: throw ClassCastException("$this is not a TranslatableContents")).key + +fun > BlockState.getValueNullable(prop: Property): T? { + if (hasProperty(prop)) { + return getValue(prop) + } + + return null +} + +fun lazy2(a: () -> A, b: A.() -> B): Supplier { + val first = lazy(a) + return Supplier { b.invoke(first.value) } +} + +fun HolderLookup.Provider.lookupOrThrow(key: ResourceKey): Holder { + return lookupOrThrow(key.registryKey()).getOrThrow(key) +} + +fun Registry.getHolder(value: T): Holder? { + // this is so stupid + return getHolder(getResourceKey(value).getOrNull() ?: return null).getOrNull() +} + +fun Registry.getHolderOrThrow(value: T): Holder { + // this is so stupid + return getHolder(getResourceKey(value).orElseThrow()).orElseThrow() +} + +// forge registry functionality emulation on vanilla registry +fun Registry.getReverseTag(value: T): Stream> { + return getHolder(value)?.tags() ?: Stream.empty() +} + +// forge > neoforge moment +infix fun FluidStack.isSameFluidSameComponents(other: FluidStack): Boolean { + return FluidStack.isSameFluidSameComponents(this, other) +} + +infix fun FluidStack.isSameFluid(other: FluidStack): Boolean { + return FluidStack.isSameFluid(this, other) +} + +infix fun FluidStack.isNotSameFluidSameComponents(other: FluidStack): Boolean { + return !FluidStack.isSameFluidSameComponents(this, other) +} + +infix fun FluidStack.isNotSameFluid(other: FluidStack): Boolean { + return !FluidStack.isSameFluid(this, other) +} + +infix fun FluidStack.isSameAs(other: FluidStack): Boolean { + return FluidStack.isSameFluidSameComponents(this, other) && amount == other.amount +} + +infix fun FluidStack.isNotSameAs(other: FluidStack): Boolean { + return !FluidStack.isSameFluidSameComponents(this, other) && amount == other.amount +} + +fun SimpleCache(size: Long, freshness: Duration): Cache { + return Caffeine.newBuilder() + .maximumSize(size) + .scheduler(Scheduler.systemScheduler()) + .executor(Util.backgroundExecutor()) + .expireAfterWrite(freshness) + .build() +} + +fun SimpleCache(freshness: Duration): Cache { + return SimpleCache(16384L, freshness) +} diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/WriteOnce.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/WriteOnce.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/util/WriteOnce.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/WriteOnce.kt index 7f2148bdf..ee550fe7e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/WriteOnce.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/WriteOnce.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.util +package ru.dbotthepony.mc.otm.util import ru.dbotthepony.kommons.util.KOptional import kotlin.properties.ReadWriteProperty diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/chart/AbstractCombinedHistoryChart.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/chart/AbstractCombinedHistoryChart.kt similarity index 90% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/chart/AbstractCombinedHistoryChart.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/chart/AbstractCombinedHistoryChart.kt index 75039e9bf..1ccc5a547 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/chart/AbstractCombinedHistoryChart.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/chart/AbstractCombinedHistoryChart.kt @@ -1,12 +1,12 @@ -package ru.dbotthepony.mc.otm.core.chart +package ru.dbotthepony.mc.otm.util.chart import it.unimi.dsi.fastutil.objects.ObjectIterators import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet import net.minecraft.network.RegistryFriendlyByteBuf -import ru.dbotthepony.mc.otm.core.collect.filter -import ru.dbotthepony.mc.otm.core.collect.map -import ru.dbotthepony.mc.otm.core.collect.toList -import ru.dbotthepony.mc.otm.core.util.ITickable +import ru.dbotthepony.kommons.collect.filter +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.kommons.collect.toList +import ru.dbotthepony.mc.otm.util.ITickable import ru.dbotthepony.mc.otm.network.syncher.DynamicSynchableGroup import ru.dbotthepony.mc.otm.network.syncher.IRemoteState import ru.dbotthepony.mc.otm.network.syncher.ISynchable diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/chart/AbstractHistoryChart.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/chart/AbstractHistoryChart.kt similarity index 99% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/chart/AbstractHistoryChart.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/chart/AbstractHistoryChart.kt index 144a4370f..3cbcac7ab 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/chart/AbstractHistoryChart.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/chart/AbstractHistoryChart.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.chart +package ru.dbotthepony.mc.otm.util.chart import com.mojang.serialization.Codec import com.mojang.serialization.codecs.RecordCodecBuilder diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/chart/CombinedDecimalHistoryChart.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/chart/CombinedDecimalHistoryChart.kt similarity index 87% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/chart/CombinedDecimalHistoryChart.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/chart/CombinedDecimalHistoryChart.kt index e1f21760e..d9f70a3a2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/chart/CombinedDecimalHistoryChart.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/chart/CombinedDecimalHistoryChart.kt @@ -1,8 +1,8 @@ -package ru.dbotthepony.mc.otm.core.chart +package ru.dbotthepony.mc.otm.util.chart import net.minecraft.network.RegistryFriendlyByteBuf -import ru.dbotthepony.mc.otm.core.collect.reduce -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.kommons.collect.reduce +import ru.dbotthepony.mc.otm.util.math.Decimal import java.util.function.Supplier class CombinedDecimalHistoryChart( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/chart/DecimalHistoryChart.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/chart/DecimalHistoryChart.kt similarity index 87% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/chart/DecimalHistoryChart.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/chart/DecimalHistoryChart.kt index ef52060a5..85c50bcb3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/chart/DecimalHistoryChart.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/chart/DecimalHistoryChart.kt @@ -1,9 +1,9 @@ -package ru.dbotthepony.mc.otm.core.chart +package ru.dbotthepony.mc.otm.util.chart import com.mojang.serialization.Codec import net.minecraft.network.RegistryFriendlyByteBuf -import ru.dbotthepony.mc.otm.core.collect.reduce -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.kommons.collect.reduce +import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import ru.dbotthepony.mc.otm.network.MatteryStreamCodec diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/chart/IHistoryChart.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/chart/IHistoryChart.kt similarity index 80% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/chart/IHistoryChart.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/chart/IHistoryChart.kt index 7c766163f..fc3112a17 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/chart/IHistoryChart.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/chart/IHistoryChart.kt @@ -1,6 +1,6 @@ -package ru.dbotthepony.mc.otm.core.chart +package ru.dbotthepony.mc.otm.util.chart -import ru.dbotthepony.mc.otm.core.math.Cluster +import ru.dbotthepony.mc.otm.util.math.Cluster import java.util.random.RandomGenerator /** diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/AwareItemStack.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/AwareItemStack.kt similarity index 95% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/AwareItemStack.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/AwareItemStack.kt index a29c78778..364980e17 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/AwareItemStack.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/AwareItemStack.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.collect +package ru.dbotthepony.mc.otm.util.collect import net.minecraft.world.Container import net.minecraft.world.entity.player.Inventory @@ -8,7 +8,7 @@ import net.minecraft.world.item.enchantment.EnchantmentHelper import net.neoforged.neoforge.items.IItemHandler import ru.dbotthepony.mc.otm.container.get import ru.dbotthepony.mc.otm.container.set -import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.util.get /** * Allows to see the contents of container and extract the item from it diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ConditionalEnumSet.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ConditionalEnumSet.kt similarity index 90% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ConditionalEnumSet.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ConditionalEnumSet.kt index 9dbbf12ab..9a9f5ffee 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ConditionalEnumSet.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ConditionalEnumSet.kt @@ -1,5 +1,7 @@ -package ru.dbotthepony.mc.otm.core.collect +package ru.dbotthepony.mc.otm.util.collect +import ru.dbotthepony.kommons.collect.filter +import ru.dbotthepony.kommons.collect.map import java.util.EnumMap import java.util.function.BooleanSupplier import java.util.stream.Stream diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ConditionalSet.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ConditionalSet.kt similarity index 92% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ConditionalSet.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ConditionalSet.kt index 7b70a3f0a..1b41106f8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ConditionalSet.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ConditionalSet.kt @@ -1,6 +1,8 @@ -package ru.dbotthepony.mc.otm.core.collect +package ru.dbotthepony.mc.otm.util.collect import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap +import ru.dbotthepony.kommons.collect.filter +import ru.dbotthepony.kommons.collect.map import java.util.function.BooleanSupplier import java.util.stream.Stream diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ConditionalSupplierSet.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ConditionalSupplierSet.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ConditionalSupplierSet.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ConditionalSupplierSet.kt index 9e55865fd..526611917 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ConditionalSupplierSet.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ConditionalSupplierSet.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.collect +package ru.dbotthepony.mc.otm.util.collect class ConditionalSupplierSet : AbstractSet { // method without boxing diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/IntRange2Set.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/IntRange2Set.kt similarity index 98% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/IntRange2Set.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/IntRange2Set.kt index 7e1588613..1b80121d1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/IntRange2Set.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/IntRange2Set.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.collect +package ru.dbotthepony.mc.otm.util.collect import it.unimi.dsi.fastutil.HashCommon import it.unimi.dsi.fastutil.ints.IntBidirectionalIterator @@ -7,6 +7,7 @@ import it.unimi.dsi.fastutil.ints.IntComparator import it.unimi.dsi.fastutil.ints.IntIterators import it.unimi.dsi.fastutil.ints.IntSet import it.unimi.dsi.fastutil.ints.IntSortedSet +import ru.dbotthepony.kommons.collect.all class IntRange2Set private constructor(private val first: Int, private val last: Int) : IntSortedSet { constructor(range: IntRange) : this(range.first, range.last) { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/Iterables.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/Iterables.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/Iterables.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/Iterables.kt index 3b73cab8a..947651b0a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/Iterables.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/Iterables.kt @@ -1,10 +1,10 @@ -package ru.dbotthepony.mc.otm.core.collect +package ru.dbotthepony.mc.otm.util.collect import it.unimi.dsi.fastutil.ints.IntCollection import it.unimi.dsi.fastutil.ints.IntIterable import it.unimi.dsi.fastutil.ints.IntIterator import it.unimi.dsi.fastutil.ints.IntSortedSet -import ru.dbotthepony.mc.otm.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal fun IntRange.asIterable(): IntIterable { return IntIterable { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/JsonArrayCollector.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/JsonArrayCollector.kt similarity index 95% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/JsonArrayCollector.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/JsonArrayCollector.kt index 2922a2270..ef82d25c0 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/JsonArrayCollector.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/JsonArrayCollector.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.collect +package ru.dbotthepony.mc.otm.util.collect import com.google.gson.JsonArray import com.google.gson.JsonElement diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/JsonArraySpliterator.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/JsonArraySpliterator.kt similarity index 95% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/JsonArraySpliterator.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/JsonArraySpliterator.kt index 86eda1eb5..8703b1b38 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/JsonArraySpliterator.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/JsonArraySpliterator.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.collect +package ru.dbotthepony.mc.otm.util.collect import com.google.gson.JsonArray import com.google.gson.JsonElement diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ListSet.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ListSet.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ListSet.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ListSet.kt index fd8cdb104..2d9885d94 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ListSet.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ListSet.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.collect +package ru.dbotthepony.mc.otm.util.collect import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableSet diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ListTagCollector.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ListTagCollector.kt similarity index 95% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ListTagCollector.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ListTagCollector.kt index c5c52a2a0..3835a86e1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ListTagCollector.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ListTagCollector.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.collect +package ru.dbotthepony.mc.otm.util.collect import net.minecraft.nbt.ListTag import net.minecraft.nbt.Tag diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ProxiedMap.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ProxiedMap.kt similarity index 99% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ProxiedMap.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ProxiedMap.kt index eae95106b..c8ee19f1d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ProxiedMap.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ProxiedMap.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.collect +package ru.dbotthepony.mc.otm.util.collect abstract class ProxiedMap(protected val backingMap: MutableMap = HashMap()) : MutableMap { protected abstract fun onClear() diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ReferenceHashStrategy.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ReferenceHashStrategy.kt similarity index 92% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ReferenceHashStrategy.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ReferenceHashStrategy.kt index a8ed01173..0cf58820e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/ReferenceHashStrategy.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/ReferenceHashStrategy.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.collect +package ru.dbotthepony.mc.otm.util.collect import it.unimi.dsi.fastutil.Hash import java.lang.ref.Reference diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/SupplierList.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/SupplierList.kt similarity index 92% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/SupplierList.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/SupplierList.kt index ec1764c55..ffde3fc44 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/SupplierList.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/SupplierList.kt @@ -1,6 +1,6 @@ -package ru.dbotthepony.mc.otm.core.collect +package ru.dbotthepony.mc.otm.util.collect -import ru.dbotthepony.mc.otm.core.stream +import ru.dbotthepony.kommons.collect.stream import java.util.concurrent.Future import java.util.function.Supplier import java.util.stream.Stream diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/SupplierMap.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/SupplierMap.kt similarity index 94% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/SupplierMap.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/SupplierMap.kt index a53c6448f..ccd3ba155 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/SupplierMap.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/SupplierMap.kt @@ -1,8 +1,8 @@ -package ru.dbotthepony.mc.otm.core.collect +package ru.dbotthepony.mc.otm.util.collect import com.google.common.collect.ImmutableSet import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap -import ru.dbotthepony.mc.otm.core.stream +import ru.dbotthepony.kommons.collect.stream import java.util.function.Supplier import java.util.stream.Stream diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/UUIDIntModifiersMap.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/UUIDIntModifiersMap.kt similarity index 96% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/UUIDIntModifiersMap.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/UUIDIntModifiersMap.kt index dce7b03da..af39a8df2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/UUIDIntModifiersMap.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/UUIDIntModifiersMap.kt @@ -1,11 +1,11 @@ -package ru.dbotthepony.mc.otm.core.collect +package ru.dbotthepony.mc.otm.util.collect import net.minecraft.core.HolderLookup import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.ListTag import net.neoforged.neoforge.common.util.INBTSerializable import org.apache.logging.log4j.LogManager -import ru.dbotthepony.mc.otm.core.nbt.contains +import ru.dbotthepony.mc.otm.util.contains import java.util.UUID /** diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/WeakHashSet.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/WeakHashSet.kt similarity index 90% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/WeakHashSet.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/WeakHashSet.kt index 6464b7d87..6ee9ea0a4 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/collect/WeakHashSet.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/collect/WeakHashSet.kt @@ -1,9 +1,11 @@ -package ru.dbotthepony.mc.otm.core.collect +package ru.dbotthepony.mc.otm.util.collect import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenCustomHashSet import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet import it.unimi.dsi.fastutil.objects.ObjectSet -import ru.dbotthepony.mc.otm.core.util.HashedWeakReference +import ru.dbotthepony.kommons.collect.filterNotNull +import ru.dbotthepony.kommons.collect.map +import ru.dbotthepony.mc.otm.util.HashedWeakReference import java.lang.ref.ReferenceQueue class WeakHashSet(initialCapacity: Int = 16, loadFactor: Float = 0.75f, linked: Boolean = false) : MutableSet { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/BlockRotation.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/BlockRotation.kt similarity index 99% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/math/BlockRotation.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/math/BlockRotation.kt index d138b9536..216c46405 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/BlockRotation.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/BlockRotation.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.math +package ru.dbotthepony.mc.otm.util.math import net.minecraft.core.BlockPos import net.minecraft.core.Direction diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/BlockRotationFreedom.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/BlockRotationFreedom.kt similarity index 98% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/math/BlockRotationFreedom.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/math/BlockRotationFreedom.kt index 6cb7926f4..5309f6cd2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/BlockRotationFreedom.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/BlockRotationFreedom.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.math +package ru.dbotthepony.mc.otm.util.math import net.minecraft.core.Direction import net.minecraft.world.level.block.state.properties.EnumProperty diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/Clustering.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/Clustering.kt similarity index 97% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/math/Clustering.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/math/Clustering.kt index 267d40356..761143e1f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/Clustering.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/Clustering.kt @@ -1,10 +1,8 @@ -package ru.dbotthepony.mc.otm.core.math +package ru.dbotthepony.mc.otm.util.math import it.unimi.dsi.fastutil.objects.ObjectArrayList import net.minecraft.util.RandomSource -import ru.dbotthepony.mc.otm.core.random -import java.util.random.RandomGenerator -import kotlin.math.min +import ru.dbotthepony.mc.otm.util.random interface Cluster { val values: List diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/Colors.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/Colors.kt similarity index 95% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/math/Colors.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/math/Colors.kt index 1f5145e34..2b1aeba23 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/Colors.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/Colors.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.math +package ru.dbotthepony.mc.otm.util.math import com.mojang.serialization.Codec import com.mojang.serialization.codecs.RecordCodecBuilder diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/Decimal.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/Decimal.kt similarity index 99% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/math/Decimal.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/math/Decimal.kt index 284cb53be..408f15c01 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/Decimal.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/Decimal.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.math +package ru.dbotthepony.mc.otm.util.math import net.minecraft.nbt.ByteArrayTag import net.minecraft.nbt.StringTag diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/EuclidMath.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/EuclidMath.kt similarity index 99% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/math/EuclidMath.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/math/EuclidMath.kt index 1c1f6d5ed..6db8be6d6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/EuclidMath.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/EuclidMath.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.math +package ru.dbotthepony.mc.otm.util.math import com.mojang.blaze3d.vertex.PoseStack import it.unimi.dsi.fastutil.ints.IntSpliterators @@ -15,9 +15,9 @@ import org.joml.Matrix4f import org.joml.Quaterniond import org.joml.Quaternionf import org.joml.Vector3f -import ru.dbotthepony.mc.otm.core.collect.filter -import ru.dbotthepony.mc.otm.core.collect.flatMap -import ru.dbotthepony.mc.otm.core.collect.map +import ru.dbotthepony.kommons.collect.filter +import ru.dbotthepony.kommons.collect.flatMap +import ru.dbotthepony.kommons.collect.map import java.lang.ref.SoftReference import java.util.stream.Stream import java.util.stream.StreamSupport diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/Math.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/Math.kt similarity index 98% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/math/Math.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/math/Math.kt index 21ddabcfc..5b80b5b58 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/Math.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/Math.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.math +package ru.dbotthepony.mc.otm.util.math import java.math.BigDecimal import java.math.BigInteger diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/MatrixExt.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/MatrixExt.kt similarity index 86% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/math/MatrixExt.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/math/MatrixExt.kt index 11acd5701..edf72c07a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/MatrixExt.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/MatrixExt.kt @@ -1,19 +1,19 @@ @file:Suppress("unused") -package ru.dbotthepony.mc.otm.core.math +package ru.dbotthepony.mc.otm.util.math import org.joml.Matrix3f import org.joml.Matrix4f import org.joml.Vector3f import org.joml.Vector4f -import ru.dbotthepony.mc.otm.core.math.IAngle -import ru.dbotthepony.mc.otm.core.math.Vector -import ru.dbotthepony.mc.otm.core.math.asVector3f -import ru.dbotthepony.mc.otm.core.math.rotateAroundThis -import ru.dbotthepony.mc.otm.core.math.rotation -import ru.dbotthepony.mc.otm.core.math.rotationDegrees -import ru.dbotthepony.mc.otm.core.math.unaryMinus +import ru.dbotthepony.mc.otm.util.math.IAngle +import ru.dbotthepony.mc.otm.util.math.Vector +import ru.dbotthepony.mc.otm.util.math.asVector3f +import ru.dbotthepony.mc.otm.util.math.rotateAroundThis +import ru.dbotthepony.mc.otm.util.math.rotation +import ru.dbotthepony.mc.otm.util.math.rotationDegrees +import ru.dbotthepony.mc.otm.util.math.unaryMinus fun Matrix4f.rotate(angle: IAngle): Matrix4f { mul(angle.rotationXYZW()) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/NumberExt.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/NumberExt.kt similarity index 99% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/math/NumberExt.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/util/math/NumberExt.kt index 8c4c3dd64..f10672845 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/NumberExt.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/util/math/NumberExt.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core.math +package ru.dbotthepony.mc.otm.util.math import net.minecraft.nbt.ByteArrayTag import net.minecraft.nbt.Tag diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/feature/BlackHolePlacer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/feature/BlackHolePlacer.kt index 9a687d100..f2d9a7939 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/feature/BlackHolePlacer.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/feature/BlackHolePlacer.kt @@ -6,8 +6,8 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleBlockEntity import ru.dbotthepony.mc.otm.config.ServerConfig -import ru.dbotthepony.mc.otm.core.math.Decimal -import ru.dbotthepony.mc.otm.core.nextDecimal +import ru.dbotthepony.mc.otm.util.math.Decimal +import ru.dbotthepony.mc.otm.util.nextDecimal import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import ru.dbotthepony.mc.otm.registry.game.MBlocks diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/StandardDeviationHeightProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/StandardDeviationHeightProvider.kt index c085e35f2..cd921716b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/StandardDeviationHeightProvider.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/StandardDeviationHeightProvider.kt @@ -9,7 +9,7 @@ import net.minecraft.world.level.levelgen.WorldGenerationContext import net.minecraft.world.level.levelgen.heightproviders.HeightProvider import net.minecraft.world.level.levelgen.heightproviders.HeightProviderType import org.apache.logging.log4j.LogManager -import ru.dbotthepony.mc.otm.core.nextNormalDouble +import ru.dbotthepony.mc.otm.util.nextNormalDouble import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.registry.data.MHeightProviders diff --git a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/ComparatorTests.kt b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/ComparatorTests.kt deleted file mode 100644 index 1a943112e..000000000 --- a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/ComparatorTests.kt +++ /dev/null @@ -1,34 +0,0 @@ -package ru.dbotthepony.mc.otm.tests - -import it.unimi.dsi.fastutil.ints.IntComparators -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.DisplayName -import org.junit.jupiter.api.Test -import ru.dbotthepony.mc.otm.core.addSorted -import java.util.Random - -object ComparatorTests { - @Test - @DisplayName("Comparator tests") - fun test() { - val sortedList = mutableListOf(1, 4, 6) - sortedList.addSorted(2, IntComparators.NATURAL_COMPARATOR) - sortedList.addSorted(3, IntComparators.NATURAL_COMPARATOR) - sortedList.addSorted(7, IntComparators.NATURAL_COMPARATOR) - sortedList.addSorted(-1, IntComparators.NATURAL_COMPARATOR) - - assertEquals(mutableListOf(-1, 1, 2, 3, 4, 6, 7), sortedList) - - val rand = Random() - val sorted2 = ArrayList() - - for (i in 0 .. 100) { - sorted2.addSorted(rand.nextInt(-100, 100), IntComparators.NATURAL_COMPARATOR) - } - - val sorted22 = ArrayList(sorted2) - sorted22.sort() - - assertEquals(sorted22, sorted2) - } -} diff --git a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/DecimalTests.kt b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/DecimalTests.kt index 366fd3dc3..0958305ca 100644 --- a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/DecimalTests.kt +++ b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/DecimalTests.kt @@ -5,7 +5,7 @@ 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.core.math.Decimal +import ru.dbotthepony.mc.otm.util.math.Decimal import java.io.ObjectInputStream import java.io.ObjectOutputStream diff --git a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/ExperienceUtilsTest.kt b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/ExperienceUtilsTest.kt index cf617fc77..dd718ab76 100644 --- a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/ExperienceUtilsTest.kt +++ b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/ExperienceUtilsTest.kt @@ -3,9 +3,9 @@ package ru.dbotthepony.mc.otm.tests import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test -import ru.dbotthepony.mc.otm.core.util.getLevelFromXp -import ru.dbotthepony.mc.otm.core.util.getTotalXpRequiredForLevel -import ru.dbotthepony.mc.otm.core.util.getXpRequiredForLevelUp +import ru.dbotthepony.mc.otm.util.getLevelFromXp +import ru.dbotthepony.mc.otm.util.getTotalXpRequiredForLevel +import ru.dbotthepony.mc.otm.util.getXpRequiredForLevelUp object ExperienceUtilsTest { @Test 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 b54aa47aa..a65d6ecdc 100644 --- a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/FriendlyStreams.kt +++ b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/FriendlyStreams.kt @@ -5,12 +5,12 @@ 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.core.util.readInt -import ru.dbotthepony.mc.otm.core.util.readVarIntLE -import ru.dbotthepony.mc.otm.core.util.readVarLongLE -import ru.dbotthepony.mc.otm.core.util.writeInt -import ru.dbotthepony.mc.otm.core.util.writeVarIntLE -import ru.dbotthepony.mc.otm.core.util.writeVarLongLE +import ru.dbotthepony.mc.otm.util.readInt +import ru.dbotthepony.mc.otm.util.readVarIntLE +import ru.dbotthepony.mc.otm.util.readVarLongLE +import ru.dbotthepony.mc.otm.util.writeInt +import ru.dbotthepony.mc.otm.util.writeVarIntLE +import ru.dbotthepony.mc.otm.util.writeVarLongLE object FriendlyStreams { @Test diff --git a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/MathTests.kt b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/MathTests.kt index 43b2b8a6e..6c1006c7e 100644 --- a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/MathTests.kt +++ b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/MathTests.kt @@ -3,8 +3,8 @@ package ru.dbotthepony.mc.otm.tests import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test -import ru.dbotthepony.mc.otm.core.math.integerDivisionDown -import ru.dbotthepony.mc.otm.core.math.integerDivisionUp +import ru.dbotthepony.mc.otm.util.math.integerDivisionDown +import ru.dbotthepony.mc.otm.util.math.integerDivisionUp object MathTests { @Test diff --git a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/TickListTests.kt b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/TickListTests.kt index b489731ef..f3f75b8f2 100644 --- a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/TickListTests.kt +++ b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/TickListTests.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.tests import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test -import ru.dbotthepony.mc.otm.core.util.TickList +import ru.dbotthepony.mc.otm.util.TickList object TickListTests { @Test diff --git a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/WeakHashSetTests.kt b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/WeakHashSetTests.kt index 38bf57250..c890f43f7 100644 --- a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/WeakHashSetTests.kt +++ b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/WeakHashSetTests.kt @@ -2,8 +2,8 @@ package ru.dbotthepony.mc.otm.tests import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test -import ru.dbotthepony.mc.otm.core.collect.WeakHashSet -import ru.dbotthepony.mc.otm.core.collect.forEach +import ru.dbotthepony.mc.otm.util.collect.WeakHashSet +import ru.dbotthepony.kommons.collect.forEach object WeakHashSetTests { @Test