From 269800a2d8a7327b05a716f14f91bf95a316a6ec Mon Sep 17 00:00:00 2001
From: screret <68943070+screret@users.noreply.github.com>
Date: Thu, 16 May 2024 16:39:02 +0300
Subject: [PATCH] fix mineability of planet stone blocks

---
 .../data/minecraft/tags/blocks/mineable/pickaxe.json      | 5 +++++
 .../data/minecraft/tags/blocks/mineable/shovel.json       | 7 +++++++
 .../java/argent_matter/gcyr/common/data/GCyRBlocks.java   | 8 ++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json

diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
index a3ac8d0c..ad022558 100644
--- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
+++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
@@ -7,6 +7,11 @@
     "gcyr:dyson_solar_cell",
     "gcyr:dyson_sphere_maintenance_port",
     "gcyr:stainless_evaporation_casing",
+    "gcyr:mercury_rock",
+    "gcyr:venusian_regolith",
+    "gcyr:venus_rock",
+    "gcyr:moon_stone",
+    "gcyr:martian_rock",
     "gcyr:airlock_door",
     "gcyr:launch_pad",
     "gcyr:seat"
diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json
new file mode 100644
index 00000000..34ae77cd
--- /dev/null
+++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json
@@ -0,0 +1,7 @@
+{
+  "values": [
+    "gcyr:venus_sand",
+    "gcyr:moon_sand",
+    "gcyr:mars_regolith"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/java/argent_matter/gcyr/common/data/GCyRBlocks.java b/src/main/java/argent_matter/gcyr/common/data/GCyRBlocks.java
index bfa80802..78065f77 100644
--- a/src/main/java/argent_matter/gcyr/common/data/GCyRBlocks.java
+++ b/src/main/java/argent_matter/gcyr/common/data/GCyRBlocks.java
@@ -58,6 +58,7 @@ public class  GCyRBlocks {
             .initialProperties(() -> Blocks.STONE)
             .properties(properties -> properties.mapColor(MapColor.COLOR_GRAY))
             .blockstate(GCyRModels::randomRotatedModel)
+            .tag(BlockTags.MINEABLE_WITH_PICKAXE)
             .simpleItem()
             .register();
     //endregion
@@ -68,6 +69,7 @@ public class  GCyRBlocks {
             .initialProperties(() -> Blocks.SAND)
             .properties(properties -> properties.mapColor(MapColor.TERRACOTTA_ORANGE))
             .blockstate(GCyRModels::randomRotatedModel)
+            .tag(BlockTags.MINEABLE_WITH_SHOVEL)
             .simpleItem()
             .register();
 
@@ -76,6 +78,7 @@ public class  GCyRBlocks {
             .initialProperties(() -> Blocks.SANDSTONE)
             .properties(properties -> properties.mapColor(MapColor.TERRACOTTA_GRAY))
             .blockstate(GCyRModels::randomRotatedModel)
+            .tag(BlockTags.MINEABLE_WITH_PICKAXE)
             .simpleItem()
             .register();
 
@@ -84,6 +87,7 @@ public class  GCyRBlocks {
             .initialProperties(() -> Blocks.STONE)
             .properties(properties -> properties.mapColor(MapColor.TERRACOTTA_LIGHT_GRAY))
             .blockstate(GCyRModels::randomRotatedModel)
+            .tag(BlockTags.MINEABLE_WITH_PICKAXE)
             .simpleItem()
             .register();
     //endregion
@@ -95,6 +99,7 @@ public class  GCyRBlocks {
             .initialProperties(() -> Blocks.STONE)
             .properties(properties -> properties.mapColor(MapColor.COLOR_LIGHT_GRAY))
             .blockstate(GCyRModels::randomRotatedModel)
+            .tag(BlockTags.MINEABLE_WITH_PICKAXE)
             .simpleItem()
             .register();
 
@@ -102,6 +107,7 @@ public class  GCyRBlocks {
             .block("moon_sand", FallingBlock::new)
             .initialProperties(() -> Blocks.GRAVEL)
             .blockstate(GCyRModels::randomRotatedModel)
+            .tag(BlockTags.MINEABLE_WITH_SHOVEL)
             .simpleItem()
             .register();
     //endregion
@@ -110,6 +116,7 @@ public class  GCyRBlocks {
     public static final BlockEntry<FallingBlock> MARS_REGOLITH = REGISTRATE
             .block("mars_regolith", FallingBlock::new)
             .initialProperties(()  -> Blocks.RED_SAND)
+            .tag(BlockTags.MINEABLE_WITH_SHOVEL)
             .simpleItem()
             .register();
 
@@ -117,6 +124,7 @@ public class  GCyRBlocks {
             .block("martian_rock", Block::new)
             .initialProperties(() -> Blocks.STONE)
             .properties(properties -> properties.mapColor(MapColor.COLOR_RED))
+            .tag(BlockTags.MINEABLE_WITH_PICKAXE)
             .simpleItem()
             .register();
     // endregion