From 35e871890c718965b0691139515e382401e39ff4 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 19 Jan 2025 13:30:58 +0700 Subject: [PATCH] Move DecimalProvider to data.world subpackage --- .../dbotthepony/mc/otm/datagen/loot/LootModifiersData.kt | 2 +- .../ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt | 8 ++++---- .../kotlin/ru/dbotthepony/mc/otm/OverdriveThatMatters.kt | 2 +- .../mc/otm/data/{ => world}/DecimalProvider.kt | 8 ++++---- .../ru/dbotthepony/mc/otm/item/ProceduralBatteryItem.kt | 2 +- .../ru/dbotthepony/mc/otm/item/matter/MatterDustItem.kt | 5 +---- 6 files changed, 12 insertions(+), 15 deletions(-) rename src/main/kotlin/ru/dbotthepony/mc/otm/data/{ => world}/DecimalProvider.kt (92%) 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 8024aa914..21a58a335 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 @@ -12,7 +12,7 @@ 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.data.UniformDecimal +import ru.dbotthepony.mc.otm.data.world.UniformDecimal import ru.dbotthepony.mc.otm.data.condition.ChanceWithPlaytimeCondition import ru.dbotthepony.mc.otm.data.condition.HasExoPackCondition import ru.dbotthepony.mc.otm.data.condition.ItemInInventoryCondition 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 f57a5952c..8c8dcf092 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 @@ -20,7 +20,7 @@ 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.core.math.Decimal -import ru.dbotthepony.mc.otm.data.UniformDecimal +import ru.dbotthepony.mc.otm.data.world.UniformDecimal import ru.dbotthepony.mc.otm.datagen.modLootTable import ru.dbotthepony.mc.otm.item.ProceduralBatteryItem import ru.dbotthepony.mc.otm.item.exopack.ProceduralExopackSlotUpgradeItem @@ -262,9 +262,9 @@ fun addLootTables(lootTables: LootTables) { apply( ProceduralBatteryItem.Randomizer( - maxBatteryLevel = UniformDecimal(Decimal(10_000_000), Decimal(50_000_000)), - batteryLevel = UniformDecimal(Decimal(0), Decimal(25_000_000)), - maxInput = UniformDecimal(Decimal(1_000), Decimal(5_000)), + maxBatteryLevel = UniformDecimal(Decimal(10_000_000), Decimal(50_000_000)), + batteryLevel = UniformDecimal(Decimal(0), Decimal(25_000_000)), + maxInput = UniformDecimal(Decimal(1_000), Decimal(5_000)), )) } } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/OverdriveThatMatters.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/OverdriveThatMatters.kt index 61a08961e..f6314ccd8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/OverdriveThatMatters.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/OverdriveThatMatters.kt @@ -51,7 +51,7 @@ import ru.dbotthepony.mc.otm.config.ItemsConfig import ru.dbotthepony.mc.otm.config.MachinesConfig import ru.dbotthepony.mc.otm.config.ServerConfig import ru.dbotthepony.mc.otm.config.ToolsConfig -import ru.dbotthepony.mc.otm.data.DecimalProvider +import ru.dbotthepony.mc.otm.data.world.DecimalProvider import ru.dbotthepony.mc.otm.item.ChestUpgraderItem import ru.dbotthepony.mc.otm.item.tool.ExplosiveHammerItem import ru.dbotthepony.mc.otm.item.armor.TritaniumArmorItem diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/data/DecimalProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/data/world/DecimalProvider.kt similarity index 92% rename from src/main/kotlin/ru/dbotthepony/mc/otm/data/DecimalProvider.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/data/world/DecimalProvider.kt index 8cd19d0eb..aa917f726 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/data/DecimalProvider.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/data/world/DecimalProvider.kt @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.data +package ru.dbotthepony.mc.otm.data.world import com.mojang.datafixers.util.Either import com.mojang.serialization.Codec @@ -37,7 +37,7 @@ abstract class DecimalProvider : SampledDecimal { .either(DecimalCodec, registry.byNameCodec().dispatch({ it.type }, { it.codec })) .xmap( { c -> c.map(::ConstantDecimal, { it }) }, - { if (it.type === ConstantDecimal.Companion) Either.left(it.minValue) else Either.right(it) } + { if (it.type === ConstantDecimal) Either.left(it.minValue) else Either.right(it) } ) } @@ -48,8 +48,8 @@ abstract class DecimalProvider : SampledDecimal { init { registror.register("zero") { ConstantDecimal.Zero } - registror.register("constant") { ConstantDecimal.Companion } - registror.register("uniform") { UniformDecimal.Companion } + registror.register("constant") { ConstantDecimal } + registror.register("uniform") { UniformDecimal } } fun register(bus: IEventBus) { 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 7ba2650ad..1cb0e9a58 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/ProceduralBatteryItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/ProceduralBatteryItem.kt @@ -18,7 +18,7 @@ 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.data.DecimalProvider +import ru.dbotthepony.mc.otm.data.world.DecimalProvider import ru.dbotthepony.mc.otm.registry.CapabilitiesRegisterListener import ru.dbotthepony.mc.otm.registry.MDataComponentTypes import ru.dbotthepony.mc.otm.registry.MItemFunctionTypes 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 5891251f6..850a90f02 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 @@ -13,7 +13,6 @@ import net.minecraft.world.inventory.Slot 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 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 @@ -22,13 +21,11 @@ import ru.dbotthepony.mc.otm.container.MatteryContainer import ru.dbotthepony.mc.otm.core.TranslatableComponent import ru.dbotthepony.mc.otm.core.math.Decimal import ru.dbotthepony.mc.otm.matter.IMatterItem -import ru.dbotthepony.mc.otm.core.nbt.set -import ru.dbotthepony.mc.otm.data.DecimalProvider +import ru.dbotthepony.mc.otm.data.world.DecimalProvider import ru.dbotthepony.mc.otm.matter.IMatterValue import ru.dbotthepony.mc.otm.matter.MatterValue import ru.dbotthepony.mc.otm.registry.MDataComponentTypes import ru.dbotthepony.mc.otm.registry.MItemFunctionTypes -import ru.dbotthepony.mc.otm.registry.MItems class MatterDustItem : Item(Properties().stacksTo(64)), IMatterItem { class Randomizer(val matter: DecimalProvider, val luckBias: IntProvider = ConstantInt.ZERO) : LootItemFunction, LootItemFunction.Builder {