Tera + Forms + Re-add Mega

* initial commit

* fixed

* WIP: before pulling 1.6

* Details Change adjustments to fix data

* idk why its making me do this

* final touches before pr

Author: Conno2429

build.gradle.kts

@@ -109,4 +109,4 @@ private fun getGensCredentials(): Pair<String?, String?> {
     val username = (project.findProperty("gensUsername") ?: System.getenv("GENS_USERNAME") ?: "") as String?
     val password = (project.findProperty("gensPassword") ?: System.getenv("GENS_PASSWORD") ?: "") as String?
     return Pair(username, password)
-}
+}

common/src/main/generated/resources/assets/generations_core/lang/en_us.json

@@ -1642,6 +1642,7 @@
   "item.generations_core.bug_badge": "Bug Badge",
   "item.generations_core.bug_candy": "Bug Candy",
   "item.generations_core.bug_memory_drive": "Bug Memory Drive",
+  "item.generations_core.bug_tera_shard": "Bug Tera Shard",
   "item.generations_core.buginium_z": "Buginium Z",
   "item.generations_core.burn_drive": "Burn Drive",
   "item.generations_core.camera": "Camera",
@@ -1778,6 +1779,7 @@
   "item.generations_core.dark_soul.tooltip": "§7HINT:  Darkrai appears faintly, you need more.",
   "item.generations_core.dark_stone": "Dark Stone",
   "item.generations_core.dark_stone.tooltip": "§7HINT: It isn’t reacting. More Dragons could do the trick.",
+  "item.generations_core.dark_tera_shard": "Dark Tera Shard",
   "item.generations_core.darkinium_z": "Darkinium Z",
   "item.generations_core.data_cards": "Data Cards",
   "item.generations_core.data_cards.desc": "Not currently implemented",
@@ -1838,6 +1840,7 @@
   "item.generations_core.dragon_soul.tooltip": "§7HINT: It screams. They seek their masters- the Tao Trio. An Orb is required to seal these souls. With a certain Gem, you could manipulate it towards a specific Tao.",
   "item.generations_core.dragon_stone": "Dragon Stone",
   "item.generations_core.dragon_stone.tooltip": "§7HINT: It isn’t reacting. More Dragons could do the trick.",
+  "item.generations_core.dragon_tera_shard": "Dragon Tera Shard",
   "item.generations_core.dragonium_z": "Dragonium Z",
   "item.generations_core.dread_plate": "Dread Plate",
   "item.generations_core.dropped_item_red": "Dropped Item Red",
@@ -1865,6 +1868,7 @@
   "item.generations_core.effort_ribbon": "Effort Ribbon",
   "item.generations_core.electric_candy": "Electric Candy",
   "item.generations_core.electric_memory_drive": "Electric Memory Drive",
+  "item.generations_core.electric_tera_shard": "Electric Tera Shard",
   "item.generations_core.electrium_z": "Electrium Z",
   "item.generations_core.elegant_wing": "Elegant Wing",
   "item.generations_core.eleki_key": "Eleki Key",
@@ -1908,6 +1912,7 @@
   "item.generations_core.fairy_candy": "Fairy Candy",
   "item.generations_core.fairy_feather": "Fairy Feather",
   "item.generations_core.fairy_memory_drive": "Fairy Memory Drive",
+  "item.generations_core.fairy_tera_shard": "Fairy Tera Shard",
   "item.generations_core.fame_checker": "Fame Checker",
   "item.generations_core.fame_checker.desc": "Not currently implemented",
   "item.generations_core.fancy_apple": "Fancy Apple",
@@ -1921,6 +1926,7 @@
   "item.generations_core.fighting_badge": "Fighting Badge",
   "item.generations_core.fighting_candy": "Fighting Candy",
   "item.generations_core.fighting_memory_drive": "Fighting Memory Drive",
+  "item.generations_core.fighting_tera_shard": "Fighting Tera Shard",
   "item.generations_core.fightinium_z": "Fightinium Z",
   "item.generations_core.film": "Film",
   "item.generations_core.fire_badge": "Fire Badge",
@@ -1936,6 +1942,7 @@
   "item.generations_core.fire_stone_pickaxe": "Fire Stone Pickaxe",
   "item.generations_core.fire_stone_shovel": "Fire Stone Shovel",
   "item.generations_core.fire_stone_sword": "Fire Stone Sword",
+  "item.generations_core.fire_tera_shard": "Fire Tera Shard",
   "item.generations_core.firium_z": "Firium Z",
   "item.generations_core.fist_plate": "Fist Plate",
   "item.generations_core.flame_plate": "Flame Plate",
@@ -1946,6 +1953,7 @@
   "item.generations_core.fluffy_tail": "Fluffy Tail",
   "item.generations_core.flying_candy": "Flying Candy",
   "item.generations_core.flying_memory_drive": "Flying Memory Drive",
+  "item.generations_core.flying_tera_shard": "Flying Tera Shard",
   "item.generations_core.flyinium_z": "Flyinium Z",
   "item.generations_core.fog_badge": "Fog Badge",
   "item.generations_core.footprint_ribbon": "Footprint Ribbon",
@@ -1986,6 +1994,7 @@
   "item.generations_core.ghost_boat_with_chest": "Ghost Boat With Chest",
   "item.generations_core.ghost_candy": "Ghost Candy",
   "item.generations_core.ghost_memory_drive": "Ghost Memory Drive",
+  "item.generations_core.ghost_tera_shard": "Ghost Tera Shard",
   "item.generations_core.ghostium_z": "Ghostium Z",
   "item.generations_core.gift_box": "Gift Box",
   "item.generations_core.gigantamix": "Gigantamix",
@@ -2015,6 +2024,7 @@
   "item.generations_core.grass_badge": "Grass Badge",
   "item.generations_core.grass_candy": "Grass Candy",
   "item.generations_core.grass_memory_drive": "Grass Memory Drive",
+  "item.generations_core.grass_tera_shard": "Grass Tera Shard",
   "item.generations_core.grassium_z": "Grassium Z",
   "item.generations_core.great_ability_ribbon": "Great Ability Ribbon",
   "item.generations_core.great_walkmon": "Great Walkmon",
@@ -2033,6 +2043,7 @@
   "item.generations_core.griseous_orb.tooltip": "§7HINT: This item appears to be related to the Creation Trio. If you crafted a Red Chain, you may be activate an Altar.",
   "item.generations_core.ground_candy": "Ground Candy",
   "item.generations_core.ground_memory_drive": "Ground Memory Drive",
+  "item.generations_core.ground_tera_shard": "Ground Tera Shard",
   "item.generations_core.groundium_z": "Groundium Z",
   "item.generations_core.grubby_hanky": "Grubby Hanky",
   "item.generations_core.grubby_hanky.desc": "Not currently implemented",
@@ -2083,6 +2094,7 @@
   "item.generations_core.ice_stone_pickaxe": "Ice Stone Pickaxe",
   "item.generations_core.ice_stone_shovel": "Ice Stone Shovel",
   "item.generations_core.ice_stone_sword": "Ice Stone Sword",
+  "item.generations_core.ice_tera_shard": "Ice Tera Shard",
   "item.generations_core.iceberg_badge": "Iceberg Badge",
   "item.generations_core.iceberg_key": "Iceberg Key",
   "item.generations_core.iceberg_key.tooltip": "§7HINT: This item appears to be related to one of the Regi’s. Find their shrine at a Snowpoint Temple.",
@@ -2332,6 +2344,7 @@
   "item.generations_core.nessa_disc.desc": "GlitchxCity - Nessa",
   "item.generations_core.netherite_hammer": "Netherite Hammer",
   "item.generations_core.normal_candy": "Normal Candy",
+  "item.generations_core.normal_tera_shard": "Normal Tera Shard",
   "item.generations_core.normalium_z": "Normalium Z",
   "item.generations_core.npc_path_tool": "Npc Path Tool",
   "item.generations_core.npc_wand": "Npc Wand",
@@ -2413,6 +2426,7 @@
   "item.generations_core.point_card.desc": "Not currently implemented",
   "item.generations_core.poison_candy": "Poison Candy",
   "item.generations_core.poison_memory_drive": "Poison Memory Drive",
+  "item.generations_core.poison_tera_shard": "Poison Tera Shard",
   "item.generations_core.poisonium_z": "Poisonium Z",
   "item.generations_core.poke_doll": "Poke Doll",
   "item.generations_core.poke_flute": "Poke Flute",
@@ -2525,6 +2539,7 @@
   "item.generations_core.psychic_badge": "Psychic Badge",
   "item.generations_core.psychic_candy": "Psychic Candy",
   "item.generations_core.psychic_memory_drive": "Psychic Memory Drive",
+  "item.generations_core.psychic_tera_shard": "Psychic Tera Shard",
   "item.generations_core.psychium_z": "Psychium Z",
   "item.generations_core.punching_glove": "Punching Glove",
   "item.generations_core.pungent_root": "Pungent Root",
@@ -2605,6 +2620,7 @@
   "item.generations_core.rock_memory_drive": "Rock Memory Drive",
   "item.generations_core.rock_peak_key": "Rock Peak Key",
   "item.generations_core.rock_peak_key.tooltip": "§7HINT: This item appears to be related to one of the Regi’s. Find their shrine at a Snowpoint Temple.",
+  "item.generations_core.rock_tera_shard": "Rock Tera Shard",
   "item.generations_core.rocket_boots": "Rocket Boots",
   "item.generations_core.rocket_chestplate": "Rocket Chestplate",
   "item.generations_core.rocket_helmet": "Rocket Helmet",
@@ -2816,8 +2832,10 @@
   "item.generations_core.static_wing": "Static Wing",
   "item.generations_core.steel_candy": "Steel Candy",
   "item.generations_core.steel_memory_drive": "Steel Memory Drive",
+  "item.generations_core.steel_tera_shard": "Steel Tera Shard",
   "item.generations_core.steelium_z": "Steelium Z",
   "item.generations_core.steelixite": "Steelixite",
+  "item.generations_core.stellar_tera_shard": "Stellar Tera Shard",
   "item.generations_core.stone_badge": "Stone Badge",
   "item.generations_core.stone_hammer": "Stone Hammer",
   "item.generations_core.stone_plate": "Stone Plate",
@@ -2864,25 +2882,7 @@
   "item.generations_core.teal_mask": "Teal Mask",
   "item.generations_core.team_rocket_disc": "Team Rocket Disc",
   "item.generations_core.team_rocket_disc.desc": "GlitchxCity - Team Rocket",
-  "item.generations_core.tera_bug_shard": "Tera Bug Shard",
-  "item.generations_core.tera_dark_shard": "Tera Dark Shard",
-  "item.generations_core.tera_dragon_shard": "Tera Dragon Shard",
-  "item.generations_core.tera_electric_shard": "Tera Electric Shard",
-  "item.generations_core.tera_fairy_shard": "Tera Fairy Shard",
-  "item.generations_core.tera_fighting_shard": "Tera Fighting Shard",
-  "item.generations_core.tera_fire_shard": "Tera Fire Shard",
-  "item.generations_core.tera_flying_shard": "Tera Flying Shard",
-  "item.generations_core.tera_ghost_shard": "Tera Ghost Shard",
-  "item.generations_core.tera_grass_shard": "Tera Grass Shard",
-  "item.generations_core.tera_ground_shard": "Tera Ground Shard",
-  "item.generations_core.tera_ice_shard": "Tera Ice Shard",
-  "item.generations_core.tera_normal_shard": "Tera Normal Shard",
-  "item.generations_core.tera_poison_shard": "Tera Poison Shard",
-  "item.generations_core.tera_psychic_shard": "Tera Psychic Shard",
-  "item.generations_core.tera_rock_shard": "Tera Rock Shard",
-  "item.generations_core.tera_steel_shard": "Tera Steel Shard",
-  "item.generations_core.tera_stellar_shard": "Tera Stellar Shard",
-  "item.generations_core.tera_water_shard": "Tera Water Shard",
+  "item.generations_core.tera_orb": "Tera Orb",
   "item.generations_core.thick_club": "Thick Club",
   "item.generations_core.thunder_badge": "Thunder Badge",
   "item.generations_core.thunder_stone_axe": "Thunder Stone Axe",
@@ -3245,6 +3245,7 @@
   "item.generations_core.water_stone_pickaxe": "Water Stone Pickaxe",
   "item.generations_core.water_stone_shovel": "Water Stone Shovel",
   "item.generations_core.water_stone_sword": "Water Stone Sword",
+  "item.generations_core.water_tera_shard": "Water Tera Shard",
   "item.generations_core.waterium_z": "Waterium Z",
   "item.generations_core.wave_badge": "Wave Badge",
   "item.generations_core.wave_incense": "Wave Incense",

…ons_core/models/item/tera_bug_shard.json …ons_core/models/item/bug_tera_shard.jsoncommon/src/main/generated/resources/assets/generations_core/models/item/tera_bug_shard.json renamed to common/src/main/generated/resources/assets/generations_core/models/item/bug_tera_shard.json common/src/main/generated/resources/assets/generations_core/models/item/tera_bug_shard.json renamed to common/src/main/generated/resources/assets/generations_core/models/item/bug_tera_shard.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "generations_core:item/tera_shards/tera_bug_shard"
+    "layer0": "generations_core:item/tera_shards/bug_tera_shard"
   }
 }

common/src/main/generated/resources/assets/generations_core/models/item/dark_crystal.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "generations_core:item/placeholder"
+    "layer0": "generations_core:item/legend_items/dark_crystal"
   }
 }

…ns_core/models/item/tera_rock_shard.json …ns_core/models/item/dark_tera_shard.jsoncommon/src/main/generated/resources/assets/generations_core/models/item/tera_rock_shard.json renamed to common/src/main/generated/resources/assets/generations_core/models/item/dark_tera_shard.json common/src/main/generated/resources/assets/generations_core/models/item/tera_rock_shard.json renamed to common/src/main/generated/resources/assets/generations_core/models/item/dark_tera_shard.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "generations_core:item/tera_shards/tera_rock_shard"
+    "layer0": "generations_core:item/tera_shards/dark_tera_shard"
   }
 }

…_core/models/item/tera_flying_shard.json …_core/models/item/dragon_tera_shard.jsoncommon/src/main/generated/resources/assets/generations_core/models/item/tera_flying_shard.json renamed to common/src/main/generated/resources/assets/generations_core/models/item/dragon_tera_shard.json common/src/main/generated/resources/assets/generations_core/models/item/tera_flying_shard.json renamed to common/src/main/generated/resources/assets/generations_core/models/item/dragon_tera_shard.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "generations_core:item/tera_shards/tera_flying_shard"
+    "layer0": "generations_core:item/tera_shards/dragon_tera_shard"
   }
 }

…ore/models/item/tera_fighting_shard.json …ore/models/item/electric_tera_shard.jsoncommon/src/main/generated/resources/assets/generations_core/models/item/tera_fighting_shard.json renamed to common/src/main/generated/resources/assets/generations_core/models/item/electric_tera_shard.json common/src/main/generated/resources/assets/generations_core/models/item/tera_fighting_shard.json renamed to common/src/main/generated/resources/assets/generations_core/models/item/electric_tera_shard.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "generations_core:item/tera_shards/tera_fighting_shard"
+    "layer0": "generations_core:item/tera_shards/electric_tera_shard"
   }
 }

…s_core/models/item/tera_ghost_shard.json …s_core/models/item/fairy_tera_shard.jsoncommon/src/main/generated/resources/assets/generations_core/models/item/tera_ghost_shard.json renamed to common/src/main/generated/resources/assets/generations_core/models/item/fairy_tera_shard.json common/src/main/generated/resources/assets/generations_core/models/item/tera_ghost_shard.json renamed to common/src/main/generated/resources/assets/generations_core/models/item/fairy_tera_shard.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "generations_core:item/tera_shards/tera_ghost_shard"
+    "layer0": "generations_core:item/tera_shards/fairy_tera_shard"
   }
 }

…ore/models/item/tera_electric_shard.json …ore/models/item/fighting_tera_shard.jsoncommon/src/main/generated/resources/assets/generations_core/models/item/tera_electric_shard.json renamed to common/src/main/generated/resources/assets/generations_core/models/item/fighting_tera_shard.json common/src/main/generated/resources/assets/generations_core/models/item/tera_electric_shard.json renamed to common/src/main/generated/resources/assets/generations_core/models/item/fighting_tera_shard.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "generations_core:item/tera_shards/tera_electric_shard"
+    "layer0": "generations_core:item/tera_shards/fighting_tera_shard"
   }
 }

…ns_core/models/item/tera_dark_shard.json …ns_core/models/item/fire_tera_shard.jsoncommon/src/main/generated/resources/assets/generations_core/models/item/tera_dark_shard.json renamed to common/src/main/generated/resources/assets/generations_core/models/item/fire_tera_shard.json common/src/main/generated/resources/assets/generations_core/models/item/tera_dark_shard.json renamed to common/src/main/generated/resources/assets/generations_core/models/item/fire_tera_shard.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "generations_core:item/tera_shards/tera_dark_shard"
+    "layer0": "generations_core:item/tera_shards/fire_tera_shard"
   }
 }