diff --git a/client/src/main/java/client/Client.java b/client/src/main/java/client/Client.java index 5049fd9c..62159054 100755 --- a/client/src/main/java/client/Client.java +++ b/client/src/main/java/client/Client.java @@ -1176,21 +1176,22 @@ public class Client implements IThreadListener { if(block != Blocks.air) { desc = block.getDisplay(); if(block.getMiningTool() != null) - line2 = "Werkzeug: " + block.getMiningTool().getDisplay() + (block.getMiningTool().isLevelled() ? "Level " + (block.getMiningLevel() + 1) : ""); + line2 = Color.BLUE + "Werkzeug" + Color.DARK_GRAY + ": " + Color.GREEN + block.getMiningTool().getDisplay() + (block.getMiningTool().isLevelled() ? Color.ORK + " Level " + Color.DARK_GREEN + (block.getMiningLevel() + 1) : ""); } } else if(this.pointed != null && this.pointed.type == ObjectType.ENTITY && this.pointed.entity != null) { Entity entity = this.pointed.entity; desc = entity.getName(); if(entity instanceof EntityLiving living) { - line1 = living.formatStats(); + line1 = living.formatStatsFull(); } + line2 = Color.CYAN + EntityRegistry.getEntityName(EntityRegistry.getEntityString(entity)); } if(desc != null) { Drawing.drawRectBorder(this.fbX / 2 - 180, 20, 360, 60, 0xff6f6f6f, 0xff000000, 0xffafafaf, 0xff4f4f4f); Drawing.drawTextCentered(desc, this.fbX / 2, 24, 0xffffffff); if(line1 != null) - Drawing.drawTextCentered(line1, this.fbX / 2, 80 - 4 - Font.YGLYPH * 2, 0xffffffff); + Drawing.drawTextCentered(line1, this.fbX / 2, 80 - 4 - Font.YGLYPH * 2 - 2, 0xffffffff); if(line2 != null) Drawing.drawTextCentered(line2, this.fbX / 2, 80 - 4 - Font.YGLYPH, 0xffffffff); } diff --git a/client/src/main/resources/textures/blocks/chest_front.png b/client/src/main/resources/textures/blocks/black_metal_chest_front.png similarity index 56% rename from client/src/main/resources/textures/blocks/chest_front.png rename to client/src/main/resources/textures/blocks/black_metal_chest_front.png index d6ad16cd..6237058c 100755 Binary files a/client/src/main/resources/textures/blocks/chest_front.png and b/client/src/main/resources/textures/blocks/black_metal_chest_front.png differ diff --git a/client/src/main/resources/textures/blocks/chest_inner.png b/client/src/main/resources/textures/blocks/black_metal_chest_inner.png similarity index 57% rename from client/src/main/resources/textures/blocks/chest_inner.png rename to client/src/main/resources/textures/blocks/black_metal_chest_inner.png index 2b840b7b..ac55a9c2 100755 Binary files a/client/src/main/resources/textures/blocks/chest_inner.png and b/client/src/main/resources/textures/blocks/black_metal_chest_inner.png differ diff --git a/client/src/main/resources/textures/blocks/black_metal_chest_side.png b/client/src/main/resources/textures/blocks/black_metal_chest_side.png new file mode 100755 index 00000000..bb0d925f Binary files /dev/null and b/client/src/main/resources/textures/blocks/black_metal_chest_side.png differ diff --git a/client/src/main/resources/textures/blocks/chest_top.png b/client/src/main/resources/textures/blocks/black_metal_chest_top.png similarity index 57% rename from client/src/main/resources/textures/blocks/chest_top.png rename to client/src/main/resources/textures/blocks/black_metal_chest_top.png index daf9cd16..448ef960 100755 Binary files a/client/src/main/resources/textures/blocks/chest_top.png and b/client/src/main/resources/textures/blocks/black_metal_chest_top.png differ diff --git a/client/src/main/resources/textures/blocks/iron_chest_front.png b/client/src/main/resources/textures/blocks/iron_chest_front.png new file mode 100755 index 00000000..ada41bff Binary files /dev/null and b/client/src/main/resources/textures/blocks/iron_chest_front.png differ diff --git a/client/src/main/resources/textures/blocks/iron_chest_inner.png b/client/src/main/resources/textures/blocks/iron_chest_inner.png new file mode 100755 index 00000000..a040595b Binary files /dev/null and b/client/src/main/resources/textures/blocks/iron_chest_inner.png differ diff --git a/client/src/main/resources/textures/blocks/iron_chest_side.png b/client/src/main/resources/textures/blocks/iron_chest_side.png new file mode 100755 index 00000000..cc18e753 Binary files /dev/null and b/client/src/main/resources/textures/blocks/iron_chest_side.png differ diff --git a/client/src/main/resources/textures/blocks/iron_chest_top.png b/client/src/main/resources/textures/blocks/iron_chest_top.png new file mode 100755 index 00000000..384b2df0 Binary files /dev/null and b/client/src/main/resources/textures/blocks/iron_chest_top.png differ diff --git a/client/src/main/resources/textures/blocks/nichun_chest_front.png b/client/src/main/resources/textures/blocks/nichun_chest_front.png new file mode 100755 index 00000000..a240967f Binary files /dev/null and b/client/src/main/resources/textures/blocks/nichun_chest_front.png differ diff --git a/client/src/main/resources/textures/blocks/nichun_chest_inner.png b/client/src/main/resources/textures/blocks/nichun_chest_inner.png new file mode 100755 index 00000000..564fb045 Binary files /dev/null and b/client/src/main/resources/textures/blocks/nichun_chest_inner.png differ diff --git a/client/src/main/resources/textures/blocks/nichun_chest_side.png b/client/src/main/resources/textures/blocks/nichun_chest_side.png new file mode 100755 index 00000000..0e7e6a75 Binary files /dev/null and b/client/src/main/resources/textures/blocks/nichun_chest_side.png differ diff --git a/client/src/main/resources/textures/blocks/nichun_chest_top.png b/client/src/main/resources/textures/blocks/nichun_chest_top.png new file mode 100755 index 00000000..d993cc66 Binary files /dev/null and b/client/src/main/resources/textures/blocks/nichun_chest_top.png differ diff --git a/client/src/main/resources/textures/blocks/platinum_chest_front.png b/client/src/main/resources/textures/blocks/platinum_chest_front.png new file mode 100755 index 00000000..c4c5615a Binary files /dev/null and b/client/src/main/resources/textures/blocks/platinum_chest_front.png differ diff --git a/client/src/main/resources/textures/blocks/platinum_chest_inner.png b/client/src/main/resources/textures/blocks/platinum_chest_inner.png new file mode 100755 index 00000000..fee9e099 Binary files /dev/null and b/client/src/main/resources/textures/blocks/platinum_chest_inner.png differ diff --git a/client/src/main/resources/textures/blocks/platinum_chest_side.png b/client/src/main/resources/textures/blocks/platinum_chest_side.png new file mode 100755 index 00000000..ac9e4ecf Binary files /dev/null and b/client/src/main/resources/textures/blocks/platinum_chest_side.png differ diff --git a/client/src/main/resources/textures/blocks/platinum_chest_top.png b/client/src/main/resources/textures/blocks/platinum_chest_top.png new file mode 100755 index 00000000..695b5f36 Binary files /dev/null and b/client/src/main/resources/textures/blocks/platinum_chest_top.png differ diff --git a/client/src/main/resources/textures/blocks/silver_chest_front.png b/client/src/main/resources/textures/blocks/silver_chest_front.png new file mode 100755 index 00000000..74dbd317 Binary files /dev/null and b/client/src/main/resources/textures/blocks/silver_chest_front.png differ diff --git a/client/src/main/resources/textures/blocks/silver_chest_inner.png b/client/src/main/resources/textures/blocks/silver_chest_inner.png new file mode 100755 index 00000000..7eb30a64 Binary files /dev/null and b/client/src/main/resources/textures/blocks/silver_chest_inner.png differ diff --git a/client/src/main/resources/textures/blocks/chest_side.png b/client/src/main/resources/textures/blocks/silver_chest_side.png similarity index 56% rename from client/src/main/resources/textures/blocks/chest_side.png rename to client/src/main/resources/textures/blocks/silver_chest_side.png index 4d4ad692..7760d14e 100755 Binary files a/client/src/main/resources/textures/blocks/chest_side.png and b/client/src/main/resources/textures/blocks/silver_chest_side.png differ diff --git a/client/src/main/resources/textures/blocks/silver_chest_top.png b/client/src/main/resources/textures/blocks/silver_chest_top.png new file mode 100755 index 00000000..123bad4f Binary files /dev/null and b/client/src/main/resources/textures/blocks/silver_chest_top.png differ diff --git a/client/src/main/resources/textures/blocks/stone_chest_front.png b/client/src/main/resources/textures/blocks/stone_chest_front.png new file mode 100755 index 00000000..28596fb4 Binary files /dev/null and b/client/src/main/resources/textures/blocks/stone_chest_front.png differ diff --git a/client/src/main/resources/textures/blocks/stone_chest_inner.png b/client/src/main/resources/textures/blocks/stone_chest_inner.png new file mode 100755 index 00000000..da8a2d51 Binary files /dev/null and b/client/src/main/resources/textures/blocks/stone_chest_inner.png differ diff --git a/client/src/main/resources/textures/blocks/stone_chest_side.png b/client/src/main/resources/textures/blocks/stone_chest_side.png new file mode 100755 index 00000000..62a0f10d Binary files /dev/null and b/client/src/main/resources/textures/blocks/stone_chest_side.png differ diff --git a/client/src/main/resources/textures/blocks/stone_chest_top.png b/client/src/main/resources/textures/blocks/stone_chest_top.png new file mode 100755 index 00000000..96b0e4d1 Binary files /dev/null and b/client/src/main/resources/textures/blocks/stone_chest_top.png differ diff --git a/client/src/main/resources/textures/blocks/thetium_chest_front.png b/client/src/main/resources/textures/blocks/thetium_chest_front.png new file mode 100755 index 00000000..13dce335 Binary files /dev/null and b/client/src/main/resources/textures/blocks/thetium_chest_front.png differ diff --git a/client/src/main/resources/textures/blocks/thetium_chest_inner.png b/client/src/main/resources/textures/blocks/thetium_chest_inner.png new file mode 100755 index 00000000..40783872 Binary files /dev/null and b/client/src/main/resources/textures/blocks/thetium_chest_inner.png differ diff --git a/client/src/main/resources/textures/blocks/thetium_chest_side.png b/client/src/main/resources/textures/blocks/thetium_chest_side.png new file mode 100755 index 00000000..42d9b4bc Binary files /dev/null and b/client/src/main/resources/textures/blocks/thetium_chest_side.png differ diff --git a/client/src/main/resources/textures/blocks/thetium_chest_top.png b/client/src/main/resources/textures/blocks/thetium_chest_top.png new file mode 100755 index 00000000..8f868d54 Binary files /dev/null and b/client/src/main/resources/textures/blocks/thetium_chest_top.png differ diff --git a/client/src/main/resources/textures/blocks/wood_chest_front.png b/client/src/main/resources/textures/blocks/wood_chest_front.png new file mode 100755 index 00000000..985464f0 Binary files /dev/null and b/client/src/main/resources/textures/blocks/wood_chest_front.png differ diff --git a/client/src/main/resources/textures/blocks/wood_chest_inner.png b/client/src/main/resources/textures/blocks/wood_chest_inner.png new file mode 100755 index 00000000..75aaf6f6 Binary files /dev/null and b/client/src/main/resources/textures/blocks/wood_chest_inner.png differ diff --git a/client/src/main/resources/textures/blocks/wood_chest_side.png b/client/src/main/resources/textures/blocks/wood_chest_side.png new file mode 100755 index 00000000..ba55ede2 Binary files /dev/null and b/client/src/main/resources/textures/blocks/wood_chest_side.png differ diff --git a/client/src/main/resources/textures/blocks/wood_chest_top.png b/client/src/main/resources/textures/blocks/wood_chest_top.png new file mode 100755 index 00000000..ee38683e Binary files /dev/null and b/client/src/main/resources/textures/blocks/wood_chest_top.png differ diff --git a/client/src/main/resources/textures/npc/alpharius_omegon.png b/client/src/main/resources/textures/npc/alpharius_omegon.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/alpharius_omegon.png differ diff --git a/client/src/main/resources/textures/npc/angron.png b/client/src/main/resources/textures/npc/angron.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/angron.png differ diff --git a/client/src/main/resources/textures/npc/corvus_corax.png b/client/src/main/resources/textures/npc/corvus_corax.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/corvus_corax.png differ diff --git a/client/src/main/resources/textures/npc/ferrus_manus.png b/client/src/main/resources/textures/npc/ferrus_manus.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/ferrus_manus.png differ diff --git a/client/src/main/resources/textures/npc/fulgrim.png b/client/src/main/resources/textures/npc/fulgrim.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/fulgrim.png differ diff --git a/client/src/main/resources/textures/npc/horus_lupercal.png b/client/src/main/resources/textures/npc/horus_lupercal.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/horus_lupercal.png differ diff --git a/client/src/main/resources/textures/npc/jaghatai_khan.png b/client/src/main/resources/textures/npc/jaghatai_khan.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/jaghatai_khan.png differ diff --git a/client/src/main/resources/textures/npc/konrad_curze.png b/client/src/main/resources/textures/npc/konrad_curze.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/konrad_curze.png differ diff --git a/client/src/main/resources/textures/npc/leman_russ.png b/client/src/main/resources/textures/npc/leman_russ.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/leman_russ.png differ diff --git a/client/src/main/resources/textures/npc/lion_el_jonson.png b/client/src/main/resources/textures/npc/lion_el_jonson.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/lion_el_jonson.png differ diff --git a/client/src/main/resources/textures/npc/lorgar_aurelian.png b/client/src/main/resources/textures/npc/lorgar_aurelian.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/lorgar_aurelian.png differ diff --git a/client/src/main/resources/textures/npc/magnus_the_red.png b/client/src/main/resources/textures/npc/magnus_the_red.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/magnus_the_red.png differ diff --git a/client/src/main/resources/textures/npc/marine_emperors_child.png b/client/src/main/resources/textures/npc/marine_emperors_child.png new file mode 100755 index 00000000..29a53f3f Binary files /dev/null and b/client/src/main/resources/textures/npc/marine_emperors_child.png differ diff --git a/client/src/main/resources/textures/npc/merfolk.png b/client/src/main/resources/textures/npc/merfolk.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/merfolk.png differ diff --git a/client/src/main/resources/textures/npc/mortarion.png b/client/src/main/resources/textures/npc/mortarion.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/mortarion.png differ diff --git a/client/src/main/resources/textures/npc/perturabo.png b/client/src/main/resources/textures/npc/perturabo.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/perturabo.png differ diff --git a/client/src/main/resources/textures/npc/roboute_guilliman.png b/client/src/main/resources/textures/npc/roboute_guilliman.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/roboute_guilliman.png differ diff --git a/client/src/main/resources/textures/npc/rogal_dorn.png b/client/src/main/resources/textures/npc/rogal_dorn.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/rogal_dorn.png differ diff --git a/client/src/main/resources/textures/npc/sanguinius.png b/client/src/main/resources/textures/npc/sanguinius.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/sanguinius.png differ diff --git a/client/src/main/resources/textures/npc/vulkan.png b/client/src/main/resources/textures/npc/vulkan.png new file mode 100755 index 00000000..54aa400f Binary files /dev/null and b/client/src/main/resources/textures/npc/vulkan.png differ diff --git a/common/src/main/java/common/ai/EntityAICatSit.java b/common/src/main/java/common/ai/EntityAICatSit.java index a39ef9df..e20416de 100755 --- a/common/src/main/java/common/ai/EntityAICatSit.java +++ b/common/src/main/java/common/ai/EntityAICatSit.java @@ -2,6 +2,7 @@ package common.ai; import common.block.Block; import common.block.artificial.BlockBed; +import common.block.tech.BlockChest; import common.entity.animal.EntityCat; import common.init.Blocks; import common.tileentity.TileEntity; @@ -86,7 +87,7 @@ public class EntityAICatSit extends EntityAIMoveToBlock State iblockstate = worldIn.getState(pos); Block block = iblockstate.getBlock(); - if (block == Blocks.chest) + if (block instanceof BlockChest) { TileEntity tileentity = worldIn.getTileEntity(pos); diff --git a/common/src/main/java/common/block/tech/BlockAnvil.java b/common/src/main/java/common/block/tech/BlockAnvil.java index 7e06be64..defab22b 100755 --- a/common/src/main/java/common/block/tech/BlockAnvil.java +++ b/common/src/main/java/common/block/tech/BlockAnvil.java @@ -9,7 +9,6 @@ import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.inventory.Container; import common.inventory.ContainerRepair; -import common.entity.npc.EntityNPC; import common.item.CheatTab; import common.model.Model; import common.model.Model.ModelProvider; diff --git a/common/src/main/java/common/block/tech/BlockEnchantmentTable.java b/common/src/main/java/common/block/tech/BlockEnchantmentTable.java index b14d1ad2..c6c1a791 100755 --- a/common/src/main/java/common/block/tech/BlockEnchantmentTable.java +++ b/common/src/main/java/common/block/tech/BlockEnchantmentTable.java @@ -5,7 +5,6 @@ import common.block.Material; import common.entity.npc.EntityNPC; import common.inventory.Container; import common.inventory.ContainerEnchantment; -import common.entity.npc.EntityNPC; import common.item.CheatTab; import common.model.Model; import common.model.Model.ModelProvider; diff --git a/common/src/main/java/common/block/tech/BlockWarpChest.java b/common/src/main/java/common/block/tech/BlockWarpChest.java index 43761d09..39f151f1 100755 --- a/common/src/main/java/common/block/tech/BlockWarpChest.java +++ b/common/src/main/java/common/block/tech/BlockWarpChest.java @@ -8,7 +8,6 @@ import common.entity.types.EntityLiving; import common.init.Items; import common.inventory.Container; import common.inventory.ContainerChest; -import common.entity.npc.EntityNPC; import common.item.CheatTab; import common.item.Item; import common.model.Model; diff --git a/common/src/main/java/common/block/tech/BlockWorkbench.java b/common/src/main/java/common/block/tech/BlockWorkbench.java index 7cfe9353..a08b35d8 100755 --- a/common/src/main/java/common/block/tech/BlockWorkbench.java +++ b/common/src/main/java/common/block/tech/BlockWorkbench.java @@ -5,7 +5,6 @@ import common.block.Material; import common.entity.npc.EntityNPC; import common.inventory.Container; import common.inventory.ContainerWorkbench; -import common.entity.npc.EntityNPC; import common.item.CheatTab; import common.model.Model; import common.model.Model.ModelProvider; diff --git a/common/src/main/java/common/entity/animal/EntityHorse.java b/common/src/main/java/common/entity/animal/EntityHorse.java index c7a5fd46..0c234a44 100755 --- a/common/src/main/java/common/entity/animal/EntityHorse.java +++ b/common/src/main/java/common/entity/animal/EntityHorse.java @@ -362,7 +362,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic { { if (!this.worldObj.client && this.isChested()) { - this.dropItem(Items.chest, 1); + this.dropItem(Items.wood_chest, 1); this.setChested(false); } } @@ -891,7 +891,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic { return true; } - if (!flag && this.canCarryChest() && !this.isChested() && itemstack.getItem() == Items.chest) + if (!flag && this.canCarryChest() && !this.isChested() && itemstack.getItem() == Items.wood_chest) { this.setChested(true); this.playSound(SoundEvent.PLOP, 1.0F); diff --git a/common/src/main/java/common/entity/npc/EntityNPC.java b/common/src/main/java/common/entity/npc/EntityNPC.java index b830422b..b6f3f035 100755 --- a/common/src/main/java/common/entity/npc/EntityNPC.java +++ b/common/src/main/java/common/entity/npc/EntityNPC.java @@ -1166,6 +1166,10 @@ public abstract class EntityNPC extends EntityLiving implements IInventory public String formatStats() { return super.formatStats() + (this.getManaPoints() == 0 ? "" : Color.GRAY + " [" + Color.MIDNIGHT + this.getManaPoints() + Color.GRAY + "]"); } + + public String formatStatsFull() { + return super.formatStatsFull() + (this.getManaPoints() == 0 ? "" : Color.DARK_GRAY + " | " + Color.BLUE + this.getManaPoints() + Color.MIDNIGHT + " Mana"); + } public MerchantRecipeList getTrades(EntityNPC player) { if(this.trades == null) { diff --git a/common/src/main/java/common/entity/types/EntityLiving.java b/common/src/main/java/common/entity/types/EntityLiving.java index f727da32..951e098a 100755 --- a/common/src/main/java/common/entity/types/EntityLiving.java +++ b/common/src/main/java/common/entity/types/EntityLiving.java @@ -2235,6 +2235,12 @@ public abstract class EntityLiving extends Entity this.getHealth(), this.getMaxHealth()); } + public String formatStatsFull() { + return String.format(this.getAlignment().color + this.getAlignment().display + Color.DARK_GRAY + " | " + getHealthColor(this.getHealth(), this.getMaxHealth()) + "%d" + + Color.GRAY + " / " + getMaxHpColor(this.getMaxHealth()) + "%d" + Color.RED + " HP", + this.getHealth(), this.getMaxHealth()); + } + public abstract int getColor(); public boolean isGhost() { diff --git a/common/src/main/java/common/init/BlockRegistry.java b/common/src/main/java/common/init/BlockRegistry.java index c82237d2..b100707f 100755 --- a/common/src/main/java/common/init/BlockRegistry.java +++ b/common/src/main/java/common/init/BlockRegistry.java @@ -611,14 +611,14 @@ public abstract class BlockRegistry { register("construction_table", (new BlockWorkbench(4)).setHardness(2.5F).setSound(SoundType.WOOD).setDisplay("Konstruktionstisch")); register("assembly_unit", (new BlockWorkbench(5)).setHardness(2.5F).setSound(SoundType.WOOD).setDisplay("Fertigungseinheit")); - register("chest", new BlockChest(9, 3).setDisplay("Truhe")); - register("large_chest", new BlockChest(9, 6).setDisplay("Große Truhe")); - register("xlarge_chest", new BlockChest(12, 8).setDisplay("Große Truhe")); - register("xxlarge_chest", new BlockChest(16, 10).setDisplay("Große Truhe")); - register("xxxlarge_chest", new BlockChest(18, 14).setDisplay("Große Truhe")); - register("huge_chest", new BlockChest(22, 18).setDisplay("Große Truhe")); - register("giant_chest", new BlockChest(28, 18).setDisplay("Große Truhe")); - register("toolarge_chest", new BlockChest(32, 18).setDisplay("Große Truhe")); + register("wood_chest", new BlockChest(9, 3).setDisplay("Holztruhe")); + register("stone_chest", new BlockChest(9, 6).setDisplay("Steintruhe")); + register("iron_chest", new BlockChest(12, 8).setDisplay("Eisentruhe")); + register("platinum_chest", new BlockChest(16, 10).setDisplay("Platintruhe")); + register("silver_chest", new BlockChest(18, 14).setDisplay("Silbertruhe")); + register("thetium_chest", new BlockChest(22, 18).setDisplay("Thetiumtruhe")); + register("black_metal_chest", new BlockChest(28, 18).setDisplay("Schwarzmetalltruhe")); + register("nichun_chest", new BlockChest(32, 18).setDisplay("Nichuntruhe")); register("warp_chest", (new BlockWarpChest()).setHardness(22.5F).setResistance(1000.0F).setSound(SoundType.STONE) .setDisplay("Warptruhe").setLight(0.5F)); diff --git a/common/src/main/java/common/init/Blocks.java b/common/src/main/java/common/init/Blocks.java index bdaff3d3..aa5c37ef 100755 --- a/common/src/main/java/common/init/Blocks.java +++ b/common/src/main/java/common/init/Blocks.java @@ -148,7 +148,6 @@ public abstract class Blocks { public static final BlockSapling cherry_sapling = get("cherry_sapling"); public static final BlockSlab cherry_slab = get("cherry_slab"); public static final BlockStairs cherry_stairs = get("cherry_stairs"); - public static final BlockChest chest = get("chest"); public static final BlockMetalBlock chrome_block = get("chrome_block"); public static final BlockMetalOre chrome_ore = get("chrome_ore"); public static final Block cinnabar_block = get("cinnabar_block"); @@ -550,13 +549,6 @@ public abstract class Blocks { public static final BlockActiveDisplay display_on = get("display_on"); public static final BlockActiveDisplay display2_on = get("display2_on"); public static final BlockActiveDisplay display4_on = get("display4_on"); - public static final BlockChest large_chest = get("large_chest"); - public static final BlockChest giant_chest = get("giant_chest"); - public static final BlockChest huge_chest = get("huge_chest"); - public static final BlockChest toolarge_chest = get("toolarge_chest"); - public static final BlockChest xlarge_chest = get("xlarge_chest"); - public static final BlockChest xxlarge_chest = get("xxlarge_chest"); - public static final BlockChest xxxlarge_chest = get("xxxlarge_chest"); public static final BlockUnlitTorch torch = get("torch"); public static final BlockLitTorch lit_torch = get("lit_torch"); public static final BlockUnlitTorch tian_torch = get("tian_torch"); @@ -677,6 +669,14 @@ public abstract class Blocks { public static final BlockStainedGlass violet_glass = get("violet_glass"); public static final BlockStainedGlassPane violet_glass_pane = get("violet_glass_pane"); public static final BlockWool violet_wool = get("violet_wool"); + public static final BlockChest wood_chest = get("wood_chest"); + public static final BlockChest stone_chest = get("stone_chest"); + public static final BlockChest iron_chest = get("iron_chest"); + public static final BlockChest platinum_chest = get("platinum_chest"); + public static final BlockChest silver_chest = get("silver_chest"); + public static final BlockChest thetium_chest = get("thetium_chest"); + public static final BlockChest black_metal_chest = get("black_metal_chest"); + public static final BlockChest nichun_chest = get("nichun_chest"); private static T get(String id) { T block = (T)BlockRegistry.byNameExact(id); diff --git a/common/src/main/java/common/init/CraftingRegistry.java b/common/src/main/java/common/init/CraftingRegistry.java index d103578d..65f34bc1 100755 --- a/common/src/main/java/common/init/CraftingRegistry.java +++ b/common/src/main/java/common/init/CraftingRegistry.java @@ -172,7 +172,7 @@ public abstract class CraftingRegistry add(new ItemStack(slab, 6), "###", '#', planks); add(new ItemStack(ItemRegistry.byName(wood.getName() + "_stairs"), 4), "# ", "## ", "###", '#', planks); - add(new ItemStack(Items.chest), "###", "# #", "###", '#', planks); + add(new ItemStack(Items.wood_chest), "###", "# #", "###", '#', planks); add(new ItemStack(Items.workbench), "##", "##", '#', planks); add(new ItemStack(Items.assembly_unit), "----", "XXXX", "X##X", '#', Items.construction_table, '-', Items.titanium_ingot, 'X', planks); @@ -257,7 +257,7 @@ public abstract class CraftingRegistry addShapeless(new ItemStack(Items.charged_orb, 1), Items.orb, Items.blazing_powder); addShapeless(new ItemStack(Items.fireball, 3), Items.gunpowder, Items.blazing_powder, Items.coal); addShapeless(new ItemStack(Items.fireball, 3), Items.gunpowder, Items.blazing_powder, Items.charcoal); - add(new ItemStack(Items.hopper), "I I", "ICI", " I ", 'I', Items.iron_ingot, 'C', Items.chest); + add(new ItemStack(Items.hopper), "I I", "ICI", " I ", 'I', Items.iron_ingot, 'C', Items.wood_chest); add(new ItemStack(Items.dynamite, 1), "X#X", "#X#", "X#X", 'X', Items.gunpowder, '#', Items.clay_lump); diff --git a/common/src/main/java/common/init/Items.java b/common/src/main/java/common/init/Items.java index e40c306b..8b62a745 100755 --- a/common/src/main/java/common/init/Items.java +++ b/common/src/main/java/common/init/Items.java @@ -236,7 +236,6 @@ public abstract class Items { public static final Item cherry_sapling = get("cherry_sapling"); public static final Item cherry_slab = get("cherry_slab"); public static final Item cherry_stairs = get("cherry_stairs"); - public static final Item chest = get("chest"); public static final ItemMagnet chick_magnet = get("chick_magnet"); public static final ItemFood chicken = get("chicken"); public static final Item chrome_block = get("chrome_block"); @@ -910,13 +909,6 @@ public abstract class Items { public static final ItemPotion potion_weakness = get("potion_weakness"); public static final ItemPotion potion_weakness_base = get("potion_weakness_base"); public static final ItemPotion potion_weakness_extended = get("potion_weakness_extended"); - public static final Item large_chest = get("large_chest"); - public static final Item giant_chest = get("giant_chest"); - public static final Item huge_chest = get("huge_chest"); - public static final Item toolarge_chest = get("toolarge_chest"); - public static final Item xlarge_chest = get("xlarge_chest"); - public static final Item xxlarge_chest = get("xxlarge_chest"); - public static final Item xxxlarge_chest = get("xxxlarge_chest"); public static final ItemKey key = get("key"); public static final ItemKey black_key = get("black_key"); public static final ItemKey black_keycard = get("black_keycard"); @@ -1061,6 +1053,14 @@ public abstract class Items { public static final Item ink_sack = get("ink_sack"); public static final Item lapis_lazuli = get("lapis_lazuli"); public static final ItemHoe hoe = get("hoe"); + public static final Item wood_chest = get("wood_chest"); + public static final Item black_metal_chest = get("black_metal_chest"); + public static final Item iron_chest = get("iron_chest"); + public static final Item nichun_chest = get("nichun_chest"); + public static final Item platinum_chest = get("platinum_chest"); + public static final Item silver_chest = get("silver_chest"); + public static final Item stone_chest = get("stone_chest"); + public static final Item thetium_chest = get("thetium_chest"); private static T get(String id) { T item = (T)ItemRegistry.byName(id); diff --git a/common/src/main/java/common/tileentity/TileEntityBrewingStand.java b/common/src/main/java/common/tileentity/TileEntityBrewingStand.java index 136813f5..121c217d 100755 --- a/common/src/main/java/common/tileentity/TileEntityBrewingStand.java +++ b/common/src/main/java/common/tileentity/TileEntityBrewingStand.java @@ -10,7 +10,6 @@ import common.init.Items; import common.inventory.Container; import common.inventory.ContainerBrewingStand; import common.inventory.ISidedInventory; -import common.entity.npc.EntityNPC; import common.item.Item; import common.item.ItemStack; import common.item.consumable.ItemPotion; diff --git a/common/src/main/java/common/tileentity/TileEntityDispenser.java b/common/src/main/java/common/tileentity/TileEntityDispenser.java index 1699d59e..8bb82ab7 100755 --- a/common/src/main/java/common/tileentity/TileEntityDispenser.java +++ b/common/src/main/java/common/tileentity/TileEntityDispenser.java @@ -5,7 +5,6 @@ import common.collect.Lists; import common.entity.npc.EntityNPC; import common.inventory.Container; import common.inventory.ContainerDispenser; -import common.entity.npc.EntityNPC; import common.item.ItemStack; import common.rng.Random; import common.tags.TagObject; diff --git a/common/src/main/java/common/tileentity/TileEntityFurnace.java b/common/src/main/java/common/tileentity/TileEntityFurnace.java index 241d2014..214c24f8 100755 --- a/common/src/main/java/common/tileentity/TileEntityFurnace.java +++ b/common/src/main/java/common/tileentity/TileEntityFurnace.java @@ -15,7 +15,6 @@ import common.inventory.Container; import common.inventory.ContainerFurnace; import common.inventory.IInventory; import common.inventory.ISidedInventory; -import common.entity.npc.EntityNPC; import common.inventory.SlotFurnaceFuel; import common.item.Item; import common.item.ItemStack; diff --git a/common/src/main/java/common/tileentity/TileEntityHopper.java b/common/src/main/java/common/tileentity/TileEntityHopper.java index 8fc00688..403b563f 100755 --- a/common/src/main/java/common/tileentity/TileEntityHopper.java +++ b/common/src/main/java/common/tileentity/TileEntityHopper.java @@ -15,7 +15,6 @@ import common.inventory.Container; import common.inventory.ContainerHopper; import common.inventory.IInventory; import common.inventory.ISidedInventory; -import common.entity.npc.EntityNPC; import common.item.ItemStack; import common.tags.TagObject; import common.util.BlockPos; diff --git a/server/src/main/java/server/world/Converter.java b/server/src/main/java/server/world/Converter.java index d785607c..44971da7 100644 --- a/server/src/main/java/server/world/Converter.java +++ b/server/src/main/java/server/world/Converter.java @@ -654,10 +654,10 @@ public abstract class Converter { mapBlock(Blocks.oak_stairs.getState().withProperty(BlockStairs.FACING, Facing.WEST).withProperty(BlockStairs.HALF, EnumHalf.TOP), 53, 5, 13); mapBlock(Blocks.oak_stairs.getState().withProperty(BlockStairs.FACING, Facing.SOUTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 53, 6, 14); mapBlock(Blocks.oak_stairs.getState().withProperty(BlockStairs.FACING, Facing.NORTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 53, 7, 15); - mapBlock(Blocks.chest.getState().withProperty(BlockChest.FACING, Facing.NORTH), 54); - mapBlock(Blocks.chest.getState().withProperty(BlockChest.FACING, Facing.SOUTH), 54, 3, 9, 15); - mapBlock(Blocks.chest.getState().withProperty(BlockChest.FACING, Facing.WEST), 54, 4, 10); - mapBlock(Blocks.chest.getState().withProperty(BlockChest.FACING, Facing.EAST), 54, 5, 11); + mapBlock(Blocks.wood_chest.getState().withProperty(BlockChest.FACING, Facing.NORTH), 54); + mapBlock(Blocks.wood_chest.getState().withProperty(BlockChest.FACING, Facing.SOUTH), 54, 3, 9, 15); + mapBlock(Blocks.wood_chest.getState().withProperty(BlockChest.FACING, Facing.WEST), 54, 4, 10); + mapBlock(Blocks.wood_chest.getState().withProperty(BlockChest.FACING, Facing.EAST), 54, 5, 11); mapBlock(Blocks.diamond_ore, 56); mapBlock(Blocks.diamond_block, 57); mapBlock(Blocks.workbench, 58); @@ -1101,10 +1101,10 @@ public abstract class Converter { mapBlock(Blocks.anvil.getState().withProperty(BlockAnvil.FACING, Facing.WEST), 145, 1, 5, 9, 13); mapBlock(Blocks.anvil.getState().withProperty(BlockAnvil.FACING, Facing.NORTH), 145, 2, 6, 10, 14); mapBlock(Blocks.anvil.getState().withProperty(BlockAnvil.FACING, Facing.EAST), 145, 3, 7, 11, 15); - mapBlock(Blocks.chest.getState().withProperty(BlockChest.FACING, Facing.NORTH), 146); - mapBlock(Blocks.chest.getState().withProperty(BlockChest.FACING, Facing.SOUTH), 146, 3, 9, 15); - mapBlock(Blocks.chest.getState().withProperty(BlockChest.FACING, Facing.WEST), 146, 4, 10); - mapBlock(Blocks.chest.getState().withProperty(BlockChest.FACING, Facing.EAST), 146, 5, 11); + mapBlock(Blocks.wood_chest.getState().withProperty(BlockChest.FACING, Facing.NORTH), 146); + mapBlock(Blocks.wood_chest.getState().withProperty(BlockChest.FACING, Facing.SOUTH), 146, 3, 9, 15); + mapBlock(Blocks.wood_chest.getState().withProperty(BlockChest.FACING, Facing.WEST), 146, 4, 10); + mapBlock(Blocks.wood_chest.getState().withProperty(BlockChest.FACING, Facing.EAST), 146, 5, 11); mapBlock(Blocks.light_weighted_pressure_plate.getState().withProperty(BlockPressurePlateWeighted.POWER, 0), 147, 0); mapBlock(Blocks.light_weighted_pressure_plate.getState().withProperty(BlockPressurePlateWeighted.POWER, 1), 147, 1); mapBlock(Blocks.light_weighted_pressure_plate.getState().withProperty(BlockPressurePlateWeighted.POWER, 2), 147, 2); diff --git a/server/src/main/java/server/worldgen/FeatureDungeons.java b/server/src/main/java/server/worldgen/FeatureDungeons.java index ae449201..d45c18bf 100755 --- a/server/src/main/java/server/worldgen/FeatureDungeons.java +++ b/server/src/main/java/server/worldgen/FeatureDungeons.java @@ -93,7 +93,7 @@ public class FeatureDungeons if (k3 != k && i4 != -1 && k4 != l1 && k3 != l && i4 != 4 && k4 != i2) { - if (worldIn.getState(blockpos1).getBlock() != Blocks.chest) + if (worldIn.getState(blockpos1).getBlock() != Blocks.wood_chest) { worldIn.setBlockToAir(blockpos1); } @@ -102,7 +102,7 @@ public class FeatureDungeons { worldIn.setBlockToAir(blockpos1); } - else if (worldIn.getState(blockpos1).getBlock().getMaterial().isSolid() && worldIn.getState(blockpos1).getBlock() != Blocks.chest) + else if (worldIn.getState(blockpos1).getBlock().getMaterial().isSolid() && worldIn.getState(blockpos1).getBlock() != Blocks.wood_chest) { if (i4 == -1 && rand.zrange(4) != 0) { @@ -140,7 +140,7 @@ public class FeatureDungeons if (j3 == 1) { - worldIn.setState(blockpos2, Blocks.chest.correctFacing(worldIn, blockpos2, Blocks.chest.getState()), 2); + worldIn.setState(blockpos2, Blocks.wood_chest.correctFacing(worldIn, blockpos2, Blocks.wood_chest.getState()), 2); WeightedList list = RngLoot.addToList(LootConstants.DUNGEON_CHEST, ItemEnchantedBook.getRandom(rand)); TileEntity tileentity1 = worldIn.getTileEntity(blockpos2); diff --git a/server/src/main/java/server/worldgen/feature/WorldGenAbandonedChest.java b/server/src/main/java/server/worldgen/feature/WorldGenAbandonedChest.java index 309977ad..e16e4a72 100755 --- a/server/src/main/java/server/worldgen/feature/WorldGenAbandonedChest.java +++ b/server/src/main/java/server/worldgen/feature/WorldGenAbandonedChest.java @@ -51,7 +51,7 @@ public class WorldGenAbandonedChest extends FeatureGenerator BlockPos blockpos = position.add(rand.zrange(4) - rand.zrange(4), rand.zrange(3) - rand.zrange(3), rand.zrange(4) - rand.zrange(4)); if (worldIn.isAirBlock(blockpos) && worldIn.isBlockSolid(blockpos.down())) { - worldIn.setState(blockpos, Blocks.chest.getState().withProperty(BlockChest.FACING, Facing.randHorizontal(rand)), 2); + worldIn.setState(blockpos, Blocks.wood_chest.getState().withProperty(BlockChest.FACING, Facing.randHorizontal(rand)), 2); TileEntity tileentity = worldIn.getTileEntity(blockpos); if(tileentity instanceof TileEntityChest chest) RngLoot.generateChestContents(rand, this.items, chest, this.amount); diff --git a/server/src/main/java/server/worldgen/structure/StructureComponent.java b/server/src/main/java/server/worldgen/structure/StructureComponent.java index 9a60e7e6..a76d81c4 100755 --- a/server/src/main/java/server/worldgen/structure/StructureComponent.java +++ b/server/src/main/java/server/worldgen/structure/StructureComponent.java @@ -697,10 +697,10 @@ public abstract class StructureComponent { BlockPos blockpos = new BlockPos(this.getXWithOffset(x, z), this.getYWithOffset(y), this.getZWithOffset(x, z)); - if (boundingBoxIn.isVecInside(blockpos) && worldIn.getState(blockpos).getBlock() != Blocks.chest) + if (boundingBoxIn.isVecInside(blockpos) && worldIn.getState(blockpos).getBlock() != Blocks.wood_chest) { - State iblockstate = Blocks.chest.getState(); - worldIn.setState(blockpos, Blocks.chest.correctFacing(worldIn, blockpos, iblockstate), 2); + State iblockstate = Blocks.wood_chest.getState(); + worldIn.setState(blockpos, Blocks.wood_chest.correctFacing(worldIn, blockpos, iblockstate), 2); TileEntity tileentity = worldIn.getTileEntity(blockpos); if (tileentity instanceof TileEntityChest) diff --git a/server/src/main/java/server/worldgen/structure/StructureMineshaft.java b/server/src/main/java/server/worldgen/structure/StructureMineshaft.java index f49ed292..2be4b73d 100755 --- a/server/src/main/java/server/worldgen/structure/StructureMineshaft.java +++ b/server/src/main/java/server/worldgen/structure/StructureMineshaft.java @@ -294,7 +294,7 @@ public class StructureMineshaft if (boundingBoxIn.isVecInside(blockpos) && worldIn.getState(blockpos).getBlock() == Blocks.air && worldIn.isBlockSolid(blockpos.down())) { - worldIn.setState(blockpos, Blocks.chest.getState().withProperty(BlockChest.FACING, Facing.randHorizontal(rand)), 2); + worldIn.setState(blockpos, Blocks.wood_chest.getState().withProperty(BlockChest.FACING, Facing.randHorizontal(rand)), 2); TileEntity tileentity = worldIn.getTileEntity(blockpos); if(tileentity instanceof TileEntityChest chest) RngLoot.generateChestContents(rand, listIn, chest, max);