From a49754e5cc3de6572fb608d32ba432a117749754 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 30 Mar 2025 15:24:29 +0700 Subject: [PATCH] Move random utils to util subpackage --- .../mc/otm/block/entity/cable/EnergyCableGraph.kt | 5 +---- .../mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt | 2 +- .../mc/otm/block/entity/tech/AndroidChargerBlockEntity.kt | 2 +- .../mc/otm/block/entity/tech/AndroidStationBlockEntity.kt | 2 +- .../mc/otm/block/entity/tech/BatteryBankBlockEntity.kt | 5 +---- src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt | 2 +- .../mc/otm/client/screen/tech/AndroidStationScreen.kt | 2 -- .../kotlin/ru/dbotthepony/mc/otm/core/math/Clustering.kt | 4 +--- .../dbotthepony/mc/otm/core/util/CapabilityListIterator.kt | 2 -- .../kotlin/ru/dbotthepony/mc/otm/core/util/LootTableUtils.kt | 1 - .../ru/dbotthepony/mc/otm/core/{ => util}/RandomUtils.kt | 2 +- .../ru/dbotthepony/mc/otm/data/world/DecimalProvider.kt | 2 +- .../mc/otm/data/world/StandardDeviationHeightProvider.kt | 2 +- .../kotlin/ru/dbotthepony/mc/otm/item/QuantumBatteryItem.kt | 2 +- .../mc/otm/item/exopack/AbstractExopackSlotUpgradeItem.kt | 3 +-- .../ru/dbotthepony/mc/otm/item/weapon/EnergySwordItem.kt | 2 +- .../ru/dbotthepony/mc/otm/item/weapon/FallingSunItem.kt | 2 +- .../dbotthepony/mc/otm/worldgen/feature/BlackHolePlacer.kt | 2 +- 18 files changed, 15 insertions(+), 29 deletions(-) rename src/main/kotlin/ru/dbotthepony/mc/otm/core/{ => util}/RandomUtils.kt (99%) 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..6d666d4a3 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.mc.otm.core.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/matter/MatterRecyclerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt index e93ebf9e9..bbc9f82fd 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 @@ -24,7 +24,7 @@ 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.util.nextDecimal import ru.dbotthepony.mc.otm.core.otmRandom import ru.dbotthepony.mc.otm.graph.matter.MatterGraph import ru.dbotthepony.mc.otm.item.matter.MatterDustItem 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..f2b312d40 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 @@ -18,7 +18,7 @@ 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.core.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..05f83fc1c 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 @@ -18,7 +18,7 @@ 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.shuffle import ru.dbotthepony.mc.otm.core.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..3b2dc8cbf 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.mc.otm.core.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/client/MatteryGUI.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt index b9fbe68db..8dd1f7388 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt @@ -35,7 +35,7 @@ import ru.dbotthepony.mc.otm.core.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.random import ru.dbotthepony.mc.otm.core.util.formatPower import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures import java.util.* 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..86e094ef6 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,7 +7,6 @@ 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 @@ -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/core/math/Clustering.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/Clustering.kt index 267d40356..fd1b5369f 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/Clustering.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/math/Clustering.kt @@ -2,9 +2,7 @@ package ru.dbotthepony.mc.otm.core.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.core.util.random interface Cluster { val values: List diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/CapabilityListIterator.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/CapabilityListIterator.kt index 086c911b7..18a42ed6b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/CapabilityListIterator.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/CapabilityListIterator.kt @@ -1,9 +1,7 @@ package ru.dbotthepony.mc.otm.core.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 java.util.function.Supplier class CapabilityListIterator( diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/LootTableUtils.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/LootTableUtils.kt index 8821690ee..b18abfa48 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/LootTableUtils.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/LootTableUtils.kt @@ -13,7 +13,6 @@ 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/core/util/RandomUtils.kt similarity index 99% rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/RandomUtils.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/core/util/RandomUtils.kt index cf7da7c9a..454b65b5a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/RandomUtils.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/RandomUtils.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.core +package ru.dbotthepony.mc.otm.core.util import it.unimi.dsi.fastutil.ints.IntList import net.minecraft.Util 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..d3fa6b9f3 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 @@ -8,7 +8,7 @@ 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.core.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/data/world/StandardDeviationHeightProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/data/world/StandardDeviationHeightProvider.kt index 5dd139d7a..5e98ae7f1 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/data/world/StandardDeviationHeightProvider.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/data/world/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.core.util.nextNormalDouble import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.registry.data.MHeightProviders 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..6f1361f94 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/QuantumBatteryItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/QuantumBatteryItem.kt @@ -42,7 +42,7 @@ 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.nextUUID import ru.dbotthepony.mc.otm.core.util.formatPower import ru.dbotthepony.mc.otm.isClientThread import ru.dbotthepony.mc.otm.isServerThread 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..3772db575 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 @@ -20,8 +20,7 @@ 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.util.nextUUID import ru.dbotthepony.mc.otm.core.otmRandom import ru.dbotthepony.mc.otm.registry.game.MItems import ru.dbotthepony.mc.otm.runIfClient 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..e2636fb9f 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 @@ -31,7 +31,7 @@ import ru.dbotthepony.mc.otm.core.damageType import ru.dbotthepony.mc.otm.core.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.util.nextVariance import ru.dbotthepony.mc.otm.core.otmRandom import ru.dbotthepony.mc.otm.core.util.WriteOnce import ru.dbotthepony.mc.otm.item.MatteryItem 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..29973ada1 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 @@ -31,7 +31,7 @@ import ru.dbotthepony.mc.otm.core.damageType import ru.dbotthepony.mc.otm.core.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.util.nextVariance import ru.dbotthepony.mc.otm.core.otmRandom import ru.dbotthepony.mc.otm.core.util.WriteOnce import ru.dbotthepony.mc.otm.item.MatteryItem 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..15d1723d6 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 @@ -7,7 +7,7 @@ import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfigur 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.core.util.nextDecimal import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import ru.dbotthepony.mc.otm.registry.game.MBlocks