diff --git a/client/src/main/java/client/init/RenderRegistry.java b/client/src/main/java/client/init/RenderRegistry.java index 973f05ad..4022ca63 100644 --- a/client/src/main/java/client/init/RenderRegistry.java +++ b/client/src/main/java/client/init/RenderRegistry.java @@ -85,7 +85,6 @@ import common.entity.item.EntityOrb; import common.entity.item.EntityTnt; import common.entity.item.EntityTntCart; import common.entity.item.EntityXp; -import common.entity.item.EntityXpBottle; import common.entity.npc.SpeciesInfo; import common.entity.projectile.EntityArrow; import common.entity.projectile.EntityBox; @@ -126,7 +125,6 @@ public abstract class RenderRegistry { map.put(EntityOrb.class, new RenderItemEntity(mgr, Items.charged_orb, ritem)); map.put(EntityEgg.class, new RenderItemEntity(mgr, Items.egg, ritem)); map.put(EntityPotion.class, new RenderPotion(mgr, ritem)); - map.put(EntityXpBottle.class, new RenderItemEntity(mgr, Items.experience_bottle, ritem)); map.put(EntityFireball.class, new RenderFireball(mgr, 0.75F)); map.put(EntityFireCharge.class, new RenderFireball(mgr, 0.5F)); map.put(EntityBox.class, new RenderFlyingBox(mgr)); diff --git a/client/src/main/resources/textures/blocks/blood_brick.png b/client/src/main/resources/textures/blocks/blood_brick.png index caaf66f8..485f54cd 100755 Binary files a/client/src/main/resources/textures/blocks/blood_brick.png and b/client/src/main/resources/textures/blocks/blood_brick.png differ diff --git a/client/src/main/resources/textures/items/ardite_sword.png b/client/src/main/resources/textures/busy/ardite_sword.png similarity index 100% rename from client/src/main/resources/textures/items/ardite_sword.png rename to client/src/main/resources/textures/busy/ardite_sword.png diff --git a/client/src/main/resources/textures/items/bow.png b/client/src/main/resources/textures/busy/bow.png similarity index 100% rename from client/src/main/resources/textures/items/bow.png rename to client/src/main/resources/textures/busy/bow.png diff --git a/client/src/main/resources/textures/items/bow_pulling_0.png b/client/src/main/resources/textures/busy/bow_pulling_0.png similarity index 100% rename from client/src/main/resources/textures/items/bow_pulling_0.png rename to client/src/main/resources/textures/busy/bow_pulling_0.png diff --git a/client/src/main/resources/textures/items/bow_pulling_1.png b/client/src/main/resources/textures/busy/bow_pulling_1.png similarity index 100% rename from client/src/main/resources/textures/items/bow_pulling_1.png rename to client/src/main/resources/textures/busy/bow_pulling_1.png diff --git a/client/src/main/resources/textures/items/bow_pulling_2.png b/client/src/main/resources/textures/busy/bow_pulling_2.png similarity index 100% rename from client/src/main/resources/textures/items/bow_pulling_2.png rename to client/src/main/resources/textures/busy/bow_pulling_2.png diff --git a/client/src/main/resources/textures/items/burning_soul.png b/client/src/main/resources/textures/busy/burning_soul.png similarity index 100% rename from client/src/main/resources/textures/items/burning_soul.png rename to client/src/main/resources/textures/busy/burning_soul.png diff --git a/client/src/main/resources/textures/items/carrot_on_a_stick.png b/client/src/main/resources/textures/busy/carrot_on_a_stick.png similarity index 100% rename from client/src/main/resources/textures/items/carrot_on_a_stick.png rename to client/src/main/resources/textures/busy/carrot_on_a_stick.png diff --git a/client/src/main/resources/textures/items/dark_lighter.png b/client/src/main/resources/textures/busy/dark_lighter.png similarity index 100% rename from client/src/main/resources/textures/items/dark_lighter.png rename to client/src/main/resources/textures/busy/dark_lighter.png diff --git a/client/src/main/resources/textures/items/diamond_axe.png b/client/src/main/resources/textures/busy/diamond_axe.png similarity index 100% rename from client/src/main/resources/textures/items/diamond_axe.png rename to client/src/main/resources/textures/busy/diamond_axe.png diff --git a/client/src/main/resources/textures/items/diamond_hoe.png b/client/src/main/resources/textures/busy/diamond_hoe.png similarity index 100% rename from client/src/main/resources/textures/items/diamond_hoe.png rename to client/src/main/resources/textures/busy/diamond_hoe.png diff --git a/client/src/main/resources/textures/items/diamond_pickaxe.png b/client/src/main/resources/textures/busy/diamond_pickaxe.png similarity index 100% rename from client/src/main/resources/textures/items/diamond_pickaxe.png rename to client/src/main/resources/textures/busy/diamond_pickaxe.png diff --git a/client/src/main/resources/textures/items/diamond_shears.png b/client/src/main/resources/textures/busy/diamond_shears.png similarity index 100% rename from client/src/main/resources/textures/items/diamond_shears.png rename to client/src/main/resources/textures/busy/diamond_shears.png diff --git a/client/src/main/resources/textures/items/diamond_shovel.png b/client/src/main/resources/textures/busy/diamond_shovel.png similarity index 100% rename from client/src/main/resources/textures/items/diamond_shovel.png rename to client/src/main/resources/textures/busy/diamond_shovel.png diff --git a/client/src/main/resources/textures/items/diamond_sword.png b/client/src/main/resources/textures/busy/diamond_sword.png similarity index 100% rename from client/src/main/resources/textures/items/diamond_sword.png rename to client/src/main/resources/textures/busy/diamond_sword.png diff --git a/client/src/main/resources/textures/items/cactus_green.png b/client/src/main/resources/textures/busy/dye/cactus_green.png similarity index 100% rename from client/src/main/resources/textures/items/cactus_green.png rename to client/src/main/resources/textures/busy/dye/cactus_green.png diff --git a/client/src/main/resources/textures/items/cyan_dye.png b/client/src/main/resources/textures/busy/dye/cyan_dye.png similarity index 100% rename from client/src/main/resources/textures/items/cyan_dye.png rename to client/src/main/resources/textures/busy/dye/cyan_dye.png diff --git a/client/src/main/resources/textures/items/gray_dye.png b/client/src/main/resources/textures/busy/dye/gray_dye.png similarity index 100% rename from client/src/main/resources/textures/items/gray_dye.png rename to client/src/main/resources/textures/busy/dye/gray_dye.png diff --git a/client/src/main/resources/textures/items/light_blue_dye.png b/client/src/main/resources/textures/busy/dye/light_blue_dye.png similarity index 100% rename from client/src/main/resources/textures/items/light_blue_dye.png rename to client/src/main/resources/textures/busy/dye/light_blue_dye.png diff --git a/client/src/main/resources/textures/items/lime_dye.png b/client/src/main/resources/textures/busy/dye/lime_dye.png similarity index 100% rename from client/src/main/resources/textures/items/lime_dye.png rename to client/src/main/resources/textures/busy/dye/lime_dye.png diff --git a/client/src/main/resources/textures/items/magenta_dye.png b/client/src/main/resources/textures/busy/dye/magenta_dye.png similarity index 100% rename from client/src/main/resources/textures/items/magenta_dye.png rename to client/src/main/resources/textures/busy/dye/magenta_dye.png diff --git a/client/src/main/resources/textures/items/orange_dye.png b/client/src/main/resources/textures/busy/dye/orange_dye.png similarity index 100% rename from client/src/main/resources/textures/items/orange_dye.png rename to client/src/main/resources/textures/busy/dye/orange_dye.png diff --git a/client/src/main/resources/textures/items/pink_dye.png b/client/src/main/resources/textures/busy/dye/pink_dye.png similarity index 100% rename from client/src/main/resources/textures/items/pink_dye.png rename to client/src/main/resources/textures/busy/dye/pink_dye.png diff --git a/client/src/main/resources/textures/items/purple_dye.png b/client/src/main/resources/textures/busy/dye/purple_dye.png similarity index 100% rename from client/src/main/resources/textures/items/purple_dye.png rename to client/src/main/resources/textures/busy/dye/purple_dye.png diff --git a/client/src/main/resources/textures/items/red_dye.png b/client/src/main/resources/textures/busy/dye/red_dye.png similarity index 100% rename from client/src/main/resources/textures/items/red_dye.png rename to client/src/main/resources/textures/busy/dye/red_dye.png diff --git a/client/src/main/resources/textures/items/silver_dye.png b/client/src/main/resources/textures/busy/dye/silver_dye.png similarity index 100% rename from client/src/main/resources/textures/items/silver_dye.png rename to client/src/main/resources/textures/busy/dye/silver_dye.png diff --git a/client/src/main/resources/textures/items/yellow_dye.png b/client/src/main/resources/textures/busy/dye/yellow_dye.png similarity index 100% rename from client/src/main/resources/textures/items/yellow_dye.png rename to client/src/main/resources/textures/busy/dye/yellow_dye.png diff --git a/client/src/main/resources/textures/items/fishing_rod.png b/client/src/main/resources/textures/busy/fishing_rod.png similarity index 100% rename from client/src/main/resources/textures/items/fishing_rod.png rename to client/src/main/resources/textures/busy/fishing_rod.png diff --git a/client/src/main/resources/textures/items/fishing_rod_cast.png b/client/src/main/resources/textures/busy/fishing_rod_cast.png similarity index 100% rename from client/src/main/resources/textures/items/fishing_rod_cast.png rename to client/src/main/resources/textures/busy/fishing_rod_cast.png diff --git a/client/src/main/resources/textures/items/acid_bucket.png b/client/src/main/resources/textures/busy/fluid/acid_bucket.png similarity index 100% rename from client/src/main/resources/textures/items/acid_bucket.png rename to client/src/main/resources/textures/busy/fluid/acid_bucket.png diff --git a/client/src/main/resources/textures/items/blood_bucket.png b/client/src/main/resources/textures/busy/fluid/blood_bucket.png similarity index 100% rename from client/src/main/resources/textures/items/blood_bucket.png rename to client/src/main/resources/textures/busy/fluid/blood_bucket.png diff --git a/client/src/main/resources/textures/items/bucket.png b/client/src/main/resources/textures/busy/fluid/bucket.png similarity index 100% rename from client/src/main/resources/textures/items/bucket.png rename to client/src/main/resources/textures/busy/fluid/bucket.png diff --git a/client/src/main/resources/textures/items/goo_bucket.png b/client/src/main/resources/textures/busy/fluid/goo_bucket.png similarity index 100% rename from client/src/main/resources/textures/items/goo_bucket.png rename to client/src/main/resources/textures/busy/fluid/goo_bucket.png diff --git a/client/src/main/resources/textures/items/hydrogen_bucket.png b/client/src/main/resources/textures/busy/fluid/hydrogen_bucket.png similarity index 100% rename from client/src/main/resources/textures/items/hydrogen_bucket.png rename to client/src/main/resources/textures/busy/fluid/hydrogen_bucket.png diff --git a/client/src/main/resources/textures/items/lava_bucket.png b/client/src/main/resources/textures/busy/fluid/lava_bucket.png similarity index 100% rename from client/src/main/resources/textures/items/lava_bucket.png rename to client/src/main/resources/textures/busy/fluid/lava_bucket.png diff --git a/client/src/main/resources/textures/items/magma_bucket.png b/client/src/main/resources/textures/busy/fluid/magma_bucket.png similarity index 100% rename from client/src/main/resources/textures/items/magma_bucket.png rename to client/src/main/resources/textures/busy/fluid/magma_bucket.png diff --git a/client/src/main/resources/textures/items/mercury_bucket.png b/client/src/main/resources/textures/busy/fluid/mercury_bucket.png similarity index 100% rename from client/src/main/resources/textures/items/mercury_bucket.png rename to client/src/main/resources/textures/busy/fluid/mercury_bucket.png diff --git a/client/src/main/resources/textures/items/milk_bucket.png b/client/src/main/resources/textures/busy/fluid/milk_bucket.png similarity index 100% rename from client/src/main/resources/textures/items/milk_bucket.png rename to client/src/main/resources/textures/busy/fluid/milk_bucket.png diff --git a/client/src/main/resources/textures/items/nukage_bucket.png b/client/src/main/resources/textures/busy/fluid/nukage_bucket.png similarity index 100% rename from client/src/main/resources/textures/items/nukage_bucket.png rename to client/src/main/resources/textures/busy/fluid/nukage_bucket.png diff --git a/client/src/main/resources/textures/items/plasma_bucket.png b/client/src/main/resources/textures/busy/fluid/plasma_bucket.png similarity index 100% rename from client/src/main/resources/textures/items/plasma_bucket.png rename to client/src/main/resources/textures/busy/fluid/plasma_bucket.png diff --git a/client/src/main/resources/textures/items/slime_bucket.png b/client/src/main/resources/textures/busy/fluid/slime_bucket.png similarity index 100% rename from client/src/main/resources/textures/items/slime_bucket.png rename to client/src/main/resources/textures/busy/fluid/slime_bucket.png diff --git a/client/src/main/resources/textures/items/spring_water_bucket.png b/client/src/main/resources/textures/busy/fluid/spring_water_bucket.png similarity index 100% rename from client/src/main/resources/textures/items/spring_water_bucket.png rename to client/src/main/resources/textures/busy/fluid/spring_water_bucket.png diff --git a/client/src/main/resources/textures/items/swamp_water_bucket.png b/client/src/main/resources/textures/busy/fluid/swamp_water_bucket.png similarity index 100% rename from client/src/main/resources/textures/items/swamp_water_bucket.png rename to client/src/main/resources/textures/busy/fluid/swamp_water_bucket.png diff --git a/client/src/main/resources/textures/items/water_bucket.png b/client/src/main/resources/textures/busy/fluid/water_bucket.png similarity index 100% rename from client/src/main/resources/textures/items/water_bucket.png rename to client/src/main/resources/textures/busy/fluid/water_bucket.png diff --git a/client/src/main/resources/textures/items/gold_axe.png b/client/src/main/resources/textures/busy/gold_axe.png similarity index 100% rename from client/src/main/resources/textures/items/gold_axe.png rename to client/src/main/resources/textures/busy/gold_axe.png diff --git a/client/src/main/resources/textures/items/gold_hoe.png b/client/src/main/resources/textures/busy/gold_hoe.png similarity index 100% rename from client/src/main/resources/textures/items/gold_hoe.png rename to client/src/main/resources/textures/busy/gold_hoe.png diff --git a/client/src/main/resources/textures/items/gold_pickaxe.png b/client/src/main/resources/textures/busy/gold_pickaxe.png similarity index 100% rename from client/src/main/resources/textures/items/gold_pickaxe.png rename to client/src/main/resources/textures/busy/gold_pickaxe.png diff --git a/client/src/main/resources/textures/items/gold_shears.png b/client/src/main/resources/textures/busy/gold_shears.png similarity index 100% rename from client/src/main/resources/textures/items/gold_shears.png rename to client/src/main/resources/textures/busy/gold_shears.png diff --git a/client/src/main/resources/textures/items/gold_shovel.png b/client/src/main/resources/textures/busy/gold_shovel.png similarity index 100% rename from client/src/main/resources/textures/items/gold_shovel.png rename to client/src/main/resources/textures/busy/gold_shovel.png diff --git a/client/src/main/resources/textures/items/gold_sword.png b/client/src/main/resources/textures/busy/gold_sword.png similarity index 100% rename from client/src/main/resources/textures/items/gold_sword.png rename to client/src/main/resources/textures/busy/gold_sword.png diff --git a/client/src/main/resources/textures/items/gyriyn_axe.png b/client/src/main/resources/textures/busy/gyriyn_axe.png similarity index 100% rename from client/src/main/resources/textures/items/gyriyn_axe.png rename to client/src/main/resources/textures/busy/gyriyn_axe.png diff --git a/client/src/main/resources/textures/items/gyriyn_hoe.png b/client/src/main/resources/textures/busy/gyriyn_hoe.png similarity index 100% rename from client/src/main/resources/textures/items/gyriyn_hoe.png rename to client/src/main/resources/textures/busy/gyriyn_hoe.png diff --git a/client/src/main/resources/textures/items/gyriyn_pickaxe.png b/client/src/main/resources/textures/busy/gyriyn_pickaxe.png similarity index 100% rename from client/src/main/resources/textures/items/gyriyn_pickaxe.png rename to client/src/main/resources/textures/busy/gyriyn_pickaxe.png diff --git a/client/src/main/resources/textures/items/gyriyn_shears.png b/client/src/main/resources/textures/busy/gyriyn_shears.png similarity index 100% rename from client/src/main/resources/textures/items/gyriyn_shears.png rename to client/src/main/resources/textures/busy/gyriyn_shears.png diff --git a/client/src/main/resources/textures/items/gyriyn_shovel.png b/client/src/main/resources/textures/busy/gyriyn_shovel.png similarity index 100% rename from client/src/main/resources/textures/items/gyriyn_shovel.png rename to client/src/main/resources/textures/busy/gyriyn_shovel.png diff --git a/client/src/main/resources/textures/items/iron_axe.png b/client/src/main/resources/textures/busy/iron_axe.png similarity index 100% rename from client/src/main/resources/textures/items/iron_axe.png rename to client/src/main/resources/textures/busy/iron_axe.png diff --git a/client/src/main/resources/textures/items/iron_hoe.png b/client/src/main/resources/textures/busy/iron_hoe.png similarity index 100% rename from client/src/main/resources/textures/items/iron_hoe.png rename to client/src/main/resources/textures/busy/iron_hoe.png diff --git a/client/src/main/resources/textures/items/iron_pickaxe.png b/client/src/main/resources/textures/busy/iron_pickaxe.png similarity index 100% rename from client/src/main/resources/textures/items/iron_pickaxe.png rename to client/src/main/resources/textures/busy/iron_pickaxe.png diff --git a/client/src/main/resources/textures/items/iron_shears.png b/client/src/main/resources/textures/busy/iron_shears.png similarity index 100% rename from client/src/main/resources/textures/items/iron_shears.png rename to client/src/main/resources/textures/busy/iron_shears.png diff --git a/client/src/main/resources/textures/items/iron_shovel.png b/client/src/main/resources/textures/busy/iron_shovel.png similarity index 100% rename from client/src/main/resources/textures/items/iron_shovel.png rename to client/src/main/resources/textures/busy/iron_shovel.png diff --git a/client/src/main/resources/textures/items/iron_sword.png b/client/src/main/resources/textures/busy/iron_sword.png similarity index 100% rename from client/src/main/resources/textures/items/iron_sword.png rename to client/src/main/resources/textures/busy/iron_sword.png diff --git a/client/src/main/resources/textures/items/apple.png b/client/src/main/resources/textures/busy/it/apple.png similarity index 100% rename from client/src/main/resources/textures/items/apple.png rename to client/src/main/resources/textures/busy/it/apple.png diff --git a/client/src/main/resources/textures/items/baked_potato.png b/client/src/main/resources/textures/busy/it/baked_potato.png similarity index 100% rename from client/src/main/resources/textures/items/baked_potato.png rename to client/src/main/resources/textures/busy/it/baked_potato.png diff --git a/client/src/main/resources/textures/items/beef.png b/client/src/main/resources/textures/busy/it/beef.png similarity index 100% rename from client/src/main/resources/textures/items/beef.png rename to client/src/main/resources/textures/busy/it/beef.png diff --git a/client/src/main/resources/textures/items/bread.png b/client/src/main/resources/textures/busy/it/bread.png similarity index 100% rename from client/src/main/resources/textures/items/bread.png rename to client/src/main/resources/textures/busy/it/bread.png diff --git a/client/src/main/resources/textures/items/carrot.png b/client/src/main/resources/textures/busy/it/carrot.png similarity index 100% rename from client/src/main/resources/textures/items/carrot.png rename to client/src/main/resources/textures/busy/it/carrot.png diff --git a/client/src/main/resources/textures/items/charged_apple.png b/client/src/main/resources/textures/busy/it/charged_apple.png similarity index 100% rename from client/src/main/resources/textures/items/charged_apple.png rename to client/src/main/resources/textures/busy/it/charged_apple.png diff --git a/client/src/main/resources/textures/items/chicken.png b/client/src/main/resources/textures/busy/it/chicken.png similarity index 100% rename from client/src/main/resources/textures/items/chicken.png rename to client/src/main/resources/textures/busy/it/chicken.png diff --git a/client/src/main/resources/textures/items/cod.png b/client/src/main/resources/textures/busy/it/cod.png similarity index 100% rename from client/src/main/resources/textures/items/cod.png rename to client/src/main/resources/textures/busy/it/cod.png diff --git a/client/src/main/resources/textures/items/cooked_beef.png b/client/src/main/resources/textures/busy/it/cooked_beef.png similarity index 100% rename from client/src/main/resources/textures/items/cooked_beef.png rename to client/src/main/resources/textures/busy/it/cooked_beef.png diff --git a/client/src/main/resources/textures/items/cooked_chicken.png b/client/src/main/resources/textures/busy/it/cooked_chicken.png similarity index 100% rename from client/src/main/resources/textures/items/cooked_chicken.png rename to client/src/main/resources/textures/busy/it/cooked_chicken.png diff --git a/client/src/main/resources/textures/items/cooked_cod.png b/client/src/main/resources/textures/busy/it/cooked_cod.png similarity index 100% rename from client/src/main/resources/textures/items/cooked_cod.png rename to client/src/main/resources/textures/busy/it/cooked_cod.png diff --git a/client/src/main/resources/textures/items/cooked_porkchop.png b/client/src/main/resources/textures/busy/it/cooked_porkchop.png similarity index 100% rename from client/src/main/resources/textures/items/cooked_porkchop.png rename to client/src/main/resources/textures/busy/it/cooked_porkchop.png diff --git a/client/src/main/resources/textures/items/cooked_salmon.png b/client/src/main/resources/textures/busy/it/cooked_salmon.png similarity index 100% rename from client/src/main/resources/textures/items/cooked_salmon.png rename to client/src/main/resources/textures/busy/it/cooked_salmon.png diff --git a/client/src/main/resources/textures/items/cookie.png b/client/src/main/resources/textures/busy/it/cookie.png similarity index 100% rename from client/src/main/resources/textures/items/cookie.png rename to client/src/main/resources/textures/busy/it/cookie.png diff --git a/client/src/main/resources/textures/items/golden_apple.png b/client/src/main/resources/textures/busy/it/golden_apple.png similarity index 100% rename from client/src/main/resources/textures/items/golden_apple.png rename to client/src/main/resources/textures/busy/it/golden_apple.png diff --git a/client/src/main/resources/textures/items/golden_carrot.png b/client/src/main/resources/textures/busy/it/golden_carrot.png similarity index 100% rename from client/src/main/resources/textures/items/golden_carrot.png rename to client/src/main/resources/textures/busy/it/golden_carrot.png diff --git a/client/src/main/resources/textures/items/melon.png b/client/src/main/resources/textures/busy/it/melon.png similarity index 100% rename from client/src/main/resources/textures/items/melon.png rename to client/src/main/resources/textures/busy/it/melon.png diff --git a/client/src/main/resources/textures/items/melon_seed.png b/client/src/main/resources/textures/busy/it/melon_seed.png similarity index 100% rename from client/src/main/resources/textures/items/melon_seed.png rename to client/src/main/resources/textures/busy/it/melon_seed.png diff --git a/client/src/main/resources/textures/items/poisonous_potato.png b/client/src/main/resources/textures/busy/it/poisonous_potato.png similarity index 100% rename from client/src/main/resources/textures/items/poisonous_potato.png rename to client/src/main/resources/textures/busy/it/poisonous_potato.png diff --git a/client/src/main/resources/textures/items/porkchop.png b/client/src/main/resources/textures/busy/it/porkchop.png similarity index 100% rename from client/src/main/resources/textures/items/porkchop.png rename to client/src/main/resources/textures/busy/it/porkchop.png diff --git a/client/src/main/resources/textures/items/potato.png b/client/src/main/resources/textures/busy/it/potato.png similarity index 100% rename from client/src/main/resources/textures/items/potato.png rename to client/src/main/resources/textures/busy/it/potato.png diff --git a/client/src/main/resources/textures/items/pumpkin_seed.png b/client/src/main/resources/textures/busy/it/pumpkin_seed.png similarity index 100% rename from client/src/main/resources/textures/items/pumpkin_seed.png rename to client/src/main/resources/textures/busy/it/pumpkin_seed.png diff --git a/client/src/main/resources/textures/items/salmon.png b/client/src/main/resources/textures/busy/it/salmon.png similarity index 100% rename from client/src/main/resources/textures/items/salmon.png rename to client/src/main/resources/textures/busy/it/salmon.png diff --git a/client/src/main/resources/textures/items/soul_wart.png b/client/src/main/resources/textures/busy/it/soul_wart.png similarity index 100% rename from client/src/main/resources/textures/items/soul_wart.png rename to client/src/main/resources/textures/busy/it/soul_wart.png diff --git a/client/src/main/resources/textures/items/wheat.png b/client/src/main/resources/textures/busy/it/wheat.png similarity index 100% rename from client/src/main/resources/textures/items/wheat.png rename to client/src/main/resources/textures/busy/it/wheat.png diff --git a/client/src/main/resources/textures/items/wheat_seed.png b/client/src/main/resources/textures/busy/it/wheat_seed.png similarity index 100% rename from client/src/main/resources/textures/items/wheat_seed.png rename to client/src/main/resources/textures/busy/it/wheat_seed.png diff --git a/client/src/main/resources/textures/items/lead.png b/client/src/main/resources/textures/busy/lead.png similarity index 100% rename from client/src/main/resources/textures/items/lead.png rename to client/src/main/resources/textures/busy/lead.png diff --git a/client/src/main/resources/textures/items/lighter.png b/client/src/main/resources/textures/busy/lighter.png similarity index 100% rename from client/src/main/resources/textures/items/lighter.png rename to client/src/main/resources/textures/busy/lighter.png diff --git a/client/src/main/resources/textures/items/name_tag.png b/client/src/main/resources/textures/busy/name_tag.png similarity index 100% rename from client/src/main/resources/textures/items/name_tag.png rename to client/src/main/resources/textures/busy/name_tag.png diff --git a/client/src/main/resources/textures/items/nichun_axe.png b/client/src/main/resources/textures/busy/nichun_axe.png similarity index 100% rename from client/src/main/resources/textures/items/nichun_axe.png rename to client/src/main/resources/textures/busy/nichun_axe.png diff --git a/client/src/main/resources/textures/items/nichun_hoe.png b/client/src/main/resources/textures/busy/nichun_hoe.png similarity index 100% rename from client/src/main/resources/textures/items/nichun_hoe.png rename to client/src/main/resources/textures/busy/nichun_hoe.png diff --git a/client/src/main/resources/textures/items/nichun_pickaxe.png b/client/src/main/resources/textures/busy/nichun_pickaxe.png similarity index 100% rename from client/src/main/resources/textures/items/nichun_pickaxe.png rename to client/src/main/resources/textures/busy/nichun_pickaxe.png diff --git a/client/src/main/resources/textures/items/nichun_shears.png b/client/src/main/resources/textures/busy/nichun_shears.png similarity index 100% rename from client/src/main/resources/textures/items/nichun_shears.png rename to client/src/main/resources/textures/busy/nichun_shears.png diff --git a/client/src/main/resources/textures/items/nichun_shovel.png b/client/src/main/resources/textures/busy/nichun_shovel.png similarity index 100% rename from client/src/main/resources/textures/items/nichun_shovel.png rename to client/src/main/resources/textures/busy/nichun_shovel.png diff --git a/client/src/main/resources/textures/items/nichun_sword.png b/client/src/main/resources/textures/busy/nichun_sword.png similarity index 100% rename from client/src/main/resources/textures/items/nichun_sword.png rename to client/src/main/resources/textures/busy/nichun_sword.png diff --git a/client/src/main/resources/textures/items/saddle.png b/client/src/main/resources/textures/busy/saddle.png similarity index 100% rename from client/src/main/resources/textures/items/saddle.png rename to client/src/main/resources/textures/busy/saddle.png diff --git a/client/src/main/resources/textures/items/stone_axe.png b/client/src/main/resources/textures/busy/stone_axe.png similarity index 100% rename from client/src/main/resources/textures/items/stone_axe.png rename to client/src/main/resources/textures/busy/stone_axe.png diff --git a/client/src/main/resources/textures/items/stone_hoe.png b/client/src/main/resources/textures/busy/stone_hoe.png similarity index 100% rename from client/src/main/resources/textures/items/stone_hoe.png rename to client/src/main/resources/textures/busy/stone_hoe.png diff --git a/client/src/main/resources/textures/items/stone_pickaxe.png b/client/src/main/resources/textures/busy/stone_pickaxe.png similarity index 100% rename from client/src/main/resources/textures/items/stone_pickaxe.png rename to client/src/main/resources/textures/busy/stone_pickaxe.png diff --git a/client/src/main/resources/textures/items/stone_shovel.png b/client/src/main/resources/textures/busy/stone_shovel.png similarity index 100% rename from client/src/main/resources/textures/items/stone_shovel.png rename to client/src/main/resources/textures/busy/stone_shovel.png diff --git a/client/src/main/resources/textures/items/stone_sword.png b/client/src/main/resources/textures/busy/stone_sword.png similarity index 100% rename from client/src/main/resources/textures/items/stone_sword.png rename to client/src/main/resources/textures/busy/stone_sword.png diff --git a/client/src/main/resources/textures/items/thetium_axe.png b/client/src/main/resources/textures/busy/thetium_axe.png similarity index 100% rename from client/src/main/resources/textures/items/thetium_axe.png rename to client/src/main/resources/textures/busy/thetium_axe.png diff --git a/client/src/main/resources/textures/items/thetium_hoe.png b/client/src/main/resources/textures/busy/thetium_hoe.png similarity index 100% rename from client/src/main/resources/textures/items/thetium_hoe.png rename to client/src/main/resources/textures/busy/thetium_hoe.png diff --git a/client/src/main/resources/textures/items/thetium_pickaxe.png b/client/src/main/resources/textures/busy/thetium_pickaxe.png similarity index 100% rename from client/src/main/resources/textures/items/thetium_pickaxe.png rename to client/src/main/resources/textures/busy/thetium_pickaxe.png diff --git a/client/src/main/resources/textures/items/thetium_shears.png b/client/src/main/resources/textures/busy/thetium_shears.png similarity index 100% rename from client/src/main/resources/textures/items/thetium_shears.png rename to client/src/main/resources/textures/busy/thetium_shears.png diff --git a/client/src/main/resources/textures/items/thetium_shovel.png b/client/src/main/resources/textures/busy/thetium_shovel.png similarity index 100% rename from client/src/main/resources/textures/items/thetium_shovel.png rename to client/src/main/resources/textures/busy/thetium_shovel.png diff --git a/client/src/main/resources/textures/items/thetium_sword.png b/client/src/main/resources/textures/busy/thetium_sword.png similarity index 100% rename from client/src/main/resources/textures/items/thetium_sword.png rename to client/src/main/resources/textures/busy/thetium_sword.png diff --git a/client/src/main/resources/textures/items/wand.png b/client/src/main/resources/textures/busy/wand.png similarity index 100% rename from client/src/main/resources/textures/items/wand.png rename to client/src/main/resources/textures/busy/wand.png diff --git a/client/src/main/resources/textures/items/wood_axe.png b/client/src/main/resources/textures/busy/wood_axe.png similarity index 100% rename from client/src/main/resources/textures/items/wood_axe.png rename to client/src/main/resources/textures/busy/wood_axe.png diff --git a/client/src/main/resources/textures/items/wood_hoe.png b/client/src/main/resources/textures/busy/wood_hoe.png similarity index 100% rename from client/src/main/resources/textures/items/wood_hoe.png rename to client/src/main/resources/textures/busy/wood_hoe.png diff --git a/client/src/main/resources/textures/items/wood_pickaxe.png b/client/src/main/resources/textures/busy/wood_pickaxe.png similarity index 100% rename from client/src/main/resources/textures/items/wood_pickaxe.png rename to client/src/main/resources/textures/busy/wood_pickaxe.png diff --git a/client/src/main/resources/textures/items/wood_shovel.png b/client/src/main/resources/textures/busy/wood_shovel.png similarity index 100% rename from client/src/main/resources/textures/items/wood_shovel.png rename to client/src/main/resources/textures/busy/wood_shovel.png diff --git a/client/src/main/resources/textures/items/wood_sword.png b/client/src/main/resources/textures/busy/wood_sword.png similarity index 100% rename from client/src/main/resources/textures/items/wood_sword.png rename to client/src/main/resources/textures/busy/wood_sword.png diff --git a/client/src/main/resources/textures/items/ahrd_fragment.png b/client/src/main/resources/textures/items/ahrd_fragment.png index ae6872c8..5e20aefa 100755 Binary files a/client/src/main/resources/textures/items/ahrd_fragment.png and b/client/src/main/resources/textures/items/ahrd_fragment.png differ diff --git a/client/src/main/resources/textures/items/aluminium_ingot.png b/client/src/main/resources/textures/items/aluminium_ingot.png index 00918f16..60d8f5a2 100755 Binary files a/client/src/main/resources/textures/items/aluminium_ingot.png and b/client/src/main/resources/textures/items/aluminium_ingot.png differ diff --git a/client/src/main/resources/textures/items/antimony_powder.png b/client/src/main/resources/textures/items/antimony_powder.png index 1e789ab6..bd77ce2f 100755 Binary files a/client/src/main/resources/textures/items/antimony_powder.png and b/client/src/main/resources/textures/items/antimony_powder.png differ diff --git a/client/src/main/resources/textures/items/arrow.png b/client/src/main/resources/textures/items/arrow.png index 4f748a00..3ae5cdf5 100755 Binary files a/client/src/main/resources/textures/items/arrow.png and b/client/src/main/resources/textures/items/arrow.png differ diff --git a/client/src/main/resources/textures/items/arsenic_powder.png b/client/src/main/resources/textures/items/arsenic_powder.png index 670d1aca..637201d3 100755 Binary files a/client/src/main/resources/textures/items/arsenic_powder.png and b/client/src/main/resources/textures/items/arsenic_powder.png differ diff --git a/client/src/main/resources/textures/items/banhammer.png b/client/src/main/resources/textures/items/banhammer.png index 674391bd..23850a07 100755 Binary files a/client/src/main/resources/textures/items/banhammer.png and b/client/src/main/resources/textures/items/banhammer.png differ diff --git a/client/src/main/resources/textures/items/bismuth_ingot.png b/client/src/main/resources/textures/items/bismuth_ingot.png index f2db74bf..2b019926 100755 Binary files a/client/src/main/resources/textures/items/bismuth_ingot.png and b/client/src/main/resources/textures/items/bismuth_ingot.png differ diff --git a/client/src/main/resources/textures/items/black_metal_ingot.png b/client/src/main/resources/textures/items/black_metal_ingot.png index ecd0a753..93202ee7 100755 Binary files a/client/src/main/resources/textures/items/black_metal_ingot.png and b/client/src/main/resources/textures/items/black_metal_ingot.png differ diff --git a/client/src/main/resources/textures/items/black_quartz.png b/client/src/main/resources/textures/items/black_quartz.png index 67a0ec88..f5d997cd 100755 Binary files a/client/src/main/resources/textures/items/black_quartz.png and b/client/src/main/resources/textures/items/black_quartz.png differ diff --git a/client/src/main/resources/textures/items/blackbrick.png b/client/src/main/resources/textures/items/blackbrick.png index 63839adf..3f6efc51 100755 Binary files a/client/src/main/resources/textures/items/blackbrick.png and b/client/src/main/resources/textures/items/blackbrick.png differ diff --git a/client/src/main/resources/textures/items/blazing_powder.png b/client/src/main/resources/textures/items/blazing_powder.png index 3454e136..5a096fb4 100755 Binary files a/client/src/main/resources/textures/items/blazing_powder.png and b/client/src/main/resources/textures/items/blazing_powder.png differ diff --git a/client/src/main/resources/textures/items/bloodbrick.png b/client/src/main/resources/textures/items/bloodbrick.png index e9c14edb..e31cd2e6 100755 Binary files a/client/src/main/resources/textures/items/bloodbrick.png and b/client/src/main/resources/textures/items/bloodbrick.png differ diff --git a/client/src/main/resources/textures/items/boat.png b/client/src/main/resources/textures/items/boat.png index 235e0a26..f9b457bd 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/bolt.png b/client/src/main/resources/textures/items/bolt.png index 665dcf21..05e59b69 100755 Binary files a/client/src/main/resources/textures/items/bolt.png and b/client/src/main/resources/textures/items/bolt.png differ diff --git a/client/src/main/resources/textures/items/bone.png b/client/src/main/resources/textures/items/bone.png index 3faca89a..a9cdbe05 100755 Binary files a/client/src/main/resources/textures/items/bone.png and b/client/src/main/resources/textures/items/bone.png differ diff --git a/client/src/main/resources/textures/items/bonemeal.png b/client/src/main/resources/textures/items/bonemeal.png index 5b1833be..3dd02f01 100755 Binary files a/client/src/main/resources/textures/items/bonemeal.png and b/client/src/main/resources/textures/items/bonemeal.png differ diff --git a/client/src/main/resources/textures/items/book.png b/client/src/main/resources/textures/items/book.png index f791ae43..53ac40a8 100755 Binary files a/client/src/main/resources/textures/items/book.png and b/client/src/main/resources/textures/items/book.png differ diff --git a/client/src/main/resources/textures/items/bottle.png b/client/src/main/resources/textures/items/bottle.png index 87339d79..8c806004 100755 Binary files a/client/src/main/resources/textures/items/bottle.png and b/client/src/main/resources/textures/items/bottle.png differ diff --git a/client/src/main/resources/textures/items/bowl.png b/client/src/main/resources/textures/items/bowl.png deleted file mode 100755 index 63d16ad6..00000000 Binary files a/client/src/main/resources/textures/items/bowl.png and /dev/null differ diff --git a/client/src/main/resources/textures/items/brick.png b/client/src/main/resources/textures/items/brick.png index 11e74be6..806d18e8 100755 Binary files a/client/src/main/resources/textures/items/brick.png and b/client/src/main/resources/textures/items/brick.png differ diff --git a/client/src/main/resources/textures/items/calcium_powder.png b/client/src/main/resources/textures/items/calcium_powder.png index 1e13afe4..4a6d05a6 100644 Binary files a/client/src/main/resources/textures/items/calcium_powder.png and b/client/src/main/resources/textures/items/calcium_powder.png differ diff --git a/client/src/main/resources/textures/items/chain.png b/client/src/main/resources/textures/items/chain.png index f80079d0..5814073a 100755 Binary files a/client/src/main/resources/textures/items/chain.png and b/client/src/main/resources/textures/items/chain.png differ diff --git a/client/src/main/resources/textures/items/charcoal.png b/client/src/main/resources/textures/items/charcoal.png index 20d5b257..e117a208 100755 Binary files a/client/src/main/resources/textures/items/charcoal.png and b/client/src/main/resources/textures/items/charcoal.png differ diff --git a/client/src/main/resources/textures/items/charge_crystal.png b/client/src/main/resources/textures/items/charge_crystal.png index 1e033653..4dd8d569 100755 Binary files a/client/src/main/resources/textures/items/charge_crystal.png and b/client/src/main/resources/textures/items/charge_crystal.png differ diff --git a/client/src/main/resources/textures/items/charged_powder.png b/client/src/main/resources/textures/items/charged_powder.png index 570b4d67..b0be57b9 100755 Binary files a/client/src/main/resources/textures/items/charged_powder.png and b/client/src/main/resources/textures/items/charged_powder.png differ diff --git a/client/src/main/resources/textures/items/chick_magnet.png b/client/src/main/resources/textures/items/chick_magnet.png index ebeb8fa6..aa06fee1 100755 Binary files a/client/src/main/resources/textures/items/chick_magnet.png and b/client/src/main/resources/textures/items/chick_magnet.png differ diff --git a/client/src/main/resources/textures/items/chrome_ingot.png b/client/src/main/resources/textures/items/chrome_ingot.png index 74ad0db9..bb511d4a 100755 Binary files a/client/src/main/resources/textures/items/chrome_ingot.png and b/client/src/main/resources/textures/items/chrome_ingot.png differ diff --git a/client/src/main/resources/textures/items/cinnabar.png b/client/src/main/resources/textures/items/cinnabar.png index 8e2298a6..987a8af8 100755 Binary files a/client/src/main/resources/textures/items/cinnabar.png and b/client/src/main/resources/textures/items/cinnabar.png differ diff --git a/client/src/main/resources/textures/items/clay_ball.png b/client/src/main/resources/textures/items/clay_ball.png deleted file mode 100755 index 5103d6cc..00000000 Binary files a/client/src/main/resources/textures/items/clay_ball.png and /dev/null differ diff --git a/client/src/main/resources/textures/items/record_old.png b/client/src/main/resources/textures/items/clay_lump.png similarity index 50% rename from client/src/main/resources/textures/items/record_old.png rename to client/src/main/resources/textures/items/clay_lump.png index 343ebb52..ab619964 100755 Binary files a/client/src/main/resources/textures/items/record_old.png and b/client/src/main/resources/textures/items/clay_lump.png differ diff --git a/client/src/main/resources/textures/items/clownfish.png b/client/src/main/resources/textures/items/clownfish.png deleted file mode 100755 index 41df72fd..00000000 Binary files a/client/src/main/resources/textures/items/clownfish.png and /dev/null differ diff --git a/client/src/main/resources/textures/items/coal.png b/client/src/main/resources/textures/items/coal.png index 5563b6fc..c0c24247 100755 Binary files a/client/src/main/resources/textures/items/coal.png and b/client/src/main/resources/textures/items/coal.png differ diff --git a/client/src/main/resources/textures/items/cobalt_ingot.png b/client/src/main/resources/textures/items/cobalt_ingot.png index a7ddf173..c7fbf37d 100755 Binary files a/client/src/main/resources/textures/items/cobalt_ingot.png and b/client/src/main/resources/textures/items/cobalt_ingot.png differ diff --git a/client/src/main/resources/textures/items/cocoa_powder.png b/client/src/main/resources/textures/items/cocoa_powder.png index 69593ae9..64eede2a 100755 Binary files a/client/src/main/resources/textures/items/cocoa_powder.png and b/client/src/main/resources/textures/items/cocoa_powder.png differ diff --git a/client/src/main/resources/textures/items/copper_ingot.png b/client/src/main/resources/textures/items/copper_ingot.png index 22c02cd5..02f181cc 100755 Binary files a/client/src/main/resources/textures/items/copper_ingot.png and b/client/src/main/resources/textures/items/copper_ingot.png differ diff --git a/client/src/main/resources/textures/items/darkstone_fragment.png b/client/src/main/resources/textures/items/darkstone_fragment.png index 46030848..755a0db3 100755 Binary files a/client/src/main/resources/textures/items/darkstone_fragment.png and b/client/src/main/resources/textures/items/darkstone_fragment.png differ diff --git a/client/src/main/resources/textures/items/diamond.png b/client/src/main/resources/textures/items/diamond.png index 10e70a0c..4cdf0f5e 100755 Binary files a/client/src/main/resources/textures/items/diamond.png and b/client/src/main/resources/textures/items/diamond.png differ diff --git a/client/src/main/resources/textures/items/dna_sample.png b/client/src/main/resources/textures/items/dna_sample.png index 1cccd8d1..756e8959 100755 Binary files a/client/src/main/resources/textures/items/dna_sample.png and b/client/src/main/resources/textures/items/dna_sample.png differ diff --git a/client/src/main/resources/textures/items/dna_sample_char.png b/client/src/main/resources/textures/items/dna_sample_char.png index 8e54c3de..b47f454a 100755 Binary files a/client/src/main/resources/textures/items/dna_sample_char.png and b/client/src/main/resources/textures/items/dna_sample_char.png differ diff --git a/client/src/main/resources/textures/items/dynamite.png b/client/src/main/resources/textures/items/dynamite.png index 868a3dc2..40069cee 100755 Binary files a/client/src/main/resources/textures/items/dynamite.png and b/client/src/main/resources/textures/items/dynamite.png differ diff --git a/client/src/main/resources/textures/items/dynamite_1.png b/client/src/main/resources/textures/items/dynamite_1.png index e7c2f6a1..b35c99e8 100755 Binary files a/client/src/main/resources/textures/items/dynamite_1.png and b/client/src/main/resources/textures/items/dynamite_1.png differ diff --git a/client/src/main/resources/textures/items/dynamite_2.png b/client/src/main/resources/textures/items/dynamite_2.png index df99e607..fce6c1d6 100755 Binary files a/client/src/main/resources/textures/items/dynamite_2.png and b/client/src/main/resources/textures/items/dynamite_2.png differ diff --git a/client/src/main/resources/textures/items/dynamite_3.png b/client/src/main/resources/textures/items/dynamite_3.png index a2179ffd..8eadac64 100755 Binary files a/client/src/main/resources/textures/items/dynamite_3.png and b/client/src/main/resources/textures/items/dynamite_3.png differ diff --git a/client/src/main/resources/textures/items/dynamite_4.png b/client/src/main/resources/textures/items/dynamite_4.png index c7485959..82171af4 100755 Binary files a/client/src/main/resources/textures/items/dynamite_4.png and b/client/src/main/resources/textures/items/dynamite_4.png differ diff --git a/client/src/main/resources/textures/items/dynamite_5.png b/client/src/main/resources/textures/items/dynamite_5.png index d0ad1ae5..22a1acf1 100755 Binary files a/client/src/main/resources/textures/items/dynamite_5.png and b/client/src/main/resources/textures/items/dynamite_5.png differ diff --git a/client/src/main/resources/textures/items/dynamite_6.png b/client/src/main/resources/textures/items/dynamite_6.png index 249af2e0..ccdc3b6b 100755 Binary files a/client/src/main/resources/textures/items/dynamite_6.png and b/client/src/main/resources/textures/items/dynamite_6.png differ diff --git a/client/src/main/resources/textures/items/dynamite_7.png b/client/src/main/resources/textures/items/dynamite_7.png index e1906892..e70f49ab 100755 Binary files a/client/src/main/resources/textures/items/dynamite_7.png and b/client/src/main/resources/textures/items/dynamite_7.png differ diff --git a/client/src/main/resources/textures/items/egg.png b/client/src/main/resources/textures/items/egg.png index ace0c430..a9686645 100755 Binary files a/client/src/main/resources/textures/items/egg.png and b/client/src/main/resources/textures/items/egg.png differ diff --git a/client/src/main/resources/textures/items/emerald.png b/client/src/main/resources/textures/items/emerald.png index 1da2950e..b1f52100 100755 Binary files a/client/src/main/resources/textures/items/emerald.png and b/client/src/main/resources/textures/items/emerald.png differ diff --git a/client/src/main/resources/textures/items/enchanted_book.png b/client/src/main/resources/textures/items/enchanted_book.png index 8742bee8..ae3940ba 100755 Binary files a/client/src/main/resources/textures/items/enchanted_book.png and b/client/src/main/resources/textures/items/enchanted_book.png differ diff --git a/client/src/main/resources/textures/items/experience_bottle.png b/client/src/main/resources/textures/items/experience_bottle.png deleted file mode 100755 index ae4214ff..00000000 Binary files a/client/src/main/resources/textures/items/experience_bottle.png and /dev/null differ diff --git a/client/src/main/resources/textures/items/exterminator.png b/client/src/main/resources/textures/items/exterminator.png index 33b54c55..62919a98 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/eye.png b/client/src/main/resources/textures/items/eye.png new file mode 100755 index 00000000..fada867f Binary files /dev/null and b/client/src/main/resources/textures/items/eye.png differ diff --git a/client/src/main/resources/textures/items/feather.png b/client/src/main/resources/textures/items/feather.png index d4c3be55..820f2c4b 100755 Binary files a/client/src/main/resources/textures/items/feather.png and b/client/src/main/resources/textures/items/feather.png differ diff --git a/client/src/main/resources/textures/items/fermented_spider_eye.png b/client/src/main/resources/textures/items/fermented_spider_eye.png deleted file mode 100755 index 226ffb89..00000000 Binary files a/client/src/main/resources/textures/items/fermented_spider_eye.png and /dev/null differ diff --git a/client/src/main/resources/textures/items/fireball.png b/client/src/main/resources/textures/items/fireball.png index d62a6f47..4d71fcf8 100755 Binary files a/client/src/main/resources/textures/items/fireball.png and b/client/src/main/resources/textures/items/fireball.png differ diff --git a/client/src/main/resources/textures/items/flint.png b/client/src/main/resources/textures/items/flint.png index 5f51093f..8dff9786 100755 Binary files a/client/src/main/resources/textures/items/flint.png and b/client/src/main/resources/textures/items/flint.png differ diff --git a/client/src/main/resources/textures/items/ghi_fragment.png b/client/src/main/resources/textures/items/ghi_fragment.png index c89a9309..32547ded 100755 Binary files a/client/src/main/resources/textures/items/ghi_fragment.png and b/client/src/main/resources/textures/items/ghi_fragment.png differ diff --git a/client/src/main/resources/textures/items/glowing_powder.png b/client/src/main/resources/textures/items/glowing_powder.png new file mode 100755 index 00000000..edc3a97c Binary files /dev/null and b/client/src/main/resources/textures/items/glowing_powder.png differ diff --git a/client/src/main/resources/textures/items/glowstone_dust.png b/client/src/main/resources/textures/items/glowstone_dust.png deleted file mode 100755 index edd93a6d..00000000 Binary files a/client/src/main/resources/textures/items/glowstone_dust.png and /dev/null differ diff --git a/client/src/main/resources/textures/items/gold_coin.png b/client/src/main/resources/textures/items/gold_coin.png index 453d6e07..4f7b065e 100755 Binary files a/client/src/main/resources/textures/items/gold_coin.png and b/client/src/main/resources/textures/items/gold_coin.png differ diff --git a/client/src/main/resources/textures/items/gold_ingot.png b/client/src/main/resources/textures/items/gold_ingot.png index ea781e71..5e5abc0d 100755 Binary files a/client/src/main/resources/textures/items/gold_ingot.png and b/client/src/main/resources/textures/items/gold_ingot.png differ diff --git a/client/src/main/resources/textures/items/gold_nugget.png b/client/src/main/resources/textures/items/gold_nugget.png index 3a9a2fe4..8be48cc7 100755 Binary files a/client/src/main/resources/textures/items/gold_nugget.png and b/client/src/main/resources/textures/items/gold_nugget.png differ diff --git a/client/src/main/resources/textures/items/gunpowder.png b/client/src/main/resources/textures/items/gunpowder.png index 73cadece..e9cbde3d 100755 Binary files a/client/src/main/resources/textures/items/gunpowder.png and b/client/src/main/resources/textures/items/gunpowder.png differ diff --git a/client/src/main/resources/textures/items/ink_sack.png b/client/src/main/resources/textures/items/ink_sack.png index 162715a4..7da90cca 100755 Binary files a/client/src/main/resources/textures/items/ink_sack.png and b/client/src/main/resources/textures/items/ink_sack.png differ diff --git a/client/src/main/resources/textures/items/iodine_powder.png b/client/src/main/resources/textures/items/iodine_powder.png index 41cbca17..2a2a9505 100755 Binary files a/client/src/main/resources/textures/items/iodine_powder.png and b/client/src/main/resources/textures/items/iodine_powder.png differ diff --git a/client/src/main/resources/textures/items/iron_ingot.png b/client/src/main/resources/textures/items/iron_ingot.png index 3833fa05..0b6c793e 100644 Binary files a/client/src/main/resources/textures/items/iron_ingot.png and b/client/src/main/resources/textures/items/iron_ingot.png differ diff --git a/client/src/main/resources/textures/items/lapis_lazuli.png b/client/src/main/resources/textures/items/lapis_lazuli.png index 4713983e..750755f4 100755 Binary files a/client/src/main/resources/textures/items/lapis_lazuli.png and b/client/src/main/resources/textures/items/lapis_lazuli.png differ diff --git a/client/src/main/resources/textures/items/lead_ingot.png b/client/src/main/resources/textures/items/lead_ingot.png index 48d97a90..5be4820a 100755 Binary files a/client/src/main/resources/textures/items/lead_ingot.png and b/client/src/main/resources/textures/items/lead_ingot.png differ diff --git a/client/src/main/resources/textures/items/leather.png b/client/src/main/resources/textures/items/leather.png index 13dc1998..66f67715 100755 Binary files a/client/src/main/resources/textures/items/leather.png and b/client/src/main/resources/textures/items/leather.png differ diff --git a/client/src/main/resources/textures/items/lithium_ingot.png b/client/src/main/resources/textures/items/lithium_ingot.png index 8da19576..84b65c3b 100755 Binary files a/client/src/main/resources/textures/items/lithium_ingot.png and b/client/src/main/resources/textures/items/lithium_ingot.png differ diff --git a/client/src/main/resources/textures/items/magma_cream.png b/client/src/main/resources/textures/items/magma_cream.png deleted file mode 100755 index b2be210c..00000000 Binary files a/client/src/main/resources/textures/items/magma_cream.png and /dev/null differ diff --git a/client/src/main/resources/textures/items/magnesium_powder.png b/client/src/main/resources/textures/items/magnesium_powder.png index 21098a65..107943c2 100755 Binary files a/client/src/main/resources/textures/items/magnesium_powder.png and b/client/src/main/resources/textures/items/magnesium_powder.png differ diff --git a/client/src/main/resources/textures/items/magnet.png b/client/src/main/resources/textures/items/magnet.png index 93d0518c..77d99028 100755 Binary files a/client/src/main/resources/textures/items/magnet.png and b/client/src/main/resources/textures/items/magnet.png differ diff --git a/client/src/main/resources/textures/items/manganese_ingot.png b/client/src/main/resources/textures/items/manganese_ingot.png index e8b7efa6..03195b2e 100755 Binary files a/client/src/main/resources/textures/items/manganese_ingot.png and b/client/src/main/resources/textures/items/manganese_ingot.png differ diff --git a/client/src/main/resources/textures/items/minecart.png b/client/src/main/resources/textures/items/minecart.png index 2046f2bc..364ca0cd 100755 Binary files a/client/src/main/resources/textures/items/minecart.png and b/client/src/main/resources/textures/items/minecart.png differ diff --git a/client/src/main/resources/textures/items/mushroom_stew.png b/client/src/main/resources/textures/items/mushroom_stew.png deleted file mode 100755 index 5598bc78..00000000 Binary files a/client/src/main/resources/textures/items/mushroom_stew.png and /dev/null differ diff --git a/client/src/main/resources/textures/items/navigator.png b/client/src/main/resources/textures/items/navigator.png index 3715ee42..6281123a 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/items/neodymium_ingot.png b/client/src/main/resources/textures/items/neodymium_ingot.png index b015a963..0a829324 100755 Binary files a/client/src/main/resources/textures/items/neodymium_ingot.png and b/client/src/main/resources/textures/items/neodymium_ingot.png differ diff --git a/client/src/main/resources/textures/items/neptunium_ingot.png b/client/src/main/resources/textures/items/neptunium_ingot.png index 0f5070e2..ef59afe0 100755 Binary files a/client/src/main/resources/textures/items/neptunium_ingot.png and b/client/src/main/resources/textures/items/neptunium_ingot.png differ diff --git a/client/src/main/resources/textures/items/nickel_ingot.png b/client/src/main/resources/textures/items/nickel_ingot.png index d0ef7b0e..9f27c755 100755 Binary files a/client/src/main/resources/textures/items/nickel_ingot.png and b/client/src/main/resources/textures/items/nickel_ingot.png differ diff --git a/client/src/main/resources/textures/items/nieh_fragment.png b/client/src/main/resources/textures/items/nieh_fragment.png index 5f63fdaa..e8dae45f 100755 Binary files a/client/src/main/resources/textures/items/nieh_fragment.png and b/client/src/main/resources/textures/items/nieh_fragment.png differ diff --git a/client/src/main/resources/textures/items/palladium_ingot.png b/client/src/main/resources/textures/items/palladium_ingot.png index fad31977..9381d7b7 100755 Binary files a/client/src/main/resources/textures/items/palladium_ingot.png and b/client/src/main/resources/textures/items/palladium_ingot.png differ diff --git a/client/src/main/resources/textures/items/paper.png b/client/src/main/resources/textures/items/paper.png index a1d9c7e2..44ab3a2b 100755 Binary files a/client/src/main/resources/textures/items/paper.png and b/client/src/main/resources/textures/items/paper.png differ diff --git a/client/src/main/resources/textures/items/phosphor_powder.png b/client/src/main/resources/textures/items/phosphor_powder.png index df5d136b..c53b6d5a 100755 Binary files a/client/src/main/resources/textures/items/phosphor_powder.png and b/client/src/main/resources/textures/items/phosphor_powder.png differ diff --git a/client/src/main/resources/textures/items/platinum_ingot.png b/client/src/main/resources/textures/items/platinum_ingot.png index d39193e1..043f8d0c 100755 Binary files a/client/src/main/resources/textures/items/platinum_ingot.png and b/client/src/main/resources/textures/items/platinum_ingot.png differ diff --git a/client/src/main/resources/textures/items/plutonium_ingot.png b/client/src/main/resources/textures/items/plutonium_ingot.png index 9ba95dbc..12701263 100755 Binary files a/client/src/main/resources/textures/items/plutonium_ingot.png and b/client/src/main/resources/textures/items/plutonium_ingot.png differ diff --git a/client/src/main/resources/textures/items/potassium_powder.png b/client/src/main/resources/textures/items/potassium_powder.png index da32e5d4..dcd8d6a3 100755 Binary files a/client/src/main/resources/textures/items/potassium_powder.png and b/client/src/main/resources/textures/items/potassium_powder.png differ diff --git a/client/src/main/resources/textures/items/potion_overlay.png b/client/src/main/resources/textures/items/potion_overlay.png index 61864e9b..716ae511 100755 Binary files a/client/src/main/resources/textures/items/potion_overlay.png and b/client/src/main/resources/textures/items/potion_overlay.png differ diff --git a/client/src/main/resources/textures/items/praseodymium_ingot.png b/client/src/main/resources/textures/items/praseodymium_ingot.png index c98d7f80..2887e174 100755 Binary files a/client/src/main/resources/textures/items/praseodymium_ingot.png and b/client/src/main/resources/textures/items/praseodymium_ingot.png differ diff --git a/client/src/main/resources/textures/items/pufferfish.png b/client/src/main/resources/textures/items/pufferfish.png deleted file mode 100755 index aadbd88e..00000000 Binary files a/client/src/main/resources/textures/items/pufferfish.png and /dev/null differ diff --git a/client/src/main/resources/textures/items/pumpkin_pie.png b/client/src/main/resources/textures/items/pumpkin_pie.png deleted file mode 100755 index c21a032b..00000000 Binary files a/client/src/main/resources/textures/items/pumpkin_pie.png and /dev/null differ diff --git a/client/src/main/resources/textures/items/quartz.png b/client/src/main/resources/textures/items/quartz.png index e403446a..55d1abbd 100755 Binary files a/client/src/main/resources/textures/items/quartz.png and b/client/src/main/resources/textures/items/quartz.png differ diff --git a/client/src/main/resources/textures/items/radium_ingot.png b/client/src/main/resources/textures/items/radium_ingot.png index 75d7c141..9df5810d 100755 Binary files a/client/src/main/resources/textures/items/radium_ingot.png and b/client/src/main/resources/textures/items/radium_ingot.png differ diff --git a/client/src/main/resources/textures/items/red_bed.png b/client/src/main/resources/textures/items/red_bed.png deleted file mode 100755 index 22a4cf04..00000000 Binary files a/client/src/main/resources/textures/items/red_bed.png and /dev/null differ diff --git a/client/src/main/resources/textures/items/rocket.png b/client/src/main/resources/textures/items/rocket.png index 21fe0ea1..ecccb904 100755 Binary files a/client/src/main/resources/textures/items/rocket.png and b/client/src/main/resources/textures/items/rocket.png differ diff --git a/client/src/main/resources/textures/items/rotten_flesh.png b/client/src/main/resources/textures/items/rotten_flesh.png index 3f39998e..5b3f1646 100755 Binary files a/client/src/main/resources/textures/items/rotten_flesh.png and b/client/src/main/resources/textures/items/rotten_flesh.png differ diff --git a/client/src/main/resources/textures/items/ruby.png b/client/src/main/resources/textures/items/ruby.png index 21ef97f4..a8ca679f 100755 Binary files a/client/src/main/resources/textures/items/ruby.png and b/client/src/main/resources/textures/items/ruby.png differ diff --git a/client/src/main/resources/textures/items/scanner.png b/client/src/main/resources/textures/items/scanner.png index b457495b..d816f5f8 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/items/selenium_powder.png b/client/src/main/resources/textures/items/selenium_powder.png index 25291613..0abd4a16 100755 Binary files a/client/src/main/resources/textures/items/selenium_powder.png and b/client/src/main/resources/textures/items/selenium_powder.png differ diff --git a/client/src/main/resources/textures/items/silicon_ingot.png b/client/src/main/resources/textures/items/silicon_ingot.png index 814f4b1f..7e149413 100755 Binary files a/client/src/main/resources/textures/items/silicon_ingot.png and b/client/src/main/resources/textures/items/silicon_ingot.png differ diff --git a/client/src/main/resources/textures/items/silver_ingot.png b/client/src/main/resources/textures/items/silver_ingot.png index 940067f6..7d5cb4ae 100755 Binary files a/client/src/main/resources/textures/items/silver_ingot.png and b/client/src/main/resources/textures/items/silver_ingot.png differ diff --git a/client/src/main/resources/textures/items/skull.png b/client/src/main/resources/textures/items/skull.png index 835979f5..e39fecdd 100644 Binary files a/client/src/main/resources/textures/items/skull.png and b/client/src/main/resources/textures/items/skull.png differ diff --git a/client/src/main/resources/textures/items/slime_ball.png b/client/src/main/resources/textures/items/slime_ball.png deleted file mode 100755 index 46478ee0..00000000 Binary files a/client/src/main/resources/textures/items/slime_ball.png and /dev/null differ diff --git a/client/src/main/resources/textures/items/slime_blob.png b/client/src/main/resources/textures/items/slime_blob.png new file mode 100755 index 00000000..953ca49a Binary files /dev/null and b/client/src/main/resources/textures/items/slime_blob.png differ diff --git a/client/src/main/resources/textures/items/snowball.png b/client/src/main/resources/textures/items/snowball.png index 340c6398..7121ab27 100755 Binary files a/client/src/main/resources/textures/items/snowball.png and b/client/src/main/resources/textures/items/snowball.png differ diff --git a/client/src/main/resources/textures/items/sodium_powder.png b/client/src/main/resources/textures/items/sodium_powder.png index 1c9e7742..9f4ad225 100755 Binary files a/client/src/main/resources/textures/items/sodium_powder.png and b/client/src/main/resources/textures/items/sodium_powder.png differ diff --git a/client/src/main/resources/textures/items/speckled_melon.png b/client/src/main/resources/textures/items/speckled_melon.png deleted file mode 100755 index dee1bf56..00000000 Binary files a/client/src/main/resources/textures/items/speckled_melon.png and /dev/null differ diff --git a/client/src/main/resources/textures/items/spider_eye.png b/client/src/main/resources/textures/items/spider_eye.png deleted file mode 100755 index 35d85843..00000000 Binary files a/client/src/main/resources/textures/items/spider_eye.png and /dev/null differ diff --git a/client/src/main/resources/textures/items/stick.png b/client/src/main/resources/textures/items/stick.png index 6f8ce13b..e5f6fd77 100755 Binary files a/client/src/main/resources/textures/items/stick.png and b/client/src/main/resources/textures/items/stick.png differ diff --git a/client/src/main/resources/textures/items/sugar.png b/client/src/main/resources/textures/items/sugar.png index 0864df94..01d5a87a 100755 Binary files a/client/src/main/resources/textures/items/sugar.png and b/client/src/main/resources/textures/items/sugar.png differ diff --git a/client/src/main/resources/textures/items/sulfur_powder.png b/client/src/main/resources/textures/items/sulfur_powder.png index 5c1a8f11..651b1dd4 100755 Binary files a/client/src/main/resources/textures/items/sulfur_powder.png and b/client/src/main/resources/textures/items/sulfur_powder.png differ diff --git a/client/src/main/resources/textures/items/thi_fragment.png b/client/src/main/resources/textures/items/thi_fragment.png index 90abf54b..a4cc7759 100755 Binary files a/client/src/main/resources/textures/items/thi_fragment.png and b/client/src/main/resources/textures/items/thi_fragment.png differ diff --git a/client/src/main/resources/textures/items/tin_ingot.png b/client/src/main/resources/textures/items/tin_ingot.png index 95eb514c..4013652c 100755 Binary files a/client/src/main/resources/textures/items/tin_ingot.png and b/client/src/main/resources/textures/items/tin_ingot.png differ diff --git a/client/src/main/resources/textures/items/titanium_ingot.png b/client/src/main/resources/textures/items/titanium_ingot.png index 24fbe4b7..4e0f6eff 100755 Binary files a/client/src/main/resources/textures/items/titanium_ingot.png and b/client/src/main/resources/textures/items/titanium_ingot.png differ diff --git a/client/src/main/resources/textures/items/tnt_minecart.png b/client/src/main/resources/textures/items/tnt_minecart.png deleted file mode 100755 index 561279b7..00000000 Binary files a/client/src/main/resources/textures/items/tnt_minecart.png and /dev/null differ diff --git a/client/src/main/resources/textures/items/trident.png b/client/src/main/resources/textures/items/trident.png index b51ed3d8..43b21046 100755 Binary files a/client/src/main/resources/textures/items/trident.png and b/client/src/main/resources/textures/items/trident.png differ diff --git a/client/src/main/resources/textures/items/tungsten_ingot.png b/client/src/main/resources/textures/items/tungsten_ingot.png index a10133d6..ed05530e 100755 Binary files a/client/src/main/resources/textures/items/tungsten_ingot.png and b/client/src/main/resources/textures/items/tungsten_ingot.png differ diff --git a/client/src/main/resources/textures/items/uranium_ingot.png b/client/src/main/resources/textures/items/uranium_ingot.png index c8dcafec..6984af5d 100755 Binary files a/client/src/main/resources/textures/items/uranium_ingot.png and b/client/src/main/resources/textures/items/uranium_ingot.png differ diff --git a/client/src/main/resources/textures/items/vanadium_ingot.png b/client/src/main/resources/textures/items/vanadium_ingot.png index e6c70441..130412b4 100755 Binary files a/client/src/main/resources/textures/items/vanadium_ingot.png and b/client/src/main/resources/textures/items/vanadium_ingot.png differ diff --git a/client/src/main/resources/textures/items/writable_book.png b/client/src/main/resources/textures/items/writable_book.png deleted file mode 100755 index fa95246a..00000000 Binary files a/client/src/main/resources/textures/items/writable_book.png and /dev/null differ diff --git a/client/src/main/resources/textures/items/written_book.png b/client/src/main/resources/textures/items/written_book.png deleted file mode 100755 index b2a2aa8e..00000000 Binary files a/client/src/main/resources/textures/items/written_book.png and /dev/null differ diff --git a/client/src/main/resources/textures/items/zinc_ingot.png b/client/src/main/resources/textures/items/zinc_ingot.png index 10e86500..ff9a3eaa 100755 Binary files a/client/src/main/resources/textures/items/zinc_ingot.png and b/client/src/main/resources/textures/items/zinc_ingot.png differ diff --git a/common/src/main/java/common/block/natural/BlockClay.java b/common/src/main/java/common/block/natural/BlockClay.java index 3beac4de..3c5a637c 100755 --- a/common/src/main/java/common/block/natural/BlockClay.java +++ b/common/src/main/java/common/block/natural/BlockClay.java @@ -21,7 +21,7 @@ public class BlockClay extends Block */ public Item getDrop(State state, Random rand, int fortune) { - return Items.clay_ball; + return Items.clay_lump; } /** diff --git a/common/src/main/java/common/block/natural/BlockGlowstone.java b/common/src/main/java/common/block/natural/BlockGlowstone.java index ab7f99e9..ca1677d1 100755 --- a/common/src/main/java/common/block/natural/BlockGlowstone.java +++ b/common/src/main/java/common/block/natural/BlockGlowstone.java @@ -42,7 +42,7 @@ public class BlockGlowstone extends Block */ public Item getDrop(State state, Random rand, int fortune) { - return Items.glowstone_dust; + return Items.glowing_powder; } @Serverside diff --git a/common/src/main/java/common/entity/item/EntityTntCart.java b/common/src/main/java/common/entity/item/EntityTntCart.java index ed12c14c..f5a79342 100755 --- a/common/src/main/java/common/entity/item/EntityTntCart.java +++ b/common/src/main/java/common/entity/item/EntityTntCart.java @@ -221,7 +221,7 @@ public class EntityTntCart extends EntityCart } public Item getItem() { - return Items.tnt_minecart; + return Items.minecart; } public EntityType getType() { diff --git a/common/src/main/java/common/entity/item/EntityXpBottle.java b/common/src/main/java/common/entity/item/EntityXpBottle.java deleted file mode 100755 index 14ccf806..00000000 --- a/common/src/main/java/common/entity/item/EntityXpBottle.java +++ /dev/null @@ -1,64 +0,0 @@ -package common.entity.item; - -import common.entity.types.EntityLiving; -import common.entity.types.EntityThrowable; -import common.util.BlockPos; -import common.util.HitPosition; -import common.world.World; - -public class EntityXpBottle extends EntityThrowable -{ - public EntityXpBottle(World worldIn) - { - super(worldIn); - } - - public EntityXpBottle(World worldIn, EntityLiving p_i1786_2_) - { - super(worldIn, p_i1786_2_); - } - - public EntityXpBottle(World worldIn, double x, double y, double z) - { - super(worldIn, x, y, z); - } - - /** - * Gets the amount of gravity to apply to the thrown entity with each tick. - */ - protected float getGravityVelocity() - { - return 0.07F; - } - - protected float getVelocity() - { - return 0.7F; - } - - protected float getInaccuracy() - { - return -20.0F; - } - - /** - * Called when this EntityThrowable hits a block or entity. - */ - protected void onImpact(HitPosition p_70184_1_) - { - if (!this.worldObj.client) - { - this.worldObj.playEffect(2002, new BlockPos(this), 0); - int i = this.worldObj.rand.rangeBonus(3, 7, 4); - - while (i > 0) - { - int j = EntityXp.getXPSplit(i); - i -= j; - this.worldObj.spawnEntityInWorld(new EntityXp(this.worldObj, this.posX, this.posY, this.posZ, j)); - } - - this.setDead(); - } - } -} diff --git a/common/src/main/java/common/entity/npc/EntitySlime.java b/common/src/main/java/common/entity/npc/EntitySlime.java index 997ce449..f8df31c3 100755 --- a/common/src/main/java/common/entity/npc/EntitySlime.java +++ b/common/src/main/java/common/entity/npc/EntitySlime.java @@ -180,7 +180,7 @@ public class EntitySlime extends EntityNPC World world = this.worldObj; double d0 = this.posX + (double)f2; double d1 = this.posZ + (double)f3; - world.clientParticle(ParticleType.ITEM_CRACK, d0, this.getEntityBoundingBox().minY, d1, ItemRegistry.getId(Items.slime_ball)); + world.clientParticle(ParticleType.ITEM_CRACK, d0, this.getEntityBoundingBox().minY, d1, ItemRegistry.getId(Items.slime_blob)); } // if (!this.isChild()) diff --git a/common/src/main/java/common/entity/projectile/FishConstants.java b/common/src/main/java/common/entity/projectile/FishConstants.java index 1710aff0..6448f639 100644 --- a/common/src/main/java/common/entity/projectile/FishConstants.java +++ b/common/src/main/java/common/entity/projectile/FishConstants.java @@ -9,8 +9,7 @@ public abstract class FishConstants { (new RngFishable(new ItemStack(Items.leather_boots), 10)).setMaxDamagePercent(0.9F), new RngFishable(new ItemStack(Items.leather), 10), new RngFishable(new ItemStack(Items.bone), 10), new RngFishable(new ItemStack(Items.water_bottle), 10), new RngFishable(new ItemStack(Items.string), 5), (new RngFishable(new ItemStack(Items.fishing_rod), 2)).setMaxDamagePercent(0.9F), - new RngFishable(new ItemStack(Items.bowl), 10), new RngFishable(new ItemStack(Items.stick), 5), - new RngFishable(new ItemStack(Items.ink_sack, 10), 1), + new RngFishable(new ItemStack(Items.stick), 5), new RngFishable(new ItemStack(Items.ink_sack, 10), 1), new RngFishable(new ItemStack(Items.tripwire_hook), 10), new RngFishable(new ItemStack(Items.rotten_flesh), 10)); public static final WeightedList FISHING_TREASURE = new WeightedList( new RngFishable(new ItemStack(Items.waterlily), 1), new RngFishable(new ItemStack(Items.name_tag), 1), @@ -20,7 +19,5 @@ public abstract class FishConstants { (new RngFishable(new ItemStack(Items.book), 1)).setEnchantable()); public static final WeightedList FISH_TYPES = new WeightedList( new RngFishable(new ItemStack(Items.cod), 60), - new RngFishable(new ItemStack(Items.salmon), 25), - new RngFishable(new ItemStack(Items.clownfish), 2), - new RngFishable(new ItemStack(Items.pufferfish), 13)); + new RngFishable(new ItemStack(Items.salmon), 25)); } diff --git a/common/src/main/java/common/init/CraftingRegistry.java b/common/src/main/java/common/init/CraftingRegistry.java index ed6ce1dd..54fe3081 100755 --- a/common/src/main/java/common/init/CraftingRegistry.java +++ b/common/src/main/java/common/init/CraftingRegistry.java @@ -36,7 +36,7 @@ public abstract class CraftingRegistry {Items.charged_block, new ItemStack(Items.charged_powder, 9)}, {Items.coal_block, new ItemStack(Items.coal, 9)}, {Items.hay_block, new ItemStack(Items.wheat, 9)}, - {Items.slime_block, new ItemStack(Items.slime_ball, 9)} + {Items.slime_block, new ItemStack(Items.slime_blob, 9)} }; private static final List recipes = Lists.newArrayList(); @@ -133,15 +133,11 @@ public abstract class CraftingRegistry add(new ItemStack(Items.gold_ingot), "###", "###", "###", '#', Items.gold_nugget); add(new ItemStack(Items.gold_nugget, 9), "#", '#', Items.gold_ingot); - addShapeless(new ItemStack(Items.mushroom_stew), Items.brown_mushroom, Items.red_mushroom, Items.bowl); add(new ItemStack(Items.cookie, 8), "#X#", 'X', Items.cocoa_powder, '#', Items.wheat); add(new ItemStack(Items.melon_block), "MMM", "MMM", "MMM", 'M', Items.melon); add(new ItemStack(Items.melon_seed), "M", 'M', Items.melon); add(new ItemStack(Items.pumpkin_seed, 4), "M", 'M', Items.pumpkin); - addShapeless(new ItemStack(Items.pumpkin_pie), Items.pumpkin, Items.sugar, Items.egg); - addShapeless(new ItemStack(Items.fermented_spider_eye), Items.spider_eye, Items.brown_mushroom, Items.sugar); addShapeless(new ItemStack(Items.blazing_powder, 2), Items.demon_rod); - addShapeless(new ItemStack(Items.magma_cream), Items.blazing_powder, Items.slime_ball); add(new ItemStack(Items.warp_chest), "###", "#E#", "###", '#', Items.obsidian, 'E', Items.charged_orb); add(new ItemStack(Items.furnace), "###", "# #", "###", '#', Items.cobblestone); @@ -210,7 +206,6 @@ public abstract class CraftingRegistry add(new ItemStack(Items.paper, 3), "###", '#', Items.reeds); addShapeless(new ItemStack(Items.book, 1), Items.paper, Items.paper, Items.paper, Items.leather); - addShapeless(new ItemStack(Items.writable_book, 1), Items.book, Items.ink_sack, Items.feather); for(WoodType wood : WoodType.values()) { Item planks = ItemRegistry.byName(wood.getName() + "_planks"); add(new ItemStack(ItemRegistry.byName(wood.getName() + "_fence"), 3), "W#W", "W#W", '#', Items.stick, 'W', planks); @@ -230,7 +225,6 @@ public abstract class CraftingRegistry add(new ItemStack(Items.trapdoor, 2), "###", "###", '#', planks); add(new ItemStack(Items.sign, 3), "###", "###", " X ", '#', planks, 'X', Items.stick); add(new ItemStack(Items.stick, 4), "#", "#", '#', planks); - add(new ItemStack(Items.bowl, 4), "# #", " # ", '#', planks); add(new ItemStack(Items.boat, 1), "# #", "###", '#', planks); add(new ItemStack(Items.tripwire_hook, 2), "I", "S", "#", '#', planks, 'S', Items.stick, 'I', Items.iron_ingot); add(new ItemStack(Items.wooden_button, 1), "#", '#', planks); @@ -245,12 +239,12 @@ public abstract class CraftingRegistry add(new ItemStack(Items.mossy_cobblestone_wall, 6), "###", "###", '#', Items.mossy_cobblestone); add(new ItemStack(Items.blood_brick_fence, 6), "###", "###", '#', Items.blood_brick); - add(new ItemStack(Items.lead, 2), "~~ ", "~O ", " ~", '~', Items.string, 'O', Items.slime_ball); + add(new ItemStack(Items.lead, 2), "~~ ", "~O ", " ~", '~', Items.string, 'O', Items.slime_blob); add(new ItemStack(Items.snow, 1), "##", "##", '#', Items.snowball); add(new ItemStack(Items.snow_layer, 6), "###", '#', Items.snow); - add(new ItemStack(Items.clay, 1), "##", "##", '#', Items.clay_ball); + add(new ItemStack(Items.clay, 1), "##", "##", '#', Items.clay_lump); add(new ItemStack(Items.brick_block, 1), "##", "##", '#', Items.brick); - add(new ItemStack(Items.glowstone, 1), "##", "##", '#', Items.glowstone_dust); + add(new ItemStack(Items.glowstone, 1), "##", "##", '#', Items.glowing_powder); add(new ItemStack(Items.quartz_block, 1), "##", "##", '#', Items.quartz); add(new ItemStack(Items.white_wool, 1), "##", "##", '#', Items.string); add(new ItemStack(Items.tnt, 1), "X#X", "#X#", "X#X", 'X', Items.gunpowder, '#', Items.sand); @@ -278,7 +272,6 @@ public abstract class CraftingRegistry add(new ItemStack(Items.minecart, 1), "# #", "###", '#', Items.iron_ingot); add(new ItemStack(Items.cauldron, 1), "# #", "# #", "###", '#', Items.iron_ingot); add(new ItemStack(Items.brewing_stand, 1), " B ", "###", '#', Items.cobblestone, 'B', Items.demon_rod); - add(new ItemStack(Items.tnt_minecart, 1), "A", "B", 'A', Items.tnt, 'B', Items.minecart); add(new ItemStack(Items.bucket, 1), "# #", " # ", '#', Items.iron_ingot); add(new ItemStack(Items.flowerpot, 1), "# #", " # ", '#', Items.brick); addShapeless(new ItemStack(Items.lighter, 1), new ItemStack(Items.iron_ingot, 1), new ItemStack(Items.flint, 1)); @@ -295,7 +288,6 @@ public abstract class CraftingRegistry 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.speckled_melon, 1), "###", "#X#", "###", '#', Items.gold_nugget, 'X', Items.melon); 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); @@ -304,7 +296,7 @@ public abstract class CraftingRegistry add(new ItemStack(Items.light_weighted_pressure_plate, 1), "##", '#', Items.gold_ingot); add(new ItemStack(Items.dispenser, 1), "###", "#X#", "#R#", '#', Items.cobblestone, 'X', Items.bow, 'R', Items.charged_powder); add(new ItemStack(Items.dropper, 1), "###", "# #", "#R#", '#', Items.cobblestone, 'R', Items.charged_powder); - add(new ItemStack(Items.sticky_piston, 1), "S", "P", 'S', Items.slime_ball, 'P', Items.piston); + add(new ItemStack(Items.sticky_piston, 1), "S", "P", 'S', Items.slime_blob, 'P', Items.piston); add(new ItemStack(Items.enchanting_table, 1), " B ", "D#D", "###", '#', Items.obsidian, 'B', Items.book, 'D', Items.diamond); add(new ItemStack(Items.anvil, 1), "III", " i ", "iii", 'I', Items.iron_block, 'i', Items.iron_ingot); addShapeless(new ItemStack(Items.charged_orb, 1), Items.orb, Items.blazing_powder); @@ -313,7 +305,7 @@ public abstract class CraftingRegistry add(new ItemStack(Items.hopper), "I I", "ICI", " I ", 'I', Items.iron_ingot, 'C', Items.chest); - add(new ItemStack(Items.dynamite, 1), "X#X", "#X#", "X#X", 'X', Items.gunpowder, '#', Items.clay_ball); + add(new ItemStack(Items.dynamite, 1), "X#X", "#X#", "X#X", 'X', Items.gunpowder, '#', Items.clay_lump); add(new ItemStack(Items.dynamite_1), "X#X", "#X#", "X#X", 'X', Items.gunpowder, '#', Items.dynamite); add(new ItemStack(Items.dynamite_2), "##", "##", '#', Items.dynamite_1); addShapeless(new ItemStack(Items.dynamite_3), Items.dynamite_2, Items.dynamite_2); @@ -323,7 +315,6 @@ public abstract class CraftingRegistry addShapeless(new ItemStack(Items.dynamite_7), Items.dynamite_6, Items.dynamite_6); add(new ItemStack(Items.portal_frame, 1), "XYX", "X#X", "XXX", 'X', Items.obsidian, 'Y', Items.orb, '#', Items.charged_orb); - add(new ItemStack(Items.experience_bottle, 1), "YXY", "X#X", "YXY", 'X', Items.glass_pane, 'Y', Items.glowstone, '#', Items.emerald); add(new ItemStack(Items.mob_spawner, 1), "###", "#X#", "###", 'X', Items.charge_crystal, '#', Items.iron_bars); add(new ItemStack(Items.dragon_egg, 1), "###", "#X#", "#D#", 'X', Items.charge_crystal, 'D', Items.diamond, '#', Items.obsidian); diff --git a/common/src/main/java/common/init/EntityRegistry.java b/common/src/main/java/common/init/EntityRegistry.java index 6d07e865..f98da0ef 100755 --- a/common/src/main/java/common/init/EntityRegistry.java +++ b/common/src/main/java/common/init/EntityRegistry.java @@ -29,7 +29,6 @@ import common.entity.item.EntityOrb; import common.entity.item.EntityTnt; import common.entity.item.EntityTntCart; import common.entity.item.EntityXp; -import common.entity.item.EntityXpBottle; import common.entity.npc.SpeciesInfo; import common.entity.projectile.EntityArrow; import common.entity.projectile.EntityBox; @@ -245,7 +244,6 @@ public abstract class EntityRegistry { registerEntity("FireCharge", EntityFireCharge.class, "Feuerkugel"); registerEntity("Orb", EntityOrb.class, "Geladene Kugel"); registerEntity("Potion", EntityPotion.class, "Trank"); - registerEntity("XpBottle", EntityXpBottle.class, "Erfahrungsfläschchen"); registerEntity("Box", EntityBox.class, "Eisenwürfel"); registerEntity("Tnt", EntityTnt.class, "TNT"); registerEntity("Falling", EntityFalling.class, "Fallender Block"); diff --git a/common/src/main/java/common/init/ItemRegistry.java b/common/src/main/java/common/init/ItemRegistry.java index a5ee760f..76282557 100755 --- a/common/src/main/java/common/init/ItemRegistry.java +++ b/common/src/main/java/common/init/ItemRegistry.java @@ -32,7 +32,6 @@ import common.item.consumable.ItemFishFood; import common.item.consumable.ItemFood; import common.item.consumable.ItemPotion; import common.item.consumable.ItemSeedFood; -import common.item.consumable.ItemSoup; import common.item.material.ItemArmor; import common.item.material.ItemBook; import common.item.material.ItemBottle; @@ -47,7 +46,6 @@ import common.item.projectile.ItemChargedOrb; import common.item.projectile.ItemDie; import common.item.projectile.ItemDynamite; import common.item.projectile.ItemEgg; -import common.item.projectile.ItemExpBottle; import common.item.projectile.ItemFireball; import common.item.projectile.ItemSnowball; import common.item.spawner.ItemBoat; @@ -182,9 +180,7 @@ public abstract class ItemRegistry { register("milk_bucket", (new ItemBucketMilk()).setDisplay("Milch").setContainerItem(bucket)); register("boat", (new ItemBoat()).setDisplay("Boot")); - register("minecart", (new ItemMinecart(false)).setDisplay("Lore")); - register("tnt_minecart", (new ItemMinecart(true)).setDisplay("TNT-Lore") - .setColor(TextColor.RED)); + register("minecart", (new ItemMinecart()).setDisplay("Lore")); for(EntityInfo egg : EntityRegistry.DNA.values()) { register("dna_sample_" + egg.id().toLowerCase(), (new ItemMobTemplate(egg.id())) .setMaxAmount(StackSize.L)); @@ -235,8 +231,6 @@ public abstract class ItemRegistry { register("coal", coal); register("charcoal", (new Item()).setDisplay("Holzkohle").setTab(CheatTab.METALS)); register("stick", (new Item()).setDisplay("Stock").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XL)); - register("bowl", (new Item()).setDisplay("Schüssel").setTab(CheatTab.MISC)); - register("mushroom_stew", (new ItemSoup(6)).setDisplay("Pilzsuppe")); register("feather", (new Item()).setDisplay("Feder").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XXL)); register("gunpowder", (new Item()).setDisplay("Schwarzpulver").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XL)); register("wheat", (new Item()).setDisplay("Weizen").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.L)); @@ -252,20 +246,19 @@ public abstract class ItemRegistry { register("snowball", (new ItemSnowball()).setDisplay("Schneeball").setMaxAmount(StackSize.L)); register("leather", (new Item()).setDisplay("Leder").setTab(CheatTab.MATERIALS)); register("brick", (new Item()).setDisplay("Ziegel").setTab(CheatTab.MATERIALS)); - register("clay_ball", (new Item()).setDisplay("Ton").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.L)); + register("clay_lump", (new Item()).setDisplay("Ton").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.L)); register("paper", (new Item()).setDisplay("Papier").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XL).setDefaultColor(0xffffff)); register("book", (new ItemBook()).setDisplay("Buch").setTab(CheatTab.MISC)); - register("slime_ball", (new Item()).setDisplay("Schleimball").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.L)); + register("slime_blob", (new Item()).setDisplay("Schleim").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.L)); register("egg", (new ItemEgg()).setDisplay("Ei").setMaxAmount(StackSize.L)); register("navigator", (new ItemSpaceNavigator()).setDisplay("Elektronischer Navigator").setTab(CheatTab.TOOLS)); register("exterminator", (new ItemExterminator()).setDisplay("Weltenzerstörer")); register("fishing_rod", (new ItemFishingRod()).setDisplay("Angel")); - register("glowstone_dust", (new Item()).setDisplay("Glowstonestaub") + register("glowing_powder", (new Item()).setDisplay("Glühender Staub") .setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XL)); for(ItemFishFood.FishType type : ItemFishFood.FishType.values()) { register(type.getName(), (new ItemFishFood(false, type))); - if(type.canCook()) - register("cooked_" + type.getName(), (new ItemFishFood(true, type))); + register("cooked_" + type.getName(), (new ItemFishFood(true, type))); } Item lapis = null; for(DyeColor color : DyeColor.values()) { @@ -294,20 +287,12 @@ public abstract class ItemRegistry { for(Pair pot : ItemPotion.getBrewedPotions()) { register(pot.first(), new ItemPotion(pot.second().getPotion(), pot.second())); } - register("spider_eye", (new ItemFood(2, false)).setPotionEffect(Effect.POISON, 5, 0, 1.0F).setDisplay("Spinnenauge") + register("eye", (new ItemFood(2, false)).setPotionEffect(Effect.POISON, 5, 0, 1.0F).setDisplay("Auge") .setMaxAmount(StackSize.L)); - register("fermented_spider_eye", (new Item()).setDisplay("Fermentiertes Spinnenauge") - .setTab(CheatTab.MISC).setMaxAmount(StackSize.L)); - register("blazing_powder", (new Item()).setDisplay("Glühender Staub") + register("blazing_powder", (new Item()).setDisplay("Schillernder Staub") .setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XL)); - register("magma_cream", (new Item()).setDisplay("Magmacreme").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.L)); register("charged_orb", (new ItemChargedOrb()).setDisplay("Geladene Kugel")); - register("speckled_melon", (new Item()).setDisplay("Glitzernde Melone") - .setTab(CheatTab.MISC)); - register("experience_bottle", (new ItemExpBottle()).setDisplay("Erfahrungsfläschchen")); register("fireball", (new ItemFireball()).setDisplay("Feuerkugel")); - register("writable_book", (new Item()).setDisplay("Buch und Feder").setTab(CheatTab.TOOLS)); - register("written_book", (new Item()).setDisplay("Beschriebenes Buch").setTab(CheatTab.MISC)); Item emerald = (new Item()).setDisplay("Smaragd").setTab(CheatTab.METALS); register("emerald", emerald); @@ -321,11 +306,9 @@ public abstract class ItemRegistry { 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("golden_carrot", (new ItemFood(6, false)).setDisplay("Goldene Karotte")); register("carrot_on_a_stick", (new ItemCarrotOnAStick()).setDisplay("Karottenrute")); register("charge_crystal", (new Item()).setDisplay("Energiekristall").setTab(CheatTab.MISC).setColor(TextColor.DMAGENTA).setGleaming()); - register("pumpkin_pie", (new ItemFood(8, false)).setDisplay("Kürbiskuchen").setTab(CheatTab.FOOD)); 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)); int max = ench.getMaxLevel(); diff --git a/common/src/main/java/common/init/Items.java b/common/src/main/java/common/init/Items.java index 8bfdac91..c53e1dcf 100755 --- a/common/src/main/java/common/init/Items.java +++ b/common/src/main/java/common/init/Items.java @@ -17,7 +17,6 @@ import common.item.consumable.ItemFishFood; import common.item.consumable.ItemFood; import common.item.consumable.ItemPotion; import common.item.consumable.ItemSeedFood; -import common.item.consumable.ItemSoup; import common.item.material.ItemArmor; import common.item.material.ItemBook; import common.item.material.ItemBottle; @@ -32,7 +31,6 @@ import common.item.projectile.ItemChargedOrb; import common.item.projectile.ItemDie; import common.item.projectile.ItemDynamite; import common.item.projectile.ItemEgg; -import common.item.projectile.ItemExpBottle; import common.item.projectile.ItemFireball; import common.item.projectile.ItemSnowball; import common.item.spawner.ItemBoat; @@ -194,7 +192,6 @@ public abstract class Items { public static final ItemBook book = get("book"); public static final Item bookshelf = get("bookshelf"); public static final ItemBow bow = get("bow"); - public static final Item bowl = get("bowl"); public static final ItemFood bread = get("bread"); public static final Item brewing_stand = get("brewing_stand"); public static final Item brick = get("brick"); @@ -254,7 +251,7 @@ public abstract class Items { public static final Item cinnabar_block = get("cinnabar_block"); public static final Item cinnabar_ore = get("cinnabar_ore"); public static final Item clay = get("clay"); - public static final Item clay_ball = get("clay_ball"); + public static final Item clay_lump = get("clay_lump"); public static final ItemArmor cloth_boots = get("cloth_boots"); public static final ItemArmor cloth_chestplate = get("cloth_chestplate"); public static final ItemArmor cloth_helmet = get("cloth_helmet"); @@ -343,10 +340,8 @@ public abstract class Items { public static final Item emerald_block = get("emerald_block"); public static final Item emerald_ore = get("emerald_ore"); public static final Item enchanting_table = get("enchanting_table"); - public static final ItemExpBottle experience_bottle = get("experience_bottle"); public static final ItemExterminator exterminator = get("exterminator"); public static final Item feather = get("feather"); - public static final Item fermented_spider_eye = get("fermented_spider_eye"); public static final Item fern = get("fern"); public static final ItemFireball fireball = get("fireball"); public static final ItemFishingRod fishing_rod = get("fishing_rod"); @@ -364,7 +359,7 @@ public abstract class Items { public static final ItemBottle bottle = get("bottle"); public static final Item glass_pane = get("glass_pane"); public static final Item glowstone = get("glowstone"); - public static final Item glowstone_dust = get("glowstone_dust"); + public static final Item glowing_powder = get("glowing_powder"); public static final ItemAxe gold_axe = get("gold_axe"); public static final Item gold_block = get("gold_block"); public static final ItemArmor gold_boots = get("gold_boots"); @@ -488,7 +483,6 @@ public abstract class Items { public static final Item magenta_glass_pane = get("magenta_glass_pane"); public static final Item magenta_wool = get("magenta_wool"); public static final ItemBucket magma_bucket = get("magma_bucket"); - public static final Item magma_cream = get("magma_cream"); public static final Item magnesium_block = get("magnesium_block"); public static final Item magnesium_ore = get("magnesium_ore"); public static final ItemMetal magnesium_powder = get("magnesium_powder"); @@ -521,7 +515,6 @@ public abstract class Items { public static final Item mossy_cobblestone = get("mossy_cobblestone"); public static final Item mossy_cobblestone_wall = get("mossy_cobblestone_wall"); public static final Item mossy_stonebrick = get("mossy_stonebrick"); - public static final ItemSoup mushroom_stew = get("mushroom_stew"); public static final Item mycelium = get("mycelium"); public static final ItemNameTag name_tag = get("name_tag"); public static final ItemSpaceNavigator navigator = get("navigator"); @@ -607,7 +600,6 @@ public abstract class Items { public static final ItemMetal praseodymium_ingot = get("praseodymium_ingot"); public static final Item praseodymium_ore = get("praseodymium_ore"); public static final Item pumpkin = get("pumpkin"); - public static final ItemFood pumpkin_pie = get("pumpkin_pie"); public static final ItemSeeds pumpkin_seed = get("pumpkin_seed"); public static final Item purple_bed = get("purple_bed"); public static final Item purple_carpet = get("purple_carpet"); @@ -695,7 +687,7 @@ public abstract class Items { public static final Item silver_ore = get("silver_ore"); public static final Item silver_wool = get("silver_wool"); public static final Item skull = get("skull"); - public static final Item slime_ball = get("slime_ball"); + public static final Item slime_blob = get("slime_blob"); public static final Item slime_block = get("slime_block"); public static final ItemBucket slime_bucket = get("slime_bucket"); public static final Item smooth_rock = get("smooth_rock"); @@ -708,8 +700,7 @@ public abstract class Items { 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 Item speckled_melon = get("speckled_melon"); - public static final ItemFood spider_eye = get("spider_eye"); + 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"); public static final Item spruce_door = get("spruce_door"); @@ -790,7 +781,6 @@ public abstract class Items { public static final Item tnt_5 = get("tnt_5"); public static final Item tnt_6 = get("tnt_6"); public static final Item tnt_7 = get("tnt_7"); - public static final ItemMinecart tnt_minecart = get("tnt_minecart"); public static final Item trapdoor = get("trapdoor"); public static final Item tripwire_hook = get("tripwire_hook"); public static final Item tungsten_block = get("tungsten_block"); @@ -842,8 +832,6 @@ public abstract class Items { public static final Item wooden_button = get("wooden_button"); public static final Item wooden_pressure_plate = get("wooden_pressure_plate"); public static final Item workbench = get("workbench"); - public static final Item writable_book = get("writable_book"); - public static final Item written_book = get("written_book"); public static final Item yellow_carpet = get("yellow_carpet"); public static final Item yellow_clay = get("yellow_clay"); public static final ItemDye yellow_dye = get("yellow_dye"); @@ -857,8 +845,6 @@ public abstract class Items { public static final ItemFishFood cooked_cod = get("cooked_cod"); public static final ItemFishFood salmon = get("salmon"); public static final ItemFishFood cooked_salmon = get("cooked_salmon"); - public static final ItemFishFood clownfish = get("clownfish"); - public static final ItemFishFood pufferfish = get("pufferfish"); public static final Item concrete = get("concrete"); public static final Item concrete_slab = get("concrete_slab"); public static final Item concrete_stairs = get("concrete_stairs"); diff --git a/common/src/main/java/common/init/SmeltingRegistry.java b/common/src/main/java/common/init/SmeltingRegistry.java index 34d76396..0f38068f 100755 --- a/common/src/main/java/common/init/SmeltingRegistry.java +++ b/common/src/main/java/common/init/SmeltingRegistry.java @@ -29,7 +29,7 @@ public abstract class SmeltingRegistry add(Items.chicken, new ItemStack(Items.cooked_chicken), 0.35F); add(Items.cobblestone, new ItemStack(Items.stone), 0.1F); add(Items.stonebrick, new ItemStack(Items.cracked_stonebrick), 0.1F); - add(Items.clay_ball, new ItemStack(Items.brick), 0.3F); + 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); @@ -37,10 +37,7 @@ public abstract class SmeltingRegistry for (ItemFishFood.FishType fish : ItemFishFood.FishType.values()) { - if (fish.canCook()) - { - add(ItemRegistry.byName(fish.getName()), new ItemStack(ItemRegistry.byName("cooked_" + fish.getName())), 0.35F); - } + add(ItemRegistry.byName(fish.getName()), new ItemStack(ItemRegistry.byName("cooked_" + fish.getName())), 0.35F); } add(Items.emerald_ore, new ItemStack(Items.emerald), 1.0F); diff --git a/common/src/main/java/common/init/TradeRegistry.java b/common/src/main/java/common/init/TradeRegistry.java index 36d265a7..00a0e1dc 100755 --- a/common/src/main/java/common/init/TradeRegistry.java +++ b/common/src/main/java/common/init/TradeRegistry.java @@ -20,7 +20,6 @@ public abstract class TradeRegistry { new GemForItem(Items.carrot, new PriceInfo(15, 19)), new ItemForGem(Items.bread, new PriceInfo(-4, -2)), new GemForItem(Items.pumpkin, new PriceInfo(8, 13)), - new ItemForGem(Items.pumpkin_pie, new PriceInfo(-3, -2)), new GemForItem(Items.melon_block, new PriceInfo(7, 12)), new ItemForGem(Items.apple, new PriceInfo(-5, -7)), new ItemForGem(Items.cookie, new PriceInfo(-6, -10)), @@ -47,7 +46,6 @@ public abstract class TradeRegistry { new ItemForGem(Items.navigator, new PriceInfo(10, 12)), new ItemForGem(Items.bookshelf, new PriceInfo(3, 4)), - new GemForItem(Items.written_book, new PriceInfo(2, 2)), new ItemForGem(Items.glass, new PriceInfo(-5, -3)), new BookForGem(), @@ -59,7 +57,6 @@ public abstract class TradeRegistry { new ItemForGem(Items.ink_sack, new PriceInfo(-2, -1)), new ItemForGem(Items.charged_orb, new PriceInfo(7, 11)), new ItemForGem(Items.glowstone, new PriceInfo(-3, -1)), - new ItemForGem(Items.experience_bottle, new PriceInfo(3, 11)), new GemForItem(Items.coal, new PriceInfo(16, 24)), new ItemForGem(Items.iron_helmet, new PriceInfo(4, 6)), new GemForItem(Items.iron_ingot, new PriceInfo(7, 9)), diff --git a/common/src/main/java/common/item/consumable/ItemFishFood.java b/common/src/main/java/common/item/consumable/ItemFishFood.java index 6ec6ec55..0981cbdd 100755 --- a/common/src/main/java/common/item/consumable/ItemFishFood.java +++ b/common/src/main/java/common/item/consumable/ItemFishFood.java @@ -1,102 +1,60 @@ package common.item.consumable; -import common.effect.Effect; -import common.effect.StatusEffect; -import common.entity.npc.EntityNPC; import common.item.ItemStack; -import common.world.World; -public class ItemFishFood extends ItemFood -{ - private final boolean cooked; - private final FishType type; +public class ItemFishFood extends ItemFood { + private final boolean cooked; + private final FishType type; - public ItemFishFood(boolean cooked, FishType type) - { - super(0, false); - this.cooked = cooked; - this.type = type; - this.setDisplay((this.type.canCook() ? (this.cooked ? "Gebratener " : "Roher ") : "") + this.type.getDisplay()); - } - - public FishType getType() { - return this.type; - } - - public boolean isCooked() { - return this.cooked; - } + public ItemFishFood(boolean cooked, FishType type) { + super(0, false); + this.cooked = cooked; + this.type = type; + this.setDisplay((this.cooked ? "Gebratener " : "Roher ") + this.type.getDisplay()); + } - public int getHealAmount(ItemStack stack) - { - return this.cooked && this.type.canCook() ? this.type.getCookedHealAmount() : this.type.getUncookedHealAmount(); - } + public FishType getType() { + return this.type; + } - protected void onFoodEaten(ItemStack stack, World worldIn, EntityNPC player) - { - if (this.type == ItemFishFood.FishType.PUFFERFISH) - { - player.addEffect(new StatusEffect(Effect.POISON, 1200, 3)); - player.addEffect(new StatusEffect(Effect.NAUSEA, 300, 1)); - } + public boolean isCooked() { + return this.cooked; + } - super.onFoodEaten(stack, worldIn, player); - } + public int getHealAmount(ItemStack stack) { + return this.cooked ? this.type.getCookedHealAmount() : this.type.getUncookedHealAmount(); + } - public static enum FishType - { - COD("cod", "Kabeljau", 2, 5), - SALMON("salmon", "Lachs", 2, 6), - CLOWNFISH("clownfish", "Clownfisch", 1), - PUFFERFISH("pufferfish", "Kugelfisch", 1); + public static enum FishType { + COD("cod", "Kabeljau", 2, 5), + SALMON("salmon", "Lachs", 2, 6); - private final String name; - private final String display; - private final int uncookedHealAmount; - private final int cookedHealAmount; - private boolean cookable = false; + private final String name; + private final String display; + private final int uncookedHealAmount; + private final int cookedHealAmount; - private FishType(String name, String display, int uncookedHeal, int cookedHeal) - { - this.name = name; - this.display = display; - this.uncookedHealAmount = uncookedHeal; - this.cookedHealAmount = cookedHeal; - this.cookable = true; - } + private FishType(String name, String display, int uncookedHeal, int cookedHeal) { + this.name = name; + this.display = display; + this.uncookedHealAmount = uncookedHeal; + this.cookedHealAmount = cookedHeal; + } - private FishType(String name, String display, int uncookedHeal) - { - this.name = name; - this.display = display; - this.uncookedHealAmount = uncookedHeal; - this.cookedHealAmount = 0; - this.cookable = false; - } + public String getDisplay() { + return this.display; + } - public String getDisplay() - { - return this.display; - } + public String getName() { + return this.name; + } - public String getName() - { - return this.name; - } + public int getUncookedHealAmount() { + return this.uncookedHealAmount; + } - public int getUncookedHealAmount() - { - return this.uncookedHealAmount; - } - - public int getCookedHealAmount() - { - return this.cookedHealAmount; - } - - public boolean canCook() - { - return this.cookable; - } - } + public int getCookedHealAmount() { + return this.cookedHealAmount; + } + } } diff --git a/common/src/main/java/common/item/consumable/ItemSoup.java b/common/src/main/java/common/item/consumable/ItemSoup.java deleted file mode 100755 index f9546908..00000000 --- a/common/src/main/java/common/item/consumable/ItemSoup.java +++ /dev/null @@ -1,25 +0,0 @@ -package common.item.consumable; - -import common.entity.npc.EntityNPC; -import common.init.Items; -import common.item.ItemStack; -import common.world.World; - -public class ItemSoup extends ItemFood -{ - public ItemSoup(int healAmount) - { - super(healAmount, false); - this.setUnstackable(); - } - - /** - * 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) - { - super.onItemUseFinish(stack, worldIn, playerIn); - return new ItemStack(Items.bowl); - } -} diff --git a/common/src/main/java/common/item/material/ItemRecord.java b/common/src/main/java/common/item/material/ItemRecord.java index 9614fad6..82c6e649 100755 --- a/common/src/main/java/common/item/material/ItemRecord.java +++ b/common/src/main/java/common/item/material/ItemRecord.java @@ -11,6 +11,6 @@ public class ItemRecord extends Item { @Clientside public String[] getTextures(String name) { - return new String[] {"record_old"}; + return new String[] {"paper"}; } } diff --git a/common/src/main/java/common/item/projectile/ItemExpBottle.java b/common/src/main/java/common/item/projectile/ItemExpBottle.java deleted file mode 100755 index 6317bd43..00000000 --- a/common/src/main/java/common/item/projectile/ItemExpBottle.java +++ /dev/null @@ -1,55 +0,0 @@ -package common.item.projectile; - -import common.entity.item.EntityXpBottle; -import common.entity.npc.EntityNPC; -import common.init.SoundEvent; -import common.item.CheatTab; -import common.item.Item; -import common.item.ItemStack; -import common.tileentity.TileEntity; -import common.util.BlockPos; -import common.util.Facing; -import common.util.Serverside; -import common.util.Vec3; -import common.world.AWorldServer; -import common.world.World; - -public class ItemExpBottle extends Item -{ - public ItemExpBottle() - { - this.setTab(CheatTab.MAGIC); - this.setGleaming(); - } - - /** - * 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.creative) -// { - itemStackIn.decrSize(); -// } - - worldIn.playSoundAtEntity(playerIn, SoundEvent.THROW, 0.5F); - - if (!worldIn.client) - { - worldIn.spawnEntityInWorld(new EntityXpBottle(worldIn, playerIn)); - } - -// playerIn.triggerAchievement(StatRegistry.objectUseStats[ItemRegistry.getIdFromItem(this)]); - return itemStackIn; - } - - @Serverside - public ItemStack dispenseStack(AWorldServer world, TileEntity source, Vec3 position, BlockPos blockpos, Facing facing, ItemStack stack) { - return this.dispenseProjectile(world, facing, stack, new EntityXpBottle(world, position.xCoord, position.yCoord, position.zCoord), 1.375f, 3.0f); - } - - @Serverside - public int getDispenseSoundId() { - return 1002; - } -} diff --git a/common/src/main/java/common/item/spawner/ItemMinecart.java b/common/src/main/java/common/item/spawner/ItemMinecart.java index b182f55d..0a24df19 100755 --- a/common/src/main/java/common/item/spawner/ItemMinecart.java +++ b/common/src/main/java/common/item/spawner/ItemMinecart.java @@ -3,7 +3,6 @@ package common.item.spawner; import common.block.tech.BlockRail; import common.entity.item.EntityCart; import common.entity.item.EntityMinecart; -import common.entity.item.EntityTntCart; import common.entity.npc.EntityNPC; import common.init.Blocks; import common.item.CheatTab; @@ -20,22 +19,13 @@ import common.world.World; public class ItemMinecart extends Item { - private final boolean tnt; - - public ItemMinecart(boolean tnt) + public ItemMinecart() { this.setUnstackable(); - this.tnt = tnt; - this.setTab(tnt ? CheatTab.EXPLOSIVES : CheatTab.VEHICLES); + this.setTab(CheatTab.VEHICLES); this.setMagnetic(); } - @Serverside - private EntityCart getMinecart(World worldIn, double x, double y, double z) - { - return this.tnt ? new EntityTntCart(worldIn, x, y, z) : new EntityMinecart(worldIn, x, y, z); - } - /** * Called when a Block is right-clicked with this Item */ @@ -64,7 +54,7 @@ public class ItemMinecart extends Item d0 = 0.5D; } - EntityCart entityminecart = this.getMinecart(worldIn, (double)pos.getX() + 0.5D, (double)pos.getY() + 0.0625D + d0, (double)pos.getZ() + 0.5D); + EntityCart entityminecart = new EntityMinecart(worldIn, (double)pos.getX() + 0.5D, (double)pos.getY() + 0.0625D + d0, (double)pos.getZ() + 0.5D); if (stack.hasDisplayName()) { @@ -126,7 +116,7 @@ public class ItemMinecart extends Item } } - EntityCart entityminecart = this.getMinecart(world, d0, d1 + d3, d2); + EntityCart entityminecart = new EntityMinecart(world, d0, d1 + d3, d2); if (stack.hasDisplayName()) {