diff --git a/client/src/main/resources/textures/blocks/soul_warts_0.png b/client/src/main/resources/textures/blocks/soul_grass_0.png similarity index 100% rename from client/src/main/resources/textures/blocks/soul_warts_0.png rename to client/src/main/resources/textures/blocks/soul_grass_0.png diff --git a/client/src/main/resources/textures/blocks/soul_warts_1.png b/client/src/main/resources/textures/blocks/soul_grass_1.png similarity index 100% rename from client/src/main/resources/textures/blocks/soul_warts_1.png rename to client/src/main/resources/textures/blocks/soul_grass_1.png diff --git a/client/src/main/resources/textures/blocks/soul_warts_2.png b/client/src/main/resources/textures/blocks/soul_grass_2.png similarity index 100% rename from client/src/main/resources/textures/blocks/soul_warts_2.png rename to client/src/main/resources/textures/blocks/soul_grass_2.png diff --git a/client/src/main/resources/textures/busy/dye/cactus_green.png b/client/src/main/resources/textures/busy/dye/cactus_green.png deleted file mode 100755 index 009e0587..00000000 Binary files a/client/src/main/resources/textures/busy/dye/cactus_green.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/dye/orange_dye.png b/client/src/main/resources/textures/busy/dye/orange_dye.png deleted file mode 100755 index 1cc564f4..00000000 Binary files a/client/src/main/resources/textures/busy/dye/orange_dye.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/dye/red_dye.png b/client/src/main/resources/textures/busy/dye/red_dye.png deleted file mode 100755 index 2d1a7429..00000000 Binary files a/client/src/main/resources/textures/busy/dye/red_dye.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/dye/yellow_dye.png b/client/src/main/resources/textures/busy/dye/yellow_dye.png deleted file mode 100755 index 95e06731..00000000 Binary files a/client/src/main/resources/textures/busy/dye/yellow_dye.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/fluid/bucket.png b/client/src/main/resources/textures/busy/fluid/bucket.png deleted file mode 100755 index f8e53692..00000000 Binary files a/client/src/main/resources/textures/busy/fluid/bucket.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/fluid/lava_bucket.png b/client/src/main/resources/textures/busy/fluid/lava_bucket.png deleted file mode 100755 index 13a19570..00000000 Binary files a/client/src/main/resources/textures/busy/fluid/lava_bucket.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/fluid/milk_bucket.png b/client/src/main/resources/textures/busy/fluid/milk_bucket.png deleted file mode 100755 index c77d92c5..00000000 Binary files a/client/src/main/resources/textures/busy/fluid/milk_bucket.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/fluid/water_bucket.png b/client/src/main/resources/textures/busy/fluid/water_bucket.png deleted file mode 100755 index 2f36accb..00000000 Binary files a/client/src/main/resources/textures/busy/fluid/water_bucket.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/apple.png b/client/src/main/resources/textures/busy/it/apple.png deleted file mode 100755 index 6f908bb6..00000000 Binary files a/client/src/main/resources/textures/busy/it/apple.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/baked_potato.png b/client/src/main/resources/textures/busy/it/baked_potato.png deleted file mode 100755 index e4d765b1..00000000 Binary files a/client/src/main/resources/textures/busy/it/baked_potato.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/beef.png b/client/src/main/resources/textures/busy/it/beef.png deleted file mode 100755 index c9ab891f..00000000 Binary files a/client/src/main/resources/textures/busy/it/beef.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/bread.png b/client/src/main/resources/textures/busy/it/bread.png deleted file mode 100755 index 5a28f149..00000000 Binary files a/client/src/main/resources/textures/busy/it/bread.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/carrot.png b/client/src/main/resources/textures/busy/it/carrot.png deleted file mode 100755 index 2d08aab9..00000000 Binary files a/client/src/main/resources/textures/busy/it/carrot.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/chicken.png b/client/src/main/resources/textures/busy/it/chicken.png deleted file mode 100755 index 6d259224..00000000 Binary files a/client/src/main/resources/textures/busy/it/chicken.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/cod.png b/client/src/main/resources/textures/busy/it/cod.png deleted file mode 100755 index 32996bf5..00000000 Binary files a/client/src/main/resources/textures/busy/it/cod.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/cooked_beef.png b/client/src/main/resources/textures/busy/it/cooked_beef.png deleted file mode 100755 index 2df9bbf0..00000000 Binary files a/client/src/main/resources/textures/busy/it/cooked_beef.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/cooked_chicken.png b/client/src/main/resources/textures/busy/it/cooked_chicken.png deleted file mode 100755 index 890b5b3f..00000000 Binary files a/client/src/main/resources/textures/busy/it/cooked_chicken.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/cooked_cod.png b/client/src/main/resources/textures/busy/it/cooked_cod.png deleted file mode 100755 index 87564c70..00000000 Binary files a/client/src/main/resources/textures/busy/it/cooked_cod.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/cooked_porkchop.png b/client/src/main/resources/textures/busy/it/cooked_porkchop.png deleted file mode 100755 index 605d3f50..00000000 Binary files a/client/src/main/resources/textures/busy/it/cooked_porkchop.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/cooked_salmon.png b/client/src/main/resources/textures/busy/it/cooked_salmon.png deleted file mode 100755 index fb765ed7..00000000 Binary files a/client/src/main/resources/textures/busy/it/cooked_salmon.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/cookie.png b/client/src/main/resources/textures/busy/it/cookie.png deleted file mode 100755 index 01fe56b1..00000000 Binary files a/client/src/main/resources/textures/busy/it/cookie.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/golden_apple.png b/client/src/main/resources/textures/busy/it/golden_apple.png deleted file mode 100755 index 62019898..00000000 Binary files a/client/src/main/resources/textures/busy/it/golden_apple.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/golden_carrot.png b/client/src/main/resources/textures/busy/it/golden_carrot.png deleted file mode 100755 index e0f1ea62..00000000 Binary files a/client/src/main/resources/textures/busy/it/golden_carrot.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/melon.png b/client/src/main/resources/textures/busy/it/melon.png deleted file mode 100755 index 590f47a2..00000000 Binary files a/client/src/main/resources/textures/busy/it/melon.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/melon_seed.png b/client/src/main/resources/textures/busy/it/melon_seed.png deleted file mode 100755 index ef84499c..00000000 Binary files a/client/src/main/resources/textures/busy/it/melon_seed.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/poisonous_potato.png b/client/src/main/resources/textures/busy/it/poisonous_potato.png deleted file mode 100755 index 6f154afa..00000000 Binary files a/client/src/main/resources/textures/busy/it/poisonous_potato.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/porkchop.png b/client/src/main/resources/textures/busy/it/porkchop.png deleted file mode 100755 index 7e83c1ad..00000000 Binary files a/client/src/main/resources/textures/busy/it/porkchop.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/potato.png b/client/src/main/resources/textures/busy/it/potato.png deleted file mode 100755 index c1d8541e..00000000 Binary files a/client/src/main/resources/textures/busy/it/potato.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/pumpkin_seed.png b/client/src/main/resources/textures/busy/it/pumpkin_seed.png deleted file mode 100755 index 8d8f0761..00000000 Binary files a/client/src/main/resources/textures/busy/it/pumpkin_seed.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/salmon.png b/client/src/main/resources/textures/busy/it/salmon.png deleted file mode 100755 index 68bcd697..00000000 Binary files a/client/src/main/resources/textures/busy/it/salmon.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/soul_wart.png b/client/src/main/resources/textures/busy/it/soul_wart.png deleted file mode 100755 index 09da1e33..00000000 Binary files a/client/src/main/resources/textures/busy/it/soul_wart.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/wheat.png b/client/src/main/resources/textures/busy/it/wheat.png deleted file mode 100755 index bbd2fd9d..00000000 Binary files a/client/src/main/resources/textures/busy/it/wheat.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/it/wheat_seed.png b/client/src/main/resources/textures/busy/it/wheat_seed.png deleted file mode 100755 index 83d23a6e..00000000 Binary files a/client/src/main/resources/textures/busy/it/wheat_seed.png and /dev/null differ diff --git a/client/src/main/resources/textures/busy/carrot_on_a_stick.png b/client/src/main/resources/textures/busy/whip.png similarity index 100% rename from client/src/main/resources/textures/busy/carrot_on_a_stick.png rename to client/src/main/resources/textures/busy/whip.png diff --git a/client/src/main/resources/textures/busy/fluid/acid_bucket.png b/client/src/main/resources/textures/items/acid.png similarity index 57% rename from client/src/main/resources/textures/busy/fluid/acid_bucket.png rename to client/src/main/resources/textures/items/acid.png index b1937787..83c9309d 100755 Binary files a/client/src/main/resources/textures/busy/fluid/acid_bucket.png and b/client/src/main/resources/textures/items/acid.png differ diff --git a/client/src/main/resources/textures/items/apple.png b/client/src/main/resources/textures/items/apple.png new file mode 100755 index 00000000..2427ca4e Binary files /dev/null and b/client/src/main/resources/textures/items/apple.png differ diff --git a/client/src/main/resources/textures/items/beef.png b/client/src/main/resources/textures/items/beef.png new file mode 100755 index 00000000..db5189fe Binary files /dev/null and b/client/src/main/resources/textures/items/beef.png differ diff --git a/client/src/main/resources/textures/busy/fluid/blood_bucket.png b/client/src/main/resources/textures/items/blood.png similarity index 55% rename from client/src/main/resources/textures/busy/fluid/blood_bucket.png rename to client/src/main/resources/textures/items/blood.png index 793c5bc8..8fe3a086 100755 Binary files a/client/src/main/resources/textures/busy/fluid/blood_bucket.png and b/client/src/main/resources/textures/items/blood.png differ diff --git a/client/src/main/resources/textures/items/boat.png b/client/src/main/resources/textures/items/boat.png index f9b457bd..4a74aee4 100755 Binary files a/client/src/main/resources/textures/items/boat.png and b/client/src/main/resources/textures/items/boat.png differ diff --git a/client/src/main/resources/textures/items/bread.png b/client/src/main/resources/textures/items/bread.png new file mode 100755 index 00000000..f1723ab6 Binary files /dev/null and b/client/src/main/resources/textures/items/bread.png differ diff --git a/client/src/main/resources/textures/items/bucket.png b/client/src/main/resources/textures/items/bucket.png new file mode 100755 index 00000000..6b79d529 Binary files /dev/null and b/client/src/main/resources/textures/items/bucket.png differ diff --git a/client/src/main/resources/textures/items/carrot.png b/client/src/main/resources/textures/items/carrot.png new file mode 100755 index 00000000..971663b3 Binary files /dev/null and b/client/src/main/resources/textures/items/carrot.png differ diff --git a/client/src/main/resources/textures/busy/it/charged_apple.png b/client/src/main/resources/textures/items/charged_apple.png similarity index 61% rename from client/src/main/resources/textures/busy/it/charged_apple.png rename to client/src/main/resources/textures/items/charged_apple.png index 8dc6dfed..210f2415 100755 Binary files a/client/src/main/resources/textures/busy/it/charged_apple.png and b/client/src/main/resources/textures/items/charged_apple.png differ diff --git a/client/src/main/resources/textures/items/chicken.png b/client/src/main/resources/textures/items/chicken.png new file mode 100755 index 00000000..2cb95cd3 Binary files /dev/null and b/client/src/main/resources/textures/items/chicken.png differ diff --git a/client/src/main/resources/textures/items/cod.png b/client/src/main/resources/textures/items/cod.png new file mode 100755 index 00000000..7ff69baa Binary files /dev/null and b/client/src/main/resources/textures/items/cod.png differ diff --git a/client/src/main/resources/textures/items/cooked_beef.png b/client/src/main/resources/textures/items/cooked_beef.png new file mode 100755 index 00000000..9763999b Binary files /dev/null and b/client/src/main/resources/textures/items/cooked_beef.png differ diff --git a/client/src/main/resources/textures/items/cooked_chicken.png b/client/src/main/resources/textures/items/cooked_chicken.png new file mode 100755 index 00000000..03c5efd0 Binary files /dev/null and b/client/src/main/resources/textures/items/cooked_chicken.png differ diff --git a/client/src/main/resources/textures/items/cooked_cod.png b/client/src/main/resources/textures/items/cooked_cod.png new file mode 100755 index 00000000..bf0892f1 Binary files /dev/null and b/client/src/main/resources/textures/items/cooked_cod.png differ diff --git a/client/src/main/resources/textures/items/cooked_porkchop.png b/client/src/main/resources/textures/items/cooked_porkchop.png new file mode 100755 index 00000000..75b3ffcb Binary files /dev/null and b/client/src/main/resources/textures/items/cooked_porkchop.png differ diff --git a/client/src/main/resources/textures/items/cooked_salmon.png b/client/src/main/resources/textures/items/cooked_salmon.png new file mode 100755 index 00000000..eb44676f Binary files /dev/null and b/client/src/main/resources/textures/items/cooked_salmon.png differ diff --git a/client/src/main/resources/textures/items/cookie.png b/client/src/main/resources/textures/items/cookie.png new file mode 100755 index 00000000..f41bcb2e Binary files /dev/null and b/client/src/main/resources/textures/items/cookie.png differ diff --git a/client/src/main/resources/textures/busy/dye/cyan_dye.png b/client/src/main/resources/textures/items/cyan_dye.png similarity index 54% rename from client/src/main/resources/textures/busy/dye/cyan_dye.png rename to client/src/main/resources/textures/items/cyan_dye.png index 901c1a62..924d399d 100755 Binary files a/client/src/main/resources/textures/busy/dye/cyan_dye.png and b/client/src/main/resources/textures/items/cyan_dye.png differ diff --git a/client/src/main/resources/textures/items/exterminator.png b/client/src/main/resources/textures/items/exterminator.png index 62919a98..dffa95f9 100755 Binary files a/client/src/main/resources/textures/items/exterminator.png and b/client/src/main/resources/textures/items/exterminator.png differ diff --git a/client/src/main/resources/textures/items/golden_apple.png b/client/src/main/resources/textures/items/golden_apple.png new file mode 100755 index 00000000..c8c052a6 Binary files /dev/null and b/client/src/main/resources/textures/items/golden_apple.png differ diff --git a/client/src/main/resources/textures/busy/fluid/goo_bucket.png b/client/src/main/resources/textures/items/goo.png similarity index 59% rename from client/src/main/resources/textures/busy/fluid/goo_bucket.png rename to client/src/main/resources/textures/items/goo.png index a67246c4..42fc3427 100755 Binary files a/client/src/main/resources/textures/busy/fluid/goo_bucket.png and b/client/src/main/resources/textures/items/goo.png differ diff --git a/client/src/main/resources/textures/busy/dye/gray_dye.png b/client/src/main/resources/textures/items/gray_dye.png similarity index 56% rename from client/src/main/resources/textures/busy/dye/gray_dye.png rename to client/src/main/resources/textures/items/gray_dye.png index 38dc3cc6..24921c82 100755 Binary files a/client/src/main/resources/textures/busy/dye/gray_dye.png and b/client/src/main/resources/textures/items/gray_dye.png differ diff --git a/client/src/main/resources/textures/items/green_dye.png b/client/src/main/resources/textures/items/green_dye.png new file mode 100755 index 00000000..eecd002c Binary files /dev/null and b/client/src/main/resources/textures/items/green_dye.png differ diff --git a/client/src/main/resources/textures/busy/fluid/hydrogen_bucket.png b/client/src/main/resources/textures/items/hydrogen.png similarity index 58% rename from client/src/main/resources/textures/busy/fluid/hydrogen_bucket.png rename to client/src/main/resources/textures/items/hydrogen.png index cba76419..84ebc219 100755 Binary files a/client/src/main/resources/textures/busy/fluid/hydrogen_bucket.png and b/client/src/main/resources/textures/items/hydrogen.png differ diff --git a/client/src/main/resources/textures/items/lava.png b/client/src/main/resources/textures/items/lava.png new file mode 100755 index 00000000..370f230d Binary files /dev/null and b/client/src/main/resources/textures/items/lava.png differ diff --git a/client/src/main/resources/textures/busy/dye/light_blue_dye.png b/client/src/main/resources/textures/items/light_blue_dye.png similarity index 55% rename from client/src/main/resources/textures/busy/dye/light_blue_dye.png rename to client/src/main/resources/textures/items/light_blue_dye.png index ef58a5f6..acf8b4b3 100755 Binary files a/client/src/main/resources/textures/busy/dye/light_blue_dye.png and b/client/src/main/resources/textures/items/light_blue_dye.png differ diff --git a/client/src/main/resources/textures/busy/dye/lime_dye.png b/client/src/main/resources/textures/items/lime_dye.png similarity index 55% rename from client/src/main/resources/textures/busy/dye/lime_dye.png rename to client/src/main/resources/textures/items/lime_dye.png index c7c91f97..1bc92269 100755 Binary files a/client/src/main/resources/textures/busy/dye/lime_dye.png and b/client/src/main/resources/textures/items/lime_dye.png differ diff --git a/client/src/main/resources/textures/busy/dye/magenta_dye.png b/client/src/main/resources/textures/items/magenta_dye.png similarity index 55% rename from client/src/main/resources/textures/busy/dye/magenta_dye.png rename to client/src/main/resources/textures/items/magenta_dye.png index fbf9f648..1a358245 100755 Binary files a/client/src/main/resources/textures/busy/dye/magenta_dye.png and b/client/src/main/resources/textures/items/magenta_dye.png differ diff --git a/client/src/main/resources/textures/busy/fluid/magma_bucket.png b/client/src/main/resources/textures/items/magma.png similarity index 53% rename from client/src/main/resources/textures/busy/fluid/magma_bucket.png rename to client/src/main/resources/textures/items/magma.png index dc76d265..8313c8ac 100755 Binary files a/client/src/main/resources/textures/busy/fluid/magma_bucket.png and b/client/src/main/resources/textures/items/magma.png differ diff --git a/client/src/main/resources/textures/items/melon.png b/client/src/main/resources/textures/items/melon.png new file mode 100755 index 00000000..af874fbd Binary files /dev/null and b/client/src/main/resources/textures/items/melon.png differ diff --git a/client/src/main/resources/textures/items/melon_seed.png b/client/src/main/resources/textures/items/melon_seed.png new file mode 100755 index 00000000..706ee795 Binary files /dev/null and b/client/src/main/resources/textures/items/melon_seed.png differ diff --git a/client/src/main/resources/textures/busy/fluid/mercury_bucket.png b/client/src/main/resources/textures/items/mercury.png similarity index 55% rename from client/src/main/resources/textures/busy/fluid/mercury_bucket.png rename to client/src/main/resources/textures/items/mercury.png index 084003b9..b1f163a2 100755 Binary files a/client/src/main/resources/textures/busy/fluid/mercury_bucket.png and b/client/src/main/resources/textures/items/mercury.png differ diff --git a/client/src/main/resources/textures/items/milk.png b/client/src/main/resources/textures/items/milk.png new file mode 100755 index 00000000..e560fb92 Binary files /dev/null and b/client/src/main/resources/textures/items/milk.png differ diff --git a/client/src/main/resources/textures/items/navigator.png b/client/src/main/resources/textures/items/navigator.png index 6281123a..69ae1cf7 100755 Binary files a/client/src/main/resources/textures/items/navigator.png and b/client/src/main/resources/textures/items/navigator.png differ diff --git a/client/src/main/resources/textures/busy/fluid/nukage_bucket.png b/client/src/main/resources/textures/items/nukage.png similarity index 58% rename from client/src/main/resources/textures/busy/fluid/nukage_bucket.png rename to client/src/main/resources/textures/items/nukage.png index 6825ae78..bf0b6fef 100755 Binary files a/client/src/main/resources/textures/busy/fluid/nukage_bucket.png and b/client/src/main/resources/textures/items/nukage.png differ diff --git a/client/src/main/resources/textures/items/orange_dye.png b/client/src/main/resources/textures/items/orange_dye.png new file mode 100755 index 00000000..82c6c1be Binary files /dev/null and b/client/src/main/resources/textures/items/orange_dye.png differ diff --git a/client/src/main/resources/textures/busy/dye/pink_dye.png b/client/src/main/resources/textures/items/pink_dye.png similarity index 55% rename from client/src/main/resources/textures/busy/dye/pink_dye.png rename to client/src/main/resources/textures/items/pink_dye.png index a82bb54a..dc3f2239 100755 Binary files a/client/src/main/resources/textures/busy/dye/pink_dye.png and b/client/src/main/resources/textures/items/pink_dye.png differ diff --git a/client/src/main/resources/textures/busy/fluid/plasma_bucket.png b/client/src/main/resources/textures/items/plasma.png similarity index 63% rename from client/src/main/resources/textures/busy/fluid/plasma_bucket.png rename to client/src/main/resources/textures/items/plasma.png index 7cad0557..300b46f6 100755 Binary files a/client/src/main/resources/textures/busy/fluid/plasma_bucket.png and b/client/src/main/resources/textures/items/plasma.png differ diff --git a/client/src/main/resources/textures/items/porkchop.png b/client/src/main/resources/textures/items/porkchop.png new file mode 100755 index 00000000..54427dee Binary files /dev/null and b/client/src/main/resources/textures/items/porkchop.png differ diff --git a/client/src/main/resources/textures/items/potato.png b/client/src/main/resources/textures/items/potato.png new file mode 100755 index 00000000..f6451556 Binary files /dev/null and b/client/src/main/resources/textures/items/potato.png differ diff --git a/client/src/main/resources/textures/items/pumpkin_seed.png b/client/src/main/resources/textures/items/pumpkin_seed.png new file mode 100755 index 00000000..a4c86683 Binary files /dev/null and b/client/src/main/resources/textures/items/pumpkin_seed.png differ diff --git a/client/src/main/resources/textures/busy/dye/purple_dye.png b/client/src/main/resources/textures/items/purple_dye.png similarity index 56% rename from client/src/main/resources/textures/busy/dye/purple_dye.png rename to client/src/main/resources/textures/items/purple_dye.png index ebe58dc9..d8119ca3 100755 Binary files a/client/src/main/resources/textures/busy/dye/purple_dye.png and b/client/src/main/resources/textures/items/purple_dye.png differ diff --git a/client/src/main/resources/textures/items/red_dye.png b/client/src/main/resources/textures/items/red_dye.png new file mode 100755 index 00000000..34a3b598 Binary files /dev/null and b/client/src/main/resources/textures/items/red_dye.png differ diff --git a/client/src/main/resources/textures/items/salmon.png b/client/src/main/resources/textures/items/salmon.png new file mode 100755 index 00000000..78e44175 Binary files /dev/null and b/client/src/main/resources/textures/items/salmon.png differ diff --git a/client/src/main/resources/textures/items/scanner.png b/client/src/main/resources/textures/items/scanner.png index d816f5f8..c4a3b50c 100755 Binary files a/client/src/main/resources/textures/items/scanner.png and b/client/src/main/resources/textures/items/scanner.png differ diff --git a/client/src/main/resources/textures/busy/dye/silver_dye.png b/client/src/main/resources/textures/items/silver_dye.png similarity index 55% rename from client/src/main/resources/textures/busy/dye/silver_dye.png rename to client/src/main/resources/textures/items/silver_dye.png index d08f3999..a001151f 100755 Binary files a/client/src/main/resources/textures/busy/dye/silver_dye.png and b/client/src/main/resources/textures/items/silver_dye.png differ diff --git a/client/src/main/resources/textures/busy/fluid/slime_bucket.png b/client/src/main/resources/textures/items/slime.png similarity index 57% rename from client/src/main/resources/textures/busy/fluid/slime_bucket.png rename to client/src/main/resources/textures/items/slime.png index a57c6c24..2935404c 100755 Binary files a/client/src/main/resources/textures/busy/fluid/slime_bucket.png and b/client/src/main/resources/textures/items/slime.png differ diff --git a/client/src/main/resources/textures/items/soul_seed.png b/client/src/main/resources/textures/items/soul_seed.png new file mode 100755 index 00000000..aebbb8ef Binary files /dev/null and b/client/src/main/resources/textures/items/soul_seed.png differ diff --git a/client/src/main/resources/textures/busy/fluid/spring_water_bucket.png b/client/src/main/resources/textures/items/spring_water.png similarity index 59% rename from client/src/main/resources/textures/busy/fluid/spring_water_bucket.png rename to client/src/main/resources/textures/items/spring_water.png index 75e03828..d5ec903c 100755 Binary files a/client/src/main/resources/textures/busy/fluid/spring_water_bucket.png and b/client/src/main/resources/textures/items/spring_water.png differ diff --git a/client/src/main/resources/textures/busy/fluid/swamp_water_bucket.png b/client/src/main/resources/textures/items/swamp_water.png similarity index 61% rename from client/src/main/resources/textures/busy/fluid/swamp_water_bucket.png rename to client/src/main/resources/textures/items/swamp_water.png index a8a81349..69ec89ec 100755 Binary files a/client/src/main/resources/textures/busy/fluid/swamp_water_bucket.png and b/client/src/main/resources/textures/items/swamp_water.png differ diff --git a/client/src/main/resources/textures/items/water.png b/client/src/main/resources/textures/items/water.png new file mode 100755 index 00000000..19267c27 Binary files /dev/null and b/client/src/main/resources/textures/items/water.png differ diff --git a/client/src/main/resources/textures/items/wheat.png b/client/src/main/resources/textures/items/wheat.png new file mode 100755 index 00000000..1da242ec Binary files /dev/null and b/client/src/main/resources/textures/items/wheat.png differ diff --git a/client/src/main/resources/textures/items/wheat_seed.png b/client/src/main/resources/textures/items/wheat_seed.png new file mode 100755 index 00000000..3ba07b1a Binary files /dev/null and b/client/src/main/resources/textures/items/wheat_seed.png differ diff --git a/client/src/main/resources/textures/items/yellow_dye.png b/client/src/main/resources/textures/items/yellow_dye.png new file mode 100755 index 00000000..caf2c9f9 Binary files /dev/null and b/client/src/main/resources/textures/items/yellow_dye.png differ diff --git a/common/src/main/java/common/ai/EntityAIControlledByPlayer.java b/common/src/main/java/common/ai/EntityAIControlledByPlayer.java index 0cab2f9f..1bc21b78 100755 --- a/common/src/main/java/common/ai/EntityAIControlledByPlayer.java +++ b/common/src/main/java/common/ai/EntityAIControlledByPlayer.java @@ -174,16 +174,9 @@ public class EntityAIControlledByPlayer extends EntityAIBase { ItemStack itemstack = entityplayer.getHeldItem(); - if (itemstack != null && itemstack.getItem() == Items.carrot_on_a_stick) + if (itemstack != null && itemstack.getItem() == Items.whip) { itemstack.damage(1, entityplayer); - - if (itemstack.isEmpty()) - { - ItemStack itemstack1 = new ItemStack(Items.fishing_rod); - itemstack1.copyData(itemstack); - entityplayer.inventory.mainInventory[entityplayer.inventory.currentItem] = itemstack1; - } } } diff --git a/common/src/main/java/common/block/foliage/BlockPotato.java b/common/src/main/java/common/block/foliage/BlockPotato.java index 1a71a608..decbb579 100755 --- a/common/src/main/java/common/block/foliage/BlockPotato.java +++ b/common/src/main/java/common/block/foliage/BlockPotato.java @@ -31,7 +31,7 @@ public class BlockPotato extends BlockCrops { if (((Integer)state.getValue(AGE)).intValue() >= 7 && worldIn.rand.chance(50)) { - dropItem(worldIn, pos, new ItemStack(Items.poisonous_potato)); + dropItem(worldIn, pos, new ItemStack(Items.stick)); } } } diff --git a/common/src/main/java/common/block/foliage/BlockWart.java b/common/src/main/java/common/block/foliage/BlockWart.java index 69881bc4..16da0f81 100755 --- a/common/src/main/java/common/block/foliage/BlockWart.java +++ b/common/src/main/java/common/block/foliage/BlockWart.java @@ -80,7 +80,7 @@ public class BlockWart extends BlockBush for (int j = 0; j < i; ++j) { - dropItem(worldIn, pos, new ItemStack(Items.soul_wart)); + dropItem(worldIn, pos, new ItemStack(Items.soul_seed)); } } } diff --git a/common/src/main/java/common/color/DyeColor.java b/common/src/main/java/common/color/DyeColor.java index a2a9630b..3e742cd0 100755 --- a/common/src/main/java/common/color/DyeColor.java +++ b/common/src/main/java/common/color/DyeColor.java @@ -20,7 +20,7 @@ public enum DyeColor implements Identifyable, Displayable { PURPLE("purple", "Violett", "Violettes", "Violetter", "Violette", null, "Violetter Farbstoff", 8339378, TextColor.DMAGENTA), BLUE("blue", "Blau", "Blaues", "Blauer", "Blaue", "lapis_lazuli", "Lapislazuli", 3361970, TextColor.MIDNIGHT), BROWN("brown", "Braun", "Braunes", "Brauner", "Braune", "cocoa_powder", "Gemahlene Kakaobohnen", 6704179, TextColor.BROWN), - GREEN("green", "Grün", "Grünes", "Grüner", "Grüne", "cactus_green", "Kaktusgrün", 6717235, TextColor.DGREEN), + GREEN("green", "Grün", "Grünes", "Grüner", "Grüne", null, "Kaktusgrün", 6717235, TextColor.DGREEN), RED("red", "Rot", "Rotes", "Roter", "Rote", null, "Roter Farbstoff", 10040115, TextColor.DRED), BLACK("black", "Schwarz", "Schwarzes", "Schwarzer", "Schwarze", "ink_sack", "Tintenbeutel", 1644825, TextColor.BLACK); diff --git a/common/src/main/java/common/entity/animal/EntityHorse.java b/common/src/main/java/common/entity/animal/EntityHorse.java index 13cc70f8..ed28561e 100755 --- a/common/src/main/java/common/entity/animal/EntityHorse.java +++ b/common/src/main/java/common/entity/animal/EntityHorse.java @@ -830,7 +830,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic { j = 60; k = 3; } - else if (itemstack.getItem() == Items.golden_carrot) + else if (itemstack.getItem() == Items.carrot) { hp = 4; j = 60; diff --git a/common/src/main/java/common/entity/animal/EntityPig.java b/common/src/main/java/common/entity/animal/EntityPig.java index dc2e5983..7bf9ec20 100755 --- a/common/src/main/java/common/entity/animal/EntityPig.java +++ b/common/src/main/java/common/entity/animal/EntityPig.java @@ -34,7 +34,6 @@ public class EntityPig extends EntityAnimal this.tasks.addTask(1, new EntityAIPanic(this, 1.25D)); this.tasks.addTask(2, this.aiControlledByPlayer = new EntityAIControlledByPlayer(this, 0.3F)); this.tasks.addTask(3, new EntityAIMate(this, 1.0D)); - this.tasks.addTask(4, new EntityAITempt(this, 1.2D, Items.carrot_on_a_stick, false)); this.tasks.addTask(4, new EntityAITempt(this, 1.2D, Items.carrot, false)); this.tasks.addTask(5, new EntityAIFollowParent(this, 1.1D)); this.tasks.addTask(6, new EntityAIWander(this, 1.0D)); @@ -56,7 +55,7 @@ public class EntityPig extends EntityAnimal public boolean canBeSteered() { ItemStack itemstack = ((EntityNPC)this.passenger).getHeldItem(); - return itemstack != null && itemstack.getItem() == Items.carrot_on_a_stick; + return itemstack != null && itemstack.getItem() == Items.whip; } protected void entityInit() diff --git a/common/src/main/java/common/entity/animal/EntityRabbit.java b/common/src/main/java/common/entity/animal/EntityRabbit.java index 00dc9ff0..eaa0c77d 100755 --- a/common/src/main/java/common/entity/animal/EntityRabbit.java +++ b/common/src/main/java/common/entity/animal/EntityRabbit.java @@ -63,7 +63,7 @@ public class EntityRabbit extends EntityAnimal { this.navigator.setHeightRequirement(2.5F); this.tasks.addTask(1, new EntityAISwimming(this)); this.tasks.addTask(1, new EntityRabbit.AIPanic(this, 1.33D)); - this.tasks.addTask(2, new EntityAITempt(this, 1.0D, stack -> stack.getItem() == Items.carrot || stack.getItem() == Items.golden_carrot || stack.getItem().getBlock() instanceof BlockFlower, false)); + this.tasks.addTask(2, new EntityAITempt(this, 1.0D, stack -> stack.getItem() == Items.carrot || stack.getItem().getBlock() instanceof BlockFlower, false)); this.tasks.addTask(3, new EntityAIMate(this, 0.8D) { protected int getMatingCooldown() { return EntityRabbit.this.rand.excl(50, 200); @@ -265,7 +265,7 @@ public class EntityRabbit extends EntityAnimal { } private boolean isRabbitBreedingItem(Item itemIn) { - return itemIn == Items.carrot || itemIn == Items.golden_carrot || itemIn.getBlock() instanceof BlockFlower; + return itemIn == Items.carrot || itemIn.getBlock() instanceof BlockFlower; } public EntityRabbit createChild(EntityLiving ageable) { diff --git a/common/src/main/java/common/init/BlockRegistry.java b/common/src/main/java/common/init/BlockRegistry.java index 79b6318a..5c53c532 100755 --- a/common/src/main/java/common/init/BlockRegistry.java +++ b/common/src/main/java/common/init/BlockRegistry.java @@ -302,6 +302,7 @@ public abstract class BlockRegistry { registerFluid("blood", "Blut", false, LiquidType.COLD, false, 0, 10, 0.0f, 2, 1); registerFluid("spring_water", "Klares Wasser", true, LiquidType.COLD, false, 0, 5, 0.0f, 1, 1); registerFluid("swamp_water", "Sumpfwasser", true, LiquidType.COLD, false, 0, 5, 0.0f, TextureAnimation.SWAMP_WATER_STILL, TextureAnimation.SWAMP_WATER_FLOW); + registerFluid("milk", "Milch", false, LiquidType.COLD, true, 0, 5, 0.0f, 1, 1); register("coal_ore", (new BlockOre()).setHardness(3.0F).setResistance(5.0F).setSound(SoundType.STONE).setDisplay("Steinkohle")); @@ -471,7 +472,7 @@ public abstract class BlockRegistry { register("wheats", (new BlockCrops()).setDisplay("Getreide")); register("carrots", (new BlockCarrot()).setDisplay("Karotten")); register("potatoes", (new BlockPotato()).setDisplay("Kartoffeln")); - register("soul_warts", (new BlockWart()).setDisplay("Seelenwarze")); + register("soul_grass", (new BlockWart()).setDisplay("Seelenwarze")); diff --git a/common/src/main/java/common/init/Blocks.java b/common/src/main/java/common/init/Blocks.java index 9c1859ca..944847a5 100755 --- a/common/src/main/java/common/init/Blocks.java +++ b/common/src/main/java/common/init/Blocks.java @@ -459,7 +459,7 @@ public abstract class Blocks { public static final BlockMetalOre sodium_ore = get("sodium_ore"); public static final BlockSoulFire soul_fire = get("soul_fire"); public static final BlockSoulSand soul_sand = get("soul_sand"); - public static final BlockWart soul_warts = get("soul_warts"); + public static final BlockWart soul_grass = get("soul_grass"); public static final Block sponge = get("sponge"); public static final BlockStaticLiquid spring_water = get("spring_water"); public static final BlockDoor spruce_door = get("spruce_door"); @@ -615,6 +615,8 @@ public abstract class Blocks { public static final BlockPortal light_portal = get("light_portal"); public static final BlockPortal radiating_portal = get("radiating_portal"); public static final BlockPortal shining_portal = get("shining_portal"); + public static final BlockStaticLiquid milk = get("milk"); + public static final BlockDynamicLiquid flowing_milk = get("flowing_milk"); private static T get(String id) { T block = (T)BlockRegistry.byNameExact(id); diff --git a/common/src/main/java/common/init/CraftingRegistry.java b/common/src/main/java/common/init/CraftingRegistry.java index 54fe3081..9a2838fc 100755 --- a/common/src/main/java/common/init/CraftingRegistry.java +++ b/common/src/main/java/common/init/CraftingRegistry.java @@ -195,6 +195,7 @@ public abstract class CraftingRegistry addShapeless(new ItemStack(ItemDye.getByColor(DyeColor.MAGENTA), 2), Items.syringa); addShapeless(new ItemStack(ItemDye.getByColor(DyeColor.RED), 2), Items.rose_bush); addShapeless(new ItemStack(ItemDye.getByColor(DyeColor.PINK), 2), Items.paeonia); + addShapeless(new ItemStack(ItemDye.getByColor(DyeColor.GREEN)), Items.cactus); for (DyeColor color : DyeColor.values()) { @@ -262,7 +263,7 @@ public abstract class CraftingRegistry add(new ItemStack(Items.iron_door, 3), "##", "##", "##", '#', Items.iron_ingot); add(new ItemStack(Items.iron_trapdoor, 1), "##", "##", '#', Items.iron_ingot); - add(new ItemStack(Items.cake, 1), "AAA", "BEB", "CCC", 'A', Items.milk_bucket, 'B', Items.sugar, 'C', Items.wheat, 'E', Items.egg); + add(new ItemStack(Items.cake, 1), "AAA", "BEB", "CCC", 'A', Items.milk_bottle, 'B', Items.sugar, 'C', Items.wheat, 'E', Items.egg); add(new ItemStack(Items.sugar, 1), "#", '#', Items.reeds); add(new ItemStack(Items.torch, 4), "X", "#", 'X', Items.coal, '#', Items.stick); @@ -278,7 +279,7 @@ public abstract class CraftingRegistry add(new ItemStack(Items.bread, 1), "###", '#', Items.wheat); add(new ItemStack(Items.fishing_rod, 1), " #", " #X", "# X", '#', Items.stick, 'X', Items.string); - add(new ItemStack(Items.carrot_on_a_stick, 1), "# ", " X", '#', Items.fishing_rod, 'X', Items.carrot); + add(new ItemStack(Items.whip, 1), "# ", " X", '#', Items.stick, 'X', Items.string); add(new ItemStack(Items.cobblestone_stairs, 4), "# ", "## ", "###", '#', Items.cobblestone); add(new ItemStack(Items.brick_stairs, 4), "# ", "## ", "###", '#', Items.brick_block); add(new ItemStack(Items.stonebrick_stairs, 4), "# ", "## ", "###", '#', Items.stonebrick); @@ -287,7 +288,6 @@ public abstract class CraftingRegistry add(new ItemStack(Items.quartz_stairs, 4), "# ", "## ", "###", '#', Items.quartz_block); add(new ItemStack(Items.golden_apple, 1), "###", "#X#", "###", '#', Items.gold_ingot, 'X', Items.apple); add(new ItemStack(Items.charged_apple, 1), "###", "#X#", "###", '#', Items.gold_block, 'X', Items.apple); - add(new ItemStack(Items.golden_carrot, 1), "###", "#X#", "###", '#', Items.gold_nugget, 'X', Items.carrot); add(new ItemStack(Items.lever, 1), "X", "#", '#', Items.cobblestone, 'X', Items.stick); add(new ItemStack(Items.navigator, 1), " # ", "#X#", " # ", '#', Items.iron_ingot, 'X', Items.charged_powder); add(new ItemStack(Items.stone_button, 1), "#", '#', Items.stone); diff --git a/common/src/main/java/common/init/ItemRegistry.java b/common/src/main/java/common/init/ItemRegistry.java index 76282557..e7f7b7e8 100755 --- a/common/src/main/java/common/init/ItemRegistry.java +++ b/common/src/main/java/common/init/ItemRegistry.java @@ -27,7 +27,7 @@ import common.item.Item; import common.item.ItemStack; import common.item.StackSize; import common.item.consumable.ItemAppleGold; -import common.item.consumable.ItemBucketMilk; +import common.item.consumable.ItemMilkBottle; import common.item.consumable.ItemFishFood; import common.item.consumable.ItemFood; import common.item.consumable.ItemPotion; @@ -54,7 +54,7 @@ import common.item.spawner.ItemMobTemplate; import common.item.spawner.ItemCharTemplate; import common.item.tool.ItemAxe; import common.item.tool.ItemCamera; -import common.item.tool.ItemCarrotOnAStick; +import common.item.tool.ItemWhip; import common.item.tool.ItemEditor; import common.item.tool.ItemFishingRod; import common.item.tool.ItemFire; @@ -177,7 +177,6 @@ public abstract class ItemRegistry { register("recursive_" + BlockRegistry.getName(liquid.first()) + "_bucket", new ItemBucket(liquid.second(), true)); } - register("milk_bucket", (new ItemBucketMilk()).setDisplay("Milch").setContainerItem(bucket)); register("boat", (new ItemBoat()).setDisplay("Boot")); register("minecart", (new ItemMinecart()).setDisplay("Lore")); @@ -280,13 +279,15 @@ public abstract class ItemRegistry { register("demon_rod", (new Item()).setDisplay("Dämonenrute").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XL)); register("gold_coin", (new Item()).setDisplay("Goldmünze").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XL)); register("gold_nugget", (new Item()).setDisplay("Goldnugget").setTab(CheatTab.METALS).setMaxAmount(StackSize.XL)); - register("bottle", (new ItemBottle()).setDisplay("Flasche")); + Item bottle; + register("bottle", (bottle = new ItemBottle()).setDisplay("Flasche")); for(Pair pot : ItemPotion.getBasePotions()) { register(pot.first(), new ItemPotion(pot.second(), null)); } for(Pair pot : ItemPotion.getBrewedPotions()) { register(pot.first(), new ItemPotion(pot.second().getPotion(), pot.second())); } + register("milk_bottle", (new ItemMilkBottle()).setDisplay("Flasche mit Milch").setContainerItem(bottle)); register("eye", (new ItemFood(2, false)).setPotionEffect(Effect.POISON, 5, 0, 1.0F).setDisplay("Auge") .setMaxAmount(StackSize.L)); register("blazing_powder", (new Item()).setDisplay("Schillernder Staub") @@ -300,14 +301,11 @@ public abstract class ItemRegistry { register("carrot", new ItemSeedFood(3, Blocks.carrots, Blocks.farmland).setDisplay("Karotte").setMaxAmount(StackSize.L)); register("potato", new ItemSeedFood(1, Blocks.potatoes, Blocks.farmland).setDisplay("Kartoffel").setMaxAmount(StackSize.L)); register("wheat_seed", new ItemSeeds(Blocks.wheats, Blocks.farmland).setDisplay("Weizenkörner").setMaxAmount(StackSize.XL)); - register("soul_wart", new ItemSeeds(Blocks.soul_warts, Blocks.soul_sand).setDisplay("Seelenwarze").setMaxAmount(StackSize.L)); + register("soul_seed", new ItemSeeds(Blocks.soul_grass, Blocks.soul_sand).setDisplay("Seelenwarze").setMaxAmount(StackSize.L)); register("pumpkin_seed", new ItemSeeds(Blocks.pumpkin_stem, Blocks.farmland).setDisplay("Kürbiskerne").setMaxAmount(StackSize.XL)); register("melon_seed", new ItemSeeds(Blocks.melon_stem, Blocks.farmland).setDisplay("Melonenkerne").setMaxAmount(StackSize.XL)); - register("baked_potato", (new ItemFood(5, false)).setDisplay("Ofenkartoffel").setMaxAmount(StackSize.L)); - register("poisonous_potato", (new ItemFood(2, false)).setPotionEffect(Effect.POISON, 5, 0, 0.6F).setDisplay("Giftige Kartoffel").setMaxAmount(StackSize.L)); - register("golden_carrot", (new ItemFood(6, false)).setDisplay("Goldene Karotte")); - register("carrot_on_a_stick", (new ItemCarrotOnAStick()).setDisplay("Karottenrute")); + register("whip", (new ItemWhip()).setDisplay("Peitsche")); register("charge_crystal", (new Item()).setDisplay("Energiekristall").setTab(CheatTab.MISC).setColor(TextColor.DMAGENTA).setGleaming()); for(Enchantment ench : Enchantment.values()) { register("enchanted_book_" + ench.getName(), (new ItemEnchantedBook(ench, 1)).setUnstackable().setDisplay("Verzaubertes Buch mit " + ench.getFormattedName(1)).setTab(CheatTab.ENCHANTMENTS)); diff --git a/common/src/main/java/common/init/Items.java b/common/src/main/java/common/init/Items.java index c53e1dcf..851f27ae 100755 --- a/common/src/main/java/common/init/Items.java +++ b/common/src/main/java/common/init/Items.java @@ -12,7 +12,7 @@ import common.collect.Lists; import common.collect.Sets; import common.item.*; import common.item.consumable.ItemAppleGold; -import common.item.consumable.ItemBucketMilk; +import common.item.consumable.ItemMilkBottle; import common.item.consumable.ItemFishFood; import common.item.consumable.ItemFood; import common.item.consumable.ItemPotion; @@ -39,7 +39,7 @@ import common.item.spawner.ItemMobTemplate; import common.item.spawner.ItemCharTemplate; import common.item.tool.ItemAxe; import common.item.tool.ItemCamera; -import common.item.tool.ItemCarrotOnAStick; +import common.item.tool.ItemWhip; import common.item.tool.ItemEditor; import common.item.tool.ItemFishingRod; import common.item.tool.ItemFire; @@ -109,7 +109,6 @@ public abstract class Items { public static final ItemMetal arsenic_powder = get("arsenic_powder"); public static final Item ash = get("ash"); public static final Item assembly_unit = get("assembly_unit"); - public static final ItemFood baked_potato = get("baked_potato"); public static final ItemBanHammer banhammer = get("banhammer"); public static final Item effect_generator = get("effect_generator"); public static final Item bedrock = get("bedrock"); @@ -208,14 +207,14 @@ public abstract class Items { public static final ItemBucket bucket = get("bucket"); public static final ItemFire burning_soul = get("burning_soul"); public static final Item cactus = get("cactus"); - public static final ItemDye cactus_green = get("cactus_green"); + public static final ItemDye green_dye = get("green_dye"); public static final Item cake = get("cake"); public static final Item calcium_block = get("calcium_block"); public static final Item calcium_ore = get("calcium_ore"); public static final ItemMetal calcium_powder = get("calcium_powder"); public static final ItemCamera camera = get("camera"); public static final ItemSeedFood carrot = get("carrot"); - public static final ItemCarrotOnAStick carrot_on_a_stick = get("carrot_on_a_stick"); + public static final ItemWhip whip = get("whip"); public static final Item carved_sandstone = get("carved_sandstone"); public static final Item carved_stonebrick = get("carved_stonebrick"); public static final Item cauldron = get("cauldron"); @@ -377,7 +376,6 @@ public abstract class Items { public static final ItemSword gold_sword = get("gold_sword"); public static final ItemAppleGold golden_apple = get("golden_apple"); public static final ItemAppleGold charged_apple = get("charged_apple"); - public static final ItemFood golden_carrot = get("golden_carrot"); public static final ItemBucket goo_bucket = get("goo_bucket"); public static final Item grass = get("grass"); public static final Item gravel = get("gravel"); @@ -507,7 +505,7 @@ public abstract class Items { public static final Item melon_block = get("melon_block"); public static final ItemSeeds melon_seed = get("melon_seed"); public static final ItemBucket mercury_bucket = get("mercury_bucket"); - public static final ItemBucketMilk milk_bucket = get("milk_bucket"); + public static final ItemMilkBottle milk_bottle = get("milk_bottle"); public static final ItemMinecart minecart = get("minecart"); public static final Item mob_spawner = get("mob_spawner"); public static final Item moon_cheese = get("moon_cheese"); @@ -588,7 +586,6 @@ public abstract class Items { public static final ItemMetal plutonium_ingot = get("plutonium_ingot"); public static final Item plutonium_ore = get("plutonium_ore"); public static final Item podzol = get("podzol"); - public static final ItemFood poisonous_potato = get("poisonous_potato"); public static final Item poppy = get("poppy"); public static final ItemFood porkchop = get("porkchop"); public static final Item portal_frame = get("portal_frame"); @@ -699,7 +696,7 @@ public abstract class Items { public static final Item sodium_ore = get("sodium_ore"); public static final ItemMetal sodium_powder = get("sodium_powder"); public static final Item soul_sand = get("soul_sand"); - public static final ItemSeeds soul_wart = get("soul_wart"); + public static final ItemSeeds soul_seed = get("soul_seed"); public static final ItemFood eye = get("eye"); public static final Item sponge = get("sponge"); public static final ItemBucket spring_water_bucket = get("spring_water_bucket"); @@ -995,6 +992,8 @@ public abstract class Items { public static final Item swamp_oak_stairs = get("swamp_oak_stairs"); public static final Item swamp_vine = get("swamp_vine"); public static final Item swamp = get("swamp"); + public static final ItemBucket milk_bucket = get("milk_bucket"); + public static final ItemBucket recursive_milk_bucket = get("recursive_milk_bucket"); private static T get(String id) { T item = (T)ItemRegistry.byName(id); diff --git a/common/src/main/java/common/init/SmeltingRegistry.java b/common/src/main/java/common/init/SmeltingRegistry.java index 0f38068f..f5bb236f 100755 --- a/common/src/main/java/common/init/SmeltingRegistry.java +++ b/common/src/main/java/common/init/SmeltingRegistry.java @@ -31,8 +31,6 @@ public abstract class SmeltingRegistry add(Items.stonebrick, new ItemStack(Items.cracked_stonebrick), 0.1F); add(Items.clay_lump, new ItemStack(Items.brick), 0.3F); add(Items.clay, new ItemStack(Items.hardened_clay), 0.35F); - add(Items.cactus, new ItemStack(Items.cactus_green), 0.2F); - add(Items.potato, new ItemStack(Items.baked_potato), 0.35F); add(Items.hellrock, new ItemStack(Items.bloodbrick), 0.1F); for (ItemFishFood.FishType fish : ItemFishFood.FishType.values()) diff --git a/common/src/main/java/common/item/consumable/ItemBucketMilk.java b/common/src/main/java/common/item/consumable/ItemBucketMilk.java deleted file mode 100755 index 4f39be2a..00000000 --- a/common/src/main/java/common/item/consumable/ItemBucketMilk.java +++ /dev/null @@ -1,73 +0,0 @@ -package common.item.consumable; - -import java.util.Map; -import common.attributes.Attribute; -import common.attributes.UsageSlot; -import common.entity.npc.EntityNPC; -import common.init.Items; -import common.item.CheatTab; -import common.item.Item; -import common.item.ItemAction; -import common.item.ItemStack; -import common.world.World; - -public class ItemBucketMilk extends Item -{ - public ItemBucketMilk() - { - this.setUnstackable(); - this.setTab(CheatTab.TOOLS); - this.setMagnetic(); - } - - /** - * Called when the player finishes using this Item (E.g. finishes eating.). Not called when the player stops using - * the Item before the action is complete. - */ - public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityNPC playerIn) - { -// if (!playerIn.creative) -// { - stack.decrSize(); -// } - - if (!worldIn.client) - { - playerIn.clearEffects(false); - } - -// playerIn.triggerAchievement(StatRegistry.objectUseStats[ItemRegistry.getIdFromItem(this)]); - return stack.isEmpty() ? new ItemStack(Items.bucket) : stack; - } - - /** - * How long it takes to use or consume an item - */ - public int getMaxItemUseDuration(ItemStack stack) - { - return 32; - } - - /** - * returns the action that specifies what animation to play when the items is being used - */ - public ItemAction getItemUseAction() - { - return ItemAction.DRINK; - } - - /** - * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer - */ - public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityNPC playerIn) - { - playerIn.setItemInUse(itemStackIn, this.getMaxItemUseDuration(itemStackIn)); - return itemStackIn; - } - - public void getModifiers(Map map, UsageSlot slot) - { - if(slot == null || slot == UsageSlot.INVENTORY) - map.put(Attribute.RADIATION, -5.0f); - } -} diff --git a/common/src/main/java/common/item/consumable/ItemMilkBottle.java b/common/src/main/java/common/item/consumable/ItemMilkBottle.java new file mode 100755 index 00000000..a6ec35bd --- /dev/null +++ b/common/src/main/java/common/item/consumable/ItemMilkBottle.java @@ -0,0 +1,50 @@ +package common.item.consumable; + +import java.util.Map; +import common.attributes.Attribute; +import common.attributes.UsageSlot; +import common.entity.npc.EntityNPC; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemAction; +import common.item.ItemStack; +import common.util.Clientside; +import common.world.World; + +public class ItemMilkBottle extends Item { + public ItemMilkBottle() { + this.setUnstackable(); + this.setTab(CheatTab.FOOD); + this.setMagnetic(); + } + + public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityNPC playerIn) { + stack.decrSize(); + if(!worldIn.client) + playerIn.clearEffects(false); + return stack; + } + + public int getMaxItemUseDuration(ItemStack stack) { + return 32; + } + + public ItemAction getItemUseAction() { + return ItemAction.DRINK; + } + + public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityNPC playerIn) { + playerIn.setItemInUse(itemStackIn, this.getMaxItemUseDuration(itemStackIn)); + return itemStackIn; + } + + public void getModifiers(Map map, UsageSlot slot) { + if(slot == null || slot == UsageSlot.INVENTORY) + map.put(Attribute.RADIATION, -2.0f); + } + + @Clientside + public String[] getTextures(String name) { + return new String[] {"potion_overlay", "bottle"}; + } +} diff --git a/common/src/main/java/common/item/material/ItemBucket.java b/common/src/main/java/common/item/material/ItemBucket.java index e86fda6a..a5debf54 100755 --- a/common/src/main/java/common/item/material/ItemBucket.java +++ b/common/src/main/java/common/item/material/ItemBucket.java @@ -8,6 +8,8 @@ import java.util.Map; import java.util.Queue; import java.util.Set; +import common.attributes.Attribute; +import common.attributes.UsageSlot; import common.block.Block; import common.block.Material; import common.block.liquid.BlockDynamicLiquid; @@ -134,6 +136,11 @@ public class ItemBucket extends Item return this.liquid; } + public void getModifiers(Map map, UsageSlot slot) { + if(this.liquid == Blocks.flowing_milk && (slot == null || slot == UsageSlot.INVENTORY)) + map.put(Attribute.RADIATION, -5.0f); + } + /** * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer */ @@ -321,7 +328,7 @@ public class ItemBucket extends Item @Clientside public String[] getTextures(String name) { - return super.getTextures(this.recursive ? name.substring("recursive_".length()) : name); + return this.liquid == null ? new String[] {"bucket"} : new String[] {"bucket", name.substring(this.recursive ? "recursive_".length() : 0, name.length() - "_bucket".length())}; } @Serverside diff --git a/common/src/main/java/common/item/tool/ItemCarrotOnAStick.java b/common/src/main/java/common/item/tool/ItemCarrotOnAStick.java deleted file mode 100755 index 0791539d..00000000 --- a/common/src/main/java/common/item/tool/ItemCarrotOnAStick.java +++ /dev/null @@ -1,67 +0,0 @@ -package common.item.tool; - -import common.entity.animal.EntityPig; -import common.entity.npc.EntityNPC; -import common.init.Items; -import common.item.CheatTab; -import common.item.Item; -import common.item.ItemStack; -import common.item.WieldType; -import common.world.World; - -public class ItemCarrotOnAStick extends Item -{ - public ItemCarrotOnAStick() - { - this.setTab(CheatTab.TOOLS); - this.setMaxDamage(25); - } - -// /** -// * Returns True is the item is renderer in full 3D when hold. -// */ -// public boolean isFull3D() -// { -// return true; -// } - -// /** -// * Returns true if this item should be rotated by 180 degrees around the Y axis when being held in an entities -// * hands. -// */ -// public boolean shouldRotateAroundWhenRendering() -// { -// return true; -// } - - /** - * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer - */ - public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityNPC playerIn) - { - if (playerIn.isRiding() && playerIn.vehicle instanceof EntityPig) - { - EntityPig entitypig = (EntityPig)playerIn.vehicle; - - if (entitypig.getAIControlledByPlayer().isControlledByPlayer() && itemStackIn.getMaxDamage() - itemStackIn.getItemDamage() >= 7) - { - entitypig.getAIControlledByPlayer().boostSpeed(); - itemStackIn.damage(7, playerIn); - - if (itemStackIn.isEmpty()) - { - ItemStack itemstack = new ItemStack(Items.fishing_rod); - itemstack.copyData(itemStackIn); - return itemstack; - } - } - } - -// playerIn.triggerAchievement(StatRegistry.objectUseStats[ItemRegistry.getIdFromItem(this)]); - return itemStackIn; - } - - public WieldType getWieldType() { - return WieldType.TOOL_FLIP; - } -} diff --git a/common/src/main/java/common/item/tool/ItemWhip.java b/common/src/main/java/common/item/tool/ItemWhip.java new file mode 100755 index 00000000..06643f75 --- /dev/null +++ b/common/src/main/java/common/item/tool/ItemWhip.java @@ -0,0 +1,38 @@ +package common.item.tool; + +import common.entity.animal.EntityPig; +import common.entity.npc.EntityNPC; +import common.item.CheatTab; +import common.item.Item; +import common.item.ItemStack; +import common.item.WieldType; +import common.world.World; + +public class ItemWhip extends Item +{ + public ItemWhip() + { + this.setTab(CheatTab.TOOLS); + this.setMaxDamage(35); + } + + public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityNPC playerIn) + { + if (playerIn.isRiding() && playerIn.vehicle instanceof EntityPig) + { + EntityPig entitypig = (EntityPig)playerIn.vehicle; + + if (entitypig.getAIControlledByPlayer().isControlledByPlayer() && itemStackIn.getMaxDamage() - itemStackIn.getItemDamage() >= 7) + { + entitypig.getAIControlledByPlayer().boostSpeed(); + itemStackIn.damage(7, playerIn); + } + } + + return itemStackIn; + } + + public WieldType getWieldType() { + return WieldType.TOOL_FLIP; + } +} diff --git a/server/src/main/java/server/clipboard/ReorderRegistry.java b/server/src/main/java/server/clipboard/ReorderRegistry.java index 3a124dc4..92809d60 100755 --- a/server/src/main/java/server/clipboard/ReorderRegistry.java +++ b/server/src/main/java/server/clipboard/ReorderRegistry.java @@ -82,7 +82,7 @@ public abstract class ReorderRegistry { PLACE_LAST.add(Blocks.vine); PLACE_LAST.add(Blocks.swamp_vine); PLACE_LAST.add(Blocks.waterlily); - PLACE_LAST.add(Blocks.soul_warts); + PLACE_LAST.add(Blocks.soul_grass); PLACE_LAST.add(Blocks.piston); PLACE_LAST.add(Blocks.sticky_piston); PLACE_LAST.add(Blocks.tripwire_hook); @@ -197,7 +197,7 @@ public abstract class ReorderRegistry { // vines are complicated, but I'll list the single-attachment variants anyway addAttach(Blocks.vine.getStateFromMeta(0), Facing.UP); addCardinals(Blocks.vine, 1, 2, 4, 8); - addAttach(Blocks.soul_wart, Facing.DOWN); + addAttach(Blocks.soul_seed, Facing.DOWN); for (int offset = 0; offset < 16; offset += 4) { addCardinals(Blocks.cocoa, offset + 0, offset + 1, offset + 2, offset + 3); } diff --git a/server/src/main/java/server/world/Converter.java b/server/src/main/java/server/world/Converter.java index 1ed4008a..4a0b1b1d 100644 --- a/server/src/main/java/server/world/Converter.java +++ b/server/src/main/java/server/world/Converter.java @@ -938,10 +938,10 @@ public abstract class Converter { mapBlock(Blocks.blood_brick_stairs.getState().withProperty(BlockStairs.FACING, Facing.WEST).withProperty(BlockStairs.HALF, EnumHalf.TOP), 114, 5, 13); mapBlock(Blocks.blood_brick_stairs.getState().withProperty(BlockStairs.FACING, Facing.SOUTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 114, 6, 14); mapBlock(Blocks.blood_brick_stairs.getState().withProperty(BlockStairs.FACING, Facing.NORTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 114, 7, 15); - mapBlock(Blocks.soul_warts.getState().withProperty(BlockWart.AGE, 0), 115); - mapBlock(Blocks.soul_warts.getState().withProperty(BlockWart.AGE, 1), 115, 1); - mapBlock(Blocks.soul_warts.getState().withProperty(BlockWart.AGE, 2), 115, 2); - mapBlock(Blocks.soul_warts.getState().withProperty(BlockWart.AGE, 3), 115, 3); + mapBlock(Blocks.soul_grass.getState().withProperty(BlockWart.AGE, 0), 115); + mapBlock(Blocks.soul_grass.getState().withProperty(BlockWart.AGE, 1), 115, 1); + mapBlock(Blocks.soul_grass.getState().withProperty(BlockWart.AGE, 2), 115, 2); + mapBlock(Blocks.soul_grass.getState().withProperty(BlockWart.AGE, 3), 115, 3); mapBlock(Blocks.enchanting_table, 116); mapBlock(Blocks.brewing_stand, 117); mapBlock(Blocks.cauldron.getState().withProperty(BlockCauldron.LEVEL, 0), 118); diff --git a/server/src/main/java/server/worldgen/LootConstants.java b/server/src/main/java/server/worldgen/LootConstants.java index bd4c2c12..63682b93 100755 --- a/server/src/main/java/server/worldgen/LootConstants.java +++ b/server/src/main/java/server/worldgen/LootConstants.java @@ -45,7 +45,7 @@ public abstract class LootConstants { public static final WeightedList HELL_FORTRESS = new WeightedList(new RngLoot(Items.diamond, 1, 3, 5), new RngLoot(Items.iron_ingot, 1, 5, 5), new RngLoot(Items.gold_ingot, 1, 3, 15), new RngLoot(Items.gold_sword, 1, 1, 5), new RngLoot(Items.gold_chestplate, 1, 1, 5), new RngLoot(Items.lighter, 1, 1, 5), - new RngLoot(Items.soul_wart, 3, 7, 5), new RngLoot(Items.saddle, 1, 1, 10), new RngLoot(Items.gold_horse_armor, 1, 1, 8), + new RngLoot(Items.soul_seed, 3, 7, 5), new RngLoot(Items.saddle, 1, 1, 10), new RngLoot(Items.gold_horse_armor, 1, 1, 8), new RngLoot(Items.iron_horse_armor, 1, 1, 5), new RngLoot(Items.diamond_horse_armor, 1, 1, 3), new RngLoot(Items.obsidian, 2, 4, 2)); public static final WeightedList DUNGEON_CHEST = new WeightedList(new RngLoot(Items.saddle, 1, 1, 11), diff --git a/server/src/main/java/server/worldgen/structure/StructureBridge.java b/server/src/main/java/server/worldgen/structure/StructureBridge.java index b893de5d..496972d8 100755 --- a/server/src/main/java/server/worldgen/structure/StructureBridge.java +++ b/server/src/main/java/server/worldgen/structure/StructureBridge.java @@ -912,8 +912,8 @@ public class StructureBridge this.setBlockState(worldIn, i2, 8, 5, 10, structureBoundingBoxIn); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 3, 4, 4, 4, 4, 8, Blocks.soul_sand.getState(), Blocks.soul_sand.getState(), false); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, 4, 4, 9, 4, 8, Blocks.soul_sand.getState(), Blocks.soul_sand.getState(), false); - this.fillWithBlocks(worldIn, structureBoundingBoxIn, 3, 5, 4, 4, 5, 8, Blocks.soul_warts.getState(), Blocks.soul_warts.getState(), false); - this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, 5, 4, 9, 5, 8, Blocks.soul_warts.getState(), Blocks.soul_warts.getState(), false); + this.fillWithBlocks(worldIn, structureBoundingBoxIn, 3, 5, 4, 4, 5, 8, Blocks.soul_grass.getState(), Blocks.soul_grass.getState(), false); + this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, 5, 4, 9, 5, 8, Blocks.soul_grass.getState(), Blocks.soul_grass.getState(), false); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 4, 2, 0, 8, 2, 12, Blocks.blood_brick.getState(), Blocks.blood_brick.getState(), false); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 0, 2, 4, 12, 2, 8, Blocks.blood_brick.getState(), Blocks.blood_brick.getState(), false); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 4, 0, 0, 8, 1, 3, Blocks.blood_brick.getState(), Blocks.blood_brick.getState(), false);