fix: silver and tin ores not respecting silk touch

MrTJP · Dec 25, 2024 · a27ed1c · a27ed1c
1 parent ec64ab2
commit a27ed1c
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 17 deletions.
diff --git a/exploration/src/main/generated/.cache/09d015dc330d59f8eec0a6dc4d86adf5d6409937 b/exploration/src/main/generated/.cache/09d015dc330d59f8eec0a6dc4d86adf5d6409937
@@ -1,4 +1,4 @@
-// 1.20.1	2024-09-04T10:59:19.234548	projectred_exploration Block Loot Tables
+// 1.20.1	2024-12-24T19:37:49.042697	projectred_exploration Block Loot Tables
 f377cd52869f1bb40758dc52113c67c61d878b62 data/projectred_exploration/loot_tables/blocks/basalt.json
 6b10d48608a3129d5d7885f5430a1f1e15b1a801 data/projectred_exploration/loot_tables/blocks/basalt_brick.json
 0208b3852855ab1b7d0729980dcde806b2b17f00 data/projectred_exploration/loot_tables/blocks/basalt_brick_wall.json
@@ -9,8 +9,8 @@ f377cd52869f1bb40758dc52113c67c61d878b62 data/projectred_exploration/loot_tables
 e2ae109c6659c7709c28da431a674eb8c607bc6b data/projectred_exploration/loot_tables/blocks/deepslate_peridot_ore.json
 ce59282023621005bfe023f7e7649eb55df8df20 data/projectred_exploration/loot_tables/blocks/deepslate_ruby_ore.json
 90743dedec7a4cda562b906c4bb361806e25bd50 data/projectred_exploration/loot_tables/blocks/deepslate_sapphire_ore.json
-a7a596bb57108e065423cddb5a459c227f4bc9f1 data/projectred_exploration/loot_tables/blocks/deepslate_silver_ore.json
-ba435c351d46b69a1d0e8494f2061817f17f1621 data/projectred_exploration/loot_tables/blocks/deepslate_tin_ore.json
+2c8b823513399fc72f285df091a59dca9efe7d23 data/projectred_exploration/loot_tables/blocks/deepslate_silver_ore.json
+6e2af0d13cd64325734e20b72cb13cc288a5763c data/projectred_exploration/loot_tables/blocks/deepslate_tin_ore.json
 1f80078186126007a55ffa3312150b02f8bcb40b data/projectred_exploration/loot_tables/blocks/electrotine_block.json
 e3736d3df27fe6b845e109135612ed9856c8a0eb data/projectred_exploration/loot_tables/blocks/electrotine_block_wall.json
 08fc1f6cd5af8e816cc6b635407a64f7659978ce data/projectred_exploration/loot_tables/blocks/electrotine_ore.json
@@ -30,6 +30,6 @@ c4cb08e8ea7e7e32fb4aa2c4c484920e7a9019f2 data/projectred_exploration/loot_tables
 89016b6428da9530bd1ec46b96ab793e87edffe9 data/projectred_exploration/loot_tables/blocks/sapphire_block_wall.json
 e80459901675826889d9de14de57bc829e62fac5 data/projectred_exploration/loot_tables/blocks/sapphire_ore.json
 65989d0c279840b6a7751351c3a5d898802705ae data/projectred_exploration/loot_tables/blocks/silver_block.json
-a7a596bb57108e065423cddb5a459c227f4bc9f1 data/projectred_exploration/loot_tables/blocks/silver_ore.json
+34854d2e01bede100f7e67cd9507d02475f6d6f8 data/projectred_exploration/loot_tables/blocks/silver_ore.json
 dcc50b58d079ebca41e9c2661fc58a999653290c data/projectred_exploration/loot_tables/blocks/tin_block.json
-ba435c351d46b69a1d0e8494f2061817f17f1621 data/projectred_exploration/loot_tables/blocks/tin_ore.json
+9d420b3e2f3226c2a7709487849463eed2f53675 data/projectred_exploration/loot_tables/blocks/tin_ore.json
diff --git a/...c/main/generated/data/projectred_exploration/loot_tables/blocks/deepslate_silver_ore.json b/...c/main/generated/data/projectred_exploration/loot_tables/blocks/deepslate_silver_ore.json
@@ -5,8 +5,32 @@
       "bonus_rolls": 0.0,
       "entries": [
         {
-          "type": "minecraft:item",
-          "name": "projectred_exploration:raw_silver"
+          "type": "minecraft:alternatives",
+          "children": [
+            {
+              "type": "minecraft:item",
+              "conditions": [
+                {
+                  "condition": "minecraft:match_tool",
+                  "predicate": {
+                    "enchantments": [
+                      {
+                        "enchantment": "minecraft:silk_touch",
+                        "levels": {
+                          "min": 1
+                        }
+                      }
+                    ]
+                  }
+                }
+              ],
+              "name": "projectred_exploration:deepslate_silver_ore"
+            },
+            {
+              "type": "minecraft:item",
+              "name": "projectred_exploration:raw_silver"
+            }
+          ]
         }
       ],
       "rolls": 1.0

diff --git a/.../src/main/generated/data/projectred_exploration/loot_tables/blocks/deepslate_tin_ore.json b/.../src/main/generated/data/projectred_exploration/loot_tables/blocks/deepslate_tin_ore.json
@@ -5,8 +5,32 @@
       "bonus_rolls": 0.0,
       "entries": [
         {
-          "type": "minecraft:item",
-          "name": "projectred_exploration:raw_tin"
+          "type": "minecraft:alternatives",
+          "children": [
+            {
+              "type": "minecraft:item",
+              "conditions": [
+                {
+                  "condition": "minecraft:match_tool",
+                  "predicate": {
+                    "enchantments": [
+                      {
+                        "enchantment": "minecraft:silk_touch",
+                        "levels": {
+                          "min": 1
+                        }
+                      }
+                    ]
+                  }
+                }
+              ],
+              "name": "projectred_exploration:deepslate_tin_ore"
+            },
+            {
+              "type": "minecraft:item",
+              "name": "projectred_exploration:raw_tin"
+            }
+          ]
         }
       ],
       "rolls": 1.0

diff --git a/...oration/src/main/generated/data/projectred_exploration/loot_tables/blocks/silver_ore.json b/...oration/src/main/generated/data/projectred_exploration/loot_tables/blocks/silver_ore.json
@@ -5,8 +5,32 @@
       "bonus_rolls": 0.0,
       "entries": [
         {
-          "type": "minecraft:item",
-          "name": "projectred_exploration:raw_silver"
+          "type": "minecraft:alternatives",
+          "children": [
+            {
+              "type": "minecraft:item",
+              "conditions": [
+                {
+                  "condition": "minecraft:match_tool",
+                  "predicate": {
+                    "enchantments": [
+                      {
+                        "enchantment": "minecraft:silk_touch",
+                        "levels": {
+                          "min": 1
+                        }
+                      }
+                    ]
+                  }
+                }
+              ],
+              "name": "projectred_exploration:silver_ore"
+            },
+            {
+              "type": "minecraft:item",
+              "name": "projectred_exploration:raw_silver"
+            }
+          ]
         }
       ],
       "rolls": 1.0

diff --git a/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/tin_ore.json b/exploration/src/main/generated/data/projectred_exploration/loot_tables/blocks/tin_ore.json
@@ -5,8 +5,32 @@
       "bonus_rolls": 0.0,
       "entries": [
         {
-          "type": "minecraft:item",
-          "name": "projectred_exploration:raw_tin"
+          "type": "minecraft:alternatives",
+          "children": [
+            {
+              "type": "minecraft:item",
+              "conditions": [
+                {
+                  "condition": "minecraft:match_tool",
+                  "predicate": {
+                    "enchantments": [
+                      {
+                        "enchantment": "minecraft:silk_touch",
+                        "levels": {
+                          "min": 1
+                        }
+                      }
+                    ]
+                  }
+                }
+              ],
+              "name": "projectred_exploration:tin_ore"
+            },
+            {
+              "type": "minecraft:item",
+              "name": "projectred_exploration:raw_tin"
+            }
+          ]
         }
       ],
       "rolls": 1.0

diff --git a/...oration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLootTableProvider.java b/...oration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLootTableProvider.java
@@ -27,10 +27,10 @@ protected void registerTables() {
         register(DEEPSLATE_PERIDOT_ORE_BLOCK.get(),     valueRangeOrSilkWithFortune(DEEPSLATE_PERIDOT_ORE_BLOCK.get(),      PERIDOT_ITEM.get(), 1, 2));
         register(ELECTROTINE_ORE_BLOCK.get(),           valueRangeOrSilkWithFortune(ELECTROTINE_ORE_BLOCK.get(),            ELECTROTINE_DUST_ITEM.get(), 1, 8));
         register(DEEPSLATE_ELECTROTINE_ORE_BLOCK.get(), valueRangeOrSilkWithFortune(DEEPSLATE_ELECTROTINE_ORE_BLOCK.get(),  ELECTROTINE_DUST_ITEM.get(), 1, 8));
-        register(TIN_ORE_BLOCK.get(),                   singleItem(RAW_TIN_ITEM.get()));
-        register(DEEPSLATE_TIN_ORE_BLOCK.get(),         singleItem(RAW_TIN_ITEM.get()));
-        register(SILVER_ORE_BLOCK.get(),                singleItem(RAW_SILVER_ITEM.get()));
-        register(DEEPSLATE_SILVER_ORE_BLOCK.get(),      singleItem(RAW_SILVER_ITEM.get()));
+        register(TIN_ORE_BLOCK.get(),                   singleItemOrSilk(TIN_ORE_BLOCK.get(), RAW_TIN_ITEM.get()));
+        register(DEEPSLATE_TIN_ORE_BLOCK.get(),         singleItemOrSilk(DEEPSLATE_TIN_ORE_BLOCK.get(), RAW_TIN_ITEM.get()));
+        register(SILVER_ORE_BLOCK.get(),                singleItemOrSilk(SILVER_ORE_BLOCK.get(), RAW_SILVER_ITEM.get()));
+        register(DEEPSLATE_SILVER_ORE_BLOCK.get(),      singleItemOrSilk(DEEPSLATE_SILVER_ORE_BLOCK.get(), RAW_SILVER_ITEM.get()));
 
         // Decorative Blocks
         register(MARBLE_BLOCK.get(),         singleItem(MARBLE_BLOCK.get()));