Merge branch 'master' of https://github.com/GenerationsMod/Generation…

…s-Core

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

@@ -1673,6 +1673,7 @@
   "item.generations_core.coolness_master_ribbon": "Coolness Master Ribbon",
   "item.generations_core.copper_plate": "Copper Plate",
   "item.generations_core.coraleye_badge": "Coraleye Badge",
+  "item.generations_core.cornerstone_mask": "Cornerstone Mask",
   "item.generations_core.country_ribbon": "Country Ribbon",
   "item.generations_core.coupon_1": "Coupon 1",
   "item.generations_core.coupon_1.desc": "Not currently implemented",
@@ -2007,6 +2008,7 @@
   "item.generations_core.health_candy_xl": "Health Candy Xl",
   "item.generations_core.health_candy_xl.desc": "Not currently implemented",
   "item.generations_core.heart_scale": "Heart Scale",
+  "item.generations_core.heartflame_mask": "Heartflame Mask",
   "item.generations_core.heat_badge": "Heat Badge",
   "item.generations_core.heracronite": "Heracronite",
   "item.generations_core.hi_tech_earbuds": "Hi Tech Earbuds",
@@ -2256,7 +2258,6 @@
   "item.generations_core.mine_badge": "Mine Badge",
   "item.generations_core.mineral_badge": "Mineral Badge",
   "item.generations_core.mirror": "Mirror",
-  "item.generations_core.mirror.tooltip": "§7HINT: Instead of seeing your reflection, you see Gems. They’re pink, blue, and white and laid out in a frame.",
   "item.generations_core.misty_seed": "Misty Seed",
   "item.generations_core.mixed_mushrooms": "Mixed Mushrooms",
   "item.generations_core.moomoo_cheese": "Moomoo Cheese",
@@ -2823,6 +2824,7 @@
   "item.generations_core.tapunium_z": "Tapunium Z",
   "item.generations_core.teachy_tv": "Teachy Tv",
   "item.generations_core.teachy_tv.desc": "Not currently implemented",
+  "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.terrain_extender": "Terrain Extender",
@@ -3174,6 +3176,7 @@
   "item.generations_core.waterium_z": "Waterium Z",
   "item.generations_core.wave_badge": "Wave Badge",
   "item.generations_core.wave_incense": "Wave Incense",
+  "item.generations_core.wellspring_mask": "Wellspring Mask",
   "item.generations_core.white_flute": "White Flute",
   "item.generations_core.white_mane_hair": "White Mane Hair",
   "item.generations_core.white_mane_hair.tooltip": "§7HINT: This majestic steed requires a generous offering of carrots if you wish to lay your eyes upon them.",

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

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "generations_core:item/held_items/cornerstone_mask"
+  }
+}

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

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

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

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "generations_core:item/held_items/teal_mask"
+  }
+}

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

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "generations_core:item/held_items/wellspring_mask"
+  }
+}

common/src/main/generated/resources/data/generations_core/tags/items/held_items.json

@@ -152,6 +152,10 @@
     "generations_core:punching_glove",
     "generations_core:clear_amulet",
     "generations_core:booster_energy",
-    "generations_core:fairy_feather"
+    "generations_core:fairy_feather",
+    "generations_core:teal_mask",
+    "generations_core:wellspring_mask",
+    "generations_core:heartflame_mask",
+    "generations_core:cornerstone_mask"
   ]
 }

common/src/main/generated/resources/data/generations_core/tags/items/legendary_items.json

@@ -59,10 +59,10 @@
     "generations_core:sparkling_shard",
     "generations_core:sparkling_stone",
     "generations_core:rusty_fragment",
-    "generations_core:rusty_sword",
     "generations_core:crowned_sword",
-    "generations_core:rusty_shield",
+    "generations_core:rusty_sword",
     "generations_core:crowned_shield",
+    "generations_core:rusty_shield",
     "generations_core:scroll_page",
     "generations_core:secret_armor_scroll",
     "generations_core:zygarde_cube",

common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/axe.json

@@ -55,6 +55,102 @@
     "generations_core:cursed_jack_o_lantern",
     "generations_core:cursed_carved_pumpkin",
     "generations_core:scarecrow",
-    "generations_core:box"
+    "generations_core:box",
+    "generations_core:purple_couch_arm_left",
+    "generations_core:light_blue_couch_arm_left",
+    "generations_core:pink_couch_arm_left",
+    "generations_core:brown_couch_arm_left",
+    "generations_core:cyan_couch_arm_left",
+    "generations_core:orange_couch_arm_left",
+    "generations_core:light_gray_couch_arm_left",
+    "generations_core:blue_couch_arm_left",
+    "generations_core:green_couch_arm_left",
+    "generations_core:black_couch_arm_left",
+    "generations_core:yellow_couch_arm_left",
+    "generations_core:magenta_couch_arm_left",
+    "generations_core:red_couch_arm_left",
+    "generations_core:gray_couch_arm_left",
+    "generations_core:white_couch_arm_left",
+    "generations_core:lime_couch_arm_left",
+    "generations_core:purple_couch_arm_right",
+    "generations_core:light_blue_couch_arm_right",
+    "generations_core:pink_couch_arm_right",
+    "generations_core:brown_couch_arm_right",
+    "generations_core:cyan_couch_arm_right",
+    "generations_core:orange_couch_arm_right",
+    "generations_core:light_gray_couch_arm_right",
+    "generations_core:blue_couch_arm_right",
+    "generations_core:green_couch_arm_right",
+    "generations_core:black_couch_arm_right",
+    "generations_core:yellow_couch_arm_right",
+    "generations_core:magenta_couch_arm_right",
+    "generations_core:red_couch_arm_right",
+    "generations_core:gray_couch_arm_right",
+    "generations_core:white_couch_arm_right",
+    "generations_core:lime_couch_arm_right",
+    "generations_core:purple_couch_corner_left",
+    "generations_core:light_blue_couch_corner_left",
+    "generations_core:pink_couch_corner_left",
+    "generations_core:brown_couch_corner_left",
+    "generations_core:cyan_couch_corner_left",
+    "generations_core:orange_couch_corner_left",
+    "generations_core:light_gray_couch_corner_left",
+    "generations_core:blue_couch_corner_left",
+    "generations_core:green_couch_corner_left",
+    "generations_core:black_couch_corner_left",
+    "generations_core:yellow_couch_corner_left",
+    "generations_core:magenta_couch_corner_left",
+    "generations_core:red_couch_corner_left",
+    "generations_core:gray_couch_corner_left",
+    "generations_core:white_couch_corner_left",
+    "generations_core:lime_couch_corner_left",
+    "generations_core:purple_couch_corner_right",
+    "generations_core:light_blue_couch_corner_right",
+    "generations_core:pink_couch_corner_right",
+    "generations_core:brown_couch_corner_right",
+    "generations_core:cyan_couch_corner_right",
+    "generations_core:orange_couch_corner_right",
+    "generations_core:light_gray_couch_corner_right",
+    "generations_core:blue_couch_corner_right",
+    "generations_core:green_couch_corner_right",
+    "generations_core:black_couch_corner_right",
+    "generations_core:yellow_couch_corner_right",
+    "generations_core:magenta_couch_corner_right",
+    "generations_core:red_couch_corner_right",
+    "generations_core:gray_couch_corner_right",
+    "generations_core:white_couch_corner_right",
+    "generations_core:lime_couch_corner_right",
+    "generations_core:purple_couch_middle",
+    "generations_core:light_blue_couch_middle",
+    "generations_core:pink_couch_middle",
+    "generations_core:brown_couch_middle",
+    "generations_core:cyan_couch_middle",
+    "generations_core:orange_couch_middle",
+    "generations_core:light_gray_couch_middle",
+    "generations_core:blue_couch_middle",
+    "generations_core:green_couch_middle",
+    "generations_core:black_couch_middle",
+    "generations_core:yellow_couch_middle",
+    "generations_core:magenta_couch_middle",
+    "generations_core:red_couch_middle",
+    "generations_core:gray_couch_middle",
+    "generations_core:white_couch_middle",
+    "generations_core:lime_couch_middle",
+    "generations_core:purple_couch_ottoman",
+    "generations_core:light_blue_couch_ottoman",
+    "generations_core:pink_couch_ottoman",
+    "generations_core:brown_couch_ottoman",
+    "generations_core:cyan_couch_ottoman",
+    "generations_core:orange_couch_ottoman",
+    "generations_core:light_gray_couch_ottoman",
+    "generations_core:blue_couch_ottoman",
+    "generations_core:green_couch_ottoman",
+    "generations_core:black_couch_ottoman",
+    "generations_core:yellow_couch_ottoman",
+    "generations_core:magenta_couch_ottoman",
+    "generations_core:red_couch_ottoman",
+    "generations_core:gray_couch_ottoman",
+    "generations_core:white_couch_ottoman",
+    "generations_core:lime_couch_ottoman"
   ]
 }

common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -796,22 +796,150 @@
     "generations_core:pink_elevator",
     "generations_core:desk",
     "generations_core:fridge",
-    "generations_core:green_pc",
-    "generations_core:white_pc",
-    "generations_core:magenta_pc",
-    "generations_core:blue_pc",
+    "generations_core:purple_street_lamp",
+    "generations_core:light_blue_street_lamp",
+    "generations_core:pink_street_lamp",
+    "generations_core:brown_street_lamp",
+    "generations_core:cyan_street_lamp",
+    "generations_core:orange_street_lamp",
+    "generations_core:light_gray_street_lamp",
+    "generations_core:blue_street_lamp",
+    "generations_core:green_street_lamp",
+    "generations_core:black_street_lamp",
+    "generations_core:yellow_street_lamp",
+    "generations_core:magenta_street_lamp",
+    "generations_core:red_street_lamp",
+    "generations_core:gray_street_lamp",
+    "generations_core:white_street_lamp",
+    "generations_core:lime_street_lamp",
+    "generations_core:purple_street_lamp",
+    "generations_core:light_blue_street_lamp",
+    "generations_core:pink_street_lamp",
+    "generations_core:brown_street_lamp",
+    "generations_core:cyan_street_lamp",
+    "generations_core:orange_street_lamp",
+    "generations_core:light_gray_street_lamp",
+    "generations_core:blue_street_lamp",
+    "generations_core:green_street_lamp",
+    "generations_core:black_street_lamp",
+    "generations_core:yellow_street_lamp",
+    "generations_core:magenta_street_lamp",
+    "generations_core:red_street_lamp",
+    "generations_core:gray_street_lamp",
+    "generations_core:white_street_lamp",
+    "generations_core:lime_street_lamp",
+    "generations_core:purple_street_lamp",
+    "generations_core:light_blue_street_lamp",
+    "generations_core:pink_street_lamp",
+    "generations_core:brown_street_lamp",
+    "generations_core:cyan_street_lamp",
+    "generations_core:orange_street_lamp",
+    "generations_core:light_gray_street_lamp",
+    "generations_core:blue_street_lamp",
+    "generations_core:green_street_lamp",
+    "generations_core:black_street_lamp",
+    "generations_core:yellow_street_lamp",
+    "generations_core:magenta_street_lamp",
+    "generations_core:red_street_lamp",
+    "generations_core:gray_street_lamp",
+    "generations_core:white_street_lamp",
+    "generations_core:lime_street_lamp",
+    "generations_core:purple_street_lamp",
+    "generations_core:light_blue_street_lamp",
+    "generations_core:pink_street_lamp",
+    "generations_core:brown_street_lamp",
+    "generations_core:cyan_street_lamp",
+    "generations_core:orange_street_lamp",
+    "generations_core:light_gray_street_lamp",
+    "generations_core:blue_street_lamp",
+    "generations_core:green_street_lamp",
+    "generations_core:black_street_lamp",
+    "generations_core:yellow_street_lamp",
+    "generations_core:magenta_street_lamp",
+    "generations_core:red_street_lamp",
+    "generations_core:gray_street_lamp",
+    "generations_core:white_street_lamp",
+    "generations_core:lime_street_lamp",
+    "generations_core:purple_street_lamp",
+    "generations_core:light_blue_street_lamp",
+    "generations_core:pink_street_lamp",
+    "generations_core:brown_street_lamp",
+    "generations_core:cyan_street_lamp",
+    "generations_core:orange_street_lamp",
+    "generations_core:light_gray_street_lamp",
+    "generations_core:blue_street_lamp",
+    "generations_core:green_street_lamp",
+    "generations_core:black_street_lamp",
+    "generations_core:yellow_street_lamp",
+    "generations_core:magenta_street_lamp",
+    "generations_core:red_street_lamp",
+    "generations_core:gray_street_lamp",
+    "generations_core:white_street_lamp",
+    "generations_core:lime_street_lamp",
+    "generations_core:purple_street_lamp",
+    "generations_core:light_blue_street_lamp",
+    "generations_core:pink_street_lamp",
+    "generations_core:brown_street_lamp",
+    "generations_core:cyan_street_lamp",
+    "generations_core:orange_street_lamp",
+    "generations_core:light_gray_street_lamp",
+    "generations_core:blue_street_lamp",
+    "generations_core:green_street_lamp",
+    "generations_core:black_street_lamp",
+    "generations_core:yellow_street_lamp",
+    "generations_core:magenta_street_lamp",
+    "generations_core:red_street_lamp",
+    "generations_core:gray_street_lamp",
+    "generations_core:white_street_lamp",
+    "generations_core:lime_street_lamp",
+    "generations_core:purple_street_lamp",
+    "generations_core:light_blue_street_lamp",
+    "generations_core:pink_street_lamp",
+    "generations_core:brown_street_lamp",
+    "generations_core:cyan_street_lamp",
+    "generations_core:orange_street_lamp",
+    "generations_core:light_gray_street_lamp",
+    "generations_core:blue_street_lamp",
+    "generations_core:green_street_lamp",
+    "generations_core:black_street_lamp",
+    "generations_core:yellow_street_lamp",
+    "generations_core:magenta_street_lamp",
+    "generations_core:red_street_lamp",
+    "generations_core:gray_street_lamp",
+    "generations_core:white_street_lamp",
+    "generations_core:lime_street_lamp",
+    "generations_core:purple_street_lamp",
+    "generations_core:light_blue_street_lamp",
+    "generations_core:pink_street_lamp",
+    "generations_core:brown_street_lamp",
+    "generations_core:cyan_street_lamp",
+    "generations_core:orange_street_lamp",
+    "generations_core:light_gray_street_lamp",
+    "generations_core:blue_street_lamp",
+    "generations_core:green_street_lamp",
+    "generations_core:black_street_lamp",
+    "generations_core:yellow_street_lamp",
+    "generations_core:magenta_street_lamp",
+    "generations_core:red_street_lamp",
+    "generations_core:gray_street_lamp",
+    "generations_core:white_street_lamp",
+    "generations_core:lime_street_lamp",
+    "generations_core:purple_pc",
     "generations_core:light_blue_pc",
     "generations_core:pink_pc",
-    "generations_core:light_gray_pc",
     "generations_core:brown_pc",
-    "generations_core:gray_pc",
-    "generations_core:purple_pc",
-    "generations_core:yellow_pc",
-    "generations_core:black_pc",
     "generations_core:cyan_pc",
-    "generations_core:lime_pc",
     "generations_core:orange_pc",
+    "generations_core:light_gray_pc",
+    "generations_core:blue_pc",
+    "generations_core:green_pc",
+    "generations_core:black_pc",
+    "generations_core:yellow_pc",
+    "generations_core:magenta_pc",
     "generations_core:red_pc",
+    "generations_core:gray_pc",
+    "generations_core:white_pc",
+    "generations_core:lime_pc",
     "generations_core:empty_ball_display",
     "generations_core:poke_ball_display",
     "generations_core:great_ball_display",

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

@@ -2,13 +2,15 @@ package generations.gg.generations.core.generationscore.common
 
 import com.cobblemon.mod.common.api.dialogue.Dialogue
 import com.cobblemon.mod.common.api.dialogue.Dialogues
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
 import com.cobblemon.mod.common.util.asTranslated
 import com.cobblemon.mod.common.util.openDialogue
 import dev.architectury.event.EventResult
 import dev.architectury.event.events.common.InteractionEvent
 import generations.gg.generations.core.generationscore.common.api.events.general.EntityEvents
 import generations.gg.generations.core.generationscore.common.tags.GenerationsBlockTags
 import generations.gg.generations.core.generationscore.common.world.entity.ZygardeCellEntity
+import generations.gg.generations.core.generationscore.common.world.item.GenerationsCobblemonInteractions
 import generations.gg.generations.core.generationscore.common.world.item.GenerationsItems
 import generations.gg.generations.core.generationscore.common.world.item.ZygardeCubeItem
 import generations.gg.generations.core.generationscore.common.world.level.block.ElevatorBlock
@@ -63,6 +65,8 @@ object GenerationsArchitecturyEvents {
         }
 
         InteractionEvent.INTERACT_ENTITY.register { player, entity, hand ->
+            if(player !is ServerPlayer) return@register EventResult.pass()
+
             val stack = player.getItemInHand(hand)
             if (stack.`is`(GenerationsItems.ZYGARDE_CUBE.get()) && entity is ZygardeCellEntity) {
                 if (stack.damageValue != ZygardeCubeItem.FULL) {
@@ -74,6 +78,10 @@ object GenerationsArchitecturyEvents {
                 } else {
                     player.displayClientMessage("item.generations_core.zygarde_cube.tooltip.cell_full".asTranslated(), false)
                 }
+            } else {
+                if(entity is PokemonEntity) {
+                    return@register if(GenerationsCobblemonInteractions.triggerCustomInteraction(entity, player, stack)) EventResult.interruptTrue() else EventResult.pass()
+                }
             }
 
             return@register EventResult.pass()