From b4b05403fda50307e2b35de91296ab9bb53c2baa Mon Sep 17 00:00:00 2001 From: Lance5057 Date: Sat, 29 Apr 2017 22:20:58 -0500 Subject: Updated to TiCo 2.6.3 Added Zweihander Partially added Sheathe Partially added Crest Mount Partially added materials --- .../items/zweihander/_zweihander_blade.png | Bin 131 -> 0 bytes .../textures/items/zweihander/_zweihander_core.png | Bin 177 -> 0 bytes .../items/zweihander/_zweihander_guard.png | Bin 199 -> 0 bytes .../items/zweihander/_zweihander_handle.png | Bin 186 -> 0 bytes .../zweihander/beheading_zweihander_effect.png | Bin 261 -> 0 bytes .../items/zweihander/blaze_zweihander_effect.png | Bin 223 -> 0 bytes .../zweihander/bloodoath_zweihander_effect.png | Bin 638 -> 0 bytes .../bloodoath_zweihander_effect.png.mcmeta | 50 --------------------- .../zweihander/corpseivy_zweihander_effect.png | Bin 472 -> 0 bytes .../items/zweihander/diamond_zweihander_effect.png | Bin 146 -> 0 bytes .../items/zweihander/emerald_zweihander_effect.png | Bin 116 -> 0 bytes .../items/zweihander/flux_zweihander_effect.png | Bin 216 -> 0 bytes .../zweihander/greenmint_zweihander_blade.png | Bin 259 -> 0 bytes .../items/zweihander/greenmint_zweihander_core.png | Bin 264 -> 0 bytes .../zweihander/greenmint_zweihander_guard.png | Bin 272 -> 0 bytes .../zweihander/greenmint_zweihander_handle.png | Bin 280 -> 0 bytes .../zweihander/lapis_zweihander_effect (1).png | Bin 146 -> 0 bytes .../items/zweihander/lapis_zweihander_effect.png | Bin 146 -> 0 bytes .../zweihander/lava_zweihander_effect (1).png | Bin 141 -> 0 bytes .../items/zweihander/lava_zweihander_effect.png | Bin 141 -> 0 bytes .../zweihander/manacore_zweihander_effect.png | Bin 174 -> 0 bytes .../items/zweihander/moss_zweihander_effect.png | Bin 163 -> 0 bytes .../zweihander/necrotic_zweihander_effect.png | Bin 175 -> 0 bytes .../items/zweihander/piston_zweihander_effect.png | Bin 195 -> 0 bytes .../items/zweihander/quartz_zweihander_effect.png | Bin 173 -> 0 bytes .../items/zweihander/redmint_zweihander_blade.png | Bin 224 -> 0 bytes .../items/zweihander/redmint_zweihander_core.png | Bin 254 -> 0 bytes .../items/zweihander/redmint_zweihander_guard.png | Bin 261 -> 0 bytes .../items/zweihander/redmint_zweihander_handle.png | Bin 263 -> 0 bytes .../zweihander/redstone_zweihander_effect.png | Bin 137 -> 0 bytes .../zweihander/reinforced_zweihander_effect.png | Bin 191 -> 0 bytes .../zweihander/scabbing_zweihander_effect.png | Bin 255 -> 0 bytes .../items/zweihander/silk_zweihander_effect.png | Bin 187 -> 0 bytes .../items/zweihander/smite_zweihander_effect.png | Bin 307 -> 0 bytes .../items/zweihander/spider_zweihander_effect.png | Bin 162 -> 0 bytes .../zweihander/terracore_zweihander_effect.png | Bin 175 -> 0 bytes .../zweihander/textbook_zweihander_effect.png | Bin 143 -> 0 bytes .../models/item/tools/zweihander.tcon.json | 36 +++++++++++++++ .../assets/tinkersdefense/models/sheathe_1.png | Bin 0 -> 598 bytes .../zweihander/beheading_zweihander_effect.png | Bin 0 -> 261 bytes .../textures/items/zweihander/blade.png | Bin 0 -> 131 bytes .../items/zweihander/blaze_zweihander_effect.png | Bin 0 -> 223 bytes .../zweihander/bloodoath_zweihander_effect.png | Bin 0 -> 638 bytes .../bloodoath_zweihander_effect.png.mcmeta | 50 +++++++++++++++++++++ .../textures/items/zweihander/broken.png | Bin 0 -> 213 bytes .../textures/items/zweihander/core.png | Bin 0 -> 177 bytes .../zweihander/corpseivy_zweihander_effect.png | Bin 0 -> 472 bytes .../items/zweihander/diamond_zweihander_effect.png | Bin 0 -> 146 bytes .../items/zweihander/emerald_zweihander_effect.png | Bin 0 -> 116 bytes .../items/zweihander/flux_zweihander_effect.png | Bin 0 -> 216 bytes .../zweihander/greenmint_zweihander_blade.png | Bin 0 -> 259 bytes .../items/zweihander/greenmint_zweihander_core.png | Bin 0 -> 264 bytes .../zweihander/greenmint_zweihander_guard.png | Bin 0 -> 272 bytes .../zweihander/greenmint_zweihander_handle.png | Bin 0 -> 280 bytes .../textures/items/zweihander/guard.png | Bin 0 -> 199 bytes .../textures/items/zweihander/handle.png | Bin 0 -> 186 bytes .../zweihander/lapis_zweihander_effect (1).png | Bin 0 -> 146 bytes .../items/zweihander/lapis_zweihander_effect.png | Bin 0 -> 146 bytes .../zweihander/lava_zweihander_effect (1).png | Bin 0 -> 141 bytes .../items/zweihander/lava_zweihander_effect.png | Bin 0 -> 141 bytes .../zweihander/manacore_zweihander_effect.png | Bin 0 -> 174 bytes .../items/zweihander/moss_zweihander_effect.png | Bin 0 -> 163 bytes .../zweihander/necrotic_zweihander_effect.png | Bin 0 -> 175 bytes .../items/zweihander/piston_zweihander_effect.png | Bin 0 -> 195 bytes .../items/zweihander/quartz_zweihander_effect.png | Bin 0 -> 173 bytes .../items/zweihander/redmint_zweihander_blade.png | Bin 0 -> 224 bytes .../items/zweihander/redmint_zweihander_core.png | Bin 0 -> 254 bytes .../items/zweihander/redmint_zweihander_guard.png | Bin 0 -> 261 bytes .../items/zweihander/redmint_zweihander_handle.png | Bin 0 -> 263 bytes .../zweihander/redstone_zweihander_effect.png | Bin 0 -> 137 bytes .../zweihander/reinforced_zweihander_effect.png | Bin 0 -> 191 bytes .../zweihander/scabbing_zweihander_effect.png | Bin 0 -> 255 bytes .../items/zweihander/silk_zweihander_effect.png | Bin 0 -> 187 bytes .../items/zweihander/smite_zweihander_effect.png | Bin 0 -> 307 bytes .../items/zweihander/spider_zweihander_effect.png | Bin 0 -> 162 bytes .../zweihander/terracore_zweihander_effect.png | Bin 0 -> 175 bytes .../zweihander/textbook_zweihander_effect.png | Bin 0 -> 143 bytes .../tinkersdefense/textures/model/sheathe.png | Bin 0 -> 598 bytes 78 files changed, 86 insertions(+), 50 deletions(-) delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/beheading_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/blaze_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/corpseivy_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/diamond_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/emerald_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/flux_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_blade.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_core.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_guard.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_handle.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect (1).png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect (1).png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/manacore_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/moss_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/necrotic_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/piston_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/quartz_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_blade.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_core.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_guard.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_handle.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/redstone_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/reinforced_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/scabbing_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/silk_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/smite_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/spider_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/terracore_zweihander_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/textbook_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/models/item/tools/zweihander.tcon.json create mode 100644 src/main/resources/assets/tinkersdefense/models/sheathe_1.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/beheading_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/blade.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/blaze_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/bloodoath_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/broken.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/core.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/corpseivy_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/diamond_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/emerald_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/flux_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_blade.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_core.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_guard.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_handle.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/guard.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/handle.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/lapis_zweihander_effect (1).png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/lapis_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/lava_zweihander_effect (1).png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/lava_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/manacore_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/moss_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/necrotic_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/piston_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/quartz_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_blade.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_core.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_guard.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_handle.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/redstone_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/reinforced_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/scabbing_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/silk_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/smite_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/spider_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/terracore_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/zweihander/textbook_zweihander_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/model/sheathe.png (limited to 'src/main/resources/assets') diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png deleted file mode 100644 index 05ee7ad..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_blade.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png deleted file mode 100644 index 9106565..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_core.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png deleted file mode 100644 index 70bf386..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_guard.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png b/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png deleted file mode 100644 index edf805d..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/_zweihander_handle.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/beheading_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/beheading_zweihander_effect.png deleted file mode 100644 index 64d883e..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/beheading_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/blaze_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/blaze_zweihander_effect.png deleted file mode 100644 index 8563571..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/blaze_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png deleted file mode 100644 index f2d35ef..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta b/src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta deleted file mode 100644 index 191c85a..0000000 --- a/src/main/resources/assets/tinker/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta +++ /dev/null @@ -1,50 +0,0 @@ -{ - "animation": { - "frametime": 1, - "frames": [ - 3, - 2, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 2, - 3, - 3, - 3, - 3 - ] - } -} diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/corpseivy_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/corpseivy_zweihander_effect.png deleted file mode 100644 index e77311c..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/corpseivy_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/diamond_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/diamond_zweihander_effect.png deleted file mode 100644 index 795efe6..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/diamond_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/emerald_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/emerald_zweihander_effect.png deleted file mode 100644 index 8164a71..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/emerald_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/flux_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/flux_zweihander_effect.png deleted file mode 100644 index 804447e..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/flux_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_blade.png b/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_blade.png deleted file mode 100644 index 3e2ec7b..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_blade.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_core.png b/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_core.png deleted file mode 100644 index 7ce220b..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_core.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_guard.png b/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_guard.png deleted file mode 100644 index 6e1980f..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_guard.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_handle.png b/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_handle.png deleted file mode 100644 index ecbe5f3..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/greenmint_zweihander_handle.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect (1).png b/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect (1).png deleted file mode 100644 index cfe6390..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect (1).png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect.png deleted file mode 100644 index cfe6390..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/lapis_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect (1).png b/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect (1).png deleted file mode 100644 index 454f57a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect (1).png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect.png deleted file mode 100644 index 454f57a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/lava_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/manacore_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/manacore_zweihander_effect.png deleted file mode 100644 index e0e79c9..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/manacore_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/moss_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/moss_zweihander_effect.png deleted file mode 100644 index 9cd743a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/moss_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/necrotic_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/necrotic_zweihander_effect.png deleted file mode 100644 index 5f81bf4..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/necrotic_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/piston_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/piston_zweihander_effect.png deleted file mode 100644 index dc9af5a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/piston_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/quartz_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/quartz_zweihander_effect.png deleted file mode 100644 index 8cc7817..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/quartz_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_blade.png b/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_blade.png deleted file mode 100644 index edc328a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_blade.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_core.png b/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_core.png deleted file mode 100644 index 98b5f54..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_core.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_guard.png b/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_guard.png deleted file mode 100644 index c0beeb3..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_guard.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_handle.png b/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_handle.png deleted file mode 100644 index 5e999d8..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/redmint_zweihander_handle.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/redstone_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/redstone_zweihander_effect.png deleted file mode 100644 index 4a601eb..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/redstone_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/reinforced_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/reinforced_zweihander_effect.png deleted file mode 100644 index bb66d4e..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/reinforced_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/scabbing_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/scabbing_zweihander_effect.png deleted file mode 100644 index 7e0551a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/scabbing_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/silk_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/silk_zweihander_effect.png deleted file mode 100644 index 92c910a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/silk_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/smite_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/smite_zweihander_effect.png deleted file mode 100644 index 830c2df..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/smite_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/spider_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/spider_zweihander_effect.png deleted file mode 100644 index df3bf8e..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/spider_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/terracore_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/terracore_zweihander_effect.png deleted file mode 100644 index ebb74c2..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/terracore_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/textbook_zweihander_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/textbook_zweihander_effect.png deleted file mode 100644 index d65cae8..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/textbook_zweihander_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinkersdefense/models/item/tools/zweihander.tcon.json b/src/main/resources/assets/tinkersdefense/models/item/tools/zweihander.tcon.json new file mode 100644 index 0000000..32cec80 --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/models/item/tools/zweihander.tcon.json @@ -0,0 +1,36 @@ +{ + "textures": { + "layer0": "tinkersdefense:items/zweihander/blade", + "layer1": "tinkersdefense:items/zweihander/core", + "layer2": "tinkersdefense:items/zweihander/guard", + "layer3": "tinkersdefense:items/zweihander/handle", + "broken1": "tinkersdefense:items/zweihander/broken" + }, + "display": { + "thirdperson_righthand": { + "rotation": [ 0, 90, 45 ], + "translation": [ 0, 8, 0 ], + "scale": [ 1.5, 1.5, 1 ] + }, + "thirdperson_lefthand": { + "rotation": [ 0, 90, 45 ], + "translation": [ 0, 8, 0 ], + "scale": [ 1.5, 1.5, 1 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 90, 45 ], + "translation": [ 0, 8, 0 ], + "scale": [ 1.5, 1.5, 1 ] + }, + "firstperson_lefthand": { + "rotation": [ 0, 90, 45 ], + "translation": [ 0, 8, 0 ], + "scale": [ 1.5, 1.5, 1 ] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ -2, 4, -5], + "scale":[ 0.5, 0.5, 0.5] + } + } +} diff --git a/src/main/resources/assets/tinkersdefense/models/sheathe_1.png b/src/main/resources/assets/tinkersdefense/models/sheathe_1.png new file mode 100644 index 0000000..87cf001 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/models/sheathe_1.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/beheading_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/beheading_zweihander_effect.png new file mode 100644 index 0000000..64d883e Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/beheading_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/blade.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/blade.png new file mode 100644 index 0000000..05ee7ad Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/blade.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/blaze_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/blaze_zweihander_effect.png new file mode 100644 index 0000000..8563571 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/blaze_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/bloodoath_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/bloodoath_zweihander_effect.png new file mode 100644 index 0000000..f2d35ef Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/bloodoath_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta new file mode 100644 index 0000000..191c85a --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/bloodoath_zweihander_effect.png.mcmeta @@ -0,0 +1,50 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 3, + 2, + 1, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 2, + 3, + 3, + 3, + 3 + ] + } +} diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/broken.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/broken.png new file mode 100644 index 0000000..00b5fdc Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/broken.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/core.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/core.png new file mode 100644 index 0000000..9106565 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/core.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/corpseivy_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/corpseivy_zweihander_effect.png new file mode 100644 index 0000000..e77311c Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/corpseivy_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/diamond_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/diamond_zweihander_effect.png new file mode 100644 index 0000000..795efe6 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/diamond_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/emerald_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/emerald_zweihander_effect.png new file mode 100644 index 0000000..8164a71 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/emerald_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/flux_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/flux_zweihander_effect.png new file mode 100644 index 0000000..804447e Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/flux_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_blade.png new file mode 100644 index 0000000..3e2ec7b Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_blade.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_core.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_core.png new file mode 100644 index 0000000..7ce220b Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_core.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_guard.png new file mode 100644 index 0000000..6e1980f Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_guard.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_handle.png new file mode 100644 index 0000000..ecbe5f3 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/greenmint_zweihander_handle.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/guard.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/guard.png new file mode 100644 index 0000000..70bf386 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/guard.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/handle.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/handle.png new file mode 100644 index 0000000..edf805d Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/handle.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lapis_zweihander_effect (1).png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lapis_zweihander_effect (1).png new file mode 100644 index 0000000..cfe6390 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lapis_zweihander_effect (1).png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lapis_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lapis_zweihander_effect.png new file mode 100644 index 0000000..cfe6390 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lapis_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lava_zweihander_effect (1).png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lava_zweihander_effect (1).png new file mode 100644 index 0000000..454f57a Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lava_zweihander_effect (1).png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lava_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lava_zweihander_effect.png new file mode 100644 index 0000000..454f57a Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/lava_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/manacore_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/manacore_zweihander_effect.png new file mode 100644 index 0000000..e0e79c9 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/manacore_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/moss_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/moss_zweihander_effect.png new file mode 100644 index 0000000..9cd743a Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/moss_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/necrotic_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/necrotic_zweihander_effect.png new file mode 100644 index 0000000..5f81bf4 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/necrotic_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/piston_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/piston_zweihander_effect.png new file mode 100644 index 0000000..dc9af5a Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/piston_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/quartz_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/quartz_zweihander_effect.png new file mode 100644 index 0000000..8cc7817 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/quartz_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_blade.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_blade.png new file mode 100644 index 0000000..edc328a Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_blade.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_core.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_core.png new file mode 100644 index 0000000..98b5f54 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_core.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_guard.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_guard.png new file mode 100644 index 0000000..c0beeb3 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_guard.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_handle.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_handle.png new file mode 100644 index 0000000..5e999d8 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redmint_zweihander_handle.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redstone_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redstone_zweihander_effect.png new file mode 100644 index 0000000..4a601eb Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/redstone_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/reinforced_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/reinforced_zweihander_effect.png new file mode 100644 index 0000000..bb66d4e Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/reinforced_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/scabbing_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/scabbing_zweihander_effect.png new file mode 100644 index 0000000..7e0551a Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/scabbing_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/silk_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/silk_zweihander_effect.png new file mode 100644 index 0000000..92c910a Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/silk_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/smite_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/smite_zweihander_effect.png new file mode 100644 index 0000000..830c2df Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/smite_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/spider_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/spider_zweihander_effect.png new file mode 100644 index 0000000..df3bf8e Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/spider_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/terracore_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/terracore_zweihander_effect.png new file mode 100644 index 0000000..ebb74c2 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/terracore_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/zweihander/textbook_zweihander_effect.png b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/textbook_zweihander_effect.png new file mode 100644 index 0000000..d65cae8 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/zweihander/textbook_zweihander_effect.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/model/sheathe.png b/src/main/resources/assets/tinkersdefense/textures/model/sheathe.png new file mode 100644 index 0000000..9bb3952 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/model/sheathe.png differ -- cgit v1.2.3