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

Move triggers and worldgen to server subpackage

Browse Source
This commit is contained in:
DBotThePony 2025-03-31 08:57:04 +07:00
parent 12241ead12
commit 2b589410f5
Signed by: DBot
GPG Key ID: DCC23B5715498507
34 changed files with 104 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ import ru.dbotthepony.mc.otm.data.world.EllipsoidPlacement
import ru.dbotthepony.mc.otm.data.world.StandardDeviationHeightProvider import ru.dbotthepony.mc.otm.data.world.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.feature.BlackHolePlacerFeature import ru.dbotthepony.mc.otm.server.feature.BlackHolePlacerFeature
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

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

@ -93,7 +93,7 @@ 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 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

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

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,

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

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)

2
src/main/kotlin/ru/dbotthepony/mc/otm/registry/data/MWorldGenFeatures.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.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.worldgen.feature.BlackHolePlacerFeature import ru.dbotthepony.mc.otm.server.feature.BlackHolePlacerFeature
object MWorldGenFeatures { object MWorldGenFeatures {
private val registry = MDeferredRegister(BuiltInRegistries.FEATURE) private val registry = MDeferredRegister(BuiltInRegistries.FEATURE)

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

@ -1,4 +1,4 @@
package ru.dbotthepony.mc.otm.worldgen.feature package ru.dbotthepony.mc.otm.server.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

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) {

4
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
@ -27,7 +27,7 @@ class HurtTrigger(id: ResourceLocation) : MCriterionTrigger<HurtTrigger.Instance
ContextAwarePredicate.CODEC.optionalFieldOf("predicate").forGetter(Instance::predicate), ContextAwarePredicate.CODEC.optionalFieldOf("predicate").forGetter(Instance::predicate),
DamagePredicateCodec.optionalFieldOf("damagePredicate").forGetter(Instance::damagePredicate), DamagePredicateCodec.optionalFieldOf("damagePredicate").forGetter(Instance::damagePredicate),
ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate) ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate)
).apply(it, ::Instance) ).apply(it, HurtTrigger::Instance)
} }
inner class Instance( inner class Instance(

4
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
@ -19,7 +19,7 @@ class ItemTrigger(id: ResourceLocation) : MCriterionTrigger<ItemTrigger.Instance
ItemPredicate.CODEC.fieldOf("predicate").forGetter(Instance::predicate), ItemPredicate.CODEC.fieldOf("predicate").forGetter(Instance::predicate),
Codec.BOOL.optionalFieldOf("invert", false).forGetter(Instance::invert), Codec.BOOL.optionalFieldOf("invert", false).forGetter(Instance::invert),
ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate) ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate)
).apply(it, ::Instance) ).apply(it, ItemTrigger::Instance)
} }
inner class Instance(val predicate: ItemPredicate, val invert: Boolean = false, player: Optional<ContextAwarePredicate> = Optional.empty()) : AbstractInstance(player) inner class Instance(val predicate: ItemPredicate, val invert: Boolean = false, player: Optional<ContextAwarePredicate> = Optional.empty()) : AbstractInstance(player)

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

4
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
@ -11,7 +11,7 @@ class SingletonTrigger(id: ResourceLocation) : MCriterionTrigger<SingletonTrigge
override val codec: Codec<Instance> = RecordCodecBuilder.create { override val codec: Codec<Instance> = RecordCodecBuilder.create {
it.group( it.group(
ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate) ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(Instance::playerPredicate)
).apply(it, ::Instance) ).apply(it, SingletonTrigger::Instance)
} }
val empty = Instance() val empty = Instance()