DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 64 Pull Requests Packages Releases Wiki Activity

Compare commits

base: DBot:0743ea2c9a282a43ce29754eda59ff7eeeec8cf2
Branches Tags
DBot:1.21
DBot:world-structures
DBot:worldgen-placement-providers
DBot:1.20.1
DBot:1.19.2
DBot:1.19.3
DBot:1.19.4
DBot:1.20.2
DBot:1.20
...
compare: DBot:74d48a7dc30acf30606c4048ba508c7ab5c482e4
Branches Tags
DBot:1.21
DBot:world-structures
DBot:worldgen-placement-providers
DBot:1.20.1
DBot:1.19.2
DBot:1.19.3
DBot:1.19.4
DBot:1.20.2
DBot:1.20

5 Commits
0743ea2c9a ... 74d48a7dc3

Author SHA1 Message Date
DBotThePony
74d48a7dc3
Update references after merge 2025-03-31 13:10:12 +07:00
DBotThePony
5b463e8adb
Merge branch '1.21' into worldgen-placement-providers 
# Conflicts:
#	src/data/kotlin/ru/dbotthepony/mc/otm/datagen/WorldGen.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/OverdriveThatMatters.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/registry/data/MWorldGenFeatures.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/server/world/EnhancedPlacedFeature.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/server/world/EnhancedPlacementContext.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/server/world/Ext.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/server/world/PlacementVariable.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/server/world/PlacementVariableMap.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/server/world/feature/DebugPlacerFeature.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/server/world/feature/EnhancedFeature.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/ChainPlacement.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EllipsoidPlacement.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedChainPlacement.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedCountPlacement.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedPlacement.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedSplitPlacement.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/SplitPlacement.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/StandardDeviationHeightProvider.kt
#	src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/WormPlacement.kt
 2025-03-31 13:02:27 +07:00
DBotThePony
a956d9a34f
Move feature to world subpackage 2025-03-31 09:32:32 +07:00
DBotThePony
9b1c192f09
Provide "enhanced" (count unlimited) item stack codecs 2025-03-31 09:12:12 +07:00
DBotThePony
2b589410f5
Move triggers and worldgen to server subpackage 2025-03-31 08:57:04 +07:00
62 changed files with 209 additions and 169 deletions
Show Stats Expand all files Collapse all files

24
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/WorldGen.kt
View File

@ -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.BooleanProvider
import ru.dbotthepony.mc.otm.data.world.OneOfFloatProvider import ru.dbotthepony.mc.otm.data.world.OneOfFloatProvider
import ru.dbotthepony.mc.otm.registry.MRegistries 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.game.MBlocks
import ru.dbotthepony.mc.otm.registry.data.MWorldGenFeatures 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.worldgen.feature.BlackHolePlacerFeature import ru.dbotthepony.mc.otm.server.world.feature.BlackHolePlacerFeature
import ru.dbotthepony.mc.otm.worldgen.feature.EnhancedFeature import ru.dbotthepony.mc.otm.server.world.feature.EnhancedFeature
import ru.dbotthepony.mc.otm.worldgen.placement import ru.dbotthepony.mc.otm.server.world.placement
import ru.dbotthepony.mc.otm.worldgen.placement.EllipsoidPlacement import ru.dbotthepony.mc.otm.server.world.placement.EllipsoidPlacement
import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedChainPlacement import ru.dbotthepony.mc.otm.server.world.placement.EnhancedChainPlacement
import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedCountPlacement import ru.dbotthepony.mc.otm.server.world.placement.EnhancedCountPlacement
import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedPlacement import ru.dbotthepony.mc.otm.server.world.placement.EnhancedPlacement
import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedSplitPlacement import ru.dbotthepony.mc.otm.server.world.placement.EnhancedSplitPlacement
import ru.dbotthepony.mc.otm.worldgen.placement.WormPlacement import ru.dbotthepony.mc.otm.server.world.placement.WormPlacement
import ru.dbotthepony.mc.otm.worldgen.wrap import ru.dbotthepony.mc.otm.server.world.wrap
private object ConfiguredFeatures { private object ConfiguredFeatures {
val TRITANIUM_ORE = key("tritanium_ore") val TRITANIUM_ORE = key("tritanium_ore")

4
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AdvancementData.kt
View File

@ -13,8 +13,8 @@ import ru.dbotthepony.mc.otm.datagen.modLocation
import ru.dbotthepony.mc.otm.registry.MItemTags import ru.dbotthepony.mc.otm.registry.MItemTags
import ru.dbotthepony.mc.otm.registry.game.MItems import ru.dbotthepony.mc.otm.registry.game.MItems
import ru.dbotthepony.mc.otm.registry.MRegistry import ru.dbotthepony.mc.otm.registry.MRegistry
import ru.dbotthepony.mc.otm.triggers.BlackHoleTrigger import ru.dbotthepony.mc.otm.server.triggers.BlackHoleTrigger
import ru.dbotthepony.mc.otm.triggers.NailedEntityTrigger import ru.dbotthepony.mc.otm.server.triggers.NailedEntityTrigger
import java.util.function.Consumer import java.util.function.Consumer
fun addAdvancements(serializer: Consumer<AdvancementHolder>, lang: MatteryLanguageProvider) { fun addAdvancements(serializer: Consumer<AdvancementHolder>, lang: MatteryLanguageProvider) {

26
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/AndroidAdvancementsData.kt
View File

@ -16,19 +16,19 @@ import ru.dbotthepony.mc.otm.datagen.modLocation
import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures
import ru.dbotthepony.mc.otm.registry.game.MItems import ru.dbotthepony.mc.otm.registry.game.MItems
import ru.dbotthepony.mc.otm.registry.MNames import ru.dbotthepony.mc.otm.registry.MNames
import ru.dbotthepony.mc.otm.triggers.AndroidBatteryTrigger import ru.dbotthepony.mc.otm.server.triggers.AndroidBatteryTrigger
import ru.dbotthepony.mc.otm.triggers.AndroidResearchTrigger import ru.dbotthepony.mc.otm.server.triggers.AndroidResearchTrigger
import ru.dbotthepony.mc.otm.triggers.AndroidTravelUnderwater import ru.dbotthepony.mc.otm.server.triggers.AndroidTravelUnderwater
import ru.dbotthepony.mc.otm.triggers.BecomeAndroidDeathTrigger import ru.dbotthepony.mc.otm.server.triggers.BecomeAndroidDeathTrigger
import ru.dbotthepony.mc.otm.triggers.BecomeAndroidSleepTrigger import ru.dbotthepony.mc.otm.server.triggers.BecomeAndroidSleepTrigger
import ru.dbotthepony.mc.otm.triggers.BecomeAndroidTrigger import ru.dbotthepony.mc.otm.server.triggers.BecomeAndroidTrigger
import ru.dbotthepony.mc.otm.triggers.BecomeHumaneTrigger import ru.dbotthepony.mc.otm.server.triggers.BecomeHumaneTrigger
import ru.dbotthepony.mc.otm.triggers.EnderTeleporterFallDeathTrigger import ru.dbotthepony.mc.otm.server.triggers.EnderTeleporterFallDeathTrigger
import ru.dbotthepony.mc.otm.triggers.FallDampenersSaveTrigger import ru.dbotthepony.mc.otm.server.triggers.FallDampenersSaveTrigger
import ru.dbotthepony.mc.otm.triggers.KillAsAndroidTrigger import ru.dbotthepony.mc.otm.server.triggers.KillAsAndroidTrigger
import ru.dbotthepony.mc.otm.triggers.NanobotsArmorTrigger import ru.dbotthepony.mc.otm.server.triggers.NanobotsArmorTrigger
import ru.dbotthepony.mc.otm.triggers.ShockwaveDamageMobTrigger import ru.dbotthepony.mc.otm.server.triggers.ShockwaveDamageMobTrigger
import ru.dbotthepony.mc.otm.triggers.ShockwaveTrigger import ru.dbotthepony.mc.otm.server.triggers.ShockwaveTrigger
import java.util.* import java.util.*
import java.util.function.Consumer import java.util.function.Consumer

12
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/ExopackAdvancementsData.kt
View File

@ -8,12 +8,12 @@ import net.minecraft.world.item.Items
import ru.dbotthepony.mc.otm.datagen.lang.MatteryLanguageProvider import ru.dbotthepony.mc.otm.datagen.lang.MatteryLanguageProvider
import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.datagen.modLocation
import ru.dbotthepony.mc.otm.registry.game.MItems import ru.dbotthepony.mc.otm.registry.game.MItems
import ru.dbotthepony.mc.otm.triggers.ExopackBatterySlotTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackBatterySlotTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackGainedCraftingTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackGainedCraftingTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackGainedEnderAccessTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackGainedEnderAccessTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackGainedSmeltingTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackGainedSmeltingTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackObtainedTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackObtainedTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackSlotsExpandedTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackSlotsExpandedTrigger
import java.util.function.Consumer import java.util.function.Consumer
fun addExopackAdvancements(serializer: Consumer<AdvancementHolder>, lang: MatteryLanguageProvider, root: AdvancementHolder, zpm: AdvancementHolder) { fun addExopackAdvancements(serializer: Consumer<AdvancementHolder>, lang: MatteryLanguageProvider, root: AdvancementHolder, zpm: AdvancementHolder) {

2
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt
View File

@ -13,7 +13,7 @@ import ru.dbotthepony.mc.otm.util.registryName
import ru.dbotthepony.mc.otm.datagen.lang.MatteryLanguageProvider import ru.dbotthepony.mc.otm.datagen.lang.MatteryLanguageProvider
import ru.dbotthepony.mc.otm.datagen.modLocation import ru.dbotthepony.mc.otm.datagen.modLocation
import ru.dbotthepony.mc.otm.registry.game.MItems import ru.dbotthepony.mc.otm.registry.game.MItems
import ru.dbotthepony.mc.otm.triggers.TakeItemOutOfReplicatorTrigger import ru.dbotthepony.mc.otm.server.triggers.TakeItemOutOfReplicatorTrigger
import java.util.function.Consumer import java.util.function.Consumer
data class CraftEntry( data class CraftEntry(

2
src/main/java/ru/dbotthepony/mc/otm/mixin/InventoryChangeTriggerMixin.java
View File

@ -6,7 +6,7 @@ import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import ru.dbotthepony.mc.otm.triggers.MatteryInventoryChangeTrigger; import ru.dbotthepony.mc.otm.server.triggers.MatteryInventoryChangeTrigger;
@Mixin(InventoryChangeTrigger.class) @Mixin(InventoryChangeTrigger.class)
public abstract class InventoryChangeTriggerMixin { public abstract class InventoryChangeTriggerMixin {

2
src/main/java/ru/dbotthepony/mc/otm/mixin/SimpleCriterionTriggerMixin.java
View File

@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import ru.dbotthepony.mc.otm.triggers.MatteryInventoryChangeTrigger; import ru.dbotthepony.mc.otm.server.triggers.MatteryInventoryChangeTrigger;
// i tried to mixin into InventoryChangeTrigger with extends SimpleCriterionTrigger and @Overwrite+@Override // i tried to mixin into InventoryChangeTrigger with extends SimpleCriterionTrigger and @Overwrite+@Override
// while also defining SimpleCriterionTrigger methods non final in accesstransfoer // while also defining SimpleCriterionTrigger methods non final in accesstransfoer

6
src/main/kotlin/ru/dbotthepony/mc/otm/OverdriveThatMatters.kt
View File

@ -93,9 +93,9 @@ import ru.dbotthepony.mc.otm.registry.data.MPlacementModifiers
import ru.dbotthepony.mc.otm.registry.data.MWorldGenFeatures import ru.dbotthepony.mc.otm.registry.data.MWorldGenFeatures
import ru.dbotthepony.mc.otm.server.MCommands import ru.dbotthepony.mc.otm.server.MCommands
import ru.dbotthepony.mc.otm.storage.StorageStack import ru.dbotthepony.mc.otm.storage.StorageStack
import ru.dbotthepony.mc.otm.triggers.KillAsAndroidTrigger import ru.dbotthepony.mc.otm.server.triggers.KillAsAndroidTrigger
import ru.dbotthepony.mc.otm.worldgen.feature.EnhancedFeature import ru.dbotthepony.mc.otm.server.world.feature.EnhancedFeature
import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedPlacement import ru.dbotthepony.mc.otm.server.world.placement.EnhancedPlacement
import thedarkcolour.kotlinforforge.neoforge.forge.DIST import thedarkcolour.kotlinforforge.neoforge.forge.DIST
import thedarkcolour.kotlinforforge.neoforge.forge.FORGE_BUS import thedarkcolour.kotlinforforge.neoforge.forge.FORGE_BUS
import thedarkcolour.kotlinforforge.neoforge.forge.LOADING_CONTEXT import thedarkcolour.kotlinforforge.neoforge.forge.LOADING_CONTEXT

3
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/Jobs.kt
View File

@ -18,6 +18,7 @@ import ru.dbotthepony.mc.otm.util.math.weakGreaterThan
import ru.dbotthepony.mc.otm.util.math.weakLessThan import ru.dbotthepony.mc.otm.util.math.weakLessThan
import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import ru.dbotthepony.mc.otm.data.codec.DecimalCodec
import ru.dbotthepony.mc.otm.data.codec.EnhancedItemStackCodecs
private fun isReason(status: Any?, reason: Any) = status == null || status == reason private fun isReason(status: Any?, reason: Any) = status == null || status == reason
private val LOGGER = LogManager.getLogger() private val LOGGER = LogManager.getLogger()
@ -67,7 +68,7 @@ open class ItemJob(
) : Job(ticks, power, experience) { ) : Job(ticks, power, experience) {
companion object { companion object {
fun <T : ItemJob> itemCodec(builder: RecordCodecBuilder.Instance<T>): Products.P4<RecordCodecBuilder.Mu<T>, ItemStack, Double, Decimal, Float> { fun <T : ItemJob> itemCodec(builder: RecordCodecBuilder.Instance<T>): Products.P4<RecordCodecBuilder.Mu<T>, ItemStack, Double, Decimal, Float> {
return builder.group(ItemStack.CODEC.fieldOf("Item").forGetter(ItemJob::itemStack)).and(basicCodec(builder)) return builder.group(EnhancedItemStackCodecs.CODEC.fieldOf("Item").forGetter(ItemJob::itemStack)).and(basicCodec(builder))
} }
val CODEC: Codec<ItemJob> by lazy { val CODEC: Codec<ItemJob> by lazy {

2
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/blackhole/BlackHoleBlockEntity.kt
View File

@ -46,7 +46,7 @@ import ru.dbotthepony.mc.otm.util.otmRandom
import ru.dbotthepony.mc.otm.matter.MatterManager import ru.dbotthepony.mc.otm.matter.MatterManager
import ru.dbotthepony.mc.otm.registry.MDamageTypes import ru.dbotthepony.mc.otm.registry.MDamageTypes
import ru.dbotthepony.mc.otm.registry.MatteryDamageSource import ru.dbotthepony.mc.otm.registry.MatteryDamageSource
import ru.dbotthepony.mc.otm.triggers.BlackHoleTrigger import ru.dbotthepony.mc.otm.server.triggers.BlackHoleTrigger
import kotlin.math.pow import kotlin.math.pow
import kotlin.math.roundToInt import kotlin.math.roundToInt
import kotlin.math.sqrt import kotlin.math.sqrt

3
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterEntanglerBlockEntity.kt
View File

@ -38,6 +38,7 @@ import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.mc.otm.container.ItemStackKey import ru.dbotthepony.mc.otm.container.ItemStackKey
import ru.dbotthepony.mc.otm.container.asKey import ru.dbotthepony.mc.otm.container.asKey
import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import ru.dbotthepony.mc.otm.data.codec.DecimalCodec
import ru.dbotthepony.mc.otm.data.codec.EnhancedItemStackCodecs
import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.data.codec.minRange
import ru.dbotthepony.mc.otm.graph.matter.MatterNode import ru.dbotthepony.mc.otm.graph.matter.MatterNode
import ru.dbotthepony.mc.otm.menu.matter.MatterEntanglerMenu import ru.dbotthepony.mc.otm.menu.matter.MatterEntanglerMenu
@ -53,7 +54,7 @@ class MatterEntanglerBlockEntity(blockPos: BlockPos, blockState: BlockState) : M
companion object { companion object {
val CODEC: Codec<Job> = RecordCodecBuilder.create { val CODEC: Codec<Job> = RecordCodecBuilder.create {
it.group( it.group(
ItemStack.CODEC.fieldOf("itemStack").forGetter(ItemJob::itemStack), EnhancedItemStackCodecs.CODEC.fieldOf("itemStack").forGetter(ItemJob::itemStack),
DecimalCodec.minRange(Decimal.ZERO).fieldOf("matter").forGetter(Job::matter), DecimalCodec.minRange(Decimal.ZERO).fieldOf("matter").forGetter(Job::matter),
Codec.DOUBLE.minRange(0.0).fieldOf("ticks").forGetter(ItemJob::ticks), Codec.DOUBLE.minRange(0.0).fieldOf("ticks").forGetter(ItemJob::ticks),
Codec.FLOAT.minRange(0f).optionalFieldOf("experience", 0f).forGetter(Job::experience) Codec.FLOAT.minRange(0f).optionalFieldOf("experience", 0f).forGetter(Job::experience)

3
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt
View File

@ -30,6 +30,7 @@ import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer
import ru.dbotthepony.mc.otm.util.math.Decimal import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.mc.otm.util.otmRandom import ru.dbotthepony.mc.otm.util.otmRandom
import ru.dbotthepony.mc.otm.data.codec.DecimalCodec import ru.dbotthepony.mc.otm.data.codec.DecimalCodec
import ru.dbotthepony.mc.otm.data.codec.EnhancedItemStackCodecs
import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.data.codec.minRange
import ru.dbotthepony.mc.otm.graph.matter.MatterNode import ru.dbotthepony.mc.otm.graph.matter.MatterNode
import ru.dbotthepony.mc.otm.matter.MatterManager import ru.dbotthepony.mc.otm.matter.MatterManager
@ -55,7 +56,7 @@ class MatterReplicatorBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) :
val CODEC: Codec<ReplicatorJob> by lazy { val CODEC: Codec<ReplicatorJob> by lazy {
RecordCodecBuilder.create { RecordCodecBuilder.create {
it.group( it.group(
ItemStack.CODEC.fieldOf("Item").forGetter(ReplicatorJob::itemStack), EnhancedItemStackCodecs.CODEC.fieldOf("Item").forGetter(ReplicatorJob::itemStack),
DecimalCodec.minRange(Decimal.ZERO).fieldOf("matterPerTick").forGetter(ReplicatorJob::matterPerTick), DecimalCodec.minRange(Decimal.ZERO).fieldOf("matterPerTick").forGetter(ReplicatorJob::matterPerTick),
UUIDUtil.CODEC.fieldOf("task").forGetter(ReplicatorJob::task), UUIDUtil.CODEC.fieldOf("task").forGetter(ReplicatorJob::task),
DecimalCodec.minRange(Decimal.ZERO).fieldOf("matterValue").forGetter(ReplicatorJob::matterValue), DecimalCodec.minRange(Decimal.ZERO).fieldOf("matterValue").forGetter(ReplicatorJob::matterValue),

4
src/main/kotlin/ru/dbotthepony/mc/otm/capability/energy/BatteryBackedEnergyStorage.kt
View File

@ -18,8 +18,8 @@ import ru.dbotthepony.mc.otm.util.math.Decimal
import ru.dbotthepony.mc.otm.util.getDecimal import ru.dbotthepony.mc.otm.util.getDecimal
import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.registry.StatNames import ru.dbotthepony.mc.otm.registry.StatNames
import ru.dbotthepony.mc.otm.triggers.AndroidBatteryTrigger import ru.dbotthepony.mc.otm.server.triggers.AndroidBatteryTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackBatterySlotTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackBatterySlotTrigger
class BatteryBackedEnergyStorage( class BatteryBackedEnergyStorage(
private val ply: Player, private val ply: Player,

5
src/main/kotlin/ru/dbotthepony/mc/otm/container/EnhancedContainer.kt
View File

@ -13,6 +13,7 @@ import net.minecraft.world.item.ItemStack
import net.neoforged.neoforge.common.util.INBTSerializable import net.neoforged.neoforge.common.util.INBTSerializable
import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.LogManager
import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer import ru.dbotthepony.mc.otm.container.slotted.SlottedContainer
import ru.dbotthepony.mc.otm.data.codec.EnhancedItemStackCodecs
import ru.dbotthepony.mc.otm.util.isNotEmpty import ru.dbotthepony.mc.otm.util.isNotEmpty
import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.util.set
@ -133,7 +134,7 @@ abstract class EnhancedContainer<out S : IContainerSlot>(private val size: Int)
if (items[i].isNotEmpty) { if (items[i].isNotEmpty) {
attached = true attached = true
tag["item"] = ItemStack.OPTIONAL_CODEC.encodeStart(ops, items[i]) tag["item"] = EnhancedItemStackCodecs.OPTIONAL_CODEC.encodeStart(ops, items[i])
.getOrThrow { RuntimeException("Unable to serialize item ${items[i]} at slot $i: $it") } .getOrThrow { RuntimeException("Unable to serialize item ${items[i]} at slot $i: $it") }
} }
@ -165,7 +166,7 @@ abstract class EnhancedContainer<out S : IContainerSlot>(private val size: Int)
if (!seenSlots.add(slot)) continue if (!seenSlots.add(slot)) continue
if ("item" in element) { if ("item" in element) {
ItemStack.OPTIONAL_CODEC.decode(ops, element["item"]) EnhancedItemStackCodecs.OPTIONAL_CODEC.decode(ops, element["item"])
.map { it.first } .map { it.first }
.ifError { LOGGER.error("Failed to deserialize item stack in slot $slot: ${it.message()}") } .ifError { LOGGER.error("Failed to deserialize item stack in slot $slot: ${it.message()}") }
.ifSuccess { .ifSuccess {

5
src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/ContainerSlot.kt
View File

@ -8,6 +8,7 @@ import net.minecraft.world.item.ItemStack
import net.neoforged.neoforge.common.util.INBTSerializable import net.neoforged.neoforge.common.util.INBTSerializable
import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.LogManager
import ru.dbotthepony.mc.otm.container.IAutomatedContainerSlot import ru.dbotthepony.mc.otm.container.IAutomatedContainerSlot
import ru.dbotthepony.mc.otm.data.codec.EnhancedItemStackCodecs
import ru.dbotthepony.mc.otm.util.isNotEmpty import ru.dbotthepony.mc.otm.util.isNotEmpty
import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.data.getOrNull import ru.dbotthepony.mc.otm.data.getOrNull
@ -97,13 +98,13 @@ open class ContainerSlot(
override fun serializeNBT(provider: HolderLookup.Provider): CompoundTag { override fun serializeNBT(provider: HolderLookup.Provider): CompoundTag {
return CompoundTag().also { return CompoundTag().also {
it["item"] = ItemStack.OPTIONAL_CODEC.encodeStart(provider.createSerializationContext(NbtOps.INSTANCE), item) it["item"] = EnhancedItemStackCodecs.OPTIONAL_CODEC.encodeStart(provider.createSerializationContext(NbtOps.INSTANCE), item)
.getOrThrow { RuntimeException("Unable to serialize $item in slot $slot: $it") } .getOrThrow { RuntimeException("Unable to serialize $item in slot $slot: $it") }
} }
} }
override fun deserializeNBT(provider: HolderLookup.Provider, nbt: CompoundTag) { override fun deserializeNBT(provider: HolderLookup.Provider, nbt: CompoundTag) {
_item = ItemStack.OPTIONAL_CODEC.decode(provider.createSerializationContext(NbtOps.INSTANCE), nbt["item"]) _item = EnhancedItemStackCodecs.OPTIONAL_CODEC.decode(provider.createSerializationContext(NbtOps.INSTANCE), nbt["item"])
.ifError { LOGGER.error("Unable to deserialize item at slot $slot: ${it.message()}") } .ifError { LOGGER.error("Unable to deserialize item at slot $slot: ${it.message()}") }
.getOrNull()?.first ?: ItemStack.EMPTY .getOrNull()?.first ?: ItemStack.EMPTY

7
src/main/kotlin/ru/dbotthepony/mc/otm/container/slotted/SlottedContainer.kt
View File

@ -23,6 +23,7 @@ import ru.dbotthepony.mc.otm.container.IAutomatedContainer
import ru.dbotthepony.mc.otm.container.IFilteredContainerSlot import ru.dbotthepony.mc.otm.container.IFilteredContainerSlot
import ru.dbotthepony.mc.otm.container.ItemFilter import ru.dbotthepony.mc.otm.container.ItemFilter
import ru.dbotthepony.mc.otm.container.balance import ru.dbotthepony.mc.otm.container.balance
import ru.dbotthepony.mc.otm.data.codec.EnhancedItemStackCodecs
import ru.dbotthepony.mc.otm.util.isNotEmpty import ru.dbotthepony.mc.otm.util.isNotEmpty
import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.data.codec.minRange
@ -183,7 +184,7 @@ class SlottedContainer(
companion object { companion object {
val CODEC: Codec<LegacySerializedItem> = RecordCodecBuilder.create { val CODEC: Codec<LegacySerializedItem> = RecordCodecBuilder.create {
it.group( it.group(
ItemStack.OPTIONAL_CODEC.fieldOf("item").forGetter { it.item }, EnhancedItemStackCodecs.OPTIONAL_CODEC.fieldOf("item").forGetter { it.item },
Codec.INT.minRange(0).fieldOf("slot").forGetter { it.slot }, Codec.INT.minRange(0).fieldOf("slot").forGetter { it.slot },
).apply(it, SlottedContainer::LegacySerializedItem) ).apply(it, SlottedContainer::LegacySerializedItem)
} }
@ -227,7 +228,7 @@ class SlottedContainer(
for (entry in lostItems) { for (entry in lostItems) {
if ("item" in entry) { if ("item" in entry) {
ItemStack.OPTIONAL_CODEC.decode(provider, entry["item"]) EnhancedItemStackCodecs.OPTIONAL_CODEC.decode(provider, entry["item"])
.ifError { LOGGER.warn("Unable to deserialize 'lost' item: ${it.message()}") } .ifError { LOGGER.warn("Unable to deserialize 'lost' item: ${it.message()}") }
.ifSuccess { if (it.first.isNotEmpty) result.add(it.first) } .ifSuccess { if (it.first.isNotEmpty) result.add(it.first) }
} }
@ -275,7 +276,7 @@ class SlottedContainer(
slots[slot].item = item slots[slot].item = item
bitmap[slot] = item.isNotEmpty bitmap[slot] = item.isNotEmpty
} else if (item.isNotEmpty) { } else if (item.isNotEmpty) {
ItemStack.CODEC.encodeStart(provider.createSerializationContext(NbtOps.INSTANCE), item) EnhancedItemStackCodecs.CODEC.encodeStart(provider.createSerializationContext(NbtOps.INSTANCE), item)
.ifError { LOGGER.warn("Unable to serialize 'lost' item: ${it.message()}") } .ifError { LOGGER.warn("Unable to serialize 'lost' item: ${it.message()}") }
.ifSuccess { s -> .ifSuccess { s ->
this.provider = provider this.provider = provider

26
src/main/kotlin/ru/dbotthepony/mc/otm/data/codec/EnhancedItemStackCodecs.kt Normal file
View File

@ -0,0 +1,26 @@
package ru.dbotthepony.mc.otm.data.codec
import com.mojang.serialization.Codec
import com.mojang.serialization.codecs.RecordCodecBuilder
import net.minecraft.core.component.DataComponentPatch
import net.minecraft.util.ExtraCodecs
import net.minecraft.world.item.ItemStack
import java.util.*
import kotlin.jvm.optionals.getOrElse
object EnhancedItemStackCodecs {
val CODEC: Codec<ItemStack> by lazy {
RecordCodecBuilder.create {
it.group(
ItemStack.ITEM_NON_AIR_CODEC.fieldOf("id").forGetter(ItemStack::getItemHolder),
Codec.INT.minRange(1).fieldOf("count").orElse(1).forGetter(ItemStack::getCount),
DataComponentPatch.CODEC.optionalFieldOf("components", DataComponentPatch.EMPTY).forGetter(ItemStack::getComponentsPatch)
).apply(it, ::ItemStack)
}
}
val OPTIONAL_CODEC: Codec<ItemStack> by lazy {
ExtraCodecs.optionalEmptyMap(CODEC)
.xmap({ it.getOrElse { ItemStack.EMPTY } }, { if (it.isEmpty) Optional.empty() else Optional.of(it) })
}
}

3
src/main/kotlin/ru/dbotthepony/mc/otm/data/condition/ItemInInventoryCondition.kt
View File

@ -10,6 +10,7 @@ import net.minecraft.world.level.storage.loot.predicates.LootItemCondition
import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType
import ru.dbotthepony.mc.otm.capability.items import ru.dbotthepony.mc.otm.capability.items
import ru.dbotthepony.kommons.collect.filter import ru.dbotthepony.kommons.collect.filter
import ru.dbotthepony.mc.otm.data.codec.EnhancedItemStackCodecs
import ru.dbotthepony.mc.otm.data.get import ru.dbotthepony.mc.otm.data.get
import ru.dbotthepony.mc.otm.registry.data.MLootItemConditions import ru.dbotthepony.mc.otm.registry.data.MLootItemConditions
@ -48,7 +49,7 @@ data class ItemInInventoryCondition(
val CODEC: MapCodec<ItemInInventoryCondition> by lazy { val CODEC: MapCodec<ItemInInventoryCondition> by lazy {
RecordCodecBuilder.mapCodec { RecordCodecBuilder.mapCodec {
it.group( it.group(
ItemStack.CODEC.fieldOf("item").forGetter(ItemInInventoryCondition::item), EnhancedItemStackCodecs.CODEC.fieldOf("item").forGetter(ItemInInventoryCondition::item),
Codec.BOOL.optionalFieldOf("matchComponents", false).forGetter(ItemInInventoryCondition::matchComponents), Codec.BOOL.optionalFieldOf("matchComponents", false).forGetter(ItemInInventoryCondition::matchComponents),
Codec.BOOL.optionalFieldOf("matchCosmetics", false).forGetter(ItemInInventoryCondition::matchCosmetics), Codec.BOOL.optionalFieldOf("matchCosmetics", false).forGetter(ItemInInventoryCondition::matchCosmetics),
).apply(it, ::ItemInInventoryCondition) ).apply(it, ::ItemInInventoryCondition)

2
src/main/kotlin/ru/dbotthepony/mc/otm/item/exopack/AbstractExopackSlotUpgradeItem.kt
View File

@ -24,7 +24,7 @@ import ru.dbotthepony.mc.otm.util.nextUUID
import ru.dbotthepony.mc.otm.util.otmRandom import ru.dbotthepony.mc.otm.util.otmRandom
import ru.dbotthepony.mc.otm.registry.game.MItems import ru.dbotthepony.mc.otm.registry.game.MItems
import ru.dbotthepony.mc.otm.runIfClient import ru.dbotthepony.mc.otm.runIfClient
import ru.dbotthepony.mc.otm.triggers.ExopackSlotsExpandedTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackSlotsExpandedTrigger
import java.util.UUID import java.util.UUID
abstract class AbstractExopackSlotUpgradeItem(properties: Properties = defaultProperties()) : Item(properties) { abstract class AbstractExopackSlotUpgradeItem(properties: Properties = defaultProperties()) : Item(properties) {

2
src/main/kotlin/ru/dbotthepony/mc/otm/item/tool/ExplosiveHammerItem.kt
View File

@ -40,7 +40,7 @@ import ru.dbotthepony.mc.otm.util.math.*
import ru.dbotthepony.mc.otm.registry.MDamageTypes import ru.dbotthepony.mc.otm.registry.MDamageTypes
import ru.dbotthepony.mc.otm.registry.game.MDataComponentTypes import ru.dbotthepony.mc.otm.registry.game.MDataComponentTypes
import ru.dbotthepony.mc.otm.registry.MatteryDamageSource import ru.dbotthepony.mc.otm.registry.MatteryDamageSource
import ru.dbotthepony.mc.otm.triggers.NailedEntityTrigger import ru.dbotthepony.mc.otm.server.triggers.NailedEntityTrigger
import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.util.TranslatableComponent
import ru.dbotthepony.mc.otm.util.damageType import ru.dbotthepony.mc.otm.util.damageType
import ru.dbotthepony.mc.otm.util.getExplosionResistance import ru.dbotthepony.mc.otm.util.getExplosionResistance

2
src/main/kotlin/ru/dbotthepony/mc/otm/menu/matter/MatterReplicatorMenu.kt
View File

@ -17,7 +17,7 @@ import ru.dbotthepony.mc.otm.menu.input.ItemConfigPlayerInput
import ru.dbotthepony.mc.otm.menu.makeUpgradeSlots import ru.dbotthepony.mc.otm.menu.makeUpgradeSlots
import ru.dbotthepony.mc.otm.menu.widget.ProfiledLevelGaugeWidget import ru.dbotthepony.mc.otm.menu.widget.ProfiledLevelGaugeWidget
import ru.dbotthepony.mc.otm.registry.game.MMenus import ru.dbotthepony.mc.otm.registry.game.MMenus
import ru.dbotthepony.mc.otm.triggers.TakeItemOutOfReplicatorTrigger import ru.dbotthepony.mc.otm.server.triggers.TakeItemOutOfReplicatorTrigger
class MatterReplicatorMenu @JvmOverloads constructor( class MatterReplicatorMenu @JvmOverloads constructor(
p_38852_: Int, p_38852_: Int,

2
src/main/kotlin/ru/dbotthepony/mc/otm/player/ExopackContainer.kt
View File

@ -7,7 +7,7 @@ import ru.dbotthepony.mc.otm.container.EnhancedContainer
import ru.dbotthepony.mc.otm.container.IContainerSlot import ru.dbotthepony.mc.otm.container.IContainerSlot
import ru.dbotthepony.mc.otm.container.IEnhancedContainer import ru.dbotthepony.mc.otm.container.IEnhancedContainer
import ru.dbotthepony.mc.otm.container.ItemFilter import ru.dbotthepony.mc.otm.container.ItemFilter
import ru.dbotthepony.mc.otm.triggers.MatteryInventoryChangeTrigger import ru.dbotthepony.mc.otm.server.triggers.MatteryInventoryChangeTrigger
class ExopackContainer(size: Int, val player: MatteryPlayer) : EnhancedContainer<IPlayerInventorySlot>(size) { class ExopackContainer(size: Int, val player: MatteryPlayer) : EnhancedContainer<IPlayerInventorySlot>(size) {
private inner class Slot(slot: Int) : IContainerSlot.Simple(slot, this@ExopackContainer), IPlayerInventorySlot { private inner class Slot(slot: Int) : IContainerSlot.Simple(slot, this@ExopackContainer), IPlayerInventorySlot {

22
src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt
View File

@ -101,17 +101,17 @@ import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures
import ru.dbotthepony.mc.otm.registry.MDamageTypes import ru.dbotthepony.mc.otm.registry.MDamageTypes
import ru.dbotthepony.mc.otm.registry.game.MItems import ru.dbotthepony.mc.otm.registry.game.MItems
import ru.dbotthepony.mc.otm.registry.MatteryDamageSource import ru.dbotthepony.mc.otm.registry.MatteryDamageSource
import ru.dbotthepony.mc.otm.triggers.AndroidResearchTrigger import ru.dbotthepony.mc.otm.server.triggers.AndroidResearchTrigger
import ru.dbotthepony.mc.otm.triggers.AndroidTravelUnderwater import ru.dbotthepony.mc.otm.server.triggers.AndroidTravelUnderwater
import ru.dbotthepony.mc.otm.triggers.BecomeAndroidDeathTrigger import ru.dbotthepony.mc.otm.server.triggers.BecomeAndroidDeathTrigger
import ru.dbotthepony.mc.otm.triggers.BecomeAndroidSleepTrigger import ru.dbotthepony.mc.otm.server.triggers.BecomeAndroidSleepTrigger
import ru.dbotthepony.mc.otm.triggers.BecomeAndroidTrigger import ru.dbotthepony.mc.otm.server.triggers.BecomeAndroidTrigger
import ru.dbotthepony.mc.otm.triggers.BecomeHumaneTrigger import ru.dbotthepony.mc.otm.server.triggers.BecomeHumaneTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackGainedCraftingTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackGainedCraftingTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackGainedEnderAccessTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackGainedEnderAccessTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackGainedSmeltingTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackGainedSmeltingTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackObtainedTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackObtainedTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackSlotsExpandedTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackSlotsExpandedTrigger
import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.util.ResourceLocation
import ru.dbotthepony.mc.otm.util.TranslatableComponent import ru.dbotthepony.mc.otm.util.TranslatableComponent
import ru.dbotthepony.mc.otm.util.damageType import ru.dbotthepony.mc.otm.util.damageType

2
src/main/kotlin/ru/dbotthepony/mc/otm/player/android/AndroidResearch.kt
View File

@ -20,7 +20,7 @@ import ru.dbotthepony.mc.otm.util.TranslatableComponent
import ru.dbotthepony.mc.otm.util.registryName import ru.dbotthepony.mc.otm.util.registryName
import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.milliTime import ru.dbotthepony.mc.otm.milliTime
import ru.dbotthepony.mc.otm.triggers.AndroidResearchTrigger import ru.dbotthepony.mc.otm.server.triggers.AndroidResearchTrigger
import kotlin.math.absoluteValue import kotlin.math.absoluteValue
class AndroidResearch(val type: AndroidResearchType, val capability: MatteryPlayer) : INBTSerializable<CompoundTag> { class AndroidResearch(val type: AndroidResearchType, val capability: MatteryPlayer) : INBTSerializable<CompoundTag> {

2
src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/EnderTeleporterFeature.kt
View File

@ -52,7 +52,7 @@ import ru.dbotthepony.mc.otm.util.math.times
import ru.dbotthepony.mc.otm.util.otmRandom import ru.dbotthepony.mc.otm.util.otmRandom
import ru.dbotthepony.mc.otm.milliTime import ru.dbotthepony.mc.otm.milliTime
import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures
import ru.dbotthepony.mc.otm.triggers.EnderTeleporterFallDeathTrigger import ru.dbotthepony.mc.otm.server.triggers.EnderTeleporterFallDeathTrigger
import java.util.* import java.util.*
import kotlin.math.sin import kotlin.math.sin

2
src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/FallDampenersFeature.kt
View File

@ -7,7 +7,7 @@ import ru.dbotthepony.mc.otm.player.MatteryPlayer
import ru.dbotthepony.mc.otm.config.PlayerConfig import ru.dbotthepony.mc.otm.config.PlayerConfig
import ru.dbotthepony.mc.otm.util.isFall import ru.dbotthepony.mc.otm.util.isFall
import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures
import ru.dbotthepony.mc.otm.triggers.FallDampenersSaveTrigger import ru.dbotthepony.mc.otm.server.triggers.FallDampenersSaveTrigger
class FallDampenersFeature(capability: MatteryPlayer) : AndroidFeature(AndroidFeatures.FALL_DAMPENERS, capability) { class FallDampenersFeature(capability: MatteryPlayer) : AndroidFeature(AndroidFeatures.FALL_DAMPENERS, capability) {
override fun onHurt(event: LivingIncomingDamageEvent) { override fun onHurt(event: LivingIncomingDamageEvent) {

2
src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/NanobotsArmorFeature.kt
View File

@ -16,7 +16,7 @@ import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures
import ru.dbotthepony.mc.otm.registry.StatNames import ru.dbotthepony.mc.otm.registry.StatNames
import ru.dbotthepony.mc.otm.util.set import ru.dbotthepony.mc.otm.util.set
import ru.dbotthepony.mc.otm.onceServer import ru.dbotthepony.mc.otm.onceServer
import ru.dbotthepony.mc.otm.triggers.NanobotsArmorTrigger import ru.dbotthepony.mc.otm.server.triggers.NanobotsArmorTrigger
import kotlin.math.roundToInt import kotlin.math.roundToInt
class NanobotsArmorFeature(android: MatteryPlayer) : AndroidFeature(AndroidFeatures.NANOBOTS_ARMOR, android) { class NanobotsArmorFeature(android: MatteryPlayer) : AndroidFeature(AndroidFeatures.NANOBOTS_ARMOR, android) {

4
src/main/kotlin/ru/dbotthepony/mc/otm/player/android/feature/ShockwaveFeature.kt
View File

@ -30,8 +30,8 @@ import ru.dbotthepony.mc.otm.registry.game.AndroidFeatures
import ru.dbotthepony.mc.otm.registry.MDamageTypes import ru.dbotthepony.mc.otm.registry.MDamageTypes
import ru.dbotthepony.mc.otm.registry.game.MSoundEvents import ru.dbotthepony.mc.otm.registry.game.MSoundEvents
import ru.dbotthepony.mc.otm.registry.MatteryDamageSource import ru.dbotthepony.mc.otm.registry.MatteryDamageSource
import ru.dbotthepony.mc.otm.triggers.ShockwaveDamageMobTrigger import ru.dbotthepony.mc.otm.server.triggers.ShockwaveDamageMobTrigger
import ru.dbotthepony.mc.otm.triggers.ShockwaveTrigger import ru.dbotthepony.mc.otm.server.triggers.ShockwaveTrigger
import kotlin.math.pow import kotlin.math.pow
import kotlin.math.roundToInt import kotlin.math.roundToInt

3
src/main/kotlin/ru/dbotthepony/mc/otm/recipe/MatterEntanglerRecipe.kt
View File

@ -22,6 +22,7 @@ import ru.dbotthepony.kommons.collect.filterNotNull
import ru.dbotthepony.kommons.collect.map import ru.dbotthepony.kommons.collect.map
import ru.dbotthepony.mc.otm.util.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.DecimalCodec
import ru.dbotthepony.mc.otm.data.codec.EnhancedItemStackCodecs
import ru.dbotthepony.mc.otm.data.codec.minRange import ru.dbotthepony.mc.otm.data.codec.minRange
import ru.dbotthepony.mc.otm.network.StreamCodecs import ru.dbotthepony.mc.otm.network.StreamCodecs
import ru.dbotthepony.mc.otm.network.optional import ru.dbotthepony.mc.otm.network.optional
@ -168,7 +169,7 @@ open class MatterEntanglerRecipe(
ShapedRecipePattern.MAP_CODEC.fieldOf("ingredients").forGetter(MatterEntanglerRecipe::ingredients), ShapedRecipePattern.MAP_CODEC.fieldOf("ingredients").forGetter(MatterEntanglerRecipe::ingredients),
DecimalCodec.minRange(Decimal.ZERO).fieldOf("matter").forGetter(MatterEntanglerRecipe::matter), DecimalCodec.minRange(Decimal.ZERO).fieldOf("matter").forGetter(MatterEntanglerRecipe::matter),
Codec.DOUBLE.minRange(0.0).fieldOf("ticks").forGetter(MatterEntanglerRecipe::ticks), Codec.DOUBLE.minRange(0.0).fieldOf("ticks").forGetter(MatterEntanglerRecipe::ticks),
ItemStack.CODEC.fieldOf("result").forGetter(MatterEntanglerRecipe::result), EnhancedItemStackCodecs.CODEC.fieldOf("result").forGetter(MatterEntanglerRecipe::result),
Codec.FLOAT.minRange(0f).optionalFieldOf("experience", 0f).forGetter(MatterEntanglerRecipe::experience), Codec.FLOAT.minRange(0f).optionalFieldOf("experience", 0f).forGetter(MatterEntanglerRecipe::experience),
(DataComponentType.CODEC as Codec<DataComponentType<UUID>>).optionalFieldOf("uuidKey").forGetter(MatterEntanglerRecipe::uuidKey), (DataComponentType.CODEC as Codec<DataComponentType<UUID>>).optionalFieldOf("uuidKey").forGetter(MatterEntanglerRecipe::uuidKey),
UUIDUtil.STRING_CODEC.optionalFieldOf("fixedUuid").forGetter(MatterEntanglerRecipe::fixedUuid) UUIDUtil.STRING_CODEC.optionalFieldOf("fixedUuid").forGetter(MatterEntanglerRecipe::fixedUuid)

44
src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCriteriaTriggers.kt
View File

@ -2,28 +2,28 @@ package ru.dbotthepony.mc.otm.registry
import net.minecraft.core.registries.BuiltInRegistries import net.minecraft.core.registries.BuiltInRegistries
import net.neoforged.bus.api.IEventBus import net.neoforged.bus.api.IEventBus
import ru.dbotthepony.mc.otm.triggers.AndroidBatteryTrigger import ru.dbotthepony.mc.otm.server.triggers.AndroidBatteryTrigger
import ru.dbotthepony.mc.otm.triggers.AndroidResearchTrigger import ru.dbotthepony.mc.otm.server.triggers.AndroidResearchTrigger
import ru.dbotthepony.mc.otm.triggers.AndroidTravelUnderwater import ru.dbotthepony.mc.otm.server.triggers.AndroidTravelUnderwater
import ru.dbotthepony.mc.otm.triggers.BecomeAndroidDeathTrigger import ru.dbotthepony.mc.otm.server.triggers.BecomeAndroidDeathTrigger
import ru.dbotthepony.mc.otm.triggers.BecomeAndroidSleepTrigger import ru.dbotthepony.mc.otm.server.triggers.BecomeAndroidSleepTrigger
import ru.dbotthepony.mc.otm.triggers.BecomeAndroidTrigger import ru.dbotthepony.mc.otm.server.triggers.BecomeAndroidTrigger
import ru.dbotthepony.mc.otm.triggers.BecomeHumaneTrigger import ru.dbotthepony.mc.otm.server.triggers.BecomeHumaneTrigger
import ru.dbotthepony.mc.otm.triggers.BlackHoleTrigger import ru.dbotthepony.mc.otm.server.triggers.BlackHoleTrigger
import ru.dbotthepony.mc.otm.triggers.EnderTeleporterFallDeathTrigger import ru.dbotthepony.mc.otm.server.triggers.EnderTeleporterFallDeathTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackBatterySlotTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackBatterySlotTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackGainedCraftingTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackGainedCraftingTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackGainedEnderAccessTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackGainedEnderAccessTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackGainedSmeltingTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackGainedSmeltingTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackObtainedTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackObtainedTrigger
import ru.dbotthepony.mc.otm.triggers.ExopackSlotsExpandedTrigger import ru.dbotthepony.mc.otm.server.triggers.ExopackSlotsExpandedTrigger
import ru.dbotthepony.mc.otm.triggers.FallDampenersSaveTrigger import ru.dbotthepony.mc.otm.server.triggers.FallDampenersSaveTrigger
import ru.dbotthepony.mc.otm.triggers.KillAsAndroidTrigger import ru.dbotthepony.mc.otm.server.triggers.KillAsAndroidTrigger
import ru.dbotthepony.mc.otm.triggers.NailedEntityTrigger import ru.dbotthepony.mc.otm.server.triggers.NailedEntityTrigger
import ru.dbotthepony.mc.otm.triggers.NanobotsArmorTrigger import ru.dbotthepony.mc.otm.server.triggers.NanobotsArmorTrigger
import ru.dbotthepony.mc.otm.triggers.ShockwaveDamageMobTrigger import ru.dbotthepony.mc.otm.server.triggers.ShockwaveDamageMobTrigger
import ru.dbotthepony.mc.otm.triggers.ShockwaveTrigger import ru.dbotthepony.mc.otm.server.triggers.ShockwaveTrigger
import ru.dbotthepony.mc.otm.triggers.TakeItemOutOfReplicatorTrigger import ru.dbotthepony.mc.otm.server.triggers.TakeItemOutOfReplicatorTrigger
object MCriteriaTriggers { object MCriteriaTriggers {
private val registrar = MDeferredRegister(BuiltInRegistries.TRIGGER_TYPES) private val registrar = MDeferredRegister(BuiltInRegistries.TRIGGER_TYPES)

4
src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistries.kt
View File

@ -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.AndroidResearchDescription
import ru.dbotthepony.mc.otm.player.android.AndroidResearchResult import ru.dbotthepony.mc.otm.player.android.AndroidResearchResult
import ru.dbotthepony.mc.otm.storage.StorageStack import ru.dbotthepony.mc.otm.storage.StorageStack
import ru.dbotthepony.mc.otm.worldgen.feature.EnhancedFeature import ru.dbotthepony.mc.otm.server.world.feature.EnhancedFeature
import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedPlacement import ru.dbotthepony.mc.otm.server.world.placement.EnhancedPlacement
object MRegistries { object MRegistries {
private fun <T> k(name: String): ResourceKey<Registry<T>> { private fun <T> k(name: String): ResourceKey<Registry<T>> {

2
src/main/kotlin/ru/dbotthepony/mc/otm/registry/data/MHeightProviders.kt
View File

@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.registry.data
import net.minecraft.core.registries.BuiltInRegistries import net.minecraft.core.registries.BuiltInRegistries
import net.minecraft.world.level.levelgen.heightproviders.HeightProviderType import net.minecraft.world.level.levelgen.heightproviders.HeightProviderType
import net.neoforged.bus.api.IEventBus 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 import ru.dbotthepony.mc.otm.registry.MDeferredRegister
object MHeightProviders { object MHeightProviders {

16
src/main/kotlin/ru/dbotthepony/mc/otm/registry/data/MPlacementModifiers.kt
View File

@ -5,14 +5,14 @@ import net.minecraft.world.level.levelgen.placement.PlacementModifierType
import net.neoforged.bus.api.IEventBus import net.neoforged.bus.api.IEventBus
import ru.dbotthepony.mc.otm.registry.MDeferredRegister import ru.dbotthepony.mc.otm.registry.MDeferredRegister
import ru.dbotthepony.mc.otm.registry.MRegistries import ru.dbotthepony.mc.otm.registry.MRegistries
import ru.dbotthepony.mc.otm.worldgen.feature.EnhancedFeature import ru.dbotthepony.mc.otm.server.world.feature.EnhancedFeature
import ru.dbotthepony.mc.otm.worldgen.placement.ChainPlacement import ru.dbotthepony.mc.otm.server.world.placement.ChainPlacement
import ru.dbotthepony.mc.otm.worldgen.placement.EllipsoidPlacement import ru.dbotthepony.mc.otm.server.world.placement.EllipsoidPlacement
import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedChainPlacement import ru.dbotthepony.mc.otm.server.world.placement.EnhancedChainPlacement
import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedCountPlacement import ru.dbotthepony.mc.otm.server.world.placement.EnhancedCountPlacement
import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedSplitPlacement import ru.dbotthepony.mc.otm.server.world.placement.EnhancedSplitPlacement
import ru.dbotthepony.mc.otm.worldgen.placement.SplitPlacement import ru.dbotthepony.mc.otm.server.world.placement.SplitPlacement
import ru.dbotthepony.mc.otm.worldgen.placement.WormPlacement import ru.dbotthepony.mc.otm.server.world.placement.WormPlacement
object MPlacementModifiers { object MPlacementModifiers {
private val registry = MDeferredRegister(BuiltInRegistries.PLACEMENT_MODIFIER_TYPE) private val registry = MDeferredRegister(BuiltInRegistries.PLACEMENT_MODIFIER_TYPE)

6
src/main/kotlin/ru/dbotthepony/mc/otm/registry/data/MWorldGenFeatures.kt
View File

@ -4,9 +4,9 @@ import net.minecraft.core.registries.BuiltInRegistries
import net.neoforged.bus.api.IEventBus import net.neoforged.bus.api.IEventBus
import ru.dbotthepony.kommons.util.getValue import ru.dbotthepony.kommons.util.getValue
import ru.dbotthepony.mc.otm.registry.MDeferredRegister 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.worldgen.feature.BlackHolePlacerFeature 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 { object MWorldGenFeatures {
private val registry = MDeferredRegister(BuiltInRegistries.FEATURE) private val registry = MDeferredRegister(BuiltInRegistries.FEATURE)

4
src/main/kotlin/ru/dbotthepony/mc/otm/triggers/AndroidResearchTrigger.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/AndroidResearchTrigger.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.triggers package ru.dbotthepony.mc.otm.server.triggers
import com.mojang.serialization.Codec import com.mojang.serialization.Codec
import com.mojang.serialization.codecs.RecordCodecBuilder import com.mojang.serialization.codecs.RecordCodecBuilder
@ -20,7 +20,7 @@ object AndroidResearchTrigger : MCriterionTrigger<AndroidResearchTrigger.Instanc
it.group( it.group(
ResourceLocation.CODEC.optionalFieldOf("research").forGetter(Instance::research), ResourceLocation.CODEC.optionalFieldOf("research").forGetter(Instance::research),
ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate) ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate)
).apply(it, ::Instance) ).apply(it, AndroidResearchTrigger::Instance)
} }
class Instance(val research: Optional<ResourceLocation>, player: Optional<ContextAwarePredicate> = Optional.empty()) : AbstractInstance(player), Predicate<AndroidResearchType> { class Instance(val research: Optional<ResourceLocation>, player: Optional<ContextAwarePredicate> = Optional.empty()) : AbstractInstance(player), Predicate<AndroidResearchType> {

4
src/main/kotlin/ru/dbotthepony/mc/otm/triggers/AndroidTravelUnderwater.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/AndroidTravelUnderwater.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.triggers package ru.dbotthepony.mc.otm.server.triggers
import com.mojang.serialization.Codec import com.mojang.serialization.Codec
import com.mojang.serialization.codecs.RecordCodecBuilder import com.mojang.serialization.codecs.RecordCodecBuilder
@ -19,7 +19,7 @@ object AndroidTravelUnderwater : MCriterionTrigger<AndroidTravelUnderwater.Insta
it.group( it.group(
Codec.DOUBLE.minRange(0.0).fieldOf("distanceToTravel").forGetter(Instance::distanceToTravel), Codec.DOUBLE.minRange(0.0).fieldOf("distanceToTravel").forGetter(Instance::distanceToTravel),
ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate) ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate)
).apply(it, ::Instance) ).apply(it, AndroidTravelUnderwater::Instance)
} }
class Instance(val distanceToTravel: Double, playerPredicate: Optional<ContextAwarePredicate> = Optional.empty()) : AbstractInstance(playerPredicate) class Instance(val distanceToTravel: Double, playerPredicate: Optional<ContextAwarePredicate> = Optional.empty()) : AbstractInstance(playerPredicate)

4
src/main/kotlin/ru/dbotthepony/mc/otm/triggers/ExopackTriggers.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/ExopackTriggers.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.triggers package ru.dbotthepony.mc.otm.server.triggers
import com.mojang.serialization.Codec import com.mojang.serialization.Codec
import com.mojang.serialization.codecs.RecordCodecBuilder import com.mojang.serialization.codecs.RecordCodecBuilder
@ -22,7 +22,7 @@ object ExopackSlotsExpandedTrigger : MCriterionTrigger<ExopackSlotsExpandedTrigg
Codec.intRange(0, Int.MAX_VALUE).optionalFieldOf("minGained", 0).forGetter(Instance::minGained), Codec.intRange(0, Int.MAX_VALUE).optionalFieldOf("minGained", 0).forGetter(Instance::minGained),
Codec.intRange(0, Int.MAX_VALUE).optionalFieldOf("minTotal", 0).forGetter(Instance::minTotal), Codec.intRange(0, Int.MAX_VALUE).optionalFieldOf("minTotal", 0).forGetter(Instance::minTotal),
ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate) ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate)
).apply(it, ::Instance) ).apply(it, ExopackSlotsExpandedTrigger::Instance)
} }
fun trigger(player: ServerPlayer, gained: Int, total: Int) { fun trigger(player: ServerPlayer, gained: Int, total: Int) {

2
src/main/kotlin/ru/dbotthepony/mc/otm/triggers/HurtTrigger.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/HurtTrigger.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.triggers package ru.dbotthepony.mc.otm.server.triggers
import com.mojang.serialization.Codec import com.mojang.serialization.Codec
import com.mojang.serialization.codecs.RecordCodecBuilder import com.mojang.serialization.codecs.RecordCodecBuilder

2
src/main/kotlin/ru/dbotthepony/mc/otm/triggers/ItemTrigger.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/ItemTrigger.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.triggers package ru.dbotthepony.mc.otm.server.triggers
import com.mojang.serialization.Codec import com.mojang.serialization.Codec
import com.mojang.serialization.codecs.RecordCodecBuilder import com.mojang.serialization.codecs.RecordCodecBuilder

18
src/main/kotlin/ru/dbotthepony/mc/otm/triggers/KillAsAndroidTrigger.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/KillAsAndroidTrigger.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.triggers package ru.dbotthepony.mc.otm.server.triggers
import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableList
import com.mojang.serialization.Codec import com.mojang.serialization.Codec
@ -28,7 +28,7 @@ object KillAsAndroidTrigger : MCriterionTrigger<KillAsAndroidTrigger.Instance>(R
ContextAwarePredicate.CODEC.optionalFieldOf("entityPredicate").forGetter(Instance::predicate), ContextAwarePredicate.CODEC.optionalFieldOf("entityPredicate").forGetter(Instance::predicate),
FEATURE_CODEC.fieldOf("featurePredicate").forGetter(Instance::featurePredicate), FEATURE_CODEC.fieldOf("featurePredicate").forGetter(Instance::featurePredicate),
ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate) ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate)
).apply(it, ::Instance) ).apply(it, KillAsAndroidTrigger::Instance)
} }
enum class PredicateType(codec: Lazy<MapCodec<out FeaturePredicate>>) : StringRepresentable { enum class PredicateType(codec: Lazy<MapCodec<out FeaturePredicate>>) : StringRepresentable {
@ -37,22 +37,28 @@ object KillAsAndroidTrigger : MCriterionTrigger<KillAsAndroidTrigger.Instance>(R
}), }),
HAS(lazy { HAS(lazy {
RecordCodecBuilder.mapCodec<Has> { RecordCodecBuilder.mapCodec<Has> {
it.group(ResourceLocation.CODEC.fieldOf("name").forGetter(Has::name)).apply(it, ::Has) it.group(ResourceLocation.CODEC.fieldOf("name").forGetter(Has::name)).apply(it,
KillAsAndroidTrigger::Has
)
} }
}), }),
NOT(lazy { NOT(lazy {
RecordCodecBuilder.mapCodec<Not> { RecordCodecBuilder.mapCodec<Not> {
it.group(FEATURE_CODEC.fieldOf("parent").forGetter(Not::parent)).apply(it, ::Not) it.group(FEATURE_CODEC.fieldOf("parent").forGetter(Not::parent)).apply(it, KillAsAndroidTrigger::Not)
} }
}), }),
AND(lazy { AND(lazy {
RecordCodecBuilder.mapCodec<And> { RecordCodecBuilder.mapCodec<And> {
it.group(FEATURE_CODEC.listOf().fieldOf("children").forGetter(And::children)).apply(it, ::And) it.group(FEATURE_CODEC.listOf().fieldOf("children").forGetter(And::children)).apply(it,
KillAsAndroidTrigger::And
)
} }
}), }),
OR(lazy { OR(lazy {
RecordCodecBuilder.mapCodec<OrPredicate> { RecordCodecBuilder.mapCodec<OrPredicate> {
it.group(FEATURE_CODEC.listOf().fieldOf("children").forGetter(OrPredicate::children)).apply(it, ::OrPredicate) it.group(FEATURE_CODEC.listOf().fieldOf("children").forGetter(OrPredicate::children)).apply(it,
KillAsAndroidTrigger::OrPredicate
)
} }
}); });

2
src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MCriterionTrigger.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/MCriterionTrigger.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.triggers package ru.dbotthepony.mc.otm.server.triggers
import com.mojang.serialization.Codec import com.mojang.serialization.Codec
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet

2
src/main/kotlin/ru/dbotthepony/mc/otm/triggers/MatteryInventoryChangeTrigger.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/MatteryInventoryChangeTrigger.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.triggers package ru.dbotthepony.mc.otm.server.triggers
import com.mojang.serialization.Codec import com.mojang.serialization.Codec
import it.unimi.dsi.fastutil.objects.ObjectArrayList import it.unimi.dsi.fastutil.objects.ObjectArrayList

4
src/main/kotlin/ru/dbotthepony/mc/otm/triggers/NanobotsArmorTrigger.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/NanobotsArmorTrigger.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.triggers package ru.dbotthepony.mc.otm.server.triggers
import com.mojang.serialization.Codec import com.mojang.serialization.Codec
import com.mojang.serialization.codecs.RecordCodecBuilder import com.mojang.serialization.codecs.RecordCodecBuilder
@ -14,7 +14,7 @@ object NanobotsArmorTrigger : MCriterionTrigger<NanobotsArmorTrigger.Instance>(R
it.group( it.group(
Doubles.CODEC.fieldOf("predicate").forGetter(Instance::predicate), Doubles.CODEC.fieldOf("predicate").forGetter(Instance::predicate),
ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate), ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate),
).apply(it, ::Instance) ).apply(it, NanobotsArmorTrigger::Instance)
} }
fun trigger(player: ServerPlayer, damageAbsorbed: Double) { fun trigger(player: ServerPlayer, damageAbsorbed: Double) {

2
src/main/kotlin/ru/dbotthepony/mc/otm/triggers/SimpleTriggers.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/SimpleTriggers.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.triggers package ru.dbotthepony.mc.otm.server.triggers
import ru.dbotthepony.mc.otm.OverdriveThatMatters import ru.dbotthepony.mc.otm.OverdriveThatMatters
import ru.dbotthepony.mc.otm.util.ResourceLocation import ru.dbotthepony.mc.otm.util.ResourceLocation

2
src/main/kotlin/ru/dbotthepony/mc/otm/triggers/SingletonTrigger.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/triggers/SingletonTrigger.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.triggers package ru.dbotthepony.mc.otm.server.triggers
import com.mojang.serialization.Codec import com.mojang.serialization.Codec
import com.mojang.serialization.codecs.RecordCodecBuilder import com.mojang.serialization.codecs.RecordCodecBuilder

6
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/EnhancedPlacedFeature.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/world/EnhancedPlacedFeature.kt
View File

@ -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.Cache
import com.github.benmanes.caffeine.cache.Caffeine 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.data.codec.minRange
import ru.dbotthepony.mc.otm.util.GJRAND64RandomSource import ru.dbotthepony.mc.otm.util.GJRAND64RandomSource
import ru.dbotthepony.mc.otm.util.shuffle import ru.dbotthepony.mc.otm.util.shuffle
import ru.dbotthepony.mc.otm.worldgen.feature.EnhancedFeature import ru.dbotthepony.mc.otm.server.world.feature.EnhancedFeature
import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedPlacement import ru.dbotthepony.mc.otm.server.world.placement.EnhancedPlacement
import java.io.DataOutputStream import java.io.DataOutputStream
import java.time.Duration import java.time.Duration
import java.util.* import java.util.*

4
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/EnhancedPlacementContext.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/world/EnhancedPlacementContext.kt
View File

@ -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.core.BlockPos
import net.minecraft.util.RandomSource 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.FeaturePlaceContext
import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration
import net.minecraft.world.level.levelgen.placement.PlacementContext 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.* import java.util.*
class EnhancedPlacementContext { class EnhancedPlacementContext {

6
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/Ext.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/world/Ext.kt
View File

@ -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.BlockPos
import net.minecraft.core.Holder import net.minecraft.core.Holder
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature import net.minecraft.world.level.levelgen.feature.ConfiguredFeature
import net.minecraft.world.level.levelgen.placement.PlacementModifier import net.minecraft.world.level.levelgen.placement.PlacementModifier
import ru.dbotthepony.mc.otm.util.collect.Vec3iHashStrategy import ru.dbotthepony.mc.otm.util.collect.Vec3iHashStrategy
import ru.dbotthepony.mc.otm.worldgen.feature.EnhancedFeature import ru.dbotthepony.mc.otm.server.world.feature.EnhancedFeature
import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedPlacement import ru.dbotthepony.mc.otm.server.world.placement.EnhancedPlacement
fun PlacementModifier.wrap(): EnhancedPlacement { fun PlacementModifier.wrap(): EnhancedPlacement {
return EnhancedPlacement.Wrapper(this) return EnhancedPlacement.Wrapper(this)

2
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/PlacementVariable.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/world/PlacementVariable.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.worldgen package ru.dbotthepony.mc.otm.server.world
import net.minecraft.resources.ResourceLocation import net.minecraft.resources.ResourceLocation

2
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/PlacementVariableMap.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/world/PlacementVariableMap.kt
View File

@ -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 it.unimi.dsi.fastutil.objects.Object2ObjectAVLTreeMap
import ru.dbotthepony.kommons.util.KOptional import ru.dbotthepony.kommons.util.KOptional

4
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/feature/BlackHolePlacer.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/world/feature/BlackHolePlacer.kt
View File

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.worldgen.feature package ru.dbotthepony.mc.otm.server.world.feature
import com.mojang.serialization.codecs.RecordCodecBuilder import com.mojang.serialization.codecs.RecordCodecBuilder
import net.minecraft.world.level.levelgen.feature.Feature import net.minecraft.world.level.levelgen.feature.Feature
@ -16,7 +16,7 @@ object BlackHolePlacerFeature : Feature<BlackHolePlacerFeature.Config>(
it.group( it.group(
DecimalCodec.fieldOf("matter_min").forGetter(Config::minMatter), DecimalCodec.fieldOf("matter_min").forGetter(Config::minMatter),
DecimalCodec.fieldOf("matter_max").forGetter(Config::maxMatter) DecimalCodec.fieldOf("matter_max").forGetter(Config::maxMatter)
).apply(it, ::Config) ).apply(it, BlackHolePlacerFeature::Config)
} }
) { ) {
data class Config(val minMatter: Decimal, val maxMatter: Decimal) : FeatureConfiguration data class Config(val minMatter: Decimal, val maxMatter: Decimal) : FeatureConfiguration

2
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/feature/DebugPlacerFeature.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/world/feature/DebugPlacerFeature.kt
View File

@ -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.Block
import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.block.state.BlockState

8
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/feature/EnhancedFeature.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/world/feature/EnhancedFeature.kt
View File

@ -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.Codec
import com.mojang.serialization.MapCodec 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.MBuiltInRegistries
import ru.dbotthepony.mc.otm.registry.MDeferredRegister import ru.dbotthepony.mc.otm.registry.MDeferredRegister
import ru.dbotthepony.mc.otm.registry.MRegistries import ru.dbotthepony.mc.otm.registry.MRegistries
import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacementContext import ru.dbotthepony.mc.otm.server.world.EnhancedPlacementContext
import ru.dbotthepony.mc.otm.worldgen.PlacementPos import ru.dbotthepony.mc.otm.server.world.PlacementPos
import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedPlacement import ru.dbotthepony.mc.otm.server.world.placement.EnhancedPlacement
abstract class EnhancedFeature<FC>(codec: Codec<FC>) { abstract class EnhancedFeature<FC>(codec: Codec<FC>) {
abstract fun place(context: EnhancedPlacementContext, config: FC, positions: Set<PlacementPos>, allPositions: Set<PlacementPos>): Boolean abstract fun place(context: EnhancedPlacementContext, config: FC, positions: Set<PlacementPos>, allPositions: Set<PlacementPos>): Boolean

2
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/ChainPlacement.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/ChainPlacement.kt
View File

@ -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.google.common.collect.ImmutableList
import com.mojang.serialization.Codec import com.mojang.serialization.Codec

6
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/EllipsoidPlacement.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EllipsoidPlacement.kt
View File

@ -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.MapCodec
import com.mojang.serialization.codecs.RecordCodecBuilder 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.rotate
import ru.dbotthepony.mc.otm.util.math.rotateAroundThis import ru.dbotthepony.mc.otm.util.math.rotateAroundThis
import ru.dbotthepony.mc.otm.util.nextDouble import ru.dbotthepony.mc.otm.util.nextDouble
import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacementContext import ru.dbotthepony.mc.otm.server.world.EnhancedPlacementContext
import ru.dbotthepony.mc.otm.worldgen.PlacementPos import ru.dbotthepony.mc.otm.server.world.PlacementPos
import java.util.* import java.util.*
import java.util.stream.Stream import java.util.stream.Stream
import kotlin.math.PI import kotlin.math.PI

6
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/EnhancedChainPlacement.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedChainPlacement.kt
View File

@ -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.google.common.collect.ImmutableList
import com.mojang.serialization.Codec import com.mojang.serialization.Codec
import com.mojang.serialization.MapCodec import com.mojang.serialization.MapCodec
import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacementContext import ru.dbotthepony.mc.otm.server.world.EnhancedPlacementContext
import ru.dbotthepony.mc.otm.worldgen.PlacementPos import ru.dbotthepony.mc.otm.server.world.PlacementPos
/** /**
* Chains placements, feeding results from one placement into next * Chains placements, feeding results from one placement into next

6
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/EnhancedCountPlacement.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedCountPlacement.kt
View File

@ -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 com.mojang.serialization.MapCodec
import net.minecraft.util.valueproviders.IntProvider import net.minecraft.util.valueproviders.IntProvider
import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacementContext import ru.dbotthepony.mc.otm.server.world.EnhancedPlacementContext
import ru.dbotthepony.mc.otm.worldgen.PlacementPos import ru.dbotthepony.mc.otm.server.world.PlacementPos
class EnhancedCountPlacement(val provider: IntProvider) : EnhancedPlacement { class EnhancedCountPlacement(val provider: IntProvider) : EnhancedPlacement {
override fun evaluate(context: EnhancedPlacementContext, positions: List<PlacementPos>): List<PlacementPos> { override fun evaluate(context: EnhancedPlacementContext, positions: List<PlacementPos>): List<PlacementPos> {

6
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/EnhancedPlacement.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedPlacement.kt
View File

@ -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.Codec
import com.mojang.serialization.MapCodec 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.MBuiltInRegistries
import ru.dbotthepony.mc.otm.registry.MDeferredRegister import ru.dbotthepony.mc.otm.registry.MDeferredRegister
import ru.dbotthepony.mc.otm.registry.MRegistries import ru.dbotthepony.mc.otm.registry.MRegistries
import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacementContext import ru.dbotthepony.mc.otm.server.world.EnhancedPlacementContext
import ru.dbotthepony.mc.otm.worldgen.PlacementPos import ru.dbotthepony.mc.otm.server.world.PlacementPos
import java.util.stream.Collectors import java.util.stream.Collectors
interface EnhancedPlacement { interface EnhancedPlacement {

6
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/EnhancedSplitPlacement.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/EnhancedSplitPlacement.kt
View File

@ -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.google.common.collect.ImmutableList
import com.mojang.serialization.Codec import com.mojang.serialization.Codec
@ -6,8 +6,8 @@ import com.mojang.serialization.MapCodec
import com.mojang.serialization.codecs.RecordCodecBuilder import com.mojang.serialization.codecs.RecordCodecBuilder
import net.minecraft.util.StringRepresentable import net.minecraft.util.StringRepresentable
import net.minecraft.world.level.levelgen.placement.PlacementModifier import net.minecraft.world.level.levelgen.placement.PlacementModifier
import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacementContext import ru.dbotthepony.mc.otm.server.world.EnhancedPlacementContext
import ru.dbotthepony.mc.otm.worldgen.PlacementPos import ru.dbotthepony.mc.otm.server.world.PlacementPos
/** /**
* Or "shard" placement, if you will. * Or "shard" placement, if you will.

2
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/SplitPlacement.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/SplitPlacement.kt
View File

@ -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.google.common.collect.ImmutableList
import com.mojang.serialization.Codec import com.mojang.serialization.Codec

2
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/StandardDeviationHeightProvider.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/StandardDeviationHeightProvider.kt
View File

@ -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.Codec
import com.mojang.serialization.MapCodec import com.mojang.serialization.MapCodec

6
src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/WormPlacement.kt → src/main/kotlin/ru/dbotthepony/mc/otm/server/world/placement/WormPlacement.kt
View File

@ -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.Codec
import com.mojang.serialization.MapCodec 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.plus
import ru.dbotthepony.mc.otm.util.math.toBlockPos import ru.dbotthepony.mc.otm.util.math.toBlockPos
import ru.dbotthepony.mc.otm.util.nextDouble import ru.dbotthepony.mc.otm.util.nextDouble
import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacementContext import ru.dbotthepony.mc.otm.server.world.EnhancedPlacementContext
import ru.dbotthepony.mc.otm.worldgen.PlacementPos import ru.dbotthepony.mc.otm.server.world.PlacementPos
import java.util.stream.Stream import java.util.stream.Stream
import kotlin.math.PI import kotlin.math.PI
import kotlin.math.absoluteValue import kotlin.math.absoluteValue