Update to currentHEADmain

13 files changed, 281 insertions, 1 deletions

diff --git a/src/main/resources/data/sparkt/loot_tables/block/machine_block.json b/src/main/resources/data/sparkt/loot_table/blocks/machine_frame.json
index 5c6db56..10e03be 100644
--- a/src/main/resources/data/sparkt/loot_tables/block/machine_block.json
+++ b/src/main/resources/data/sparkt/loot_table/blocks/machine_frame.json
@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "sparkt:machine_block"
+          "name": "sparkt:machine_frame"
         }
       ],
       "conditions": [
diff --git a/src/main/resources/data/sparkt/loot_table/blocks/ore_deepslate_tungsten.json b/src/main/resources/data/sparkt/loot_table/blocks/ore_deepslate_tungsten.json
new file mode 100644
index 0000000..4e2f050
--- /dev/null
+++ b/src/main/resources/data/sparkt/loot_table/blocks/ore_deepslate_tungsten.json
@@ -0,0 +1,52 @@
+{
+    "type": "minecraft:block",
+    "pools": [
+      {
+        "bonus_rolls": 0.0,
+        "entries": [
+          {
+            "type": "minecraft:alternatives",
+            "children": [
+              {
+                "type": "minecraft:item",
+                "conditions": [
+                  {
+                    "condition": "minecraft:match_tool",
+                    "predicate": {
+                      "predicates": {
+                        "minecraft:enchantments": [
+                          {
+                            "enchantments": "minecraft:silk_touch",
+                            "levels": {
+                              "min": 1
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  }
+                ],
+                "name": "sparkt:ore_deepslate_tungsten"
+              },
+              {
+                "type": "minecraft:item",
+                "functions": [
+                  {
+                    "enchantment": "minecraft:fortune",
+                    "formula": "minecraft:ore_drops",
+                    "function": "minecraft:apply_bonus"
+                  },
+                  {
+                    "function": "minecraft:explosion_decay"
+                  }
+                ],
+                "name": "sparkt:raw_tungsten"
+              }
+            ]
+          }
+        ],
+        "rolls": 1.0
+      }
+    ],
+    "random_sequence": "sparkt:blocks/ore_deepslate_tungsten"
+  }
\ No newline at end of file
diff --git a/src/main/resources/data/sparkt/loot_table/blocks/ore_tungsten.json b/src/main/resources/data/sparkt/loot_table/blocks/ore_tungsten.json
new file mode 100644
index 0000000..0cff1a3
--- /dev/null
+++ b/src/main/resources/data/sparkt/loot_table/blocks/ore_tungsten.json
@@ -0,0 +1,52 @@
+{
+    "type": "minecraft:block",
+    "pools": [
+      {
+        "bonus_rolls": 0.0,
+        "entries": [
+          {
+            "type": "minecraft:alternatives",
+            "children": [
+              {
+                "type": "minecraft:item",
+                "conditions": [
+                  {
+                    "condition": "minecraft:match_tool",
+                    "predicate": {
+                      "predicates": {
+                        "minecraft:enchantments": [
+                          {
+                            "enchantments": "minecraft:silk_touch",
+                            "levels": {
+                              "min": 1
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  }
+                ],
+                "name": "sparkt:ore_tungsten"
+              },
+              {
+                "type": "minecraft:item",
+                "functions": [
+                  {
+                    "enchantment": "minecraft:fortune",
+                    "formula": "minecraft:ore_drops",
+                    "function": "minecraft:apply_bonus"
+                  },
+                  {
+                    "function": "minecraft:explosion_decay"
+                  }
+                ],
+                "name": "sparkt:raw_tungsten"
+              }
+            ]
+          }
+        ],
+        "rolls": 1.0
+      }
+    ],
+    "random_sequence": "sparkt:blocks/ore_tungsten"
+  }
\ No newline at end of file
diff --git a/src/main/resources/data/sparkt/recipe/heating_element.json b/src/main/resources/data/sparkt/recipe/heating_element.json
new file mode 100644
index 0000000..c5ee59f
--- /dev/null
+++ b/src/main/resources/data/sparkt/recipe/heating_element.json
@@ -0,0 +1,23 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        " w ",
+        "wfw",
+        " c "
+    ],
+    "key": {
+        "w": {
+            "item": "sparkt:ingot_tungsten"
+        },
+        "f": {
+            "item": "minecraft:iron_ingot"
+        },
+        "c": {
+            "item": "minecraft:copper_ingot"
+        }
+    },
+    "result": {
+        "id": "sparkt:heating_element",
+        "count": 3
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_ore.json b/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_ore.json
new file mode 100644
index 0000000..c8b636c
--- /dev/null
+++ b/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_ore.json
@@ -0,0 +1,13 @@
+{
+    "type": "minecraft:blasting",
+    "category": "misc",
+    "cookingtime": 100,
+    "experience": 0.7,
+    "group": "ingot_tungsten",
+    "ingredient": {
+      "item": "sparkt:ore_tungsten"
+    },
+    "result": {
+      "id": "sparkt:ingot_tungsten"
+    }
+  }
\ No newline at end of file
diff --git a/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_ore_deepslate.json b/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_ore_deepslate.json
new file mode 100644
index 0000000..24096f5
--- /dev/null
+++ b/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_ore_deepslate.json
@@ -0,0 +1,13 @@
+{
+    "type": "minecraft:blasting",
+    "category": "misc",
+    "cookingtime": 100,
+    "experience": 0.7,
+    "group": "ingot_tungsten",
+    "ingredient": {
+      "item": "sparkt:ore_deepslate_tungsten"
+    },
+    "result": {
+      "id": "sparkt:ingot_tungsten"
+    }
+  }
\ No newline at end of file
diff --git a/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_raw.json b/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_raw.json
new file mode 100644
index 0000000..8758117
--- /dev/null
+++ b/src/main/resources/data/sparkt/recipe/ingot_tungsten_blast_raw.json
@@ -0,0 +1,13 @@
+{
+    "type": "minecraft:blasting",
+    "category": "misc",
+    "cookingtime": 100,
+    "experience": 0.7,
+    "group": "ingot_tungsten",
+    "ingredient": {
+      "item": "sparkt:raw_tungsten"
+    },
+    "result": {
+      "id": "sparkt:ingot_tungsten"
+    }
+  }
\ No newline at end of file
diff --git a/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_ore.json b/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_ore.json
new file mode 100644
index 0000000..7c049cf
--- /dev/null
+++ b/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_ore.json
@@ -0,0 +1,13 @@
+{
+    "type": "minecraft:smelting",
+    "category": "misc",
+    "cookingtime": 200,
+    "experience": 0.7,
+    "group": "ingot_tungsten",
+    "ingredient": {
+      "item": "sparkt:ore_tungsten"
+    },
+    "result": {
+      "id": "sparkt:ingot_tungsten"
+    }
+  }
\ No newline at end of file
diff --git a/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_ore_deepslate.json b/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_ore_deepslate.json
new file mode 100644
index 0000000..7d8b984
--- /dev/null
+++ b/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_ore_deepslate.json
@@ -0,0 +1,13 @@
+{
+    "type": "minecraft:smelting",
+    "category": "misc",
+    "cookingtime": 200,
+    "experience": 0.7,
+    "group": "ingot_tungsten",
+    "ingredient": {
+      "item": "sparkt:ore_deepslate_tungsten"
+    },
+    "result": {
+      "id": "sparkt:ingot_tungsten"
+    }
+  }
\ No newline at end of file
diff --git a/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_raw.json b/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_raw.json
new file mode 100644
index 0000000..3ea83f6
--- /dev/null
+++ b/src/main/resources/data/sparkt/recipe/ingot_tungsten_smelt_raw.json
@@ -0,0 +1,13 @@
+{
+    "type": "minecraft:smelting",
+    "category": "misc",
+    "cookingtime": 200,
+    "experience": 0.7,
+    "group": "ingot_tungsten",
+    "ingredient": {
+      "item": "sparkt:raw_tungsten"
+    },
+    "result": {
+      "id": "sparkt:ingot_tungsten"
+    }
+  }
\ No newline at end of file
diff --git a/src/main/resources/data/sparkt/recipe/machine_frame.json b/src/main/resources/data/sparkt/recipe/machine_frame.json
new file mode 100644
index 0000000..06d2760
--- /dev/null
+++ b/src/main/resources/data/sparkt/recipe/machine_frame.json
@@ -0,0 +1,20 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "isi",
+        "s s",
+        "isi"
+    ],
+    "key": {
+        "s": {
+            "item": "minecraft:smooth_stone"
+        },
+        "i": {
+            "item": "minecraft:iron_ingot"
+        }
+    },
+    "result": {
+        "id": "sparkt:machine_frame",
+        "count": 2
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/sparkt/recipe/machine_furnace.json b/src/main/resources/data/sparkt/recipe/machine_furnace.json
new file mode 100644
index 0000000..9ab9dc4
--- /dev/null
+++ b/src/main/resources/data/sparkt/recipe/machine_furnace.json
@@ -0,0 +1,26 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "rmr",
+        "hfh",
+        "rhr"
+    ],
+    "key": {
+        "r": {
+            "item": "minecraft:redstone"
+        },
+        "m": {
+            "item": "sparkt:machine_frame"
+        },
+        "h": {
+            "item": "sparkt:heating_element"
+        },
+        "f": {
+            "item": "minecraft:furnace"
+        }
+    },
+    "result": {
+        "id": "sparkt:machine_furnace",
+        "count": 1
+    }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/sparkt/recipe/machine_grinder.json b/src/main/resources/data/sparkt/recipe/machine_grinder.json
new file mode 100644
index 0000000..37cee40
--- /dev/null
+++ b/src/main/resources/data/sparkt/recipe/machine_grinder.json
@@ -0,0 +1,29 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "rir",
+        "pmp",
+        "ccc"
+    ],
+    "key": {
+        "r": {
+            "item": "minecraft:redstone"
+        },
+        "i": {
+            "item": "minecraft:iron_block"
+        },
+        "p": {
+            "item": "minecraft:piston"
+        },
+        "m": {
+            "item": "sparkt:machine_frame"
+        },
+        "c": {
+            "item": "minecraft:copper_ingot"
+        }
+    },
+    "result": {
+        "id": "sparkt:machine_grinder",
+        "count": 1
+    }
+}
\ No newline at end of file