feat: add test on weather and ensure weather is good

CHANGELOG.md

@@ -16,15 +16,10 @@
   - Milk - Effect Cleanse
   - Moomoo Milk - Effect Cleanse
 - Added `label` as an alternate key to the `tag` property.
-- Added Saccharine wood furniture for Adorn.
 
 ### Changes
 - Ride sounds have been separated into stereo for passengers and mono for other players. Riding will now sound more spacious.
 - Added a new config option, `Enable In-Flight Dismounting` (default: off), which lets you dismount while riding a Pokémon in the air.
-- Battle AI now uses a smarter threshold for switching, reducing unnecessary switches.
-- AI will always use the most damaging move when at low HP and when it is not switching, improving endgame decision-making.
-- Added support for optional message variants in battle activate instructions for more context-specific battle text.
-  - Example: `this.add('-activate', pokemon, 'ability: example', '[msg]message1');` will parse to lang key `cobblemon.battle.activate.example.message1`
 
 ### Fixes
 - Fixed an issue in the OmniPathNodeMaker/Navigation that prevented Combees from pathing into and out of Saccharine leaves.
@@ -34,7 +29,6 @@
 - Fixed honey from Saccharine Leaves being harvestable at less than the max age.
 - Items given from interacting with Saccharine Leaves are placed in the active hotbar slot if possible.
 - Fix all Pokémon being saved to chunks and never despawning.
-- Fixed possible error on world generation when Combees are placed in naturally generated bee nests.
 - Fixed PokeSnacks crashing if there was no available spawn.
 - Fixed Pokémon spawn influences not being specific to regional forms
 - Fixed crashing when viewing another player in spectator mode
@@ -46,33 +40,15 @@
 - Fixed Mint Leaves not being usable for filling the Resurrection Machine.
 - Added Saccharine Boats and Saccharine Boat with Chests to relevant boat tags.
 - Fixed the `run_script` Molang function to not fail if the environment's context is null.
-- Fixed issue #1917 
-- Fixed the movesets of certain Pokémon being incorrectly sanitized upon reload.
-- Fixed the ordering of Aprijuice's riding stat boosts to always have the same order.
-- Fixed the Molang functions `date_local_time`, `date_of`, `date_is_after` to use the correct date format.
-- Fixed the bottom half of pasture blocks having an incorrect hit-box when facing north or south.
-- Fixed Galarian Mr. Mime incorrectly being rideable.
-- Fixed gimmicks not being usable in double / triple battles
-- Fixed gimmick buttons showing when already used in the same turn in double / triple battles
-- Fixed Apricorn block model rotation for counters/sinks/cupboards/drawers to match that of most recent version of Adorn.
-- Fixed Fresh Start Mochi EV reset not syncing health changes properly.
-- Fixed requirements such as `biomeCondition` crashing the game when used to define Pokémon interactions.
-- Fixed Pokémon interactions not playing sound effects when the volume was not specified.
-- Fixed Pokémon interaction cooldowns taking longer than intended when the Pokémon was in the player’s party.
-- Fixed Pokémon interactions occasionally crashing the game when spamming an interaction with a 0 cooldown.
-- Fixed Pokémon fullness decreasing more than intended when the Pokémon was pastured.
-- Fixed crashing when sending a Pokémon out after editing its form 
-- Fixed Super Potion recipes incorrectly using Hondew Berry instead of Aguav Berry.
 
 ### Developer
-- Changed the `owner` parameter in the `OwnerQueryRequirement` interface from `ServerPlayer` to `Player`. This method is now also called on the client to verify whether a Pokémon interaction succeeded, so make sure to update your implementations to handle both server and client contexts.
+- Changed the `owner` parameter in the `OwnerQueryRequirement` interface from `ServerPlayer` to `Player`. This method is now also called on the client to verify whether a Pokémon interaction succeeded, so make sure to update your implementations to handle both server and client contexts. 
 
 ### Molang & Datapacks
 - Ride sounds can now be set as exclusive to passengers
 - Ride sounds no longer play when submerged unless specified with a new setting
-- Exception handling has been added to `run_molang`, resolving some crashes caused by malformed MoLang expressions.
 
 ### Particles
 
 ### Localization
-- Updated translations for:
+- Updated translations for:

common/src/main/java/com/cobblemon/mod/common/mixin/BeeOccupantMixin.java

@@ -11,9 +11,7 @@ package com.cobblemon.mod.common.mixin;
 
 import com.cobblemon.mod.common.CobblemonMemories;
 import com.cobblemon.mod.common.api.ai.config.task.PathToBeeHiveTaskConfig;
-import com.cobblemon.mod.common.api.pokemon.PokemonProperties;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
-import com.cobblemon.mod.common.world.feature.SaccharineTreeFeature;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.tags.BlockTags;
@@ -44,21 +42,7 @@ public abstract class BeeOccupantMixin {
         if (cir.getReturnValue() == null) {
             final BeehiveBlockEntity.Occupant occupant = (BeehiveBlockEntity.Occupant) (Object) this;
             CompoundTag compoundTag = occupant.entityData().copyTag();
-            String id = compoundTag.getString("id");
-            Entity entity = null;
-            if (id.equals(SaccharineTreeFeature.Companion.getPOKEMON_PLACEHOLD_ID())) {
-                // Special case for Pokemon stuffed into a beenest upon world gen.
-                // For technical reasons we cannot create them as full entities during world gen.
-                // So we look for this special id tag and complete the entity when it attempts to exit a hive.
-                if (compoundTag.contains("pokemonProperties")) {
-                    String properties = compoundTag.getString("pokemonProperties");
-                    PokemonProperties pokemon = PokemonProperties.Companion.parse(properties);
-                    entity = pokemon.createEntity(level);
-                }
-            } else {
-                entity = EntityType.loadEntityRecursive(compoundTag, level, (entityx) -> entityx);
-            }
-
+            Entity entity = EntityType.loadEntityRecursive(compoundTag, level, (entityx) -> entityx);
             if (entity instanceof PokemonEntity pokemonEntity) {
                 var state = level.getBlockState(pos);
                 var newPos = Vec3.ZERO;

common/src/main/java/com/cobblemon/mod/common/mixin/SimpleBlockFeatureMixin.java

@@ -33,7 +33,7 @@ public class SimpleBlockFeatureMixin {
         if (!(blockState.getBlock() instanceof HeartyGrainsBlock)) {
             return;
         }
-        if (blockState.getValue(HeartyGrainsBlock.AGE) <= HeartyGrainsBlock.AGE_AFTER_HARVEST) {
+        if (blockState.getValue(HeartyGrainsBlock.Companion.getAGE()) <= HeartyGrainsBlock.AGE_AFTER_HARVEST) {
             return; //block is too young to be double
         }
         if (!worldGenLevel.isEmptyBlock(blockPos.above())) {
@@ -43,4 +43,4 @@ public class SimpleBlockFeatureMixin {
         DoublePlantBlock.placeAt(worldGenLevel, blockState, blockPos, Block.UPDATE_CLIENTS);
         cir.setReturnValue(true);
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/Cobblemon.kt

@@ -164,7 +164,7 @@ object Cobblemon {
 
     val statistics: CobblemonStats = CobblemonStats
 
-    @JvmField
+    @JvmStatic
     val builtinPacks = listOf<CobblemonPack>(
         CobblemonPack(id = "adorncompatibility", name = "Adorn Compatibility", packType = PackType.CLIENT_RESOURCES, activationBehaviour = ResourcePackActivationBehaviour.ALWAYS_ENABLED, neededMods = setOf("adorn")),
         CobblemonPack(id = "gyaradosjump", name = "Gyarados Jump Patterns", packType = PackType.CLIENT_RESOURCES, activationBehaviour = ResourcePackActivationBehaviour.DEFAULT_ENABLED),
@@ -569,4 +569,4 @@ object Cobblemon {
         this.implementation.registerCommandArgument(cobblemonResource("model_part"), ModelPartArgumentType::class, SingletonArgumentInfo.contextFree(ModelPartArgumentType::modelPart))
     }
 
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/AspectCriterion.kt

@@ -23,7 +23,6 @@ class AspectCriterion(
 ): SimpleCriterionCondition<MutableMap<ResourceLocation, MutableSet<String>>>(playerCtx) {
 
     companion object {
-        @JvmField
         val CODEC: Codec<AspectCriterion> = RecordCodecBuilder.create { it.group(
             //All three of these codecs used to use Codecs.createStrictOptionalFieldCodec, that no longer exists
             ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(AspectCriterion::playerCtx),
@@ -36,4 +35,4 @@ class AspectCriterion(
         val caughtAspects = context.getOrDefault(species, mutableSetOf())
         return this.aspects.all { it in caughtAspects }
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/BattleCountableCriterion.kt

@@ -25,7 +25,6 @@ class BattleCountableCriterion(
 ): CountableCriterion<BattleCountableContext>(playerCtx, count) {
 
     companion object {
-        @JvmField
         val CODEC: Codec<BattleCountableCriterion> = RecordCodecBuilder.create { it.group(
             ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(BattleCountableCriterion::playerCtx),
             Codec.STRING.listOf().optionalFieldOf("battle_types", listOf("any")).forGetter(BattleCountableCriterion::battleTypes),

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/CastPokeRodCriterionCondition.kt

@@ -25,7 +25,6 @@ class CastPokeRodCriterionCondition(
 ): SimpleCriterionCondition<CastPokeRodContext>(playerCtx) {
 
     companion object {
-        @JvmField
         val CODEC: Codec<CastPokeRodCriterionCondition> = RecordCodecBuilder.create { it.group(
                 EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(CastPokeRodCriterionCondition::playerCtx),
                 Codec.STRING.optionalFieldOf("baitId", "empty_bait").forGetter(CastPokeRodCriterionCondition::baitId)
@@ -35,4 +34,4 @@ class CastPokeRodCriterionCondition(
     override fun matches(player: ServerPlayer, context: CastPokeRodContext): Boolean {
         return (context.baitId == this.baitId.asIdentifierDefaultingNamespace() || this.baitId == "empty_bait")
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/CatchPokemonCriterion.kt

@@ -31,7 +31,6 @@ class CaughtPokemonCriterion(
 ): CountableCriterion<CountablePokemonTypeContext>(playerCtx, count) {
 
     companion object {
-        @JvmField
         val CODEC: Codec<CaughtPokemonCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(CaughtPokemonCriterion::playerCtx),
             Codec.STRING.optionalFieldOf("type", "any").forGetter(CaughtPokemonCriterion::type),
@@ -43,4 +42,4 @@ class CaughtPokemonCriterion(
     override fun matches(player: ServerPlayer, context: CountablePokemonTypeContext): Boolean {
         return super.matches(player, context) && (context.type == type || type == "any")// && (context.species == species || species == "any")
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/CountableCriterion.kt

@@ -23,7 +23,6 @@ open class CountableCriterion<T : CountableContext>(
 ): SimpleCriterionCondition<T>(playerCtx) {
 
     companion object {
-        @JvmField
         val CODEC: Codec<CountableCriterion<CountableContext>> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(CountableCriterion<CountableContext>::playerCtx),
             Codec.INT.optionalFieldOf("count", 0).forGetter(CountableCriterion<CountableContext>::count)

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/EvolvePokemonCriterion.kt

@@ -26,7 +26,6 @@ class EvolvePokemonCriterion(
 ): CountableCriterion<EvolvePokemonContext>(playerCtx, count) {
 
     companion object {
-        @JvmField
         val CODEC: Codec<EvolvePokemonCriterion> = RecordCodecBuilder.create { it.group(
             ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(EvolvePokemonCriterion::playerCtx),
             Codec.STRING.optionalFieldOf("species", "any").forGetter(EvolvePokemonCriterion::species),

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/LevelUpCriterion.kt

@@ -25,7 +25,6 @@ class LevelUpCriterion(
 ): SimpleCriterionCondition<LevelUpContext>(playerCtx) {
 
     companion object {
-        @JvmField
         val CODEC: Codec<LevelUpCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(LevelUpCriterion::playerCtx),
             Codec.INT.optionalFieldOf("level", 0).forGetter(LevelUpCriterion::level),
@@ -43,4 +42,4 @@ class LevelUpCriterion(
         return level == context.level && evolutionCheck == evolved
     }
 
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/PartyCheckCriterion.kt

@@ -24,7 +24,6 @@ class PartyCheckCriterion(
 ): SimpleCriterionCondition<PlayerPartyStore>(playerCtx) {
 
     companion object {
-        @JvmField
         val CODEC: Codec<PartyCheckCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(PartyCheckCriterion::playerCtx),
             ResourceLocation.CODEC.listOf().optionalFieldOf("party", listOf()).forGetter(PartyCheckCriterion::party)
@@ -48,4 +47,4 @@ class PartyCheckCriterion(
         }
         return matches.containsAll(party) && matches.size == party.size
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/PlantTumblestoneCriterionCondition.kt

@@ -23,7 +23,6 @@ class PlantTumblestoneCriterion(
 ): SimpleCriterionCondition<PlantTumblestoneContext>(playerCtx) {
 
     companion object {
-        @JvmField
         val CODEC: Codec<PlantTumblestoneCriterion> = RecordCodecBuilder.create { it.group(
             ContextAwarePredicate.CODEC.optionalFieldOf("player").forGetter(PlantTumblestoneCriterion::playerCtx)
         ).apply(it, ::PlantTumblestoneCriterion) }

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/PokemonCriterion.kt

@@ -24,7 +24,6 @@ class PokemonCriterion(
 ): SimpleCriterionCondition<Pokemon>(playerCtx) {
 
     companion object {
-        @JvmField
         val CODEC: Codec<PokemonCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(PokemonCriterion::playerCtx),
             Codec.STRING.optionalFieldOf("species", "any").forGetter(PokemonCriterion::species),
@@ -36,4 +35,4 @@ class PokemonCriterion(
         var speciesCheck = (species.equals(context.species.resourceIdentifier.path) || species.equals(context.species.resourceIdentifier.toString())) || species.equals("any")
         return speciesCheck && properties.matches(context)
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/PokemonInteractCriterion.kt

@@ -25,7 +25,6 @@ class PokemonInteractCriterion(
     val item: String
 ): SimpleCriterionCondition<PokemonInteractContext>(playerCtx) {
     companion object {
-        @JvmField
         val CODEC: Codec<PokemonInteractCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(PokemonInteractCriterion::playerCtx),
             Codec.STRING.optionalFieldOf("species", "any").forGetter(PokemonInteractCriterion::species),
@@ -36,4 +35,4 @@ class PokemonInteractCriterion(
     override fun matches(player: ServerPlayer, context: PokemonInteractContext): Boolean {
         return (context.species == this.species.asIdentifierDefaultingNamespace() || this.species == "any") && (context.item == this.item.asIdentifierDefaultingNamespace() || this.item == "any")
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/ReelInPokemonCriterionCondition.kt

@@ -26,7 +26,6 @@ class ReelInPokemonCriterionCondition(
 ) : SimpleCriterionCondition<ReelInPokemonContext>(playerCtx) {
 
     companion object {
-        @JvmField
         val CODEC: Codec<ReelInPokemonCriterionCondition> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter { it.playerCtx },
             Codec.STRING.optionalFieldOf("species", "any").forGetter { it.species },
@@ -38,4 +37,4 @@ class ReelInPokemonCriterionCondition(
         return (context.species == this.species.asIdentifierDefaultingNamespace() || this.species == "any")
                 && (context.baitId == this.baitId.asIdentifierDefaultingNamespace() || this.baitId == "any" || this.baitId == "empty_bait")
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/advancement/criterion/TradePokemonCriterionCondition.kt

@@ -28,7 +28,6 @@ class TradePokemonCriterion(
 ): SimpleCriterionCondition<TradePokemonContext>(playerCtx) {
 
     companion object {
-        @JvmField
         val CODEC: Codec<TradePokemonCriterion> = RecordCodecBuilder.create { it.group(
             EntityPredicate.ADVANCEMENT_CODEC.optionalFieldOf("player").forGetter(TradePokemonCriterion::playerCtx),
             Codec.STRING.optionalFieldOf("traded", "any").forGetter(TradePokemonCriterion::traded),

common/src/main/kotlin/com/cobblemon/mod/common/advancement/predicate/CobblemonEntitySubPredicates.kt

@@ -18,7 +18,7 @@ import net.minecraft.resources.ResourceKey
 
 object CobblemonEntitySubPredicates : PlatformRegistry<Registry<MapCodec<out EntitySubPredicate>>, ResourceKey<Registry<MapCodec<out EntitySubPredicate>>>, MapCodec<out EntitySubPredicate>>() {
 
-    @JvmField
+    @JvmStatic
     val POKE_POBBER = this.create("poke_bobber", FishingBobberPredicate.CODEC)
 
     override val registry: Registry<MapCodec<out EntitySubPredicate>> = BuiltInRegistries.ENTITY_SUB_PREDICATE_TYPE

common/src/main/kotlin/com/cobblemon/mod/common/advancement/predicate/FishingBobberPredicate.kt

@@ -24,7 +24,7 @@ class FishingBobberPredicate(val inOpenWater: Boolean) : EntitySubPredicate {
         return (entity as? PokeRodFishingBobberEntity)?.inOpenWater == this.inOpenWater
     }
     companion object {
-        @JvmField
+        @JvmStatic
         val CODEC: MapCodec<FishingBobberPredicate> = RecordCodecBuilder.mapCodec { instance ->
             instance.group(
                 Codec.BOOL.fieldOf("in_open_water").forGetter(FishingBobberPredicate::inOpenWater)

common/src/main/kotlin/com/cobblemon/mod/common/api/Priority.kt

@@ -22,7 +22,7 @@ enum class Priority : StringRepresentable {
 
     companion object {
 
-        @JvmField
+        @JvmStatic
         val CODEC: Codec<Priority> = StringRepresentable.fromEnum(Priority::values)
 
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/abilities/Ability.kt

@@ -104,7 +104,7 @@ open class Ability internal constructor(var template: AbilityTemplate, forced: B
 
     companion object {
 
-        @JvmField
+        @JvmStatic
         val CODEC: Codec<Ability> = RecordCodecBuilder.create {
             it.group(
                 AbilityTemplate.CODEC.fieldOf(DataKeys.POKEMON_ABILITY_NAME).forGetter(Ability::template),

common/src/main/kotlin/com/cobblemon/mod/common/api/abilities/AbilityTemplate.kt

@@ -47,7 +47,7 @@ class AbilityTemplate(
 
     companion object {
 
-        @JvmField
+        @JvmStatic
         val CODEC: Codec<AbilityTemplate> = CodecUtils.createByStringCodec(
             Abilities::getOrDummy,
             AbilityTemplate::name

common/src/main/kotlin/com/cobblemon/mod/common/api/abilities/PotentialAbility.kt

@@ -29,7 +29,6 @@ interface PotentialAbility {
     val type: PotentialAbilityType<*>
     fun isSatisfiedBy(aspects: Set<String>): Boolean
     companion object {
-        @JvmField
         val types = mutableListOf<PotentialAbilityType<*>>()
     }
 }
@@ -52,4 +51,5 @@ open class CommonAbility(override val template: AbilityTemplate) : PotentialAbil
     override val priority = Priority.LOWEST
     override val type = CommonAbilityType
     override fun isSatisfiedBy(aspects: Set<String>) = true
-}
+}
+

common/src/main/kotlin/com/cobblemon/mod/common/api/ai/config/task/AttackHostileMobsTaskConfig.kt

@@ -26,9 +26,8 @@ class AttackHostileMobsTaskConfig : SingleTaskConfig {
     ): BehaviorControl<in LivingEntity>? {
         return AttackHostileMobsTask.create()
     }
-
+    
     companion object {
-        @JvmField
         val CODEC: Codec<AttackHostileMobsTaskConfig> = Codec.unit(AttackHostileMobsTaskConfig())
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/apricorn/Apricorn.kt

@@ -99,7 +99,6 @@ enum class Apricorn : StringRepresentable {
     override fun getSerializedName() = this.name.lowercase()
 
     companion object {
-        @JvmField
         val CODEC: Codec<Apricorn> = StringRepresentable.fromValues(::values)
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/berry/spawncondition/AllBiomeCondition.kt

@@ -24,7 +24,6 @@ class AllBiomeCondition(val minGroveSize: Int, val maxGroveSize: Int) : BerrySpa
     }
 
     companion object {
-        @JvmField
         val ID = cobblemonResource("all_biome")
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/berry/spawncondition/PreferredBiomeCondition.kt

@@ -26,7 +26,6 @@ class PreferredBiomeCondition(val minGroveSize: Int, val maxGroveSize: Int) : Be
     }
 
     companion object {
-        @JvmField
         val ID = cobblemonResource("preferred_biome")
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/berry/spawncondition/SpecificBiomeCondition.kt

@@ -24,7 +24,6 @@ class SpecificBiomeCondition : BerrySpawnCondition {
     override fun getGroveSize(random: RandomSource) = random.nextIntBetweenInclusive(minGroveSize, maxGroveSize)
 
     companion object {
-        @JvmField
         val ID = cobblemonResource("specific_biome")
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/cooking/Flavour.kt

@@ -27,7 +27,6 @@ enum class Flavour(val colour: Int): StringRepresentable {
 
     override fun getSerializedName() = name
     companion object {
-        @JvmField
         val CODEC = StringRepresentable.fromEnum<Flavour> { Flavour.entries.toTypedArray() }
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/cooking/Food.kt

@@ -17,7 +17,6 @@ data class Food(
         val saturation: Float = 0f,
 ) {
     companion object {
-        @JvmField
         val CODEC: Codec<Food> = RecordCodecBuilder.create { builder ->
             builder.group(
                     Codec.INT.optionalFieldOf("hunger", 0).forGetter { it.hunger },

common/src/main/kotlin/com/cobblemon/mod/common/api/cooking/Seasoning.kt

@@ -38,7 +38,6 @@ data class Seasoning(
     val mobEffects: List<SerializableMobEffectInstance>? = null
 ) {
     companion object {
-        @JvmField
         val CODEC: Codec<Seasoning> = RecordCodecBuilder.create { builder ->
             builder.group(
                 ITEM_REGISTRY_LIKE_CODEC.fieldOf("ingredient").forGetter { it.ingredient },
@@ -59,7 +58,6 @@ data class Seasoning(
             }
         }
 
-        @JvmField
         val STREAM_CODEC: StreamCodec<ByteBuf, Seasoning> = ByteBufCodecs.fromCodec(CODEC)
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/cooking/SerializableMobEffectInstance.kt

@@ -31,7 +31,6 @@ data class SerializableMobEffectInstance(
     }
 
     companion object {
-        @JvmField
         val CODEC: Codec<SerializableMobEffectInstance> = RecordCodecBuilder.create { builder ->
             builder.group(
                     ResourceLocation.CODEC.fieldOf("effect").forGetter { it.effect },
@@ -43,4 +42,4 @@ data class SerializableMobEffectInstance(
             ).apply(builder, ::SerializableMobEffectInstance)
         }
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/dialogue/Dialogue.kt

@@ -26,11 +26,9 @@ class Dialogue(
     val initializationAction: DialogueAction = FunctionDialogueAction { _, _ -> }
 ) {
     companion object {
-        @JvmField
         val DEFAULT_BACKGROUND = cobblemonResource("textures/gui/dialogue/dialogue_box.png")
 
         @JvmOverloads
-        @JvmStatic
         fun of(
             pages: Iterable<DialoguePage>,
             background: ResourceLocation = DEFAULT_BACKGROUND,
@@ -46,7 +44,6 @@ class Dialogue(
         }
 
         @JvmOverloads
-        @JvmStatic
         fun of(
             pages: Iterable<DialoguePage>,
             background: ResourceLocation = DEFAULT_BACKGROUND,

common/src/main/kotlin/com/cobblemon/mod/common/api/dialogue/DialogueAction.kt

@@ -23,7 +23,7 @@ import com.cobblemon.mod.common.util.resolve
  */
 interface DialogueAction {
     companion object {
-        @JvmField
+        @JvmStatic
         val types = mutableMapOf<String, Class<out DialogueAction>>()
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/dialogue/DialogueFace.kt

@@ -23,7 +23,6 @@ sealed interface DialogueFaceProvider {
     val isLeftSide: Boolean
 
     companion object {
-        @JvmField
         val types = mutableMapOf(
             "artificial" to ArtificialDialogueFaceProvider::class.java,
             "player" to PlayerDialogueFaceProvider::class.java,

common/src/main/kotlin/com/cobblemon/mod/common/api/dialogue/DialogueManager.kt

@@ -58,9 +58,4 @@ object DialogueManager {
         DialogueClosedPacket(activeDialogue.dialogueId).sendToPlayer(playerEntity)
         activeDialogues.remove(playerEntity.uuid)
     }
-
-    @JvmStatic
-    fun getDialogue(playerEntity: ServerPlayer): ActiveDialogue? {
-        return activeDialogues[playerEntity.uuid]
-    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/dialogue/DialoguePage.kt

@@ -38,7 +38,6 @@ class DialoguePage(
 ) {
     companion object {
         @JvmOverloads
-        @JvmStatic
         fun of(
             /** The ID is optional, but if you want to be able to jump to this page from other pages then you probably want to set this. */
             id: String = "",
@@ -79,4 +78,4 @@ class DialoguePage(
             )
         )
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/dialogue/DialoguePredicate.kt

@@ -20,7 +20,6 @@ import com.cobblemon.mod.common.util.resolveBoolean
  */
 interface DialoguePredicate {
     companion object {
-        @JvmField
         val types = mutableMapOf<String, Class<out DialoguePredicate>>()
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/dialogue/DialogueText.kt

@@ -24,7 +24,6 @@ import net.minecraft.network.chat.MutableComponent
  */
 interface DialogueText {
     companion object {
-        @JvmField
         val types = mutableMapOf<String, Class<out DialogueText>>(
             "expression" to ExpressionLikeDialogueText::class.java,
         )

common/src/main/kotlin/com/cobblemon/mod/common/api/drop/DropEntry.kt

@@ -26,10 +26,7 @@ interface DropEntry {
     companion object {
         val entryTypes = mutableMapOf<String, Class<out DropEntry>>()
         var defaultType: Class<out DropEntry>? = null
-        @JvmStatic
         fun getByName(name: String) = entryTypes[name]
-        @JvmOverloads
-        @JvmStatic
         fun <T : DropEntry> register(name: String, clazz: Class<T>, isDefault: Boolean = false) {
             entryTypes[name] = clazz
             if (isDefault) {

common/src/main/kotlin/com/cobblemon/mod/common/api/entity/pokemon/EntityEffect.kt

@@ -63,16 +63,13 @@ interface EntityEffect {
             register(TransformEffect.ID, TransformEffect::class, ::TransformEffect)
         }
 
-        @JvmStatic
         fun <T : EntityEffect> register(id: String, type: KClass<T>, default: () -> T) {
             effects[id] = type
             defaults[id] = default
         }
 
-        @JvmStatic
         fun createDefault(id: String): EntityEffect? = defaults[id]?.invoke()
 
-        @JvmStatic
         fun loadFromNbt(nbt: CompoundTag, registryLookup: HolderLookup.Provider): EntityEffect? {
             if (nbt.contains(DataKeys.ENTITY_EFFECT_ID)) {
                 val id = nbt.getString(DataKeys.ENTITY_EFFECT_ID)
@@ -103,4 +100,4 @@ interface MocKEffect : PhysicalEffect {
 
     val exposedBall: PokeBall?
         get() = this.mock.pokeball?.let { PokeBalls.getPokeBall(it.asIdentifierDefaultingNamespace()) }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/events/battles/instruction/FormeChangeEvent.kt

@@ -8,10 +8,12 @@
 
 package com.cobblemon.mod.common.api.events.battles.instruction
 
+import com.bedrockk.molang.runtime.value.MoValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.api.battles.model.actor.ActorType
 import com.cobblemon.mod.common.api.events.battles.BattleEvent
+import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
 import com.cobblemon.mod.common.util.asArrayValue
 
@@ -23,8 +25,7 @@ import com.cobblemon.mod.common.util.asArrayValue
 data class FormeChangeEvent(
     override val battle: PokemonBattle,
     val pokemon: BattlePokemon,
-    val formeName: String,
-    val pnx: String
+    val formeName: String
 ) : BattleEvent {
     val context = mutableMapOf(
         "battle" to battle.struct,
@@ -32,7 +33,6 @@ data class FormeChangeEvent(
         "npcs" to battle.actors.filter { it.type == ActorType.NPC }.asArrayValue { it.struct },
         "wild_pokemon" to battle.actors.filter { it.type == ActorType.WILD }.asArrayValue { it.struct },
         "pokemon" to pokemon.struct,
-        "forme" to StringValue(formeName),
-        "pnx" to StringValue(pnx)
+        "forme" to StringValue(formeName)
     )
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/fishing/SpawnBait.kt

@@ -35,7 +35,6 @@ class SpawnBait(
         constructor(type: ResourceLocation, subcategory: Optional<ResourceLocation>, chance: Double, value: Double) : this(type, subcategory.orElse(null), chance, value)
 
         companion object {
-            @JvmField
             val CODEC = RecordCodecBuilder.create<Effect> { instance ->
                 instance.group(
                     ResourceLocation.CODEC.fieldOf("type").forGetter { it.type },
@@ -48,7 +47,6 @@ class SpawnBait(
     }
 
     companion object {
-        @JvmField
         val CODEC = RecordCodecBuilder.create<SpawnBait> { instance ->
             instance.group(
                 ITEM_REGISTRY_LIKE_CODEC.fieldOf("item").forGetter { it.item },
@@ -56,7 +54,6 @@ class SpawnBait(
             ).apply(instance, ::SpawnBait)
         }
 
-        @JvmField
         val STREAM_CODEC = ByteBufCodecs.fromCodec(CODEC)
     }
 
@@ -99,4 +96,6 @@ class SpawnBait(
             }
         }
     }
-}
+}
+
+

common/src/main/kotlin/com/cobblemon/mod/common/api/interaction/PokemonInteractions.kt

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.interaction
 
 import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.api.conditional.RegistryLikeCondition
 import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.molang.ExpressionLike
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
@@ -30,11 +29,6 @@ import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.util.LowerCaseEnumTypeAdapterFactory
-import net.minecraft.world.item.Item
-import net.minecraft.world.level.biome.Biome
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.levelgen.structure.Structure
-import net.minecraft.world.level.material.Fluid
 
 object PokemonInteractions : JsonDataRegistry<PokemonInteractionSet> {
     override val id = cobblemonResource("pokemon_interactions")
@@ -49,11 +43,6 @@ object PokemonInteractions : JsonDataRegistry<PokemonInteractionSet> {
         .registerTypeAdapter(Requirement::class.java, CobblemonRequirementAdapter)
         .registerTypeAdapter(InteractionEffect::class.java, InteractionEffectAdapter)
         .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Biome::class.java).type, BiomeLikeConditionAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Block::class.java).type, BlockLikeConditionAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Item::class.java).type, ItemLikeConditionAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Structure::class.java).type, StructureLikeConditionAdapter)
-        .registerTypeAdapter(TypeToken.getParameterized(RegistryLikeCondition::class.java, Fluid::class.java).type, FluidLikeConditionAdapter)
         .registerTypeAdapter(IntRange::class.java, IntRangeAdapter)
         .registerTypeAdapterFactory(LowerCaseEnumTypeAdapterFactory())
         .setPrettyPrinting()

common/src/main/kotlin/com/cobblemon/mod/common/api/interaction/PokemonInteration.kt

@@ -17,7 +17,6 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket
 import com.cobblemon.mod.common.pokemon.adapters.CobblemonRequirementAdapter
 import com.cobblemon.mod.common.util.*
-import com.google.gson.annotations.SerializedName
 import net.minecraft.core.registries.Registries
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
@@ -144,12 +143,11 @@ class GiveItemEffect(val item: ResourceLocation, val amount: IntRange?) : Intera
 class PlaySoundEffect(
     val sound: ResourceLocation,
     val soundSource: SoundSource?,
-    @SerializedName("playAround") private val _playAround: Boolean?,
-    @SerializedName("distance") private val _distance: Double?,
-    @SerializedName("volume") private val _volume: Float?,
-    @SerializedName("pitch") private val _pitch: Float?,
+    val playAround: Boolean = true,
+    val distance: Double = 64.0,
+    val volume: Float = 1.0F,
+    val pitch: Float = 1.0F
 ) : InteractionEffect {
-
     override fun applyEffect(
         pokemon: PokemonEntity,
         player: ServerPlayer
@@ -163,7 +161,6 @@ class PlaySoundEffect(
             volume,
             pitch
         )
-
         if (playAround) {
             packet.sendToPlayersAround(pokemon.x, pokemon.y, pokemon.z, distance, pokemon.level().dimension())
         } else {
@@ -171,18 +168,6 @@ class PlaySoundEffect(
         }
     }
 
-    val playAround: Boolean
-        get() = _playAround != false
-
-    val distance: Double
-        get() = _distance ?: 64.0
-
-    val volume: Float
-        get() = _volume ?: 1.0F
-
-    val pitch: Float
-        get() = _pitch ?: 1.0F
-
     companion object {
         val ID = "play_sound"
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/interaction/RequestManager.kt

@@ -223,7 +223,6 @@ abstract class RequestManager<T : ServerPlayerActionRequest> {
     companion object {
         private val managers = mutableListOf<RequestManager<*>>()
 
-        @JvmStatic
         fun register(manager: RequestManager<*>) = managers.add(manager)
 
         fun onLogoff(player: ServerPlayer) = managers.forEach { it.onLogoff(player) }

common/src/main/kotlin/com/cobblemon/mod/common/api/item/ability/AbilityChanger.kt

@@ -59,7 +59,7 @@ interface AbilityChanger<T : PotentialAbility> {
          *
          * While this can be used in custom data scenarios this functions most "game-like" if the Pokémon only has 2 common abilities.
          */
-        @JvmField
+        @JvmStatic
         val COMMON_ABILITY: AbilityChanger<CommonAbility> = AbilityTypeChanger(CommonAbilityType) { other -> other == CommonAbilityType }
 
         /**
@@ -67,7 +67,7 @@ interface AbilityChanger<T : PotentialAbility> {
          *
          * While this can be used in custom data scenarios this functions most "game-like" if the Pokémon only has 1 hidden ability.
          */
-        @JvmField
+        @JvmStatic
         val HIDDEN_ABILITY: AbilityChanger<HiddenAbility> = AbilityTypeChanger(HiddenAbilityType) { other -> other == CommonAbilityType || other == HiddenAbilityType }
 
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/molang/ExpressionLike.kt

@@ -35,11 +35,10 @@ interface ExpressionLike {
     fun resolveObject(runtime: MoLangRuntime) = resolve(runtime) as ObjectValue<*>
 
     companion object {
-        @JvmField
         val CODEC: Codec<ExpressionLike> = Codec.STRING.xmap({
             it.asExpressionLike()
         }) {
             it.getString()
         }
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt

@@ -324,24 +324,13 @@ object MoLangFunctions {
             runtime.environment.context = params.environment.context
             val expression = params.getString(0).asExpressionLike()
             val delayInSeconds = params.getDoubleOrNull(1)?.toFloat() ?: 0.0f
-
-            fun evaluate(): MoValue {
-                return try {
-                    runtime.resolve(expression)
-                } catch (ex: Exception) {
-                    Cobblemon.LOGGER.warn("Failed to evaluate MoLang expression${if (delayInSeconds > 0.0f) " (delayed)" else ""}: $expression", ex)
-                    DoubleValue.ZERO
-                }
-            }
-
             if (delayInSeconds > 0.0f) {
                 val tracker = if (Cobblemon.implementation.environment() == Environment.SERVER) ServerTaskTracker else ClientTaskTracker
                 tracker.after(delayInSeconds) {
-                    evaluate()
+                    runtime.resolve(expression)
                 }
-                DoubleValue.ONE
             } else {
-                evaluate()
+                runtime.resolve(expression)
             }
         },
         "system_time_millis" to java.util.function.Function { _ ->
@@ -351,19 +340,19 @@ object MoLangFunctions {
         "date_local_time" to java.util.function.Function { _ ->
             val time = System.currentTimeMillis()
             val date = java.util.Date(time)
-            val formatted = java.text.SimpleDateFormat("dd/MM/yyyy").format(date)
+            val formatted = java.text.SimpleDateFormat("DD/MM/YYYY").format(date)
             StringValue(formatted)
         },
         "date_of" to java.util.function.Function { params ->
             val time = params.getDouble(0).toLong()
             val date = java.util.Date(time)
-            val formatted = java.text.SimpleDateFormat("dd/MM/yyyy").format(date)
+            val formatted = java.text.SimpleDateFormat("DD/MM/YYYY").format(date)
             StringValue(formatted)
         },
         "date_is_after" to java.util.function.Function { params ->
             val dateA = params.getString(0)
             val dateB = params.getString(1)
-            val format = java.text.SimpleDateFormat("dd/MM/yyyy")
+            val format = java.text.SimpleDateFormat("DD/MM/YYYY")
             val a = format.parse(dateA)
             val b = format.parse(dateB)
             DoubleValue(a.after(b))

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/BenchedMove.kt

@@ -112,7 +112,7 @@ class BenchedMoves : Iterable<BenchedMove> {
     }
 
     companion object {
-        @JvmField
+        @JvmStatic
         val CODEC: Codec<BenchedMoves> = Codec.list(BenchedMove.CODEC)
             .xmap(
                 { moveList ->
@@ -144,7 +144,6 @@ data class BenchedMove(val moveTemplate: MoveTemplate, val ppRaisedStages: Int)
     }
 
     companion object {
-        @JvmStatic
         fun loadFromNBT(nbt: CompoundTag): BenchedMove {
             val name = nbt.getString(DataKeys.POKEMON_MOVESET_MOVENAME)
             return BenchedMove(
@@ -153,7 +152,6 @@ data class BenchedMove(val moveTemplate: MoveTemplate, val ppRaisedStages: Int)
             )
         }
 
-        @JvmStatic
         fun loadFromJSON(json: JsonObject): BenchedMove {
             val name = json.get(DataKeys.POKEMON_MOVESET_MOVENAME).asString
             return BenchedMove(
@@ -162,7 +160,6 @@ data class BenchedMove(val moveTemplate: MoveTemplate, val ppRaisedStages: Int)
             )
         }
 
-        @JvmStatic
         fun loadFromBuffer(buffer: RegistryFriendlyByteBuf): BenchedMove {
             val name = buffer.readString()
             return BenchedMove(
@@ -171,7 +168,7 @@ data class BenchedMove(val moveTemplate: MoveTemplate, val ppRaisedStages: Int)
             )
         }
 
-        @JvmField
+        @JvmStatic
         val CODEC: Codec<BenchedMove> = RecordCodecBuilder.create { it.group(
             MoveTemplate.BY_STRING_CODEC.fieldOf(DataKeys.POKEMON_MOVESET_MOVENAME).forGetter(BenchedMove::moveTemplate),
             Codec.intRange(0, 3).fieldOf(DataKeys.POKEMON_MOVESET_RAISED_PP_STAGES).forGetter(BenchedMove::ppRaisedStages)

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/Move.kt

@@ -149,14 +149,12 @@ open class Move(
     }
 
     companion object {
-        @JvmStatic
         fun loadFromNBT(nbt: CompoundTag): Move {
             val moveName = nbt.getString(DataKeys.POKEMON_MOVESET_MOVENAME)
             val template = Moves.getByNameOrDummy(moveName)
             return template.create(nbt.getInt(DataKeys.POKEMON_MOVESET_MOVEPP), nbt.getInt(DataKeys.POKEMON_MOVESET_RAISED_PP_STAGES))
         }
 
-        @JvmStatic
         fun loadFromJSON(json: JsonObject): Move {
             val moveName = json.get(DataKeys.POKEMON_MOVESET_MOVENAME).asString
             val template = Moves.getByNameOrDummy(moveName)
@@ -165,7 +163,6 @@ open class Move(
             return Move(template, currentPp, raisedPpStages)
         }
 
-        @JvmStatic
         fun loadFromBuffer(buffer: RegistryFriendlyByteBuf): Move {
             val moveName = buffer.readString()
             val currentPp = buffer.readSizedInt(IntSize.U_BYTE)
@@ -174,7 +171,7 @@ open class Move(
             return template.create(currentPp, raisedPpStages)
         }
 
-        @JvmField
+        @JvmStatic
         val CODEC: Codec<Move> = RecordCodecBuilder.create { it.group(
             MoveTemplate.BY_STRING_CODEC.fieldOf(DataKeys.POKEMON_MOVESET_MOVENAME).forGetter(Move::template),
             Codec.intRange(0, Int.MAX_VALUE).fieldOf(DataKeys.POKEMON_MOVESET_MOVEPP).forGetter(Move::currentPp),

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/MoveSet.kt

@@ -208,7 +208,7 @@ class MoveSet : Iterable<Move> {
 
     companion object {
         const val MOVE_COUNT = 4
-        @JvmField
+        @JvmStatic
         val CODEC: Codec<MoveSet> = Codec.list(Move.CODEC, 0, MOVE_COUNT)
             .xmap(
                 { moveList ->

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/MoveTemplate.kt

@@ -90,10 +90,9 @@ open class MoveTemplate(
     )
 
     companion object {
-        @JvmStatic
         fun dummy(name: String) = Dummy(name)
 
-        @JvmField
+        @JvmStatic
         val BY_STRING_CODEC: Codec<MoveTemplate> = CodecUtils.createByStringCodec(
             Moves::getByNameOrDummy,
             MoveTemplate::name
@@ -158,4 +157,4 @@ open class MoveTemplate(
         }
         return this.elementalType
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/ActionEffectTimeline.kt

@@ -32,7 +32,6 @@ class ActionEffectTimeline(
     val condition: ExpressionLike = "true".asExpressionLike()
 ) {
     companion object {
-        @JvmField
         val NONE = ActionEffectTimeline()
     }
 
@@ -99,4 +98,4 @@ interface EntityProvider {
 //    val sound: ResourceLocation? = null,
 //    val animation: List<AnimationWithMoments> = listOf(),
 //    val effects: List<ActionEffect> = listOf()
-//)
+//)

common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ActionEffectKeyframe.kt

@@ -21,10 +21,8 @@ import java.util.concurrent.CompletableFuture
  */
 interface ActionEffectKeyframe {
     companion object {
-        @JvmField
         val types = mutableMapOf<String, Class<out ActionEffectKeyframe>>()
 
-        @JvmStatic
         inline fun <reified T : ActionEffectKeyframe> register(type: String) {
             types[type] = T::class.java
         }
@@ -33,4 +31,4 @@ interface ActionEffectKeyframe {
     fun play(context: ActionEffectContext): CompletableFuture<Unit>
     fun interrupt(context: ActionEffectContext) {}
     fun skip(): CompletableFuture<Unit> = CompletableFuture.completedFuture(Unit)
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/mulch/MulchVariant.kt

@@ -32,4 +32,4 @@ enum class MulchVariant(val duration: Int = -1) : StringRepresentable {
     companion object {
         const val GROWTH_TIME_MULTIPLIER = 0.5
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCClasses.kt

@@ -109,7 +109,6 @@ object NPCClasses : JsonDataRegistry<NPCClass> {
      * @param name The path of the NPC class asset.
      * @return The [NPCClass] if existing.
      */
-    @JvmStatic
     fun getByName(name: String) = this.getByIdentifier(cobblemonResource(name))
 
     /**

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/NPCPartyProvider.kt

@@ -25,7 +25,6 @@ import net.minecraft.server.level.ServerPlayer
  */
 interface NPCPartyProvider {
     companion object {
-        @JvmField
         val types = mutableMapOf<String, (String) -> NPCPartyProvider>(
             SimplePartyProvider.TYPE to { SimplePartyProvider() },
             PoolPartyProvider.TYPE to { PoolPartyProvider() },

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/configuration/NPCInteractConfiguration.kt

@@ -34,7 +34,6 @@ interface NPCInteractConfiguration {
     companion object {
         val types = mutableMapOf<String, NPCInteractConfigurationType<out NPCInteractConfiguration>>()
 
-        @JvmStatic
         fun register(type: String, displayName: MutableComponent, clazz: Class<out NPCInteractConfiguration>) {
             types[type] = NPCInteractConfigurationType(displayName, clazz)
         }

common/src/main/kotlin/com/cobblemon/mod/common/api/npc/variation/NPCVariationProvider.kt

@@ -34,7 +34,6 @@ interface NPCVariationProvider {
             "random" to RandomNPCVariationProvider::class.java
         )
 
-        @JvmStatic
         fun register(type: String, clazz: Class<out NPCVariationProvider>) {
             types[type] = clazz
         }

common/src/main/kotlin/com/cobblemon/mod/common/api/orientation/OrientationController.kt

@@ -23,11 +23,8 @@ import kotlin.math.sign
 open class OrientationController(val entity: LivingEntity) {
 
     companion object {
-        @JvmField
         val FORWARDS: Vector3f = Vector3f(0.0f, 0.0f, -1.0f)
-        @JvmField
         val UP: Vector3f = Vector3f(0.0f, 1.0f, 0.0f)
-        @JvmField
         val LEFT: Vector3f = Vector3f(-1.0f, 0.0f, 0.0f)
     }
 
@@ -132,4 +129,4 @@ open class OrientationController(val entity: LivingEntity) {
         return@updateOrientation Matrix3f().set(resultQuat)
     }
 
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/permission/PermissionLevel.kt

@@ -25,7 +25,6 @@ enum class PermissionLevel(val numericalValue: Int) {
     ALL_COMMANDS(4);
 
     companion object {
-        @JvmStatic
         fun byNumericValue(value: Int): PermissionLevel {
             return entries.first { it.numericalValue == value }
         }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokeball/catching/CaptureContext.kt

@@ -23,8 +23,6 @@ data class CaptureContext(
          * @param critical If the capture is a critical capture, defaults to false.
          * @return The generated [CaptureContext].
          */
-        @JvmOverloads
-        @JvmStatic
         fun successful(critical: Boolean = false): CaptureContext {
             if (critical) {
                 return CaptureContext(numberOfShakes = 1, isSuccessfulCapture = true, isCriticalCapture = true)

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/FormDexRecord.kt

@@ -37,7 +37,6 @@ import net.minecraft.network.RegistryFriendlyByteBuf
  */
 class FormDexRecord {
     companion object {
-        @JvmField
         val CODEC: Codec<FormDexRecord> = RecordCodecBuilder.create { instance ->
             instance.group(
                 ListCodec(Codec.STRING, 0, 3).fieldOf("genders").forGetter { it.genders.map { it.name } },

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/PokedexEntryProgress.kt

@@ -26,11 +26,10 @@ enum class PokedexEntryProgress : StringRepresentable, Comparable<PokedexEntryPr
 
     override fun getSerializedName() = this.name
     companion object {
-        @JvmField
         val CODEC: Codec<PokedexEntryProgress> = RecordCodecBuilder.create { instance ->
             instance.map ({
                 PokedexEntryProgress.valueOf(it)
             }, PrimitiveCodec.STRING.fieldOf("name").forGetter { it.name })
         }
     }
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/PokedexManager.kt

@@ -70,7 +70,6 @@ class PokedexManager(
     }
 
     companion object {
-        @JvmField
         val CODEC = RecordCodecBuilder.create<PokedexManager> { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("uuid").forGetter { it.uuid.toString() },

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/SpeciesDexRecord.kt

@@ -33,7 +33,6 @@ import net.minecraft.resources.ResourceLocation
  */
 class SpeciesDexRecord {
     companion object {
-        @JvmField
         val CODEC: Codec<SpeciesDexRecord> = RecordCodecBuilder.create { instance ->
             instance.group(
                 ListCodec(PrimitiveCodec.STRING, 0, 512).fieldOf("aspects").forGetter { it.aspects.toList() },

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/def/AggregatePokedexDef.kt

@@ -76,9 +76,7 @@ class AggregatePokedexDef(
     }
 
     companion object {
-        @JvmField
         val ID = cobblemonResource("aggregate_pokedex_def")
-        @JvmField
         val CODEC: MapCodec<AggregatePokedexDef> = RecordCodecBuilder.mapCodec { instance ->
             instance.group(
                 ResourceLocation.CODEC.fieldOf("id").forGetter { it.id },

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/def/PokedexDef.kt

@@ -34,12 +34,9 @@ abstract class PokedexDef: ClientDataSynchronizer<PokedexDef> {
     abstract fun getEntries(): List<PokedexEntry>
 
     companion object {
-        @JvmField
         val CODEC: Codec<PokedexDef> = ResourceLocation.CODEC.dispatch("type", PokedexDef::typeId, PokedexDef::getCodecById)
-        @JvmField
         val PACKET_CODEC: StreamCodec<ByteBuf, PokedexDef> = ResourceLocation.STREAM_CODEC.dispatch({ it.typeId }, ::getPacketCodecById)
 
-        @JvmStatic
         fun getPacketCodecById(id: ResourceLocation): StreamCodec<ByteBuf, out PokedexDef> {
             return when (id) {
                 SimplePokedexDef.ID -> SimplePokedexDef.PACKET_CODEC
@@ -48,7 +45,6 @@ abstract class PokedexDef: ClientDataSynchronizer<PokedexDef> {
             }
         }
 
-        @JvmStatic
         fun getCodecById(id: ResourceLocation): MapCodec<out PokedexDef> {
             return when (id) {
                 SimplePokedexDef.ID -> SimplePokedexDef.CODEC

common/src/main/kotlin/com/cobblemon/mod/common/api/pokedex/def/SimplePokedexDef.kt

@@ -64,9 +64,7 @@ class SimplePokedexDef(
     }
 
     companion object {
-        @JvmField
         val ID = cobblemonResource("simple_pokedex_def")
-        @JvmField
         val CODEC: MapCodec<SimplePokedexDef> = RecordCodecBuilder.mapCodec { instance ->
             instance.group(
                 ResourceLocation.CODEC.fieldOf("id").forGetter { it.id },
@@ -80,7 +78,6 @@ class SimplePokedexDef(
             }
         }
 
-        @JvmField
         val PACKET_CODEC: StreamCodec<ByteBuf, SimplePokedexDef> = StreamCodec.composite(
             ResourceLocation.STREAM_CODEC, SimplePokedexDef::id,
             ByteBufCodecs.INT, SimplePokedexDef::sortOrder,

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/PokemonProperties.kt

@@ -82,13 +82,13 @@ import kotlin.jvm.optionals.getOrNull
 open class PokemonProperties {
     companion object {
 
-        @JvmField
+        @JvmStatic
         val CODEC: Codec<PokemonProperties> = Codec.STRING.xmap(
             { parse(it) },
             { it.asString() }
         )
 
-        @JvmField
+        @JvmStatic
         val CUSTOM_PROPERTIES_CODEC: Codec<MutableList<CustomPokemonProperty>> = Codec.list(Codec.STRING)
             .xmap(
                 { string -> parse(string.joinToString(" ")).customProperties },
@@ -96,7 +96,6 @@ open class PokemonProperties {
             )
 
         @JvmOverloads
-        @JvmStatic
         fun parse(string: String, delimiter: String = " ", assigner: String = "="): PokemonProperties {
             val props = PokemonProperties()
             props.originalString = string

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/aspect/AspectProvider.kt

@@ -22,14 +22,10 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 interface AspectProvider {
     companion object {
         val providers = mutableListOf<AspectProvider>()
-
-        @JvmStatic
         fun register(provider: AspectProvider): AspectProvider {
             providers.add(provider)
             return provider
         }
-
-        @JvmStatic
         fun unregister(provider: AspectProvider) {
             providers.remove(provider)
         }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/aspect/SingleConditionAspectProvider.kt

@@ -21,7 +21,6 @@ import com.cobblemon.mod.common.pokemon.Pokemon
  */
 interface SingleConditionalAspectProvider : AspectProvider {
     companion object {
-        @JvmStatic
         fun getForFeature(name: String): SingleConditionalAspectProvider {
             return object : SingleConditionalAspectProvider {
                 override val aspect: String = name

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/egg/EggGroup.kt

@@ -38,7 +38,6 @@ enum class EggGroup(val showdownID: String) {
             it.showdownID.lowercase().replace(" ", "_").replace("-", "_")
         }
 
-        @JvmStatic
         fun fromIdentifier(identifier: String): EggGroup? {
             val key = identifier.lowercase().replace(" ", "_").replace("-", "_")
             return identifierMap[key]

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/PreEvolution.kt

@@ -26,9 +26,9 @@ interface PreEvolution {
     val form: FormData
 
     companion object {
-        @JvmOverloads
-        @JvmStatic
+
         fun of(species: Species, form: FormData = species.standardForm): PreEvolution = StandardPreEvolution(species, form)
+
     }
 
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/evolution/progress/EvolutionProgressTypes.kt

@@ -25,15 +25,15 @@ object EvolutionProgressTypes {
         ResourceKey.createRegistryKey(cobblemonResource("evolution_progress")), Lifecycle.stable()
     )
 
-    @JvmField
+    @JvmStatic
     val DAMAGE_TAKEN = this.registerType(DamageTakenEvolutionProgress.ID, EvolutionProgressType(DamageTakenEvolutionProgress.CODEC))
-    @JvmField
+    @JvmStatic
     val DEFEAT = this.registerType(DefeatEvolutionProgress.ID, EvolutionProgressType(DefeatEvolutionProgress.CODEC))
-    @JvmField
+    @JvmStatic
     val LAST_BATTLE_CRITICAL_HITS = this.registerType(LastBattleCriticalHitsEvolutionProgress.ID, EvolutionProgressType(LastBattleCriticalHitsEvolutionProgress.CODEC))
-    @JvmField
+    @JvmStatic
     val RECOIL = this.registerType(RecoilEvolutionProgress.ID, EvolutionProgressType(RecoilEvolutionProgress.CODEC))
-    @JvmField
+    @JvmStatic
     val USE_MOVE = this.registerType(UseMoveEvolutionProgress.ID, EvolutionProgressType(UseMoveEvolutionProgress.CODEC))
 
     /**

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/feature/SpeciesFeatures.kt

@@ -102,12 +102,6 @@ object SpeciesFeatures : JsonDataRegistry<SpeciesFeatureProvider<*>> {
 
     @JvmStatic
     fun register(name: String, provider: SpeciesFeatureProvider<*>) = register(name, provider, isCoded = true)
-
-    @JvmStatic
-    fun registerType(key: String, clazz: Class<out SpeciesFeatureProvider<*>>) {
-        types[key] = clazz
-    }
-
     private fun registerFromAssets(identifier: ResourceLocation, provider: SpeciesFeatureProvider<*>) = register(identifier.path, provider, isCoded = false)
 
     @JvmStatic

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/friendship/FriendshipMutationCalculator.kt

@@ -34,7 +34,6 @@ fun interface FriendshipMutationCalculator {
          * For more information see this [Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/Friendship#Generation_VIII) entry.
          * It will yield 3 between 0 and 99 friendship, 2 between 100 and 199 otherwise 0.
          */
-        @JvmField
         val SWORD_AND_SHIELD_LEVEL_UP = FriendshipMutationCalculator { pokemon ->
             when {
                 pokemon.friendship <= 99 -> 3

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/moves/Learnset.kt

@@ -23,7 +23,6 @@ open class Learnset : ClientDataSynchronizer<Learnset> {
         val loadMove: (JsonElement, Learnset) -> Boolean
     ) {
         companion object {
-            @JvmStatic
             fun parseFromPrefixIntoList(prefix: String, list: (Learnset) -> MutableList<MoveTemplate>): Interpreter {
                 return Interpreter { element, learnset ->
                     val str = element.takeIf { it.isJsonPrimitive }?.asString ?: return@Interpreter false
@@ -41,19 +40,12 @@ open class Learnset : ClientDataSynchronizer<Learnset> {
     }
 
     companion object {
-        @JvmField
         val tmInterpreter = Interpreter.parseFromPrefixIntoList("tm") { it.tmMoves }
-        @JvmField
         val eggInterpreter = Interpreter.parseFromPrefixIntoList("egg") { it.eggMoves }
-        @JvmField
         val tutorInterpreter = Interpreter.parseFromPrefixIntoList("tutor") { it.tutorMoves }
-        @JvmField
         val legacyInterpreter = Interpreter.parseFromPrefixIntoList("legacy") { it.legacyMoves }
-        @JvmField
         val specialInterpreter = Interpreter.parseFromPrefixIntoList("special") { it.specialMoves }
-        @JvmField
         val formChangeInterpreter = Interpreter.parseFromPrefixIntoList("form_change") { it.formChangeMoves }
-        @JvmField
         val levelUpInterpreter = Interpreter { element, learnset ->
             val str = element.takeIf { it.isJsonPrimitive }?.asString ?: return@Interpreter false
             val splits = str.split(":")
@@ -76,7 +68,6 @@ open class Learnset : ClientDataSynchronizer<Learnset> {
 
         }
 
-        @JvmField
         val interpreters = mutableListOf(
             tmInterpreter,
             eggInterpreter,

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/moves/LearnsetQuery.kt

@@ -22,7 +22,7 @@ fun interface LearnsetQuery {
     fun canLearn(move: MoveTemplate, learnset: Learnset): Boolean
 
     companion object {
-        @JvmField
+
         val ANY = LearnsetQuery { move, learnset ->
             learnset.levelUpMoves.values.any { it.contains(move) }
                     || learnset.eggMoves.contains(move)
@@ -34,7 +34,6 @@ fun interface LearnsetQuery {
                     || learnset.specialMoves.contains(move)
         }
 
-        @JvmField
         val LEGAL = LearnsetQuery { move, learnset ->
             learnset.levelUpMoves.values.any { it.contains(move) }
                     || learnset.eggMoves.contains(move)
@@ -44,31 +43,22 @@ fun interface LearnsetQuery {
                     || learnset.evolutionMoves.contains(move)
         }
 
-        @JvmStatic
         fun level(level: Int) = LearnsetQuery { move, learnset -> learnset.getLevelUpMovesUpTo(level).contains(move) }
 
-        @JvmField
         val ANY_LEVEL = LearnsetQuery { move, learnset -> learnset.levelUpMoves.values.any { it.contains(move) } }
 
-        @JvmField
         val EGG_MOVE = LearnsetQuery { move, learnset -> learnset.eggMoves.contains(move) }
 
-        @JvmField
         val TUTOR_MOVES = LearnsetQuery { move, learnset -> learnset.tutorMoves.contains(move) }
 
-        @JvmField
         val TM_MOVE = LearnsetQuery { move, learnset -> learnset.tmMoves.contains(move) }
 
-        @JvmField
         val FORM_CHANGE = LearnsetQuery { move, learnset -> learnset.formChangeMoves.contains(move) }
 
-        @JvmField
         val EVOLUTION = LearnsetQuery { move, learnset -> learnset.evolutionMoves.contains(move) }
 
-        @JvmField
         val LEGACY_MOVES = LearnsetQuery { move, learnset -> learnset.legacyMoves.contains(move) }
 
-        @JvmField
         val SPECIAL_MOVES = LearnsetQuery { move, learnset -> learnset.specialMoves.contains(move) }
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/stats/Stat.kt

@@ -70,7 +70,7 @@ interface Stat {
         /**
          * A [Codec] for [Stat] without filtering the [Stat.Type].
          */
-        @JvmField
+        @JvmStatic
         val ALL_CODEC: Codec<Stat> = CodecUtils.createByIdentifierCodec(
             Cobblemon.statProvider::fromIdentifier,
             Stat::identifier
@@ -79,7 +79,7 @@ interface Stat {
         /**
          * A [Codec] for [Stat] with the [Stat.Type.PERMANENT].
          */
-        @JvmField
+        @JvmStatic
         val PERMANENT_ONLY_CODEC: Codec<Stat> = ALL_CODEC.comapFlatMap(
             { stat -> if (stat.type == Type.PERMANENT) DataResult.success(stat) else DataResult.error { "${stat.identifier} is not of type ${Type.PERMANENT}" } },
             { stat -> stat }
@@ -88,7 +88,7 @@ interface Stat {
         /**
          * A [Codec] for [Stat] with the [Stat.Type.BATTLE_ONLY].
          */
-        @JvmField
+        @JvmStatic
         val BATTLE_ONLY_CODEC: Codec<Stat> = ALL_CODEC.comapFlatMap(
             { stat -> if (stat.type == Type.BATTLE_ONLY) DataResult.success(stat) else DataResult.error { "${stat.identifier} is not of type ${Type.BATTLE_ONLY}" } },
             { stat -> stat }

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/stats/Stats.kt

@@ -35,25 +35,21 @@ enum class Stats(override val identifier: ResourceLocation, override val display
          * All the stats, an alternative to [values].
          * Using [StatProvider.all] is recommended instead for maximum addon compatibility.
          */
-        @JvmField
         val ALL: Set<Stat> = EnumSet.allOf(Stats::class.java)
 
         /**
          * All the stats with type of [Stat.Type.PERMANENT].
          * Using [StatProvider.ofType] with type [Stat.Type.PERMANENT] is recommended instead for maximum addon compatibility.
          */
-        @JvmField
         val PERMANENT: Set<Stat> = EnumSet.of(HP, ATTACK, DEFENCE, SPECIAL_ATTACK, SPECIAL_DEFENCE, SPEED)
 
         /**
          * All the stats with type of [Stat.Type.BATTLE_ONLY].
          * Using [StatProvider.ofType] with type [Stat.Type.BATTLE_ONLY] is recommended instead for maximum addon compatibility.
          */
-        @JvmField
         val BATTLE_ONLY: Set<Stat> = EnumSet.of(EVASION, ACCURACY)
 
         /** Gets the [Stat] from the respective Showdown id. */
-        @JvmStatic
         fun getStat(statKey: String) = when(statKey.lowercase()) {
             "hp" -> HP
             "atk", "attack" -> ATTACK // Hyper Cutter states the full stat name "Attack"
@@ -66,7 +62,6 @@ enum class Stats(override val identifier: ResourceLocation, override val display
         }
 
         /** Gets the severity lang key from the respective boost/unboost stage. */
-        @JvmStatic
         fun getSeverity(stages: Int) = when(stages) {
             0 -> "cap.single"
             1 -> "slight"

common/src/main/kotlin/com/cobblemon/mod/common/api/pokemon/status/Status.kt

@@ -30,7 +30,7 @@ open class Status(
         /**
          * A [Codec] for [Status].
          */
-        @JvmField
+        @JvmStatic
         val CODEC: Codec<Status> = CodecUtils.createByIdentifierCodec(
             Statuses::getStatus,
             Status::name

common/src/main/kotlin/com/cobblemon/mod/common/api/properties/CustomPokemonProperty.kt

@@ -25,23 +25,17 @@ import com.cobblemon.mod.common.util.server
 interface CustomPokemonProperty {
     companion object {
         /** A list of all the registered [CustomPokemonPropertyType]s. */
-        @JvmField
         val properties = mutableListOf<CustomPokemonPropertyType<*>>()
 
-        @JvmStatic
         fun <T: CustomPokemonProperty> register(propertyType: CustomPokemonPropertyType<T>) {
             properties.add(propertyType)
             this.triggerSyncAttempt()
         }
 
-        @JvmStatic
-        @JvmOverloads
         fun <T : CustomPokemonProperty> register(name: String, needsLabel: Boolean = true, fromString: (String?) -> T?, examples: () -> Collection<String>) {
             register(listOf(name), needsLabel, fromString, examples)
         }
 
-        @JvmStatic
-        @JvmOverloads
         fun <T : CustomPokemonProperty> register(aliases: Iterable<String>, needsLabel: Boolean = true, fromString: (String?) -> T?, examples: () -> Collection<String>) {
             properties.add(
                 object : CustomPokemonPropertyType<T> {
@@ -54,7 +48,6 @@ interface CustomPokemonProperty {
             this.triggerSyncAttempt()
         }
 
-        @JvmStatic
         fun unregister(property: CustomPokemonPropertyType<*>) {
             properties.remove(property)
         }

common/src/main/kotlin/com/cobblemon/mod/common/api/reactive/EventObservables.kt

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.api.reactive
 import com.cobblemon.mod.common.api.events.Cancelable
 
 open class EventObservable<T> : SimpleObservable<T>() {
-    @JvmOverloads
     inline fun post(vararg events: T, then: (T) -> Unit = {}) {
         // Issuing generic-typed pass-throughs to varargs doesn't work
         // properly unless the source is a vararg as well, complicated story.

common/src/main/kotlin/com/cobblemon/mod/common/api/reactive/Observable.kt

@@ -59,12 +59,10 @@ interface Observable<T> {
 
     companion object {
         /** Creates a completed [Observable] with the given values. This [Observable] cannot receive new values. */
-        @JvmStatic
         fun <T> just(vararg values: T): Observable<T> {
             return SingularObservable<T>().also { it.emit(*values) }
         }
 
-        @JvmStatic
         fun <T> of(future: CompletableFuture<T>): Observable<T> {
             val observable = SingularObservable<T>()
             future.thenAccept { observable.emit(it) }
@@ -72,28 +70,20 @@ interface Observable<T> {
         }
 
         /** Gets a [TakeFirstTransform] */
-        @JvmStatic
         fun <T> takeFirst(amount: Int = 1) = TakeFirstTransform<T>(amount)
         /** Gets a [IgnoreFirstTransform] */
-        @JvmStatic
         fun <T> ignoreFirst(amount: Int = 1) = IgnoreFirstTransform<T>(amount)
         /** Gets a [FilterTransform] */
-        @JvmStatic
         fun <T> filter(predicate: (T) -> Boolean) = FilterTransform(predicate)
         /** Gets a [MapTransform] */
-        @JvmStatic
         fun <T, O> map(mapping: (T) -> O) = MapTransform(mapping)
         /** Gets a [EmitWhileTransform] */
-        @JvmStatic
         fun <T> emitWhile(predicate: (T) -> Boolean) = EmitWhileTransform(predicate)
         /** Gets a [StopAfterTransform] */
-        @JvmStatic
         fun <T> stopAfter(predicate: (T) -> Boolean) = StopAfterTransform(predicate)
         /** Gets a transform which will take values until the given predicate is met. */
-        @JvmStatic
         fun <T> emitUntil(predicate: (T) -> Boolean) = EmitWhileTransform<T> { !predicate(it) }
         /** Gets a transform which does not change the value but lets you access the value at this stage of the pipe. */
-        @JvmStatic
         fun <T> tap(handler: (T) -> Unit) = map<T, T> { handler(it); return@map it }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/stats/RidingStat.kt

@@ -29,9 +29,7 @@ enum class RidingStat(
     JUMP(Flavour.BITTER);
 
     companion object {
-        @JvmStatic
         fun getByName(name: String) = RidingStat.entries.firstOrNull { it.name.equals(name, ignoreCase = true) }
-        @JvmStatic
         fun getByFlavour(flavour: Flavour) = RidingStat.entries.firstOrNull { it.flavour == flavour }
     }
 

common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/BedrockParticle.kt

@@ -72,7 +72,6 @@ class BedrockParticle(
 
     // kill plane maybe
     companion object {
-        @JvmField
         val EXPRESSION_SET_CODEC = RecordCodecBuilder.create<ExpressionSet> { instance ->
             instance.group(
                 EXPRESSION_CODEC.fieldOf("sizeX").forGetter { it.sizeX },
@@ -84,7 +83,6 @@ class BedrockParticle(
             ).apply(instance, ::ExpressionSet)
         }
 
-        @JvmField
         val EVENT_SET_CODEC = RecordCodecBuilder.create<EventSet> { instance ->
             instance.group(
                 SimpleEventTrigger.CODEC.listOf().fieldOf("creationEvents").forGetter { it.creationEvents },
@@ -93,7 +91,6 @@ class BedrockParticle(
             ).apply(instance, ::EventSet)
         }
 
-        @JvmField
         val CODEC: Codec<BedrockParticle> = RecordCodecBuilder.create { instance ->
             instance.group(
                 ResourceLocation.CODEC.fieldOf("texture").forGetter { it.texture },

common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/BedrockParticleEffect.kt

@@ -36,7 +36,6 @@ class BedrockParticleOptions(
     var events: MutableMap<String, ParticleEvent> = mutableMapOf()
 ) {
     companion object {
-        @JvmField
         val CODEC: Codec<BedrockParticleOptions> = RecordCodecBuilder.create { instance ->
             instance.group(
                 ResourceLocation.CODEC.fieldOf("id").forGetter { it.id },

common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/BedrockParticleEmitter.kt

@@ -39,7 +39,6 @@ class BedrockParticleEmitter(
     var loopingTravelDistanceEvents: MutableList<LoopingTravelDistanceEventTrigger> = mutableListOf()
 ) {
     companion object {
-        @JvmField
         val CODEC: Codec<BedrockParticleEmitter> = RecordCodecBuilder.create { instance ->
             instance.group(
                 EXPRESSION_CODEC.listOf().fieldOf("startExpressions").forGetter { it.startExpressions },

common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/EmitterSpace.kt

@@ -20,7 +20,6 @@ class EmitterSpace(
     var scaling: ScalingMode = ScalingMode.WORLD
 ) {
     companion object {
-        @JvmField
         val CODEC: Codec<EmitterSpace> = RecordCodecBuilder.create { instance ->
             instance.group(
                 Codec.STRING.optionalFieldOfWithDefault("scaling", "world").forGetter { it.scaling.toString() }

common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/MoLangCurve.kt

@@ -66,7 +66,6 @@ class LinearMoLangCurve(
     var nodes: List<Double> = emptyList()
 ) : MoLangCurve {
     companion object {
-        @JvmField
         val CODEC: Codec<LinearMoLangCurve> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },
@@ -128,7 +127,6 @@ class CatmullRomMoLangCurve(
     }
 
     companion object {
-        @JvmField
         val CODEC: Codec<CatmullRomMoLangCurve> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },
@@ -204,7 +202,6 @@ class BezierChainMoLangCurve(
         }
 
         companion object {
-            @JvmField
             val CODEC = RecordCodecBuilder.create<BezierChainNode> { instance ->
                 instance.group(
                     PrimitiveCodec.DOUBLE.fieldOf("value").forGetter { it.value },
@@ -233,7 +230,6 @@ class BezierChainMoLangCurve(
     class BezierChainPointData(val time: Double, val value: Double, val slope: Double)
 
     companion object {
-        @JvmField
         val CODEC: Codec<BezierChainMoLangCurve> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },
@@ -284,7 +280,6 @@ class BezierMoLangCurve(
     }
 
     companion object {
-        @JvmField
         val CODEC: Codec<BezierMoLangCurve> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },

common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleCameraMode.kt

@@ -67,7 +67,6 @@ interface ParticleCameraMode : CodecMapped {
 
 class RotateXYZCameraMode : ParticleCameraMode {
     companion object {
-        @JvmField
         val CODEC: Codec<RotateXYZCameraMode> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name }
@@ -102,7 +101,6 @@ class RotateXYZCameraMode : ParticleCameraMode {
 
 class RotateYCameraMode : ParticleCameraMode {
     companion object {
-        @JvmField
         val CODEC: Codec<RotateYCameraMode> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name }
@@ -138,7 +136,6 @@ class RotateYCameraMode : ParticleCameraMode {
 
 class LookAtXYZ : ParticleCameraMode {
     companion object {
-        @JvmField
         val CODEC: Codec<LookAtXYZ> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name }
@@ -175,7 +172,6 @@ class LookAtXYZ : ParticleCameraMode {
 class LookAtY : ParticleCameraMode {
     override val type: ParticleCameraModeType = ParticleCameraModeType.LOOK_AT_Y
     companion object {
-        @JvmField
         val CODEC: Codec<LookAtY> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name }
@@ -207,7 +203,6 @@ class LookAtY : ParticleCameraMode {
 class DirectionZ : ParticleCameraMode {
     override val type: ParticleCameraModeType = ParticleCameraModeType.DIRECTION_Z
     companion object {
-        @JvmField
         val CODEC: Codec<DirectionZ> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name }
@@ -243,7 +238,6 @@ class DirectionZ : ParticleCameraMode {
 class EmitterYZPlane : ParticleCameraMode {
     override val type: ParticleCameraModeType = ParticleCameraModeType.EMITTER_YZ_PLANE
     companion object {
-        @JvmField
         val CODEC: Codec<EmitterYZPlane> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name }
@@ -283,7 +277,6 @@ class EmitterYZPlane : ParticleCameraMode {
 class EmitterXZPlane : ParticleCameraMode {
     override val type: ParticleCameraModeType = ParticleCameraModeType.EMITTER_XZ_PLANE
     companion object {
-        @JvmField
         val CODEC: Codec<EmitterXZPlane> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name }
@@ -322,7 +315,6 @@ class EmitterXZPlane : ParticleCameraMode {
 class EmitterXYPlane : ParticleCameraMode {
     override val type: ParticleCameraModeType = ParticleCameraModeType.EMITTER_XY_PLANE
     companion object {
-        @JvmField
         val CODEC: Codec<EmitterXYPlane> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name }
@@ -361,7 +353,6 @@ class EmitterXYPlane : ParticleCameraMode {
 class DirectionY : ParticleCameraMode {
     override val type: ParticleCameraModeType = ParticleCameraModeType.DIRECTION_Y
     companion object {
-        @JvmField
         val CODEC: Codec<DirectionY> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name }
@@ -397,7 +388,6 @@ class DirectionY : ParticleCameraMode {
 class DirectionX : ParticleCameraMode {
     override val type: ParticleCameraModeType = ParticleCameraModeType.DIRECTION_X
     companion object {
-        @JvmField
         val CODEC: Codec<DirectionX> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name }
@@ -456,7 +446,6 @@ class DirectionX : ParticleCameraMode {
 class LookAtDirection : ParticleCameraMode {
     override val type: ParticleCameraModeType = ParticleCameraModeType.LOOK_AT_DIRECTION
     companion object {
-        @JvmField
         val CODEC: Codec<LookAtDirection> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name }

common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleCollision.kt

@@ -28,7 +28,6 @@ class ParticleCollision(
     var expiresOnContact: Boolean = false
 ) {
     companion object {
-        @JvmField
         val CODEC: Codec<ParticleCollision> = RecordCodecBuilder.create { instance ->
             instance.group(
                 EXPRESSION_CODEC.fieldOf("enabled").forGetter { it.enabled },

common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleEmitterLifetime.kt

@@ -41,7 +41,6 @@ interface ParticleEmitterLifetime : CodecMapped {
 
 class OnceEmitterLifetime(var activeTime: Expression = 1.0.asExpression()) : ParticleEmitterLifetime {
     companion object {
-        @JvmField
         val CODEC: Codec<OnceEmitterLifetime> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },
@@ -74,7 +73,6 @@ class OnceEmitterLifetime(var activeTime: Expression = 1.0.asExpression()) : Par
 
 class ExpressionEmitterLifetime(var activation: Expression = NumberExpression(0.0), var expiration: Expression = NumberExpression(0.0)) : ParticleEmitterLifetime {
     companion object {
-        @JvmField
         val CODEC: Codec<ExpressionEmitterLifetime> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },
@@ -116,7 +114,6 @@ class ExpressionEmitterLifetime(var activation: Expression = NumberExpression(0.
 
 class LoopingEmitterLifetime(var activeTime: Expression = 1.0.asExpression(), var sleepTime: Expression = 1.0.asExpression()) : ParticleEmitterLifetime {
     companion object {
-        @JvmField
         val CODEC: Codec<LoopingEmitterLifetime> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },

common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleEmitterRate.kt

@@ -48,7 +48,6 @@ enum class ParticleEmitterRateType {
 
 class InstantParticleEmitterRate(var amount: Expression = "1".asExpression()) : ParticleEmitterRate {
     companion object {
-        @JvmField
         val CODEC: Codec<InstantParticleEmitterRate> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },
@@ -85,7 +84,6 @@ class SteadyParticleEmitterRate(
     var time = System.currentTimeMillis()
 
     companion object {
-        @JvmField
         val CODEC: Codec<SteadyParticleEmitterRate> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },

common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleEmitterShape.kt

@@ -86,7 +86,6 @@ class SphereParticleEmitterShape(
     val pAttachmentOptions: Map<AttachedType, Boolean>? = null
 ) : ParticleEmitterShape {
     companion object {
-        @JvmField
         val CODEC: Codec<SphereParticleEmitterShape> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },
@@ -154,7 +153,6 @@ class PointParticleEmitterShape(
     val pAttachmentOptions: Map<AttachedType, Boolean>? = null
 ): ParticleEmitterShape {
     companion object {
-        @JvmField
         val CODEC: Codec<PointParticleEmitterShape> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },
@@ -212,7 +210,6 @@ class BoxParticleEmitterShape(
     val pAttachmentOptions: Map<AttachedType, Boolean>? = null
 ) : ParticleEmitterShape {
     companion object {
-        @JvmField
         val CODEC: Codec<BoxParticleEmitterShape> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },
@@ -335,7 +332,6 @@ class DiscParticleEmitterShape(
     val pAttachmentOptions: Map<AttachedType, Boolean>? = null
 ): ParticleEmitterShape {
     companion object {
-        @JvmField
         val CODEC: Codec<DiscParticleEmitterShape> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },
@@ -422,7 +418,6 @@ class EntityBoundingBoxParticleEmitterShape(
     var surfaceOnly: Boolean = true
 ): ParticleEmitterShape {
     companion object {
-        @JvmField
         val CODEC: Codec<EntityBoundingBoxParticleEmitterShape> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },

common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleEvent.kt

@@ -41,7 +41,6 @@ class ParticleEvent(
     var expression: ExpressionLike? = null
 ): Encodable, Decodable {
     companion object {
-        @JvmField
         val CODEC: Codec<ParticleEvent> = RecordCodecBuilder.create { instance ->
             instance.group(
                 EventParticleOptions.CODEC.optionalFieldOf("particle_effect", null).forGetter { it.particleEffect },
@@ -172,7 +171,6 @@ class EventParticleOptions(
     val expression: ExpressionLike? = null
 ) {
     companion object {
-        @JvmField
         val CODEC = RecordCodecBuilder.create<EventParticleOptions> { instance ->
             instance.group(
                 ResourceLocation.CODEC.fieldOf("effect").forGetter { it.effect },
@@ -207,7 +205,6 @@ class EventSoundEffect(
     val sound: ResourceLocation,
 ) {
     companion object {
-        @JvmField
         val CODEC = RecordCodecBuilder.create<EventSoundEffect> { instance ->
             instance.group(
                 ResourceLocation.CODEC.fieldOf("sound").forGetter { it.sound }

common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleEventTrigger.kt

@@ -31,7 +31,6 @@ import net.minecraft.network.RegistryFriendlyByteBuf
  */
 class SimpleEventTrigger(var event: String): Encodable, Decodable {
     companion object {
-        @JvmField
         val CODEC = RecordCodecBuilder.create<SimpleEventTrigger> { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("event").forGetter { it.event }
@@ -62,7 +61,6 @@ class SimpleEventTrigger(var event: String): Encodable, Decodable {
  */
 class EventTriggerTimeline(var map: MutableMap<Double, MutableList<String>>): Encodable, Decodable {
     companion object {
-        @JvmField
         val CODEC = RecordCodecBuilder.create<EventTriggerTimeline> { instance ->
             instance.group(
                 UnboundedMapCodec(PrimitiveCodec.DOUBLE, PrimitiveCodec.STRING.listOf()).fieldOf("map").forGetter { it.map }
@@ -96,7 +94,6 @@ class EventTriggerTimeline(var map: MutableMap<Double, MutableList<String>>): En
  */
 class LoopingTravelDistanceEventTrigger(var distance: Double, var events: MutableList<String>): Encodable, Decodable {
     companion object {
-        @JvmField
         val CODEC = RecordCodecBuilder.create<LoopingTravelDistanceEventTrigger> { instance ->
             instance.group(
                 PrimitiveCodec.DOUBLE.fieldOf("distance").forGetter { it.distance },

common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleMotion.kt

@@ -64,7 +64,6 @@ class ParametricParticleMotion(
     )
 ) : ParticleMotion {
     companion object {
-        @JvmField
         val CODEC: Codec<ParametricParticleMotion> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },
@@ -128,7 +127,6 @@ class DynamicParticleMotion(
     override val type = ParticleMotionType.DYNAMIC
 
     companion object {
-        @JvmField
         val CODEC: Codec<DynamicParticleMotion> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },
@@ -205,7 +203,6 @@ interface ParticleMotionDirection : CodecMapped {
 
 class InwardsMotionDirection : ParticleMotionDirection {
     companion object {
-        @JvmField
         val CODEC: Codec<InwardsMotionDirection> = RecordCodecBuilder.create { instance ->
             instance.group(PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name })
                 .apply(instance) { InwardsMotionDirection() }
@@ -231,7 +228,6 @@ class InwardsMotionDirection : ParticleMotionDirection {
 
 class OutwardsMotionDirection : ParticleMotionDirection {
     companion object {
-        @JvmField
         val CODEC: Codec<OutwardsMotionDirection> = RecordCodecBuilder.create { instance ->
             instance.group(PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name })
                 .apply(instance) { OutwardsMotionDirection() }
@@ -264,7 +260,6 @@ class CustomMotionDirection(
     )
 ) : ParticleMotionDirection {
     companion object {
-        @JvmField
         val CODEC: Codec<CustomMotionDirection> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name },
@@ -310,7 +305,6 @@ enum class ParticleMotionDirectionType {
 
 class StaticParticleMotion : ParticleMotion {
     companion object {
-        @JvmField
         val CODEC: Codec<StaticParticleMotion> = RecordCodecBuilder.create { instance ->
             instance.group(
                 PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name }