From 822bbe9df256cb91c782ca13766d0eab4d2e0b27 Mon Sep 17 00:00:00 2001
From: Sergeant Acoustic <sergeantacoustic@noreply.localhost>
Date: Fri, 29 Aug 2025 23:14:32 +0100
Subject: [PATCH] Fix new tetra hammer materials

* Set all hammer materials to cost the previous tier to make
* Remove all old leftover materials
---
 data/tetra/materials/metal/copper.json        |   2 +-
 data/tetra/modules/double/basic_hammer.json   | 122 +-----------------
 .../basic_hammer/basic_hammer.json            |  28 ++--
 3 files changed, 20 insertions(+), 132 deletions(-)
 rename data/tetra/schematics/{ => double}/basic_hammer/basic_hammer.json (78%)

diff --git a/data/tetra/materials/metal/copper.json b/data/tetra/materials/metal/copper.json
index d8f6b1a..855a7f2 100644
--- a/data/tetra/materials/metal/copper.json
+++ b/data/tetra/materials/metal/copper.json
@@ -23,5 +23,5 @@
         "items": [ "minecraft:copper_ingot" ]
     },
     "improvements": {"workable": 1},
-    "requiredTools": {"hammer_dig": 2}
+    "requiredTools": {"hammer_dig": 1}
 }
diff --git a/data/tetra/modules/double/basic_hammer.json b/data/tetra/modules/double/basic_hammer.json
index 5883492..fca9a0c 100644
--- a/data/tetra/modules/double/basic_hammer.json
+++ b/data/tetra/modules/double/basic_hammer.json
@@ -16,114 +16,6 @@
         "tetra:shared/"
     ],
     "variants": [
-        {
-            "materials": [ "tetra:wood/" ],
-            "key": "basic_hammer/",
-            "attributes": {
-                "generic.attack_speed": -1.1
-            },
-            "aspects": {
-                "block_breaker": 2,
-                "breakable": 2,
-                "blunt_weapon": 1
-            },
-            "extract": {
-                "primaryAttributes": {
-                    "generic.attack_damage": 0.5
-                },
-                "secondaryAttributes": {
-                    "generic.attack_damage": 1,
-                    "generic.attack_speed": -0.08
-                },
-                "tools": {
-                    "hammer_dig": [ 0, 0.8333 ]
-                },
-                "durability": 0.55,
-                "integrity": -1,
-                "magicCapacity": 1,
-                "glyph": {
-                    "textureX": 64
-                },
-                "availableTextures": [ "log" ],
-                "models": [
-                    {
-                        "location": "tetra:item/module/double/head/basic_hammer/"
-                    }
-                ]
-            }
-        },
-        {
-            "materials": [ "tetra:stone/stone" ],
-            "key": "basic_hammer/",
-            "attributes": {
-                "generic.attack_speed": -1.1
-            },
-            "aspects": {
-                "block_breaker": 2,
-                "breakable": 2,
-                "blunt_weapon": 1
-            },
-            "models": [
-                {
-                    "location": "tetra:item/module/double/head/basic_hammer/stone",
-                    "tint": "aaaaaa"
-                }
-            ],
-            "extract": {
-                "primaryAttributes": {
-                    "generic.attack_damage": 0.5
-                },
-                "secondaryAttributes": {
-                    "generic.attack_damage": 1,
-                    "generic.attack_speed": -0.08
-                },
-                "tools": {
-                    "hammer_dig": [ 0, 0.8333 ]
-                },
-                "durability": 0.55,
-                "integrity": -1,
-                "magicCapacity": 1,
-                "glyph": {
-                    "textureX": 64
-                }
-            }
-        },
-        {
-            "materials": [ "tetra:stone/diorite", "tetra:stone/andesite", "tetra:stone/granite" ],
-            "key": "basic_hammer/",
-            "attributes": {
-                "generic.attack_speed": -1.1
-            },
-            "aspects": {
-                "block_breaker": 2,
-                "breakable": 2,
-                "blunt_weapon": 1
-            },
-            "extract": {
-                "primaryAttributes": {
-                    "generic.attack_damage": 0.5
-                },
-                "secondaryAttributes": {
-                    "generic.attack_damage": 1,
-                    "generic.attack_speed": -0.08
-                },
-                "tools": {
-                    "hammer_dig": [ 0, 0.8333 ]
-                },
-                "durability": 0.55,
-                "integrity": -1,
-                "magicCapacity": 1,
-                "glyph": {
-                    "textureX": 64
-                },
-                "availableTextures": [ "stone" ],
-                "models": [
-                    {
-                        "location": "tetra:item/module/double/head/basic_hammer/"
-                    }
-                ]
-            }
-        },
         {
             "materials": [ "tetra:metal/copper" ],
             "key": "basic_hammer/",
@@ -256,12 +148,6 @@
             "tools": {
                 "hammer_dig": "minecraft:iron"
             },
-            "availableTextures": [ "metal" ],
-            "models": [
-                {
-                    "location": "tetra:item/module/double/head/basic_hammer/"
-                }
-            ],
             "extract": {
                 "primaryAttributes": {
                     "generic.attack_damage": 0.5
@@ -278,7 +164,13 @@
                 "magicCapacity": 1,
                 "glyph": {
                     "textureX": 64
-                }
+                },
+                "availableTextures": [ "metal" ],
+                "models": [
+                    {
+                        "location": "tetra:item/module/double/head/basic_hammer/"
+                    }
+                ]
             }
         },
         {
diff --git a/data/tetra/schematics/basic_hammer/basic_hammer.json b/data/tetra/schematics/double/basic_hammer/basic_hammer.json
similarity index 78%
rename from data/tetra/schematics/basic_hammer/basic_hammer.json
rename to data/tetra/schematics/double/basic_hammer/basic_hammer.json
index 54d759c..39a5c29 100644
--- a/data/tetra/schematics/basic_hammer/basic_hammer.json
+++ b/data/tetra/schematics/double/basic_hammer/basic_hammer.json
@@ -14,12 +14,10 @@
     },
     "displayType": "major",
     "applicableMaterials": [
-        "#wood",
-        "#stone",
         "!copper",
         "!iron",
-        "#metal",
-        "#gem",
+        "!cobalt",
+        "!diamond",
         "!netherite"
     ],
     "translation": {
@@ -43,20 +41,18 @@
     "outcomes": [
         {
             "materials": [
-                "tetra:wood/",
-                "tetra:stone/stone",
-                "tetra:stone/diorite",
-                "tetra:stone/andesite",
-                "tetra:stone/granite"
+                "tetra:metal/copper"
             ],
-            "toolFactor": 0,
+            "requiredTools": {
+                "hammer_dig": 0
+            },
+            "countFactor": 2,
             "moduleKey": "double/basic_hammer",
             "moduleVariant": "basic_hammer/"
         },
         {
             "materials": [
-                "tetra:metal/iron",
-                "tetra:metal/copper"
+                "tetra:metal/iron"
             ],
             "countFactor": 2,
             "moduleKey": "double/basic_hammer",
@@ -70,11 +66,11 @@
             "moduleVariant": "basic_hammer/"
         },
         {
-            "materials": {
+            "materials": [
                 "tetra:gem/diamond"
-            },
+            ],
             "requiredTools": {
-                "hammer_dig": "minecraft:netherite"
+                "hammer_dig": 1
             },
             "moduleKey": "double/basic_hammer",
             "moduleVariant": "basic_hammer/",
@@ -90,7 +86,7 @@
                 "count": 2
             },
             "requiredTools": {
-                "hammer_dig": "tetra:maxed_forge_hammer"
+                "hammer_dig": 5
             },
             "moduleKey": "double/basic_hammer",
             "moduleVariant": "basic_hammer/netherite"