feat: olivine cave items (#340)

* feat: olivine block textures

* feat: implement olivine caves blocks

* chore: unused imports

* chore: minor cleanup

* feat: add olivine blocks to creative tab

src/main/generated/assets/galacticraft/blockstates/olivine_basalt.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "galacticraft:block/olivine_basalt"
+    }
+  }
+}

src/main/generated/assets/galacticraft/blockstates/olivine_block.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "galacticraft:block/olivine_block",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "galacticraft:block/olivine_block"
+    },
+    "axis=z": {
+      "model": "galacticraft:block/olivine_block",
+      "x": 90
+    }
+  }
+}

src/main/generated/assets/galacticraft/blockstates/olivine_cluster.json

@@ -0,0 +1,30 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "galacticraft:block/olivine_cluster_vertical",
+      "x": 180
+    },
+    "facing=east": {
+      "model": "galacticraft:block/olivine_cluster_horizontal",
+      "x": 90,
+      "y": 90
+    },
+    "facing=north": {
+      "model": "galacticraft:block/olivine_cluster_horizontal",
+      "x": 90
+    },
+    "facing=south": {
+      "model": "galacticraft:block/olivine_cluster_horizontal",
+      "x": 90,
+      "y": 180
+    },
+    "facing=up": {
+      "model": "galacticraft:block/olivine_cluster_vertical"
+    },
+    "facing=west": {
+      "model": "galacticraft:block/olivine_cluster_horizontal",
+      "x": 90,
+      "y": 270
+    }
+  }
+}

src/main/generated/assets/galacticraft/blockstates/rich_olivine_basalt.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "galacticraft:block/rich_olivine_basalt"
+    }
+  }
+}

src/main/generated/assets/galacticraft/lang/en_us.json

@@ -194,6 +194,9 @@
   "block.galacticraft.moon_surface_rock": "Moon Surface Rock",
   "block.galacticraft.moon_tin_ore": "Moon Tin Ore",
   "block.galacticraft.moon_turf": "Moon Turf",
+  "block.galacticraft.olivine_basalt": "Olivine Basalt",
+  "block.galacticraft.olivine_block": "Block of Olivine",
+  "block.galacticraft.olivine_cluster": "Olivine Cluster",
   "block.galacticraft.orange_candle_moon_cheese_block": "Block of Cheese with Orange Candle",
   "block.galacticraft.oxygen_bubble_distributor": "Bubble Distributor",
   "block.galacticraft.oxygen_bubble_distributor.description": "Oxygen Bubble Distributor creates a bubble of air around itself. Requires oxygen and electricity.",
@@ -216,6 +219,7 @@
   "block.galacticraft.red_candle_moon_cheese_block": "Block of Cheese with Red Candle",
   "block.galacticraft.refinery": "Refinery",
   "block.galacticraft.refinery.description": "Refinery will take an input of oil and energy, and output fuel used for rockets and vehicles.",
+  "block.galacticraft.rich_olivine_basalt": "Rich Olivine Basalt",
   "block.galacticraft.rocket_launch_pad": "Rocket Launch Pad",
   "block.galacticraft.rocket_workbench": "Rocket Workbench",
   "block.galacticraft.scorched_venus_rock": "Scorched Rock",
@@ -436,6 +440,7 @@
   "item.galacticraft.meteoric_iron_nugget": "Meteoric Iron Nugget",
   "item.galacticraft.moon_buggy_schematic": "Moon Buggy Schematic",
   "item.galacticraft.nose_cone": "Nose Cone",
+  "item.galacticraft.olivine_shard": "Olivine Shard",
   "item.galacticraft.orange_parachute": "Orange Parachute",
   "item.galacticraft.orion_drive": "Orion Drive",
   "item.galacticraft.oxygen_concentrator": "Oxygen Concentrator",

src/main/generated/assets/galacticraft/models/block/olivine_basalt.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "galacticraft:block/olivine_basalt"
+  }
+}

src/main/generated/assets/galacticraft/models/block/olivine_block.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "galacticraft:block/olivine_block_top",
+    "side": "galacticraft:block/olivine_block_side"
+  }
+}

src/main/generated/assets/galacticraft/models/block/olivine_cluster_horizontal.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "galacticraft:block/olivine_cluster_horizontal"
+  }
+}

src/main/generated/assets/galacticraft/models/block/olivine_cluster_vertical.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "galacticraft:block/olivine_cluster_vertical"
+  }
+}

src/main/generated/assets/galacticraft/models/block/rich_olivine_basalt.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "galacticraft:block/rich_olivine_basalt"
+  }
+}

src/main/generated/assets/galacticraft/models/item/olivine_basalt.json

@@ -0,0 +1,3 @@
+{
+  "parent": "galacticraft:block/olivine_basalt"
+}

src/main/generated/assets/galacticraft/models/item/olivine_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "galacticraft:block/olivine_block"
+}

src/main/generated/assets/galacticraft/models/item/olivine_cluster.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "galacticraft:block/olivine_cluster_vertical"
+  }
+}

src/main/generated/assets/galacticraft/models/item/olivine_shard.json

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

src/main/generated/assets/galacticraft/models/item/rich_olivine_basalt.json

@@ -0,0 +1,3 @@
+{
+  "parent": "galacticraft:block/rich_olivine_basalt"
+}

src/main/generated/data/c/tags/blocks/clusters.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "galacticraft:olivine_cluster"
+  ]
+}

src/main/generated/data/c/tags/blocks/ores.json

@@ -5,6 +5,8 @@
     "galacticraft:deepslate_silicon_ore",
     "galacticraft:moon_copper_ore",
     "galacticraft:lunaslate_copper_ore",
+    "galacticraft:olivine_basalt",
+    "galacticraft:rich_olivine_basalt",
     "galacticraft:tin_ore",
     "galacticraft:deepslate_tin_ore",
     "galacticraft:moon_tin_ore",

src/main/generated/data/c/tags/items/clusters.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "galacticraft:olivine_cluster"
+  ]
+}

src/main/generated/data/c/tags/items/gems.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "galacticraft:olivine_shard"
+  ]
+}

src/main/generated/data/c/tags/items/ores.json

@@ -5,6 +5,8 @@
     "galacticraft:deepslate_silicon_ore",
     "galacticraft:moon_copper_ore",
     "galacticraft:lunaslate_copper_ore",
+    "galacticraft:olivine_basalt",
+    "galacticraft:rich_olivine_basalt",
     "galacticraft:tin_ore",
     "galacticraft:deepslate_tin_ore",
     "galacticraft:moon_tin_ore",

src/main/generated/data/galacticraft/advancements/recipes/misc/olivine_block_from_shards.json

@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_olivine_shard": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "galacticraft:olivine_shard"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "galacticraft:olivine_block_from_shards"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_olivine_shard"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "galacticraft:olivine_block_from_shards"
+    ]
+  }
+}

src/main/generated/data/galacticraft/loot_tables/blocks/olivine_basalt.json

@@ -0,0 +1,61 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:alternatives",
+          "children": [
+            {
+              "type": "minecraft:item",
+              "conditions": [
+                {
+                  "condition": "minecraft:match_tool",
+                  "predicate": {
+                    "enchantments": [
+                      {
+                        "enchantment": "minecraft:silk_touch",
+                        "levels": {
+                          "min": 1
+                        }
+                      }
+                    ]
+                  }
+                }
+              ],
+              "name": "galacticraft:olivine_basalt"
+            },
+            {
+              "type": "minecraft:item",
+              "functions": [
+                {
+                  "add": false,
+                  "count": {
+                    "type": "minecraft:uniform",
+                    "max": 2.0,
+                    "min": 1.0
+                  },
+                  "function": "minecraft:set_count"
+                },
+                {
+                  "enchantment": "minecraft:fortune",
+                  "formula": "minecraft:uniform_bonus_count",
+                  "function": "minecraft:apply_bonus",
+                  "parameters": {
+                    "bonusMultiplier": 1
+                  }
+                },
+                {
+                  "function": "minecraft:explosion_decay"
+                }
+              ],
+              "name": "galacticraft:olivine_shard"
+            }
+          ]
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/galacticraft/loot_tables/blocks/olivine_block.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "galacticraft:olivine_block"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}