Tersalization aspect. Pokemon will have the shader effect when they have the "terastal_active" aspect.

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsCobblemonEvents.kt

@@ -10,15 +10,20 @@ import com.cobblemon.mod.common.api.events.CobblemonEvents.HELD_ITEM_POST
 import com.cobblemon.mod.common.api.events.CobblemonEvents.LOOT_DROPPED
 import com.cobblemon.mod.common.api.events.CobblemonEvents.POKEMON_INTERACTION_GUI_CREATION
 import com.cobblemon.mod.common.api.events.drops.LootDroppedEvent
+import com.cobblemon.mod.common.api.pokemon.feature.FlagSpeciesFeature
 import com.cobblemon.mod.common.api.text.text
 import com.cobblemon.mod.common.battles.actor.PlayerBattleActor
+import com.cobblemon.mod.common.client.entity.PokemonClientDelegate
 import com.cobblemon.mod.common.client.gui.interact.wheel.InteractWheelOption
 import com.cobblemon.mod.common.client.gui.interact.wheel.Orientation
 import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.cobblemonResource
 import com.cobblemon.mod.common.util.giveOrDropItemStack
 import generations.gg.generations.core.generationscore.common.api.player.Caught
 import generations.gg.generations.core.generationscore.common.battle.GenerationsInstructionProcessor
+import generations.gg.generations.core.generationscore.common.client.TeraProvider
+import generations.gg.generations.core.generationscore.common.client.render.CobblemonInstanceProvider
+import generations.gg.generations.core.generationscore.common.client.render.rarecandy.CobblemonInstance
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.instanceOrNull
 import generations.gg.generations.core.generationscore.common.config.LegendKeys
 import generations.gg.generations.core.generationscore.common.config.SpeciesKey
@@ -47,8 +52,17 @@ class GenerationsCobblemonEvents {
 
 
         fun init() {
+            CobblemonEvents.TERASTALLIZATION.subscribe(Priority.NORMAL, {
+                var feature = FlagSpeciesFeature("terastal_active", true)
+
+                feature.apply(it.pokemon.originalPokemon)
+                feature.apply(it.pokemon.effectedPokemon)
+                it.pokemon.originalPokemon.updateAspects()
+            })
+
+
+
 //            FORME_CHANGE.subscribe(Priority.NORMAL, {(a, b, c) -> GenerationsInstructionProcessor.processDetailsChange(a, b, c) })
-//            CobblemonEvents.TERASTALLIZATION.subscribe(Priority.NORMAL, GenerationsInstructionProcessor::processTerastillization)
 //            CobblemonEvents.MEGA_EVOLUTION.subscribe(Priority.NORMAL, GenerationsInstructionProcessor::processMegaEvolution)
 //            CobblemonEvents.POKEMON_ENTITY_SPAWN.subscribe(Priority.HIGHEST) { it ->
 //

common/src/main/java/generations/gg/generations/core/generationscore/common/battle/GenerationsInstructionProcessor.kt

@@ -13,6 +13,7 @@ import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.net.messages.client.battle.BattleTransformPokemonPacket
 import com.cobblemon.mod.common.pokemon.Pokemon
 import com.mojang.datafixers.util.Unit
+import generations.gg.generations.core.generationscore.common.GenerationsCore
 
 object GenerationsInstructionProcessor {
     private var originalAbility: Ability? = null
@@ -136,7 +137,7 @@ private fun Pokemon.restoreAbility(tempAbility: Ability, originalAbility: Abilit
             originalAbility?.let { ability ->
                 this.updateAbility(ability)
             } ?: run {
-                println("Original Ability is null")
+                GenerationsCore.LOGGER.warn("Original Ability is null")
             }
         }
     }

common/src/main/java/generations/gg/generations/core/generationscore/common/client/TeraProvider.kt

@@ -0,0 +1,5 @@
+package generations.gg.generations.core.generationscore.common.client
+
+interface TeraProvider {
+    var teraActive: Boolean
+}

common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/RareCandyBone.kt

@@ -7,6 +7,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokemonModelRepository
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext.RenderState
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.pokemon.FormData
 import com.cobblemon.mod.common.pokemon.Species
 import com.cobblemon.mod.common.util.asResource
@@ -19,6 +20,7 @@ import generations.gg.generations.core.generationscore.common.client.render.Cobb
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.CompiledModel
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.ModelRegistry
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.Pipelines
+import generations.gg.generations.core.generationscore.common.client.render.rarecandy.instanceOrNull
 import net.minecraft.client.Minecraft
 import net.minecraft.client.model.geom.ModelPart
 import net.minecraft.client.renderer.texture.MissingTextureAtlasSprite
@@ -82,6 +84,10 @@ class RareCandyBone /*Remove when cobblemon doesn't have parts of code that assu
         }
         if (model.renderObject!!.isReady) {
             instance.light = packedLight
+            instance.teraActive = context.request(RenderContext.ASPECTS)?.contains("terastal_active") ?: false
+
+            System.out.println(context.request(RenderContext.ASPECTS))
+
 //            instance.tint.set(r, g, b) TODO: convert color int into its float components for tint.
             val variant = getVariant(context)
             if (variant != null) {

common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/rarecandy/CobblemonInstance.java

@@ -1,5 +1,6 @@
 package generations.gg.generations.core.generationscore.common.client.render.rarecandy;
 
+import generations.gg.generations.core.generationscore.common.client.TeraProvider;
 import generations.gg.generations.core.generationscore.common.client.model.ModelContextProviders;
 import gg.generations.rarecandy.renderer.animation.Animation;
 import gg.generations.rarecandy.renderer.animation.AnimationInstance;
@@ -8,11 +9,12 @@
 import org.joml.Matrix4f;
 import org.joml.Vector3f;
 
-public class CobblemonInstance extends AnimatedObjectInstance implements BlockLightValueProvider {
+public class CobblemonInstance extends AnimatedObjectInstance implements BlockLightValueProvider, TeraProvider {
 
     public Matrix4f[] matrixTransforms;
     public Transform offsets;
     private final Vector3f tint = new Vector3f();
+    private boolean teraActive = false;
 
     public Transform getOffset(String material) {
         return this.offsets != null ? this.currentAnimation.getOffset(material) : null;
@@ -52,6 +54,16 @@ public Vector3f getTint() {
         return tint;
     }
 
+    @Override
+    public boolean getTeraActive() {
+        return teraActive;
+    }
+
+    @Override
+    public void setTeraActive(boolean teraActive) {
+        this.teraActive = teraActive;
+    }
+
     private static class StaticAnimationInstance extends AnimationInstance {
         public StaticAnimationInstance(Animation animation) {
             super(animation);

common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/rarecandy/Pipelines.kt

@@ -123,7 +123,7 @@ object Pipelines {
             ctx.uniform().upload2i(light and 0xFFFF, light shr 16 and 0xFFFF)
         }
 
-        .supplyVec3("tint") { it.instance.instanceOrNull<CobblemonInstance>()?.tint?.takeIf { it != ZERO } ?: ONE }
+        .supplyVec3("tint") { /*it.instance.instanceOrNull<CobblemonInstance>()?.tint?.takeIf { it != ZERO } ?:*/ ONE }
 
         .supplyInt("frame") { pingpong(MinecraftClientGameProvider.getTimePassed()).toInt() }
 
@@ -147,7 +147,10 @@ object Pipelines {
         .supplyVec3("Light0_Direction") { RenderSystem.shaderLightDirections[0] }
         .supplyVec3("Light1_Direction") { RenderSystem.shaderLightDirections[1] }
 
-        .supplyBooleanUniform("useTera") { true }
+        .supplyBooleanUniform("useTera") {
+            val isActive = it.instance.instanceOrNull<CobblemonInstance>()?.teraActive ?: false
+            return@supplyBooleanUniform isActive
+        }
 
         .prePostDraw({ material ->
             if (material.cullType() != CullType.None) {

common/src/main/resources/assets/generations_core/shaders/animated.fs.glsl

@@ -76,7 +76,7 @@ float linear_fog_fade(float vertexDistance, float fogStart, float fogEnd) {
 // ===== Lighting Method =====
 
 vec4 minecraft_sample_lightmap(sampler2D lightMap, ivec2 uv) {
-    return texture(lightMap, (vec2(uv) + 0.5) / 16.0);
+    return texture(lightMap, clamp(uv / 256.0, vec2(0.5 / 16.0), vec2(15.5 / 16.0)));
 }
 
 // ===== Layered Color Method =====

common/src/main/resources/data/generations_core/species_feature_assignments/terastal_active.json

@@ -0,0 +1,4 @@
+{
+  "pokemon": ["annihilape", "anorith", "appletun", "applin", "araquanid", "arbok", "arboliva", "arcanine", "arceus", "archaludon", "archen", "archeops", "arctibax", "arctovish", "arctozolt", "ariados", "armaldo", "armarouge", "aromatisse", "aron", "arrokuda", "articuno", "audino", "aurorus", "avalugg", "axew", "azelf", "azumarill", "azurill", "bagon", "baltoy", "banette", "barbaracle", "barboach", "barraskewda", "basculegion", "basculin", "bastiodon", "baxcalibur", "bayleef", "beartic", "beautifly", "beedrill", "beheeyem", "beldum", "bellibolt", "bellossom", "bellsprout", "bergmite", "bewear", "bibarel", "bidoof", "binacle", "bisharp", "blacephalon", "blastoise", "blaziken", "blipbug", "blissey", "blitzle", "boldore", "boltund", "bombirdier", "bonsly", "bouffalant", "bounsweet", "braixen", "brambleghast", "bramblin", "braviary", "breloom", "brionne", "bronzong", "bronzor", "brutebonnet", "bruxish", "budew", "buizel", "bulbasaur", "buneary", "bunnelby", "burmy", "butterfree", "buzzwole", "cacnea", "cacturne", "calyrex", "camerupt", "capsakid", "carbink", "carkol", "carnivine", "carracosta", "carvanha", "cascoon", "castform", "caterpie", "celebi", "celesteela", "centiskorch", "ceruledge", "cetitan", "cetoddle", "chandelure", "chansey", "charcadet", "charizard", "charjabug", "charmander", "charmeleon", "chatot", "cherrim", "cherubi", "chesnaught", "chespin", "chewtle", "chienpao", "chikorita", "chimchar", "chimecho", "chinchou", "chingling", "chiyu", "cinccino", "cinderace", "clamperl", "clauncher", "clawitzer", "claydol", "clefable", "clefairy", "cleffa", "clobbopus", "clodsire", "cloyster", "coalossal", "cobalion", "cofagrigus", "combee", "combusken", "comfey", "conkeldurr", "copperajah", "corphish", "corsola", "corviknight", "corvisquire", "cosmoem", "cosmog", "cottonee", "crabominable", "crabrawler", "cradily", "cramorant", "cranidos", "crawdaunt", "cresselia", "croagunk", "crobat", "crocalor", "croconaw", "crustle", "cryogonal", "cubchoo", "cubone", "cufant", "cursola", "cutiefly", "cyclizar", "cyndaquil", "dachsbun", "darkrai", "darmanitan", "dartrix", "darumaka", "decidueye", "dedenne", "deerling", "deino", "delcatty", "delibird", "delphox", "deoxys", "dewgong", "dewott", "dewpider", "dhelmise", "dialga", "diancie", "diggersby", "diglett", "dipplin", "ditto", "dodrio", "doduo", "dolliv", "dondozo", "donphan", "dottler", "doublade", "dracovish", "dracozolt", "dragalge", "dragapult", "dragonair", "dragonite", "drakloak", "drampa", "drapion", "dratini", "drednaw", "dreepy", "drifblim", "drifloon", "drilbur", "drizzile", "drowzee", "druddigon", "dubwool", "ducklett", "dudunsparce", "dugtrio", "dunsparce", "duosion", "duraludon", "durant", "dusclops", "dusknoir", "duskull", "dustox", "dwebble", "eelektrik", "eelektross", "eevee", "eiscue", "ekans", "eldegoss", "electabuzz", "electivire", "electrike", "electrode", "elekid", "elgyem", "emboar", "emolga", "empoleon", "enamorus", "entei", "escavalier", "espathra", "espeon", "espurr", "eternatus", "excadrill", "exeggcute", "exeggutor", "exploud", "falinks", "farfetchd", "farigiraf", "fearow", "feebas", "fennekin", "feraligatr", "ferroseed", "ferrothorn", "fezandipiti", "fidough", "finizen", "finneon", "flaaffy", "flabebe", "flamigo", "flapple", "flareon", "fletchinder", "fletchling", "flittle", "floatzel", "floette", "floragato", "florges", "fluttermane", "flygon", "fomantis", "foongus", "forretress", "fraxure", "frigibax", "frillish", "froakie", "frogadier", "froslass", "frosmoth", "fuecoco", "furfrou", "furret", "gabite", "gallade", "galvantula", "garbodor", "garchomp", "gardevoir", "garganacl", "gastly", "gastrodon", "genesect", "gengar", "geodude", "gholdengo", "gible", "gigalith", "gimmighoul", "girafarig", "giratina", "glaceon", "glalie", "glameow", "glastrier", "gligar", "glimmet", "glimmora", "gliscor", "gloom", "gogoat", "golbat", "goldeen", "golduck", "golem", "golett", "golisopod", "golurk", "goodra", "goomy", "gorebyss", "gossifleur", "gothita", "gothitelle", "gothorita", "gougingfire", "gourgeist", "grafaiai", "granbull", "grapploct", "graveler", "greattusk", "greavard", "greedent", "greninja", "grimer", "grimmsnarl", "grookey", "grotle", "groudon", "grovyle", "growlithe", "grubbin", "grumpig", "gulpin", "gumshoos", "gurdurr", "guzzlord", "gyarados", "hakamoo", "happiny", "hariyama", "hatenna", "hatterene", "hattrem", "haunter", "hawlucha", "haxorus", "heatmor", "heatran", "heliolisk", "helioptile", "heracross", "herdier", "hippopotas", "hippowdon", "hitmonchan", "hitmonlee", "hitmontop", "honchkrow", "honedge", "hooh", "hoopa", "hoothoot", "hoppip", "horsea", "houndoom", "houndour", "houndstone", "huntail", "hydrapple", "hydreigon", "hypno", "igglybuff", "illumise", "impidimp", "incineroar", "indeedee", "infernape", "inkay", "inteleon", "ironboulder", "ironbundle", "ironcrown", "ironhands", "ironjugulis", "ironleaves", "ironmoth", "ironthorns", "irontreads", "ironvaliant", "ivysaur", "jangmoo", "jellicent", "jigglypuff", "jirachi", "jolteon", "joltik", "jumpluff", "jynx", "kabuto", "kabutops", "kadabra", "kakuna", "kangaskhan", "karrablast", "kartana", "kecleon", "keldeo", "kilowattrel", "kingambit", "kingdra", "kingler", "kirlia", "klang", "klawf", "kleavor", "klefki", "klink", "klinklang", "koffing", "komala", "kommoo", "koraidon", "krabby", "kricketot", "kricketune", "krokorok", "krookodile", "kubfu", "kyogre", "kyurem", "lairon", "lampent", "landorus", "lanturn", "lapras", "larvesta", "larvitar", "latias", "latios", "leafeon", "leavanny", "lechonk", "ledian", "ledyba", "lickilicky", "lickitung", "liepard", "lileep", "lilligant", "lillipup", "linoone", "litleo", "litten", "litwick", "lokix", "lombre", "lopunny", "lotad", "loudred", "lucario", "ludicolo", "lugia", "lumineon", "lunala", "lunatone", "lurantis", "luvdisc", "luxio", "luxray", "lycanroc", "mabosstiff", "machamp", "machoke", "machop", "magby", "magcargo", "magearna", "magikarp", "magmar", "magmortar", "magnemite", "magneton", "magnezone", "makuhita", "malamar", "mamoswine", "manaphy", "mandibuzz", "manectric", "mankey", "mantine", "mantyke", "maractus", "mareanie", "mareep", "marill", "marowak", "marshadow", "marshtomp", "maschiff", "masquerain", "maushold", "mawile", "medicham", "meditite", "meganium", "melmetal", "meloetta", "meltan", "meowscarada", "meowstic", "meowth", "mesprit", "metagross", "metang", "metapod", "mew", "mewtwo", "mienfoo", "mienshao", "mightyena", "milcery", "milotic", "miltank", "mimejr", "mimikyu", "minccino", "minior", "minun", "miraidon", "misdreavus", "mismagius", "moltres", "monferno", "morelull", "morgrem", "morpeko", "mothim", "mrmime", "mrrime", "mudbray", "mudkip", "mudsdale", "muk", "munchlax", "munkidori", "munna", "murkrow", "musharna", "nacli", "naclstack", "naganadel", "natu", "necrozma", "nickit", "nidoking", "nidoqueen", "nidoranf", "nidoranm", "nidorina", "nidorino", "nihilego", "nincada", "ninetales", "ninjask", "noctowl", "noibat", "noivern", "nosepass", "numel", "nuzleaf", "nymble", "obstagoon", "octillery", "oddish", "ogerpon", "oinkologne", "okidogi", "omanyte", "omastar", "onix", "oranguru", "orbeetle", "oricorio", "orthworm", "oshawott", "overqwil", "pachirisu", "palafin", "palkia", "palossand", "palpitoad", "pancham", "pangoro", "panpour", "pansage", "pansear", "paras", "parasect", "passimian", "patrat", "pawmi", "pawmo", "pawmot", "pawniard", "pecharunt", "pelipper", "perrserker", "persian", "petilil", "phanpy", "phantump", "pheromosa", "phione", "pichu", "pidgeot", "pidgeotto", "pidgey", "pidove", "pignite", "pikachu", "pikipek", "piloswine", "pincurchin", "pineco", "pinsir", "piplup", "plusle", "poipole", "politoed", "poliwag", "poliwhirl", "poliwrath", "poltchageist", "polteageist", "ponyta", "poochyena", "popplio", "porygon", "porygon2", "porygonz", "primarina", "primeape", "prinplup", "probopass", "psyduck", "pumpkaboo", "pupitar", "purrloin", "purugly", "pyroar", "pyukumuku", "quagsire", "quaquaval", "quaxly", "quaxwell", "quilava", "quilladin", "qwilfish", "raboot", "rabsca", "ragingbolt", "raichu", "raikou", "ralts", "rampardos", "rapidash", "raticate", "rattata", "rayquaza", "regice", "regidrago", "regieleki", "regigigas", "regirock", "registeel", "relicanth", "rellor", "remoraid", "reshiram", "reuniclus", "revavroom", "rhydon", "rhyhorn", "rhyperior", "ribombee", "rillaboom", "riolu", "roaringmoon", "rockruff", "roggenrola", "rolycoly", "rookidee", "roselia", "roserade", "rotom", "rowlet", "rufflet", "runerigus", "sableye", "salamence", "salandit", "salazzle", "samurott", "sandaconda", "sandile", "sandshrew", "sandslash", "sandygast", "sandyshocks", "sawk", "sawsbuck", "scatterbug", "sceptile", "scizor", "scolipede", "scorbunny", "scovillain", "scrafty", "scraggy", "screamtail", "scyther", "seadra", "seaking", "sealeo", "seedot", "seel", "seismitoad", "sentret", "serperior", "servine", "seviper", "sewaddle", "sharpedo", "shaymin", "shedinja", "shelgon", "shellder", "shellos", "shelmet", "shieldon", "shiftry", "shiinotic", "shinx", "shroodle", "shroomish", "shuckle", "shuppet", "sigilyph", "silcoon", "silicobra", "silvally", "simipour", "simisage", "simisear", "sinistcha", "sinistea", "sirfetchd", "sizzlipede", "skarmory", "skeledirge", "skiddo", "skiploom", "skitty", "skorupi", "skrelp", "skuntank", "skwovet", "slaking", "slakoth", "sliggoo", "slitherwing", "slowbro", "slowking", "slowpoke", "slugma", "slurpuff", "smeargle", "smoliv", "smoochum", "sneasel", "sneasler", "snivy", "snom", "snorlax", "snorunt", "snover", "snubbull", "sobble", "solgaleo", "solosis", "solrock", "spearow", "spectrier", "spewpa", "spheal", "spidops", "spinarak", "spinda", "spiritomb", "spoink", "sprigatito", "spritzee", "squawkabilly", "squirtle", "stakataka", "stantler", "staraptor", "staravia", "starly", "starmie", "staryu", "steelix", "steenee", "stonjourner", "stoutland", "stufful", "stunfisk", "stunky", "sudowoodo", "suicune", "sunflora", "sunkern", "surskit", "swablu", "swadloon", "swalot", "swampert", "swanna", "swellow", "swinub", "swirlix", "swoobat", "sylveon", "tadbulb", "taillow", "talonflame", "tandemaus", "tangela", "tangrowth", "tapubulu", "tapufini", "tapukoko", "tapulele", "tarountula", "tatsugiri", "tauros", "teddiursa", "tentacool", "tentacruel", "tepig", "terapagos", "terrakion", "thievul", "throh", "thundurus", "thwackey", "timburr", "tinglu", "tinkatink", "tinkaton", "tinkatuff", "tirtouga", "toedscool", "toedscruel", "togedemaru", "togekiss", "togepi", "togetic", "torchic", "torkoal", "tornadus", "torracat", "torterra", "totodile", "toucannon", "toxapex", "toxel", "toxicroak", "toxtricity", "tranquill", "trapinch", "treecko", "trevenant", "tropius", "trubbish", "trumbeak", "tsareena", "turtonator", "turtwig", "tympole", "tynamo", "typenull", "typhlosion", "tyranitar", "tyrantrum", "tyrogue", "tyrunt", "umbreon", "unfezant", "unown", "ursaluna", "ursaring", "urshifu", "uxie", "vanillish", "vanillite", "vanilluxe", "vaporeon", "varoom", "veluza", "venipede", "venomoth", "venonat", "venusaur", "vespiquen", "vibrava", "victini", "victreebel", "vigoroth", "vikavolt", "vileplume", "virizion", "vivillon", "volbeat", "volcanion", "volcarona", "voltorb", "vullaby", "vulpix", "wailmer", "wailord", "walkingwake", "walrein", "wartortle", "watchog", "wattrel", "weavile", "weedle", "weepinbell", "weezing", "whimsicott", "whirlipede", "whiscash", "whismur", "wigglytuff", "wiglett", "wimpod", "wingull", "wishiwashi", "wobbuffet", "wochien", "woobat", "wooloo", "wooper", "wormadam", "wugtrio", "wurmple", "wynaut", "wyrdeer", "xatu", "xerneas", "xurkitree", "yamask", "yamper", "yanma", "yanmega", "yungoos", "yveltal", "zacian", "zamazenta", "zangoose", "zapdos", "zarude", "zebstrika", "zekrom", "zeraora", "zigzagoon", "zoroark", "zorua", "zubat", "zweilous", "zygarde", "abomasnow", "abra", "absol", "accelgor", "aegislash", "aerodactyl", "aggron", "aipom", "alakazam", "alcremie", "alomomola", "altaria", "amaura", "ambipom", "amoonguss", "ampharos"],
+  "features": ["terastal_active"]
+}

common/src/main/resources/data/generations_core/species_features/terastal_active.json

@@ -0,0 +1,6 @@
+{
+  "type": "flag",
+  "keys": ["terastal_active"],
+  "default": false,
+  "isAspect": true
+}