mace

gradle.properties

@@ -17,7 +17,7 @@ minecraft_version=1.21
 # as they do not follow standard versioning conventions.
 minecraft_version_range=[1.21,1.21.1)
 # The Neo version must agree with the Minecraft version to get a valid artifact
-neo_version=21.0.83-beta
+neo_version=21.0.98-beta
 # The Neo version range can use any version of Neo as bounds
 neo_version_range=[21.0.0-beta,)
 # The loader version range can only use the major version of FML as bounds

src/generated/resources/.cache/1bda0eb39dbc3800081e5f8528c492e5d2ac1dc9

@@ -1,2 +1,2 @@
-// 1.21	2024-07-16T16:21:56.201976	Languages: en_us for mod: assorted_armaments
-6beeaf1d42adffcf0691421959cc88dddc19151e assets/assorted_armaments/lang/en_us.json
+// 1.21	2024-07-17T12:14:30.3571186	Languages: en_us for mod: assorted_armaments
+d3fb1c68605db5a46811a4d0dd8fba3e7c56e2c1 assets/assorted_armaments/lang/en_us.json

src/generated/resources/.cache/2db82bc4898868f7eec79958ed07d46c99c9af46

@@ -1,19 +1,25 @@
-// 1.21	2024-07-16T14:37:17.2193294	Item Models: assorted_armaments
+// 1.21	2024-07-17T09:50:46.8654472	Item Models: assorted_armaments
 9f5ce353cc483273242470fac8e74e0999b4efeb assets/assorted_armaments/models/item/diamond_claymore.json
 1f15a0020d5f44de2b673f75da3664427b52ccfe assets/assorted_armaments/models/item/diamond_claymore_blocking.json
 1c2ff54384d1ded71022bea0c27159a13a41fc6c assets/assorted_armaments/models/item/diamond_claymore_inventory.json
+fc9a049ff14b2552e31856d2e8981cd6835c6b22 assets/assorted_armaments/models/item/diamond_mace.json
 9619c9e457df4c09222ac0940dd12ec577d2bff9 assets/assorted_armaments/models/item/golden_claymore.json
 6665a03a5233a294963319da5b68eb95cd00ce5c assets/assorted_armaments/models/item/golden_claymore_blocking.json
 b99081f7ea7c7ec428b2ccc0d4484c0cd3e7eeda assets/assorted_armaments/models/item/golden_claymore_inventory.json
+0f7a9420d0630c951c4de44697a6d753aebc65c5 assets/assorted_armaments/models/item/golden_mace.json
 71d39dc9a3105364a3ea8c92880c32a4597529c4 assets/assorted_armaments/models/item/iron_claymore.json
 f13d51ffd2add96ae573fd701fd90bfcc310f59d assets/assorted_armaments/models/item/iron_claymore_blocking.json
 f7c7b38356c450a067560d6cd48dd062150f3958 assets/assorted_armaments/models/item/iron_claymore_inventory.json
+48e82205f3e84627c516a2393790171080a68f4f assets/assorted_armaments/models/item/iron_mace.json
 c315f5bf8d2372b2719696373384ad59b3c5a431 assets/assorted_armaments/models/item/netherite_claymore.json
 eda89a2e4667f95ec719a18a4b3ec377fff48948 assets/assorted_armaments/models/item/netherite_claymore_blocking.json
 110a66c24c32b3bd29f9777efe19d9cc769230b4 assets/assorted_armaments/models/item/netherite_claymore_inventory.json
+3dc57528b72903e8c4fff3cb6fa3739e11f3e279 assets/assorted_armaments/models/item/netherite_mace.json
 daed45eaf2b96d5097c98791f81946fd672a1f95 assets/assorted_armaments/models/item/stone_claymore.json
 ef0be2fb9c4a35f869878cf4aae153891db53764 assets/assorted_armaments/models/item/stone_claymore_blocking.json
 f81ac86f2a25cecb4949bb78e65e487895f14150 assets/assorted_armaments/models/item/stone_claymore_inventory.json
+26c4850fd8bb36666f6e16b090a7a306b0e536d8 assets/assorted_armaments/models/item/stone_mace.json
 fff5e484d6ed448fd747ae1d9c5f191f9f42997f assets/assorted_armaments/models/item/wooden_claymore.json
 1d4ebe2e7400716b793444ec422fbcbad50de24a assets/assorted_armaments/models/item/wooden_claymore_blocking.json
 7769febb5b9173a3405449255fcfb26b53ad50f9 assets/assorted_armaments/models/item/wooden_claymore_inventory.json
+ae00e6edfec471f1ba4e9955a3293ff8e01f4603 assets/assorted_armaments/models/item/wooden_mace.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,17 +1,29 @@
-// 1.21	2024-07-16T14:37:17.2203559	Recipes
+// 1.21	2024-07-17T09:50:46.867599	Recipes
 8382164a2d614e6d69b66ab944401aed13df5831 data/assorted_armaments/advancement/recipes/combat/diamond_claymore.json
+7c1fd99c1a811bcdab5562b1d6e932fa4430548a data/assorted_armaments/advancement/recipes/combat/diamond_mace.json
 a25b61df6c6c33ceaf2b1e6d730bb61fc1f5aadb data/assorted_armaments/advancement/recipes/combat/golden_claymore.json
+a8836313ab3bf6735fbb927a5dd4c67ef4526026 data/assorted_armaments/advancement/recipes/combat/golden_mace.json
 d276fd5fe3a0cf9a48f116fb2353e476df18cdf9 data/assorted_armaments/advancement/recipes/combat/iron_claymore.json
+54f050e3fc332ab970e960c69bc78e6c5612ed51 data/assorted_armaments/advancement/recipes/combat/iron_mace.json
 94b7e274b64f185c8aa46f4aaa24f7ad95a804d5 data/assorted_armaments/advancement/recipes/combat/netherite_claymore_smithing.json
+c34cf7505b8bca841090a5f3a9fc107f78e2f493 data/assorted_armaments/advancement/recipes/combat/netherite_mace_smithing.json
 d5b1ed1a87e63b2059a8821f54fd7ba7570bda29 data/assorted_armaments/advancement/recipes/combat/stone_claymore.json
+90af859f0da35a3909d4f49ab6303c49230fab52 data/assorted_armaments/advancement/recipes/combat/stone_mace.json
 e267c8093a149c569a1227905ee2e23025e6ab85 data/assorted_armaments/advancement/recipes/combat/wooden_claymore.json
-6d3eb532fa3814b720e492f80e56d8d6c6863055 data/assorted_armaments/advancement/recipes/misc/gold_nugget_from_smelting.json
-e630d1b2597084f5f8ac5f12fa8a9cac702a3479 data/assorted_armaments/advancement/recipes/misc/iron_nugget_from_smelting.json
+59a87bd4615a4c274604b516efc35f801184fc11 data/assorted_armaments/advancement/recipes/combat/wooden_mace.json
+c48d79d5652d0e747990dfe43fc2f46be397627d data/assorted_armaments/advancement/recipes/misc/gold_nugget_from_smelting.json
+d808a492db6370f1094cb5a84e6d3722aa88e93b data/assorted_armaments/advancement/recipes/misc/iron_nugget_from_smelting.json
 89885995711164134674b09c5c192288a98ad311 data/assorted_armaments/recipe/diamond_claymore.json
+4af12ab4812ba46e9bdddf6c05a20f68a960136c data/assorted_armaments/recipe/diamond_mace.json
 1f376c743e9f88e2522e2edfa796660d3027ddc8 data/assorted_armaments/recipe/golden_claymore.json
-920c1b220a31335de25b45b0438096c8baa73649 data/assorted_armaments/recipe/gold_nugget_from_smelting.json
+2e8951cb4ec1204c3664ea98322ef4308d19da50 data/assorted_armaments/recipe/golden_mace.json
+892627d8d6f0230d03d8ec9189094b40c54713d6 data/assorted_armaments/recipe/gold_nugget_from_smelting.json
 fafac210004fce3a6e958ef1a6381bbf514a11f4 data/assorted_armaments/recipe/iron_claymore.json
-d70254e5653eb4c529b7cca4de20a5e5de3bacf3 data/assorted_armaments/recipe/iron_nugget_from_smelting.json
+9275ad993c351adda5dff035a938fa5559b35735 data/assorted_armaments/recipe/iron_mace.json
+78c59f001b85fa1b7d22163f18264247b57ad008 data/assorted_armaments/recipe/iron_nugget_from_smelting.json
 b6326c23d1e52445305c6f16aaa53182fc9b24f8 data/assorted_armaments/recipe/netherite_claymore_smithing.json
+7551916980100fff882ee33c4fcb01e653fbcf2c data/assorted_armaments/recipe/netherite_mace_smithing.json
 9f2127f283804e7057a5a3dd37ddf82945936563 data/assorted_armaments/recipe/stone_claymore.json
+a9a907d3354f90e04bdc86e05d0fa0359700eb66 data/assorted_armaments/recipe/stone_mace.json
 e9077c25852fc3e140f1cdf3649abfe7c05b0ed1 data/assorted_armaments/recipe/wooden_claymore.json
+1bb60273a91347a571b324968622d0a37149fe91 data/assorted_armaments/recipe/wooden_mace.json

src/generated/resources/.cache/aec9b27ab4b41731e7cef8638cc084f67472833b

@@ -0,0 +1,3 @@
+// 1.21	2024-07-17T11:58:43.1606745	Tags for minecraft:entity_type mod id assorted_armaments
+cfed4d980bbfe7f6653b455d9609e16cf8f43921 data/assorted_armaments/tags/entity_type/piglins.json
+b2164b5ee879d6acc660ac00dfb3a822a2da2ad8 data/assorted_armaments/tags/entity_type/zombies.json

src/generated/resources/.cache/b9473a7920e150f1fd90d60adffdd8557dd85fef

@@ -1,6 +1,15 @@
-// 1.21	2024-07-16T16:07:37.0090101	Tags for minecraft:item mod id assorted_armaments
+// 1.21	2024-07-17T12:10:52.6461927	Tags for minecraft:item mod id assorted_armaments
+2339775d05f0f18b3a4b0442182b2947a8d21dac data/assorted_armaments/tags/item/armor_based_damage.json
 d500bd43e88c70df0ec4054b266d05b7df7e221e data/assorted_armaments/tags/item/can_block.json
 f24a559480a18b444e7f297e1003e8167bc0f39a data/assorted_armaments/tags/item/claymores.json
+7afce92566460028195e030448653863cf8cdad4 data/assorted_armaments/tags/item/disabled_when_disabling_blocking.json
+2339775d05f0f18b3a4b0442182b2947a8d21dac data/assorted_armaments/tags/item/disables_blocking_on_attack.json
 d500bd43e88c70df0ec4054b266d05b7df7e221e data/assorted_armaments/tags/item/efficient_sweep.json
+2339775d05f0f18b3a4b0442182b2947a8d21dac data/assorted_armaments/tags/item/extra_knockback.json
+49d8eba27c3286414774334db28149d1407fa619 data/assorted_armaments/tags/item/maces.json
+7077b1b5725e080525035c20f8566479b8e6bd11 data/assorted_armaments/tags/item/piglins_can_use.json
 d500bd43e88c70df0ec4054b266d05b7df7e221e data/assorted_armaments/tags/item/two_handed.json
+98f49f4247d9fd93ce70a45c22a636e58c22225d data/assorted_armaments/tags/item/zombies_can_use.json
+2339775d05f0f18b3a4b0442182b2947a8d21dac data/minecraft/tags/item/enchantable/sword.json
+7077b1b5725e080525035c20f8566479b8e6bd11 data/minecraft/tags/item/piglin_loved.json
 d500bd43e88c70df0ec4054b266d05b7df7e221e data/minecraft/tags/item/swords.json

src/generated/resources/.cache/e31f75891746f095f78065a964298b59b7cd2c16

@@ -1,2 +1,2 @@
-// 1.21	2024-07-16T16:21:56.2009386	Languages: zh_cn for mod: assorted_armaments
-6d82e65aec7095c92891f7f41d3218dedec54ef5 assets/assorted_armaments/lang/zh_cn.json
+// 1.21	2024-07-17T12:14:30.3551141	Languages: zh_cn for mod: assorted_armaments
+015041856bad326a9835b6521d55d40485265e40 assets/assorted_armaments/lang/zh_cn.json

src/generated/resources/assets/assorted_armaments/lang/en_us.json

@@ -1,13 +1,22 @@
 {
+  "desc.assorted_armaments.armor_based_damage": "Deals extra damage to enemies with armor",
   "desc.assorted_armaments.can_block": "Can be used to block melee damage that is equal to half of the weapon's damage",
-  "desc.assorted_armaments.efficient_sweep": "On a sweeping attack, all targets in range take 100% damage",
+  "desc.assorted_armaments.disables_blocking_on_attack": "Disables the target's ability to block",
+  "desc.assorted_armaments.efficient_sweep": "All targets in range on a sweeping attack take the same damage as a direct melee attack",
+  "desc.assorted_armaments.extra_knockback": "Deals extra knockback",
   "desc.assorted_armaments.shift": "Hold [SHIFT] for more information",
   "desc.assorted_armaments.two_handed": "Disables offhand items when held in main hand",
   "item.assorted_armaments.diamond_claymore": "Diamond Claymore",
+  "item.assorted_armaments.diamond_mace": "Diamond Mace",
   "item.assorted_armaments.golden_claymore": "Golden Claymore",
+  "item.assorted_armaments.golden_mace": "Golden Mace",
   "item.assorted_armaments.iron_claymore": "Iron Claymore",
+  "item.assorted_armaments.iron_mace": "Iron Mace",
   "item.assorted_armaments.netherite_claymore": "Netherite Claymore",
+  "item.assorted_armaments.netherite_mace": "Netherite Mace",
   "item.assorted_armaments.stone_claymore": "Stone Claymore",
+  "item.assorted_armaments.stone_mace": "Stone Mace",
   "item.assorted_armaments.wooden_claymore": "Wooden Claymore",
+  "item.assorted_armaments.wooden_mace": "Wooden Mace",
   "name.assorted_armaments": "Assorted Armaments"
 }

src/generated/resources/assets/assorted_armaments/lang/zh_cn.json

@@ -1,13 +1,22 @@
 {
+  "desc.assorted_armaments.armor_based_damage": "对有护甲的敌人造成额外伤害",
   "desc.assorted_armaments.can_block": "可以格挡武器伤害一半大小的近战伤害",
-  "desc.assorted_armaments.efficient_sweep": "横扫攻击时，范围内所有目标受到100%的伤害",
+  "desc.assorted_armaments.disables_blocking_on_attack": "攻击被格挡时使目标失去格挡能力",
+  "desc.assorted_armaments.efficient_sweep": "横扫攻击时范围内所有目标受到与直接攻击一致的伤害",
+  "desc.assorted_armaments.extra_knockback": "可造成额外击退",
   "desc.assorted_armaments.shift": "按[SHIFT]查看更多信息",
-  "desc.assorted_armaments.two_handed": "拿在主手时，禁用副手物品",
+  "desc.assorted_armaments.two_handed": "拿在主手时禁用副手物品",
   "item.assorted_armaments.diamond_claymore": "钻石大剑",
+  "item.assorted_armaments.diamond_mace": "钻石钉头锤",
   "item.assorted_armaments.golden_claymore": "金大剑",
+  "item.assorted_armaments.golden_mace": "金钉头锤",
   "item.assorted_armaments.iron_claymore": "铁大剑",
+  "item.assorted_armaments.iron_mace": "铁钉头锤",
   "item.assorted_armaments.netherite_claymore": "下界合金大剑",
+  "item.assorted_armaments.netherite_mace": "下界合金钉头锤",
   "item.assorted_armaments.stone_claymore": "石大剑",
+  "item.assorted_armaments.stone_mace": "石钉头锤",
   "item.assorted_armaments.wooden_claymore": "木大剑",
+  "item.assorted_armaments.wooden_mace": "木钉头锤",
   "name.assorted_armaments": "百般武艺"
 }

src/generated/resources/assets/assorted_armaments/models/item/diamond_mace.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "assorted_armaments:item/diamond_mace"
+  }
+}

src/generated/resources/assets/assorted_armaments/models/item/golden_mace.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "assorted_armaments:item/golden_mace"
+  }
+}

src/generated/resources/assets/assorted_armaments/models/item/iron_mace.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "assorted_armaments:item/iron_mace"
+  }
+}

src/generated/resources/assets/assorted_armaments/models/item/netherite_mace.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "assorted_armaments:item/netherite_mace"
+  }
+}

src/generated/resources/assets/assorted_armaments/models/item/stone_mace.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "assorted_armaments:item/stone_mace"
+  }
+}

src/generated/resources/assets/assorted_armaments/models/item/wooden_mace.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/handheld",
+  "textures": {
+    "layer0": "assorted_armaments:item/wooden_mace"
+  }
+}

src/generated/resources/data/assorted_armaments/advancement/recipes/combat/diamond_mace.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_diamond": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:diamond"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "assorted_armaments:diamond_mace"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_diamond"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "assorted_armaments:diamond_mace"
+    ]
+  }
+}

src/generated/resources/data/assorted_armaments/advancement/recipes/combat/golden_mace.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_gold_ingot": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:gold_ingot"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "assorted_armaments:golden_mace"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_gold_ingot"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "assorted_armaments:golden_mace"
+    ]
+  }
+}

src/generated/resources/data/assorted_armaments/advancement/recipes/combat/iron_mace.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_iron_ingot": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:iron_ingot"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "assorted_armaments:iron_mace"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_iron_ingot"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "assorted_armaments:iron_mace"
+    ]
+  }
+}

src/generated/resources/data/assorted_armaments/advancement/recipes/combat/netherite_mace_smithing.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_netherite_ingot": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:netherite_ingot"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "assorted_armaments:netherite_mace_smithing"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_netherite_ingot"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "assorted_armaments:netherite_mace_smithing"
+    ]
+  }
+}

src/generated/resources/data/assorted_armaments/advancement/recipes/combat/stone_mace.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": "#minecraft:stone_tool_materials"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "assorted_armaments:stone_mace"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_item"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "assorted_armaments:stone_mace"
+    ]
+  }
+}