diff --git a/src/generated/resources/assets/tconstruct/models/item/tool/swasher/blocking.json b/src/generated/resources/assets/tconstruct/models/item/tool/swasher/blocking.json new file mode 100644 index 0000000000..b21e5cd814 --- /dev/null +++ b/src/generated/resources/assets/tconstruct/models/item/tool/swasher/blocking.json @@ -0,0 +1,39 @@ +{ + "parent": "tconstruct:item/swasher", + "display": { + "firstperson_righthand": { + "rotation": [ + 0, + 0, + -5 + ], + "translation": [ + -5, + 2, + -0.2 + ], + "scale": [ + 1, + 1, + 1 + ] + }, + "firstperson_lefthand": { + "rotation": [ + 0, + 180, + 5 + ], + "translation": [ + -5, + 2, + -0.2 + ], + "scale": [ + 1, + 1, + 1 + ] + } + } +} diff --git a/src/generated/resources/assets/tconstruct/models/item/tool/swasher/blocking_1.json b/src/generated/resources/assets/tconstruct/models/item/tool/swasher/blocking_1.json new file mode 100644 index 0000000000..d0d6c2e72d --- /dev/null +++ b/src/generated/resources/assets/tconstruct/models/item/tool/swasher/blocking_1.json @@ -0,0 +1,39 @@ +{ + "parent": "tconstruct:item/tool/swasher/pulling_1", + "display": { + "firstperson_righthand": { + "rotation": [ + 0, + 0, + -5 + ], + "translation": [ + -5, + 2, + -0.2 + ], + "scale": [ + 1, + 1, + 1 + ] + }, + "firstperson_lefthand": { + "rotation": [ + 0, + 180, + 5 + ], + "translation": [ + -5, + 2, + -0.2 + ], + "scale": [ + 1, + 1, + 1 + ] + } + } +} diff --git a/src/generated/resources/assets/tconstruct/models/item/tool/swasher/blocking_2.json b/src/generated/resources/assets/tconstruct/models/item/tool/swasher/blocking_2.json new file mode 100644 index 0000000000..b30a686ff0 --- /dev/null +++ b/src/generated/resources/assets/tconstruct/models/item/tool/swasher/blocking_2.json @@ -0,0 +1,39 @@ +{ + "parent": "tconstruct:item/tool/swasher/pulling_2", + "display": { + "firstperson_righthand": { + "rotation": [ + 0, + 0, + -5 + ], + "translation": [ + -5, + 2, + -0.2 + ], + "scale": [ + 1, + 1, + 1 + ] + }, + "firstperson_lefthand": { + "rotation": [ + 0, + 180, + 5 + ], + "translation": [ + -5, + 2, + -0.2 + ], + "scale": [ + 1, + 1, + 1 + ] + } + } +} diff --git a/src/generated/resources/assets/tconstruct/models/item/tool/swasher/broken.json b/src/generated/resources/assets/tconstruct/models/item/tool/swasher/broken.json new file mode 100644 index 0000000000..c313830b1e --- /dev/null +++ b/src/generated/resources/assets/tconstruct/models/item/tool/swasher/broken.json @@ -0,0 +1,33 @@ +{ + "loader": "tconstruct:tool", + "parent": "tconstruct:item/base/swasher", + "textures": { + "blade": "tconstruct:item/tool/swasher/blade_broken", + "barrel": "tconstruct:item/tool/swasher/barrel", + "handle": "tconstruct:item/tool/swasher/handle" + }, + "modifier_roots": [ + "tconstruct:item/tool/swasher/modifiers/broken/", + "tconstruct:item/tool/swasher/modifiers/" + ], + "parts": [ + { + "name": "handle", + "index": 1 + }, + { + "name": "blade", + "index": 0 + }, + { + "name": "barrel", + "index": 2 + } + ], + "first_modifiers": [ + { + "name": "tconstruct:tank", + "forced": true + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/models/item/tool/swasher/pulling_1.json b/src/generated/resources/assets/tconstruct/models/item/tool/swasher/pulling_1.json new file mode 100644 index 0000000000..ef36d538a0 --- /dev/null +++ b/src/generated/resources/assets/tconstruct/models/item/tool/swasher/pulling_1.json @@ -0,0 +1,33 @@ +{ + "loader": "tconstruct:tool", + "parent": "tconstruct:item/base/swasher", + "textures": { + "blade": "tconstruct:item/tool/swasher/blade", + "barrel": "tconstruct:item/tool/swasher/barrel_1", + "handle": "tconstruct:item/tool/swasher/handle" + }, + "modifier_roots": [ + "tconstruct:item/tool/swasher/modifiers/1/", + "tconstruct:item/tool/swasher/modifiers/" + ], + "parts": [ + { + "name": "handle", + "index": 1 + }, + { + "name": "blade", + "index": 0 + }, + { + "name": "barrel", + "index": 2 + } + ], + "first_modifiers": [ + { + "name": "tconstruct:tank", + "forced": true + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/models/item/tool/swasher/pulling_2.json b/src/generated/resources/assets/tconstruct/models/item/tool/swasher/pulling_2.json new file mode 100644 index 0000000000..2d0ab7d0cb --- /dev/null +++ b/src/generated/resources/assets/tconstruct/models/item/tool/swasher/pulling_2.json @@ -0,0 +1,33 @@ +{ + "loader": "tconstruct:tool", + "parent": "tconstruct:item/base/swasher", + "textures": { + "blade": "tconstruct:item/tool/swasher/blade", + "barrel": "tconstruct:item/tool/swasher/barrel_2", + "handle": "tconstruct:item/tool/swasher/handle" + }, + "modifier_roots": [ + "tconstruct:item/tool/swasher/modifiers/2/", + "tconstruct:item/tool/swasher/modifiers/" + ], + "parts": [ + { + "name": "handle", + "index": 1 + }, + { + "name": "blade", + "index": 0 + }, + { + "name": "barrel", + "index": 2 + } + ], + "first_modifiers": [ + { + "name": "tconstruct:tank", + "forced": true + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_aluminum.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_aluminum.png new file mode 100644 index 0000000000..d17b42c33e Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_aluminum.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_amethyst_bronze.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_amethyst_bronze.png new file mode 100644 index 0000000000..2df100b4e6 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_amethyst_bronze.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_bamboo.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_bamboo.png new file mode 100644 index 0000000000..443884d8ea Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_bamboo.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_blazing_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_blazing_bone.png new file mode 100644 index 0000000000..6769b7a735 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_blazing_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_bone.png new file mode 100644 index 0000000000..b5f8146613 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_bronze.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_bronze.png new file mode 100644 index 0000000000..dede847f7d Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_bronze.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_chorus.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_chorus.png new file mode 100644 index 0000000000..cb03e06a6e Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_chorus.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_cobalt.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_cobalt.png new file mode 100644 index 0000000000..02f99ed608 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_cobalt.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_constantan.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_constantan.png new file mode 100644 index 0000000000..95ccba1e93 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_constantan.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_copper.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_copper.png new file mode 100644 index 0000000000..cc2e3265e6 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_copper.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_electrum.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_electrum.png new file mode 100644 index 0000000000..f2d73adbbc Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_electrum.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_hepatizon.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_hepatizon.png new file mode 100644 index 0000000000..e911c593ac Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_hepatizon.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_invar.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_invar.png new file mode 100644 index 0000000000..14a8290a2c Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_invar.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_iron.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_iron.png new file mode 100644 index 0000000000..4af22aa296 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_iron.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_lead.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_lead.png new file mode 100644 index 0000000000..98cfed7739 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_lead.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_manyullyn.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_manyullyn.png new file mode 100644 index 0000000000..f87e1c8ba1 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_manyullyn.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_nahuatl.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_nahuatl.png new file mode 100644 index 0000000000..79bc538532 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_nahuatl.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_necronium.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_necronium.png new file mode 100644 index 0000000000..aba56b49ea Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_necronium.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_necrotic_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_necrotic_bone.png new file mode 100644 index 0000000000..5d0f46523b Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_necrotic_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_plated_slimewood.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_plated_slimewood.png new file mode 100644 index 0000000000..18b1a1d2c6 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_plated_slimewood.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_platinum.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_platinum.png new file mode 100644 index 0000000000..2f878dd9d4 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_platinum.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_queens_slime.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_queens_slime.png new file mode 100644 index 0000000000..6639332263 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_queens_slime.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_rose_gold.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_rose_gold.png new file mode 100644 index 0000000000..dd102be60f Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_rose_gold.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_silver.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_silver.png new file mode 100644 index 0000000000..84b6ad9810 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_silver.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_slimesteel.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_slimesteel.png new file mode 100644 index 0000000000..b6b373d452 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_slimesteel.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_slimewood_greenheart.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_slimewood_greenheart.png new file mode 100644 index 0000000000..7851789eb3 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_slimewood_greenheart.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_steel.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_steel.png new file mode 100644 index 0000000000..0cf0569b2b Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_steel.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_tungsten.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_tungsten.png new file mode 100644 index 0000000000..19fc210e81 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_tungsten.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_unknown.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_unknown.png new file mode 100644 index 0000000000..31819bf743 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_unknown.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_venombone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_venombone.png new file mode 100644 index 0000000000..463afcfdbf Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_venombone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_wood.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_wood.png new file mode 100644 index 0000000000..38ec18e721 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_wood.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_aluminum.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_aluminum.png new file mode 100644 index 0000000000..88166bba2c Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_aluminum.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_amethyst_bronze.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_amethyst_bronze.png new file mode 100644 index 0000000000..6442565497 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_amethyst_bronze.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_bamboo.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_bamboo.png new file mode 100644 index 0000000000..2540de4045 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_bamboo.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_blazing_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_blazing_bone.png new file mode 100644 index 0000000000..7c43606baa Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_blazing_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_bone.png new file mode 100644 index 0000000000..6d31a64191 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_bronze.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_bronze.png new file mode 100644 index 0000000000..26c6d24180 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_bronze.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_chorus.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_chorus.png new file mode 100644 index 0000000000..d01bf9a049 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_chorus.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_cobalt.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_cobalt.png new file mode 100644 index 0000000000..c011d0d515 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_cobalt.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_constantan.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_constantan.png new file mode 100644 index 0000000000..6e20e16920 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_constantan.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_copper.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_copper.png new file mode 100644 index 0000000000..bfb3f3344c Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_copper.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_electrum.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_electrum.png new file mode 100644 index 0000000000..b1b0738ec2 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_electrum.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_hepatizon.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_hepatizon.png new file mode 100644 index 0000000000..b7a4e2c64e Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_hepatizon.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_invar.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_invar.png new file mode 100644 index 0000000000..bdffa951b9 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_invar.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_iron.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_iron.png new file mode 100644 index 0000000000..234db8a0d8 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_iron.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_lead.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_lead.png new file mode 100644 index 0000000000..54f6e5b426 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_lead.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_manyullyn.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_manyullyn.png new file mode 100644 index 0000000000..41e570f874 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_manyullyn.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_nahuatl.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_nahuatl.png new file mode 100644 index 0000000000..078466dc06 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_nahuatl.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_necronium.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_necronium.png new file mode 100644 index 0000000000..b08f2abe0a Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_necronium.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_necrotic_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_necrotic_bone.png new file mode 100644 index 0000000000..196f95d25f Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_necrotic_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_plated_slimewood.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_plated_slimewood.png new file mode 100644 index 0000000000..b9abc2e59d Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_plated_slimewood.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_platinum.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_platinum.png new file mode 100644 index 0000000000..fdeebc2d89 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_platinum.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_queens_slime.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_queens_slime.png new file mode 100644 index 0000000000..583b842edd Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_queens_slime.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_rose_gold.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_rose_gold.png new file mode 100644 index 0000000000..b2e182a495 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_rose_gold.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_silver.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_silver.png new file mode 100644 index 0000000000..89700f0613 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_silver.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_slimesteel.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_slimesteel.png new file mode 100644 index 0000000000..43bad30879 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_slimesteel.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_slimewood_greenheart.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_slimewood_greenheart.png new file mode 100644 index 0000000000..0e05536b22 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_slimewood_greenheart.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_steel.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_steel.png new file mode 100644 index 0000000000..d49755ac37 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_steel.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_tungsten.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_tungsten.png new file mode 100644 index 0000000000..c947ff6df3 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_tungsten.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_unknown.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_unknown.png new file mode 100644 index 0000000000..e204e61631 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_unknown.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_venombone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_venombone.png new file mode 100644 index 0000000000..87cb3c9e76 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_venombone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_wood.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_wood.png new file mode 100644 index 0000000000..1df1771c78 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_wood.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_aluminum.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_aluminum.png new file mode 100644 index 0000000000..03dfe12c6c Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_aluminum.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_amethyst_bronze.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_amethyst_bronze.png new file mode 100644 index 0000000000..a28992a8a5 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_amethyst_bronze.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_bamboo.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_bamboo.png new file mode 100644 index 0000000000..a09dbd1b52 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_bamboo.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_blazing_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_blazing_bone.png new file mode 100644 index 0000000000..2525cac7ee Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_blazing_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_bone.png new file mode 100644 index 0000000000..a5a4c1fcf5 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_bronze.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_bronze.png new file mode 100644 index 0000000000..4906433939 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_bronze.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_chorus.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_chorus.png new file mode 100644 index 0000000000..a1e2ade017 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_chorus.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_cobalt.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_cobalt.png new file mode 100644 index 0000000000..a5fe510439 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_cobalt.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_constantan.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_constantan.png new file mode 100644 index 0000000000..67eb391a76 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_constantan.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_copper.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_copper.png new file mode 100644 index 0000000000..e8f8a531d0 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_copper.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_electrum.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_electrum.png new file mode 100644 index 0000000000..8d3514116e Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_electrum.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_hepatizon.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_hepatizon.png new file mode 100644 index 0000000000..97fadc8156 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_hepatizon.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_invar.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_invar.png new file mode 100644 index 0000000000..a969b224bd Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_invar.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_iron.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_iron.png new file mode 100644 index 0000000000..4babdedef1 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_iron.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_lead.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_lead.png new file mode 100644 index 0000000000..06b012635e Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_lead.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_manyullyn.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_manyullyn.png new file mode 100644 index 0000000000..ca08d073a3 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_manyullyn.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_nahuatl.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_nahuatl.png new file mode 100644 index 0000000000..baca37c512 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_nahuatl.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_necronium.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_necronium.png new file mode 100644 index 0000000000..332ef694dc Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_necronium.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_necrotic_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_necrotic_bone.png new file mode 100644 index 0000000000..7f56ab1f57 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_necrotic_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_plated_slimewood.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_plated_slimewood.png new file mode 100644 index 0000000000..36396db677 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_plated_slimewood.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_platinum.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_platinum.png new file mode 100644 index 0000000000..d187199808 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_platinum.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_queens_slime.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_queens_slime.png new file mode 100644 index 0000000000..14b50a204f Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_queens_slime.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_rose_gold.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_rose_gold.png new file mode 100644 index 0000000000..2ded07e401 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_rose_gold.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_silver.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_silver.png new file mode 100644 index 0000000000..9169bf1e36 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_silver.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_slimesteel.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_slimesteel.png new file mode 100644 index 0000000000..9cc577eec3 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_slimesteel.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_slimewood_greenheart.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_slimewood_greenheart.png new file mode 100644 index 0000000000..fdd812fff3 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_slimewood_greenheart.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_steel.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_steel.png new file mode 100644 index 0000000000..b104041303 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_steel.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_tungsten.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_tungsten.png new file mode 100644 index 0000000000..bf6b51b2dc Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_tungsten.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_unknown.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_unknown.png new file mode 100644 index 0000000000..5536358ea0 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_unknown.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_venombone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_venombone.png new file mode 100644 index 0000000000..635e198ac9 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_venombone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_wood.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_wood.png new file mode 100644 index 0000000000..7a33612e1f Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_wood.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_amethyst_bronze.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_amethyst_bronze.png new file mode 100644 index 0000000000..7891215bd6 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_amethyst_bronze.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_blazing_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_blazing_bone.png new file mode 100644 index 0000000000..9918588efb Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_blazing_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_bone.png new file mode 100644 index 0000000000..a478ae1a43 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_bronze.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_bronze.png new file mode 100644 index 0000000000..cb75f1f190 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_bronze.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_chorus.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_chorus.png new file mode 100644 index 0000000000..75a3ca78d0 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_chorus.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_cobalt.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_cobalt.png new file mode 100644 index 0000000000..a14c76aef4 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_cobalt.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_constantan.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_constantan.png new file mode 100644 index 0000000000..53c484ae43 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_constantan.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_copper.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_copper.png new file mode 100644 index 0000000000..ddb9366511 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_copper.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_electrum.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_electrum.png new file mode 100644 index 0000000000..f19c50d1bb Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_electrum.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_flint.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_flint.png new file mode 100644 index 0000000000..be9914588b Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_flint.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_hepatizon.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_hepatizon.png new file mode 100644 index 0000000000..b07b1a2005 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_hepatizon.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_invar.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_invar.png new file mode 100644 index 0000000000..4338c417c0 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_invar.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_iron.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_iron.png new file mode 100644 index 0000000000..9c7d7d759d Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_iron.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_lead.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_lead.png new file mode 100644 index 0000000000..7abc40a218 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_lead.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_manyullyn.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_manyullyn.png new file mode 100644 index 0000000000..ea3701cd90 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_manyullyn.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_nahuatl.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_nahuatl.png new file mode 100644 index 0000000000..ea60630cc1 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_nahuatl.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_necronium.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_necronium.png new file mode 100644 index 0000000000..c2a28f4bf0 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_necronium.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_necrotic_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_necrotic_bone.png new file mode 100644 index 0000000000..0d3b79d45c Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_necrotic_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_osmium.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_osmium.png new file mode 100644 index 0000000000..fc643c0200 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_osmium.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_pig_iron.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_pig_iron.png new file mode 100644 index 0000000000..869a6e2d07 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_pig_iron.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_plated_slimewood.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_plated_slimewood.png new file mode 100644 index 0000000000..13ad7ad50e Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_plated_slimewood.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_platinum.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_platinum.png new file mode 100644 index 0000000000..bcb4300691 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_platinum.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_queens_slime.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_queens_slime.png new file mode 100644 index 0000000000..607ff21691 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_queens_slime.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_rock_stone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_rock_stone.png new file mode 100644 index 0000000000..9a5d5bcfba Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_rock_stone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_rose_gold.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_rose_gold.png new file mode 100644 index 0000000000..f0a75b4087 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_rose_gold.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_scorched_stone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_scorched_stone.png new file mode 100644 index 0000000000..2109066d80 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_scorched_stone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_seared_stone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_seared_stone.png new file mode 100644 index 0000000000..cd5f62b75f Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_seared_stone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_silver.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_silver.png new file mode 100644 index 0000000000..0de03e5767 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_silver.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_slimesteel.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_slimesteel.png new file mode 100644 index 0000000000..5f173f5aa4 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_slimesteel.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_slimewood_greenheart.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_slimewood_greenheart.png new file mode 100644 index 0000000000..170c55c752 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_slimewood_greenheart.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_steel.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_steel.png new file mode 100644 index 0000000000..fc0554e9ed Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_steel.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_tungsten.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_tungsten.png new file mode 100644 index 0000000000..57d7b668ed Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_tungsten.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_unknown.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_unknown.png new file mode 100644 index 0000000000..99b240a8da Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_unknown.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_venombone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_venombone.png new file mode 100644 index 0000000000..b942364382 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_venombone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_whitestone_end.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_whitestone_end.png new file mode 100644 index 0000000000..c7863ed948 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_whitestone_end.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_wood.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_wood.png new file mode 100644 index 0000000000..aa42d5d912 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_broken_tconstruct_wood.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_amethyst_bronze.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_amethyst_bronze.png new file mode 100644 index 0000000000..830228ac8f Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_amethyst_bronze.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_blazing_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_blazing_bone.png new file mode 100644 index 0000000000..abe5f614a3 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_blazing_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_bone.png new file mode 100644 index 0000000000..3fdc1d6888 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_bronze.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_bronze.png new file mode 100644 index 0000000000..9024d5bbaa Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_bronze.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_chorus.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_chorus.png new file mode 100644 index 0000000000..7fdabc71d4 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_chorus.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_cobalt.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_cobalt.png new file mode 100644 index 0000000000..64cd37e9be Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_cobalt.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_constantan.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_constantan.png new file mode 100644 index 0000000000..bfbb792c58 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_constantan.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_copper.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_copper.png new file mode 100644 index 0000000000..eb478a546a Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_copper.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_electrum.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_electrum.png new file mode 100644 index 0000000000..b0ae574cf6 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_electrum.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_flint.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_flint.png new file mode 100644 index 0000000000..ef2a790774 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_flint.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_hepatizon.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_hepatizon.png new file mode 100644 index 0000000000..4ac93702f6 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_hepatizon.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_invar.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_invar.png new file mode 100644 index 0000000000..f1a44d7178 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_invar.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_iron.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_iron.png new file mode 100644 index 0000000000..61adaf3a28 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_iron.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_lead.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_lead.png new file mode 100644 index 0000000000..60b3a8b87e Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_lead.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_manyullyn.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_manyullyn.png new file mode 100644 index 0000000000..0038533519 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_manyullyn.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_nahuatl.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_nahuatl.png new file mode 100644 index 0000000000..d6aba14ba3 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_nahuatl.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_necronium.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_necronium.png new file mode 100644 index 0000000000..6cb42a5a1b Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_necronium.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_necrotic_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_necrotic_bone.png new file mode 100644 index 0000000000..41e7b96378 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_necrotic_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_osmium.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_osmium.png new file mode 100644 index 0000000000..af2108e464 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_osmium.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_pig_iron.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_pig_iron.png new file mode 100644 index 0000000000..63de78c212 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_pig_iron.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_plated_slimewood.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_plated_slimewood.png new file mode 100644 index 0000000000..3668d25786 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_plated_slimewood.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_platinum.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_platinum.png new file mode 100644 index 0000000000..d63de68955 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_platinum.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_queens_slime.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_queens_slime.png new file mode 100644 index 0000000000..2fa31f147a Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_queens_slime.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_rock_stone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_rock_stone.png new file mode 100644 index 0000000000..a38f914b30 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_rock_stone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_rose_gold.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_rose_gold.png new file mode 100644 index 0000000000..82629a5664 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_rose_gold.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_scorched_stone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_scorched_stone.png new file mode 100644 index 0000000000..7124936cee Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_scorched_stone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_seared_stone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_seared_stone.png new file mode 100644 index 0000000000..2703c436ba Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_seared_stone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_silver.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_silver.png new file mode 100644 index 0000000000..4556a6b170 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_silver.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_slimesteel.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_slimesteel.png new file mode 100644 index 0000000000..175c46c64a Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_slimesteel.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_slimewood_greenheart.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_slimewood_greenheart.png new file mode 100644 index 0000000000..b9353ba5bc Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_slimewood_greenheart.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_steel.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_steel.png new file mode 100644 index 0000000000..67653334cc Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_steel.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_tungsten.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_tungsten.png new file mode 100644 index 0000000000..0e706548a0 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_tungsten.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_unknown.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_unknown.png new file mode 100644 index 0000000000..8d22ce8568 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_unknown.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_venombone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_venombone.png new file mode 100644 index 0000000000..22afea2dbb Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_venombone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_whitestone_end.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_whitestone_end.png new file mode 100644 index 0000000000..4a6e1012d8 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_whitestone_end.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_wood.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_wood.png new file mode 100644 index 0000000000..35d8f58e76 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/blade_tconstruct_wood.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_amethyst_bronze.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_amethyst_bronze.png new file mode 100644 index 0000000000..081b6b88be Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_amethyst_bronze.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_blazing_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_blazing_bone.png new file mode 100644 index 0000000000..4d4b9b7081 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_blazing_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_bone.png new file mode 100644 index 0000000000..9faf4fcded Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_bronze.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_bronze.png new file mode 100644 index 0000000000..0727a2253d Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_bronze.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_chorus.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_chorus.png new file mode 100644 index 0000000000..ff00bc5ccd Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_chorus.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_cobalt.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_cobalt.png new file mode 100644 index 0000000000..5c1f5ca20c Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_cobalt.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_constantan.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_constantan.png new file mode 100644 index 0000000000..5ea8ca707f Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_constantan.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_copper.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_copper.png new file mode 100644 index 0000000000..2a913bb477 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_copper.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_electrum.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_electrum.png new file mode 100644 index 0000000000..07f9521bac Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_electrum.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_flint.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_flint.png new file mode 100644 index 0000000000..4e2801a065 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_flint.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_hepatizon.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_hepatizon.png new file mode 100644 index 0000000000..895e3d8f9a Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_hepatizon.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_invar.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_invar.png new file mode 100644 index 0000000000..3edd5b292e Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_invar.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_iron.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_iron.png new file mode 100644 index 0000000000..bc07df2733 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_iron.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_lead.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_lead.png new file mode 100644 index 0000000000..8512516a6e Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_lead.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_manyullyn.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_manyullyn.png new file mode 100644 index 0000000000..b440c2ce42 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_manyullyn.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_nahuatl.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_nahuatl.png new file mode 100644 index 0000000000..36dc6aceea Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_nahuatl.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_necronium.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_necronium.png new file mode 100644 index 0000000000..3e1ad68ada Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_necronium.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_necrotic_bone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_necrotic_bone.png new file mode 100644 index 0000000000..61fa08091a Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_necrotic_bone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_osmium.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_osmium.png new file mode 100644 index 0000000000..56922c5cd0 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_osmium.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_pig_iron.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_pig_iron.png new file mode 100644 index 0000000000..dee2598534 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_pig_iron.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_plated_slimewood.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_plated_slimewood.png new file mode 100644 index 0000000000..7971cf0bac Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_plated_slimewood.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_platinum.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_platinum.png new file mode 100644 index 0000000000..9015a8d156 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_platinum.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_queens_slime.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_queens_slime.png new file mode 100644 index 0000000000..9d32f3ec92 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_queens_slime.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_rock_stone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_rock_stone.png new file mode 100644 index 0000000000..7f72ba7b44 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_rock_stone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_rose_gold.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_rose_gold.png new file mode 100644 index 0000000000..4f6667b9f4 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_rose_gold.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_scorched_stone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_scorched_stone.png new file mode 100644 index 0000000000..c26948604a Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_scorched_stone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_seared_stone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_seared_stone.png new file mode 100644 index 0000000000..0912d96acd Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_seared_stone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_silver.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_silver.png new file mode 100644 index 0000000000..f3f6d6af91 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_silver.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_slimesteel.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_slimesteel.png new file mode 100644 index 0000000000..21c0710fc1 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_slimesteel.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_slimewood_greenheart.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_slimewood_greenheart.png new file mode 100644 index 0000000000..4e213a0c3b Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_slimewood_greenheart.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_steel.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_steel.png new file mode 100644 index 0000000000..02dd474540 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_steel.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_tungsten.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_tungsten.png new file mode 100644 index 0000000000..529d6efda6 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_tungsten.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_unknown.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_unknown.png new file mode 100644 index 0000000000..fbf435633c Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_unknown.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_venombone.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_venombone.png new file mode 100644 index 0000000000..dc3b25c615 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_venombone.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_whitestone_end.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_whitestone_end.png new file mode 100644 index 0000000000..35ebf12218 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_whitestone_end.png differ diff --git a/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_wood.png b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_wood.png new file mode 100644 index 0000000000..5592dc3cd3 Binary files /dev/null and b/src/generated/resources/assets/tconstruct/textures/item/tool/swasher/handle_tconstruct_wood.png differ diff --git a/src/generated/resources/assets/tconstruct/tinkering/generator_part_textures.json b/src/generated/resources/assets/tconstruct/tinkering/generator_part_textures.json index ce9499342a..dbbbb15767 100644 --- a/src/generated/resources/assets/tconstruct/tinkering/generator_part_textures.json +++ b/src/generated/resources/assets/tconstruct/tinkering/generator_part_textures.json @@ -824,6 +824,36 @@ "path": "tconstruct:item/tool/battlesign/handle", "skip_variants": true, "stat_type": "tconstruct:plating_shield" + }, + { + "path": "tconstruct:item/tool/swasher/blade", + "skip_variants": true, + "stat_type": "tconstruct:head" + }, + { + "path": "tconstruct:item/tool/swasher/blade_broken", + "skip_variants": true, + "stat_type": "tconstruct:head" + }, + { + "path": "tconstruct:item/tool/swasher/handle", + "skip_variants": true, + "stat_type": "tconstruct:handle" + }, + { + "path": "tconstruct:item/tool/swasher/barrel", + "skip_variants": true, + "stat_type": "tconstruct:grip" + }, + { + "path": "tconstruct:item/tool/swasher/barrel_1", + "skip_variants": true, + "stat_type": "tconstruct:grip" + }, + { + "path": "tconstruct:item/tool/swasher/barrel_2", + "skip_variants": true, + "stat_type": "tconstruct:grip" } ], "replace": false diff --git a/src/generated/resources/data/minecraft/tags/items/swords.json b/src/generated/resources/data/minecraft/tags/items/swords.json index 74312a195d..ac4f032c1c 100644 --- a/src/generated/resources/data/minecraft/tags/items/swords.json +++ b/src/generated/resources/data/minecraft/tags/items/swords.json @@ -2,6 +2,7 @@ "values": [ "tconstruct:dagger", "tconstruct:sword", - "tconstruct:cleaver" + "tconstruct:cleaver", + "tconstruct:swasher" ] } \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/mantle/loot_injectors/buried_treasure.json b/src/generated/resources/data/tconstruct/mantle/loot_injectors/buried_treasure.json new file mode 100644 index 0000000000..3a8e381f32 --- /dev/null +++ b/src/generated/resources/data/tconstruct/mantle/loot_injectors/buried_treasure.json @@ -0,0 +1,38 @@ +{ + "name": "minecraft:chests/buried_treasure", + "pools": [ + { + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "tconstruct:add_tool_data", + "materials": [ + { + "type": "tconstruct:random" + }, + { + "type": "tconstruct:random" + }, + { + "type": "tconstruct:random" + } + ] + }, + { + "fluid": { + "amount": 1000, + "fluid": "minecraft:lava" + }, + "function": "mantle:set_fluid" + } + ], + "name": "tconstruct:swasher", + "weight": 2 + } + ], + "name": "pool3" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/mantle/loot_injectors/fishing_treasure.json b/src/generated/resources/data/tconstruct/mantle/loot_injectors/fishing_treasure.json new file mode 100644 index 0000000000..2124a94094 --- /dev/null +++ b/src/generated/resources/data/tconstruct/mantle/loot_injectors/fishing_treasure.json @@ -0,0 +1,37 @@ +{ + "name": "minecraft:gameplay/fishing/treasure", + "pools": [ + { + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "tconstruct:add_tool_data", + "materials": [ + { + "type": "tconstruct:random" + }, + { + "type": "tconstruct:random" + }, + { + "type": "tconstruct:random" + } + ] + }, + { + "fluid": { + "amount": 1000, + "fluid": "minecraft:lava" + }, + "function": "mantle:set_fluid" + } + ], + "name": "tconstruct:swasher" + } + ], + "name": "main" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/mantle/loot_injectors/shipwreck_treasure.json b/src/generated/resources/data/tconstruct/mantle/loot_injectors/shipwreck_treasure.json new file mode 100644 index 0000000000..0d262bdf25 --- /dev/null +++ b/src/generated/resources/data/tconstruct/mantle/loot_injectors/shipwreck_treasure.json @@ -0,0 +1,38 @@ +{ + "name": "minecraft:chests/shipwreck_treasure", + "pools": [ + { + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "tconstruct:add_tool_data", + "materials": [ + { + "type": "tconstruct:random" + }, + { + "type": "tconstruct:random" + }, + { + "type": "tconstruct:random" + } + ] + }, + { + "fluid": { + "amount": 1000, + "fluid": "minecraft:lava" + }, + "function": "mantle:set_fluid" + } + ], + "name": "tconstruct:swasher", + "weight": 10 + } + ], + "name": "main" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/spitting.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/spitting.json index 2e27d8c1d9..2f9f5201b4 100644 --- a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/spitting.json +++ b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/ability/spitting.json @@ -36,6 +36,9 @@ }, { "tag": "tconstruct:modifiable/shields" + }, + { + "item": "tconstruct:swasher" } ] ] diff --git a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/spitting.json b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/spitting.json index 9107c7788b..149fc53ecb 100644 --- a/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/spitting.json +++ b/src/generated/resources/data/tconstruct/recipes/tools/modifiers/salvage/ability/spitting.json @@ -16,6 +16,9 @@ }, { "tag": "tconstruct:modifiable/shields" + }, + { + "item": "tconstruct:swasher" } ] ] diff --git a/src/generated/resources/data/tconstruct/tags/items/modifiable/ancient.json b/src/generated/resources/data/tconstruct/tags/items/modifiable/ancient.json index 5b46113f5e..0e76d2646c 100644 --- a/src/generated/resources/data/tconstruct/tags/items/modifiable/ancient.json +++ b/src/generated/resources/data/tconstruct/tags/items/modifiable/ancient.json @@ -2,6 +2,7 @@ "values": [ "tconstruct:melting_pan", "tconstruct:war_pick", - "tconstruct:battlesign" + "tconstruct:battlesign", + "tconstruct:swasher" ] } \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/tags/items/modifiable/bonus_slots.json b/src/generated/resources/data/tconstruct/tags/items/modifiable/bonus_slots.json index 1be5695d29..3ed0a4c64b 100644 --- a/src/generated/resources/data/tconstruct/tags/items/modifiable/bonus_slots.json +++ b/src/generated/resources/data/tconstruct/tags/items/modifiable/bonus_slots.json @@ -23,6 +23,7 @@ "tconstruct:melting_pan", "tconstruct:war_pick", "tconstruct:battlesign", + "tconstruct:swasher", "tconstruct:travelers_helmet", "tconstruct:travelers_chestplate", "tconstruct:travelers_leggings", diff --git a/src/generated/resources/data/tconstruct/tags/items/modifiable/durability.json b/src/generated/resources/data/tconstruct/tags/items/modifiable/durability.json index 1be5695d29..3ed0a4c64b 100644 --- a/src/generated/resources/data/tconstruct/tags/items/modifiable/durability.json +++ b/src/generated/resources/data/tconstruct/tags/items/modifiable/durability.json @@ -23,6 +23,7 @@ "tconstruct:melting_pan", "tconstruct:war_pick", "tconstruct:battlesign", + "tconstruct:swasher", "tconstruct:travelers_helmet", "tconstruct:travelers_chestplate", "tconstruct:travelers_leggings", diff --git a/src/generated/resources/data/tconstruct/tags/items/modifiable/harvest.json b/src/generated/resources/data/tconstruct/tags/items/modifiable/harvest.json index 228a5ba52c..db7cdf9a42 100644 --- a/src/generated/resources/data/tconstruct/tags/items/modifiable/harvest.json +++ b/src/generated/resources/data/tconstruct/tags/items/modifiable/harvest.json @@ -3,6 +3,7 @@ "tconstruct:dagger", "tconstruct:sword", "tconstruct:cleaver", + "tconstruct:swasher", "#tconstruct:modifiable/harvest/primary", "#tconstruct:modifiable/harvest/stone" ] diff --git a/src/generated/resources/data/tconstruct/tags/items/modifiable/held.json b/src/generated/resources/data/tconstruct/tags/items/modifiable/held.json index d94e2550e3..91bac2c8bc 100644 --- a/src/generated/resources/data/tconstruct/tags/items/modifiable/held.json +++ b/src/generated/resources/data/tconstruct/tags/items/modifiable/held.json @@ -1,6 +1,7 @@ { "values": [ "tconstruct:war_pick", + "tconstruct:swasher", "#tconstruct:modifiable/interactable/right", "#tconstruct:modifiable/interactable/left", "#tconstruct:modifiable/armor/held" diff --git a/src/generated/resources/data/tconstruct/tags/items/modifiable/melee/primary.json b/src/generated/resources/data/tconstruct/tags/items/modifiable/melee/primary.json index a40a0618d0..61e648d064 100644 --- a/src/generated/resources/data/tconstruct/tags/items/modifiable/melee/primary.json +++ b/src/generated/resources/data/tconstruct/tags/items/modifiable/melee/primary.json @@ -7,6 +7,7 @@ "tconstruct:dagger", "tconstruct:sword", "tconstruct:cleaver", - "tconstruct:battlesign" + "tconstruct:battlesign", + "tconstruct:swasher" ] } \ No newline at end of file diff --git a/src/generated/resources/data/tconstruct/tags/items/modifiable/multipart.json b/src/generated/resources/data/tconstruct/tags/items/modifiable/multipart.json index ab3d997a76..888b383704 100644 --- a/src/generated/resources/data/tconstruct/tags/items/modifiable/multipart.json +++ b/src/generated/resources/data/tconstruct/tags/items/modifiable/multipart.json @@ -18,6 +18,7 @@ "tconstruct:melting_pan", "tconstruct:war_pick", "tconstruct:battlesign", + "tconstruct:swasher", "tconstruct:plate_helmet", "tconstruct:plate_chestplate", "tconstruct:plate_leggings", diff --git a/src/generated/resources/data/tconstruct/tags/items/modifiable/ranged.json b/src/generated/resources/data/tconstruct/tags/items/modifiable/ranged.json index 054f9f4027..d4607c0bed 100644 --- a/src/generated/resources/data/tconstruct/tags/items/modifiable/ranged.json +++ b/src/generated/resources/data/tconstruct/tags/items/modifiable/ranged.json @@ -1,5 +1,6 @@ { "values": [ + "tconstruct:swasher", "#tconstruct:modifiable/ranged/bows", "#tconstruct:modifiable/staffs" ] diff --git a/src/generated/resources/data/tconstruct/tinkering/tool_definitions/swasher.json b/src/generated/resources/data/tconstruct/tinkering/tool_definitions/swasher.json new file mode 100644 index 0000000000..3f1e3d229c --- /dev/null +++ b/src/generated/resources/data/tconstruct/tinkering/tool_definitions/swasher.json @@ -0,0 +1,85 @@ +{ + "modules": [ + { + "type": "tconstruct:material_stats", + "primary_part": 0, + "stat_types": [ + "tconstruct:head", + "tconstruct:handle", + "tconstruct:grip" + ] + }, + { + "type": "tconstruct:default_materials", + "materials": [ + { + "type": "tconstruct:random" + }, + { + "type": "tconstruct:random" + }, + { + "type": "tconstruct:random" + } + ] + }, + { + "type": "tconstruct:material_traits", + "hooks": [ + "tconstruct:rebalanced_trait" + ], + "material_index": 2, + "stat_type": "tconstruct:grip" + }, + { + "type": "tconstruct:base_stats", + "stats": { + "tconstruct:attack_speed": 1.5, + "tconstruct:draw_speed": 1.5 + } + }, + { + "type": "tconstruct:modifier_slots", + "slots": { + "abilities": 1, + "upgrades": 3 + } + }, + { + "type": "tconstruct:traits", + "traits": [ + { + "level": 1, + "name": "tconstruct:spitting" + }, + { + "level": 1, + "name": "tconstruct:spilling" + }, + { + "level": 1, + "name": "tconstruct:silky_shears" + } + ] + }, + { + "type": "tconstruct:tool_actions", + "tool_actions": [ + "sword_dig" + ] + }, + { + "type": "tconstruct:is_effective", + "predicate_type": "mantle:tag", + "tag": "forge:mineable/sword" + }, + { + "type": "tconstruct:mining_speed_modifier", + "blocks": [ + "minecraft:cobweb" + ], + "modifier": 7.5, + "predicate_type": "mantle:set" + } + ] +} \ No newline at end of file diff --git a/src/main/java/slimeknights/tconstruct/common/data/loot/LootTableInjectionProvider.java b/src/main/java/slimeknights/tconstruct/common/data/loot/LootTableInjectionProvider.java index b7060a467c..8b10e0f629 100644 --- a/src/main/java/slimeknights/tconstruct/common/data/loot/LootTableInjectionProvider.java +++ b/src/main/java/slimeknights/tconstruct/common/data/loot/LootTableInjectionProvider.java @@ -1,13 +1,17 @@ package slimeknights.tconstruct.common.data.loot; import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.level.material.Fluids; import net.minecraft.world.level.storage.loot.entries.LootItem; import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer; +import net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction; import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction; import net.minecraft.world.level.storage.loot.functions.SetItemDamageFunction; import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidType; import slimeknights.mantle.loot.AbstractLootTableInjectionProvider; import slimeknights.mantle.loot.LootTableInjection; import slimeknights.mantle.loot.function.SetFluidLootFunction; @@ -46,7 +50,7 @@ protected void addTables() { // bartering RandomMaterial random = RandomMaterial.random().build(); - AddToolDataFunction.Builder ancientToolData = AddToolDataFunction.builder().addMaterial(random).addMaterial(random); + AddToolDataFunction.Builder ancientToolData2 = AddToolDataFunction.builder().addMaterial(random).addMaterial(random); injectGameplay("piglin_bartering") .addToPool("main", LootItem.lootTableItem(TinkerSmeltery.scorchedLantern).setWeight(20) .apply(SetFluidLootFunction.builder(new FluidStack(TinkerFluids.blazingBlood.get(), FluidValues.LANTERN_CAPACITY))) @@ -54,7 +58,7 @@ protected void addTables() { .build()) .addToPool("main", LootItem.lootTableItem(TinkerTools.battlesign.get()) .setWeight(5) - .apply(ancientToolData) + .apply(ancientToolData2) .build()); // spawn chest @@ -90,51 +94,51 @@ protected void addTables() { injectChest("simple_dungeon") .addToPool("main", LootItem.lootTableItem(TinkerTools.meltingPan.get()) .setWeight(10) // about as often as both diamond swords - .apply(ancientToolData) + .apply(ancientToolData2) .build()); injectChest("igloo_chest") .addToPool("main", LootItem.lootTableItem(TinkerTools.meltingPan.get()) .setWeight(2) // common as a stone axe - .apply(ancientToolData) + .apply(ancientToolData2) .build()); inject("hero_of_the_toolsmith", "gameplay/hero_of_the_village/toolsmith_gift") .addToPool("main", LootItem.lootTableItem(TinkerTools.meltingPan.get()) .setWeight(2) // makes it a 40% chance of frypan as opposed to an axe variant - .apply(ancientToolData) + .apply(ancientToolData2) .build()); // find warpicks in pillager outputs, 50% chance to replace the crossbow - AddToolDataFunction.Builder warPickData = AddToolDataFunction.builder().addMaterial(random).addMaterial(random).addMaterial(random); + AddToolDataFunction.Builder ancientToolData3 = AddToolDataFunction.builder().addMaterial(random).addMaterial(random).addMaterial(random); injectChest("pillager_outpost") .addToPool("main", LootItem.lootTableItem(TinkerTools.warPick.get()) - .apply(warPickData) + .apply(ancientToolData3) .build()); // also find them in mineshafts, same pool as iron picks injectChest("abandoned_mineshaft") .addToPool("main", LootItem.lootTableItem(TinkerTools.warPick.get()) .setWeight(5) // about as often as both diamond swords - .apply(warPickData) + .apply(ancientToolData3) .build()); injectChest("woodland_mansion") .addToPool("main", LootItem.lootTableItem(TinkerTools.warPick.get()) .setWeight(10) // about as often as both diamond swords - .apply(warPickData) + .apply(ancientToolData3) .build()); inject("hero_of_the_weaponsmith", "gameplay/hero_of_the_village/weaponsmith_gift") .addToPool("main", LootItem.lootTableItem(TinkerTools.warPick.get()) .setWeight(2) // makes it a 33% chance of war pick as opposed to a stone tool - .apply(warPickData) + .apply(ancientToolData3) .build()); LootTableInjection.Builder bastion = injectChest("bastion_treasure") .addToPool("main", LootItem.lootTableItem(TinkerTools.battlesign.get()) .setWeight(12) // about as often as both diamond swords - .apply(ancientToolData) + .apply(ancientToolData2) .build()); injectChest("bastion_other") .addToPool("pool1", LootItem.lootTableItem(TinkerTools.battlesign.get()) .setWeight(3) // bit more common than an iron sword - .apply(ancientToolData) + .apply(ancientToolData2) .apply(SetItemDamageFunction.setDamage(UniformGenerator.between(0.1f, 0.9f))) .build()); // diamond armor shows in bastions, add in some plate with similar weight to enchanted version @@ -148,10 +152,26 @@ protected void addTables() { .build()); } - // TODO: igloo - frypan? - // TODO: simple dungeon - frypan - main - weight 15 - // TODO: shipwreck treasure - swasher? - // TODO: buried treasure - swasher - pool3 - weight 1 + // swashers are found in the ocean in all sorts of places, maybe there were pirates once + LootItemConditionalFunction.Builder setFluid = SetFluidLootFunction.builder(new FluidStack(Fluids.LAVA, FluidType.BUCKET_VOLUME)); + injectChest("buried_treasure") + .addToPool("pool3", LootItem.lootTableItem(TinkerTools.swasher.get()) + .setWeight(2) // 50% chance because the vanilla stuff in that table is trash anyways + .apply(ancientToolData3) + .apply(setFluid) + .build()); + injectChest("shipwreck_treasure") + .addToPool("main", LootItem.lootTableItem(TinkerTools.swasher.get()) + .setWeight(10) // as common as gold, less common than emerald, twice as common as diamond + .apply(ancientToolData3) + .apply(setFluid) + .build()); + inject("fishing_treasure", new ResourceLocation("gameplay/fishing/treasure")) + .addToPool("main", LootItem.lootTableItem(TinkerTools.swasher.get()) + .setWeight(1) // all treasure from fishing is the same weight + .apply(ancientToolData3) + .apply(setFluid) + .build()); } @Override diff --git a/src/main/java/slimeknights/tconstruct/common/data/tags/ItemTagProvider.java b/src/main/java/slimeknights/tconstruct/common/data/tags/ItemTagProvider.java index 7f464a1cc1..a17035269b 100644 --- a/src/main/java/slimeknights/tconstruct/common/data/tags/ItemTagProvider.java +++ b/src/main/java/slimeknights/tconstruct/common/data/tags/ItemTagProvider.java @@ -282,6 +282,7 @@ private void addTools() { addToolTags(TinkerTools.meltingPan, MULTIPART_TOOL, DURABILITY, ANCIENT_TOOLS, HARVEST_PRIMARY, STAFFS, HELD_ARMOR, INTERACTABLE_DUAL, AOE, BONUS_SLOTS); addToolTags(TinkerTools.warPick, MULTIPART_TOOL, DURABILITY, ANCIENT_TOOLS, HARVEST_PRIMARY, STONE_HARVEST, MELEE_WEAPON, HELD, AOE, CLUSTER_MAX_HARVESTABLES, CROSSBOWS, BONUS_SLOTS, ItemTags.PICKAXES, Tags.Items.TOOLS_CROSSBOWS); addToolTags(TinkerTools.battlesign, MULTIPART_TOOL, DURABILITY, ANCIENT_TOOLS, MELEE_PRIMARY, SHIELDS, BONUS_SLOTS, Tags.Items.TOOLS_SHIELDS); + addToolTags(TinkerTools.swasher, MULTIPART_TOOL, DURABILITY, ANCIENT_TOOLS, HARVEST, MELEE_PRIMARY, RANGED, HELD, BONUS_SLOTS, ItemTags.SWORDS); // armor addArmorTags(TinkerTools.travelersGear, DURABILITY, BONUS_SLOTS, GOLDEN_ARMOR, DYEABLE, ItemTags.FREEZE_IMMUNE_WEARABLES); diff --git a/src/main/java/slimeknights/tconstruct/library/data/AbstractToolItemModelProvider.java b/src/main/java/slimeknights/tconstruct/library/data/AbstractToolItemModelProvider.java index caf676198f..5660ba0e91 100644 --- a/src/main/java/slimeknights/tconstruct/library/data/AbstractToolItemModelProvider.java +++ b/src/main/java/slimeknights/tconstruct/library/data/AbstractToolItemModelProvider.java @@ -61,35 +61,45 @@ protected void tool(IdAwareObject tool, JsonObject properties, String... brokenP transformTool("tool/" + name + "/broken", readJson(id), "", false, "broken", brokenParts); } + public enum AmmoType { CROSSBOW, BOW, NONE } + /** Creates a model in the blocking folder with the given copied display */ protected void bow(IdAwareObject bow, JsonObject properties, boolean crossbow, String... pullingParts) throws IOException { + pulling(bow, properties, crossbow ? AmmoType.CROSSBOW : AmmoType.BOW, "bowstring", 3, pullingParts); + } + + /** Creates a model in the blocking folder with the given copied display */ + protected void pulling(IdAwareObject bow, JsonObject properties, AmmoType ammo, String brokenPart, int pullingCount, String... pullingParts) throws IOException { ResourceLocation id = bow.getId(); String name = id.getPath(); JsonObject base = readJson(id); base.remove("overrides"); // don't need them anywhere, notably ditching for the sake of ammo models - transformTool("tool/" + name + "/broken", base, "", false, "broken", "bowstring"); + transformTool("tool/" + name + "/broken", base, "", false, "broken", brokenPart); withDisplay("tool/" + name + "/blocking", id, properties); - if (crossbow) { - // crossbows have two ammo states - String arrowName = "tool/" + name + "/arrow"; - String fireworkName = "tool/" + name + "/firework"; - JsonObject ammoBase = suffixTextures(base.deepCopy(), "3", pullingParts); - models.put(arrowName, addPart(ammoBase.deepCopy(), "ammo", name, "arrow")); - models.put(fireworkName, addPart(ammoBase.deepCopy(), "ammo", name, "firework")); - withDisplay("tool/" + name + "/arrow_blocking", resource(arrowName), properties); - withDisplay("tool/" + name + "/firework_blocking", resource(fireworkName), properties); - } else { - // bows have an arrow part that pulls back - addPart(base, "arrow", name, "arrow"); + switch(ammo) { + case CROSSBOW -> { + // crossbows have two ammo states + String arrowName = "tool/" + name + "/arrow"; + String fireworkName = "tool/" + name + "/firework"; + JsonObject ammoBase = suffixTextures(base.deepCopy(), "3", pullingParts); + models.put(arrowName, addPart(ammoBase.deepCopy(), "ammo", name, "arrow")); + models.put(fireworkName, addPart(ammoBase.deepCopy(), "ammo", name, "firework")); + withDisplay("tool/" + name + "/arrow_blocking", resource(arrowName), properties); + withDisplay("tool/" + name + "/firework_blocking", resource(fireworkName), properties); + } + case BOW -> { + // bows have an arrow part that pulls back + addPart(base, "arrow", name, "arrow"); + } } - for (int i = 1; i <= 3; i++) { + for (int i = 1; i <= pullingCount; i++) { String pulling = "tool/" + name + "/pulling_" + i; transformTool(pulling, base, "", false, Integer.toString(i), pullingParts); withDisplay("tool/" + name + "/blocking_" + i, resource(pulling), properties); } } - /** Creates models for blocking, broken and charged for the given tool */ + /** Creates models for blocking, broken and fully charged for the given tool */ protected void charged(IdAwareObject bow, JsonObject properties, String... brokenParts) throws IOException { ResourceLocation id = bow.getId(); String name = id.getPath(); diff --git a/src/main/java/slimeknights/tconstruct/tools/TinkerTools.java b/src/main/java/slimeknights/tconstruct/tools/TinkerTools.java index 73b427dc1f..9df67e2958 100644 --- a/src/main/java/slimeknights/tconstruct/tools/TinkerTools.java +++ b/src/main/java/slimeknights/tconstruct/tools/TinkerTools.java @@ -178,6 +178,7 @@ public TinkerTools() { public static final ItemObject meltingPan = ITEMS.register("melting_pan", () -> new ModifiableItem(UNSTACKABLE_PROPS, ToolDefinitions.MELTING_PAN)); public static final ItemObject warPick = ITEMS.register("war_pick", () -> new ModifiableCrossbowItem(UNSTACKABLE_PROPS, ToolDefinitions.WAR_PICK)); public static final ItemObject battlesign = ITEMS.register("battlesign", () -> new ModifiableItem(UNSTACKABLE_PROPS, ToolDefinitions.BATTLESIGN)); + public static final ItemObject swasher = ITEMS.register("swasher", () -> new ModifiableItem(UNSTACKABLE_PROPS, ToolDefinitions.SWASHER)); // armor public static final EnumObject travelersGear = ITEMS.registerEnum("travelers", ArmorItem.Type.values(), type -> new MultilayerArmorItem(ArmorDefinitions.TRAVELERS, type, UNSTACKABLE_PROPS)); @@ -354,6 +355,7 @@ private static void addTabItems(ItemDisplayParameters itemDisplayParameters, Cre acceptTool(output, meltingPan); acceptTool(output, warPick); acceptTool(output, battlesign); + acceptTool(output, swasher); // armor acceptTools(output, travelersGear); diff --git a/src/main/java/slimeknights/tconstruct/tools/ToolClientEvents.java b/src/main/java/slimeknights/tconstruct/tools/ToolClientEvents.java index f07a2af510..d3ca764ad9 100644 --- a/src/main/java/slimeknights/tconstruct/tools/ToolClientEvents.java +++ b/src/main/java/slimeknights/tconstruct/tools/ToolClientEvents.java @@ -178,6 +178,7 @@ static void clientSetupEvent(FMLClientSetupEvent event) { TinkerItemProperties.registerToolProperties(TinkerTools.meltingPan); TinkerItemProperties.registerCrossbowProperties(TinkerTools.warPick); TinkerItemProperties.registerToolProperties(TinkerTools.battlesign); + TinkerItemProperties.registerToolProperties(TinkerTools.swasher); // armor TinkerItemProperties.registerToolProperties(TinkerTools.travelersShield); TinkerItemProperties.registerToolProperties(TinkerTools.plateShield); @@ -226,6 +227,7 @@ static void itemColors(RegisterColorHandlersEvent.Item event) { registerItemColors(colors, TinkerTools.meltingPan); registerItemColors(colors, TinkerTools.warPick); registerItemColors(colors, TinkerTools.battlesign); + registerItemColors(colors, TinkerTools.swasher); // armor registerItemColors(colors, TinkerTools.travelersShield); registerItemColors(colors, TinkerTools.plateShield); diff --git a/src/main/java/slimeknights/tconstruct/tools/ToolDefinitions.java b/src/main/java/slimeknights/tconstruct/tools/ToolDefinitions.java index 8816db41df..d4b98b5bce 100644 --- a/src/main/java/slimeknights/tconstruct/tools/ToolDefinitions.java +++ b/src/main/java/slimeknights/tconstruct/tools/ToolDefinitions.java @@ -43,4 +43,5 @@ public final class ToolDefinitions { public static final ToolDefinition MELTING_PAN = ToolDefinition.create(TinkerTools.meltingPan); public static final ToolDefinition WAR_PICK = ToolDefinition.create(TinkerTools.warPick); public static final ToolDefinition BATTLESIGN = ToolDefinition.create(TinkerTools.battlesign); + public static final ToolDefinition SWASHER = ToolDefinition.create(TinkerTools.swasher); } diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java index 1632e9962e..f5f8c6df12 100644 --- a/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java +++ b/src/main/java/slimeknights/tconstruct/tools/data/ModifierRecipeProvider.java @@ -1252,7 +1252,6 @@ private void addModifierRecipes(Consumer consumer) { .setTools(ingredientFromTags(TinkerTags.Items.CHESTPLATES, TinkerTags.Items.SHIELDS)) .saveSalvage(consumer, prefix(TinkerModifiers.bursting, abilitySalvage)) .save(consumer, prefix(TinkerModifiers.bursting, abilityFolder)); - Ingredient blockWhileCharging = IntersectionIngredient.of(Ingredient.of(TinkerTags.Items.DURABILITY), ingredientFromTags(TinkerTags.Items.INTERACTABLE_RIGHT, TinkerTags.Items.SHIELDS)); ModifierRecipeBuilder.modifier(TinkerModifiers.spitting) .addInput(tanks) .addInput(Items.DISPENSER) @@ -1260,7 +1259,10 @@ private void addModifierRecipes(Consumer consumer) { .addInput(Tags.Items.INGOTS_COPPER) .addInput(Tags.Items.INGOTS_COPPER) .setSlots(SlotType.ABILITY, 1) - .setTools(blockWhileCharging) + // swasher gets spitting to get multishot, doesn't really fit any good categories for it otherwise (but feel free to request a tag) + .setTools(IntersectionIngredient.of(Ingredient.of(TinkerTags.Items.DURABILITY), CompoundIngredient.of( + Ingredient.of(TinkerTags.Items.INTERACTABLE_RIGHT), Ingredient.of(TinkerTags.Items.SHIELDS), Ingredient.of(TinkerTools.swasher)) + )) .saveSalvage(consumer, prefix(TinkerModifiers.spitting, abilitySalvage)) .save(consumer, prefix(TinkerModifiers.spitting, abilityFolder)); ModifierRecipeBuilder.modifier(ModifierIds.tank) @@ -1347,6 +1349,7 @@ private void addModifierRecipes(Consumer consumer) { .saveSalvage(consumer, prefix(TinkerModifiers.fireprimer, upgradeSalvage)) .save(consumer, prefix(TinkerModifiers.fireprimer, upgradeFolder)); // slings + Ingredient blockWhileCharging = IntersectionIngredient.of(Ingredient.of(TinkerTags.Items.DURABILITY), ingredientFromTags(TinkerTags.Items.INTERACTABLE_RIGHT, TinkerTags.Items.SHIELDS)); ModifierRecipeBuilder.modifier(TinkerModifiers.flinging) .setTools(blockWhileCharging) .addInput(Tags.Items.STRING) diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ToolDefinitionDataProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/ToolDefinitionDataProvider.java index a7510c5f10..9d898a204d 100644 --- a/src/main/java/slimeknights/tconstruct/tools/data/ToolDefinitionDataProvider.java +++ b/src/main/java/slimeknights/tconstruct/tools/data/ToolDefinitionDataProvider.java @@ -57,6 +57,8 @@ import slimeknights.tconstruct.tools.data.material.MaterialIds; import slimeknights.tconstruct.tools.modules.MeltingFluidEffectiveModule; import slimeknights.tconstruct.tools.modules.MeltingModule; +import slimeknights.tconstruct.tools.stats.GripMaterialStats; +import slimeknights.tconstruct.tools.stats.HandleMaterialStats; import slimeknights.tconstruct.tools.stats.HeadMaterialStats; import slimeknights.tconstruct.tools.stats.LimbMaterialStats; import slimeknights.tconstruct.tools.stats.PlatingMaterialStats; @@ -93,7 +95,8 @@ protected void addToolDefinitions() { DefaultMaterialsModule defaultTwoParts = DefaultMaterialsModule.builder().material(tier1Material, tier1Material).build(); DefaultMaterialsModule defaultThreeParts = DefaultMaterialsModule.builder().material(tier1Material, tier1Material, tier1Material).build(); DefaultMaterialsModule defaultFourParts = DefaultMaterialsModule.builder().material(tier1Material, tier1Material, tier1Material, tier1Material).build(); - DefaultMaterialsModule defaultAncient = DefaultMaterialsModule.builder().material(randomMaterial, randomMaterial).build(); + DefaultMaterialsModule ancientTwoParts = DefaultMaterialsModule.builder().material(randomMaterial, randomMaterial).build(); + DefaultMaterialsModule ancientThreeParts = DefaultMaterialsModule.builder().material(randomMaterial, randomMaterial, randomMaterial).build(); // pickaxes define(ToolDefinitions.PICKAXE) @@ -644,7 +647,7 @@ protected void addToolDefinitions() { .stat(PlatingMaterialStats.SHIELD.getId()) .stat(LimbMaterialStats.ID) .build()) - .module(defaultAncient) + .module(ancientTwoParts) // ancient tools add a second copy of traits, and add both traits to rebalanced .module(new MaterialTraitsModule(LimbMaterialStats.ID, 1), ToolHooks.REBALANCED_TRAIT) // stats @@ -673,7 +676,7 @@ protected void addToolDefinitions() { .stat(LimbMaterialStats.ID) .stat(StatlessMaterialStats.BOWSTRING.getIdentifier()) .build()) - .module(DefaultMaterialsModule.builder().material(randomMaterial, randomMaterial, randomMaterial).build()) + .module(ancientThreeParts) // ancient tools when rebalanced get both heads .module(new MaterialTraitsModule(LimbMaterialStats.ID, 1), ToolHooks.REBALANCED_TRAIT) // stats @@ -689,7 +692,7 @@ protected void addToolDefinitions() { .stat(HeadMaterialStats.ID) .stat(PlatingMaterialStats.SHIELD.getId()) .build()) - .module(defaultAncient) + .module(ancientTwoParts) // ancient tools when rebalanced get both heads .module(new MaterialTraitsModule(PlatingMaterialStats.SHIELD.getId(), 1), ToolHooks.REBALANCED_TRAIT) // stats @@ -707,6 +710,29 @@ protected void addToolDefinitions() { .trait(TinkerModifiers.bonking) .trait(TinkerModifiers.knockback).build()) .module(new ParticleWeaponAttack(TinkerTools.bonkAttackParticle.get())); + // swasher + define(ToolDefinitions.SWASHER) + .module(MaterialStatsModule.stats() + .stat(HeadMaterialStats.ID) + .stat(HandleMaterialStats.ID) + .stat(GripMaterialStats.ID) + .build()) + .module(ancientThreeParts) + // ancient tools when rebalanced get both heads + .module(new MaterialTraitsModule(GripMaterialStats.ID, 2), ToolHooks.REBALANCED_TRAIT) + // stats + .module(new SetStatsModule(StatsNBT.builder() + .set(ToolStats.ATTACK_SPEED, 1.5f) + .set(ToolStats.DRAW_SPEED, 1.5f).build())) + .smallToolStartingSlots() + // traits + .module(ToolTraitsModule.builder() + .trait(TinkerModifiers.spitting) + .trait(TinkerModifiers.spilling) + .trait(TinkerModifiers.silkyShears).build()) + // behavior + .module(ToolActionsModule.of(ToolActions.SWORD_DIG)) + .module(swordHarvest); } @Override diff --git a/src/main/java/slimeknights/tconstruct/tools/data/ToolItemModelProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/ToolItemModelProvider.java index e4451c329a..f740bb9b1a 100644 --- a/src/main/java/slimeknights/tconstruct/tools/data/ToolItemModelProvider.java +++ b/src/main/java/slimeknights/tconstruct/tools/data/ToolItemModelProvider.java @@ -62,6 +62,7 @@ protected void addModels() throws IOException { bow(TinkerTools.warPick, toolBlocking, true, "bowstring"); // battlesign has custom properties for blocking, so that is just written directly transformTool("tool/battlesign/broken", readJson(TinkerTools.battlesign.getId()), "", false, "broken", "head"); + pulling(TinkerTools.swasher, toolBlocking, AmmoType.NONE, "blade", 2, "barrel"); } @Override diff --git a/src/main/java/slimeknights/tconstruct/tools/data/sprite/TinkerPartSpriteProvider.java b/src/main/java/slimeknights/tconstruct/tools/data/sprite/TinkerPartSpriteProvider.java index 1669d84068..08991e2f0e 100644 --- a/src/main/java/slimeknights/tconstruct/tools/data/sprite/TinkerPartSpriteProvider.java +++ b/src/main/java/slimeknights/tconstruct/tools/data/sprite/TinkerPartSpriteProvider.java @@ -115,5 +115,7 @@ protected void addAllSpites() { buildTool("war_pick").skipVariants().addHead("limb").addLimb("body") .addBreakableBowstring("bowstring").addBowstring("bowstring_1").addBowstring("bowstring_2").addBowstring("bowstring_3"); buildTool("battlesign").skipVariants().addBreakableHead("head").addPart("handle", PlatingMaterialStats.SHIELD.getId()); + buildTool("swasher").skipVariants().addBreakableHead("blade").addHandle("handle") + .addGrip("barrel").addGrip("barrel_1").addGrip("barrel_2"); } } diff --git a/src/main/java/slimeknights/tconstruct/world/WorldEvents.java b/src/main/java/slimeknights/tconstruct/world/WorldEvents.java index 53cd5f1be8..d09d5c7265 100644 --- a/src/main/java/slimeknights/tconstruct/world/WorldEvents.java +++ b/src/main/java/slimeknights/tconstruct/world/WorldEvents.java @@ -1,5 +1,6 @@ package slimeknights.tconstruct.world; +import net.minecraft.util.RandomSource; import net.minecraft.world.InteractionHand; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; @@ -14,15 +15,20 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.block.SkullBlock; +import net.minecraft.world.level.material.Fluids; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingVisibilityEvent; import net.minecraftforge.event.entity.living.MobSpawnEvent.FinalizeSpawn; import net.minecraftforge.event.village.WandererTradesEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidType; import net.minecraftforge.fml.common.Mod; import slimeknights.tconstruct.TConstruct; import slimeknights.tconstruct.common.config.Config; +import slimeknights.tconstruct.library.tools.capability.fluid.ToolTankHelper; import slimeknights.tconstruct.library.tools.helper.ToolBuildHandler; +import slimeknights.tconstruct.library.tools.nbt.ToolStack; import slimeknights.tconstruct.tools.TinkerTools; import slimeknights.tconstruct.world.logic.AncientToolItemListing; @@ -77,7 +83,7 @@ static void livingSpawn(FinalizeSpawn event) { EntityType type = mob.getType(); // 5% chance for a zombie piglin to spawn with a battle sign, doesn't mean they drop it though ServerLevelAccessor level = event.getLevel(); - if ((type == EntityType.ZOMBIFIED_PIGLIN || type == EntityType.PIGLIN || type == EntityType.PIGLIN_BRUTE || type == EntityType.HUSK || type == EntityType.ZOMBIE_VILLAGER) + if ((type == EntityType.ZOMBIFIED_PIGLIN || type == EntityType.PIGLIN || type == EntityType.PIGLIN_BRUTE || type == EntityType.HUSK || type == EntityType.ZOMBIE_VILLAGER || type == EntityType.DROWNED) && level.getRandom().nextFloat() < 0.05f) { // forge event runs before finalize spawn so we can't just set our item now or it may get overwritten // instead, we cancel the event (which blocks vanilla finalize), then finalize ourself, then can set our item after @@ -85,14 +91,23 @@ static void livingSpawn(FinalizeSpawn event) { mob.finalizeSpawn(level, level.getCurrentDifficultyAt(mob.blockPosition()), event.getSpawnType(), event.getSpawnData(), event.getSpawnTag()); Item item = mob.getMainHandItem().getItem(); - // zombie villagers/husks just always get it if the chance is met + RandomSource random = level.getRandom(); + // zombie villagers/husks just always get it if the chance is m et if (type == EntityType.HUSK) { - mob.setItemInHand(InteractionHand.MAIN_HAND, ToolBuildHandler.buildItemRandomMaterials(TinkerTools.meltingPan.get(), level.getRandom())); + mob.setItemInHand(InteractionHand.MAIN_HAND, ToolBuildHandler.buildItemRandomMaterials(TinkerTools.meltingPan.get(), random)); } else if (type == EntityType.ZOMBIE_VILLAGER) { - mob.setItemInHand(InteractionHand.MAIN_HAND, ToolBuildHandler.buildItemRandomMaterials(TinkerTools.warPick.get(), level.getRandom())); + mob.setItemInHand(InteractionHand.MAIN_HAND, ToolBuildHandler.buildItemRandomMaterials(TinkerTools.warPick.get(), random)); + } else if (type == EntityType.DROWNED) { + // only update drowned if they are holding nothing, keep their trident or fishing rod + if (item == Items.AIR) { + ToolStack swasher = ToolBuildHandler.buildToolRandomMaterials(TinkerTools.swasher.get(), random); + // add random amount of lava between 0 and 2000mb + ToolTankHelper.TANK_HELPER.setFluid(swasher, new FluidStack(Fluids.LAVA, random.nextInt(FluidType.BUCKET_VOLUME * 2 + 1))); + mob.setItemInHand(InteractionHand.MAIN_HAND, swasher.createStack()); + } // only replace golden sword or golden axes with our item, if they are holding nothing or a crossbow do nothing } else if (item == Items.GOLDEN_SWORD || item == Items.GOLDEN_AXE) { - mob.setItemInHand(InteractionHand.MAIN_HAND, ToolBuildHandler.buildItemRandomMaterials(TinkerTools.battlesign.get(), level.getRandom())); + mob.setItemInHand(InteractionHand.MAIN_HAND, ToolBuildHandler.buildItemRandomMaterials(TinkerTools.battlesign.get(), random)); } } } diff --git a/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/ancient/tconstruct_swasher.json b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/ancient/tconstruct_swasher.json new file mode 100644 index 0000000000..33c81de539 --- /dev/null +++ b/src/main/resources/assets/tconstruct/book/encyclopedia/en_us/tools/ancient/tconstruct_swasher.json @@ -0,0 +1,14 @@ +{ + "tool": "tconstruct:swasher", + "text": [ + { "text": "The swasher is a combination of a melee weapon and a handheld fluid pistol. It is often found in buried treasure and shipwrecks, the hands of drowned, and sometimes caught when fishing." } + ], + "properties": [ + "+0 Attack Damage", + "1.5 Attack Speed", + "Spitting I", + "Spilling I", + "3 Upgrade Slots", + "1 Ability Slot" + ] +} diff --git a/src/main/resources/assets/tconstruct/book/tinkers_gadgetry/en_us/ancient/tconstruct_swasher.json b/src/main/resources/assets/tconstruct/book/tinkers_gadgetry/en_us/ancient/tconstruct_swasher.json new file mode 100644 index 0000000000..6d164ca35e --- /dev/null +++ b/src/main/resources/assets/tconstruct/book/tinkers_gadgetry/en_us/ancient/tconstruct_swasher.json @@ -0,0 +1,13 @@ +{ + "tool": "tconstruct:swasher", + "text": [ + { "text": "The swasher is a combination of a melee weapon and a handheld fluid pistol found in various ocean locations." } + ], + "properties": [ + "Medium Damage", + "High Attack Speed", + "Fluid Pistol", + "3 Upgrade Slots", + "1 Ability Slot" + ] +} diff --git a/src/main/resources/assets/tconstruct/lang/en_us.json b/src/main/resources/assets/tconstruct/lang/en_us.json index 13e7151827..94ae052c14 100644 --- a/src/main/resources/assets/tconstruct/lang/en_us.json +++ b/src/main/resources/assets/tconstruct/lang/en_us.json @@ -916,6 +916,7 @@ "item.tconstruct.melting_pan": "Melting Pan", "item.tconstruct.battlesign": "Battlesign", "item.tconstruct.war_pick": "War Pick", + "item.tconstruct.swasher": "Swasher", "item.tconstruct.travelers_helmet": "Traveler's Goggles", "item.tconstruct.travelers_chestplate": "Traveler's Vest", diff --git a/src/main/resources/assets/tconstruct/models/item/base/swasher_blocking.json b/src/main/resources/assets/tconstruct/models/item/base/swasher_blocking.json new file mode 100644 index 0000000000..19f77ed741 --- /dev/null +++ b/src/main/resources/assets/tconstruct/models/item/base/swasher_blocking.json @@ -0,0 +1,17 @@ +{ + "__comment": "this file is not actually used directly, its mostly for reference as it was simplier to copy transforms than the whole tool model", + "parent": "forge:item/default", + "gui_light": "front", + "display": { + "firstperson_righthand": { + "rotation": [ 0, 0, -5 ], + "translation": [ -5, 2, -0.2 ], + "scale": [ 1, 1, 1 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 180, 5 ], + "translation": [ -5, 2, -0.2 ], + "scale": [ 1, 1, 1 ] + } + } +} diff --git a/src/main/resources/assets/tconstruct/models/item/swasher.json b/src/main/resources/assets/tconstruct/models/item/swasher.json index 7f80078a38..ef5e7137c3 100644 --- a/src/main/resources/assets/tconstruct/models/item/swasher.json +++ b/src/main/resources/assets/tconstruct/models/item/swasher.json @@ -2,15 +2,41 @@ "loader": "tconstruct:tool", "parent": "tconstruct:item/base/swasher", "textures": { - "head": "tconstruct:item/tool/swasher/blade", - "broken_head": "tconstruct:item/tool/swasher/broken_blade", - "barrel": "tconstruct:item/tool/swasher/barrel", - "handle": "tconstruct:item/tool/swasher/handle" + "blade": "tconstruct:item/tool/swasher/blade", + "barrel": "tconstruct:item/tool/swasher/barrel", + "handle": "tconstruct:item/tool/swasher/handle" }, "modifier_roots": [ "tconstruct:item/tool/swasher/modifiers/" ], "parts": [ - { "name": "handle", "index": 1 }, - { "name": "head", "index": 0, "broken": "broken_head" }, - { "name": "barrel" } + { "name": "handle", "index": 1 }, + { "name": "blade", "index": 0 }, + { "name": "barrel", "index": 2 } + ], + "first_modifiers": [{ "name": "tconstruct:tank", "forced": true }], + "overrides": [ + { + "predicate": { "tconstruct:charging": 1 }, + "model": "tconstruct:item/tool/swasher/pulling_1" + }, + { + "predicate": { "tconstruct:charging": 1, "tconstruct:charge": 1.0 }, + "model": "tconstruct:item/tool/swasher/pulling_2" + }, + { + "predicate": { "tconstruct:charging": 2 }, + "model": "tconstruct:item/tool/swasher/blocking" + }, + { + "predicate": { "tconstruct:charging": 2, "tconstruct:charge": 0.05 }, + "model": "tconstruct:item/tool/swasher/blocking_1" + }, + { + "predicate": { "tconstruct:charging": 2, "tconstruct:charge": 1.0 }, + "model": "tconstruct:item/tool/swasher/blocking_2" + }, + { + "predicate": { "tconstruct:broken": 1 }, + "model": "tconstruct:item/tool/swasher/broken" + } ] } diff --git a/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel.png b/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel.png index cbe4c3a3a7..a5dddebf58 100644 Binary files a/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel.png and b/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel.png differ diff --git a/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1.png b/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1.png index aab32f563b..b8dbf5e446 100644 Binary files a/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1.png and b/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1.png differ diff --git a/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_grayscale.png b/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_grayscale.png deleted file mode 100644 index b8dbf5e446..0000000000 Binary files a/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_grayscale.png and /dev/null differ diff --git a/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_debris.png b/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_debris.png new file mode 100644 index 0000000000..aab32f563b Binary files /dev/null and b/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_1_tconstruct_debris.png differ diff --git a/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2.png b/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2.png index ef2770477b..8d1c440802 100644 Binary files a/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2.png and b/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2.png differ diff --git a/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_grayscale.png b/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_grayscale.png deleted file mode 100644 index 8d1c440802..0000000000 Binary files a/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_grayscale.png and /dev/null differ diff --git a/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_debris.png b/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_debris.png new file mode 100644 index 0000000000..ef2770477b Binary files /dev/null and b/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_2_tconstruct_debris.png differ diff --git a/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_grayscale.png b/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_grayscale.png deleted file mode 100644 index a5dddebf58..0000000000 Binary files a/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_grayscale.png and /dev/null differ diff --git a/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_debris.png b/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_debris.png new file mode 100644 index 0000000000..cbe4c3a3a7 Binary files /dev/null and b/src/main/resources/assets/tconstruct/textures/item/tool/swasher/barrel_tconstruct_debris.png differ