CHANGELOG.md

@@ -7,13 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-Initial 1.21.1 release
-
-### Added
-
-- Netherite upgrades no longer need a smithing template
-- Backported bundle
-- Added [Trees Make Sound](https://modrinth.com/mod/trees-make-sound)
+Initial release
 
 [unreleased]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/src/branch/1.21.1
 [2.0.1]: https://patience.nearmisses.xyz/SergeantAcoustic/tinkers_tinkering/compare/2.0.0...2.0.1

TODO.md

@@ -11,22 +11,27 @@ Start by creating a list of needed mods
 ## Datapack
 
 * Worldgen
-	* Ores
 	* endercon
 		* maybe work out everything initially changed
 	* geophilic
 		* disable rocks
 * Recipes
 	* Antique Atlas
+	* Convenience (e.g. coal/redstone to dye, shapeless shulker box)
+	* Minecraft
 	* Copper armour
 * Advancements
 	* Wooden paxel recipe unlock when getting wood
 	* Others
+* Loot tables
 * Tags
 * Villagers (https://modrinth.com/mod/data-trades)
+* Worldgen
+	* Ores
 
 
 ## Assets
 
-* Spear backport
-* For any other mods
+* Lang files
+	* Spear backport
+	* Any other mods

overrides/global_packs/mc_rebalance_datapack/assets/minecraft/lang/en_us.json

@@ -1,5 +1,4 @@
 {
-    "advancements.end.obtain_ancient_debris.title": "Insomniac's Fortune",
     "advancements.husbandry.netherite_hoe.description": "Use a Dendrite Ingot to upgrade a Hoe, and then reevaluate your life choices",
     "advancements.husbandry.netherite_hoe.title": "Serious Dedication",
     "advancements.nether.netherite_armor.description": "Get a full suit of Dendrite armor",

overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/recipe/paxel/diamond_paxel.json

@@ -3,11 +3,10 @@
   "category": "equipment",
   "key": {
     "#": {"item": "minecraft:stick"},
-    "X": {"item": "minecraft:diamond"},
-    "Z": {"item": "minecraft:netherite_scrap"}
+    "X": {"item": "minecraft:diamond"}
   },
   "pattern": [
-    "XZX",
+    "XXX",
     "X#X",
     " # "
   ],

overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/recipe/paxel/golden_paxel.json

@@ -3,11 +3,10 @@
   "category": "equipment",
   "key": {
     "#": {"item": "minecraft:stick"},
-    "X": {"item": "minecraft:gold_ingot"},
-    "Z": {"item": "minecraft:diamond"}
+    "X": {"item": "minecraft:gold_ingot"}
   },
   "pattern": [
-    "XZX",
+    "XXX",
     "X#X",
     " # "
   ],

overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/recipe/paxel/iron_paxel.json

@@ -3,11 +3,10 @@
   "category": "equipment",
   "key": {
     "#": {"item": "minecraft:stick"},
-    "X": {"item": "minecraft:iron_ingot"},
-    "Z": {"item": "minecraft:gold_ingot"}
+    "X": {"item": "minecraft:iron_ingot"}
   },
   "pattern": [
-    "XZX",
+    "XXX",
     "X#X",
     " # "
   ],

overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/recipe/paxel/netherite_paxel.json

@@ -0,0 +1,30 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "equipment",
+  "key": {
+    "#": {"item": "minecraft:stick"},
+    "X": {"item": "minecraft:netherite_ingot"}
+  },
+  "pattern": [
+    "XXX",
+    "X#X",
+    " # "
+  ],
+  "result": {
+    "count": 1,
+    "id": "minecraft:netherite_shovel",
+    "components": {
+      "tool": {
+        "rules": [
+          {"blocks": "#minecraft:incorrect_for_netherite_tool", "correct_for_drops": false},
+          {"blocks": "#mineable/pickaxe", "speed": 9.0, "correct_for_drops": true},
+          {"blocks": "#mineable/axe", "speed": 9.0, "correct_for_drops": true},
+          {"blocks": "#mineable/shovel", "speed": 9.0, "correct_for_drops": true},
+          {"blocks": "#mineable/hoe", "speed": 9.0, "correct_for_drops": true}
+        ]
+      },
+      "custom_name": "{'text':'Dendrite Paxel','italic':false}",
+      "custom_model_data": 74831
+    }
+  }
+}

overrides/global_packs/mc_rebalance_datapack/data/mc_rebalance/recipe/paxel/stone_paxel.json

@@ -3,11 +3,10 @@
   "category": "equipment",
   "key": {
     "#": {"item": "minecraft:stick"},
-    "X": {"tag": "minecraft:stone_tool_materials"},
-    "Z": {"item": "minecraft:iron_ingot"}
+    "X": {"tag": "minecraft:stone_tool_materials"}
   },
   "pattern": [
-    "XZX",
+    "XXX",
     "X#X",
     " # "
   ],

overrides/global_packs/mc_rebalance_datapack/data/minecraft/advancement/nether/obtain_ancient_debris.json

@@ -1,35 +0,0 @@
-{
-  "parent": "minecraft:end/root",
-  "criteria": {
-    "ancient_debris": {
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "minecraft:ancient_debris",
-              "minecraft:netherite_scrap"
-            ]
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    }
-  },
-  "display": {
-    "description": {
-      "translate": "advancements.nether.obtain_ancient_debris.description"
-    },
-    "icon": {
-      "count": 1,
-      "id": "minecraft:ancient_debris"
-    },
-    "title": {
-      "translate": "advancements.end.obtain_ancient_debris.title"
-    }
-  },
-  "requirements": [
-    [
-      "ancient_debris"
-    ]
-  ]
-}

overrides/global_packs/mc_rebalance_datapack/pack.mcmeta

@@ -1,8 +1,7 @@
 {
   "pack": {
-    "description":"Modpack assets",
-    "pack_format": 48,
-    "supported_formats": [34, 48]
+    "description":"Rebalances Minecraft's recipes and drop tables to cause a more meaningful progression." ,
+    "pack_format": 15
   },
   "filter": {
     "block": [