Refactor ground type gem cluster

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

@@ -343,7 +343,7 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
     @JvmField
     val TYPE_GEM_CLUSTER_POISON = typeGemCluster("poison_gem_cluster", TYPE_GEM_BLOCK_POISON, cobblemonResource("poison_gem"))
     @JvmField
-    val TYPE_GEM_CLUSTER_GROUND = typeGemCluster("type_gem_cluster_ground", TYPE_GEM_BLOCK_GROUND, cobblemonResource("ground_gem"))
+    val TYPE_GEM_CLUSTER_GROUND = typeGemCluster("ground_gem_cluster", TYPE_GEM_BLOCK_GROUND, cobblemonResource("ground_gem"))
     @JvmField
     val TYPE_GEM_CLUSTER_FLYING = typeGemCluster("type_gem_cluster_flying", TYPE_GEM_BLOCK_FLYING, cobblemonResource("flying_gem"))
     @JvmField

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

@@ -1234,7 +1234,7 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
     @JvmField
     val TYPE_GEM_CLUSTER_POISON = blockItem("poison_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_POISON)
     @JvmField
-    val TYPE_GEM_CLUSTER_GROUND = blockItem("type_gem_cluster_ground", CobblemonBlocks.TYPE_GEM_CLUSTER_GROUND)
+    val TYPE_GEM_CLUSTER_GROUND = blockItem("ground_gem_cluster", CobblemonBlocks.TYPE_GEM_CLUSTER_GROUND)
     @JvmField
     val TYPE_GEM_CLUSTER_FLYING = blockItem("type_gem_cluster_flying", CobblemonBlocks.TYPE_GEM_CLUSTER_FLYING)
     @JvmField

common/src/main/resources/assets/cobblemon/blockstates/ground_gem_cluster.json

@@ -79,28 +79,28 @@
       "y": 90
     },
     "stage=3,facing=down": {
-      "model": "cobblemon:block/type_gems/type_gem_cluster_ground",
+      "model": "cobblemon:block/type_gems/ground_gem_cluster",
       "x": 180
     },
     "stage=3,facing=up": {
-      "model": "cobblemon:block/type_gems/type_gem_cluster_ground"
+      "model": "cobblemon:block/type_gems/ground_gem_cluster"
     },
     "stage=3,facing=north": {
-      "model": "cobblemon:block/type_gems/type_gem_cluster_ground",
+      "model": "cobblemon:block/type_gems/ground_gem_cluster",
       "x": 90
     },
     "stage=3,facing=south": {
-      "model": "cobblemon:block/type_gems/type_gem_cluster_ground",
+      "model": "cobblemon:block/type_gems/ground_gem_cluster",
       "x": 90,
       "y": 180
     },
     "stage=3,facing=west": {
-      "model": "cobblemon:block/type_gems/type_gem_cluster_ground",
+      "model": "cobblemon:block/type_gems/ground_gem_cluster",
       "x": 90,
       "y": 270
     },
     "stage=3,facing=east": {
-      "model": "cobblemon:block/type_gems/type_gem_cluster_ground",
+      "model": "cobblemon:block/type_gems/ground_gem_cluster",
       "x": 90,
       "y": 90
     }

common/src/main/resources/assets/cobblemon/lang/en_us.json

@@ -227,7 +227,7 @@
   "block.cobblemon.type_gem_cluster_ice": "Ice Type Gem Cluster",
   "block.cobblemon.type_gem_cluster_fighting": "Fighting Type Gem Cluster",
   "block.cobblemon.poison_gem_cluster": "Poison Gem Cluster",
-  "block.cobblemon.type_gem_cluster_ground": "Ground Type Gem Cluster",
+  "block.cobblemon.ground_gem_cluster": "Ground Gem Cluster",
   "block.cobblemon.type_gem_cluster_flying": "Flying Type Gem Cluster",
   "block.cobblemon.type_gem_cluster_psychic": "Psychic Type Gem Cluster",
   "block.cobblemon.type_gem_cluster_bug": "Bug Type Gem Cluster",

common/src/main/resources/assets/cobblemon/models/block/type_gems/ground_gem_cluster.json

@@ -3,6 +3,6 @@
   "ambientocclusion": false,
   "gui_light": "front",
   "textures": {
-    "cross": "cobblemon:block/type_gems/type_gem_cluster_ground"
+    "cross": "cobblemon:block/type_gems/ground_gem_cluster"
   }
 }

common/src/main/resources/assets/cobblemon/models/item/ground_gem_cluster.json

@@ -1,7 +1,7 @@
 {
     "parent":  "minecraft:item/generated",
     "textures":  {
-                     "layer0":  "cobblemon:block/type_gems/type_gem_cluster_ground"
+                     "layer0":  "cobblemon:block/type_gems/ground_gem_cluster"
                  },
     "overrides":  [
                       {

common/src/main/resources/data/cobblemon/loot_table/blocks/ground_gem_cluster.json

@@ -26,13 +26,13 @@
                   }
                 }
               ],
-              "name": "cobblemon:type_gem_cluster_ground"
+              "name": "cobblemon:ground_gem_cluster"
             },
             {
               "type": "minecraft:item",
               "conditions": [
                 {
-                  "block": "cobblemon:type_gem_cluster_ground",
+                  "block": "cobblemon:ground_gem_cluster",
                   "condition": "minecraft:block_state_property",
                   "properties": {
                     "stage": "3"

common/src/main/resources/data/cobblemon/tags/block/type_gem_clusters.json

@@ -8,7 +8,7 @@
     "cobblemon:type_gem_cluster_ice",
     "cobblemon:type_gem_cluster_fighting",
     "cobblemon:poison_gem_cluster",
-    "cobblemon:type_gem_cluster_ground",
+    "cobblemon:ground_gem_cluster",
     "cobblemon:type_gem_cluster_flying",
     "cobblemon:type_gem_cluster_psychic",
     "cobblemon:type_gem_cluster_bug",