more armors

CHANGELOG.md

@@ -1,23 +1,22 @@
 # Changelog
-## [1.7.3 (January 31st, 2026)](#1-7-3)
+## [1.7.2 (MONTH Xth, YEAR)](#1-7-2)
+
+### Additions
+
+### Changes
 
 ### Fixes
-- Fixed mounted Pokémon not playing sounds.
-- Fixed players failing to join servers randomly.
-- Fixed some Pokémon having no stamina for flying.
-- Fixed `/pctake` not respecting the actual size of the PC.
+- Fixed orientation not getting reset after crashing while flying and getting back on the Pokémon.
+- Fixed Furfrou not being trimmable on NeoForge.
+- 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.
 
 ### Developer
-- Poké Ball GUI textures now respect the ball's namespace, enabling proper texture loading for custom balls from other mods.
 
 ### Molang & Datapacks
-- Added a `chance` requirement type for Pokémon interactions.
+
+### Particles
 
 ### Localization
-- Updated translations for:
-  - French
-  - Canadian French
-  - Korean
-  - Portuguese
-  - Simplified Chinese
-  - Spanish
+- Updated translations for:

changelogs/CHANGELOG-1.7.2.md

@@ -1,137 +0,0 @@
-# Changelog
-## [1.7.2 (January 25th, 2026)](#1-7-2)
-
-### Additions
-- Added Saccharine wood furniture for Adorn.
-- Added the Partner Mark, which party Pokémon have a very small chance to earn as the player walks, provided they have enough friendship.
-- Added decorative block models for existing items: Potion, Super Potion, Hyper Potion, Max Potion, Full Restore, Antidote, Awakening, Burn Heal, Ice Heal, Paralyze Heal, Full Heal, Ether, Elixir, Max Ether, Max Elixir, X Accuracy, X Attack, X Defence, X Special Attack, X Special Defence, X Speed, Dire Hit, Guard Spec, Weakness Policy, Blunder Policy, Cleanse Tag, and Spell Tag.
-- Added decorative sign blocks called Plaques.
-- Added ride style labels to ride stats in Pokédex, as well as ride style icons in the summary GUI.
-- Added more seasonings for sinister tea:
-  - Mental Herb - Mental Restoration I for 10 seconds, which staves off Insomnia.
-  - White Herb - Removes negative effects.
-  - Milk, Moomoo Milk - Removes effects.
-- Added dispenser support for:
-  - Applying a Honey Bottle to Saccharine Logs.
-  - Washing honey off of Saccharine Slathered Logs.
-  - Applying and removing honey on Saccharine Leaves.
-- Added riding statistics: `Distance by Pokémon on Land`, `Distance by Pokémon in Air` and `Distance by Pokémon in Liquid`.
-
-### New rideable Pokémon
-- Honchkrow 
-- Mantine
-
-### Pokémon Added
-
-#### Gen 5
-- Throh
-- Sawk
-
-#### Gen 6
-- Litleo
-- Pyroar
-- Spritzee
-- Aromatisse
-- Swirlix
-- Slurpuff
-
-### Model updates for the following Pokémon
-- Falinks
-- Cottonee
-- Whimsicott
-- Ferroseed
-- Ferrothorn
-- Chingling
-- Chimecho
-
-### Animation updates for the following Pokémon
-- Mantine (ride animations)
-- Flygon (ride jump animation)
-- Honchkrow (ride animations)
-- Croagunk
-- Toxicroak
-
-### Changes
-- Added a new config option, `Enable In-Flight Dismounting` (default: off), which lets you dismount while riding a Pokémon in the air. This is the textbook definition of caveat emptor.
-- Ride sounds have been separated into stereo for passengers and mono for other players. Riding will now sound more spacious.
-- 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.
-- Items given from interacting with Saccharine Leaves are placed in the active hotbar slot if possible.
-- Added `label` as an alternate key to the `tag` property.
-
-### Fixes
-- Fixed crashing when viewing another player in spectator mode. Some said this was reason to release this update a month ago. They were probably right.
-- Fixed crashing when sending a Pokémon out after editing its form.
-- Fixed all Pokémon being saved to chunks and never despawning even when they should be.
-- Fixed Poké Snacks crashing if there was no available spawn.
-- Fixed Poké Snack / Bait effects so that EV Yield, Type, and Egg Group filters now all apply together when weighting spawns. And you thought you were going crazy.
-- Fixed Furfrou not being trimmable on NeoForge specifically.
-- Fixed honey from Saccharine Leaves being harvestable at less than the max age.
-- Fixed possible error on world generation when Combee are placed in naturally generated bee nests.
-- Fixed Galarian Weezing crashing the world if it decides to blink the wrong way. The same could happen to you!
-- Fixed Galarian Mr. Mime incorrectly being rideable. Some would argue that regular Mr. Mime shouldn't be rideable, but that would make them wrong.
-- Fixed missing apricorn textures for Adorn blocks.
-- Fixed Apricorn block model rotation for counters/sinks/cupboards/drawers to match that of most recent version of Adorn.
-- Fixed item interaction sometimes not working properly when playing on servers.
-- Fixed Mint Leaves not being usable for filling the Resurrection Machine.
-- Fixed Super Potion recipes incorrectly using Hondew Berry instead of Aguav Berry. They look similar, to be fair.
-- Fixed Wishiwashi not schooling properly.
-- Fixed battle item duplication issue. How did it work? Wouldn't you like to know, weather boy.
-- Fixed the ordering of Aprijuice's riding stat boosts so they always have the same order.
-- Fixed the movesets of certain Pokémon being incorrectly sanitized upon reload, causing some forms to keep losing moves.
-- Fixed selected leading Pokémon in battle not being used when levels are set.
-- Fixed the bottom half of pasture blocks having an incorrect hit-box when facing north or south.
-- Fixed gimmicks not being usable in double and triple battles.
-- Fixed gimmick buttons showing when already used in the same turn in double and triple battles.
-- Fixed mochi items consuming two items at a time.
-- Fixed Fresh Start Mochi's EV reset not syncing health changes properly.
-- Fixed Pokémon spawn influences not being specific to regional forms.
-- Fixed memory leak from battles not being cleaned up after ending.
-- Fixed orientation not getting reset after crashing while flying and getting back on the Pokémon.
-- Fixed shiny Pokémon not respecting the `silent` flag on spawn.
-- Fixed 'Plain' prefix not being applied to all low-quality Aprijuice.
-- 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 Scraggy line, Milcery line, and Morpeko spawning on unnatural blocks. 
-- Fixed invulnerability-bypassed damage being resisted by invulnerable NPC entities.
-- Fixed Fabric network packets not being handled immediately, fixing incompatibilities with Supplementaries, Prometheus, Sleep Tight, and others.
-- Fixed killer not being set early enough on a wild Pokémon entity from `WinInstruction`.
-- Fixed requirements such as `biomeCondition` crashing the game when used to define Pokémon interactions.
-- Fixed an issue that prevented registering custom dispenser behaviours (no longer overrides vanilla behaviour).
-- Fixed an issue navigation that prevented Combee from pathing into and out of Saccharine Leaves.
-- Added Saccharine Boats and Saccharine Boat with Chests to relevant boat tags.
-- Fixed Soothe Bell not being properly tagged as a held item.
-- Fixed `/calculateseatpositions` expecting a locator format that even we don't use. It needs an underscore after "seat".
-- Fixed the `run_script` Molang function to not fail if the environment's context is null.
-- Fixed the Molang functions `date_local_time`, `date_of`, `date_is_after` to use the correct date format.
-
-### 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.
-- Added the `pnx` to the `BattleFaintedEvent` and `FormeChangeEvent`.
-- Added register methods for custom instructions to `ShowdownInterpreter`.
-- Changed callback operations in `BattlePokemon` to allow multiple callbacks and be mutable.
-- Added `display_name`, `description`, and `max_pp` functions to the `MoveTemplate` struct.
-- Changed the implementations of `AIBattleActor` to be open classes to allow extension.
-- Changed the resource location of Poké Ball icons in the GUI to use the balls namespace instead of Cobblemon's, allowing mods to properly use their own namespace for these textures.
-
-### 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.
-- Added the `create_itemstack`, `has_inventory_space`, `set_inventory_slot`, and `give_item` MoLang functions for item and inventory utility.
-- Added the `get_move_from_id` MoLang function for general move info queries without requiring a Moveset object to access.
-- 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`.
-
-### Localization
-- Updated translations for:
-  - French
-  - Canadian French
-  - Simplified Chinese
-  - Ukrainian
-  - Brazilian Portuguese
-  - Spanish
-  - Korean
-  - Japanese

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/ServerPlayerMixin.java

@@ -11,15 +11,11 @@ package com.cobblemon.mod.common.mixin;
 import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.PlayerSpawnerAccessor;
-import com.cobblemon.mod.common.api.riding.RidingStyle;
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner;
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory;
-import com.cobblemon.mod.common.api.stats.CobblemonStats;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -93,32 +89,4 @@ public abstract class ServerPlayerMixin implements PlayerSpawnerAccessor {
     private boolean cobblemon$cancelSavingPokemonMounts(boolean original, @Local(ordinal=0) Entity entity) {
         return original && !(entity instanceof PokemonEntity);
     }
-
-    @WrapOperation(method = "checkRidingStatistics", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;getVehicle()Lnet/minecraft/world/entity/Entity;"))
-    public Entity cobblemon$checkRidingStatistics(ServerPlayer player, Operation<Entity> original, @Local int distance) {
-        var entity = original.call(player);
-        if (!(entity instanceof PokemonEntity pokemonEntity)) {
-            return entity;
-        }
-
-        var ridingController = pokemonEntity.getRidingController();
-        if (ridingController == null) return entity;
-
-        var activeContext = ridingController.getContext();
-        if (activeContext == null) return entity;
-
-        var ridingStyle = activeContext.getStyle();
-        CobblemonStats.CobblemonStat stat = switch (ridingStyle) {
-            case RidingStyle.LAND -> CobblemonStats.RIDING_LAND;
-            case RidingStyle.AIR -> CobblemonStats.RIDING_AIR;
-            case RidingStyle.LIQUID -> CobblemonStats.RIDING_LIQUID;
-            default -> null;
-        };
-
-        if (stat != null) {
-            player.awardStat(CobblemonStats.getStat(stat), distance);
-        }
-
-        return entity;
-    }
 }

common/src/main/java/com/cobblemon/mod/common/mixin/accessor/DispenserBlockAccessor.java

@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.mixin.accessor;
-
-import net.minecraft.world.item.Item;
-import net.minecraft.core.dispenser.DispenseItemBehavior;
-import net.minecraft.world.level.block.DispenserBlock;
-
-import java.util.Map;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(DispenserBlock.class)
-public interface DispenserBlockAccessor {
-	@Accessor("DISPENSER_REGISTRY")
-	static Map<Item, DispenseItemBehavior> getItemBehaviors() {
-		throw new AssertionError();
-	}
-}

common/src/main/java/com/cobblemon/mod/common/mixin/client/AbstractClientPlayerMixin.java

@@ -33,7 +33,7 @@ public class AbstractClientPlayerMixin {
             cir.setReturnValue(usageContext.getFovMultiplier());
         } else {
             // Only modify fov through riding if the pokedex is not open
-            AbstractClientPlayer player = (AbstractClientPlayer) (Object) this;
+            LocalPlayer player = (LocalPlayer) (Object) this;
             // Only modify fov for the driver and not the passengers
             if (player != null && player.isPassenger() && player.getVehicle() instanceof PokemonEntity && player.getVehicle().getControllingPassenger() == player) {
                 PokemonEntity ride = (PokemonEntity) player.getVehicle();

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

@@ -42,8 +42,8 @@ import com.cobblemon.mod.common.api.scheduling.ServerRealTimeTaskTracker
 import com.cobblemon.mod.common.api.scheduling.ServerTaskTracker
 import com.cobblemon.mod.common.api.spawning.BestSpawner
 import com.cobblemon.mod.common.api.spawning.CobblemonSpawningZoneGenerator
-import com.cobblemon.mod.common.api.spawning.SpawningZoneGenerator
 import com.cobblemon.mod.common.api.spawning.position.AreaSpawnablePositionResolver
+import com.cobblemon.mod.common.api.spawning.SpawningZoneGenerator
 import com.cobblemon.mod.common.api.starter.StarterHandler
 import com.cobblemon.mod.common.api.stats.CobblemonStats
 import com.cobblemon.mod.common.api.storage.PokemonStoreManager
@@ -68,7 +68,7 @@ import com.cobblemon.mod.common.api.tags.CobblemonItemTags
 import com.cobblemon.mod.common.battles.*
 import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
-import com.cobblemon.mod.common.block.dispenser.DispenserBehaviorRegistry
+import com.cobblemon.mod.common.block.DispenserBehaviorRegistry
 import com.cobblemon.mod.common.client.CobblemonPack
 import com.cobblemon.mod.common.command.argument.*
 import com.cobblemon.mod.common.config.CobblemonConfig
@@ -76,7 +76,12 @@ import com.cobblemon.mod.common.config.LastChangedVersion
 import com.cobblemon.mod.common.config.constraint.IntConstraint
 import com.cobblemon.mod.common.config.starter.StarterConfig
 import com.cobblemon.mod.common.data.CobblemonDataProvider
-import com.cobblemon.mod.common.events.*
+import com.cobblemon.mod.common.events.AdvancementHandler
+import com.cobblemon.mod.common.events.EntityCallbackHandler
+import com.cobblemon.mod.common.events.CallbackHandler
+import com.cobblemon.mod.common.events.PokedexHandler
+import com.cobblemon.mod.common.events.ServerTickHandler
+import com.cobblemon.mod.common.events.StatHandler
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
 import com.cobblemon.mod.common.permission.LaxPermissionValidator
 import com.cobblemon.mod.common.platform.events.PlatformEvents
@@ -91,7 +96,7 @@ import com.cobblemon.mod.common.pokemon.feature.SlowpokeTailRegrowthSpeciesFeatu
 import com.cobblemon.mod.common.pokemon.feature.TagSeasonResolver
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.pokemon.properties.*
-import com.cobblemon.mod.common.pokemon.properties.LabelProperty
+import com.cobblemon.mod.common.pokemon.properties.tags.PokemonFlagProperty
 import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
 import com.cobblemon.mod.common.starter.CobblemonStarterHandler
 import com.cobblemon.mod.common.util.*
@@ -165,7 +170,7 @@ object Cobblemon {
     val statistics: CobblemonStats = CobblemonStats
 
     @JvmStatic
-    val builtinPacks = listOf(
+    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),
         CobblemonPack(id = "regionbiasforms", name = "Region Bias Forms", packType = PackType.CLIENT_RESOURCES, activationBehaviour = ResourcePackActivationBehaviour.DEFAULT_ENABLED),
@@ -189,6 +194,7 @@ object Cobblemon {
         implementation.registerSoundEvents()
         implementation.registerDataComponents()
         implementation.registerBlocks()
+        implementation.registerArmorMaterials()
         implementation.registerItems()
         implementation.registerEntityTypes()
         implementation.registerEntityAttributes()
@@ -201,7 +207,6 @@ object Cobblemon {
         implementation.registerEntityDataSerializers()
         implementation.registerCriteria()
         implementation.registerEntitySubPredicates()
-        implementation.registerMobEffects()
         DispenserBehaviorRegistry.registerDispenserBehaviors()
 
         DropEntry.register("command", CommandDropEntry::class.java)
@@ -315,7 +320,7 @@ object Cobblemon {
 
         CustomPokemonProperty.register(UncatchableProperty)
         CustomPokemonProperty.register(BattleCloneProperty)
-        CustomPokemonProperty.register(LabelProperty)
+        CustomPokemonProperty.register(PokemonFlagProperty)
         CustomPokemonProperty.register(HiddenAbilityPropertyType)
         CustomPokemonProperty.register(AspectPropertyType)
         CustomPokemonProperty.register(UnaspectPropertyType)

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

@@ -0,0 +1,53 @@
+package com.cobblemon.mod.common
+
+import com.cobblemon.mod.common.platform.PlatformRegistry
+import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.core.Registry
+import net.minecraft.core.registries.BuiltInRegistries
+import net.minecraft.core.registries.Registries
+import net.minecraft.resources.ResourceKey
+import net.minecraft.sounds.SoundEvents
+import net.minecraft.world.item.ArmorItem
+import net.minecraft.world.item.ArmorMaterial
+import net.minecraft.world.item.Items
+import net.minecraft.world.item.crafting.Ingredient
+
+@Suppress("unused")
+object CobblemonArmorMaterials :
+    PlatformRegistry<Registry<ArmorMaterial>, ResourceKey<Registry<ArmorMaterial>>, ArmorMaterial>() {
+
+    override val registry: Registry<ArmorMaterial> = BuiltInRegistries.ARMOR_MATERIAL
+    override val resourceKey: ResourceKey<Registry<ArmorMaterial>> = Registries.ARMOR_MATERIAL
+
+    @JvmField
+    val MALICIOUS_ARMOR = cosmeticMaterial("malicious_armor")
+    @JvmField
+    val HEAVY_DUTY_BOOTS = cosmeticMaterial("heavy_duty_boots")
+    @JvmField
+    val PROTECTIVE_PADS = cosmeticMaterial("protective_pads")
+    @JvmField
+    val ASSAULT_VEST = cosmeticMaterial("assault_vest")
+    @JvmField
+    val MYSTIC_WATER = cosmeticMaterial("mystic_water")
+    @JvmField
+    val BLACK_BELT = cosmeticMaterial("black_belt")
+
+    private fun cosmeticMaterial(name: String): ArmorMaterial {
+        val armorMaterial = ArmorMaterial(
+            mapOf(
+                ArmorItem.Type.HELMET to 0,
+                ArmorItem.Type.CHESTPLATE to 0,
+                ArmorItem.Type.LEGGINGS to 0,
+                ArmorItem.Type.BOOTS to 0,
+            ),
+            0,
+            SoundEvents.ARMOR_EQUIP_GENERIC,
+            { Ingredient.EMPTY },
+            listOf(ArmorMaterial.Layer(cobblemonResource(name), "", true)),
+            0.0f,
+            0.0f,
+        )
+
+        return create(name, armorMaterial)
+    }
+}

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

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common
 
 import com.cobblemon.mod.common.api.apricorn.Apricorn
-import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.block.*
 import com.cobblemon.mod.common.block.campfirepot.CampfireBlock
 import com.cobblemon.mod.common.block.LecternBlock
@@ -42,11 +41,11 @@ import net.minecraft.world.level.block.state.BlockBehaviour
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.properties.BlockSetType
 import net.minecraft.world.level.block.state.properties.BlockStateProperties
+import net.minecraft.world.level.block.state.properties.BlockStateProperties.LIT
 import net.minecraft.world.level.block.state.properties.NoteBlockInstrument
 import net.minecraft.world.level.block.state.properties.WoodType
 import net.minecraft.world.level.material.MapColor
 import net.minecraft.world.level.material.PushReaction
-import net.minecraft.world.phys.shapes.Shapes
 
 @Suppress("SameParameterValue", "HasPlatformType", "MemberVisibilityCanBePrivate", "unused")
 object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<Block>>, Block>() {
@@ -244,9 +243,9 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     val REVIVAL_HERB = this.create("revival_herb", RevivalHerbBlock(BlockBehaviour.Properties.of().pushReaction(PushReaction.DESTROY).mapColor(MapColor.PLANT).ignitedByLava().noCollission().instabreak().sound(CobblemonSounds.REVIVAL_HERB_SOUNDS)))
 
     @JvmField
-    val POKE_CAKE = this.create("poke_cake", PokeSnackBlock(BlockBehaviour.Properties.of().forceSolidOn().strength(0.5F).sound(SoundType.WOOL).pushReaction(PushReaction.DESTROY).lightLevel { if (it.getValue(BlockStateProperties.LIT)) 3 else 0 }, false))
+    val POKE_CAKE = this.create("poke_cake", PokeSnackBlock(BlockBehaviour.Properties.of().forceSolidOn().strength(0.5F).sound(SoundType.WOOL).pushReaction(PushReaction.DESTROY).lightLevel { if (it.getValue(LIT)) 3 else 0 }, false))
     @JvmField
-    val POKE_SNACK = this.create("poke_snack", PokeSnackBlock(BlockBehaviour.Properties.of().forceSolidOn().strength(0.5F).sound(SoundType.WOOL).pushReaction(PushReaction.DESTROY).lightLevel { if (it.getValue(BlockStateProperties.LIT)) 3 else 0 }, true))
+    val POKE_SNACK = this.create("poke_snack", PokeSnackBlock(BlockBehaviour.Properties.of().forceSolidOn().strength(0.5F).sound(SoundType.WOOL).pushReaction(PushReaction.DESTROY).lightLevel { if (it.getValue(LIT)) 3 else 0 }, true))
 
     @JvmField
     val TUMBLESTONE_CLUSTER = tumblestoneBlock("tumblestone_cluster", GrowableStoneBlock.STAGE_3, 7, 3, null)
@@ -478,99 +477,6 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @JvmField
     val GIMMIGHOUL_CHEST = create("gimmighoul_chest", GildedChestBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CHEST).noOcclusion().sound(CobblemonSounds.GILDED_CHEST_SOUNDS), GildedChestBlock.Type.FAKE))
 
-    @JvmField
-    val WHITE_PLAQUE = create("white_plaque", PlaqueBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.METAL).noOcclusion().pushReaction(PushReaction.DESTROY).strength(5.0F)))
-    @JvmField
-    val LIGHT_GRAY_PLAQUE = create("light_gray_plaque", PlaqueBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.METAL).noOcclusion().pushReaction(PushReaction.DESTROY).strength(5.0F)))
-    @JvmField
-    val GRAY_PLAQUE = create("gray_plaque", PlaqueBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.METAL).noOcclusion().pushReaction(PushReaction.DESTROY).strength(5.0F)))
-    @JvmField
-    val BLACK_PLAQUE = create("black_plaque", PlaqueBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.METAL).noOcclusion().pushReaction(PushReaction.DESTROY).strength(5.0F)))
-    @JvmField
-    val BROWN_PLAQUE = create("brown_plaque", PlaqueBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.METAL).noOcclusion().pushReaction(PushReaction.DESTROY).strength(5.0F)))
-    @JvmField
-    val RED_PLAQUE = create("red_plaque", PlaqueBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.METAL).noOcclusion().pushReaction(PushReaction.DESTROY).strength(5.0F)))
-    @JvmField
-    val ORANGE_PLAQUE = create("orange_plaque", PlaqueBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.METAL).noOcclusion().pushReaction(PushReaction.DESTROY).strength(5.0F)))
-    @JvmField
-    val YELLOW_PLAQUE = create("yellow_plaque", PlaqueBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.METAL).noOcclusion().pushReaction(PushReaction.DESTROY).strength(5.0F)))
-    @JvmField
-    val LIME_PLAQUE = create("lime_plaque", PlaqueBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.METAL).noOcclusion().pushReaction(PushReaction.DESTROY).strength(5.0F)))
-    @JvmField
-    val GREEN_PLAQUE = create("green_plaque", PlaqueBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.METAL).noOcclusion().pushReaction(PushReaction.DESTROY).strength(5.0F)))
-    @JvmField
-    val CYAN_PLAQUE = create("cyan_plaque", PlaqueBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.METAL).noOcclusion().pushReaction(PushReaction.DESTROY).strength(5.0F)))
-    @JvmField
-    val LIGHT_BLUE_PLAQUE = create("light_blue_plaque", PlaqueBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.METAL).noOcclusion().pushReaction(PushReaction.DESTROY).strength(5.0F)))
-    @JvmField
-    val BLUE_PLAQUE = create("blue_plaque", PlaqueBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.METAL).noOcclusion().pushReaction(PushReaction.DESTROY).strength(5.0F)))
-    @JvmField
-    val PURPLE_PLAQUE = create("purple_plaque", PlaqueBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.METAL).noOcclusion().pushReaction(PushReaction.DESTROY).strength(5.0F)))
-    @JvmField
-    val MAGENTA_PLAQUE = create("magenta_plaque", PlaqueBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.METAL).noOcclusion().pushReaction(PushReaction.DESTROY).strength(5.0F)))
-    @JvmField
-    val PINK_PLAQUE = create("pink_plaque", PlaqueBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).mapColor(MapColor.METAL).noOcclusion().pushReaction(PushReaction.DESTROY).strength(5.0F)))
-
-    @JvmField
-    val CLEANSE_TAG = create("cleanse_tag", WallAttachedStackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOD).mapColor(MapColor.NONE).pushReaction(PushReaction.DESTROY).noOcclusion().noCollission(), WallAttachedStackableItemBlock.WallStackableItemBlockType.TAG))
-    @JvmField
-    val SPELL_TAG = create("spell_tag", WallAttachedStackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.WOOD).mapColor(MapColor.NONE).pushReaction(PushReaction.DESTROY).noOcclusion().noCollission(), WallAttachedStackableItemBlock.WallStackableItemBlockType.TAG))
-
-    @JvmField
-    val BLUNDER_POLICY = create("blunder_policy", WallAttachedDirectionalShapeBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion().noCollission(), 14, 12, 1))
-    @JvmField
-    val WEAKNESS_POLICY = create("weakness_policy", WallAttachedDirectionalShapeBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion().noCollission(), 14, 12, 1))
-
-    @JvmField
-    val FULL_HEAL = create("full_heal", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.STATUS_RESTORE))
-    @JvmField
-    val ANTIDOTE = create("antidote", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.STATUS_RESTORE))
-    @JvmField
-    val AWAKENING = create("awakening", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.STATUS_RESTORE))
-    @JvmField
-    val BURN_HEAL = create("burn_heal", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.STATUS_RESTORE))
-    @JvmField
-    val ICE_HEAL = create("ice_heal", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.STATUS_RESTORE))
-    @JvmField
-    val PARALYZE_HEAL = create("paralyze_heal", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.STATUS_RESTORE))
-
-    @JvmField
-    val ETHER = create("ether", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.ETHER))
-    @JvmField
-    val MAX_ETHER = create("max_ether", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.ETHER))
-    @JvmField
-    val ELIXIR = create("elixir", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.ETHER))
-    @JvmField
-    val MAX_ELIXIR = create("max_elixir", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.ETHER))
-
-    @JvmField
-    val POTION = create("potion", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.POTION))
-    @JvmField
-    val SUPER_POTION = create("super_potion", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.POTION))
-    @JvmField
-    val HYPER_POTION = create("hyper_potion", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.POTION))
-    @JvmField
-    val MAX_POTION = create("max_potion", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.MAX_POTION))
-    @JvmField
-    val FULL_RESTORE = create("full_restore", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.MAX_POTION))
-
-    @JvmField
-    val DIRE_HIT = create("dire_hit", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.BATTLE_ITEM))
-    @JvmField
-    val GUARD_SPEC = create("guard_spec", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.BATTLE_ITEM))
-    @JvmField
-    val X_ACCURACY = create("x_${Stats.ACCURACY.identifier.path}", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.BATTLE_ITEM))
-    @JvmField
-    val X_ATTACK = create("x_${Stats.ATTACK.identifier.path}", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.BATTLE_ITEM))
-    @JvmField
-    val X_DEFENSE = create("x_${Stats.DEFENCE.identifier.path}", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.BATTLE_ITEM))
-    @JvmField
-    val X_SP_ATK = create("x_${Stats.SPECIAL_ATTACK.identifier.path}", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.BATTLE_ITEM))
-    @JvmField
-    val X_SP_DEF = create("x_${Stats.SPECIAL_DEFENCE.identifier.path}", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.BATTLE_ITEM))
-    @JvmField
-    val X_SPEED = create("x_${Stats.SPEED.identifier.path}", StackableItemBlock(BlockBehaviour.Properties.of().sound(SoundType.CANDLE).mapColor(MapColor.NONE).noOcclusion(), StackableItemBlock.StackableItemBlockType.BATTLE_ITEM))
-
     @JvmField
     val MONITOR = create("monitor", MonitorBlock(BlockBehaviour.Properties.of().mapColor(MapColor.METAL).sound(SoundType.METAL).pushReaction(PushReaction.BLOCK).requiresCorrectToolForDrops().strength(5.0F, 6.0F).lightLevel { if (it.getValue(MonitorBlock.SCREEN) != MonitorBlock.MonitorScreen.OFF) 13 else 0 }))
     @JvmField

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

@@ -64,6 +64,8 @@ interface CobblemonImplementation {
 
     fun registerEntityDataSerializers()
 
+    fun registerArmorMaterials()
+
     /**
      * TODO
      *
@@ -117,11 +119,6 @@ interface CobblemonImplementation {
 
     fun registerEntitySubPredicates()
 
-    /**
-     * TODO
-     */
-    fun registerMobEffects()
-
 
     /**
      * Add a feature to the current platform implementation.

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

@@ -44,16 +44,21 @@ import com.cobblemon.mod.common.pokeball.PokeBall
 import com.cobblemon.mod.common.pokemon.IVs
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
 import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.core.Holder
 import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
 import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.sounds.SoundEvents
 import net.minecraft.world.effect.MobEffectInstance
 import net.minecraft.world.effect.MobEffects
+import net.minecraft.world.entity.EquipmentSlot
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.food.FoodProperties
+import net.minecraft.world.item.ArmorItem
+import net.minecraft.world.item.ArmorMaterial
 import net.minecraft.world.item.BlockItem
 import net.minecraft.world.item.HangingSignItem
 import net.minecraft.world.item.Item
@@ -501,29 +506,10 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField val RAZOR_CLAW = noSettingsItem("razor_claw")
     @JvmField val RAZOR_FANG = noSettingsItem("razor_fang")
     @JvmField val AUSPICIOUS_ARMOR = heldItem("auspicious_armor")
-    @JvmField val MALICIOUS_ARMOR = heldItem("malicious_armor")
-    @JvmField val SHELL_HELMET = heldItem("shell_helmet")
     @JvmField val METAL_ALLOY = noSettingsItem("metal_alloy")
     @JvmField val SCROLL_OF_DARKNESS = noSettingsItem("scroll_of_darkness")
     @JvmField val SCROLL_OF_WATERS = noSettingsItem("scroll_of_waters")
 
-    @JvmField val WHITE_PLAQUE = blockItem("white_plaque", CobblemonBlocks.WHITE_PLAQUE)
-    @JvmField val LIGHT_GRAY_PLAQUE = blockItem("light_gray_plaque", CobblemonBlocks.LIGHT_GRAY_PLAQUE)
-    @JvmField val GRAY_PLAQUE = blockItem("gray_plaque", CobblemonBlocks.GRAY_PLAQUE)
-    @JvmField val BLACK_PLAQUE = blockItem("black_plaque", CobblemonBlocks.BLACK_PLAQUE)
-    @JvmField val BROWN_PLAQUE = blockItem("brown_plaque", CobblemonBlocks.BROWN_PLAQUE)
-    @JvmField val RED_PLAQUE = blockItem("red_plaque", CobblemonBlocks.RED_PLAQUE)
-    @JvmField val ORANGE_PLAQUE = blockItem("orange_plaque", CobblemonBlocks.ORANGE_PLAQUE)
-    @JvmField val YELLOW_PLAQUE = blockItem("yellow_plaque", CobblemonBlocks.YELLOW_PLAQUE)
-    @JvmField val LIME_PLAQUE = blockItem("lime_plaque", CobblemonBlocks.LIME_PLAQUE)
-    @JvmField val GREEN_PLAQUE = blockItem("green_plaque", CobblemonBlocks.GREEN_PLAQUE)
-    @JvmField val CYAN_PLAQUE = blockItem("cyan_plaque", CobblemonBlocks.CYAN_PLAQUE)
-    @JvmField val LIGHT_BLUE_PLAQUE = blockItem("light_blue_plaque", CobblemonBlocks.LIGHT_BLUE_PLAQUE)
-    @JvmField val BLUE_PLAQUE = blockItem("blue_plaque", CobblemonBlocks.BLUE_PLAQUE)
-    @JvmField val PURPLE_PLAQUE = blockItem("purple_plaque", CobblemonBlocks.PURPLE_PLAQUE)
-    @JvmField val MAGENTA_PLAQUE = blockItem("magenta_plaque", CobblemonBlocks.MAGENTA_PLAQUE)
-    @JvmField val PINK_PLAQUE = blockItem("pink_plaque", CobblemonBlocks.PINK_PLAQUE)
-
     private val berries = mutableMapOf<ResourceLocation, BerryItem>()
     // Plants
     @JvmField val CHERI_BERRY = berryItem("cheri", StatusCuringBerryItem(CobblemonBlocks.CHERI_BERRY, Statuses.PARALYSIS))
@@ -716,15 +702,15 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     val MOOMOO_MILK = create("moomoo_milk", MoomooMilk(Item.Properties().craftRemainder(Items.GLASS_BOTTLE).stacksTo((16))))
 
     @JvmField
-    val POTION = create("potion", PotionItem(PotionType.POTION, CobblemonBlocks.POTION))
+    val POTION = create("potion", PotionItem(PotionType.POTION))
     @JvmField
-    val SUPER_POTION = create("super_potion", PotionItem(PotionType.SUPER_POTION, CobblemonBlocks.SUPER_POTION))
+    val SUPER_POTION = create("super_potion", PotionItem(PotionType.SUPER_POTION))
     @JvmField
-    val HYPER_POTION = create("hyper_potion", PotionItem(PotionType.HYPER_POTION, CobblemonBlocks.HYPER_POTION))
+    val HYPER_POTION = create("hyper_potion", PotionItem(PotionType.HYPER_POTION))
     @JvmField
-    val MAX_POTION = create("max_potion", PotionItem(PotionType.MAX_POTION, CobblemonBlocks.MAX_POTION))
+    val MAX_POTION = create("max_potion", PotionItem(PotionType.MAX_POTION))
     @JvmField
-    val FULL_RESTORE = create("full_restore", PotionItem(PotionType.FULL_RESTORE, CobblemonBlocks.FULL_RESTORE))
+    val FULL_RESTORE = create("full_restore", PotionItem(PotionType.FULL_RESTORE))
 
     @JvmField
     val HEAL_POWDER = create("heal_powder", HealPowderItem())
@@ -809,27 +795,28 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val SERIOUS_MINT = mintItem("serious_mint", MintItem(Natures.SERIOUS))
 
-    @JvmField val X_ACCURACY = create("x_${Stats.ACCURACY.identifier.path}", XStatItem(Stats.ACCURACY, block = CobblemonBlocks.X_ACCURACY))
-    @JvmField val X_ATTACK = create("x_${Stats.ATTACK.identifier.path}", XStatItem(Stats.ATTACK, block = CobblemonBlocks.X_ATTACK))
-    @JvmField val X_DEFENSE = create("x_${Stats.DEFENCE.identifier.path}", XStatItem(Stats.DEFENCE, block = CobblemonBlocks.X_DEFENSE))
-    @JvmField val X_SP_ATK = create("x_${Stats.SPECIAL_ATTACK.identifier.path}", XStatItem(Stats.SPECIAL_ATTACK, block = CobblemonBlocks.X_SP_ATK))
-    @JvmField val X_SP_DEF = create("x_${Stats.SPECIAL_DEFENCE.identifier.path}", XStatItem(Stats.SPECIAL_DEFENCE, block = CobblemonBlocks.X_SP_DEF))
-    @JvmField val X_SPEED = create("x_${Stats.SPEED.identifier.path}", XStatItem(Stats.SPEED, block = CobblemonBlocks.X_SPEED))
+    @JvmField val X_ACCURACY = create("x_${Stats.ACCURACY.identifier.path}", XStatItem(Stats.ACCURACY))
+    @JvmField val X_ATTACK = create("x_${Stats.ATTACK.identifier.path}", XStatItem(Stats.ATTACK))
+    @JvmField val X_DEFENSE = create("x_${Stats.DEFENCE.identifier.path}", XStatItem(Stats.DEFENCE))
+    @JvmField val X_SP_ATK = create("x_${Stats.SPECIAL_ATTACK.identifier.path}", XStatItem(Stats.SPECIAL_ATTACK))
+    @JvmField val X_SP_DEF = create("x_${Stats.SPECIAL_DEFENCE.identifier.path}", XStatItem(Stats.SPECIAL_DEFENCE))
+    @JvmField val X_SPEED = create("x_${Stats.SPEED.identifier.path}", XStatItem(Stats.SPEED))
 
-    @JvmField val DIRE_HIT = create("dire_hit", DireHitItem(CobblemonBlocks.DIRE_HIT))
-    @JvmField val GUARD_SPEC = create("guard_spec", GuardSpecItem(CobblemonBlocks.GUARD_SPEC))
+    @JvmField val DIRE_HIT = create("dire_hit", DireHitItem())
+    @JvmField val GUARD_SPEC = create("guard_spec", GuardSpecItem())
 
-    @JvmField val FULL_HEAL = create("full_heal", StatusCureItem("item.cobblemon.full_heal", block = CobblemonBlocks.FULL_HEAL))
-    @JvmField val ANTIDOTE = create("antidote", StatusCureItem("item.cobblemon.antidote", Statuses.POISON, Statuses.POISON_BADLY, block = CobblemonBlocks.ANTIDOTE))
-    @JvmField val AWAKENING = create("awakening", StatusCureItem("item.cobblemon.awakening", Statuses.SLEEP, block = CobblemonBlocks.AWAKENING))
-    @JvmField val BURN_HEAL = create("burn_heal", StatusCureItem("item.cobblemon.burn_heal", Statuses.BURN, block = CobblemonBlocks.BURN_HEAL))
-    @JvmField val ICE_HEAL = create("ice_heal", StatusCureItem("item.cobblemon.ice_heal", Statuses.FROZEN, block = CobblemonBlocks.ICE_HEAL))
-    @JvmField val PARALYZE_HEAL = create("paralyze_heal", StatusCureItem("item.cobblemon.paralyze_heal", Statuses.PARALYSIS, block = CobblemonBlocks.PARALYZE_HEAL))
+    @JvmField val BURN_HEAL = create("burn_heal", StatusCureItem("item.cobblemon.burn_heal", Statuses.BURN))
+    @JvmField val PARALYZE_HEAL = create("paralyze_heal", StatusCureItem("item.cobblemon.paralyze_heal", Statuses.PARALYSIS))
+    @JvmField val ICE_HEAL = create("ice_heal", StatusCureItem("item.cobblemon.ice_heal", Statuses.FROZEN))
+    @JvmField val ANTIDOTE = create("antidote", StatusCureItem("item.cobblemon.antidote", Statuses.POISON, Statuses.POISON_BADLY))
+    @JvmField val AWAKENING = create("awakening", StatusCureItem("item.cobblemon.awakening", Statuses.SLEEP))
 
-    @JvmField val ETHER = create("ether", EtherItem(max = false, CobblemonBlocks.ETHER))
-    @JvmField val MAX_ETHER = create("max_ether", EtherItem(max = true, CobblemonBlocks.MAX_ETHER))
-    @JvmField val ELIXIR = create("elixir", ElixirItem(max = false, CobblemonBlocks.ELIXIR))
-    @JvmField val MAX_ELIXIR = create("max_elixir", ElixirItem(max = true, CobblemonBlocks.MAX_ELIXIR))
+    @JvmField val FULL_HEAL = create("full_heal", StatusCureItem("item.cobblemon.full_heal"))
+
+    @JvmField val ETHER = create("ether", EtherItem(max = false))
+    @JvmField val MAX_ETHER = create("max_ether", EtherItem(max = true))
+    @JvmField val ELIXIR = create("elixir", ElixirItem(max = false))
+    @JvmField val MAX_ELIXIR = create("max_elixir", ElixirItem(max = true))
 
     @JvmField
     val ABILITY_CAPSULE = this.create("ability_capsule", AbilityChangeItem(AbilityChanger.COMMON_ABILITY))
@@ -908,7 +895,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     val WATER_STONE = noSettingsItem("water_stone")
 
     val wearables = mutableListOf<WearableItem>()
-    //Wearable items (these items should have a corresponding 3D model)
+
+    // Wearable items (these items should have a corresponding 3D model)
     @JvmField val BLACK_GLASSES = wearableItem("black_glasses")
     @JvmField val CHOICE_BAND = wearableItem("choice_band")
     @JvmField val CHOICE_SPECS = wearableItem("choice_specs")
@@ -919,6 +907,20 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField val ROCKY_HELMET = wearableItem("rocky_helmet")
     @JvmField val SAFETY_GOGGLES = wearableItem("safety_goggles")
     @JvmField val WISE_GLASSES = wearableItem("wise_glasses")
+    @JvmField val SHELL_HELMET = wearableItem("shell_helmet")
+
+    @JvmField
+    val MALICIOUS_ARMOR = armorItem("malicious_armor", CobblemonArmorMaterials.MALICIOUS_ARMOR, ArmorItem.Type.CHESTPLATE)
+    @JvmField
+    val HEAVY_DUTY_BOOTS = armorItem("heavy_duty_boots", CobblemonArmorMaterials.HEAVY_DUTY_BOOTS, ArmorItem.Type.BOOTS)
+    @JvmField
+    val PROTECTIVE_PADS = armorItem("protective_pads", CobblemonArmorMaterials.PROTECTIVE_PADS, ArmorItem.Type.CHESTPLATE)
+    @JvmField
+    val ASSAULT_VEST = armorItem("assault_vest", CobblemonArmorMaterials.ASSAULT_VEST, ArmorItem.Type.CHESTPLATE)
+    @JvmField
+    val MYSTIC_WATER = armorItem("mystic_water", CobblemonArmorMaterials.MYSTIC_WATER, ArmorItem.Type.CHESTPLATE)
+    @JvmField
+    val BLACK_BELT = armorItem("black_belt", CobblemonArmorMaterials.BLACK_BELT, ArmorItem.Type.CHESTPLATE)
 
     // Held Items
     @JvmField
@@ -928,17 +930,13 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val AIR_BALLOON = heldItem("air_balloon")
     @JvmField
-    val ASSAULT_VEST = heldItem("assault_vest")
-    @JvmField
     val BIG_ROOT = compostableBlockItem("big_root", CobblemonBlocks.BIG_ROOT, 0.30f)
     @JvmField
     val BINDING_BAND = heldItem("binding_band")
     @JvmField
-    val BLACK_BELT = heldItem("black_belt")
-    @JvmField
     val BLACK_SLUDGE = heldItem("black_sludge")
     @JvmField
-    val BLUNDER_POLICY = itemNameBlockItem("blunder_policy", CobblemonBlocks.BLUNDER_POLICY)
+    val BLUNDER_POLICY = heldItem("blunder_policy")
     @JvmField
     val CELL_BATTERY = heldItem("cell_battery")
     @JvmField
@@ -946,7 +944,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val CHOICE_SCARF = heldItem("choice_scarf")
     @JvmField
-    val CLEANSE_TAG = itemNameBlockItem("cleanse_tag", CobblemonBlocks.CLEANSE_TAG)
+    val CLEANSE_TAG = heldItem("cleanse_tag")
     @JvmField
     val CLEAR_AMULET = heldItem("clear_amulet")
     @JvmField
@@ -982,8 +980,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val HARD_STONE = heldItem("hard_stone")
     @JvmField
-    val HEAVY_DUTY_BOOTS = heldItem("heavy_duty_boots")
-    @JvmField
     val IRON_BALL = heldItem("iron_ball")
     @JvmField
     val LAGGING_TAIL = heldItem("lagging_tail")
@@ -1008,8 +1004,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val MIRACLE_SEED = heldItem("miracle_seed")
     @JvmField
-    val MYSTIC_WATER = heldItem("mystic_water")
-    @JvmField
     val NEVER_MELT_ICE = heldItem("never_melt_ice")
     @JvmField
     val POISON_BARB = heldItem("poison_barb")
@@ -1028,8 +1022,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val PSYCHIC_SEED = heldItem("psychic_seed")
     @JvmField
-    val PROTECTIVE_PADS = heldItem("protective_pads")
-    @JvmField
     val PUNCHING_GLOVE = heldItem("punching_glove")
     @JvmField
     val QUICK_CLAW = heldItem("quick_claw")
@@ -1054,7 +1046,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val SOFT_SAND = heldItem("soft_sand")
     @JvmField
-    val SPELL_TAG = itemNameBlockItem("spell_tag", CobblemonBlocks.SPELL_TAG)
+    val SPELL_TAG = heldItem("spell_tag")
     @JvmField
     val SMOKE_BALL = heldItem("smoke_ball")
     @JvmField
@@ -1072,7 +1064,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val UTILITY_UMBRELLA = heldItem("utility_umbrella")
     @JvmField
-    val WEAKNESS_POLICY = itemNameBlockItem("weakness_policy", CobblemonBlocks.WEAKNESS_POLICY)
+    val WEAKNESS_POLICY = heldItem("weakness_policy")
     @JvmField
     val WIDE_LENS = heldItem("wide_lens")
     @JvmField
@@ -1507,9 +1499,13 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
         return item
     }
 
-    private fun wearableItem(name: String, heldItemRemappedName: String? = null): CobblemonItem = create(
+    private fun wearableItem(
+        name: String,
+        heldItemRemappedName: String? = null,
+        equipmentSlot: EquipmentSlot = EquipmentSlot.HEAD,
+    ): CobblemonItem = create(
         name,
-        WearableItem(name).also {
+        WearableItem(name, equipmentSlot).also {
             wearables.add(it)
             if (heldItemRemappedName != null) {
                 CobblemonHeldItemManager.registerRemap(it, heldItemRemappedName)
@@ -1517,6 +1513,21 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
         }
     )
 
+    private fun armorItem(
+        name: String,
+        armorMaterial: ArmorMaterial,
+        armorType: ArmorItem.Type,
+        durability: Int? = null,
+    ): ArmorItem {
+        var properties = Properties()
+        if (durability != null) properties = properties.durability(durability)
+        val armorMaterialHolder = BuiltInRegistries.ARMOR_MATERIAL.wrapAsHolder(armorMaterial)
+
+        val armorItem = ArmorItem(armorMaterialHolder, armorType, properties)
+
+        return create(name, armorItem)
+    }
+
     private fun campfirePotItem(block: Block, color: CampfirePotColor): CampfirePotItem {
         val item = create("campfire_pot_${color.suffix}", CampfirePotItem(block, color))
         campfire_pots.add(item)
@@ -1569,7 +1580,6 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
             }
         }
     )
-
     private fun heldItem(name: String, item: Item, remappedName: String? = null) = create(
         name = name,
         entry = item.also {

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

@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common
-
-import com.cobblemon.mod.common.api.cooking.effects.CleanseAllEffect
-import com.cobblemon.mod.common.api.cooking.effects.CleanseNegativeEffect
-import com.cobblemon.mod.common.api.cooking.effects.MentalRestorationEffect
-import com.cobblemon.mod.common.platform.PlatformRegistry
-import net.minecraft.core.Registry
-import net.minecraft.core.registries.BuiltInRegistries
-import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
-import net.minecraft.world.effect.MobEffect
-
-object CobblemonMobEffects : PlatformRegistry<Registry<MobEffect>, ResourceKey<Registry<MobEffect>>, MobEffect>() {
-    override val registry: Registry<MobEffect> = BuiltInRegistries.MOB_EFFECT
-    override val resourceKey: ResourceKey<Registry<MobEffect>> = Registries.MOB_EFFECT
-
-    @JvmField
-    val CLEANSE_NEGATIVE = create("cleanse_negative", CleanseNegativeEffect())
-
-    @JvmField
-    val MENTAL_RESTORATION = create("mental_restoration", MentalRestorationEffect())
-
-    @JvmField
-    val CLEANSE_ALL = create("cleanse_all", CleanseAllEffect())
-}

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

@@ -401,7 +401,6 @@ object CobblemonNetwork {
         // Data registries
         list.add(PacketRegisterInfo(AbilityRegistrySyncPacket.ID, AbilityRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(CobblemonMechanicsSyncPacket.ID, CobblemonMechanicsSyncPacket::decode, CobblemonMechanicsSyncHandler))
-        list.add(PacketRegisterInfo(PokemonInteractionsSyncPacket.ID, PokemonInteractionsSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(MovesRegistrySyncPacket.ID, MovesRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(BerryRegistrySyncPacket.ID, BerryRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(SpeciesRegistrySyncPacket.ID, SpeciesRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))

common/src/main/kotlin/com/cobblemon/mod/common/api/battles/model/PokemonBattle.kt

@@ -304,8 +304,7 @@ open class PokemonBattle(
             .forEach{it.pokemon.heal()}
         actors.forEach { actor ->
             actor.pokemonList.forEach { battlePokemon ->
-                battlePokemon.postBattlePokemonOperations.forEach { it(battlePokemon) }
-                battlePokemon.entity?.let { entity -> battlePokemon.postBattleEntityOperations.forEach { it(entity) } }
+                battlePokemon.entity?.let { entity -> battlePokemon.postBattleEntityOperation(entity) }
                 if (battlePokemon.effectedPokemon.entity != null
                         && battlePokemon.effectedPokemon.entity?.beamMode == 0
                         && battlePokemon.effectedPokemon.entity?.platform != PlatformType.NONE) {
@@ -499,8 +498,8 @@ open class PokemonBattle(
     }
 
     fun stop() {
-        writeShowdownAction(">forcetie") // This will terminate the Showdown connection
         end()
+        writeShowdownAction(">forcetie") // This will terminate the Showdown connection
     }
 
     fun checkForInputDispatch() {

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

@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.cooking.effects
-
-import net.minecraft.world.effect.MobEffect
-import net.minecraft.world.effect.MobEffectCategory
-import net.minecraft.world.entity.Entity
-import net.minecraft.world.entity.LivingEntity
-
-class CleanseAllEffect : MobEffect(MobEffectCategory.BENEFICIAL, 0xFFFFFF) {
-    override fun isInstantenous() = true
-    override fun applyInstantenousEffect(source: Entity?, indirect: Entity?, target: LivingEntity, amplifier: Int, proximity: Double) {
-        target.removeAllEffects()
-    }
-    override fun shouldApplyEffectTickThisTick(duration: Int, amplifier: Int) = false
-}

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

@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.cooking.effects
-
-import net.minecraft.world.effect.MobEffect
-import net.minecraft.world.effect.MobEffectCategory
-import net.minecraft.world.entity.Entity
-import net.minecraft.world.entity.LivingEntity
-
-class CleanseNegativeEffect : MobEffect(MobEffectCategory.BENEFICIAL, 0xFFFFFF) {
-    override fun isInstantenous() = true
-    override fun applyInstantenousEffect(source: Entity?, indirect: Entity?, target: LivingEntity, amplifier: Int, proximity: Double) {
-        val snapshot = target.activeEffects.toList()
-        for (ei in snapshot) {
-            if (ei.effect.value().category == MobEffectCategory.HARMFUL) {
-                target.removeEffect(ei.effect)
-            }
-        }
-    }
-    override fun shouldApplyEffectTickThisTick(duration: Int, amplifier: Int) = false
-}

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

@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.api.cooking.effects
-
-import net.minecraft.server.level.ServerPlayer
-import net.minecraft.stats.Stats
-import net.minecraft.world.effect.MobEffect
-import net.minecraft.world.effect.MobEffectCategory
-import net.minecraft.world.entity.LivingEntity
-
-class MentalRestorationEffect : MobEffect(MobEffectCategory.BENEFICIAL, 0xAA66FF) {
-    override fun applyEffectTick(entity: LivingEntity, amplifier: Int): Boolean {
-        if (entity is ServerPlayer) {
-            val stats = entity.stats
-            val statType = Stats.CUSTOM.get(Stats.TIME_SINCE_REST)
-            val current = stats.getValue(statType)
-            val reduction = 31 * (amplifier + 1)// reduce by half a minute every second per level (30 ticks removed per tick + 1 to account for the tick passing)
-            val newValue = Math.max(current - reduction, 0)
-            stats.setValue(entity, statType, newValue)
-        }
-        return true
-    }
-
-    override fun shouldApplyEffectTickThisTick(duration: Int, amplifier: Int): Boolean {
-        return true
-    }
-}

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

@@ -9,7 +9,6 @@
 package com.cobblemon.mod.common.api.events.battles
 
 import com.bedrockk.molang.runtime.value.MoValue
-import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.api.battles.interpreter.BattleContext
 import com.cobblemon.mod.common.api.battles.model.PokemonBattle
 import com.cobblemon.mod.common.api.battles.model.actor.ActorType
@@ -26,8 +25,7 @@ import com.cobblemon.mod.common.util.asArrayValue
 data class BattleFaintedEvent(
     override val battle: PokemonBattle,
     val killed: BattlePokemon,
-    val context: BattleContext,
-    val pnx: String
+    val context: BattleContext
 ) : BattleEvent {
     val structContext = mutableMapOf<String, MoValue>(
         "battle" to battle.struct,
@@ -35,7 +33,6 @@ data class BattleFaintedEvent(
         "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 killed.struct,
-        "context" to context.getStruct(),
-        "pnx" to StringValue(pnx)
+        "context" to context.getStruct()
     )
-}
+}

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

@@ -25,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,
@@ -34,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/interaction/PokemonInteractions.kt

@@ -9,14 +9,13 @@
 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
+import com.cobblemon.mod.common.api.pokemon.requirement.OwnerQueryRequirement
 import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.net.messages.client.data.PokemonInteractionsSyncPacket
 import com.cobblemon.mod.common.pokemon.adapters.CobblemonRequirementAdapter
 import com.cobblemon.mod.common.pokemon.evolution.adapters.LegacyItemConditionWrapperAdapter
 import com.cobblemon.mod.common.pokemon.requirements.PokemonPropertiesRequirement
@@ -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,42 +43,40 @@ 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()
         .create()
 
-    val interactions = mutableListOf<PokemonInteractionSet>()
+    val speciesInteractions = mutableListOf<PokemonInteractionSet>()
+    val generalInteractions = mutableListOf<PokemonInteractionSet>()
 
-    override fun sync(player: ServerPlayer) {
-        PokemonInteractionsSyncPacket(interactions).sendToPlayer(player)
-    }
+    override fun sync(player: ServerPlayer) {}
 
     override fun reload(data: Map<ResourceLocation, PokemonInteractionSet>) {
-        interactions.clear()
-        val split = data.entries
-            .partition {
-                it.value.requirements.any { requirement -> requirement is PokemonPropertiesRequirement && requirement.target.species != null }
-            }
-
-        // Put the species specific interactions first as they take priority
-        interactions.addAll(split.first.map {it.value})
-        interactions.addAll(split.second.map {it.value})
-
-        Cobblemon.LOGGER.info("Loaded {} Pokémon interaction sets", interactions.size)
+        speciesInteractions.clear()
+        generalInteractions.clear()
+        val split = data.entries.partition { it.value.requirements.any { requirement -> requirement is PokemonPropertiesRequirement && requirement.target.species != null } }
+        speciesInteractions.addAll(split.first.map {it.value})
+        generalInteractions.addAll(split.second.map {it.value})
+        Cobblemon.LOGGER.info("Loaded {} Pokémon interaction sets", data.size)
     }
 
     fun findInteraction(pokemon: PokemonEntity): PokemonInteraction? {
         val setCheck: (PokemonInteractionSet) -> Boolean = { it.requirements.all { req -> req.check(pokemon.pokemon) }}
         val interactionCheck: (PokemonInteraction) -> Boolean = { it.requirements.all { req -> req.check(pokemon.pokemon) } && !pokemon.pokemon.isOnInteractionCooldown(it.grouping)  }
-        return interactions
+        // species-specific interactions take priority
+        val validInteractions = speciesInteractions
             .filter(setCheck)
             .flatMap { it.interactions }
-            .firstOrNull(interactionCheck)
+            .filter(interactionCheck)
+            .toMutableList()
+        if (validInteractions.isEmpty()) { // if all species-specific interactions are absent/on cooldown, fallback to more generic ones
+            validInteractions.addAll(generalInteractions.filter(setCheck).flatMap { it.interactions }
+                .filter(interactionCheck)
+            )
+        }
+
+        return validInteractions.randomOrNull()
     }
 }

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

@@ -15,11 +15,11 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.api.pokemon.requirement.Requirement
 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 com.cobblemon.mod.common.util.asExpressionLike
+import com.cobblemon.mod.common.util.giveOrDropItemStack
+import com.cobblemon.mod.common.util.withPlayerValue
+import com.cobblemon.mod.common.util.withQueryValue
 import net.minecraft.core.registries.Registries
-import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.sounds.SoundSource
@@ -28,75 +28,30 @@ import net.minecraft.world.entity.EquipmentSlot
 import net.minecraft.world.entity.item.ItemEntity
 import net.minecraft.world.item.ItemStack
 
+/**
+ * A
+ */
 data class PokemonInteractionSet(
     val requirements: List<Requirement> = listOf(),
-    val interactions: List<PokemonInteraction> = listOf(),
-) {
-    fun encode(buffer: FriendlyByteBuf) {
-        buffer.writeCollection(requirements) { it, requirement ->
-            CobblemonRequirementAdapter.encode(requirement, it)
-        }
-        buffer.writeCollection(interactions) { it, interaction ->
-            interaction.encode(it)
-        }
-    }
-
-    companion object {
-        fun decode(buffer: FriendlyByteBuf): PokemonInteractionSet {
-            val requirements = buffer.readList(CobblemonRequirementAdapter::decode)
-            val interactions = buffer.readList(PokemonInteraction::decode)
-            return PokemonInteractionSet(requirements, interactions)
-        }
-    }
-}
-
+    val interactions: List<PokemonInteraction> = listOf()
+)
 data class PokemonInteraction(
     val grouping: ResourceLocation,
     val requirements: List<Requirement> = listOf(),
     val effects: List<InteractionEffect> = listOf(),
     val cooldown: ExpressionLike = "0".asExpressionLike()
-) {
-    fun encode(buffer: FriendlyByteBuf) {
-        buffer.writeResourceLocation(grouping)
-        buffer.writeCollection(requirements) { it, requirement ->
-            CobblemonRequirementAdapter.encode(requirement, it)
-        }
-        buffer.writeExpressionLike(cooldown)
-    }
-
-    companion object {
-        fun decode(buffer: FriendlyByteBuf): PokemonInteraction {
-            val grouping = buffer.readResourceLocation()
-            val requirements = buffer.readList { it ->
-                CobblemonRequirementAdapter.decode(it)
-            }
-
-            // No need to sync these for now
-            val effects = emptyList<InteractionEffect>()
-            val cooldown = buffer.readExpressionLike()
-
-            return PokemonInteraction(
-                grouping,
-                requirements,
-                effects,
-                cooldown,
-            )
-        }
-    }
-}
+)
 
 interface InteractionEffect {
     fun applyEffect(pokemon: PokemonEntity, player: ServerPlayer)
 }
 
-class DropItemEffect(val item: ResourceLocation, val amount: IntRange?) : InteractionEffect {
+class DropItemEffect(val item: ResourceLocation, val amount: IntRange?): InteractionEffect {
     override fun applyEffect(
         pokemon: PokemonEntity,
         player: ServerPlayer
     ) {
-        val item = player.registryAccess().registryOrThrow(Registries.ITEM).get(item) ?: throw IllegalArgumentException(
-            "Cannot load item with id: $item"
-        )
+        val item = player.registryAccess().registryOrThrow(Registries.ITEM).get(item) ?: throw IllegalArgumentException("Cannot load item with id: $item")
         val stack = ItemStack(item)
         stack.count = amount?.randomOrNull() ?: 1
         if (stack.isEmpty)
@@ -113,14 +68,12 @@ class DropItemEffect(val item: ResourceLocation, val amount: IntRange?) : Intera
     }
 }
 
-class GiveItemEffect(val item: ResourceLocation, val amount: IntRange?) : InteractionEffect {
+class GiveItemEffect(val item: ResourceLocation, val amount: IntRange?): InteractionEffect {
     override fun applyEffect(
         pokemon: PokemonEntity,
         player: ServerPlayer
     ) {
-        val item = player.registryAccess().registryOrThrow(Registries.ITEM).get(item) ?: throw IllegalArgumentException(
-            "Cannot load item with id: $item"
-        )
+        val item = player.registryAccess().registryOrThrow(Registries.ITEM).get(item) ?: throw IllegalArgumentException("Cannot load item with id: $item")
         val stack = ItemStack(item)
         stack.count = amount?.randomOrNull() ?: 1
         if (stack.isEmpty)
@@ -133,54 +86,25 @@ 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?,
-) : InteractionEffect {
-
+class PlaySoundEffect(val sound: ResourceLocation, val soundSource: SoundSource?, 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
     ) {
-        val packet = UnvalidatedPlaySoundS2CPacket(
-            sound,
-            soundSource ?: SoundSource.NEUTRAL,
-            pokemon.x,
-            pokemon.y,
-            pokemon.z,
-            volume,
-            pitch
-        )
-
+        val packet = UnvalidatedPlaySoundS2CPacket(sound, soundSource ?: SoundSource.NEUTRAL, pokemon.x, pokemon.y, pokemon.z, volume, pitch)
         if (playAround) {
-            packet.sendToPlayersAround(pokemon.x, pokemon.y, pokemon.z, distance, pokemon.level().dimension())
+            packet.sendToPlayersAround( pokemon.x, pokemon.y, pokemon.z, distance, pokemon.level().dimension())
         } else {
             packet.sendToPlayer(player)
         }
     }
 
-    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"
     }
 }
 
-class ShrinkItemEffect(val amount: Int = 1) : InteractionEffect {
+class ShrinkItemEffect(val amount: Int = 1): InteractionEffect {
     override fun applyEffect(
         pokemon: PokemonEntity,
         player: ServerPlayer
@@ -196,7 +120,7 @@ class ShrinkItemEffect(val amount: Int = 1) : InteractionEffect {
     }
 }
 
-class ScriptEffect(val script: ExpressionLike) : InteractionEffect {
+class ScriptEffect(val script: ExpressionLike): InteractionEffect {
     override fun applyEffect(
         pokemon: PokemonEntity,
         player: ServerPlayer

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

@@ -311,7 +311,7 @@ object MoLangFunctions {
             runtime.environment.variable = params.environment.variable
             val args = params.params.subList(1, params.params.size)
             runtime.environment.context = ContextStruct(
-                (params.environment.context?.map ?: emptyMap()) + args.mapIndexed { index, value -> "arg_${index + 1}" to value }.toMap()
+                params.environment.context.map + args.mapIndexed { index, value -> "arg_${index + 1}" to value }.toMap()
             )
             val script = params.getString(0).asIdentifierDefaultingNamespace()
             // store the args in the
@@ -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,28 +340,23 @@ 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))
         },
-        "get_move_from_id" to java.util.function.Function { params ->
-            val moveId = params.getString(0)
-            val moveTemplate = Moves.getByName(moveId)
-            return@Function moveTemplate?.struct ?: DoubleValue.ZERO
-        },
         "create_simple_party_provider" to java.util.function.Function { params ->
             val partyProvider = SimplePartyProvider()
             return@Function partyProvider.struct
@@ -383,13 +367,6 @@ object MoLangFunctions {
             val pickupItem = ObtainableItem(item = item, pickupPriority = pickupPriority)
             return@Function pickupItem.struct
         },
-        "create_itemstack" to java.util.function.Function { params ->
-            val itemId = params.getString(0).asIdentifierDefaultingNamespace()
-            val item = BuiltInRegistries.ITEM.get(itemId) ?: return@Function DoubleValue.ZERO
-            val count = params.getIntOrNull(1) ?: 1
-            val itemStack = ItemStack(item, count)
-            return@Function ObjectValue(itemStack)
-        },
         "file" to java.util.function.Function { MoLangLoadedFilesCache.struct }
     )
     val biomeFunctions = mutableListOf<(Holder<Biome>) -> HashMap<String, java.util.function.Function<MoParams, Any>>>()
@@ -595,62 +572,6 @@ object MoLangFunctions {
                 }
                 return@put items
             }
-            map.put("has_inventory_space") { _ ->
-                val inventory = player.inventory
-                return@put if (inventory.getFreeSlot() != -1) DoubleValue.ONE else DoubleValue.ZERO
-            }
-            map.put("set_inventory_slot") { params ->
-                val slot = params.getInt(0)
-                val inventory = player.inventory
-                if (slot !in 0 until inventory.containerSize) return@put DoubleValue.ZERO
-
-                val value = params.getOrNull<MoValue>(1) ?: return@put DoubleValue.ZERO
-
-                val stack: ItemStack? = when (value) {
-                    is ObjectValue<*> -> value.obj as? ItemStack
-                    is StringValue -> {
-                        val id = ResourceLocation.parse(value.value)
-                        val item = player.registryAccess().registryOrThrow(Registries.ITEM).get(id) ?: return@put DoubleValue.ZERO
-                        ItemStack(item)
-                    }
-                    else -> null
-                }
-
-                if (stack == null) return@put DoubleValue.ZERO
-
-                inventory.setItem(slot, stack)
-                return@put DoubleValue.ONE
-            }
-            map.put("give_item") { params ->
-                val inventory = player.inventory
-                val freeSlot = inventory.getFreeSlot()
-                val value = params.getOrNull<MoValue>(0) ?: return@put DoubleValue.ZERO
-                val dropIfFull = params.getBooleanOrNull(1) ?: false
-
-                val stack: ItemStack? = when (value) {
-                    is ObjectValue<*> -> value.obj as? ItemStack
-                    is StringValue -> {
-                        val id = ResourceLocation.parse(value.value)
-                        val item = player.registryAccess().registryOrThrow(Registries.ITEM).get(id) ?: return@put DoubleValue.ZERO
-                        ItemStack(item)
-                    }
-                    else -> null
-                }
-
-                if (stack == null) return@put DoubleValue.ZERO
-
-                if (freeSlot == -1) {
-                    if (dropIfFull) {
-                        player.drop(stack, false)
-                        return@put DoubleValue.ONE
-                    } else {
-                        return@put DoubleValue.ZERO
-                    }
-                }
-
-                inventory.setItem(freeSlot, stack)
-                return@put DoubleValue.ONE
-            }
             map.put("face") { params -> ObjectValue(PlayerDialogueFaceProvider(player.uuid, params.getBooleanOrNull(0) != false)) }
             map.put("swing_hand") { _ -> player.swing(player.usedItemHand) }
             map.put("food_level") { _ -> DoubleValue(player.foodData.foodLevel) }
@@ -694,7 +615,8 @@ object MoLangFunctions {
                 }
                 map.put("active_dialogue") { _ ->
                     if (player.isInDialogue) {
-                        return@put player.activeDialogue?.toMoLangStruct() ?: DoubleValue.ZERO
+                        player.activeDialogue?.dialogueId.toString()
+                        return@put DoubleValue.ONE
                     } else {
                         DoubleValue.ZERO
                     }
@@ -857,20 +779,6 @@ object MoLangFunctions {
                     battleStartResult.ifSuccessful { returnValue = it.struct }
                     return@put returnValue
                 }
-                map.put("get_custom_stat") { params ->
-                    val statName = params.getString(0)
-
-                    val resourceLocation = ResourceLocation.tryParse(statName) ?: return@put DoubleValue.ZERO
-                    val statResourceLocation = BuiltInRegistries.CUSTOM_STAT.get(resourceLocation) ?: return@put DoubleValue.ZERO
-
-                    val exists = net.minecraft.stats.Stats.CUSTOM.contains(statResourceLocation)
-                    if (!exists) return@put DoubleValue.ZERO
-
-                    val stat = net.minecraft.stats.Stats.CUSTOM.get(statResourceLocation)
-                    val value = player.stats.getValue(stat)
-
-                    DoubleValue(value)
-                }
             }
             map
         }
@@ -1831,35 +1739,22 @@ object MoLangFunctions {
                 pokemon.removeCosmeticItem()
             }
             map.put("add_marks") { params ->
-                var appliedMark = false
                 for (param in params.params) {
                     val identifier = param.asString().asIdentifierDefaultingNamespace()
                     val mark = Marks.getByIdentifier(identifier)
-                    if (mark != null) {
-                        pokemon.exchangeMark(mark, true)
-                        appliedMark = true
-                    }
+                    if (mark != null) pokemon.exchangeMark(mark, true)
                 }
-
-                DoubleValue(appliedMark)
             }
             map.put("add_marks_with_chance") { params ->
-                var appliedMark = false
                 for (param in params.params) {
                     val identifier = param.asString().asIdentifierDefaultingNamespace()
                     val mark = Marks.getByIdentifier(identifier)
-
                     mark?.let {
                         val probability = it.chance.coerceIn(0F, 1F) * 100
                         val randomValue = Random.nextDouble(0.0, 100.0)
-                        if (randomValue < probability) {
-                            pokemon.exchangeMark(it, true)
-                            appliedMark = true
-                        }
+                        if (randomValue < probability) pokemon.exchangeMark(it, true)
                     }
                 }
-
-                DoubleValue(appliedMark)
             }
             map.put("add_potential_marks") { params ->
                 for (param in params.params) {

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

@@ -58,15 +58,12 @@ open class MoveTemplate(
     val struct: MoStruct by lazy {
         QueryStruct(hashMapOf())
             .addFunction("name") { StringValue(name) }
-            .addFunction("display_name") { StringValue(displayName.string) }
-            .addFunction("description") { StringValue(description.string) }
             .addFunction("type") { StringValue(elementalType.showdownId) }
             .addFunction("damage_category") { StringValue(damageCategory.name) }
             .addFunction("power") { DoubleValue(power) }
             .addFunction("target") { StringValue(target.name) }
             .addFunction("accuracy") { DoubleValue(accuracy) }
             .addFunction("pp") { DoubleValue(pp) }
-            .addFunction("max_pp") { DoubleValue(maxPp) }
             .addFunction("priority") { DoubleValue(priority) }
             .addFunction("crit_ratio") { DoubleValue(critRatio) }
     }

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

@@ -80,9 +80,7 @@ open class ChoiceSpeciesFeatureProvider(
 
     internal constructor(): this(emptyList())
 
-    override fun get(pokemon: Pokemon): StringSpeciesFeature? {
-        return pokemon.features.filterIsInstance<StringSpeciesFeature>().find { it.name in keys }
-    }
+    override fun get(pokemon: Pokemon) = pokemon.getFeature<StringSpeciesFeature>(keys.first())
 
     override fun invoke(pokemon: Pokemon): StringSpeciesFeature? {
         val existing = get(pokemon)
@@ -103,15 +101,15 @@ open class ChoiceSpeciesFeatureProvider(
     }
 
     override fun invoke(nbt: CompoundTag): StringSpeciesFeature? {
-        val key = keys.find { nbt.contains(it) }
-        if (key == null) return null
-        return StringSpeciesFeature(key, "").also { it.loadFromNBT(nbt) }
+        return if (nbt.contains(keys.first())) {
+            StringSpeciesFeature(keys.first(), "").also { it.loadFromNBT(nbt) }
+        } else null
     }
 
     override fun invoke(json: JsonObject): StringSpeciesFeature? {
-        val key = keys.find { json.has(it) }
-        if (key == null) return null
-        return StringSpeciesFeature(key, "").also { it.loadFromJSON(json) }
+        return if (json.has(keys.first())) {
+            StringSpeciesFeature(keys.first(), "").also { it.loadFromJSON(json) }
+        } else null
     }
 
     override fun fromString(value: String?): StringSpeciesFeature? {
@@ -133,7 +131,7 @@ open class ChoiceSpeciesFeatureProvider(
 
     override fun provide(properties: PokemonProperties): Set<String> {
         return if (isAspect) {
-            val feature = properties.customProperties.filterIsInstance<StringSpeciesFeature>().find { it.name in keys }
+            val feature = properties.customProperties.filterIsInstance<StringSpeciesFeature>().find { it.name == keys.first() }
             if (feature != null) {
                 setOf(getAspect(feature))
             } else {

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

@@ -132,9 +132,7 @@ class FlagSpeciesFeatureProvider : SynchronizedSpeciesFeatureProvider<FlagSpecie
 
     constructor(vararg keys: String) : this(keys.toList())
 
-    override fun get(pokemon: Pokemon): FlagSpeciesFeature? {
-        return pokemon.features.filterIsInstance<FlagSpeciesFeature>().find { it.name in keys }
-    }
+    override fun get(pokemon: Pokemon) = pokemon.getFeature<FlagSpeciesFeature>(keys.first())
 
     override fun invoke(pokemon: Pokemon): FlagSpeciesFeature? {
         return get(pokemon)
@@ -146,15 +144,15 @@ class FlagSpeciesFeatureProvider : SynchronizedSpeciesFeatureProvider<FlagSpecie
     }
 
     override fun invoke(nbt: CompoundTag): FlagSpeciesFeature? {
-        val key = keys.find { nbt.contains(it) }
-        if (key == null) return null
-        return FlagSpeciesFeature(key, false).also { it.loadFromNBT(nbt) }
+        return if (nbt.contains(keys.first())) {
+            FlagSpeciesFeature(keys.first(), false).also { it.loadFromNBT(nbt) }
+        } else null
     }
 
     override fun invoke(json: JsonObject): FlagSpeciesFeature? {
-        val key = keys.find { json.has(it) }
-        if (key == null) return null
-        return FlagSpeciesFeature(key, false).also { it.loadFromJSON(json) }
+        return if (json.has(keys.first())) {
+            FlagSpeciesFeature(keys.first(), false).also { it.loadFromJSON(json) }
+        } else null
     }
 
     override fun fromString(value: String?): FlagSpeciesFeature? {
@@ -172,26 +170,16 @@ class FlagSpeciesFeatureProvider : SynchronizedSpeciesFeatureProvider<FlagSpecie
     }
 
     override fun provide(pokemon: Pokemon): Set<String> {
-        return if (isAspect) {
-            val feature = pokemon.features.filterIsInstance<FlagSpeciesFeature>().find { it.name in keys }
-            if (feature != null && feature.enabled) {
-                setOf(keys.first())
-            } else {
-                emptySet()
-            }
+        return if (isAspect && pokemon.getFeature<FlagSpeciesFeature>(keys.first())?.enabled == true) {
+            setOf(keys.first())
         } else {
             emptySet()
         }
     }
 
     override fun provide(properties: PokemonProperties): Set<String> {
-        return if (isAspect) {
-            val feature = properties.customProperties.filterIsInstance<FlagSpeciesFeature>().find { it.name in keys }
-            if (feature != null && feature.enabled) {
-                setOf(keys.first())
-            } else {
-                emptySet()
-            }
+        return if (isAspect && properties.customProperties.filterIsInstance<FlagSpeciesFeature>().find { it.name == keys.first() }?.enabled == true) {
+            setOf(keys.first())
         } else {
             emptySet()
         }

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

@@ -142,15 +142,19 @@ class IntSpeciesFeatureProvider : SynchronizedSpeciesFeatureProvider<IntSpeciesF
     }
 
     override fun invoke(nbt: CompoundTag): IntSpeciesFeature? {
-        val key = keys.find { nbt.contains(it) }
-        if (key == null) return null
-        return IntSpeciesFeature(keys.first(), nbt.getInt(key));
+        return if (nbt.contains(keys.first())) {
+            IntSpeciesFeature(keys.first(), nbt.getInt(keys.first()))
+        } else {
+            null
+        }
     }
 
     override fun invoke(json: JsonObject): IntSpeciesFeature? {
-        val key = keys.find { json.has(it) }
-        if (key == null) return null
-        return IntSpeciesFeature(keys.first(), json.get(key).asInt)
+        return if (json.has(keys.first())) {
+            IntSpeciesFeature(keys.first(), json.get(keys.first()).asInt)
+        } else {
+            null
+        }
     }
 
     override fun get(pokemon: Pokemon) = pokemon.features.filterIsInstance<IntSpeciesFeature>().find { it.name in keys }

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/requirement/OwnerQueryRequirement.kt

@@ -12,7 +12,6 @@ import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.pokemon.Pokemon
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.entity.LivingEntity
-import net.minecraft.world.entity.player.Player
 
 /**
  * A [Requirement] that expects a [LivingEntity] to be attached to the [Pokemon].
@@ -27,7 +26,7 @@ interface OwnerQueryRequirement : Requirement {
     override fun check(pokemon: Pokemon): Boolean {
         val owner = pokemon.getOwnerEntity() ?: return false
         return when (owner) {
-            is Player -> {
+            is ServerPlayer -> {
                 this.checkPlayer(pokemon, owner)
             }
             is NPCEntity -> {
@@ -38,13 +37,13 @@ interface OwnerQueryRequirement : Requirement {
     }
 
     /**
-     * Checks if the given [Pokemon] & [Player] satisfies the requirement.
+     * Checks if the given [Pokemon] & [ServerPlayer] satisfies the requirement.
      *
      * @param pokemon The [Pokemon] being queried.
-     * @param owner The [Player] that owns this [Pokemon].
+     * @param owner The [ServerPlayer] that owns this [Pokemon].
      * @return If the requirement was satisfied.
      */
-    fun checkPlayer(pokemon: Pokemon, owner: Player): Boolean
+    fun checkPlayer(pokemon: Pokemon, owner: ServerPlayer): Boolean
 
     /**
      * Checks if the given [Pokemon] & [NPCEntity] satisfies the requirement.

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/riding/behaviour/types/composite/strategies/CompositeRidingStrategy.kt

@@ -41,6 +41,10 @@ interface CompositeRidingStrategy<T : CompositeSettings> {
         toState: RidingBehaviourState,
         toSettings: RidingBehaviourSettings
     ) {
+        if (vehicle.level().isClientSide) {
+            val fromSettings = if (settings.defaultBehaviour == toSettings) settings.alternateBehaviour else settings.defaultBehaviour
+
+        }
         toState.stamina.set(fromState.stamina.get())
         toState.rideVelocity.set(fromState.rideVelocity.get())
         fromState.reset()

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/land/HorseBehaviour.kt

@@ -187,16 +187,17 @@ class HorseBehaviour : RidingBehaviour<HorseSettings, HorseState> {
             return
         }
 
-
+        var newStam = stam
         val stamDrainRate = (1.0f / vehicle.runtime.resolveDouble(settings.staminaExpr ?: globalHorse.staminaExpr!!)).toFloat() / 20.0f
 
-        val newStam = if (state.sprinting.get()) {
-            max(0.0f,stam - stamDrainRate)
+        if (state.sprinting.get()) {
+            newStam = max(0.0f,stam - stamDrainRate)
+
         } else {
-            min(1.0f,stam + stamDrainRate * 4)
+            newStam = min(1.0f,stam + stamDrainRate * 4)
         }
 
-        state.stamina.set(newStam.coerceIn(0F, 1F))
+        state.stamina.set(newStam)
     }
 
     override fun updatePassengerRotation(

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/liquid/DolphinBehaviour.kt

@@ -100,7 +100,7 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
         driver: Player,
         input: Vec3
     ) {
-        if (vehicle.level().isClientSide) {
+        if(vehicle.level().isClientSide) {
             handleBoosting(state, vehicle)
             tickStamina(settings, state, vehicle)
         }
@@ -147,7 +147,7 @@ class DolphinBehaviour : RidingBehaviour<DolphinSettings, DolphinState> {
         val stamDrainRate = (1.0f / boostTime).toFloat()
 
         val newStam = if (state.boosting.get()) max(0.0f,stam - stamDrainRate)
-            else (stam + stamDrainRate).coerceIn(0F, 1F)
+            else min(1.0f,stam + stamDrainRate)
 
         state.stamina.set(newStam)
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/sound/RideLoopSound.kt

@@ -12,7 +12,6 @@ package com.cobblemon.mod.common.api.riding.sound
 import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeBehaviour
 import com.cobblemon.mod.common.api.riding.behaviour.types.composite.CompositeState
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
-import com.cobblemon.mod.common.util.getIsSubmerged
 import com.cobblemon.mod.common.util.resolveDouble
 import net.minecraft.client.Minecraft
 import net.minecraft.client.resources.sounds.AbstractTickableSoundInstance
@@ -66,21 +65,6 @@ class RideLoopSound(val ride: PokemonEntity, val soundSettings: RideSoundSetting
             return
         }
 
-        // Mute the sound if it's not meant to play for the passenger
-        if (this.isPassenger && !this.soundSettings.playForPassengers) {
-            this.volume = 0.0f
-            return
-        }
-
-        // Mute sounds when submerged unless they support underwater sounds, underwater sounds don't play above water
-        if (this.ride.getIsSubmerged() && !this.soundSettings.submerged) {
-            this.volume = 0.0f
-            return
-        } else if (!this.ride.getIsSubmerged() && this.soundSettings.submerged) {
-            this.volume = 0.0f
-            return
-        }
-
         // Perform data driven pitch and volume calculation
         this.volume = ((soundSettings.volumeExpr.let { ride.runtime.resolveDouble(it) })).toFloat()
         this.volume *= this.fade

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/sound/RidingSoundSettings.kt

@@ -27,9 +27,7 @@ data class RideSoundSettings(
     val soundLocation: ResourceLocation,
     @SerializedName("volumeExpr") private val _volumeExpr: Expression? = "1.0".asExpression(),
     @SerializedName("pitchExpr") private val _pitchExpr: Expression? = "1.0".asExpression(),
-    val playForPassengers: Boolean = true,
     val playForNonPassengers: Boolean = false,
-    val submerged: Boolean = false,
     val muffleEnabled: Boolean = false,
     @SerializedName("attenuationModel") private val _attenuationModel: RideAttenuationModel? = RideAttenuationModel.NONE
 ): Encodable {
@@ -48,9 +46,7 @@ data class RideSoundSettings(
         buffer.writeResourceLocation(soundLocation)
         buffer.writeExpression(volumeExpr)
         buffer.writeExpression(pitchExpr)
-        buffer.writeBoolean(playForPassengers)
         buffer.writeBoolean(playForNonPassengers)
-        buffer.writeBoolean(submerged)
         buffer.writeBoolean(muffleEnabled)
         buffer.writeEnum(attenuationModel)
     }
@@ -61,9 +57,7 @@ data class RideSoundSettings(
             val soundLocation = buffer.readResourceLocation()
             val volumeExpr = buffer.readExpression()
             val pitchExpr = buffer.readExpression()
-            val playForPassengers = buffer.readBoolean()
             val playForNonPassengers = buffer.readBoolean()
-            val submerged = buffer.readBoolean()
             val muffleEnabled = buffer.readBoolean()
             val attenuationModel = buffer.readEnum(RideAttenuationModel::class.java)
 
@@ -71,9 +65,7 @@ data class RideSoundSettings(
                 soundLocation,
                 volumeExpr,
                 pitchExpr,
-                playForPassengers,
                 playForNonPassengers,
-                submerged,
                 muffleEnabled,
                 attenuationModel
             )

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/detail/SpawnAction.kt

@@ -44,7 +44,11 @@ abstract class SpawnAction<R>(
 
         spawnablePosition.applyInfluences { it.affectAction(this) }
         val result = run()
-        future.complete(result)
+        if (result != null) {
+            future.complete(result)
+        } else {
+            future.completeExceptionally(Exception("Nothing was spawned."))
+        }
 
         return result
     }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/influence/SpawnBaitInfluence.kt

@@ -26,7 +26,7 @@ import net.minecraft.world.entity.Entity
 /**
  * A [SpawningInfluence] that applies some number of SpawnBait effects.
  *
- * @author Hiroku, Plastered_Crab, ppVon
+ * @author Hiroku, Plastered_Crab
  * @since March 18th, 2025
  */
 open class SpawnBaitInfluence(val effects: List<SpawnBait.Effect>, val onUsed: (time: Int, entity: PokemonEntity?) -> Unit = { _, _ -> }) : SpawningInfluence {
@@ -50,84 +50,78 @@ open class SpawnBaitInfluence(val effects: List<SpawnBait.Effect>, val onUsed: (
         }
     }
 
-    // EV, Type, and Egg Group related bait effects
+    // EV related bait effects
     override fun affectWeight(detail: SpawnDetail, spawnablePosition: SpawnablePosition, weight: Float): Float {
         val merged = SpawnBaitUtils.mergeEffects(effects)
 
-        val hasRelevantEffects =
-            merged.any { it.type == Effects.EV } ||
-            merged.any { it.type == Effects.TYPING } ||
-            merged.any { it.type == Effects.EGG_GROUP }
-
-        if (!hasRelevantEffects) {
-            return super.affectWeight(detail, spawnablePosition, weight)
-        }
-
-        val pokemonDetail = detail as? PokemonSpawnDetail
-            ?: return super.affectWeight(detail, spawnablePosition, weight)
-
-        val detailSpecies = pokemonDetail.pokemon.species
-            ?.let { PokemonSpecies.getByName(it) }
-            ?: return super.affectWeight(detail, spawnablePosition, weight)
-
-        val formData = detailSpecies.getForm(pokemonDetail.pokemon.aspects)
-
-        var newWeight = weight
-        var used = false
-
         // if bait exists and any effects are related to EV yields
-        if (merged.any { it.type == Effects.EV }) {
-            val evEffect = effects.firstOrNull { it.type == Effects.EV }
-            val baitEVStat = evEffect?.subcategory?.path?.let { Stats.getStat(it) }
+        if (merged.any { it.type == Effects.EV }){
+            if (detail is PokemonSpawnDetail) {
+                val detailSpecies = detail.pokemon.species?.let { PokemonSpecies.getByName(it) }
+                val baitEVStat = effects.firstOrNull { it.type == Effects.EV }?.subcategory?.path?.let { Stats.getStat(it) }
 
-            if (baitEVStat != null) {
-                val evYieldValue = formData.evYield[baitEVStat]?.toFloat() ?: 0f
-                used = true
-
-                if (evYieldValue <= 0f) {
-                    newWeight = 0f
-                } else {
-                    LOGGER.debug("Boosted weight value");
+                if (detailSpecies != null && baitEVStat != null) {
+                    val evYieldValue = detailSpecies.evYield[baitEVStat]?.toFloat() ?: 0f
+                    return when {
+                        evYieldValue > 0 -> {
+                            markUsed()
+                            super.affectWeight(detail, spawnablePosition, weight)
+                        }
+                        else -> {
+                            markUsed()
+                            super.affectWeight(detail, spawnablePosition, 0f)
+                        }
+                    }
                 }
             }
         }
-
         // if bait exists and any effects are related to Typing
-        if (newWeight > 0f && merged.any { it.type == Effects.TYPING }) {
-            val baitEffect = effects.firstOrNull { it.type == Effects.TYPING }
-            val baitTypingEffect = baitEffect?.subcategory?.path?.let { ElementalTypes.get(it) }
+        if (merged.any { it.type == Effects.TYPING }){
+            if (detail is PokemonSpawnDetail) {
+                val detailSpecies = detail.pokemon.species?.let { PokemonSpecies.getByName(it) }
+                val baitEffect = effects.firstOrNull { it.type == Effects.TYPING }
+                val baitTypingEffect = baitEffect?.subcategory?.path?.let { ElementalTypes.get(it) }
 
-            if (baitEffect != null && baitTypingEffect != null) {
-                val isMatchingType = formData.types.contains(baitTypingEffect)
-                used = true
-
-                if (isMatchingType) {
-                    newWeight *= baitEffect.value.toFloat()
+                if (detailSpecies != null && baitTypingEffect != null) {
+                    val isMatchingType = detailSpecies.types.contains(baitTypingEffect)
+                    return when {
+                        isMatchingType -> {
+                            markUsed()
+                            super.affectWeight(detail, spawnablePosition, weight * baitEffect.value.toFloat())
+                        }
+                        else -> super.affectWeight(detail, spawnablePosition, weight)
+                    }
                 }
             }
         }
-
         // if bait exists and any effects are related to Egg Groups
-        if (newWeight > 0f && merged.any { it.type == Effects.EGG_GROUP }) {
-            val eggGroupEffects = effects.filter { it.type == Effects.EGG_GROUP }
+        if (merged.any { it.type == Effects.EGG_GROUP }) {
+            if (detail is PokemonSpawnDetail) {
+                val detailSpecies = detail.pokemon.species?.let { PokemonSpecies.getByName(it) }
 
-            val matchingEffect = eggGroupEffects.firstOrNull { effect ->
-                val key = effect.subcategory?.path ?: return@firstOrNull false
-                val eggGroup = EggGroup.fromIdentifier(key)
-                if (eggGroup == null) {
-                    LOGGER.warn("Unknown egg group identifier: $key")
-                    return@firstOrNull false
+                if (detailSpecies != null) {
+                    // Collect all the egg group effects
+                    val eggGroupEffects = effects.filter { it.type == Effects.EGG_GROUP }
+
+                    // Check if any of the egg group effects match the species' egg groups
+                    val matchingEffect = eggGroupEffects.firstOrNull { effect ->
+                        val effectEggGroupKey = effect.subcategory?.path ?: return@firstOrNull false
+                        val eggGroup = EggGroup.fromIdentifier(effectEggGroupKey)
+                        if (eggGroup == null) {
+                            LOGGER.warn("Unknown egg group identifier: $effectEggGroupKey")
+                            return@firstOrNull false
+                        }
+                        detailSpecies.eggGroups.contains(eggGroup)
+                    }
+
+                    if (matchingEffect != null) {
+                        markUsed()
+                        val multiplier = matchingEffect.value
+                        return super.affectWeight(detail, spawnablePosition, (weight * multiplier).toFloat())
+                    }
                 }
-                formData.eggGroups.contains(eggGroup)
-            }
-
-            if (matchingEffect != null) {
-                used = true
-                newWeight *= matchingEffect.value.toFloat()
             }
         }
-
-        if (used) markUsed()
-        return super.affectWeight(detail, spawnablePosition, newWeight)
+        return super.affectWeight(detail, spawnablePosition, weight)
     }
 }

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

@@ -8,58 +8,30 @@
 
 package com.cobblemon.mod.common.api.stats
 
-import com.cobblemon.mod.common.Cobblemon
-import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.resources.ResourceLocation
-import net.minecraft.stats.StatFormatter
 
 object CobblemonStats {
-    val stats = mutableMapOf<String, CobblemonStat>()
+    val stats = mutableMapOf<String,  ResourceLocation>()
 
-    @JvmField
-    var CAPTURED: CobblemonStat = CobblemonStat("captured")
-    @JvmField
-    val SHINIES_CAPTURED: CobblemonStat = CobblemonStat("shinies_captured")
-    @JvmField
-    val RELEASED: CobblemonStat = CobblemonStat("released")
-    @JvmField
-    val EVOLVED: CobblemonStat = CobblemonStat("evolved")
-    @JvmField
-    val LEVEL_UP: CobblemonStat = CobblemonStat("level_up")
-    @JvmField
-    val BATTLES_WON: CobblemonStat = CobblemonStat("battles_won")
-    @JvmField
-    val BATTLES_LOST: CobblemonStat = CobblemonStat("battles_lost")
-    @JvmField
-    val BATTLES_FLED: CobblemonStat = CobblemonStat("battles_fled")
-    @JvmField
-    val BATTLES_TOTAL: CobblemonStat = CobblemonStat("battles_total")
-    @JvmField
-    val DEX_ENTRIES: CobblemonStat = CobblemonStat("dex_entries")
-    @JvmField
-    val EGGS_COLLECTED: CobblemonStat = CobblemonStat("eggs_collected")
-    @JvmField
-    val EGGS_HATCHED: CobblemonStat = CobblemonStat("eggs_hatched")
-    @JvmField
-    val TRADED: CobblemonStat = CobblemonStat("traded")
-    @JvmField
-    val FOSSILS_REVIVED: CobblemonStat = CobblemonStat("fossils_revived")
-    @JvmField
-    val TIMES_RIDDEN: CobblemonStat = CobblemonStat("times_ridden")
-    @JvmField
-    val ROD_CASTS: CobblemonStat = CobblemonStat("rod_casts")
-    @JvmField
-    val REEL_INS: CobblemonStat = CobblemonStat("reel_ins")
-    @JvmField
-    val POKEMON_INTERACTED_WITH: CobblemonStat = CobblemonStat("pokemon_interacted_with")
-    @JvmField
-    val RIDING_LAND: CobblemonStat = CobblemonStat("riding_land", StatFormatter.DISTANCE)
-    @JvmField
-    val RIDING_AIR: CobblemonStat = CobblemonStat("riding_air", StatFormatter.DISTANCE)
-    @JvmField
-    val RIDING_LIQUID: CobblemonStat = CobblemonStat("riding_liquid", StatFormatter.DISTANCE)
-
-    //TODO block, stats (interact, gimmi)
+    var CAPTURED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "captured") //makeCustomStat("captured", StatFormatter.DEFAULT)
+    val SHINIES_CAPTURED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "shinies_captured") //makeCustomStat("shinies_captured", StatFormatter.DEFAULT)
+    val RELEASED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "released") //makeCustomStat("released", StatFormatter.DEFAULT)
+    val EVOLVED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "evolved") //makeCustomStat("evolved", StatFormatter.DEFAULT)
+    val LEVEL_UP: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "level_up") //makeCustomStat("level_up", StatFormatter.DEFAULT)
+    val BATTLES_WON: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "battles_won") //makeCustomStat("battles_won", StatFormatter.DEFAULT)
+    val BATTLES_LOST: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "battles_lost") //makeCustomStat("battles_lost", StatFormatter.DEFAULT)
+    val BATTLES_FLED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "battles_fled") //makeCustomStat("battles_fled", StatFormatter.DEFAULT)
+    val BATTLES_TOTAL: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "battles_total") //makeCustomStat("battles_total", StatFormatter.DEFAULT)
+    val DEX_ENTRIES: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "dex_entries") //makeCustomStat("dex_entries", StatFormatter.DEFAULT)
+    val EGGS_COLLECTED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "eggs_collected") //makeCustomStat("eggs_collected", StatFormatter.DEFAULT)
+    val EGGS_HATCHED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "eggs_hatched") //makeCustomStat("eggs_hatched", StatFormatter.DEFAULT)
+    val TRADED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "traded") //makeCustomStat("traded", StatFormatter.DEFAULT)
+    val FOSSILS_REVIVED: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "fossils_revived") //makeCustomStat("fossils_revived", StatFormatter.DEFAULT)
+    val TIMES_RIDDEN: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "times_ridden")
+    val ROD_CASTS: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "rod_casts")
+    val REEL_INS: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "reel_ins")
+    val POKEMON_INTERACTED_WITH: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", "pokemon_interacted_with") //makeCustomStat("pokemon_interacted_with", StatFormatter.DEFAULT)
+    //TODO block, stats (interact, gimmi), riding (styles?)
 
     fun registerStats() {
         stats["captured"] = CAPTURED
@@ -80,22 +52,5 @@ object CobblemonStats {
         stats["rod_casts"] = ROD_CASTS
         stats["reel_ins"] = REEL_INS
         stats["pokemon_interacted_with"] = POKEMON_INTERACTED_WITH
-        stats["riding_land"] = RIDING_LAND
-        stats["riding_air"] = RIDING_AIR
-        stats["riding_liquid"] = RIDING_LIQUID
-    }
-
-    @JvmStatic
-    fun getStat(cobblemonStat: CobblemonStat) : ResourceLocation {
-        val resourceLocation = cobblemonStat.resourceLocation
-        val stat = BuiltInRegistries.CUSTOM_STAT.get(resourceLocation)
-        if (stat == null) {
-            Cobblemon.LOGGER.error("Could not find stat with id {}", resourceLocation)
-        }
-        return stat ?: throw NullPointerException("Could not find stat with id $resourceLocation")
-    }
-
-    data class CobblemonStat(val path: String, val formatter: StatFormatter = StatFormatter.DEFAULT) {
-        val resourceLocation: ResourceLocation = ResourceLocation.fromNamespaceAndPath("cobblemon", path);
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/party/PartyStore.kt

@@ -258,22 +258,17 @@ open class PartyStore(override val uuid: UUID) : PokemonStore<PartyPosition>() {
 
     @JvmOverloads
     fun toBattleTeam(clone: Boolean = false, healPokemon: Boolean = false, leadingPokemon: UUID? = null) : List<BattlePokemon> {
-        var leadingPokemonId = leadingPokemon
         val result = this.mapNotNull {
             return@mapNotNull if (clone) {
-                BattlePokemon.safeCopyOf(it).also { copy ->
-                    if (leadingPokemon != null && it.uuid == leadingPokemonId) {
-                        leadingPokemonId = copy.uuid
-                    }
-                }
+                BattlePokemon.safeCopyOf(it)
             } else {
                 BattlePokemon.playerOwned(it)
             }.also { if (healPokemon) it.effectedPokemon.heal() }
         }.toMutableList()
 
         // reposition lead to front of the party
-        if (leadingPokemonId != null && result.first().uuid != leadingPokemonId) {
-            result.find { it.uuid == leadingPokemonId }?.let { lead ->
+        if (leadingPokemon != null && result.first().uuid != leadingPokemon) {
+            result.find { it.uuid == leadingPokemon }?.let { lead ->
                 result.remove(lead)
                 result.add(0, lead)
             }

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/party/PlayerPartyStore.kt

@@ -154,12 +154,12 @@ open class PlayerPartyStore(
 
                 // Metabolism for Fullness
                 if (pokemon.currentFullness > 0) {
-                    pokemon.tickMetabolism(20)
+                    pokemon.tickMetabolism()
                 }
 
                 // Interaction Cooldown
                 if (pokemon.interactionCooldowns.any()) {
-                    pokemon.tickInteractionCooldown(20)
+                    pokemon.tickInteractionCooldown()
                 }
 
                 pokemon.features.filterIsInstance<TickingSpeciesFeature>().forEach { it.onSecondPassed(player.serverLevel(), pokemon, null) }

common/src/main/kotlin/com/cobblemon/mod/common/api/tags/CobblemonItemTags.kt

@@ -42,7 +42,6 @@ object CobblemonItemTags {
     @JvmField val DAWN_STONE_ORES = create("dawn_stone_ores")
     @JvmField val POTTERY_SHERDS = create("decorated_pot_sherds")
     @JvmField val DEEP_SEAS = create("deep_seas")
-    @JvmField val DISPLAY_CASE_ITEMS = create("display_case_items")
     @JvmField val DUSK_STONE_ORES = create("dusk_stone_ores")
     @JvmField val ETHERS = create("ethers")
     @JvmField val EVOLUTION_ITEMS = create("evolution_items")
@@ -58,7 +57,6 @@ object CobblemonItemTags {
     @JvmField val HANGING_SIGNS = create("hanging_signs")
     @JvmField val HERBS = create("herbs")
     @JvmField val ICE_STONE_ORES = create("ice_stone_ores")
-    @JvmField val ITEM_BLOCKS = create("item_blocks")
     @JvmField val LEAF_STONE_ORES = create("leaf_stone_ores")
     @JvmField val MACHINES = create("machines")
     @JvmField val MINT_LEAF = create("mint_leaf")
@@ -67,7 +65,6 @@ object CobblemonItemTags {
     @JvmField val MOCHIS = create("mochis")
     @JvmField val MOON_STONE_ORES = create("moon_stone_ores")
     @JvmField val MUTATED_BERRIES = create("mutated_berries")
-    @JvmField val PLAQUES = create("plaques")
     @JvmField val PLANTS = create("plants")
     @JvmField val POKE_BALLS = create("poke_balls")
     @JvmField val POKE_RODS = create("poke_rods")

common/src/main/kotlin/com/cobblemon/mod/common/battles/BattleBuilder.kt

@@ -63,8 +63,8 @@ object BattleBuilder {
     ): BattleStartResult {
 
         val adjustLevel = battleFormat.adjustLevel
-        val team1 = partyAccessor(player1).toBattleTeam(clone = cloneParties || adjustLevel > 0,  healPokemon = healFirst, leadingPokemonPlayer1)
-        val team2 = partyAccessor(player2).toBattleTeam(clone = cloneParties || adjustLevel > 0,  healPokemon = healFirst, leadingPokemonPlayer2)
+        val team1 = partyAccessor(player1).toBattleTeam(clone = cloneParties || adjustLevel > 0,  healPokemon = healFirst, leadingPokemonPlayer1).sortedBy { it.health <= 0 }
+        val team2 = partyAccessor(player2).toBattleTeam(clone = cloneParties || adjustLevel > 0,  healPokemon = healFirst, leadingPokemonPlayer2).sortedBy { it.health <= 0 }
 
         val battlePartyStores = mutableListOf<PlayerPartyStore>()
 

common/src/main/kotlin/com/cobblemon/mod/common/battles/BattleFormat.kt

@@ -105,18 +105,12 @@ data class BattleFormat(
     }
 
     fun toFormatJSON(): String {
-        /*
-          Bag clause does not exist in showdown as a rule because showdown simply has no concept of a 'bag'.
-          If we try sending it, the battle will error. So this simply omits that from ever getting sent.
-          If we ever find a case where we are doing this for more than just bag clause, we should make a proper abstraction.
-         */
-        val rulesToSendToShowdown = ruleSet.filter { it != BattleRules.BAG_CLAUSE }
         return """
             {
                 "mod": "$mod",
                 "gameType": "${battleType.name}",
                 "gen": $gen,
-                "ruleset": [${rulesToSendToShowdown.joinToString { "\"$it\"" }}],
+                "ruleset": [${ruleSet.joinToString { "\"$it\"" }}],
                 "effectType": "Format"
             }
         """.trimIndent().replace("\n", "")

common/src/main/kotlin/com/cobblemon/mod/common/battles/BattleRegistry.kt

@@ -221,7 +221,6 @@ object BattleRegistry {
     fun closeBattle(battle: PokemonBattle) {
         battle.onEndHandlers.forEach { it(battle) }
         battleMap.remove(battle.battleId)
-        ShowdownService.service.endBattle(battle)
     }
 
     @JvmStatic

common/src/main/kotlin/com/cobblemon/mod/common/battles/BattleRules.kt

@@ -12,7 +12,6 @@ object BattleRules {
     const val OBTAINABLE = "Obtainable"
     const val PAST = "+Past"
     const val UNOBTAINABLE = "+Unobtainable"
-    const val BAG_CLAUSE = "Bag Clause"
     const val TEAM_PREVIEW = "Team Preview"
     const val ENDLESS_BATTLE_CLAUSE = "Endless Battle Clause"
     const val CANCEL_MOD = "Cancel Mod"

common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownActionRequest.kt

@@ -289,8 +289,6 @@ class ShowdownMoveset {
     var canDynamax = false
     var maxMoves: List<InBattleGimmickMove?>? = null
     var canTerastallize: String? = null
-    /** This stores a list of gimmicks that have already been used this turn by a previous Pokemon, but the full turn has not been processed (ie. double battles). */
-    val pendingGimmickUsedThisTurn = mutableListOf<Gimmick>()
 
     fun saveToBuffer(buffer: RegistryFriendlyByteBuf) {
         buffer.writeSizedInt(IntSize.U_BYTE, moves.size)

common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownInterpreter.kt

@@ -300,35 +300,4 @@ object ShowdownInterpreter {
         } ?:
         MissingContext()
     }
-
-    /**
-     * Registers a new update instruction parser.
-     * @param id The ID of the instruction to register.
-     * @param callback The callback function to create the instruction.
-     */
-    @JvmStatic
-    fun registerUpdateInstructionParser(id: String, callback: (PokemonBattle, InstructionSet, BattleMessage, Iterator<BattleMessage>) -> InterpreterInstruction) {
-        updateInstructionParser[id] = callback
-    }
-
-    /**
-     * Registers a new split instruction parser.
-     * @param id The ID of the instruction to register.
-     * @param callback The callback function to create the instruction.
-     */
-    @JvmStatic
-    fun registerSplitInstructionParser(id: String, callback: (PokemonBattle, BattleActor, InstructionSet, BattleMessage, BattleMessage, Iterator<BattleMessage>) -> InterpreterInstruction) {
-        splitInstructionParser[id] = callback
-    }
-
-    /**
-     * Registers a new side instruction parser.
-     * @param id The ID of the instruction to register.
-     * @param callback The callback function to create the instruction.
-     */
-    @JvmStatic
-    fun registerSideInstructionParser(id: String, callback: (PokemonBattle, BattleActor, InstructionSet, BattleMessage) -> InterpreterInstruction) {
-        sideInstructionParser[id] = callback
-    }
-
-}
+}

common/src/main/kotlin/com/cobblemon/mod/common/battles/actor/MultiPokemonBattleActor.kt

@@ -18,7 +18,7 @@ import java.util.UUID
 import net.minecraft.network.chat.MutableComponent
 import net.minecraft.network.chat.Component
 
-open class MultiPokemonBattleActor(
+class MultiPokemonBattleActor(
     pokemonList: List<BattlePokemon>,
     artificialDecider: BattleAI = RandomBattleAI(),
     uuid: UUID = UUID.randomUUID()

common/src/main/kotlin/com/cobblemon/mod/common/battles/actor/PokemonBattleActor.kt

@@ -24,14 +24,17 @@ import net.minecraft.network.chat.MutableComponent
 import net.minecraft.network.chat.Component
 import net.minecraft.world.phys.Vec3
 
-open class PokemonBattleActor(
+class PokemonBattleActor(
     uuid: UUID,
     val pokemon: BattlePokemon,
     override val fleeDistance: Float,
-    artificialDecider: BattleAI = RandomBattleAI(),
+    artificialDecider: BattleAI = RandomBattleAI()
 ) : AIBattleActor(uuid, listOf(pokemon), artificialDecider), EntityBackedBattleActor<PokemonEntity>, FleeableBattleActor {
 
-    override val initialPos: Vec3? = pokemon.entity?.position()
+    override val initialPos: Vec3?
+    init {
+        initialPos = entity?.position()
+    }
     override fun getName() = pokemon.effectedPokemon.species.translatedName
     override fun nameOwned(name: String): MutableComponent = Component.literal(name)
     override fun getWorldAndPosition(): Pair<ServerLevel, Vec3>? {

common/src/main/kotlin/com/cobblemon/mod/common/battles/actor/TrainerBattleActor.kt

@@ -17,7 +17,7 @@ import com.cobblemon.mod.common.util.battleLang
 import java.util.UUID
 import net.minecraft.network.chat.MutableComponent
 
-open class TrainerBattleActor(
+class TrainerBattleActor(
     val trainerName: String,
     uuid: UUID,
     pokemonList: List<BattlePokemon>,

common/src/main/kotlin/com/cobblemon/mod/common/battles/ai/StrongBattleAI.kt

@@ -31,7 +31,6 @@ import kotlin.collections.associateWith
 import kotlin.collections.partition
 import kotlin.math.absoluteValue
 
-
 /**
  * AI that tries to choose the best move for the given situations. Based off of the Pokemon Trainer Tournament Simulator Github
  * https://github.com/cRz-Shadows/Pokemon_Trainer_Tournament_Simulator/blob/main/pokemon-showdown/sim/examples/Simulation-test-1.ts#L330
@@ -272,11 +271,6 @@ class StrongBattleAI(skill: Int) : BattleAI {
         }
         activeTrackerPokemon.firstTurn = false
 
-        // If HP is below 30% and not switching out, always use the most damaging move
-        if (activeTrackerPokemon.currentHpPercent < 0.3 && !shouldSwitchOut(aiSide, battle, activeBattlePokemon, moveset)) {
-            findAndUseMostDamagingMove(activeBattlePokemon, activeTrackerPokemon, opponents, availableMoves, moveset, battle, aiSide)?.let { return it }
-        }
-
         // Decision-making based on move availability and switch-out condition
         if (!shouldSwitchOut(aiSide, battle, activeBattlePokemon, moveset)) {
             val nRemainingMons = activeTracker.alliedSide.actors.sumOf { actor -> actor.party.filter { it.currentHpPercent > 0 }.size }
@@ -527,19 +521,6 @@ class StrongBattleAI(skill: Int) : BattleAI {
 
         val opponentActiveTracker = activeTracker.opponentSide.activePokemon
         val opponentSpeedEstimations = opponentActiveTracker.map { statEstimationActive(it, Stats.SPEED) }
-
-
-        // Only switch if a switch-in is significantly better than the current Pokémon
-        val currentScore = estimateMatchup(activeBattlePokemon, side, battle)
-        val bestSwitchScore = availableSwitches.maxOfOrNull { estimateMatchup(activeBattlePokemon, side, battle, it) } ?: currentScore
-        val improvementThreshold = currentScore.absoluteValue * 0.25 + 2
-        if (bestSwitchScore <= currentScore + improvementThreshold) {
-            return false
-        }
-
-        if(bestSwitchScore < 1) {
-            return false
-        }
         // todo add some way to keep track of the player's boosting to see if it needs to switch out to something that can stop it
 
         // if slower speed stat than the opposing pokemon and HP is less than 20% don't switch out
@@ -567,8 +548,6 @@ class StrongBattleAI(skill: Int) : BattleAI {
         if (availableSwitches.isEmpty() || availableSwitches.none { estimateMatchup(activeBattlePokemon, side, battle, it) > 0 })
             return false
 
-        
-
         // ...and a 'good' reason to switch out
         if (opponentActiveTracker.any { it.boosts.getOrDefault(Stats.ACCURACY, 0) <= accuracySwitchThreshold } ||
             opponentActiveTracker.any { it.boosts.getOrDefault(Stats.DEFENCE, 0) <= -3 } ||

common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/ActivateInstruction.kt

@@ -114,14 +114,7 @@ class ActivateInstruction(val instructionSet: InstructionSet, val message: Battl
                 }
                 "maxguard", "protect" -> battleLang("activate.protect", pokemonName)
                 "shadowforce", "hyperspacefury", "hyperspacehole" -> battleLang("activate.phantomforce", pokemonName)
-                else -> {
-                    val msgVariant = message.optionalArgument("msg")
-                    if (msgVariant != null) {
-                        battleLang("activate.${effect.id}.$msgVariant", pokemonName, sourceName, extraEffect)
-                    } else {
-                        battleLang("activate.${effect.id}", pokemonName, sourceName, extraEffect)
-                    }
-                }
+                else -> battleLang("activate.${effect.id}", pokemonName, sourceName, extraEffect)
             }
             battle.broadcastChatMessage(lang)
             //We check holds here so the chat msg + particle effect happen more concurrently, instead of sequentially

common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/FaintInstruction.kt

@@ -52,7 +52,7 @@ class FaintInstruction(battle: PokemonBattle, val message: BattleMessage) : Inte
             preamble.thenAccept {
                 faintingPokemon.effectedPokemon.currentHealth = 0
                 faintingPokemon.sendUpdate()
-                CobblemonEvents.BATTLE_FAINTED.post(BattleFaintedEvent(battle, pokemon, context, pnx))
+                CobblemonEvents.BATTLE_FAINTED.post(BattleFaintedEvent(battle, pokemon, context))
                 battle.getActorAndActiveSlotFromPNX(pnx).second.battlePokemon = null
                 faintingPokemon.contextManager.add(context)
                 faintingPokemon.contextManager.clear(BattleContext.Type.STATUS, BattleContext.Type.VOLATILE, BattleContext.Type.BOOST, BattleContext.Type.UNBOOST)

common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/FormeChangeInstruction.kt

@@ -26,7 +26,6 @@ import com.cobblemon.mod.common.util.battleLang
 class FormeChangeInstruction(val message: BattleMessage): InterpreterInstruction {
 
     override fun invoke(battle: PokemonBattle) {
-        val (pnx, _) = message.pnxAndUuid(0) ?: return
         val battlePokemon = message.battlePokemon(0, battle) ?: return
         val details = message.argumentAt(1)?.split(',')?.get(0)?.lowercase() ?: return
         val speciesName = details.substringBefore('-')
@@ -38,7 +37,7 @@ class FormeChangeInstruction(val message: BattleMessage): InterpreterInstruction
         battle.dispatchWaiting {
             battle.minorBattleActions[battlePokemon.uuid] = message
 
-            CobblemonEvents.FORME_CHANGE.post(FormeChangeEvent(battle, battlePokemon, formName, pnx))
+            CobblemonEvents.FORME_CHANGE.post(FormeChangeEvent(battle, battlePokemon, formName))
             val pokemonName = battlePokemon.getName()
             val lang = when(formName) {
                 "busted", "hero", "complete" -> return@dispatchWaiting

common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/SwitchInstruction.kt

@@ -166,11 +166,6 @@ class SwitchInstruction(val instructionSet: InstructionSet, val battleActor: Bat
             // If we can't find the entity for some reason then we're going to skip the recall animation
             val sendOutFuture = CompletableFuture<Unit>()
             (pokemonEntity?.recallWithAnimation() ?: CompletableFuture.completedFuture(Unit)).thenApply {
-                if (battle.ended) {
-                    sendOutFuture.complete(Unit)
-                    return@thenApply
-                }
-
                 // Queue actual swap and send-in after the animation has ended
                 actor.pokemonList.swap(actor.activePokemon.indexOf(activePokemon), actor.pokemonList.indexOf(newPokemon))
                 activePokemon.battlePokemon = newPokemon

common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/WinInstruction.kt

@@ -43,17 +43,17 @@ class WinInstruction(val message: BattleMessage): InterpreterInstruction {
         val losersText = losers.map { it.getName() }.reduce { acc, next -> acc + " & " + next }
         val wasCaught = battle.showdownMessages.any { "capture" in it }
 
-        // If the battle was a PvW battle, we need to set the killer of the wild Pokémon to the player
-        if (battle.isPvW) {
-            val nonPlayerActor = battle.actors.first { it.type == ActorType.WILD }
-            val wildPokemon: BattlePokemon = nonPlayerActor.pokemonList.first()
-
-            if (!wasCaught && losers.any { it.uuid == wildPokemon.uuid }) {
-                wildPokemon.effectedPokemon.entity?.killer = (battle.actors.firstOrNull { it.type == ActorType.PLAYER } as? PlayerBattleActor)?.entity
-            }
-        }
-
         battle.dispatch {
+            // If the battle was a PvW battle, we need to set the killer of the wild Pokémon to the player
+            if (battle.isPvW) {
+                val nonPlayerActor = battle.actors.first { it.type == ActorType.WILD }
+                val wildPokemon: BattlePokemon = nonPlayerActor.pokemonList.first()
+
+                if (!wasCaught && losers.any { it.uuid == wildPokemon.uuid }) {
+                    wildPokemon.effectedPokemon.entity?.killer = (battle.actors.firstOrNull { it.type == ActorType.PLAYER } as? PlayerBattleActor)?.entity
+                }
+            }
+
             // broadcast victory / defeat
             if (!wasCaught) {
                 val blackedOut = battle.isPvW && losers.any { it is PlayerBattleActor }

common/src/main/kotlin/com/cobblemon/mod/common/battles/pokemon/BattlePokemon.kt

@@ -36,18 +36,10 @@ import java.util.function.Function
 open class BattlePokemon(
     val originalPokemon: Pokemon,
     val effectedPokemon: Pokemon = originalPokemon,
-    var postBattlePokemonOperations: MutableList<(BattlePokemon) -> Unit> = mutableListOf(),
-    var postBattleEntityOperations: MutableList<(PokemonEntity) -> Unit> = mutableListOf()
+    val postBattleEntityOperation: (PokemonEntity) -> Unit = {}
 ) {
     lateinit var actor: BattleActor
 
-    constructor(originalPokemon: Pokemon, effectedPokemon: Pokemon, postBattleEntityOperation: (PokemonEntity) -> Unit) : this(
-        originalPokemon = originalPokemon,
-        effectedPokemon = effectedPokemon,
-        postBattlePokemonOperations = mutableListOf<(BattlePokemon) -> Unit>(),
-        postBattleEntityOperations = mutableListOf(postBattleEntityOperation)
-    )
-
     companion object {
         fun safeCopyOf(pokemon: Pokemon): BattlePokemon {
             //TOOD figure out a closer registry access (might have to break some method signatures for this (1.7?)

common/src/main/kotlin/com/cobblemon/mod/common/battles/runner/ShowdownService.kt

@@ -27,7 +27,6 @@ interface ShowdownService {
     fun openConnection()
     fun closeConnection()
     fun startBattle(battle: PokemonBattle, messages: Array<String>)
-    fun endBattle(battle: PokemonBattle)
     fun send(battleId: UUID, messages: Array<String>)
     fun getRegistryData(type: String): JsonArray
     fun sendRegistryData(data: Map<String, String>, type: String)

common/src/main/kotlin/com/cobblemon/mod/common/battles/runner/graal/GraalShowdownService.kt

@@ -129,11 +129,6 @@ class GraalShowdownService : ShowdownService {
         startBattleFunction.execute(this, battle.battleId.toString(), messages)
     }
 
-    override fun endBattle(battle: PokemonBattle) {
-        val endBattleFunction = context.getBindings("js").getMember("endBattle")
-        endBattleFunction.execute(battle.battleId.toString())
-    }
-
     override fun send(battleId: UUID, messages: Array<String>) {
         sendToShowdown(battleId, messages)
     }

common/src/main/kotlin/com/cobblemon/mod/common/battles/runner/socket/SocketShowdownService.kt

@@ -62,11 +62,6 @@ class SocketShowdownService(val host: String = "localhost", val port: Int = 1846
         send(battle.battleId, messages)
     }
 
-    override fun endBattle(battle: PokemonBattle) {
-        writer.write(">endbattle ${battle.battleId}\n")
-        acknowledge { Cobblemon.LOGGER.error("Failed to end battle ${battle.battleId}!") }
-    }
-
     override fun send(battleId: UUID, messages: Array<String>) {
         for (message in messages) {
             writer.write("$battleId~$message\n")

common/src/main/kotlin/com/cobblemon/mod/common/block/DispenserBehaviorRegistry.kt

@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2023 Cobblemon Contributors
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package com.cobblemon.mod.common.block
+
+import net.minecraft.world.item.Item
+import net.minecraft.core.dispenser.DispenseItemBehavior
+import net.minecraft.world.item.Items
+import net.minecraft.world.item.alchemy.PotionContents
+import net.minecraft.world.item.alchemy.Potions
+import net.minecraft.world.level.block.DispenserBlock
+
+object DispenserBehaviorRegistry {
+    private val behaviors = mutableMapOf<Item, DispenseItemBehavior>()
+
+    fun register(items: List<Item>, behaviorProvider: (Item) -> DispenseItemBehavior) {
+        for (item in items) {
+            behaviors[item] = behaviorProvider(item)
+        }
+    }
+
+    fun applyBehaviors() {
+        behaviors.forEach { (item, behavior) ->
+            DispenserBlock.registerBehavior(item, behavior)
+        }
+    }
+
+    // TODO: Seems like there can only 1 behavior per item, so registering the leaves with the honey bottle overrode the honey bottle behavior for the log.
+    //  Registering a new behavior with `DispenserBlock.registerBehavior` will override any existing ones for that item, possibly even ones from Minecraft and other mods
+    //  Will probably need to use an alternate way of implementing this to avoid conflicts.
+    fun registerDispenserBehaviors() {
+        // register(listOf(PotionContents.createItemStack(Items.POTION, Potions.WATER).item)) { SaccharineLogSlatheredBlock.createBehavior() }
+        // register(listOf(Items.HONEY_BOTTLE)) { SaccharineLogBlock.createBehavior() }
+        // register(listOf(Items.HONEY_BOTTLE, Items.GLASS_BOTTLE)) { item -> SaccharineLeafBlock.createBehavior(item)}
+        applyBehaviors()
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/block/DisplayCaseBlock.kt

@@ -19,7 +19,6 @@ import net.minecraft.world.InteractionResult
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.BlockItem
 import net.minecraft.world.item.context.BlockPlaceContext
-import net.minecraft.world.level.BlockGetter
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.LevelAccessor
 import net.minecraft.world.level.block.BaseEntityBlock
@@ -111,8 +110,6 @@ class DisplayCaseBlock(settings: Properties) : BaseEntityBlock(settings) {
 
     override fun getRenderShape(state: BlockState) = RenderShape.MODEL
 
-    override fun getShadeBrightness(state: BlockState, level: BlockGetter, pos: BlockPos): Float = 0.75F
-
     override fun getAnalogOutputSignal(state: BlockState, world: Level, pos: BlockPos): Int {
         val stack = (world.getBlockEntity(pos) as DisplayCaseBlockEntity).getStack()
 

common/src/main/kotlin/com/cobblemon/mod/common/block/HeartyGrainsBlock.kt

@@ -29,7 +29,6 @@ import net.minecraft.world.level.block.SoundType
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.block.state.StateDefinition
 import net.minecraft.world.level.block.state.properties.BlockStateProperties
-import net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED
 import net.minecraft.world.level.block.state.properties.DoubleBlockHalf
 import net.minecraft.world.level.block.state.properties.EnumProperty
 import net.minecraft.world.level.block.state.properties.IntegerProperty
@@ -44,6 +43,7 @@ class HeartyGrainsBlock(settings: Properties) : CropBlock(settings), SimpleWater
         val CODEC = simpleCodec(::HeartyGrainsBlock)
         const val MATURE_AGE = 6
         const val AGE_AFTER_HARVEST = 3 // Last single block stage
+        val WATERLOGGED = BlockStateProperties.WATERLOGGED
         val AGE: IntegerProperty = IntegerProperty.create("age", 0, MATURE_AGE)
         val HALF: EnumProperty<DoubleBlockHalf> = BlockStateProperties.DOUBLE_BLOCK_HALF
 

common/src/main/kotlin/com/cobblemon/mod/common/block/PastureBlock.kt

@@ -21,7 +21,6 @@ import com.cobblemon.mod.common.util.isInBattle
 import com.cobblemon.mod.common.util.playSoundServer
 import com.cobblemon.mod.common.util.toVec3d
 import com.cobblemon.mod.common.util.voxelShape
-import com.cobblemon.mod.common.util.rotateShape
 import com.mojang.serialization.MapCodec
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
@@ -72,10 +71,10 @@ class PastureBlock(settings: Properties): BaseEntityBlock(settings), SimpleWater
         private val WEST_AABB_TOP = buildCollider(top = true, Direction.WEST)
         private val EAST_AABB_TOP = buildCollider(top = true, Direction.EAST)
 
+        private val SOUTH_AABB_BOTTOM = buildCollider(top = false, Direction.SOUTH)
+        private val NORTH_AABB_BOTTOM = buildCollider(top = false, Direction.NORTH)
+        private val WEST_AABB_BOTTOM = buildCollider(top = false, Direction.WEST)
         private val EAST_AABB_BOTTOM = buildCollider(top = false, Direction.EAST)
-        private val SOUTH_AABB_BOTTOM = rotateShape(Direction.EAST, Direction.SOUTH, EAST_AABB_BOTTOM)
-        private val NORTH_AABB_BOTTOM = rotateShape(Direction.EAST, Direction.NORTH, EAST_AABB_BOTTOM)
-        private val WEST_AABB_BOTTOM = rotateShape(Direction.EAST, Direction.WEST, EAST_AABB_BOTTOM)
 
         private fun buildCollider(top: Boolean, direction: Direction): VoxelShape {
             if (top) {

common/src/main/kotlin/com/cobblemon/mod/common/block/PlaqueBlock.kt

@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.block
-
-import com.cobblemon.mod.common.util.rotateShape
-import com.mojang.serialization.MapCodec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.core.BlockPos
-import net.minecraft.core.Direction
-import net.minecraft.world.item.context.BlockPlaceContext
-import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.LevelAccessor
-import net.minecraft.world.level.LevelReader
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.Blocks
-import net.minecraft.world.level.block.FaceAttachedHorizontalDirectionalBlock
-import net.minecraft.world.level.block.SimpleWaterloggedBlock
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.block.state.StateDefinition
-import net.minecraft.world.level.block.state.properties.AttachFace
-import net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED
-import net.minecraft.world.level.material.FluidState
-import net.minecraft.world.level.material.Fluids
-import net.minecraft.world.phys.shapes.CollisionContext
-import net.minecraft.world.phys.shapes.Shapes
-import net.minecraft.world.phys.shapes.VoxelShape
-
-class PlaqueBlock(properties : Properties) : FaceAttachedHorizontalDirectionalBlock(properties), SimpleWaterloggedBlock {
-    companion object {
-        val CODEC: MapCodec<PlaqueBlock> = RecordCodecBuilder.mapCodec {
-            it.group(propertiesCodec()).apply(it, ::PlaqueBlock)
-        }
-
-        val FLOOR_NORTH = Shapes.or(
-            Shapes.box(0.0625, 0.25, 0.4375, 0.9375, 1.0, 0.5625),
-            Shapes.box(0.125, 0.0, 0.4375, 0.25, 0.25, 0.5625),
-            Shapes.box(0.75, 0.0, 0.4375, 0.875, 0.25, 0.5625),
-        )
-        val WALL_NORTH = Shapes.box(0.0625, 0.125, 0.9375, 0.9375, 0.875, 1.0)
-        val CEILING_NORTH = Shapes.box(0.0625, 0.0, 0.4375, 0.9375, 0.75, 0.5625)
-    }
-
-    init {
-        registerDefaultState(stateDefinition.any()
-            .setValue(FACING, Direction.NORTH)
-            .setValue(FACE, AttachFace.WALL)
-            .setValue(WATERLOGGED, false)
-        )
-    }
-
-    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
-        builder.add(FACING, FACE, WATERLOGGED)
-    }
-
-    override fun getFluidState(blockState: BlockState): FluidState? {
-        return if (blockState.getValue(WATERLOGGED)) Fluids.WATER.getSource(false) else super.getFluidState(blockState);
-    }
-
-    override fun getStateForPlacement(context: BlockPlaceContext): BlockState? {
-        val fluidState = context.level.getFluidState(context.clickedPos)
-        for (direction in context.nearestLookingDirections) {
-            val blockState: BlockState
-            if (direction.getAxis() === Direction.Axis.Y) {
-                blockState = (defaultBlockState()
-                    .setValue(FACE, if (direction == Direction.UP) AttachFace.CEILING else AttachFace.FLOOR) as BlockState)
-                    .setValue(FACING, context.horizontalDirection.opposite)
-                    .setValue(WATERLOGGED, fluidState.type === Fluids.WATER
-                ) as BlockState
-            } else {
-                blockState = (defaultBlockState()
-                    .setValue(FACE, AttachFace.WALL) as BlockState)
-                    .setValue(FACING, direction.opposite)
-                    .setValue(WATERLOGGED, fluidState.type === Fluids.WATER
-                ) as BlockState
-
-            }
-
-            if (blockState.canSurvive(context.getLevel(), context.getClickedPos())) {
-                return blockState
-            }
-        }
-        return null
-    }
-
-    override fun codec(): MapCodec<PlaqueBlock> = CODEC
-
-    override fun getShape(state: BlockState, blockGetter: BlockGetter, pos: BlockPos, collisionContext: CollisionContext): VoxelShape {
-        val direction = state.getValue(FACING)
-        return when (state.getValue(FACE)) {
-            AttachFace.FLOOR ->
-                if (direction.axis === Direction.Axis.X) {
-                    rotateShape(Direction.NORTH, Direction.WEST, FLOOR_NORTH)
-                } else FLOOR_NORTH
-            AttachFace.WALL ->
-                when (direction) {
-                    Direction.NORTH, Direction.UP, Direction.DOWN -> WALL_NORTH
-                    else -> rotateShape(Direction.NORTH, direction, WALL_NORTH)
-                }
-            AttachFace.CEILING ->
-                if (direction.axis === Direction.Axis.X) {
-                    rotateShape(Direction.NORTH, Direction.WEST, CEILING_NORTH)
-                } else CEILING_NORTH
-        }
-    }
-
-    override fun updateShape(state: BlockState, direction: Direction, neighborState: BlockState, world: LevelAccessor, pos: BlockPos, neighborPos: BlockPos): BlockState {
-        if (state.getValue(WATERLOGGED)) {
-            world.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world))
-        }
-        return if (getConnectedDirection(state).opposite == direction && !state.canSurvive(world, pos)) Blocks.AIR.defaultBlockState()
-        else super.updateShape(state, direction, neighborState, world, pos, neighborPos)
-    }
-
-    override fun canSurvive(state: BlockState, level: LevelReader, pos: BlockPos): Boolean {
-        return if (state.getValue(FACE) == AttachFace.CEILING) {
-            val direction = getConnectedDirection(state)
-            canSupportCenter(level, pos.relative(direction.opposite), direction)
-        } else {
-            super.canSurvive(state, level, pos)
-        }
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/SaccharineLeafBlock.kt

@@ -28,8 +28,6 @@ import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
-import net.minecraft.world.item.alchemy.PotionContents
-import net.minecraft.world.item.alchemy.Potions
 import net.minecraft.world.level.BlockGetter
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.LevelAccessor
@@ -69,16 +67,9 @@ class SaccharineLeafBlock(settings: Properties) : LeavesBlock(settings) {
 
                 if (blockState.block is SaccharineLeafBlock) {
                     val currentAge = blockState.getValue(AGE)
-
-                    val waterBottle = PotionContents.createItemStack(Items.POTION, Potions.WATER).item
-
-                    val newAge = when (item) {
-                        Items.HONEY_BOTTLE if currentAge < MAX_AGE ->
-                            (currentAge + 2).coerceAtMost(MAX_AGE)
-
-                        waterBottle if currentAge > MIN_AGE ->
-                            (currentAge - 2).coerceAtLeast(MIN_AGE)
-
+                    val newAge = when {
+                        item == Items.HONEY_BOTTLE && currentAge < MAX_AGE -> (currentAge + 2).coerceAtMost(MAX_AGE)
+                        item == Items.GLASS_BOTTLE && currentAge > MIN_AGE -> (currentAge - 2).coerceAtLeast(MIN_AGE)
                         else -> currentAge
                     }
 
@@ -88,23 +79,21 @@ class SaccharineLeafBlock(settings: Properties) : LeavesBlock(settings) {
                         stack.shrink(1)
 
                         val dispenserEntity = source.blockEntity
-                        val outputItem = Items.GLASS_BOTTLE
+                        val outputItem = if (item == Items.HONEY_BOTTLE) Items.GLASS_BOTTLE else Items.HONEY_BOTTLE
                         val outputStack = ItemStack(outputItem)
                         var added = false
 
-                        if (dispenserEntity != null) {
-                            for (i in 0 until dispenserEntity.containerSize) {
-                                val slotStack = dispenserEntity.getItem(i)
+                        for (i in 0 until dispenserEntity.containerSize) {
+                            val slotStack = dispenserEntity.getItem(i)
 
-                                if (slotStack.isEmpty) {
-                                    dispenserEntity.setItem(i, outputStack.copy())
-                                    added = true
-                                    break
-                                } else if (slotStack.`is`(outputItem) && slotStack.count < slotStack.maxStackSize) {
-                                    slotStack.grow(1)
-                                    added = true
-                                    break
-                                }
+                            if (slotStack.isEmpty) {
+                                dispenserEntity.setItem(i, outputStack.copy())
+                                added = true
+                                break
+                            } else if (slotStack.`is`(outputItem) && slotStack.count < slotStack.maxStackSize) {
+                                slotStack.grow(1)
+                                added = true
+                                break
                             }
                         }
 

common/src/main/kotlin/com/cobblemon/mod/common/block/SaccharineLogBlock.kt

@@ -25,7 +25,6 @@ import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
 import net.minecraft.world.level.Level
-import net.minecraft.world.level.block.DispenserBlock
 import net.minecraft.world.level.block.HorizontalDirectionalBlock
 import net.minecraft.world.level.block.RotatedPillarBlock
 import net.minecraft.world.level.block.state.BlockState
@@ -38,7 +37,7 @@ class SaccharineLogBlock(properties: Properties) : RotatedPillarBlock(properties
         fun createBehavior(): DispenseItemBehavior {
             return DispenseItemBehavior { source, stack ->
                 val level = source.level
-                val facing = source.state.getValue(DispenserBlock.FACING)
+                val facing = source.state.getValue(HorizontalDirectionalBlock.FACING)
                 val pos = source.pos.relative(facing)
                 val blockState = level.getBlockState(pos)
 
@@ -51,13 +50,7 @@ class SaccharineLogBlock(properties: Properties) : RotatedPillarBlock(properties
             }
         }
 
-        fun changeLogTypeDispenser(
-            level: ServerLevel,
-            pos: BlockPos,
-            newState: BlockState,
-            stack: ItemStack,
-            source: BlockSource
-        ) {
+        fun changeLogTypeDispenser(level: ServerLevel, pos: BlockPos, newState: BlockState, stack: ItemStack, source: BlockSource) {
             level.setBlock(pos, newState, 3)
             level.gameEvent(null, GameEvent.BLOCK_CHANGE, pos)
 
@@ -82,23 +75,11 @@ class SaccharineLogBlock(properties: Properties) : RotatedPillarBlock(properties
             }
 
             if (!added) {
-                Containers.dropItemStack(
-                    level,
-                    source.pos.x.toDouble(),
-                    source.pos.y.toDouble(),
-                    source.pos.z.toDouble(),
-                    glassBottle
-                )
+                Containers.dropItemStack(level, source.pos.x.toDouble(), source.pos.y.toDouble(), source.pos.z.toDouble(), glassBottle)
             }
         }
 
-        fun changeLogType(
-            level: Level,
-            pos: BlockPos,
-            newState: BlockState,
-            player: Player? = null,
-            itemStack: ItemStack? = null
-        ) {
+        fun changeLogType(level: Level, pos: BlockPos, newState: BlockState, player: Player? = null, itemStack: ItemStack? = null) {
             level.setBlock(pos, newState, 3)
             level.gameEvent(null, GameEvent.BLOCK_CHANGE, pos)
 
@@ -112,15 +93,7 @@ class SaccharineLogBlock(properties: Properties) : RotatedPillarBlock(properties
         }
     }
 
-    override fun useItemOn(
-        stack: ItemStack,
-        state: BlockState,
-        level: Level,
-        pos: BlockPos,
-        player: Player,
-        hand: InteractionHand,
-        hitResult: BlockHitResult
-    ): ItemInteractionResult {
+    override fun useItemOn(stack: ItemStack, state: BlockState, level: Level, pos: BlockPos, player: Player, hand: InteractionHand, hitResult: BlockHitResult): ItemInteractionResult {
         val axis = state.getValue(AXIS)
         val itemStack = player.getItemInHand(hand)
         if (!level.isClientSide && itemStack.`is`(Items.HONEY_BOTTLE) && axis == Direction.Axis.Y) {

common/src/main/kotlin/com/cobblemon/mod/common/block/StackableItemBlock.kt

@@ -1,204 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.block
-
-import com.cobblemon.mod.common.util.rotateShape
-import com.mojang.serialization.MapCodec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.core.BlockPos
-import net.minecraft.core.Direction
-import net.minecraft.util.StringRepresentable
-import net.minecraft.world.item.context.BlockPlaceContext
-import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.LevelAccessor
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.Blocks
-import net.minecraft.world.level.block.HorizontalDirectionalBlock
-import net.minecraft.world.level.block.SimpleWaterloggedBlock
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.block.state.StateDefinition
-import net.minecraft.world.level.block.state.properties.BlockStateProperties.HORIZONTAL_FACING
-import net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED
-import net.minecraft.world.level.block.state.properties.IntegerProperty
-import net.minecraft.world.level.material.FluidState
-import net.minecraft.world.level.material.Fluids
-import net.minecraft.world.phys.shapes.CollisionContext
-import net.minecraft.world.phys.shapes.Shapes
-import net.minecraft.world.phys.shapes.VoxelShape
-import kotlin.math.min
-
-class StackableItemBlock(settings: Properties, val type: StackableItemBlockType): HorizontalDirectionalBlock(settings), SimpleWaterloggedBlock {
-    enum class StackableItemBlockType: StringRepresentable {
-        BATTLE_ITEM,
-        ETHER,
-        MAX_POTION,
-        POTION,
-        STATUS_RESTORE;
-
-        override fun getSerializedName(): String = this.name.lowercase()
-
-        companion object {
-            val CODEC = StringRepresentable.fromEnum(::values)
-        }
-    }
-
-    companion object {
-        val MAX_AMOUNT: Int = 4
-        val AMOUNT: IntegerProperty = IntegerProperty.create("amount", 1, MAX_AMOUNT)
-
-        val CODEC: MapCodec<StackableItemBlock> = RecordCodecBuilder.mapCodec { it.group(
-            propertiesCodec(),
-            StackableItemBlockType.CODEC.fieldOf("type").forGetter(StackableItemBlock::type)
-        ).apply(it, ::StackableItemBlock) }
-
-        val northShapeMap: Map<StackableItemBlockType, List<VoxelShape>> = mapOf(
-            StackableItemBlockType.BATTLE_ITEM to listOf(
-                Shapes.box(0.34375, 0.0, 0.34375, 0.65625, 0.4375, 0.65625),
-                Shapes.or(
-                    Shapes.box(0.09375, 0.0, 0.34375, 0.40625, 0.4375, 0.65625),
-                    Shapes.box(0.59375, 0.0, 0.40625, 0.90625, 0.4375, 0.71875)
-                ),
-                Shapes.or(
-                    Shapes.box(0.59375, 0.0, 0.59375, 0.90625, 0.4375, 0.90625),
-                    Shapes.box(0.09375, 0.0, 0.53125, 0.40625, 0.4375, 0.84375),
-                    Shapes.box(0.34375, 0.0, 0.09375, 0.65625, 0.4375, 0.40625)
-                ),
-                Shapes.or(
-                    Shapes.box(0.09375, 0.0, 0.09375, 0.40625, 0.4375, 0.40625),
-                    Shapes.box(0.59375, 0.0, 0.15625, 0.90625, 0.4375, 0.46875),
-                    Shapes.box(0.65625, 0.0, 0.59375, 0.96875, 0.4375, 0.90625),
-                    Shapes.box(0.15625, 0.0, 0.53125, 0.46875, 0.4375, 0.84375)
-                )
-            ),
-            StackableItemBlockType.ETHER to listOf(
-                Shapes.box(0.375, 0.0, 0.3125, 0.625, 0.5, 0.6875),
-                Shapes.or(
-                    Shapes.box(0.625, 0.0, 0.375, 0.875, 0.5, 0.75),
-                    Shapes.box(0.125, 0.0, 0.3125, 0.375, 0.5, 0.6875)
-                ),
-                Shapes.or(
-                    Shapes.box(0.375, 0.0, 0.125, 0.625, 0.5, 0.5),
-                    Shapes.box(0.125, 0.0, 0.5625, 0.375, 0.5, 0.9375),
-                    Shapes.box(0.625, 0.0, 0.625, 0.875, 0.5, 1.0)
-                ),
-                Shapes.or(
-                    Shapes.box(0.125, 0.0, 0.0625, 0.375, 0.5, 0.4375),
-                    Shapes.box(0.625, 0.0, 0.125, 0.875, 0.5, 0.5),
-                    Shapes.box(0.6875, 0.0, 0.625, 0.9375, 0.5, 1.0),
-                    Shapes.box(0.1875, 0.0, 0.5625, 0.4375, 0.5, 0.9375)
-                )
-            ),
-            StackableItemBlockType.MAX_POTION to listOf(
-                Shapes.box(0.34375, 0.0, 0.3125, 0.65625, 0.5, 0.6875),
-                Shapes.or(
-                    Shapes.box(0.09375, 0.0, 0.3125, 0.40625, 0.5, 0.6875),
-                    Shapes.box(0.59375, 0.0, 0.375, 0.90625, 0.5, 0.75)
-                ),
-                Shapes.or(
-                    Shapes.box(0.34375, 0.0, 0.0625, 0.65625, 0.5, 0.4375),
-                    Shapes.box(0.09375, 0.0, 0.5625, 0.40625, 0.5, 0.9375),
-                    Shapes.box(0.59375, 0.0, 0.625, 0.90625, 0.5, 1.0)
-                ),
-                Shapes.or(
-                    Shapes.box(0.09375, 0.0, 0.0625, 0.40625, 0.5, 0.4375),
-                    Shapes.box(0.15625, 0.0, 0.5625, 0.46875, 0.5, 0.9375),
-                    Shapes.box(0.65625, 0.0, 0.625, 0.96875, 0.5, 1.0),
-                    Shapes.box(0.59375, 0.0, 0.125, 0.90625, 0.5, 0.5)
-                ).singleEncompassing()
-            ),
-            StackableItemBlockType.POTION to listOf(
-                Shapes.box(0.375, 0.0, 0.3125, 0.625, 0.5625, 0.75),
-                Shapes.or(
-                    Shapes.box(0.125, 0.0, 0.3125, 0.375, 0.5625, 0.75),
-                    Shapes.box(0.625, 0.0, 0.375, 0.875, 0.5625, 0.8125)
-                ),
-                Shapes.or(
-                    Shapes.box(0.375, 0.0, 0.0625, 0.625, 0.5625, 0.5),
-                    Shapes.box(0.625, 0.0, 0.5625, 0.875, 0.5625, 1.0),
-                    Shapes.box(0.125, 0.0, 0.5, 0.375, 0.5625, 0.9375)
-                ),
-                Shapes.or(
-                    Shapes.box(0.125, 0.0, 0.0, 0.375, 0.5625, 0.4375),
-                    Shapes.box(0.625, 0.0, 0.0625, 0.875, 0.5625, 0.5),
-                    Shapes.box(0.6875, 0.0, 0.5625, 0.9375, 0.5625, 1.0),
-                    Shapes.box(0.1875, 0.0, 0.5, 0.4375, 0.5625, 0.9375)
-                )
-            ),
-            StackableItemBlockType.STATUS_RESTORE to listOf(
-                Shapes.box(0.375, 0.0, 0.3125, 0.625, 0.4375, 0.6875),
-                Shapes.or(
-                    Shapes.box(0.125, 0.0, 0.3125, 0.375, 0.4375, 0.75),
-                    Shapes.box(0.625, 0.0, 0.375, 0.875, 0.4375, 0.75)
-                ),
-                Shapes.or(
-                    Shapes.box(0.125, 0.0, 0.5, 0.375, 0.4375, 0.875),
-                    Shapes.box(0.625, 0.0, 0.5625, 0.875, 0.4375, 0.9375),
-                    Shapes.box(0.375, 0.0, 0.0625, 0.625, 0.4375, 0.4375)
-                ),
-                Shapes.or(
-                    Shapes.box(0.1875, 0.0, 0.5, 0.4375, 0.4375, 0.875),
-                    Shapes.box(0.125, 0.0, 0.0, 0.375, 0.4375, 0.375),
-                    Shapes.box(0.625, 0.0, 0.0625, 0.875, 0.4375, 0.4375),
-                    Shapes.box(0.6875, 0.0, 0.5625, 0.9375, 0.4375, 0.9375)
-                )
-            )
-        )
-
-        fun getShape(type: StackableItemBlockType, count: Int): VoxelShape = northShapeMap[type]?.let { list -> list[(count - 1).coerceIn(0, list.lastIndex)] } ?: Shapes.block()
-        fun getMaxAmount(type: StackableItemBlockType): Int = min(northShapeMap[type]?.size ?: 1 , MAX_AMOUNT)
-    }
-
-    init {
-        registerDefaultState(stateDefinition.any()
-            .setValue(HORIZONTAL_FACING, Direction.NORTH)
-            .setValue(AMOUNT, 1)
-            .setValue(WATERLOGGED, false))
-    }
-
-    override fun codec(): MapCodec<StackableItemBlock> = CODEC
-
-    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
-        builder.add(HORIZONTAL_FACING, AMOUNT, WATERLOGGED)
-    }
-
-    override fun getFluidState(blockState: BlockState): FluidState? = if (blockState.getValue(WATERLOGGED)) Fluids.WATER.getSource(false) else super.getFluidState(blockState)
-
-    override fun updateShape(state: BlockState, direction: Direction, neighborState: BlockState, world: LevelAccessor, pos: BlockPos, neighborPos: BlockPos): BlockState {
-        if (state.getValue(WATERLOGGED)) {
-            world.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world))
-        }
-        return if (state.getValue(HORIZONTAL_FACING).opposite == direction && !state.canSurvive(world, pos)) Blocks.AIR.defaultBlockState()
-        else super.updateShape(state, direction, neighborState, world, pos, neighborPos)
-    }
-
-    override fun getCollisionShape(state: BlockState, level: BlockGetter, pos: BlockPos, context: CollisionContext): VoxelShape {
-        val direction = state.getValue(HORIZONTAL_FACING)
-        val count = state.getValue(AMOUNT)
-        return rotateShape(Direction.NORTH, direction, getShape(type, count))
-    }
-
-    override fun getShape(state: BlockState, level: BlockGetter, pos: BlockPos, context: CollisionContext): VoxelShape {
-        return getCollisionShape(state, level, pos, context).singleEncompassing()
-    }
-
-    override fun getStateForPlacement(context: BlockPlaceContext): BlockState? {
-        val blockState = context.level.getBlockState(context.clickedPos)
-        val fluidState = context.level.getFluidState(context.clickedPos)
-        return if (blockState.`is`(this)) blockState.setValue(AMOUNT, min(getMaxAmount(type), (blockState.getValue(AMOUNT) + 1)))
-            else super.getStateForPlacement(context)?.setValue(HORIZONTAL_FACING, context.horizontalDirection.opposite)?.setValue(WATERLOGGED, fluidState.type === Fluids.WATER)
-    }
-
-    override fun canBeReplaced(state: BlockState, useContext: BlockPlaceContext): Boolean {
-        return if (
-            !useContext.isSecondaryUseActive
-            && useContext.itemInHand.`is`(this.asItem())
-            && state.getValue(AMOUNT) <= getMaxAmount(type)
-        ) true else super.canBeReplaced(state, useContext)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/WallAttachedDirectionalBlock.kt

@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.block
-
-import com.mojang.serialization.MapCodec
-import net.minecraft.core.BlockPos
-import net.minecraft.core.Direction
-import net.minecraft.world.item.context.BlockPlaceContext
-import net.minecraft.world.level.LevelAccessor
-import net.minecraft.world.level.LevelReader
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.Blocks
-import net.minecraft.world.level.block.HorizontalDirectionalBlock
-import net.minecraft.world.level.block.SimpleWaterloggedBlock
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.block.state.StateDefinition
-import net.minecraft.world.level.block.state.properties.BlockStateProperties.HORIZONTAL_FACING
-import net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED
-import net.minecraft.world.level.material.FluidState
-import net.minecraft.world.level.material.Fluids
-
-open class WallAttachedDirectionalBlock(settings: Properties): HorizontalDirectionalBlock(settings), SimpleWaterloggedBlock {
-    companion object {
-        val CODEC = simpleCodec(::WallAttachedDirectionalBlock)
-    }
-
-    init {
-        registerDefaultState(stateDefinition.any()
-            .setValue(HORIZONTAL_FACING, Direction.NORTH)
-            .setValue(WATERLOGGED, false))
-    }
-
-    override fun codec(): MapCodec<out WallAttachedDirectionalBlock> = CODEC
-
-    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
-        builder.add(HORIZONTAL_FACING, WATERLOGGED)
-    }
-
-    override fun getStateForPlacement(context: BlockPlaceContext): BlockState? {
-        var direction = context.clickedFace
-        if (direction === null || direction.axis === Direction.Axis.Y) {
-            direction = context.horizontalDirection.opposite
-        }
-
-        val fluidState = context.level.getFluidState(context.clickedPos)
-        val blockState = this.defaultBlockState()
-            .setValue(HORIZONTAL_FACING, direction)
-            .setValue(WATERLOGGED, fluidState.type === Fluids.WATER
-        ) as BlockState
-
-        if (blockState.canSurvive(context.getLevel(), context.getClickedPos())) {
-            return blockState
-        }
-        return null
-    }
-
-    override fun getFluidState(blockState: BlockState): FluidState? = if (blockState.getValue(WATERLOGGED)) Fluids.WATER.getSource(false) else super.getFluidState(blockState)
-
-    override fun updateShape(state: BlockState, direction: Direction, neighborState: BlockState, world: LevelAccessor, pos: BlockPos, neighborPos: BlockPos): BlockState {
-        if (state.getValue(WATERLOGGED)) {
-            world.scheduleTick(pos, Fluids.WATER, Fluids.WATER.getTickDelay(world))
-        }
-        return if (state.getValue(HORIZONTAL_FACING).opposite == direction && !state.canSurvive(world, pos)) Blocks.AIR.defaultBlockState()
-        else super.updateShape(state, direction, neighborState, world, pos, neighborPos)
-    }
-
-    override fun canSurvive(state: BlockState, level: LevelReader, pos: BlockPos): Boolean {
-        return canAttach(level, pos, state.getValue(HORIZONTAL_FACING))
-    }
-
-    fun canAttach(reader: LevelReader, pos: BlockPos, direction: Direction): Boolean {
-        val blockPos = pos.relative(direction.opposite)
-        return reader.getBlockState(blockPos).isFaceSturdy(reader, blockPos, direction)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/WallAttachedDirectionalShapeBlock.kt

@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.block
-
-import com.cobblemon.mod.common.util.rotateShape
-import com.mojang.serialization.Codec
-import com.mojang.serialization.MapCodec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.core.BlockPos
-import net.minecraft.core.Direction
-import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.phys.shapes.CollisionContext
-import net.minecraft.world.phys.shapes.Shapes
-import net.minecraft.world.phys.shapes.VoxelShape
-
-class WallAttachedDirectionalShapeBlock(settings: Properties, val width: Int = 16, val height: Int = 16, val depth: Int = 16): WallAttachedDirectionalBlock(settings) {
-    companion object {
-        /**
-         * Calculates a [VoxelShape] based on a center point of (8, 8, 16).
-         *
-         * The resulting shape is centered X horizontally and Y vertically
-         * expanding inwards/North along the Z-axis from the South face (16).
-         *
-         * @param width The width of the shape from 0-16, along the X-axis.
-         * @param height The height of the shape from 0-16 along the Y-axis.
-         * @param depth The depth of the shape from 0-16 along the Z-axis, extending inwards from 16.
-         * @return A VoxelShape.
-         */
-        fun convertToShape(sizeX: Int, sizeY: Int, sizeZ: Int): VoxelShape {
-            val x = sizeX.coerceIn(0, 16).toDouble()
-            val y = sizeY.coerceIn(0, 16).toDouble()
-            val z = sizeZ.coerceIn(0, 16).toDouble()
-
-            val minX = (8.0 - (x / 2.0)) / 16.0
-            val maxX = (8.0 + (x / 2.0)) / 16.0
-
-            val minY = (8.0 - (y / 2.0)) / 16.0
-            val maxY = (8.0 + (y / 2.0)) / 16.0
-
-            val minZ = (16.0 - z) / 16.0
-
-            return Shapes.box(minX, minY, minZ, maxX, maxY, 1.0)
-        }
-    }
-
-    override fun codec(): MapCodec<WallAttachedDirectionalShapeBlock> = RecordCodecBuilder.mapCodec { instance ->
-        instance.group(
-            propertiesCodec(),
-            Codec.INT.fieldOf("width").forGetter { it.width },
-            Codec.INT.fieldOf("height").forGetter { it.height },
-            Codec.INT.fieldOf("depth").forGetter { it.depth }
-        ).apply(instance, { properties, width, height, depth ->
-            WallAttachedDirectionalShapeBlock(properties, width, height, depth)
-        })
-    }
-
-    override fun getShape(state: BlockState, level: BlockGetter, pos: BlockPos, context: CollisionContext): VoxelShape {
-        val direction = state.getValue(FACING)
-        return rotateShape(Direction.NORTH, direction, convertToShape(width, height, depth))
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/WallAttachedStackableItemBlock.kt

@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.block
-
-import com.cobblemon.mod.common.util.rotateShape
-import com.mojang.serialization.MapCodec
-import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.minecraft.core.BlockPos
-import net.minecraft.core.Direction
-import net.minecraft.util.StringRepresentable
-import net.minecraft.world.item.context.BlockPlaceContext
-import net.minecraft.world.level.BlockGetter
-import net.minecraft.world.level.block.Block
-import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.level.block.state.StateDefinition
-import net.minecraft.world.level.block.state.properties.BlockStateProperties.HORIZONTAL_FACING
-import net.minecraft.world.level.block.state.properties.BlockStateProperties.WATERLOGGED
-import net.minecraft.world.level.block.state.properties.IntegerProperty
-import net.minecraft.world.phys.shapes.CollisionContext
-import net.minecraft.world.phys.shapes.Shapes
-import net.minecraft.world.phys.shapes.VoxelShape
-import kotlin.math.min
-
-class WallAttachedStackableItemBlock(settings: Properties, val type: WallStackableItemBlockType): WallAttachedDirectionalBlock(settings) {
-    enum class WallStackableItemBlockType: StringRepresentable {
-        TAG;
-
-        override fun getSerializedName(): String = this.name.lowercase()
-
-        companion object {
-            val CODEC = StringRepresentable.fromEnum(::values)
-        }
-    }
-
-    companion object {
-        val MAX_AMOUNT: Int = 8
-        val AMOUNT: IntegerProperty = IntegerProperty.create("amount", 1, MAX_AMOUNT)
-
-        val CODEC: MapCodec<WallAttachedStackableItemBlock> = RecordCodecBuilder.mapCodec { it.group(
-            propertiesCodec(),
-            WallStackableItemBlockType.CODEC.fieldOf("type").forGetter(WallAttachedStackableItemBlock::type)
-        ).apply(it, ::WallAttachedStackableItemBlock) }
-
-        val northShapeMap: Map<WallStackableItemBlockType, List<VoxelShape>> = mapOf(
-            WallStackableItemBlockType.TAG to listOf(
-                Shapes.box(0.375, 0.25, 0.9375, 0.625, 0.6875, 1.0),
-                Shapes.box(0.375, 0.0625, 0.9375, 1.0, 0.6875, 1.0),
-                Shapes.box(0.0, 0.0625, 0.9375, 1.0, 0.9375, 1.0),
-                Shapes.box(0.0, 0.0625, 0.9375, 1.0, 1.0, 1.0),
-                Shapes.box(0.0, 0.0, 0.9375, 1.0, 1.0, 1.0),
-                Shapes.box(0.0, 0.0, 0.9375, 1.0, 1.0, 1.0),
-                Shapes.box(0.0, 0.0, 0.9375, 1.0, 1.0, 1.0),
-                Shapes.box(0.0, 0.0, 0.9375, 1.0, 1.0, 1.0)
-            )
-        )
-
-        fun getShape(type: WallStackableItemBlockType, count: Int): VoxelShape = northShapeMap[type]?.let { list -> list[(count - 1).coerceIn(0, list.lastIndex)] } ?: Shapes.block()
-        fun getMaxAmount(type: WallStackableItemBlockType): Int = min(northShapeMap[type]?.size ?: 1 , MAX_AMOUNT)
-    }
-
-    init {
-        registerDefaultState(stateDefinition.any()
-            .setValue(HORIZONTAL_FACING, Direction.NORTH)
-            .setValue(AMOUNT, 1)
-            .setValue(WATERLOGGED, false))
-    }
-
-    override fun codec(): MapCodec<WallAttachedStackableItemBlock> = CODEC
-
-    override fun createBlockStateDefinition(builder: StateDefinition.Builder<Block, BlockState>) {
-        super.createBlockStateDefinition(builder)
-        builder.add(AMOUNT)
-    }
-
-    override fun getShape(state: BlockState, level: BlockGetter, pos: BlockPos, context: CollisionContext): VoxelShape {
-        val direction = state.getValue(HORIZONTAL_FACING)
-        val count = state.getValue(AMOUNT)
-        return rotateShape(Direction.NORTH, direction, getShape(type, count))
-    }
-
-    override fun getStateForPlacement(context: BlockPlaceContext): BlockState? {
-        val blockState = context.level.getBlockState(context.clickedPos)
-        return if (blockState.`is`(this)) blockState.setValue(AMOUNT, min(getMaxAmount(type), (blockState.getValue(AMOUNT) + 1)))
-            else super.getStateForPlacement(context)
-    }
-
-    override fun canBeReplaced(state: BlockState, useContext: BlockPlaceContext): Boolean {
-        return if (
-            !useContext.isSecondaryUseActive
-            && useContext.itemInHand.`is`(this.asItem())
-            && state.getValue(AMOUNT) <= getMaxAmount(type)
-        ) true else super.canBeReplaced(state, useContext)
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/dispenser/ChainedDispenseItemBehavior.kt

@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.block.dispenser
-
-import net.minecraft.core.dispenser.BlockSource
-import net.minecraft.core.dispenser.DispenseItemBehavior
-import net.minecraft.world.item.ItemStack
-import java.util.concurrent.CopyOnWriteArrayList
-
-class ChainedDispenseItemBehavior(private val base: DispenseItemBehavior) : DispenseItemBehavior {
-    private val extras = CopyOnWriteArrayList<DispenseItemBehavior>()
-
-    fun add(behavior: DispenseItemBehavior) {
-        extras.add(behavior)
-    }
-
-    override fun dispense(blockSource: BlockSource, itemStack: ItemStack): ItemStack {
-
-        var current = itemStack
-        for (b in extras) {
-            val prev = current.copy()
-            val next = try {
-                b.dispense(blockSource, current)
-            } catch (t: Throwable) {
-                continue
-            }
-            current = next
-            if (handled(prev, current)) {
-                return current
-            }
-        }
-
-        val beforeBase = current.copy()
-        val afterBase = try {
-            base.dispense(blockSource, current)
-        } catch (_: Throwable) {
-            return current
-        }
-
-        if (handled(beforeBase, afterBase)) {
-            return afterBase
-        }
-
-        return afterBase
-    }
-
-    private fun handled(before: ItemStack, after: ItemStack): Boolean {
-        return !ItemStack.matches(before, after)
-    }
-
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/dispenser/DispenserBehaviorRegistry.kt

@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.block.dispenser
-
-import com.cobblemon.mod.common.block.SaccharineLeafBlock
-import com.cobblemon.mod.common.block.SaccharineLogBlock
-import com.cobblemon.mod.common.block.SaccharineLogSlatheredBlock
-import com.cobblemon.mod.common.mixin.accessor.DispenserBlockAccessor
-import net.minecraft.core.dispenser.DispenseItemBehavior
-import net.minecraft.world.item.Item
-import net.minecraft.world.item.Items
-import net.minecraft.world.item.alchemy.PotionContents
-import net.minecraft.world.item.alchemy.Potions
-import net.minecraft.world.level.block.DispenserBlock
-
-object DispenserBehaviorRegistry {
-    private val behaviors = mutableMapOf<Item, DispenseItemBehavior>()
-
-    fun register(items: List<Item>, behaviorProvider: (Item) -> DispenseItemBehavior) {
-        register(behaviorProvider, items = items)
-    }
-
-    fun register(vararg behaviorProviders: (Item) -> DispenseItemBehavior, items: List<Item>) {
-        for (item in items) {
-            val providedBehaviors = behaviorProviders.map { provider -> provider(item) }
-
-            val existingLocal = behaviors[item]
-            if (existingLocal is ChainedDispenseItemBehavior) {
-                providedBehaviors.forEach { existingLocal.add(it) }
-                continue
-            }
-
-            val currentRegistered = getCurrentRegisteredBehavior(item)
-            if (currentRegistered is ChainedDispenseItemBehavior) {
-                behaviors[item] = currentRegistered
-                providedBehaviors.forEach { currentRegistered.add(it) }
-                continue
-            }
-
-            val base = currentRegistered ?: DispenseItemBehavior.NOOP
-            val chained = ChainedDispenseItemBehavior(base)
-            providedBehaviors.forEach { chained.add(it) }
-
-            behaviors[item] = chained
-            DispenserBlock.registerBehavior(item, chained)
-        }
-    }
-
-    private fun getCurrentRegisteredBehavior(item: Item): DispenseItemBehavior? {
-        return try {
-            val map = DispenserBlockAccessor.getItemBehaviors()
-            map[item]
-        } catch (t: Throwable) {
-            DispenseItemBehavior.LOGGER.error("Failed to read existing dispenser behaviors via mixin accessor", t)
-            null
-        }
-    }
-
-    fun registerDispenserBehaviors() {
-        register(
-            { SaccharineLogSlatheredBlock.createBehavior() },
-            items = listOf(
-                PotionContents.createItemStack(
-                    Items.POTION,
-                    Potions.WATER
-                ).item
-            )
-        )
-        register(
-            { SaccharineLogBlock.createBehavior() },
-            items = listOf(Items.HONEY_BOTTLE)
-        )
-        register(
-            { item -> SaccharineLeafBlock.createBehavior(item) },
-            items = listOf(
-                Items.HONEY_BOTTLE,
-                PotionContents.createItemStack(
-                    Items.POTION,
-                    Potions.WATER
-                ).item
-            )
-        )
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/block/entity/PokemonPastureBlockEntity.kt

@@ -17,6 +17,7 @@ import com.cobblemon.mod.common.api.pasture.PastureLinkManager
 import com.cobblemon.mod.common.api.scheduling.afterOnServer
 import com.cobblemon.mod.common.api.text.italicise
 import com.cobblemon.mod.common.api.text.red
+import com.cobblemon.mod.common.api.text.textClickHandlers
 import com.cobblemon.mod.common.block.PastureBlock
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
@@ -109,10 +110,10 @@ class PokemonPastureBlockEntity(pos: BlockPos, state: BlockState) :
             for (tetheredPokemon in tetheredPokemonList) {
                 val pokemon = tetheredPokemon.getPokemon()!!
                 if (pokemon.currentFullness > 0) {
-                    pokemon.tickMetabolism(1)
+                    pokemon.tickMetabolism()
                 }
                 if (pokemon.interactionCooldowns.any()) {
-                    pokemon.tickInteractionCooldown(1)
+                    pokemon.tickInteractionCooldown()
                 }
             }
             blockEntity.togglePastureOn(blockEntity.getInRangeViewerCount(world, blockEntity.blockPos) > 0)

common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt

@@ -319,48 +319,7 @@ object CobblemonClient {
             CobblemonBlocks.PINK_CAMPFIRE_POT,
             CobblemonBlocks.RED_CAMPFIRE_POT,
             CobblemonBlocks.WHITE_CAMPFIRE_POT,
-            CobblemonBlocks.YELLOW_CAMPFIRE_POT,
-            CobblemonBlocks.WHITE_PLAQUE,
-            CobblemonBlocks.LIGHT_GRAY_PLAQUE,
-            CobblemonBlocks.GRAY_PLAQUE,
-            CobblemonBlocks.BLACK_PLAQUE,
-            CobblemonBlocks.BROWN_PLAQUE,
-            CobblemonBlocks.RED_PLAQUE,
-            CobblemonBlocks.ORANGE_PLAQUE,
-            CobblemonBlocks.YELLOW_PLAQUE,
-            CobblemonBlocks.LIME_PLAQUE,
-            CobblemonBlocks.GREEN_PLAQUE,
-            CobblemonBlocks.CYAN_PLAQUE,
-            CobblemonBlocks.LIGHT_BLUE_PLAQUE,
-            CobblemonBlocks.BLUE_PLAQUE,
-            CobblemonBlocks.PURPLE_PLAQUE,
-            CobblemonBlocks.MAGENTA_PLAQUE,
-            CobblemonBlocks.PINK_PLAQUE,
-            CobblemonBlocks.BLUNDER_POLICY,
-            CobblemonBlocks.WEAKNESS_POLICY,
-            CobblemonBlocks.POTION,
-            CobblemonBlocks.SUPER_POTION,
-            CobblemonBlocks.HYPER_POTION,
-            CobblemonBlocks.MAX_POTION,
-            CobblemonBlocks.FULL_RESTORE,
-            CobblemonBlocks.ANTIDOTE,
-            CobblemonBlocks.AWAKENING,
-            CobblemonBlocks.BURN_HEAL,
-            CobblemonBlocks.ICE_HEAL,
-            CobblemonBlocks.PARALYZE_HEAL,
-            CobblemonBlocks.FULL_HEAL,
-            CobblemonBlocks.ETHER,
-            CobblemonBlocks.MAX_ETHER,
-            CobblemonBlocks.ELIXIR,
-            CobblemonBlocks.MAX_ELIXIR,
-            CobblemonBlocks.DIRE_HIT,
-            CobblemonBlocks.GUARD_SPEC,
-            CobblemonBlocks.X_ACCURACY,
-            CobblemonBlocks.X_ATTACK,
-            CobblemonBlocks.X_DEFENSE,
-            CobblemonBlocks.X_SP_ATK,
-            CobblemonBlocks.X_SP_DEF,
-            CobblemonBlocks.X_SPEED
+            CobblemonBlocks.YELLOW_CAMPFIRE_POT
         )
 
         this.createBoatModelLayers()

common/src/main/kotlin/com/cobblemon/mod/common/client/battle/ClientBattle.kt

@@ -11,11 +11,10 @@ package com.cobblemon.mod.common.client.battle
 import com.cobblemon.mod.common.CobblemonNetwork
 import com.cobblemon.mod.common.api.battles.model.actor.ActorType
 import com.cobblemon.mod.common.api.pokedex.PokedexEntryProgress
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.battles.BattleFormat
 import com.cobblemon.mod.common.battles.ForcePassActionResponse
-import com.cobblemon.mod.common.battles.MoveActionResponse
 import com.cobblemon.mod.common.battles.PassActionResponse
-import com.cobblemon.mod.common.battles.ShowdownMoveset
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.net.messages.server.battle.BattleSelectActionsPacket
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
@@ -62,15 +61,8 @@ class ClientBattle(
         if (index != -1) {
            while(index < pendingActionRequests.size) {
                val request = pendingActionRequests[index]
-               if (request.response != PassActionResponse && request.response !is ForcePassActionResponse) {
-                   val response = request.response
-                   // If we're cancelling a turn that used a gimmick, we re-enable the ability for that gimmick to be used.
-                   if (response is MoveActionResponse && response.gimmickID != null) {
-                       val gimmick = ShowdownMoveset.Gimmick.entries.find { it.id == response.gimmickID }
-                       pendingActionRequests.forEach { it.moveSet?.pendingGimmickUsedThisTurn?.remove(gimmick) }
-                   }
+               if (request.response != PassActionResponse && request.response !is ForcePassActionResponse)
                    request.response = null
-               }
                index++
            }
         }

common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt

@@ -507,7 +507,9 @@ class PokemonClientDelegate : PosableState(), PokemonSideDelegate {
 
     override fun positionRider(passenger: Entity, positionUpdater: MoveFunction) {
         val locatorName = getSeatLocator(passenger)
-        val locator = this.locatorStates[locatorName] ?: return
+        val locator = this.locatorStates[locatorName]
+
+        if (locator == null) return
 
         val offset = locator.matrix.getTranslation(Vector3f())
             .sub(

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/PartyOverlay.kt

@@ -29,7 +29,6 @@ import com.cobblemon.mod.common.client.render.renderScaledGuiItemIcon
 import com.cobblemon.mod.common.pokemon.Gender
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
-import com.cobblemon.mod.common.util.toAssetPath
 import java.util.UUID
 import net.minecraft.client.DeltaTracker
 import net.minecraft.client.Minecraft
@@ -39,7 +38,6 @@ import net.minecraft.client.gui.components.toasts.AdvancementToast
 import net.minecraft.client.gui.components.toasts.Toast
 import net.minecraft.client.gui.screens.ChatScreen
 import net.minecraft.client.gui.screens.Screen
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.Mth
 import kotlin.math.ceil
 import kotlin.math.floor
@@ -469,7 +467,7 @@ class PartyOverlay : Gui(Minecraft.getInstance()) {
                     )
                 }
 
-                val ballIcon = pokemon.caughtBall.name.toAssetPath("textures/gui/ball/", ".png")
+                val ballIcon = cobblemonResource("textures/gui/ball/" + pokemon.caughtBall.name.path + ".png")
                 val ballHeight = 22
                 blitk(
                     matrixStack = matrices,

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleMoveSelection.kt

@@ -68,7 +68,7 @@ class BattleMoveSelection(
     var moveTiles = baseTiles
 
     val backButton = BattleBackButton(x - 11F, Minecraft.getInstance().window.guiScaledHeight - 22F)
-    val gimmickButtons = moveSet.getGimmicks().filter { it !in moveSet.pendingGimmickUsedThisTurn }.mapIndexed { index, gimmick ->
+    val gimmickButtons = moveSet.getGimmicks().mapIndexed { index, gimmick ->
         val initOff = BattleBackButton.WIDTH * 0.65F
         val xOff = initOff + BattleGimmickButton.SPACING * index
         BattleGimmickButton.create(gimmick, this, backButton.x + xOff, backButton.y)

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleSwitchPokemonSelection.kt

@@ -31,14 +31,12 @@ import com.cobblemon.mod.common.util.battleLang
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
 import com.cobblemon.mod.common.util.math.fromEulerXYZDegrees
-import com.cobblemon.mod.common.util.toAssetPath
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.narration.NarratableEntry
 import net.minecraft.client.gui.narration.NarrationElementOutput
 import net.minecraft.client.resources.sounds.SimpleSoundInstance
 import net.minecraft.client.sounds.SoundManager
-import net.minecraft.resources.ResourceLocation
 import org.joml.Quaternionf
 import org.joml.Vector3f
 
@@ -233,7 +231,7 @@ class BattleSwitchPokemonSelection(
                     textureHeight = SELECT_HEIGHT * 2,
                 )
 
-                val ballIcon = pokemon.caughtBall.name.toAssetPath("textures/gui/ball/", ".png")
+                val ballIcon = cobblemonResource("textures/gui/ball/" + pokemon.caughtBall.name.path + ".png")
                 val ballHeight = 22
                 blitk(
                     matrixStack = matrixStack,

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleTargetSelection.kt

@@ -17,7 +17,6 @@ import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.battles.InBattleGimmickMove
 import com.cobblemon.mod.common.battles.InBattleMove
 import com.cobblemon.mod.common.battles.MoveActionResponse
-import com.cobblemon.mod.common.battles.ShowdownMoveset
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.battle.ActiveClientBattlePokemon
@@ -128,7 +127,7 @@ class BattleTargetSelection(
         private val isMultiTarget = multiTargetList?.firstOrNull { it.getPNX() == target.getPNX() } != null
         private val isCurrentPokemon = request.activePokemon.battlePokemon?.uuid == target.battlePokemon!!.uuid
 
-        open val response: MoveActionResponse get() = MoveActionResponse(targetSelection.move.id, responseTarget, gimmickID)
+        open val response: MoveActionResponse get() = MoveActionResponse(targetSelection.move.id, responseTarget)
         val state = FloatingState()
 
         open val selectable: Boolean get() = isMultiTarget || (responseTarget != null)
@@ -312,13 +311,6 @@ class BattleTargetSelection(
         fun onClick() {
             if (!selectable) return
             targetSelection.playDownSound(Minecraft.getInstance().soundManager)
-            // If a gimmick is used, remove the ability to use it on any pending action requests ahead of it
-            if (response.gimmickID != null) {
-                val gimmick = ShowdownMoveset.Gimmick.entries.first { it.id == response.gimmickID }
-                CobblemonClient.battle?.pendingActionRequests?.forEach {
-                    it.moveSet?.pendingGimmickUsedThisTurn?.add(gimmick)
-                }
-            }
             targetSelection.battleGUI.selectAction(targetSelection.request, response)
         }
     }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/partyselect/PartySlotButton.kt

@@ -24,13 +24,11 @@ import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
 import com.cobblemon.mod.common.util.math.fromEulerXYZDegrees
-import com.cobblemon.mod.common.util.toAssetPath
 import com.google.common.collect.Lists
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Button
 import net.minecraft.client.sounds.SoundManager
 import net.minecraft.network.chat.Component
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.util.FormattedCharSequence
 import net.minecraft.world.item.ItemStack
 import org.joml.Quaternionf
@@ -113,7 +111,7 @@ class PartySlotButton(
         )
         context.pose().popPose()
 
-        val ballIcon = pokemon.pokeball!!.asIdentifierDefaultingNamespace().toAssetPath("textures/gui/ball/", ".png")
+        val ballIcon = cobblemonResource("textures/gui/ball/" + pokemon.pokeball!!.asIdentifierDefaultingNamespace().path + ".png")
         val ballHeight = 22
         blitk(
             matrixStack = matrices,

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pc/PCGUI.kt

@@ -40,7 +40,6 @@ import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.isInventoryKeyPressed
 import com.cobblemon.mod.common.util.lang
-import com.cobblemon.mod.common.util.toAssetPath
 import com.mojang.blaze3d.platform.InputConstants
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
@@ -464,7 +463,7 @@ class PCGUI(
             )
 
             // Poké Ball
-            val ballResource = pokemon.caughtBall.name.toAssetPath("textures/item/poke_balls/", ".png")
+            val ballResource = cobblemonResource("textures/item/poke_balls/" + pokemon.caughtBall.name.path + ".png")
             blitk(
                 matrixStack = matrices,
                 texture = ballResource,

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/pokedex/widgets/StatsWidget.kt

@@ -237,11 +237,9 @@ class StatsWidget(val pX: Int, val pY: Int) : SoundlessWidget(
             blitk(matrixStack = matrices, texture = divider, x = pX + 51, y = pY + 10, height = 27.5, width = 1)
             blitk(matrixStack = matrices, texture = divider, x = pX + 9, y = pY + 2, height = 6, width = 121)
 
-            val rideStyle = selectedBehaviour.value.key.path.toString().split("/").last().lowercase()
             drawScaledText(
                 context = context,
-                text = lang("ui.ride_style.${selectedBehaviour.key.toString().lowercase()}.${rideStyle}")
-                    .append(" | ").append(lang("ui.ride_style.${selectedBehaviour.key.toString().lowercase()}")).bold(),
+                text = lang("ui.ride_style.${selectedBehaviour.key.name.lowercase()}").bold(),
                 x = pX + 69.5,
                 y = pY + 3,
                 colour = 0x3A96B6,

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/Summary.kt

@@ -45,7 +45,6 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.isInventoryKeyPressed
 import com.cobblemon.mod.common.util.lang
-import com.cobblemon.mod.common.util.toAssetPath
 import com.mojang.blaze3d.platform.InputConstants
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
@@ -559,7 +558,7 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
         }
 
         // Poké Ball
-        val ballResource = selectedPokemon.caughtBall.name.toAssetPath("textures/item/poke_balls/", ".png")
+        val ballResource = cobblemonResource("textures/item/poke_balls/" + selectedPokemon.caughtBall.name.path + ".png")
         blitk(
             matrixStack = matrices,
             texture = ballResource,

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/widgets/PartySlotWidget.kt

@@ -24,7 +24,6 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
 import com.cobblemon.mod.common.util.math.fromEulerXYZDegrees
-import com.cobblemon.mod.common.util.toAssetPath
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceLocation
@@ -108,7 +107,7 @@ class PartySlotWidget(
                 )
             }
 
-            val ballIcon = slotPokemon.caughtBall.name.toAssetPath("textures/gui/ball/", ".png")
+            val ballIcon = cobblemonResource("textures/gui/ball/" + slotPokemon.caughtBall.name.path + ".png")
             val ballHeight = 22
             blitk(
                 matrixStack = matrices,

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/widgets/screens/moves/MovesWidget.kt

@@ -19,11 +19,11 @@ import com.cobblemon.mod.common.client.render.drawScaledText
 import com.cobblemon.mod.common.net.messages.server.RequestMoveSwapPacket
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
-import java.math.RoundingMode
-import java.text.DecimalFormat
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.network.chat.Component
+import java.math.RoundingMode
+import java.text.DecimalFormat
 
 class MovesWidget(
     pX: Int, pY: Int,

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/summary/widgets/screens/stats/StatWidget.kt

@@ -66,7 +66,6 @@ class StatWidget(
         private const val MARKER_WIDTH = 8
         private const val WIDTH = 134
         private const val HEIGHT = 148
-        private const val RIDE_ICON_SIZE = 32
         const val SCALE = 0.5F
 
         private const val WHITE = 0x00FFFFFF
@@ -337,16 +336,14 @@ class StatWidget(
                         colour = pentagonColour
                     )
 
-                    val rideStyle = selectedBehaviour.value.key.path.toString().split("/").last().lowercase()
-                    val iconResource = cobblemonResource("textures/gui/summary/icon_ride_${selectedBehaviour.key.toString().lowercase()}_${rideStyle}.png")
-                    blitk(
-                        matrixStack = matrices,
-                        texture = iconResource,
-                        x= (x + 59) / SCALE,
-                        y = (y + 62.5) / SCALE,
-                        width = RIDE_ICON_SIZE,
-                        height = RIDE_ICON_SIZE,
-                        scale = SCALE
+                    drawScaledText(
+                        context = context,
+                        font = CobblemonResources.DEFAULT_LARGE,
+                        text = lang("ui.ride_style.${selectedBehaviour.key.name.lowercase()}").bold(),
+                        x = x + (WIDTH / 2),
+                        y = y + 66,
+                        shadow = true,
+                        centered = true
                     )
 
                     // Stat Labels
@@ -371,16 +368,6 @@ class StatWidget(
                         verticesOffset = pentagonVerticesOffset,
                         offsetY = 5.5
                     )
-
-                    if (pMouseX >= (x + 59) && pMouseY >= (y + 62.5) && pMouseX <= ((x + 59) + (RIDE_ICON_SIZE * SCALE)) && pMouseY <= ((y + 62.5) + (RIDE_ICON_SIZE * SCALE))) {
-                        context.renderTooltip(
-                            Minecraft.getInstance().font,
-                            lang("ui.ride_style.${selectedBehaviour.key.toString().lowercase()}.${rideStyle}")
-                                .append(" | ").append(lang("ui.ride_style.${selectedBehaviour.key.toString().lowercase()}")),
-                            pMouseX,
-                            pMouseY
-                        )
-                    }
                 }
 
             } else {

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/trade/TradeGUI.kt

@@ -32,7 +32,6 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.lang
-import com.cobblemon.mod.common.util.toAssetPath
 import com.mojang.blaze3d.platform.InputConstants
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.GuiGraphics
@@ -585,7 +584,7 @@ class TradeGUI(
 
             // Poké Ball
             val nameXOffset = if (isOpposing) 75 else 0
-            val ballResource = pokemon.caughtBall.name.toAssetPath("textures/item/poke_balls/", ".png")
+            val ballResource = cobblemonResource("textures/item/poke_balls/" + pokemon.caughtBall.name.path + ".png")
             blitk(
                 matrixStack = context.pose(),
                 texture = ballResource,

common/src/main/kotlin/com/cobblemon/mod/common/client/keybind/keybinds/PartySendBinding.kt

@@ -143,18 +143,18 @@ object PartySendBinding : CobblemonBlockingKeyBinding(
     }
 
     private fun canAttemptDismount(player: LocalPlayer, selectedPartyPokemon: Pokemon?): Boolean {
-        val vehicle = player.vehicle as? PokemonEntity ?: return false
-
-        if (player != vehicle.controllingPassenger) return true
-
+        if (player.vehicle !is PokemonEntity) return false
+        val vehicle = player.vehicle as PokemonEntity
+        if (player != vehicle.controllingPassenger) {
+            return true
+        }
         val isAirRide = vehicle.ridingController?.context?.style == RidingStyle.AIR
         val hasLandRide = vehicle.rideProp.behaviours?.get(RidingStyle.LAND) != null
-
-        if (!Cobblemon.config.enableInFlightDismounting && isAirRide && hasLandRide) {
-            return false
+        return if (isAirRide && hasLandRide) {
+            false
+        } else {
+            vehicle.pokemon.uuid == selectedPartyPokemon?.uuid
         }
-
-        return vehicle.pokemon.uuid == selectedPartyPokemon?.uuid
     }
 
     private fun isRidingPokemon(player: LocalPlayer, ignoreControlling: Boolean = false): Boolean {

common/src/main/kotlin/com/cobblemon/mod/common/client/net/CalculateSeatPositionsHandler.kt

@@ -23,7 +23,7 @@ import net.minecraft.world.phys.Vec3
 
 object CalculateSeatPositionsHandler : ClientNetworkPacketHandler<CalculateSeatPositionsPacket> {
     private const val FORMAT = "%.2f"
-    private const val SEAT_PREFIX = "seat_"
+    private const val SEAT_PREFIX = "seat"
     private const val SIMULATION_PERIOD_TICKS = 15 * 20F
 
     class SeatRanges(

common/src/main/kotlin/com/cobblemon/mod/common/client/net/SetClientPlayerDataHandler.kt

@@ -16,8 +16,10 @@ object SetClientPlayerDataHandler : ClientNetworkPacketHandler<SetClientPlayerDa
     override fun handle(packet: SetClientPlayerDataPacket, client: Minecraft) {
         if (packet.isIncremental) {
             packet.type.incrementalAfterDecodeAction.invoke(packet.playerData)
-        } else {
+        }
+        else {
             packet.type.afterDecodeAction.invoke(packet.playerData)
         }
+
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/net/orientation/ClientboundUpdateOrientationHandler.kt

@@ -17,33 +17,35 @@ import net.minecraft.util.Mth
 
 object ClientboundUpdateOrientationHandler : ClientNetworkPacketHandler<ClientboundUpdateOrientationPacket> {
     override fun handle(packet: ClientboundUpdateOrientationPacket, client: Minecraft) {
-        val level = client.level ?: return
-        val player = client.player ?: return
-        val vehicle = level.getEntity(packet.entityId)
-        val vehicleController = if (vehicle is OrientationControllable) vehicle.orientationController else return
+        client.executeIfPossible {
+            val level = client.level ?: return@executeIfPossible
+            val player = client.player ?: return@executeIfPossible
+            val vehicle = level.getEntity(packet.entityId)
+            val vehicleController = if (vehicle is OrientationControllable) vehicle.orientationController else return@executeIfPossible
 
-        // If the client is also the driver of this entity then don't update it as the driver is the source
-        // of truth on vehicle orientation updates.
-        if (vehicle.controllingPassenger != player) {
-            packet.active?.let { shouldUseCustomOrientation ->
+            // If the client is also the driver of this entity then don't update it as the driver is the source
+            // of truth on vehicle orientation updates.
+            if (vehicle.controllingPassenger != player) {
+                packet.active?.let { shouldUseCustomOrientation ->
 
-                val playerIsPassenger = vehicle.passengers.contains(player)
+                    val playerIsPassenger = vehicle.passengers.contains(player)
 
-                // If the player has just switched to riding a custom orientation ride then set their
-                // ride x and y rots local to the vehicle rots(if the controller wasn't active and will now be active)
-                // This ensures that on transition your camera stays in the same spot
-                if (!vehicleController.isActive() && shouldUseCustomOrientation && playerIsPassenger) {
-                    // Set local to the vehicle x and yrot
-                    val playerRotater = player as RidePassenger?
-                    if (playerRotater != null) {
-                        playerRotater.`cobblemon$setRideXRot`(Mth.wrapDegrees(player.getXRot() - vehicle.getXRot()))
-                        playerRotater.`cobblemon$setRideYRot`(Mth.wrapDegrees(player.getYRot() - vehicle.getYRot()))
+                    // If the player has just switched to riding a custom orientation ride then set their
+                    // ride x and y rots local to the vehicle rots(if the controller wasn't active and will now be active)
+                    // This ensures that on transition your camera stays in the same spot
+                    if (!vehicleController.isActive() && shouldUseCustomOrientation && playerIsPassenger) {
+                        // Set local to the vehicle x and yrot
+                        val playerRotater = player as RidePassenger?
+                        if (playerRotater != null) {
+                            playerRotater.`cobblemon$setRideXRot`(Mth.wrapDegrees(player.getXRot() - vehicle.getXRot()))
+                            playerRotater.`cobblemon$setRideYRot`(Mth.wrapDegrees(player.getYRot() - vehicle.getYRot()))
+                        }
                     }
-                }
 
-                vehicle.orientationController.active = shouldUseCustomOrientation
+                    vehicle.orientationController.active = shouldUseCustomOrientation
+                }
+                vehicle.orientationController.updateOrientation { _ -> packet.orientation }
             }
-            vehicle.orientationController.updateOrientation { _ -> packet.orientation }
         }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/net/pokemon/update/ClientboundUpdateRidingStateHandler.kt

@@ -15,14 +15,16 @@ import net.minecraft.client.Minecraft
 
 object ClientboundUpdateRidingStateHandler : ClientNetworkPacketHandler<ClientboundUpdateRidingStatePacket> {
     override fun handle(packet: ClientboundUpdateRidingStatePacket, client: Minecraft) {
-        val player = client.player ?: return
-        val entity = player.level().getEntity(packet.entity) ?: return
-        if (entity !is PokemonEntity) return
-        if (entity.controllingPassenger == player) return
-        val buffer = packet.data ?: return
-        if (entity.ridingController?.context?.settings?.key != packet.behaviour) {
-            entity.ridingController?.changeBehaviour(packet.behaviour)
+        client.executeIfPossible {
+            val player = client.player ?: return@executeIfPossible
+            val entity = player.level().getEntity(packet.entity) ?: return@executeIfPossible
+            if (entity !is PokemonEntity) return@executeIfPossible
+            if (entity.controllingPassenger == player) return@executeIfPossible
+            val buffer = packet.data ?: return@executeIfPossible
+            if (entity.ridingController?.context?.settings?.key != packet.behaviour) {
+                entity.ridingController?.changeBehaviour(packet.behaviour)
+            }
+            entity.ridingController?.context?.state?.decode(buffer)
         }
-        entity.ridingController?.context?.state?.decode(buffer)
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/net/riding/ClientboundUpdateDriverInputHandler.kt

@@ -15,13 +15,15 @@ import net.minecraft.client.player.RemotePlayer
 
 object ClientboundUpdateDriverInputHandler : ClientNetworkPacketHandler<ClientboundUpdateDriverInputPacket> {
     override fun handle(packet: ClientboundUpdateDriverInputPacket, client: Minecraft) {
-        val level = client.level ?: return
-        val entity = level.getEntity(packet.entityId)
-        if (entity is RemotePlayer) {
-            entity.xxa = packet.driverInput.x
-            entity.zza = packet.driverInput.z
-            entity.jumping = packet.driverInput.y == 1.0f
-            entity.isShiftKeyDown = packet.driverInput.y == -1.0f
+        client.executeIfPossible {
+            val level = client.level ?: return@executeIfPossible
+            val entity = level.getEntity(packet.entityId)
+            if (entity is RemotePlayer) {
+                entity.xxa = packet.driverInput.x
+                entity.zza = packet.driverInput.z
+                entity.jumping = packet.driverInput.y == 1.0f
+                entity.isShiftKeyDown = packet.driverInput.y == -1.0f
+            }
         }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/net/sound/UnvalidatedPlaySoundS2CPacketHandler.kt

@@ -15,9 +15,11 @@ import net.minecraft.sounds.SoundEvent
 
 internal object UnvalidatedPlaySoundS2CPacketHandler : ClientNetworkPacketHandler<UnvalidatedPlaySoundS2CPacket> {
     override fun handle(packet: UnvalidatedPlaySoundS2CPacket, client: Minecraft) {
-        // This prevents clients that might not have the required resources installed from getting spammed about missing sound
-        if (client.soundManager.getSoundEvent(packet.sound) != null) {
-            client.level?.playSound(client.player, packet.x, packet.y, packet.z, SoundEvent.createVariableRangeEvent(packet.sound), packet.category, packet.volume, packet.pitch)
+        client.executeIfPossible {
+            // This prevents clients that might not have the required resources installed from getting spammed about missing sound
+            if (client.soundManager.getSoundEvent(packet.sound) != null) {
+                client.level?.playSound(client.player, packet.x, packet.y, packet.z, SoundEvent.createVariableRangeEvent(packet.sound), packet.category, packet.volume, packet.pitch)
+            }
         }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/net/toast/ToastPacketHandler.kt

@@ -15,6 +15,6 @@ import net.minecraft.client.Minecraft
 
 object ToastPacketHandler : ClientNetworkPacketHandler<ToastPacket> {
     override fun handle(packet: ToastPacket, client: Minecraft) {
-        ToastTracker.handle(packet, client)
+        client.executeIfPossible { ToastTracker.handle(packet, client) }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/persisted/ClientPersistedData.kt

@@ -8,8 +8,6 @@
 
 package com.cobblemon.mod.common.client.persisted
 
-import com.cobblemon.mod.common.Cobblemon
-import com.cobblemon.mod.common.Cobblemon.LOGGER
 import com.cobblemon.mod.common.config.CobblemonConfig
 import java.io.BufferedReader
 import java.io.BufferedWriter
@@ -33,14 +31,7 @@ object ClientPersistedData {
     fun readSnapshotsData() : SnapshotAcknowledgementData? {
         if (snapshotsPath.exists()) {
             BufferedReader(InputStreamReader(FileInputStream(snapshotsPath.toFile()))).use { reader ->
-                try {
-                    return gson.fromJson(reader, SnapshotAcknowledgementData::class.java)
-                } catch (exception: Exception) {
-                    LOGGER.error("Failed to load snapshots.json... Resetting File")
-                    val data = SnapshotAcknowledgementData(Cobblemon.VERSION, false)
-                    writeSnapshotsData(data)
-                    return data
-                }
+                return gson.fromJson(reader, SnapshotAcknowledgementData::class.java)
             }
         }
 
@@ -55,23 +46,16 @@ object ClientPersistedData {
     fun readRidingPerspectivesData() : RidingPerspectiveData? {
         if (ridingPerspectivesPath.exists()) {
             BufferedReader(InputStreamReader(FileInputStream(ridingPerspectivesPath.toFile()))).use { reader ->
-                try {
-                    return gson.fromJson(reader, RidingPerspectiveData::class.java)
-                } catch (exception: Exception) {
-                    LOGGER.error("Failed to load riding_perspectives.json... Resetting File")
-                    val data = RidingPerspectiveData()
-                    saveRidingPerspectivesData(data)
-                    return data
-                }
+                return gson.fromJson(reader, RidingPerspectiveData::class.java)
             }
         }
 
         return null
     }
 
-    fun saveRidingPerspectivesData(data: RidingPerspectiveData) {
+    fun saveRidingPerspectivesData() {
         ridingPerspectivesPath.toFile().parentFile.mkdirs()
-        BufferedWriter(FileWriter(ridingPerspectivesPath.toFile())).use { writer -> gson.toJson(data, writer) }
+        BufferedWriter(FileWriter(ridingPerspectivesPath.toFile())).use { writer -> gson.toJson(ridingPerspectives, writer) }
     }
 
     data class SnapshotAcknowledgementData(val version: String, val dontShowAgain: Boolean)
@@ -80,7 +64,7 @@ object ClientPersistedData {
     ) {
         fun updatePerspective(key: ResourceLocation, cameraType: CameraType) {
             perspectives[key] = cameraType
-            saveRidingPerspectivesData(this)
+            saveRidingPerspectivesData()
         }
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/block/DisplayCaseRenderer.kt

@@ -160,7 +160,6 @@ class DisplayCaseRenderer(ctx: BlockEntityRendererProvider.Context) : BlockEntit
             stack.item is BedItem -> PositioningType.BED
             stack.item is BannerItem -> PositioningType.BANNER
             stack.`is`(CobblemonItemTags.POKE_BALLS) -> PositioningType.POKE_BALL
-            stack.`is`(CobblemonItemTags.PLAQUES) -> PositioningType.ITEM_MODEL
             stack.item is PokedexItem -> PositioningType.POKEDEX
             stack.item == CobblemonItems.RELIC_COIN_POUCH -> PositioningType.COIN_POUCH
             stack.item == CobblemonItems.PASTURE -> PositioningType.PASTURE

common/src/main/kotlin/com/cobblemon/mod/common/client/render/camera/MountedCameraRenderer.kt

@@ -82,6 +82,7 @@ object MountedCameraRenderer {
         var offset = Vec3(0.0, currEyeHeight - (driver.bbHeight / 2), 0.0)
         var eyeOffset = Vec3(0.0, currEyeHeight - (driver.bbHeight / 2), 0.0)
 
+        val shouldFlip = !(vehicleController.active && vehicleController.orientation != null) // Do not flip the offset for 3rd person reverse unless we are using normal mc camera rotation.
         val isFirstPerson = Minecraft.getInstance().options.cameraType == CameraType.FIRST_PERSON
 
         eyeOffset = eyeOffset.add(getFirstPersonOffset(model, locatorName))
@@ -90,9 +91,9 @@ object MountedCameraRenderer {
             if (isFirstPerson) {
                 getFirstPersonOffset(model, locatorName)
             } else /* if (Cobblemon.config.thirdPersonViewBobbing) */ {
-                getThirdPersonOffset(thirdPersonReverse, model.thirdPersonCameraOffset, locatorName)
+                getThirdPersonOffset(thirdPersonReverse, model.thirdPersonCameraOffset, locatorName, shouldFlip)
             } /* else {
-                getThirdPersonOffset(thirdPersonReverse, model.thirdPersonCameraOffsetNoViewBobbing, locatorName)
+                getThirdPersonOffset(thirdPersonReverse, model.thirdPersonCameraOffsetNoViewBobbing, locatorName, shouldFlip)
             } */
         )
 
@@ -324,20 +325,19 @@ object MountedCameraRenderer {
         thirdPersonReverse: Boolean,
         cameraOffsets: Map<String, Vec3>,
         locatorName: String,
+        shouldFlip: Boolean = true
     ): Vec3 {
         val offset = if (thirdPersonReverse && cameraOffsets.containsKey(locatorName + "_reverse")) {
             cameraOffsets[locatorName + "_reverse"]!!
-        } else if (thirdPersonReverse && cameraOffsets.containsKey("seat_default_reverse")) {
-            cameraOffsets[locatorName + "seat_default_reverse"]!!
         } else if (cameraOffsets.containsKey(locatorName)) {
             cameraOffsets[locatorName]!!
-        } else if (cameraOffsets.containsKey("seat_default")) {
-            cameraOffsets["seat_default"]!!
         } else {
             Vec3.ZERO
         }
 
-        return if (thirdPersonReverse) offset.multiply(1.0, 1.0, -1.0) else offset
+        // Don't need to account for this since orientation is derived from camera rotation and that z is already flipped.
+        // Flip only when not on a rollable.
+        return if (thirdPersonReverse && shouldFlip) offset.multiply(1.0, 1.0, -1.0) else offset
     }
 
     private fun getFirstPersonOffset(model: PosableModel, locatorName: String): Vec3 {
@@ -345,8 +345,6 @@ object MountedCameraRenderer {
 
         return if (cameraOffsets.containsKey(locatorName)) {
             cameraOffsets[locatorName]!!
-        } else if (cameraOffsets.containsKey("seat_default")) {
-            cameraOffsets["seat_default"]!!
         } else {
             Vec3.ZERO
         }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PosableModel.kt

@@ -568,9 +568,6 @@ open class PosableModel(@Transient override val rootPart: Bone) : ModelFrame {
         // Is there any reason why we should actually change the pose?
         if (entity != null && (poseName == null || currentPose == null || !currentPose.isSuitable(state) || entityPoseType !in currentPose.poseTypes)) {
             val desirablePose = getFirstSuitablePose(state, entityPoseType)
-            if (desirablePose == currentPose) {
-                return currentPose
-            }
             // If this if succeeds then it just no longer fits this pose
             if (currentPose != null) {
                 // Don't apply pose correction until the current primary animation is complete.