Make starters work from datapacks instead of config.

Breakout Animation, Overhauled Sendout Logic

See merge request cable-mc/cobblemon!943

.gitignore

@@ -35,10 +35,5 @@ common/src/main/resources/assets/cobblemon/showdown
 /fabric/src/generated/resources/cobblemon-common.accesswidener
 /.ignored/
 
-# Logs
-common/logs
-fabric/logs
-forge/logs
-
 # MacOS
 .DS_Store

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Changelog
 ## [1.5.0](#1-5-0)
+
 ### Additions
 - Added over (number here) ruin structures, where you can find Pokémon-themed Armor Trims and Pottery Sherds, Tumblestones, and more.
 - Added (number here) fossil structures, where you can brush Suspicious Sand/Gravel for Fossils.
@@ -18,6 +19,7 @@
 - Added 6 Pokémon-themed Pottery Sherds, obtained from ruin structures.
 - Added a Pokémon-themed armor trim, obtained from ruin structures.
 - You can now find Nether Fire Stone Ore in, surprisingly, the Nether.
+- You'll also find Terracotta Sun Stone Ore in Badlands biomes.
 - Added effects for many Poké Balls when sending out Pokémon or capturing.
 - Added a new send-out ball toss animation that showcases the ball used for the Pokémon.
 - Added simple move animations for Pokémon in battle with a proof of concept for more complicated animations.
@@ -27,13 +29,119 @@
 - Added the [Ability Capsule](https://bulbapedia.bulbagarden.net/wiki/Ability_Capsule) and [Patch](https://bulbapedia.bulbagarden.net/wiki/Ability_Patch), these have no acquisition method for now and only work as intended with the traditional ability format of 1 to 2 common abilities and 1 hidden ability.
 - Added Gilded Chests, available in all Apricorn colors.
 - Added Relic Coins, Relic Coin Pouches, and Relic Coin Sacks.
-- Added Gimmighoul.
+- Added various new tags for searchability and better compatibility. 
+- Added Type Gems. These items hold no functionality for now. Start collecting though...
+- Added 6 custom Pottery Sherds, obtained from ruin structures.
+- Added cries to Meowth, Alolan Meowth, Galaraian Meowth,
+- Completed the advancement for placing a Tumblestone near Lava or Magma to make it grow.
+- Added new held items: Ability Shield, Absorb Bulb, Air Balloon, Binding Band, Blunder Policy, Cell Battery, Covert Cloak, Damp Rock, Eject Button, Eviolite, Expert Belt, Float Stone, Focus Sash, Heat Rock, Icy Rock, Iron Ball, Light Ball, Loaded Dice, Red Card, Shell Bell, Sticky Barb, Smooth Rock, Soothe Bell and Weakness Policy.
+
+### Pokémon Added
+#### Gen 2
+- Sentret
+- Furret
+- Qwilfish
+- Heracross
+- Skarmory
+- Ferroseed
+- Ferrothorn
+
+#### Gen 3
+- Lileep
+- Cradily
+- Anorith
+- Armaldo
+- Tropius
+- Roselia
+
+#### Gen 4
+- Shieldon
+- Bastiodon
+- Cranidos
+- Rampardos
+- Budew
+- Roserade
+
+#### Gen 5
+- Tirtouga
+- Carracosta
+- Archen
+- Archeops
+- Zorua
+- Zoroark
+- Petilil
+- Lilligant
+- Darumaka
+- Darmanitan
+- Woobat
+- Swoobat
+- Sandile
+- Krokorok
+- Krookodile
+- Frillish
+- Jellicent
+- Cubchoo
+- Beartic
+- Deino
+- Zweilous
+- Hydreigon
+- Larvesta
+- Volcarona
+
+#### Gen 6
+- Tyrunt
+- Tyrantrum
+- Amaura
+- Aurorus
+- Goomy
+- Sliggoo
+- Goodra
+
+#### Gen 7
+- Turtonator
+- Fomantis
+- Lurantis
+- Salandit
+- Salazzle
+- Jangmo-o
+- Hakamo-o
+- Kommo-o
+
+#### Gen 8
+- Gossifleur
+- Eldegoss
+- Arctozolt
+- Arctovish
+- Dracozolt
+- Dracovish
+- Basculegion
+- Hisuian Zorua
+- Hisuian Zoroark
+- Hisuian Voltorb
+- Hisuian Electrode
+- Hisuian Qwilfish
+- Overqwil
+- Hisuian Sneasel
+- Sneasler
+- Stonjourner
+- Cufant
+- Copperajah
+- Dreepy
+- Drakloak
+- Dragapult
+- Hisuian Sliggoo
+- Hisuian Goodra
+
+#### Gen 9
+- Gimmighoul.
   - Using Relic Coins, you can increase Gimmighoul's Coin Stash. Upon reaching 999, it can be evolved into Gholdengo.
   - Additionally, if you give Gimmighoul a Netherite Scrap, you can increase its Netherite Stash. Who knows what might happen if it fills up?
-- Completed the advancement for placing a Tumblestone near Lava or Magma to make it grow.
+
 
 ### Changes
 - Pokémon now transition more smoothly between different poses.
+- Updated models for Mimikyu, Alcremie, Squirtle, Wartortle, Blastoise, Omanyte, Omastar, Growlithe, Swinub, Piloswine, Basculine, Rowlet, Dartrix, Decidueye, Kabuto, Kabutops, Piplup, Prinplup, Elekid, Electabuzz, Cubone, Marowak, Paras, Drifloon, Drifblim, Venonat, Venomoth, Yanma, Yanmega, and Raboot.
+- Updated animations for Diglett, Dugtrio, Dragonite, Omanyte, Omastar, Pinsir, Falinks, Lechonk, Litwick, Lampent, Chandelure, Carnivine, Galarian Meowth, Galarian Rapidash, Venonat, Venomoth, Phanphy, Donphan, Dratini, Dragonair, Happiny, Chansey, Blissey, Volbeat, Illumise, Numel, Drifloon, and Drifblim.
 - Added more held items to the held item tag, and Metal Coat to the held item tab.
 - Added all ores to the modloader ore tags, and added tags for each ore type to the mod (both blocks and items).
 - Changed the Destiny Knot to be crafted with a Ghast Tear, rather than a diamond.
@@ -44,8 +152,16 @@
 - Apricorn Sprouts can now be planted directly on Apricorn leaves to create a new Apricorn of the same color.
 - Added tooltips to interaction GUIs to make it clearer what they do.
 - Poké Ball recipes now use tags for their center ingredient, rather than specificied Copper Ingot, Iron Ingot, Gold Ingot, and Diamond, allowing for further datapack customisation.
+- Starter Toast now closes once corresponding button is pressed once.
+- Moved some items in the vanilla Food & Drinks category.
+- Stacked Cobblemon Potion Bases can now be quick moved into Brewing Stands.
+- Changed Healer recipe to swap the Max Revive for a Revive.
+- Upped the rate that Gastly drop Ghast Tears from 2.5% to 5%.
+- Pokémon with a low Blaze Powder drop chance now drop it more frequently in the Nether.
+- Reorganised a few advancements.
 
 ### Fixes
+- Resized Snorlax.
 - Re-added the recipe for the Iron Vitamin.
 - Cleaned up empty evolutions declaration in species files (no, I'm not listing all 169 by name).
 - Fixed Exeggcute not being able to evolve.
@@ -77,12 +193,13 @@
 - Made PokemonProperties.parse more interoperable with Java.
 - Added the ``HeldItemEvent``, this comes with 2 implementation ``HeldItemEvent.Pre`` and ``HeldItemEvent.Post``. 
 - API to support dynamic lighting in any mod that implements this feature has been added to all Species & Forms, see LightingData class for details.
-- Added a Mixin for the BrewingStandScreenHandler to fix the incorrect handling of quickMove in Fabric.
 - Corrections to the ability implementation have been made that make ``Ability.forced`` function as intended and never reroll an ability for a Pokémon, please check your implementations to ensure the corrected behavior is intended for your use case.
 - ``Pokemon.ability`` no longer has a public setter, please migrate to using ``Pokemon#updateAbility``, this handles the ability coordinate storage for you when necessary.
 - ``Ability.forced``, ``Ability.index`` and ``Ability.priority`` have all had their setters internalized, there is no longer any need to manually adjust these migrate to the method mentioned above to handle that process for you.
 - ``AbilityChanger`` has been added to API alongside some implementations, this is subject to change as the ability capsule and patch currently only expect the traditional behaviour in the Pokémon games of 1 to 2 regular abilities and 1 hidden.
 - ``Pokemon#rollAbility`` has been added, this rerolls a legal ability for the Pokémon.
+- `docs/cobblemon-tags` tags and spawn-presets can now be auto-generated from the current tags in the cobblemon mod with the `generateSpawnPresetList.py` and `generateTagList.py` scripts.
+- `public_spawns_to_json.py` script has been added to give the powerful spawn.json generator a simplistic UI.
 
 ### Datapack & Resourcepack Creators
 - The maximum amount of fossils that can fit in the Fossil Analyzer can be adjusted in the config.
@@ -118,6 +235,7 @@
 ```
 - Following up on this change ``light_source`` was removed as a possible shoulder effect due to becoming unnecessary and never having had a default implementation.
 - Added the item tag ``cobblemon:ability_changers``, contains the ``cobblemon:ability_capsule`` & ``cobblemon:ability_patch`` by default.
+- Added the item tag ``cobblemon:held/is_friendship_booster``, allows items to give the Soothe Bell effect of a boost of 1.5x Friendship gained, contains ``cobblemon:soothe_bell`` by default.
 
 ## [1.4.1 (December 23rd, 2023)](#1-4-1)
 

build-logic/build.gradle.kts

@@ -15,4 +15,7 @@ dependencies {
     implementation(libs.shadow)
     implementation(libs.loom)
     implementation(libs.architecturyPlugin)
+
+    implementation(libs.blossom)
+    implementation(libs.ideaExt)
 }

build-logic/src/main/kotlin/cobblemon.publish-conventions.gradle.kts

@@ -1,3 +1,6 @@
+import extensions.VersionType
+import extensions.writeVersion
+
 plugins {
     java
     `java-library`
@@ -31,7 +34,7 @@ publishing {
 
             groupId = "com.cobblemon"
             artifactId = project.findProperty("maven.artifactId")?.toString() ?: project.name
-            version = rootProject.version.toString()
+            version = project.writeVersion(VersionType.PUBLISHING)
         }
     }
 }

build-logic/src/main/kotlin/extensions/Versioning.kt

@@ -0,0 +1,24 @@
+package extensions
+
+import org.gradle.api.Project
+
+fun Project.version(): String {
+    return rootProject.property("mod_version").toString()
+}
+
+fun Project.isSnapshot(): Boolean {
+    return rootProject.property("snapshot") == "true"
+}
+
+fun Project.writeVersion(type: VersionType = VersionType.FULL): String {
+    val version = "${rootProject.property("mod_version")}+${rootProject.property("mc_version")}"
+    return when (type) {
+        VersionType.PUBLISHING -> if(this.isSnapshot()) "$version-SNAPSHOT" else version
+        VersionType.FULL -> if(this.isSnapshot()) rootProject.version.toString() else version
+    }
+}
+
+enum class VersionType {
+    PUBLISHING,
+    FULL
+}

build.gradle.kts

@@ -9,5 +9,5 @@ version = "${project.property("mod_version")}+${project.property("mc_version")}"
 
 val isSnapshot = project.property("snapshot")?.equals("true") ?: false
 if (isSnapshot) {
-    version = "$version-${versioning.info.branch}-${versioning.info.build}-SNAPSHOT"
+    version = "$version-${versioning.info.branch}-${versioning.info.build}"
 }

common/build.gradle.kts

@@ -1,3 +1,9 @@
+import extensions.isSnapshot
+import extensions.version
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
+import java.time.format.DateTimeFormatter
+
 /*
  *
  *  * Copyright (C) 2023 Cobblemon Contributors
@@ -11,6 +17,10 @@
 plugins {
     id("cobblemon.base-conventions")
     id("cobblemon.publish-conventions")
+
+    id("net.kyori.blossom")
+    id("org.jetbrains.gradle.plugin.idea-ext")
+    id ("net.nemerosa.versioning") version "2.8.2"
 }
 
 architectury {
@@ -44,8 +54,7 @@ dependencies {
     modCompileOnly(libs.mongoDriverCore)
     modCompileOnly(libs.mongoDriverSync)
 
-    testRuntimeOnly(libs.junitEngine)
-    testImplementation(libs.junitApi)
+    testImplementation(libs.fabricJunit)
     testImplementation(libs.junitParams)
     testImplementation(libs.mockito)
     testImplementation(libs.mockk)
@@ -59,3 +68,34 @@ tasks.withType<Test> {
         setExceptionFormat("full")
     }
 }
+
+sourceSets {
+    main {
+        blossom {
+            kotlinSources {
+                fun generateLicenseHeader() : String {
+                    val builder = StringBuilder()
+                    builder.append("/*\n")
+                    rootProject.file("HEADER").forEachLine {
+                        if(it.isEmpty()) {
+                            builder.append(" *").append("\n")
+                        } else {
+                            builder.append(" * ").append(it).append("\n")
+                        }
+                    }
+
+                    return builder.append(" */").append("\n").toString()
+                }
+
+                property("license", generateLicenseHeader())
+                property("modid", "cobblemon")
+                property("version", project.version())
+                property("isSnapshot", if(rootProject.isSnapshot()) "true" else "false")
+                property("gitCommit", versioning.info.commit)
+                property("branch", versioning.info.branch)
+                System.getProperty("buildNumber")?.let { property("buildNumber", it) }
+                property("timestamp", OffsetDateTime.now(ZoneOffset.UTC).format(DateTimeFormatter.ofPattern("MM/dd/yyyy hh:mm:ss")) + " UTC")
+            }
+        }
+    }
+}

common/logs/latest.log

@@ -1 +0,0 @@
-[19:57:25] [Test worker/INFO]: Booting LaxPermissionValidator, permissions will be checked using Minecrafts permission level system, see https://minecraft.fandom.com/wiki/Permission_level

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

@@ -0,0 +1,35 @@
+/*
+ * 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.CobblemonBuildDetails;
+import net.minecraft.util.crash.CrashReport;
+import net.minecraft.util.crash.CrashReportSection;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(CrashReport.class)
+public final class CrashReportMixin {
+
+    @Inject(method = "addStackTrace", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/SystemDetails;writeTo(Ljava/lang/StringBuilder;)V"))
+    public void cobblemon$printCobblemonDetails(StringBuilder builder, CallbackInfo callback) {
+        CrashReportSection cobblemon = new CrashReportSection("Cobblemon");
+        cobblemon.add("Version", CobblemonBuildDetails.VERSION);
+        cobblemon.add("Is Snapshot", CobblemonBuildDetails.SNAPSHOT);
+        cobblemon.add("Git Commit", CobblemonBuildDetails.INSTANCE.smallCommitHash() + " (" + "https://gitlab.com/cable-mc/cobblemon/-/commit/" + CobblemonBuildDetails.GIT_COMMIT + ")");
+        cobblemon.add("Branch", CobblemonBuildDetails.BRANCH);
+        cobblemon.add("Timestamp", CobblemonBuildDetails.TIMESTAMP);
+
+        cobblemon.addStackTrace(builder);
+        builder.append("\n\n");
+    }
+
+}

common/src/main/kotlin-templates/CobblemonBuildDetails.kt.peb

@@ -0,0 +1,18 @@
+{{ license }}
+
+package com.cobblemon.mod.common
+
+object CobblemonBuildDetails {
+
+    const val MOD_ID = "{{ modid }}"
+    const val VERSION = "{{ version }}"
+    const val SNAPSHOT = {{ isSnapshot }}
+
+    const val GIT_COMMIT = "{{ gitCommit | default("Not Specified") }}"
+    const val BRANCH = "{{ branch | default("Not Specified") }}"
+    const val TIMESTAMP = "{{ timestamp }}"
+
+    fun smallCommitHash(): String {
+        return this.GIT_COMMIT.substring(0, 7)
+    }
+}

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

@@ -8,6 +8,7 @@
 
 package com.cobblemon.mod.common
 
+import com.cobblemon.mod.common.CobblemonBuildDetails.smallCommitHash
 import com.cobblemon.mod.common.advancement.CobblemonCriteria
 import com.cobblemon.mod.common.advancement.criterion.EvolvePokemonContext
 import com.cobblemon.mod.common.api.Priority
@@ -16,10 +17,10 @@ import com.cobblemon.mod.common.api.data.DataProvider
 import com.cobblemon.mod.common.api.drop.CommandDropEntry
 import com.cobblemon.mod.common.api.drop.DropEntry
 import com.cobblemon.mod.common.api.drop.ItemDropEntry
+import com.cobblemon.mod.common.api.events.CobblemonEvents
 import com.cobblemon.mod.common.api.events.CobblemonEvents.BATTLE_VICTORY
 import com.cobblemon.mod.common.api.events.CobblemonEvents.DATA_SYNCHRONIZED
 import com.cobblemon.mod.common.api.events.CobblemonEvents.EVOLUTION_COMPLETE
-import com.cobblemon.mod.common.api.events.CobblemonEvents.HELD_ITEM_UPDATED
 import com.cobblemon.mod.common.api.events.CobblemonEvents.LEVEL_UP_EVENT
 import com.cobblemon.mod.common.api.events.CobblemonEvents.POKEMON_CAPTURED
 import com.cobblemon.mod.common.api.events.CobblemonEvents.TRADE_COMPLETED
@@ -35,7 +36,10 @@ import com.cobblemon.mod.common.api.pokemon.effect.ShoulderEffectRegistry
 import com.cobblemon.mod.common.api.pokemon.experience.ExperienceCalculator
 import com.cobblemon.mod.common.api.pokemon.experience.ExperienceGroups
 import com.cobblemon.mod.common.api.pokemon.experience.StandardExperienceCalculator
-import com.cobblemon.mod.common.api.pokemon.feature.*
+import com.cobblemon.mod.common.api.pokemon.feature.ChoiceSpeciesFeatureProvider
+import com.cobblemon.mod.common.api.pokemon.feature.FlagSpeciesFeatureProvider
+import com.cobblemon.mod.common.api.pokemon.feature.IntSpeciesFeatureProvider
+import com.cobblemon.mod.common.api.pokemon.feature.SpeciesFeatures
 import com.cobblemon.mod.common.api.pokemon.helditem.HeldItemProvider
 import com.cobblemon.mod.common.api.pokemon.stats.EvCalculator
 import com.cobblemon.mod.common.api.pokemon.stats.Generation8EvCalculator
@@ -62,28 +66,17 @@ import com.cobblemon.mod.common.api.storage.player.PlayerDataStoreManager
 import com.cobblemon.mod.common.api.storage.player.factory.JsonPlayerDataStoreFactory
 import com.cobblemon.mod.common.api.storage.player.factory.MongoPlayerDataStoreFactory
 import com.cobblemon.mod.common.api.tags.CobblemonEntityTypeTags
-import com.cobblemon.mod.common.battles.BagItems
-import com.cobblemon.mod.common.battles.BattleFormat
-import com.cobblemon.mod.common.battles.BattleRegistry
-import com.cobblemon.mod.common.battles.BattleSide
-import com.cobblemon.mod.common.battles.ShowdownThread
+import com.cobblemon.mod.common.api.tags.CobblemonItemTags
+import com.cobblemon.mod.common.battles.*
 import com.cobblemon.mod.common.battles.actor.PokemonBattleActor
 import com.cobblemon.mod.common.battles.pokemon.BattlePokemon
-import com.cobblemon.mod.common.command.argument.DialogueArgumentType
-import com.cobblemon.mod.common.command.argument.MoveArgumentType
-import com.cobblemon.mod.common.command.argument.PartySlotArgumentType
-import com.cobblemon.mod.common.command.argument.PokemonArgumentType
-import com.cobblemon.mod.common.command.argument.PokemonPropertiesArgumentType
-import com.cobblemon.mod.common.command.argument.PokemonStoreArgumentType
-import com.cobblemon.mod.common.command.argument.SpawnBucketArgumentType
+import com.cobblemon.mod.common.command.argument.*
 import com.cobblemon.mod.common.config.CobblemonConfig
 import com.cobblemon.mod.common.config.LastChangedVersion
 import com.cobblemon.mod.common.config.constraint.IntConstraint
-import com.cobblemon.mod.common.config.starter.StarterConfig
 import com.cobblemon.mod.common.data.CobblemonDataProvider
 import com.cobblemon.mod.common.events.AdvancementHandler
 import com.cobblemon.mod.common.events.ServerTickHandler
-import com.cobblemon.mod.common.item.CobblemonItem
 import com.cobblemon.mod.common.item.PokeBallItem
 import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket
 import com.cobblemon.mod.common.permission.LaxPermissionValidator
@@ -94,7 +87,6 @@ import com.cobblemon.mod.common.pokemon.aspects.SHINY_ASPECT
 import com.cobblemon.mod.common.pokemon.evolution.variants.BlockClickEvolution
 import com.cobblemon.mod.common.pokemon.feature.TagSeasonResolver
 import com.cobblemon.mod.common.pokemon.helditem.CobblemonHeldItemManager
-import com.cobblemon.mod.common.pokemon.misc.GimmighoulStashHandler
 import com.cobblemon.mod.common.pokemon.properties.HiddenAbilityPropertyType
 import com.cobblemon.mod.common.pokemon.properties.UncatchableProperty
 import com.cobblemon.mod.common.pokemon.properties.tags.PokemonFlagProperty
@@ -102,13 +94,7 @@ import com.cobblemon.mod.common.pokemon.stat.CobblemonStatProvider
 import com.cobblemon.mod.common.sherds.CobblemonSherds
 import com.cobblemon.mod.common.starter.CobblemonStarterHandler
 import com.cobblemon.mod.common.trade.TradeManager
-import com.cobblemon.mod.common.util.DataKeys
-import com.cobblemon.mod.common.util.cobblemonResource
-import com.cobblemon.mod.common.util.ifDedicatedServer
-import com.cobblemon.mod.common.util.isLaterVersion
-import com.cobblemon.mod.common.util.party
-import com.cobblemon.mod.common.util.removeAmountIf
-import com.cobblemon.mod.common.util.server
+import com.cobblemon.mod.common.util.*
 import com.cobblemon.mod.common.world.feature.CobblemonPlacedFeatures
 import com.cobblemon.mod.common.world.feature.ore.CobblemonOrePlacedFeatures
 import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
@@ -116,31 +102,35 @@ import com.mongodb.ConnectionString
 import com.mongodb.MongoClientSettings
 import com.mongodb.client.MongoClient
 import com.mongodb.client.MongoClients
-import java.io.File
-import java.io.FileReader
-import java.io.FileWriter
-import java.io.PrintWriter
-import java.util.UUID
-import kotlin.properties.Delegates
-import kotlin.reflect.full.memberProperties
-import kotlin.reflect.jvm.isAccessible
-import kotlin.reflect.jvm.javaField
 import net.minecraft.client.MinecraftClient
 import net.minecraft.command.argument.serialize.ConstantArgumentSerializer
 import net.minecraft.entity.data.TrackedDataHandlerRegistry
 import net.minecraft.item.Items
 import net.minecraft.item.NameTagItem
 import net.minecraft.registry.RegistryKey
-import net.minecraft.sound.SoundCategory
 import net.minecraft.util.WorldSavePath
 import net.minecraft.world.World
 import org.apache.logging.log4j.LogManager
+import org.apache.logging.log4j.Logger
+import java.io.File
+import java.io.FileReader
+import java.io.FileWriter
+import java.util.*
+import kotlin.collections.filterIsInstance
+import kotlin.collections.forEach
+import kotlin.collections.listOf
+import kotlin.collections.set
+import kotlin.math.roundToInt
+import kotlin.properties.Delegates
+import kotlin.reflect.full.memberProperties
+import kotlin.reflect.jvm.isAccessible
+import kotlin.reflect.jvm.javaField
 
 object Cobblemon {
     const val MODID = "cobblemon"
     const val VERSION = "1.4.0"
     const val CONFIG_PATH = "config/$MODID/main.json"
-    val LOGGER = LogManager.getLogger()
+    val LOGGER: Logger = LogManager.getLogger()
 
     lateinit var implementation: CobblemonImplementation
     @Deprecated("This field is now a config value", ReplaceWith("Cobblemon.config.captureCalculator"))
@@ -162,7 +152,6 @@ object Cobblemon {
     var storage = PokemonStoreManager()
     var molangData = NbtMoLangDataStoreFactory
     lateinit var playerData: PlayerDataStoreManager
-    lateinit var starterConfig: StarterConfig
     val dataProvider: DataProvider = CobblemonDataProvider
     var permissionValidator: PermissionValidator by Delegates.observable(LaxPermissionValidator().also { it.initialize() }) { _, _, newValue -> newValue.initialize() }
     var statProvider: StatProvider = CobblemonStatProvider
@@ -170,6 +159,14 @@ object Cobblemon {
 
     fun preInitialize(implementation: CobblemonImplementation) {
         this.implementation = implementation
+
+        this.LOGGER.info("Launching Cobblemon ${CobblemonBuildDetails.VERSION}${if(CobblemonBuildDetails.SNAPSHOT) "-SNAPSHOT" else ""} ")
+        if(CobblemonBuildDetails.SNAPSHOT) {
+            this.LOGGER.info("  - Git Commit: ${smallCommitHash()} (https://gitlab.com/cable-mc/cobblemon/-/commit/${CobblemonBuildDetails.GIT_COMMIT})")
+            this.LOGGER.info("  - Branch: ${CobblemonBuildDetails.BRANCH}")
+            this.LOGGER.info("  - Timestamp: ${CobblemonBuildDetails.TIMESTAMP}")
+        }
+
         implementation.registerPermissionValidator()
         implementation.registerSoundEvents()
         implementation.registerBlocks()
@@ -244,6 +241,16 @@ object Cobblemon {
         TrackedDataHandlerRegistry.register(PoseTypeDataSerializer)
         TrackedDataHandlerRegistry.register(IdentifierDataSerializer)
 
+        // Lowest priority because this applies after luxury ball bonus as of gen 4
+        CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(Priority.LOWEST) { event ->
+            var increment = (event.newFriendship - event.pokemon.friendship).toFloat()
+            // Our Luxury ball spec is diff from official, but we will still assume these stack
+            if (event.pokemon.heldItemNoCopy().isIn(CobblemonItemTags.IS_FRIENDSHIP_BOOSTER)) {
+                increment += increment * 0.5F
+            }
+            event.newFriendship = event.pokemon.friendship + increment.roundToInt()
+        }
+
         HeldItemProvider.register(CobblemonHeldItemManager, Priority.LOWEST)
     }
 
@@ -455,27 +462,6 @@ object Cobblemon {
         this.saveConfig()
 
         bestSpawner.loadConfig()
-        PokemonSpecies.observable.subscribe { starterConfig = this.loadStarterConfig() }
-    }
-
-    fun loadStarterConfig(): StarterConfig {
-        if (config.exportStarterConfig) {
-            val file = File("config/cobblemon/starters.json")
-            file.parentFile.mkdirs()
-            if (!file.exists()) {
-                val config = StarterConfig()
-                val pw = PrintWriter(file)
-                StarterConfig.GSON.toJson(config, pw)
-                pw.close()
-                return config
-            }
-            val reader = FileReader(file)
-            val config = StarterConfig.GSON.fromJson(reader, StarterConfig::class.java)
-            reader.close()
-            return config
-        } else {
-            return StarterConfig()
-        }
     }
 
     fun saveConfig() {

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

@@ -72,6 +72,8 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
     @JvmField
     val SUN_STONE_ORE = evolutionStoneOre("sun_stone_ore")
     @JvmField
+    val TERRACOTTA_SUN_STONE_ORE = evolutionStoneOre("terracotta_sun_stone_ore")
+    @JvmField
     val THUNDER_STONE_ORE = evolutionStoneOre("thunder_stone_ore")
     @JvmField
     val WATER_STONE_ORE = evolutionStoneOre("water_stone_ore")
@@ -158,7 +160,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
     @JvmField
     val BIG_ROOT = this.create("big_root", BigRootBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).burnable().mapColor(MapColor.DARK_GREEN).noCollision().ticksRandomly().breakInstantly().sounds(CobblemonSounds.BIG_ROOT_SOUNDS)))
     @JvmField
-    val REVIVAL_HERB = this.create("revival_herb", RevivalHerbBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).mapColor(MapColor.DARK_GREEN).burnable().noCollision().breakInstantly().sounds(BlockSoundGroup.CROP)))
+    val REVIVAL_HERB = this.create("revival_herb", RevivalHerbBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).mapColor(MapColor.DARK_GREEN).burnable().noCollision().breakInstantly().sounds(CobblemonSounds.REVIVAL_HERB_SOUNDS)))
 
     @JvmField
     val TUMBLESTONE_CLUSTER = tumblestoneBlock("tumblestone_cluster", GrowableStoneBlock.STAGE_3, 7, 3, null)
@@ -426,7 +428,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, RegistryKey<Registry<
     )
 
     @JvmField
-    val VIVICHOKE_SEEDS = this.create("vivichoke_seeds", VivichokeBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).burnable().mapColor(MapColor.DARK_GREEN).noCollision().ticksRandomly().breakInstantly().sounds(BlockSoundGroup.CROP)))
+    val VIVICHOKE_SEEDS = this.create("vivichoke_seeds", VivichokeBlock(AbstractBlock.Settings.create().pistonBehavior(PistonBehavior.DESTROY).burnable().mapColor(MapColor.DARK_GREEN).noCollision().ticksRandomly().breakInstantly().sounds(CobblemonSounds.VIVICHOKE_SOUNDS)))
     @JvmField
     val PEP_UP_FLOWER = this.create("pep_up_flower", FlowerBlock(StatusEffects.LEVITATION, 10, AbstractBlock.Settings.create().mapColor(MapColor.DARK_GREEN).noCollision().breakInstantly().sounds(BlockSoundGroup.GRASS).offset(AbstractBlock.OffsetType.XZ).pistonBehavior(PistonBehavior.DESTROY)))
     @JvmField

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

@@ -48,5 +48,9 @@ object CobblemonCommands {
         PokemonRestartCommand.register(dispatcher)
         BedrockParticleCommand.register(dispatcher)
         OpenDialogueCommand.register(dispatcher)
+
+        // Possibly lock down registration if and only if under dev environment or running in an environment
+        // with a certain system environment variable set
+        CobblemonInfoCommand.register(dispatcher)
     }
 }

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

@@ -30,6 +30,7 @@ import com.cobblemon.mod.common.item.berry.PortionHealingBerryItem
 import com.cobblemon.mod.common.item.berry.StatusCuringBerryItem
 import com.cobblemon.mod.common.item.berry.VolatileCuringBerryItem
 import com.cobblemon.mod.common.item.interactive.*
+import com.cobblemon.mod.common.item.interactive.PotionItem
 import com.cobblemon.mod.common.item.interactive.ability.AbilityChangeItem
 import com.cobblemon.mod.common.platform.PlatformRegistry
 import com.cobblemon.mod.common.pokeball.PokeBall
@@ -39,14 +40,7 @@ import net.minecraft.block.Block
 import net.minecraft.entity.LivingEntity
 import net.minecraft.entity.effect.StatusEffectInstance
 import net.minecraft.entity.effect.StatusEffects
-import net.minecraft.item.BlockItem
-import net.minecraft.item.FoodComponent
-import net.minecraft.item.HangingSignItem
-import net.minecraft.item.Item
-import net.minecraft.item.ItemStack
-import net.minecraft.item.SignItem
-import net.minecraft.item.SmithingTemplateItem
-import net.minecraft.item.StewItem
+import net.minecraft.item.*
 import net.minecraft.registry.Registries
 import net.minecraft.registry.Registry
 import net.minecraft.registry.RegistryKey
@@ -289,6 +283,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField val RIBBON_SWEET = noSettingsItem("ribbon_sweet")
     @JvmField val CHIPPED_POT = noSettingsItem("chipped_pot")
     @JvmField val CRACKED_POT = noSettingsItem("cracked_pot")
+    @JvmField val MASTERPIECE_TEACUP = noSettingsItem("masterpiece_teacup")
+    @JvmField val UNREMARKABLE_TEACUP = noSettingsItem("unremarkable_teacup")
     @JvmField val SWEET_APPLE = noSettingsItem("sweet_apple")
     @JvmField val TART_APPLE = noSettingsItem("tart_apple")
     @JvmField val GALARICA_CUFF = noSettingsItem("galarica_cuff")
@@ -412,7 +408,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField
     val CLEVER_FEATHER = create("clever_feather", FeatherItem(Stats.SPECIAL_DEFENCE))
     @JvmField
-    val MEDICINAL_LEEK = create("medicinal_leek", MedicinalLeekItem(CobblemonBlocks.MEDICINAL_LEEK, Item.Settings().food(FoodComponent.Builder().snack().hunger(1).saturationModifier(0.2f).build())))
+    val MEDICINAL_LEEK = heldItem("medicinal_leek", MedicinalLeekItem(CobblemonBlocks.MEDICINAL_LEEK, Item.Settings().food(FoodComponent.Builder().snack().hunger(1).saturationModifier(0.2f).build())), "leek")
     @JvmField
     val ROASTED_LEEK = create("roasted_leek", Item(Item.Settings().food(FoodComponent.Builder().snack().hunger(3).saturationModifier(0.3f).build())))
     @JvmField
@@ -587,6 +583,8 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField
     val SUN_STONE_ORE = blockItem("sun_stone_ore", CobblemonBlocks.SUN_STONE_ORE)
     @JvmField
+    val TERRACOTTA_SUN_STONE_ORE = blockItem("terracotta_sun_stone_ore", CobblemonBlocks.TERRACOTTA_SUN_STONE_ORE)
+    @JvmField
     val THUNDER_STONE_ORE = blockItem("thunder_stone_ore", CobblemonBlocks.THUNDER_STONE_ORE)
     @JvmField
     val WATER_STONE_ORE = blockItem("water_stone_ore", CobblemonBlocks.WATER_STONE_ORE)
@@ -638,16 +636,28 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
 
     // Held Items
     @JvmField
+    val ABILITY_SHIELD = heldItem("ability_shield")
+    @JvmField
+    val ABSORB_BULB = heldItem("absorb_bulb")
+    @JvmField
+    val AIR_BALLOON = heldItem("air_balloon")
+    @JvmField
     val ASSAULT_VEST = heldItem("assault_vest")
     @JvmField
     val BIG_ROOT = blockItem("big_root", CobblemonBlocks.BIG_ROOT)
     @JvmField
+    val BINDING_BAND = heldItem("binding_band")
+    @JvmField
     val BLACK_BELT = heldItem("black_belt")
     @JvmField
     val BLACK_GLASSES = heldItem("black_glasses")
     @JvmField
     val BLACK_SLUDGE = heldItem("black_sludge")
     @JvmField
+    val BLUNDER_POLICY = heldItem("blunder_policy")
+    @JvmField
+    val CELL_BATTERY = heldItem("cell_battery")
+    @JvmField
     val CHARCOAL = heldItem("charcoal_stick", remappedName = "charcoal")
     @JvmField
     val CHOICE_BAND = heldItem("choice_band")
@@ -658,26 +668,64 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField
     val CLEANSE_TAG = heldItem("cleanse_tag")
     @JvmField
+    val CLEAR_AMULET = heldItem("clear_amulet")
+    @JvmField
+    val COVERT_CLOAK = heldItem("covert_cloak")
+    @JvmField
+    val DESTINY_KNOT = heldItem("destiny_knot")
+    @JvmField
     val DRAGON_FANG = heldItem("dragon_fang")
     @JvmField
+    val EJECT_BUTTON = heldItem("eject_button")
+    @JvmField
+    val EJECT_PACK = heldItem("eject_pack")
+    @JvmField
+    val EVERSTONE = heldItem("everstone")
+    @JvmField
+    val EVIOLITE = heldItem("eviolite")
+    @JvmField
     val EXP_SHARE = heldItem("exp_share")
     @JvmField
+    val EXPERT_BELT = heldItem("expert_belt")
+    @JvmField
     val FAIRY_FEATHER = heldItem("fairy_feather")
     @JvmField
+    val FLAME_ORB = heldItem("flame_orb")
+    @JvmField
+    val FLOAT_STONE = heldItem("float_stone")
+    @JvmField
     val FOCUS_BAND = heldItem("focus_band")
     @JvmField
+    val FOCUS_SASH = heldItem("focus_sash")
+    @JvmField
+    val GRIP_CLAW = heldItem("grip_claw")
+    @JvmField
     val HARD_STONE = heldItem("hard_stone")
     @JvmField
     val HEAVY_DUTY_BOOTS = heldItem("heavy_duty_boots")
     @JvmField
+    val IRON_BALL = heldItem("iron_ball")
+    @JvmField
+    val LAGGING_TAIL = heldItem("lagging_tail")
+    @JvmField
     val LEFTOVERS = heldItem("leftovers")
     @JvmField
+    val LIFE_ORB = heldItem("life_orb")
+    @JvmField
+    val LIGHT_BALL = heldItem("light_ball")
+    @JvmField
     val LIGHT_CLAY = heldItem("light_clay")
     @JvmField
+    val LOADED_DICE = heldItem("loaded_dice")
+    @JvmField
     val LUCKY_EGG = heldItem("lucky_egg")
     @JvmField
+    val LUMINOUS_MOSS = heldItem("luminous_moss")
+    @JvmField
     val MAGNET = heldItem("magnet")
     @JvmField
+    val METRONOME = heldItem("metronome")
+    @JvmField
     val MIRACLE_SEED = heldItem("miracle_seed")
     @JvmField
     val MUSCLE_BAND = heldItem("muscle_band")
@@ -688,14 +736,42 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField
     val POISON_BARB = heldItem("poison_barb")
     @JvmField
+    val POWER_ANKLET = heldItem("power_anklet")
+    @JvmField
+    val POWER_BAND = heldItem("power_band")
+    @JvmField
+    val POWER_BELT = heldItem("power_belt")
+    @JvmField
+    val POWER_BRACER = heldItem("power_bracer")
+    @JvmField
+    val POWER_LENS = heldItem("power_lens")
+    @JvmField
+    val POWER_WEIGHT = heldItem("power_weight")
+    @JvmField
+    val PROTECTIVE_PADS = heldItem("protective_pads")
+    @JvmField
+    val PUNCHING_GLOVE = heldItem("punching_glove")
+    @JvmField
     val QUICK_CLAW = heldItem("quick_claw")
     @JvmField
+    val RED_CARD = heldItem("red_card")
+    @JvmField
+    val RING_TARGET = heldItem("ring_target")
+    @JvmField
     val ROCKY_HELMET = heldItem("rocky_helmet")
     @JvmField
+    val ROOM_SERVICE = heldItem("room_service")
+    @JvmField
     val SAFETY_GOGGLES = heldItem("safety_goggles")
     @JvmField
+    val SCOPE_LENS = heldItem("scope_lens")
+    @JvmField
     val SHARP_BEAK = heldItem("sharp_beak")
     @JvmField
+    val SHED_SHELL = heldItem("shed_shell")
+    @JvmField
+    val SHELL_BELL = heldItem("shell_bell")
+    @JvmField
     val SILK_SCARF = heldItem("silk_scarf")
     @JvmField
     val SILVER_POWDER = heldItem("silver_powder")
@@ -704,10 +780,30 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField
     val SPELL_TAG = heldItem("spell_tag")
     @JvmField
+    val SMOKE_BALL = heldItem("smoke_ball")
+    @JvmField
+    val SOOTHE_BELL = heldItem("soothe_bell")
+    @JvmField
+    val STICKY_BARB = heldItem("sticky_barb")
+    @JvmField
+    val TERRAIN_EXTENDER = heldItem("terrain_extender")
+    @JvmField
+    val THROAT_SPRAY = heldItem("throat_spray")
+    @JvmField
+    val TOXIC_ORB = heldItem("toxic_orb")
+    @JvmField
     val TWISTED_SPOON = heldItem("twisted_spoon")
     @JvmField
+    val UTILITY_UMBRELLA = heldItem("utility_umbrella")
+    @JvmField
+    val WEAKNESS_POLICY = heldItem("weakness_policy")
+    @JvmField
+    val WIDE_LENS = heldItem("wide_lens")
+    @JvmField
     val WISE_GLASSES = heldItem("wise_glasses")
     @JvmField
+    val ZOOM_LENS = heldItem("zoom_lens")
+    @JvmField
     val MENTAL_HERB = compostableHeldItem("mental_herb", null, 1F)
     @JvmField
     val MIRROR_HERB = compostableHeldItem("mirror_herb", null, 1F)
@@ -722,29 +818,13 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
     @JvmField
     val QUICK_POWDER = heldItem("quick_powder")
     @JvmField
-    val DESTINY_KNOT = heldItem("destiny_knot")
+    val DAMP_ROCK = heldItem("damp_rock")
     @JvmField
-    val EVERSTONE = heldItem("everstone")
+    val HEAT_ROCK = heldItem("heat_rock")
     @JvmField
-    val POWER_ANKLET = heldItem("power_anklet")
+    val SMOOTH_ROCK = heldItem("smooth_rock")
     @JvmField
-    val POWER_BAND = heldItem("power_band")
-    @JvmField
-    val POWER_BELT = heldItem("power_belt")
-    @JvmField
-    val POWER_BRACER = heldItem("power_bracer")
-    @JvmField
-    val POWER_LENS = heldItem("power_lens")
-    @JvmField
-    val POWER_WEIGHT = heldItem("power_weight")
-    @JvmField
-    val FLAME_ORB = heldItem("flame_orb")
-    @JvmField
-    val LIFE_ORB = heldItem("life_orb")
-    @JvmField
-    val TOXIC_ORB = heldItem("toxic_orb")
-    @JvmField
-    val SMOKE_BALL = heldItem("smoke_ball")
+    val ICY_ROCK = heldItem("icy_rock")
 
     // Mulch
     @JvmField
@@ -931,6 +1011,16 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, RegistryKey<Registry<It
             }
         }
     )
+    private fun heldItem(name: String, item: Item, remappedName: String? = null) = create(
+        name = name,
+        entry = item.also {
+            if (remappedName != null) {
+                CobblemonHeldItemManager.registerRemap(it, remappedName)
+                CobblemonHeldItemManager.registerRemap(Items.BONE, "thickclub")
+                CobblemonHeldItemManager.registerRemap(Items.SNOWBALL, "snowball")
+            }
+        }
+    )
 
     private fun compostable(item: Item, increaseLevelChance: Float) = Cobblemon.implementation.registerCompostable(item, increaseLevelChance)
 

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

@@ -99,27 +99,27 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, RegistryKey<Regi
     val MULCH_REMOVE = this.create("mulch.remove")
 
     @JvmField
-    val FOSSIL_MACHINE_ACTIVATE = this.create("fossilmachine.activate")
+    val FOSSIL_MACHINE_ACTIVATE = this.create("fossil_machine.activate")
     @JvmField
-    val FOSSIL_MACHINE_ACTIVE_LOOP = this.create("fossilmachine.active_loop")
+    val FOSSIL_MACHINE_ACTIVE_LOOP = this.create("fossil_machine.active_loop")
     @JvmField
-    val FOSSIL_MACHINE_ASSEMBLE = this.create("fossilmachine.assemble")
+    val FOSSIL_MACHINE_ASSEMBLE = this.create("fossil_machine.assemble")
     @JvmField
-    val FOSSIL_MACHINE_DNA_FULL = this.create("fossilmachine.dna_full")
+    val FOSSIL_MACHINE_DNA_FULL = this.create("fossil_machine.dna_full")
     @JvmField
-    val FOSSIL_MACHINE_FINISHED = this.create("fossilmachine.finished")
+    val FOSSIL_MACHINE_FINISHED = this.create("fossil_machine.finished")
     @JvmField
-    val FOSSIL_MACHINE_INSERT_DNA = this.create("fossilmachine.insert_dna")
+    val FOSSIL_MACHINE_INSERT_DNA = this.create("fossil_machine.insert_dna")
     @JvmField
-    val FOSSIL_MACHINE_INSERT_DNA_SMALL = this.create("fossilmachine.insert_dna_small")
+    val FOSSIL_MACHINE_INSERT_DNA_SMALL = this.create("fossil_machine.insert_dna_small")
     @JvmField
-    val FOSSIL_MACHINE_INSERT_FOSSIL = this.create("fossilmachine.insert_fossil")
+    val FOSSIL_MACHINE_INSERT_FOSSIL = this.create("fossil_machine.insert_fossil")
     @JvmField
-    val FOSSIL_MACHINE_RETRIEVE_FOSSIL = this.create("fossilmachine.retrieve_fossil")
+    val FOSSIL_MACHINE_RETRIEVE_FOSSIL = this.create("fossil_machine.retrieve_fossil")
     @JvmField
-    val FOSSIL_MACHINE_RETRIEVE_POKEMON = this.create("fossilmachine.retrieve_pokemon")
+    val FOSSIL_MACHINE_RETRIEVE_POKEMON = this.create("fossil_machine.retrieve_pokemon")
     @JvmField
-    val FOSSIL_MACHINE_UNPROTECTED = this.create("fossilmachine.unprotected")
+    val FOSSIL_MACHINE_UNPROTECTED = this.create("fossil_machine.unprotected")
 
     @JvmField
     val COIN_POUCH_BREAK = this.create("coin_pouch.break")
@@ -155,11 +155,21 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, RegistryKey<Regi
     @JvmField
     val ENERGY_ROOT_PLACE = this.create("energy_root.place")
 
+    @JvmField
+    val VIVICHOKE_BREAK = this.create("vivichoke.break")
+    @JvmField
+    val VIVICHOKE_PLACE = this.create("vivichoke.place")
+
     @JvmField
     val MINT_BREAK = this.create("mint.break")
     @JvmField
     val MINT_PLACE = this.create("mint.place")
 
+    @JvmField
+    val REVIVAL_HERB_BREAK = this.create("revival_herb.break")
+    @JvmField
+    val REVIVAL_HERB_PLACE = this.create("revival_herb.place")
+
     @JvmField
     val MEDICINAL_LEEK_BREAK = this.create("medicinal_leek.break")
     @JvmField
@@ -277,6 +287,15 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, RegistryKey<Regi
         SoundEvents.BLOCK_GRASS_FALL
     )
 
+    @JvmField
+    val VIVICHOKE_SOUNDS = BlockSoundGroup(1f, 1f,
+        VIVICHOKE_BREAK,
+        SoundEvents.BLOCK_GRASS_STEP,
+        VIVICHOKE_PLACE,
+        SoundEvents.BLOCK_GRASS_HIT,
+        SoundEvents.BLOCK_GRASS_FALL
+    )
+
     @JvmField
     val MINT_SOUNDS = BlockSoundGroup(1f, 1f,
         MINT_BREAK,
@@ -286,6 +305,15 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, RegistryKey<Regi
         SoundEvents.BLOCK_GRASS_FALL
     )
 
+    @JvmField
+    val REVIVAL_HERB_SOUNDS = BlockSoundGroup(1f, 1f,
+        REVIVAL_HERB_BREAK,
+        SoundEvents.BLOCK_GRASS_STEP,
+        REVIVAL_HERB_PLACE,
+        SoundEvents.BLOCK_GRASS_HIT,
+        SoundEvents.BLOCK_GRASS_FALL
+    )
+
     @JvmField
     val GILDED_CHEST_SOUNDS = BlockSoundGroup(1f, 1f,
         GILDED_CHEST_BREAK,

common/src/main/kotlin/com/cobblemon/mod/common/api/multiblock/MultiblockBlock.kt

@@ -35,8 +35,8 @@ abstract class MultiblockBlock(properties: Settings) : BlockWithEntity(propertie
         itemStack: ItemStack?
     ) {
         if (world is ServerWorld) {
-            val multiblockEntity = world.getBlockEntity(pos) as MultiblockEntity
-            multiblockEntity.multiblockBuilder?.validate(world)
+            val multiblockEntity = world.getBlockEntity(pos) as? MultiblockEntity
+            multiblockEntity?.multiblockBuilder?.validate(world)
         }
         super.onPlaced(world, pos, state, placer, itemStack)
     }
@@ -52,8 +52,8 @@ abstract class MultiblockBlock(properties: Settings) : BlockWithEntity(propertie
         if(hand == Hand.OFF_HAND) {
             return ActionResult.SUCCESS
         }
-        val entity = world.getBlockEntity(pos) as MultiblockEntity
-        if (entity.multiblockStructure != null) {
+        val entity = world.getBlockEntity(pos) as MultiblockEntity?
+        if (entity?.multiblockStructure != null) {
             return entity.multiblockStructure!!.onUse(state, world, pos, player, hand, hit)
         }
         return super.onUse(state, world, pos, player, hand, hit)

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

@@ -205,8 +205,8 @@ object PokeBalls : JsonDataRegistry<PokeBall> {
         createDefault("ancient_wing_ball", throwPower = 2.5f, ancient = true)
         createDefault("ancient_jet_ball", throwPower = 2.5f, ancient = true)
         createDefault("ancient_origin_ball", GuaranteedModifier(), ancient = true)
-        // Luxury ball effect
-        CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(priority = Priority.LOWEST) { event ->
+        // Luxury ball effect, low priority as it must be triggered before soothe bell as of gen 4
+        CobblemonEvents.FRIENDSHIP_UPDATED.subscribe(priority = Priority.LOW) { event ->
             var increment = (event.newFriendship - event.pokemon.friendship).toFloat()
             if (increment <= 1F) {
                 event.pokemon.caughtBall.effects.filterIsInstance<FriendshipEarningBoostEffect>()

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

@@ -20,6 +20,7 @@ import com.cobblemon.mod.common.api.pokemon.stats.Stats
 import com.cobblemon.mod.common.api.pokemon.status.Statuses
 import com.cobblemon.mod.common.api.properties.CustomPokemonProperty
 import com.cobblemon.mod.common.api.types.ElementalTypes
+import com.cobblemon.mod.common.api.types.tera.TeraTypes
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.*
 import com.cobblemon.mod.common.pokemon.status.PersistentStatus
@@ -339,7 +340,7 @@ open class PokemonProperties {
                 pokemon.setEV(stat.key, stat.value)
             }
         }
-        teraType?.let { ElementalTypes.get(it)?.let { type -> pokemon.teraType = type } }
+        teraType?.let { TeraTypes.get(it.asIdentifierDefaultingNamespace())?.let { type -> pokemon.teraType = type } }
         dmaxLevel?.let { pokemon.dmaxLevel = it }
         gmaxFactor?.let { pokemon.gmaxFactor = it }
         tradeable?.let { pokemon.tradeable = it }
@@ -396,7 +397,7 @@ open class PokemonProperties {
                 return false
             }
         }
-        nickname?.takeIf { it != pokemon.nickname }?.let { return false }
+        nickname?.takeIf { it.string != pokemon.nickname?.string }?.let { return false }
         form?.takeIf { !it.equals(pokemon.form.name, true) }?.let { return false }
         friendship?.takeIf { it != pokemon.friendship }?.let { return false }
         pokeball?.takeIf { it != pokemon.caughtBall.name.toString() }?.let { return false }
@@ -409,7 +410,7 @@ open class PokemonProperties {
         evs?.forEach{ stat ->
             if (stat.value != pokemon.evs[stat.key]) { return false }
         }
-        teraType?.takeIf { it != pokemon.teraType.name }?.let { return false }
+        teraType?.takeIf { it.asIdentifierDefaultingNamespace() != pokemon.teraType.id }?.let { return false }
         dmaxLevel?.takeIf { it != pokemon.dmaxLevel }?.let { return false }
         gmaxFactor?.takeIf { it != pokemon.gmaxFactor }?.let { return false }
         tradeable?.takeIf { it != pokemon.tradeable }?.let { return false }
@@ -436,7 +437,7 @@ open class PokemonProperties {
                 }
             } catch (_: InvalidIdentifierException) {}
         }
-        nickname?.takeIf { it != properties.nickname }?.let { return false }
+        nickname?.takeIf { it.string != properties.nickname?.string }?.let { return false }
         form?.takeIf { !it.equals(properties.form, true) }?.let { return false }
         friendship?.takeIf { it != properties.friendship }?.let { return false }
         pokeball?.takeIf { it != properties.pokeball }?.let { return false }
@@ -476,11 +477,11 @@ open class PokemonProperties {
 
     // TEST YOUR LUCK!
     fun roll(pokemon: Pokemon) {
-        val baseTypes = pokemon.species.types.toList()
+        val baseTypes = pokemon.form.types.toList()
         if (this.shiny == null) pokemon.shiny = Cobblemon.config.shinyRate.checkRate()
         if (this.teraType == null) pokemon.teraType =
-            if (Cobblemon.config.teraTypeRate.checkRate()) ElementalTypes.all().filter { !baseTypes.contains(it) }.random()
-            else baseTypes.random()
+            if (Cobblemon.config.teraTypeRate.checkRate()) TeraTypes.random(true)
+            else TeraTypes.forElementalType(baseTypes.random())
     }
 
     fun createEntity(world: World): PokemonEntity {

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

@@ -12,6 +12,8 @@ import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawner
 import com.cobblemon.mod.common.api.spawning.spawner.PlayerSpawnerFactory
 import com.cobblemon.mod.common.platform.events.PlatformEvents
+import com.cobblemon.mod.common.util.server
+import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules
 import java.util.UUID
 import net.minecraft.server.network.ServerPlayerEntity
 
@@ -34,7 +36,7 @@ object CobblemonWorldSpawnerManager : SpawnerManager() {
 
     fun onPlayerLogin(player: ServerPlayerEntity) {
         // Disables spawning
-        if (!Cobblemon.config.enableSpawning) {
+        if (!Cobblemon.config.enableSpawning || server()?.gameRules?.getBoolean(CobblemonGameRules.DO_POKEMON_SPAWNING) == false) {
             return;
         }
 

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

@@ -12,6 +12,8 @@ import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.spawning.influence.SpawningInfluence
 import com.cobblemon.mod.common.api.spawning.spawner.Spawner
 import com.cobblemon.mod.common.api.spawning.spawner.TickingSpawner
+import com.cobblemon.mod.common.util.server
+import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules.DO_POKEMON_SPAWNING
 
 /**
  * A manager of various spawners. This is a class in which you should register
@@ -49,7 +51,7 @@ open class SpawnerManager {
 
     open fun onServerTick() {
         // Disables spawning
-        if (!Cobblemon.config.enableSpawning) {
+        if (!Cobblemon.config.enableSpawning || server()?.gameRules?.getBoolean(DO_POKEMON_SPAWNING) == false) {
             return
         }
         influences.removeIf { it.isExpired() }

common/src/main/kotlin/com/cobblemon/mod/common/api/spawning/spawner/AreaSpawner.kt

@@ -63,9 +63,6 @@ abstract class AreaSpawner(
 
     override fun run(cause: SpawnCause): Pair<SpawningContext, SpawnDetail>? {
         val area = getArea(cause)
-        if (area?.world?.gameRules?.getBoolean(DO_POKEMON_SPAWNING) == false) {
-            return null
-        }
         val constrainedArea = if (area != null) constrainArea(area) else null
         if (constrainedArea != null) {
 

common/src/main/kotlin/com/cobblemon/mod/common/api/starter/StarterCategory.kt

@@ -6,24 +6,19 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-package com.cobblemon.mod.common.config.starter
+package com.cobblemon.mod.common.api.starter
 
 import com.cobblemon.mod.common.api.pokemon.PokemonProperties
 import com.cobblemon.mod.common.pokemon.RenderablePokemon
 import com.cobblemon.mod.common.util.asTranslated
+import net.minecraft.text.Text
 
 data class StarterCategory(
-    val name: String,
-    val displayName: String,
+    val displayName: Text,
     val pokemon: List<PokemonProperties>
-) {
-    fun asRenderableStarterCategory() = RenderableStarterCategory(name, displayName, pokemon.map { it.asRenderablePokemon() })
-}
+)
 
 data class RenderableStarterCategory(
-    val name: String,
-    val displayName: String,
+    val displayName: Text,
     val pokemon: List<RenderablePokemon>
-) {
-    val displayNameText = displayName.asTranslated()
-}
+)

common/src/main/kotlin/com/cobblemon/mod/common/api/starter/StarterHandler.kt

@@ -8,12 +8,12 @@
 
 package com.cobblemon.mod.common.api.starter
 
-import com.cobblemon.mod.common.config.starter.StarterCategory
 import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.util.Identifier
 
 interface StarterHandler {
-    fun getStarterList(player: ServerPlayerEntity): List<StarterCategory>
+    fun getStarters(player: ServerPlayerEntity): Map<Identifier, StarterCategory>
     fun handleJoin(player: ServerPlayerEntity)
     fun requestStarterChoice(player: ServerPlayerEntity)
-    fun chooseStarter(player: ServerPlayerEntity, categoryName: String, index: Int)
+    fun chooseStarter(player: ServerPlayerEntity, categoryId: Identifier, index: Int)
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/starter/StarterRegistry.kt

@@ -0,0 +1,69 @@
+/*
+ * 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.starter
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.data.DataRegistry
+import com.cobblemon.mod.common.api.data.JsonDataRegistry
+import com.cobblemon.mod.common.api.pokemon.PokemonProperties
+import com.cobblemon.mod.common.api.reactive.SimpleObservable
+import com.cobblemon.mod.common.starter.CobblemonStarterHandler
+import com.cobblemon.mod.common.util.adapters.PlainJsonTextAdapter
+import com.cobblemon.mod.common.util.adapters.pokemonPropertiesShortAdapter
+import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace
+import com.cobblemon.mod.common.util.cobblemonResource
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.google.gson.reflect.TypeToken
+import net.minecraft.resource.ResourceType
+import net.minecraft.server.network.ServerPlayerEntity
+import net.minecraft.text.Text
+import net.minecraft.util.Identifier
+
+/**
+ * The registry for starter Pokémon.
+ *
+ * The data here is used by the [CobblemonStarterHandler].
+ *
+ * 3rd party is not enforced to respect this registry.
+ */
+object StarterRegistry : JsonDataRegistry<StarterCategory> {
+    override val gson: Gson = GsonBuilder()
+        .setPrettyPrinting()
+        .disableHtmlEscaping()
+        .registerTypeAdapter(Text::class.java, PlainJsonTextAdapter)
+        .registerTypeAdapter(PokemonProperties::class.java, pokemonPropertiesShortAdapter)
+        .create()
+    override val typeToken: TypeToken<StarterCategory> = TypeToken.get(StarterCategory::class.java)
+    override val id: Identifier = cobblemonResource("starter")
+    override val resourcePath: String = id.path
+    override val type: ResourceType = ResourceType.SERVER_DATA
+    override val observable: SimpleObservable<out DataRegistry> = SimpleObservable()
+    private val categories = hashMapOf<Identifier, StarterCategory>()
+
+    // We let the default starter handler sync the client
+    // This is to prevent unnecessary packets depending on impl
+    override fun sync(player: ServerPlayerEntity) {}
+
+    override fun reload(data: Map<Identifier, StarterCategory>) {
+        this.categories.clear()
+        this.categories += data
+        Cobblemon.LOGGER.info("Loaded {} starters ({} categories)", this.categories.values.sumOf { it.pokemon.size }, this.categories.size)
+    }
+
+    fun all(): Map<Identifier, StarterCategory> = this.categories
+
+    fun keys(): Set<Identifier> = this.categories.keys
+
+    fun categories(): Collection<StarterCategory> = this.categories.values
+
+    fun categoryOf(key: Identifier): StarterCategory? = this.categories[key]
+
+    fun categoryOf(key: String): StarterCategory? = this.categories[key.asIdentifierDefaultingNamespace()]
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/storage/player/PlayerData.kt

@@ -37,7 +37,7 @@ data class PlayerData(
         fun defaultData(forPlayer: UUID) = PlayerData(
             uuid = forPlayer,
             starterPrompted = false,
-            starterLocked = !Cobblemon.starterConfig.allowStarterOnJoin,
+            starterLocked = !Cobblemon.config.allowStarterOnJoin,
             starterSelected =  false,
             starterUUID =  null,
             keyItems = mutableSetOf(),

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

@@ -22,107 +22,15 @@ import net.minecraft.registry.tag.TagKey
 object CobblemonBiomeTags {
 
     @JvmField
-    val IS_DEEP_DARK = create("is_deep_dark")
+    val IS_AUTUMN = create("has_season/autumn")
     @JvmField
-    val IS_ARID = create("is_arid")
+    val IS_SPRING = create("has_season/spring")
     @JvmField
-    val IS_AUTUMN = create("is_autumn")
-    @JvmField
-    val IS_BADLANDS = create("is_badlands")
-    @JvmField
-    val IS_BAMBOO = create("is_bamboo")
-    @JvmField
-    val IS_CAVE = create("is_cave")
-    @JvmField
-    val IS_COAST = create("is_coast")
-    @JvmField
-    val IS_COLD = create("is_cold")
-    @JvmField
-    val IS_DEEP_OCEAN = create("is_deep_ocean")
-    @JvmField
-    val IS_DESERT = create("is_desert")
-    @JvmField
-    val IS_DRIPSTONE = create("is_dripstone")
-    @JvmField
-    val IS_FLORAL = create("is_floral")
-    @JvmField
-    val IS_FOREST = create("is_forest")
-    @JvmField
-    val IS_FREEZING = create("is_freezing")
-    @JvmField
-    val IS_FRESHWATER = create("is_freshwater")
-    @JvmField
-    val IS_COLD_OCEAN = create("is_cold_ocean")
-    @JvmField
-    val IS_FROZEN_OCEAN = create("is_frozen_ocean")
-    @JvmField
-    val IS_GLACIAL = create("is_glacial")
-    @JvmField
-    val IS_GRASSLAND = create("is_grassland")
-    @JvmField
-    val IS_HIGHLANDS = create("is_highlands")
-    @JvmField
-    val IS_HILLS = create("is_hills")
-    @JvmField
-    val IS_ISLAND = create("is_island")
-    @JvmField
-    val IS_JUNGLE = create("is_jungle")
-    @JvmField
-    val IS_LUKEWARM_OCEAN = create("is_lukewarm_ocean")
-    @JvmField
-    val IS_LUSH = create("is_lush")
-    @JvmField
-    val IS_MAGICAL = create("is_magical")
-    @JvmField
-    val IS_MOUNTAIN = create("is_mountain")
-    @JvmField
-    val IS_MUSHROOM = create("is_mushroom")
-    @JvmField
-    val IS_OVERWORLD = create("is_overworld")
-    @JvmField
-    val IS_PEAK = create("is_peak")
-    @JvmField
-    val IS_PLAINS = create("is_plains")
-    @JvmField
-    val IS_PLATEAU = create("is_plateau")
-    @JvmField
-    val IS_WARM_OCEAN = create("is_warm_ocean")
-    @JvmField
-    val IS_RIVER = create("is_river")
-    @JvmField
-    val IS_SANDY = create("is_sandy")
-    @JvmField
-    val IS_SAVANNA = create("is_savanna")
-    @JvmField
-    val IS_SKY = create("is_sky")
-    @JvmField
-    val IS_SNOWY_FOREST = create("is_snowy_forest")
-    @JvmField
-    val IS_SPOOKY = create("is_spooky")
-    @JvmField
-    val IS_SPRING = create("is_spring")
-    @JvmField
-    val IS_SUMMER = create("is_summer")
-    @JvmField
-    val IS_SWAMP = create("is_swamp")
-    @JvmField
-    val IS_TAIGA = create("is_taiga")
+    val IS_SUMMER = create("has_season/summer")
     @JvmField
     val IS_TEMPERATE = create("is_temperate")
     @JvmField
-    val IS_THERMAL = create("is_thermal")
-    @JvmField
-    val IS_TUNDRA = create("is_tundra")
-    @JvmField
-    val IS_VOID = create("is_void")
-    @JvmField
-    val IS_VOlCANIC = create("is_volcanic")
-    @JvmField
-    val IS_WINTER = create("is_winter")
-    @JvmField
-    val IS_SPARSE = create("is_sparse")
-    @JvmField
-    val IS_DENSE = create("is_dense")
+    val IS_WINTER = create("has_season/winter")
 
     // Has Feature tags
     @JvmField
@@ -180,16 +88,5 @@ object CobblemonBiomeTags {
     @JvmField
     val HAS_WATER_STONE_ORE_RARE = create("has_ore/ore_water_stone_rare")
 
-    // ToDo remove in 1.3
-    @Deprecated(message = "This tag no longer exists", level = DeprecationLevel.ERROR)
-    @JvmField
-    val IS_CRAG = create("is_crag")
-    @Deprecated(message = "This tag no longer exists", level = DeprecationLevel.ERROR)
-    @JvmField
-    val IS_ICY = create("is_icy")
-    @Deprecated(message = "This tag no longer exists", replaceWith = ReplaceWith("com.cobblemon.mod.common.api.tags.CobblemonBiomeTags.IS_CAVE"), level = DeprecationLevel.ERROR)
-    @JvmField
-    val IS_UNDERGROUND = create("is_underground")
-
     private fun create(path: String) = TagKey.of(RegistryKeys.BIOME, cobblemonResource(path))
 }

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

@@ -147,6 +147,9 @@ object CobblemonItemTags {
     @JvmField
     val ABILITY_CHANGERS = create("ability_changers")
 
+    @JvmField
+    val IS_FRIENDSHIP_BOOSTER = create("is_friendship_booster")
+
     private fun create(path: String) = TagKey.of(RegistryKeys.ITEM, cobblemonResource(path))
 
 }

common/src/main/kotlin/com/cobblemon/mod/common/api/types/tera/TeraType.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.api.types.tera
+
+import com.cobblemon.mod.common.api.data.ShowdownIdentifiable
+import net.minecraft.text.Text
+import net.minecraft.util.Identifier
+
+/**
+ * The representation of the Pokémons Tera type.
+ *
+ * @see [Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/Terastal_phenomenon)
+ *
+ */
+interface TeraType : ShowdownIdentifiable {
+
+    /**
+     * The [Identifier] associated to this type.
+     */
+    val id: Identifier
+
+    /**
+     * If this tera type can be selected naturally.
+     */
+    val legalAsStatic: Boolean
+
+    /**
+     * The display name of this type.
+     */
+    val displayName: Text
+
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/types/tera/TeraTypes.kt

@@ -0,0 +1,128 @@
+/*
+ * 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.types.tera
+
+import com.cobblemon.mod.common.api.types.ElementalType
+import com.cobblemon.mod.common.api.types.ElementalTypes
+import com.cobblemon.mod.common.api.types.tera.elemental.ElementalTypeTeraType
+import com.cobblemon.mod.common.api.types.tera.gimmick.StellarTeraType
+import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.util.Identifier
+
+/**
+ * The registry of all [TeraType]s.
+ */
+@Suppress("unused")
+object TeraTypes {
+    private val types = hashMapOf<Identifier, TeraType>()
+
+    @JvmStatic
+    val NORMAL = this.create(cobblemonResource("normal"), ElementalTypeTeraType(ElementalTypes.NORMAL))
+
+    @JvmStatic
+    val FIRE = this.create(cobblemonResource("fire"), ElementalTypeTeraType(ElementalTypes.FIRE))
+
+    @JvmStatic
+    val WATER = this.create(cobblemonResource("water"), ElementalTypeTeraType(ElementalTypes.WATER))
+
+    @JvmStatic
+    val GRASS = this.create(cobblemonResource("grass"), ElementalTypeTeraType(ElementalTypes.GRASS))
+
+    @JvmStatic
+    val ELECTRIC = this.create(cobblemonResource("electric"), ElementalTypeTeraType(ElementalTypes.ELECTRIC))
+
+    @JvmStatic
+    val ICE = this.create(cobblemonResource("ice"), ElementalTypeTeraType(ElementalTypes.ICE))
+
+    @JvmStatic
+    val FIGHTING = this.create(cobblemonResource("fighting"), ElementalTypeTeraType(ElementalTypes.FIGHTING))
+
+    @JvmStatic
+    val POISON = this.create(cobblemonResource("poison"), ElementalTypeTeraType(ElementalTypes.POISON))
+
+    @JvmStatic
+    val GROUND = this.create(cobblemonResource("ground"), ElementalTypeTeraType(ElementalTypes.GROUND))
+
+    @JvmStatic
+    val FLYING = this.create(cobblemonResource("flying"), ElementalTypeTeraType(ElementalTypes.FLYING))
+
+    @JvmStatic
+    val PSYCHIC = this.create(cobblemonResource("psychic"), ElementalTypeTeraType(ElementalTypes.PSYCHIC))
+
+    @JvmStatic
+    val BUG = this.create(cobblemonResource("bug"), ElementalTypeTeraType(ElementalTypes.BUG))
+
+    @JvmStatic
+    val ROCK = this.create(cobblemonResource("rock"), ElementalTypeTeraType(ElementalTypes.ROCK))
+
+    @JvmStatic
+    val GHOST = this.create(cobblemonResource("ghost"), ElementalTypeTeraType(ElementalTypes.GHOST))
+
+    @JvmStatic
+    val DRAGON = this.create(cobblemonResource("dragon"), ElementalTypeTeraType(ElementalTypes.DRAGON))
+
+    @JvmStatic
+    val DARK = this.create(cobblemonResource("dark"), ElementalTypeTeraType(ElementalTypes.DARK))
+
+    @JvmStatic
+    val STEEL = this.create(cobblemonResource("steel"), ElementalTypeTeraType(ElementalTypes.STEEL))
+
+    @JvmStatic
+    val FAIRY = this.create(cobblemonResource("fairy"), ElementalTypeTeraType(ElementalTypes.FAIRY))
+
+    @JvmStatic
+    val STELLAR = this.create(StellarTeraType.ID, StellarTeraType())
+
+    /**
+     * Pick a random [TeraType].
+     *
+     * @param legalOnly If [TeraType.legalAsStatic] should be respected.
+     * @return The selected [TeraType].
+     */
+    @JvmStatic
+    fun random(legalOnly: Boolean): TeraType {
+        val possible = this.types.values
+        if (legalOnly) {
+            return possible.filter(TeraType::legalAsStatic).random()
+        }
+        return possible.random()
+    }
+
+    /**
+     * Gets a [TeraType] by its [id].
+     *
+     * @param id The [Identifier] expected to match against a [TeraType.id].
+     * @return The found [TeraType] or null.
+     */
+    @JvmStatic
+    fun get(id: Identifier): TeraType? = this.types[id]
+
+    /**
+     * Gets a [TeraType] by its [id].
+     *
+     * @param id The string representation of a [Identifier] if no namespace is present assumes Cobblemon' instead of Minecraft'.
+     * @return The found [TeraType] or null.
+     */
+    @JvmStatic
+    fun get(id: String): TeraType? = this.get(cobblemonResource(id))
+
+    /**
+     * Gets the corresponding tera type for a [ElementalType].
+     *
+     * @param type The [ElementalType] being checked.
+     * @return The associated [TeraType].
+     */
+    @JvmStatic
+    fun forElementalType(type: ElementalType): TeraType = this.get(cobblemonResource(type.name))!! // it's safe to do
+
+    private fun create(id: Identifier, type: TeraType): TeraType {
+        this.types[id] = type
+        return type
+    }
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/types/tera/elemental/ElementalTypeTeraType.kt

@@ -0,0 +1,25 @@
+/*
+ * 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.types.tera.elemental
+
+import com.cobblemon.mod.common.api.types.ElementalType
+import com.cobblemon.mod.common.api.types.tera.TeraType
+import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.text.Text
+import net.minecraft.util.Identifier
+
+class ElementalTypeTeraType(val type: ElementalType) : TeraType {
+    override val legalAsStatic: Boolean = true
+
+    override val id: Identifier = cobblemonResource(this.type.name)
+
+    override val displayName: Text = this.type.displayName
+
+    override fun showdownId(): String = this.type.name
+}

common/src/main/kotlin/com/cobblemon/mod/common/api/types/tera/gimmick/StellarTeraType.kt

@@ -0,0 +1,30 @@
+/*
+ * 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.types.tera.gimmick
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.api.types.tera.TeraType
+import com.cobblemon.mod.common.util.cobblemonResource
+import net.minecraft.text.Text
+import net.minecraft.util.Identifier
+
+class StellarTeraType : TeraType {
+    override val id: Identifier = ID
+
+    override val legalAsStatic: Boolean = false
+
+    override val displayName: Text = LANG
+
+    override fun showdownId(): String = ID.path
+
+    companion object {
+        val ID = cobblemonResource("stellar")
+        private val LANG = Text.translatable("${Cobblemon.MODID}.terra_type.stellar")
+    }
+}

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

@@ -22,7 +22,6 @@ import com.cobblemon.mod.common.net.messages.client.battle.BattleChallengeExpire
 import com.cobblemon.mod.common.util.getPlayer
 import com.google.gson.GsonBuilder
 import java.time.Instant
-import java.util.Optional
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 import net.minecraft.server.network.ServerPlayerEntity
@@ -139,7 +138,7 @@ object BattleRegistry {
             // 0 - 9, empty == 10
             packedTeamBuilder.append("${if (pk.dmaxLevel < 10) pk.dmaxLevel else ""},")
             // Teratype
-            packedTeamBuilder.append("${pokemon.effectedPokemon.teraType.name},")
+            packedTeamBuilder.append("${pokemon.effectedPokemon.teraType.showdownId()},")
 
             team.add(packedTeamBuilder.toString())
         }

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

@@ -62,8 +62,8 @@ class MonitorBlock(properties: Settings) : MultiblockBlock(properties) {
         if(world == null || pos == null) {
             return 0
         }
-        val monitorEntity = world.getBlockEntity(pos) as MultiblockEntity
-        val multiBlockEntity = monitorEntity.multiblockStructure
+        val monitorEntity = world.getBlockEntity(pos) as? MultiblockEntity
+        val multiBlockEntity = monitorEntity?.multiblockStructure
         if(multiBlockEntity != null) {
             return multiBlockEntity.getComparatorOutput(state, world, pos)
         }

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

@@ -149,8 +149,8 @@ class RestorationTankBlock(properties: Settings) : MultiblockBlock(properties),
         if(world == null || pos == null) {
             return 0
         }
-        val tankEntity = world.getBlockEntity(pos) as MultiblockEntity
-        val multiBlockEntity = tankEntity.multiblockStructure
+        val tankEntity = world.getBlockEntity(pos) as? MultiblockEntity
+        val multiBlockEntity = tankEntity?.multiblockStructure
         if(multiBlockEntity != null) {
             return multiBlockEntity.getComparatorOutput(state, world, pos)
         }
@@ -180,7 +180,7 @@ class RestorationTankBlock(properties: Settings) : MultiblockBlock(properties),
             return
         }
         val tankEntity = world.getBlockEntity(pos) as? MultiblockEntity
-        tankEntity?.multiblockStructure!!.onTriggerEvent(state, world, pos, random)
+        tankEntity?.multiblockStructure?.onTriggerEvent(state, world, pos, random)
     }
 
     override fun getOutlineShape(

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

@@ -9,15 +9,23 @@
 package com.cobblemon.mod.common.block
 
 import com.cobblemon.mod.common.api.tags.CobblemonBlockTags
+import com.cobblemon.mod.common.block.chest.GildedChestBlock
 import net.minecraft.block.*
+import net.minecraft.entity.player.PlayerEntity
+import net.minecraft.fluid.FluidState
+import net.minecraft.fluid.Fluids
 import net.minecraft.item.ItemPlacementContext
+import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.server.world.ServerWorld
 import net.minecraft.state.StateManager
+import net.minecraft.state.property.BooleanProperty
+import net.minecraft.state.property.Properties
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
 import net.minecraft.util.math.random.Random
 import net.minecraft.util.shape.VoxelShape
 import net.minecraft.world.BlockView
+import net.minecraft.world.World
 import net.minecraft.world.WorldAccess
 import net.minecraft.world.WorldView
 
@@ -28,7 +36,18 @@ class TumblestoneBlock(
     height: Int,
     xzOffset: Int,
     nextStage: Block?
-) : GrowableStoneBlock(settings, stage, height, xzOffset, nextStage) {
+) : GrowableStoneBlock(settings, stage, height, xzOffset, nextStage), Waterloggable {
+
+    init {
+        this.defaultState = this.stateManager.defaultState
+            .with(FACING, Direction.DOWN)
+            .with(WATERLOGGED, false)
+    }
+
+    companion object {
+        val WATERLOGGED = BooleanProperty.of("waterlogged")
+    }
+
     override fun canGrow(pos: BlockPos, world: BlockView): Boolean {
         if (stage == MAX_STAGE) return false
         val iterator: Iterator<BlockPos> =
@@ -43,4 +62,31 @@ class TumblestoneBlock(
         return true
     }
 
+    override fun getFluidState(state: BlockState): FluidState {
+        return if (state.get(GildedChestBlock.WATERLOGGED)) {
+            Fluids.WATER.getStill(false)
+        } else super.getFluidState(state)
+    }
+
+    override fun appendProperties(builder: StateManager.Builder<Block, BlockState>) {
+        super.appendProperties(builder)
+        builder.add(GildedChestBlock.WATERLOGGED)
+    }
+
+    override fun getPlacementState(blockPlaceContext: ItemPlacementContext): BlockState? {
+        return super.getPlacementState(blockPlaceContext)?.with(GildedChestBlock.WATERLOGGED, blockPlaceContext.world.getFluidState(blockPlaceContext.blockPos).fluid == Fluids.WATER)
+
+    }
+
+    override fun getStateForNeighborUpdate(
+        state: BlockState,
+        direction: Direction,
+        neighborState: BlockState,
+        world: WorldAccess,
+        pos: BlockPos,
+        neighborPos: BlockPos
+    ): BlockState? {
+        if (state.get(GildedChestBlock.WATERLOGGED)) world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world))
+        return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos)
+    }
 }

common/src/main/kotlin/com/cobblemon/mod/common/block/chest/GildedChestBlock.kt

@@ -16,29 +16,24 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.party
 import com.cobblemon.mod.common.util.toVec3d
-import net.minecraft.block.Block
-import net.minecraft.block.BlockRenderType
-import net.minecraft.block.BlockState
-import net.minecraft.block.BlockWithEntity
-import net.minecraft.block.Blocks
-import net.minecraft.block.HorizontalFacingBlock
-import net.minecraft.block.ShapeContext
+import net.minecraft.block.*
+import net.minecraft.entity.LivingEntity
 import net.minecraft.entity.ai.pathing.NavigationType
 import net.minecraft.entity.mob.PiglinBrain
 import net.minecraft.entity.player.PlayerEntity
+import net.minecraft.fluid.FluidState
+import net.minecraft.fluid.Fluids
 import net.minecraft.item.ItemPlacementContext
+import net.minecraft.item.ItemStack
+import net.minecraft.screen.ScreenHandler
 import net.minecraft.server.network.ServerPlayerEntity
 import net.minecraft.sound.SoundCategory
 import net.minecraft.state.StateManager
+import net.minecraft.state.property.BooleanProperty
 import net.minecraft.state.property.Properties
 import net.minecraft.text.MutableText
 import net.minecraft.text.Text
-import net.minecraft.util.ActionResult
-import net.minecraft.util.BlockMirror
-import net.minecraft.util.BlockRotation
-import net.minecraft.util.Hand
-import net.minecraft.util.Identifier
-import net.minecraft.util.ItemScatterer
+import net.minecraft.util.*
 import net.minecraft.util.hit.BlockHitResult
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Direction
@@ -46,17 +41,21 @@ import net.minecraft.util.shape.VoxelShape
 import net.minecraft.util.shape.VoxelShapes
 import net.minecraft.world.BlockView
 import net.minecraft.world.World
+import net.minecraft.world.WorldAccess
 
 @Suppress("OVERRIDE_DEPRECATION")
-class GildedChestBlock(settings: Settings, val type: Type = Type.RED) : BlockWithEntity(settings) {
+class GildedChestBlock(settings: Settings, val type: Type = Type.RED) : BlockWithEntity(settings), Waterloggable {
 
     init {
-        defaultState = defaultState.with(Properties.HORIZONTAL_FACING, Direction.SOUTH)
+        defaultState = defaultState
+            .with(Properties.HORIZONTAL_FACING, Direction.SOUTH)
+            .with(WATERLOGGED, false)
     }
 
     companion object {
         val POKEMON_ARGS = "gimmighoul"
         val LEVEL_RANGE = 5..30
+        val WATERLOGGED = BooleanProperty.of("waterlogged")
 
         val SOUTH_OUTLINE = VoxelShapes.union(
             VoxelShapes.cuboid(0.0, 0.0, 0.25, 1.0, 1.0, 0.9375)
@@ -88,9 +87,28 @@ class GildedChestBlock(settings: Settings, val type: Type = Type.RED) : BlockWit
         }
     }
 
+    override fun getStateForNeighborUpdate(
+        state: BlockState,
+        direction: Direction,
+        neighborState: BlockState,
+        world: WorldAccess,
+        pos: BlockPos,
+        neighborPos: BlockPos
+    ): BlockState {
+        if (state.get(WATERLOGGED)) world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world))
+        return super.getStateForNeighborUpdate(state,   direction, neighborState, world, pos, neighborPos)
+    }
+
+    override fun getFluidState(state: BlockState): FluidState {
+        return if (state.get(WATERLOGGED)) {
+            Fluids.WATER.getStill(false)
+        } else super.getFluidState(state)
+    }
+
     override fun appendProperties(builder: StateManager.Builder<Block, BlockState>) {
         super.appendProperties(builder)
         builder.add(Properties.HORIZONTAL_FACING)
+        builder.add(WATERLOGGED)
     }
 
     private val facingToYaw: HashMap<Direction, Float> = hashMapOf(
@@ -111,7 +129,7 @@ class GildedChestBlock(settings: Settings, val type: Type = Type.RED) : BlockWit
             if (player is ServerPlayerEntity) {
                 spawnPokemon(world, pos, state, player)
             }
-            world.setBlockState(pos, Blocks.AIR.defaultState)
+            world.setBlockState(pos, if (state.fluidState.isOf(Fluids.WATER)) Blocks.WATER.defaultState else Blocks.AIR.defaultState)
         } else super.onBreak(world, pos, state, player)
     }
 
@@ -188,12 +206,9 @@ class GildedChestBlock(settings: Settings, val type: Type = Type.RED) : BlockWit
     override fun getRenderType(state: BlockState?) = BlockRenderType.ENTITYBLOCK_ANIMATED
 
     override fun getPlacementState(blockPlaceContext: ItemPlacementContext): BlockState? {
-//        val abovePosition = blockPlaceContext.blockPos.up()
-//        val world = blockPlaceContext.world
-//        if (world.getBlockState(abovePosition).canReplace(blockPlaceContext) && !world.isOutOfHeightLimit(abovePosition)) {
-            return defaultState.with(HorizontalFacingBlock.FACING, blockPlaceContext.horizontalPlayerFacing.opposite)
-//        }
-        // return null
+        return defaultState
+            .with(HorizontalFacingBlock.FACING, blockPlaceContext.horizontalPlayerFacing.opposite)
+            .with(WATERLOGGED, blockPlaceContext.world.getFluidState(blockPlaceContext.blockPos).fluid == Fluids.WATER)
     }
 
     @Deprecated("Deprecated in Java")
@@ -205,6 +220,14 @@ class GildedChestBlock(settings: Settings, val type: Type = Type.RED) : BlockWit
         ) as BlockState
     }
 
+    override fun hasComparatorOutput(state: BlockState?): Boolean {
+        return true
+    }
+
+    override fun getComparatorOutput(state: BlockState?, world: World, pos: BlockPos?): Int {
+        return ScreenHandler.calculateComparatorOutput(world.getBlockEntity(pos))
+    }
+
     override fun mirror(state: BlockState, mirror: BlockMirror): BlockState {
         return state.rotate(mirror.getRotation(state.get(Properties.HORIZONTAL_FACING) as Direction))
     }
@@ -225,4 +248,17 @@ class GildedChestBlock(settings: Settings, val type: Type = Type.RED) : BlockWit
         return false
     }
 
+    override fun onPlaced(
+        world: World,
+        pos: BlockPos,
+        state: BlockState,
+        placer: LivingEntity?,
+        itemStack: ItemStack
+    ) {
+        val blockEntity = world.getBlockEntity(pos)
+        if (itemStack.hasCustomName() && blockEntity is GildedChestBlockEntity) {
+            blockEntity.customName = itemStack.name
+        }
+    }
+
 }

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

@@ -19,6 +19,7 @@ import net.minecraft.block.entity.BlockEntityType
 import net.minecraft.nbt.NbtCompound
 import net.minecraft.nbt.NbtHelper
 import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.ChunkPos
 
 open class FossilMultiblockEntity(
     pos: BlockPos,
@@ -39,8 +40,12 @@ open class FossilMultiblockEntity(
         get() {
             return if (field != null) {
                 field
-            } else if (masterBlockPos != null && masterBlockPos != pos && world?.getBlockEntity(masterBlockPos) != null) {
-                field = (world?.getBlockEntity(masterBlockPos) as FossilMultiblockEntity).multiblockStructure
+            } else if (masterBlockPos != null && masterBlockPos != pos) {
+                val chunkPos = ChunkPos(masterBlockPos)
+                if (world?.chunkManager?.isChunkLoaded(chunkPos.x, chunkPos.z) == true) {
+                    val entity: FossilMultiblockEntity? = world?.getBlockEntity(masterBlockPos) as FossilMultiblockEntity?
+                    field = entity?.multiblockStructure
+                }
                 field
             } else {
                 null

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

@@ -20,6 +20,7 @@ import net.minecraft.entity.player.PlayerEntity
 import net.minecraft.entity.player.PlayerInventory
 import net.minecraft.inventory.DoubleInventory
 import net.minecraft.inventory.Inventories
+import net.minecraft.inventory.SidedInventory
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NbtCompound
 import net.minecraft.screen.GenericContainerScreenHandler
@@ -28,9 +29,10 @@ import net.minecraft.state.property.Properties
 import net.minecraft.text.Text
 import net.minecraft.util.collection.DefaultedList
 import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Direction
 import net.minecraft.world.World
 
-class GildedChestBlockEntity(pos: BlockPos, state: BlockState, val type: Type = Type.RED) : LootableContainerBlockEntity(CobblemonBlockEntities.GILDED_CHEST, pos, state) {
+class GildedChestBlockEntity(pos: BlockPos, state: BlockState, val type: Type = Type.RED) : LootableContainerBlockEntity(CobblemonBlockEntities.GILDED_CHEST, pos, state), SidedInventory {
     var inventoryContents: DefaultedList<ItemStack> = DefaultedList.ofSize(NUM_SLOTS, ItemStack.EMPTY)
     val poseableState: GildedState = GildedState()
 
@@ -69,7 +71,7 @@ class GildedChestBlockEntity(pos: BlockPos, state: BlockState, val type: Type =
 
     override fun getContainerName() = Text.translatable("block.cobblemon.gilded_chest")
     override fun createScreenHandler(syncId: Int, playerInventory: PlayerInventory?) =
-        GenericContainerScreenHandler.createGeneric9x3(syncId, playerInventory, this);
+        GenericContainerScreenHandler.createGeneric9x3(syncId, playerInventory, this)
 
     override fun onOpen(player: PlayerEntity) {
         if (!this.removed && !player.isSpectator && type != Type.FAKE) {
@@ -83,6 +85,22 @@ class GildedChestBlockEntity(pos: BlockPos, state: BlockState, val type: Type =
         }
     }
 
+    override fun getAvailableSlots(side: Direction): IntArray {
+        return if (type == Type.FAKE) IntArray(0) else IntArray(NUM_SLOTS)
+    }
+
+    override fun canInsert(slot: Int, stack: ItemStack?, dir: Direction?): Boolean {
+        if (type == Type.FAKE) return false
+        return dir != Direction.DOWN
+    }
+
+    override fun canExtract(slot: Int, stack: ItemStack?, dir: Direction?): Boolean {
+        if (type == Type.FAKE) return false
+        return dir == Direction.DOWN
+    }
+
+    override fun canPlayerUse(player: PlayerEntity) = !player.isSpectator
+
     override fun getInvStackList(): DefaultedList<ItemStack> = inventoryContents
 
     override fun setInvStackList(list: DefaultedList<ItemStack>) {

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

@@ -140,7 +140,7 @@ class PokemonPastureBlockEntity(pos: BlockPos, val state: BlockState) : BlockEnt
             if (fixedPosition != null) {
                 entity.setPosition(fixedPosition.toCenterPos().subtract(0.0, 0.5, 0.0))
                 val pc = Cobblemon.storage.getPC(player.uuid)
-                entity.beamMode = 1
+                entity.beamMode = 2
                 afterOnServer(seconds = SendOutPokemonHandler.SEND_OUT_DURATION) {
                     entity.beamMode = 0
                 }

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

@@ -117,10 +117,10 @@ class FossilMultiblockBuilder(val centerPos: BlockPos) : MultiblockStructureBuil
         val monitorPos = monitorPositions[fossilTankIndex]
         val fossilAnalyzerPos = fossilAnalyzerPositions[fossilTankIndex]!!
         val restorationTankPos = restorationTankPositions[fossilTankIndex]!!
-        val monitorEntity = world.getBlockEntity(monitorPos) as MultiblockEntity
-        val analyzerEntity = world.getBlockEntity(fossilAnalyzerPos) as MultiblockEntity
-        val tankBaseEntity = world.getBlockEntity(restorationTankPos) as MultiblockEntity
-        val tankTopEntity = world.getBlockEntity(restorationTankPos.up()) as MultiblockEntity
+        val monitorEntity = world.getBlockEntity(monitorPos) as? MultiblockEntity
+        val analyzerEntity = world.getBlockEntity(fossilAnalyzerPos) as? MultiblockEntity
+        val tankBaseEntity = world.getBlockEntity(restorationTankPos) as? MultiblockEntity
+        val tankTopEntity = world.getBlockEntity(restorationTankPos.up()) as? MultiblockEntity
         val structure = FossilMultiblockStructure(monitorPos, fossilAnalyzerPos, restorationTankPos)
 
         structure.tankConnectorDirection = dirsToCheck.filter {
@@ -128,20 +128,20 @@ class FossilMultiblockBuilder(val centerPos: BlockPos) : MultiblockStructureBuil
             return@filter adjPos == fossilAnalyzerPos
         }.first()
 
-        analyzerEntity.multiblockStructure = structure
-        tankBaseEntity.multiblockStructure = structure
-        tankTopEntity.multiblockStructure = structure
-        monitorEntity.multiblockStructure = structure
+        analyzerEntity?.multiblockStructure = structure
+        tankBaseEntity?.multiblockStructure = structure
+        tankTopEntity?.multiblockStructure = structure
+        monitorEntity?.multiblockStructure = structure
         structure.syncToClient(world)
         structure.markDirty(world)
 
         world.playSound(null, centerPos, CobblemonSounds.FOSSIL_MACHINE_ASSEMBLE, SoundCategory.BLOCKS)
 
         //Set these to null so the builders can be freed
-        analyzerEntity.multiblockBuilder = null
-        tankBaseEntity.multiblockBuilder = null
-        tankTopEntity.multiblockBuilder = null
-        monitorEntity.multiblockBuilder = null
+        analyzerEntity?.multiblockBuilder = null
+        tankBaseEntity?.multiblockBuilder = null
+        tankTopEntity?.multiblockBuilder = null
+        monitorEntity?.multiblockBuilder = null
     }
 
     companion object {

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

@@ -98,101 +98,97 @@ class FossilMultiblockStructure (
     ): ActionResult {
         val stack = player.getStackInHand(interactionHand)
 
-        if (this.createdPokemon != null) {
-
-            if (!stack.isIn(CobblemonItemTags.POKE_BALLS) || stack.item !is PokeBallItem) {
-                return ActionResult.PASS
-            }
-
+        if(stack.isIn(CobblemonItemTags.POKE_BALLS) || stack.item is PokeBallItem) {
             if (player !is ServerPlayerEntity) {
-                return ActionResult.CONSUME
+                return ActionResult.SUCCESS
             }
+            if (this.createdPokemon != null) {
 
-            if (this.fossilOwnerUUID != null && player.uuid != this.fossilOwnerUUID) {
-                var ownerName : String = "UNKNOWN_USER" // TODO: lang agnostic fallback
-                server()?.userCache?.getByUuid(this.fossilOwnerUUID)?.orElse(null)?.name?.let {
-                    ownerName = it
+                if (this.fossilOwnerUUID != null && player.uuid != this.fossilOwnerUUID) {
+                    var ownerName : String = "UNKNOWN_USER" // TODO: lang agnostic fallback
+                    server()?.userCache?.getByUuid(this.fossilOwnerUUID)?.orElse(null)?.name?.let {
+                        ownerName = it
+                    }
+                    player.sendMessage(lang("fossilmachine.protected", ownerName), true)
+                    return ActionResult.FAIL
                 }
-                player.sendMessage(lang("fossilmachine.protected", ownerName), true)
-                return ActionResult.FAIL
+
+
+
+                val ballType = (stack.item as PokeBallItem).pokeBall
+                if (!player.isCreative) {
+                    stack?.decrement(1)
+                }
+
+                this.createdPokemon!!.caughtBall = ballType
+                player.party().add(this.createdPokemon!!)
+                this.fossilState.growthState = "Taken"
+                player.playSound(CobblemonSounds.FOSSIL_MACHINE_RETRIEVE_POKEMON, SoundCategory.BLOCKS, 1.0F, 1.0F)
+                CobblemonCriteria.RESURRECT_POKEMON.trigger(player, createdPokemon!!)
+
+                // Turn the monitor off
+                val monitorState = world.getBlockState(monitorPos)
+                if(!monitorState.equals(MonitorBlock.MonitorScreen.OFF)) {
+                    world.setBlockState(monitorPos, monitorState.with(MonitorBlock.SCREEN, MonitorBlock.MonitorScreen.OFF))
+                }
+
+                this.createdPokemon = null
+                this.fossilOwnerUUID = null
+                this.protectionTime = -1
+                this.updateFossilType(world)
+                this.syncToClient(world)
+                this.markDirty(world)
+                return ActionResult.SUCCESS
             }
-
-
-
-            val ballType = (stack.item as PokeBallItem).pokeBall
-            if (!player.isCreative) {
-                stack?.decrement(1)
-            }
-
-            this.createdPokemon!!.caughtBall = ballType
-            player.party().add(this.createdPokemon!!)
-            this.fossilState.growthState = "Taken"
-            player.playSound(CobblemonSounds.FOSSIL_MACHINE_RETRIEVE_POKEMON, SoundCategory.BLOCKS, 1.0F, 1.0F)
-            CobblemonCriteria.RESURRECT_POKEMON.trigger(player, createdPokemon!!)
-
-            // Turn the monitor off
-            val monitorState = world.getBlockState(monitorPos)
-            if(!monitorState.equals(MonitorBlock.MonitorScreen.OFF)) {
-                world.setBlockState(monitorPos, monitorState.with(MonitorBlock.SCREEN, MonitorBlock.MonitorScreen.OFF))
-            }
-
-            this.createdPokemon = null
-            this.fossilOwnerUUID = null
-            this.protectionTime = -1
-            this.updateFossilType(world)
-            this.syncToClient(world)
-            this.markDirty(world)
-            return ActionResult.SUCCESS
-        }
-
-        if (this.isRunning()) {
-            return ActionResult.PASS
         }
 
         // Reclaim the last fossil from the machine if their hand is empty
         if (player.getStackInHand(interactionHand).isEmpty) {
-            if (fossilInventory.isEmpty()) {
-                return ActionResult.CONSUME
-            }
+            if(!this.isRunning() && this.createdPokemon == null) {
+                if (fossilInventory.isEmpty()) {
+                    return ActionResult.CONSUME
+                }
+                player.setStackInHand(interactionHand, fossilInventory.last())
 
-            player.setStackInHand(interactionHand, fossilInventory.last())
-
-            // remove last fossil in the fossil machine stack when grabbed out of the machine
-            this.fossilInventory.removeAt(fossilInventory.size - 1)
-            if(!world.isClient) {
-                world.playSound(null, analyzerPos, CobblemonSounds.FOSSIL_MACHINE_RETRIEVE_FOSSIL, SoundCategory.BLOCKS)
-                this.updateFossilType(world)
-                this.syncToClient(world)
-                this.markDirty(world)
+                // remove last fossil in the fossil machine stack when grabbed out of the machine
+                this.fossilInventory.removeAt(fossilInventory.size - 1)
+                if(!world.isClient) {
+                    world.playSound(null, analyzerPos, CobblemonSounds.FOSSIL_MACHINE_RETRIEVE_FOSSIL, SoundCategory.BLOCKS)
+                    this.updateFossilType(world)
+                    this.syncToClient(world)
+                    this.markDirty(world)
+                }
             }
             return ActionResult.CONSUME
         }
 
         // Check if the player is holding a fossil and if so insert it into the machine.
         if (Fossils.isFossilIngredient(stack)) {
-            if (fossilInventory.size > Cobblemon.config.maxInsertedFossilItems) {
-                return ActionResult.FAIL
-            }
+            if(!this.isRunning() && this.createdPokemon == null) {
+                if (fossilInventory.size > Cobblemon.config.maxInsertedFossilItems) {
+                    return ActionResult.FAIL
+                }
 
-            val copyFossilStack = stack.copyWithCount(1)
-            if (!player.isCreative) {
-                stack?.decrement(1)
-            }
+                val copyFossilStack = stack.copyWithCount(1)
+                if (!player.isCreative) {
+                    stack?.decrement(1)
+                }
 
-            fossilOwnerUUID = player.uuid
-            fossilInventory.add(copyFossilStack)
-            if(!world.isClient) {
-                this.updateFossilType(world)
-                world.playSound(null, analyzerPos, CobblemonSounds.FOSSIL_MACHINE_INSERT_FOSSIL, SoundCategory.BLOCKS)
-                this.syncToClient(world)
-                this.markDirty(world)
+                fossilOwnerUUID = player.uuid
+                fossilInventory.add(copyFossilStack)
+                if(!world.isClient) {
+                    this.updateFossilType(world)
+                    world.playSound(null, analyzerPos, CobblemonSounds.FOSSIL_MACHINE_INSERT_FOSSIL, SoundCategory.BLOCKS)
+                    this.syncToClient(world)
+                    this.markDirty(world)
+                }
             }
             return ActionResult.SUCCESS
         }
 
         // Check if the player is holding a natural material and if so, feed it to the machine.
-        if (NaturalMaterials.isNaturalMaterial(stack) && this.organicMaterialInside < MATERIAL_TO_START) {
-            if (insertOrganicMaterial(stack, world)) {
+        if (NaturalMaterials.isNaturalMaterial(stack)) {
+            if (!this.isRunning() && this.createdPokemon == null && this.organicMaterialInside < MATERIAL_TO_START && insertOrganicMaterial(stack, world)) {
                 this.lastInteraction = world.time
                 if (!player.isCreative) {
                     val returnItem = NaturalMaterials.getReturnItem(stack)
@@ -200,7 +196,6 @@ class FossilMultiblockStructure (
                     player.giveOrDropItemStack(ItemStack(Registries.ITEM.get(returnItem)), false)
                 }
             }
-
             return ActionResult.success(world.isClient)
         }
 
@@ -311,22 +306,22 @@ class FossilMultiblockStructure (
     }
 
     override fun onBreak(world: World, pos: BlockPos, state: BlockState, player: PlayerEntity?) {
-        val monitorEntity = world.getBlockEntity(monitorPos) as MultiblockEntity
-        val analyzerEntity = world.getBlockEntity(analyzerPos) as MultiblockEntity
-        val tankBaseEntity = world.getBlockEntity(tankBasePos) as MultiblockEntity
-        val tankTopEntity = world.getBlockEntity(tankBasePos.up()) as MultiblockEntity
-        val state = world.getBlockState(tankBaseEntity.pos)
+        val monitorEntity = world.getBlockEntity(monitorPos) as? MultiblockEntity
+        val analyzerEntity = world.getBlockEntity(analyzerPos) as? MultiblockEntity
+        val tankBaseEntity = world.getBlockEntity(tankBasePos) as? MultiblockEntity
+        val tankTopEntity = world.getBlockEntity(tankBasePos.up()) as? MultiblockEntity
+        val state = world.getBlockState(tankBaseEntity?.pos)
         val direction = state.get(HorizontalFacingBlock.FACING).getOpposite()
         val wildPokemon: Pokemon? = this.createdPokemon
 
-        monitorEntity.multiblockStructure = null
-        analyzerEntity.multiblockStructure = null
-        tankBaseEntity.multiblockStructure = null
-        tankTopEntity.multiblockStructure = null
-        monitorEntity.masterBlockPos = null
-        analyzerEntity.masterBlockPos = null
-        tankBaseEntity.masterBlockPos = null
-        tankTopEntity.masterBlockPos = null
+        monitorEntity?.multiblockStructure = null
+        analyzerEntity?.multiblockStructure = null
+        tankBaseEntity?.multiblockStructure = null
+        tankTopEntity?.multiblockStructure = null
+        monitorEntity?.masterBlockPos = null
+        analyzerEntity?.masterBlockPos = null
+        tankBaseEntity?.masterBlockPos = null
+        tankTopEntity?.masterBlockPos = null
 
         // Drop fossils from machine as long as the machine is not started or near completion
         if (this.timeRemaining == -1 || this.timeRemaining >= 20) {
@@ -544,7 +539,7 @@ class FossilMultiblockStructure (
         }
 
         if (natureValue < 0 && organicMaterialInside == 0) return false
-        val oldFillStage = organicMaterialInside / 8
+        val oldFillStage = organicMaterialInside * 8 / MATERIAL_TO_START
 
         // to prevent over/under filling the tank causing a crash
         if ((organicMaterialInside + natureValue) > MATERIAL_TO_START) {
@@ -562,7 +557,7 @@ class FossilMultiblockStructure (
             world.playSound(null, this.tankBasePos, CobblemonSounds.FOSSIL_MACHINE_INSERT_DNA, SoundCategory.BLOCKS, 1.0F, 1.0F)
         }
         this.markDirty(world)
-        if (oldFillStage != (organicMaterialInside / 8)) {
+        if (oldFillStage != (organicMaterialInside * 8 / MATERIAL_TO_START)) {
             this.syncToClient(world)
         }
         return true
@@ -624,10 +619,10 @@ class FossilMultiblockStructure (
         }
 
         const val TICKS_PER_MINUTE = 1200
-        const val MATERIAL_TO_START = 64
-        const val TIME_TO_TAKE = TICKS_PER_MINUTE * 1
+        const val MATERIAL_TO_START = 128
+        const val TIME_TO_TAKE = TICKS_PER_MINUTE * 12
         const val TIME_PER_STAGE = TIME_TO_TAKE / 8
-        const val PROTECTION_TIME = 6000
+        const val PROTECTION_TIME = TICKS_PER_MINUTE * 5
 
         fun fromNbt(nbt: NbtCompound, animAge: Int = -1, partialTicks: Float = 0f): FossilMultiblockStructure {
             val monitorPos = NbtHelper.toBlockPos(nbt.getCompound(DataKeys.MONITOR_POS))
@@ -662,7 +657,7 @@ class FossilMultiblockStructure (
             if (nbt.contains(DataKeys.CREATED_POKEMON)) {
                 result.createdPokemon = Pokemon.loadFromNBT(nbt.getCompound(DataKeys.CREATED_POKEMON))
             }
-            result.fillLevel = result.organicMaterialInside / 8
+            result.fillLevel = result.organicMaterialInside * 8 / MATERIAL_TO_START
             return result
         }
 

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

@@ -11,7 +11,6 @@ package com.cobblemon.mod.common.client.entity
 import com.bedrockk.molang.runtime.value.DoubleValue
 import com.bedrockk.molang.runtime.value.StringValue
 import com.cobblemon.mod.common.CobblemonSounds
-import com.cobblemon.mod.common.Cobblemon
 import com.cobblemon.mod.common.api.entity.PokemonSideDelegate
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunctions
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct
@@ -22,7 +21,6 @@ import com.cobblemon.mod.common.api.scheduling.lerpOnClient
 import com.cobblemon.mod.common.client.particle.BedrockParticleEffectRepository
 import com.cobblemon.mod.common.client.particle.ParticleStorm
 import com.cobblemon.mod.common.client.render.MatrixWrapper
-import com.cobblemon.mod.common.client.render.SnowstormParticle
 import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.StatefulAnimation
@@ -34,11 +32,8 @@ import com.cobblemon.mod.common.util.MovingSoundInstance
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.util.math.MatrixStack
-import java.lang.Float.min
-import kotlin.math.abs
 import net.minecraft.entity.Entity
 import net.minecraft.entity.data.TrackedData
-import net.minecraft.particle.ParticleTypes
 import net.minecraft.sound.SoundCategory
 import net.minecraft.sound.SoundEvent
 import net.minecraft.util.Hand
@@ -105,6 +100,8 @@ class PokemonClientDelegate : PoseableEntityState<PokemonEntity>(), PokemonSideD
                     this.addPrimaryAnimation(primaryAnimation)
                 }
             } else if (data == PokemonEntity.BEAM_MODE) {
+                // If you make adjustments to this code, make sure to Find Usages for both PokemonEntity.beamMode and PokemonEntity.BEAM_MODE
+                // TODO: change beamMode to an enum, or a set of booleans (send-out vs recall, delay vs delay)
                 val beamMode = currentEntity.beamMode
                 when (beamMode) {
                     0 -> { /* Do nothing */ }
@@ -141,39 +138,37 @@ class PokemonClientDelegate : PoseableEntityState<PokemonEntity>(), PokemonSideD
                         currentEntity.after(seconds = POKEBALL_AIR_TIME){
                             beamStartTime = System.currentTimeMillis()
                             ballDone = true
-                            if (client.soundManager.get(CobblemonSounds.POKE_BALL_OPEN.id) != null && !playedSendOutSound) {
-                                currentEntity.owner?.let {
-                                    client.world?.playSound(client.player, soundPos.x, soundPos.y, soundPos.z, SoundEvent.of(CobblemonSounds.POKE_BALL_SEND_OUT.id), SoundCategory.PLAYERS, 0.6f, 1f)
-                                    playedSendOutSound = true
-                                    /// create end rod particles in a 0.1 radius around the soundPos with a count of 50 and a random velocity of 0.1
-                                    sendOutPosition?.let{
-                                        val newPos = it.add(sendOutOffset)
-                                        val ballType = currentEntity.pokemon.caughtBall.name.path.toLowerCase().replace("_","")
-                                        val mode = if(currentEntity.isBattling) "battle" else "casual"
-                                        val sendflash = BedrockParticleEffectRepository.getEffect(cobblemonResource("${ballType}/${mode}/sendflash"))
-                                        sendflash?.let { effect ->
-                                            val wrapper = MatrixWrapper()
-                                            val matrix = MatrixStack()
-                                            matrix.translate(newPos.x, newPos.y, newPos.z)
-                                            wrapper.updateMatrix(matrix.peek().positionMatrix)
-                                            val world = MinecraftClient.getInstance().world ?: return@let
+                            if (client.soundManager.get(CobblemonSounds.POKE_BALL_SEND_OUT.id) != null && !playedSendOutSound) {
+                                client.world?.playSound(client.player, soundPos.x, soundPos.y, soundPos.z, SoundEvent.of(CobblemonSounds.POKE_BALL_SEND_OUT.id), SoundCategory.PLAYERS, 0.6f, 1f)
+                                playedSendOutSound = true
+                            }
+                            // Display ball-specific particles
+                            sendOutPosition?.let{
+                                val newPos = it.add(sendOutOffset)
+                                val ballType = currentEntity.pokemon.caughtBall.name.path.lowercase().replace("_","")
+                                val mode = if(currentEntity.isBattling) "battle" else "casual"
+                                val sendflash = BedrockParticleEffectRepository.getEffect(cobblemonResource("${ballType}/${mode}/sendflash"))
+                                sendflash?.let { effect ->
+                                    val wrapper = MatrixWrapper()
+                                    val matrix = MatrixStack()
+                                    matrix.translate(newPos.x, newPos.y, newPos.z)
+                                    wrapper.updateMatrix(matrix.peek().positionMatrix)
+                                    val world = MinecraftClient.getInstance().world ?: return@let
+                                    ParticleStorm(effect, wrapper, world).spawn()
+                                    val ballsparks = BedrockParticleEffectRepository.getEffect(cobblemonResource("${ballType}/${mode}/ballsparks"))
+                                    val ballsendsparkle = BedrockParticleEffectRepository.getEffect(cobblemonResource("${ballType}/${mode}/ballsendsparkle"))
+                                    // using afterOnClient because it's such a small timeframe that it's unlikely the entity has been removed & we'd like the precision
+                                    afterOnClient(seconds = 0.01667f) {
+                                        ballsparks?.let { effect ->
                                             ParticleStorm(effect, wrapper, world).spawn()
-                                            val ballsparks = BedrockParticleEffectRepository.getEffect(cobblemonResource("${ballType}/${mode}/ballsparks"))
-                                            val ballsendsparkle = BedrockParticleEffectRepository.getEffect(cobblemonResource("${ballType}/${mode}/ballsendsparkle"))
-                                            // using afterOnClient because it's such a small timeframe that it's unlikely the entity has been removed & we'd like the precision
-                                            afterOnClient(seconds = 0.01667f) {
-                                                ballsparks?.let { effect ->
-                                                    ParticleStorm(effect, wrapper, world).spawn()
-                                                }
-                                                ballsendsparkle?.let { effect ->
-                                                    ParticleStorm(effect, wrapper, world).spawn()
-                                                }
-                                                currentEntity.after(seconds = 0.4f) {
-                                                    val ballsparkle = BedrockParticleEffectRepository.getEffect(cobblemonResource("${ballType}/ballsparkle"))
-                                                    ballsparkle?.let { effect ->
-                                                        ParticleStorm(effect, wrapper, world).spawn()
-                                                    }
-                                                }
+                                        }
+                                        ballsendsparkle?.let { effect ->
+                                            ParticleStorm(effect, wrapper, world).spawn()
+                                        }
+                                        currentEntity.after(seconds = 0.4f) {
+                                            val ballsparkle = BedrockParticleEffectRepository.getEffect(cobblemonResource("${ballType}/ballsparkle"))
+                                            ballsparkle?.let { effect ->
+                                                ParticleStorm(effect, wrapper, world).spawn()
                                             }
                                         }
                                     }
@@ -190,7 +185,35 @@ class PokemonClientDelegate : PoseableEntityState<PokemonEntity>(), PokemonSideD
                             }
                         }
                     }
-                    else -> {
+                    2 -> {
+                        // Scaling up with no delay and no particles
+                        playedSendOutSound = false
+                        entityScaleModifier = 0F
+                        currentEntity.isInvisible = false
+                        val soundPos = currentEntity.pos
+                        val client = MinecraftClient.getInstance()
+
+                        if (client.soundManager.get(CobblemonSounds.POKE_BALL_SEND_OUT.id) != null && !playedSendOutSound) {
+                            client.world?.playSound(
+                                client.player,
+                                soundPos.x,
+                                soundPos.y,
+                                soundPos.z,
+                                CobblemonSounds.POKE_BALL_SEND_OUT,
+                                SoundCategory.PLAYERS,
+                                0.6f,
+                                1f
+                            )
+                            playedSendOutSound = true
+                        }
+                        lerpOnClient(BEAM_SHRINK_TIME) { entityScaleModifier = it }
+                        currentEntity.after(seconds = BEAM_SHRINK_TIME * 2) {
+                            ballOffset = 0f
+                            ballRotOffset = 0f
+                            sendOutPosition = null
+                        }
+                    }
+                    3 -> {
                         // Scaling down into pokeball
                         entityScaleModifier = 1F
                         beamStartTime = System.currentTimeMillis()
@@ -203,6 +226,7 @@ class PokemonClientDelegate : PoseableEntityState<PokemonEntity>(), PokemonSideD
                             }
                         }
                     }
+                    else -> { /* Do nothing */ }
                 }
             } else if (data == PokemonEntity.LABEL_LEVEL) {
                 currentEntity.dataTracker.get(PokemonEntity.LABEL_LEVEL)

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

@@ -59,7 +59,7 @@ class PartyOverlay : InGameHud(MinecraftClient.getInstance(), MinecraftClient.ge
         BattleGUI::class.java
     )
 
-    private val starterToast = CobblemonToast(
+    val starterToast = CobblemonToast(
         MathHelper.randomUuid(),
         CobblemonItems.POKE_BALL.defaultStack,
         lang("ui.starter.choose_starter_title", SummaryBinding.boundKey().localizedText).red(),
@@ -104,24 +104,12 @@ class PartyOverlay : InGameHud(MinecraftClient.getInstance(), MinecraftClient.ge
                 !CobblemonClient.checkedStarterScreen
             ) {
                 if (!this.attachedToast) {
+                    // Adding starter toast on start and connect of client to server.
                     minecraft.toastManager.add(this.starterToast)
                     this.attachedToast = true
                 }
-                /*
-                drawScaledText(
-                    context = context,
-                    text = lang("ui.starter.chooseyourstarter", SummaryBinding.boundKey().localizedText),
-                    x = minecraft.window.scaledWidth / 2,
-                    y = 70,
-                    centered = true,
-                    shadow = true
-                )
-                 */
             }
-            return
-        }
-        if (this.starterToast.nextVisibility != Toast.Visibility.HIDE) {
-            this.starterToast.nextVisibility = Toast.Visibility.HIDE
+            return // Don't render the stuff below if no Pokémon in party
         }
 
         val totalHeight = party.slots.size * SLOT_HEIGHT

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

@@ -62,8 +62,9 @@ class BattleGeneralActionSelection(
                 }
 
                 addOption(rank++, battleLang("ui.run"), BattleGUI.runResource) {
-
-                    MinecraftClient.getInstance().player?.sendMessage(battleLang("flee"))
+                    CobblemonClient.battle?.minimised = true
+                    MinecraftClient.getInstance().player?.sendMessage(battleLang("run_prompt"), false)
+                    playDownSound(MinecraftClient.getInstance().soundManager)
                 }
             }
         }

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

@@ -15,6 +15,7 @@ import com.cobblemon.mod.common.api.gui.ColourLibrary
 import com.cobblemon.mod.common.api.gui.MultiLineLabelK
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.text.bold
+import com.cobblemon.mod.common.client.CobblemonClient
 import com.cobblemon.mod.common.client.CobblemonResources
 import com.cobblemon.mod.common.client.gui.startselection.widgets.CategoryList
 import com.cobblemon.mod.common.client.gui.startselection.widgets.ExitButton
@@ -26,7 +27,7 @@ import com.cobblemon.mod.common.client.gui.summary.widgets.type.DualTypeWidget
 import com.cobblemon.mod.common.client.gui.summary.widgets.type.SingleTypeWidget
 import com.cobblemon.mod.common.client.gui.summary.widgets.type.TypeWidget
 import com.cobblemon.mod.common.client.render.drawScaledText
-import com.cobblemon.mod.common.config.starter.RenderableStarterCategory
+import com.cobblemon.mod.common.api.starter.RenderableStarterCategory
 import com.cobblemon.mod.common.net.messages.server.SelectStarterPacket
 import com.cobblemon.mod.common.pokemon.RenderablePokemon
 import com.cobblemon.mod.common.util.asTranslated
@@ -37,8 +38,9 @@ import net.minecraft.client.MinecraftClient
 import net.minecraft.client.gui.DrawContext
 import net.minecraft.client.gui.screen.Screen
 import net.minecraft.client.sound.PositionedSoundInstance
-import net.minecraft.client.util.math.MatrixStack
+import net.minecraft.client.toast.Toast
 import net.minecraft.text.Text
+import net.minecraft.util.Identifier
 
 /**
  * Starterselection Screen Thingy
@@ -46,7 +48,7 @@ import net.minecraft.text.Text
  * @author Qu
  * @since 2022-06-18
  */
-class StarterSelectionScreen(private val categories: List<RenderableStarterCategory>): Screen("cobblemon.ui.starter.title".asTranslated()) {
+class StarterSelectionScreen(categories: Map<Identifier, RenderableStarterCategory>): Screen("cobblemon.ui.starter.title".asTranslated()) {
 
     companion object {
         // Size of UI at scale 1
@@ -63,8 +65,9 @@ class StarterSelectionScreen(private val categories: List<RenderableStarterCateg
         private val doubleTypeBackground = cobblemonResource("textures/gui/starterselection/starterselection_type_slot2.png")
     }
 
+    private val categories = categories.toSortedMap { a, b -> a.compareTo(b) }
     private var currentSelection = 0
-    private lateinit var currentCategory: RenderableStarterCategory
+    private lateinit var currentCategoryId: Identifier
     private lateinit var modelWidget: ModelWidget
     private lateinit var currentPokemon: RenderablePokemon
     private lateinit var typeWidget: TypeWidget
@@ -74,6 +77,12 @@ class StarterSelectionScreen(private val categories: List<RenderableStarterCateg
 
     override fun init() {
         super.init()
+        // Hide toast once checkedStarterScreen was set, which happens during the opening of the starter screen.
+        if (CobblemonClient.checkedStarterScreen) {
+            if (CobblemonClient.overlay.starterToast.nextVisibility != Toast.Visibility.HIDE) {
+                CobblemonClient.overlay.starterToast.nextVisibility = Toast.Visibility.HIDE
+            }
+        }
 
         val x = (width - BASE_WIDTH) / 2
         val y = (height - BASE_HEIGHT) / 2
@@ -88,7 +97,7 @@ class StarterSelectionScreen(private val categories: List<RenderableStarterCateg
                 paneWidth = 71, paneHeight = BASE_HEIGHT - 11,
                 topOffset = 6, bottomOffset = 5,
                 entryHeight = 20, entryWidth = 57,
-                categories = categories,
+                categories = this.categories,
                 x = x - 2, y = y + 8,
                 starterSelectionScreen = this
             )
@@ -113,8 +122,8 @@ class StarterSelectionScreen(private val categories: List<RenderableStarterCateg
         addDrawableChild(rightButton)
         addDrawableChild(leftButton)
 
-        currentCategory = categories.first()
-        currentPokemon = currentCategory.pokemon[currentSelection]
+        currentCategoryId = categories.firstKey()
+        currentPokemon = this.currentCategory().pokemon[currentSelection]
 
         with(currentPokemon) {
             modelWidget = ModelWidget(
@@ -135,11 +144,11 @@ class StarterSelectionScreen(private val categories: List<RenderableStarterCateg
         ) {
             CobblemonNetwork.sendPacketToServer(
                 SelectStarterPacket(
-                    categoryName = currentCategory.name,
+                    categoryId = currentCategoryId,
                     selected = currentSelection
                 )
             )
-            MinecraftClient.getInstance().setScreen(null)
+            this.close()
         }
 
         addDrawableChild(selectionButton)
@@ -154,7 +163,7 @@ class StarterSelectionScreen(private val categories: List<RenderableStarterCateg
         starterRoundaboutLeft = StarterRoundabout(
             pX = x + 89, pY = height / 2 + 84,
             pWidth = StarterRoundabout.MODEL_WIDTH, pHeight = StarterRoundabout.MODEL_HEIGHT,
-            pokemon = currentCategory.pokemon[leftOfCurrentSelection()],
+            pokemon = this.currentCategory().pokemon[leftOfCurrentSelection()],
             clickAction = { _, _ -> this.left()  },
             rotationVector = this.modelWidget.rotVec
         )
@@ -162,7 +171,7 @@ class StarterSelectionScreen(private val categories: List<RenderableStarterCateg
         starterRoundaboutRight = StarterRoundabout(
             pX = x + 149, pY = height / 2 + 84,
             pWidth = StarterRoundabout.MODEL_WIDTH, pHeight = StarterRoundabout.MODEL_HEIGHT,
-            pokemon = currentCategory.pokemon[rightOfCurrentSelection()],
+            pokemon = this.currentCategory().pokemon[rightOfCurrentSelection()],
             clickAction = { _, _ -> this.right()  },
             rotationVector = this.modelWidget.rotVec
         )
@@ -269,8 +278,8 @@ class StarterSelectionScreen(private val categories: List<RenderableStarterCateg
         super.render(context, mouseX, mouseY, delta)
     }
 
-    fun changeCategory(category: RenderableStarterCategory) {
-        currentCategory = category
+    fun changeCategory(id: Identifier) {
+        currentCategoryId = id
         currentSelection = 0
         updateSelection()
     }
@@ -281,7 +290,7 @@ class StarterSelectionScreen(private val categories: List<RenderableStarterCateg
         updateSelection()
     }
 
-    private fun rightOfCurrentSelection() : Int = if (currentSelection + 1 <= currentCategory.pokemon.size - 1) currentSelection + 1 else 0
+    private fun rightOfCurrentSelection() : Int = if (currentSelection + 1 <= this.currentCategory().pokemon.size - 1) currentSelection + 1 else 0
 
     private fun left() {
         MinecraftClient.getInstance().soundManager.play(PositionedSoundInstance.master(CobblemonSounds.GUI_CLICK, 1.0F))
@@ -289,16 +298,16 @@ class StarterSelectionScreen(private val categories: List<RenderableStarterCateg
         updateSelection()
     }
 
-    private fun leftOfCurrentSelection() : Int = if (currentSelection - 1 == -1) currentCategory.pokemon.size - 1 else currentSelection - 1
+    private fun leftOfCurrentSelection() : Int = if (currentSelection - 1 == -1) this.currentCategory().pokemon.size - 1 else currentSelection - 1
 
     private fun updateSelection() {
-        currentPokemon = currentCategory.pokemon[currentSelection].also {
+        currentPokemon = this.currentCategory().pokemon[currentSelection].also {
             modelWidget.pokemon = it
             typeWidget = typeWidget(it, (width - BASE_WIDTH) / 2, (height - BASE_HEIGHT) / 2)
         }
-        starterRoundaboutLeft.pokemon = currentCategory.pokemon[leftOfCurrentSelection()]
+        starterRoundaboutLeft.pokemon = this.currentCategory().pokemon[leftOfCurrentSelection()]
         starterRoundaboutCenter.pokemon = currentPokemon
-        starterRoundaboutRight.pokemon = currentCategory.pokemon[rightOfCurrentSelection()]
+        starterRoundaboutRight.pokemon = this.currentCategory().pokemon[rightOfCurrentSelection()]
     }
 
     private fun typeWidget(pokemon: RenderablePokemon, x: Int, y: Int) : TypeWidget {
@@ -317,5 +326,7 @@ class StarterSelectionScreen(private val categories: List<RenderableStarterCateg
         )
     }
 
+    private fun currentCategory(): RenderableStarterCategory = this.categories[this.currentCategoryId]!!
+
     override fun shouldPause() = true
 }

common/src/main/kotlin/com/cobblemon/mod/common/client/gui/startselection/widgets/CategoryList.kt

@@ -12,14 +12,14 @@ import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.client.gui.startselection.StarterSelectionScreen
 import com.cobblemon.mod.common.client.render.drawScaledText
-import com.cobblemon.mod.common.config.starter.RenderableStarterCategory
+import com.cobblemon.mod.common.api.starter.RenderableStarterCategory
 import com.cobblemon.mod.common.util.cobblemonResource
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.gui.DrawContext
 import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget
 import net.minecraft.client.sound.PositionedSoundInstance
-import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.text.Text
+import net.minecraft.util.Identifier
 
 class CategoryList(
     private val paneWidth: Int,
@@ -28,7 +28,7 @@ class CategoryList(
     bottomOffset: Int,
     private val entryWidth: Int,
     entryHeight: Int,
-    private val categories: List<RenderableStarterCategory>,
+    private val categories: Map<Identifier, RenderableStarterCategory>,
     val x: Int, val y: Int,
     private val minecraft: MinecraftClient = MinecraftClient.getInstance(),
     private val starterSelectionScreen: StarterSelectionScreen
@@ -44,7 +44,6 @@ class CategoryList(
     companion object {
         private const val CATEGORY_BUTTON_WIDTH = 51.5f
         private const val CATEGORY_BUTTON_HEIGHT = 16f
-        private const val ENTRY_X_OFFSET = 10f
         private val categoryResource = cobblemonResource("textures/gui/starterselection/starterselection_slot.png")
     }
 
@@ -53,19 +52,12 @@ class CategoryList(
         this.setRenderHorizontalShadows(false)
         this.setRenderBackground(false)
         this.setRenderSelection(false)
-    }
-
-    private var entriesCreated = false
-
-    private fun createEntries() = categories.map {
-        Category(it)
+        this.categories.forEach { (id, category) ->
+            this.addEntry(Category(id, category))
+        }
     }
 
     override fun render(context: DrawContext, mouseX: Int, mouseY: Int, delta: Float) {
-        if (!entriesCreated) {
-            createEntries().forEach { addEntry(it) }
-            entriesCreated = true
-        }
         context.enableScissor(
             x,
             y,
@@ -80,15 +72,13 @@ class CategoryList(
         this.updateSize(this.paneWidth, this.paneHeight, this.y, this.y + this.paneHeight)
         this.setLeftPos(this.x)
     }
-
-    private fun scale(n: Int): Int = (this.client.window.scaleFactor * n).toInt()
     override fun getRowWidth() = this.entryWidth
     override fun getScrollbarPositionX(): Int {
         return this.left + this.width - 5
     }
 
 
-    inner class Category(private val category: RenderableStarterCategory) : Entry<Category>() {
+    inner class Category(private val id: Identifier, private val category: RenderableStarterCategory) : Entry<Category>() {
 
         override fun render(
             context: DrawContext,
@@ -121,7 +111,7 @@ class CategoryList(
                 )
             drawScaledText(
                 context = context,
-                text = category.displayNameText,
+                text = category.displayName.copy(),
                 x = x + 28,
                 y = y + 4.5F,
                 scale = 1F,
@@ -132,7 +122,7 @@ class CategoryList(
         }
 
         override fun mouseClicked(mouseX: Double, mouseY: Double, button: Int): Boolean {
-            starterSelectionScreen.changeCategory(category = category)
+            starterSelectionScreen.changeCategory(this.id)
             minecraft.soundManager.play(PositionedSoundInstance.master(CobblemonSounds.GUI_CLICK, 1.0F))
             return true
         }

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

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.CobblemonSounds
 import com.cobblemon.mod.common.api.gui.blitk
 import com.cobblemon.mod.common.api.moves.Move
 import com.cobblemon.mod.common.api.moves.MoveSet
+import com.cobblemon.mod.common.api.pokemon.PokemonSpecies.species
 import com.cobblemon.mod.common.api.reactive.Observable.Companion.emitWhile
 import com.cobblemon.mod.common.api.reactive.ObservableSubscription
 import com.cobblemon.mod.common.api.scheduling.Schedulable
@@ -34,6 +35,7 @@ import com.cobblemon.mod.common.client.gui.summary.widgets.screens.moves.MoveSwa
 import com.cobblemon.mod.common.client.gui.summary.widgets.screens.moves.MovesWidget
 import com.cobblemon.mod.common.client.gui.summary.widgets.screens.stats.StatWidget
 import com.cobblemon.mod.common.client.render.drawScaledText
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokemonModelRepository
 import com.cobblemon.mod.common.net.messages.server.storage.party.MovePartyPokemonPacket
 import com.cobblemon.mod.common.net.messages.server.storage.party.SwapPartyPokemonPacket
 import com.cobblemon.mod.common.pokemon.Gender
@@ -613,6 +615,27 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
         ) {
             this.focused = null
         }
+        if (Cobblemon.config.enableDebugKeys) {
+            val model = PokemonModelRepository.getPoser(selectedPokemon.species.resourceIdentifier, selectedPokemon.aspects)
+            if (keyCode == InputUtil.GLFW_KEY_UP) {
+                model.profileTranslation = model.profileTranslation.add(0.0, -0.01, 0.0)
+            }
+            if (keyCode == InputUtil.GLFW_KEY_DOWN) {
+                model.profileTranslation = model.profileTranslation.add(0.0, 0.01, 0.0)
+            }
+            if (keyCode == InputUtil.GLFW_KEY_LEFT) {
+                model.profileTranslation = model.profileTranslation.add(-0.01, 0.0, 0.0)
+            }
+            if (keyCode == InputUtil.GLFW_KEY_RIGHT) {
+                model.profileTranslation = model.profileTranslation.add(0.01, 0.0, 0.0)
+            }
+            if (keyCode == InputUtil.GLFW_KEY_EQUAL) {
+                model.profileScale += 0.01F
+            }
+            if (keyCode == InputUtil.GLFW_KEY_MINUS) {
+                model.profileScale -= 0.01F
+            }
+        }
         return super.keyPressed(keyCode, scanCode, modifiers)
     }
 
@@ -620,4 +643,14 @@ class Summary private constructor(party: Collection<Pokemon?>, private val edita
         MinecraftClient.getInstance().soundManager.play(PositionedSoundInstance.master(soundEvent, 1.0F))
     }
 
+    override fun close() {
+        if (Cobblemon.config.enableDebugKeys) {
+            val model = PokemonModelRepository.getPoser(selectedPokemon.species.resourceIdentifier, selectedPokemon.aspects)
+            MinecraftClient.getInstance().player?.sendMessage(Text.of("Profile Translation: ${model.profileTranslation}"))
+            MinecraftClient.getInstance().player?.sendMessage(Text.of("Profile Scale: ${model.profileScale}"))
+            Cobblemon.LOGGER.info("override var profileTranslation = Vec3d(${model.profileTranslation.x}, ${model.profileTranslation.y}, ${model.profileTranslation.z})")
+            Cobblemon.LOGGER.info("override var profileScale = ${model.profileScale}F")
+        }
+        super.close()
+    }
 }

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

@@ -8,11 +8,14 @@
 
 package com.cobblemon.mod.common.client.keybind
 
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.client.keybind.keybinds.DebugKeybindings
 import com.cobblemon.mod.common.client.keybind.keybinds.DownShiftPartyBinding
 import com.cobblemon.mod.common.client.keybind.keybinds.HidePartyBinding
 import com.cobblemon.mod.common.client.keybind.keybinds.PartySendBinding
 import com.cobblemon.mod.common.client.keybind.keybinds.SummaryBinding
 import com.cobblemon.mod.common.client.keybind.keybinds.UpShiftPartyBinding
+import com.cobblemon.mod.common.config.CobblemonConfig
 import com.cobblemon.mod.common.platform.events.PlatformEvents
 import net.minecraft.client.option.KeyBinding
 
@@ -23,13 +26,17 @@ import net.minecraft.client.option.KeyBinding
  * @since 2022-02-17
  */
 object CobblemonKeyBinds {
+    private val keyBinds = arrayListOf<CobblemonKeyBinding>()
 
     init {
         PlatformEvents.CLIENT_TICK_POST.subscribe { this.onTick() }
+        if (Cobblemon.config.enableDebugKeys) {
+            DebugKeybindings.keybindings.forEach {
+                this.queue(it)
+            }
+        }
     }
 
-    private val keyBinds = arrayListOf<CobblemonKeyBinding>()
-
     val HIDE_PARTY = this.queue(HidePartyBinding)
     // ToDo enable again down the line
     //val POKENAV = this.queue(PokeNavigatorBinding)

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

@@ -9,7 +9,9 @@
 package com.cobblemon.mod.common.client.keybind
 
 import com.cobblemon.mod.common.api.text.red
+import com.cobblemon.mod.common.api.text.yellow
 import com.cobblemon.mod.common.client.CobblemonClient
+import com.cobblemon.mod.common.client.keybind.keybinds.SummaryBinding
 import com.cobblemon.mod.common.net.messages.server.starter.RequestStarterScreenPacket
 import com.cobblemon.mod.common.util.lang
 import net.minecraft.client.MinecraftClient
@@ -25,12 +27,20 @@ abstract class CobblemonPartyLockedKeyBinding(
     category: String
 ) : CobblemonKeyBinding(name, type, key, category) {
 
+    private var skippedStarterSelectionMessageShown = false
+
     override fun onTick() {
         if (this.wasPressed() && this.hasPartyMembers()) {
             this.onPress()
         }
     }
 
+    /**
+     *  Checks if the player has any party members, and
+     *
+     *  - Handles the starter selection if the player doesn't have any party members.
+     *  - Shows a message if the player initially skipped the starter selection.
+     */
     private fun hasPartyMembers(): Boolean {
         val havePokemon = CobblemonClient.storage.myParty.slots.any { it != null }
         val starterSelected = CobblemonClient.clientPlayerData.starterSelected
@@ -42,6 +52,18 @@ abstract class CobblemonPartyLockedKeyBinding(
                 RequestStarterScreenPacket().sendToServer()
             }
             return false
+        } else if (!startersLocked && !starterSelected && havePokemon) {
+            if (!skippedStarterSelectionMessageShown) {
+                MinecraftClient.getInstance().player?.sendMessage(
+                    lang(
+                        "ui.starter.skippedchoosing",
+                        SummaryBinding.boundKey().localizedText
+                    ).yellow(), false
+                )
+                /** Only show the info message about skipping the selection once per MC instance */
+                skippedStarterSelectionMessageShown = true
+            }
+            return true
         }
         return true
     }

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

@@ -10,4 +10,5 @@ package com.cobblemon.mod.common.client.keybind
 
 object KeybindCategories {
     const val COBBLEMON_CATEGORY = "key.cobblemon.categories.cobblemon"
+    const val COBBLEMON_DEBUG_CATEGORY = "key.cobblemon.categories.cobblemon.debug"
 }

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

@@ -0,0 +1,140 @@
+/*
+ * 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.keybind.keybinds
+
+import com.cobblemon.mod.common.Cobblemon
+import com.cobblemon.mod.common.client.CobblemonClient
+import com.cobblemon.mod.common.client.keybind.CobblemonKeyBinding
+import com.cobblemon.mod.common.client.keybind.KeybindCategories
+import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokemonModelRepository
+import net.minecraft.client.MinecraftClient
+import net.minecraft.client.util.InputUtil
+import net.minecraft.text.Text
+
+object DebugKeybindings {
+    val keybindings = listOf(
+        ScaleUpKeybinding(),
+        ScaleDownKeybinding(),
+        TranslateLeftKeybinding(),
+        TranslateRightKeybinding(),
+        TranslateUpKeybinding(),
+        TranslateDownKeybinding(),
+        PrintModelSettingsKeybinding()
+    )
+    class ScaleUpKeybinding(): CobblemonKeyBinding(
+        "key.cobblemon.scaleportraitup",
+        InputUtil.Type.KEYSYM,
+        InputUtil.GLFW_KEY_EQUAL,
+        KeybindCategories.COBBLEMON_DEBUG_CATEGORY
+    ) {
+        override fun onPress() {
+            val currentlySelectedPokemon = CobblemonClient.storage.myParty.get(CobblemonClient.storage.selectedSlot)
+            if (currentlySelectedPokemon != null) {
+                val model = PokemonModelRepository.getPoser(currentlySelectedPokemon.species.resourceIdentifier, currentlySelectedPokemon.aspects)
+                model.portraitScale += 0.01F
+            }
+
+        }
+    }
+    class ScaleDownKeybinding(): CobblemonKeyBinding(
+        "key.cobblemon.scaleportraitdown",
+        InputUtil.Type.KEYSYM,
+        InputUtil.GLFW_KEY_MINUS,
+        KeybindCategories.COBBLEMON_DEBUG_CATEGORY
+    ) {
+        override fun onPress() {
+            val currentlySelectedPokemon = CobblemonClient.storage.myParty.get(CobblemonClient.storage.selectedSlot)
+            if (currentlySelectedPokemon != null) {
+                val model = PokemonModelRepository.getPoser(currentlySelectedPokemon.species.resourceIdentifier, currentlySelectedPokemon.aspects)
+                model.portraitScale -= 0.01F
+            }
+
+        }
+    }
+
+    class TranslateUpKeybinding: CobblemonKeyBinding(
+        "key.cobblemon.translateportraitup",
+        InputUtil.Type.KEYSYM,
+        InputUtil.GLFW_KEY_I,
+        KeybindCategories.COBBLEMON_DEBUG_CATEGORY
+    ) {
+        override fun onPress() {
+            val currentlySelectedPokemon = CobblemonClient.storage.myParty.get(CobblemonClient.storage.selectedSlot)
+            if (currentlySelectedPokemon != null) {
+                val model = PokemonModelRepository.getPoser(currentlySelectedPokemon.species.resourceIdentifier, currentlySelectedPokemon.aspects)
+                model.portraitTranslation = model.portraitTranslation.add(0.0, -0.01, 0.0)
+            }
+
+        }
+    }
+    class TranslateDownKeybinding(): CobblemonKeyBinding(
+        "key.cobblemon.translateportraitdown",
+        InputUtil.Type.KEYSYM,
+        InputUtil.GLFW_KEY_K,
+        KeybindCategories.COBBLEMON_DEBUG_CATEGORY
+    ) {
+        override fun onPress() {
+            val currentlySelectedPokemon = CobblemonClient.storage.myParty.get(CobblemonClient.storage.selectedSlot)
+            if (currentlySelectedPokemon != null) {
+                val model = PokemonModelRepository.getPoser(currentlySelectedPokemon.species.resourceIdentifier, currentlySelectedPokemon.aspects)
+                model.portraitTranslation = model.portraitTranslation.add(0.0, 0.01, 0.0)
+            }
+
+        }
+    }
+
+    class TranslateLeftKeybinding(): CobblemonKeyBinding(
+        "key.cobblemon.translateportraitleft",
+        InputUtil.Type.KEYSYM,
+        InputUtil.GLFW_KEY_J,
+        KeybindCategories.COBBLEMON_DEBUG_CATEGORY
+    ) {
+        override fun onPress() {
+            val currentlySelectedPokemon = CobblemonClient.storage.myParty.get(CobblemonClient.storage.selectedSlot)
+            if (currentlySelectedPokemon != null) {
+                val model = PokemonModelRepository.getPoser(currentlySelectedPokemon.species.resourceIdentifier, currentlySelectedPokemon.aspects)
+                model.portraitTranslation = model.portraitTranslation.add(-0.01, 0.0, 0.0)
+            }
+
+        }
+    }
+
+    class TranslateRightKeybinding(): CobblemonKeyBinding(
+        "key.cobblemon.translateportraitright",
+        InputUtil.Type.KEYSYM,
+        InputUtil.GLFW_KEY_L,
+        KeybindCategories.COBBLEMON_DEBUG_CATEGORY
+    ) {
+        override fun onPress() {
+            val currentlySelectedPokemon = CobblemonClient.storage.myParty.get(CobblemonClient.storage.selectedSlot)
+            if (currentlySelectedPokemon != null) {
+                val model = PokemonModelRepository.getPoser(currentlySelectedPokemon.species.resourceIdentifier, currentlySelectedPokemon.aspects)
+                model.portraitTranslation = model.portraitTranslation.add(0.01, 0.0, 0.0)
+            }
+        }
+    }
+
+    class PrintModelSettingsKeybinding() : CobblemonKeyBinding(
+        "key.cobblemon.printmodelsettings",
+        InputUtil.Type.KEYSYM,
+        InputUtil.GLFW_KEY_PERIOD,
+        KeybindCategories.COBBLEMON_DEBUG_CATEGORY
+    ) {
+        override fun onPress() {
+            val currentlySelectedPokemon = CobblemonClient.storage.myParty.get(CobblemonClient.storage.selectedSlot)
+            if (currentlySelectedPokemon != null) {
+                val model = PokemonModelRepository.getPoser(currentlySelectedPokemon.species.resourceIdentifier, currentlySelectedPokemon.aspects)
+                MinecraftClient.getInstance().player?.sendMessage(Text.of("Portrait Translation: ${model.portraitTranslation}"))
+                MinecraftClient.getInstance().player?.sendMessage(Text.of("Portrait Scale: ${model.portraitScale}"))
+                Cobblemon.LOGGER.info("override var portraitTranslation = Vec3d(${model.portraitTranslation.x}, ${model.portraitTranslation.y}, ${model.portraitTranslation.z})")
+                Cobblemon.LOGGER.info("override var portraitScale = ${model.portraitScale}F")
+            }
+        }
+    }
+}

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

@@ -189,8 +189,8 @@ class SnowstormParticle(
             viewDirection = viewDirection
         )
 
-        val xSize = storm.runtime.resolveDouble(storm.effect.particle.sizeX).toFloat()
-        val ySize = storm.runtime.resolveDouble(storm.effect.particle.sizeY).toFloat()
+        val xSize = storm.runtime.resolveDouble(storm.effect.particle.sizeX).toFloat() / 1.5.toFloat()
+        val ySize = storm.runtime.resolveDouble(storm.effect.particle.sizeY).toFloat() / 1.5.toFloat()
 
         val particleVertices = arrayOf(
             Vector3f(-xSize, -ySize, 0.0f),

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

@@ -72,7 +72,7 @@ class RestorationTankRenderer(ctx: BlockEntityRendererFactory.Context) : BlockEn
 
         val fluidModel = if (struct.isRunning()) FLUID_MODELS[8]
         else if (struct.createdPokemon != null) FLUID_MODELS[7]
-        else FLUID_MODELS[fillLevel-1]
+        else FLUID_MODELS[fillLevel.coerceAtMost(FLUID_MODELS.size - 1) - 1]
         fluidModel.getQuads(entity.cachedState, null, entity.world?.random).forEach { quad ->
             transparentBuffer?.quad(matrices.peek(), quad, 0.75f, 0.75f, 0.75f, light, OverlayTexture.DEFAULT_UV)
         }

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

@@ -18,7 +18,6 @@ import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunctions
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct
 import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup
 import com.cobblemon.mod.common.api.molang.ObjectValue
-import com.cobblemon.mod.common.api.scheduling.afterOnClient
 import com.cobblemon.mod.common.client.ClientMoLangFunctions.setupClient
 import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
 import com.cobblemon.mod.common.client.render.MatrixWrapper
@@ -46,6 +45,7 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.asExpressionLike
 import com.cobblemon.mod.common.util.getDoubleOrNull
 import com.cobblemon.mod.common.util.getStringOrNull
+import com.cobblemon.mod.common.util.plus
 import net.minecraft.client.model.ModelPart
 import net.minecraft.client.render.OverlayTexture
 import net.minecraft.client.render.RenderLayer
@@ -697,6 +697,7 @@ abstract class PoseableEntityModel<T : Entity>(
             val portion = (state.animationSeconds - primaryAnimation.started) / primaryAnimation.duration
             state.primaryOverridePortion = 1 - primaryAnimation.curve(portion)
             if (!primaryAnimation.run(entity, this, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, 1 - state.primaryOverridePortion)) {
+                primaryAnimation.afterAction.accept(Unit)
                 state.primaryAnimation = null
                 state.primaryOverridePortion = 1F
             }
@@ -715,6 +716,7 @@ abstract class PoseableEntityModel<T : Entity>(
     //This is used to set additional entity type specific context
     open fun setupEntityTypeContext(entity: T?) {}
 
+    //Called by LivingEntityRenderer's render method before calling model.render (which is this.render in this case)
     override fun setAngles(
         entity: T,
         limbSwing: Float,
@@ -745,19 +747,16 @@ abstract class PoseableEntityModel<T : Entity>(
                     curve = { 1F }
                 )
                 state.addPrimaryAnimation(primaryAnimation)
-                afterOnClient(seconds = primaryAnimation.duration) {
+                primaryAnimation.afterAction += {
                     state.setPose(desirablePose.poseName)
-                    if (state.primaryAnimation == primaryAnimation) {
-                        state.primaryAnimation = null
-                    }
                 }
             } else if (transition != null) {
                 val animation = transition(previousPose, desirablePose)
                 val primaryAnimation = if (animation is PrimaryAnimation) animation else PrimaryAnimation(animation, curve = { 1F })
-                state.addPrimaryAnimation(primaryAnimation)
-                afterOnClient(seconds = primaryAnimation.duration) {
+                primaryAnimation.afterAction += {
                     state.setPose(desirablePose.poseName)
                 }
+                state.addPrimaryAnimation(primaryAnimation)
             } else {
                 state.setPose(poses.values.first { desirablePoseType in it.poseTypes && (it.condition == null || (entity != null && it.condition.invoke(entity))) }.poseName)
             }

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

@@ -56,6 +56,8 @@ import net.minecraft.util.math.Vec3d
  * handling all the state for an entity's model, and needs to be conscious of the fact that the
  * model may change without this state changing.
  *
+ * This also handles setting up the molang runtime that animations have access to
+ *
  * @author Hiroku
  * @since December 5th, 2021
  */
@@ -164,6 +166,11 @@ abstract class PoseableEntityState<T : Entity> : Schedulable {
         val previousAge = age
         updateAge(age + 1)
         runEffects(entity, previousAge, age)
+        val primaryAnimation = primaryAnimation ?: return
+        if (primaryAnimation.started + primaryAnimation.duration <= animationSeconds) {
+            this.primaryAnimation = null
+            primaryAnimation.afterAction.accept(Unit)
+        }
     }
 
     abstract fun updatePartialTicks(partialTicks: Float)

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

@@ -12,6 +12,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityMo
 import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.ModelFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunction
+import java.util.function.Consumer
 import net.minecraft.entity.Entity
 
 /**
@@ -39,6 +40,7 @@ class PrimaryAnimation<T : Entity>(
 ): StatefulAnimation<T, ModelFrame> {
     var started = -1F
     override val duration: Float = animation.duration
+    var afterAction: Consumer<Unit> = Consumer { }
 
     override fun run(
         entity: T?,

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

@@ -15,7 +15,7 @@ import net.minecraft.entity.Entity
 
 /**
  * An animation that can run without an entity associated. These are
- * locked to a specific frame, and CAN be given an entity along with
+ * locked to a specific [ModelFrame], and CAN be given an entity along with
  * limb swing and age information, but might not.
  *
  * @author Hiroku

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

@@ -32,11 +32,11 @@ class BlockEntityModel(val root: Bone) : PoseableEntityModel<Entity>() {
         )
 
         closedPose.transitions[openPose.poseName] = { _, _ ->
-            bedrockStateful("gilded_chest", "opening").andThen { _, state -> state.setPose(openPose.poseName) }
+            bedrockStateful("gilded_chest", "opening")
         }
 
         openPose.transitions[closedPose.poseName] = { _, _ ->
-            bedrockStateful("gilded_chest", "closing").andThen { _, state -> state.setPose(closedPose.poseName) }
+            bedrockStateful("gilded_chest", "closing")
         }
     }
 

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

@@ -51,8 +51,8 @@ class AncientPokeBallModel(root: ModelPart) : PokeBallModel(root), PokeBallFrame
             transformTicks = 0
         )
 
-        shut.transitions[open.poseName] = { _, _ -> bedrockStateful("ancient_poke_ball", "open").andThen { entity, state -> state.setPose(open.poseName) } }
-        open.transitions[shut.poseName] = { _, _ -> bedrockStateful("ancient_poke_ball", "shut").andThen { entity, state -> state.setPose(shut.poseName) } }
+        shut.transitions[open.poseName] = { _, _ -> bedrockStateful("ancient_poke_ball", "open") }
+        open.transitions[shut.poseName] = { _, _ -> bedrockStateful("ancient_poke_ball", "shut") }
         midair.transitions[open.poseName] = shut.transitions[open.poseName]!!
     }
 }

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

@@ -91,14 +91,18 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod
     @SerializedName("profileTranslation")
     private val _profileTranslation: Vec3d? = null
 
-    override val portraitScale
+    //Some weirdness going on here, vars have to be initialized, gson doesn't like multiple fields with the same name
+    @Transient
+    override var portraitScale = 1F
         get() = _portraitScale ?: 1F
-    override val portraitTranslation
+    @Transient
+    override var portraitTranslation = Vec3d.ZERO
         get() = _portraitTranslation ?: Vec3d(0.0, 0.0, 0.0)
-
-    override val profileScale
+    @Transient
+    override var profileScale = 1F
         get() = _profileScale ?: 1F
-    override val profileTranslation
+    @Transient
+    override var profileTranslation = Vec3d.ZERO
         get() = _profileTranslation ?: Vec3d(0.0, 0.0, 0.0)
 
 

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

@@ -56,14 +56,14 @@ abstract class PokemonPoseableModel : PoseableEntityModel<PokemonEntity>() {
     }
 
     @Transient
-    open val portraitScale: Float = 1F
+    open var portraitScale: Float = 1F
     @Transient
-    open val portraitTranslation: Vec3d = Vec3d.ZERO
+    open var portraitTranslation: Vec3d = Vec3d.ZERO
 
     @Transient
-    open val profileScale: Float = 1F
+    open var profileScale: Float = 1F
     @Transient
-    open val profileTranslation: Vec3d = Vec3d.ZERO
+    open var profileTranslation: Vec3d = Vec3d.ZERO
 
     open fun getFaintAnimation(
         pokemonEntity: PokemonEntity,

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

@@ -24,11 +24,11 @@ class AbraModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
     override val rootPart = root.registerChildWithAllChildren("abra")
     override val head = getPart("head")
 
-    override val portraitScale = 1.8F
-    override val portraitTranslation = Vec3d(0.0, 0.2, 0.0)
+    override var portraitScale = 1.8F
+    override var portraitTranslation = Vec3d(0.0, 0.2, 0.0)
 
-    override val profileScale = 0.85F
-    override val profileTranslation = Vec3d(0.0, 0.7, 0.0)
+    override var profileScale = 0.85F
+    override var profileTranslation = Vec3d(0.0, 0.7, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var walking: PokemonPose

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

@@ -20,11 +20,11 @@ class AerodactylModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
     override val rootPart = root.registerChildWithAllChildren("aerodactyl")
     override val head = getPart("head")
 
-    override val portraitScale = 1.9F
-    override val portraitTranslation = Vec3d(-1.0, -0.65, 0.0)
+    override var portraitScale = 1.9F
+    override var portraitTranslation = Vec3d(-1.0, -0.65, 0.0)
 
-    override val profileScale = 0.55F
-    override val profileTranslation = Vec3d(0.0, 0.55, 0.0)
+    override var profileScale = 0.55F
+    override var profileTranslation = Vec3d(0.0, 0.55, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var walk: PokemonPose

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

@@ -30,11 +30,11 @@ class AlakazamModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe
     override val leftLeg = getPart("left_upper_leg")
     override val rightLeg = getPart("right_upper_leg")
 
-    override val portraitScale = 1.75F
-    override val portraitTranslation = Vec3d(-0.25, 0.85, 0.0)
+    override var portraitScale = 1.75F
+    override var portraitTranslation = Vec3d(-0.25, 0.85, 0.0)
 
-    override val profileScale = 0.73F
-    override val profileTranslation = Vec3d(0.0, 0.65, 0.0)
+    override var profileScale = 0.73F
+    override var profileTranslation = Vec3d(0.0, 0.65, 0.0)
 
     lateinit var sleep: PokemonPose
     lateinit var standing: PokemonPose

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

@@ -29,11 +29,11 @@ class ArbokModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
     override val rootPart = root.registerChildWithAllChildren("arbok")
     override val head = getPart("head_ai")
 
-    override val portraitScale = 1.5F
-    override val portraitTranslation = Vec3d(-0.4, 1.0, 0.0)
+    override var portraitScale = 1.5F
+    override var portraitTranslation = Vec3d(-0.4, 1.0, 0.0)
 
-    override val profileScale = 0.67F
-    override val profileTranslation = Vec3d(0.0, 0.7, 0.0)
+    override var profileScale = 0.67F
+    override var profileTranslation = Vec3d(0.0, 0.7, 0.0)
 
     lateinit var sleep: PokemonPose
     lateinit var standing: PokemonPose

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

@@ -27,11 +27,11 @@ class ArcanineModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad
     override val hindLeftLeg = getPart("leg_back_left")
     override val hindRightLeg = getPart("leg_back_right")
 
-    override val portraitScale = 1.5F
-    override val portraitTranslation = Vec3d(-0.4, 0.7, 0.0)
+    override var portraitScale = 1.5F
+    override var portraitTranslation = Vec3d(-0.4, 0.7, 0.0)
 
-    override val profileScale = 0.76F
-    override val profileTranslation = Vec3d(0.0, 0.57, 0.0)
+    override var profileScale = 0.76F
+    override var profileTranslation = Vec3d(0.0, 0.57, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var walk: PokemonPose

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

@@ -31,11 +31,11 @@ class ArticunoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe
     override val leftWing = getPart("leftwing")
     override val rightWing = getPart("rightwing")
 
-    override val portraitScale = 2.8F
-    override val portraitTranslation = Vec3d(-0.35, 0.6, 0.0)
+    override var portraitScale = 2.8F
+    override var portraitTranslation = Vec3d(-0.35, 0.6, 0.0)
 
-    override val profileScale = 0.85F
-    override val profileTranslation = Vec3d(0.0, 0.5, 0.0)
+    override var profileScale = 0.85F
+    override var profileTranslation = Vec3d(0.0, 0.5, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var walk: PokemonPose

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

@@ -28,11 +28,11 @@ class BeedrillModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BiWi
     override val leftWing = getPart("wing_left")
     override val rightWing = getPart("wing_right")
 
-    override val portraitScale = 1.9F
-    override val portraitTranslation = Vec3d(0.05, 0.9, 0.0)
+    override var portraitScale = 1.9F
+    override var portraitTranslation = Vec3d(0.05, 0.9, 0.0)
 
-    override val profileScale = 0.8F
-    override val profileTranslation = Vec3d(-0.1, 0.9, 0.0)
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3d(-0.1, 0.9, 0.0)
 
     lateinit var sleep: PokemonPose
     lateinit var standing: PokemonPose

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

@@ -21,11 +21,11 @@ class BellsproutModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
     override val rootPart = root.registerChildWithAllChildren("bellsprout")
     override val head = getPart("head")
 
-    override val portraitScale = 2.0F
-    override val portraitTranslation = Vec3d(-0.1, 0.41, 0.0)
+    override var portraitScale = 2.0F
+    override var portraitTranslation = Vec3d(-0.1, 0.41, 0.0)
 
-    override val profileScale = 0.75F
-    override val profileTranslation = Vec3d(0.0, 0.64, 0.0)
+    override var profileScale = 0.75F
+    override var profileTranslation = Vec3d(0.0, 0.64, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var walk: PokemonPose

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

@@ -27,10 +27,10 @@ class BulbasaurModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua
     override val hindLeftLeg = getPart("leg_back_left")
     override val hindRightLeg = getPart("leg_back_right")
 
-    override val portraitScale = 2.0F
-    override val portraitTranslation = Vec3d(-0.26, -1.20, 0.0)
-    override val profileScale = 0.9F
-    override val profileTranslation = Vec3d(0.0, 0.4, 0.0)
+    override var portraitScale = 2.0F
+    override var portraitTranslation = Vec3d(-0.26, -1.20, 0.0)
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3d(0.0, 0.4, 0.0)
 
     lateinit var sleep: PokemonPose
     lateinit var standing: PokemonPose

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

@@ -27,11 +27,11 @@ class ButterfreeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi
     val leftWingBack = getPart("wing_left2")
     val rightWingBack = getPart("wing_right2")
 
-    override val portraitScale = 2.4F
-    override val portraitTranslation = Vec3d(-0.1, 0.2, 0.0)
+    override var portraitScale = 2.4F
+    override var portraitTranslation = Vec3d(-0.1, 0.2, 0.0)
 
-    override val profileScale = 0.7F
-    override val profileTranslation = Vec3d(0.1, 0.8, 0.0)
+    override var profileScale = 0.7F
+    override var profileTranslation = Vec3d(0.1, 0.8, 0.0)
 
     lateinit var sleep: PokemonPose
 

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

@@ -25,10 +25,10 @@ class CaterpieModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
     override val rootPart = root.registerChildWithAllChildren("caterpie")
     override val head = getPart("head")
 
-    override val portraitScale = 2.1F
-    override val portraitTranslation = Vec3d(-0.55, -1.55, 0.0)
-    override val profileScale = 0.8F
-    override val profileTranslation = Vec3d(0.0, 0.55, 0.0)
+    override var portraitScale = 2.1F
+    override var portraitTranslation = Vec3d(-0.55, -1.55, 0.0)
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3d(0.0, 0.55, 0.0)
 
     lateinit var sleep: PokemonPose
     lateinit var standing: PokemonPose

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

@@ -8,13 +8,16 @@
 
 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
 
+import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState
 import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
+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 com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import net.minecraft.client.model.ModelPart
 import net.minecraft.util.math.Vec3d
 
@@ -23,17 +26,27 @@ class ChanseyModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame {
     override val leftLeg = getPart("left_foot")
     override val rightLeg = getPart("right_foot")
 
-    override val portraitScale = 1.5F
-    override val portraitTranslation = Vec3d(-0.35, 0.3, 0.0)
+    override var portraitScale = 1.5F
+    override var portraitTranslation = Vec3d(-0.35, 0.3, 0.0)
 
-    override val profileScale = 0.8F
-    override val profileTranslation = Vec3d(0.0, 0.55, 0.0)
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3d(0.0, 0.55, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var walk: PokemonPose
+    lateinit var sleep: PokemonPose
 
     override fun registerPoses() {
-        val blink = quirk { bedrockStateful("chansey", "blink")}
+        val blink = quirk { bedrockStateful("chansey", "blink") }
+
+        sleep = registerPose(
+            poseName = "sleep",
+            poseType = PoseType.SLEEP,
+            idleAnimations = arrayOf(
+                bedrock("chansey", "ground_sleep")
+            )
+        )
+
         standing = registerPose(
             poseName = "standing",
             poseTypes = STATIONARY_POSES + UI_POSES,
@@ -49,15 +62,13 @@ class ChanseyModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame {
             transformTicks = 10,
             quirks = arrayOf(blink),
             idleAnimations = arrayOf(
-                bedrock("chansey", "ground_idle"),
-                BipedWalkAnimation(this),
-                //bedrock("chansey", "ground_walk")
+                bedrock("chansey", "ground_walk")
             )
         )
     }
 
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PoseableEntityState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("chansey", "faint") else null
+    override fun getFaintAnimation(
+        pokemonEntity: PokemonEntity,
+        state: PoseableEntityState<PokemonEntity>
+    ) = bedrockStateful("chansey", "faint")
 }

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

@@ -34,11 +34,11 @@ class CharizardModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip
     override val leftWing = getPart("wing_left")
     override val rightWing = getPart("wing_right")
 
-    override val portraitScale = 1.9F
-    override val portraitTranslation = Vec3d(-0.5, 1.4, 0.0)
+    override var portraitScale = 1.9F
+    override var portraitTranslation = Vec3d(-0.5, 1.4, 0.0)
 
-    override val profileScale = 0.55F
-    override val profileTranslation = Vec3d(0.05, 0.93, 0.0)
+    override var profileScale = 0.55F
+    override var profileTranslation = Vec3d(0.05, 0.93, 0.0)
 
     lateinit var sleep: PokemonPose
     lateinit var standing: PokemonPose

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

@@ -31,11 +31,11 @@ class CharmanderModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi
     override val rightLeg = getPart("leg_right")
     override val leftLeg = getPart("leg_left")
 
-    override val portraitScale = 2.2F
-    override val portraitTranslation = Vec3d(-0.1, -0.1, 0.0)
+    override var portraitScale = 2.2F
+    override var portraitTranslation = Vec3d(-0.1, -0.1, 0.0)
 
-    override val profileScale = 0.71F
-    override val profileTranslation = Vec3d(0.0, 0.72, 0.0)
+    override var profileScale = 0.71F
+    override var profileTranslation = Vec3d(0.0, 0.72, 0.0)
 
     lateinit var sleep: PokemonPose
     lateinit var standing: PokemonPose

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

@@ -29,11 +29,11 @@ class CharmeleonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi
     override val rightLeg = getPart("leg_right")
     override val leftLeg = getPart("leg_left")
 
-    override val portraitScale = 1.9F
-    override val portraitTranslation = Vec3d(-0.16, 0.55, 0.0)
+    override var portraitScale = 1.9F
+    override var portraitTranslation = Vec3d(-0.16, 0.55, 0.0)
 
-    override val profileScale = 0.65F
-    override val profileTranslation = Vec3d(0.0, 0.79, 0.0)
+    override var profileScale = 0.65F
+    override var profileTranslation = Vec3d(0.0, 0.79, 0.0)
 
     lateinit var sleep: PokemonPose
     lateinit var standing: PokemonPose

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

@@ -23,11 +23,11 @@ import net.minecraft.util.math.Vec3d
 class ClefableModel(root: ModelPart) : PokemonPoseableModel() {
     override val rootPart = root.registerChildWithAllChildren("clefable")
 
-    override val portraitScale = 2.0F
-    override val portraitTranslation = Vec3d(-0.1, -0.7, 0.0)
+    override var portraitScale = 2.0F
+    override var portraitTranslation = Vec3d(-0.1, -0.7, 0.0)
 
-    override val profileScale = 1.15F
-    override val profileTranslation = Vec3d(0.0, 0.02, 0.0)
+    override var profileScale = 1.15F
+    override var profileTranslation = Vec3d(0.0, 0.02, 0.0)
 
     lateinit var sleep: PokemonPose
     lateinit var standing: PokemonPose

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

@@ -23,11 +23,11 @@ import net.minecraft.util.math.Vec3d
 class ClefairyModel(root: ModelPart) : PokemonPoseableModel() {
     override val rootPart = root.registerChildWithAllChildren("clefairy")
 
-    override val portraitScale = 2.0F
-    override val portraitTranslation = Vec3d(0.0, -1.0, 0.0)
+    override var portraitScale = 2.0F
+    override var portraitTranslation = Vec3d(0.0, -1.0, 0.0)
 
-    override val profileScale = 1.1F
-    override val profileTranslation = Vec3d(0.0, 0.08, 0.0)
+    override var profileScale = 1.1F
+    override var profileTranslation = Vec3d(0.0, 0.08, 0.0)
 
     lateinit var sleep: PokemonPose
     lateinit var standing: PokemonPose

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

@@ -19,11 +19,11 @@ import net.minecraft.util.math.Vec3d
 class CloysterModel(root: ModelPart) : PokemonPoseableModel() {
     override val rootPart = root.registerChildWithAllChildren("cloyster")
 
-    override val portraitScale = 2.0F
-    override val portraitTranslation = Vec3d(-0.25, -0.85, 0.0)
+    override var portraitScale = 2.0F
+    override var portraitTranslation = Vec3d(-0.25, -0.85, 0.0)
 
-    override val profileScale = 0.9F
-    override val profileTranslation = Vec3d(0.0, 0.37, 0.0)
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3d(0.0, 0.37, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var walk: PokemonPose

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

@@ -23,26 +23,29 @@ class CuboneModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF
     override val rootPart = root.registerChildWithAllChildren("cubone")
     override val head = getPart("head")
 
-    override val leftLeg = getPart("leftleg")
-    override val rightLeg = getPart("rightleg")
+    override val leftLeg = getPart("left_leg")
+    override val rightLeg = getPart("right_leg")
 
-    override val portraitScale = 2.0F
-    override val portraitTranslation = Vec3d(0.1, -0.7, 0.0)
+    override var portraitScale = 2.0F
+    override var portraitTranslation = Vec3d(0.1, -0.7, 0.0)
 
-    override val profileScale = 1.0F
-    override val profileTranslation = Vec3d(0.0, 0.25, 0.0)
+    override var profileScale = 1.0F
+    override var profileTranslation = Vec3d(0.0, 0.25, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var walk: PokemonPose
 
     override fun registerPoses() {
+        val blink = quirk { bedrockStateful("cubone", "blink") }
+
         standing = registerPose(
             poseName = "standing",
             poseTypes = STATIONARY_POSES + UI_POSES,
             transformTicks = 10,
+            quirks = arrayOf(blink),
             idleAnimations = arrayOf(
                 singleBoneLook(),
-                bedrock("cubone", "ground_idle")
+                bedrock("cubone", "idle")
             )
         )
 
@@ -50,10 +53,11 @@ class CuboneModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF
             poseName = "walk",
             poseTypes = MOVING_POSES,
             transformTicks = 10,
+            quirks = arrayOf(blink),
             idleAnimations = arrayOf(
                 BipedWalkAnimation(this, periodMultiplier = 1.1F, amplitudeMultiplier = 1.15f),
                 singleBoneLook(),
-                bedrock("cubone", "ground_idle")
+                bedrock("cubone", "idle")
                 //bedrock("cubone", "ground_walk")
             )
         )

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

@@ -21,11 +21,11 @@ class DewgongModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
     override val rootPart = root.registerChildWithAllChildren("dewgong")
     override val head = getPart("head")
 
-    override val portraitScale = 2.5F
-    override val portraitTranslation = Vec3d(-0.6, -2.0, 0.0)
+    override var portraitScale = 2.5F
+    override var portraitTranslation = Vec3d(-0.6, -2.0, 0.0)
 
-    override val profileScale = 1.1F
-    override val profileTranslation = Vec3d(0.0, 0.0, 0.0)
+    override var profileScale = 1.1F
+    override var profileTranslation = Vec3d(0.0, 0.0, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var float: PokemonPose

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

@@ -0,0 +1,75 @@
+/*
+ * 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.PoseableEntityState
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
+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 com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import net.minecraft.client.model.ModelPart
+import net.minecraft.util.math.Vec3d
+
+class DiglettAlolanModel(root: ModelPart) : PokemonPoseableModel() {
+    override val rootPart = root.registerChildWithAllChildren("diglett_alolan")
+
+    override var portraitScale = 1.8F
+    override var portraitTranslation = Vec3d(-0.06, -0.86, 0.0)
+
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3d(0.0, 0.32, 0.0)
+
+    lateinit var stand: PokemonPose
+    lateinit var walk: PokemonPose
+//    lateinit var battleidle: PokemonPose
+//    lateinit var sleep: PokemonPose
+
+//    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("diglett_alolan", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("diglett_alolan", "blink")}
+//        val quirk = quirk { bedrockStateful("diglett_alolan", "quirk_idle")}
+
+//        sleep = registerPose(
+//            poseName = "sleep",
+//            poseType = PoseType.SLEEP,
+//            idleAnimations = arrayOf(bedrock("diglett_alolan", "sleep"))
+//        )
+
+        stand = registerPose(
+            poseName = "stand",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            quirks = arrayOf(blink),
+            idleAnimations = arrayOf(bedrock("diglett_alolan", "ground_idle"))
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = MOVING_POSES,
+            quirks = arrayOf(blink),
+            idleAnimations = arrayOf(bedrock("diglett_alolan", "ground_idle"))
+        )
+
+//        battleidle = registerPose(
+//            poseName = "battleidle",
+//            poseTypes = STATIONARY_POSES,
+//            quirks = arrayOf(blink),
+//            idleAnimations = arrayOf(bedrock("diglett_alolan", "battle_idle"))
+//        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PoseableEntityState<PokemonEntity>
+//    ) = bedrockStateful("diglett_alolan", "faint")
+}

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

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
 
 import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -22,35 +23,49 @@ import net.minecraft.util.math.Vec3d
 class DiglettModel(root: ModelPart) : PokemonPoseableModel() {
     override val rootPart = root.registerChildWithAllChildren("diglett")
 
-    override val portraitScale = 1.8F
-    override val portraitTranslation = Vec3d(0.05, -1.0, 0.0)
+    override var portraitScale = 1.8F
+    override var portraitTranslation = Vec3d(-0.06, -0.86, 0.0)
 
-    override val profileScale = 0.9F
-    override val profileTranslation = Vec3d(0.0, 0.15, 0.0)
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3d(0.0, 0.32, 0.0)
 
     lateinit var stand: PokemonPose
     lateinit var walk: PokemonPose
+    lateinit var battleidle: PokemonPose
     lateinit var sleep: PokemonPose
+
+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("diglett", "cry") }
+
     override fun registerPoses() {
         val blink = quirk { bedrockStateful("diglett", "blink")}
+        val quirk = quirk { bedrockStateful("diglett", "quirk_idle")}
+
+        sleep = registerPose(
+            poseName = "sleep",
+            poseType = PoseType.SLEEP,
+            idleAnimations = arrayOf(bedrock("diglett", "sleep"))
+        )
+
         stand = registerPose(
             poseName = "stand",
             poseTypes = STATIONARY_POSES + UI_POSES,
-            quirks = arrayOf(blink),
+            quirks = arrayOf(blink, quirk),
             idleAnimations = arrayOf(bedrock("diglett", "ground_idle"))
         )
 
-        sleep = registerPose(
-                poseType = PoseType.SLEEP,
-                idleAnimations = arrayOf(bedrock("diglett", "sleep"))
-        )
-
         walk = registerPose(
             poseName = "walk",
             poseTypes = MOVING_POSES,
             quirks = arrayOf(blink),
             idleAnimations = arrayOf(bedrock("diglett", "ground_walk"))
         )
+
+        battleidle = registerPose(
+            poseName = "battleidle",
+            poseTypes = STATIONARY_POSES,
+            quirks = arrayOf(blink, quirk),
+            idleAnimations = arrayOf(bedrock("diglett", "battle_idle"))
+        )
     }
 
     override fun getFaintAnimation(

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

@@ -23,11 +23,11 @@ import net.minecraft.util.math.Vec3d
 class DittoModel(root: ModelPart) : PokemonPoseableModel() {
     override val rootPart = root.registerChildWithAllChildren("ditto")
 
-    override val portraitScale = 3.2F
-    override val portraitTranslation = Vec3d(0.0, -2.2, 0.0)
+    override var portraitScale = 3.2F
+    override var portraitTranslation = Vec3d(0.0, -2.2, 0.0)
 
-    override val profileScale = 1.4F
-    override val profileTranslation = Vec3d(0.0, -0.34, 0.0)
+    override var profileScale = 1.4F
+    override var profileTranslation = Vec3d(0.0, -0.34, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var walk: PokemonPose

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

@@ -20,11 +20,11 @@ import net.minecraft.util.math.Vec3d
 class DodrioModel (root: ModelPart) : PokemonPoseableModel() {
     override val rootPart = root.registerChildWithAllChildren("dodrio")
 
-    override val portraitScale = 1.5F
-    override val portraitTranslation = Vec3d(-0.15, 0.9, 0.0)
+    override var portraitScale = 1.5F
+    override var portraitTranslation = Vec3d(-0.15, 0.9, 0.0)
 
-    override val profileScale = 0.8F
-    override val profileTranslation = Vec3d(0.0, 0.6, 0.0)
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3d(0.0, 0.6, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var walking: PokemonPose

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

@@ -20,11 +20,11 @@ import net.minecraft.util.math.Vec3d
 class DoduoModel (root: ModelPart) : PokemonPoseableModel() {
     override val rootPart = root.registerChildWithAllChildren("doduo")
 
-    override val portraitScale = 2.0F
-    override val portraitTranslation = Vec3d(-0.1, 0.35, 0.0)
+    override var portraitScale = 2.0F
+    override var portraitTranslation = Vec3d(-0.1, 0.35, 0.0)
 
-    override val profileScale = 0.85F
-    override val profileTranslation = Vec3d(0.0, 0.5, 0.0)
+    override var profileScale = 0.85F
+    override var profileTranslation = Vec3d(0.0, 0.5, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var walking: PokemonPose

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

@@ -11,6 +11,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
+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
@@ -21,28 +22,115 @@ class DragonairModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
     override val rootPart = root.registerChildWithAllChildren("dragonair")
     override val head = getPart("head")
 
-    override val portraitScale = 2.3F
-    override val portraitTranslation = Vec3d(-0.2, 1.7, 0.0)
+    override var portraitScale = 2.3F
+    override var portraitTranslation = Vec3d(-0.2, 1.7, 0.0)
 
-    override val profileScale = 0.65F
-    override val profileTranslation = Vec3d(0.1, 0.9, 0.0)
+    override var profileScale = 0.65F
+    override var profileTranslation = Vec3d(0.1, 0.9, 0.0)
 
     lateinit var standing: PokemonPose
-
-    // TODO dragonair swish
+    lateinit var walking: PokemonPose
+    lateinit var water_idle: PokemonPose
+    lateinit var water_swim: PokemonPose
+    lateinit var sleep: PokemonPose
+    lateinit var water_sleep: PokemonPose
+    lateinit var surface_swim: PokemonPose
+    lateinit var surface_float: PokemonPose
+    lateinit var battle_idle: PokemonPose
 
     override fun registerPoses() {
-        val blink = quirk { bedrockStateful("dragonair", "blink")}
+        val blink = quirk { bedrockStateful("dragonair", "blink") }
+
+        sleep = registerPose(
+            poseName = "sleep",
+            poseType = PoseType.SLEEP,
+            condition = { !it.isTouchingWater },
+            idleAnimations = arrayOf(
+                bedrock("dragonair", "sleep")
+            )
+        )
+
+        water_sleep = registerPose(
+            poseName = "water_sleep",
+            poseType = PoseType.SLEEP,
+            condition = { it.isTouchingWater },
+            idleAnimations = arrayOf(
+                bedrock("dragonair", "water_sleep")
+            )
+        )
+
         standing = registerPose(
             poseName = "standing",
-            poseTypes = STATIONARY_POSES + MOVING_POSES + UI_POSES,
-            transformTicks = 10,
+            poseTypes = STATIONARY_POSES + UI_POSES - PoseType.FLOAT,
             quirks = arrayOf(blink),
+            condition = { !it.isBattling },
+            transformTicks = 10,
             idleAnimations = arrayOf(
                 singleBoneLook(),
                 bedrock("dragonair", "ground_idle")
             )
         )
+
+        walking = registerPose(
+            poseName = "walking",
+            poseTypes = MOVING_POSES - PoseType.SWIM,
+            quirks = arrayOf(blink),
+            transformTicks = 10,
+            idleAnimations = arrayOf(
+                bedrock("dragonair", "ground_walk")
+            )
+        )
+
+        water_idle = registerPose(
+            poseName = "water_idle",
+            poseType = PoseType.FLOAT,
+            transformTicks = 10,
+            idleAnimations = arrayOf(
+                bedrock("dragonair", "water_idle")
+            )
+        )
+
+        water_swim = registerPose(
+            poseName = "water_swim",
+            poseType = PoseType.SWIM,
+            transformTicks = 10,
+            idleAnimations = arrayOf(
+                bedrock("dragonair", "water_swim")
+            )
+        )
+
+        /* Anim doesn't exist
+        surface_float = registerPose(
+            poseName = "surface_float",
+            poseTypes = PoseType.STATIONARY_POSES,
+            condition = { !it.isSubmergedInWater && it.isTouchingWater},
+            transformTicks = 10,
+            idleAnimations = arrayOf(
+                bedrock("dragonair", "surfacewater_float")
+            )
+        )
+
+         */
+
+        surface_swim = registerPose(
+            poseName = "surface_swim",
+            poseTypes = PoseType.MOVING_POSES,
+            condition = { !it.isSubmergedInWater && it.isTouchingWater},
+            transformTicks = 10,
+            idleAnimations = arrayOf(
+                bedrock("dragonair", "surfacewater_swim")
+            )
+        )
+
+        battle_idle = registerPose(
+            poseName = "battle_idle",
+            poseTypes = PoseType.STATIONARY_POSES,
+            transformTicks = 10,
+            condition = { it.isBattling },
+            idleAnimations = arrayOf(
+                bedrock("dragonair", "battle_idle")
+            )
+        )
     }
 
 //    override fun getFaintAnimation(

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

@@ -25,32 +25,41 @@ import com.cobblemon.mod.common.util.math.geometry.toRadians
 import net.minecraft.client.model.ModelPart
 import net.minecraft.util.math.Vec3d
 
-class DragoniteModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BiWingedFrame, BipedFrame, BimanualFrame {
+class DragoniteModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
     override val rootPart = root.registerChildWithAllChildren("dragonite")
     override val head = getPart("head")
-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
-    override val leftWing = getPart("wing_left")
-    override val rightWing = getPart("wing_right")
-    override val leftArm = getPart("arm_left")
-    override val rightArm = getPart("arm_right")
 
-    override val portraitScale = 1.2F
-    override val portraitTranslation = Vec3d(-0.2, 2.6, 0.0)
+    override var portraitScale = 1.2F
+    override var portraitTranslation = Vec3d(-0.2, 2.6, 0.0)
 
-    override val profileScale = 0.41F
-    override val profileTranslation = Vec3d(0.0, 1.1, 0.0)
+    override var profileScale = 0.41F
+    override var profileTranslation = Vec3d(0.0, 1.1, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var walk: PokemonPose
+    lateinit var wateridle: PokemonPose
+    lateinit var waterswim: PokemonPose
+    lateinit var surfacewateridle: PokemonPose
+    lateinit var surfacewaterswim: PokemonPose
+    lateinit var battleidle: PokemonPose
+    lateinit var sleep: PokemonPose
     lateinit var hover: PokemonPose
     lateinit var fly: PokemonPose
 
     override fun registerPoses() {
         val blink = quirk { bedrockStateful("dragonite", "blink")}
+        sleep = registerPose(
+            poseName = "sleep",
+            poseType = PoseType.SLEEP,
+            idleAnimations = arrayOf(
+                bedrock("dragonite", "sleep")
+            )
+        )
+
         standing = registerPose(
             poseName = "standing",
             poseTypes = UI_POSES + PoseType.STAND,
+            condition = { !it.isBattling},
             quirks = arrayOf(blink),
             idleAnimations = arrayOf(
                 singleBoneLook(),
@@ -64,39 +73,82 @@ class DragoniteModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BiW
             quirks = arrayOf(blink),
             idleAnimations = arrayOf(
                 singleBoneLook(),
-                bedrock("dragonite", "ground_idle"),
-                BipedWalkAnimation(this, periodMultiplier = 0.6F, amplitudeMultiplier = 0.9F),
-                BimanualSwingAnimation(this, swingPeriodMultiplier = 0.6F, amplitudeMultiplier = 0.9F)
+                bedrock("dragonite", "ground_idle")
+            )
+        )
+
+        battleidle = registerPose(
+            poseName = "battleidle",
+            poseTypes = PoseType.STATIONARY_POSES,
+            condition = { it.isBattling},
+            quirks = arrayOf(blink),
+            idleAnimations = arrayOf(
+                singleBoneLook(),
+                bedrock("dragonite", "battle_idle")
             )
         )
 
         hover = registerPose(
             poseName = "hover",
-            poseTypes = setOf(PoseType.HOVER, PoseType.FLOAT),
+            poseType = PoseType.HOVER,
             quirks = arrayOf(blink),
             idleAnimations = arrayOf(
                 singleBoneLook(),
-                bedrock("dragonite", "ground_idle"),
-                WingFlapIdleAnimation(this,
-                    flapFunction = sineFunction(verticalShift = -10F.toRadians(), period = 0.9F, amplitude = 0.6F),
-                    timeVariable = { state, _, _ -> state?.animationSeconds ?: 0F },
-                    axis = ModelPartTransformation.Y_AXIS
-                )
+                bedrock("dragonite", "air_idle")
             )
         )
 
         fly = registerPose(
             poseName = "fly",
-            poseTypes = setOf(PoseType.FLY, PoseType.SWIM),
+            poseType = PoseType.FLY,
             quirks = arrayOf(blink),
             idleAnimations = arrayOf(
                 singleBoneLook(),
-                bedrock("dragonite", "ground_idle"),
-                WingFlapIdleAnimation(this,
-                    flapFunction = sineFunction(verticalShift = -14F.toRadians(), period = 0.9F, amplitude = 0.6F),
-                    timeVariable = { state, _, _ -> state?.animationSeconds ?: 0F },
-                    axis = ModelPartTransformation.Y_AXIS
-                )
+                bedrock("dragonite", "air_fly")
+            )
+        )
+
+        wateridle = registerPose(
+            poseName = "wateridle",
+            poseType = PoseType.FLOAT,
+            condition = { it.isSubmergedInWater },
+            quirks = arrayOf(blink),
+            idleAnimations = arrayOf(
+                singleBoneLook(),
+                bedrock("dragonite", "water_idle")
+            )
+        )
+
+        waterswim = registerPose(
+            poseName = "waterswim",
+            poseType = PoseType.SWIM,
+            condition = { it.isSubmergedInWater },
+            quirks = arrayOf(blink),
+            idleAnimations = arrayOf(
+                singleBoneLook(),
+                bedrock("dragonite", "water_swim")
+            )
+        )
+
+        surfacewateridle = registerPose(
+            poseName = "surfacewateridle",
+            poseType = PoseType.FLOAT,
+            condition = { !it.isSubmergedInWater },
+            quirks = arrayOf(blink),
+            idleAnimations = arrayOf(
+                singleBoneLook(),
+                bedrock("dragonite", "surfacewater_idle")
+            )
+        )
+
+        surfacewaterswim = registerPose(
+            poseName = "surfacewaterswim",
+            poseType = PoseType.SWIM,
+            condition = { !it.isSubmergedInWater },
+            quirks = arrayOf(blink),
+            idleAnimations = arrayOf(
+                singleBoneLook(),
+                bedrock("dragonite", "surfacewater_swim")
             )
         )
     }

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

@@ -11,8 +11,10 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
 import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
+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.SWIMMING_POSES
 import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
 import net.minecraft.client.model.ModelPart
 import net.minecraft.util.math.Vec3d
@@ -21,25 +23,89 @@ class DratiniModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
     override val rootPart = root.registerChildWithAllChildren("dratini")
     override val head = getPart("head")
 
-    override val portraitScale = 1.8F
-    override val portraitTranslation = Vec3d(0.0, 0.35, 0.0)
+    override var portraitScale = 1.66F
+    override var portraitTranslation = Vec3d(-0.48, 0.35, 0.0)
 
-    override val profileScale = 0.7F
-    override val profileTranslation = Vec3d(0.2, 0.8, 0.0)
+    override var profileScale = 0.58F
+    override var profileTranslation = Vec3d(0.14, 0.83, 0.0)
 
     lateinit var standing: PokemonPose
+    lateinit var walking: PokemonPose
+    lateinit var water_idle: PokemonPose
+    lateinit var water_swim: PokemonPose
+    lateinit var sleep: PokemonPose
+    lateinit var water_sleep: PokemonPose
+    lateinit var surface_swim: PokemonPose
 
     override fun registerPoses() {
-        val blink = quirk { bedrockStateful("dratini", "blink")}
+        val blink = quirk { bedrockStateful("dratini", "blink") }
+
+        sleep = registerPose(
+            poseName = "sleep",
+            poseType = PoseType.SLEEP,
+            condition = { !it.isTouchingWater },
+            idleAnimations = arrayOf(
+                bedrock("dratini", "sleep")
+            )
+        )
+
+        water_sleep = registerPose(
+            poseName = "water_sleep",
+            poseType = PoseType.SLEEP,
+            condition = { it.isTouchingWater },
+            idleAnimations = arrayOf(
+                bedrock("dratini", "water_sleep")
+            )
+        )
+
         standing = registerPose(
             poseName = "standing",
-            poseTypes = STATIONARY_POSES + MOVING_POSES + UI_POSES,
+            poseTypes = STATIONARY_POSES + UI_POSES - PoseType.FLOAT,
             quirks = arrayOf(blink),
+            transformTicks = 10,
             idleAnimations = arrayOf(
                 singleBoneLook(),
                 bedrock("dratini", "ground_idle")
             )
         )
+
+        walking = registerPose(
+            poseName = "walking",
+            poseTypes = MOVING_POSES - PoseType.SWIM,
+            quirks = arrayOf(blink),
+            transformTicks = 10,
+            idleAnimations = arrayOf(
+                bedrock("dratini", "ground_walk")
+            )
+        )
+
+        water_idle = registerPose(
+            poseName = "water_idle",
+            poseType = PoseType.FLOAT,
+            transformTicks = 10,
+            idleAnimations = arrayOf(
+                bedrock("dratini", "water_idle")
+            )
+        )
+
+        water_swim = registerPose(
+            poseName = "water_swim",
+            poseType = PoseType.SWIM,
+            transformTicks = 10,
+            idleAnimations = arrayOf(
+                bedrock("dratini", "water_swim")
+            )
+        )
+
+        surface_swim = registerPose(
+            poseName = "surface_swim",
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.MOVING_POSES,
+            condition = { !it.isSubmergedInWater && it.isTouchingWater},
+            transformTicks = 10,
+            idleAnimations = arrayOf(
+                bedrock("dratini", "surfacewater_swim")
+            )
+        )
     }
 
 //    override fun getFaintAnimation(

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

@@ -26,11 +26,11 @@ class DrowzeeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped
     override val leftLeg = getPart("left_leg")
     override val rightLeg = getPart("right_leg")
 
-    override val portraitScale = 2.4F
-    override val portraitTranslation = Vec3d(0.0, -0.1, 0.0)
+    override var portraitScale = 2.4F
+    override var portraitTranslation = Vec3d(0.0, -0.1, 0.0)
 
-    override val profileScale = 0.9F
-    override val profileTranslation = Vec3d(0.0, 0.4, 0.0)
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3d(0.0, 0.4, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var walk: PokemonPose

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

@@ -0,0 +1,82 @@
+/*
+ * 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.PoseableEntityState
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
+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 com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import net.minecraft.client.model.ModelPart
+import net.minecraft.util.math.Vec3d
+
+class DugtrioAlolanModel(root: ModelPart) : PokemonPoseableModel() {
+    override val rootPart = root.registerChildWithAllChildren("dugtrio_alolan")
+
+    override var portraitScale = 1.3F
+    override var portraitTranslation = Vec3d(-0.11, -0.1, 0.0)
+
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3d(0.0, 0.29, 0.0)
+
+    lateinit var standing: PokemonPose
+    lateinit var walking: PokemonPose
+//    lateinit var battleidle: PokemonPose
+//    lateinit var sleep: PokemonPose
+//
+//    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dugtrio_alolan", "cry") }
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("dugtrio_alolan", "blink")}
+        val blink2 = quirk { bedrockStateful("dugtrio_alolan", "blink2")}
+        val blink3 = quirk { bedrockStateful("dugtrio_alolan", "blink3")}
+
+//        val quirk = quirk { bedrockStateful("dugtrio_alolan", "quirk_idle")}
+//        val quirk2 = quirk { bedrockStateful("dugtrio_alolan", "quirk_idle2")}
+//        val quirk3 = quirk { bedrockStateful("dugtrio_alolan", "quirk_idle3")}
+
+//        sleep = registerPose(
+//            poseName = "sleep",
+//            poseType = PoseType.SLEEP,
+//            idleAnimations = arrayOf(bedrock("dugtrio_alolan", "sleep"))
+//        )
+
+        standing = registerPose(
+            poseName = "stand",
+            poseTypes = STATIONARY_POSES + UI_POSES,
+            condition = { !it.isBattling },
+            quirks = arrayOf(blink, blink2, blink3),
+            idleAnimations = arrayOf(bedrock("dugtrio_alolan", "ground_idle"))
+        )
+
+        walking = registerPose(
+            poseName = "walk",
+            poseTypes = MOVING_POSES,
+            quirks = arrayOf(blink, blink2, blink3),
+            idleAnimations = arrayOf(bedrock("dugtrio_alolan", "ground_idle"))
+        )
+
+//        battleidle = registerPose(
+//            poseName = "battleidle",
+//            poseTypes = STATIONARY_POSES,
+//            condition = { it.isBattling },
+//            quirks = arrayOf(blink, blink2, blink3, quirk, quirk2, quirk3),
+//            idleAnimations = arrayOf(bedrock("dugtrio_alolan", "battle_idle"))
+//        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PoseableEntityState<PokemonEntity>
+//    ) = bedrockStateful("dugtrio_alolan", "faint")
+}

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

@@ -9,6 +9,7 @@
 package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
 
 import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
 import com.cobblemon.mod.common.entity.PoseType
@@ -22,36 +23,56 @@ import net.minecraft.util.math.Vec3d
 class DugtrioModel(root: ModelPart) : PokemonPoseableModel() {
     override val rootPart = root.registerChildWithAllChildren("dugtrio")
 
-    override val portraitScale = 1.3F
-    override val portraitTranslation = Vec3d(0.0, -0.4, 0.0)
+    override var portraitScale = 1.3F
+    override var portraitTranslation = Vec3d(-0.11, -0.1, 0.0)
 
-    override val profileScale = 0.9F
-    override val profileTranslation = Vec3d(0.0, 0.15, 0.0)
+    override var profileScale = 0.9F
+    override var profileTranslation = Vec3d(0.0, 0.29, 0.0)
 
+    lateinit var standing: PokemonPose
+    lateinit var walking: PokemonPose
+    lateinit var battleidle: PokemonPose
     lateinit var sleep: PokemonPose
 
+    override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dugtrio", "cry") }
+
     override fun registerPoses() {
         val blink = quirk { bedrockStateful("dugtrio", "blink")}
         val blink2 = quirk { bedrockStateful("dugtrio", "blink2")}
         val blink3 = quirk { bedrockStateful("dugtrio", "blink3")}
-        registerPose(
+
+        val quirk = quirk { bedrockStateful("dugtrio", "quirk_idle")}
+        val quirk2 = quirk { bedrockStateful("dugtrio", "quirk_idle2")}
+        val quirk3 = quirk { bedrockStateful("dugtrio", "quirk_idle3")}
+
+        sleep = registerPose(
+            poseName = "sleep",
+            poseType = PoseType.SLEEP,
+            idleAnimations = arrayOf(bedrock("dugtrio", "sleep"))
+        )
+
+        standing = registerPose(
             poseName = "stand",
             poseTypes = STATIONARY_POSES + UI_POSES,
-            quirks = arrayOf(blink, blink2, blink3),
+            condition = { !it.isBattling },
+            quirks = arrayOf(blink, blink2, blink3, quirk, quirk2, quirk3),
             idleAnimations = arrayOf(bedrock("dugtrio", "ground_idle"))
         )
 
-        sleep = registerPose(
-                poseType = PoseType.SLEEP,
-                idleAnimations = arrayOf(bedrock("dugtrio", "sleep"))
-        )
-
-        registerPose(
+        walking = registerPose(
             poseName = "walk",
             poseTypes = MOVING_POSES,
             quirks = arrayOf(blink, blink2, blink3),
             idleAnimations = arrayOf(bedrock("dugtrio", "ground_walk"))
         )
+
+        battleidle = registerPose(
+            poseName = "battleidle",
+            poseTypes = STATIONARY_POSES,
+            condition = { it.isBattling },
+            quirks = arrayOf(blink, blink2, blink3, quirk, quirk2, quirk3),
+            idleAnimations = arrayOf(bedrock("dugtrio", "battle_idle"))
+        )
     }
 
     override fun getFaintAnimation(

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

@@ -38,11 +38,11 @@ class EeveeModel(root: ModelPart) : PokemonPoseableModel(), EaredFrame, HeadedFr
     override val leftEarJoint = EarJoint(getPart("ear_left"), Z_AXIS, RangeOfMotion(50F.toRadians(), 0F))
     override val rightEarJoint = EarJoint(getPart("ear_right"), Z_AXIS, RangeOfMotion((-50F).toRadians(), 0F))
 
-    override val portraitScale = 2.2F
-    override val portraitTranslation = Vec3d(-0.4, -0.54, 0.0)
+    override var portraitScale = 2.2F
+    override var portraitTranslation = Vec3d(-0.4, -0.54, 0.0)
 
-    override val profileScale = 0.8F
-    override val profileTranslation = Vec3d(0.0, 0.55, 0.0)
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3d(0.0, 0.55, 0.0)
 
     lateinit var stand: PokemonPose
     lateinit var walk: PokemonPose

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

@@ -45,11 +45,11 @@ class EkansModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
     val tail5Segment = WaveSegment(modelPart = tail5, length = 10F)
     val tail6Segment = WaveSegment(modelPart = tail6, length = 10F)
 
-    override val portraitScale = 1.7F
-    override val portraitTranslation = Vec3d(-0.3, -0.45, 0.0)
+    override var portraitScale = 1.7F
+    override var portraitTranslation = Vec3d(-0.3, -0.45, 0.0)
 
-    override val profileScale = 0.7F
-    override val profileTranslation = Vec3d(-0.05, 0.6, 0.0)
+    override var profileScale = 0.7F
+    override var profileTranslation = Vec3d(-0.05, 0.6, 0.0)
 
     lateinit var sleep: PokemonPose
 

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

@@ -15,33 +15,49 @@ 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.PokemonPose
 import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
+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.ModelPart
 import net.minecraft.util.math.Vec3d
-class ElectabuzzModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame, BimanualFrame {
+class ElectabuzzModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame {
     override val rootPart = root.registerChildWithAllChildren("electabuzz")
     override val head = getPart("head")
-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
-    override val leftArm = getPart("arm_left")
-    override val rightArm = getPart("arm_right")
 
-    override val portraitScale = 2.5F
-    override val portraitTranslation = Vec3d(-0.2, 0.4, 0.0)
+    override var portraitScale = 2.5F
+    override var portraitTranslation = Vec3d(-0.3, 0.2, 0.0)
 
-    override val profileScale = 0.8F
-    override val profileTranslation = Vec3d(0.0, 0.6, 0.0)
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3d(0.0, 0.6, 0.0)
 
+    lateinit var sleep: PokemonPose
+    lateinit var sleepambient: PokemonPose
     lateinit var standing: PokemonPose
     lateinit var walk: PokemonPose
+    lateinit var battleidle: PokemonPose
 
     override fun registerPoses() {
-        val blink = quirk { bedrockStateful("electabuzz", "blink")}
+        val blink = quirk { bedrockStateful("electabuzz", "blink") }
+
+        sleep = registerPose(
+            poseType = PoseType.SLEEP,
+            poseName = "sleep",
+            condition = { it.isBattling },
+            idleAnimations = arrayOf(bedrock("electabuzz", "sleep"))
+        )
+
+        sleepambient = registerPose(
+            poseType = PoseType.SLEEP,
+            poseName = "ambientsleep",
+            condition = { !it.isBattling },
+            idleAnimations = arrayOf(bedrock("electabuzz", "ambient_sleep"))
+        )
+
         standing = registerPose(
             poseName = "standing",
             poseTypes = STATIONARY_POSES + UI_POSES,
+            condition = { !it.isBattling },
             quirks = arrayOf(blink),
             idleAnimations = arrayOf(
                 singleBoneLook(),
@@ -55,9 +71,18 @@ class ElectabuzzModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi
             quirks = arrayOf(blink),
             idleAnimations = arrayOf(
                 singleBoneLook(),
-                bedrock("electabuzz", "ground_idle"),
-                BipedWalkAnimation(this, periodMultiplier = 0.6F, amplitudeMultiplier = 0.9F),
-                BimanualSwingAnimation(this, swingPeriodMultiplier = 0.6F, amplitudeMultiplier = 0.9F)
+                bedrock("electabuzz", "ground_walk")
+            )
+        )
+
+        battleidle = registerPose(
+            poseName = "battle_idle",
+            poseTypes = PoseType.STATIONARY_POSES,
+            transformTicks = 10,
+            quirks = arrayOf(blink),
+            condition = { it.isBattling },
+            idleAnimations = arrayOf(
+                bedrock("electabuzz", "battle_idle")
             )
         )
     }

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

@@ -0,0 +1,57 @@
+/*
+ * 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.PokemonPose
+import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel
+import com.cobblemon.mod.common.entity.PoseType
+import net.minecraft.client.model.ModelPart
+import net.minecraft.util.math.Vec3d
+
+class ElectrodeHisuianModel (root: ModelPart) : PokemonPoseableModel() {
+    override val rootPart = root.registerChildWithAllChildren("electrode_hisuian")
+
+    override var portraitScale = 1.5F
+    override var portraitTranslation = Vec3d(-0.4, -0.3, 0.0)
+
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3d(0.0, 0.5, 0.0)
+
+    lateinit var standing: PokemonPose
+    lateinit var walk: PokemonPose
+
+    override fun registerPoses() {
+        val blink = quirk { bedrockStateful("electrode_hisuian", "blink") }
+        standing = registerPose(
+            poseName = "standing",
+            poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES,
+            transformTicks = 0,
+            quirks = arrayOf(blink),
+            idleAnimations = arrayOf(
+                bedrock("electrode_hisuian", "ground_idle")
+            )
+        )
+
+        walk = registerPose(
+            poseName = "walk",
+            poseTypes = PoseType.MOVING_POSES,
+            transformTicks = 0,
+            quirks = arrayOf(blink),
+            onTransitionedInto = { it?.reset() },
+            idleAnimations = arrayOf(
+                bedrock("electrode_hisuian", "ground_walk")
+            )
+        )
+    }
+
+//    override fun getFaintAnimation(
+//        pokemonEntity: PokemonEntity,
+//        state: PoseableEntityState<PokemonEntity>
+//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("electrode_hisuian", "faint") else null
+}

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

@@ -19,11 +19,11 @@ import net.minecraft.util.math.Vec3d
 class ElectrodeModel(root: ModelPart) : PokemonPoseableModel() {
     override val rootPart = root.registerChildWithAllChildren("electrode")
 
-    override val portraitScale = 1.5F
-    override val portraitTranslation = Vec3d(-0.4, -0.3, 0.0)
+    override var portraitScale = 1.5F
+    override var portraitTranslation = Vec3d(-0.4, -0.3, 0.0)
 
-    override val profileScale = 0.8F
-    override val profileTranslation = Vec3d(0.0, 0.5, 0.0)
+    override var profileScale = 0.8F
+    override var profileTranslation = Vec3d(0.0, 0.5, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var walk: PokemonPose

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

@@ -21,11 +21,11 @@ import net.minecraft.util.math.Vec3d
 class ExeggcuteModel(root: ModelPart) : PokemonPoseableModel() {
     override val rootPart = root.registerChildWithAllChildren("exeggcute")
 
-    override val portraitScale = 2.1F
-    override val portraitTranslation = Vec3d(0.0, -1.9, 0.0)
+    override var portraitScale = 2.1F
+    override var portraitTranslation = Vec3d(0.0, -1.9, 0.0)
 
-    override val profileScale = 1.0F
-    override val profileTranslation = Vec3d(-0.15, 0.0, 0.0)
+    override var profileScale = 1.0F
+    override var profileTranslation = Vec3d(-0.15, 0.0, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var walk: PokemonPose

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

@@ -36,11 +36,11 @@ class ExeggutorAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFram
         override val head: ModelPart = getPart("head3")
     }
 
-    override val portraitScale = 1.0F
-    override val portraitTranslation = Vec3d(-1.4, 16.55, 0.0)
+    override var portraitScale = 1.0F
+    override var portraitTranslation = Vec3d(-1.4, 16.55, 0.0)
 
-    override val profileScale = 0.45F
-    override val profileTranslation = Vec3d(0.0, 1.0, 0.0)
+    override var profileScale = 0.45F
+    override var profileTranslation = Vec3d(0.0, 1.0, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var walk: PokemonPose

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

@@ -38,11 +38,11 @@ class ExeggutorModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip
         override val head: ModelPart = getPart("head3")
     }
 
-    override val portraitScale = 1.2F
-    override val portraitTranslation = Vec3d(-1.0, 1.77, 0.0)
+    override var portraitScale = 1.2F
+    override var portraitTranslation = Vec3d(-1.0, 1.77, 0.0)
 
-    override val profileScale = 0.45F
-    override val profileTranslation = Vec3d(0.0, 1.1, 0.0)
+    override var profileScale = 0.45F
+    override var profileTranslation = Vec3d(0.0, 1.1, 0.0)
 
     lateinit var standing: PokemonPose
     lateinit var walk: PokemonPose