From 74d48a7dc30acf30606c4048ba508c7ab5c482e4 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 31 Mar 2025 13:10:12 +0700 Subject: [PATCH] Update references after merge --- .../ru/dbotthepony/mc/otm/datagen/WorldGen.kt | 22 +++++++++---------- .../mc/otm/OverdriveThatMatters.kt | 4 ++-- .../mc/otm/registry/MRegistries.kt | 4 ++-- .../mc/otm/registry/data/MHeightProviders.kt | 2 +- .../otm/registry/data/MPlacementModifiers.kt | 16 +++++++------- .../mc/otm/registry/data/MWorldGenFeatures.kt | 4 ++-- .../mc/otm/server/triggers/HurtTrigger.kt | 2 +- .../mc/otm/server/triggers/ItemTrigger.kt | 2 +- .../otm/server/triggers/SingletonTrigger.kt | 2 +- .../otm/server/world/EnhancedPlacedFeature.kt | 6 ++--- .../server/world/EnhancedPlacementContext.kt | 4 ++-- .../ru/dbotthepony/mc/otm/server/world/Ext.kt | 6 ++--- .../mc/otm/server/world/PlacementVariable.kt | 2 +- .../otm/server/world/PlacementVariableMap.kt | 2 +- .../world/feature/DebugPlacerFeature.kt | 2 +- .../server/world/feature/EnhancedFeature.kt | 8 +++---- .../server/world/placement/ChainPlacement.kt | 2 +- .../world/placement/EllipsoidPlacement.kt | 6 ++--- .../world/placement/EnhancedChainPlacement.kt | 6 ++--- .../world/placement/EnhancedCountPlacement.kt | 6 ++--- .../world/placement/EnhancedPlacement.kt | 6 ++--- .../world/placement/EnhancedSplitPlacement.kt | 6 ++--- .../server/world/placement/SplitPlacement.kt | 2 +- .../StandardDeviationHeightProvider.kt | 2 +- .../server/world/placement/WormPlacement.kt | 6 ++--- 25 files changed, 65 insertions(+), 65 deletions(-) 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 48a1164bc..66955b4b7 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/WorldGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/WorldGen.kt @@ -29,20 +29,20 @@ 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 -import ru.dbotthepony.mc.otm.worldgen.placement.StandardDeviationHeightProvider +import ru.dbotthepony.mc.otm.server.world.placement.StandardDeviationHeightProvider import ru.dbotthepony.mc.otm.registry.game.MBlocks import ru.dbotthepony.mc.otm.registry.data.MWorldGenFeatures -import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacedFeature +import ru.dbotthepony.mc.otm.server.world.EnhancedPlacedFeature import ru.dbotthepony.mc.otm.server.world.feature.BlackHolePlacerFeature -import ru.dbotthepony.mc.otm.worldgen.feature.EnhancedFeature -import ru.dbotthepony.mc.otm.worldgen.placement -import ru.dbotthepony.mc.otm.worldgen.placement.EllipsoidPlacement -import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedChainPlacement -import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedCountPlacement -import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedPlacement -import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedSplitPlacement -import ru.dbotthepony.mc.otm.worldgen.placement.WormPlacement -import ru.dbotthepony.mc.otm.worldgen.wrap +import ru.dbotthepony.mc.otm.server.world.feature.EnhancedFeature +import ru.dbotthepony.mc.otm.server.world.placement +import ru.dbotthepony.mc.otm.server.world.placement.EllipsoidPlacement +import ru.dbotthepony.mc.otm.server.world.placement.EnhancedChainPlacement +import ru.dbotthepony.mc.otm.server.world.placement.EnhancedCountPlacement +import ru.dbotthepony.mc.otm.server.world.placement.EnhancedPlacement +import ru.dbotthepony.mc.otm.server.world.placement.EnhancedSplitPlacement +import ru.dbotthepony.mc.otm.server.world.placement.WormPlacement +import ru.dbotthepony.mc.otm.server.world.wrap private object ConfiguredFeatures { val TRITANIUM_ORE = key("tritanium_ore") diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/OverdriveThatMatters.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/OverdriveThatMatters.kt index 0aaac71c2..0acb48b04 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/OverdriveThatMatters.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/OverdriveThatMatters.kt @@ -94,8 +94,8 @@ import ru.dbotthepony.mc.otm.registry.data.MWorldGenFeatures import ru.dbotthepony.mc.otm.server.MCommands import ru.dbotthepony.mc.otm.storage.StorageStack import ru.dbotthepony.mc.otm.server.triggers.KillAsAndroidTrigger -import ru.dbotthepony.mc.otm.worldgen.feature.EnhancedFeature -import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedPlacement +import ru.dbotthepony.mc.otm.server.world.feature.EnhancedFeature +import ru.dbotthepony.mc.otm.server.world.placement.EnhancedPlacement import thedarkcolour.kotlinforforge.neoforge.forge.DIST import thedarkcolour.kotlinforforge.neoforge.forge.FORGE_BUS import thedarkcolour.kotlinforforge.neoforge.forge.LOADING_CONTEXT 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 5e0656d60..b2490ac48 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistries.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistries.kt @@ -14,8 +14,8 @@ import ru.dbotthepony.mc.otm.player.android.AndroidFeatureType import ru.dbotthepony.mc.otm.player.android.AndroidResearchDescription import ru.dbotthepony.mc.otm.player.android.AndroidResearchResult import ru.dbotthepony.mc.otm.storage.StorageStack -import ru.dbotthepony.mc.otm.worldgen.feature.EnhancedFeature -import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedPlacement +import ru.dbotthepony.mc.otm.server.world.feature.EnhancedFeature +import ru.dbotthepony.mc.otm.server.world.placement.EnhancedPlacement object MRegistries { private fun k(name: String): ResourceKey> { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/data/MHeightProviders.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/data/MHeightProviders.kt index 3a1267516..3a4852257 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/data/MHeightProviders.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/data/MHeightProviders.kt @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.registry.data import net.minecraft.core.registries.BuiltInRegistries import net.minecraft.world.level.levelgen.heightproviders.HeightProviderType import net.neoforged.bus.api.IEventBus -import ru.dbotthepony.mc.otm.worldgen.placement.StandardDeviationHeightProvider +import ru.dbotthepony.mc.otm.server.world.placement.StandardDeviationHeightProvider import ru.dbotthepony.mc.otm.registry.MDeferredRegister object MHeightProviders { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/data/MPlacementModifiers.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/data/MPlacementModifiers.kt index 2ca50b940..704574c6d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/data/MPlacementModifiers.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/data/MPlacementModifiers.kt @@ -5,14 +5,14 @@ import net.minecraft.world.level.levelgen.placement.PlacementModifierType import net.neoforged.bus.api.IEventBus import ru.dbotthepony.mc.otm.registry.MDeferredRegister import ru.dbotthepony.mc.otm.registry.MRegistries -import ru.dbotthepony.mc.otm.worldgen.feature.EnhancedFeature -import ru.dbotthepony.mc.otm.worldgen.placement.ChainPlacement -import ru.dbotthepony.mc.otm.worldgen.placement.EllipsoidPlacement -import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedChainPlacement -import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedCountPlacement -import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedSplitPlacement -import ru.dbotthepony.mc.otm.worldgen.placement.SplitPlacement -import ru.dbotthepony.mc.otm.worldgen.placement.WormPlacement +import ru.dbotthepony.mc.otm.server.world.feature.EnhancedFeature +import ru.dbotthepony.mc.otm.server.world.placement.ChainPlacement +import ru.dbotthepony.mc.otm.server.world.placement.EllipsoidPlacement +import ru.dbotthepony.mc.otm.server.world.placement.EnhancedChainPlacement +import ru.dbotthepony.mc.otm.server.world.placement.EnhancedCountPlacement +import ru.dbotthepony.mc.otm.server.world.placement.EnhancedSplitPlacement +import ru.dbotthepony.mc.otm.server.world.placement.SplitPlacement +import ru.dbotthepony.mc.otm.server.world.placement.WormPlacement object MPlacementModifiers { private val registry = MDeferredRegister(BuiltInRegistries.PLACEMENT_MODIFIER_TYPE) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/data/MWorldGenFeatures.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/data/MWorldGenFeatures.kt index 3a15ceca8..603c488cd 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/data/MWorldGenFeatures.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/data/MWorldGenFeatures.kt @@ -4,9 +4,9 @@ import net.minecraft.core.registries.BuiltInRegistries import net.neoforged.bus.api.IEventBus import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.mc.otm.registry.MDeferredRegister -import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacedFeature +import ru.dbotthepony.mc.otm.server.world.EnhancedPlacedFeature import ru.dbotthepony.mc.otm.server.world.feature.BlackHolePlacerFeature -import ru.dbotthepony.mc.otm.worldgen.feature.DebugPlacerFeature +import ru.dbotthepony.mc.otm.server.world.feature.DebugPlacerFeature object MWorldGenFeatures { private val registry = MDeferredRegister(BuiltInRegistries.FEATURE) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/HurtTrigger.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/HurtTrigger.kt index d9bac01f2..b884fb89a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/HurtTrigger.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/HurtTrigger.kt @@ -27,7 +27,7 @@ class HurtTrigger(id: ResourceLocation) : MCriterionTrigger = Optional.empty()) : AbstractInstance(player) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/SingletonTrigger.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/SingletonTrigger.kt index 099f1d30a..8839b95df 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/SingletonTrigger.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/SingletonTrigger.kt @@ -11,7 +11,7 @@ class SingletonTrigger(id: ResourceLocation) : MCriterionTrigger = RecordCodecBuilder.create { it.group( ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate) - ).apply(it, SingletonTrigger::Instance) + ).apply(it, ::Instance) } val empty = Instance() diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/EnhancedPlacedFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/EnhancedPlacedFeature.kt index 60b6f79ce..31a6ffb26 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/EnhancedPlacedFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/EnhancedPlacedFeature.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.worldgen +package ru.dbotthepony.mc.otm.server.world import com.github.benmanes.caffeine.cache.Cache import com.github.benmanes.caffeine.cache.Caffeine @@ -25,8 +25,8 @@ import ru.dbotthepony.mc.otm.THREAD_LOCAL_RANDOM import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.util.GJRAND64RandomSource import ru.dbotthepony.mc.otm.util.shuffle -import ru.dbotthepony.mc.otm.worldgen.feature.EnhancedFeature -import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedPlacement +import ru.dbotthepony.mc.otm.server.world.feature.EnhancedFeature +import ru.dbotthepony.mc.otm.server.world.placement.EnhancedPlacement import java.io.DataOutputStream import java.time.Duration import java.util.* diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/EnhancedPlacementContext.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/EnhancedPlacementContext.kt index bd3013789..3a5aca84c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/EnhancedPlacementContext.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/EnhancedPlacementContext.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.worldgen +package ru.dbotthepony.mc.otm.server.world import net.minecraft.core.BlockPos import net.minecraft.util.RandomSource @@ -8,7 +8,7 @@ import net.minecraft.world.level.chunk.ChunkGenerator import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration import net.minecraft.world.level.levelgen.placement.PlacementContext -import ru.dbotthepony.mc.otm.worldgen.feature.EnhancedFeature +import ru.dbotthepony.mc.otm.server.world.feature.EnhancedFeature import java.util.* class EnhancedPlacementContext { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/Ext.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/Ext.kt index 28fc596dd..5132aa5bd 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/Ext.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/Ext.kt @@ -1,12 +1,12 @@ -package ru.dbotthepony.mc.otm.worldgen +package ru.dbotthepony.mc.otm.server.world import net.minecraft.core.BlockPos import net.minecraft.core.Holder import net.minecraft.world.level.levelgen.feature.ConfiguredFeature import net.minecraft.world.level.levelgen.placement.PlacementModifier import ru.dbotthepony.mc.otm.util.collect.Vec3iHashStrategy -import ru.dbotthepony.mc.otm.worldgen.feature.EnhancedFeature -import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedPlacement +import ru.dbotthepony.mc.otm.server.world.feature.EnhancedFeature +import ru.dbotthepony.mc.otm.server.world.placement.EnhancedPlacement fun PlacementModifier.wrap(): EnhancedPlacement { return EnhancedPlacement.Wrapper(this) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/PlacementVariable.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/PlacementVariable.kt index b52deeee9..269e24a5a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/PlacementVariable.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/PlacementVariable.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.worldgen +package ru.dbotthepony.mc.otm.server.world import net.minecraft.resources.ResourceLocation diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/PlacementVariableMap.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/PlacementVariableMap.kt index 1cf849322..55439b9c6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/PlacementVariableMap.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/PlacementVariableMap.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.worldgen +package ru.dbotthepony.mc.otm.server.world import it.unimi.dsi.fastutil.objects.Object2ObjectAVLTreeMap import ru.dbotthepony.kommons.util.KOptional diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/feature/DebugPlacerFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/feature/DebugPlacerFeature.kt index aa5e38d67..260a0e80c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/feature/DebugPlacerFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/feature/DebugPlacerFeature.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.worldgen.feature +package ru.dbotthepony.mc.otm.server.world.feature import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.state.BlockState diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/feature/EnhancedFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/feature/EnhancedFeature.kt index 49403adfd..40a304ef2 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/feature/EnhancedFeature.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/feature/EnhancedFeature.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.worldgen.feature +package ru.dbotthepony.mc.otm.server.world.feature import com.mojang.serialization.Codec import com.mojang.serialization.MapCodec @@ -11,9 +11,9 @@ import net.neoforged.neoforge.registries.DataPackRegistryEvent import ru.dbotthepony.mc.otm.registry.MBuiltInRegistries import ru.dbotthepony.mc.otm.registry.MDeferredRegister import ru.dbotthepony.mc.otm.registry.MRegistries -import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacementContext -import ru.dbotthepony.mc.otm.worldgen.PlacementPos -import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedPlacement +import ru.dbotthepony.mc.otm.server.world.EnhancedPlacementContext +import ru.dbotthepony.mc.otm.server.world.PlacementPos +import ru.dbotthepony.mc.otm.server.world.placement.EnhancedPlacement abstract class EnhancedFeature(codec: Codec) { abstract fun place(context: EnhancedPlacementContext, config: FC, positions: Set, allPositions: Set): Boolean diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/ChainPlacement.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/ChainPlacement.kt index dd854ae73..6ea14a666 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/ChainPlacement.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/ChainPlacement.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.worldgen.placement +package ru.dbotthepony.mc.otm.server.world.placement import com.google.common.collect.ImmutableList import com.mojang.serialization.Codec diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EllipsoidPlacement.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EllipsoidPlacement.kt index 003c2eaea..6e74dd9a3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EllipsoidPlacement.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EllipsoidPlacement.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.worldgen.placement +package ru.dbotthepony.mc.otm.server.world.placement import com.mojang.serialization.MapCodec import com.mojang.serialization.codecs.RecordCodecBuilder @@ -20,8 +20,8 @@ import ru.dbotthepony.mc.otm.util.math.Vector import ru.dbotthepony.mc.otm.util.math.rotate import ru.dbotthepony.mc.otm.util.math.rotateAroundThis import ru.dbotthepony.mc.otm.util.nextDouble -import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacementContext -import ru.dbotthepony.mc.otm.worldgen.PlacementPos +import ru.dbotthepony.mc.otm.server.world.EnhancedPlacementContext +import ru.dbotthepony.mc.otm.server.world.PlacementPos import java.util.* import java.util.stream.Stream import kotlin.math.PI diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedChainPlacement.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedChainPlacement.kt index 51ccf1fa6..60683f9b7 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedChainPlacement.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedChainPlacement.kt @@ -1,10 +1,10 @@ -package ru.dbotthepony.mc.otm.worldgen.placement +package ru.dbotthepony.mc.otm.server.world.placement import com.google.common.collect.ImmutableList import com.mojang.serialization.Codec import com.mojang.serialization.MapCodec -import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacementContext -import ru.dbotthepony.mc.otm.worldgen.PlacementPos +import ru.dbotthepony.mc.otm.server.world.EnhancedPlacementContext +import ru.dbotthepony.mc.otm.server.world.PlacementPos /** * Chains placements, feeding results from one placement into next diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedCountPlacement.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedCountPlacement.kt index c737c6aa4..bd1667144 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedCountPlacement.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedCountPlacement.kt @@ -1,9 +1,9 @@ -package ru.dbotthepony.mc.otm.worldgen.placement +package ru.dbotthepony.mc.otm.server.world.placement import com.mojang.serialization.MapCodec import net.minecraft.util.valueproviders.IntProvider -import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacementContext -import ru.dbotthepony.mc.otm.worldgen.PlacementPos +import ru.dbotthepony.mc.otm.server.world.EnhancedPlacementContext +import ru.dbotthepony.mc.otm.server.world.PlacementPos class EnhancedCountPlacement(val provider: IntProvider) : EnhancedPlacement { override fun evaluate(context: EnhancedPlacementContext, positions: List): List { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedPlacement.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedPlacement.kt index 7e270bc58..237df7db8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedPlacement.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedPlacement.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.worldgen.placement +package ru.dbotthepony.mc.otm.server.world.placement import com.mojang.serialization.Codec import com.mojang.serialization.MapCodec @@ -7,8 +7,8 @@ import net.neoforged.bus.api.IEventBus import ru.dbotthepony.mc.otm.registry.MBuiltInRegistries import ru.dbotthepony.mc.otm.registry.MDeferredRegister import ru.dbotthepony.mc.otm.registry.MRegistries -import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacementContext -import ru.dbotthepony.mc.otm.worldgen.PlacementPos +import ru.dbotthepony.mc.otm.server.world.EnhancedPlacementContext +import ru.dbotthepony.mc.otm.server.world.PlacementPos import java.util.stream.Collectors interface EnhancedPlacement { diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedSplitPlacement.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedSplitPlacement.kt index 2af662d8e..b2d524b25 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedSplitPlacement.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedSplitPlacement.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.worldgen.placement +package ru.dbotthepony.mc.otm.server.world.placement import com.google.common.collect.ImmutableList import com.mojang.serialization.Codec @@ -6,8 +6,8 @@ import com.mojang.serialization.MapCodec import com.mojang.serialization.codecs.RecordCodecBuilder import net.minecraft.util.StringRepresentable import net.minecraft.world.level.levelgen.placement.PlacementModifier -import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacementContext -import ru.dbotthepony.mc.otm.worldgen.PlacementPos +import ru.dbotthepony.mc.otm.server.world.EnhancedPlacementContext +import ru.dbotthepony.mc.otm.server.world.PlacementPos /** * Or "shard" placement, if you will. diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/SplitPlacement.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/SplitPlacement.kt index 6538f8bfa..9f0e123e3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/SplitPlacement.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/SplitPlacement.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.worldgen.placement +package ru.dbotthepony.mc.otm.server.world.placement import com.google.common.collect.ImmutableList import com.mojang.serialization.Codec diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/StandardDeviationHeightProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/StandardDeviationHeightProvider.kt index cd921716b..aa75a99db 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/StandardDeviationHeightProvider.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/StandardDeviationHeightProvider.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.worldgen.placement +package ru.dbotthepony.mc.otm.server.world.placement import com.mojang.serialization.Codec import com.mojang.serialization.MapCodec diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/WormPlacement.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/WormPlacement.kt index ad58cd59a..152b273bb 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/WormPlacement.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/WormPlacement.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.worldgen.placement +package ru.dbotthepony.mc.otm.server.world.placement import com.mojang.serialization.Codec import com.mojang.serialization.MapCodec @@ -22,8 +22,8 @@ import ru.dbotthepony.mc.otm.util.math.normalizeAngle import ru.dbotthepony.mc.otm.util.math.plus import ru.dbotthepony.mc.otm.util.math.toBlockPos import ru.dbotthepony.mc.otm.util.nextDouble -import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacementContext -import ru.dbotthepony.mc.otm.worldgen.PlacementPos +import ru.dbotthepony.mc.otm.server.world.EnhancedPlacementContext +import ru.dbotthepony.mc.otm.server.world.PlacementPos import java.util.stream.Stream import kotlin.math.PI import kotlin.math.absoluteValue