From ba8feb526da0a1ce15a179e1e5ee44582f769768 Mon Sep 17 00:00:00 2001 From: Lance5057 Date: Fri, 18 Mar 2016 06:14:33 -0500 Subject: Added modifiers, beautified code --- .../armor/breastplate/ModelBiped-texturemap.png | Bin 480 -> 0 bytes .../blastprotection_breastplate_effect.png | Bin 0 -> 212 bytes .../fireprotection_breastplate_effect.png | Bin 0 -> 210 bytes .../projprotection_breastplate_effect.png | Bin 0 -> 202 bytes .../breastplate/protection_breastplate_effect.png | Bin 0 -> 207 bytes .../items/armor/sabatons/_sabatons_caps.png | Bin 230 -> 287 bytes .../items/armor/sabatons/_sabatons_plates.png | Bin 228 -> 281 bytes .../items/armor/sabatons/_sabatons_soles.png | Bin 200 -> 250 bytes .../items/armor/sabatons/_sabatons_trim.png | Bin 202 -> 264 bytes .../sabatons/blastprotection_sabatons_effect.png | Bin 0 -> 267 bytes .../sabatons/depthstrider_sabatons_effect.png | Bin 0 -> 278 bytes .../armor/sabatons/featherfall_sabatons_effect.png | Bin 0 -> 293 bytes .../sabatons/fireprotection_sabatons_effect.png | Bin 0 -> 258 bytes .../armor/sabatons/firewalk_sabatons_effect.png | Bin 0 -> 283 bytes .../armor/sabatons/frostwalk_sabatons_effect.png | Bin 0 -> 283 bytes .../armor/sabatons/glowstep_sabatons_effect.png | Bin 0 -> 263 bytes .../sabatons/projprotection_sabatons_effect.png | Bin 0 -> 253 bytes .../armor/sabatons/protection_sabatons_effect.png | Bin 0 -> 302 bytes .../items/broadsword/soulbound_sword_effect.png | Bin 0 -> 217 bytes .../items/zweihander/blaze_sword_effect.png | Bin 281 -> 0 bytes .../armor/Breastplate/_breastplate_plate.png | Bin 994 -> 985 bytes .../armor/Grieves/TinkerHelm-texturemap.png | Bin 0 -> 389 bytes .../textures/armor/Grieves/_grieves_chain.png | Bin 295 -> 295 bytes .../textures/armor/Grieves/_grieves_cod.png | Bin 228 -> 228 bytes .../textures/armor/Grieves/_grieves_plate.png | Bin 466 -> 505 bytes .../textures/armor/Grieves/_grieves_trim.png | Bin 761 -> 797 bytes .../textures/armor/Grieves/_helm_chain.png | Bin 0 -> 407 bytes .../textures/armor/Grieves/_helm_top.png | Bin 0 -> 3420 bytes .../textures/armor/Grieves/_helm_visor.png | Bin 0 -> 358 bytes .../textures/armor/Helm/_helm_chain.png | Bin 407 -> 247 bytes .../textures/armor/Helm/_helm_top.png | Bin 3419 -> 378 bytes .../textures/armor/Helm/_helm_visor.png | Bin 336 -> 338 bytes .../textures/blocks/glowstonecrumbs.png | Bin 0 -> 273 bytes .../tinkersdefense/textures/blocks/unstableice.png | Bin 0 -> 18041 bytes .../textures/blocks/unstableice.png.mcmeta | 5 +++ .../textures/blocks/unstableobsidian.png | Bin 0 -> 8716 bytes .../textures/blocks/unstableobsidian.png.mcmeta | 45 +++++++++++++++++++++ .../tinkersdefense/textures/items/SoulChain.png | Bin 0 -> 393 bytes 38 files changed, 50 insertions(+) delete mode 100644 src/main/resources/assets/tinker/textures/items/armor/breastplate/ModelBiped-texturemap.png create mode 100644 src/main/resources/assets/tinker/textures/items/armor/breastplate/blastprotection_breastplate_effect.png create mode 100644 src/main/resources/assets/tinker/textures/items/armor/breastplate/fireprotection_breastplate_effect.png create mode 100644 src/main/resources/assets/tinker/textures/items/armor/breastplate/projprotection_breastplate_effect.png create mode 100644 src/main/resources/assets/tinker/textures/items/armor/breastplate/protection_breastplate_effect.png create mode 100644 src/main/resources/assets/tinker/textures/items/armor/sabatons/blastprotection_sabatons_effect.png create mode 100644 src/main/resources/assets/tinker/textures/items/armor/sabatons/depthstrider_sabatons_effect.png create mode 100644 src/main/resources/assets/tinker/textures/items/armor/sabatons/featherfall_sabatons_effect.png create mode 100644 src/main/resources/assets/tinker/textures/items/armor/sabatons/fireprotection_sabatons_effect.png create mode 100644 src/main/resources/assets/tinker/textures/items/armor/sabatons/firewalk_sabatons_effect.png create mode 100644 src/main/resources/assets/tinker/textures/items/armor/sabatons/frostwalk_sabatons_effect.png create mode 100644 src/main/resources/assets/tinker/textures/items/armor/sabatons/glowstep_sabatons_effect.png create mode 100644 src/main/resources/assets/tinker/textures/items/armor/sabatons/projprotection_sabatons_effect.png create mode 100644 src/main/resources/assets/tinker/textures/items/armor/sabatons/protection_sabatons_effect.png create mode 100644 src/main/resources/assets/tinker/textures/items/broadsword/soulbound_sword_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/zweihander/blaze_sword_effect.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/armor/Grieves/TinkerHelm-texturemap.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_helm_chain.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_helm_top.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_helm_visor.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/blocks/glowstonecrumbs.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/blocks/unstableice.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/blocks/unstableice.png.mcmeta create mode 100644 src/main/resources/assets/tinkersdefense/textures/blocks/unstableobsidian.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/blocks/unstableobsidian.png.mcmeta create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/SoulChain.png (limited to 'src/main/resources/assets') diff --git a/src/main/resources/assets/tinker/textures/items/armor/breastplate/ModelBiped-texturemap.png b/src/main/resources/assets/tinker/textures/items/armor/breastplate/ModelBiped-texturemap.png deleted file mode 100644 index 4bb7876..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/armor/breastplate/ModelBiped-texturemap.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/armor/breastplate/blastprotection_breastplate_effect.png b/src/main/resources/assets/tinker/textures/items/armor/breastplate/blastprotection_breastplate_effect.png new file mode 100644 index 0000000..a2a60da Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/armor/breastplate/blastprotection_breastplate_effect.png differ diff --git a/src/main/resources/assets/tinker/textures/items/armor/breastplate/fireprotection_breastplate_effect.png b/src/main/resources/assets/tinker/textures/items/armor/breastplate/fireprotection_breastplate_effect.png new file mode 100644 index 0000000..c959767 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/armor/breastplate/fireprotection_breastplate_effect.png differ diff --git a/src/main/resources/assets/tinker/textures/items/armor/breastplate/projprotection_breastplate_effect.png b/src/main/resources/assets/tinker/textures/items/armor/breastplate/projprotection_breastplate_effect.png new file mode 100644 index 0000000..8f1957d Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/armor/breastplate/projprotection_breastplate_effect.png differ diff --git a/src/main/resources/assets/tinker/textures/items/armor/breastplate/protection_breastplate_effect.png b/src/main/resources/assets/tinker/textures/items/armor/breastplate/protection_breastplate_effect.png new file mode 100644 index 0000000..53ccbd9 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/armor/breastplate/protection_breastplate_effect.png differ diff --git a/src/main/resources/assets/tinker/textures/items/armor/sabatons/_sabatons_caps.png b/src/main/resources/assets/tinker/textures/items/armor/sabatons/_sabatons_caps.png index 9403940..816650a 100644 Binary files a/src/main/resources/assets/tinker/textures/items/armor/sabatons/_sabatons_caps.png and b/src/main/resources/assets/tinker/textures/items/armor/sabatons/_sabatons_caps.png differ diff --git a/src/main/resources/assets/tinker/textures/items/armor/sabatons/_sabatons_plates.png b/src/main/resources/assets/tinker/textures/items/armor/sabatons/_sabatons_plates.png index 0741a00..dae8c9a 100644 Binary files a/src/main/resources/assets/tinker/textures/items/armor/sabatons/_sabatons_plates.png and b/src/main/resources/assets/tinker/textures/items/armor/sabatons/_sabatons_plates.png differ diff --git a/src/main/resources/assets/tinker/textures/items/armor/sabatons/_sabatons_soles.png b/src/main/resources/assets/tinker/textures/items/armor/sabatons/_sabatons_soles.png index 3eda3e5..aa1a902 100644 Binary files a/src/main/resources/assets/tinker/textures/items/armor/sabatons/_sabatons_soles.png and b/src/main/resources/assets/tinker/textures/items/armor/sabatons/_sabatons_soles.png differ diff --git a/src/main/resources/assets/tinker/textures/items/armor/sabatons/_sabatons_trim.png b/src/main/resources/assets/tinker/textures/items/armor/sabatons/_sabatons_trim.png index 72a06de..b56b653 100644 Binary files a/src/main/resources/assets/tinker/textures/items/armor/sabatons/_sabatons_trim.png and b/src/main/resources/assets/tinker/textures/items/armor/sabatons/_sabatons_trim.png differ diff --git a/src/main/resources/assets/tinker/textures/items/armor/sabatons/blastprotection_sabatons_effect.png b/src/main/resources/assets/tinker/textures/items/armor/sabatons/blastprotection_sabatons_effect.png new file mode 100644 index 0000000..b3b8740 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/armor/sabatons/blastprotection_sabatons_effect.png differ diff --git a/src/main/resources/assets/tinker/textures/items/armor/sabatons/depthstrider_sabatons_effect.png b/src/main/resources/assets/tinker/textures/items/armor/sabatons/depthstrider_sabatons_effect.png new file mode 100644 index 0000000..f750ed2 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/armor/sabatons/depthstrider_sabatons_effect.png differ diff --git a/src/main/resources/assets/tinker/textures/items/armor/sabatons/featherfall_sabatons_effect.png b/src/main/resources/assets/tinker/textures/items/armor/sabatons/featherfall_sabatons_effect.png new file mode 100644 index 0000000..48c9dff Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/armor/sabatons/featherfall_sabatons_effect.png differ diff --git a/src/main/resources/assets/tinker/textures/items/armor/sabatons/fireprotection_sabatons_effect.png b/src/main/resources/assets/tinker/textures/items/armor/sabatons/fireprotection_sabatons_effect.png new file mode 100644 index 0000000..1eb9482 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/armor/sabatons/fireprotection_sabatons_effect.png differ diff --git a/src/main/resources/assets/tinker/textures/items/armor/sabatons/firewalk_sabatons_effect.png b/src/main/resources/assets/tinker/textures/items/armor/sabatons/firewalk_sabatons_effect.png new file mode 100644 index 0000000..1cb5883 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/armor/sabatons/firewalk_sabatons_effect.png differ diff --git a/src/main/resources/assets/tinker/textures/items/armor/sabatons/frostwalk_sabatons_effect.png b/src/main/resources/assets/tinker/textures/items/armor/sabatons/frostwalk_sabatons_effect.png new file mode 100644 index 0000000..acae962 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/armor/sabatons/frostwalk_sabatons_effect.png differ diff --git a/src/main/resources/assets/tinker/textures/items/armor/sabatons/glowstep_sabatons_effect.png b/src/main/resources/assets/tinker/textures/items/armor/sabatons/glowstep_sabatons_effect.png new file mode 100644 index 0000000..f0a3230 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/armor/sabatons/glowstep_sabatons_effect.png differ diff --git a/src/main/resources/assets/tinker/textures/items/armor/sabatons/projprotection_sabatons_effect.png b/src/main/resources/assets/tinker/textures/items/armor/sabatons/projprotection_sabatons_effect.png new file mode 100644 index 0000000..6b35e70 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/armor/sabatons/projprotection_sabatons_effect.png differ diff --git a/src/main/resources/assets/tinker/textures/items/armor/sabatons/protection_sabatons_effect.png b/src/main/resources/assets/tinker/textures/items/armor/sabatons/protection_sabatons_effect.png new file mode 100644 index 0000000..7920e89 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/armor/sabatons/protection_sabatons_effect.png differ diff --git a/src/main/resources/assets/tinker/textures/items/broadsword/soulbound_sword_effect.png b/src/main/resources/assets/tinker/textures/items/broadsword/soulbound_sword_effect.png new file mode 100644 index 0000000..23fd671 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/broadsword/soulbound_sword_effect.png differ diff --git a/src/main/resources/assets/tinker/textures/items/zweihander/blaze_sword_effect.png b/src/main/resources/assets/tinker/textures/items/zweihander/blaze_sword_effect.png deleted file mode 100644 index ccfa649..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/zweihander/blaze_sword_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_plate.png b/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_plate.png index 7c3931f..763c312 100644 Binary files a/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_plate.png and b/src/main/resources/assets/tinkersdefense/textures/armor/Breastplate/_breastplate_plate.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/TinkerHelm-texturemap.png b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/TinkerHelm-texturemap.png new file mode 100644 index 0000000..1e86e72 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/TinkerHelm-texturemap.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_chain.png b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_chain.png index 5d838af..90d100c 100644 Binary files a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_chain.png and b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_chain.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_cod.png b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_cod.png index 3f344df..c833b30 100644 Binary files a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_cod.png and b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_cod.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_plate.png b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_plate.png index 9b5e46c..1873d8b 100644 Binary files a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_plate.png and b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_plate.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_trim.png b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_trim.png index 4ba39be..52acf9f 100644 Binary files a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_trim.png and b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_grieves_trim.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_helm_chain.png b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_helm_chain.png new file mode 100644 index 0000000..d81e841 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_helm_chain.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_helm_top.png b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_helm_top.png new file mode 100644 index 0000000..276ed50 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_helm_top.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_helm_visor.png b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_helm_visor.png new file mode 100644 index 0000000..b9f8830 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/armor/Grieves/_helm_visor.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_chain.png b/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_chain.png index e6210af..f12a955 100644 Binary files a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_chain.png and b/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_chain.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_top.png b/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_top.png index d4d20be..cb2239e 100644 Binary files a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_top.png and b/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_top.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_visor.png b/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_visor.png index 03abb98..9d242d7 100644 Binary files a/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_visor.png and b/src/main/resources/assets/tinkersdefense/textures/armor/Helm/_helm_visor.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/glowstonecrumbs.png b/src/main/resources/assets/tinkersdefense/textures/blocks/glowstonecrumbs.png new file mode 100644 index 0000000..a0cc2de Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/blocks/glowstonecrumbs.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/unstableice.png b/src/main/resources/assets/tinkersdefense/textures/blocks/unstableice.png new file mode 100644 index 0000000..da6c0f6 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/blocks/unstableice.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/unstableice.png.mcmeta b/src/main/resources/assets/tinkersdefense/textures/blocks/unstableice.png.mcmeta new file mode 100644 index 0000000..0645f48 --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/textures/blocks/unstableice.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/unstableobsidian.png b/src/main/resources/assets/tinkersdefense/textures/blocks/unstableobsidian.png new file mode 100644 index 0000000..bd77aa5 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/blocks/unstableobsidian.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/blocks/unstableobsidian.png.mcmeta b/src/main/resources/assets/tinkersdefense/textures/blocks/unstableobsidian.png.mcmeta new file mode 100644 index 0000000..7ceb363 --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/textures/blocks/unstableobsidian.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/tinkersdefense/textures/items/SoulChain.png b/src/main/resources/assets/tinkersdefense/textures/items/SoulChain.png new file mode 100644 index 0000000..a8dd41f Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/SoulChain.png differ -- cgit v1.2.3