From 3add1e694184471c0d788b6c04c8801d680eda11 Mon Sep 17 00:00:00 2001 From: Lance5057 Date: Tue, 26 Apr 2016 02:33:40 -0500 Subject: Removed Gimp Files folder and all xcf files. Wasn't supposed to be uploading those. Also added some stuff for a hidden feature. --- src/main/java/lance5057/tDefense/TD_Config.java | 8 +- .../java/lance5057/tDefense/armor/ArmorCore.java | 4 +- .../lance5057/tDefense/armor/items/Sheath.java | 14 +- .../tDefense/armor/items/cloth/TinkersHood.java | 4 +- .../tDefense/armor/items/cloth/TinkersRobe.java | 4 +- .../tDefense/armor/items/cloth/TinkersShawl.java | 4 +- .../tDefense/armor/items/cloth/TinkersShoes.java | 4 +- .../armor/items/heavy/TinkersGauntlets.java | 10 +- .../tDefense/armor/items/heavy/TinkersGrieves.java | 4 +- .../tDefense/armor/items/heavy/TinkersHelm.java | 4 +- .../armor/items/heavy/TinkersSabatons.java | 9 +- .../tDefense/armor/items/light/TinkersBoots.java | 4 +- .../armor/items/light/TinkersChausses.java | 4 +- .../tDefense/armor/items/light/TinkersCoif.java | 4 +- .../tDefense/armor/items/light/TinkersHauberk.java | 4 +- .../tDefense/armor/renderers/ModelSheath.java | 25 +- .../armor/renderers/cloth/ModelTinkersHood.java | 24 +- .../armor/renderers/cloth/ModelTinkersRobe.java | 24 +- .../armor/renderers/cloth/ModelTinkersShawl.java | 24 +- .../renderers/heavy/ModelTinkersGauntlets.java | 25 +- .../armor/renderers/heavy/ModelTinkersGrieves.java | 24 +- .../armor/renderers/heavy/ModelTinkersHelm.java | 23 +- .../renderers/heavy/ModelTinkersSabatons.java | 31 +- .../armor/renderers/light/ModelTinkersBoots.java | 24 +- .../renderers/light/ModelTinkersChausses.java | 23 +- .../armor/renderers/light/ModelTinkersCoif.java | 24 +- .../armor/renderers/light/ModelTinkersHauberk.java | 23 +- .../tDefense/core/tools/HeaterShield.java | 6 +- .../java/lance5057/tDefense/core/tools/Shears.java | 11 + .../modifiers/Thaumcraft/modifierRepairVis.java | 88 ++--- .../tDefense/core/tools/modifiers/ToolMods.java | 73 +++- .../blocks/finishingAnvil/Gui_FinishingAnvil.java | 60 +++- .../finishingAnvil/utilities/Injector.java | 91 +++++ .../items/heatershield/_shield_binding.png | Bin 311 -> 197 bytes .../items/heatershield/_shield_bindings.xcf | Bin 13527 -> 0 bytes .../textures/items/heatershield/_shield_edge.png | Bin 331 -> 192 bytes .../textures/items/heatershield/_shield_face.png | Bin 259 -> 171 bytes .../items/heatershield/_shield_face_broken.png | Bin 273 -> 0 bytes .../items/heatershield/_shield_face_other.png | Bin 262 -> 0 bytes .../textures/items/heatershield/_shield_plate.png | Bin 0 -> 184 bytes .../items/heatershield/_shield_plate_broken.png | Bin 0 -> 195 bytes .../heatershield/aeonsteel_shield_binding.png | Bin 322 -> 0 bytes .../items/heatershield/aeonsteel_shield_edge.png | Bin 357 -> 0 bytes .../items/heatershield/aeonsteel_shield_face.png | Bin 361 -> 0 bytes .../heatershield/aeonsteel_shield_face_other.png | Bin 306 -> 0 bytes .../items/heatershield/alumite_shield_binding.png | Bin 252 -> 0 bytes .../items/heatershield/alumite_shield_edge.png | Bin 396 -> 0 bytes .../items/heatershield/alumite_shield_face.png | Bin 327 -> 0 bytes .../heatershield/alumite_shield_face_other.png | Bin 297 -> 0 bytes .../items/heatershield/ardite_shield_binding.png | Bin 346 -> 0 bytes .../items/heatershield/ardite_shield_edge.png | Bin 326 -> 0 bytes .../items/heatershield/ardite_shield_face.png | Bin 298 -> 0 bytes .../heatershield/ardite_shield_face_other.png | Bin 281 -> 0 bytes .../items/heatershield/beheading_shield_effect.png | Bin 317 -> 0 bytes .../items/heatershield/blades_shield_effect.png | Bin 346 -> 0 bytes .../items/heatershield/blaze_shield_effect.png | Bin 224 -> 0 bytes .../heatershield/blueslime_shield_binding.png | Bin 302 -> 0 bytes .../items/heatershield/blueslime_shield_edge.png | Bin 385 -> 0 bytes .../items/heatershield/blueslime_shield_face.png | Bin 307 -> 0 bytes .../heatershield/blueslime_shield_face_other.png | Bin 316 -> 0 bytes .../items/heatershield/bone_shield_binding.png | Bin 334 -> 0 bytes .../items/heatershield/bone_shield_edge.png | Bin 349 -> 0 bytes .../items/heatershield/bone_shield_face.png | Bin 272 -> 0 bytes .../items/heatershield/bone_shield_face_other.png | Bin 277 -> 0 bytes .../items/heatershield/bronze_shield_binding.png | Bin 316 -> 0 bytes .../items/heatershield/bronze_shield_edge.png | Bin 356 -> 0 bytes .../items/heatershield/bronze_shield_face.png | Bin 336 -> 0 bytes .../heatershield/bronze_shield_face_other.png | Bin 305 -> 0 bytes .../items/heatershield/cactus_shield_binding.png | Bin 357 -> 0 bytes .../items/heatershield/cactus_shield_edge.png | Bin 390 -> 0 bytes .../items/heatershield/cactus_shield_face.png | Bin 279 -> 0 bytes .../heatershield/cactus_shield_face_other.png | Bin 304 -> 0 bytes .../items/heatershield/cobalt_shield_binding.png | Bin 288 -> 0 bytes .../items/heatershield/cobalt_shield_edge.png | Bin 337 -> 0 bytes .../items/heatershield/cobalt_shield_face.png | Bin 293 -> 0 bytes .../heatershield/cobalt_shield_face_other.png | Bin 277 -> 0 bytes .../items/heatershield/copper_shield_binding.png | Bin 347 -> 0 bytes .../items/heatershield/copper_shield_edge.png | Bin 328 -> 0 bytes .../items/heatershield/copper_shield_face.png | Bin 325 -> 0 bytes .../heatershield/copper_shield_face_other.png | Bin 307 -> 0 bytes .../items/heatershield/diamond_shield_effect.png | Bin 301 -> 0 bytes .../heatershield/dogbearium_shield_binding.png | Bin 433 -> 0 bytes .../items/heatershield/dogbearium_shield_edge.png | Bin 351 -> 0 bytes .../items/heatershield/dogbearium_shield_face.png | Bin 340 -> 0 bytes .../heatershield/dogbearium_shield_face_other.png | Bin 305 -> 0 bytes .../items/heatershield/emerald_shield_effect.png | Bin 229 -> 0 bytes .../items/heatershield/feathers_shield_effect.png | Bin 359 -> 0 bytes .../items/heatershield/flint_shield_binding.png | Bin 278 -> 0 bytes .../items/heatershield/flint_shield_edge.png | Bin 351 -> 0 bytes .../items/heatershield/flint_shield_face.png | Bin 271 -> 0 bytes .../items/heatershield/flint_shield_face_other.png | Bin 271 -> 0 bytes .../items/heatershield/flux_shield_effect.png | Bin 226 -> 0 bytes .../items/heatershield/lapis_shield_effect.png | Bin 224 -> 0 bytes .../items/heatershield/lava_shield_effect.png | Bin 224 -> 0 bytes .../items/heatershield/legends_shield_effect.png | Bin 396 -> 0 bytes .../heatershield/manyullyn_shield_binding.png | Bin 406 -> 0 bytes .../items/heatershield/manyullyn_shield_edge.png | Bin 377 -> 0 bytes .../items/heatershield/manyullyn_shield_face.png | Bin 273 -> 0 bytes .../heatershield/manyullyn_shield_face_other.png | Bin 279 -> 0 bytes .../items/heatershield/mirrors_shield_effect.png | Bin 224 -> 0 bytes .../items/heatershield/moss_shield_effect.png | Bin 353 -> 0 bytes .../items/heatershield/necrotic_shield_effect.png | Bin 219 -> 0 bytes .../heatershield/netherrack_shield_binding.png | Bin 271 -> 0 bytes .../items/heatershield/netherrack_shield_edge.png | Bin 760 -> 0 bytes .../items/heatershield/netherrack_shield_face.png | Bin 418 -> 0 bytes .../heatershield/netherrack_shield_face_other.png | Bin 420 -> 0 bytes .../items/heatershield/obsidian_shield_binding.png | Bin 258 -> 0 bytes .../items/heatershield/obsidian_shield_edge.png | Bin 388 -> 0 bytes .../items/heatershield/obsidian_shield_face.png | Bin 318 -> 0 bytes .../heatershield/obsidian_shield_face_other.png | Bin 317 -> 0 bytes .../items/heatershield/paper_shield_binding.png | Bin 399 -> 0 bytes .../items/heatershield/paper_shield_edge.png | Bin 775 -> 0 bytes .../items/heatershield/paper_shield_face.png | Bin 292 -> 0 bytes .../items/heatershield/paper_shield_face_other.png | Bin 293 -> 0 bytes .../items/heatershield/pigiron_shield_binding.png | Bin 313 -> 0 bytes .../items/heatershield/pigiron_shield_edge.png | Bin 357 -> 0 bytes .../items/heatershield/pigiron_shield_face.png | Bin 297 -> 0 bytes .../heatershield/pigiron_shield_face_other.png | Bin 300 -> 0 bytes .../items/heatershield/piston_shield_effect.png | Bin 294 -> 0 bytes .../items/heatershield/quartz_shield_effect.png | Bin 252 -> 0 bytes .../heatershield/queensgold_shield_binding.png | Bin 383 -> 0 bytes .../items/heatershield/queensgold_shield_edge.png | Bin 350 -> 0 bytes .../items/heatershield/queensgold_shield_face.png | Bin 317 -> 0 bytes .../heatershield/queensgold_shield_face_other.png | Bin 305 -> 0 bytes .../items/heatershield/redstone_shield_effect.png | Bin 217 -> 0 bytes .../heatershield/reinforced_shield_effect.png | Bin 357 -> 0 bytes .../items/heatershield/silk_shield_effect.png | Bin 336 -> 0 bytes .../items/heatershield/slime_shield_binding.png | Bin 301 -> 0 bytes .../items/heatershield/slime_shield_edge.png | Bin 352 -> 0 bytes .../items/heatershield/slime_shield_face.png | Bin 319 -> 0 bytes .../items/heatershield/slime_shield_face_other.png | Bin 317 -> 0 bytes .../items/heatershield/smite_shield_effect.png | Bin 202 -> 0 bytes .../items/heatershield/spider_shield_effect.png | Bin 216 -> 0 bytes .../items/heatershield/steel_shield_binding.png | Bin 348 -> 0 bytes .../items/heatershield/steel_shield_edge.png | Bin 318 -> 0 bytes .../items/heatershield/steel_shield_face.png | Bin 312 -> 0 bytes .../items/heatershield/steel_shield_face_other.png | Bin 302 -> 0 bytes .../items/heatershield/stone_shield_binding.png | Bin 258 -> 0 bytes .../items/heatershield/stone_shield_edge.png | Bin 318 -> 0 bytes .../items/heatershield/stone_shield_face.png | Bin 277 -> 0 bytes .../items/heatershield/stone_shield_face_other.png | Bin 293 -> 0 bytes .../items/heatershield/wood_shield_binding.png | Bin 415 -> 0 bytes .../items/heatershield/wood_shield_edge.png | Bin 671 -> 0 bytes .../items/heatershield/wood_shield_face.png | Bin 380 -> 0 bytes .../items/heatershield/wood_shield_face_other.png | Bin 369 -> 0 bytes .../tinker/textures/items/parts/_soulstone.png | Bin 0 -> 385 bytes .../textures/items/parts/_soulstone.png.mcmeta | 11 + .../textures/armor/halberd/_halberd_chain.png | Bin 227 -> 0 bytes .../textures/armor/halberd/_halberd_plate.png | Bin 449 -> 0 bytes .../textures/armor/halberd/_halberd_rivet.png | Bin 210 -> 0 bytes .../textures/armor/hauberk/_hauberk_chain.png | Bin 0 -> 227 bytes .../textures/armor/hauberk/_hauberk_plate.png | Bin 0 -> 449 bytes .../textures/armor/hauberk/_hauberk_rivet.png | Bin 0 -> 210 bytes .../tinkersdefense/textures/gui/heatershield.png | Bin 3794 -> 3648 bytes .../textures/items/heatershield/_angel_face.png | Bin 0 -> 211 bytes .../textures/items/heatershield/_arrow_face.png | Bin 0 -> 175 bytes .../textures/items/heatershield/_bar_face.png | Bin 0 -> 175 bytes .../textures/items/heatershield/_checker_face.png | Bin 0 -> 175 bytes .../textures/items/heatershield/_creeper_face.png | Bin 0 -> 154 bytes .../textures/items/heatershield/_cross_face.png | Bin 0 -> 171 bytes .../textures/items/heatershield/_demon_binding.png | Bin 0 -> 200 bytes .../textures/items/heatershield/_demon_edge.png | Bin 0 -> 194 bytes .../items/heatershield/_demon_shield_edge.png | Bin 0 -> 194 bytes .../textures/items/heatershield/_ender_face.png | Bin 0 -> 161 bytes .../items/heatershield/_enforced_binding.png | Bin 0 -> 200 bytes .../textures/items/heatershield/_fancy_binding.png | Bin 0 -> 185 bytes .../textures/items/heatershield/_fancy_face.png | Bin 0 -> 199 bytes .../textures/items/heatershield/_glass_plate.png | Bin 0 -> 189 bytes .../textures/items/heatershield/_heart_edge.png | Bin 0 -> 190 bytes .../items/heatershield/_heart_shield_edge.png | Bin 0 -> 200 bytes .../textures/items/heatershield/_hell_binding.png | Bin 0 -> 196 bytes .../textures/items/heatershield/_horbar_face.png | Bin 0 -> 177 bytes .../items/heatershield/_horstripe_face.png | Bin 0 -> 154 bytes .../textures/items/heatershield/_love_binding.png | Bin 0 -> 164 bytes .../textures/items/heatershield/_pig_binding.png | Bin 0 -> 190 bytes .../textures/items/heatershield/_queen_binding.png | Bin 0 -> 213 bytes .../items/heatershield/_reinforced_binding.png | Bin 0 -> 186 bytes .../items/heatershield/_shield_binding.png | Bin 0 -> 197 bytes .../textures/items/heatershield/_shield_edge.png | Bin 0 -> 192 bytes .../textures/items/heatershield/_shield_face.png | Bin 0 -> 171 bytes .../textures/items/heatershield/_shield_plate.png | Bin 0 -> 184 bytes .../items/heatershield/_shield_plate_broken.png | Bin 0 -> 195 bytes .../textures/items/heatershield/_skeleton_face.png | Bin 0 -> 151 bytes .../textures/items/heatershield/_skull_binding.png | Bin 0 -> 183 bytes .../textures/items/heatershield/_slime_binding.png | Bin 0 -> 189 bytes .../textures/items/heatershield/_small_binding.png | Bin 0 -> 192 bytes .../items/heatershield/_spider_binding.png | Bin 0 -> 182 bytes .../textures/items/heatershield/_square_face.png | Bin 0 -> 147 bytes .../textures/items/heatershield/_squared_edge.png | Bin 0 -> 191 bytes .../items/heatershield/_squared_shield_edge.png | Bin 0 -> 191 bytes .../textures/items/heatershield/_stripe_face.png | Bin 0 -> 155 bytes .../textures/items/heatershield/_test_face.png | Bin 0 -> 157 bytes .../textures/items/heatershield/_tri_binding.png | Bin 0 -> 181 bytes .../textures/items/heatershield/_triangle_face.png | Bin 0 -> 180 bytes .../textures/items/heatershield/_wide_binding.png | Bin 0 -> 188 bytes .../textures/items/heatershield/_wolf_binding.png | Bin 0 -> 205 bytes .../textures/items/heatershield/heatershield.png | Bin 0 -> 3648 bytes .../tinkersdefense/textures/items/soulstone.png | Bin 0 -> 385 bytes .../textures/items/soulstone.png.mcmeta | 11 + .../assets/tinkersdefense/txt/souls/steve.txt | 400 +++++++++++++++++++++ 200 files changed, 864 insertions(+), 266 deletions(-) delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/_shield_bindings.xcf delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/_shield_face_broken.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/_shield_face_other.png create mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/_shield_plate.png create mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/_shield_plate_broken.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/aeonsteel_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/aeonsteel_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/aeonsteel_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/aeonsteel_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/alumite_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/alumite_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/alumite_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/alumite_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/ardite_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/ardite_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/ardite_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/ardite_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/beheading_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/blades_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/blaze_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/blueslime_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/blueslime_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/blueslime_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/blueslime_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/bone_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/bone_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/bone_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/bone_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/bronze_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/bronze_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/bronze_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/bronze_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/cactus_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/cactus_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/cactus_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/cactus_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/cobalt_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/cobalt_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/cobalt_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/cobalt_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/copper_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/copper_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/copper_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/copper_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/diamond_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/dogbearium_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/dogbearium_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/dogbearium_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/dogbearium_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/emerald_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/feathers_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/flint_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/flint_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/flint_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/flint_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/flux_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/lapis_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/lava_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/legends_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/manyullyn_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/manyullyn_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/manyullyn_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/manyullyn_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/mirrors_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/moss_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/necrotic_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/netherrack_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/netherrack_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/netherrack_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/netherrack_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/obsidian_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/obsidian_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/obsidian_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/obsidian_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/paper_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/paper_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/paper_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/paper_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/pigiron_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/pigiron_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/pigiron_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/pigiron_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/piston_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/quartz_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/queensgold_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/queensgold_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/queensgold_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/queensgold_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/redstone_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/reinforced_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/silk_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/slime_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/slime_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/slime_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/slime_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/smite_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/spider_shield_effect.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/steel_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/steel_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/steel_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/steel_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/stone_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/stone_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/stone_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/stone_shield_face_other.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/wood_shield_binding.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/wood_shield_edge.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/wood_shield_face.png delete mode 100644 src/main/resources/assets/tinker/textures/items/heatershield/wood_shield_face_other.png create mode 100644 src/main/resources/assets/tinker/textures/items/parts/_soulstone.png create mode 100644 src/main/resources/assets/tinker/textures/items/parts/_soulstone.png.mcmeta delete mode 100644 src/main/resources/assets/tinkersdefense/textures/armor/halberd/_halberd_chain.png delete mode 100644 src/main/resources/assets/tinkersdefense/textures/armor/halberd/_halberd_plate.png delete mode 100644 src/main/resources/assets/tinkersdefense/textures/armor/halberd/_halberd_rivet.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_chain.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_plate.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_rivet.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_angel_face.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_arrow_face.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_bar_face.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_checker_face.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_creeper_face.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_cross_face.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_binding.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_edge.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_shield_edge.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_ender_face.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_enforced_binding.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_binding.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_face.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_glass_plate.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_heart_edge.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_heart_shield_edge.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_hell_binding.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horbar_face.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horstripe_face.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_love_binding.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_pig_binding.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_queen_binding.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_reinforced_binding.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_binding.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_edge.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_face.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_plate.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_plate_broken.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skeleton_face.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skull_binding.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_slime_binding.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_small_binding.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_spider_binding.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_square_face.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_squared_edge.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_squared_shield_edge.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_stripe_face.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_test_face.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_tri_binding.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_triangle_face.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wide_binding.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wolf_binding.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/heatershield/heatershield.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/soulstone.png create mode 100644 src/main/resources/assets/tinkersdefense/textures/items/soulstone.png.mcmeta create mode 100644 src/main/resources/assets/tinkersdefense/txt/souls/steve.txt (limited to 'src') diff --git a/src/main/java/lance5057/tDefense/TD_Config.java b/src/main/java/lance5057/tDefense/TD_Config.java index fb1280d..a235a4f 100644 --- a/src/main/java/lance5057/tDefense/TD_Config.java +++ b/src/main/java/lance5057/tDefense/TD_Config.java @@ -15,10 +15,12 @@ public class TD_Config public int SoulBoundID; public int DazeID; + public int RainbowID; public int CrestFeathersID; public int CrestMirrorsID; public int CrestLegendsID; public int CrestBladesID; + public int XPBoostID; public int ArmorProtectionID; public int ArmorFireProtectionID; @@ -78,11 +80,15 @@ public class TD_Config GreenMintMatID = config.get("Material Configs", "GreenMint Material ID", 205).getInt(); DazeID = config.get("Modifier Configs", "Daze ID", count++).getInt(); + SoulBoundID = config.get("Modifier Configs", "Soulbound ID", count++).getInt(); + RainbowID = config.get("Modifier Configs", "Rainbow ID", count++).getInt(); + XPBoostID = config.get("Modifier Configs", "XPBoost ID", count++).getInt(); + CrestFeathersID = config.get("Modifier Configs", "Crest of Feathers ID", count++).getInt(); CrestMirrorsID = config.get("Modifier Configs", "Crest of Mirrors ID", count++).getInt(); CrestLegendsID = config.get("Modifier Configs", "Crest of Legends ID", count++).getInt(); CrestLegendsID = config.get("Modifier Configs", "Crest of Legends ID", count++).getInt(); - SoulBoundID = config.get("Modifier Configs", "Soulbound ID", count++).getInt(); + ArmorProtectionID = config.get("Armor Modifier Configs", "Protection ID", count++).getInt(); ArmorFireProtectionID = config.get("Armor Modifier Configs", "Fire Protection ID", count++).getInt(); diff --git a/src/main/java/lance5057/tDefense/armor/ArmorCore.java b/src/main/java/lance5057/tDefense/armor/ArmorCore.java index 3cc3732..e56535a 100644 --- a/src/main/java/lance5057/tDefense/armor/ArmorCore.java +++ b/src/main/java/lance5057/tDefense/armor/ArmorCore.java @@ -186,9 +186,9 @@ public class ArmorCore extends ToolCore implements ISpecialArmor, IRunicArmor switch(pass) { case 0: - return this.getIconSuffix(0); - case 1: return this.getIconSuffix(2); + case 1: + return this.getIconSuffix(0); case 2: return this.getIconSuffix(3); case 3: diff --git a/src/main/java/lance5057/tDefense/armor/items/Sheath.java b/src/main/java/lance5057/tDefense/armor/items/Sheath.java index 1dc87ea..e9db2db 100644 --- a/src/main/java/lance5057/tDefense/armor/items/Sheath.java +++ b/src/main/java/lance5057/tDefense/armor/items/Sheath.java @@ -1,29 +1,25 @@ package lance5057.tDefense.armor.items; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.parts.ClothMaterial; -import lance5057.tDefense.armor.renderers.ModelSheath; import lance5057.tDefense.proxy.ClientProxy; import net.minecraft.client.model.ModelBiped; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import tconstruct.library.TConstructRegistry; import tconstruct.library.accessory.IAccessory; -import tconstruct.library.accessory.IAccessoryModel; -import tconstruct.library.tools.ToolCore; import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class Sheath extends ToolCore implements IAccessory +public class Sheath extends ArmorCore implements IAccessory { public Sheath() { - super(0); + super(0,-1); } @Override @@ -45,9 +41,9 @@ public class Sheath extends ToolCore implements IAccessory color[3] = Integer.toHexString(TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class).color); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(4), this.getIconSuffix(3)}; + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(4), this.getIconSuffix(3)}; - ClientProxy.sheath.SetColors(color, this.getDefaultFolder(), textures); + ClientProxy.sheath.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.sheath; } diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java index 61e5224..aba5909 100644 --- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java +++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java @@ -134,7 +134,7 @@ public class TinkersHood extends ArmorCore implements IRevealer, IGoggles, IVisD public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { String[] color = new String[10]; - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); @@ -148,7 +148,7 @@ public class TinkersHood extends ArmorCore implements IRevealer, IGoggles, IVisD newColor = TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class); color[0] = Integer.toHexString(newColor.color); - ClientProxy.hood.SetColors(color, this.getDefaultFolder(), textures); + ClientProxy.hood.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.hood; } diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java index 741c554..311d971 100644 --- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java +++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersRobe.java @@ -123,7 +123,7 @@ public class TinkersRobe extends ArmorCore implements IVisDiscountGear public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { String[] color = new String[10]; - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); @@ -137,7 +137,7 @@ public class TinkersRobe extends ArmorCore implements IVisDiscountGear newColor = TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class); color[0] = Integer.toHexString(newColor.color); - ClientProxy.robe.SetColors(color, this.getDefaultFolder(), textures); + ClientProxy.robe.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.robe; } diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java index c483537..4fa23d0 100644 --- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java +++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShawl.java @@ -133,7 +133,7 @@ public class TinkersShawl extends ArmorCore implements IVisDiscountGear public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { String[] color = new String[10]; - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); @@ -147,7 +147,7 @@ public class TinkersShawl extends ArmorCore implements IVisDiscountGear newColor = TConstructRegistry.getCustomMaterial(HandleID, ClothMaterial.class); color[0] = Integer.toHexString(newColor.color); - ClientProxy.shawl.SetColors(color, this.getDefaultFolder(), textures); + ClientProxy.shawl.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.shawl; } diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java index 3c2feb0..95e6840 100644 --- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java +++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersShoes.java @@ -131,7 +131,7 @@ public class TinkersShoes extends ArmorCore implements IVisDiscountGear public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { String[] color = new String[10]; - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); @@ -141,7 +141,7 @@ public class TinkersShoes extends ArmorCore implements IVisDiscountGear CustomMaterial newColor = TConstructRegistry.getCustomMaterial(HeadID, ClothMaterial.class); color[1] = Integer.toHexString(newColor.color); - ClientProxy.shoes.SetColors(color, this.getDefaultFolder(), textures); + ClientProxy.shoes.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.shoes; } diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGauntlets.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGauntlets.java index 4a94f9e..312d200 100644 --- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGauntlets.java +++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGauntlets.java @@ -19,11 +19,11 @@ import tconstruct.tools.TinkerTools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class TinkersGauntlets extends ToolCore implements IAccessory +public class TinkersGauntlets extends ArmorCore implements IAccessory { public TinkersGauntlets() { - super(2); + super(0,-1); this.setUnlocalizedName("tinkersgauntlets"); } @@ -72,7 +72,7 @@ public class TinkersGauntlets extends ToolCore implements IAccessory @Override public float getDamageModifier() { - return 1.4f; + return 0f; } @Override @@ -140,9 +140,9 @@ public class TinkersGauntlets extends ToolCore implements IAccessory for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; - ClientProxy.gauntlets.SetColors(color, this.getDefaultFolder(), textures); + ClientProxy.gauntlets.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.gauntlets; } } diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java index b0913a1..6bfb8d1 100644 --- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java +++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersGrieves.java @@ -142,8 +142,8 @@ public class TinkersGrieves extends ArmorCore for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)}; - ClientProxy.grieves.SetColors(color, this.getDefaultFolder(), textures); + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)}; + ClientProxy.grieves.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.grieves; } } diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java index aa1998f..135e948 100644 --- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java +++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java @@ -132,8 +132,8 @@ public class TinkersHelm extends ArmorCore implements IRevealer, IGoggles for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)}; - ClientProxy.helm.SetColors(color, this.getDefaultFolder(), textures); + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)}; + ClientProxy.helm.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.helm; } diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java index 48845ce..64447b2 100644 --- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java +++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersSabatons.java @@ -145,8 +145,13 @@ public class TinkersSabatons extends ArmorCore for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)}; - ClientProxy.sabatons.SetColors(color, this.getDefaultFolder(), textures); + int ExtraID = itemStack.getTagCompound().getCompoundTag("InfiTool").getInteger("RenderExtra"); + + CustomMaterial newColor = TConstructRegistry.getCustomMaterial(ExtraID, ClothMaterial.class); + color[3] = Integer.toHexString(newColor.color); + + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3), this.getIconSuffix(4)}; + ClientProxy.sabatons.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.sabatons; } } diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java index acce2b6..ce81f83 100644 --- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java +++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersBoots.java @@ -141,8 +141,8 @@ public class TinkersBoots extends ArmorCore CustomMaterial newColor = TConstructRegistry.getCustomMaterial(AccessoryID, ClothMaterial.class); color[0] = Integer.toHexString(newColor.color); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; - ClientProxy.boots.SetColors(color, this.getDefaultFolder(), textures); + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; + ClientProxy.boots.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.boots; } diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java index 8624bff..852f95f 100644 --- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java +++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersChausses.java @@ -127,8 +127,8 @@ public class TinkersChausses extends ArmorCore for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0)}; - ClientProxy.chausses.SetColors(color, this.getDefaultFolder(), textures); + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0)}; + ClientProxy.chausses.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.chausses; } diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java index 2547a56..ba0db3d 100644 --- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java +++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java @@ -142,8 +142,8 @@ public class TinkersCoif extends ArmorCore implements IRevealer, IGoggles CustomMaterial newColor = TConstructRegistry.getCustomMaterial(AccessoryID, ClothMaterial.class); color[0] = Integer.toHexString(newColor.color); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; - ClientProxy.coif.SetColors(color, this.getDefaultFolder(), textures); + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; + ClientProxy.coif.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.coif; } diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java index 061f7fe..9e071a7 100644 --- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java +++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersHauberk.java @@ -128,8 +128,8 @@ public class TinkersHauberk extends ArmorCore for(int j = 0; j < 10; j++) color[j] = Integer.toHexString(itemStack.getItem().getColorFromItemStack(itemStack, j)); - String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; - ClientProxy.hauberk.SetColors(color, this.getDefaultFolder(), textures); + //String[] textures = {this.getIconSuffix(2), this.getIconSuffix(0), this.getIconSuffix(3)}; + ClientProxy.hauberk.SetColors(color, this.getDefaultFolder(), itemStack); return ClientProxy.hauberk; } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java index 2fdc674..9841c80 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -46,24 +47,22 @@ public class ModelSheath extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 4; i++) - { - GL11.glPushMatrix(); - - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0.0F, -0.0F, 0.0F); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + GL11.glPushMatrix(); - //setLivingAnimations((EntityLivingBase) entity, f,f1, f5); - super.render(entity, f, f1, f2, f3, f4, f5); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java index 59b058c..629d2c4 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.cloth; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -44,23 +45,22 @@ public class ModelTinkersHood extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 3; i++) - { - GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - float size = 2.25f; - GL11.glScalef(1.5F / size, 1.5F / size, 1.5F / size); - GL11.glTranslatef(0.0F, 0F * f5, 0.0F); + GL11.glPushMatrix(); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - //setRotationAngles(f, f1, f2, f3, f4, f5, entity); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java index a981f8f..80c32a8 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersRobe.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.cloth; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -89,23 +90,22 @@ public class ModelTinkersRobe extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 2; i++) - { - GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0F, -0F * f5, -0F); + GL11.glPushMatrix(); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java index f9c6ad1..387463e 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersShawl.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.cloth; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -102,23 +103,22 @@ public class ModelTinkersShawl extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 3; i++) - { - GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0F, -0F * f5, -0F); + GL11.glPushMatrix(); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGauntlets.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGauntlets.java index e007127..a63b402 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGauntlets.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGauntlets.java @@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.FMLClientHandler; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; @@ -72,24 +73,22 @@ public class ModelTinkersGauntlets extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 3; i++) - { - GL11.glPushMatrix(); - - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0.0F, -0.0F, 0.0F); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + GL11.glPushMatrix(); - //setLivingAnimations((EntityLivingBase) entity, f,f1, f5); - super.render(entity, f, f1, f2, f3, f4, f5); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java index c5f59ff..58cd8cf 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.heavy; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -84,23 +85,22 @@ public class ModelTinkersGrieves extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 4; i++) - { - GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0F, -0F * f5, -0F); + GL11.glPushMatrix(); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java index 78a0c83..005b182 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.heavy; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -53,22 +54,22 @@ public class ModelTinkersHelm extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 3; i++) + + for(int i = 0; i < 10; i++) { - GL11.glPushMatrix(); + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + GL11.glPushMatrix(); - float size = 2.5f; - GL11.glScalef(1.5F / size, 1.5F / size, 1.5F / size); - GL11.glTranslatef(0.0F, -0F * f5, 0.0F); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersSabatons.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersSabatons.java index 1a948aa..ca24d32 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersSabatons.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersSabatons.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.heavy; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -114,25 +115,21 @@ public class ModelTinkersSabatons extends ArmorRenderer { GL11.glPushMatrix(); - for(int i = 0; i < 4; i++) + for(int i = 0; i < 10; i++) { - //TConstructRegistry.getCustomMaterial(arg0, arg1) - GL11.glPushMatrix(); - ResourceLocation texture = new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png"); - //Boolean exists = new File(texture.getResourceDomain() + ":" + texture.getResourcePath()).exists(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(texture); - - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0.0F, -0F * f5, 0.0F); - - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); - - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - GL11.glPopMatrix(); + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { + + GL11.glPushMatrix(); + + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); + + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java index a55c825..41dff40 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.light; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -53,23 +54,22 @@ public class ModelTinkersBoots extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 3; i++) - { - GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0.0F, -0F * f5, 0.0F); + GL11.glPushMatrix(); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java index 00f0d64..010e06b 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.light; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -86,22 +87,22 @@ public class ModelTinkersChausses extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 2; i++) - { - GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0F, 0F * f5, -0F); + GL11.glPushMatrix(); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java index d59bcc2..da3f80b 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.light; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -41,23 +42,22 @@ public class ModelTinkersCoif extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 3; i++) - { - GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0.0F, 0F * f5, 0.0F); + GL11.glPushMatrix(); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - setRotationAngles(f, f1, f2, f3, f4, f5, entity); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java index 455ac3b..9e3f192 100644 --- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java +++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java @@ -1,6 +1,7 @@ package lance5057.tDefense.armor.renderers.light; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.ArmorCore; import lance5057.tDefense.armor.renderers.ArmorRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -93,22 +94,22 @@ public class ModelTinkersHauberk extends ArmorRenderer public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { GL11.glPushMatrix(); - for(int i = 0; i < 3; i++) - { - GL11.glPushMatrix(); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("tinkersdefense:textures/" + defaultFolder + "/" + textures[i] + ".png")); + for(int i = 0; i < 10; i++) + { + String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack); + if(texture != "") + { - float size = 1.6f; - GL11.glScalef(1.0F / size, 1.0F / size, 1.0F / size); - GL11.glTranslatef(0.0F, 0F * f5, 0.0F); + GL11.glPushMatrix(); - int[] intColors = TinkersDefense.hexToRGB(colors[i]); - GL11.glColor3d((float) intColors[0] / 255, (float) intColors[1] / 255, (float) intColors[2] / 255); + ((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i); + super.render(entity, f, f1, f2, f3, f4, f5); - super.render(entity, f, f1, f2, f3, f4, f5); - GL11.glPopMatrix(); + GL11.glPopMatrix(); + } } + GL11.glPopMatrix(); } diff --git a/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java b/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java index 00f3707..ad70bfd 100644 --- a/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java +++ b/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java @@ -91,13 +91,13 @@ public class HeaterShield extends Shield switch(partType) { case 0: - return "_shield_face"; + return "_shield_plate"; case 1: - return "_shield_face_broken"; + return "_shield_plate_broken"; case 2: return "_shield_edge"; case 3: - return "_shield_face_other"; + return "_shield_face"; case 4: return "_shield_binding"; default: diff --git a/src/main/java/lance5057/tDefense/core/tools/Shears.java b/src/main/java/lance5057/tDefense/core/tools/Shears.java index 8ba51b7..8870766 100644 --- a/src/main/java/lance5057/tDefense/core/tools/Shears.java +++ b/src/main/java/lance5057/tDefense/core/tools/Shears.java @@ -126,6 +126,17 @@ public class Shears extends ToolCore { ArrayList drops = target.onSheared(itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, itemstack)); + if(itemstack.getTagCompound().getCompoundTag("InfiTool").hasKey("Rainbow")) + { + for(int i = 0; i < drops.size(); i++) + { + if(drops.get(i).getItem() == Blocks.wool.getItem(entity.worldObj, 0, 0, 0)) + { + drops.get(i).setItemDamage(entity.worldObj.rand.nextInt(16)); + } + } + } + Random rand = new Random(); for(ItemStack stack : drops) { diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java index ab921dc..13c14d4 100644 --- a/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java +++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java @@ -11,57 +11,63 @@ import thaumcraft.common.items.wands.ItemWandCap; public class modifierRepairVis extends ModBoolean { - WandCap cap; - String color; - String tooltipName; - + WandCap cap; + String color; + String tooltipName; + public modifierRepairVis(ItemStack[] items, int effect, String tag, String c, String tip) { super(items, effect, tag, c, tip); color = c; tooltipName = tip; } - + @Override - public boolean matches (ItemStack[] recipe, ItemStack input) - { + public boolean matches(ItemStack[] recipe, ItemStack input) + { cap = null; - for(WandCap cp: WandCap.caps.values()) - { - ItemStack test = cp.getItem(); - if(recipe[0].getItem() == test.getItem() && recipe[0].getItemDamage() == test.getItemDamage()) - { - cap = cp; - break; - } - } - - if (!canModify(input, recipe)) - return false; - if (cap == null) - return false; - return true; - } - - @Override - protected boolean canModify (ItemStack tool, ItemStack[] input) - { - NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); - return tags.getInteger("Modifiers") > 0 && !tags.getBoolean(key) && input[0].getItem() instanceof ItemWandCap; //Will fail if the modifier is false or the tag doesn't exist - } + for(int i = 0; i < recipe.length; i++) + { + if(recipe[i] != null) + { + for(WandCap cp : WandCap.caps.values()) + { + ItemStack test = cp.getItem(); + if(recipe[i].getItem() == test.getItem() && recipe[i].getItemDamage() == test.getItemDamage()) + { + cap = cp; + break; + } + } + } + } + + if(!canModify(input, recipe)) + return false; + if(cap == null) + return false; + return true; + } + + @Override + protected boolean canModify(ItemStack tool, ItemStack[] input) + { + NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); + return tags.getInteger("Modifiers") > 0 && !tags.getBoolean(key) && cap != null; //Will fail if the modifier is false or the tag doesn't exist + } @Override - public void modify (ItemStack[] input, ItemStack tool) - { - NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); + public void modify(ItemStack[] input, ItemStack tool) + { + NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); + + tags.setFloat(key, cap.getBaseCostModifier()); - tags.setFloat(key, cap.getBaseCostModifier()); - - int modifiers = tags.getInteger("Modifiers"); - modifiers -= 1; - tags.setInteger("Modifiers", modifiers); + int modifiers = tags.getInteger("Modifiers"); + modifiers -= 1; + tags.setInteger("Modifiers", modifiers); - String mat = cap.getTag().substring(0, 1).toUpperCase() + cap.getTag().substring(1) + " "; - addToolTip(tool, color + mat + tooltipName, color + mat + tooltipName + " ("+(int)(cap.getBaseCostModifier()*100)+"%)"); - } + String mat = cap.getTag().substring(0, 1).toUpperCase() + cap.getTag().substring(1) + " "; + addToolTip(tool, color + mat + tooltipName, color + mat + tooltipName + " (" + (int) (cap.getBaseCostModifier() * 100) + "%)"); + } } diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/ToolMods.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/ToolMods.java index 7280383..a610fee 100644 --- a/src/main/java/lance5057/tDefense/core/tools/modifiers/ToolMods.java +++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/ToolMods.java @@ -2,11 +2,11 @@ package lance5057.tDefense.core.tools.modifiers; import java.util.ArrayList; -import cpw.mods.fml.common.registry.GameRegistry; import lance5057.tDefense.Reference; import lance5057.tDefense.TinkersDefense; +import lance5057.tDefense.armor.modifiers.modifierBoolExclusive; +import lance5057.tDefense.armor.modifiers.modifierIntExclusive; import lance5057.tDefense.core.tools.modifiers.ActiveToolMods.TDefenseActiveToolMod; -import lance5057.tDefense.core.tools.modifiers.Botania.modifierCorpseIvy; import lance5057.tDefense.core.tools.modifiers.TDefense.modifierSoulBound; import lance5057.tDefense.core.tools.modifiers.TDefense.shields.modifierCrestofBlades; import lance5057.tDefense.core.tools.modifiers.TDefense.shields.modifierCrestofFeathers; @@ -16,35 +16,39 @@ import lance5057.tDefense.core.tools.modifiers.TDefense.weapons.modifierDaze; import mods.battlegear2.api.core.IBattlePlayer; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityXPOrb; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityFireball; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingDeathEvent; import tconstruct.library.TConstructRegistry; import tconstruct.library.client.TConstructClientRegistry; import tconstruct.library.crafting.ModifyBuilder; import tconstruct.library.tools.ToolCore; -import tconstruct.tools.TinkerTools; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibOreDict; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; public class ToolMods { public static Item item_relic; public static Item itemSoulChain; + public static Item item_RainbowGem; + public static Item item_Textbook; + public ToolMods() { + MinecraftForge.EVENT_BUS.register(this); + LoadItems(); } @@ -54,8 +58,15 @@ public class ToolMods itemSoulChain = new Item().setCreativeTab(TinkersDefense.tabName).setMaxStackSize(1).setUnlocalizedName("SoulChain").setTextureName(Reference.MOD_ID + ":SoulChain"); - GameRegistry.registerItem(item_relic, "Ancient Relic"); - GameRegistry.registerItem(itemSoulChain, "Soul Chain"); + item_Textbook = new Item().setCreativeTab(TinkersDefense.tabName).setMaxStackSize(1).setUnlocalizedName("Textbook").setTextureName(Reference.MOD_ID + ":Textbook"); + + //Shears + item_RainbowGem = new Item().setCreativeTab(TinkersDefense.tabName).setMaxStackSize(1).setUnlocalizedName("RainbowGem").setTextureName(Reference.MOD_ID + ":RainbowGem"); + + GameRegistry.registerItem(item_relic, "AncientRelic"); + GameRegistry.registerItem(itemSoulChain, "SoulChain"); + GameRegistry.registerItem(item_RainbowGem, "RainbowGem"); + GameRegistry.registerItem(item_Textbook, "Textbook"); } public void RegisterRecipes() @@ -64,19 +75,24 @@ public class ToolMods public void RegisterModifiers() { + //All + ModifyBuilder.registerModifier(new modifierSoulBound(new ItemStack[] {new ItemStack(itemSoulChain)}, TinkersDefense.config.SoulBoundID, "Soulbound", "\u00A7b", "Soulbound")); + + //Weapons + //TO-DO ModifyBuilder.registerModifier(new modifierDaze("Daze", TinkersDefense.config.DazeID, new ItemStack[] {new ItemStack(Blocks.light_weighted_pressure_plate), new ItemStack(Items.potionitem, 1, 8202)}, new int[] {1, 0})); + ModifyBuilder.registerModifier(new modifierIntExclusive(new ItemStack[] {new ItemStack(item_Textbook, 1, 0)}, TinkersDefense.config.XPBoostID, "XPBoost", 1, EnumChatFormatting.GREEN.toString(), "XP Boost", new String[] {"weapon"}, 1, null)); - //ModifyBuilder.registerModifier(new modifierTorchArrow(new ItemStack[] {new ItemStack(Blocks.glowstone)}, 12)); + //Shears + ModifyBuilder.registerModifier(new modifierBoolExclusive(new ItemStack[] {new ItemStack(item_RainbowGem, 1, 0)}, TinkersDefense.config.RainbowID, "Rainbow", EnumChatFormatting.WHITE.toString(), "Rainbow", new String[] {"shears"}, 1, null)); + //Shields ModifyBuilder.registerModifier(new modifierCrestofFeathers("Crest of Feathers", TinkersDefense.config.CrestFeathersID, new ItemStack[] {new ItemStack(Items.feather)}, new int[] {1})); - ModifyBuilder.registerModifier(new modifierCrestofMirrors("Crest of Mirrors", TinkersDefense.config.CrestMirrorsID, new ItemStack[] {new ItemStack(Blocks.glass_pane)}, new int[] {1})); - ModifyBuilder.registerModifier(new modifierCrestofLegends("Crest of Legends", TinkersDefense.config.CrestLegendsID, new ItemStack[] {new ItemStack(item_relic)}, new int[] {1})); - ModifyBuilder.registerModifier(new modifierCrestofBlades("Crest of Blades", TinkersDefense.config.CrestBladesID, new ItemStack[] {new ItemStack(Items.iron_sword)}, new int[] {1})); - ModifyBuilder.registerModifier(new modifierSoulBound(new ItemStack[] {new ItemStack(itemSoulChain)}, TinkersDefense.config.SoulBoundID, "Soulbound", "\u00A7b", "Soulbound")); + ModifyBuilder.registerModifier(new modifierBoolExclusive(new ItemStack[] {new ItemStack(item_RainbowGem, 1, 0)}, TinkersDefense.config.RainbowID, "Rainbow", EnumChatFormatting.WHITE.toString(), "Rainbow", new String[] {"shears"}, 1, null)); TConstructRegistry.registerActiveToolMod(new TDefenseActiveToolMod()); @@ -88,6 +104,9 @@ public class ToolMods TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CrestLegendsID, "tinker", "legends", true); TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CrestBladesID, "tinker", "blades", true); TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.SoulBoundID, "tinker", "soulbound", true); + TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.RainbowID, "tinker", "rainbow", true); + TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.XPBoostID, "tinker", "textbook", true); + } } @@ -129,4 +148,24 @@ public class ToolMods { //entity.worldObj.ent } + + @SubscribeEvent + public void XPBoost(LivingDeathEvent event) + { + if(!(event.entityLiving instanceof EntityPlayer) && event.source.getSourceOfDamage() instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) event.source.getSourceOfDamage(); + ItemStack itemstack = player.getCurrentEquippedItem(); + if(itemstack != null) + { + NBTTagCompound tags = itemstack.getTagCompound().getCompoundTag("InfiTool"); + + if(tags != null && tags.hasKey("XPBoost")) + { + player.worldObj.spawnEntityInWorld(new EntityXPOrb(player.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, (int)Math.pow(tags.getInteger("XPBoost"),2))); + + } + } + } + } } diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java index f97fdcc..b9fc7d2 100644 --- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java +++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java @@ -142,7 +142,7 @@ public class Gui_FinishingAnvil extends GuiContainer if(tags.hasKey("Render" + renders[leftSelect])) { tags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPosX + ((rightButtonPosY % 3) * 16)) * TinkersDefense.config.MaterialIndex)); - if(rightButtonPosX + (rightButtonPosY * 16) > 0) + if(rightButtonPosX > 0) tags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(tags.getInteger(renders[leftSelect])).primaryColor()); else tags.removeTag(renders[leftSelect] + "Color"); @@ -236,11 +236,16 @@ public class Gui_FinishingAnvil extends GuiContainer this.mc.getTextureManager().bindTexture(this.forGui); if(inventory.getStackInSlot(0) != null) - this.drawTexturedModalRect(7, 12 + (leftSelect * 20), 16, 0, 16, 16); + { +// int leftMax = leftSelect; +// if(leftMax > 2) +// leftMax = 2; + this.drawTexturedModalRect(7, 12 + ((leftSelect - leftButtonPosX) * 20), 16, 0, 16, 16); + } - this.drawTexturedModalRect(7, 12, this.xLIcon_one + (this.leftButtonPosX * 16), this.yLIcon_one + (this.leftButtonPosY * 16), 16, 16); - this.drawTexturedModalRect(7, 32, this.xLIcon_two + (this.leftButtonPosX * 16), this.yLIcon_two + (this.leftButtonPosY * 16), 16, 16); - this.drawTexturedModalRect(7, 52, this.xLIcon_three + (this.leftButtonPosX * 16), this.yLIcon_three + (this.leftButtonPosY * 16), 16, 16); + this.drawTexturedModalRect(7, 12, this.xLIcon_one + (this.leftButtonPosX * 16), this.yLIcon_one + 0, 16, 16); + this.drawTexturedModalRect(7, 32, this.xLIcon_two + (this.leftButtonPosX * 16), this.yLIcon_two + 0, 16, 16); + this.drawTexturedModalRect(7, 52, this.xLIcon_three + (this.leftButtonPosX * 16), this.yLIcon_three + 0, 16, 16); this.drawTexturedModalRect(132, 12, this.xRIcon_one + (this.rightButtonPosX * 16), this.yRIcon_one + (this.rightButtonPosY * 16), 16, 16); @@ -289,21 +294,40 @@ public class Gui_FinishingAnvil extends GuiContainer ToolCoreTip tt = ((Injector) TinkersDefense.tcInject).tools.get(tool.getToolName()); List list = new ArrayList(); - switch(i) + if(tt != null) { - case 0: list.add(tt.getPart(1 + this.leftButtonPosX)); break; - case 1: list.add(tt.getPart(3 + this.leftButtonPosX)); break; - case 2: list.add(tt.getPart(2 + this.leftButtonPosX)); break; - - case 3: list.add(tt.getPartName(this.leftSelect + 1, (rightButtonPosX + ((rightButtonPosY % 3) * 16)))); break; - case 4: list.add(tt.getPartName(this.leftSelect + 1, (rightButtonPosX + 1 + ((rightButtonPosY % 3) * 16)))); break; - case 5: list.add(tt.getPartName(this.leftSelect + 1, (rightButtonPosX + 2 + ((rightButtonPosY % 3) * 16)))); break; + switch(i) + { + case 0: + list.add(tt.getPart(1 + this.leftButtonPosX)); + break; + case 1: + list.add(tt.getPart(3 + this.leftButtonPosX)); + break; + case 2: + list.add(tt.getPart(2 + this.leftButtonPosX)); + break; + + case 3: + list.add(tt.getPartName(this.leftSelect + 1, (rightButtonPosX + ((rightButtonPosY % 3) * 16)))); + break; + case 4: + list.add(tt.getPartName(this.leftSelect + 1, (rightButtonPosX + 1 + ((rightButtonPosY % 3) * 16)))); + break; + case 5: + list.add(tt.getPartName(this.leftSelect + 1, (rightButtonPosX + 2 + ((rightButtonPosY % 3) * 16)))); + break; + } + + if(list.get(0).contains("Metallurgy")) + list.add(" -by Shadowclaimer"); + func_146283_a(list, x, y); + } + else + { + list.add("Error - No name/desc!"); + func_146283_a(list, x, y); } - - if(list.get(0).contains("Metallurgy")) - list.add(" -by Shadowclaimer"); - func_146283_a(list, x, y); - } } } diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java index 84cd4de..a0125d9 100644 --- a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java +++ b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java @@ -68,6 +68,8 @@ public class Injector extends ToolCore Mattock(); if(tool.getToolName().equals("Longbow")) Longbow(); + if(tool.getToolName().equals("HeaterShield")) + HeaterShield(); setupIcons(tool, iconRegister, heads, this.headStrings, this.headIcons); setupIcons(tool, iconRegister, accessories, this.accessoryStrings, this.accessoryIcons); setupIcons(tool, iconRegister, handles, this.handleStrings, this.handleIcons); @@ -464,4 +466,93 @@ public class Injector extends ToolCore handles.add("_m5copper_handle"); extras.add("_m5copper_extra"); } + + void HeaterShield() + { + ToolCoreTip tt = new ToolCoreTip(); + + tt.head = "Plate"; + tt.accessory = "Emblem"; + tt.handle = "Edge"; + tt.extra = "Binding"; + + tt.headTT.add("Standard Plate"); + heads.add("_glass_plate"); + tt.headTT.add("Glass Plate"); + + tt.accessoryTT.add("Standard Emblem"); + accessories.add("_test_face"); + tt.accessoryTT.add("Villager Emblem"); + accessories.add("_skeleton_face"); + tt.accessoryTT.add("Skeleton Emblem"); + accessories.add("_ender_face"); + tt.accessoryTT.add("Ender Emblem"); + accessories.add("_creeper_face"); + tt.accessoryTT.add("Creeper Emblem"); + accessories.add("_square_face"); + tt.accessoryTT.add("Block Emblem"); + accessories.add("_angel_face"); + tt.accessoryTT.add("Angel Emblem"); + accessories.add("_fancy_face"); + tt.accessoryTT.add("Fancy Emblem"); + accessories.add("_cross_face"); + tt.accessoryTT.add("Cross Emblem"); + accessories.add("_stripe_face"); + tt.accessoryTT.add("Vertical Stripe Emblem"); + accessories.add("_bar_face"); + tt.accessoryTT.add("Vertical Bars Emblem"); + accessories.add("_horbar_face"); + tt.accessoryTT.add("Horizontal Bars Emblem"); + accessories.add("_horstripe_face"); + tt.accessoryTT.add("Horizontal Stripe Emblem"); + accessories.add("_triangle_face"); + tt.accessoryTT.add("Triangles Emblem"); + accessories.add("_arrow_face"); + tt.accessoryTT.add("Arrow Emblem"); + accessories.add("_checker_face"); + tt.accessoryTT.add("Checkered Emblem"); + + tt.handleTT.add("Standard Edge"); + handles.add("_demon_edge"); + tt.handleTT.add("Demonic Edge"); + handles.add("_squared_edge"); + tt.handleTT.add("Squared Edge"); + handles.add("_heart_edge"); + tt.handleTT.add("Heart Edge"); + + tt.extraTT.add("Standard Binding"); + extras.add("_spider_binding"); + tt.extraTT.add("Spider Binding"); + extras.add("_love_binding"); + tt.extraTT.add("Heart Binding"); + extras.add("_enforced_binding"); + tt.extraTT.add("Enforced Binding"); + extras.add("_slime_binding"); + tt.extraTT.add("Slimey Binding"); + extras.add("_small_binding"); + tt.extraTT.add("Small Binding"); + extras.add("_demon_binding"); + tt.extraTT.add("Demon Binding"); + extras.add("_pig_binding"); + tt.extraTT.add("Pig Binding"); + extras.add("_wolf_binding"); + tt.extraTT.add("Wolf Binding"); + extras.add("_wide_binding"); + tt.extraTT.add("Wide Binding"); + extras.add("_reinforced_binding"); + tt.extraTT.add("Strong Binding"); + extras.add("_skull_binding"); + tt.extraTT.add("Skull Binding"); + extras.add("_hell_binding"); + tt.extraTT.add("Hell Binding"); + extras.add("_queen_binding"); + tt.extraTT.add("Queen's Binding"); + extras.add("_tri_binding"); + tt.extraTT.add("Tri Binding"); + extras.add("_fancy_binding"); + tt.extraTT.add("Fancy Binding"); + + tools.put("Heater Shield", tt); + } + } diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_binding.png index 97438b8..01666c2 100644 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_binding.png and b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_binding.png differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_bindings.xcf b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_bindings.xcf deleted file mode 100644 index ff0e85a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_bindings.xcf and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_edge.png index 6022fdb..41a2a63 100644 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_edge.png and b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_edge.png differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face.png index 48b9bee..a2c7402 100644 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face.png and b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face.png differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face_broken.png b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face_broken.png deleted file mode 100644 index 7e24728..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face_broken.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face_other.png deleted file mode 100644 index 5d422a4..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_plate.png b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_plate.png new file mode 100644 index 0000000..f688376 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_plate.png differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/_shield_plate_broken.png b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_plate_broken.png new file mode 100644 index 0000000..4169e2b Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/heatershield/_shield_plate_broken.png differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/aeonsteel_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/aeonsteel_shield_binding.png deleted file mode 100644 index e6f464b..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/aeonsteel_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/aeonsteel_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/aeonsteel_shield_edge.png deleted file mode 100644 index 76e5c94..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/aeonsteel_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/aeonsteel_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/aeonsteel_shield_face.png deleted file mode 100644 index c2ab6e8..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/aeonsteel_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/aeonsteel_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/aeonsteel_shield_face_other.png deleted file mode 100644 index 665a8b5..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/aeonsteel_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/alumite_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/alumite_shield_binding.png deleted file mode 100644 index bcf0b92..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/alumite_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/alumite_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/alumite_shield_edge.png deleted file mode 100644 index 9e7308c..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/alumite_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/alumite_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/alumite_shield_face.png deleted file mode 100644 index 44c6b0e..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/alumite_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/alumite_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/alumite_shield_face_other.png deleted file mode 100644 index 9652bf3..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/alumite_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/ardite_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/ardite_shield_binding.png deleted file mode 100644 index 6934848..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/ardite_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/ardite_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/ardite_shield_edge.png deleted file mode 100644 index ef761cd..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/ardite_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/ardite_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/ardite_shield_face.png deleted file mode 100644 index 3f876a7..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/ardite_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/ardite_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/ardite_shield_face_other.png deleted file mode 100644 index f85b880..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/ardite_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/beheading_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/beheading_shield_effect.png deleted file mode 100644 index e75b706..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/beheading_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/blades_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/blades_shield_effect.png deleted file mode 100644 index 84a1902..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/blades_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/blaze_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/blaze_shield_effect.png deleted file mode 100644 index 8941f8a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/blaze_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/blueslime_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/blueslime_shield_binding.png deleted file mode 100644 index df693a0..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/blueslime_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/blueslime_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/blueslime_shield_edge.png deleted file mode 100644 index 8e4f1c8..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/blueslime_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/blueslime_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/blueslime_shield_face.png deleted file mode 100644 index efad3d6..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/blueslime_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/blueslime_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/blueslime_shield_face_other.png deleted file mode 100644 index c40dae7..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/blueslime_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/bone_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/bone_shield_binding.png deleted file mode 100644 index d577e36..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/bone_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/bone_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/bone_shield_edge.png deleted file mode 100644 index 15170ce..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/bone_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/bone_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/bone_shield_face.png deleted file mode 100644 index 0396487..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/bone_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/bone_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/bone_shield_face_other.png deleted file mode 100644 index 5dbd98c..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/bone_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/bronze_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/bronze_shield_binding.png deleted file mode 100644 index 808af2d..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/bronze_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/bronze_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/bronze_shield_edge.png deleted file mode 100644 index 56fad70..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/bronze_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/bronze_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/bronze_shield_face.png deleted file mode 100644 index cf93cc5..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/bronze_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/bronze_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/bronze_shield_face_other.png deleted file mode 100644 index 8796aa9..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/bronze_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/cactus_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/cactus_shield_binding.png deleted file mode 100644 index f2b0f6c..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/cactus_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/cactus_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/cactus_shield_edge.png deleted file mode 100644 index 5cf27b2..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/cactus_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/cactus_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/cactus_shield_face.png deleted file mode 100644 index a6cbfca..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/cactus_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/cactus_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/cactus_shield_face_other.png deleted file mode 100644 index f4df68d..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/cactus_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/cobalt_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/cobalt_shield_binding.png deleted file mode 100644 index 949ad8c..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/cobalt_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/cobalt_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/cobalt_shield_edge.png deleted file mode 100644 index 5b83854..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/cobalt_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/cobalt_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/cobalt_shield_face.png deleted file mode 100644 index e1fe4a2..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/cobalt_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/cobalt_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/cobalt_shield_face_other.png deleted file mode 100644 index e7792ab..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/cobalt_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/copper_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/copper_shield_binding.png deleted file mode 100644 index c6743f3..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/copper_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/copper_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/copper_shield_edge.png deleted file mode 100644 index aaea4b5..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/copper_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/copper_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/copper_shield_face.png deleted file mode 100644 index 7fdaf50..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/copper_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/copper_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/copper_shield_face_other.png deleted file mode 100644 index d2a16d1..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/copper_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/diamond_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/diamond_shield_effect.png deleted file mode 100644 index bbd6bf1..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/diamond_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/dogbearium_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/dogbearium_shield_binding.png deleted file mode 100644 index 1290673..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/dogbearium_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/dogbearium_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/dogbearium_shield_edge.png deleted file mode 100644 index d0d6590..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/dogbearium_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/dogbearium_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/dogbearium_shield_face.png deleted file mode 100644 index 2a7fd52..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/dogbearium_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/dogbearium_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/dogbearium_shield_face_other.png deleted file mode 100644 index 079784c..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/dogbearium_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/emerald_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/emerald_shield_effect.png deleted file mode 100644 index d62a5be..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/emerald_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/feathers_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/feathers_shield_effect.png deleted file mode 100644 index 92464cc..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/feathers_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/flint_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/flint_shield_binding.png deleted file mode 100644 index 5ec566f..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/flint_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/flint_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/flint_shield_edge.png deleted file mode 100644 index fd4e49f..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/flint_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/flint_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/flint_shield_face.png deleted file mode 100644 index d7f500a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/flint_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/flint_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/flint_shield_face_other.png deleted file mode 100644 index 88db7c1..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/flint_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/flux_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/flux_shield_effect.png deleted file mode 100644 index 8547016..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/flux_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/lapis_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/lapis_shield_effect.png deleted file mode 100644 index 7bce7eb..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/lapis_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/lava_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/lava_shield_effect.png deleted file mode 100644 index 5bf9183..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/lava_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/legends_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/legends_shield_effect.png deleted file mode 100644 index cd14f6a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/legends_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/manyullyn_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/manyullyn_shield_binding.png deleted file mode 100644 index 36db5fd..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/manyullyn_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/manyullyn_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/manyullyn_shield_edge.png deleted file mode 100644 index 57f4a68..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/manyullyn_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/manyullyn_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/manyullyn_shield_face.png deleted file mode 100644 index 9a25523..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/manyullyn_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/manyullyn_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/manyullyn_shield_face_other.png deleted file mode 100644 index 1820ee6..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/manyullyn_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/mirrors_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/mirrors_shield_effect.png deleted file mode 100644 index ae8e4e0..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/mirrors_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/moss_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/moss_shield_effect.png deleted file mode 100644 index ba30b4c..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/moss_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/necrotic_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/necrotic_shield_effect.png deleted file mode 100644 index bcec218..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/necrotic_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/netherrack_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/netherrack_shield_binding.png deleted file mode 100644 index b391eb7..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/netherrack_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/netherrack_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/netherrack_shield_edge.png deleted file mode 100644 index d4ec016..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/netherrack_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/netherrack_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/netherrack_shield_face.png deleted file mode 100644 index fa238fb..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/netherrack_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/netherrack_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/netherrack_shield_face_other.png deleted file mode 100644 index e01984e..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/netherrack_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/obsidian_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/obsidian_shield_binding.png deleted file mode 100644 index 86c339f..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/obsidian_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/obsidian_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/obsidian_shield_edge.png deleted file mode 100644 index 366e4a8..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/obsidian_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/obsidian_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/obsidian_shield_face.png deleted file mode 100644 index 2fcb714..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/obsidian_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/obsidian_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/obsidian_shield_face_other.png deleted file mode 100644 index cf88c74..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/obsidian_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/paper_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/paper_shield_binding.png deleted file mode 100644 index 1860add..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/paper_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/paper_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/paper_shield_edge.png deleted file mode 100644 index f20e5ba..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/paper_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/paper_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/paper_shield_face.png deleted file mode 100644 index 1685d0b..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/paper_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/paper_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/paper_shield_face_other.png deleted file mode 100644 index 6cc004c..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/paper_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/pigiron_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/pigiron_shield_binding.png deleted file mode 100644 index eebbf32..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/pigiron_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/pigiron_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/pigiron_shield_edge.png deleted file mode 100644 index 476e81c..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/pigiron_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/pigiron_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/pigiron_shield_face.png deleted file mode 100644 index b7aa551..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/pigiron_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/pigiron_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/pigiron_shield_face_other.png deleted file mode 100644 index bae2839..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/pigiron_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/piston_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/piston_shield_effect.png deleted file mode 100644 index 8520d54..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/piston_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/quartz_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/quartz_shield_effect.png deleted file mode 100644 index 10087c2..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/quartz_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/queensgold_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/queensgold_shield_binding.png deleted file mode 100644 index 3cbc92d..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/queensgold_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/queensgold_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/queensgold_shield_edge.png deleted file mode 100644 index 17151c8..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/queensgold_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/queensgold_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/queensgold_shield_face.png deleted file mode 100644 index f3c7efa..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/queensgold_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/queensgold_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/queensgold_shield_face_other.png deleted file mode 100644 index d649aa9..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/queensgold_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/redstone_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/redstone_shield_effect.png deleted file mode 100644 index 34a53d1..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/redstone_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/reinforced_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/reinforced_shield_effect.png deleted file mode 100644 index 9efbbe0..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/reinforced_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/silk_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/silk_shield_effect.png deleted file mode 100644 index 1e8bc7e..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/silk_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/slime_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/slime_shield_binding.png deleted file mode 100644 index 8e1aec6..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/slime_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/slime_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/slime_shield_edge.png deleted file mode 100644 index f106531..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/slime_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/slime_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/slime_shield_face.png deleted file mode 100644 index 176f473..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/slime_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/slime_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/slime_shield_face_other.png deleted file mode 100644 index 3796391..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/slime_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/smite_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/smite_shield_effect.png deleted file mode 100644 index 62b34a2..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/smite_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/spider_shield_effect.png b/src/main/resources/assets/tinker/textures/items/heatershield/spider_shield_effect.png deleted file mode 100644 index 7c779f1..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/spider_shield_effect.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/steel_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/steel_shield_binding.png deleted file mode 100644 index 919b47f..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/steel_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/steel_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/steel_shield_edge.png deleted file mode 100644 index 3aa8dad..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/steel_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/steel_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/steel_shield_face.png deleted file mode 100644 index b1242e2..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/steel_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/steel_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/steel_shield_face_other.png deleted file mode 100644 index 0ba58ff..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/steel_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/stone_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/stone_shield_binding.png deleted file mode 100644 index 14510c6..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/stone_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/stone_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/stone_shield_edge.png deleted file mode 100644 index 2baa9c2..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/stone_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/stone_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/stone_shield_face.png deleted file mode 100644 index 732a7b1..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/stone_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/stone_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/stone_shield_face_other.png deleted file mode 100644 index 7f92322..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/stone_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/wood_shield_binding.png b/src/main/resources/assets/tinker/textures/items/heatershield/wood_shield_binding.png deleted file mode 100644 index c6fd97a..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/wood_shield_binding.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/wood_shield_edge.png b/src/main/resources/assets/tinker/textures/items/heatershield/wood_shield_edge.png deleted file mode 100644 index 7cf091d..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/wood_shield_edge.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/wood_shield_face.png b/src/main/resources/assets/tinker/textures/items/heatershield/wood_shield_face.png deleted file mode 100644 index 2a3485d..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/wood_shield_face.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/heatershield/wood_shield_face_other.png b/src/main/resources/assets/tinker/textures/items/heatershield/wood_shield_face_other.png deleted file mode 100644 index 6db407e..0000000 Binary files a/src/main/resources/assets/tinker/textures/items/heatershield/wood_shield_face_other.png and /dev/null differ diff --git a/src/main/resources/assets/tinker/textures/items/parts/_soulstone.png b/src/main/resources/assets/tinker/textures/items/parts/_soulstone.png new file mode 100644 index 0000000..8db1dc9 Binary files /dev/null and b/src/main/resources/assets/tinker/textures/items/parts/_soulstone.png differ diff --git a/src/main/resources/assets/tinker/textures/items/parts/_soulstone.png.mcmeta b/src/main/resources/assets/tinker/textures/items/parts/_soulstone.png.mcmeta new file mode 100644 index 0000000..ac9b4a1 --- /dev/null +++ b/src/main/resources/assets/tinker/textures/items/parts/_soulstone.png.mcmeta @@ -0,0 +1,11 @@ +{ + "animation": { + "frametime": 18, + "frames": [ + 0, + 1, + 2, + 1 + ] + } +} diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/halberd/_halberd_chain.png b/src/main/resources/assets/tinkersdefense/textures/armor/halberd/_halberd_chain.png deleted file mode 100644 index be6dd55..0000000 Binary files a/src/main/resources/assets/tinkersdefense/textures/armor/halberd/_halberd_chain.png and /dev/null differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/halberd/_halberd_plate.png b/src/main/resources/assets/tinkersdefense/textures/armor/halberd/_halberd_plate.png deleted file mode 100644 index c176223..0000000 Binary files a/src/main/resources/assets/tinkersdefense/textures/armor/halberd/_halberd_plate.png and /dev/null differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/halberd/_halberd_rivet.png b/src/main/resources/assets/tinkersdefense/textures/armor/halberd/_halberd_rivet.png deleted file mode 100644 index 1ea650c..0000000 Binary files a/src/main/resources/assets/tinkersdefense/textures/armor/halberd/_halberd_rivet.png and /dev/null differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_chain.png b/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_chain.png new file mode 100644 index 0000000..be6dd55 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_chain.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_plate.png b/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_plate.png new file mode 100644 index 0000000..c176223 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_plate.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_rivet.png b/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_rivet.png new file mode 100644 index 0000000..1ea650c Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/armor/hauberk/_hauberk_rivet.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/gui/heatershield.png b/src/main/resources/assets/tinkersdefense/textures/gui/heatershield.png index 8c4dd46..4bfa8c3 100644 Binary files a/src/main/resources/assets/tinkersdefense/textures/gui/heatershield.png and b/src/main/resources/assets/tinkersdefense/textures/gui/heatershield.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_angel_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_angel_face.png new file mode 100644 index 0000000..faa4249 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_angel_face.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_arrow_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_arrow_face.png new file mode 100644 index 0000000..286c249 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_arrow_face.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_bar_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_bar_face.png new file mode 100644 index 0000000..6e98c81 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_bar_face.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_checker_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_checker_face.png new file mode 100644 index 0000000..1e07e28 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_checker_face.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_creeper_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_creeper_face.png new file mode 100644 index 0000000..36c7b66 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_creeper_face.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_cross_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_cross_face.png new file mode 100644 index 0000000..0f50826 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_cross_face.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_binding.png new file mode 100644 index 0000000..ae977ae Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_binding.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_edge.png new file mode 100644 index 0000000..638365a Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_edge.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_shield_edge.png new file mode 100644 index 0000000..9a534ea Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_demon_shield_edge.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_ender_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_ender_face.png new file mode 100644 index 0000000..055cf9c Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_ender_face.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_enforced_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_enforced_binding.png new file mode 100644 index 0000000..d617d1c Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_enforced_binding.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_binding.png new file mode 100644 index 0000000..2c700c4 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_binding.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_face.png new file mode 100644 index 0000000..5455d91 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_fancy_face.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_glass_plate.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_glass_plate.png new file mode 100644 index 0000000..df356d0 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_glass_plate.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_heart_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_heart_edge.png new file mode 100644 index 0000000..5e1f4b9 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_heart_edge.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_heart_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_heart_shield_edge.png new file mode 100644 index 0000000..27d6ae3 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_heart_shield_edge.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_hell_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_hell_binding.png new file mode 100644 index 0000000..d5f8ed4 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_hell_binding.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horbar_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horbar_face.png new file mode 100644 index 0000000..4175fac Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horbar_face.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horstripe_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horstripe_face.png new file mode 100644 index 0000000..f06ae5c Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_horstripe_face.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_love_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_love_binding.png new file mode 100644 index 0000000..d2a7168 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_love_binding.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_pig_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_pig_binding.png new file mode 100644 index 0000000..4e52d91 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_pig_binding.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_queen_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_queen_binding.png new file mode 100644 index 0000000..193a9fb Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_queen_binding.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_reinforced_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_reinforced_binding.png new file mode 100644 index 0000000..ac67e66 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_reinforced_binding.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_binding.png new file mode 100644 index 0000000..01666c2 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_binding.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_edge.png new file mode 100644 index 0000000..41a2a63 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_edge.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_face.png new file mode 100644 index 0000000..a2c7402 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_face.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_plate.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_plate.png new file mode 100644 index 0000000..f688376 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_plate.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_plate_broken.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_plate_broken.png new file mode 100644 index 0000000..4169e2b Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_shield_plate_broken.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skeleton_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skeleton_face.png new file mode 100644 index 0000000..e23e4ff Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skeleton_face.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skull_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skull_binding.png new file mode 100644 index 0000000..e01d7eb Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_skull_binding.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_slime_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_slime_binding.png new file mode 100644 index 0000000..f146eb8 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_slime_binding.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_small_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_small_binding.png new file mode 100644 index 0000000..9df4e09 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_small_binding.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_spider_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_spider_binding.png new file mode 100644 index 0000000..e987416 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_spider_binding.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_square_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_square_face.png new file mode 100644 index 0000000..4be2b26 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_square_face.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_squared_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_squared_edge.png new file mode 100644 index 0000000..e5a6304 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_squared_edge.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_squared_shield_edge.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_squared_shield_edge.png new file mode 100644 index 0000000..a2ba90c Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_squared_shield_edge.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_stripe_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_stripe_face.png new file mode 100644 index 0000000..e45695b Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_stripe_face.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_test_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_test_face.png new file mode 100644 index 0000000..607aae7 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_test_face.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_tri_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_tri_binding.png new file mode 100644 index 0000000..91a1cdf Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_tri_binding.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_triangle_face.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_triangle_face.png new file mode 100644 index 0000000..e676e44 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_triangle_face.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wide_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wide_binding.png new file mode 100644 index 0000000..528ed50 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wide_binding.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wolf_binding.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wolf_binding.png new file mode 100644 index 0000000..5f641f1 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/_wolf_binding.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/heatershield/heatershield.png b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/heatershield.png new file mode 100644 index 0000000..4bfa8c3 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/heatershield/heatershield.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/soulstone.png b/src/main/resources/assets/tinkersdefense/textures/items/soulstone.png new file mode 100644 index 0000000..8db1dc9 Binary files /dev/null and b/src/main/resources/assets/tinkersdefense/textures/items/soulstone.png differ diff --git a/src/main/resources/assets/tinkersdefense/textures/items/soulstone.png.mcmeta b/src/main/resources/assets/tinkersdefense/textures/items/soulstone.png.mcmeta new file mode 100644 index 0000000..ac9b4a1 --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/textures/items/soulstone.png.mcmeta @@ -0,0 +1,11 @@ +{ + "animation": { + "frametime": 18, + "frames": [ + 0, + 1, + 2, + 1 + ] + } +} diff --git a/src/main/resources/assets/tinkersdefense/txt/souls/steve.txt b/src/main/resources/assets/tinkersdefense/txt/souls/steve.txt new file mode 100644 index 0000000..c2bba0a --- /dev/null +++ b/src/main/resources/assets/tinkersdefense/txt/souls/steve.txt @@ -0,0 +1,400 @@ +Offense +Heh. What is super armor to me. %dmg% damage!! +%dmg% damage! Pow! +Swish! +HIYA! +%dmg% damage? Swing me harder! +Woo! %dmg% damage! I'm awesome! +%dmg% damage! +%dmg% damage? +%dmg% damage... + +Defense +Hee hee hee... you are bad. Only %dmg% damage! +You need to do more than that. Only %dmg% damage. +Only %dmg%? Pathetic! +Ah my face! +Don't hit! Thats rude! +I can do more than %dmg% damage and I don't have hands! +%dmg% damage! +%dmg% damage? +%dmg% damage... + +Armor +It's like I'm hugging you! +Did you put on deoderant today? Doesn't smell like it... +Smelling kinda musty here... +Ewww you're sweating on me %player%! +You're warm... It's nice... +Don't worry %player%! I'll protect you! +I'm like a koala. + +Weapon +Let me at 'em! +I'm so sharp it hurts! +You should have made me into a chainsaw. Chainsaws are cool! +Why didn't you make me into a flamethrower? +Find me something to whack on! + +OnFire +It's hot! You're gonna be burnt! +Fire! Fire! It's too hot in here! + +LowHP +%Player%, say something. +H, Hey, get away, jack! +One more blow from that guy could finish us. +No need to worry... +Yo, you awake up there, %player%? + +Death +Damn... if only there hadn't been the accident... we would have been able to live happily ever after... +That's not good... +I guess human dreams are fragile... +I remember... my dad's motto was... A man should never cry like a newborn. +Sorry! It was my fault... +I wonder if there is a life after death... +Aww man, that sucks! +Darn, I couldn't get to telling you his weak point! + +LowHunger +Eat something nutritious. +You look famished! +Are you hungry? You should eat. +You should eat. +Are you hungry? +Your tummy sounds angry. +Was that a monster?! Oh it was just your stomache... + +LowDurability +I'm starvin'! +I'm starving. I wanna eat a piece of %material%. +I feel thirsty. +Wow. I'm beat. +Thump, thump, thump. My heart is throbbing... +I'm getting sleepy... zzz. +I'm still young! +I am very sensitive. Handle with care, please. +My fortune today is the worst!! My stars are all wrong. +Something's bothering me... +I feel my body starting to creak... +My back hurts lately... +Hasn't Steve been good to you? I don't know what I've done for you to treat me so disrespectfully. +%player% you need to repair me every once in a while. Life without Steve isn't worth living. +Am I losing it? +Agghh! My head is gonna explode... +Recently, I've been feeling beat. +I'm really having a crappy day. +Why... am I so... miserable... ? +Don't you think my existence is pretty important. I mean, how many talking &tool%s do you know. +Count on me! Oops. Wait, wait! +Hey... %player%, you been cold to me recently... +I'm burning out... + +Broken +I'm gonna take a nap. +Not now %player%, I've got a headache. +I wonder if there is any medicine that heals the heart... +I, I lost... +I hope I can have pleasant dreams tonight... +(Sob)... I have no time left... +Oh... Dad. You are there. +Nothingness... there is nothing there but darkness... darkness spreading everywhere. +Agghh! +I can't take it anymore. +Uggghhh! +I don't want to be defeated by him! +Argh... I think I'm really... a loser... + +Repaired +Yeah, my priorities have all changed! Ahh, it's exciting to be alive. +I tingle with excitement at my new life course. Steve, the millionaire %tool%!! +The power sealed within me now... about to be revived! +As long as I am alive, good things will happen. +Andy, brother! Stop! Stop it! Phew... it was... a dream... +It feels like love... + +Modified +I'm gonna be the %tool% to beat all %tool%! +%player%, you're too friendly. It makes me jealous. +It feels like love... +I... I feel strong... I feel charged with power... an immense power... +I'm pretty much a genius, huh. +Uggh! This, this is it! The coolness I was looking for. +I see. I get it. Now I understand. I am enlightened! + +HorseNear +Neigh! +Is that a horse? Well, it doesn't matter. It's cool anyway! +I wonder what the name of that horse is? +Hey look, Swedish meatballs! +How do you turn that into glue...? + +PigNear +Oink Oink! +I wonder if boar's meat is tasty. +Mmm, porkchops. +Aww he has a wittle snout! + +ChickenNear +Cluck cluck! +Didn't you say you like chicken better %player%? +That's a chicken? It looks like a duck... + +CowNear +Mooo! +Mmm, steak. +Horns and udders...? +I could go for a glass of milk. + +SheepNear +Baaaaah! +It looks so fluffy! +Mmm, mutton. +%player% could you just lay me on that sheep? It looks soft. + +WolfNear +Woof! +Hey back up, I'm not a chew toy! +Here boy! *whistles* +Aww I wanna pet him! + +CatNear +Meow! +Claws and teeth? Scary pet you have... +No, I'm not for scratching! +So cute! + +SkeletonNear +They say that monster is one of the undead. +What's that weird clunky noise? +I hear a bow being drawn... +Doot doot! + +ZombieNear +Smell something? +They say that monster is one of the undead. +I smell something. +Eww it's rotting! +Don't let that touch you, it looks diseased! + +CreeperNear +I smell gunpowder. +Smell something? +Handle with care. +I feel the presence of some kind of powder... +He has gunpowder. +I smell something. +What's up with its color? + +SpiderNear +*shudder* +Giant bugs? This is hell. +You should try riding that! +Too many legs... Yuck! +Kill it with fire! + +EndermanNear +He has long legs. You needed me to tell you that huh. +It has such thin arms. +Careful, he can dodge pretty well... Well, sometimes anyway. +Woah, where'd he come from? +Wow, he's huge. + +SilverfishNear +What's up with its color? +I hear scratching... +Ew what is that?! +Kill it with fire! + +BlazeNear +Blaze blaze bla bla blaze. Woah, Mr. Blaze. +Is that a demon? +I think that's a demon. +I hope you're fireproof. + +EnemyNear +What's he doing here? +Hey look, it's a %other%! +Look out! +Hey, shoo, stupid %other%. +I wonder what %other% tastes like... + +InsultZombie +Being undead bites. +He makes me puke. +Bet he'd taste nasty if we ate him. +Looks like a sickly little boy. +Looks a little sickly. +He looks like he'll die pretty soon with our without our help. +He must be rotten. +You reek man. +Yeeek... +There are alot of guys running around that look like him. + +InsultSkeleton +Calcium rich bones have such a nice pop when they break. +He looks pale. I wonder if something bad happened to him. +Wow that guy's pale. Get out on the beach or something dude. +He looks pale. I wonder if he has a glandular problem. +Ah, he doesn't look like much. Whups! Incoming! +Whoa, careful! You'll put somebody's eye out with that thing. +He's just a skeleton, but he has a bow. + +InsultCreeper +Woah! This guys gonna blow! +Get away from him before he pops... +That looks kinda like a pig, a creepy pig... +He looks a bit unstable... +Hehehe, what is that? + +InsultSpider +Don't make me get the bug spray! +Bugs are gross! Go away! +%player%, kill it with fire! + +InsultEnderman +Behind his benign face, lies evil intent of the most fearful kind... Aren't I dramatic? +I get an evil vibe off him. +I hate the way his mouth moves... + +InsultSilverfish +Bet he'd taste nasty if we ate him. +Ew, what is that? +Squish it! + +InsultWitch +I don't want to get an apple from her. +Just smash the potion throwing old bag! +This chick's gross. +Old lady power is endless... +You have something for if you get poisoned right? + +InsultBlaze +Away hellspawn! +The power of Steve compels you! +Got any holy water? Or any water really... + +InsultGhast +Crybaby! +Hit that fireball back at him! +Did you bring a ranged weapon? That would help right now. +Ew, it's got weird tentacles... + +InsultDragon +Ooo a Dragon... Rrrarrggh! +Steve's tip of the day. Lesson 1. Ender Dragon hides make awesome boots. +I used to imagine dragons were slender creatures. +Ohhh C-Cool... + +InsultPlayer +%other%... I heard that name somewhere before. +%other% has a great body! +%other%, %other%... Talk to me bud. Why do you challenge the supremacy of Steve? +He has the same name as the mayor of my village! +I wonder if %other% has no friends? Probably. +This guy's boring. +Bet he's got no friends. +Yup, he was adopted. +Don't waste your time with this guy %player%. +My weak point? Hmph. No such thing. +He should just chill himself, don't you think? +Let's settle it with speed! You can't beat the speed of a talking %tool%! +He thinks he's so cool with his sword. Loser. +He's strong. But he's not all that strong when you attack from a distance. +Whoa, careful! You'll put somebody's eye out with that thing. +His weapon is great, but he is meager. +There are alot of guys running around that look like him. +So he's still kickin' huh? + +InsultOther +Me shatter you like glass. +Wish I knew how to slowly lumber into oncoming fire. +He's lame. +He burnt me in my dream. Burn him back. For me! +Pretty much looks like a dork huh. +Airhead. +Leave it be, %player%. It obviously has no friends. +This guy's a putz... Did I just use that word? +Just off him already. +My name is STEVE! I own you. +Won't give up will he. +Get lost. Loser. +I hate this loser. +Annoying. +Oh! My buddy's calling! I gotta go. +How do we handle this one? +Looks stupid. +The weak point of this monster? I don't remember... +What me... lose to him!? Ha, good one! +Just because I'm a %tool%, doesn't mean I'm stupid. +Don't you think he's annoying? +Weak point? Uh, duh! Don't make me say it, please. +Hello my name is Steve. I own you, %other%. +Today's prediction. Pain! +I wonder how much I could sell that %other% for... +This guy doesn't hold back. +This guy's a clown. +He should try to learn from my exquisite sense of style. +My kung fu is stronger! +What? The weak point? You know it, right? It's not that I don't know it... +He'll get what's coming... Just wait. +Humph, this guy's a piece of cake. +This guy might fetch a high price! +Let's just take 'em out, pack 'em up and get outta here. +He's got a weird face. +Behave yourself %other%. +Finish him, %player%!! +Fight fire with fire, %player%. Not literally but you get what I mean. +He's pretty tough. Be careful. +Whoa! Are you fighting him? +Maybe he doesn't know he's made of paper. We have to tell him. +His weak point? Come on, you've gotta know it? + +Creation +My name is Steve! A pleasure. +My name is Steve! By the way, my sister's name is Stephanie. +And on the 6th day Steve created... +Zzz... Huh! Was I sleeping? +Today's fortune, you will meet someone new. It was great to meet you, %player%. +Hello my name is Steve. I own you. +In the village, everybody called me Steve, the busy bee. + +Other +I wonder sometimes, why do I have to be a %tool%? Why not some absurd fully automatic firearm? +My baby brother was such a brat... +By the way. How are ya doing? +Reminds me of last night. I had a dream of my dad... he was a catapult... +My hair is awesome!!! It takes forever in the morning but tell me it isn't worth it. +Waffle, waffle, waffle. +Why on earth can I talk? I'm a %tool%... +Do you understand, %player%, what it feels like to be a %tool%? +...Achoo! +I has a twin sister who I have been separated from for a long time... I wonder how she's doing. +My sister was totally cute. She was the belle of the village. +When I take a close look at you, %player% you look like my sister. +My pitiful attempts to be cool. Blasted playground! +Why didn't the cool kids play with me? +I like flan. +How'd I get my name...? I don't remember. +Don't you think my name is cool? +Yo. What is it like being human, %player%? Don't think it would work for me. A human %tool%... messy. +Sometimes, I remember my old days. I went through many hardships... +My jokes are getting stale... +Let me tell you my state of mind... I wanna be a human as quickly as possible. +Love is an immaculate beam of warm fuzzy energy. +Did you know that I am an excellent singer? A pro! +My dad would say, "A man should stand up in the headwind no matter what. +If I didn't have a torso, that would kinda bug me. +Last night, my late dad talked to me in a dream... I was so happy +Yesterday, I dreamt I was rich. +My ego is like a gas giant. Like Jupiter or, heh Uranus. +I know, I know... You're wondering how you might serve Steve better. +Fortune of the day. Beware of being boring. Oops, I gotta be careful. +Fortune of the day. It'll be a very happy day. Maybe. +I can sing and dance! I should be a performer. +I am a great dancer. I want to show you. +I wonder %player%, how old are you? +By the way, do you think I am handsome? +Don't you think it will look good on me if I dye my hair red? +Fortune of the day. The lucky item is a white handkerchief. -- cgit v1.2.3