MEGA X/Y Form Fixes + Other Minor Fixes + Additional Datagen (#104)

Conno2429 · web-flow · commit ca8ed87fe9cd · 2025-04-04T22:12:28.000-05:00
* Fixed Corphish and Crawdaunt not spawning properly

* Added Ogerpon Masks and Genesect Drives to ball loots

Generated files included

* Reversion to fix wiggly/bouncy entities

* Fixed Mega X/Y forms

* Fixed logic for full set armor bonuses
diff --git a/common/src/main/generated/resources/data/generations_core/loot_tables/chests/cherish_ball.json b/common/src/main/generated/resources/data/generations_core/loot_tables/chests/cherish_ball.json
@@ -336,6 +336,10 @@
           "type": "minecraft:item",
           "name": "generations_core:shattered_relic_song_1"
         },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:chill_drive"
+        },
         {
           "type": "minecraft:item",
           "name": "cobblemon:serious_mint"
diff --git a/common/src/main/generated/resources/data/generations_core/loot_tables/chests/dive_ball.json b/common/src/main/generated/resources/data/generations_core/loot_tables/chests/dive_ball.json
@@ -356,6 +356,10 @@
           "type": "minecraft:item",
           "name": "generations_core:shattered_ice_key_4"
         },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:wellspring_mask"
+        },
         {
           "type": "minecraft:item",
           "name": "generations_core:tm_11"
diff --git a/common/src/main/generated/resources/data/generations_core/loot_tables/chests/dream_ball.json b/common/src/main/generated/resources/data/generations_core/loot_tables/chests/dream_ball.json
@@ -304,6 +304,14 @@
           "type": "minecraft:item",
           "name": "generations_core:lava_crystal"
         },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:hearthflame_mask"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:burn_drive"
+        },
         {
           "type": "minecraft:item",
           "name": "cobblemon:relaxed_mint"
diff --git a/common/src/main/generated/resources/data/generations_core/loot_tables/chests/friend_ball.json b/common/src/main/generated/resources/data/generations_core/loot_tables/chests/friend_ball.json
@@ -324,6 +324,10 @@
           "type": "minecraft:item",
           "name": "generations_core:shattered_ice_key_4"
         },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:cornerstone_mask"
+        },
         {
           "type": "minecraft:item",
           "name": "minecraft:porkchop"
diff --git a/common/src/main/generated/resources/data/generations_core/loot_tables/chests/heavy_ball.json b/common/src/main/generated/resources/data/generations_core/loot_tables/chests/heavy_ball.json
@@ -300,6 +300,10 @@
           "type": "minecraft:item",
           "name": "generations_core:fragmented_drago_key_4"
         },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:cornerstone_mask"
+        },
         {
           "type": "minecraft:item",
           "name": "generations_core:rock_candy"
diff --git a/common/src/main/generated/resources/data/generations_core/loot_tables/chests/master_ball.json b/common/src/main/generated/resources/data/generations_core/loot_tables/chests/master_ball.json
@@ -400,6 +400,34 @@
           "type": "minecraft:item",
           "name": "generations_core:adamant_crystal"
         },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:wellspring_mask"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:hearthflame_mask"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:cornerstone_mask"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:shock_drive"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:burn_drive"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:chill_drive"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:douse_drive"
+        },
         {
           "type": "minecraft:item",
           "name": "generations_core:tm_9"
diff --git a/common/src/main/generated/resources/data/generations_core/loot_tables/chests/net_ball.json b/common/src/main/generated/resources/data/generations_core/loot_tables/chests/net_ball.json
@@ -256,6 +256,14 @@
           "type": "minecraft:item",
           "name": "generations_core:insect_plate"
         },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:wellspring_mask"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:douse_drive"
+        },
         {
           "type": "minecraft:item",
           "name": "generations_core:tm_11"
diff --git a/common/src/main/generated/resources/data/generations_core/loot_tables/chests/park_ball.json b/common/src/main/generated/resources/data/generations_core/loot_tables/chests/park_ball.json
@@ -248,6 +248,10 @@
           "type": "minecraft:item",
           "name": "generations_core:gracidea"
         },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:hearthflame_mask"
+        },
         {
           "type": "minecraft:item",
           "name": "cobblemon:serious_mint"
diff --git a/common/src/main/generated/resources/data/generations_core/loot_tables/chests/quick_ball.json b/common/src/main/generated/resources/data/generations_core/loot_tables/chests/quick_ball.json
@@ -252,6 +252,10 @@
           "type": "minecraft:item",
           "name": "generations_core:dragon_soul"
         },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:shock_drive"
+        },
         {
           "type": "minecraft:item",
           "name": "cobblemon:sassy_mint"
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/battle/GenerationsInstructionProcessor.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/battle/GenerationsInstructionProcessor.kt
@@ -22,26 +22,24 @@ object GenerationsInstructionProcessor {
         val s1 = message.argumentAt(1) ?: return
         val s2 = s1.split(",".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
         if (s2.isEmpty()) return
-        val s3 = s2[0].split("-".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+        val s3 = s2[0].lowercase().split("-".toRegex(), 2).dropLastWhile { it.isEmpty() }.toTypedArray()
 
         if (s3.size < 2) return
 
         val battlePokemon = message.battlePokemon(0, battle) ?: return
 
-        val name = s3[1].lowercase()
+        val name = s3[1]
 
         var pair: Pair<String, Any> = when(name) {
-            "mega" -> {
-                val megaStone = battlePokemon.heldItemManager.showdownId(battlePokemon) ?: return
-                when {
-                    megaStone.endsWith("x") -> "mega_x"
-                    megaStone.endsWith("y") -> "mega_y"
-                    else -> "mega"
-                } to true
-            }
+            "mega" -> "mega" to true
+            "mega-x" -> "mega_x" to true
+            "mega-y" -> "mega_y" to true
             "sunshine" -> "sunny" to true
             "school" -> "schooling" to true
+            "primal" -> "primal" to true
+            "ash" -> "ash" to true
             "wellspring", "hearthflame", "cornerstone", "teal" -> s3.getOrNull(2)?.takeIf { it == "Tera" }.let { "terastal" to true } ?: null
+
             else -> name to true
         } ?: let {
             battlePokemon.originalPokemon.removeBattleFeature()
@@ -115,7 +113,6 @@ private fun Pokemon.removeBattleFeature() {
 
 private fun Pokemon.applyBattleFeature(feature: SpeciesFeature) {
     this.persistentData.putString("form_name", feature.name)
-
     if(feature is StringSpeciesFeature) {
         this.persistentData.putString("form_value", feature.value)
         feature.apply(this)
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/armor/ArmorTickEffect.java b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/armor/ArmorTickEffect.java
@@ -19,7 +19,7 @@ static boolean isWearingFullSet(Player player, ArmorMaterial material) {
 
             ItemStack equippedItemStack = player.getItemBySlot(equipmentSlot);
             if (!(equippedItemStack.getItem() instanceof ArmorItem)) return false;
-            if (((ArmorItem) equippedItemStack.getItem()).getMaterial() != material) return true;
+            if (((ArmorItem) equippedItemStack.getItem()).getMaterial() != material) return false;
         }
 
         return true;
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0341_corphish.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0341_corphish.json
@@ -7,7 +7,7 @@
             "id": "corphish-1",
             "pokemon": "corphish",
             "presets": [
-                "natural"
+                "underwater"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/cobblemon/spawn_pool_world/0342_crawdaunt.json b/common/src/main/resources/data/cobblemon/spawn_pool_world/0342_crawdaunt.json
@@ -7,7 +7,7 @@
             "id": "crawdaunt-1",
             "pokemon": "crawdaunt",
             "presets": [
-                "natural"
+                "underwater"
             ],
             "type": "pokemon",
             "context": "submerged",
diff --git a/common/src/main/resources/data/generations_core/species_additions/generation1/charizard.json b/common/src/main/resources/data/generations_core/species_additions/generation1/charizard.json
@@ -39,7 +39,7 @@
                 "mega"
             ],
             "aspects": [
-                "mega-x"
+                "mega_x"
             ],
             "height": 17,
             "weight": 1105,
@@ -85,7 +85,7 @@
                 "mega"
             ],
             "aspects": [
-                "mega-y"
+                "mega_y"
             ],
             "height": 17,
             "weight": 1005,
diff --git a/common/src/main/resources/data/generations_core/species_additions/generation1/mewtwo.json b/common/src/main/resources/data/generations_core/species_additions/generation1/mewtwo.json
@@ -48,7 +48,7 @@
                 "legendary"
             ],
             "aspects": [
-                "mega-x"
+                "mega_x"
             ],
             "height": 23,
             "weight": 1270,
@@ -93,7 +93,7 @@
                 "legendary"
             ],
             "aspects": [
-                "mega-y"
+                "mega_y"
             ],
             "height": 15,
             "weight": 330,
diff --git a/fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/client/GenerationsCoreClientFabric.java b/fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/client/GenerationsCoreClientFabric.java
@@ -36,7 +36,7 @@ public class GenerationsCoreClientFabric implements ClientModInitializer {
     public void onInitializeClient() {
         WorldRenderEvents.AFTER_TRANSLUCENT.register(context -> GenerationsCoreClient.renderHighlightedPath(context.matrixStack(), Minecraft.getInstance().levelRenderer.ticks, context.camera()));
 
-        WorldRenderEvents.AFTER_ENTITIES.register(context -> GenerationsCoreClient.renderRareCandy(context.world()));
+        WorldRenderEvents.BEFORE_DEBUG_RENDER.register(context -> GenerationsCoreClient.renderRareCandy(context.world()));
 
         GenerationsCoreClient.onInitialize(Minecraft.getInstance());
         registerRenderTypes();
diff --git a/forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/loot/GenerationsChestLoot.java b/forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/generators/loot/GenerationsChestLoot.java
@@ -139,7 +139,7 @@ public void generate(@NotNull BiConsumer<ResourceLocation, LootTable.Builder> ou
 				ROCKSTAR_COSTUME, BELLE_COSTUME, POPSTAR_COSTUME,
 				PHD_COSTUME, LIBRE_COSTUME, RUSTY_IRON_KEY_1,
 				SHATTERED_ICE_KEY_1, CRUMBLED_ROCK_KEY_1, FRAGMENTED_DRAGO_KEY_1,
-				DISCHARGED_ELEKI_KEY_1, SHATTERED_RELIC_SONG_1, SERIOUS_MINT,
+				DISCHARGED_ELEKI_KEY_1, SHATTERED_RELIC_SONG_1, CHILL_DRIVE, SERIOUS_MINT,
 				LONELY_MINT, BRAVE_MINT, DRAGON_MEMORY_DRIVE,
 				DRACO_PLATE, ICE_CANDY, PSYCHIC_CANDY,
 				TM_10, TM_34, TM_46,
@@ -186,8 +186,8 @@ public void generate(@NotNull BiConsumer<ResourceLocation, LootTable.Builder> ou
 						POKEMAIL_BRICK, POKEMAIL_BRIDGE_D, POKEMAIL_BRIDGE_M,
 						POKEMAIL_BRIDGE_S, POKEMAIL_BRIDGE_T, POKEMAIL_BRIDGE_V,
 						WATER_CANDY, SHATTERED_ICE_KEY_1, SHATTERED_ICE_KEY_2,
-						SHATTERED_ICE_KEY_3, SHATTERED_ICE_KEY_4, TM_11,
-						TM_22, TM_50, TM_77, TM_110,
+						SHATTERED_ICE_KEY_3, SHATTERED_ICE_KEY_4, WELLSPRING_MASK,
+						TM_11, TM_22, TM_50, TM_77, TM_110,
 						TM_123, TM_142, TM_145, TM_154,
 						TM_188, TM_196, TM_208, TM_209
 				);
@@ -219,7 +219,7 @@ public void generate(@NotNull BiConsumer<ResourceLocation, LootTable.Builder> ou
 						RUSTY_IRON_KEY_2, SHATTERED_ICE_KEY_2,
 						CRUMBLED_ROCK_KEY_2, FRAGMENTED_DRAGO_KEY_2,
 						DISCHARGED_ELEKI_KEY_2, SHATTERED_RELIC_SONG_2,
-						LAVA_CRYSTAL, RELAXED_MINT, IMPISH_MINT,
+						LAVA_CRYSTAL, HEARTHFLAME_MASK, BURN_DRIVE, RELAXED_MINT, IMPISH_MINT,
 						GENTLE_MINT, POKEMAIL_AIR, POKEMAIL_BLOOM,
 						POKEMAIL_BRICK, POKEMAIL_BRIDGE_D, POKEMAIL_BRIDGE_M,
 						POKEMAIL_BRIDGE_S, POKEMAIL_BRIDGE_T, POKEMAIL_BRIDGE_V,
@@ -336,7 +336,7 @@ public void generate(@NotNull BiConsumer<ResourceLocation, LootTable.Builder> ou
 						TANGA_BERRY, THROAT_SPRAY, TIN_OF_BEANS,
 						TWISTED_SPOON, WACAN_BERRY, WEAKNESS_POLICY,
 						WHIPPED_DREAM, X_ATTACK, SHATTERED_RELIC_SONG_1,
-						SHATTERED_ICE_KEY_2, SHATTERED_ICE_KEY_3, SHATTERED_ICE_KEY_4,
+						SHATTERED_ICE_KEY_2, SHATTERED_ICE_KEY_3, SHATTERED_ICE_KEY_4, CORNERSTONE_MASK,
 						PORKCHOP, MILK_BUCKET, RABBIT_FOOT, MUSIC_DISC_STRAD, BUG_CANDY,
 						ROCK_CANDY, PURPLE_JUICE, BLUE_JUICE,
 						GREEN_JUICE, PINK_JUICE, BASIC_SWEET_POKE_PUFF,
@@ -543,7 +543,7 @@ public void generate(@NotNull BiConsumer<ResourceLocation, LootTable.Builder> ou
 						ROCK_MEMORY_DRIVE, STEEL_MEMORY_DRIVE,
 						STONE_PLATE, IRON_PLATE,
 						FRAGMENTED_DRAGO_KEY_1, FRAGMENTED_DRAGO_KEY_2,
-						FRAGMENTED_DRAGO_KEY_3, FRAGMENTED_DRAGO_KEY_4,
+						FRAGMENTED_DRAGO_KEY_3, FRAGMENTED_DRAGO_KEY_4, CORNERSTONE_MASK,
 						ROCK_CANDY, STEEL_CANDY, MEW_FOSSIL,
 						TM_36, TM_51,
 						TM_76, TM_86,
@@ -868,6 +868,8 @@ public void generate(@NotNull BiConsumer<ResourceLocation, LootTable.Builder> ou
 						SPARKLING_SHARD, MIRROR, DARK_SOUL,
 						LIGHT_SOUL, METEORITE_SHARD, MEW_DNA_FIBER,
 						LUSTROUS_GLOBE, GRISEOUS_CORE, ADAMANT_CRYSTAL,
+						WELLSPRING_MASK, HEARTHFLAME_MASK, CORNERSTONE_MASK,
+						SHOCK_DRIVE, BURN_DRIVE, CHILL_DRIVE, DOUSE_DRIVE,
 						TM_9, TM_23, TM_48,
 						TM_68, TM_72, TM_82,
 						TM_96, TM_126, TM_136,
@@ -979,7 +981,7 @@ public void generate(@NotNull BiConsumer<ResourceLocation, LootTable.Builder> ou
 						GOOD_ROD, SUPER_ROD,
 						WAILMER_PAIL, JOLLY_MINT, NAIVE_MINT,
 						MODEST_MINT, GROUND_MEMORY_DRIVE,
-						BUG_MEMORY_DRIVE, EARTH_PLATE, INSECT_PLATE,
+						BUG_MEMORY_DRIVE, EARTH_PLATE, INSECT_PLATE, WELLSPRING_MASK, DOUSE_DRIVE,
 						TM_11, TM_22, TM_50,
 						TM_77, TM_110, TM_123,
 						TM_142, TM_145, TM_154,
@@ -1067,7 +1069,7 @@ public void generate(@NotNull BiConsumer<ResourceLocation, LootTable.Builder> ou
 						DISCHARGED_ELEKI_KEY_4, SHATTERED_RELIC_SONG_4,
 						SUN_FLUTE, MOON_FLUTE, N_SOLARIZER,
 						N_LUNARIZER, MELODY_FLUTE, HOOPA_RING,
-						GRACIDEA, SERIOUS_MINT, LONELY_MINT,
+						GRACIDEA, HEARTHFLAME_MASK, SERIOUS_MINT, LONELY_MINT,
 						BRAVE_MINT, ADAMANT_MINT, NAUGHTY_MINT,
 						BOLD_MINT, RELAXED_MINT, IMPISH_MINT,
 						GENTLE_MINT, LAX_MINT, TIMID_MINT,
@@ -1188,7 +1190,7 @@ public void generate(@NotNull BiConsumer<ResourceLocation, LootTable.Builder> ou
 						X_ACCURACY_2, X_ATTACK_3, X_SPECIAL_ATTACK_3,
 						X_SPECIAL_DEFENSE_3, X_SPEED_6, YELLOW_NECTAR,
 						YELLOW_SHARD, ZINC, ZOOM_LENS,
-						FEATHER, PORKCHOP, RABBIT_FOOT, MUSIC_DISC_STAL, DRAGON_SOUL,
+						FEATHER, PORKCHOP, RABBIT_FOOT, MUSIC_DISC_STAL, DRAGON_SOUL, SHOCK_DRIVE,
 						SASSY_MINT, CAREFUL_MINT, DARK_MEMORY_DRIVE,
 						DREAD_PLATE, TM_1, TM_6,
 						TM_7, TM_25, TM_32,
