feat: port to 1.20.2 and added neoforge as a dest

nanite · Dec 24, 2023 · 4b1b250 · 4b1b250
1 parent 16d5a05
commit 4b1b250
Show file tree

Hide file tree

Showing 110 changed files with 405 additions and 135 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,19 +1,8 @@
 # Just Hammers Changelog
 
-## [2.0.2]
-
-### Added
-
-- A nice new tooltip to show the durability of the hammer.
-- You can now shift to negate the hammer's ability to break blocks in the AOE (Area of Effect).
+## [82.0.0]
 
 ### Changed
 
-- All hammers above the basic 3x3x1 (Not requiring netherite) now have at least the durability of the netherite pickaxe.
-  - This is a pretty major bump in durability for the hammers, but it's a lot more fun to use them now.
-
-### Fixed
-
-- Hammers no longer break! This was intended from the start but this actually works now. If your hammer is about to break, it will stop being able to mine until it's repaired using an anvil.
-- Hammers no longer do weird things when looking at specific angles. Thanks to [#14](https://github.com/ErrorMikey/JustHammers/issues/14) [@danielhoyosceldran](https://github.com/danielhoyosceldran)
-- Hammers work again in creative mode when on Fabric [#16](https://github.com/ErrorMikey/JustHammers/issues/16) [@prshs70](https://github.com/prshs70)
+- Ported to 1.20.2
+- Moved to new versioning system. 
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
+    id "architectury-plugin" version "3.4.151"
+    id "dev.architectury.loom" version "1.4.373" apply false
     id "me.modmuss50.mod-publish-plugin" version "0.4.5"
 }
 
@@ -42,7 +42,7 @@ allprojects {
     apply plugin: "maven-publish"
 
     archivesBaseName = rootProject.archives_base_name
-    version = "${rootProject.mod_version}+mc${rootProject.minecraft_version}"
+    version = {rootProject.mod_version
     group = rootProject.maven_group
 
     repositories {
@@ -66,13 +66,19 @@ publishMods {
 
     def fabricOptions = publishOptions {
         file = project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
-        displayName = "${project.name} Fabric ${mod_version}+mc${minecraft_version}"
+        displayName = "[FABRIC][${minecraft_version}] ${project.name} ${mod_version}"
         modLoaders.add("fabric")
     }
 
     def forgeOptions = publishOptions {
         file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
-        displayName = "${project.name} Forge ${mod_version}+mc${minecraft_version}"
+        displayName = "[FORGE][${minecraft_version}] ${project.name} ${mod_version}"
+        modLoaders.add("forge")
+    }
+
+    def neoForge = publishOptions {
+        file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
+        displayName = "[NEOFORGE][${minecraft_version}] ${project.name} ${mod_version}"
         modLoaders.add("neoforge")
     }
 
@@ -105,6 +111,13 @@ publishMods {
         }
     }
 
+    curseforge("curseforgeNeoForge") {
+        from(curseForgeOptions, neoForge)
+        requires {
+            slug = "architectury-api"
+        }
+    }
+
     modrinth("modrinthFabric") {
         from(modrinthOptions, fabricOptions)
         requires {
@@ -123,6 +136,13 @@ publishMods {
         }
     }
 
+    modrinth("modrinthNeoforge") {
+        from(modrinthOptions, neoForge)
+        requires {
+            slug = "architectury-api"
+        }
+    }
+
     github {
         file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
         additionalFiles.from project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }

diff --git a/common/build.gradle b/common/build.gradle
@@ -6,6 +6,8 @@ loom {
     accessWidenerPath = file("src/main/resources/justhammers.accesswidener")
 }
 
+sourceSets.main.resources.srcDirs += file("src/generated/resources")
+
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     modApi "dev.architectury:architectury:${rootProject.architectury_version}"

diff --git a/.../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e → .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/.../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e → .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,33 +1,33 @@
-// 1.20.1	2023-09-04T19:44:50.513295	Recipes
-549a650260663790674dd96ac5b17c1a96e5cff3 data/justhammers/advancements/recipes/tools/destructor_core.json
-deadf649fd062fc5371f3c709d7c252b86c81979 data/justhammers/advancements/recipes/tools/diamond_destructor_hammer.json
-f9973689357ea2501354f7208ff16360a5753201 data/justhammers/advancements/recipes/tools/diamond_hammer.json
-6fe7f0e21c13d8c8a75763edf0232293b5902baf data/justhammers/advancements/recipes/tools/diamond_impact_hammer.json
-37630825411171e2e8bd51973cc40f2c17c2784f data/justhammers/advancements/recipes/tools/diamond_reinforced_hammer.json
-1387083ab206e635db2cc2f971ac64402defa1ce data/justhammers/advancements/recipes/tools/diamond_reinforced_impact_hammer.json
-e1c2ecf10a0299f946a055236a7b1e1b27401611 data/justhammers/advancements/recipes/tools/gold_destructor_hammer.json
-1a1b2f3f72ddc6eea330fc40c3878c4bafaa6196 data/justhammers/advancements/recipes/tools/gold_hammer.json
-9cb9c644f59e378f02d4e8351cb138f6a6f4c73b data/justhammers/advancements/recipes/tools/gold_impact_hammer.json
-d3334e66d9ccd55dc72299ae23b5fc2d30d039fd data/justhammers/advancements/recipes/tools/gold_reinforced_hammer.json
-134cad09db2d4a52bc04d0a15188240e76ed02a4 data/justhammers/advancements/recipes/tools/gold_reinforced_impact_hammer.json
-e2a608b03e4190e48fc44088d34e43fe847665b1 data/justhammers/advancements/recipes/tools/impact_core.json
-9574b24a0b4c80f37b56e46cd422b8c97586bc37 data/justhammers/advancements/recipes/tools/iron_destructor_hammer.json
-7e0eb80d4a8605d0b3e65a473ecbd6e499bd555a data/justhammers/advancements/recipes/tools/iron_hammer.json
-40441548f9c49cde0e088a267641cbef88cf631e data/justhammers/advancements/recipes/tools/iron_impact_hammer.json
-2a382d1fcbc9b4e5f30b3ebd11148e30a794fc1e data/justhammers/advancements/recipes/tools/iron_reinforced_hammer.json
-33f9e1a4d29b0bbe84e84f725d7f2cfb2203caeb data/justhammers/advancements/recipes/tools/iron_reinforced_impact_hammer.json
-1e438fb435c3172dfb8175335efe9026ce2cc4e2 data/justhammers/advancements/recipes/tools/netherite_destructor_hammer.json
-6795912fd214b1fe33f6bb6bd9dfd52677785a24 data/justhammers/advancements/recipes/tools/netherite_hammer.json
-bffd78f59aea6b7743654e4780783572f83eed1a data/justhammers/advancements/recipes/tools/netherite_impact_hammer.json
-82a7782dffbb07c789dca3990a815b76a286d9a7 data/justhammers/advancements/recipes/tools/netherite_reinforced_hammer.json
-e63326246db1535c19e5d0a38ce112d92a149046 data/justhammers/advancements/recipes/tools/netherite_reinforced_impact_hammer.json
-bffdd3be15bcecc3b7a89b57fce6762603ae7b6e data/justhammers/advancements/recipes/tools/reinforced_core.json
-4fae741d318918b5658b1e7cade876eac88e7534 data/justhammers/advancements/recipes/tools/reinforced_impact_core.json
-7f4333d575a16f2aca78c8b0b2861233b99a335f data/justhammers/advancements/recipes/tools/stone_destructor_hammer.json
-b0840a136084a5a70407ffbfcb9a2303c723bda3 data/justhammers/advancements/recipes/tools/stone_hammer.json
-3eb014526c5ca918bd91a503e6e97ff76074ce1e data/justhammers/advancements/recipes/tools/stone_impact_hammer.json
-ecaf45da322e58772b90bbaee1a6c78d55e1015f data/justhammers/advancements/recipes/tools/stone_reinforced_hammer.json
-a0c5ae6e32f54c602eff3da167113a4c0cc519f8 data/justhammers/advancements/recipes/tools/stone_reinforced_impact_hammer.json
+// 1.20.2	2023-12-24T22:49:00.897269	Recipes
+22ca355cd8f7a6bb008d9847b87c7327bf3a5b12 data/justhammers/advancements/recipes/tools/destructor_core.json
+97fa36207b40207cdeff9e469084010563ff127b data/justhammers/advancements/recipes/tools/diamond_destructor_hammer.json
+1b8e24e0a096b8ff5718a8005a23d8f202b39466 data/justhammers/advancements/recipes/tools/diamond_hammer.json
+664562d5d3a4b5fdd842591c427bf29623cb6dc3 data/justhammers/advancements/recipes/tools/diamond_impact_hammer.json
+aaaee398a8e84772de0c0b903a0f75d21cd944fa data/justhammers/advancements/recipes/tools/diamond_reinforced_hammer.json
+5a4312df7ea74b3ac866e15bf36e19024837ff5c data/justhammers/advancements/recipes/tools/diamond_reinforced_impact_hammer.json
+9c78253911be34d4e206a5771aa797a445e852df data/justhammers/advancements/recipes/tools/gold_destructor_hammer.json
+a8240ad9524d5770c246f920fd635cac37754957 data/justhammers/advancements/recipes/tools/gold_hammer.json
+e6a58263880acddecb13d30318fe641932d38d3d data/justhammers/advancements/recipes/tools/gold_impact_hammer.json
+db3425eb2fba00a3d9d505a8ff14d0f1d55249d7 data/justhammers/advancements/recipes/tools/gold_reinforced_hammer.json
+cfa26e54ecd1d41b4f1ac3c3825e68c352439367 data/justhammers/advancements/recipes/tools/gold_reinforced_impact_hammer.json
+62461846890b21c291ad1db39706bfa0c18f380b data/justhammers/advancements/recipes/tools/impact_core.json
+f1035cba2e578d33adcbd120c383ca57acc883b0 data/justhammers/advancements/recipes/tools/iron_destructor_hammer.json
+b90bc2f1affbc088044ca53b3c670e48717bca1d data/justhammers/advancements/recipes/tools/iron_hammer.json
+0d5004542481c8fa52140b5c9810b9d241f61d54 data/justhammers/advancements/recipes/tools/iron_impact_hammer.json
+ede6c92857c9fe2625c0d6b2c0e298e25cd72ef4 data/justhammers/advancements/recipes/tools/iron_reinforced_hammer.json
+77fd320cc0a52ceb7bd65bee20bccfa9f22fed70 data/justhammers/advancements/recipes/tools/iron_reinforced_impact_hammer.json
+6f35fe577d1dc392c5493e8abf7701b14de0626a data/justhammers/advancements/recipes/tools/netherite_destructor_hammer.json
+b927e664a0dda0464117f3da0c94aedf076e54c2 data/justhammers/advancements/recipes/tools/netherite_hammer.json
+45d8242a3f5ad267a57aeae41c9ccc050d83213f data/justhammers/advancements/recipes/tools/netherite_impact_hammer.json
+cd3e63c186098a4b5ffe9942c4844136e1daa03b data/justhammers/advancements/recipes/tools/netherite_reinforced_hammer.json
+a99a948f19ea33470073c72ec177318d678ad272 data/justhammers/advancements/recipes/tools/netherite_reinforced_impact_hammer.json
+a09a7e43ba3b66d2ceaf979597ef40a9ef914b31 data/justhammers/advancements/recipes/tools/reinforced_core.json
+e7db9187bfe68ce463926a32cd627a87b2b4f9c9 data/justhammers/advancements/recipes/tools/reinforced_impact_core.json
+0af3a992ed78fc3dfcdc84009d50dfce4dab52d6 data/justhammers/advancements/recipes/tools/stone_destructor_hammer.json
+0b7c14a7a801fc0793515896e0c91eefe95deef7 data/justhammers/advancements/recipes/tools/stone_hammer.json
+17ef850bbf756fbb6867ed47a4def34f249ef4cc data/justhammers/advancements/recipes/tools/stone_impact_hammer.json
+a312d1e2663856f71e7a062437677a72de8e84c8 data/justhammers/advancements/recipes/tools/stone_reinforced_hammer.json
+7c31b4c23cd63f18ed7a6c896fbbf4bb56c7d60d data/justhammers/advancements/recipes/tools/stone_reinforced_impact_hammer.json
 55aac7918d921745c7385041bc31356b982d611c data/justhammers/recipes/destructor_core.json
 51a04d4b3c729c3273e079a5f554f9a9f71b86a2 data/justhammers/recipes/diamond_destructor_hammer.json
 e6c4efb5297056641260dc90f1dfb5158bbc7400 data/justhammers/recipes/diamond_hammer.json

diff --git a/.../b31be46d105cf2224c912559a58cee2e49a31644 → .../b31be46d105cf2224c912559a58cee2e49a31644 b/.../b31be46d105cf2224c912559a58cee2e49a31644 → .../b31be46d105cf2224c912559a58cee2e49a31644
@@ -1,4 +1,4 @@
-// 1.20.1	2023-09-04T19:44:50.510199	Item Models: justhammers
+// 1.20.2	2023-12-24T22:49:00.894037	Item Models: justhammers
 c7b59ae6e57179b6bb7fc72d53637677150f3693 assets/justhammers/models/item/destructor_core.json
 ecb4259b8cfc86898fffad8ee038de7f20c45429 assets/justhammers/models/item/diamond_destructor_hammer.json
 1e5510305d71a3b4eb623252a3fc49985bb9c1fe assets/justhammers/models/item/diamond_hammer.json

diff --git a/common/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/common/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
@@ -0,0 +1,2 @@
+// 1.20.2	2023-12-24T22:49:00.898273	Languages: en_us
+35eb489b75622d3a6de2a4646dd60da205f971c0 assets/justhammers/lang/en_us.json
diff --git a/...ources/assets/justhammers/lang/en_us.json → ...ources/assets/justhammers/lang/en_us.json b/...ources/assets/justhammers/lang/en_us.json → ...ources/assets/justhammers/lang/en_us.json
diff --git a/...thammers/models/item/destructor_core.json → ...thammers/models/item/destructor_core.json b/...thammers/models/item/destructor_core.json → ...thammers/models/item/destructor_core.json
diff --git a/...odels/item/diamond_destructor_hammer.json → ...odels/item/diamond_destructor_hammer.json b/...odels/item/diamond_destructor_hammer.json → ...odels/item/diamond_destructor_hammer.json
diff --git a/...sthammers/models/item/diamond_hammer.json → ...sthammers/models/item/diamond_hammer.json b/...sthammers/models/item/diamond_hammer.json → ...sthammers/models/item/diamond_hammer.json
diff --git a/...rs/models/item/diamond_impact_hammer.json → ...rs/models/item/diamond_impact_hammer.json b/...rs/models/item/diamond_impact_hammer.json → ...rs/models/item/diamond_impact_hammer.json
diff --git a/...odels/item/diamond_reinforced_hammer.json → ...odels/item/diamond_reinforced_hammer.json b/...odels/item/diamond_reinforced_hammer.json → ...odels/item/diamond_reinforced_hammer.json
diff --git a/...tem/diamond_reinforced_impact_hammer.json → ...tem/diamond_reinforced_impact_hammer.json b/...tem/diamond_reinforced_impact_hammer.json → ...tem/diamond_reinforced_impact_hammer.json
diff --git a/...s/models/item/gold_destructor_hammer.json → ...s/models/item/gold_destructor_hammer.json b/...s/models/item/gold_destructor_hammer.json → ...s/models/item/gold_destructor_hammer.json
diff --git a/.../justhammers/models/item/gold_hammer.json → .../justhammers/models/item/gold_hammer.json b/.../justhammers/models/item/gold_hammer.json → .../justhammers/models/item/gold_hammer.json
diff --git a/...mmers/models/item/gold_impact_hammer.json → ...mmers/models/item/gold_impact_hammer.json b/...mmers/models/item/gold_impact_hammer.json → ...mmers/models/item/gold_impact_hammer.json
diff --git a/...s/models/item/gold_reinforced_hammer.json → ...s/models/item/gold_reinforced_hammer.json b/...s/models/item/gold_reinforced_hammer.json → ...s/models/item/gold_reinforced_hammer.json
diff --git a/...s/item/gold_reinforced_impact_hammer.json → ...s/item/gold_reinforced_impact_hammer.json b/...s/item/gold_reinforced_impact_hammer.json → ...s/item/gold_reinforced_impact_hammer.json
diff --git a/.../justhammers/models/item/impact_core.json → .../justhammers/models/item/impact_core.json b/.../justhammers/models/item/impact_core.json → .../justhammers/models/item/impact_core.json
diff --git a/...s/models/item/iron_destructor_hammer.json → ...s/models/item/iron_destructor_hammer.json b/...s/models/item/iron_destructor_hammer.json → ...s/models/item/iron_destructor_hammer.json
diff --git a/.../justhammers/models/item/iron_hammer.json → .../justhammers/models/item/iron_hammer.json b/.../justhammers/models/item/iron_hammer.json → .../justhammers/models/item/iron_hammer.json
diff --git a/...mmers/models/item/iron_impact_hammer.json → ...mmers/models/item/iron_impact_hammer.json b/...mmers/models/item/iron_impact_hammer.json → ...mmers/models/item/iron_impact_hammer.json
diff --git a/...s/models/item/iron_reinforced_hammer.json → ...s/models/item/iron_reinforced_hammer.json b/...s/models/item/iron_reinforced_hammer.json → ...s/models/item/iron_reinforced_hammer.json
diff --git a/...s/item/iron_reinforced_impact_hammer.json → ...s/item/iron_reinforced_impact_hammer.json b/...s/item/iron_reinforced_impact_hammer.json → ...s/item/iron_reinforced_impact_hammer.json
diff --git a/...els/item/netherite_destructor_hammer.json → ...els/item/netherite_destructor_hammer.json b/...els/item/netherite_destructor_hammer.json → ...els/item/netherite_destructor_hammer.json
diff --git a/...hammers/models/item/netherite_hammer.json → ...hammers/models/item/netherite_hammer.json b/...hammers/models/item/netherite_hammer.json → ...hammers/models/item/netherite_hammer.json
diff --git a/.../models/item/netherite_impact_hammer.json → .../models/item/netherite_impact_hammer.json b/.../models/item/netherite_impact_hammer.json → .../models/item/netherite_impact_hammer.json
diff --git a/...els/item/netherite_reinforced_hammer.json → ...els/item/netherite_reinforced_hammer.json b/...els/item/netherite_reinforced_hammer.json → ...els/item/netherite_reinforced_hammer.json
diff --git a/...m/netherite_reinforced_impact_hammer.json → ...m/netherite_reinforced_impact_hammer.json b/...m/netherite_reinforced_impact_hammer.json → ...m/netherite_reinforced_impact_hammer.json
diff --git a/...thammers/models/item/reinforced_core.json → ...thammers/models/item/reinforced_core.json b/...thammers/models/item/reinforced_core.json → ...thammers/models/item/reinforced_core.json
diff --git a/...s/models/item/reinforced_impact_core.json → ...s/models/item/reinforced_impact_core.json b/...s/models/item/reinforced_impact_core.json → ...s/models/item/reinforced_impact_core.json
diff --git a/.../models/item/stone_destructor_hammer.json → .../models/item/stone_destructor_hammer.json b/.../models/item/stone_destructor_hammer.json → .../models/item/stone_destructor_hammer.json
diff --git a/...justhammers/models/item/stone_hammer.json → ...justhammers/models/item/stone_hammer.json b/...justhammers/models/item/stone_hammer.json → ...justhammers/models/item/stone_hammer.json
diff --git a/...mers/models/item/stone_impact_hammer.json → ...mers/models/item/stone_impact_hammer.json b/...mers/models/item/stone_impact_hammer.json → ...mers/models/item/stone_impact_hammer.json
diff --git a/.../models/item/stone_reinforced_hammer.json → .../models/item/stone_reinforced_hammer.json b/.../models/item/stone_reinforced_hammer.json → .../models/item/stone_reinforced_hammer.json
diff --git a/.../item/stone_reinforced_impact_hammer.json → .../item/stone_reinforced_impact_hammer.json b/.../item/stone_reinforced_impact_hammer.json → .../item/stone_reinforced_impact_hammer.json
diff --git a/...ements/recipes/tools/destructor_core.json → ...ements/recipes/tools/destructor_core.json b/...ements/recipes/tools/destructor_core.json → ...ements/recipes/tools/destructor_core.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/...ipes/tools/diamond_destructor_hammer.json → ...ipes/tools/diamond_destructor_hammer.json b/...ipes/tools/diamond_destructor_hammer.json → ...ipes/tools/diamond_destructor_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/...cements/recipes/tools/diamond_hammer.json → ...cements/recipes/tools/diamond_hammer.json b/...cements/recipes/tools/diamond_hammer.json → ...cements/recipes/tools/diamond_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/.../recipes/tools/diamond_impact_hammer.json → .../recipes/tools/diamond_impact_hammer.json b/.../recipes/tools/diamond_impact_hammer.json → .../recipes/tools/diamond_impact_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/...ipes/tools/diamond_reinforced_hammer.json → ...ipes/tools/diamond_reinforced_hammer.json b/...ipes/tools/diamond_reinforced_hammer.json → ...ipes/tools/diamond_reinforced_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/...ols/diamond_reinforced_impact_hammer.json → ...ols/diamond_reinforced_impact_hammer.json b/...ols/diamond_reinforced_impact_hammer.json → ...ols/diamond_reinforced_impact_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/...recipes/tools/gold_destructor_hammer.json → ...recipes/tools/gold_destructor_hammer.json b/...recipes/tools/gold_destructor_hammer.json → ...recipes/tools/gold_destructor_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/...vancements/recipes/tools/gold_hammer.json → ...vancements/recipes/tools/gold_hammer.json b/...vancements/recipes/tools/gold_hammer.json → ...vancements/recipes/tools/gold_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/...nts/recipes/tools/gold_impact_hammer.json → ...nts/recipes/tools/gold_impact_hammer.json b/...nts/recipes/tools/gold_impact_hammer.json → ...nts/recipes/tools/gold_impact_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/...recipes/tools/gold_reinforced_hammer.json → ...recipes/tools/gold_reinforced_hammer.json b/...recipes/tools/gold_reinforced_hammer.json → ...recipes/tools/gold_reinforced_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/.../tools/gold_reinforced_impact_hammer.json → .../tools/gold_reinforced_impact_hammer.json b/.../tools/gold_reinforced_impact_hammer.json → .../tools/gold_reinforced_impact_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/...vancements/recipes/tools/impact_core.json → ...vancements/recipes/tools/impact_core.json b/...vancements/recipes/tools/impact_core.json → ...vancements/recipes/tools/impact_core.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/...recipes/tools/iron_destructor_hammer.json → ...recipes/tools/iron_destructor_hammer.json b/...recipes/tools/iron_destructor_hammer.json → ...recipes/tools/iron_destructor_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/...vancements/recipes/tools/iron_hammer.json → ...vancements/recipes/tools/iron_hammer.json b/...vancements/recipes/tools/iron_hammer.json → ...vancements/recipes/tools/iron_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/...nts/recipes/tools/iron_impact_hammer.json → ...nts/recipes/tools/iron_impact_hammer.json b/...nts/recipes/tools/iron_impact_hammer.json → ...nts/recipes/tools/iron_impact_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/...recipes/tools/iron_reinforced_hammer.json → ...recipes/tools/iron_reinforced_hammer.json b/...recipes/tools/iron_reinforced_hammer.json → ...recipes/tools/iron_reinforced_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/.../tools/iron_reinforced_impact_hammer.json → .../tools/iron_reinforced_impact_hammer.json b/.../tools/iron_reinforced_impact_hammer.json → .../tools/iron_reinforced_impact_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/...es/tools/netherite_destructor_hammer.json → ...es/tools/netherite_destructor_hammer.json b/...es/tools/netherite_destructor_hammer.json → ...es/tools/netherite_destructor_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/...ments/recipes/tools/netherite_hammer.json → ...ments/recipes/tools/netherite_hammer.json b/...ments/recipes/tools/netherite_hammer.json → ...ments/recipes/tools/netherite_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {

diff --git a/...ecipes/tools/netherite_impact_hammer.json → ...ecipes/tools/netherite_impact_hammer.json b/...ecipes/tools/netherite_impact_hammer.json → ...ecipes/tools/netherite_impact_hammer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_material",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_material"
     ]
   ],
   "rewards": {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// 1.20.2 2023-12-24T22:49:00.898273 Languages: en_us
		35eb489b75622d3a6de2a4646dd60da205f971c0 assets/justhammers/lang/en_us.json