fix broken skills

Fix crash when using enchanted items in the ressurection machine

Closes #1973

See merge request cable-mc/cobblemon!2307

.gitignore

@@ -24,6 +24,7 @@ eclipse
 run
 runClient
 runServer
+utilityscripts/implementation/*.txt
 
 # Files from Forge MDK
 forge*changelog.txt

CHANGELOG.md

@@ -56,6 +56,7 @@
 - Pressing the inventory key now closes the Pokémon interact wheel GUI
 - Pokémon cries now play when clicking Pokémon in the summary screen.
 - Pressing the Summary key while either the starter selection or summary screen are open now closes those screens
+- Ice type Pokémon are now immune to Packed Snow
 
 ### New rideable Pokémon
 - Drampa
@@ -67,6 +68,7 @@
 - Milotic
 
 ### Pokémon Added
+#### Generation 3
 - Wurmple
 - Silcoon
 - Beautifly
@@ -74,59 +76,55 @@
 - Dustox
 - Skitty
 - Delcatty
-
 - Seviper
 - Zangoose
+
+#### Generation 4
 - Cherubi
 - Cherrim
 - Stunky
 - Skuntank
 
+#### Generation 5
 - Audino
 - Pawniard
 - Bisharp
-- Kingambit
 
+#### Generation 6
 - Pancham (+ Cosmetic with Black Glasses)
 - Pangoro (+ Cosmetic with Black Glasses)
 
+#### Generation 7
 - Rockruff
 - Lycanroc
 
+#### Generation 8
 - Rolycoly
 - Carkol
 - Coalossal
-
+- Runerigus
 - Snom
 - Frosmoth
-
+- Indeedee
 - Duraludon
-- Archaludon
-
 - Applin
 - Flapple
 - Appletun
-- Dipplin
-- Hydrapple
+
+#### Generation 9
 
 - Nymble
 - Lokix
+- Kingambit
+- Dipplin
+- Archaludon
+- Hydrapple
 
 #### Regional Forms
-- Sandshrew (Alolan)
-- Sandslash (Alolan)
-- Avalugg (Hisuian)
-
-### Model updates for the following Pokémon
-- Goomy
-- Sliggoo
-- Goodra
-- Porygon
-- Porygon2
-- Porygon-Z
-- Zubat
-- Golbat
-- Crobat
+- Sandshrew (Alolan Form)
+- Sandslash (Alolan Form)
+- Yamask (Galarian Form)
+- Avalugg (Hisuian Form)
 
 ### Model updates for the following Pokémon
 
@@ -136,11 +134,12 @@
 - Zubat
 - Golbat
 - Crobat
+- Ditto
 - Porygon
 - Porygon2
 - Porygon-Z
-
 - Skarmory
+- Smoochum
 - Jynx
 - Popplio
 - Brionne
@@ -148,17 +147,22 @@
 - Fletchling
 - Fletchinder
 - Talonflame
-
 - Sableye
 - Mawile
-
 - Goomy
 - Sliggoo
 - Goodra
-
 - Nacli
 - Naclstack
 - Garganacl
+- Bidoof
+- Cranidos
+- Chatot
+- Yamask
+- Cofagrigus
+- Tyranitar
+- Turtonator
+- Arbok (New Patterns: Angry, Cartoon, Clown, Comedic, Crow, Grin, Ink, Modern, Rain, Scribble, Silence, Sloth, Suspicious, Will)
 
 #### Model changes to the regional bias resource pack:
 
@@ -192,6 +196,12 @@
 - Shedinja
 - Skwovet
 - Greedent
+- Bidoof
+- Cranidos
+- Chatot
+- Yamask
+- Cofagrigus
+- Luvdisc
 
 #### Added sounds to the following moves
 - Absorb
@@ -288,6 +298,9 @@
 - Lowered the volume of Blitzle and Zebstrika's cry
 - Fixed Raichu (male) and Alolan Raichu (both genders) not displaying the correct Partner Cap when Pewter Crunchies are in the cosmetic slot.
 - Regional Foods will now prioritize being eaten instead of used for healing Pokémon, shift clicking will use it as healing
+- Resolved Z-Fighting on Pokédex Models
+- Restored Ninjask's ability to do barrel rolls
+- Fixed a crash caused by adding enchanted items to the Resurrection Machine
 
 ### Fixes
 - Fixed Croagunk's walkspeed
@@ -348,6 +361,7 @@
 - Separated all the functions of MoLangFunctions.kt into their own files.
 - Spawn buckets and their base weights are now provided by the spawner, with different base weights for world, fishing, snack, and habitat spawn buckets.
 - Removed "SpawnBucket" class in favour of just storing maps of bucket names to weights.
+- Fixed nicknames not being applied to Pokémon spawned from `spawn_pool_world` files
 
 ### Molang & Datapacks
 - Added `moveset_builders` datapack folder for different styles of movesets.
@@ -371,15 +385,84 @@
 - Ride sounds no longer play when submerged unless specified with a new setting
 - NPC Trainers can now call a `command` animation when issuing a command in battle.
 - Added a q.failed function to move action effects.
-- Herd spawned Pokémon have their levels controlled differently. The `levelRange` property now acts as a clamp instead of a filter, with a new `herdLevelRange` property to do the filter behaviour. 
+- Herd spawned Pokémon have their levels controlled differently. The `levelRange` property now acts as a clamp instead of a filter, with a new `herdLevelRange` property to do the filter behaviour.
+- `q.sound` now accepts three parameters (sound event, volume and pitch) instead of just the sound event and pitch.
 
 ### Particles
 
+#### New Move Animations
+- Blizzard
+- Disarming Voice
+- Draco Meteor
+- Dragon Breath
+- Dragon Rage
+- Drain Punch
+- Fairy Wind
+- Fire Fang
+- Gust
+- Horn Drill
+- Hydro Pump
+- Ice Fang
+- Leafage
+- Leaf Storm
+- Light Screen
+- Night Shade
+- Play Rough
+- Pyro Ball
+- Reflect
+- Rock Slide
+- Sonic Boom
+- Sucker Punch
+- Supersonic
+- Thunder Fang
+
+#### Tweaks and Fixes (Moves)
+
+- Confusion
+- Dragon Claw
+- Eruption
+- Fire Punch
+- Flame Burst
+- Flame Charge
+- Flamethrower
+- Frost Breath
+- Hypnosis
+- Ice Punch
+- Icy Wind
+- Mud Sport
+- Poison Fang
+- Protect
+- Psychic
+- Quick Attack
+- Rage Powder
+- Razor Leaf
+- Sand Attack
+- Scratch
+- Shadow Claw
+- Sing
+- Spore
+- String Shot
+- Tackle
+- Tail Whip
+- Thunder
+- Thunder Punch
+- Thunder Wave
+- Water Gun
+- Water Pulse
+- Water Sport
+
+#### Miscellaneous Particles
+
++ Added Wild Might particles for Alpha Pokémon
++ Updated stat increase and decrease particles
+
 ### Localization
 - Updated translations for:
   - Japanese
   - German
+  - Spanish
   - Ecuadorian Spanish
+  - Brazilian Portuguese
   - Simplified Chinese
   - Traditional Chinese
   - Korean

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

@@ -0,0 +1,111 @@
+/*
+ * 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;
+
+import com.cobblemon.mod.common.mixin.accessor.SinglePoolElementAccessor;
+import com.cobblemon.mod.common.world.structureprocessors.HeightRangeStructureProcessor;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Holder;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.levelgen.Heightmap;
+import net.minecraft.world.level.levelgen.structure.Structure;
+import net.minecraft.world.level.levelgen.structure.pools.*;
+import net.minecraft.world.level.levelgen.structure.pools.alias.PoolAliasLookup;
+import net.minecraft.world.level.levelgen.structure.templatesystem.LiquidSettings;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorList;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Optional;
+
+@Mixin(JigsawPlacement.class)
+public class JigsawPlacementMixin {
+
+	@Inject(
+			method = "addPieces(Lnet/minecraft/world/level/levelgen/structure/Structure$GenerationContext;Lnet/minecraft/core/Holder;Ljava/util/Optional;ILnet/minecraft/core/BlockPos;ZLjava/util/Optional;ILnet/minecraft/world/level/levelgen/structure/pools/alias/PoolAliasLookup;Lnet/minecraft/world/level/levelgen/structure/pools/DimensionPadding;Lnet/minecraft/world/level/levelgen/structure/templatesystem/LiquidSettings;)Ljava/util/Optional;",
+			at = @At("RETURN"),
+			cancellable = true
+	)
+	private static void onAddPieces(
+			Structure.GenerationContext context,
+			Holder<StructureTemplatePool> startPool,
+			Optional<ResourceLocation> startJigsawName,
+			int maxDepth,
+			BlockPos pos,
+			boolean useExpansionHack,
+			Optional<Heightmap.Types> projectStartToHeightmap,
+			int maxDistanceFromCenter,
+			PoolAliasLookup aliasLookup,
+			DimensionPadding dimensionPadding,
+			LiquidSettings liquidSettings,
+			CallbackInfoReturnable<Optional<Structure.GenerationStub>> cir
+	) {
+		Optional<Structure.GenerationStub> result = cir.getReturnValue();
+		if (result.isEmpty()) {
+			return;
+		}
+		BlockPos spawnPos = result.get().position();
+		boolean canPlace = cobblemon$canAnyStartElementPlace(context, startPool, spawnPos);
+
+		if (canPlace) {
+			return;
+		}
+
+		cir.setReturnValue(Optional.empty());
+	}
+
+	@Unique
+	private static boolean cobblemon$canAnyStartElementPlace(
+			Structure.GenerationContext generationContext,
+			Holder<StructureTemplatePool> startPool,
+			BlockPos startPos
+	) {
+		for (StructurePoolElement element : startPool.value().templates) {
+			Optional<HeightRangeStructureProcessor> heightRangeProcessor = cobblemon$getHeightRangeProcessor(element);
+
+			if (heightRangeProcessor.isEmpty()) {
+				return true;
+			}
+
+			HeightRangeStructureProcessor processor = heightRangeProcessor.get();
+			boolean valid = processor.isValidPlacement(
+					generationContext.chunkGenerator(),
+					generationContext.heightAccessor(),
+					generationContext.randomState(),
+					startPos
+			);
+
+			if (valid) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	@Unique
+	private static Optional<HeightRangeStructureProcessor> cobblemon$getHeightRangeProcessor(StructurePoolElement element) {
+		if (!(element instanceof SinglePoolElement)) {
+			return Optional.empty();
+		}
+
+		StructureProcessorList processorList = ((SinglePoolElementAccessor) element).getProcessors().value();
+		for (StructureProcessor processor : processorList.list()) {
+			if (processor instanceof HeightRangeStructureProcessor heightRangeStructureProcessor) {
+				return Optional.of(heightRangeStructureProcessor);
+			}
+		}
+
+		return Optional.empty();
+	}
+}

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

@@ -0,0 +1,22 @@
+/*
+ * 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.core.Holder;
+import net.minecraft.world.level.levelgen.structure.pools.SinglePoolElement;
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorList;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(SinglePoolElement.class)
+public interface SinglePoolElementAccessor {
+    @Accessor("processors")
+    Holder<StructureProcessorList> getProcessors();
+}
+

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

@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.OrientationControllable;
 import com.cobblemon.mod.common.api.orientation.OrientationController;
 import com.cobblemon.mod.common.client.CobblemonClient;
+import com.cobblemon.mod.common.client.gui.interact.wheel.InteractWheelGuiFactoryKt;
 import com.cobblemon.mod.common.client.keybind.keybinds.PartySendBinding;
 import com.cobblemon.mod.common.client.keybind.keybinds.RidingFreelookBinding;
 import com.cobblemon.mod.common.duck.RidePassenger;
@@ -67,6 +68,39 @@ public abstract class MouseHandlerMixin {
 
     @Unique private double cobblemon$timeDelta;
 
+    @Inject(
+            method = "onPress",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    public void cobblemon$pokeskillGuiControl(long windowPointer, int button, int action, int modifiers, CallbackInfo ci) {
+        if (button == 0 && action == 1) {
+
+            // Make sure no menus are open already
+            if (this.minecraft.screen == null && this.minecraft.getOverlay() == null) {
+                // Check to see if party key is held
+                if (PartySendBinding.INSTANCE.getWasDown()) {
+
+                    // Don't want to send out a pokemon if we let go of the key
+                    PartySendBinding.INSTANCE.actioned();
+
+                    //Open the actual gui
+                    var player = Minecraft.getInstance().player;
+                    var storage = CobblemonClient.INSTANCE.getStorage();
+                    var selectedPokemon = storage.getParty().get(storage.getSelectedSlot());
+                    if (selectedPokemon != null && player != null) {
+                        //canApplyChange = false
+                        var gui = InteractWheelGuiFactoryKt.createPokeSkillGui(player, selectedPokemon);
+                        Minecraft.getInstance().setScreen(gui);
+                    }
+
+                    // Stop the rest of minecraft click logic like punching and using items
+                    ci.cancel();
+                }
+            }
+        }
+    }
+
     @Inject(
             method = "onScroll",
             at = @At(

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

@@ -308,7 +308,9 @@ object Cobblemon {
             this.config.maxPokemonLevel,
             this.config.maxPokemonFriendship,
             this.config.maxDynamaxLevel,
-            this.config.unlockAllMoveDexMovesByDefault
+            this.config.unlockAllMoveDexMovesByDefault,
+            this.config.pokemonIntrinsicSizeMin,
+            this.config.pokemonIntrinsicSizeMax
         ).sendToPlayer(player)
     }
 

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

@@ -24,26 +24,13 @@ import com.cobblemon.mod.common.client.net.data.RideSettingsSyncHandler
 import com.cobblemon.mod.common.client.net.debug.OpenRidingStatsDebugGUIHandler
 import com.cobblemon.mod.common.client.net.dialogue.DialogueClosedHandler
 import com.cobblemon.mod.common.client.net.dialogue.DialogueOpenedHandler
-import com.cobblemon.mod.common.client.net.effect.PokeSnackBlockParticlesHandler
-import com.cobblemon.mod.common.client.net.effect.RunPosableMoLangHandler
-import com.cobblemon.mod.common.client.net.effect.SaccharineLogBlockParticlesHandler
-import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormEntityParticleHandler
-import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormParticleHandler
-import com.cobblemon.mod.common.client.net.gui.ExpGainedDataPacketHandler
-import com.cobblemon.mod.common.client.net.gui.InteractPokemonUIPacketHandler
-import com.cobblemon.mod.common.client.net.gui.PokedexUIPacketHandler
-import com.cobblemon.mod.common.client.net.gui.SetActiveTMPacketHandler
-import com.cobblemon.mod.common.client.net.gui.SetTMMachineContainerDataPacketHandler
-import com.cobblemon.mod.common.client.net.gui.SummaryUIPacketHandler
+import com.cobblemon.mod.common.client.net.effect.*
+import com.cobblemon.mod.common.client.net.gui.*
 import com.cobblemon.mod.common.client.net.habitat.OpenHabitatBlockEditorHandler
 import com.cobblemon.mod.common.client.net.npc.CloseNPCEditorHandler
 import com.cobblemon.mod.common.client.net.npc.OpenNPCEditorHandler
 import com.cobblemon.mod.common.client.net.orientation.ClientboundUpdateOrientationHandler
-import com.cobblemon.mod.common.client.net.pasture.ClosePastureHandler
-import com.cobblemon.mod.common.client.net.pasture.OpenPastureHandler
-import com.cobblemon.mod.common.client.net.pasture.PokemonPasturedHandler
-import com.cobblemon.mod.common.client.net.pasture.PokemonUnpasturedHandler
-import com.cobblemon.mod.common.client.net.pasture.UpdatePastureConflictFlagHandler
+import com.cobblemon.mod.common.client.net.pasture.*
 import com.cobblemon.mod.common.client.net.pokedex.ServerConfirmedRegisterHandler
 import com.cobblemon.mod.common.client.net.pokemon.update.ClientboundSeatAssignmentPacketHandler
 import com.cobblemon.mod.common.client.net.pokemon.update.ClientboundUpdateRidingStateHandler
@@ -62,14 +49,7 @@ import com.cobblemon.mod.common.client.net.storage.party.SetPartyPokemonHandler
 import com.cobblemon.mod.common.client.net.storage.party.SetPartyReferenceHandler
 import com.cobblemon.mod.common.client.net.storage.pc.*
 import com.cobblemon.mod.common.client.net.toast.ToastPacketHandler
-import com.cobblemon.mod.common.client.net.trade.TradeAcceptanceChangedHandler
-import com.cobblemon.mod.common.client.net.trade.TradeCancelledHandler
-import com.cobblemon.mod.common.client.net.trade.TradeCompletedHandler
-import com.cobblemon.mod.common.client.net.trade.TradeOfferExpiredHandler
-import com.cobblemon.mod.common.client.net.trade.TradeOfferNotificationHandler
-import com.cobblemon.mod.common.client.net.trade.TradeProcessStartedHandler
-import com.cobblemon.mod.common.client.net.trade.TradeStartedHandler
-import com.cobblemon.mod.common.client.net.trade.TradeUpdatedHandler
+import com.cobblemon.mod.common.client.net.trade.*
 import com.cobblemon.mod.common.net.PacketRegisterInfo
 import com.cobblemon.mod.common.net.messages.client.OpenBehaviourEditorPacket
 import com.cobblemon.mod.common.net.messages.client.PlayerInteractOptionsPacket
@@ -85,21 +65,13 @@ import com.cobblemon.mod.common.net.messages.client.data.*
 import com.cobblemon.mod.common.net.messages.client.debug.RequestOpenRidingStatsDebugGUIPacket
 import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueClosedPacket
 import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueOpenedPacket
-import com.cobblemon.mod.common.net.messages.client.effect.PokeSnackBlockParticlesPacket
-import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket
-import com.cobblemon.mod.common.net.messages.client.effect.SaccharineLogBlockParticlesPacket
-import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
-import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormParticlePacket
+import com.cobblemon.mod.common.net.messages.client.effect.*
 import com.cobblemon.mod.common.net.messages.client.habitat.OpenHabitatBlockEditorPacket
 import com.cobblemon.mod.common.net.messages.client.npc.CloseNPCEditorPacket
 import com.cobblemon.mod.common.net.messages.client.npc.OpenNPCEditorPacket
 import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateDriverInputPacket
 import com.cobblemon.mod.common.net.messages.client.orientation.ClientboundUpdateOrientationPacket
-import com.cobblemon.mod.common.net.messages.client.pasture.ClosePasturePacket
-import com.cobblemon.mod.common.net.messages.client.pasture.OpenPasturePacket
-import com.cobblemon.mod.common.net.messages.client.pasture.PokemonPasturedPacket
-import com.cobblemon.mod.common.net.messages.client.pasture.PokemonUnpasturedPacket
-import com.cobblemon.mod.common.net.messages.client.pasture.UpdatePastureConflictFlagPacket
+import com.cobblemon.mod.common.net.messages.client.pasture.*
 import com.cobblemon.mod.common.net.messages.client.pokedex.ServerConfirmedRegisterPacket
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.*
 import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.AddEvolutionPacket
@@ -120,45 +92,17 @@ import com.cobblemon.mod.common.net.messages.client.storage.party.InitializePart
 import com.cobblemon.mod.common.net.messages.client.storage.party.MoveClientPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.client.storage.party.SetPartyReferencePacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.ClosePCPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.InitializePCPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.MoveClientPCPokemonPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.OpenPCPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.RenamePCBoxPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCBoxPacket
-import com.cobblemon.mod.common.net.messages.client.storage.pc.SetPCPokemonPacket
+import com.cobblemon.mod.common.net.messages.client.storage.pc.*
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.ChangePCBoxWallpaperPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.RequestPCBoxWallpapersPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.SetPCBoxWallpapersPacket
 import com.cobblemon.mod.common.net.messages.client.storage.pc.wallpaper.UnlockPCBoxWallpaperPacket
+import com.cobblemon.mod.common.net.messages.client.tms.TechnicalMachineRegistrySyncPacket
 import com.cobblemon.mod.common.net.messages.client.toast.ToastPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeAcceptanceChangedPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeCancelledPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeCompletedPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeOfferExpiredPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeOfferNotificationPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeProcessStartedPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeStartedPacket
-import com.cobblemon.mod.common.net.messages.client.trade.TradeUpdatedPacket
-import com.cobblemon.mod.common.net.messages.client.ui.ExpGainedDataPacket
-import com.cobblemon.mod.common.net.messages.client.ui.InteractPokemonUIPacket
-import com.cobblemon.mod.common.net.messages.client.ui.PokedexUIPacket
-import com.cobblemon.mod.common.net.messages.client.ui.SetActiveTMPacket
-import com.cobblemon.mod.common.net.messages.client.ui.SetTMMachineContainerDataPacket
-import com.cobblemon.mod.common.net.messages.client.ui.SummaryUIPacket
-import com.cobblemon.mod.common.net.messages.server.BattleChallengePacket
-import com.cobblemon.mod.common.net.messages.server.BattleChallengeResponsePacket
-import com.cobblemon.mod.common.net.messages.server.BenchMovePacket
-import com.cobblemon.mod.common.net.messages.server.RequestMoveSwapPacket
-import com.cobblemon.mod.common.net.messages.server.RequestPlayerInteractionsPacket
-import com.cobblemon.mod.common.net.messages.server.SelectStarterPacket
-import com.cobblemon.mod.common.net.messages.server.SendOutPokemonPacket
-import com.cobblemon.mod.common.net.messages.server.battle.BattleSelectActionsPacket
-import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamLeavePacket
-import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamRequestPacket
-import com.cobblemon.mod.common.net.messages.server.battle.BattleTeamResponsePacket
-import com.cobblemon.mod.common.net.messages.server.battle.RemoveSpectatorPacket
-import com.cobblemon.mod.common.net.messages.server.battle.SpectateBattlePacket
+import com.cobblemon.mod.common.net.messages.client.trade.*
+import com.cobblemon.mod.common.net.messages.client.ui.*
+import com.cobblemon.mod.common.net.messages.server.*
+import com.cobblemon.mod.common.net.messages.server.battle.*
 import com.cobblemon.mod.common.net.messages.server.behaviour.DamageOnCollisionPacket
 import com.cobblemon.mod.common.net.messages.server.behaviour.SetEntityBehaviourPacket
 import com.cobblemon.mod.common.net.messages.server.block.AdjustBlockEntityViewerCountPacket
@@ -185,11 +129,7 @@ import com.cobblemon.mod.common.net.messages.server.pasture.UnpasturePokemonPack
 import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.FinishScanningPacket
 import com.cobblemon.mod.common.net.messages.server.pokedex.scanner.StartScanningPacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.interact.InteractPokemonPacket
-import com.cobblemon.mod.common.net.messages.server.pokemon.update.ServerboundUpdateRidingStatePacket
-import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetActiveMarkPacket
-import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetItemHiddenPacket
-import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetMarkingsPacket
-import com.cobblemon.mod.common.net.messages.server.pokemon.update.SetNicknamePacket
+import com.cobblemon.mod.common.net.messages.server.pokemon.update.*
 import com.cobblemon.mod.common.net.messages.server.pokemon.update.evolution.AcceptEvolutionPacket
 import com.cobblemon.mod.common.net.messages.server.riding.DismountPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.riding.ServerboundUpdateDriverInputPacket
@@ -202,21 +142,12 @@ import com.cobblemon.mod.common.net.messages.server.storage.party.PartyTutorialP
 import com.cobblemon.mod.common.net.messages.server.storage.party.ReleasePartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.SwapPartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.pc.*
-import com.cobblemon.mod.common.net.messages.server.trade.AcceptTradeRequestPacket
-import com.cobblemon.mod.common.net.messages.server.trade.CancelTradePacket
-import com.cobblemon.mod.common.net.messages.server.trade.ChangeTradeAcceptancePacket
-import com.cobblemon.mod.common.net.messages.server.trade.OfferTradePacket
-import com.cobblemon.mod.common.net.messages.server.trade.PerformTradePacket
-import com.cobblemon.mod.common.net.messages.server.trade.UpdateTradeOfferPacket
+import com.cobblemon.mod.common.net.messages.server.trade.*
 import com.cobblemon.mod.common.net.serverhandling.ChallengeHandler
 import com.cobblemon.mod.common.net.serverhandling.ChallengeResponseHandler
 import com.cobblemon.mod.common.net.serverhandling.RequestInteractionsHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.BattleSelectActionsHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.RemoveSpectatorHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.SpectateBattleHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.TeamLeaveHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestHandler
-import com.cobblemon.mod.common.net.serverhandling.battle.TeamRequestResponseHandler
+import com.cobblemon.mod.common.net.serverhandling.UsePokeSkillHandler
+import com.cobblemon.mod.common.net.serverhandling.battle.*
 import com.cobblemon.mod.common.net.serverhandling.behaviour.DamageOnCollisionPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.behaviour.SetEntityBehaviourHandler
 import com.cobblemon.mod.common.net.serverhandling.block.AdjustBlockEntityViewerCountHandler
@@ -244,11 +175,7 @@ import com.cobblemon.mod.common.net.serverhandling.pasture.UnpasturePokemonHandl
 import com.cobblemon.mod.common.net.serverhandling.pokedex.scanner.FinishScanningHandler
 import com.cobblemon.mod.common.net.serverhandling.pokedex.scanner.StartScanningHandler
 import com.cobblemon.mod.common.net.serverhandling.pokemon.interact.InteractPokemonHandler
-import com.cobblemon.mod.common.net.serverhandling.pokemon.update.ServerboundUpdateRidingStateHandler
-import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetActiveMarkHandler
-import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetItemHiddenHandler
-import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetMarkingsHandler
-import com.cobblemon.mod.common.net.serverhandling.pokemon.update.SetNicknameHandler
+import com.cobblemon.mod.common.net.serverhandling.pokemon.update.*
 import com.cobblemon.mod.common.net.serverhandling.riding.DismountPokemonPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.riding.DriverInputPacketHandler
 import com.cobblemon.mod.common.net.serverhandling.riding.ServerboundUpdatePassengerPositionHandler
@@ -264,12 +191,7 @@ import com.cobblemon.mod.common.net.serverhandling.storage.party.PartyTutorialPa
 import com.cobblemon.mod.common.net.serverhandling.storage.party.ReleasePCPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.party.SwapPartyPokemonHandler
 import com.cobblemon.mod.common.net.serverhandling.storage.pc.*
-import com.cobblemon.mod.common.net.serverhandling.trade.AcceptTradeRequestHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.CancelTradeHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.ChangeTradeAcceptanceHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.OfferTradeHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.PerformTradeHandler
-import com.cobblemon.mod.common.net.serverhandling.trade.UpdateTradeOfferHandler
+import com.cobblemon.mod.common.net.serverhandling.trade.*
 import com.cobblemon.mod.common.util.server
 import net.minecraft.server.level.ServerPlayer
 
@@ -339,6 +261,7 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(MarkingsUpdatePacket.ID, MarkingsUpdatePacket::decode, PokemonUpdatePacketHandler()))
         list.add(PacketRegisterInfo(RideBoostsUpdatePacket.ID, RideBoostsUpdatePacket::decode, PokemonUpdatePacketHandler()))
         list.add(PacketRegisterInfo(RideStaminaUpdatePacket.ID, RideStaminaUpdatePacket::decode, PokemonUpdatePacketHandler()))
+        list.add(PacketRegisterInfo(SkillCooldownsUpdatePacket.ID, SkillCooldownsUpdatePacket::decode, PokemonUpdatePacketHandler()))
         list.add(PacketRegisterInfo(AlphaUpdatePacket.ID, AlphaUpdatePacket::decode, PokemonUpdatePacketHandler()))
         list.add(PacketRegisterInfo(ScaleModifierUpdatePacket.ID, ScaleModifierUpdatePacket::decode, PokemonUpdatePacketHandler()))
 
@@ -439,6 +362,8 @@ object CobblemonNetwork {
         list.add(PacketRegisterInfo(BehaviourSyncPacket.ID, BehaviourSyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(MarkRegistrySyncPacket.ID, MarkRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
         list.add(PacketRegisterInfo(RideSettingsSyncPacket.ID, RideSettingsSyncPacket::decode, RideSettingsSyncHandler))
+        list.add(PacketRegisterInfo(PokeSkillsRegistrySyncPacket.ID, PokeSkillsRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
+        list.add(PacketRegisterInfo(TechnicalMachineRegistrySyncPacket.ID, TechnicalMachineRegistrySyncPacket::decode, DataRegistrySyncPacketHandler()))
 
         // Effects
         list.add(PacketRegisterInfo(SpawnSnowstormParticlePacket.ID, SpawnSnowstormParticlePacket::decode, SpawnSnowstormParticleHandler))
@@ -530,6 +455,7 @@ object CobblemonNetwork {
         // Interaction Packets
         list.add(PacketRegisterInfo(InteractPokemonPacket.ID, InteractPokemonPacket::decode, InteractPokemonHandler))
         list.add(PacketRegisterInfo(RequestPlayerInteractionsPacket.ID, RequestPlayerInteractionsPacket::decode, RequestInteractionsHandler))
+        list.add(PacketRegisterInfo(UsePokeSkillPacket.ID, UsePokeSkillPacket::decode, UsePokeSkillHandler))
 
         // Storage Packets
         list.add(PacketRegisterInfo(SendOutPokemonPacket.ID, SendOutPokemonPacket::decode, SendOutPokemonHandler))

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

@@ -0,0 +1,68 @@
+/*
+ * 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.CobblemonNetwork.sendPacket
+import com.cobblemon.mod.common.api.data.JsonDataRegistry
+import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
+import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import com.cobblemon.mod.common.entity.pokemon.PokeSkill
+import com.cobblemon.mod.common.net.messages.client.data.PokeSkillsRegistrySyncPacket
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.util.adapters.ActionEffectTimelineAdapter
+import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter
+import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
+import com.cobblemon.mod.common.util.adapters.TextAdapter
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import net.minecraft.network.chat.Component
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.server.packs.PackType
+import net.minecraft.world.entity.player.Player
+
+/**
+ * The JSON data registry for all the possible [PokeSkill]s.
+ *
+ * @author Hiroku
+ * @since August 31st, 2025
+ */
+object CobblemonPokeSkills : JsonDataRegistry<PokeSkill> {
+    override val id = cobblemonResource("poke_skills")
+    override val type = PackType.SERVER_DATA
+    override val observable = SimpleObservable<CobblemonPokeSkills>()
+    override val typeToken = TypeToken.get(PokeSkill::class.java)
+    override val resourcePath = "poke_skills"
+    override val gson = GsonBuilder()
+        .setPrettyPrinting()
+        .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter)
+        .registerTypeAdapter(ActionEffectTimeline::class.java, ActionEffectTimelineAdapter)
+        .registerTypeAdapter(ResourceLocation::class.java, IdentifierAdapter)
+        .registerTypeAdapter(Component::class.java, TextAdapter)
+        .create()
+
+    var skills = mapOf<ResourceLocation, PokeSkill>()
+
+    fun getAccessibleSkills(player: Player, pokemon: Pokemon): List<PokeSkill> {
+        return skills.values.filter { it.canAccess(player, pokemon) }
+    }
+
+    override fun reload(data: Map<ResourceLocation, PokeSkill>) {
+        data.forEach { (id, skill) -> skill.id = id }
+        skills = data
+        observable.emit(this)
+        Cobblemon.LOGGER.info("Loaded ${skills.size} PokéSkills")
+    }
+
+    override fun sync(player: ServerPlayer) {
+        player.sendPacket(PokeSkillsRegistrySyncPacket(skills.values.toList()))
+    }
+}

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

@@ -293,11 +293,11 @@ object MoLangFunctions {
         )
         value.functions["is_in"] = Function put@{ params: MoParams ->
             val tag = TagKey.create(key, ResourceLocation.parse(params.getString(0).replace("#", "")))
-            return@put DoubleValue(if (value.obj.`is`(tag)) 1.0 else 0.0)
+            return@put DoubleValue(value.obj.`is`(tag))
         }
         value.functions["is_of"] = Function put@{ params: MoParams ->
             val identifier = ResourceLocation.parse(params.getString(0))
-            return@put DoubleValue(if (value.obj.`is`(identifier)) 1.0 else 0.0)
+            return@put DoubleValue(value.obj.`is`(identifier))
         }
         return value
     }

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

@@ -25,7 +25,7 @@ object DropEntryMoLangFunctions : AbstractMoLangFunctionHolder<DropEntry>() {
         map["max_selectable_times"] = { DoubleValue(drop.maxSelectableTimes.toDouble()) }
         map["can_drop"] = { params ->
             val pokemon = params.getOrNull<ObjectValue<Pokemon>>(0)?.obj
-            DoubleValue(if (drop.canDrop(pokemon)) 1.0 else 0.0)
+            DoubleValue(drop.canDrop(pokemon))
         }
         return map
     }

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

@@ -35,12 +35,14 @@ import com.cobblemon.mod.common.util.effectiveName
 import com.cobblemon.mod.common.util.getBlockStatesWithPos
 import com.cobblemon.mod.common.util.getBooleanOrNull
 import com.cobblemon.mod.common.util.getDoubleOrNull
+import com.cobblemon.mod.common.util.getIntOrNull
 import com.cobblemon.mod.common.util.getIsSubmerged
 import com.cobblemon.mod.common.util.getOrNull
 import com.cobblemon.mod.common.util.getStringOrNull
 import com.cobblemon.mod.common.util.isStandingOn
 import com.cobblemon.mod.common.util.resolve
 import com.cobblemon.mod.common.util.worldRegistry
+import net.minecraft.core.BlockPos
 import net.minecraft.core.registries.Registries
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.server.level.ServerPlayer
@@ -48,7 +50,10 @@ import net.minecraft.tags.TagKey
 import net.minecraft.world.damagesource.DamageSource
 import net.minecraft.world.damagesource.DamageTypes
 import net.minecraft.world.entity.Entity
+import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.TamableAnimal
+import net.minecraft.world.level.block.BonemealableBlock
+import net.minecraft.world.level.block.CropBlock
 import net.minecraft.world.phys.AABB
 import net.minecraft.world.phys.Vec3
 import java.util.UUID
@@ -78,8 +83,13 @@ object EntityMoLangFunctions : AbstractMoLangFunctionHolder<Entity>() {
             "vertical_velocity" to { DoubleValue(thisEntity.deltaMovement.y) },
             "is_on_ground" to { _ -> DoubleValue(thisEntity.onGround()) },
             "world" to { _ -> thisEntity.level().worldRegistry.wrapAsHolder(thisEntity.level()).asWorldMoLangValue() },
+            "dimension" to { StringValue(thisEntity.level().dimension().location().toString()) },
             "biome" to { _ -> thisEntity.level().getBiome(thisEntity.blockPosition()).asBiomeMoLangValue() },
             "is_passenger" to { DoubleValue(thisEntity.isPassenger) },
+            "is_passenger" to isPassenger@{ params ->
+                val passengerEntity = (params.get<MoValue>(0) as? ObjectValue<*>)?.obj as? LivingEntity ?: return@isPassenger DoubleValue.ZERO
+                DoubleValue(passengerEntity in thisEntity.passengers)
+            },
             "discard" to { thisEntity.discard() },
             "is_sneaking" to { _ -> DoubleValue(thisEntity.isShiftKeyDown) },
             "is_sprinting" to { _ -> DoubleValue(thisEntity.isSprinting) },
@@ -121,6 +131,62 @@ object EntityMoLangFunctions : AbstractMoLangFunctionHolder<Entity>() {
                 listOf(thisEntity.deltaMovement.x, thisEntity.deltaMovement.y, thisEntity.deltaMovement.z)
                     .asArrayValue(::DoubleValue)
             },
+            "set_position" to { params ->
+                val x = params.getDouble(0)
+                val y = params.getDouble(1)
+                val z = params.getDouble(2)
+                thisEntity.setPos(x, y, z)
+                DoubleValue.ONE
+            },
+            "fertilize_nearby_crops" to { params -> //TODO: pretty bespoke. Maybe should be moved or generalized?
+                val radius = params.getIntOrNull(0) ?: 8
+                val maxCrops = params.getIntOrNull(1) ?: 8
+
+                var fertilizedCount = 0
+                val level = thisEntity.level()
+                val centerPos = thisEntity.blockPosition()
+
+                // Find all bonemealable blocks within radius
+                val bonemealableBlocks = mutableListOf<BlockPos>()
+
+                for (x in -radius..radius) {
+                    for (y in -3..3) { // Limited vertical range
+                        for (z in -radius..radius) {
+                            val pos = centerPos.offset(x, y, z)
+                            val blockState = level.getBlockState(pos)
+                            val block = blockState.block
+
+                            // Check if block can be bonemealed
+                            if (block is BonemealableBlock && block is CropBlock && block.isValidBonemealTarget(level, pos, blockState)) {
+                                bonemealableBlocks.add(pos)
+                            }
+                        }
+                    }
+                }
+
+                // Shuffle and take up to maxCrops blocks to fertilize
+                bonemealableBlocks.shuffle()
+                val blocksToFertilize = bonemealableBlocks.take(maxCrops)
+
+                for (pos in blocksToFertilize) {
+                    val blockState = level.getBlockState(pos)
+                    val block = blockState.block
+
+                    if (block is BonemealableBlock && block.isValidBonemealTarget(level, pos, blockState)) {
+                        if (block.isBonemealSuccess(level, level.random, pos, blockState)) {
+                            block.performBonemeal(level as ServerLevel, level.random, pos, blockState)
+
+                            // Add bonemeal particle
+                            val particlePos = block.getParticlePos(pos)
+                            level.levelEvent(1505, particlePos, 15) // Same event used for bonemealing in vanilla
+
+                            fertilizedCount++
+                        }
+                    }
+                }
+
+                DoubleValue(fertilizedCount.toDouble())
+            },
             "tags" to {
                 val tags = thisEntity.tags
                 val array = ArrayStruct(hashMapOf())
@@ -233,7 +299,7 @@ object EntityMoLangFunctions : AbstractMoLangFunctionHolder<Entity>() {
                 val intangible = params.getBooleanOrNull(0) ?: true
                 thisEntity.noPhysics = intangible
                 DoubleValue.ONE
-            }
+            },
         )
 
 

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

@@ -39,6 +39,7 @@ import net.minecraft.world.entity.Mob
 import net.minecraft.world.entity.PathfinderMob
 import net.minecraft.world.entity.TamableAnimal
 import net.minecraft.world.entity.ai.behavior.BlockPosTracker
+import net.minecraft.world.entity.ai.behavior.EntityTracker
 import net.minecraft.world.entity.ai.memory.MemoryModuleType
 import net.minecraft.world.entity.ai.memory.MemoryStatus
 import net.minecraft.world.entity.ai.memory.WalkTarget
@@ -123,6 +124,23 @@ object LivingEntityMoLangFunctions : AbstractMoLangFunctionHolder<LivingEntity>(
                 duration.toLong()
             )
         }
+        map["look_at_entity"] = put@{ params ->
+            val targetEntity = params.get<MoValue>(0)
+            val duration = params.getDoubleOrNull(1)?.toInt() ?: 20
+
+            val lookEntity = if (targetEntity is ObjectValue<*> && targetEntity.obj is Entity) {
+                targetEntity.obj as Entity
+            } else {
+                return@put DoubleValue.ZERO
+            }
+
+            // Set the current entity to track the looked for entity
+            val brain = entity.brain
+            val tracker = EntityTracker(lookEntity, true)
+            brain.setMemoryWithExpiry(MemoryModuleType.LOOK_TARGET, tracker, duration.toLong())
+
+            DoubleValue.ONE
+        }
         map["get_wander_control_memory"] = put@{
             val value = entity.brain.getMemorySafely(CobblemonMemories.WANDER_CONTROL).orElse(null)
                 ?: CobblemonWanderControl()

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

@@ -23,6 +23,7 @@ import com.cobblemon.mod.common.api.molang.ObjectValue
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.battles.BattleBuilder
 import com.cobblemon.mod.common.battles.BattleFormat
+import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.entity.npc.NPCEntity
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.net.messages.client.battle.BattleMusicPacket
@@ -32,6 +33,7 @@ import com.cobblemon.mod.common.util.activeDialogue
 import com.cobblemon.mod.common.util.asBlockPos
 import com.cobblemon.mod.common.util.asResource
 import com.cobblemon.mod.common.util.asUUID
+import com.cobblemon.mod.common.util.blockRegistry
 import com.cobblemon.mod.common.util.getBattleState
 import com.cobblemon.mod.common.util.getBooleanOrNull
 import com.cobblemon.mod.common.util.getDoubleOrNull
@@ -44,14 +46,19 @@ import com.cobblemon.mod.common.util.party
 import com.cobblemon.mod.common.util.pc
 import com.cobblemon.mod.common.util.pokedex
 import com.cobblemon.mod.common.util.server
+import com.cobblemon.mod.common.util.toArrayStruct
+import net.minecraft.client.player.AbstractClientPlayer
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.sounds.SoundSource
+import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
+import net.minecraft.world.level.ClipContext
 import net.minecraft.world.level.GameType
+import net.minecraft.world.phys.HitResult
 import kotlin.collections.iterator
 
 object PlayerMoLangFunctions : AbstractMoLangFunctionHolder<Player>() {
@@ -379,6 +386,61 @@ object PlayerMoLangFunctions : AbstractMoLangFunctionHolder<Player>() {
                 } ?: DoubleValue.ZERO
             }
             map["has_chosen_starter"] = { _ -> DoubleValue(Cobblemon.playerDataManager.getGenericData(player).starterSelected) }
+            map["ride"] = put@{ params ->
+                val entity = (params.get<MoValue>(0) as? ObjectValue<*>)?.obj as? Entity ?: return@put DoubleValue.ZERO
+                player.startRiding(entity)
+            }
+            map["has_respawn_position"] = {
+                DoubleValue(player.respawnPosition != null)
+            }
+            map["respawn_position"] = {
+                player.respawnPosition?.toArrayStruct() ?: DoubleValue.ZERO
+            }
+            map["respawn_dimension"] = {
+                StringValue(player.respawnDimension.location().toString())
+            }
+            map["teleport_to_respawn"] = put@{
+                val respawnPosition = player.respawnPosition?.center ?: return@put DoubleValue.ZERO
+                player.teleportTo(respawnPosition.x, respawnPosition.y, respawnPosition.z)
+                DoubleValue.ONE
+            }
+            map["get_looked_block"] = put@{ params ->
+                // Get the block the player is looking at 'distance' units away
+                val distance = params.getDoubleOrNull(0) ?: 8.0
+
+                // perform clip
+                val level = player.level()
+                val eye = player.eyePosition
+                val view = player.getViewVector(1.0f)
+                val lookPos = eye.add(view.scale(distance))
+                val hitResult = level.clip(ClipContext(eye, lookPos, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, player))
+
+                if (hitResult.type == HitResult.Type.BLOCK) {
+                    // Get base block info
+                    val blockPos = hitResult.blockPos
+                    val blockState = level.getBlockState(blockPos)
+                    val blockHolder = level.blockRegistry.wrapAsHolder(blockState.block)
+                    val blockValue = blockHolder.asMoLangValue(Registries.BLOCK)
+
+                    // Attach the position to the blockValue return
+                    blockValue.addFunction("x") { DoubleValue(blockPos.x.toDouble()) }
+                    blockValue.addFunction("y") { DoubleValue(blockPos.y.toDouble()) }
+                    blockValue.addFunction("z") { DoubleValue(blockPos.z.toDouble()) }
+
+                    return@put blockValue
+                } else {
+                    return@put DoubleValue.ZERO
+                }
+            }
+            map["is_battling"] = {
+                DoubleValue(player.isInBattle())
+            }
+        }
+
+        if (player is AbstractClientPlayer) {
+            map["is_battling"] = {
+                DoubleValue(CobblemonClient.battle?.spectating == false) // Checks not-null and not-spectating at the same time, trust
+            }
         }
 
         return map

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

@@ -15,6 +15,7 @@ import com.bedrockk.molang.runtime.value.MoValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.CobblemonMovesetBuilders
+import com.cobblemon.mod.common.CobblemonPokeSkills
 import com.cobblemon.mod.common.api.mark.Marks
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
 import com.cobblemon.mod.common.api.moves.BenchedMove
@@ -26,6 +27,9 @@ import com.cobblemon.mod.common.api.riding.stats.RidingStat
 import com.cobblemon.mod.common.api.storage.party.PartyStore
 import com.cobblemon.mod.common.pokemon.IVs
 import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.pokemon.activestate.ActivePokemonState
+import com.cobblemon.mod.common.pokemon.activestate.SentOutState
+import com.cobblemon.mod.common.pokemon.activestate.ShoulderedState
 import com.cobblemon.mod.common.util.asArrayValue
 import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import com.cobblemon.mod.common.util.getBooleanOrNull
@@ -109,7 +113,7 @@ object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
             DoubleValue(pokemon.species.nationalPokedexNumber.toDouble())
         }
         map["types"] = {
-            pokemon.form.types.map { it.toString() }.asArrayValue(::StringValue)
+            pokemon.form.types.map { it.showdownId }.asArrayValue(::StringValue)
         }
         map["gender_ratio"] = {
             DoubleValue(pokemon.form.maleRatio.toDouble())
@@ -447,6 +451,29 @@ object PokemonMoLangFunctions : AbstractMoLangFunctionHolder<Pokemon>() {
             evolution?.forceEvolve(pokemon)
             StringValue(evolution.toString())
         }
+        map["is_sent_out"] = {
+            DoubleValue(pokemon.state is SentOutState)
+        }
+        map["is_shouldered"] = {
+            DoubleValue(pokemon.state is ShoulderedState)
+        }
+        map["entity"] = {
+            (pokemon.state as? ActivePokemonState)?.entity?.struct ?: DoubleValue.ZERO
+        }
+        map["is_rideable"] = put@{
+            return@put DoubleValue(!pokemon.riding.behaviours.isNullOrEmpty())
+        }
+        map["has_status"] = put@{ params ->
+            val status = params.getString(0).asIdentifierDefaultingNamespace()
+            return@put DoubleValue(pokemon.status?.status?.name == status)
+        }
+        map["add_skill_cooldown"] = put@{ params ->
+            val skillId = params.getString(0).asIdentifierDefaultingNamespace()
+            val cooldownTicks = params.getIntOrNull(1)
+            val skill = CobblemonPokeSkills.skills[skillId] ?: return@put DoubleValue.ZERO
+            pokemon.addSkillCooldown(skillId, cooldownTicks ?: skill.cooldownTicks)
+            return@put DoubleValue.ONE
+        }
 
         map["entity"] = { pokemon.entity?.asMoLangValue() ?: DoubleValue.ZERO }
         map["is_alpha"] = { DoubleValue(pokemon.isAlpha) }

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

@@ -40,6 +40,7 @@ import net.minecraft.world.level.Level
 import net.minecraft.world.level.Level.ExplosionInteraction
 import net.minecraft.world.level.biome.Biome
 import net.minecraft.world.level.block.Block
+import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity
 import net.minecraft.world.level.levelgen.Heightmap
 import net.minecraft.world.level.storage.loot.LootParams
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets
@@ -61,6 +62,26 @@ object WorldMoLangFunctions : AbstractMoLangFunctionHolder<Holder<Level>>() {
             val time = world.dayTime % 24000
             return@put DoubleValue(timeOfDay.contains(time.toInt()))
         }
+        map["add_furnace_fuel"] = put@{ params ->
+            val x = params.getInt(0)
+            val y = params.getInt(1)
+            val z = params.getInt(2)
+            val fuelTicks = params.getInt(3)
+
+            val blockEntity = world.getBlockEntity(BlockPos(x, y, z))
+            if (blockEntity is AbstractFurnaceBlockEntity) {
+                // Add fuel time to the furnace
+                blockEntity.litTime += fuelTicks
+
+                // If this exceeds the litDuration then bump it up
+                if (blockEntity.litTime >= blockEntity.litDuration) {
+                    blockEntity.litDuration = blockEntity.litTime
+                }
+                blockEntity.setChanged()
+                return@put DoubleValue.ONE
+            }
+            return@put DoubleValue.ZERO
+        }
         map["game_time"] = { _ -> DoubleValue(world.gameTime.toDouble()) }
         map["time_of_day"] = put@{
             val time = world.dayTime % 24000
@@ -128,13 +149,13 @@ object WorldMoLangFunctions : AbstractMoLangFunctionHolder<Holder<Level>>() {
             val x = params.getDouble(0)
             val y = params.getDouble(1)
             val z = params.getDouble(2)
-            val range = params.getDouble(3).toFloat()
+            val range = params.getDoubleOrNull(3) ?: 8.0
             world.explode(
                 null,
                 x,
                 y,
                 z,
-                range,
+                range.toFloat(),
                 ExplosionInteraction.valueOf(
                     params.getStringOrNull(4)?.uppercase() ?: ExplosionInteraction.TNT.name
                 )

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

@@ -50,7 +50,7 @@ class ActionEffectTimeline(
     }
 
     fun chainKeyframes(context: ActionEffectContext, iterator: Iterator<ActionEffectKeyframe>, finalFuture: CompletableFuture<Unit>) {
-        if (!iterator.hasNext()) {
+        if (!iterator.hasNext() || context.cancelled) {
             finalFuture.complete(Unit)
         } else {
             val keyframe = iterator.next()
@@ -70,6 +70,7 @@ class ActionEffectContext(
     val runtime: MoLangRuntime,
     var canBeInterrupted: Boolean = false,
     var interrupted: Boolean = false,
+    var cancelled: Boolean = false,
     var currentKeyframes: MutableList<ActionEffectKeyframe> = mutableListOf(),
     var level: Level? = null
 ) {

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

@@ -57,6 +57,7 @@ object ActionEffects : JsonDataRegistry<ActionEffectTimeline> {
         ActionEffectKeyframe.register<RunActionEffectKeyframe>("run_action_effect")
         ActionEffectKeyframe.register<EntityParticlesActionEffectKeyframe>("entity_particles")
         ActionEffectKeyframe.register<EntitySoundActionEffectKeyframe>("entity_sound")
+        ActionEffectKeyframe.register<CancelActionEffectKeyframe>("cancel")
     }
 
     override val gson = GsonBuilder()

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

@@ -0,0 +1,19 @@
+/*
+ * 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.moves.animations.keyframes
+
+import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
+import java.util.concurrent.CompletableFuture
+
+class CancelActionEffectKeyframe : ConditionalActionEffectKeyframe() {
+    override fun playWhenTrue(context: ActionEffectContext): CompletableFuture<Unit> {
+        context.cancelled = true
+        return CompletableFuture.completedFuture(Unit)
+    }
+}

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

@@ -21,6 +21,7 @@ import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
 import net.minecraft.commands.arguments.EntityArgument.getPlayers
 import java.util.concurrent.CompletableFuture
 import net.minecraft.server.level.ServerLevel
+import net.minecraft.world.phys.Vec3
 
 /**
  * Spawns particles on the entity based on the given particle effect and locator.
@@ -65,15 +66,36 @@ class EntityParticlesActionEffectKeyframe : ConditionalActionEffectKeyframe(), E
             allEntities.any { player.distanceTo(it) <= visibilityRange }
         }
 
+        // Try to resolve a world-position target from runtime variables
+        val runtimeTargetPosition: Vec3? = try {
+            val x = "v.target_x".asExpressionLike().resolveDouble(context.runtime)
+            val y = "v.target_y".asExpressionLike().resolveDouble(context.runtime)
+            val z = "v.target_z".asExpressionLike().resolveDouble(context.runtime)
+            if (x != 0.0 || y != 0.0 || z != 0.0) Vec3(x, y, z) else null
+        } catch (e: Exception) {
+            null
+        }
+
 
         sourceEntities.filter { it is PosableEntity }.forEach { entity ->
-            if (targetLocators == null) {
-                val packet = SpawnSnowstormEntityParticlePacket(effectIdentifier, entity.id, locators)
-                packet.sendToPlayers(players)
-            }
-            else {
+            // If target entities are specified, send the particle using entity locators/position.
+            // If there are no target entities then attempt to send to v.target world position or send without target.
+            if (targetEntities.isNotEmpty()) {
                 targetEntities.forEach { targetEntity ->
-                    val packet = SpawnSnowstormEntityParticlePacket(effectIdentifier, entity.id, locators, targetEntity.id, targetLocators!!.toList())
+                    if (targetLocators != null) {
+                        val packet = SpawnSnowstormEntityParticlePacket(effectIdentifier, entity.id, locators, targetEntity.id, targetLocators!!.toList())
+                        packet.sendToPlayers(players)
+                    } else {
+                        val packet = SpawnSnowstormEntityParticlePacket(effectIdentifier, entity.id, locators, targetEntity.id)
+                        packet.sendToPlayers(players)
+                    }
+                }
+            } else {
+                if (runtimeTargetPosition != null) {
+                    val packet = SpawnSnowstormEntityParticlePacket(effectIdentifier, entity.id, locators, targetPosition = runtimeTargetPosition)
+                    packet.sendToPlayers(players)
+                } else {
+                    val packet = SpawnSnowstormEntityParticlePacket(effectIdentifier, entity.id, locators)
                     packet.sendToPlayers(players)
                 }
             }

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

@@ -8,8 +8,6 @@
 
 package com.cobblemon.mod.common.api.moves.animations.keyframes
 
-import com.bedrockk.molang.runtime.struct.QueryStruct
-import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.molang.ExpressionLike
 import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
 import com.cobblemon.mod.common.api.scheduling.delayedFuture

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

@@ -8,6 +8,8 @@
 
 package com.cobblemon.mod.common.api.moves.animations.keyframes
 
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.molang.ExpressionLike
 import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
 import com.cobblemon.mod.common.api.moves.animations.ActionEffects
 import java.util.concurrent.CompletableFuture
@@ -18,16 +20,37 @@ import net.minecraft.resources.ResourceLocation
  * effect is marked complete only when the action effect it runs is complete unless [waitForActionEffect] is
  * false.
  *
+ * If [expression] is set, it will be resolved at runtime to determine the action effect identifier.
+ * This allows dynamic delegation based on MoLang variables (e.g. v.granting_move).
+ * If [expression] is not set, the static [actionEffect] identifier is used instead.
+ *
  * @author Hiroku
  * @since January 21st, 2024
  */
 class RunActionEffectKeyframe : ConditionalActionEffectKeyframe() {
     val actionEffect: ResourceLocation? = null
+    val expression: ExpressionLike? = null
     val waitForActionEffect = true
     override fun playWhenTrue(context: ActionEffectContext): CompletableFuture<Unit> {
-        return if (actionEffect != null) {
-            ActionEffects.actionEffects[actionEffect]?.run(context)?.takeIf { waitForActionEffect } ?: skip()
+        val effectId = if (expression != null) {
+            val resolved = expression.resolveString(context.runtime)
+            if (resolved == "0" || resolved.isBlank()) {
+                Cobblemon.LOGGER.warn("RunActionEffectKeyframe expression resolved to empty/zero string: $resolved")
+                return skip()
+            }
+            try {
+                ResourceLocation.parse(resolved)
+            } catch (e: Exception) {
+                Cobblemon.LOGGER.warn("RunActionEffectKeyframe expression resolved to invalid resource location: $resolved with exception: $e")
+                return skip()
+            }
         } else {
+            actionEffect
+        }
+        return if (effectId != null) {
+            ActionEffects.actionEffects[effectId]?.run(context)?.takeIf { waitForActionEffect } ?: skip()
+        } else {
+            Cobblemon.LOGGER.warn("RunActionEffectKeyframe has no action effect identifier or expression to run")
             skip()
         }
     }

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

@@ -759,6 +759,7 @@ open class PokemonProperties {
         shiny?.let { json.addProperty(DataKeys.POKEMON_SHINY, it) }
         gender?.let { json.addProperty(DataKeys.POKEMON_GENDER, it.name) }
         species?.let { json.addProperty(DataKeys.POKEMON_SPECIES_TEXT, it) }
+        nickname?.let { json.addProperty(DataKeys.POKEMON_NICKNAME, it.string) }
         form?.let { json.addProperty(DataKeys.POKEMON_FORM_ID, it) }
         friendship?.let { json.addProperty(DataKeys.POKEMON_FRIENDSHIP, it) }
         fullness?.let { json.addProperty(DataKeys.POKEMON_FULLNESS, it) }
@@ -795,6 +796,7 @@ open class PokemonProperties {
         shiny = json.get(DataKeys.POKEMON_SHINY)?.asBoolean
         gender = json.get(DataKeys.POKEMON_GENDER)?.asString?.let { Gender.valueOf(it) }
         species = json.get(DataKeys.POKEMON_SPECIES_TEXT)?.asString
+        nickname = json.get(DataKeys.POKEMON_NICKNAME)?.asString?.let(Component::literal)
         form = json.get(DataKeys.POKEMON_FORM_ID)?.asString
         friendship = json.get(DataKeys.POKEMON_FRIENDSHIP)?.asInt
         fullness = json.get(DataKeys.POKEMON_FULLNESS)?.asInt

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

@@ -102,7 +102,7 @@ open class PlayerPartyStore(
             for (pokemon in this) {
                 // Awake from fainted
                 if (pokemon.isFainted()) {
-                    //Skip awaken logic check if config value is 0
+                    // Skip awaken logic check if config value is 0
                     if (Cobblemon.config.faintAwakenHealthPercent > 0) {
                         pokemon.faintedTimer -= 1
                         if (pokemon.faintedTimer <= -1) {
@@ -119,7 +119,7 @@ open class PlayerPartyStore(
                 }
                 // Passive healing while less than full health
                 else if (pokemon.currentHealth < pokemon.maxHealth) {
-                    //Skip passive healing logic check if config value is 0
+                    // Skip passive healing logic check if config value is 0
                     if (Cobblemon.config.healPercent > 0) {
                         pokemon.healTimer--
                         if (pokemon.healTimer <= -1) {

common/src/main/kotlin/com/cobblemon/mod/common/api/tms/TechnicalMachines.kt

@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.api.data.JsonDataRegistry
 import com.cobblemon.mod.common.api.moves.MoveTemplate
 import com.cobblemon.mod.common.api.moves.adapters.MoveTemplateAdapter
 import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import com.cobblemon.mod.common.net.messages.client.tms.TechnicalMachineRegistrySyncPacket
 import com.cobblemon.mod.common.util.adapters.TMObtainMethodAdapter
 import com.cobblemon.mod.common.util.adapters.IdentifierAdapter
 import com.cobblemon.mod.common.util.cobblemonResource
@@ -70,5 +71,7 @@ object TechnicalMachines : JsonDataRegistry<TechnicalMachine> {
 
     fun getByResourceLocation(resourceLocation: ResourceLocation) = tmMap[resourceLocation]
     fun getAllResourceLocations() = tmMap.keys.toSet()
-    override fun sync(player: ServerPlayer) {}
+    override fun sync(player: ServerPlayer) {
+        TechnicalMachineRegistrySyncPacket(tmMap.values.toList()).sendToPlayer(player)
+    }
 }

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

@@ -16,24 +16,20 @@ import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.core.HolderLookup
 import net.minecraft.core.NonNullList
+import net.minecraft.core.component.DataComponents
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket
 import net.minecraft.sounds.SoundEvent
 import net.minecraft.sounds.SoundSource
-import net.minecraft.world.ContainerHelper
-import net.minecraft.world.Containers
-import net.minecraft.world.InteractionResult
-import net.minecraft.world.ItemInteractionResult
-import net.minecraft.world.WorldlyContainer
+import net.minecraft.world.*
 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.entity.BlockEntity
 import net.minecraft.world.level.block.state.BlockState
-import net.minecraft.world.phys.BlockHitResult
 import net.minecraft.world.level.gameevent.GameEvent
-import java.util.OptionalInt
+import net.minecraft.world.phys.BlockHitResult
+import java.util.*
 import kotlin.math.pow
 
 class DiscShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(CobblemonBlockEntities.DISC_SHELF, pos, state), WorldlyContainer {
@@ -134,25 +130,7 @@ class DiscShelfBlockEntity(pos: BlockPos, state: BlockState) : BlockEntity(Cobbl
         return stack.item is TechnicalMachineItem
                 || stack.item == CobblemonItems.UPGRADE
                 || stack.item == CobblemonItems.DUBIOUS_DISC
-                || stack.item == Items.MUSIC_DISC_13
-                || stack.item == Items.MUSIC_DISC_CAT
-                || stack.item == Items.MUSIC_DISC_BLOCKS
-                || stack.item == Items.MUSIC_DISC_CHIRP
-                || stack.item == Items.MUSIC_DISC_FAR
-                || stack.item == Items.MUSIC_DISC_MALL
-                || stack.item == Items.MUSIC_DISC_MELLOHI
-                || stack.item == Items.MUSIC_DISC_STAL
-                || stack.item == Items.MUSIC_DISC_STRAD
-                || stack.item == Items.MUSIC_DISC_WARD
-                || stack.item == Items.MUSIC_DISC_11
-                || stack.item == Items.MUSIC_DISC_WAIT
-                || stack.item == Items.MUSIC_DISC_OTHERSIDE
-                || stack.item == Items.MUSIC_DISC_5
-                || stack.item == Items.MUSIC_DISC_RELIC
-                || stack.item == Items.MUSIC_DISC_PRECIPICE
-                || stack.item == Items.MUSIC_DISC_CREATOR
-                || stack.item == Items.MUSIC_DISC_CREATOR_MUSIC_BOX
-                || stack.item == Items.MUSIC_DISC_PIGSTEP
+                || stack.has(DataComponents.JUKEBOX_PLAYABLE)
     }
 
     fun onNoteBlockPulse(level: Level, noteBlockPos: BlockPos, soundEvent: SoundEvent) {

common/src/main/kotlin/com/cobblemon/mod/common/block/multiblock/FossilMultiblockStructure.kt

@@ -630,7 +630,8 @@ class FossilMultiblockStructure (
         result.putInt(DataKeys.ORGANIC_MATERIAL, organicMaterialInside)
         val fossilInv = ListTag()
 
-        fossilInventory.forEach { fossilInv.add(ItemStack.CODEC.encodeStart(NbtOps.INSTANCE, it).orThrow) }
+        val ops = registryLookup.createSerializationContext(NbtOps.INSTANCE)
+        fossilInventory.forEach { fossilInv.add(ItemStack.CODEC.encodeStart(ops, it).getOrThrow()) }
         result.put(DataKeys.FOSSIL_INVENTORY, fossilInv)
         result.putString(DataKeys.CONNECTOR_DIRECTION, tankConnectorDirection?.toString())
 
@@ -669,7 +670,10 @@ class FossilMultiblockStructure (
 
             val fossilInv = if (nbt.contains(DataKeys.FOSSIL_INVENTORY)) { (nbt.get(DataKeys.FOSSIL_INVENTORY) as ListTag) } else ListTag()
             val actualFossilList = mutableListOf<ItemStack>()
-            fossilInv.forEach { ItemStack.parse(registryLookup, it).ifPresent(actualFossilList::add) }
+
+            val ops = registryLookup.createSerializationContext(NbtOps.INSTANCE)
+            fossilInv.forEach { ItemStack.CODEC.parse(ops, it).result().ifPresent(actualFossilList::add) }
+
             result.fossilInventory = actualFossilList
             result.tankConnectorDirection = Direction.byName(nbt.getString(DataKeys.CONNECTOR_DIRECTION))
 

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

@@ -179,6 +179,8 @@ object CobblemonClient {
                     return@subscribe
                 }
 
+                storage.party.forEach { it?.tickSkillCooldowns() }
+
                 val nearbyPokemon = player.level().getEntities(
                     player,
                     AABB.ofSize(player.position(), 16.0, 16.0, 16.0)

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/wheel/InteractWheelButton.kt

@@ -28,7 +28,7 @@ class InteractWheelButton(
     private val tooltipText: String?,
     x: Int,
     y: Int,
-    private val isEnabled: Boolean,
+    private val isEnabled: () -> Boolean,
     private val colour: () -> Vector3f?,
     onPress: OnPress,
     private val canHover: (Double, Double) -> Boolean
@@ -74,12 +74,12 @@ class InteractWheelButton(
             y = y,
             width = width,
             height = height,
-            vOffset = if (isHovered(mouseX.toFloat(), mouseY.toFloat()) && isEnabled) height else 0,
+            vOffset = if (isHovered(mouseX.toFloat(), mouseY.toFloat()) && isEnabled()) height else 0,
             textureHeight = height * 2,
-            alpha = if (isEnabled) 1f else 0.4F
+            alpha = if (isEnabled()) 1f else 0.4F
         )
 
-        if(isEnabled && isHovered(mouseX.toFloat(), mouseY.toFloat())){
+        if (isEnabled() && isHovered(mouseX.toFloat(), mouseY.toFloat())){
             tooltipText?.let {
                 context.renderTooltip(Minecraft.getInstance().font, Component.translatable(it), mouseX, mouseY)
             }
@@ -95,7 +95,7 @@ class InteractWheelButton(
                 y = iconY,
                 width = ICON_SIZE,
                 height = ICON_SIZE,
-                alpha = if (isEnabled) 1F else 0.2F,
+                alpha = if (isEnabled()) 1F else 0.2F,
                 red = colour.x,
                 green = colour.y,
                 blue = colour.z,
@@ -114,7 +114,7 @@ class InteractWheelButton(
                     y = iconY - ICON_SIZE,
                     width = ICON_SIZE,
                     height = ICON_SIZE,
-                    alpha = if (isEnabled) 1F else 0.4F,
+                    alpha = if (isEnabled()) 1F else 0.4F,
                     red = colour.x,
                     green = colour.y,
                     blue = colour.z,

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/wheel/InteractWheelGUI.kt

@@ -18,7 +18,7 @@ import net.minecraft.client.gui.screens.Screen
 import net.minecraft.network.chat.Component
 import kotlin.math.max
 
-class InteractWheelGUI(private val options: Multimap<Orientation, InteractWheelOption>, title: Component) : Screen(title), CobblemonRenderable {
+open class InteractWheelGUI(private val options: Multimap<Orientation, InteractWheelOption>, title: Component) : Screen(title), CobblemonRenderable {
     companion object {
         const val SIZE = 170
         private val backgroundResource = cobblemonResource("textures/gui/interact/interact_wheel_base.png")
@@ -32,7 +32,7 @@ class InteractWheelGUI(private val options: Multimap<Orientation, InteractWheelO
         return super.keyPressed(keyCode, scanCode, modifiers)
     }
 
-    private val buttons = mutableListOf<InteractWheelButton>()
+    protected val buttons = mutableListOf<InteractWheelButton>()
     private var maxPage = 1
     private var currentPage = 0
     override fun renderBlurredBackground(delta: Float) { }
@@ -104,7 +104,7 @@ class InteractWheelGUI(private val options: Multimap<Orientation, InteractWheelO
                     tooltipText = option?.tooltipText,
                     x = x,
                     y = y,
-                    isEnabled = option != null && option.enabled,
+                    isEnabled = { option != null && option.enabled() },
                     colour = option?.colour ?: { null },
                     onPress = { option?.onPress?.invoke() },
                     canHover = { a: Double, b: Double -> !isMouseInCenter(a, b)}

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/wheel/InteractWheelGuiFactory.kt

@@ -9,20 +9,24 @@
 package com.cobblemon.mod.common.client.gui.interact.wheel
 
 import com.cobblemon.mod.common.CobblemonNetwork
+import com.cobblemon.mod.common.CobblemonPokeSkills
 import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.pokemon.interaction.PokemonInteractionGUICreationEvent
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.gui.interact.battleRequest.BattleConfigureGUI
 import com.cobblemon.mod.common.net.messages.client.PlayerInteractOptionsPacket
+import com.cobblemon.mod.common.net.messages.server.UsePokeSkillPacket
 import com.cobblemon.mod.common.net.messages.server.battle.SpectateBattlePacket
 import com.cobblemon.mod.common.net.messages.server.pokemon.interact.InteractPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.trade.AcceptTradeRequestPacket
 import com.cobblemon.mod.common.net.messages.server.trade.OfferTradePacket
+import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.google.common.collect.ArrayListMultimap
 import com.google.common.collect.Multimap
 import java.util.UUID
 import net.minecraft.client.Minecraft
+import net.minecraft.client.player.AbstractClientPlayer
 import net.minecraft.network.chat.Component
 import org.joml.Vector3f
 
@@ -30,7 +34,7 @@ fun createPokemonInteractGui(pokemonID: UUID, canMountShoulder: Boolean, canGive
     val mountShoulder = InteractWheelOption(
         iconResource = cobblemonResource("textures/gui/interact/interact_wheel_icon_shoulder.png"),
         tooltipText = "cobblemon.ui.interact.mount.shoulder",
-        enabled = canMountShoulder,
+        enabled = { canMountShoulder },
         onPress = {
             if (canMountShoulder) {
                 InteractPokemonPacket(pokemonID, InteractTypePokemon.SHOULDER).sendToServer()
@@ -41,7 +45,7 @@ fun createPokemonInteractGui(pokemonID: UUID, canMountShoulder: Boolean, canGive
     val giveHeldItem = InteractWheelOption(
         iconResource = cobblemonResource("textures/gui/interact/interact_wheel_icon_held_item.png"),
         tooltipText = "cobblemon.ui.interact.give.item",
-        enabled = canGiveHeld,
+        enabled = { canGiveHeld },
         onPress = {
             if (canGiveHeld) {
                 InteractPokemonPacket(pokemonID, InteractTypePokemon.HELD_ITEM).sendToServer()
@@ -52,7 +56,7 @@ fun createPokemonInteractGui(pokemonID: UUID, canMountShoulder: Boolean, canGive
     val giveCosmeticItem = InteractWheelOption(
         iconResource = cobblemonResource("textures/gui/interact/interact_wheel_icon_cosmetic_item.png"),
         tooltipText = "cobblemon.ui.interact.give.cosmetic_item",
-        enabled = canGiveCosmetic,
+        enabled = { canGiveCosmetic },
         onPress = {
             if (canGiveCosmetic) {
                 InteractPokemonPacket(pokemonID, InteractTypePokemon.COSMETIC_ITEM).sendToServer()
@@ -64,7 +68,7 @@ fun createPokemonInteractGui(pokemonID: UUID, canMountShoulder: Boolean, canGive
     val ride = InteractWheelOption(
         iconResource = cobblemonResource("textures/gui/interact/interact_wheel_icon_ride.png"),
         tooltipText = "cobblemon.ui.interact.ride",
-        enabled = canRide,
+        enabled = { canRide },
         onPress = {
             if (canRide) {
                 InteractPokemonPacket(pokemonID, InteractTypePokemon.RIDE).sendToServer()
@@ -177,6 +181,35 @@ fun createPlayerInteractGui(optionsPacket: PlayerInteractOptionsPacket): Interac
     return InteractWheelGUI(options, Component.translatable("cobblemon.ui.interact.player"))
 }
 
+fun createPokeSkillGui(player: AbstractClientPlayer, pokemon: Pokemon): InteractWheelGUI {
+    val accessibleSkills = CobblemonPokeSkills.getAccessibleSkills(player, pokemon)
+    val options: Multimap<Orientation, InteractWheelOption> = ArrayListMultimap.create()
+    for (skill in accessibleSkills) {
+        val skillOption = InteractWheelOption(
+            iconResource = skill.icon,
+            enabled = { skill.id !in pokemon.skillCooldownsTicks },
+            tooltipText = skill.name,
+            onPress = {
+                CobblemonNetwork.sendToServer(UsePokeSkillPacket(skillId = skill.id, pokemonId = pokemon.uuid))
+                closeGUI()
+            }
+        )
+        when (options.size()) {
+            0 -> options.put(Orientation.NORTH, skillOption)
+            1 -> options.put(Orientation.NORTHEAST, skillOption)
+            2 -> options.put(Orientation.SOUTHEAST, skillOption)
+            3 -> options.put(Orientation.SOUTH, skillOption)
+            4 -> options.put(Orientation.SOUTHWEST, skillOption)
+            5 -> options.put(Orientation.NORTHWEST, skillOption)
+            6 -> options.put(Orientation.WEST, skillOption)
+            7 -> options.put(Orientation.EAST, skillOption)
+            else -> break // We only have 8 slots
+        }
+    }
+
+    return PokeSkillWheelGUI(options, Component.translatable("cobblemon.ui.interact.poke_skill"))
+}
+
 private fun getLangKey(status: PlayerInteractOptionsPacket.OptionStatus) : String {
      return when (status) {
         PlayerInteractOptionsPacket.OptionStatus.TOO_FAR -> "cobblemon.ui.interact.too_far"

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/wheel/InteractWheelOption.kt

@@ -14,7 +14,7 @@ import org.joml.Vector3f
 data class InteractWheelOption(
     val iconResource: ResourceLocation,
     val secondaryIconResource: ResourceLocation? = null,
-    val enabled: Boolean = true,
+    val enabled: () -> Boolean = { true },
     val tooltipText: String?,
     val colour: () -> Vector3f? = { null },
     val onPress: () -> Unit

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/interact/wheel/PokeSkillWheelGUI.kt

@@ -0,0 +1,47 @@
+/*
+ * 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.client.gui.interact.wheel
+
+import com.google.common.collect.Multimap
+import net.minecraft.client.Minecraft
+import net.minecraft.network.chat.Component
+
+class PokeSkillWheelGUI(
+    private val options: Multimap<Orientation, InteractWheelOption>,
+    title: Component
+) : InteractWheelGUI(options, title) {
+
+    /**
+     * Due to the button being held swallow the event
+     */
+    override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
+        if (button == 0) return false
+        return super.mouseClicked(mouseX, mouseY, button)
+    }
+
+    /**
+     * On release will close the wheel and trigger the button press of the hovered button
+     * TODO: make this wheel choose more like pizza slices.
+     */
+    override fun mouseReleased(mouseX: Double, mouseY: Double, button: Int): Boolean {
+        if (button == 0) {
+            // Manually trigger the hovered button's press
+            buttons.forEach { btn ->
+                if (btn.isMouseOver(mouseX, mouseY)) {
+                    btn.onClick(mouseX, mouseY)
+                    return true
+                }
+            }
+            Minecraft.getInstance().setScreen(null)
+            return true
+        }
+        return super.mouseReleased(mouseX, mouseY, button)
+    }
+
+}

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

@@ -15,6 +15,7 @@ import com.cobblemon.mod.common.battles.BattleFormat
 import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.battle.ClientBattle
 import com.cobblemon.mod.common.client.gui.battle.BattleGUI
+import com.cobblemon.mod.common.client.gui.interact.wheel.createPokeSkillGui
 import com.cobblemon.mod.common.client.keybind.CobblemonBlockingKeyBinding
 import com.cobblemon.mod.common.client.keybind.KeybindCategories
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
@@ -26,12 +27,12 @@ import com.cobblemon.mod.common.pokemon.Pokemon
 import com.cobblemon.mod.common.util.isUsingPokedex
 import com.cobblemon.mod.common.util.traceFirstEntityCollision
 import com.mojang.blaze3d.platform.InputConstants
+import kotlin.math.pow
 import net.minecraft.client.Minecraft
 import net.minecraft.client.player.LocalPlayer
 import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.level.ClipContext
-import kotlin.math.pow
 
 object PartySendBinding : CobblemonBlockingKeyBinding(
     "key.cobblemon.throwpartypokemon",
@@ -39,32 +40,17 @@ object PartySendBinding : CobblemonBlockingKeyBinding(
     InputConstants.KEY_R,
     KeybindCategories.COBBLEMON_CATEGORY
 ) {
+    const val POKE_SKILL_TIME = 0.7F
     var canApplyChange = true
-    var heldDownSeconds = 0F
 
     fun actioned() {
         canApplyChange = false
-        wasDown = true
-        heldDownSeconds = 0F
     }
 
     fun canAction() = canApplyChange && Minecraft.getInstance().player?.isUsingPokedex() == false
 
-    override fun onTick() {
-        if (wasDown) {
-            if (heldDownSeconds < 100) {
-                heldDownSeconds += Minecraft.getInstance().timer.getGameTimeDeltaPartialTick(false)
-            }
-        } else {
-            heldDownSeconds = 0F
-        }
-
-        super.onTick()
-    }
-
     override fun onRelease() {
         val canAction = canAction()
-        wasDown = false
         canApplyChange = true
         if (!canAction) {
             return
@@ -105,7 +91,8 @@ object PartySendBinding : CobblemonBlockingKeyBinding(
             entityClass = LivingEntity::class.java,
             ignoreEntity = player,
             maxDistance = Cobblemon.config.battleSpectateMaxDistance,
-            collideBlock = ClipContext.Fluid.NONE)
+            collideBlock = ClipContext.Fluid.NONE
+        )
         if (canSendOutPokemon(player, targetEntity)) {
             sendToServer(SendOutPokemonPacket(CobblemonClient.storage.selectedSlot))
         } else {
@@ -127,10 +114,13 @@ object PartySendBinding : CobblemonBlockingKeyBinding(
                 //The server sends a packet back that opens the player interaction menu with the proper options
                 sendToServer(RequestPlayerInteractionsPacket(entity.uuid, entity.id, pokemon.uuid))
             }
+
             is PokemonEntity -> {
-                if (!entity.canBattle(player) || entity.position().distanceToSqr(player.position()) > Cobblemon.config.battleWildMaxDistance.pow(2)) return
-                    sendToServer(BattleChallengePacket(entity.id,  pokemon.uuid, BattleFormat.GEN_9_SINGLES))
-                }
+                if (!entity.canBattle(player) || entity.position()
+                        .distanceToSqr(player.position()) > Cobblemon.config.battleWildMaxDistance.pow(2)
+                ) return
+                sendToServer(BattleChallengePacket(entity.id, pokemon.uuid, BattleFormat.GEN_9_SINGLES))
+            }
         }
     }
 

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

@@ -19,6 +19,7 @@ import com.cobblemon.mod.common.entity.PosableEntity
 import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket
 import net.minecraft.client.Minecraft
 import net.minecraft.world.entity.Entity
+import net.minecraft.world.phys.Vec3
 
 object SpawnSnowstormEntityParticleHandler : ClientNetworkPacketHandler<SpawnSnowstormEntityParticlePacket> {
     override fun handle(packet: SpawnSnowstormEntityParticlePacket, client: Minecraft) {
@@ -31,6 +32,7 @@ object SpawnSnowstormEntityParticleHandler : ClientNetworkPacketHandler<SpawnSno
         val targetState = (targetedEntity as? PosableEntity)?.delegate as? PosableState
         val sourceLocators = packet.sourceLocators.firstNotNullOfOrNull { sourceState.getMatchingLocators(it).takeIf { it.isNotEmpty() } } ?: return
         val targetedLocator = packet.targetLocators?.firstOrNull { targetState?.getMatchingLocators(it)?.isNotEmpty() == true }
+        val targetPosition = packet.targetPosition
         val rootMatrix = sourceState.locatorStates["root"]!!
 
         sourceLocators.forEach { locator ->
@@ -40,6 +42,16 @@ object SpawnSnowstormEntityParticleHandler : ClientNetworkPacketHandler<SpawnSno
             val particleRuntime = MoLangRuntime().setup().setupClient()
             particleRuntime.environment.query.addFunction("entity") { sourceState.runtime.environment.query }
 
+            // Target resolution priority: entity+locator > world position > none
+            val targetPos: (() -> Vec3)? = if (targetedEntity != null) {
+                { targetedLocator?.let { targetState?.locatorStates?.get(it) }?.getOrigin() ?: targetedEntity.position() }
+            } else if (targetPosition != null) {
+                val pos = packet.targetPosition
+                { pos }
+            } else {
+                null
+            }
+
             val storm = ParticleStorm(
                 effect = effect,
                 emitterSpaceMatrix = particleMatrix,
@@ -49,7 +61,7 @@ object SpawnSnowstormEntityParticleHandler : ClientNetworkPacketHandler<SpawnSno
                 sourceVelocity = { sourceEntity.deltaMovement },
                 sourceAlive = { !sourceEntity.isRemoved },
                 sourceVisible = { !sourceEntity.isInvisible },
-                targetPos =  if (targetedEntity != null) { { targetedLocator?.let { targetState?.locatorStates?.get(it) }?.getOrigin() ?: targetedEntity.position() } } else null,
+                targetPos = targetPos,
                 entity = sourceEntity
             )
 

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

@@ -22,6 +22,8 @@ object ServerSettingsPacketHandler : ClientNetworkPacketHandler<ServerSettingsPa
         ServerSettings.maxPokemonFriendship = packet.maxPokemonFriendship
         ServerSettings.maxDynamaxLevel = packet.maxDynamaxLevel
         ServerSettings.unlockAllMoveDexMovesByDefault = packet.unlockAllMoveDexMovesByDefault
+        ServerSettings.pokemonIntrinsicSizeMin = packet.pokemonIntrinsicSizeMin
+        ServerSettings.pokemonIntrinsicSizeMax = packet.pokemonIntrinsicSizeMax
     }
 
 }

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

@@ -15,6 +15,7 @@ import com.cobblemon.mod.common.util.cobblemonResource
 import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.blaze3d.vertex.VertexConsumer
 import com.mojang.math.Axis
+import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.LevelRenderer
 import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.RenderType
@@ -39,13 +40,13 @@ class DiscShelfBlockEntityRenderer(ctx: BlockEntityRendererProvider.Context) :
     private val leftMargin = 1f
     private val rightMargin = 1f
     private val topMargin = 1f
-    private val bottomMargin = 1f
     private val interRowSpacing = 0f
     private val tmOverlayDepthOffset = -0.0002f
     private val slotBrightnessMultiplier = 0.65f
 
     private val tmBaseTexture = cobblemonResource("textures/block/disc_shelf/technical_machine_base.png")
     private val tmOverlayTexture = cobblemonResource("textures/block/disc_shelf/technical_machine_overlay.png")
+    private val musicDiscUnknownTexture = cobblemonResource("textures/block/disc_shelf/music_disc_unknown.png")
 
     override fun render(
         entity: DiscShelfBlockEntity,
@@ -77,7 +78,6 @@ class DiscShelfBlockEntityRenderer(ctx: BlockEntityRendererProvider.Context) :
         val slotWidth = slotWidthPixels / textureSize
         val slotHeight = slotHeightPixels / textureSize
         val verticalSpacing = (slotHeightPixels + interRowSpacing) / textureSize
-        val totalHeight = slotHeight * 7 + interRowSpacing * 6 / textureSize
         val startY = topMargin / textureSize
 
         for ((index, item) in entity.items.withIndex()) {
@@ -188,6 +188,13 @@ class DiscShelfBlockEntityRenderer(ctx: BlockEntityRendererProvider.Context) :
 
     private fun getItemTexture(itemStack: ItemStack): ResourceLocation {
         val id = BuiltInRegistries.ITEM.getKey(itemStack.item)
-        return cobblemonResource("textures/block/disc_shelf/${id.path}.png")
+        val resource = cobblemonResource("textures/block/disc_shelf/${id.path}.png")
+
+        val resourceManager = Minecraft.getInstance().resourceManager
+        if (resourceManager.getResource(resource).isEmpty) {
+            return musicDiscUnknownTexture
+        }
+
+        return resource
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ArbokModel.kt

@@ -1,121 +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.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.WaveAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.WaveSegment
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.sineFunction
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class ArbokModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("arbok")
-    override val head = getPart("head_ai")
-
-    override var portraitScale = 1.5F
-    override var portraitTranslation = Vec3(-0.4, 1.0, 0.0)
-
-    override var profileScale = 0.67F
-    override var profileTranslation = Vec3(0.0, 0.7, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var summary: Pose
-
-    val tail = getPart("tail")
-    val tail2 = getPart("tail2")
-    val tail3 = getPart("tail3")
-    val tail4 = getPart("tail4")
-    val tail5 = getPart("tail5")
-    val tailWaveSegment = WaveSegment(modelPart = tail, length = 11F)
-    val tail2WaveSegment = WaveSegment(modelPart = tail2, length = 11F)
-    val tail3WaveSegment = WaveSegment(modelPart = tail3, length = 11F)
-    val tail4WaveSegment = WaveSegment(modelPart = tail4, length = 11F)
-    val tail5WaveSegment = WaveSegment(modelPart = tail5, length = 11F)
-
-    override val cryAnimation = CryProvider { bedrockStateful("arbok", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("arbok", "blink") }
-        // TODO tongue_flick
-
-        val wave = WaveAnimation(
-            waveFunction = sineFunction(
-                period = 10F,
-                amplitude = 0.5F
-            ),
-            basedOnLimbSwing = true,
-            oscillationsScalar = 8F,
-            head = tail,
-            rotationAxis = ModelPartTransformation.Y_AXIS,
-            motionAxis = ModelPartTransformation.X_AXIS,
-            headLength = 0.1F,
-            segments = arrayOf(
-                tailWaveSegment,
-                tail2WaveSegment,
-                tail3WaveSegment,
-                tail4WaveSegment,
-                tail5WaveSegment
-            )
-        )
-
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("arbok", "sleep"))
-        )
-
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("arbok", "summary_idle"),
-                wave
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("arbok", "ground_walk"),
-                wave
-            )
-        )
-
-        summary = registerPose(
-            poseName = "summary",
-            poseTypes = UI_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("arbok", "summary_idle")
-            )
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = if (state.isPosedIn(standing, walk, sleep)) bedrockStateful("arbok", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DittoModel.kt

@@ -1,74 +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.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class DittoModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("ditto")
-
-    override var portraitScale = 3.2F
-    override var portraitTranslation = Vec3(0.0, -2.2, 0.0)
-
-    override var profileScale = 1.4F
-    override var profileTranslation = Vec3(0.0, -0.34, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var sleep: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("ditto", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("ditto", "blink") }
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-//                singleBoneLook()
-                bedrock("ditto", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-//                singleBoneLook()
-                bedrock("ditto", "ground_walk")
-            )
-        )
-
-        sleep = registerPose(
-            poseName = "sleep",
-            poseType = PoseType.SLEEP,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-//                singleBoneLook()
-                bedrock("ditto", "sleep")
-            )
-        )
-    }
-
-    override fun getFaintAnimation(state: PosableState) = bedrockStateful("ditto", "faint")
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OmanyteModel.kt

@@ -1,103 +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.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class OmanyteModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("omanyte")
-
-    override var portraitScale = 3.15F
-    override var portraitTranslation = Vec3(-0.06, -3.18, 0.0)
-
-    override var profileScale = 1.13F
-    override var profileTranslation = Vec3(0.0, -0.02, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var float: CobblemonPose
-    lateinit var swim: CobblemonPose
-    lateinit var sleep: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("omanyte", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("omanyte", "blink") }
-
-        sleep = registerPose(
-            poseName = "sleep",
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("omanyte", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STANDING_POSES + PoseType.UI_POSES,
-            quirks = arrayOf(blink),
-            transformTicks = 10,
-            condition = { !it.isBattling},
-            animations = arrayOf(
-                bedrock("omanyte", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = PoseType.MOVING_POSES - PoseType.SWIM,
-            quirks = arrayOf(blink),
-            transformTicks = 10,
-            animations = arrayOf(
-                bedrock("omanyte", "ground_walk")
-            )
-        )
-
-        float = registerPose(
-            poseName = "float",
-            poseTypes = setOf(PoseType.FLOAT, PoseType.HOVER),
-            quirks = arrayOf(blink),
-            transformTicks = 10,
-            animations = arrayOf(
-                bedrock("omanyte", "water_idle")
-            )
-        )
-
-        swim = registerPose(
-            poseName = "swim",
-            poseTypes = setOf(PoseType.SWIM, PoseType.FLY),
-            quirks = arrayOf(blink),
-            transformTicks = 10,
-            animations = arrayOf(
-                bedrock("omanyte", "water_swim")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle-standing",
-            poseTypes = PoseType.STATIONARY_POSES,
-            quirks = arrayOf(blink),
-            transformTicks = 10,
-            condition = { it.isBattling},
-            animations = arrayOf(
-                bedrock("omanyte", "battle_idle")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("omanyte", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OmastarModel.kt

@@ -1,102 +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.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class OmastarModel(root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("omastar")
-
-    override var portraitTranslation = Vec3(0.02, -2.20, 0.0)
-    override var portraitScale = 2.4F
-
-    override var profileTranslation = Vec3(0.0, 0.066, 0.0)
-    override var profileScale = 1.1F
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var float: CobblemonPose
-    lateinit var swim: CobblemonPose
-    lateinit var sleep: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("omastar", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("omastar", "blink") }
-        sleep = registerPose(
-            poseName = "sleep",
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("omastar", "sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STANDING_POSES + PoseType.UI_POSES,
-            quirks = arrayOf(blink),
-            transformTicks = 10,
-            condition = { !it.isBattling},
-            animations = arrayOf(
-                bedrock("omastar", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = PoseType.MOVING_POSES - PoseType.SWIM,
-            quirks = arrayOf(blink),
-            transformTicks = 10,
-            animations = arrayOf(
-                bedrock("omastar", "ground_walk")
-            )
-        )
-
-        float = registerPose(
-            poseName = "float",
-            poseTypes = setOf(PoseType.FLOAT, PoseType.HOVER),
-            quirks = arrayOf(blink),
-            transformTicks = 10,
-            animations = arrayOf(
-                bedrock("omastar", "water_idle")
-            )
-        )
-
-        swim = registerPose(
-            poseName = "swim",
-            poseTypes = setOf(PoseType.SWIM, PoseType.FLY),
-            quirks = arrayOf(blink),
-            transformTicks = 10,
-            animations = arrayOf(
-                bedrock("omastar", "water_swim")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle-standing",
-            poseTypes = PoseType.STATIONARY_POSES,
-            quirks = arrayOf(blink),
-            transformTicks = 10,
-            condition = { it.isBattling},
-            animations = arrayOf(
-                bedrock("omastar", "battle_idle")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("omastar", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FeraligatrModel.kt

@@ -1,155 +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.client.render.models.blockbench.pokemon.gen2
-
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.isBattling
-import com.cobblemon.mod.common.util.isUnderWater
-import com.cobblemon.mod.common.util.isInWater
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class FeraligatrModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame {
-    override val rootPart = root.registerChildWithAllChildren("feraligatr")
-    override val head = getPart("head_ai")
-
-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
-
-    override var portraitScale = 1.3F
-    override var portraitTranslation = Vec3(-0.7, 1.1, 0.0)
-
-    override var profileScale = 0.6F
-    override var profileTranslation = Vec3(0.0, 0.8, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var floating: Pose
-    lateinit var swimming: Pose
-    lateinit var sleep: Pose
-    lateinit var watersleep: Pose
-    lateinit var battleidle: Pose
-    lateinit var water_surface_idle: Pose
-    lateinit var water_surface_swim: Pose
-
-    val wateroffset = -10
-
-    override val cryAnimation = CryProvider { bedrockStateful("feraligatr", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("feraligatr", "blink")}
-
-        sleep = registerPose(
-            poseName = "sleeping",
-            poseType = PoseType.SLEEP,
-            condition = { !it.isInWater },
-            animations = arrayOf(bedrock("feraligatr", "sleep"))
-        )
-
-        watersleep = registerPose(
-            poseName = "water_sleeping",
-            poseType = PoseType.SLEEP,
-            condition = { it.isInWater },
-            animations = arrayOf(bedrock("feraligatr", "water_sleep"))
-        )
-
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.UI_POSES + PoseType.STAND,
-            transformTicks = 10,
-            condition = { !it.isBattling && !it.isInWater && !it.isUnderWater },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("feraligatr", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            transformTicks = 10,
-            poseType = PoseType.WALK,
-            condition = { !it.isInWater && !it.isUnderWater },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("feraligatr", "ground_walk")
-            )
-        )
-
-        floating = registerPose(
-            poseName = "floating",
-            transformTicks = 10,
-            poseType = PoseType.FLOAT,
-            condition = { it.isUnderWater },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("feraligatr", "water_idle")
-            )
-        )
-
-        swimming = registerPose(
-            poseName = "swimming",
-            transformTicks = 10,
-            condition = { it.isUnderWater },
-            poseType = PoseType.SWIM,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("feraligatr", "water_swim"),
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling && !it.isInWater },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("feraligatr", "battle_idle")
-            )
-        )
-
-        water_surface_idle = registerPose(
-            poseName = "surface_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            quirks = arrayOf(blink),
-            condition = { !it.isUnderWater && it.isInWater },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("feraligatr", "watersurface_idle"),
-            ),
-            transformedParts = arrayOf(rootPart.createTransformation().addPosition(ModelPartTransformation.Y_AXIS, wateroffset))
-        )
-
-        water_surface_swim = registerPose(
-            poseName = "surface_swim",
-            poseTypes = PoseType.MOVING_POSES,
-            quirks = arrayOf(blink),
-            condition = { !it.isUnderWater && it.isInWater },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("feraligatr", "watersurface_swim"),
-            ),
-            transformedParts = arrayOf(rootPart.createTransformation().addPosition(ModelPartTransformation.Y_AXIS, wateroffset))
-        )
-    }
-    override fun getFaintAnimation(state: PosableState) = if (state.isPosedIn(standing, walk, battleidle, sleep)) bedrockStateful("feraligatr", "faint") else if (state.isPosedIn(water_surface_idle, water_surface_swim, watersleep )) bedrockStateful("feraligatr", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SmoochumModel.kt

@@ -1,91 +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.client.render.models.blockbench.pokemon.gen2
-
-import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class SmoochumModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("smoochum")
-    override val head = getPart("head")
-
-    override var portraitScale = 2.3F
-    override var portraitTranslation = Vec3(-0.14, -1.0, 0.0)
-
-    override var profileScale = 0.8F
-    override var profileTranslation = Vec3(0.0, 0.55, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var shoulderLeft: Pose
-    lateinit var shoulderRight: Pose
-
-    val shoulderOffset = 1
-
-    override fun registerPoses() {
-//        val blink = quirk { bedrockStateful("smoochum", "blink") }
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-//            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("smoochum", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-//            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("smoochum", "ground_idle")
-            )
-        )
-
-        shoulderLeft = registerPose(
-                poseType = PoseType.SHOULDER_LEFT,
-                //quirks = arrayOf(blink),
-                animations = arrayOf(
-                        singleBoneLook(),
-                        bedrock("smoochum", "ground_idle")
-                ),
-                transformedParts = arrayOf(
-                        rootPart.createTransformation().addPosition(ModelPartTransformation.X_AXIS, shoulderOffset)
-                )
-        )
-
-        shoulderRight = registerPose(
-                poseType = PoseType.SHOULDER_RIGHT,
-                //quirks = arrayOf(blink),
-                animations = arrayOf(
-                        singleBoneLook(),
-                        bedrock("smoochum", "ground_idle")
-                ),
-                transformedParts = arrayOf(
-                        rootPart.createTransformation().addPosition(ModelPartTransformation.X_AXIS, -shoulderOffset)
-                )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("smoochum", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyphlosionHisuianModel.kt

@@ -19,7 +19,7 @@ import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.world.phys.Vec3
 
 class TyphlosionHisuianModel  (root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("typhlosion_hisui")
+    override val rootPart = root.registerChildWithAllChildren("typhlosion")
     override val head = getPart("head")
 
     override var portraitScale = 1.4F

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyranitarModel.kt

@@ -1,67 +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.client.render.models.blockbench.pokemon.gen2
-
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.BimanualSwingAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class TyranitarModel(root: ModelPart) : PokemonPosableModel(root), BipedFrame, BimanualFrame, HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("tyranitar")
-    override val head = getPart("head")
-
-    override val leftArm = getPart("arm_left")
-    override val rightArm = getPart("arm_right")
-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
-
-    override var portraitScale = 1.21F
-    override var portraitTranslation = Vec3(-0.43, 3.73, 0.0)
-
-    override var profileScale = 0.33F
-    override var profileTranslation = Vec3(0.02, 1.31, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("tyranitar", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("tyranitar", "blink") }
-        standing = registerPose(
-                poseName = "standing",
-                poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-                quirks = arrayOf(blink),
-                animations = arrayOf(
-                        singleBoneLook(pitchMultiplier = 0.2F, yawMultiplier = 0.4F),
-                        bedrock("tyranitar", "ground_idle")
-                )
-        )
-
-        walk = registerPose(
-                poseName = "walk",
-                poseTypes = PoseType.MOVING_POSES,
-                quirks = arrayOf(blink),
-                animations = arrayOf(
-                        singleBoneLook(pitchMultiplier = 0.2F, yawMultiplier = 0.4F),
-                        bedrock("tyranitar", "ground_idle"),
-                        BipedWalkAnimation(this, periodMultiplier = 0.6F, amplitudeMultiplier = 0.9F),
-                        BimanualSwingAnimation(this, swingPeriodMultiplier = 0.6F, amplitudeMultiplier = 0.9F)
-                )
-        )
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperPaldeanModel.kt

@@ -23,7 +23,7 @@ import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.world.phys.Vec3
 
 class WooperPaldeanModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame {
-    override val rootPart = root.registerChildWithAllChildren("wooper_paldean")
+    override val rootPart = root.registerChildWithAllChildren("wooper")
     override val head = getPart("head")
 
     override var portraitScale = 2.0F

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LuvdiscModel.kt

@@ -1,78 +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.client.render.models.blockbench.pokemon.gen3
-
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class LuvdiscModel (root: ModelPart) : PokemonPosableModel(root) {
-    override val rootPart = root.registerChildWithAllChildren("luvdisc")
-
-
-    override var portraitScale = 6.0F
-    override var portraitTranslation = Vec3(0.15, -6.5, 0.0)
-
-    override var profileScale = 2.0F
-    override var profileTranslation = Vec3(0.0, -1.3, 0.0)
-
-    lateinit var standing: Pose
-    lateinit var sleep: Pose
-    lateinit var walk: Pose
-    lateinit var float: Pose
-    lateinit var swim: Pose
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("luvdisc", "blink")}
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("luvdisc", "sleep"))
-        )
-        standing = registerPose(
-            poseName = "standing",
-            poseType = PoseType.STAND,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("luvdisc", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseType = PoseType.WALK,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("luvdisc", "ground_walk")
-            )
-        )
-
-        float = registerPose(
-            poseName = "float",
-            poseTypes = PoseType.UI_POSES + PoseType.FLOAT,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("luvdisc", "water_idle")
-            )
-        )
-
-        swim = registerPose(
-            poseName = "swim",
-            poseType = PoseType.SWIM,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                bedrock("luvdisc", "water_swim")
-            )
-        )
-    }
-        override fun getFaintAnimation(state: PosableState) = if (state.isPosedIn(standing, walk, sleep)) bedrockStateful("luvdisc", "ground_faint") else null
-
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChatotModel.kt

@@ -1,170 +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.client.render.models.blockbench.pokemon.gen4
-
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.WingFlapIdleAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BiWingedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.parabolaFunction
-import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.sineFunction
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.PoseType.Companion.FLYING_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.SHOULDER_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import com.cobblemon.mod.common.util.math.geometry.toRadians
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class ChatotModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BiWingedFrame{
-    override val rootPart = root.registerChildWithAllChildren("chatot")
-    override val leftWing = getPart("wing_left")
-    override val rightWing = getPart("wing_right")
-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
-    override val head = getPart("head")
-    private val tail = getPart("tail")
-
-    override var portraitScale = 3.5F
-    override var portraitTranslation = Vec3(-0.1, -2.1, 0.0)
-
-    override var profileScale = 1.2F
-    override var profileTranslation = Vec3(0.0, -0.01, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var stand: Pose
-    lateinit var walk: Pose
-    lateinit var fly: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("chatot", "cry") }
-
-    override fun registerPoses() {
-
-//        no sleep anim yet
-//        sleep = registerPose(
-//                poseType = PoseType.SLEEP,
-//                animations = arrayOf(bedrock("chatot", "sleep"))
-//        )
-
-        val blink = quirk { bedrockStateful("chatot", "blink") }
-
-        stand = registerPose(
-            poseName = "standing",
-            poseTypes = SHOULDER_POSES + UI_POSES + PoseType.STAND,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("chatot", "ground_idle")
-            )
-        )
-
-        fly = registerPose(
-            poseName = "hover",
-            poseTypes = FLYING_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("chatot", "air_idle"),
-                WingFlapIdleAnimation(this,
-                    flapFunction = sineFunction(verticalShift = -10F.toRadians(), period = 0.9F, amplitude = 0.6F),
-                    timeVariable = { state, _, _ -> state.animationSeconds },
-                    axis = ModelPartTransformation.Z_AXIS
-                )
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walking",
-            poseType = PoseType.WALK,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("chatot", "ground_idle"),
-                rootPart.translation(
-                    function = parabolaFunction(
-                        peak = -4F,
-                        period = 0.4F
-                    ),
-                    timeVariable = { state, _, _ -> state.animationSeconds },
-                    axis = ModelPartTransformation.Y_AXIS
-                ),
-                head.translation(
-                    function = sineFunction(
-                        amplitude = (-20F).toRadians(),
-                        period = 1F,
-                        verticalShift = (-10F).toRadians()
-                    ),
-                    axis = ModelPartTransformation.X_AXIS,
-                    timeVariable = { state, _, _ -> state.animationSeconds }
-                ),
-                leftLeg.rotation(
-                    function = parabolaFunction(
-                        tightness = -20F,
-                        phaseShift = 0F,
-                        verticalShift = (30F).toRadians()
-                    ),
-                    axis = ModelPartTransformation.X_AXIS,
-                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
-                ),
-                rightLeg.rotation(
-                    function = parabolaFunction(
-                        tightness = -20F,
-                        phaseShift = 0F,
-                        verticalShift = (30F).toRadians()
-                    ),
-                    axis = ModelPartTransformation.X_AXIS,
-                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
-                ),
-                tail.rotation(
-                    function = sineFunction(
-                        amplitude = (-5F).toRadians(),
-                        period = 1F
-                    ),
-                    axis = ModelPartTransformation.X_AXIS,
-                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
-                ),
-                wingFlap(
-                    flapFunction = sineFunction(
-                        amplitude = (-5F).toRadians(),
-                        period = 0.4F,
-                        phaseShift = 0.00F,
-                        verticalShift = (-20F).toRadians()
-                    ),
-                    timeVariable = { state, _, _ -> state.animationSeconds },
-                    axis = ModelPartTransformation.Z_AXIS
-                ),
-                rightWing.translation(
-                    function = parabolaFunction(
-                        tightness = -10F,
-                        phaseShift = 30F,
-                        verticalShift = (25F).toRadians()
-                    ),
-                    axis = ModelPartTransformation.Y_AXIS,
-                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
-                ),
-                leftWing.translation(
-                    function = parabolaFunction(
-                        tightness = -10F,
-                        phaseShift = 30F,
-                        verticalShift = (25F).toRadians()
-                    ),
-                    axis = ModelPartTransformation.Y_AXIS,
-                    timeVariable = { _, _, ageInTicks -> ageInTicks / 20 },
-                ),
-            )
-        )
-    }
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/TurtonatorModel.kt

@@ -1,86 +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.client.render.models.blockbench.pokemon.gen7
-
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.BimanualSwingAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class TurtonatorModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BimanualFrame {
-    override val rootPart = root.registerChildWithAllChildren("turtonator")
-    override val head = getPart("head")
-
-    override val leftArm = getPart("arm_left")
-    override val rightArm = getPart("arm_right")
-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
-
-    override var portraitScale = 1.62F
-    override var portraitTranslation = Vec3(-1.14, 1.92, 0.0)
-
-    override var profileScale = 0.54F
-    override var profileTranslation = Vec3(-0.08, 0.87, 0.0)
-
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-    lateinit var battleidle: CobblemonPose
-
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("turtonator", "blink") }
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
-            quirks = arrayOf(blink),
-            condition = { !it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("turtonator", "ground_idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = PoseType.MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("turtonator", "ground_idle"),
-                BipedWalkAnimation(this, periodMultiplier = 0.6F, amplitudeMultiplier = 0.9F),
-                BimanualSwingAnimation(this, swingPeriodMultiplier = 0.6F, amplitudeMultiplier = 0.9F)
-                //bedrock("turtonator", "ground_walk")
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("turtonator", "battle_idle")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("turtonator", "faint") else null
-}

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

@@ -248,10 +248,8 @@ object VaryingModelRepository {
         inbuilt("machop", ::MachopModel)
         inbuilt("machoke", ::MachokeModel)
         inbuilt("machamp", ::MachampModel)
-        inbuilt("arbok", ::ArbokModel)
         inbuilt("chansey", ::ChanseyModel)
         inbuilt("cubone", ::CuboneModel)
-        inbuilt("ditto", ::DittoModel)
         inbuilt("dodrio", ::DodrioModel)
         inbuilt("doduo", ::DoduoModel)
         inbuilt("electabuzz", ::ElectabuzzModel)
@@ -278,8 +276,6 @@ object VaryingModelRepository {
         inbuilt("nidoranm", ::NidoranmModel)
         inbuilt("nidorina", ::NidorinaModel)
         inbuilt("nidorino", ::NidorinoModel)
-        inbuilt("omanyte", ::OmanyteModel)
-        inbuilt("omastar", ::OmastarModel)
         inbuilt("persian", ::PersianModel)
         inbuilt("pinsir", ::PinsirModel)
         inbuilt("poliwag", ::PoliwagModel)
@@ -293,7 +289,6 @@ object VaryingModelRepository {
         inbuilt("venomoth", ::VenomothModel)
         inbuilt("venonat", ::VenonatModel)
         inbuilt("elekid", ::ElekidModel)
-        inbuilt("smoochum", ::SmoochumModel)
         inbuilt("hitmontop", ::HitmontopModel)
         inbuilt("electivire", ::ElectivireModel)
         inbuilt("tangrowth", ::TangrowthModel)
@@ -355,7 +350,6 @@ object VaryingModelRepository {
         inbuilt("whismur", :: WhismurModel)
         inbuilt("loudred", :: LoudredModel)
         inbuilt("exploud", :: ExploudModel)
-        inbuilt("luvdisc", :: LuvdiscModel)
         inbuilt("cryogonal", :: CryogonalModel)
         inbuilt("pumpkaboo", :: PumpkabooModel)
         inbuilt("gourgeist", :: GourgeistModel)
@@ -397,7 +391,6 @@ object VaryingModelRepository {
         inbuilt("tandemaus", ::TandemausModel)
         inbuilt("fidough", ::FidoughModel)
         inbuilt("dachsbun", ::DachsbunModel)
-        inbuilt("chatot", ::ChatotModel)
         inbuilt("gligar", ::GligarModel)
         inbuilt("gliscor", ::GliscorModel)
         inbuilt("poochyena", ::PoochyenaModel)
@@ -487,7 +480,6 @@ object VaryingModelRepository {
         inbuilt("phantump", ::PhantumpModel)
         inbuilt("totodile", ::TotodileModel)
         inbuilt("croconaw", ::CroconawModel)
-        inbuilt("feraligatr", ::FeraligatrModel)
         inbuilt("cyndaquil", ::CyndaquilModel)
         inbuilt("quilava", ::QuilavaModel)
         inbuilt("typhlosion", ::TyphlosionModel)
@@ -544,7 +536,6 @@ object VaryingModelRepository {
         inbuilt("petilil_hisui_bias", ::PetililHisuiBiasModel)
         inbuilt("lilligant_hisuian", ::LilligantHisuianModel)
         inbuilt("darumaka", ::DarumakaModel)
-        inbuilt("turtonator", ::TurtonatorModel)
         inbuilt("cufant", ::CufantModel)
         inbuilt("copperajah", ::CopperajahModel)
         inbuilt("budew", ::BudewModel)
@@ -574,7 +565,6 @@ object VaryingModelRepository {
         inbuilt("vibrava", ::VibravaModel)
         inbuilt("larvitar", ::LarvitarModel)
         inbuilt("pupitar", ::PupitarModel)
-        inbuilt("tyranitar", ::TyranitarModel)
         inbuilt("impidimp", ::ImpidimpModel)
         inbuilt("morgrem", ::MorgremModel)
         inbuilt("grimmsnarl", ::GrimmsnarlModel)

common/src/main/kotlin/com/cobblemon/mod/common/client/settings/ServerSettings.kt

@@ -28,5 +28,7 @@ object ServerSettings {
     var maxPokemonFriendship = Cobblemon.config.maxPokemonFriendship
     var maxDynamaxLevel = Cobblemon.config.maxDynamaxLevel
     var unlockAllMoveDexMovesByDefault = Cobblemon.config.unlockAllMoveDexMovesByDefault
+    var pokemonIntrinsicSizeMin = Cobblemon.config.pokemonIntrinsicSizeMin
+    var pokemonIntrinsicSizeMax = Cobblemon.config.pokemonIntrinsicSizeMax
 
 }

common/src/main/kotlin/com/cobblemon/mod/common/config/CobblemonConfig.kt

@@ -243,18 +243,6 @@ class CobblemonConfig {
     @CobblemonConfigField(Category.Pokemon, lang = "pokemon_intrinsic_size_max", SERVER)
     var pokemonIntrinsicSizeMax = 1.05F
 
-    @CobblemonConfigField(Category.Pokemon, lang = "alpha_pokemon_size_small_multiplier", SERVER)
-    var alphaPokemonSizeSmallMultiplier = 1.70F
-
-    @CobblemonConfigField(Category.Pokemon, lang = "alpha_pokemon_size_medium_multiplier", SERVER)
-    var alphaPokemonSizeMediumMultiplier = 1.55F
-
-    @CobblemonConfigField(Category.Pokemon, lang = "alpha_pokemon_size_large_multiplier", SERVER)
-    var alphaPokemonSizeLargeMultiplier = 1.40F
-
-    @CobblemonConfigField(Category.Pokemon, lang = "alpha_pokemon_size_extra_large_multiplier", SERVER)
-    var alphaPokemonSizeExtraLargeMultiplier = 1.25F
-
     @CobblemonConfigField(Category.Pokemon, lang = "baby_pokemon_level_duration", SERVER)
     var babyPokemonLevelDuration = 9
 
@@ -347,9 +335,6 @@ class CobblemonConfig {
     // @CobblemonConfigField(Category.Riding, lang = "third_person_view_bobbing", CLIENT)
     var thirdPersonViewBobbing = true
 
-    @CobblemonConfigField(Category.Riding, lang = "invert_roll", CLIENT)
-    var invertRoll = false
-
     @CobblemonConfigField(Category.Riding, lang = "invert_pitch", CLIENT)
     var invertPitch = false
 
@@ -365,9 +350,6 @@ class CobblemonConfig {
     @CobblemonConfigField(Category.Riding, lang = "swap_x_and_y_axes", CLIENT)
     var swapXAndYAxes = false
 
-    @CobblemonConfigField(Category.Riding, lang = "automatic_righting_delay", CLIENT)
-    var rightingDelay = -1.0
-
     @CobblemonConfigField(Category.Riding, lang = "disable_roll", CLIENT)
     var disableRoll = false
 

common/src/main/kotlin/com/cobblemon/mod/common/data/CobblemonDataProvider.kt

@@ -10,6 +10,13 @@ package com.cobblemon.mod.common.data
 
 import com.cobblemon.mod.common.*
 import com.cobblemon.mod.common.Cobblemon.LOGGER
+import com.cobblemon.mod.common.CobblemonBehaviours
+import com.cobblemon.mod.common.CobblemonCallbacks
+import com.cobblemon.mod.common.CobblemonCosmeticItems
+import com.cobblemon.mod.common.CobblemonMechanics
+import com.cobblemon.mod.common.CobblemonPokeSkills
+import com.cobblemon.mod.common.CobblemonRideSettings
+import com.cobblemon.mod.common.CobblemonUnlockableWallpapers
 import com.cobblemon.mod.common.api.abilities.Abilities
 import com.cobblemon.mod.common.api.berry.Berries
 import com.cobblemon.mod.common.api.cooking.Seasonings
@@ -73,6 +80,7 @@ object CobblemonDataProvider : DataProvider {
         this.register(GlobalSpeciesFeatures, reloadable = false)
         this.register(SpeciesFeatureAssignments, reloadable = false)
         this.register(ActionEffects, reloadable = true)
+        this.register(CobblemonPokeSkills, reloadable = true)
         this.register(Moves, reloadable = false)
         this.register(CobblemonMovesetBuilders, reloadable = false)
         this.register(Abilities, reloadable = false)

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

@@ -0,0 +1,360 @@
+/*
+ * 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.entity.pokemon
+
+import com.bedrockk.molang.runtime.MoLangRuntime
+import com.bedrockk.molang.runtime.value.DoubleValue
+import com.bedrockk.molang.runtime.value.StringValue
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMostSpecificMoLangValue
+import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
+import com.cobblemon.mod.common.api.molang.ObjectValue
+import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext
+import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
+import com.cobblemon.mod.common.api.moves.animations.ActionEffects
+import com.cobblemon.mod.common.api.moves.animations.TargetsProvider
+import com.cobblemon.mod.common.api.moves.animations.UsersProvider
+import com.cobblemon.mod.common.api.pokemon.status.Statuses
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.util.asExpressionLike
+import com.cobblemon.mod.common.util.blockRegistry
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.codec.EXPRESSION_LIKE_CODEC
+import com.cobblemon.mod.common.util.isInBattle
+import com.cobblemon.mod.common.util.resolveBoolean
+import com.cobblemon.mod.common.util.withQueryValue
+import com.mojang.serialization.Codec
+import com.mojang.serialization.codecs.RecordCodecBuilder
+import net.minecraft.core.registries.Registries
+import net.minecraft.network.codec.ByteBufCodecs
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.level.ServerLevel
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.world.entity.Entity
+import net.minecraft.world.entity.player.Player
+import net.minecraft.world.phys.BlockHitResult
+import net.minecraft.world.phys.HitResult
+
+/**
+ * The reference object for a skill that a Pokémon can use in the overworld.
+ *
+ * Most skills are "wrapper" skills that play a move's action effect at a target and run
+ * some MoLang on impact. Custom skills can define a full action effect timeline.
+ *
+ * Access is auto-derived from grantingMoves/Abilities/Types/Species lists. If none are
+ * populated, accessCondition is used as a fallback.
+ *
+ * @author Hiroku
+ * @since August 31st, 2025
+ */
+class PokeSkill(
+    val name: String,
+    val enabled: Boolean = true,
+    val actionEffect: ActionEffectTimeline,
+    val icon: ResourceLocation,
+    val cooldownTicks: Int,
+    val accessCondition: ExpressionLike = "true".asExpressionLike(),
+    val useCondition: ExpressionLike = "true".asExpressionLike(),
+    // Targeting
+    val targetType: TargetType? = null,
+    val range: Double? = null,
+    val targetCondition: ExpressionLike? = null,
+    // Granting
+    val grantingMoves: List<String>? = null,
+    val grantingAbilities: List<String>? = null,
+    val grantingTypes: List<String>? = null,
+    val grantingSpecies: List<String>? = null,
+    // Wrapper skill fields
+    val hitDelay: ExpressionLike? = null,
+    val hitEffect: ResourceLocation? = null,
+    val fallbackActionEffect: ResourceLocation? = null
+) {
+    // Enum to determine what this skill will target.
+    enum class TargetType {
+        NONE, SELF, BLOCK, ENTITY, BOTH
+    }
+
+    companion object {
+        val runtime = MoLangRuntime().setup()
+        val CODEC = RecordCodecBuilder.create<PokeSkill> { instance ->
+            instance.group(
+                Codec.STRING.fieldOf("name").forGetter { it.name },
+                Codec.BOOL.fieldOf("enabled").forGetter { it.enabled },
+                Codec.unit<ActionEffectTimeline> { ActionEffectTimeline.NONE }.fieldOf("actionEffect").forGetter { it.actionEffect },
+                ResourceLocation.CODEC.fieldOf("icon").forGetter { it.icon },
+                Codec.INT.fieldOf("cooldownTicks").forGetter { it.cooldownTicks },
+                EXPRESSION_LIKE_CODEC.fieldOf("accessCondition").forGetter { it.accessCondition },
+                EXPRESSION_LIKE_CODEC.fieldOf("useCondition").forGetter { it.useCondition }
+            ).apply(instance, ::PokeSkill)
+        }
+        val PACKET_CODEC = ByteBufCodecs.fromCodecWithRegistries(CODEC)
+        private val DEFAULT_ACTION_EFFECT = cobblemonResource("default_poke_skill")
+    }
+
+    @Transient
+    lateinit var id: ResourceLocation
+
+
+//    fun canAccess(player: Player, pokemon: Pokemon): Boolean {
+//        if (!enabled) {
+//            return false
+//        }
+//
+//        runtime.withQueryValue("player", player.asMostSpecificMoLangValue())
+//        runtime.withQueryValue("pokemon", pokemon.struct)
+//        pokemon.entity?.let { runtime.withQueryValue("entity", it.asMostSpecificMoLangValue()) }
+//        val hasAccess = runtime.resolveBoolean(accessCondition)
+//        return hasAccess
+//    }
+
+    /**
+     * Determines access by checking the pokemons data against the granting lists.
+     * If no granting lists are populated, accessCondition is used as a fallback.
+     */
+    fun canAccess(player: Player, pokemon: Pokemon): Boolean {
+        if (!enabled) {
+            return false
+        }
+
+        // Check granting lists — if any are populated, check if the player has any of the listed moves/abilities/types/species
+        val hasGrantingLists = !grantingMoves.isNullOrEmpty() || !grantingAbilities.isNullOrEmpty() ||
+                !grantingTypes.isNullOrEmpty() || !grantingSpecies.isNullOrEmpty()
+
+        if (hasGrantingLists) {
+            val moveMatch = !grantingMoves.isNullOrEmpty() && grantingMoves.any { moveName ->
+                pokemon.moveSet.any { it.template.name == moveName }
+            }
+            val abilityMatch = !grantingAbilities.isNullOrEmpty() && grantingAbilities.any { abilityName ->
+                pokemon.ability.name == abilityName
+            }
+            val typeMatch = !grantingTypes.isNullOrEmpty() && grantingTypes.any { typeName ->
+                pokemon.types.any { it.name.equals(typeName, ignoreCase = true) }
+            }
+            val speciesMatch = !grantingSpecies.isNullOrEmpty() && grantingSpecies.any { speciesName ->
+                pokemon.species.name.equals(speciesName, ignoreCase = true)
+            }
+
+            if (!(moveMatch || abilityMatch || typeMatch || speciesMatch)) return false
+        }
+
+        // Always evaluate accessCondition — acts as additional gate when granting lists are present,
+        // or as the sole gate when no granting lists are populated
+        runtime.withQueryValue("player", player.asMostSpecificMoLangValue())
+        runtime.withQueryValue("pokemon", pokemon.struct)
+        pokemon.entity?.let { runtime.withQueryValue("entity", it.asMostSpecificMoLangValue()) }
+        return runtime.resolveBoolean(accessCondition ?: "true".asExpressionLike())
+    }
+
+    fun canUse(player: Player, pokemon: Pokemon): Boolean {
+        val status = pokemon.status?.status
+        if (id in pokemon.skillCooldownsTicks || player.isInBattle() || status == Statuses.SLEEP || status == Statuses.FROZEN) {
+            return false
+        }
+        runtime.withQueryValue("player", player.asMostSpecificMoLangValue())
+        runtime.withQueryValue("pokemon", pokemon.struct)
+        val canUse = runtime.resolveBoolean(useCondition)
+        return canUse
+    }
+
+    /**
+     * Resolves which move from the pokemon's moveset grants this skill.
+     * Returns the first matching move name from grantingMoves, or null if none match.
+     */
+    fun resolveGrantingMove(pokemon: Pokemon): String? {
+        if (grantingMoves.isNullOrEmpty()) return null  // need this guard
+        return grantingMoves.firstOrNull { moveName ->
+            pokemon.moveSet.any { it.template.name == moveName }
+        }
+    }
+
+    /**
+     * Resolves the action effect to use for the move visual.
+     * Priority: granting move's action effect > fallbackActionEffect > null
+     */
+    fun resolveVisualEffect(pokemon: Pokemon): ResourceLocation? {
+        val grantingMove = resolveGrantingMove(pokemon)
+        if (grantingMove != null) {
+            val effectId = cobblemonResource(grantingMove)
+            if (ActionEffects.actionEffects.containsKey(effectId)) return effectId
+            Cobblemon.LOGGER.warn("PokeSkill '$id': granting move '$grantingMove' has no action effect at '$effectId'")
+        }
+        return fallbackActionEffect
+    }
+
+    /**
+     * Runs the skill on the given pokemon.
+     * Populates context and runs targeting logic.
+     */
+    fun use(
+        player: ServerPlayer,
+        pokemon: Pokemon,
+        // context information!!!
+    ): Boolean {
+        if (!canUse(player, pokemon)) return false
+        val entity = pokemon.entity ?: return false
+        val level = player.level() as? ServerLevel ?: return false
+        // I think these should be defaulted but making them nullable means I don't have to adjust the
+        // other jsons that don't populate them yet...
+        val effectiveTargetType = targetType ?: TargetType.NONE
+        val effectiveRange = range ?: 8.0
+
+        // Resolve the action effect to run
+        val effectTimeline = if (actionEffect != null && actionEffect != ActionEffectTimeline.NONE) {
+            actionEffect
+        } else {
+            ActionEffects.actionEffects[DEFAULT_ACTION_EFFECT] ?: run {
+                Cobblemon.LOGGER.warn("PokeSkill '$id': default_poke_skill action effect not found")
+                return false
+            }
+        }
+
+        // Set up runtime
+        val skillRuntime = MoLangRuntime().setup()
+        skillRuntime.withQueryValue("player", player.asMostSpecificMoLangValue())
+        skillRuntime.withQueryValue("pokemon", pokemon.struct)
+        skillRuntime.withQueryValue("entity", entity.asMostSpecificMoLangValue())
+        skillRuntime.environment.setSimpleVariable("skill_id", StringValue(id.toString()))
+        skillRuntime.environment.setSimpleVariable("target_type", StringValue(effectiveTargetType.name.lowercase()))
+        skillRuntime.environment.query.addFunction("missed") { DoubleValue(0.0) } // move action effects use this to determine if the target particles should play. We want them to always play for skills I believe
+
+
+        // Targeting — raycast based on targetType
+        when (effectiveTargetType) {
+            TargetType.SELF -> {
+                injectEntityTarget(skillRuntime, player)
+                skillRuntime.environment.setSimpleVariable("target_is_entity", DoubleValue(1.0))
+            }
+            TargetType.BLOCK -> {
+                val blockHit = getPlayerLookedBlock(player, effectiveRange)
+                if (blockHit == null) return false
+                injectBlockTarget(skillRuntime, blockHit, level)
+                skillRuntime.environment.setSimpleVariable("target_is_entity", DoubleValue(0.0))
+            }
+            TargetType.ENTITY -> {
+                val entityHit = getPlayerLookedEntity(player, effectiveRange)
+                if (entityHit == null) return false
+                injectEntityTarget(skillRuntime, entityHit)
+                skillRuntime.environment.setSimpleVariable("target_is_entity", DoubleValue(1.0))
+            }
+            TargetType.BOTH -> {
+                val entityHit = getPlayerLookedEntity(player, effectiveRange)
+                if (entityHit != null) {
+                    injectEntityTarget(skillRuntime, entityHit)
+                    skillRuntime.environment.setSimpleVariable("target_is_entity", DoubleValue(1.0))
+                } else {
+                    val blockHit = getPlayerLookedBlock(player, effectiveRange)
+                    if (blockHit == null) return false
+                    injectBlockTarget(skillRuntime, blockHit, level)
+                    skillRuntime.environment.setSimpleVariable("target_is_entity", DoubleValue(0.0))
+                }
+            }
+            TargetType.NONE -> {}
+        }
+
+        // Evaluate target condition
+        if (targetCondition != null && !skillRuntime.resolveBoolean(targetCondition)) return false
+
+        // Inject wrapper skill variables
+        val visualEffect = resolveVisualEffect(pokemon)
+        if (visualEffect != null) {
+            skillRuntime.environment.setSimpleVariable("granting_move", StringValue(visualEffect.toString()))
+        }
+        if (hitEffect != null) {
+            skillRuntime.environment.setSimpleVariable("hit_effect", StringValue(hitEffect.toString()))
+        }
+        if (hitDelay != null) {
+            skillRuntime.environment.setSimpleVariable("hit_delay", hitDelay.resolve(skillRuntime))
+        }
+
+
+        // Build providers
+        val providers = mutableListOf<Any>(
+            UsersProvider(entity)
+        )
+
+        // Build and run context
+        val context = ActionEffectContext(
+            actionEffect = effectTimeline,
+            runtime = skillRuntime,
+            providers = providers,
+            level = level
+        )
+
+        effectTimeline.run(context).thenRun {
+            // Auto-apply cooldown after effect completes
+            pokemon.skillCooldownsTicks[id] = cooldownTicks
+        }
+
+        return true
+    }
+
+    /**
+     * Utility functions for setting up the runtime for a skill.
+     */
+    private fun injectBlockTarget(runtime: MoLangRuntime, blockHit: BlockHitResult, level: ServerLevel) {
+        val pos = blockHit.blockPos
+        runtime.environment.setSimpleVariable("target_x", DoubleValue(pos.x + 0.5))
+        runtime.environment.setSimpleVariable("target_y", DoubleValue(pos.y + 0.5))
+        runtime.environment.setSimpleVariable("target_z", DoubleValue(pos.z + 0.5))
+        runtime.environment.setSimpleVariable("target_block_x", DoubleValue(pos.x.toDouble()))
+        runtime.environment.setSimpleVariable("target_block_y", DoubleValue(pos.y.toDouble()))
+        runtime.environment.setSimpleVariable("target_block_z", DoubleValue(pos.z.toDouble()))
+
+        val blockState = level.getBlockState(pos)
+        val blockHolder = level.blockRegistry.wrapAsHolder(blockState.block)
+        val blockValue = blockHolder.asMoLangValue(Registries.BLOCK)
+
+        blockValue.addFunction("x") { DoubleValue(pos.x.toDouble()) }
+        blockValue.addFunction("y") { DoubleValue(pos.y.toDouble()) }
+        blockValue.addFunction("z") { DoubleValue(pos.z.toDouble()) }
+
+        runtime.environment.setSimpleVariable("target_block", blockValue)
+    }
+
+    private fun injectEntityTarget(runtime: MoLangRuntime, entityHit: Entity) {
+        runtime.environment.setSimpleVariable("target_x", DoubleValue(entityHit.x))
+        runtime.environment.setSimpleVariable("target_y", DoubleValue(entityHit.y + entityHit.bbHeight / 2.0))
+        runtime.environment.setSimpleVariable("target_z", DoubleValue(entityHit.z))
+        runtime.environment.setSimpleVariable("target_entity", entityHit.asMostSpecificMoLangValue())
+    }
+
+    /**
+     * simple raycast to get the block the player is looking at.
+     */
+    private fun getPlayerLookedBlock(player: ServerPlayer, range: Double): BlockHitResult? {
+        val hitResult = player.pick(range, 0f, true)
+        return if (hitResult.type == HitResult.Type.BLOCK) hitResult as BlockHitResult else null
+    }
+
+    /**
+     * Raycast to determine the entity the player is looking at
+     */
+    private fun getPlayerLookedEntity(player: ServerPlayer, range: Double): Entity? {
+        val eyePosition = player.getEyePosition(1.0f)
+        val lookVector = player.getViewVector(1.0f)
+        val reachVector = eyePosition.add(lookVector.x * range, lookVector.y * range, lookVector.z * range)
+
+        // Create an outer bounding box to find potential candidates
+        val searchBox = player.boundingBox.expandTowards(lookVector.scale(range)).inflate(1.0, 1.0, 1.0)
+
+        // Filter entities within the search box
+        val entityHitResult = net.minecraft.world.entity.projectile.ProjectileUtil.getEntityHitResult(
+            player,
+            eyePosition,
+            reachVector,
+            searchBox,
+            { entity -> !entity.isSpectator && entity.isPickable },
+            range * range
+        )
+
+        return entityHitResult?.entity
+    }
+}

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

@@ -798,6 +798,13 @@ open class PokemonEntity(
         return pokemon.isFireImmune()
     }
 
+    /**
+     * Prevents ice type Pokémon from freezing (from powered snow)
+     */
+    override fun canFreeze(): Boolean {
+        return !pokemon.isFreezeImmune() && super.canFreeze()
+    }
+
     /**
      * Prevents flying type Pokémon from taking fall damage.
      */

common/src/main/kotlin/com/cobblemon/mod/common/events/ServerTickHandler.kt

@@ -20,12 +20,13 @@ object ServerTickHandler {
 
         secondsTick++
 
-        if (secondsTick == 20) {
-            secondsTick = 0
-
-            // Party tick
-            for (player in server.playerList.players) {
-                player.party().onSecondPassed(player)
+        // Party tick
+        for (player in server.playerList.players) {
+            val party = player.party()
+            party.forEach { it.tickSkillCooldowns() }
+            if (secondsTick == 20) {
+                secondsTick = 0
+                party.onSecondPassed(player)
             }
         }
     }

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/data/PokeSkillsRegistrySyncPacket.kt

@@ -0,0 +1,38 @@
+/*
+ * 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.net.messages.client.data
+
+import com.cobblemon.mod.common.CobblemonPokeSkills
+import com.cobblemon.mod.common.entity.pokemon.PokeSkill
+import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.network.RegistryFriendlyByteBuf
+
+class PokeSkillsRegistrySyncPacket(
+    pokeSkills: Collection<PokeSkill>
+) : DataRegistrySyncPacket<PokeSkill, PokeSkillsRegistrySyncPacket>(pokeSkills) {
+
+    override val id = ID
+
+    override fun encodeEntry(buffer: RegistryFriendlyByteBuf, entry: PokeSkill) {
+        PokeSkill.PACKET_CODEC.encode(buffer, entry)
+    }
+
+    override fun decodeEntry(buffer: RegistryFriendlyByteBuf): PokeSkill? {
+        return PokeSkill.PACKET_CODEC.decode(buffer)
+    }
+
+    override fun synchronizeDecoded(entries: Collection<PokeSkill>) {
+        CobblemonPokeSkills.reload(entries.associateBy { it.id })
+    }
+
+    companion object {
+        val ID = cobblemonResource("poke_skill_sync")
+        fun decode(buffer: RegistryFriendlyByteBuf) = PokeSkillsRegistrySyncPacket(emptyList()).apply { decodeBuffer(buffer) }
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/effect/SpawnSnowstormEntityParticlePacket.kt

@@ -13,10 +13,15 @@ import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormEntityParticleHa
 import com.cobblemon.mod.common.util.*
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.world.phys.Vec3
 
 /**
  * Packet that spawns a snowstorm particle effect on a specified entity and specified locator.
  * Can specify an optional target+locator to pass through to the spawned particle
+ * Can alternatively specify a [targetPosition] for entity-to-world-position targeting
+ * (e.g. a Pokémon firing particles at a block).
+ *
+ * Target resolution priority: targetedEntityId + targetLocators > targetPosition > no target
  *
  * Handled by [SpawnSnowstormEntityParticleHandler]
  *
@@ -28,7 +33,8 @@ class SpawnSnowstormEntityParticlePacket(
     val sourceEntityId: Int,
     val sourceLocators: List<String> = listOf("root"),
     val targetedEntityId: Int? = null,
-    val targetLocators: List<String>? = null
+    val targetLocators: List<String>? = null,
+    val targetPosition: Vec3? = null
 ) : NetworkPacket<SpawnSnowstormEntityParticlePacket> {
     companion object {
         val ID = cobblemonResource("spawn_snowstorm_entity_particle")
@@ -39,7 +45,8 @@ class SpawnSnowstormEntityParticlePacket(
             val sourceLocators = buffer.readList { buffer.readString() }
             val targetedEntityId = buffer.readNullable { it.readInt() }
             val targetLocators = buffer.readNullable { buffer.readList { buffer.readString() }}
-            return SpawnSnowstormEntityParticlePacket(effectId, sourceEntityId, sourceLocators, targetedEntityId, targetLocators)
+            val targetPosition = buffer.readNullable { Vec3(it.readDouble(), it.readDouble(), it.readDouble()) }
+            return SpawnSnowstormEntityParticlePacket(effectId, sourceEntityId, sourceLocators, targetedEntityId, targetLocators, targetPosition)
         }
     }
 
@@ -55,5 +62,10 @@ class SpawnSnowstormEntityParticlePacket(
                 buffer.writeString(locator)
             }
         }
+        buffer.writeNullable(targetPosition) { _, value ->
+            buffer.writeDouble(value.x)
+            buffer.writeDouble(value.y)
+            buffer.writeDouble(value.z)
+        }
     }
 }

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

@@ -0,0 +1,51 @@
+/*
+ * 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.net.messages.client.pokemon.update
+
+import com.cobblemon.mod.common.net.IntSize
+import com.cobblemon.mod.common.pokemon.Pokemon
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.cobblemon.mod.common.util.readSizedInt
+import com.cobblemon.mod.common.util.writeSizedInt
+import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.resources.ResourceLocation
+
+/**
+ * Packet that adds a single skill cooldown to a Pokémon's skill cooldowns map.
+ *
+ * @author Hiroku
+ * @since August 31st, 2025
+ */
+class SkillCooldownsUpdatePacket(
+    pokemon: () -> Pokemon?,
+    val skillId: ResourceLocation,
+    val cooldownTicks: Int
+) : SingleUpdatePacket<Pair<ResourceLocation, Int>, SkillCooldownsUpdatePacket>(pokemon, skillId to cooldownTicks) {
+    override val id: ResourceLocation = ID
+
+    override fun encodeValue(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(skillId)
+        buffer.writeSizedInt(IntSize.U_SHORT, cooldownTicks)
+    }
+
+    override fun set(pokemon: Pokemon, value: Pair<ResourceLocation, Int>) {
+        val (skillId, cooldownTicks) = value
+        pokemon.skillCooldownsTicks[skillId] = cooldownTicks
+    }
+
+    companion object {
+        val ID = cobblemonResource("skill_cooldowns_update")
+        fun decode(buffer: RegistryFriendlyByteBuf): SkillCooldownsUpdatePacket {
+            val pokemon = decodePokemon(buffer)
+            val skillId = buffer.readResourceLocation()
+            val cooldownTicks = buffer.readSizedInt(IntSize.U_SHORT)
+            return SkillCooldownsUpdatePacket(pokemon, skillId, cooldownTicks)
+        }
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/settings/ServerSettingsPacket.kt

@@ -26,7 +26,9 @@ class ServerSettingsPacket internal constructor(
     val maxPokemonLevel: Int,
     val maxPokemonFriendship: Int,
     val maxDynamaxLevel: Int,
-    val unlockAllMoveDexMovesByDefault: Boolean
+    val unlockAllMoveDexMovesByDefault: Boolean,
+    val pokemonIntrinsicSizeMin: Float,
+    val pokemonIntrinsicSizeMax: Float
 ) : NetworkPacket<ServerSettingsPacket> {
     override val id = ID
     override fun encode(buffer: RegistryFriendlyByteBuf) {
@@ -37,9 +39,14 @@ class ServerSettingsPacket internal constructor(
         buffer.writeInt(Cobblemon.config.maxPokemonFriendship)
         buffer.writeInt(Cobblemon.config.maxDynamaxLevel)
         buffer.writeBoolean(Cobblemon.config.unlockAllMoveDexMovesByDefault)
+        buffer.writeFloat(Cobblemon.config.pokemonIntrinsicSizeMin)
+        buffer.writeFloat(Cobblemon.config.pokemonIntrinsicSizeMax)
     }
     companion object {
         val ID = cobblemonResource("server_settings")
-        fun decode(buffer: RegistryFriendlyByteBuf) = ServerSettingsPacket(buffer.readBoolean(), buffer.readBoolean(), buffer.readBoolean(), buffer.readInt(), buffer.readInt(), buffer.readInt(), buffer.readBoolean())
+        fun decode(buffer: RegistryFriendlyByteBuf) = ServerSettingsPacket(buffer.readBoolean(),
+            buffer.readBoolean(), buffer.readBoolean(),
+            buffer.readInt(), buffer.readInt(), buffer.readInt(),
+            buffer.readBoolean(), buffer.readFloat(), buffer.readFloat())
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/net/messages/server/UsePokeSkillPacket.kt

@@ -0,0 +1,47 @@
+/*
+ * 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.net.messages.server
+
+import com.cobblemon.mod.common.api.net.NetworkPacket
+import java.util.UUID
+import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.resources.ResourceLocation
+
+/**
+ * Packet sent by the client to the server to indicate that it wants to use a Poké Skill.
+ *
+ * The server will validate if the skill can be used, and if so, will execute it.
+ *
+ * @param skillId The ID of the skill to use.
+ * @param pokemonId The UUID of the Pokémon using the skill.
+ *
+ * @author Hiroku
+ * @since August 31st, 2025
+ */
+class UsePokeSkillPacket(
+    val skillId: ResourceLocation,
+    val pokemonId: UUID,
+) : NetworkPacket<UsePokeSkillPacket> {
+    override val id: ResourceLocation = ID
+
+    override fun encode(buffer: RegistryFriendlyByteBuf) {
+        buffer.writeResourceLocation(skillId)
+        buffer.writeUUID(pokemonId)
+    }
+
+    companion object {
+        val ID = ResourceLocation("cobblemon", "use_poke_skill")
+        fun decode(buffer: RegistryFriendlyByteBuf): UsePokeSkillPacket {
+            return UsePokeSkillPacket(
+                buffer.readResourceLocation(),
+                buffer.readUUID()
+            )
+        }
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/net/serverhandling/UsePokeSkillHandler.kt

@@ -0,0 +1,27 @@
+/*
+ * 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.net.serverhandling
+
+import com.cobblemon.mod.common.CobblemonPokeSkills
+import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
+import com.cobblemon.mod.common.net.messages.server.UsePokeSkillPacket
+import com.cobblemon.mod.common.util.party
+import net.minecraft.server.MinecraftServer
+import net.minecraft.server.level.ServerPlayer
+
+object UsePokeSkillHandler : ServerNetworkPacketHandler<UsePokeSkillPacket> {
+    override fun handle(packet: UsePokeSkillPacket, server: MinecraftServer, player: ServerPlayer) {
+        val party = player.party()
+        val pokemon = party[packet.pokemonId] ?: return // Who?
+        val skill = CobblemonPokeSkills.getAccessibleSkills(player, pokemon).firstOrNull { it.id == packet.skillId } ?: return // What skill?
+        if (skill.canUse(player, pokemon)) {
+            skill.use(player, pokemon)
+        }
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/Pokemon.kt

@@ -767,6 +767,8 @@ open class Pokemon : ShowdownIdentifiable {
     val riding: RidingProperties
         get() = this.form.riding
 
+    var skillCooldownsTicks: MutableMap<ResourceLocation, Int> = mutableMapOf()
+
     init {
         storeCoordinates.subscribe { if (it != null && it.store !is PCStore && this.tetheringId != null) afterOnServer(seconds = 0.05F) { this.tetheringId = null } }
         storeCoordinates.subscribe {
@@ -1037,6 +1039,10 @@ open class Pokemon : ShowdownIdentifiable {
         return ElementalTypes.FIRE in types || form.behaviour.moving.swim.canSwimInLava || form.behaviour.fireImmune
     }
 
+    fun isFreezeImmune(): Boolean {
+        return ElementalTypes.ICE in types || form.behaviour.freezeImmune
+    }
+
     fun dampensVibrations(): Boolean = form.behaviour.dampensVibrations
 
     // function to return the max hunger for the pokemon
@@ -1137,6 +1143,16 @@ open class Pokemon : ShowdownIdentifiable {
         }
     }
 
+    fun tickSkillCooldowns() {
+        this.skillCooldownsTicks.entries.forEach { (key, value) ->
+            val newValue = value - 1
+            if (newValue <= 0)
+                this.skillCooldownsTicks -= key
+            else
+                this.skillCooldownsTicks[key] = newValue
+        }
+    }
+
     fun isOnInteractionCooldown(group: ResourceLocation): Boolean {
         return this.interactionCooldowns.getOrDefault(group, 0) > 0
     }
@@ -2225,6 +2241,11 @@ open class Pokemon : ShowdownIdentifiable {
         return true
     }
 
+    fun addSkillCooldown(skillId: ResourceLocation, cooldownTicks: Int) {
+        skillCooldownsTicks[skillId] = cooldownTicks
+        onChange(SkillCooldownsUpdatePacket({ this }, skillId, cooldownTicks))
+    }
+
     fun notify(packet: PokemonUpdatePacket<*>) {
         storeCoordinates.get()?.run { sendPacketToPlayers(store.getObservingPlayers(), packet) }
     }

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/PokemonSizeCategory.kt

@@ -8,7 +8,7 @@
 
 package com.cobblemon.mod.common.pokemon
 
-import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.client.settings.ServerSettings
 
 enum class PokemonSizeCategory {
     XS,
@@ -21,7 +21,7 @@ enum class PokemonSizeCategory {
         // Find which size category corresponds to the given scale modifier.
         // The scale modifier should be between the intrinsic min and max size.
         fun fromScale(scaleModifier: Float): PokemonSizeCategory {
-            val config = Cobblemon.config
+            val config = ServerSettings //Don't use cobblemon config here as it will be used by server AND client
             val minScale = config.pokemonIntrinsicSizeMin
             val maxScale = config.pokemonIntrinsicSizeMax
             val range = (maxScale - minScale).coerceAtLeast(0.0001F)

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/FormPokemonBehaviour.kt

@@ -35,6 +35,9 @@ class FormPokemonBehaviour {
     @SerializedName("fireImmune")
     private val _fireImmune: Boolean? = null
 
+    @SerializedName("freezeImmune")
+    private val _freezeImmune: Boolean? = null
+
     @SerializedName("dampensVibrations")
     private val _dampensVibrations: Boolean? = null
 
@@ -72,6 +75,9 @@ class FormPokemonBehaviour {
     val fireImmune: Boolean
         get() = _fireImmune ?: parent.fireImmune
 
+    val freezeImmune: Boolean
+        get() = _freezeImmune ?: parent.freezeImmune
+
     val entityInteract: EntityBehaviour
         get() = _entityInteract ?: parent.entityInteract
 

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/OmniPathNodeMaker.kt

@@ -318,7 +318,7 @@ class OmniPathNodeMaker : NodeEvaluator() {
 
         // Hitbox thing looks confusing but if the hitbox volume is more than like, 5, it starts getting pretty
         // fucking slow to use the findAcceptedNodeWalk function
-        val strictlyWalkPathing = !canFly() && !mob.isInWater && mob.boundingBox.size < MAX_HITBOX_SIZE_FOR_WALKING
+        val strictlyWalkPathing = !canFly() && !mob.isInWater
         val doVerticalNeighbourChecks = (canFly() || mob.isInWater) && mob.boundingBox.size < MAX_HITBOX_FOR_VERTICAL_NEIGHBOURS
 
         // Non-diagonal surroundings in 3d space
@@ -623,9 +623,11 @@ class OmniPathNodeMaker : NodeEvaluator() {
 
     override fun getPathTypeOfMob(pfContext: PathfindingContext, x: Int, y: Int, z: Int, mob: Mob): PathType {
         val set = EnumSet.noneOf(PathType::class.java)
-        val sizeX = (mob.boundingBox.maxX - mob.boundingBox.minX).toInt() + 1
-        val sizeY = (mob.boundingBox.maxY - mob.boundingBox.minY).toInt() + 1
-        val sizeZ = (mob.boundingBox.maxZ - mob.boundingBox.minZ).toInt() + 1
+        // Capping the observed size of hitboxes here to put an upper limit on the cost of larger hitbox mobs
+        // Mobs larger than these caps will inevitably become stuck on obstacles as their pathing will be flawed
+        val sizeX = ((mob.boundingBox.maxX - mob.boundingBox.minX).toInt() + 1).coerceAtMost(2)
+        val sizeY = ((mob.boundingBox.maxY - mob.boundingBox.minY).toInt() + 1).coerceAtMost(3)
+        val sizeZ = ((mob.boundingBox.maxZ - mob.boundingBox.minZ).toInt() + 1).coerceAtMost(2)
 
         // TODO -- This is experimental code to see if this is meaningful. We should clean this up later when time permits.
         val returnedEarlyPathType = mutableListOf<PathType>()

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/ai/PokemonBehaviour.kt

@@ -31,6 +31,7 @@ open class PokemonBehaviour(
     val herd: HerdBehaviour = HerdBehaviour(),
     val characteristicRainbow: Boolean = false,
     val itemInteract: ItemBehavior = ItemBehavior(),
+    val freezeImmune: Boolean = false,
 ) {
     @Transient
     val struct = ObjectValue<PokemonBehaviour>(this).also {

common/src/main/kotlin/com/cobblemon/mod/common/pokemon/status/statuses/persistent/FrozenStatus.kt

@@ -10,6 +10,7 @@ package com.cobblemon.mod.common.pokemon.status.statuses.persistent
 
 import com.cobblemon.mod.common.pokemon.status.PersistentStatus
 import com.cobblemon.mod.common.util.cobblemonResource
+
 class FrozenStatus : PersistentStatus(
     name = cobblemonResource("frozen"),
     showdownName = "frz",

common/src/main/kotlin/com/cobblemon/mod/common/util/DataKeys.kt

@@ -20,6 +20,7 @@ object DataKeys {
     const val POKEMON_FRIENDSHIP = "Friendship"
     const val POKEMON_FULLNESS = "Fullness"
     const val POKEMON_INTERACTION_COOLDOWN = "InteractionCooldown"
+    const val POKEMON_SKILL_COOLDOWNS = "SkillCooldowns"
     const val POKEMON_ALPHA = "Alpha"
 
     const val POKEMON_IVS = "IVs"

common/src/main/kotlin/com/cobblemon/mod/common/util/PlayerExtensions.kt

@@ -100,10 +100,16 @@ fun ServerPlayer.didSleep(): Boolean {
     return true
 }
 
-fun ServerPlayer.isInBattle() = BattleRegistry.getBattleByParticipatingPlayer(this) != null
+fun Player.isInBattle() = if (this is ServerPlayer) {
+    BattleRegistry.getBattleByParticipatingPlayer(this) != null
+} else {
+    CobblemonClient.battle?.spectating == false
+}
+
 var ServerPlayer.spawner: PlayerSpawner
     get() = (this as PlayerSpawnerAccessor).getPlayerSpawner()
     set(value) = (this as PlayerSpawnerAccessor).setPlayerSpawner(value)
+
 fun ServerPlayer.getBattleState(): Pair<PokemonBattle, BattleActor>? {
     val battle = BattleRegistry.getBattleByParticipatingPlayer(this)
     if (battle != null) {

common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/ActionEffectTimelineAdapter.kt

@@ -0,0 +1,31 @@
+/*
+ * 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.util.adapters
+
+import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline
+import com.cobblemon.mod.common.api.moves.animations.ActionEffects
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import java.lang.reflect.Type
+
+/**
+ * Adapter for deserializing a reference to an [ActionEffectTimeline] from its identifier.
+ *
+ * @author Hiroku
+ * @since August 31st, 2025
+ */
+object ActionEffectTimelineAdapter : JsonDeserializer<ActionEffectTimeline> {
+    override fun deserialize(json: JsonElement, type: Type, ctx: JsonDeserializationContext): ActionEffectTimeline {
+        val identifier = json.asString.asIdentifierDefaultingNamespace()
+        val timeline = ActionEffects.actionEffects[identifier]
+        return timeline ?: throw IllegalArgumentException("No ActionEffectTimeline found for id $identifier")
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/util/codec/ExpressionCodec.kt

@@ -10,6 +10,8 @@ package com.cobblemon.mod.common.util.codec
 
 import com.bedrockk.molang.Expression
 import com.bedrockk.molang.MoLang
+import com.cobblemon.mod.common.api.molang.ExpressionLike
+import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.getString
 import com.mojang.serialization.Codec
 import com.mojang.serialization.Codec.optionalField
@@ -29,6 +31,17 @@ val EXPRESSION_CODEC = object : PrimitiveCodec<Expression> {
     }
 }
 
+val EXPRESSION_LIKE_CODEC = object : PrimitiveCodec<ExpressionLike> {
+    override fun <T> read(ops: DynamicOps<T>, input: T): DataResult<ExpressionLike> {
+        return ops.getStringValue(input).map { it.asExpressionLike() }
+    }
+
+    override fun <T> write(ops: DynamicOps<T>, value: ExpressionLike): T {
+        return ops.createString(value.getString())
+    }
+}
+
+
 // special codec that always writes default value
 // vanilla changed the behaviour of Codec#optionalFieldOf(String, A) so that it OMITS default values when encoding
 // later on decoding it assumes no value -> default, but we want some default being encoded anyways so it can be targeted by commands

common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/ClientPokemonP4.kt

@@ -22,10 +22,12 @@ import net.minecraft.world.item.ItemStack
 import java.util.*
 
 internal data class ClientPokemonP4(
-    val originalTrainerFriendship: Optional<Int>
+    val skillCooldownTicks: Map<ResourceLocation, Int>,
+    val originalTrainerFriendship: Optional<Int>,
 ) : Partial<Pokemon> {
 
     override fun into(other: Pokemon): Pokemon {
+        other.skillCooldownsTicks = this.skillCooldownTicks.toMutableMap()
         this.originalTrainerFriendship.ifPresent { other.originalTrainerFriendship = it }
         return other
     }
@@ -36,11 +38,13 @@ internal data class ClientPokemonP4(
          */
         internal val CODEC: MapCodec<ClientPokemonP4> = RecordCodecBuilder.mapCodec { instance ->
             instance.group(
-                Codec.INT.optionalFieldOf(DataKeys.POKEMON_ORIGINAL_TRAINER_FRIENDSHIP).forGetter(ClientPokemonP4::originalTrainerFriendship)
-                ).apply(instance, ::ClientPokemonP4)
+                Codec.unboundedMap(ResourceLocation.CODEC, Codec.INT).fieldOf(DataKeys.POKEMON_SKILL_COOLDOWNS).forGetter(ClientPokemonP4::skillCooldownTicks),
+                Codec.INT.optionalFieldOf(DataKeys.POKEMON_ORIGINAL_TRAINER_FRIENDSHIP).forGetter(ClientPokemonP4::originalTrainerFriendship),
+            ).apply(instance, ::ClientPokemonP4)
         }
 
         internal fun from(pokemon: Pokemon): ClientPokemonP4 = ClientPokemonP4(
+            pokemon.skillCooldownsTicks,
             Optional.ofNullable(pokemon.originalTrainerFriendship)
         )
     }

common/src/main/kotlin/com/cobblemon/mod/common/util/codec/internal/PokemonP4.kt

@@ -13,13 +13,16 @@ import com.cobblemon.mod.common.util.DataKeys
 import com.mojang.serialization.Codec
 import com.mojang.serialization.MapCodec
 import com.mojang.serialization.codecs.RecordCodecBuilder
+import net.minecraft.resources.ResourceLocation
 import java.util.*
 
 internal data class PokemonP4(
-    val originalTrainerFriendship: Optional<Int>
+    val skillCooldownTicks: Map<ResourceLocation, Int>,
+    val originalTrainerFriendship: Optional<Int>,
 ) : Partial<Pokemon> {
 
     override fun into(other: Pokemon): Pokemon {
+        other.skillCooldownsTicks = this.skillCooldownTicks.toMutableMap()
         this.originalTrainerFriendship.ifPresent { other.originalTrainerFriendship = it }
         other.refreshOriginalTrainer()
         return other
@@ -28,16 +31,20 @@ internal data class PokemonP4(
     companion object {
         internal val CODEC: MapCodec<PokemonP4> = RecordCodecBuilder.mapCodec { instance ->
             instance.group(
-                Codec.INT.optionalFieldOf(DataKeys.POKEMON_ORIGINAL_TRAINER_FRIENDSHIP).forGetter(PokemonP4::originalTrainerFriendship)
+                Codec.unboundedMap(ResourceLocation.CODEC, Codec.INT).optionalFieldOf(DataKeys.POKEMON_SKILL_COOLDOWNS, emptyMap<ResourceLocation, Int>()).forGetter { it.skillCooldownTicks },
+                Codec.INT.optionalFieldOf(DataKeys.POKEMON_ORIGINAL_TRAINER_FRIENDSHIP).forGetter(PokemonP4::originalTrainerFriendship),
             ).apply(instance) {
+              skillCooldownTicks,
               originalTrainerFriendship -> PokemonP4(
-                originalTrainerFriendship
+                skillCooldownTicks,
+                originalTrainerFriendship,
               )
             }
         }
 
         internal fun from(pokemon: Pokemon): PokemonP4 = PokemonP4(
-            Optional.ofNullable(pokemon.originalTrainerFriendship)
+            pokemon.skillCooldownsTicks,
+            Optional.ofNullable(pokemon.originalTrainerFriendship),
         )
     }
 }

common/src/main/kotlin/com/cobblemon/mod/common/world/feature/CobblemonPlacedFeatures.kt

@@ -92,7 +92,9 @@ object CobblemonPlacedFeatures {
     @JvmField
     val SKELETAL_FALL = of("habitats/skeletal_fall")
     @JvmField
-    val STRANGE_FUNGAL_DWELLINGS = of("habitats/strange_fungal_dwellings")
+    val STRANGE_CRIMSON_FUNGAL_DWELLINGS = of("habitats/strange_crimson_fungal_dwellings")
+    @JvmField
+    val STRANGE_WARPED_FUNGAL_DWELLINGS = of("habitats/strange_warped_fungal_dwellings")
     @JvmField
     val VOLCANIC_PLUMES = of("habitats/volcanic_plumes")
 
@@ -177,7 +179,8 @@ object CobblemonPlacedFeatures {
         Cobblemon.implementation.addFeatureToWorldGen(ROOT_NURSERIES, GenerationStep.Decoration.LOCAL_MODIFICATIONS, CobblemonBiomeTags.IS_SWAMP)
         Cobblemon.implementation.addFeatureToWorldGen(SANDY_TIDEPOOLS, GenerationStep.Decoration.LOCAL_MODIFICATIONS, CobblemonBiomeTags.IS_BEACH)
         Cobblemon.implementation.addFeatureToWorldGen(SKELETAL_FALL, GenerationStep.Decoration.LOCAL_MODIFICATIONS, CobblemonBiomeTags.IS_SOUL_SAND)
-        Cobblemon.implementation.addFeatureToWorldGen(STRANGE_FUNGAL_DWELLINGS, GenerationStep.Decoration.LOCAL_MODIFICATIONS, CobblemonBiomeTags.IS_WASTELAND)
+        Cobblemon.implementation.addFeatureToWorldGen(STRANGE_CRIMSON_FUNGAL_DWELLINGS, GenerationStep.Decoration.LOCAL_MODIFICATIONS, CobblemonBiomeTags.IS_WASTELAND)
+        Cobblemon.implementation.addFeatureToWorldGen(STRANGE_WARPED_FUNGAL_DWELLINGS, GenerationStep.Decoration.LOCAL_MODIFICATIONS, CobblemonBiomeTags.IS_WASTELAND)
         Cobblemon.implementation.addFeatureToWorldGen(VOLCANIC_PLUMES, GenerationStep.Decoration.LOCAL_MODIFICATIONS, BiomeTags.IS_NETHER)
         Cobblemon.implementation.addFeatureToWorldGen(PREHISTORIC_BIRCH_TREE, GenerationStep.Decoration.LAKES, CobblemonBiomeTags.HAS_BIRCH_LOG)
         Cobblemon.implementation.addFeatureToWorldGen(PREHISTORIC_DRIPSTONE_OASIS, GenerationStep.Decoration.LAKES, CobblemonBiomeTags.IS_DRIPSTONE)

common/src/main/kotlin/com/cobblemon/mod/common/world/structureprocessors/HeightRangeStructureProcessor.kt

@@ -13,7 +13,10 @@ import com.mojang.serialization.MapCodec
 import com.mojang.serialization.codecs.RecordCodecBuilder
 import net.minecraft.core.BlockPos
 import net.minecraft.world.level.LevelReader
+import net.minecraft.world.level.LevelHeightAccessor
+import net.minecraft.world.level.chunk.ChunkGenerator
 import net.minecraft.world.level.levelgen.Heightmap
+import net.minecraft.world.level.levelgen.RandomState
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate
@@ -24,6 +27,25 @@ class HeightRangeStructureProcessor(
 	val reference: HeightReference = HeightReference.SEA_LEVEL
 ) : StructureProcessor() {
 
+	fun isValidPlacement(world: LevelReader, pos: BlockPos): Boolean {
+		val referenceY = reference.getY(world, pos)
+		val minY = referenceY + minOffset
+		val maxY = referenceY + maxOffset
+		return pos.y in minY..maxY
+	}
+
+	fun isValidPlacement(
+		chunkGenerator: ChunkGenerator,
+		heightAccessor: LevelHeightAccessor,
+		randomState: RandomState,
+		pos: BlockPos
+	): Boolean {
+		val referenceY = reference.getY(chunkGenerator, heightAccessor, randomState, pos)
+		val minY = referenceY + minOffset
+		val maxY = referenceY + maxOffset
+		return pos.y in minY..maxY
+	}
+
 	override fun processBlock(
 		world: LevelReader,
 		pos: BlockPos,
@@ -32,11 +54,7 @@ class HeightRangeStructureProcessor(
 		currentBlockInfo: StructureTemplate.StructureBlockInfo,
 		data: StructurePlaceSettings
 	): StructureTemplate.StructureBlockInfo? {
-		val referenceY = reference.getY(world, pos)
-		val minY = referenceY + minOffset
-		val maxY = referenceY + maxOffset
-
-		return if (pos.y in minY..maxY) {
+		return if (isValidPlacement(world, pos)) {
 			currentBlockInfo
 		} else {
 			null
@@ -65,6 +83,19 @@ class HeightRangeStructureProcessor(
 			}
 		}
 
+		fun getY(
+			chunkGenerator: ChunkGenerator,
+			heightAccessor: LevelHeightAccessor,
+			randomState: RandomState,
+			pos: BlockPos
+		): Int {
+			return if (this == SEA_LEVEL) {
+				chunkGenerator.seaLevel
+			} else {
+				chunkGenerator.getBaseHeight(pos.x, pos.z, type ?: Heightmap.Types.WORLD_SURFACE_WG, heightAccessor, randomState)
+			}
+		}
+
 		companion object {
 			val CODEC: Codec<HeightReference> = Codec.STRING.xmap(
 				{ serialized -> entries.firstOrNull { it.id == serialized } ?: SEA_LEVEL },

common/src/main/resources/assets/cobblemon/bedrock/generic/animations/moves/playrough.animation.json

@@ -0,0 +1,39 @@
+{
+	"format_version": "1.8.0",
+	"animations": {
+		"animation.playrough.actor": {
+			"animation_length": 3,
+			"bones": {
+				"root_part": {
+					"position": {
+						"0.0": [0, 0, 0],
+						"0.0417": [0, 0, -3],
+						"0.0833": [0, 0, -6],
+						"0.125": [0, 0, -16],
+						"0.2917": [0, 0, -26],
+						"1.2083": [0, 0, -10],
+						"1.2917": [0, 0, -4],
+						"1.4167": [0, 0, 0]
+					},
+					"scale": {
+						"0.0": [1, 1, 1],
+						"0.0417": [1, 1, 1.05],
+						"0.0833": [1, 1, 1.2],
+						"0.125": {"pre": [0.9841, 0.9841, 1.6], "post": [0, 0, 0]},
+						"1.2083": {"pre": [0, 0, 0], "post": [1, 1, 1]}
+					}
+				}
+			},
+			"particle_effects": {
+				"0.0": {
+					"effect": "closecombat_actor",
+					"locator": "middle"
+				},
+				"0.0417": {
+					"effect": "closecombat_dashlines",
+					"locator": "middle"
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/blizzard/blizzard_actor.particle.json

@@ -0,0 +1,72 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:blizzard_actor",
+			"basic_render_parameters": {
+				"material": "particles_alpha",
+				"texture": "textures/particles/generic/impact/impact_ice"
+			}
+		},
+		"curves": {
+			"variable.bsizing": {
+				"type": "linear",
+				"input": "v.particle_age",
+				"horizontal_range": "v.particle_lifetime",
+				"nodes": [0, 0.69, 0.96, 1, 1, 1, 1, 1, 1, 0.96, 0.82, 0]
+			}
+		},
+		"components": {
+			"minecraft:emitter_rate_steady": {
+				"spawn_rate": 900,
+				"max_particles": 10000
+			},
+			"minecraft:emitter_lifetime_once": {
+				"active_time": 1.1
+			},
+			"minecraft:emitter_shape_box": {
+				"offset": [0, 4, 2],
+				"half_dimensions": [10, 4, 10],
+				"direction": ["(v.particle_random_1-0.5)*0.5", "(v.target_deltay/v.target_distance)+((v.particle_random_2-0.5)*0.5)", -1]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": "math.random(0.9,1.4)*1.1"
+			},
+			"minecraft:particle_initial_speed": "(v.particle_random_4+1)*16",
+			"minecraft:particle_motion_dynamic": {
+				"linear_acceleration": ["math.sin(v.particle_age*((v.particle_random_2-0.5)*(360+(v.particle_random_2*180))))*1.5", "math.cos(v.particle_age*((v.particle_random_4-0.5)*(360+(v.particle_random_2*180))))*2", "math.sin(v.particle_age*((v.particle_random_1-0.5)*(360+(v.particle_random_2*180))))*1.5"],
+				"linear_drag_coefficient": 1.5
+			},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["0.1*v.bsizing", "0.1*v.bsizing"],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 8,
+					"texture_height": 56,
+					"flipbook": {
+						"base_UV": [0, 0],
+						"size_UV": [8, 8],
+						"step_UV": [0, 8],
+						"frames_per_second": 10,
+						"max_frame": 7,
+						"loop": true
+					}
+				}
+			},
+			"minecraft:particle_motion_collision": {
+				"collision_drag": 0.2,
+				"coefficient_of_restitution": 0.05,
+				"collision_radius": 0.1
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age / v.particle_lifetime",
+					"gradient": {
+						"0.0": "#FFFFFFFF",
+						"1.0": "#FFAAD4FF"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/blizzard/blizzard_target.particle.json

@@ -0,0 +1,73 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:blizzard_target",
+			"basic_render_parameters": {
+				"material": "particles_alpha",
+				"texture": "textures/particles/generic/impact/impact_ice"
+			}
+		},
+		"curves": {
+			"variable.dfd": {
+				"type": "linear",
+				"input": "v.particle_age",
+				"horizontal_range": "v.particle_lifetime",
+				"nodes": [0, 0.69, 0.96, 1, 1, 1, 0.96, 0.82, 0]
+			}
+		},
+		"components": {
+			"minecraft:emitter_initialization": {
+				"creation_expression": "v.entity_height=1;"
+			},
+			"minecraft:emitter_rate_steady": {
+				"spawn_rate": 1000,
+				"max_particles": 10000
+			},
+			"minecraft:emitter_lifetime_once": {
+				"active_time": 0.1
+			},
+			"minecraft:emitter_shape_point": {
+				"direction": ["(v.particle_random_1-0.5)*3", "(v.particle_random_2-0.5)*3", "(v.particle_random_3-0.5)*3"]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": "0.6+(v.particle_random_4*0.4)"
+			},
+			"minecraft:particle_initial_speed": "math.random(1.25,4.75)*7",
+			"minecraft:particle_motion_dynamic": {
+				"linear_acceleration": ["(v.particle_random_3-0.5)*16", "(v.particle_random_4-0.5)*16", "(v.particle_random_2-0.5)*16"],
+				"linear_drag_coefficient": 4
+			},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["0.1*v.dfd", "0.1*v.dfd"],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 8,
+					"texture_height": 56,
+					"flipbook": {
+						"base_UV": [0, 0],
+						"size_UV": [8, 8],
+						"step_UV": [0, 8],
+						"frames_per_second": 10,
+						"max_frame": 7,
+						"stretch_to_lifetime": true
+					}
+				}
+			},
+			"minecraft:particle_motion_collision": {
+				"collision_drag": 0.2,
+				"coefficient_of_restitution": 0.6,
+				"collision_radius": 0.1
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age / v.particle_lifetime",
+					"gradient": {
+						"0.0": "#FFFFFFFF",
+						"1.0": "#FFAAD4FF"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/blizzard/blizzard_targetswirl.particle.json

@@ -0,0 +1,64 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:blizzard_targetswirl",
+			"basic_render_parameters": {
+				"material": "particles_alpha",
+				"texture": "textures/particles/generic/impact/impact_ice"
+			}
+		},
+		"curves": {
+			"variable.dfd": {
+				"type": "linear",
+				"input": "v.particle_age",
+				"horizontal_range": "v.particle_lifetime",
+				"nodes": [0, 0.69, 0.96, 1, 1, 1, 0.96, 0.82, 0]
+			}
+		},
+		"components": {
+			"minecraft:emitter_initialization": {
+				"creation_expression": "v.entity_height=1;"
+			},
+			"minecraft:emitter_rate_steady": {
+				"spawn_rate": 200,
+				"max_particles": 10000
+			},
+			"minecraft:emitter_lifetime_once": {
+				"active_time": 0.7
+			},
+			"minecraft:emitter_shape_point": {},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": "0.6+(v.particle_random_4*0.4)"
+			},
+			"minecraft:particle_motion_parametric": {
+				"relative_position": ["(math.sin((v.particle_age*420)+(v.particle_random_1*360))*(math.clamp(v.entity_radius*1.04,0.65,4)+(v.particle_age*1.7)))", "(math.cos((v.particle_age*410)+(v.particle_random_1*360))*0.25)+((((v.particle_random_2-0.5)*2)*(v.entity_height*0.65))+((v.particle_age+v.particle_age)*(v.particle_random_4-0.5)))", "(math.cos((v.particle_age*410)+(v.particle_random_1*360))*(math.clamp(v.entity_radius*1.04,0.65,4)+(v.particle_age*1.7)))"]
+			},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["0.1*v.dfd", "0.1*v.dfd"],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 8,
+					"texture_height": 56,
+					"flipbook": {
+						"base_UV": [0, 0],
+						"size_UV": [8, 8],
+						"step_UV": [0, 8],
+						"frames_per_second": 10,
+						"max_frame": 7,
+						"loop": true
+					}
+				}
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age / v.particle_lifetime",
+					"gradient": {
+						"0.0": "#FFFFFFFF",
+						"1.0": "#FFAAD4FF"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_actor.particle.json

@@ -37,7 +37,7 @@
 			"minecraft:particle_motion_dynamic": {},
 			"minecraft:particle_appearance_billboard": {
 				"size": ["0.35+(v.particle_age*0.175)", "0.35+(v.particle_age*0.175)"],
-				"facing_camera_mode": "rotate_xyz",
+				"facing_camera_mode": "emitter_transform_xy",
 				"uv": {
 					"texture_width": 117,
 					"texture_height": 13,

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/confusion/confusion_target.particle.json

@@ -48,7 +48,7 @@
                     0.55,
                     0.55
                 ],
-                "facing_camera_mode": "rotate_xyz",
+                "facing_camera_mode": "emitter_transform_xy",
                 "uv": {
                     "texture_width": 68,
                     "texture_height": 17,

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/disarmingvoice/disarmingvoice_actor1.particle.json

@@ -0,0 +1,60 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:disarmingvoice_actor1",
+			"basic_render_parameters": {
+				"material": "particles_blend",
+				"texture": "textures/particles/generic/ring/largering"
+			}
+		},
+		"components": {
+			"minecraft:emitter_initialization": {
+				"creation_expression": "v.target_deltaz=5;"
+			},
+			"minecraft:emitter_rate_steady": {
+				"spawn_rate": 8,
+				"max_particles": 7
+			},
+			"minecraft:emitter_lifetime_once": {
+				"active_time": 1.1
+			},
+			"minecraft:emitter_shape_point": {
+				"offset": ["v.target_deltax*(v.emitter_age/v.emitter_lifetime)", "v.target_deltay*(v.emitter_age/v.emitter_lifetime)", "-(v.target_deltaz*(v.emitter_age/v.emitter_lifetime))"],
+				"direction": [0, "(v.target_deltay/v.target_distance)", -1]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": 0.43
+			},
+			"minecraft:particle_initial_speed": "math.clamp(v.target_deltaz,1,12)",
+			"minecraft:particle_motion_dynamic": {
+				"linear_drag_coefficient": "math.clamp(v.target_deltaz*1.5,3,10)"
+			},
+			"minecraft:particle_appearance_billboard": {
+				"size": [0.75, 0.75],
+				"facing_camera_mode": "emitter_transform_xy",
+				"uv": {
+					"texture_width": 160,
+					"texture_height": 20,
+					"flipbook": {
+						"base_UV": [0, 0],
+						"size_UV": [20, 20],
+						"step_UV": [20, 0],
+						"frames_per_second": 20,
+						"max_frame": 8
+					}
+				}
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age / v.particle_lifetime",
+					"gradient": {
+						"0.0": "#FFFFECFE",
+						"0.47": "#FFFF89E8",
+						"1.0": "#FFE600BA"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/disarmingvoice/disarmingvoice_actor2.particle.json

@@ -0,0 +1,60 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:disarmingvoice_actor2",
+			"basic_render_parameters": {
+				"material": "particles_blend",
+				"texture": "textures/particles/generic/ring/mediumring"
+			}
+		},
+		"components": {
+			"minecraft:emitter_initialization": {
+				"creation_expression": "v.target_deltaz=5;"
+			},
+			"minecraft:emitter_rate_steady": {
+				"spawn_rate": 8,
+				"max_particles": 7
+			},
+			"minecraft:emitter_lifetime_once": {
+				"active_time": 1.1
+			},
+			"minecraft:emitter_shape_point": {
+				"offset": ["v.target_deltax*(v.emitter_age/v.emitter_lifetime)", "v.target_deltay*(v.emitter_age/v.emitter_lifetime)", "-(v.target_deltaz*(v.emitter_age/v.emitter_lifetime))"],
+				"direction": [0, "(v.target_deltay/v.target_distance)", -1]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": 0.3
+			},
+			"minecraft:particle_initial_speed": "math.clamp(v.target_deltaz,1,12)",
+			"minecraft:particle_motion_dynamic": {
+				"linear_drag_coefficient": "math.clamp(v.target_deltaz*1.5,3,10)"
+			},
+			"minecraft:particle_appearance_billboard": {
+				"size": [0.55, 0.55],
+				"facing_camera_mode": "emitter_transform_xy",
+				"uv": {
+					"texture_width": 90,
+					"texture_height": 15,
+					"flipbook": {
+						"base_UV": [0, 0],
+						"size_UV": [15, 15],
+						"step_UV": [15, 0],
+						"frames_per_second": 20,
+						"max_frame": 6
+					}
+				}
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age / v.particle_lifetime",
+					"gradient": {
+						"0.0": "#FFFFECFE",
+						"0.47": "#FFFF89E8",
+						"1.0": "#FFE600BA"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/disarmingvoice/disarmingvoice_actorhearts.particle.json

@@ -0,0 +1,63 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:disarmingvoice_actorhearts",
+			"basic_render_parameters": {
+				"material": "particles_alpha",
+				"texture": "textures/particles/generic/status/infatuation_heart"
+			}
+		},
+		"curves": {
+			"variable.d": {
+				"type": "linear",
+				"input": "v.particle_age",
+				"horizontal_range": "v.particle_lifetime",
+				"nodes": [0, 0.93, 1, 1, 1, 0.93, 0.61, 0]
+			}
+		},
+		"components": {
+			"minecraft:emitter_initialization": {
+				"creation_expression": "v.target_deltaz=5;"
+			},
+			"minecraft:emitter_rate_steady": {
+				"spawn_rate": 25,
+				"max_particles": 2000
+			},
+			"minecraft:emitter_lifetime_once": {
+				"active_time": 1.1
+			},
+			"minecraft:emitter_shape_point": {
+				"offset": ["(v.target_deltax*(v.emitter_age/v.emitter_lifetime))+math.sin(v.emitter_age*360*7.5)*0.7", "(v.target_deltay*(v.emitter_age/v.emitter_lifetime))+math.cos(v.emitter_age*360*7.5)*0.7", "-(v.target_deltaz*(v.emitter_age/v.emitter_lifetime))"],
+				"direction": [0, "(v.target_deltay/v.target_distance)", -1]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": 0.45
+			},
+			"minecraft:particle_initial_speed": "v.target_deltaz*0.5",
+			"minecraft:particle_motion_dynamic": {
+				"linear_acceleration": ["(v.particle_random_1-0.5)", "(v.particle_random_2-0.5)", "(v.particle_random_3-0.5)"],
+				"linear_drag_coefficient": 4
+			},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["(0.1-(v.particle_random_4*0.04))*v.d", "(0.1-(v.particle_random_4*0.04))*v.d"],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 90,
+					"texture_height": 9,
+					"uv": [3, 3],
+					"uv_size": [3, 3]
+				}
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age / v.particle_lifetime",
+					"gradient": {
+						"0.0": "#FFFF89E8",
+						"1.0": "#FFE600BA"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/disarmingvoice/disarmingvoice_target.particle.json

@@ -0,0 +1,70 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:disarmingvoice_target",
+			"basic_render_parameters": {
+				"material": "particles_blend",
+				"texture": "textures/particles/generic/ring/xlring"
+			}
+		},
+		"curves": {
+			"variable.s": {
+				"type": "linear",
+				"input": "v.particle_age",
+				"horizontal_range": "v.particle_lifetime",
+				"nodes": [0.24, 0.69, 0.9, 0.98, 1, 1, 1, 1, 1, 1, 1, 1, 1]
+			}
+		},
+		"events": {
+			"event": {
+				"particle_effect": {
+					"effect": "cobblemon:disarmingvoice_targetsparks",
+					"type": "emitter"
+				}
+			}
+		},
+		"components": {
+			"minecraft:emitter_rate_instant": {
+				"num_particles": 1
+			},
+			"minecraft:emitter_lifetime_once": {
+				"active_time": 1.1
+			},
+			"minecraft:emitter_lifetime_events": {
+				"creation_event": "event"
+			},
+			"minecraft:emitter_shape_point": {},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": 0.43
+			},
+			"minecraft:particle_initial_speed": 0,
+			"minecraft:particle_motion_dynamic": {},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["1*v.s", "1*v.s"],
+				"facing_camera_mode": "emitter_transform_xy",
+				"uv": {
+					"texture_width": 160,
+					"texture_height": 20,
+					"flipbook": {
+						"base_UV": [0, 0],
+						"size_UV": [20, 20],
+						"step_UV": [20, 0],
+						"frames_per_second": 20,
+						"max_frame": 8
+					}
+				}
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age / v.particle_lifetime",
+					"gradient": {
+						"0.0": "#FFFFECFE",
+						"0.47": "#FFFF89E8",
+						"1.0": "#FFE600BA"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/disarmingvoice/disarmingvoice_targetsparks.particle.json

@@ -0,0 +1,64 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:disarmingvoice_targetsparks",
+			"basic_render_parameters": {
+				"material": "particles_alpha",
+				"texture": "textures/particles/generic/orb/scaling"
+			}
+		},
+		"curves": {
+			"variable.size": {
+				"type": "linear",
+				"input": "v.particle_age",
+				"horizontal_range": "v.particle_lifetime",
+				"nodes": [0, 1, 0.98, 0.86, 0.6, 0]
+			}
+		},
+		"components": {
+			"minecraft:emitter_rate_instant": {
+				"num_particles": 10
+			},
+			"minecraft:emitter_lifetime_once": {
+				"active_time": 1
+			},
+			"minecraft:emitter_shape_point": {
+				"direction": ["math.random(-0.91,0.91)", "math.random(-0.81, 1.01)", "math.random(-0.91,0.91)"]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": "math.random(0.45, 0.6)"
+			},
+			"minecraft:particle_initial_speed": "(0.8+(v.particle_random_4*0.6))*10",
+			"minecraft:particle_motion_dynamic": {
+				"linear_acceleration": ["(v.particle_random_1-0.5)*7", "(v.particle_random_2-0.5)*7", "(v.particle_random_3-0.5)*7"],
+				"linear_drag_coefficient": 5
+			},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["0.11*v.size", "0.11*v.size"],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 8,
+					"texture_height": 32,
+					"flipbook": {
+						"base_UV": [0, 16],
+						"size_UV": [8, 8],
+						"step_UV": [0, -8],
+						"frames_per_second": 12,
+						"max_frame": 3,
+						"stretch_to_lifetime": true
+					}
+				}
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age / v.particle_lifetime",
+					"gradient": {
+						"0.0": "#FFFFECFE",
+						"0.93": "#FFE600BA"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/dragonbreath/dragonbreath_actor.particle.json

@@ -0,0 +1,77 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:dragonbreath_actor",
+			"basic_render_parameters": {
+				"material": "particles_alpha",
+				"texture": "textures/particles/generic/fire/cloudyfire_white"
+			}
+		},
+		"curves": {
+			"variable.fun": {
+				"type": "linear",
+				"input": "v.particle_age",
+				"horizontal_range": "v.particle_lifetime",
+				"nodes": [1, 1, 1, 1, 0.99, 0.97, 0.91, 0.77, 0.54, -0.1]
+			}
+		},
+		"components": {
+			"minecraft:emitter_initialization": {
+				"creation_expression": "v.target_deltaz=5;v.target_deltax=0;v.target_deltay=0;"
+			},
+			"minecraft:emitter_rate_steady": {
+				"spawn_rate": "30*(math.clamp(v.target_deltaz,1,4))",
+				"max_particles": 1000
+			},
+			"minecraft:emitter_lifetime_once": {
+				"active_time": 1
+			},
+			"minecraft:emitter_shape_point": {
+				"direction": ["(-v.target_deltax+((v.particle_random_1-0.5)*1.05))+(math.sin(v.emitter_age*360)*0.25)", "(v.target_deltay+((v.particle_random_2-0.5)*1.05))+(math.sin(v.emitter_age*540)*0.2)", "-v.target_deltaz*1.05"]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": "math.random(0.75,1.0)*1.4"
+			},
+			"minecraft:particle_initial_spin": {
+				"rotation": "math.round(v.particle_random_4*3)*90"
+			},
+			"minecraft:particle_initial_speed": "(v.target_deltaz*((v.particle_random_4+0.75)*1.15))*(math.clamp(v.target_deltaz,3,24)/1.7)",
+			"minecraft:particle_motion_dynamic": {
+				"linear_acceleration": ["(v.particle_random_3-0.5)*4", "3+(v.particle_random_1-0.5)*2", "(v.particle_random_2-0.5)*1"],
+				"linear_drag_coefficient": "math.clamp(v.target_deltaz,1,20)*(0.5+(math.clamp(v.target_deltaz,1,5)*0.05))"
+			},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["(0.5-(v.particle_random_4*0.15))*v.fun", "(0.5-(v.particle_random_4*0.15))*v.fun"],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 160,
+					"texture_height": 16,
+					"flipbook": {
+						"base_UV": [0, 0],
+						"size_UV": [16, 16],
+						"step_UV": [16, 0],
+						"frames_per_second": 12,
+						"max_frame": 10
+					}
+				}
+			},
+			"minecraft:particle_motion_collision": {
+				"collision_drag": 10,
+				"collision_radius": 0.01
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "(v.particle_age / v.particle_lifetime) * (v.particle_random_4+0.75)",
+					"gradient": {
+						"0.0": "#FFFFE6A1",
+						"0.05": "#FFFFE6A1",
+						"0.2": "#FFFF3B8F",
+						"0.6": "#FFA300FF",
+						"1.0": "#FF3E00C7"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/dragonbreath/dragonbreath_target.particle.json

@@ -0,0 +1,71 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:dragonbreath_target",
+			"basic_render_parameters": {
+				"material": "particles_blend",
+				"texture": "textures/particles/generic/fire/cloudyfire_white"
+			}
+		},
+		"curves": {
+			"variable.dorasize": {
+				"type": "linear",
+				"input": "v.particle_age",
+				"horizontal_range": "v.particle_lifetime",
+				"nodes": [0.42, 0.77, 0.91, 0.98, 1, 1, 1, 1, 1, 0.86, 0.55, 0]
+			}
+		},
+		"components": {
+			"minecraft:emitter_rate_steady": {
+				"spawn_rate": 250,
+				"max_particles": 150
+			},
+			"minecraft:emitter_lifetime_looping": {
+				"active_time": 0.3
+			},
+			"minecraft:emitter_shape_point": {
+				"offset": [0, 0, "math.random(0.15,-0.05)"],
+				"direction": ["math.random(-2,2)*1.1", "math.random(-2,2)*1.1", "math.random(-2,2)*0.45"]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": "math.random(0.65,1.0)*1.4"
+			},
+			"minecraft:particle_initial_speed": "math.random(1.25,4.75)*1.25",
+			"minecraft:particle_motion_dynamic": {
+				"linear_acceleration": [0, "math.random(1.5,3.5)", 0],
+				"linear_drag_coefficient": "math.random(1.25,1.5)*2"
+			},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["(0.5-(v.particle_random_4*0.15))*v.dorasize", "(0.5-(v.particle_random_4*0.15))*v.dorasize"],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 160,
+					"texture_height": 16,
+					"flipbook": {
+						"base_UV": [0, 0],
+						"size_UV": [16, 16],
+						"step_UV": [16, 0],
+						"frames_per_second": 12,
+						"max_frame": 10
+					}
+				}
+			},
+			"minecraft:particle_motion_collision": {
+				"coefficient_of_restitution": 0.1,
+				"collision_radius": 0.1
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age / v.particle_lifetime",
+					"gradient": {
+						"0.0": "#FFFFE6A1",
+						"0.35": "#FFFF3B8F",
+						"0.7": "#FFA300FF",
+						"1.0": "#FF3E00C7"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/dragonrage/dragonrage_actor.particle.json

@@ -0,0 +1,74 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:dragonrage_actor",
+			"basic_render_parameters": {
+				"material": "particles_alpha",
+				"texture": "textures/particles/generic/fire/cloudyfire_white"
+			}
+		},
+		"curves": {
+			"variable.fun": {
+				"type": "linear",
+				"input": "v.particle_age",
+				"horizontal_range": "v.particle_lifetime",
+				"nodes": [1, 1, 1, 0.99, 0.95, 0.8, 0.5, 0.05]
+			}
+		},
+		"components": {
+			"minecraft:emitter_initialization": {
+				"creation_expression": "v.target_deltaz=5;"
+			},
+			"minecraft:emitter_rate_steady": {
+				"spawn_rate": 60,
+				"max_particles": 300
+			},
+			"minecraft:emitter_lifetime_once": {
+				"active_time": 0.65
+			},
+			"minecraft:emitter_shape_point": {
+				"offset": ["-v.target_deltax*(v.emitter_age/v.emitter_lifetime)", "v.target_deltay*(v.emitter_age/v.emitter_lifetime)", "-v.target_deltaz*(v.emitter_age/v.emitter_lifetime)"],
+				"direction": ["math.random(-0.45,0.45)", "math.random(-0.45,0.45)-(v.target_deltay/v.target_deltaz)", "math.random(-2.05,-0.55)"]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": 0.7
+			},
+			"minecraft:particle_initial_spin": {
+				"rotation": "math.round(v.particle_random_4*3)*90"
+			},
+			"minecraft:particle_initial_speed": "math.random(2.75,3.25)*(v.target_deltaz*0.5)",
+			"minecraft:particle_motion_dynamic": {
+				"linear_acceleration": ["(v.particle_random_1-0.5)*4", "1.5+(v.particle_random_1-0.5)*3", "(v.particle_random_1-0.5)*3"],
+				"linear_drag_coefficient": 4
+			},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["0.45*v.fun", "0.45*v.fun"],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 160,
+					"texture_height": 16,
+					"flipbook": {
+						"base_UV": [0, 0],
+						"size_UV": [16, 16],
+						"step_UV": [16, 0],
+						"frames_per_second": 20,
+						"max_frame": 10
+					}
+				}
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age / v.particle_lifetime",
+					"gradient": {
+						"0.0": "#FFFFA1A1",
+						"0.05": "#FFFFA1A1",
+						"0.2": "#FFFF3BF2",
+						"0.6": "#FF7C00FF",
+						"1.0": "#FF3E00C7"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/dragonrage/dragonrage_actorburst.particle.json

@@ -0,0 +1,85 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:dragonrage_actorburst",
+			"basic_render_parameters": {
+				"material": "particles_alpha",
+				"texture": "textures/particles/generic/fire/cloudyfire_white"
+			}
+		},
+		"curves": {
+			"variable.fun": {
+				"type": "linear",
+				"input": "v.particle_age",
+				"horizontal_range": "v.particle_lifetime",
+				"nodes": [1, 1, 1, 1, 0.97, 0.87, 0.54, 0]
+			}
+		},
+		"events": {
+			"ring": {
+				"particle_effect": {
+					"effect": "cobblemon:dragonrage_actorring",
+					"type": "emitter"
+				}
+			}
+		},
+		"components": {
+			"minecraft:emitter_rate_steady": {
+				"spawn_rate": 200,
+				"max_particles": 1000
+			},
+			"minecraft:emitter_lifetime_once": {
+				"active_time": 0.1
+			},
+			"minecraft:emitter_lifetime_events": {
+				"creation_event": "ring"
+			},
+			"minecraft:emitter_shape_point": {
+				"direction": ["math.random(-1.05,1.05)*1.25", "math.random(-1.05,1.05)*1.25", "math.random(-1.25,-0.05)"]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": "math.random(0.4,0.8)"
+			},
+			"minecraft:particle_initial_spin": {
+				"rotation": "math.round(v.particle_random_4*3)*90"
+			},
+			"minecraft:particle_initial_speed": "math.random(2.5,7.5)*2",
+			"minecraft:particle_motion_dynamic": {
+				"linear_acceleration": ["(v.particle_random_1-0.5)*4", "3+(v.particle_random_1-0.5)*3", "(v.particle_random_1-0.5)*1"],
+				"linear_drag_coefficient": 4
+			},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["(0.5-(v.particle_random_4*0.15))*v.fun", "(0.5-(v.particle_random_4*0.15))*v.fun"],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 160,
+					"texture_height": 16,
+					"flipbook": {
+						"base_UV": [16, 0],
+						"size_UV": [16, 16],
+						"step_UV": [16, 0],
+						"frames_per_second": 20,
+						"max_frame": 9
+					}
+				}
+			},
+			"minecraft:particle_motion_collision": {
+				"collision_drag": 10,
+				"collision_radius": 0.01
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age / v.particle_lifetime",
+					"gradient": {
+						"0.0": "#FFFFA1A1",
+						"0.05": "#FFFFA1A1",
+						"0.2": "#FFFF3BF2",
+						"0.6": "#FF7C00FF",
+						"1.0": "#FF3E00C7"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/dragonrage/dragonrage_actorring.particle.json

@@ -0,0 +1,63 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:dragonrage_actorring",
+			"basic_render_parameters": {
+				"material": "particles_blend",
+				"texture": "textures/particles/generic/ring/xlring"
+			}
+		},
+		"curves": {
+			"variable.s": {
+				"type": "linear",
+				"input": "v.particle_age",
+				"horizontal_range": "v.particle_lifetime",
+				"nodes": [0, 0.57, 0.84, 0.96, 1, 1, 1, 1, 1, 1, 1]
+			}
+		},
+		"components": {
+			"minecraft:emitter_rate_instant": {
+				"num_particles": 1
+			},
+			"minecraft:emitter_lifetime_once": {
+				"active_time": 0.05
+			},
+			"minecraft:emitter_shape_point": {
+				"offset": [0, 0, -0.1]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": 0.45
+			},
+			"minecraft:particle_initial_speed": 0,
+			"minecraft:particle_motion_dynamic": {},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["1.2*v.s", "1.2*v.s"],
+				"facing_camera_mode": "emitter_transform_xy",
+				"uv": {
+					"texture_width": 200,
+					"texture_height": 25,
+					"flipbook": {
+						"base_UV": [0, 0],
+						"size_UV": [25, 25],
+						"step_UV": [25, 0],
+						"frames_per_second": 20,
+						"max_frame": 8
+					}
+				}
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age / v.particle_lifetime",
+					"gradient": {
+						"0.0": "#FFFFA1A1",
+						"0.05": "#FFFFA1A1",
+						"0.2": "#FFFF3BF2",
+						"0.78": "#FF6600C7",
+						"1.0": "#003E00C7"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/dragonrage/dragonrage_target.particle.json

@@ -0,0 +1,84 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:dragonrage_target",
+			"basic_render_parameters": {
+				"material": "particles_alpha",
+				"texture": "textures/particles/generic/fire/cloudyfire_white"
+			}
+		},
+		"curves": {
+			"variable.fun": {
+				"type": "linear",
+				"input": "v.particle_age",
+				"horizontal_range": "v.particle_lifetime",
+				"nodes": [1, 1, 1, 1, 1, 1, 0.96, 0.85, 0.6, -0.05]
+			}
+		},
+		"events": {
+			"cover": {
+				"particle_effect": {
+					"effect": "cobblemon:dragonrage_targetcover",
+					"type": "emitter_bound"
+				}
+			}
+		},
+		"components": {
+			"minecraft:emitter_rate_instant": {
+				"num_particles": "30*math.clamp(v.entity_height,1,2)"
+			},
+			"minecraft:emitter_lifetime_once": {
+				"active_time": 0.05
+			},
+			"minecraft:emitter_lifetime_events": {
+				"creation_event": "cover"
+			},
+			"minecraft:emitter_shape_point": {
+				"direction": ["math.random(-1.55,1.55)", "math.random(-1.55,1.55)", "math.random(-1.55,1.55)"]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": "math.random(0.35,0.95)"
+			},
+			"minecraft:particle_initial_spin": {
+				"rotation": "math.round(v.particle_random_4*3)*90"
+			},
+			"minecraft:particle_initial_speed": "math.random(3,8.5)*math.clamp(v.entity_height,1,1.5)",
+			"minecraft:particle_motion_dynamic": {
+				"linear_acceleration": ["(v.particle_random_1-0.5)*5", "4+(v.particle_random_2-0.5)*3", "(v.particle_random_3-0.5)*5"],
+				"linear_drag_coefficient": 3
+			},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["(0.5-(v.particle_random_4*0.15))*v.fun", "(0.5-(v.particle_random_4*0.15))*v.fun"],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 160,
+					"texture_height": 16,
+					"flipbook": {
+						"base_UV": [16, 0],
+						"size_UV": [16, 16],
+						"step_UV": [16, 0],
+						"frames_per_second": 20,
+						"max_frame": 9
+					}
+				}
+			},
+			"minecraft:particle_motion_collision": {
+				"collision_drag": 10,
+				"collision_radius": 0.01
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age / v.particle_lifetime",
+					"gradient": {
+						"0.0": "#FFFFA1A1",
+						"0.05": "#FFFFA1A1",
+						"0.2": "#FFFF3BF2",
+						"0.6": "#FF7C00FF",
+						"1.0": "#FF3E00C7"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/dragonrage/dragonrage_targetcover.particle.json

@@ -0,0 +1,78 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:dragonrage_targetcover",
+			"basic_render_parameters": {
+				"material": "particles_alpha",
+				"texture": "textures/particles/generic/fire/cloudyfire_white"
+			}
+		},
+		"curves": {
+			"variable.burstarc": {
+				"type": "linear",
+				"input": "v.emitter_age",
+				"horizontal_range": "v.emitter_lifetime",
+				"nodes": [0.06, 0.5, 0.78, 0.91, 0.97, 0.99, 0.96, 0.83, 0.55, 0.06]
+			},
+			"variable.fun": {
+				"type": "linear",
+				"input": "v.particle_age",
+				"horizontal_range": "v.particle_lifetime",
+				"nodes": [1, 1, 1, 1, 1, 1, 0.96, 0.85, 0.6, -0.05]
+			}
+		},
+		"components": {
+			"minecraft:emitter_rate_steady": {
+				"spawn_rate": "25*math.clamp(v.entity_height,1,2)",
+				"max_particles": 1000
+			},
+			"minecraft:emitter_lifetime_once": {
+				"active_time": 0.75
+			},
+			"minecraft:emitter_shape_sphere": {
+				"radius": "(v.entity_height*(0.7-(v.particle_random_4*0.15)))*math.clamp(v.entity_scale,0.5,1))",
+				"surface_only": true,
+				"direction": ["math.random(-0.45,0.45)", "math.random(-0.15,0.35)", "math.random(-0.45,0.45)"]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": "math.random(0.45,0.75)"
+			},
+			"minecraft:particle_initial_spin": {
+				"rotation": "math.round(v.particle_random_4*3)*90"
+			},
+			"minecraft:particle_initial_speed": 1,
+			"minecraft:particle_motion_dynamic": {
+				"linear_acceleration": ["(v.particle_random_1-0.5)*4", "3+(v.particle_random_1-0.5)*2", "(v.particle_random_1-0.5)*4"],
+				"linear_drag_coefficient": 2
+			},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["0.4*v.fun", "0.4*v.fun"],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 160,
+					"texture_height": 16,
+					"flipbook": {
+						"base_UV": [0, 0],
+						"size_UV": [16, 16],
+						"step_UV": [16, 0],
+						"frames_per_second": 20,
+						"max_frame": 10
+					}
+				}
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age / v.particle_lifetime",
+					"gradient": {
+						"0.0": "#FFFFA1A1",
+						"0.05": "#FFFFA1A1",
+						"0.2": "#FFFF3BF2",
+						"0.6": "#FF7C00FF",
+						"1.0": "#FF3E00C7"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/drainpunch/drainpunch_actor.particle.json

@@ -0,0 +1,78 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:drainpunch_actor",
+			"basic_render_parameters": {
+				"material": "particles_blend",
+				"texture": "textures/particles/generic/orb/xsfadeorblite"
+			}
+		},
+		"curves": {
+			"variable.drainopen": {
+				"type": "linear",
+				"input": "v.particle_age",
+				"horizontal_range": "v.particle_lifetime",
+				"nodes": [0.35, 0.8, 0.98, 1, 1, 1, 1, 0.98, 0.9, 0.65, 0.01]
+			}
+		},
+		"events": {
+			"sparkle": {
+				"particle_effect": {
+					"effect": "cobblemon:megadrain_actortrail",
+					"type": "particle"
+				}
+			}
+		},
+		"components": {
+			"minecraft:emitter_rate_steady": {
+				"spawn_rate": 15,
+				"max_particles": 32
+			},
+			"minecraft:emitter_lifetime_looping": {
+				"active_time": 1.3
+			},
+			"minecraft:emitter_shape_point": {},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": 0.7
+			},
+			"minecraft:particle_lifetime_events": {
+				"timeline": {
+					"0.05": "sparkle",
+					"0.15": "sparkle",
+					"0.33": "sparkle",
+					"0.45": "sparkle"
+				}
+			},
+			"minecraft:particle_motion_parametric": {
+				"relative_position": ["(math.sin((v.particle_age*65)+(v.emitter_age*1523))*(0.75-(v.particle_age*(v.particle_age*1.7)))*v.drainopen)-(v.target_deltax*0.9)+((v.target_deltax * (v.particle_age / v.particle_lifetime))*0.95)", "(math.cos((v.particle_age*65)+(v.emitter_age*1523))*(0.75-(v.particle_age*(v.particle_age*1.7)))*v.drainopen)+(v.target_deltay*0.9)-((v.target_deltay * (v.particle_age / v.particle_lifetime))*0.95)", "-(v.target_deltaz*0.9)+((v.target_deltaz*(v.particle_age / v.particle_lifetime))*0.95)"]
+			},
+			"minecraft:particle_appearance_billboard": {
+				"size": [0.135, 0.135],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 45,
+					"texture_height": 5,
+					"flipbook": {
+						"base_UV": [0, 0],
+						"size_UV": [5, 5],
+						"step_UV": [5, 0],
+						"frames_per_second": 12,
+						"max_frame": 9
+					}
+				}
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age / v.particle_lifetime",
+					"gradient": {
+						"0.0": "#8FC48F00",
+						"0.25": "#DFFFE74E",
+						"0.85": "#DFBDF700",
+						"1.0": "#4F65D000"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/drainpunch/drainpunch_target.particle.json

@@ -0,0 +1,81 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:drainpunch_target",
+			"basic_render_parameters": {
+				"material": "particles_blend",
+				"texture": "textures/particles/generic/bigfist"
+			}
+		},
+		"curves": {
+			"variable.punch": {
+				"type": "linear",
+				"input": "v.particle_age",
+				"horizontal_range": "v.particle_lifetime",
+				"nodes": [0.54, 0.27, 0, 0.06, 0.1, 0.13, 0.15, 0.16, 0.16, 0.16, 0.16, 0.16, 0.16, 0.16, 0.16, 0.16, 0.16, 0.16, 0.16, 0.16, 0.16]
+			}
+		},
+		"events": {
+			"burst": {
+				"particle_effect": {
+					"effect": "cobblemon:drainpunch_targetburst",
+					"type": "emitter"
+				}
+			},
+			"ring": {
+				"particle_effect": {
+					"effect": "cobblemon:drainpunch_targetring",
+					"type": "emitter"
+				}
+			}
+		},
+		"components": {
+			"minecraft:emitter_rate_instant": {
+				"num_particles": 1
+			},
+			"minecraft:emitter_lifetime_looping": {
+				"active_time": 1
+			},
+			"minecraft:emitter_lifetime_events": {
+				"timeline": {
+					"0.05": ["burst", "ring"]
+				}
+			},
+			"minecraft:emitter_shape_point": {},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": 0.65
+			},
+			"minecraft:particle_initial_speed": 0,
+			"minecraft:particle_motion_dynamic": {},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["0.6+v.punch", "0.6+v.punch"],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 270,
+					"texture_height": 30,
+					"flipbook": {
+						"base_UV": [0, 0],
+						"size_UV": [30, 30],
+						"step_UV": [30, 0],
+						"frames_per_second": 14,
+						"max_frame": 9
+					}
+				}
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age / v.particle_lifetime",
+					"gradient": {
+						"0.0": "#FFFF7A00",
+						"0.2": "#FFFFA700",
+						"0.25": "#FFFFF390",
+						"0.43": "#FFFF7A00",
+						"0.65": "#FFB84100",
+						"1.0": "#005F1D00"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/drainpunch/drainpunch_targetburst.particle.json

@@ -0,0 +1,73 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:drainpunch_targetburst",
+			"basic_render_parameters": {
+				"material": "particles_alpha",
+				"texture": "textures/particles/generic/orb/xsfadeorblite"
+			}
+		},
+		"curves": {
+			"variable.scale": {
+				"type": "linear",
+				"input": "v.particle_age",
+				"horizontal_range": "v.particle_lifetime",
+				"nodes": [0, 1, 0.97, 0.94, 0.89, 0.83, 0.68, 0.52, 0.26, 0]
+			}
+		},
+		"components": {
+			"minecraft:emitter_rate_steady": {
+				"spawn_rate": 300,
+				"max_particles": 10000
+			},
+			"minecraft:emitter_lifetime_once": {
+				"active_time": 0.05
+			},
+			"minecraft:emitter_shape_point": {
+				"direction": ["(v.particle_random_1-0.5)*6", "(v.particle_random_2-0.5)*6", "(v.particle_random_3-0.5)*4"]
+			},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": "math.random(0.5,0.8)"
+			},
+			"minecraft:particle_initial_spin": {
+				"rotation": "math.round(v.particle_random_2*3)*90"
+			},
+			"minecraft:particle_initial_speed": "(3+(v.particle_random_4*5))*3.5",
+			"minecraft:particle_motion_dynamic": {
+				"linear_acceleration": ["(v.particle_random_1-0.5)*12", "(v.particle_random_2-0.5)*12", "(v.particle_random_3-0.5)*12"],
+				"linear_drag_coefficient": 8
+			},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["(0.1-(v.particle_random_4*0.06))*variable.scale", "(0.1-(v.particle_random_4*0.06))*variable.scale"],
+				"facing_camera_mode": "rotate_xyz",
+				"uv": {
+					"texture_width": 45,
+					"texture_height": 5,
+					"flipbook": {
+						"base_UV": [10, 0],
+						"size_UV": [5, 5],
+						"step_UV": [5, 0],
+						"frames_per_second": 16,
+						"max_frame": 7
+					}
+				}
+			},
+			"minecraft:particle_motion_collision": {
+				"collision_drag": 1,
+				"collision_radius": 0.01,
+				"expire_on_contact": true
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age/v.particle_lifetime",
+					"gradient": {
+						"0.0": "#FFFF7A00",
+						"0.2": "#FFFFF390",
+						"1.0": "#FFFF7A00"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/drainpunch/drainpunch_targetring.particle.json

@@ -0,0 +1,59 @@
+{
+	"format_version": "1.10.0",
+	"particle_effect": {
+		"description": {
+			"identifier": "cobblemon:drainpunch_targetring",
+			"basic_render_parameters": {
+				"material": "particles_blend",
+				"texture": "textures/particles/generic/ring/xlring"
+			}
+		},
+		"curves": {
+			"variable.s": {
+				"type": "linear",
+				"input": "v.particle_age",
+				"horizontal_range": "v.particle_lifetime",
+				"nodes": [0, 0.56, 0.88, 0.98, 1, 1, 1, 1, 1]
+			}
+		},
+		"components": {
+			"minecraft:emitter_rate_instant": {
+				"num_particles": 1
+			},
+			"minecraft:emitter_lifetime_once": {
+				"active_time": 0.5
+			},
+			"minecraft:emitter_shape_point": {},
+			"minecraft:particle_lifetime_expression": {
+				"max_lifetime": 0.4
+			},
+			"minecraft:particle_initial_speed": 0,
+			"minecraft:particle_motion_dynamic": {},
+			"minecraft:particle_appearance_billboard": {
+				"size": ["1.05*v.s", "1.05*v.s"],
+				"facing_camera_mode": "emitter_transform_xy",
+				"uv": {
+					"texture_width": 200,
+					"texture_height": 25,
+					"flipbook": {
+						"base_UV": [50, 0],
+						"size_UV": [25, 25],
+						"step_UV": [25, 0],
+						"frames_per_second": 16,
+						"max_frame": 6
+					}
+				}
+			},
+			"minecraft:particle_appearance_tinting": {
+				"color": {
+					"interpolant": "v.particle_age / v.particle_lifetime",
+					"gradient": {
+						"0.0": "#FFFFF390",
+						"0.79": "#FFFF7A00",
+						"1.0": "#FFBA3800"
+					}
+				}
+			}
+		}
+	}
+}

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/eruption/eruption_target.particle.json

@@ -5,7 +5,7 @@
 			"identifier": "cobblemon:eruption_target",
 			"basic_render_parameters": {
 				"material": "particles_alpha",
-				"texture": "textures/particles/vanilla/lava"
+				"texture": "textures/particles/generic/burning_rock"
 			}
 		},
 		"curves": {
@@ -19,7 +19,7 @@
 				"type": "linear",
 				"input": "v.particle_age",
 				"horizontal_range": "v.particle_lifetime",
-				"nodes": [1, 1, 0.99, 0.97, 0.93, 0.83, 0.54, 0]
+				"nodes": [-0.04, 0.46, 0.8, 0.96, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
 			}
 		},
 		"events": {
@@ -47,7 +47,7 @@
 				"creation_expression": "v.target_deltaz=10;"
 			},
 			"minecraft:emitter_rate_steady": {
-				"spawn_rate": 25,
+				"spawn_rate": 10,
 				"max_particles": 1000
 			},
 			"minecraft:emitter_lifetime_once": {
@@ -55,7 +55,7 @@
 			},
 			"minecraft:emitter_shape_disc": {
 				"offset": [0, 9, "-v.target_deltaz*0.33"],
-				"radius": "math.clamp(v.entity_width,1.5,10)",
+				"radius": "math.clamp(v.entity_width,2,10)",
 				"direction": ["(v.particle_random_1-0.5)*0.3", "(-v.particle_random_2-0.55)*0.9", "(v.target_deltaz*0.05)+(v.particle_random_3-0.5)*0.3"]
 			},
 			"minecraft:particle_lifetime_expression": {
@@ -87,18 +87,18 @@
 				"linear_drag_coefficient": 1
 			},
 			"minecraft:particle_appearance_billboard": {
-				"size": ["((0.3-(v.particle_random_4*0.125))*v.quiver)*v.shrink", "((0.3-(v.particle_random_4*0.125))*v.quiver)*v.shrink"],
+				"size": ["((0.8-(v.particle_random_4*0.125))*v.quiver)*v.shrink", "((0.8-(v.particle_random_4*0.125))*v.quiver)*v.shrink"],
 				"facing_camera_mode": "rotate_xyz",
 				"uv": {
-					"texture_width": 8,
-					"texture_height": 8,
-					"uv": [0, 0],
-					"uv_size": [8, 8]
+					"texture_width": 32,
+					"texture_height": 192,
+					"uv": [0, "math.round(v.particle_random_4*5)*32"],
+					"uv_size": [32, 32]
 				}
 			},
 			"minecraft:particle_motion_collision": {
 				"collision_drag": 20,
-				"collision_radius": 0.1
+				"collision_radius": 0.2
 			},
 			"minecraft:particle_appearance_tinting": {
 				"color": {

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/eruption/eruption_targetburst.particle.json

@@ -38,7 +38,7 @@
 		},
 		"components": {
 			"minecraft:emitter_rate_steady": {
-				"spawn_rate": 400,
+				"spawn_rate": 600,
 				"max_particles": 10000
 			},
 			"minecraft:emitter_lifetime_once": {

common/src/main/resources/assets/cobblemon/bedrock/particles/moves/eruption/eruption_targetflame.particle.json

@@ -18,13 +18,13 @@
 		},
 		"components": {
 			"minecraft:emitter_rate_instant": {
-				"num_particles": 1
+				"num_particles": 2
 			},
 			"minecraft:emitter_lifetime_once": {
 				"active_time": 0.4
 			},
 			"minecraft:emitter_shape_point": {
-				"offset": [0, 0, 0],
+				"offset": [0, -0.5, 0.25],
 				"direction": ["math.random(-1.55,1.55)*0.7", "math.random(-1.55,-0.55)", "math.random(-1.55,1.55)*0.7"]
 			},
 			"minecraft:particle_lifetime_expression": {