From 0ef6a00aa79f022e5bd56b3f77e6861bbecf6d94 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Thu, 13 Aug 2015 21:12:11 +0100 Subject: Added a new structure, a new curse, achievements, challenges, curses entry in the guide; reworked liquids to be tile entities, cleaned the structures code, potion code and... you know what? I improved and changed so much stuff that I literally forgot what I did... --- .../assets/jewelrycraft2/textures/gui/guidePage.png | Bin 36869 -> 53305 bytes .../jewelrycraft2/textures/gui/guidePageFlip.png | Bin 34450 -> 53941 bytes .../assets/jewelrycraft2/textures/gui/hearts.png | Bin 4790 -> 4897 bytes .../textures/gui/jewelrycraft2_curses_0.png | Bin 8129 -> 9703 bytes .../assets/jewelrycraft2/textures/items/guide.png | Bin 316 -> 337 bytes .../jewelrycraft2/textures/items/shadow_axe.png | Bin 267 -> 0 bytes .../jewelrycraft2/textures/items/shadow_boots.png | Bin 251 -> 0 bytes .../textures/items/shadow_chestplate.png | Bin 273 -> 0 bytes .../jewelrycraft2/textures/items/shadow_helmet.png | Bin 237 -> 0 bytes .../jewelrycraft2/textures/items/shadow_hoe.png | Bin 241 -> 0 bytes .../textures/items/shadow_leggings.png | Bin 235 -> 0 bytes .../jewelrycraft2/textures/items/shadow_pickaxe.png | Bin 286 -> 0 bytes .../jewelrycraft2/textures/items/testItem_0.png | Bin 0 -> 371 bytes .../jewelrycraft2/textures/items/testItem_1.png | Bin 0 -> 509 bytes .../jewelrycraft2/textures/items/testItem_10.png | Bin 0 -> 327 bytes .../jewelrycraft2/textures/items/testItem_11.png | Bin 0 -> 282 bytes .../jewelrycraft2/textures/items/testItem_12.png | Bin 0 -> 416 bytes .../jewelrycraft2/textures/items/testItem_2.png | Bin 0 -> 567 bytes .../jewelrycraft2/textures/items/testItem_3.png | Bin 0 -> 496 bytes .../jewelrycraft2/textures/items/testItem_4.png | Bin 0 -> 579 bytes .../jewelrycraft2/textures/items/testItem_5.png | Bin 0 -> 475 bytes .../jewelrycraft2/textures/items/testItem_6.png | Bin 0 -> 1231 bytes .../jewelrycraft2/textures/items/testItem_7.png | Bin 0 -> 399 bytes .../jewelrycraft2/textures/items/testItem_8.png | Bin 0 -> 500 bytes .../jewelrycraft2/textures/items/testItem_9.png | Bin 0 -> 439 bytes .../textures/items/unused/shadow_axe.png | Bin 0 -> 267 bytes .../textures/items/unused/shadow_boots.png | Bin 0 -> 251 bytes .../textures/items/unused/shadow_chestplate.png | Bin 0 -> 273 bytes .../textures/items/unused/shadow_helmet.png | Bin 0 -> 237 bytes .../textures/items/unused/shadow_hoe.png | Bin 0 -> 241 bytes .../textures/items/unused/shadow_leggings.png | Bin 0 -> 235 bytes .../textures/items/unused/shadow_pickaxe.png | Bin 0 -> 286 bytes 32 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/shadow_axe.png delete mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/shadow_boots.png delete mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/shadow_chestplate.png delete mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/shadow_helmet.png delete mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/shadow_hoe.png delete mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/shadow_leggings.png delete mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/shadow_pickaxe.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_0.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_1.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_10.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_11.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_12.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_2.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_3.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_4.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_5.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_6.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_7.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_8.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/testItem_9.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_axe.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_boots.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_chestplate.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_helmet.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_hoe.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_leggings.png create mode 100644 src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_pickaxe.png (limited to 'src/main/resources/assets/jewelrycraft2/textures') diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/guidePage.png b/src/main/resources/assets/jewelrycraft2/textures/gui/guidePage.png index 7387be5..f715b17 100644 Binary files a/src/main/resources/assets/jewelrycraft2/textures/gui/guidePage.png and b/src/main/resources/assets/jewelrycraft2/textures/gui/guidePage.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/guidePageFlip.png b/src/main/resources/assets/jewelrycraft2/textures/gui/guidePageFlip.png index 92f2705..7d7845d 100644 Binary files a/src/main/resources/assets/jewelrycraft2/textures/gui/guidePageFlip.png and b/src/main/resources/assets/jewelrycraft2/textures/gui/guidePageFlip.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png b/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png index 4238307..e9dc99d 100644 Binary files a/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png and b/src/main/resources/assets/jewelrycraft2/textures/gui/hearts.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/gui/jewelrycraft2_curses_0.png b/src/main/resources/assets/jewelrycraft2/textures/gui/jewelrycraft2_curses_0.png index 27a9592..ad4f35a 100644 Binary files a/src/main/resources/assets/jewelrycraft2/textures/gui/jewelrycraft2_curses_0.png and b/src/main/resources/assets/jewelrycraft2/textures/gui/jewelrycraft2_curses_0.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/guide.png b/src/main/resources/assets/jewelrycraft2/textures/items/guide.png index c015875..8d6eb02 100644 Binary files a/src/main/resources/assets/jewelrycraft2/textures/items/guide.png and b/src/main/resources/assets/jewelrycraft2/textures/items/guide.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_axe.png b/src/main/resources/assets/jewelrycraft2/textures/items/shadow_axe.png deleted file mode 100644 index d17f67a..0000000 Binary files a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_axe.png and /dev/null differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_boots.png b/src/main/resources/assets/jewelrycraft2/textures/items/shadow_boots.png deleted file mode 100644 index 9c88a3b..0000000 Binary files a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_boots.png and /dev/null differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_chestplate.png b/src/main/resources/assets/jewelrycraft2/textures/items/shadow_chestplate.png deleted file mode 100644 index 9d4a336..0000000 Binary files a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_chestplate.png and /dev/null differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_helmet.png b/src/main/resources/assets/jewelrycraft2/textures/items/shadow_helmet.png deleted file mode 100644 index 97e1541..0000000 Binary files a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_helmet.png and /dev/null differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_hoe.png b/src/main/resources/assets/jewelrycraft2/textures/items/shadow_hoe.png deleted file mode 100644 index 5e0df11..0000000 Binary files a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_hoe.png and /dev/null differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_leggings.png b/src/main/resources/assets/jewelrycraft2/textures/items/shadow_leggings.png deleted file mode 100644 index 65f5117..0000000 Binary files a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_leggings.png and /dev/null differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_pickaxe.png b/src/main/resources/assets/jewelrycraft2/textures/items/shadow_pickaxe.png deleted file mode 100644 index 95c5394..0000000 Binary files a/src/main/resources/assets/jewelrycraft2/textures/items/shadow_pickaxe.png and /dev/null differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_0.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_0.png new file mode 100644 index 0000000..b697488 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_0.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_1.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_1.png new file mode 100644 index 0000000..e685e40 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_1.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_10.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_10.png new file mode 100644 index 0000000..8a2cc52 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_10.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_11.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_11.png new file mode 100644 index 0000000..91a2869 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_11.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_12.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_12.png new file mode 100644 index 0000000..6e2360c Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_12.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_2.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_2.png new file mode 100644 index 0000000..32a0cfb Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_2.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_3.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_3.png new file mode 100644 index 0000000..75141a5 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_3.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_4.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_4.png new file mode 100644 index 0000000..ee2a582 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_4.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_5.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_5.png new file mode 100644 index 0000000..c011c21 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_5.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_6.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_6.png new file mode 100644 index 0000000..5c145ff Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_6.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_7.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_7.png new file mode 100644 index 0000000..833e7d6 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_7.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_8.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_8.png new file mode 100644 index 0000000..d3bc0af Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_8.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/testItem_9.png b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_9.png new file mode 100644 index 0000000..1b3193f Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/testItem_9.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_axe.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_axe.png new file mode 100644 index 0000000..d17f67a Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_axe.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_boots.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_boots.png new file mode 100644 index 0000000..9c88a3b Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_boots.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_chestplate.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_chestplate.png new file mode 100644 index 0000000..9d4a336 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_chestplate.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_helmet.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_helmet.png new file mode 100644 index 0000000..97e1541 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_helmet.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_hoe.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_hoe.png new file mode 100644 index 0000000..5e0df11 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_hoe.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_leggings.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_leggings.png new file mode 100644 index 0000000..65f5117 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_leggings.png differ diff --git a/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_pickaxe.png b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_pickaxe.png new file mode 100644 index 0000000..95c5394 Binary files /dev/null and b/src/main/resources/assets/jewelrycraft2/textures/items/unused/shadow_pickaxe.png differ -- cgit v1.2.3