From a3ceadd0ff43450c2a2ec56bb64c80cb20c325c4 Mon Sep 17 00:00:00 2001 From: Sen Date: Sat, 19 Jul 2025 15:46:25 +0200 Subject: [PATCH] update textures #1 --- .../client/renderer/layers/LayerArmor.java | 56 ++-- .../client/renderer/model/ModelBiped.java | 11 +- .../TileEntityItemStackRenderer.java | 59 ++++ .../tileentity/TileEntitySignRenderer.java | 3 +- .../textures/blocks/activator_rail.png | Bin 496 -> 0 bytes .../blocks/activator_rail_powered.png | Bin 542 -> 0 bytes .../resources/textures/blocks/charge_ore.png | Bin 264 -> 5316 bytes .../textures/blocks/charged_block.png | Bin 609 -> 5687 bytes .../resources/textures/blocks/cocoa_0.png | Bin 248 -> 0 bytes .../resources/textures/blocks/cocoa_1.png | Bin 405 -> 0 bytes .../resources/textures/blocks/cocoa_2.png | Bin 570 -> 0 bytes .../blocks/daylight_detector_inverted_top.png | Bin 287 -> 0 bytes .../blocks/daylight_detector_side.png | Bin 206 -> 0 bytes .../textures/blocks/daylight_detector_top.png | Bin 335 -> 0 bytes .../textures/blocks/detector_rail.png | Bin 309 -> 0 bytes .../textures/blocks/detector_rail_powered.png | Bin 581 -> 0 bytes .../resources/textures/blocks/golden_rail.png | Bin 290 -> 0 bytes .../textures/blocks/golden_rail_powered.png | Bin 341 -> 0 bytes .../resources/textures/blocks/iron_block.png | Bin 333 -> 5005 bytes .../resources/textures/items/acacia_door.png | Bin 200 -> 0 bytes .../resources/textures/items/birch_door.png | Bin 255 -> 0 bytes .../resources/textures/items/black_bed.png | Bin 390 -> 0 bytes .../textures/items/blazing_powder.png | Bin 5005 -> 4864 bytes ...potion_bottle_drinkable.png => bottle.png} | Bin .../textures/items/brewing_stand.png | Bin 291 -> 0 bytes .../main/resources/textures/items/cake.png | Bin 239 -> 0 bytes .../textures/items/calcium_powder.png | Bin .../resources/textures/items/cauldron.png | Bin 331 -> 0 bytes .../textures/items/charged_powder.png | Bin 166 -> 4878 bytes .../resources/textures/items/cherry_door.png | Bin 1570 -> 0 bytes .../main/resources/textures/items/clock.png | Bin 5737 -> 0 bytes .../main/resources/textures/items/cocoa.png | Bin 238 -> 0 bytes .../items/{display4.png => cocoa_powder.png} | Bin 4826 -> 5093 bytes .../textures/items/dark_oak_door.png | Bin 208 -> 0 bytes .../main/resources/textures/items/display.png | Bin 4816 -> 0 bytes .../resources/textures/items/display2.png | Bin 4821 -> 0 bytes .../src/main/resources/textures/items/egg.png | Bin 161 -> 4964 bytes .../main/resources/textures/items/emerald.png | Bin 332 -> 5381 bytes .../resources/textures/items/filled_map.png | Bin 190 -> 0 bytes .../resources/textures/items/flowerpot.png | Bin 541 -> 0 bytes .../{blackwood_door.png => gold_coin.png} | Bin 4615 -> 4802 bytes .../main/resources/textures/items/hopper.png | Bin 795 -> 0 bytes .../resources/textures/items/iron_door.png | Bin 5176 -> 0 bytes .../resources/textures/items/iron_ingot.png | Bin 191 -> 4830 bytes .../resources/textures/items/item_frame.png | Bin 401 -> 0 bytes .../resources/textures/items/jungle_door.png | Bin 223 -> 0 bytes .../{flint_and_steel.png => lighter.png} | Bin .../src/main/resources/textures/items/map.png | Bin 226 -> 0 bytes .../resources/textures/items/maple_door.png | Bin 1164 -> 0 bytes .../textures/items/mutton_cooked.png | Bin 452 -> 0 bytes .../resources/textures/items/mutton_raw.png | Bin 445 -> 0 bytes .../resources/textures/items/oak_door.png | Bin 5269 -> 0 bytes .../resources/textures/items/painting.png | Bin 142 -> 0 bytes .../textures/items/potion_bottle_empty.png | Bin 166 -> 0 bytes .../textures/items/potion_bottle_splash.png | Bin 317 -> 0 bytes .../resources/textures/items/purple_bed.png | Bin 405 -> 0 bytes .../main/resources/textures/items/quiver.png | Bin 179 -> 0 bytes .../main/resources/textures/items/reeds.png | Bin 204 -> 0 bytes .../main/resources/textures/items/ruby.png | Bin 434 -> 5465 bytes .../main/resources/textures/items/sign.png | Bin 161 -> 4987 bytes .../resources/textures/items/spruce_door.png | Bin 210 -> 0 bytes .../main/resources/textures/items/string.png | Bin 177 -> 0 bytes .../main/resources/textures/items/tear.png | Bin 126 -> 0 bytes .../resources/textures/items/tian_door.png | Bin 5235 -> 0 bytes .../resources/textures/items/white_bed.png | Bin 5585 -> 0 bytes .../main/resources/textures/items/wire.png | Bin 4921 -> 0 bytes .../java/common/block/DirectionalDown.java | 8 - .../main/java/common/block/DirectionalUp.java | 8 - .../java/common/block/foliage/BlockCocoa.java | 259 ------------------ .../common/block/foliage/BlockLeaves.java | 2 +- .../java/common/block/foliage/BlockStem.java | 6 +- .../block/tech/BlockDaylightDetector.java | 161 ----------- .../java/common/block/tech/BlockHopper.java | 28 +- .../main/java/common/block/tech/BlockTNT.java | 4 +- .../block/tech/BlockToggleableLight.java | 4 +- .../java/common/block/tech/BlockTorch.java | 68 +++-- .../common/block/tech/BlockUnlitTorch.java | 4 +- .../src/main/java/common/color/DyeColor.java | 2 +- .../java/common/entity/npc/EntityHaunter.java | 2 +- .../main/java/common/init/BlockRegistry.java | 5 - common/src/main/java/common/init/Blocks.java | 3 - .../java/common/init/CraftingRegistry.java | 5 +- .../main/java/common/init/ItemRegistry.java | 14 +- common/src/main/java/common/init/Items.java | 13 +- .../src/main/java/common/init/WoodType.java | 14 +- .../src/main/java/common/item/CheatTab.java | 2 +- .../java/common/item/block/ItemBlock.java | 2 +- .../main/java/common/item/block/ItemSign.java | 6 + .../java/common/item/material/ItemDye.java | 58 +--- .../main/java/common/item/tool/ItemArmor.java | 15 +- .../{ItemFlintAndSteel.java => ItemFire.java} | 4 +- .../common/item/tool/ItemGlassBottle.java | 2 +- .../java/common/item/tool/ItemPotion.java | 2 +- .../tileentity/TileEntityComparator.java | 34 --- .../TileEntityDaylightDetector.java | 33 --- .../common/tileentity/TileEntityHopper.java | 22 +- .../server/clipboard/ReorderRegistry.java | 3 - .../src/main/java/server/world/Converter.java | 59 +--- .../java/server/worldgen/LootConstants.java | 2 +- .../worldgen/tree/WorldGenBaseTree.java | 21 -- 100 files changed, 217 insertions(+), 787 deletions(-) delete mode 100755 client/src/main/resources/textures/blocks/activator_rail.png delete mode 100755 client/src/main/resources/textures/blocks/activator_rail_powered.png delete mode 100755 client/src/main/resources/textures/blocks/cocoa_0.png delete mode 100755 client/src/main/resources/textures/blocks/cocoa_1.png delete mode 100755 client/src/main/resources/textures/blocks/cocoa_2.png delete mode 100755 client/src/main/resources/textures/blocks/daylight_detector_inverted_top.png delete mode 100755 client/src/main/resources/textures/blocks/daylight_detector_side.png delete mode 100755 client/src/main/resources/textures/blocks/daylight_detector_top.png delete mode 100755 client/src/main/resources/textures/blocks/detector_rail.png delete mode 100755 client/src/main/resources/textures/blocks/detector_rail_powered.png delete mode 100755 client/src/main/resources/textures/blocks/golden_rail.png delete mode 100755 client/src/main/resources/textures/blocks/golden_rail_powered.png delete mode 100755 client/src/main/resources/textures/items/acacia_door.png delete mode 100755 client/src/main/resources/textures/items/birch_door.png delete mode 100755 client/src/main/resources/textures/items/black_bed.png rename client/src/main/resources/textures/items/{potion_bottle_drinkable.png => bottle.png} (100%) delete mode 100755 client/src/main/resources/textures/items/brewing_stand.png delete mode 100755 client/src/main/resources/textures/items/cake.png mode change 100755 => 100644 client/src/main/resources/textures/items/calcium_powder.png delete mode 100755 client/src/main/resources/textures/items/cauldron.png delete mode 100755 client/src/main/resources/textures/items/cherry_door.png delete mode 100755 client/src/main/resources/textures/items/clock.png delete mode 100755 client/src/main/resources/textures/items/cocoa.png rename client/src/main/resources/textures/items/{display4.png => cocoa_powder.png} (56%) mode change 100644 => 100755 delete mode 100755 client/src/main/resources/textures/items/dark_oak_door.png delete mode 100755 client/src/main/resources/textures/items/display.png delete mode 100644 client/src/main/resources/textures/items/display2.png delete mode 100755 client/src/main/resources/textures/items/filled_map.png delete mode 100755 client/src/main/resources/textures/items/flowerpot.png rename client/src/main/resources/textures/items/{blackwood_door.png => gold_coin.png} (60%) delete mode 100755 client/src/main/resources/textures/items/hopper.png delete mode 100755 client/src/main/resources/textures/items/iron_door.png delete mode 100755 client/src/main/resources/textures/items/item_frame.png delete mode 100755 client/src/main/resources/textures/items/jungle_door.png rename client/src/main/resources/textures/items/{flint_and_steel.png => lighter.png} (100%) delete mode 100755 client/src/main/resources/textures/items/map.png delete mode 100755 client/src/main/resources/textures/items/maple_door.png delete mode 100755 client/src/main/resources/textures/items/mutton_cooked.png delete mode 100755 client/src/main/resources/textures/items/mutton_raw.png delete mode 100755 client/src/main/resources/textures/items/oak_door.png delete mode 100755 client/src/main/resources/textures/items/painting.png delete mode 100755 client/src/main/resources/textures/items/potion_bottle_empty.png delete mode 100755 client/src/main/resources/textures/items/potion_bottle_splash.png delete mode 100755 client/src/main/resources/textures/items/purple_bed.png delete mode 100755 client/src/main/resources/textures/items/quiver.png delete mode 100755 client/src/main/resources/textures/items/reeds.png delete mode 100755 client/src/main/resources/textures/items/spruce_door.png delete mode 100755 client/src/main/resources/textures/items/string.png delete mode 100755 client/src/main/resources/textures/items/tear.png delete mode 100755 client/src/main/resources/textures/items/tian_door.png delete mode 100755 client/src/main/resources/textures/items/white_bed.png delete mode 100755 client/src/main/resources/textures/items/wire.png delete mode 100644 common/src/main/java/common/block/DirectionalDown.java delete mode 100644 common/src/main/java/common/block/DirectionalUp.java delete mode 100755 common/src/main/java/common/block/foliage/BlockCocoa.java delete mode 100755 common/src/main/java/common/block/tech/BlockDaylightDetector.java rename common/src/main/java/common/item/tool/{ItemFlintAndSteel.java => ItemFire.java} (96%) delete mode 100755 common/src/main/java/common/tileentity/TileEntityComparator.java delete mode 100755 common/src/main/java/common/tileentity/TileEntityDaylightDetector.java diff --git a/client/src/main/java/client/renderer/layers/LayerArmor.java b/client/src/main/java/client/renderer/layers/LayerArmor.java index cd6fed79..1025c63e 100755 --- a/client/src/main/java/client/renderer/layers/LayerArmor.java +++ b/client/src/main/java/client/renderer/layers/LayerArmor.java @@ -2,6 +2,7 @@ package client.renderer.layers; import org.lwjgl.opengl.GL11; +import client.Client; import client.renderer.GlState; import client.renderer.entity.RendererLivingEntity; import client.renderer.model.ModelArmor; @@ -14,14 +15,14 @@ public class LayerArmor implements LayerRenderer { protected static final String ENCHANTED_ITEM_GLINT_RES = "textures/glint.png"; - protected ModelBiped modelLeggings; - protected ModelBiped modelArmor; + protected ModelArmor modelLeggings; + protected ModelArmor modelArmor; private final RendererLivingEntity renderer; private float alpha = 1.0F; private float colorR = 1.0F; private float colorG = 1.0F; private float colorB = 1.0F; - private boolean skipRenderGlint; +// private boolean skipRenderGlint; // private static final Map ARMOR_TEXTURE_RES_MAP = Maps.newHashMap(); public LayerArmor(RendererLivingEntity rendererIn, int arms, int legs) @@ -32,12 +33,12 @@ public class LayerArmor implements LayerRenderer this.modelArmor = new ModelArmor(1.0F, arms, legs); } - public void doRenderLayer(EntityLiving entitylivingbaseIn, float p_177141_2_, float p_177141_3_, float partialTicks, float p_177141_5_, float p_177141_6_, float p_177141_7_, float scale) + public void doRenderLayer(EntityLiving entity, float limbSwing, float limbSwingAmount, float partial, float yaw, float pitch, float factor, float scale) { - this.renderLayer(entitylivingbaseIn, p_177141_2_, p_177141_3_, partialTicks, p_177141_5_, p_177141_6_, p_177141_7_, scale, 4); - this.renderLayer(entitylivingbaseIn, p_177141_2_, p_177141_3_, partialTicks, p_177141_5_, p_177141_6_, p_177141_7_, scale, 3); - this.renderLayer(entitylivingbaseIn, p_177141_2_, p_177141_3_, partialTicks, p_177141_5_, p_177141_6_, p_177141_7_, scale, 2); - this.renderLayer(entitylivingbaseIn, p_177141_2_, p_177141_3_, partialTicks, p_177141_5_, p_177141_6_, p_177141_7_, scale, 1); + this.renderLayer(entity, limbSwing, limbSwingAmount, partial, yaw, pitch, factor, scale, 4); + this.renderLayer(entity, limbSwing, limbSwingAmount, partial, yaw, pitch, factor, scale, 3); + this.renderLayer(entity, limbSwing, limbSwingAmount, partial, yaw, pitch, factor, scale, 2); + this.renderLayer(entity, limbSwing, limbSwingAmount, partial, yaw, pitch, factor, scale, 1); } public boolean shouldCombineTextures() @@ -45,19 +46,23 @@ public class LayerArmor implements LayerRenderer return false; } - private void renderLayer(EntityLiving entitylivingbaseIn, float p_177182_2_, float p_177182_3_, float partialTicks, float p_177182_5_, float p_177182_6_, float p_177182_7_, float scale, int armorSlot) + private void renderLayer(EntityLiving entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partial, float yaw, float pitch, float factor, float scale, int armorSlot) { ItemStack itemstack = this.getCurrentArmor(entitylivingbaseIn, armorSlot); if (itemstack != null && itemstack.getItem() instanceof ItemArmor) { ItemArmor itemarmor = (ItemArmor)itemstack.getItem(); - ModelBiped t = this.getArmorModel(armorSlot); - t.setModelAttributes(this.renderer.getMainModel()); - t.setLivingAnimations(entitylivingbaseIn, p_177182_2_, p_177182_3_, partialTicks); + ModelArmor t = this.getArmorModel(armorSlot); + t.setModelAttributes(this.renderer != null ? this.renderer.getMainModel() : null); + t.setLivingAnimations(entitylivingbaseIn, limbSwing, limbSwingAmount, partial); this.setModelPartVisible(t, armorSlot); boolean flag = this.isSlotForLeggings(armorSlot); - this.renderer.bindTexture(this.getArmorResource(itemarmor, flag, null)); + String tex = this.getArmorResource(itemarmor, flag, null); + if(this.renderer != null) + this.renderer.bindTexture(tex); + else + Client.CLIENT.getTextureManager().bindTexture(tex); if (itemarmor.getArmorMaterial().canBeDyed()) { @@ -66,8 +71,12 @@ public class LayerArmor implements LayerRenderer float f1 = (float)(i >> 8 & 255) / 255.0F; float f2 = (float)(i & 255) / 255.0F; GlState.color(this.colorR * f, this.colorG * f1, this.colorB * f2, this.alpha); - t.render(entitylivingbaseIn, p_177182_2_, p_177182_3_, p_177182_5_, p_177182_6_, p_177182_7_, scale); - this.renderer.bindTexture(this.getArmorResource(itemarmor, flag, "overlay")); + t.render(entitylivingbaseIn, limbSwing, limbSwingAmount, yaw, pitch, factor, scale); + String overlay = this.getArmorResource(itemarmor, flag, "overlay"); + if(this.renderer != null) + this.renderer.bindTexture(overlay); + else + Client.CLIENT.getTextureManager().bindTexture(overlay); } // case CHAIN: @@ -76,13 +85,13 @@ public class LayerArmor implements LayerRenderer // case DIAMOND: if(itemarmor.getArmorMaterial().hasArmor()) { GlState.color(this.colorR, this.colorG, this.colorB, this.alpha); - t.render(entitylivingbaseIn, p_177182_2_, p_177182_3_, p_177182_5_, p_177182_6_, p_177182_7_, scale); + t.render(entitylivingbaseIn, limbSwing, limbSwingAmount, yaw, pitch, factor, scale); } // default: - if (!this.skipRenderGlint && itemstack.isItemEnchanted()) + if (itemstack.isItemEnchanted()) { - this.renderGlint(entitylivingbaseIn, t, p_177182_2_, p_177182_3_, partialTicks, p_177182_5_, p_177182_6_, p_177182_7_, scale); + this.renderGlint(entitylivingbaseIn, t, limbSwing, limbSwingAmount, partial, yaw, pitch, factor, scale); } } } @@ -92,7 +101,7 @@ public class LayerArmor implements LayerRenderer return entitylivingbaseIn.getArmor(armorSlot - 1); } - public ModelBiped getArmorModel(int armorSlot) + public ModelArmor getArmorModel(int armorSlot) { return this.isSlotForLeggings(armorSlot) ? this.modelLeggings : this.modelArmor; } @@ -102,10 +111,13 @@ public class LayerArmor implements LayerRenderer return armorSlot == 2; } - private void renderGlint(EntityLiving entitylivingbaseIn, ModelBiped modelbaseIn, float p_177183_3_, float p_177183_4_, float partialTicks, float p_177183_6_, float p_177183_7_, float p_177183_8_, float scale) + private void renderGlint(EntityLiving entitylivingbaseIn, ModelArmor modelbaseIn, float p_177183_3_, float p_177183_4_, float partialTicks, float p_177183_6_, float p_177183_7_, float p_177183_8_, float scale) { - float f = (float)entitylivingbaseIn.ticksExisted + partialTicks; - this.renderer.bindTexture(ENCHANTED_ITEM_GLINT_RES); + float f = entitylivingbaseIn == null ? (float)(System.currentTimeMillis() % 1000000L) / 50.0f : (float)entitylivingbaseIn.ticksExisted + partialTicks; + if(this.renderer != null) + this.renderer.bindTexture(ENCHANTED_ITEM_GLINT_RES); + else + Client.CLIENT.getTextureManager().bindTexture(ENCHANTED_ITEM_GLINT_RES); GlState.enableBlend(); GlState.depthFunc(GL11.GL_EQUAL); GlState.depthMask(false); diff --git a/client/src/main/java/client/renderer/model/ModelBiped.java b/client/src/main/java/client/renderer/model/ModelBiped.java index 32801ca4..fee7e02e 100755 --- a/client/src/main/java/client/renderer/model/ModelBiped.java +++ b/client/src/main/java/client/renderer/model/ModelBiped.java @@ -114,12 +114,12 @@ public abstract class ModelBiped extends ModelBase { this.bipedHead.rotateAngleY = netHeadYaw / (180F / (float)Math.PI); this.bipedHead.rotateAngleX = headPitch / (180F / (float)Math.PI); - this.bipedRightArm.rotateAngleX = ((EntityLiving)entityIn).getArmRotation() * ExtMath.cos(limbSwing * 0.6662F + (float)Math.PI) * /* 2.0F * */ limbSwingAmount; // * 0.5F; - this.bipedLeftArm.rotateAngleX = ((EntityLiving)entityIn).getArmRotation() * ExtMath.cos(limbSwing * 0.6662F) * /* 2.0F * */ limbSwingAmount; // * 0.5F; + this.bipedRightArm.rotateAngleX = (entityIn == null ? 1.0f : ((EntityLiving)entityIn).getArmRotation()) * ExtMath.cos(limbSwing * 0.6662F + (float)Math.PI) * /* 2.0F * */ limbSwingAmount; // * 0.5F; + this.bipedLeftArm.rotateAngleX = (entityIn == null ? 1.0f : ((EntityLiving)entityIn).getArmRotation()) * ExtMath.cos(limbSwing * 0.6662F) * /* 2.0F * */ limbSwingAmount; // * 0.5F; this.bipedRightArm.rotateAngleZ = 0.0F; this.bipedLeftArm.rotateAngleZ = 0.0F; - this.bipedRightLeg.rotateAngleX = ((EntityLiving)entityIn).getLegRotation() * ExtMath.cos(limbSwing * 0.6662F) /* * 1.4F */ * limbSwingAmount; - this.bipedLeftLeg.rotateAngleX = ((EntityLiving)entityIn).getLegRotation() * ExtMath.cos(limbSwing * 0.6662F + (float)Math.PI) /* * 1.4F */ * limbSwingAmount; + this.bipedRightLeg.rotateAngleX = (entityIn == null ? 1.4f : ((EntityLiving)entityIn).getLegRotation()) * ExtMath.cos(limbSwing * 0.6662F) /* * 1.4F */ * limbSwingAmount; + this.bipedLeftLeg.rotateAngleX = (entityIn == null ? 1.4f : ((EntityLiving)entityIn).getLegRotation()) * ExtMath.cos(limbSwing * 0.6662F + (float)Math.PI) /* * 1.4F */ * limbSwingAmount; this.bipedRightLeg.rotateAngleY = 0.0F; this.bipedLeftLeg.rotateAngleY = 0.0F; @@ -231,7 +231,8 @@ public abstract class ModelBiped extends ModelBase public void setModelAttributes(ModelBase model) { - super.setModelAttributes(model); + if(model != null) + super.setModelAttributes(model); if (model instanceof ModelBiped) { diff --git a/client/src/main/java/client/renderer/tileentity/TileEntityItemStackRenderer.java b/client/src/main/java/client/renderer/tileentity/TileEntityItemStackRenderer.java index 03b63dc5..412dcd4a 100755 --- a/client/src/main/java/client/renderer/tileentity/TileEntityItemStackRenderer.java +++ b/client/src/main/java/client/renderer/tileentity/TileEntityItemStackRenderer.java @@ -1,8 +1,18 @@ package client.renderer.tileentity; +import org.lwjgl.opengl.GL11; + +import client.renderer.GlState; +import client.renderer.layers.LayerArmor; import common.block.tech.BlockChest; +import common.block.tile.BlockSign; +import common.block.tile.BlockStandingSign; +import common.entity.types.EntityLiving; import common.item.ItemStack; +import common.item.block.ItemSign; +import common.item.tool.ItemArmor; import common.tileentity.TileEntityChest; +import common.tileentity.TileEntitySign; import common.util.Facing; import common.world.State; @@ -10,6 +20,7 @@ public class TileEntityItemStackRenderer { public static TileEntityItemStackRenderer instance = new TileEntityItemStackRenderer(); private State state; + private ItemStack stack; private final TileEntityChest chest = new TileEntityChest(0) { public boolean hasWorldObj() { @@ -21,10 +32,58 @@ public class TileEntityItemStackRenderer { } }; + private final TileEntitySign sign = new TileEntitySign() { + public boolean hasWorldObj() { + return true; + } + + public State getBlockState() { + return TileEntityItemStackRenderer.this.state; + } + }; + private final LayerArmor armor = new LayerArmor(null, 12, 12) { + public ItemStack getCurrentArmor(EntityLiving entitylivingbaseIn, int armorSlot) { + return ((ItemArmor)TileEntityItemStackRenderer.this.stack.getItem()).armorType.getIndex() == armorSlot ? TileEntityItemStackRenderer.this.stack : null; + } + }; + public void renderByItem(ItemStack stack) { if(stack.getItem() != null && stack.getItem().getBlock() instanceof BlockChest chest) { this.state = chest.getState().withProperty(BlockChest.FACING, Facing.SOUTH); TileEntityRendererDispatcher.instance.renderTileEntityAt(this.chest, 0.0D, 0.0D, 0.0D, 0.0F); } + else if(stack.getItem() instanceof ItemSign sign) { + this.state = sign.getBlock().getState().withProperty(BlockStandingSign.ROTATION, 8); + TileEntityRendererDispatcher.instance.renderTileEntityAt(this.sign, 0.0D, 0.0D, 0.0D, 0.0F); + } + else if(stack.getItem() instanceof ItemArmor armor) { + this.stack = stack; + GL11.glPushMatrix(); + float offset = 0.0f; + switch(armor.armorType) { + case HEAD: + offset = -0.15f; + break; + case BODY: + offset = 0.45f; + break; + case LEGS: + offset = 1.35f; + break; + case FEET: + offset = 1.7f; + break; + } + GL11.glTranslatef(1.0f, offset, 0.0f); + GL11.glRotatef(180.0f, 0.0f, 1.0f, 0.0f); + GL11.glScalef(1.4f, -1.4f, 1.4f); + boolean cull = GlState.isCullEnabled(); + if(cull) + GlState.disableCull(); + this.armor.doRenderLayer(null, 0.0f, 0.0f, 0.0f, 0, 0, 0.0f, 0.0625F); + if(cull) + GlState.enableCull(); + GL11.glPopMatrix(); + } } } diff --git a/client/src/main/java/client/renderer/tileentity/TileEntitySignRenderer.java b/client/src/main/java/client/renderer/tileentity/TileEntitySignRenderer.java index f100d7b8..d3da4f57 100755 --- a/client/src/main/java/client/renderer/tileentity/TileEntitySignRenderer.java +++ b/client/src/main/java/client/renderer/tileentity/TileEntitySignRenderer.java @@ -22,12 +22,11 @@ public class TileEntitySignRenderer extends TileEntitySpecialRenderer<1&r=-q*fImR3Tq)(|$elV_TGL8xB}Glv>F8|Plx?Arr77~d zI6J%WBM#rY_j$i>@AG{6K2VdUX;M)Xc^nS#osPo+6h)Dmrb(yf1z24etrt`^FQ zxk37a?f85?tm_KN^#fEjPe`$Ss|%xYdE-!c0nRcdf+O}t7PtqR3Kc4kPXLt4FJyr- z5UPE2mMHueGVcC zOFYCZlDfgBZu~6=*$?MCv*JDn09Us+GQO5{w+kYbqflt3`ub9@f5pJ-%riZY1lS7) m#E_cDOjuv8^OkA*90u?DXyqEBbugp=0000}kKGq4?xN;OP4e2$}XjYhW&9=?gHtI0g%T$XZLVhV1E&%m*wyn5RMgZ@5Y zttEE(Yqk4#kWI!!Ej(Z-Gs)tkn_??1hqG>P3{Z8B8+9V(8Ux)jxVJE@ZoMc$&h=O8 gcb<>1=(RKW2m7W1B?nba7ytkO07*qoM6N<$f@j|9^Z)<= diff --git a/client/src/main/resources/textures/blocks/charge_ore.png b/client/src/main/resources/textures/blocks/charge_ore.png index 575a48880e3c4675e008b6220835e33fc99d0bab..ea0f9a3159637d14bf7dfb571e9d8dd163859a68 100755 GIT binary patch literal 5316 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 diff --git a/client/src/main/resources/textures/blocks/charged_block.png b/client/src/main/resources/textures/blocks/charged_block.png index fcf6b40f713e561048ecb91d0246d9fcb0722d04..c4faa4e926470968aa875a7b7a72cb2cbb65f935 100755 GIT binary patch literal 5687 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 delta 567 zcmV-70?7ThEa3!@BM<-vVoOIv0RI600RN!9r<0Q}6c>L20ZBwbR5;6>lgn-sK@dex zRrkC+cASJfAtVwaA>sqr@-6%yzruzE;vo@(4GAbgM6omD8BZ6BnY;)qN-A|rU484` zTPhhJ^o=flMG33*oWEmS88eK-Sns`gfbWe_n6ccHylDa}2%|ax&=`Cz1Bbce-6D_y z0mwvn=%jxID9o4xbA#A~V>5~dRN=HX8iQG56pfLn@Vhpi=L&QHivTk-&dqo>=rKB* z@$oW{I|v4Ak@BN9*1WLpgrO5EyCtC#_%Ll)iIk&@OU`Q}l@=J_XB7~@g0bv{U8iKd z6q(Oa00TB-<+uz?D&uTnY>Cpqbp~KFQC3VChroYHQGmf6TZ;fkMcZ~_?YZcv2H?}I zWg=a@xelNYL;|_v{+I-Ir0uhxE8`F_AiF(Ak*i`sF=}f+Ud0ugqaxr1c2gzMw%}Sq z0LsvgED>2_t!Z?cUp*eQ?6ftz?}S)kFVAiyyuApd4xaRs zFH?VGYR1!C@xbfJ1p>qhnF>ptwr`gOtC8X-m9d{G`(8P%jJ-Z=tD_b;sRJlHN|drO zmb}n&Fe(BMBE6BY5eXUaxoFskmGwbJX@*xg$dzReTZyopC_}Hj7Gc0AmIwW> zue6330Mgtw(eZz2z43oyH7}YU08tBbI*3kB(I#lXmhI7C&9&v0M0*zwigJzqw|3e5 zuP!(LpPj5vx&al{rvJC^jRt#p;xsqX4FGv{+n%WZ3zvKUZ|Sfh-GG`}^Z%Q+NB*BQ y)A@gSsVV6ORF;`TVynXBe_o~m=?08~!3qG-%5CKAc1DK)0000`|IaQ7{l9Bk(Eo+?&i}K*W&RV=oF1Y9Q3J9K zWb4K*S1<;#LEgY+Kz4){ShK$))RGi0mH*4?ZT=sc2*I<;EHDfJg%ikC)d`0G3!_#4 z$J;7`G28_poa3kRKiokQOoKEa8vxRLc0us}Q;TB$PpxqLzq8Nzf4rwO!GMN?BpkswR!yC(d+cz$3%#D10pP? z{+GvV|4;By_@5J^_CM58@_&St4Dkkx0{j2~h%&!_(J>jM00000NkvXXu0mjfcb3ZK diff --git a/client/src/main/resources/textures/blocks/cocoa_2.png b/client/src/main/resources/textures/blocks/cocoa_2.png deleted file mode 100755 index db28c7b8ea543c5ce6af85eda16cdaea1f5f5676..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A_P)m0YWG_Y((WnKk&l9 zFeHjDf<#KxqKmwVc2>K{%j%+kj9O_R<8uR;T&$Xb`2)&1}T9D`2$O zrkT5)I|B+~Bg%}I&1>B#4-&jhpJeT_L^7b}U{dorB9L?mq&n2&Q?okVNU_VnxMSyu z)m0Y;tgKD7YM@fi&BA#*$xcBtZ>V>2NaSPIOYV$?Oi*Nf$i|%4_y>@%>q&alDLn!+ zQ49I7iDJN@wGg-JQ8E&*C*1saHqM7!4^KxA^Jc_BN)q;LNz;gPKc%djci9epKEK5F ze2iB~iPF`h#O?ap0NF3{NtRfha`An6jBgM7d3mvg&*@ezmzscTz*WFXN}_TvNac2r zCqoXD2`4c}LmdD$@hx@T7h^4aoeQy<@vwBk$;PmqsA*qqK>E0-1(uJR*}CCl>!wd@ zWOJa2{>C~0!%cebbQ;KXi7cNxL^>d9|K{w$2BKmefd50k0sM6cONliA#{d8T07*qo IM6N<$f-IsFKmY&$ diff --git a/client/src/main/resources/textures/blocks/daylight_detector_inverted_top.png b/client/src/main/resources/textures/blocks/daylight_detector_inverted_top.png deleted file mode 100755 index 194a30e4b4414dfc138b7249a29f0e89dca21290..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85sDMfiPqHot61OLG}_)Usv{f>~b7>{KaeY+<-#!JzX3_EKVnH zF%0{4-hnY8F(D!0hi1Y#0WrCQ2M(V;Y>4H1@Z5FWj|iN~4IO8XFME#mRvvwmiKuw#2$TwxA<3B!J-A*_q7ZI$HS&3a&jD zk43z+Hy5{#Wc=~@i(8s1^BcOTm97E@-3TuI_ S?z%vyGI+ZBxvXI`{J|=`b`5;D|^#*EsXX_xts1K}RAafMDL9e=SL`-rLuA v2t9t1&@SQN)6mQIC_~|qaPkrpYi5S4cW*_Xej#fIw3)%v)z4*}Q$iB}hn!8y diff --git a/client/src/main/resources/textures/blocks/daylight_detector_top.png b/client/src/main/resources/textures/blocks/daylight_detector_top.png deleted file mode 100755 index 3bfb2da31b47b409591c00edd50357e656485074..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=DkBK$x-p&dPkC;CoLO#}JFt$y*G=ew}w3sUE)P(;7NIa(O3qEL@%3Wcl=UdpM8%{@S!3 zpPmZesocM>KJCZPx5izQFJ3h~?a66&XLr>s$LQeZhlhV(=Q%xHFYU*Vzx;>Kavy(~ z#QpsIL4oLfC5DG*``b%Os6{=Y3ON`{PWrULu_9+B^G3OdCD#1+gF zS>qLil-)uU9tlY=X_SzZJ?)^8uyL6S8yj2GO1^xBRhp-gcsJPZuNU&`oRX5x&?d}u U>o{AJBGBs$p00i_>zopr06vk2%K!iX diff --git a/client/src/main/resources/textures/blocks/detector_rail.png b/client/src/main/resources/textures/blocks/detector_rail.png deleted file mode 100755 index 92c1466eca4e2e0b3ef70eee0a479ec6137c5da7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmV-50m}Y~P)Jb>3DR(4)29EMmM!~#V(;Gn{S_5p1Bng;kgXt%D^{!k%; zuuF&z1CR?qw!;jlEi44Pis&!^ITz$?kVcU0ZK)|>1BgloAb&`K5(tU2Q{{LtPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*e% z2^lC0(sH{100G5GL_t(I%Z-!4OB7KY$3Jg&gDn-*+_@wwNJvBwDjBhn5JZArf`Ww* zJUNH`1G`&`@Q#m z@ArA%FZ>SEG{rCsAtDUJ5YsgMeQ|)9=}~{-^~8NiwqIkYKM6o0kpLij=&)aO{EKF$ zN9FDNH5CWg+%3}oxSlB4XH=^{aela=%0;_|>%qXy`h0V@_~!)+pTDXXQwYGymv5?B z3j>2srEvy83ntt5_M;G7+N1r=Ad^nXmeOQPX)=o@^D!m!F(tETl1Zl|$iQzQ$Y48H zVng8G2g97Gj_U`)Rc-R@bwtB_?6Yya?jAM- zR@bvWpDP(O!o5&WCLJgAWa~fVSHo* zF#Jc60mxwhQUuZj@;Au;eZ@9lZ+N450cRL|J);ZuFUa4~ZmM9-AQ~hFk|P)fAVs*m zfNTKHFhDi{q*;U1FaQ}4!UPEekpDp#lpeg%yg*VIfG}CV1% oh)xF}17Km08>~-y7?7Hs0k+qDqJG029smFU07*qoM6N<$g3PmRj{pDw diff --git a/client/src/main/resources/textures/blocks/golden_rail_powered.png b/client/src/main/resources/textures/blocks/golden_rail_powered.png deleted file mode 100755 index bd343be8039ac5b8d6893d5db920f0eb036678ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 341 zcmV-b0jmCqP)F4X|3V|V|0(`jVC-Y73Kj#&!3+TDL2(7L0WdL; ztqT~K;Cy5QF#Lzj0FY*o%>)fV4g-)Pkj?G6uK(9`1pV(Tw)tOgqW~5|HUMWBd_JfJ zwiV>>3R4+y7=UPy7)Xv_7=RSP#3nJIh5@nxIKu$h0J6dWWB|y&ptuM5AB5K@T7bon zT|h7la`j~XN4u$l!vGYBWTgX;7eF?Xoen^@PC^PqlJWv53_$4sgy)Cr5}yu02Ef7~ nH&~zaFaQ~VGdlybI=UACC((&L9FaP600000NkvXXu0mjfd@6@^ diff --git a/client/src/main/resources/textures/blocks/iron_block.png b/client/src/main/resources/textures/blocks/iron_block.png index 7816799ef142d7c6b44adab2106a417a257f6af5..28c5e346660c09ebbef08503cc406c660d84f73a 100755 GIT binary patch literal 5005 zcmeHKc~leU77w5TibbG^Kp&1HRKQM>$wHDTy9p#{FhVF&>C?$%f~jON8BB0NWpP18 zS}iC=QK%1G9;jF;pdv1`J_Je^tthp~BIRk3#vRc&38?tmbKdcs*Z<5pS>}Gf`}^+w z-TU2>Z=)nSa^iT8@e~SWqDaV(A-^Y?-*)53 (oD1|acxLi7)h(Qg2R;N)YlW~AZ z)#3ndR4OPGW80VUOLTY3-WqE0SJ(@~1M|+Fl{USlc%(mEzp=f&yQ|hP=So>tZf1_R zbLEi9z**ga9=ybz*gB&h^2$%V;Q+REUKq?jbhXa3{-bkQn&z?NX44x7n2-JH9?EG2 zz8T+XvSqs_bl2ow`(dgk`{53`k<}aEx^KVm;ru=OfvH~~4L*No$PRzM=XkX9*2|l> zZi=s3m}bkb@VjMade?jMLMH+9hOUHOdhlFlYI_Wscxkv(Va5K`1S>R zC-~10^grs!$?Nn3tAIg$S|jI+sd(>hht58WTS$Q3N}+I!z5 zN%~=&RkgLtS%UTLP1Wgx5~us0(7~fMpliWDk1vu&om+EoTS>%DL^YVW|BT@4&pRmT z)kkk#^j+%`@BXkFF4O0Fi^0Q(Y;T<@r5*cRe7vCj!_4l8Nq9QrOx{9A)76P5x5fZR z2R6Gtk$Kgx^R%fR$eJ=~Z*aze6>Bbk6=D-_m5vk#MtM&=+%1{6{S>nHR_KH=uBLez zZ?{R;OsYS2#$B2*eNRMj*M)ICp_!o(lSZ4eoaZI@TB3|h?MZbVL--BhbaTQ@D?>7DYgsJbOV;bxHJKkIu*278R4t`y} zt%5DV>!x7Yyrs@8u{b#E?bs;ZS;e}Z&F${iJU41g;=I_E_C9%1o#3%F{>#T6A0OJ^ z(;)VE9BG1%{S?#asS@sMQq??yl9$e2@SE^U>OX4B+aG+3%?&Cl6VG4RK$Dbg^yn8( ztk)KgQ`^lRyJcCi4U^K);55n6#@d_Zcrn@grV-%KE0qKf=kB+ujIe=$-T>L{V~3e5 z0VH>@NXxAMNZT1AXm;pL+jwoJx?i%S)8oMVvPjpQJs*bMQ>ixXoPJ5Kje08|00VqC z-Js84+wabVW*gz(OwJOozNW84L&wflC77ZUmZs{o+drSPBij9H>D~R!;&r>2`Swv0A&Lxgpr@3Gp;$%$ymnb3aHpGVqwF$?^y}x0a~Q%KeV7a+BOm zz812ryRq%k?=jL4G;GyxpRPK8f|o*dThO8pjSsN>we5!AP)uXtmZ7s-YCXT-6t<(N z`bb~bd;8oZ7bo~X*igOV7^f<)U?DrRr>-wF@5!gxkEXd)RO4Pzy|cOt1%;FGr*mC@ zKh#_L8Rq5x#m~$CwX?;ed}hzgi%HKCKQs}Si*%L2hdsUl_1wNN57gynjFE}n~d8%wZHTlTy_|*%1Wc@y$dLe}$iCUgsywwta@B1Rh zy`2^L1Df7C8~KjB9A=*jIctnca;D4|&p|Maii*lLGMs8uX~~&Gp#+8)wJ5d(Cjc3q zq*Moi{k3%oJ{DODHvJz|4ut zG$}+72$Ji-^Y~O+vG@hOT0f!!sRzx7YH2W)PE)C9qdoM5U>Qj=640M|=%wUnrp4fT zO^Ob~1+XyOb#0kU|6W+7!sk;sZg?OBupX-0vXidz%3R@GD;{& zhahl{Qk`Oa36&~Ucr1aM)r2{01`p=YVLHr!89eSw&bB`DHufOKz|gBHj*&SJTsnW z97y|vCV>{fs3Al84co}!Mb1Lni(xpTnR)E|g|CrX{DnJ^)NeLM@xZR;_tvGpe|4j2chU5lrYqrg8|;2wapFOl zKbXF=HJtC8ZSCaV#cE_km%31zd4>9n#<;iv&+^MNKfKKL^P$8g*#K>l_vE)G?+UkPk!{qf`T>Z%fDK~9an92Kl1Kiic`mcanGjn>1R7aH#;#sCm#86a98kYT{VBkHhaOmmDG;3I>*G`xu=?V zHxYZdA!pw1o4txkwC=jW^V0QGHRZO%ARL;9mu<+s`6%*klf%h&bx7M!HQzG)8+Cv< z&VJgStGDwy2ZT`@w>uv|jMEx~33(wk^rDt|%)z3}n)2#IYKc{WyPwaA2N~C|}i@f;*PW6N&)Kkl?6_KYQ9R(vh1yV0c;@d7M5k%E8n*5iH}7Lg5ZC?cL53@R}9b5 zg6Phb0$!$Xx-5VhlCZwW1dgkU)rCD23hhD!SbYJ$fCtZcknz=c6#W1I002ovPDHLk FV1oS>kf{Iw diff --git a/client/src/main/resources/textures/items/acacia_door.png b/client/src/main/resources/textures/items/acacia_door.png deleted file mode 100755 index c903484f0aa4fb649f15921a3b78eb9dd2cfb135..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P@=>&q9iy!t)x7$D3zfgF*C13FE6!3!9>qM&*=BV<;Q?(+&oK qJ_bC85@sx6PBI9w6fiJgVE9`4@$#yg*L#5`GI+ZBxvX!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J)_?bmmdSFsr7Vm z46*P}mWWAs)-vV)b-%BF_7`QT%{bP&@RT9rnFjfIxu%bAZ*M;+aZEkKA$=-m1f!3# zm0AYFCT<6*39(L7xL2excrcs!Y+>9HvtgfdgCARiNy1?T%SEvan&Tw+w@ t3GL%d&{Jpu85+u?z~(%anUR^9Azt{HU#!`^V4y=7JYD@<);T3K0RSDqQHB5j diff --git a/client/src/main/resources/textures/items/black_bed.png b/client/src/main/resources/textures/items/black_bed.png deleted file mode 100755 index b1dea4bf6839e9930d780a19e0a8c909a5f55ace..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 390 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(|+>tfNN1&P@fFdh=f{~F+U-HENjE4*ijKZESjv*GOmrgd!VsaE|`!8v9 z)=#mbu|wm=t|ecYCTaQ3+A{AT_Y#kD3F>kOF2!A9nJA*k;+Q17`)%3m<8LBP+&=T> z%_PzKhzg$f|DVmTv`%W}zq4q!ny;|srkL}ewr22Dh0rnyVlyVN_m4} zmlA`+wA2^NG8rwUf>k~;0x0rZ$5GA;0W@P z*>dcn#Ft0E?HzXR)Jf*);HaF(%pf+-QRWo&h;_p-uT<| z4@>ho)(v;n9fjKb&AXGn<-P6w`1j$_yzicCH+miHFR7~C{Q2qk{ci91VruLD#(kZ^ i)KKl{tCClHF1@Ivqw?1-&KO{bF?hQAxvXaB^>EX>4U6ba`-PAZ2)IW&i+q+U=KHaw{ne zhTmDmECC4wVmVx^W(TwU`RQ)x*m3H_bMiEGnli|OmV`cm6Vw0sdzioQu#MJui5gM} z7LQLpafYDweDcwg^+$hwu}gT+n?1o$IgIZ7s^MC{^kg3_QGbRc9}H=|Cd%VP@|S&m zGITj|Ga`o2E<@=ufl?dJ3_oOq5r>X6@}_oS{nXx|Mt>JIK1j`laZ`gf#$|%$bt01)fU)re z;&CECLGxs0mAvOkZZflpaVmrnq)cXwCNU87omd7fc7{))liY7{GtobAOt&0g)^zv;q+m?Yi7;!$L`Z;zM6P<{A1|j zQQF@d5fM)Q&Is@1^f8vRl$KI=%=yle97;2_fnFnhXEYxOwe7j5^f{c~c8s(=>w;>i z>&~p(NzCcq?e~&oZUv37Yo=@(dQaaa)qi=1WaGjg@r&_Q29HwMHfwiZC(68>i0#e- zZ(-zmdw9frk58a!G5d&0JCfa zNdhEeWHe!AG&N-{H8*24Ei^M^Gc7ncFg7h^VP!O7WMMdEGd4Dp*#;jZH85ggFf=e? zEnzfcWi2!|V=yf^H8(jeHDNh2Ha9deGGSvmlN<*pBr{@VG-P2kFfBA=HDWC^H!@@` zVKFx}Eif@*WMwrnV>UB2VUuSET?sicH#s>mIW{zt%?ES}IaDz*Ix{&sH8GP*2qX$Q zR539+GdVgnF_U=+iX>q;Wi(-CF*YqSW@IoeG-ftqEn#J5GA%GOVq!5gH8walIW?0f z2}=q&R539+GdVgnF|&LLZU}#_fW2@4000JJOGiWi{{X-MCFzVl^Z)<=32;bRa{vG? zBLDy{BLR4&KXw2B00(qQO+^Rk2NMY=GiTQ__L zpb3H?zYBZ`M`(~$Ao&i!1<0$fs;#c6C*+dX3dJF+dqH1YLlJhxi`P} zCK=%0i=XpQZ_mskg6(#TSCG5rAP7j3zVFi*!{0#I_dQ8cM0hwHoH9v@G-VV;%(86u$@^ErdcB5aSxAxuyWI|( z%?3qLV7XkvbzNMqSJY{BJ-a#soX=;pZ41xyFbo5#szMls*zfmf+ZNL_AjXqu7hpcXqpC&<3K5e)oOLm_q{w?YZ_yywdUz`;-gY6UVwhO`-l1f5BHY@ Tuk!xy00000NkvXXu0mjf-(l8$ delta 1762 zcmV<81|9i;CXFYMBYy-vdQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+O1dFk?S}N z{AUy!0s$TX!{J%=GT899se>NN_INyRrIG-HIGSiul1=~j&oKYsV6tj_5REBDi^C_M zI73mpA9=fz_1pdUVNd1GZq@+9*tWLcKjVh{|G$&3D56zHblB6l6oKZ6) zb4GNAL(YYZE4~C%Vv(XHm0YoWs;{BODphN$xp8w1&yNON%dk+)~8 zwfP#V8)N$}oK3Y3yAR`CGi#nNy9a4r4SXv9=R~dK&4zjWHkbKr;H`G=9@6YO{WT=> zL4Rp_Fxi_lZ*cs$d*<8O=bIY*Yhcr4-T`SX9=3sRrq}4+C9)U!nB#CY-;Dhv&64I_ zj&I7`P21#`fuAk+>lSG-pG7#l2eryKb3+%$;`$d0-Mrd6FEc)(*#gW%M6+vhuKm1m z->>YlR6ZY$BgNBkl(bYeae2sUuGUj4ZhrwS%TZTMTf=VksQOon@JT5yjeNi-Ce<8v z%@AG;hq1RY75uZ2TFR+5yx$I0^@yTYPObVq+(2E!UEC29`LNlGq#}n4tx7dPHJ4Id z+v$+%!tZZLmW`LKO`F-G(~7SBtSIiBXk2+TUErKDVr5^T_wH6pWECAxAg%Pn$4@q= zwuSQwPx+cVU2#0?pn22Es}xyXaHq}7+3aOW*RI&N-8rRsY+Jj=E|U$frFpto-qwGV z=6i=9f!S)Cx5WkDO!Lq0e~CTS0M%7*bF&!)O9CV^VKOi|VK`weIb$<8Ei`6jG%aCb zVlgdcV>UBoGBsm2Vlp?Ahz1`dG&3+XW??WjEjBhZVJ$Q@GdC?bH#0LWIb}C8I5A~q zHeoellgkDtBs61WI5%NqIV~_|VP-8fIAmchIb}9xEoEe5I5=cwW-?+mW|I~NT?sTd zI5#jbI5ahrd$*Gh;C`V=yf_ zGd5!_G%+}4En+ufH7z(|W@a&EVlZMeW-*i22ulhyR4_R@GdMajFtaNOZU}$76Lcj2 z000JJOGiWiqX44-qgo|TQUCw|32;bRa{vGf6951U69E94oEQKA00(qQO+^Rk2Mz}& z6mu&I6#xJMO-V#SR5;7ElRb(8K@^0)9w!tN1BEw%cQ7zB5Hu7o;4#d1V-q{^049RR z5ES|ZA}E4%gT|%}y~)lnKZ<|CvK_vks^V2O{MQqa@TcVvLihwEdcmraBmqz#s}hm0 z-|sV45vlYSi$z71$_)SnKso2KCFh)a)vqw*S@VpqR27D2vspo&h-4sd4_dx@%9_@u z(`lji)P=+0zw zIUbLA?*WM8I9pD$pq?f;f^#kpR(^#bsW+dhQY)wM2PkE{72AEQDF6Tf07*qoM6N<$ Ef_AtWRR910 diff --git a/client/src/main/resources/textures/items/potion_bottle_drinkable.png b/client/src/main/resources/textures/items/bottle.png similarity index 100% rename from client/src/main/resources/textures/items/potion_bottle_drinkable.png rename to client/src/main/resources/textures/items/bottle.png diff --git a/client/src/main/resources/textures/items/brewing_stand.png b/client/src/main/resources/textures/items/brewing_stand.png deleted file mode 100755 index 97db9af1befee26bba57d1e94db8c36560d80f7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 291 zcmV+;0o?wHP)H2O!myzaT!7OrH|8p=41 z$@`hfOwNOx&WqbvMEHVs(;A%yJ6@V2;+qQaUO(0#@@vurT9RmCY zRaGsofQbkbV~h#_z5|>=i=rsP4KSr?8f`)W8X!msu!7$vxCseCh#tPPT%?>el=r|d;mV%0|3kThKm3I002ovPDHLkV1noudcyz! diff --git a/client/src/main/resources/textures/items/cake.png b/client/src/main/resources/textures/items/cake.png deleted file mode 100755 index 46e94b8246d6b4df7eed9860678237b6130339b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`+dN$yLn>}1CoEvqShwoE>T;+^+AiiC|pAew1N? z0>|QPH*Kh;oZ0Sssk&~2MnIBelF{r5}E*ssa3B4 diff --git a/client/src/main/resources/textures/items/calcium_powder.png b/client/src/main/resources/textures/items/calcium_powder.png old mode 100755 new mode 100644 diff --git a/client/src/main/resources/textures/items/cauldron.png b/client/src/main/resources/textures/items/cauldron.png deleted file mode 100755 index e3186ebd3ac091b0433b6f4fbe39c8e25d203c9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 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 xcG{4h_mxn-|Oo8Q_UzD>efNhJ`MYBA8|~ tB(eX*2Ba zaB^>EX>4U6ba`-PAZ2)IW&i+q+Ray6w&N%a{AU%j1Oy1da(JH8JLu(4@vxJ)lbhVz z^D%Z}uq;GTB`{X)_ph%0!C}Z7uHbAxl?ELLf%=saHrF@+ea#t_S?Z< zINEmN=iE((E~*_pKRn>9Mc*HH-1S~V?`@4PIS;11+JicVGHYEHwL#v%f+CJy(LKAp|3|_~TU1j6XTgK)sJ#BhumI3b@S3X}}oDjVrt$2=&b= zPk!gA?(#<832UJsPnrV;m~>ttGSe-$?9|!9kF`^JO%0N|1Arp*%>Y9d3TRK3$&(gi zga|wa=#zkaqrW(v5M+h3r2@lPnm~jNfWhj7z zHbXNV$T>5V8=C1j7BDtYjd+MtX($E-T_eMtPVH{WeW{yb_buJbE9KOX?!Qn@4e7RW zf9m!`wVLJ|#ZH07EF7F_+p)00p@n2Z8tjZDI{Bwk>jS8CP<3Dyd2WoA5QJ;+oZ)2Vvucl z*;9zN>;VwcAk`C;8{}!LZY699HJm-gevW+# zp}tb$7D`t9Fg7^uz?#7EIb0P>k9PG4vgPs%)QmH=V@-0C1A(wBdR3CEr7ODD)>P@d`9=mrYhacW+wbW7Nj%A;+3@b|< zYjWiM#HX8oo+UF@YjJhfy=UrHwdI}BcKM9W{MV(VKI7sA8pf7=MpJ-CMbBui+|ALn z69MZy8NHV$Ds_cu9p54kDAhBVKS8OU!5k=C&g%y2QN+%5#WqYSA5L;&ierB?i~*bH zj(6>Jb}lx&j^_h?r_0w!)prP;NO|8RZw_al>I}p&)^Zwo1xRBtL z?|4`GV}Y=fT}x5Ca)z(3t}4Fc)xYEc0hl_n@p}LO00v@9M??Vs0RI60puMM)00009 za7bBm000ib000ib0l1NC?EnA(2XskIMF-~x7z`8%zHqc}0002lNklv+IrynSgf8J>2kO}0Hi8S U4xlr2g8%>k07*qoM6N<$f`y0ghX4Qo diff --git a/client/src/main/resources/textures/items/clock.png b/client/src/main/resources/textures/items/clock.png deleted file mode 100755 index 1ec0fff1f0331c754c30c2f630c1c3910ab4fdd3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5737 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 diff --git a/client/src/main/resources/textures/items/cocoa.png b/client/src/main/resources/textures/items/cocoa.png deleted file mode 100755 index 62eae8d4836fdfce56238db5ae413297de61bbf5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 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 diff --git a/client/src/main/resources/textures/items/display2.png b/client/src/main/resources/textures/items/display2.png deleted file mode 100644 index c0c93cb8cc04c841b3b60b424f79ec56bc368bdb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4821 zcmeHKc~nzp7LUk2KvCQXT5|$ZEt=$IUm(ho5F&(~ibau^yjRc)ut3Xu<0W<3m z0%AfHIGm~L$YQi{aIWKjFZyOV<=#6mbFJw@)9R!zmeY?f@~zpm+_YNn%K8gu zc6UeKnQ%GH+3z#?A(d-Z+O2yzv-WT5n331~!o9~lpbDZ~-GAPFV;$#lWUeUtXg@jM zZSR2hiGN=4B+aQS;M?7JGPo&n-yWxy?h;Wuxxt(JbRMPlTt)T5+qV-3o>d+Ea=<_6 z@imD$ahqu4Jct@D%3YwfNy;yRn)0TV{5ZAdQaIDDUN4=nv~m{v!cB8I`oMX5Ww_6T zi6y?7iV!a!@sWuO*?6N<>wz1NQy$s0l--(M)$vIz+BgkvrV8?RtvlHBDC7>gFT2#{ zZ-p!N-Q9Z5k#%#%x%D4Q1M*(t<0>b9d*m5icO)Q6R4OX;v2C31TlDmzI9a)qWIGkB z33OA(=eVCde9E&i0JryG{J&MXp~)cxZ`^s^vVEIvY!l+~6;qVa!oX^mD+!ZL)22>6 z;Iwk4A|R+Z=Z!9lVZurov~*%<}S;&Yyl$s$bLL(&1T0x7CwlRO!N+p~;Kp*Yp$()-eFL3MmBHzo-*eZEV(ld6xoZPIu*$|a>A74wChE3hD6aQuZqos!guXKy~vB$QX zz8-K`WoM*>{_G*?EUVnm@=S0;&DwkTMQR)qRk7s z>~OG!6wt3o{j2$&jJr)V#QB0HQ0l1(suYYF8TVJ_!)6xWXxdZVq;DE zBHFQ>>^(+vy6|CV*PJ%ZMf2%5@z39Ai+Yw_SQ?vEW!ipv>)uQMI51O(J*YS|s1E%p zGh)YnQ#1!@5&Hb)SX1I6?WQ3jn;oq#-g#;ND-#rXZR*24-F~SpO+vS(xyO$tnZ1S* zFI>d)NLSVWQV+Gg!teJI4o$z@JyiV5N6Kl1ZN0{ZKrj_dC^-EIl5n0(t0u#8trQ`f z)H*O7a5(>kCLJtGLok9AQKA|?@kz_yi3C*6CoX16Ac-y*NkK!i^hj)0M4T)uO~#cI z7cOx2H}L?08o^+KNv+ZtcqTs4%F6@S7BhuNutKmjJ~2TOMF`gF5dwqEAVVaf3C*Mt z7dR9A^>PI-Mi4SW0q*$36b#exC={d7NH)^RTD_7&<#M?ch(@8&NB}`Hm^Bz|B54fX z7K&jG0b-EpQ5}YAH3SPMEY)UUd?FF76W->h)=4Cz^cus63P2Bv3D!}lWQd|xQ^tB2 zFkvPj8A<3jJq&SRh*Dw@gEm7iLxh=#2J;?EA(xH%>oW8zYdLZm1yLbt05yQ9)b~P) z#FD5{4~qm!RIRgm0kPjhVyNPsSnuU#S+SNgHWA=H%KIMrZS7VtKuIJ#fmW7bNlz@` z6D{$1a;*%N^M)^JY#A4U*(4a2(MSwB6((^I7K6l*vN%#E1amlS_82O$#(=>Z8DgOV zrJ!szzcl*rFzt&7^XuEG~;hWzZN*&O6X&h~5A? z(ZWfE$aIEv#j-6tPz(?jw)80=u-ZW_ykI>7V_JQjR;%I@EeQ}To}=ECC0PorQ6gY^jI`@pJNg@~z*0~V85`n|m>dr1 zCIuuTai|FB2Rfb0Rwy_$HfLD8QFen?ff->v5~u_^0@8@DnK`grf z1S5e~`?X+{k%B3fnenz_f6A{k@wWoT3>n}zYy-m!%tFfOFdWegw^^dAn8@B17{_TZ ziw$)9j^JYGDhvB_QfqN%FKhPh{(NU->!}>|f&b*%q?dBmR2ceJ73{2CerGl=xxT~m z_KJiwYS6k#z2?r{K1HDs*Bf15p6LB*Tb<3>8MxNC#`E8EqvPw2p2=92F(E#`Aa2>p zqAShw+rw5jc4U_N5b42!*6+=EwE^PrP+n;dW`pDQCfEOXpHrK${;G0apyMiE*F}Tp zaPC2-!oK5A@HJ~6vO1TOeX6@0cJTU2+Fv^1u4ZJ1y~=mNc}#+36 lOf5Tct;|WAFS=vSn`6k&5!+oc%>uRJ#KH(cLr`+={{W8`3_kz> diff --git a/client/src/main/resources/textures/items/egg.png b/client/src/main/resources/textures/items/egg.png index a6fe2bfa3a93798aa51fb27066906cf447a27db1..ace0c43025b10a5e7875bd4f28152e383efc0350 100755 GIT binary patch literal 4964 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 b9)!cWr2I@R$ysI%M8NU=0(k{K(X0LqAH8t% delta 133 zcmV;00DAxACZPe4BYpsANklAq=Li zI}!YNXDi8KKxE_M37Z)A9|e7eK$%f~`V5Oq5t`$Dr-;h1f<=U~VdnbNX^Wzf|BJM`#b_z{47Qg?kds9``xJC8;M`v?#CzUKCr-f4+ zruAIE^W1KEuKoLQ=r>Lq01Q)e-2+h|2(t@nXn?oN7z zV^~zLJiHWkKhBn&`ZD>F^@1=>Mtg^OGDnTcXN zW3_X0&t#RzXec9iN$Wq$x+!@Uih$cAC4feQ3uNBlBa<)6cy~)tV!ZS~;Cul({TE`II*+ z{TQ>l3(MGK#}6>aO`yzp6NvD2Q58G}<;vUJh~@j?H!?51@ONhCm2R84IAp<`m09fk zvJ5+70$X+OV%2eR3J{sF^x`i?Z&$y1kY9cfRYN*G|Ix&(YVXZ6*zrNAnzJ*N=MOIk z?7wCacW#wYDd-Uw*S!AmktT<6O(sGgfgn-j++r%+X~OfUBJ!TKlvZ}kRU`hqs=&W^ zt9Ut>ynj;FnoUpfvNJ*1FKuT|IJYzL=E;rBp8VSx9c?EZN^1CY$JLAnJ+^g6vkJPB zAEN!Z$_H`e%0Ib&96_ptbKErJ+m9MtGP!E@`F%?!sYnJbk|%C+ES*^(d33PJC>=P_CYso4^Fthe z!sffBm^CR!uN7*M`0j^mRWFlfl&3bC#BX@&Wpu{2pf24PJ1I-QX_K9aT>PdX_L`h#r_Lc7T4Zva4`@G)|8_vs33GsQd zghI-?I2U)Vb@w9zy4{-TS8@X>vrTo%JGr@k%V>v_;kyJrHRJ1q3CX990MVesokET8 z>07E7&yS_T`>o5R@8;(J4jLzirp)$+H$6tQ)Ozw#Z1co<>6NMNpkM92ywrBbG03(6 z54QqwTr~H3O9~<&vuN&VnyWSY$N*5{2aq+T@`J4Jwr`pbM%q2>u-^}09MDq`b(Y#0uYn)YQ zQ)io!7TLcE-;A1E5w+Olb+hA}Lu1nq@C-^SQEQe4i0#&{d=`R#lDn&(8Y>U|W7j}s z6?tQ~DRE47+QHb@OO$S-8|PoD#eYcDEFDFx!zvF?8c=LqBN4p)XxlkxpFzx6P9&i1 z_kMIQi*0GRc&smH?0h4~&8@xTO0SNx_c_(wd`by*daW4h=)tT28ec9&aRqW7h|)?G zP{)VC+~#N%Tz&+oM({w9SVl*-7hOdn!~!~UF_DE~DZIdNv2TnLTo@C`;m1VqsRHC2 zcetCD1`$X>H5Z|kN@OaUmX6f((x7LZ8I45fA?gS^GME*F@RBP*1OY`rVF0F99EC%= z!x3&ufsn>#cn?!RZ**k1TCJd=(He~grNN`*N)Z}MrBcxt92$oMAOxU_mZ`Z~K&G0i zqZr~~fGWOHtWb;PGK7wk%acc{=}06rj`$RxRKa3>rkAOPRe{XMaVcQld{sz(<1;Pzpg+(5%?6 zru6Y+1%39=NgxtS6?!j7?5~h&vG9vnU&W>y(Wf&q5Xk*A?^ozgx$D6Yip8QanQ! zKB%LD$Wda5hlsd?G;M3weN0NWp_7A%%p+^7T{#KFwRMlyafv6ic}x5Ur4j z^aDDB-1 zfPMm%DyR~5oLCGBKO~55S!hr)kg!}`ok9e94=5L!mlEWv8+w(9^;-#n&~FMFmp_z(iW>zA^l?I5Lqq&{35`fr-J=>a2}4CFUtgPIrA3(=pO;jm^< zy#MBBcrE_TDG-S7lYEoD-{tx)*EcEfP2lg<^d8YCKvq6aSD_{|AI8o zVTq8%iG>bYCOm&125b;^4d&F6>fQxe%oV;%R4~}+3A)Pwma*R!GMcLWSWMFv(+TDl zh91$?(_kXyT#ED zk3LCwJ-*i7A65D;y^eam^XI4j{$qcBRS>yZYw)5sX(8D*XT`3r_L^K6H-s4XYSgx% z%_Uw74;7Vm*i5#&Xct_Bnf77NF+<~)-pljG7j(8-?Y8W9&%QDku57`^F`V2H2Ab8A zU-f?Iu0YTAFj&iztRXYspuU$sqb0W2Up|PkwJCTTjxM5BrVL38OX?;yJEwC0g5U(6951J delta 306 zcmV-20nPq}D$D|qBYy!CNklsW?LR}g=zoU!TK^d=@fiZtd>iO& znC6J*eGmgSSo~+0stGZmT^3>pE(1WeJAQ8YpZ<03|6TvDfPW22{xa)7!(xN~4D*0^ zvIc$w*8e>VHUNY{27p`xVuM|=%=kY;n>_IbfNV!G0OW#+YWNK(`mhLY08Delm&phN z2)O`cfc%{_utt#IL7J1k&VmGDwFH4cgr&X>#{Z?SK|_CqDME9dB!Or|GX$&|WC+ok zkqrSUUSJHtlPgt7&=VZ3O1oog+8?} z1uv-h(ue+?pJx^dl8fnq4~Bv7_nnzDL)Aa0^iQ{|pgnLjw7QL=vXTEV4g%=m`?Q&u zpp;ia#wR-}_+?l#lfz-HOq>eJC~{*i?9Ioqt52a*nZsd8N6ydtehJTKBNX!7>oqrG zLDEM@@F5+=VOhscDvG^q9G#U6+RF@in#93E0(pjfdp6$-C2LfaUT`*Kx0Ql_5;jdAcIb8spH3NtNB+|Rb*Y6)W)or$80qQsV ffq-G3@3w9Lr8vUn?uvSo00000NkvXXu0mjf+F$pi diff --git a/client/src/main/resources/textures/items/blackwood_door.png b/client/src/main/resources/textures/items/gold_coin.png similarity index 60% rename from client/src/main/resources/textures/items/blackwood_door.png rename to client/src/main/resources/textures/items/gold_coin.png index 7f4474798e0b7d5cc0fc27ef400adab8c8d248b5..453d6e079bb35454a7dae0e03fae5b414846b1a3 100755 GIT binary patch delta 1571 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 diff --git a/client/src/main/resources/textures/items/iron_door.png b/client/src/main/resources/textures/items/iron_door.png deleted file mode 100755 index 5dcbe38040727d3f3230bf7e0b58e950451c11b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5176 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 diff --git a/client/src/main/resources/textures/items/jungle_door.png b/client/src/main/resources/textures/items/jungle_door.png deleted file mode 100755 index cb3753d311024b4e1a70eedb075ac0d0ae3c885d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J)_?bmmdSFiS=}G z46*P}mWWAk^nCH(*SCL!JI+sOoL9FP9LMt9iIX%rBe(k;ts738ve08I2`bF z2E%;D1s@t)1%XNzSctLRV|Y^1utp$~CsKx)r_Vrv&3P&_BQrC@8Y{WfQzw5c16su3 M>FVdQ&MBb@0DSpFZ~y=R diff --git a/client/src/main/resources/textures/items/flint_and_steel.png b/client/src/main/resources/textures/items/lighter.png similarity index 100% rename from client/src/main/resources/textures/items/flint_and_steel.png rename to client/src/main/resources/textures/items/lighter.png diff --git a/client/src/main/resources/textures/items/map.png b/client/src/main/resources/textures/items/map.png deleted file mode 100755 index 8dc6e58bb762e787c668d51ac5658c71b1e1f0c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 226 zcmV<803H8{P)ipY@zT~GjpL=jh4lMXCua1)81eP|7(=DW#*ezzAi+U7CT`T6YXe^ZZ)Tk<$Rs zq7LYY85mcz0%pV#y$IP>ms^tl1_!7k_z~{36Z?A*H*hNJh;=82EqjqswEq3&1H7~1 cUoV(^0S<0?-T`@41poj507*qoM6N<$g5gwJp8x;= diff --git a/client/src/main/resources/textures/items/maple_door.png b/client/src/main/resources/textures/items/maple_door.png deleted file mode 100755 index 4c33b8f231cb2dd149b13f91cbc43fc4e1132641..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1164 zcmV;71atd|P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=KZlJh1E$G__oJ%S}65XZs1%=895e*a*{$!2$- zdAiAT`k`iGuq=eoPnI3(fBiY=4;-?IQ?TSQ$GG7LIb|#-@%l#$U&duHjSguF+HMwsOk# zV<>2gr$T&+(J5#9I(92UPtc zw1}4QGmO(}8O^c93Stf6-_a^@W}vda}qCIF*(F2EdXH}@!0r$TmUNs zL;j@T$f06tfy^vgGPi6cY7Eh0j493Y&`h4P9+8@^d^Ux-sDiB zn?t`nyXF2VagmI4W#j+U{yl0hI)v||pF7mE--b2PVYGVNUMi54UMZ0Gimj2}Q?aYj zn;a_i+S}}*LcZq8eUJ2esJ~4CIgIZ@;nTYc-$3}^N`C|G^UgE?7OG_c000JJOGiWi z{{a60|De66lK=n!32;bRa{vGi!2kdb!2!6DYwZ9400(qQO+^Ri2Ne-I6Rv@*#{d8T zZb?KzR5;6HU>In?h|G}^6Z|hHDN0b&iHo=3`dF|j`2OP;oXyF>hQUV$Ovs$NrgoCO zfMP&XT_t4(kOL?-0Bazk2NWj<8$&{75d#AQ1H*#peT1WtP%I!vVGd000McNliru-UtK_5*wmF^=kkC0Z~ar zK~y-)y^*_40$~t^KhOXxE|P56c-t5>1_OnL!WbGJz|Pm;;jFYZ7RJH|i6|H~S`b9Q zMK0pP3jP*mH*yiz#_9f<|C~AJ4E$&9ZLWx9SQX!U(@w#uL{zM6A)d>10CD_KaRIph zqClSUA^GKjp4;j6ctk^Z<&l|V1;Q)i^?5MbEvjw9IYBBB6+7Eo;t>siwOE95;mMxoDlONK1lCpny;P)Adt@oR$h_)@ZfkOg z7T9d)WHOgD8z!Eq9%e(wGpBHnz8(m0fWQLh(^)R=iY%)^`tBaDZy#LUm%bDY`5zmi zriD-gL2e6GWXVh4{Z4Fkf&HVC5&r=8BN(5g>8n}>)x_K$M_0000a)($X?><>&kwQgN0v6);lI3j)8&E%hSa%#NzbcN&B-71&AE0?<(X- zN@`s+Rqt*~68p&uUK{xXHAH^N*){o3@+~OP+_E(w<9J?H`z6hKohd3xfx`R?S#7gIzx%AH=S`h6Df!nt#W`rHmofAOzEvf)jfSV-&6 z_sK1ZGN;~6wvAtzcPI7xNxpzpvLE-xEE9iWD(#fLy+BTm@q)eGWosaJQE4&nV?)+R zwGC@~&3DGSFs!|+G{a{>T>EwN0^6AUV|(RO%B(u1mdVQfxw*~f(^RcXM=c$an53Bm zB~KqQ^x@jnlRSgvusTrU*JtlVjhu};?ul}3l3Bm-vCs{%b>`lN$FA;BI#VmZa>=6a z>=KDHR>&*Zm7MAdn5wireEI^dkIOl8xcAy8WcV|dao-V54V^8%v-to3 diff --git a/client/src/main/resources/textures/items/oak_door.png b/client/src/main/resources/textures/items/oak_door.png deleted file mode 100755 index 43683f81a83bdc921b700ce532a18cdeeeefb556..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5269 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 diff --git a/client/src/main/resources/textures/items/potion_bottle_empty.png b/client/src/main/resources/textures/items/potion_bottle_empty.png deleted file mode 100755 index 87339d79d618b7270ae2fc9c28ffe25faa3aecc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`xt=bLAr-fh6C|!Y@LKo$zwN@d z|KYn<|5K0rJXziU-~7n^B7KfElXxv8l7H4uUH$0)%V$ad&(F1X-=&=}tL*Kquk+U! zEI7eXVm~>B!^b$X?ZG9VEs6&9!8r_iyr`gyrWSATNx0m4o;|MKz;tT)* zkmht-v;QE2K)_g#>3@iZ?0;C8-~~^fJOOJ4vAf*d7*ec^|ATOnzQ%uoHiI;0xI6p@ z(J+wYX!U>Bu3ZeoY4&yjYd&@A6pC$$F1CaXNed4EYeLry1K}Qy_`MM4?}60-n9W2R zfDV=}UHYGB1JL~m;)4tT(L@;lQUp>A!^oPE4ZxcLVTzG4u^Ex591Oz%OM{>u;8&W9 P00000NkvXXu0mjff|G#w diff --git a/client/src/main/resources/textures/items/purple_bed.png b/client/src/main/resources/textures/items/purple_bed.png deleted file mode 100755 index 72fddd4d4c33826dd1a2b5b4d83f81f767b2a465..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 405 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE(|+>tfNN1&P@fFdh=f{|T_jpJf?)f)x|MkP-d#}JFt$#)JGOlcH4;MB7y z);0V8;Tw6i2YXzk4Q4Vf+IZu5yJL9x^hO|9ICtS+`%Q{HH})`GUa@f5(E~tG@c5c( z+oM{Kwk_Ka$2KJ~_$+Q&Arj-`5Wuir(dWc0RhOj_DlSVO%#r{CyFLF8FckZ)zbw{v zdbnYg%i(SM_Vz|A#0?GR*l(G)@Xr|`w;qQh%OsZxvhB0C z>X78tkF!@^F%jsHhqF&sv9Yl!TFmEE>@aw8dii=Dpq%r?KW9^H51R{jY|gi-XqRG> zcK-D5e#M8r#@9XyZQ2QK)8|JX>d=h|ShVr7$}{^j0!~teYD=E$%KjJ6-Qg6V>?NVl r94tO>;*^;NJPv#cNes$MZ%Q&Oa_+TUe2S$D7=R3(u6{1-oD!Mx zO57D_I_G|^Cy&GNfAVFU^TDt8ukB%YC?R2SR>4)_XbMm{LmG$Ytc$z~k;a=84Scry auru&XTD<&7jFAb@6%3xPelF{r5}E)Uj6#+G diff --git a/client/src/main/resources/textures/items/reeds.png b/client/src/main/resources/textures/items/reeds.png deleted file mode 100755 index 40872c6619d308eec874e302ed1680f0ed85b546..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`lRaG=Ln>}1CrAh-Tzxy~zpu8^ z|Lo`!|J0){Z)wg<;7!T2`?vqE{fUM%W#tU5Z-iFq1WJW!ox4=P`J?`njxgN@xNA D276Gu diff --git a/client/src/main/resources/textures/items/ruby.png b/client/src/main/resources/textures/items/ruby.png index 4f288d959b7e8b8e3cd9e4cc567b00d4588f3279..21ef97f4be74cdbf637a84f2029cd0f0cec0c9a1 100755 GIT binary patch literal 5465 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 D1dAwS delta 409 zcmV;K0cQT$DzXERBYy#TNklr^7zXbDGgJ-!`!aC;FJa-wZU88xVFrMleVjoSthtzh?|&4~ zfH_9C|2=^QWPdX8VmIIt(126G(4NX9_WzuO=Kp>Mq5rW!jUe0SnAm}BPX}ra0(t{y zK!T#`qJK0v)F*L?|DP%#^M8&p#O4g3<^Ui~Fe*3jO8wu#BJ;nFS?GThBhP;i26nK` z{tO(%C#H5_RDnVp6kzd;+*obKn~#Xe3l!yG7zO}30uuS@Rb=eJ00000NkvXXu0mjf Depk-x diff --git a/client/src/main/resources/textures/items/sign.png b/client/src/main/resources/textures/items/sign.png index 9b6e2ee25d124778340e748bba4aa5e24aabe2bb..8ce0708da93cd0e2825e01ec9096ecfec4dbd17e 100755 GIT binary patch literal 4987 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 G&;Bpo=Wv7o delta 133 zcmeyZwvcgxavej4r;B4q#jWH736q4n?)UXU1!)~0>v@>pl>XeH6*lEb+v$TDYuFk@ znhbWS&9La;pL{%v;b@#gnNo+_H=#%%!)%j9?j8mq1<}P44>A`0m>=R}P^kLz)gSi6 lMIy<}rk-WacNvnHco=l~*^3)jf4Ip21fH&bF6*2UngG3zHCX@v diff --git a/client/src/main/resources/textures/items/spruce_door.png b/client/src/main/resources/textures/items/spruce_door.png deleted file mode 100755 index 4eddb7ec421541781cda5e7b322cdd552cbf3f1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J)_?bmmdSF3Gj4r z46*P}mWWX}82h_Ebc&=SPiP;fhS`A|H-6M7Bq)HnZ1=cB3>jw6Pu#J7J-?6h)MO?n xJqAgJMGH?E9z4)~(7==ZNWzLDg@gnK25u*@oE1usRDfnPc)I$ztaD0e0svf{KcfHu diff --git a/client/src/main/resources/textures/items/string.png b/client/src/main/resources/textures/items/string.png deleted file mode 100755 index 0b04ddb55d92081989328608e16fc2ec0fb330d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`6`n4RAr-gwPIlxvV8Frh+2a5I zMw=sxj~+ghwACw0io;SQ-Tm^Kuh(x?-!9y^YF5XL`Rgyq7O^<|TG8uuSut07-i6Fx z->!f=8;Wf}i@Ec)iQ9 ct6wU9!ut~Mp&xTqfo@>%boFyt=akR{0PJ8%S^xk5 diff --git a/client/src/main/resources/textures/items/tear.png b/client/src/main/resources/textures/items/tear.png deleted file mode 100755 index e5c741f9ecb8cfb127554e4f13d5f7752bed6f74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`uAVNAAr-fh6C_wG8h1{=UN4{) zZOrk;rgD;va{}9(ePz8R%nnixQi*J9?riTjabA(ez|nlDA%!`it-)l{(wSNpEt(h@ Y;+3O?rLR>M01agDboFyt=akR{09AM;>i_@% diff --git a/client/src/main/resources/textures/items/tian_door.png b/client/src/main/resources/textures/items/tian_door.png deleted file mode 100755 index 0e8353e5a7a230faba85e7791cc8d34f965a7943..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5235 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 diff --git a/client/src/main/resources/textures/items/white_bed.png b/client/src/main/resources/textures/items/white_bed.png deleted file mode 100755 index d45a87fe926c4666056547217a399dd7dbfba070..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5585 zcmeHKdsq`!77r?*6oj=%5k+Fsc0oINOdcd55qU`>1Y)2fAn1@xLLkY+Ngx5N4`?e? zC|0Po1+{7sL9nY;>o-3FdRINUfzYWPB(7}Dc4C?ZoRVZ1Iy z1LI+XLWaW`F4ae<&>nY(Crus?#@kYCr>$-()o1XYG2O(<`jFlO;pLf@E{B_SP57;s zYFAVbS${VJJh6M6+rie#MY=N|($iyGO9eG4SM7)5FSoTkI`XS@e*0iod;jJoow*j* zD|lDizs>LayE1TfXJ7Nz-`ly=EWY@4S!D91rkVXqk9T|`f1XMmU~~?45A}|dhJWdu zn6Fr0*1*e-?0v{C5S=@)W=eS`Q|NUmw<=6N;CrR5T2p+kqCIV9{)3u~TFu_Rqq$WD zwlU#evO{SWO#iE~`!5f=q#}t)$5SXbTVl`e&TsP#Y`)z)?biHp-gBd6S?(4=pNPtQ zPi2c81HdIUdE4e?arQ-iFmq*BFzv^7=dkRJ6}X{o9$~hgHc3Q>Z8N9-7`7_GNv4h4 z!bS=QCfjVNnv_bIVsneJc}=SHiGb}oINSF-{_4D0*FfTS3yHgDf0w1t4kRSy53e=V zSyMkFmVJ@VRZLvC7Wxx#tu~`ydiMMlDXi>#<97FJPYg?w=A$%lXf{ckXaWC@Y!o=gw%YeDpD} z_o6tkEU7)Fv%ltkvm~@QA-W~4rEBZu*3vTzRPMKA-j76fvTy1vbNW7CEfbw&rC$df z=gcYC^8Lgcg;P%0ozl_yHcU~DAu~+jZem{Ss_$m)jvY`Vw6;A0s<#oK#&Ed%3PaV0sa;86F^UYoX6C6a{)>?7ph@A21y z_jGO#I(4)9ygaDsK$ zHNE?DBGPZ{NK`;or17rRM)u)Yrez8wg$sO1EKw8h?<3Hv#RzbY|4ng-)YJ&|Pw>Je8)fPS4 zH?)cv5*WTt6&`zR-?w`a<($PW_O3DD%>q%(z9Coc^IT%#g}ZJQL-uZs58T^Cb9Z6A z2YPMOQD}4$W7FYfdD;9*vGvn$CIsFMTziAF`#ZHOx}wx7DoY;3-<4LpmsojprDUt) zee$fJ!LDo~H-BX--#ZA6?9IFO^!nhZpQhlb4UV_w@e8lwaQ1!*tivr726H5ciUdiK zIGAKmX|O18IIg!r14$BL9X<}0E7Ux~otjz#ULoZXA{au7P~!*3EBL7>9F`gqE=f(4 zu%!g=**07Q2P06yItXu2Db-qzfk!a$aq^FS(R8FR{*=#ZeB!eJ;ApmWPS_c^b zwU%h480PSYwGtGQPJyWLMouUWNz(BM1nfC}gxn}>fB~BvabO&q=(Rd2S%3}b*m^Jk z8Kh8H00jgM6;QW+Tw%H-MHCQu+0joKJxlq*yklZ6p&j+9D9 zahfDlX~IY)WLOESut2mJGxZfbWS|cZwLSmV$r4r6uj1a<-N1=k`Fj=FPzgP^%4}~Ee zf`%iAl1DIxgg086N&(LuNpemwB7uy>U;@KZW1WmtiZ3K5n}%HSo526U6c&%@)&CpM zOXw(z53186XksWD8kYb|bZ_Q)9e9*UjP)q34owmK$)f%Z#~sc}K4y!cDQ5n|;HAT( z;YOlVn54qvO~uQBBt{i^1TB;dOHEsV={WpI5)Y~6FxDkUO60}7;x*X{vLFd9jw%B@ zJ=qL^&X#!sY-${q^(+RPN(Ch{77copU5m(cdI*JmddRIh%c`_}-68G;oOSgl3g6uLQNSQfMM0*iTg4m*diV~sp| zu8pLHv2y;x&q%ucg&r{KcTV0)-*ef0N7R<(o0A z#{TH(vG-obtdergM5C&Lx zSy)e+_ho+mT1=j%W76- ze(#anXIo8R~-{tyOmB)2Sup_l5f0$4~D(zf$vl?g5lPtxwx^ zySHI|&u_~J51gDo{OmnSNaMpp_ABSMSM!mnEdJ1i0WP_a$-u9iNnK z;?ffW4~vE63w}~mFWt(hd*pw=`yXPPqHs$KX{1#%de(i*=SBH^k6AlN>)Jxd^4R=(8T2ZQ1alyJ)csBtNPJ7Nfp7;EZ$(dyCcYojSe&6r= z?md~Dh{>Uj_OA8}2E$PrCXs{Rf#%z;5BPR(X~P)|>tkt(C|ZuEKzf5tO(l>JovJ4x z(nP5l4AaeXt2BjoNA}BZGv*GrlG;@zB5QWsg8p6OP~Gq#|HiuY4|Y@)Wvu$A=ZmmI z^{q9()W6SKDlT^@8Pnt<-dzyXl$rCU(Yt(J%Xg-ypZ@um zxJ{YgE{sqmiLYzj@9uq3w{8;|mL0lG8k756?m6FYz;FB-X6-*_*W-4S1qs0 zn|$fY03!)Chl}A-iTgLJN7w4DV?+oYeSKg|>Y=30cshI_hym7^2Fa4%a-}jH|e^5Q&rzUxup_TQvvH589hI!Sj z2}|sfW|U$T+}Nm!<5h^J|JzOBhn&4HC470V;HvYLl06H9b{6Gi?2OzPl7&4s?o#}! zyj`E@TKunK(q85iyPNwu>*6+J;TT!Jf`=J1Uq8>W5eTC*BLgwlO(A{VIgxWf=+II@zArN z@ASP99JhOc+hH5KL6dyeer0795i}*jbHkd!gL+X6#cgcjZO7hW#lzO#g`AF8o7PnO zJ`ZoSWNcN?yqoG(N{E=!y%G+ZZuMD%VRR zCwWDm-o7RZIS}{r*?q-lqxErfmy5_VqSd`hZAu&(SWywDt4kB`$cmG&=HR_D#rNTk zQ{s1RpMLHDs=cINxc|Dmd{xX1D%ATiUMp^yZ`f=T&ZlcMW)K zGk5>CXP&$-wk~!3-fNwA-0)G@8Y`C{nZ55&(D=ZXIZb(iw*$0D%eVhrdPtH}C21uibs-ZaKR>^h@>%AMt3L5gV?$=QZa$G+t{Ol6mGk8oL|5I5URXcKO+? z6;+0z`SV@N_FubDexWjD{IHm$#d*GW@Ub3)_nazXZ#VkSNzY#7e6+OOP*U@@-cvt2 z>&d&&clk~AV+#|PHSc_x?i`eQc)_ba>B`dF>;*GR@5R@~x{glg9H`%U;A!;lKdgB7 zxL??;-EV3`U)9;rBe?tgiyF#OUy0x4H--l9uU~X@LinCBx5FpYyg%|{z_4cGynlG> zt1CBkEA=<`@q>jS`+v-6)u`JNk0{&X>W*5!Z;Kh!+EVeT)n=b5C!>zz?9E{GkDWAc z(hOu|+GGWh7Eg#&O#gBAekKeMXh<4|Oqv9(5i^OI7G4ZIo6T${WP#A}VrG;q0t(U@ zNC;)2ECdcVQOR89ID5#?pi*OUNk|6;7>Sv2G_A+j?39!gR*El6XNYBUL?RIz;j+10 z7$9I{s+Pu0u-52drfBDokVe8l>1j%*h0L6|QkO)FnM^PbeTYw^m&rQmwZ;w=fF5iU zu4i*t2wS6Jcl9vR!O4K6BcQ+aFe<>2$d;2vU6O$ygOf=u?a`G&MRfY>lMD%#bW{YJ zOdvG?Y6Potx-A(hl|^)Vm?em%GK2=M#*$9gK!AHEZ#VRZ+$~^$ zlF2ZMjz}_xCzXhq=Jhd^j-XVS<&n=<@kBV62NQfD0i!~p3dT_Z7Ys>4%|Uo55Ap3n zCDj^fTuYEXA^0@@kg(BQQfv&_8 zx<+NDQUNNifFneC0ws*9Q9z~S3t%N8Bw>Ugg}y=o0WPkEN=0BHI)erW<)k!tEXmeu zV=WVA!Lfh{shG)SwXbTiL?qy}8aRlVlPGPH=_6D@X~;+#H>=4J@VGo7Dnz)xLWF|~ zK7yu_1|#T1GbaaO`J$E?b6GHu3=kGK_bDK-*g-B>kb%T$ok5|~C5V~k03fqx=d=uL zClyZP5}YOhDZ=Gphydg86ddrt$55^h!o`p-c%6z;r~WszdGkPi?IjPRj9~p#i>ZA_ zMUsi_qxN9}W!Xv)WZ4uLPPC_B#FI&tB~HNAK1Iag+E@~t9v$ua!A|{6D-fuFF959r zlL8(IqkNGPR)SuDK@F8^kxEGNNU}S-QKzO;a03|-3v>ipf%dd$1&y{8%Bwp%C5|*# z0SE>o0+@p;5E14pz!0=UF!tw9kyMG4Ttq;^DpG{NC>K@3N)E1qQC|WDCbg0;Z10aw z0sp5I|I!m3Df+R^$Kr>g`mz5~_I5y*a}-F^ZUg5tIPTe<=Y5A}Al}b;b+p^(Tmpi6 z7WpK7d*teo>ys4tBydl6^~m)}3Vaf{r@Q`da@l`;Vd$N$*FuYsknJ}lbEU^omm-&Ty0wJyMDOG{m~!$t=&^UEXKl^7eYSt51=_g~&Bq(&E#ru* zmn>mG)6R~soxW1O=@pA{Cc0%9Ys)U=SYvMGfsnGKm1&}QZP^OrIKSwSz4EzvM+F0h z&aZYmK6~hli~%Da)vZ5X>T~v{+erO+S>5`E>5{$IUdE*VY16VgwHF_q(96mz_&o@Z NAq}1^*&R41^FMkq9ZdiL diff --git a/common/src/main/java/common/block/DirectionalDown.java b/common/src/main/java/common/block/DirectionalDown.java deleted file mode 100644 index 8dbba560..00000000 --- a/common/src/main/java/common/block/DirectionalDown.java +++ /dev/null @@ -1,8 +0,0 @@ -package common.block; - -import common.properties.PropertyEnum; -import common.util.Facing; - -public interface DirectionalDown { - public static final PropertyEnum FACING = PropertyEnum.create("facing", Facing.class, Facing.DOWN, Facing.NORTH, Facing.SOUTH, Facing.WEST, Facing.EAST); -} diff --git a/common/src/main/java/common/block/DirectionalUp.java b/common/src/main/java/common/block/DirectionalUp.java deleted file mode 100644 index c3f8dc37..00000000 --- a/common/src/main/java/common/block/DirectionalUp.java +++ /dev/null @@ -1,8 +0,0 @@ -package common.block; - -import common.properties.PropertyEnum; -import common.util.Facing; - -public interface DirectionalUp { - public static final PropertyEnum FACING = PropertyEnum.create("facing", Facing.class, Facing.UP, Facing.NORTH, Facing.SOUTH, Facing.WEST, Facing.EAST); -} diff --git a/common/src/main/java/common/block/foliage/BlockCocoa.java b/common/src/main/java/common/block/foliage/BlockCocoa.java deleted file mode 100755 index 909716dc..00000000 --- a/common/src/main/java/common/block/foliage/BlockCocoa.java +++ /dev/null @@ -1,259 +0,0 @@ -package common.block.foliage; - -import common.block.Block; -import common.block.Rotatable; -import common.color.DyeColor; -import common.block.Material; -import common.entity.types.EntityLiving; -import common.init.Blocks; -import common.item.Item; -import common.item.ItemStack; -import common.item.material.ItemDye; -import common.model.BlockLayer; -import common.model.Model; -import common.model.ModelProvider; -import common.model.ModelRotation; -import common.model.Transform; -import common.properties.Property; -import common.properties.PropertyInteger; -import common.rng.Random; -import common.util.BlockPos; -import common.util.BoundingBox; -import common.util.Facing; -import common.vars.Vars; -import common.world.IWorldAccess; -import common.world.State; -import common.world.World; -import common.world.AWorldServer; - -public class BlockCocoa extends Block implements Rotatable, IGrowable -{ - public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 2); - - public BlockCocoa() - { - super(Material.PLANT); - this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH).withProperty(AGE, Integer.valueOf(0))); - this.setTickRandomly(); - } - - public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) - { - if (!this.canBlockStay(worldIn, pos, state)) - { - this.dropBlock(worldIn, pos, state); - } - else if (Vars.cocoaGrowth > 0 && worldIn.rand.chance(Vars.cocoaGrowth)) - { - int i = ((Integer)state.getValue(AGE)).intValue(); - - if (i < 2) - { - worldIn.setState(pos, state.withProperty(AGE, Integer.valueOf(i + 1)), 2); - } - } - } - - public boolean canBlockStay(World worldIn, BlockPos pos, State state) - { - pos = pos.offset((Facing)state.getValue(FACING)); - State iblockstate = worldIn.getState(pos); - return iblockstate.getBlock() == Blocks.jungle_log; // && iblockstate.getValue(BlockPlanks.VARIANT) == BlockPlanks.EnumType.JUNGLE; - } - - public boolean isFullCube() - { - return false; - } - - /** - * Used to determine ambient occlusion and culling when rebuilding chunks for render - */ - public boolean isOpaqueCube() - { - return false; - } - - public BoundingBox getCollisionBoundingBox(World worldIn, BlockPos pos, State state) - { - this.setBlockBoundsBasedOnState(worldIn, pos); - return super.getCollisionBoundingBox(worldIn, pos, state); - } - - public BoundingBox getSelectedBoundingBox(World worldIn, BlockPos pos) - { - this.setBlockBoundsBasedOnState(worldIn, pos); - return super.getSelectedBoundingBox(worldIn, pos); - } - - - public void setBlockBoundsBasedOnState(IWorldAccess worldIn, BlockPos pos) - { - State iblockstate = worldIn.getState(pos); - Facing enumfacing = (Facing)iblockstate.getValue(FACING); - int i = ((Integer)iblockstate.getValue(AGE)).intValue(); - int j = 4 + i * 2; - int k = 5 + i * 2; - float f = (float)j / 2.0F; - - switch (enumfacing) - { - case SOUTH: - this.setBlockBounds((8.0F - f) / 16.0F, (12.0F - (float)k) / 16.0F, (15.0F - (float)j) / 16.0F, (8.0F + f) / 16.0F, 0.75F, 0.9375F); - break; - - case NORTH: - this.setBlockBounds((8.0F - f) / 16.0F, (12.0F - (float)k) / 16.0F, 0.0625F, (8.0F + f) / 16.0F, 0.75F, (1.0F + (float)j) / 16.0F); - break; - - case WEST: - this.setBlockBounds(0.0625F, (12.0F - (float)k) / 16.0F, (8.0F - f) / 16.0F, (1.0F + (float)j) / 16.0F, 0.75F, (8.0F + f) / 16.0F); - break; - - case EAST: - this.setBlockBounds((15.0F - (float)j) / 16.0F, (12.0F - (float)k) / 16.0F, (8.0F - f) / 16.0F, 0.9375F, 0.75F, (8.0F + f) / 16.0F); - } - } - - /** - * Called by ItemBlocks after a block is set in the world, to allow post-place logic - */ - public void onBlockPlacedBy(World worldIn, BlockPos pos, State state, EntityLiving placer) - { - Facing enumfacing = Facing.fromAngle((double)placer.rotYaw); - worldIn.setState(pos, state.withProperty(FACING, enumfacing), 2); - } - - /** - * Called by ItemBlocks just before a block is actually set in the world, to allow for adjustments to the - * IBlockstate - */ - public State onBlockPlaced(World worldIn, BlockPos pos, Facing facing, float hitX, float hitY, float hitZ, EntityLiving placer) - { - if (!facing.getAxis().isHorizontal()) - { - facing = Facing.NORTH; - } - - return this.getState().withProperty(FACING, facing.getOpposite()).withProperty(AGE, Integer.valueOf(0)); - } - - /** - * Called when a neighboring block changes. - */ - public void onNeighborBlockChange(World worldIn, BlockPos pos, State state, Block neighborBlock) - { - if (!this.canBlockStay(worldIn, pos, state)) - { - this.dropBlock(worldIn, pos, state); - } - } - - private void dropBlock(World worldIn, BlockPos pos, State state) - { - worldIn.setState(pos, Blocks.air.getState(), 3); - this.dropBlockAsItem(worldIn, pos, state, 0); - } - - /** - * Spawns this Block's drops into the World as EntityItems. - */ - public void dropBlockAsItemWithChance(World worldIn, BlockPos pos, State state, float chance, int fortune) - { - int i = ((Integer)state.getValue(AGE)).intValue(); - int j = 1; - - if (i >= 2) - { - j = 3; - } - - for (int k = 0; k < j; ++k) - { - spawnAsEntity(worldIn, pos, new ItemStack(this.getItem())); - } - } - - /** - * Whether this IGrowable can grow - */ - public boolean canGrow(World worldIn, BlockPos pos, State state, boolean isClient) - { - return ((Integer)state.getValue(AGE)).intValue() < 2; - } - - public boolean canUseBonemeal(World worldIn, Random rand, BlockPos pos, State state) - { - return true; - } - - public void grow(AWorldServer worldIn, Random rand, BlockPos pos, State state) - { - worldIn.setState(pos, state.withProperty(AGE, Integer.valueOf(((Integer)state.getValue(AGE)).intValue() + 1)), 2); - } - - public BlockLayer getBlockLayer() - { - return BlockLayer.CUTOUT; - } - - protected Property[] getProperties() - { - return new Property[] {FACING, AGE}; - } - - public Model getModel(ModelProvider provider, String name, State state) { - Model model; - switch(state.getValue(AGE)) { - case 0: - model = provider.getModel("cocoa_0") - .add(6, 7, 11, 10, 12, 15) - .d().uv(0, 0, 4, 4).noCull() - .u().uv(0, 0, 4, 4).noCull() - .n().uv(11, 4, 15, 9).noCull() - .s().uv(11, 4, 15, 9).noCull() - .w().uv(11, 4, 15, 9).noCull() - .e().uv(11, 4, 15, 9).noCull() - .add(8, 12, 12, 8, 16, 16) - .w().uv(12, 0, 16, 4).noCull() - .e().uv(16, 0, 12, 4).noCull(); - break; - case 1: - model = provider.getModel("cocoa_1") - .add(5, 5, 9, 11, 12, 15) - .d().uv(0, 0, 6, 6).noCull() - .u().uv(0, 0, 6, 6).noCull() - .n().uv(9, 4, 15, 11).noCull() - .s().uv(9, 4, 15, 11).noCull() - .w().uv(9, 4, 15, 11).noCull() - .e().uv(9, 4, 15, 11).noCull() - .add(8, 12, 12, 8, 16, 16) - .w().uv(12, 0, 16, 4).noCull() - .e().uv(16, 0, 12, 4).noCull(); - break; - case 2: - default: - model = provider.getModel("cocoa_2") - .add(4, 3, 7, 12, 12, 15) - .d().uv(0, 0, 7, 7).noCull() - .u().uv(0, 0, 7, 7).noCull() - .n().uv(7, 4, 15, 13).noCull() - .s().uv(7, 4, 15, 13).noCull() - .w().uv(7, 4, 15, 13).noCull() - .e().uv(7, 4, 15, 13).noCull() - .add(8, 12, 12, 8, 16, 16) - .w().uv(12, 0, 16, 4).noCull() - .e().uv(16, 0, 12, 4).noCull(); - break; - } - return model.rotate(ModelRotation.getNorthRot(state.getValue(FACING).getOpposite())); - } - - public Transform getTransform() { - return Transform.PANE_SIDE; - } - - protected Item getItemToRegister() { - return new ItemDye(DyeColor.BROWN, this); - } -} diff --git a/common/src/main/java/common/block/foliage/BlockLeaves.java b/common/src/main/java/common/block/foliage/BlockLeaves.java index 79e0f0a4..c147260b 100755 --- a/common/src/main/java/common/block/foliage/BlockLeaves.java +++ b/common/src/main/java/common/block/foliage/BlockLeaves.java @@ -262,7 +262,7 @@ public class BlockLeaves extends BlockLeavesBase spawnAsEntity(worldIn, pos, new ItemStack(item)); } - i = 200; + i = this.type.getDropChance(); if (fortune > 0) { diff --git a/common/src/main/java/common/block/foliage/BlockStem.java b/common/src/main/java/common/block/foliage/BlockStem.java index d69279c2..316460cb 100755 --- a/common/src/main/java/common/block/foliage/BlockStem.java +++ b/common/src/main/java/common/block/foliage/BlockStem.java @@ -1,7 +1,7 @@ package common.block.foliage; import common.block.Block; -import common.block.DirectionalUp; +import common.block.Directional; import common.init.Blocks; import common.init.Items; import common.item.CheatTab; @@ -23,7 +23,7 @@ import common.world.State; import common.world.World; import common.world.AWorldServer; -public class BlockStem extends BlockBush implements DirectionalUp, IGrowable +public class BlockStem extends BlockBush implements Directional, IGrowable { public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 7); @@ -206,7 +206,7 @@ public class BlockStem extends BlockBush implements DirectionalUp, IGrowable public Model getModel(ModelProvider provider, String name, State state) { String stem = name; String upperstem = name + "_connected"; - if(state.getValue(FACING) == Facing.UP) { + if(state.getValue(FACING).getAxis().isVertical()) { switch(state.getValue(AGE)) { case 0: return provider.getModel(stem) diff --git a/common/src/main/java/common/block/tech/BlockDaylightDetector.java b/common/src/main/java/common/block/tech/BlockDaylightDetector.java deleted file mode 100755 index b34cb878..00000000 --- a/common/src/main/java/common/block/tech/BlockDaylightDetector.java +++ /dev/null @@ -1,161 +0,0 @@ -package common.block.tech; - -import common.block.Block; -import common.block.ITileEntityProvider; -import common.block.Material; -import common.block.SoundType; -import common.entity.npc.EntityNPC; -import common.init.Blocks; -import common.init.Items; -import common.item.CheatTab; -import common.item.Item; -import common.model.Model; -import common.model.ModelProvider; -import common.model.Transform; -import common.properties.Property; -import common.properties.PropertyInteger; -import common.tileentity.TileEntity; -import common.tileentity.TileEntityDaylightDetector; -import common.util.BlockPos; -import common.util.ExtMath; -import common.util.Facing; -import common.world.IWorldAccess; -import common.world.LightType; -import common.world.State; -import common.world.World; -import common.world.AWorldServer; - -public class BlockDaylightDetector extends Block implements ITileEntityProvider -{ - public static final PropertyInteger POWER = PropertyInteger.create("power", 0, 15); - private final boolean inverted; - - public BlockDaylightDetector(boolean inverted) - { - super(Material.WOOD); - this.inverted = inverted; - this.setDefaultState(this.getBaseState().withProperty(POWER, Integer.valueOf(0))); - this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.375F, 1.0F); - this.setTab(CheatTab.TECHNOLOGY); - this.setHardness(0.2F); - this.setStepSound(SoundType.WOOD); -// this.setDisplay("daylightDetector"); - } - - public void setBlockBoundsBasedOnState(IWorldAccess worldIn, BlockPos pos) - { - this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.375F, 1.0F); - } - - public double getResistance(World worldIn, BlockPos pos, State state) { - return state.getValue(POWER) > 0 ? (double)(15 - state.getValue(POWER)) * 10000.0 : super.getResistance(worldIn, pos, state); - } - - public void updatePower(AWorldServer worldIn, BlockPos pos) - { - if (worldIn.dimension.hasSkyLight() && worldIn.dimension.hasDaylight()) - { - State iblockstate = worldIn.getState(pos); - int i = worldIn.getLightFor(LightType.SKY, pos) - worldIn.getSkylightSubtracted(); - float f = worldIn.getDayPhase(1.0F); - float f1 = f < (float)Math.PI ? 0.0F : ((float)Math.PI * 2F); - f = f + (f1 - f) * 0.2F; - i = Math.round((float)i * ExtMath.cos(f)); - i = ExtMath.clampi(i, 0, 15); - - if (this.inverted) - { - i = 15 - i; - } - - if (((Integer)iblockstate.getValue(POWER)).intValue() != i) - { - worldIn.setState(pos, iblockstate.withProperty(POWER, Integer.valueOf(i)), 3); - } - } - } - - public boolean onBlockActivated(World worldIn, BlockPos pos, State state, EntityNPC playerIn, Facing side, float hitX, float hitY, float hitZ) - { -// if (playerIn.isAllowEdit()) -// { - if (worldIn.client) - { - return true; - } - else - { - if (this.inverted) - { - worldIn.setState(pos, Blocks.daylight_detector.getState().withProperty(POWER, state.getValue(POWER)), 4); - Blocks.daylight_detector.updatePower((AWorldServer)worldIn, pos); - } - else - { - worldIn.setState(pos, Blocks.daylight_detector_inverted.getState().withProperty(POWER, state.getValue(POWER)), 4); - Blocks.daylight_detector_inverted.updatePower((AWorldServer)worldIn, pos); - } - - return true; - } -// } -// else -// { -// return super.onBlockActivated(worldIn, pos, state, playerIn, side, hitX, hitY, hitZ); -// } - } - - public Item getItem() - { - return Items.daylight_detector; - } - - public boolean isFullCube() - { - return false; - } - - /** - * Used to determine ambient occlusion and culling when rebuilding chunks for render - */ - public boolean isOpaqueCube() - { - return false; - } - - /** - * Can this block provide power. Only wire currently seems to have this change based on its state. - */ - public boolean canConnectToWire(State state) - { - return true; - } - - /** - * Returns a new instance of a block's tile entity class. Called on placing the block. - */ - public TileEntity createNewTileEntity() - { - return new TileEntityDaylightDetector(); - } - - protected Property[] getProperties() - { - return new Property[] {POWER}; - } - - public Model getModel(ModelProvider provider, String name, State state) { - return provider.getModel(this.inverted ? "daylight_detector_inverted_top" : "daylight_detector_top") - .add(0, 0, 0, 16, 6, 16) - .d("daylight_detector_side").uv(0, 0, 16, 16) - .u().uv(0, 0, 16, 16).noCull() - .n("daylight_detector_side").uv(0, 10, 16, 16) - .s("daylight_detector_side").uv(0, 10, 16, 16) - .w("daylight_detector_side").uv(0, 10, 16, 16) - .e("daylight_detector_side").uv(0, 10, 16, 16); - } - - protected Item getItemToRegister() { - return this.inverted ? null : super.getItemToRegister(); - } -} diff --git a/common/src/main/java/common/block/tech/BlockHopper.java b/common/src/main/java/common/block/tech/BlockHopper.java index 127d943c..10535f27 100755 --- a/common/src/main/java/common/block/tech/BlockHopper.java +++ b/common/src/main/java/common/block/tech/BlockHopper.java @@ -3,7 +3,7 @@ package common.block.tech; import java.util.List; import common.block.Block; -import common.block.DirectionalDown; +import common.block.Directional; import common.block.ITileEntityProvider; import common.block.Material; import common.entity.Entity; @@ -11,8 +11,6 @@ import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.inventory.InventoryHelper; import common.item.CheatTab; -import common.item.Item; -import common.item.block.ItemBlock; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -28,9 +26,10 @@ import common.world.State; import common.world.World; import common.world.AWorldServer; -public class BlockHopper extends Block implements ITileEntityProvider, DirectionalDown +public class BlockHopper extends Block implements ITileEntityProvider, Directional { - private static final Model hopper_down = ModelProvider.getModelProvider().getModel("hopper_outside") + private static Model getHopperModel(boolean up) { + return ModelProvider.getModelProvider().getModel("hopper_outside") .add(0, 10, 0, 16, 11, 16) .d().uv(0, 0, 16, 16).noCull() .u("hopper_inside").uv(0, 0, 16, 16).noCull() @@ -79,8 +78,8 @@ public class BlockHopper extends Block implements ITileEntityProvider, Direction .n().uv(6, 12, 10, 16).noCull() .s().uv(6, 12, 10, 16).noCull() .w().uv(6, 12, 10, 16).noCull() - .e().uv(6, 12, 10, 16).noCull() - ; + .e().uv(6, 12, 10, 16).noCull().rotate(up ? ModelRotation.X180_Y0 : ModelRotation.X0_Y0); + } public BlockHopper() { @@ -100,7 +99,8 @@ public class BlockHopper extends Block implements ITileEntityProvider, Direction */ public void addCollisionBoxesToList(World worldIn, BlockPos pos, State state, BoundingBox mask, List list, Entity collidingEntity) { - this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.625F, 1.0F); + boolean flip = state.getBlock() == this && state.getValue(FACING) == Facing.UP; + this.setBlockBounds(0.0F, flip ? 0.375f : 0.0F, 0.0F, 1.0F, flip ? 1.0f : 0.625F, 1.0F); super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity); float f = 0.125F; this.setBlockBounds(0.0F, 0.0F, 0.0F, f, 1.0F, 1.0F); @@ -120,14 +120,7 @@ public class BlockHopper extends Block implements ITileEntityProvider, Direction */ public State onBlockPlaced(World worldIn, BlockPos pos, Facing facing, float hitX, float hitY, float hitZ, EntityLiving placer) { - Facing enumfacing = facing.getOpposite(); - - if (enumfacing == Facing.UP) - { - enumfacing = Facing.DOWN; - } - - return this.getState().withProperty(FACING, enumfacing); + return this.getState().withProperty(FACING, facing.getOpposite()); } /** @@ -151,7 +144,6 @@ public class BlockHopper extends Block implements ITileEntityProvider, Direction if (tileentity instanceof TileEntityHopper) { playerIn.connection.show((TileEntityHopper)tileentity); -// playerIn.triggerAchievement(StatRegistry.hopperStat); } return true; @@ -203,7 +195,7 @@ public class BlockHopper extends Block implements ITileEntityProvider, Direction } public Model getModel(ModelProvider provider, String name, State state) { - return state.getValue(FACING) == Facing.DOWN ? hopper_down : provider.getModel("hopper_outside") + return state.getValue(FACING).getAxis().isVertical() ? getHopperModel(state.getValue(FACING) == Facing.UP) : provider.getModel("hopper_outside") .add(0, 10, 0, 16, 11, 16) .d().uv(0, 0, 16, 16).noCull() .u("hopper_inside").uv(0, 0, 16, 16).noCull() diff --git a/common/src/main/java/common/block/tech/BlockTNT.java b/common/src/main/java/common/block/tech/BlockTNT.java index e83ad012..ab476614 100755 --- a/common/src/main/java/common/block/tech/BlockTNT.java +++ b/common/src/main/java/common/block/tech/BlockTNT.java @@ -88,12 +88,12 @@ public class BlockTNT extends Block { Item item = playerIn.getCurrentEquippedItem().getItem(); - if (item == Items.flint_and_steel || item == Items.fireball) + if (item == Items.lighter || item == Items.fireball) { this.explode(worldIn, pos, state.withProperty(EXPLODE, Boolean.valueOf(true)), playerIn); worldIn.setBlockToAir(pos); - if (item == Items.flint_and_steel) + if (item == Items.lighter) { playerIn.getCurrentEquippedItem().damage(1, playerIn); } diff --git a/common/src/main/java/common/block/tech/BlockToggleableLight.java b/common/src/main/java/common/block/tech/BlockToggleableLight.java index 08054ca6..18128cb2 100755 --- a/common/src/main/java/common/block/tech/BlockToggleableLight.java +++ b/common/src/main/java/common/block/tech/BlockToggleableLight.java @@ -32,9 +32,9 @@ public class BlockToggleableLight extends Block { if(player.getCurrentEquippedItem() == null) return super.onBlockActivated(worldIn, pos, state, player, side, hitX, hitY, hitZ); Item item = player.getCurrentEquippedItem().getItem(); - if(item != Items.flint_and_steel && item != Items.fireball) + if(item != Items.lighter && item != Items.fireball) return super.onBlockActivated(worldIn, pos, state, player, side, hitX, hitY, hitZ); - if(item == Items.flint_and_steel) + if(item == Items.lighter) player.getCurrentEquippedItem().damage(1, player); else player.getCurrentEquippedItem().decrSize(); diff --git a/common/src/main/java/common/block/tech/BlockTorch.java b/common/src/main/java/common/block/tech/BlockTorch.java index ca273152..baeed07f 100755 --- a/common/src/main/java/common/block/tech/BlockTorch.java +++ b/common/src/main/java/common/block/tech/BlockTorch.java @@ -1,7 +1,7 @@ package common.block.tech; import common.block.Block; -import common.block.DirectionalUp; +import common.block.Directional; import common.block.Material; import common.block.artificial.BlockFence; import common.block.artificial.BlockStainedGlass; @@ -24,7 +24,7 @@ import common.world.State; import common.world.World; import common.world.AWorldServer; -public abstract class BlockTorch extends Block implements DirectionalUp +public abstract class BlockTorch extends Block implements Directional { private static boolean isBlockNormalCube(World world, BlockPos pos, boolean def) { if(!World.isValid(pos) || (world.client && !world.isBlockLoaded(pos, false))) @@ -74,7 +74,7 @@ public abstract class BlockTorch extends Block implements DirectionalUp public boolean canPlaceBlockAt(World worldIn, BlockPos pos) { - for (Facing enumfacing : FACING.getStates()) + for (Facing enumfacing : Facing.values()) { if (this.canPlaceAt(worldIn, pos, enumfacing)) { @@ -89,7 +89,7 @@ public abstract class BlockTorch extends Block implements DirectionalUp { BlockPos blockpos = pos.offset(facing.getOpposite()); boolean flag = facing.getAxis().isHorizontal(); - return flag && isBlockNormalCube(worldIn, blockpos, true) || facing.equals(Facing.UP) && this.canPlaceOn(worldIn, blockpos); + return flag && isBlockNormalCube(worldIn, blockpos, true) || facing.getAxis().isVertical() && this.canPlaceOn(worldIn, blockpos); } /** @@ -137,7 +137,7 @@ public abstract class BlockTorch extends Block implements DirectionalUp } else { - Facing enumfacing = (Facing)state.getValue(FACING); + Facing enumfacing = state.getValue(FACING); Facing.Axis enumfacing$axis = enumfacing.getAxis(); Facing enumfacing1 = enumfacing.getOpposite(); boolean flag = false; @@ -166,7 +166,7 @@ public abstract class BlockTorch extends Block implements DirectionalUp protected boolean checkForDrop(World worldIn, BlockPos pos, State state) { - if (state.getBlock() == this && this.canPlaceAt(worldIn, pos, (Facing)state.getValue(FACING))) + if (state.getBlock() == this && this.canPlaceAt(worldIn, pos, state.getValue(FACING))) { return true; } @@ -206,6 +206,11 @@ public abstract class BlockTorch extends Block implements DirectionalUp { this.setBlockBounds(0.5F - f, 0.2F, 1.0F - f * 2.0F, 0.5F + f, 0.8F, 1.0F); } + else if (enumfacing == Facing.DOWN) + { + f = 0.25F; + this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 1.0F, 0.5F + f); + } else { f = 0.1F; @@ -226,29 +231,34 @@ public abstract class BlockTorch extends Block implements DirectionalUp } public Model getModel(ModelProvider provider, String name, State state) { - if(state.getValue(FACING) == Facing.UP) - return provider.getModel(name) - .add(7, 0, 7, 9, 10, 9).noShade() - .d().uv(7, 13, 9, 15).noCull() - .u().uv(7, 6, 9, 8).noCull() - .add(7, 0, 0, 9, 16, 16).noShade() - .w().uv(0, 0, 16, 16).noCull() - .e().uv(0, 0, 16, 16).noCull() - .add(0, 0, 7, 16, 16, 9).noShade() - .n().uv(0, 0, 16, 16).noCull() - .s().uv(0, 0, 16, 16).noCull(); - else - return provider.getModel(name) - .add(-1, 3.5f, 7, 1, 13.5f, 9).noShade().rotate(0, 3.5f, 8, Facing.Axis.Z, -22.5f, false) - .d().uv(7, 13, 9, 15).noCull() - .u().uv(7, 6, 9, 8).noCull() - .add(-1, 3.5f, 0, 1, 19.5f, 16).noShade().rotate(0, 3.5f, 8, Facing.Axis.Z, -22.5f, false) - .w().uv(0, 0, 16, 16).noCull() - .e().uv(0, 0, 16, 16).noCull() - .add(-8, 3.5f, 7, 8, 19.5f, 9).noShade().rotate(0, 3.5f, 8, Facing.Axis.Z, -22.5f, false) - .n().uv(0, 0, 16, 16).noCull() - .s().uv(0, 0, 16, 16).noCull() - .rotate(ModelRotation.getEastRot(state.getValue(FACING), false)); + if(state.getValue(FACING).getAxis().isVertical()) { + Model model = provider.getModel(name) + .add(7, 0, 7, 9, 10, 9).noShade(); + if(state.getValue(FACING) == Facing.UP) + model = model.d().uv(7, 13, 9, 15).noCull(); + model = model.u().uv(7, 6, 9, 8).noCull() + .add(7, 0, 0, 9, 16, 16).noShade() + .w().uv(0, 0, 16, 16).noCull() + .e().uv(0, 0, 16, 16).noCull() + .add(0, 0, 7, 16, 16, 9).noShade() + .n().uv(0, 0, 16, 16).noCull() + .s().uv(0, 0, 16, 16).noCull(); + return state.getValue(FACING) == Facing.UP ? model : model + .add(7, 0, 4, 9, 0, 12).noShade().du("iron_bars").cull(Facing.DOWN) + .add(7, 0, 4, 9, 16, 4).noShade().ns("iron_bars").noCull() + .add(7, 0, 12, 9, 16, 12).noShade().ns("iron_bars").noCull(); + } + return provider.getModel(name) + .add(-1, 3.5f, 7, 1, 13.5f, 9).noShade().rotate(0, 3.5f, 8, Facing.Axis.Z, -22.5f, false) + .d().uv(7, 13, 9, 15).noCull() + .u().uv(7, 6, 9, 8).noCull() + .add(-1, 3.5f, 0, 1, 19.5f, 16).noShade().rotate(0, 3.5f, 8, Facing.Axis.Z, -22.5f, false) + .w().uv(0, 0, 16, 16).noCull() + .e().uv(0, 0, 16, 16).noCull() + .add(-8, 3.5f, 7, 8, 19.5f, 9).noShade().rotate(0, 3.5f, 8, Facing.Axis.Z, -22.5f, false) + .n().uv(0, 0, 16, 16).noCull() + .s().uv(0, 0, 16, 16).noCull() + .rotate(ModelRotation.getEastRot(state.getValue(FACING), false)); } public Transform getTransform() { diff --git a/common/src/main/java/common/block/tech/BlockUnlitTorch.java b/common/src/main/java/common/block/tech/BlockUnlitTorch.java index 951f1c49..5e0f70a7 100644 --- a/common/src/main/java/common/block/tech/BlockUnlitTorch.java +++ b/common/src/main/java/common/block/tech/BlockUnlitTorch.java @@ -31,11 +31,11 @@ public class BlockUnlitTorch extends BlockTorch { if(playerIn.getCurrentEquippedItem() != null) { Item item = playerIn.getCurrentEquippedItem().getItem(); - if(item == Items.flint_and_steel || item == Items.fireball) { + if(item == Items.lighter || item == Items.fireball) { worldIn.setState(pos, this.lit.getState().withProperty(FACING, state.getValue(FACING)).withProperty(BlockLitTorch.FUEL, 7), 3); worldIn.playAuxSFX(playerIn, 1007, pos, 0); - if(item == Items.flint_and_steel) { + if(item == Items.lighter) { playerIn.getCurrentEquippedItem().damage(1, playerIn); } else { diff --git a/common/src/main/java/common/color/DyeColor.java b/common/src/main/java/common/color/DyeColor.java index 817ed6ae..a2a9630b 100755 --- a/common/src/main/java/common/color/DyeColor.java +++ b/common/src/main/java/common/color/DyeColor.java @@ -19,7 +19,7 @@ public enum DyeColor implements Identifyable, Displayable { CYAN("cyan", "Türkis", "Türkises", "Türkiser", "Türkise", null, "Türkiser Farbstoff", 5013401, TextColor.CYAN), PURPLE("purple", "Violett", "Violettes", "Violetter", "Violette", null, "Violetter Farbstoff", 8339378, TextColor.DMAGENTA), BLUE("blue", "Blau", "Blaues", "Blauer", "Blaue", "lapis_lazuli", "Lapislazuli", 3361970, TextColor.MIDNIGHT), - BROWN("brown", "Braun", "Braunes", "Brauner", "Braune", "cocoa", "Kakaobohnen", 6704179, TextColor.BROWN), + BROWN("brown", "Braun", "Braunes", "Brauner", "Braune", "cocoa_powder", "Gemahlene Kakaobohnen", 6704179, TextColor.BROWN), GREEN("green", "Grün", "Grünes", "Grüner", "Grüne", "cactus_green", "Kaktusgrün", 6717235, TextColor.DGREEN), RED("red", "Rot", "Rotes", "Roter", "Rote", null, "Roter Farbstoff", 10040115, TextColor.DRED), BLACK("black", "Schwarz", "Schwarzes", "Schwarzer", "Schwarze", "ink_sack", "Tintenbeutel", 1644825, TextColor.BLACK); diff --git a/common/src/main/java/common/entity/npc/EntityHaunter.java b/common/src/main/java/common/entity/npc/EntityHaunter.java index 15242769..f3a50e0a 100755 --- a/common/src/main/java/common/entity/npc/EntityHaunter.java +++ b/common/src/main/java/common/entity/npc/EntityHaunter.java @@ -229,7 +229,7 @@ public class EntityHaunter extends EntityNPC { { ItemStack itemstack = player.inventory.getCurrentItem(); - if (itemstack != null && itemstack.getItem() == Items.flint_and_steel) + if (itemstack != null && itemstack.getItem() == Items.lighter) { this.worldObj.playSound(SoundEvent.IGNITE, this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D, 1.0F); player.swingItem(); diff --git a/common/src/main/java/common/init/BlockRegistry.java b/common/src/main/java/common/init/BlockRegistry.java index b25e67fc..0ed12445 100755 --- a/common/src/main/java/common/init/BlockRegistry.java +++ b/common/src/main/java/common/init/BlockRegistry.java @@ -39,7 +39,6 @@ import common.block.foliage.BlockBlackenedSoil; import common.block.foliage.BlockBlueShroom; import common.block.foliage.BlockCactus; import common.block.foliage.BlockCarrot; -import common.block.foliage.BlockCocoa; import common.block.foliage.BlockCrops; import common.block.foliage.BlockDeadBush; import common.block.foliage.BlockDoublePlant; @@ -99,7 +98,6 @@ import common.block.tech.BlockButton; import common.block.tech.BlockCauldron; import common.block.tech.BlockChest; import common.block.tech.BlockCore; -import common.block.tech.BlockDaylightDetector; import common.block.tech.BlockDispenser; import common.block.tech.BlockDropper; import common.block.tech.BlockEnchantmentTable; @@ -362,7 +360,6 @@ public abstract class BlockRegistry { register("reeds", (new BlockReed()).setHardness(0.0F).setStepSound(SoundType.GRASS).setDisplay("Zuckerrohr").setTab(CheatTab.PLANTS)); register("vine", (new BlockVine()).setHardness(0.2F).setStepSound(SoundType.GRASS).setDisplay("Ranken").setShearsEfficiency(0)); register("waterlily", (new BlockLilyPad()).setHardness(0.0F).setStepSound(SoundType.GRASS).setDisplay("Seerosenblatt")); - register("cocoa", (new BlockCocoa()).setHardness(0.2F).setResistance(5.0F).setStepSound(SoundType.WOOD).setDisplay("Kakao")); @@ -666,8 +663,6 @@ public abstract class BlockRegistry { register("lamp", (new BlockToggleableLight(false)).setHardness(0.3F).setStepSound(SoundType.GLASS) .setDisplay("Lampe").setTab(CheatTab.TECHNOLOGY)); register("lit_lamp", (new BlockToggleableLight(true)).setHardness(0.3F).setStepSound(SoundType.GLASS).setDisplay("Lampe")); - register("daylight_detector", new BlockDaylightDetector(false).setDisplay("Tageslichtsensor")); - register("daylight_detector_inverted", new BlockDaylightDetector(true).setDisplay("Tageslichtsensor")); register("tripwire_hook", (new BlockTripWireHook()).setDisplay("Haken")); register("string", (new BlockTripWire()).setDisplay("Stolperdraht").setShearsEfficiency(0).setTab(CheatTab.TECHNOLOGY)); diff --git a/common/src/main/java/common/init/Blocks.java b/common/src/main/java/common/init/Blocks.java index ddb64ea7..6a56a125 100755 --- a/common/src/main/java/common/init/Blocks.java +++ b/common/src/main/java/common/init/Blocks.java @@ -164,7 +164,6 @@ public abstract class Blocks { public static final BlockSlab cobblestone_slab = get("cobblestone_slab"); public static final BlockStairs cobblestone_stairs = get("cobblestone_stairs"); public static final BlockWall cobblestone_wall = get("cobblestone_wall"); - public static final BlockCocoa cocoa = get("cocoa"); public static final BlockWorkbench construction_table = get("construction_table"); public static final Block copper_block = get("copper_block"); public static final BlockOre copper_ore = get("copper_ore"); @@ -190,8 +189,6 @@ public abstract class Blocks { public static final BlockSapling dark_oak_sapling = get("dark_oak_sapling"); public static final BlockSlab dark_oak_slab = get("dark_oak_slab"); public static final BlockStairs dark_oak_stairs = get("dark_oak_stairs"); - public static final BlockDaylightDetector daylight_detector = get("daylight_detector"); - public static final BlockDaylightDetector daylight_detector_inverted = get("daylight_detector_inverted"); public static final BlockTallGrass dead_bush = get("dead_bush"); public static final BlockDeadBush deadbush = get("deadbush"); public static final Block diamond_block = get("diamond_block"); diff --git a/common/src/main/java/common/init/CraftingRegistry.java b/common/src/main/java/common/init/CraftingRegistry.java index 5e816ae6..8661cee9 100755 --- a/common/src/main/java/common/init/CraftingRegistry.java +++ b/common/src/main/java/common/init/CraftingRegistry.java @@ -134,7 +134,7 @@ public abstract class CraftingRegistry 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, '#', Items.wheats); + add(new ItemStack(Items.cookie, 8), "#X#", 'X', Items.cocoa_powder, '#', Items.wheats); add(new ItemStack(Items.melon_block), "MMM", "MMM", "MMM", 'M', Items.melon); add(new ItemStack(Items.melon_stem), "M", 'M', Items.melon); add(new ItemStack(Items.pumpkin_stem, 4), "M", 'M', Items.pumpkin); @@ -218,7 +218,6 @@ public abstract class CraftingRegistry Item slab = ItemRegistry.byName(wood.getName() + "_slab"); add(new ItemStack(slab, 6), "###", '#', planks); add(new ItemStack(ItemRegistry.byName(wood.getName() + "_stairs"), 4), "# ", "## ", "###", '#', planks); - add(new ItemStack(Items.daylight_detector), "GGG", "QQQ", "WWW", 'G', Items.glass, 'Q', Items.quartz, 'W', slab); add(new ItemStack(Items.chest), "###", "# #", "###", '#', planks); add(new ItemStack(Items.workbench), "##", "##", '#', planks); @@ -281,7 +280,7 @@ public abstract class CraftingRegistry 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.flint_and_steel, 1), new ItemStack(Items.iron_ingot, 1), new ItemStack(Items.flint, 1)); + addShapeless(new ItemStack(Items.lighter, 1), new ItemStack(Items.iron_ingot, 1), new ItemStack(Items.flint, 1)); add(new ItemStack(Items.bread, 1), "###", '#', Items.wheats); add(new ItemStack(Items.fishing_rod, 1), " #", " #X", "# X", '#', Items.stick, 'X', Items.string); diff --git a/common/src/main/java/common/init/ItemRegistry.java b/common/src/main/java/common/init/ItemRegistry.java index b22ae9a8..6b6f550c 100755 --- a/common/src/main/java/common/init/ItemRegistry.java +++ b/common/src/main/java/common/init/ItemRegistry.java @@ -61,7 +61,7 @@ import common.item.tool.ItemFireball; import common.item.tool.ItemRocketLauncher; import common.item.tool.ItemFishFood; import common.item.tool.ItemFishingRod; -import common.item.tool.ItemFlintAndSteel; +import common.item.tool.ItemFire; import common.item.tool.ItemFood; import common.item.tool.ItemGlassBottle; import common.item.tool.ItemHoe; @@ -222,9 +222,9 @@ public abstract class ItemRegistry { register("weather_token_" + weather.getName(), new ItemWeatherToken(weather).setTab(CheatTab.MAGIC)); } - register("flint_and_steel", (new ItemFlintAndSteel(Blocks.fire)).setDisplay("Feuerzeug")); - register("burning_soul", (new ItemFlintAndSteel(Blocks.soul_fire)).setDisplay("Brennende Seele")); - register("dark_lighter", (new ItemFlintAndSteel(Blocks.black_fire)).setDisplay("Verdunkelndes Feuerzeug")); + register("lighter", (new ItemFire(Blocks.fire)).setDisplay("Feuerzeug")); + register("burning_soul", (new ItemFire(Blocks.soul_fire)).setDisplay("Brennende Seele")); + register("dark_lighter", (new ItemFire(Blocks.black_fire)).setDisplay("Verdunkelndes Feuerzeug")); register("apple", (new ItemFood(4, false)).setDisplay("Apfel").setMaxAmount(StackSize.L)); register("bow", (new ItemBow()).setDisplay("Bogen")); register("boltgun", (new ItemBoltgun()).setDisplay("Bolter")); @@ -270,9 +270,7 @@ public abstract class ItemRegistry { } Item lapis = null; for(DyeColor color : DyeColor.values()) { - if(color == DyeColor.BROWN) - continue; - Item dye = new ItemDye(color, null); + Item dye = new ItemDye(color); if(color == DyeColor.BLUE) lapis = dye; register(color.getDye(), dye); @@ -288,7 +286,7 @@ public abstract class ItemRegistry { register("rotten_flesh", (new ItemFood(4, true)).setDisplay("Verrottetes Fleisch")); register("orb", (new ItemFragile()).setDisplay("Kugel").setTab(CheatTab.MAGIC)); register("demon_rod", (new Item()).setDisplay("Dämonenrute").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XL)); - register("tear", (new Item()).setDisplay("Träne").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XL)); + register("gold_coin", (new Item()).setDisplay("Goldmünze").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XL)); register("gold_nugget", (new Item()).setDisplay("Goldnugget").setTab(CheatTab.METALS).setMaxAmount(StackSize.XL)); register("glass_bottle", (new ItemGlassBottle()).setDisplay("Glasflasche")); for(Pair pot : ItemPotion.getBasePotions()) { diff --git a/common/src/main/java/common/init/Items.java b/common/src/main/java/common/init/Items.java index d4a21a6e..b303c49b 100755 --- a/common/src/main/java/common/init/Items.java +++ b/common/src/main/java/common/init/Items.java @@ -59,7 +59,7 @@ import common.item.tool.ItemFireball; import common.item.tool.ItemRocketLauncher; import common.item.tool.ItemFishFood; import common.item.tool.ItemFishingRod; -import common.item.tool.ItemFlintAndSteel; +import common.item.tool.ItemFire; import common.item.tool.ItemFood; import common.item.tool.ItemGlassBottle; import common.item.tool.ItemHoe; @@ -223,7 +223,7 @@ public abstract class Items { public static final ItemBlock brown_mushroom_block = get("brown_mushroom_block"); public static final ItemBlock brown_wool = get("brown_wool"); public static final ItemBucket bucket = get("bucket"); - public static final ItemFlintAndSteel burning_soul = get("burning_soul"); + public static final ItemFire burning_soul = get("burning_soul"); public static final ItemBlock cactus = get("cactus"); public static final ItemDye cactus_green = get("cactus_green"); public static final ItemBlock cake = get("cake"); @@ -284,7 +284,7 @@ public abstract class Items { public static final ItemSlab cobblestone_slab = get("cobblestone_slab"); public static final ItemBlock cobblestone_stairs = get("cobblestone_stairs"); public static final ItemWall cobblestone_wall = get("cobblestone_wall"); - public static final ItemDye cocoa = get("cocoa"); + public static final ItemDye cocoa_powder = get("cocoa_powder"); public static final ItemBlock construction_table = get("construction_table"); public static final ItemFood cooked_beef = get("cooked_beef"); public static final ItemFood cooked_chicken = get("cooked_chicken"); @@ -303,7 +303,7 @@ public abstract class Items { public static final ItemBlock cyan_wool = get("cyan_wool"); public static final ItemBlock daisy = get("daisy"); public static final ItemBlock dandelion = get("dandelion"); - public static final ItemFlintAndSteel dark_lighter = get("dark_lighter"); + public static final ItemFire dark_lighter = get("dark_lighter"); public static final ItemDoor dark_oak_door = get("dark_oak_door"); public static final ItemFence dark_oak_fence = get("dark_oak_fence"); public static final ItemBlock dark_oak_fence_gate = get("dark_oak_fence_gate"); @@ -317,7 +317,6 @@ public abstract class Items { public static final ItemBlock dark_oak_sapling = get("dark_oak_sapling"); public static final ItemSlab dark_oak_slab = get("dark_oak_slab"); public static final ItemBlock dark_oak_stairs = get("dark_oak_stairs"); - public static final ItemBlock daylight_detector = get("daylight_detector"); public static final ItemBlock dead_bush = get("dead_bush"); public static final ItemBlock deadbush = get("deadbush"); public static final Item diamond = get("diamond"); @@ -367,14 +366,14 @@ public abstract class Items { public static final ItemFireball fireball = get("fireball"); public static final ItemFishingRod fishing_rod = get("fishing_rod"); public static final Item flint = get("flint"); - public static final ItemFlintAndSteel flint_and_steel = get("flint_and_steel"); + public static final ItemFire lighter = get("lighter"); public static final ItemBlock floor_tiles = get("floor_tiles"); public static final ItemBlock floor_tiles_black = get("floor_tiles_black"); public static final ItemBlock floor_tiles_red = get("floor_tiles_red"); public static final ItemBlock floor_tiles_white = get("floor_tiles_white"); public static final ItemBlock flowerpot = get("flowerpot"); public static final ItemBlock furnace = get("furnace"); - public static final Item tear = get("tear"); + public static final Item gold_coin = get("gold_coin"); public static final Item ghi_fragment = get("ghi_fragment"); public static final ItemBlock glass = get("glass"); public static final ItemGlassBottle glass_bottle = get("glass_bottle"); diff --git a/common/src/main/java/common/init/WoodType.java b/common/src/main/java/common/init/WoodType.java index aa76f8dc..a7b97b1f 100755 --- a/common/src/main/java/common/init/WoodType.java +++ b/common/src/main/java/common/init/WoodType.java @@ -3,10 +3,10 @@ package common.init; import common.color.Colorizer; public enum WoodType { - OAK("oak", "Eichen", null, 20, "apple"), + OAK("oak", "Eichen", null, 20, "apple", 200), SPRUCE("spruce", "Fichten", Colorizer.PINE, 20), BIRCH("birch", "Birken", Colorizer.BIRCH, 20), - JUNGLE("jungle", "Tropen", null, 40), + JUNGLE("jungle", "Tropen", null, 40, "cocoa_powder", 350), ACACIA("acacia", "Akazien", null, 20), DARK_OAK("dark_oak", "Schwarzeichen", null, 20), CHERRY("cherry", "Kirsch", Colorizer.NONE, 20), @@ -17,17 +17,19 @@ public enum WoodType { private final String name; private final Colorizer tintType; private final int sapChance; + private final int dropChance; private final String item; private final String display; private WoodType(String name, String display, Colorizer tint, int sapChance) { - this(name, display, tint, sapChance, null); + this(name, display, tint, sapChance, null, 0); } - private WoodType(String name, String display, Colorizer tint, int sapChance, String item) { + private WoodType(String name, String display, Colorizer tint, int sapChance, String item, int dropChance) { this.name = name; this.tintType = tint; this.sapChance = sapChance; + this.dropChance = dropChance; this.item = item; this.display = display; } @@ -40,6 +42,10 @@ public enum WoodType { return this.sapChance; } + public int getDropChance() { + return this.dropChance; + } + public String toString() { return this.name; } diff --git a/common/src/main/java/common/item/CheatTab.java b/common/src/main/java/common/item/CheatTab.java index 50d26d9a..f06cf77e 100755 --- a/common/src/main/java/common/item/CheatTab.java +++ b/common/src/main/java/common/item/CheatTab.java @@ -74,7 +74,7 @@ public enum CheatTab { }, TOOLS("Werkzeug", false) { protected Item getIconItem() { - return Items.flint_and_steel; + return Items.lighter; } }, LIQUIDS("Flüssigkeiten", false) { diff --git a/common/src/main/java/common/item/block/ItemBlock.java b/common/src/main/java/common/item/block/ItemBlock.java index 16d45eed..52762d75 100755 --- a/common/src/main/java/common/item/block/ItemBlock.java +++ b/common/src/main/java/common/item/block/ItemBlock.java @@ -111,7 +111,7 @@ public class ItemBlock extends Item } public Transform getTransform() { - return this.block.getRenderType() == 2 ? Transform.IDENTITY : (this.block.hasBlockFlatTexture() ? super.getTransform() : this.block.getTransform()); + return this.block.getRenderType() == 2 ? super.getTransform() : (this.block.hasBlockFlatTexture() ? super.getTransform() : this.block.getTransform()); } public Model getModel(ModelProvider provider, String name) { diff --git a/common/src/main/java/common/item/block/ItemSign.java b/common/src/main/java/common/item/block/ItemSign.java index 100f5522..18297ab4 100755 --- a/common/src/main/java/common/item/block/ItemSign.java +++ b/common/src/main/java/common/item/block/ItemSign.java @@ -8,6 +8,8 @@ import common.init.Blocks; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; +import common.model.Model; +import common.model.ModelProvider; import common.tileentity.TileEntity; import common.tileentity.TileEntitySign; import common.util.BlockPos; @@ -83,4 +85,8 @@ public class ItemSign extends Item } } } + + public Model getModel(ModelProvider provider, String name) { + return provider.getModel(provider.getEntityModel(), this.getTransform()); + } } diff --git a/common/src/main/java/common/item/material/ItemDye.java b/common/src/main/java/common/item/material/ItemDye.java index 1be53cad..dfc3acde 100755 --- a/common/src/main/java/common/item/material/ItemDye.java +++ b/common/src/main/java/common/item/material/ItemDye.java @@ -1,9 +1,7 @@ package common.item.material; import common.block.Block; -import common.block.Rotatable; import common.block.artificial.BlockBed; -import common.block.foliage.BlockCocoa; import common.block.foliage.IGrowable; import common.color.DyeColor; import common.entity.animal.EntitySheep; @@ -15,9 +13,6 @@ import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; import common.item.StackSize; -import common.model.Model; -import common.model.ModelProvider; -import common.model.Transform; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.Facing; @@ -31,17 +26,15 @@ public class ItemDye extends Item { private static final ItemDye[] DIES = new ItemDye[DyeColor.values().length]; private final DyeColor color; - private final Block block; public static ItemDye getByColor(DyeColor color) { return DIES[color.ordinal()]; } - public ItemDye(DyeColor color, Block block) + public ItemDye(DyeColor color) { this.color = color; - this.block = block; - this.setTab(color == DyeColor.BROWN ? CheatTab.PLANTS : (color == DyeColor.BLUE ? CheatTab.METALS : CheatTab.MATERIALS)); + this.setTab(color == DyeColor.BLUE ? CheatTab.METALS : CheatTab.MATERIALS); this.setDisplay(color.getDyeName()); this.setMaxAmount(StackSize.XXL); DIES[this.color.ordinal()] = this; @@ -50,10 +43,6 @@ public class ItemDye extends Item { public DyeColor getColor() { return this.color; } - - public Block getBlock() { - return this.block; - } /** * Called when a Block is right-clicked with this Item @@ -78,39 +67,6 @@ public class ItemDye extends Item { return true; } } - else if (this.color == DyeColor.BROWN) - { - State iblockstate = worldIn.getState(pos); - Block block = iblockstate.getBlock(); - - if (block == Blocks.jungle_log) // && iblockstate.getValue(BlockPlanks.VARIANT) == BlockPlanks.EnumType.JUNGLE) - { - if (side == Facing.DOWN) - { - return false; - } - - if (side == Facing.UP) - { - return false; - } - - pos = pos.offset(side); - - if (worldIn.isAirBlock(pos)) - { - State iblockstate1 = this.block.onBlockPlaced(worldIn, pos, side, hitX, hitY, hitZ, playerIn); - worldIn.setState(pos, iblockstate1, 2); - -// if (!playerIn.creative) -// { - stack.decrSize(); -// } - } - - return true; - } - } State iblockstate = worldIn.getState(pos); if(iblockstate.getBlock() instanceof BlockBed) { Block bedBlock = BlockRegistry.byName(this.color.getName() + "_bed"); @@ -240,14 +196,4 @@ public class ItemDye extends Item { public int getDispenseSoundId() { return this.color == DyeColor.WHITE ? 0 : super.getDispenseSoundId(); } - - public Transform getTransform() { - return this.block == null ? super.getTransform() : this.block.getTransform(); - } - - public Model getModel(ModelProvider provider, String name) { - return this.block == null ? super.getModel(provider, name) : - provider.getModel(this.block.getModel(provider, - BlockRegistry.getName(this.block), this.block instanceof BlockCocoa ? this.block.getState().withProperty(BlockCocoa.FACING, Facing.SOUTH).withProperty(BlockCocoa.AGE, 2) : this.block.getState()), this.getTransform()); - } } diff --git a/common/src/main/java/common/item/tool/ItemArmor.java b/common/src/main/java/common/item/tool/ItemArmor.java index 957eba87..ca36c059 100755 --- a/common/src/main/java/common/item/tool/ItemArmor.java +++ b/common/src/main/java/common/item/tool/ItemArmor.java @@ -120,17 +120,10 @@ public class ItemArmor extends Item public boolean isMagnetic() { return this.material.isMagnetic(); } - - public Model getModel(ModelProvider provider, String name) { - if(this.material.canBeDyed()) - return provider.getModel(this.getTransform(), name, name + "_overlay"); - else - return super.getModel(provider, name); - } - -// public Set getValidTags() { -// return Sets.newHashSet("color"); -// } + + public Model getModel(ModelProvider provider, String name) { + return provider.getModel(provider.getEntityModel(), this.getTransform()); + } public static int getArmorPosition(ItemStack stack) { // if(stack.getItem() != Items.pumpkin && stack.getItem() != Items.skull) { diff --git a/common/src/main/java/common/item/tool/ItemFlintAndSteel.java b/common/src/main/java/common/item/tool/ItemFire.java similarity index 96% rename from common/src/main/java/common/item/tool/ItemFlintAndSteel.java rename to common/src/main/java/common/item/tool/ItemFire.java index f236c36b..a4daf348 100755 --- a/common/src/main/java/common/item/tool/ItemFlintAndSteel.java +++ b/common/src/main/java/common/item/tool/ItemFire.java @@ -14,11 +14,11 @@ import common.util.Facing; import common.util.Vec3; import common.world.World; -public class ItemFlintAndSteel extends Item +public class ItemFire extends Item { private final BlockFire fireBlock; - public ItemFlintAndSteel(BlockFire fireBlock) + public ItemFire(BlockFire fireBlock) { this.fireBlock = fireBlock; this.setMaxDamage(64); diff --git a/common/src/main/java/common/item/tool/ItemGlassBottle.java b/common/src/main/java/common/item/tool/ItemGlassBottle.java index fb673332..815b2ee3 100755 --- a/common/src/main/java/common/item/tool/ItemGlassBottle.java +++ b/common/src/main/java/common/item/tool/ItemGlassBottle.java @@ -67,6 +67,6 @@ public class ItemGlassBottle extends Item } public Model getModel(ModelProvider provider, String name) { - return provider.getModel(this.getTransform(), "potion_bottle_empty"); + return provider.getModel(this.getTransform(), "bottle"); } } diff --git a/common/src/main/java/common/item/tool/ItemPotion.java b/common/src/main/java/common/item/tool/ItemPotion.java index f872a5f8..b7d720cb 100755 --- a/common/src/main/java/common/item/tool/ItemPotion.java +++ b/common/src/main/java/common/item/tool/ItemPotion.java @@ -254,7 +254,7 @@ public class ItemPotion extends Item } public Model getModel(ModelProvider provider, String name) { - return provider.getModel(this.getTransform(), "potion_overlay", "potion_bottle_drinkable"); + return provider.getModel(this.getTransform(), "potion_overlay", "bottle"); } public ItemStack dispenseStack(World world, TileEntity source, Vec3 position, BlockPos blockpos, Facing facing, ItemStack stack) { diff --git a/common/src/main/java/common/tileentity/TileEntityComparator.java b/common/src/main/java/common/tileentity/TileEntityComparator.java deleted file mode 100755 index 67eeb4ff..00000000 --- a/common/src/main/java/common/tileentity/TileEntityComparator.java +++ /dev/null @@ -1,34 +0,0 @@ -package common.tileentity; - -import common.tags.TagObject; - -public class TileEntityComparator extends TileEntity -{ - private int outputSignal; - - public void writeTags(TagObject compound) - { - super.writeTags(compound); - compound.setInt("OutputSignal", this.outputSignal); - } - - public void readTags(TagObject compound) - { - super.readTags(compound); - this.outputSignal = compound.getInt("OutputSignal"); - } - - public int getOutputSignal() - { - return this.outputSignal; - } - - public void setOutputSignal(int p_145995_1_) - { - this.outputSignal = p_145995_1_; - } - - public int getColor() { - return 0xaf0000; - } -} diff --git a/common/src/main/java/common/tileentity/TileEntityDaylightDetector.java b/common/src/main/java/common/tileentity/TileEntityDaylightDetector.java deleted file mode 100755 index a2afb5db..00000000 --- a/common/src/main/java/common/tileentity/TileEntityDaylightDetector.java +++ /dev/null @@ -1,33 +0,0 @@ -package common.tileentity; - -import common.block.tech.BlockDaylightDetector; -import common.world.AWorldServer; - -public class TileEntityDaylightDetector extends TileEntity implements ITickable -{ - private int updateTimer; - - public void update() - { - if (this.worldObj != null && !this.worldObj.client) - { - if(this.updateTimer <= 0) { - this.blockType = this.getBlockType(); - - if (this.blockType instanceof BlockDaylightDetector) - { - ((BlockDaylightDetector)this.blockType).updatePower((AWorldServer)this.worldObj, this.pos); - } - - this.updateTimer = 20; - } - else { - --this.updateTimer; - } - } - } - - public int getColor() { - return 0xffffaf; - } -} diff --git a/common/src/main/java/common/tileentity/TileEntityHopper.java b/common/src/main/java/common/tileentity/TileEntityHopper.java index cb7864ff..be993f58 100755 --- a/common/src/main/java/common/tileentity/TileEntityHopper.java +++ b/common/src/main/java/common/tileentity/TileEntityHopper.java @@ -224,7 +224,7 @@ public class TileEntityHopper extends TileEntityInventory implements ITickable if (!this.isFull()) { - flag = captureDroppedItems(this) || flag; + flag = captureDroppedItems(this, state.getValue(BlockHopper.FACING) != Facing.UP) || flag; } if (flag) @@ -382,13 +382,13 @@ public class TileEntityHopper extends TileEntityInventory implements ITickable return true; } - public static boolean captureDroppedItems(TileEntityHopper p_145891_0_) + public static boolean captureDroppedItems(TileEntityHopper te, boolean down) { - IInventory iinventory = getHopperInventory(p_145891_0_); + IInventory iinventory = getHopperInventory(te, !down); if (iinventory != null) { - Facing enumfacing = Facing.DOWN; + Facing enumfacing = down ? Facing.UP : Facing.DOWN; if (isInventoryEmpty(iinventory, enumfacing)) { @@ -402,7 +402,7 @@ public class TileEntityHopper extends TileEntityInventory implements ITickable for (int i = 0; i < aint.length; ++i) { - if (pullItemFromSlot(p_145891_0_, iinventory, aint[i], enumfacing)) + if (pullItemFromSlot(te, iinventory, aint[i], enumfacing)) { return true; } @@ -414,18 +414,18 @@ public class TileEntityHopper extends TileEntityInventory implements ITickable for (int k = 0; k < j; ++k) { - if (pullItemFromSlot(p_145891_0_, iinventory, k, enumfacing)) + if (pullItemFromSlot(te, iinventory, k, enumfacing)) { return true; } } } } - else + else if(down) { - for (EntityItem entityitem : func_181556_a(p_145891_0_.getWorld(), p_145891_0_.getXPos(), p_145891_0_.getYPos() + 1.0D, p_145891_0_.getZPos())) + for (EntityItem entityitem : func_181556_a(te.getWorld(), te.getXPos(), te.getYPos() + 1.0D, te.getZPos())) { - if (putDropInInventoryAllSlots(p_145891_0_, entityitem)) + if (putDropInInventoryAllSlots(te, entityitem)) { return true; } @@ -600,9 +600,9 @@ public class TileEntityHopper extends TileEntityInventory implements ITickable /** * Returns the IInventory for the specified hopper */ - public static IInventory getHopperInventory(TileEntityHopper hopper) + public static IInventory getHopperInventory(TileEntityHopper hopper, boolean down) { - return getInventoryAtPosition(hopper.getWorld(), hopper.getXPos(), hopper.getYPos() + 1.0D, hopper.getZPos()); + return getInventoryAtPosition(hopper.getWorld(), hopper.getXPos(), hopper.getYPos() + (down ? -1.0 : 1.0), hopper.getZPos()); } public static List func_181556_a(World p_181556_0_, double p_181556_1_, double p_181556_3_, double p_181556_5_) diff --git a/server/src/main/java/server/clipboard/ReorderRegistry.java b/server/src/main/java/server/clipboard/ReorderRegistry.java index 763c6748..d9da2e2e 100755 --- a/server/src/main/java/server/clipboard/ReorderRegistry.java +++ b/server/src/main/java/server/clipboard/ReorderRegistry.java @@ -81,7 +81,6 @@ public abstract class ReorderRegistry { PLACE_LAST.add(Blocks.soul_wart); PLACE_LAST.add(Blocks.piston); PLACE_LAST.add(Blocks.sticky_piston); - PLACE_LAST.add(Blocks.cocoa); PLACE_LAST.add(Blocks.tripwire_hook); PLACE_LAST.add(Blocks.string); for(BlockFlowerPot block : BlockFlowerPot.POTS) { @@ -102,8 +101,6 @@ public abstract class ReorderRegistry { for(BlockDoublePlant block : BlockDoublePlant.PLANTS) { PLACE_LAST.add(block); } - PLACE_LAST.add(Blocks.daylight_detector_inverted); - // shouldPlaceLast.add(Blocks.daylight_detector); PLACE_LAST.add(Blocks.blue_mushroom); PLACE_LAST.add(Blocks.red_button); } diff --git a/server/src/main/java/server/world/Converter.java b/server/src/main/java/server/world/Converter.java index bd3ff584..8e1c5ae9 100644 --- a/server/src/main/java/server/world/Converter.java +++ b/server/src/main/java/server/world/Converter.java @@ -38,7 +38,6 @@ import common.block.artificial.BlockTrapDoor.DoorHalf; import common.block.artificial.BlockWool; import common.block.foliage.BlockCactus; import common.block.foliage.BlockCarrot; -import common.block.foliage.BlockCocoa; import common.block.foliage.BlockCrops; import common.block.foliage.BlockDoublePlant; import common.block.foliage.BlockFarmland; @@ -62,7 +61,6 @@ import common.block.tech.BlockBrewingStand; import common.block.tech.BlockButton; import common.block.tech.BlockCauldron; import common.block.tech.BlockChest; -import common.block.tech.BlockDaylightDetector; import common.block.tech.BlockDispenser; import common.block.tech.BlockDropper; import common.block.tech.BlockFurnace; @@ -104,10 +102,7 @@ import common.log.Log; import common.rng.Random; import common.tags.TagObject; import common.tileentity.TileEntity; -import common.tileentity.DeviceEffectGenerator; import common.tileentity.TileEntityChest; -import common.tileentity.TileEntityComparator; -import common.tileentity.TileEntityDaylightDetector; import common.tileentity.TileEntityDispenser; import common.tileentity.TileEntityDropper; import common.tileentity.TileEntityFurnace; @@ -364,10 +359,7 @@ public abstract class Converter { mapTile(TileEntityDispenser.class, "Trap", "dispenser"); mapTile(TileEntityDropper.class, "Dropper", "dropper"); mapTile(TileEntitySign.class, "Sign", "sign"); - mapTile(DeviceEffectGenerator.class, "Beacon", "beacon"); - mapTile(TileEntityDaylightDetector.class, "DLDetector", "daylight_detector"); mapTile(TileEntityHopper.class, "Hopper", "hopper"); - mapTile(TileEntityComparator.class, "Comparator", "comparator"); Arrays.fill(BLOCK_MAP, Blocks.air.getState()); @@ -1032,18 +1024,6 @@ public abstract class Converter { 126, 12); mapBlock(Blocks.dark_oak_slab.getState().withProperty(BlockSlab.FACING, Facing.UP), 126, 13); - mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 0).withProperty(BlockCocoa.FACING, Facing.SOUTH), 127, 0, 12); - mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 0).withProperty(BlockCocoa.FACING, Facing.WEST), 127, 1, 13); - mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 0).withProperty(BlockCocoa.FACING, Facing.NORTH), 127, 2, 14); - mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 0).withProperty(BlockCocoa.FACING, Facing.EAST), 127, 3, 15); - mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 1).withProperty(BlockCocoa.FACING, Facing.SOUTH), 127, 4); - mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 1).withProperty(BlockCocoa.FACING, Facing.WEST), 127, 5); - mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 1).withProperty(BlockCocoa.FACING, Facing.NORTH), 127, 6); - mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 1).withProperty(BlockCocoa.FACING, Facing.EAST), 127, 7); - mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 2).withProperty(BlockCocoa.FACING, Facing.SOUTH), 127, 8); - mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 2).withProperty(BlockCocoa.FACING, Facing.WEST), 127, 9); - mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 2).withProperty(BlockCocoa.FACING, Facing.NORTH), 127, 10); - mapBlock(Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, 2).withProperty(BlockCocoa.FACING, Facing.EAST), 127, 11); mapBlock(Blocks.sandstone_stairs.getState().withProperty(BlockStairs.FACING, Facing.EAST).withProperty(BlockStairs.HALF, EnumHalf.BOTTOM), 128, 0, 8); mapBlock(Blocks.sandstone_stairs.getState().withProperty(BlockStairs.FACING, Facing.WEST).withProperty(BlockStairs.HALF, EnumHalf.BOTTOM), 128, 1, 9); mapBlock(Blocks.sandstone_stairs.getState().withProperty(BlockStairs.FACING, Facing.SOUTH).withProperty(BlockStairs.HALF, EnumHalf.BOTTOM), 128, 2, 10); @@ -1115,7 +1095,7 @@ public abstract class Converter { mapBlock(Blocks.spruce_stairs.getState().withProperty(BlockStairs.FACING, Facing.SOUTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 136, 6, 14); mapBlock(Blocks.spruce_stairs.getState().withProperty(BlockStairs.FACING, Facing.NORTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 136, 7, 15); mapBlock(Blocks.obsidian, 137); - mapBlock(Blocks.effect_generator, 138); + mapBlock(Blocks.glass, 138); mapBlock(Blocks.cobblestone_wall, 139); mapBlock(Blocks.mossy_cobblestone_wall, 139, 1); mapBlock(Blocks.flowerpot, 140); @@ -1191,23 +1171,7 @@ public abstract class Converter { mapBlock(Blocks.heavy_weighted_pressure_plate.getState().withProperty(BlockPressurePlateWeighted.POWER, 13), 148, 13); mapBlock(Blocks.heavy_weighted_pressure_plate.getState().withProperty(BlockPressurePlateWeighted.POWER, 14), 148, 14); mapBlock(Blocks.heavy_weighted_pressure_plate.getState().withProperty(BlockPressurePlateWeighted.POWER, 15), 148, 15); - mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 0), 151, 0); - mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 1), 151, 1); - mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 2), 151, 2); - mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 3), 151, 3); - mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 4), 151, 4); - mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 5), 151, 5); - mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 6), 151, 6); - mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 7), 151, 7); - mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 8), 151, 8); - mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 9), 151, 9); - mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 10), 151, 10); - mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 11), 151, 11); - mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 12), 151, 12); - mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 13), 151, 13); - mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 14), 151, 14); - mapBlock(Blocks.daylight_detector.getState().withProperty(BlockDaylightDetector.POWER, 15), 151, 15); - mapBlock(Blocks.charged_block, 152); + mapBlock(Blocks.cobblestone, 152); mapBlock(Blocks.quartz_ore, 153); mapBlock(Blocks.hopper.getState().withProperty(BlockHopper.FACING, Facing.DOWN), 154, 0, 1, 6, 7); mapBlock(Blocks.hopper.getState().withProperty(BlockHopper.FACING, Facing.NORTH), 154, 2); @@ -1343,22 +1307,6 @@ public abstract class Converter { mapBlock(Blocks.large_fern, 175, 3); mapBlock(Blocks.rose_bush, 175, 4); mapBlock(Blocks.paeonia, 175, 5); - mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 0), 178, 0); - mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 1), 178, 1); - mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 2), 178, 2); - mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 3), 178, 3); - mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 4), 178, 4); - mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 5), 178, 5); - mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 6), 178, 6); - mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 7), 178, 7); - mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 8), 178, 8); - mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 9), 178, 9); - mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 10), 178, 10); - mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 11), 178, 11); - mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 12), 178, 12); - mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 13), 178, 13); - mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 14), 178, 14); - mapBlock(Blocks.daylight_detector_inverted.getState().withProperty(BlockDaylightDetector.POWER, 15), 178, 15); mapBlock(Blocks.sandstone, 179); mapBlock(Blocks.carved_sandstone, 179, 1); mapBlock(Blocks.smooth_sandstone, 179, 2); @@ -1636,9 +1584,6 @@ public abstract class Converter { nent.setString("Text" + (i + 1), signText[i]); } } - else if(clazz == TileEntityComparator.class) { - nent.setInt("OutputSignal", ent.getInt("OutputSignal")); - } return nent; } diff --git a/server/src/main/java/server/worldgen/LootConstants.java b/server/src/main/java/server/worldgen/LootConstants.java index 03e96cdd..566c9858 100755 --- a/server/src/main/java/server/worldgen/LootConstants.java +++ b/server/src/main/java/server/worldgen/LootConstants.java @@ -44,7 +44,7 @@ public abstract class LootConstants { new RngLoot(Items.pumpkin_stem, 2, 4, 10), new RngLoot(Items.saddle, 1, 1, 3), new RngLoot(Items.iron_horse_armor, 1, 1, 1)); public static final WeightedList HELL_FORTRESS = new WeightedList(new RngLoot(Items.diamond, 1, 3, 5), new RngLoot(Items.iron_ingot, 1, 5, 5), new RngLoot(Items.gold_ingot, 1, 3, 15), new RngLoot(Items.gold_sword, 1, 1, 5), - new RngLoot(Items.gold_chestplate, 1, 1, 5), new RngLoot(Items.flint_and_steel, 1, 1, 5), + new RngLoot(Items.gold_chestplate, 1, 1, 5), new RngLoot(Items.lighter, 1, 1, 5), new RngLoot(Items.soul_wart, 3, 7, 5), new RngLoot(Items.saddle, 1, 1, 10), new RngLoot(Items.gold_horse_armor, 1, 1, 8), new RngLoot(Items.iron_horse_armor, 1, 1, 5), new RngLoot(Items.diamond_horse_armor, 1, 1, 3), new RngLoot(Items.obsidian, 2, 4, 2)); diff --git a/server/src/main/java/server/worldgen/tree/WorldGenBaseTree.java b/server/src/main/java/server/worldgen/tree/WorldGenBaseTree.java index cd5cf3ba..17f45fb1 100755 --- a/server/src/main/java/server/worldgen/tree/WorldGenBaseTree.java +++ b/server/src/main/java/server/worldgen/tree/WorldGenBaseTree.java @@ -2,7 +2,6 @@ package server.worldgen.tree; import common.block.Block; import common.block.Material; -import common.block.foliage.BlockCocoa; import common.block.foliage.BlockLeaves; import common.block.foliage.BlockVine; import common.init.Blocks; @@ -203,21 +202,6 @@ public class WorldGenBaseTree extends WorldGenTree } } } - - if (rand.zrange(5) == 0 && i > 5) - { - for (int l3 = 0; l3 < 2; ++l3) - { - for (Facing enumfacing : Facing.Plane.HORIZONTAL) - { - if (rand.zrange(4 - l3) == 0) - { - Facing enumfacing1 = enumfacing.getOpposite(); - this.func_181652_a(worldIn, rand.zrange(3), position.add(enumfacing1.getFrontOffsetX(), i - 5 + l3, enumfacing1.getFrontOffsetZ()), enumfacing); - } - } - } - } } return true; @@ -234,11 +218,6 @@ public class WorldGenBaseTree extends WorldGenTree } } - private void func_181652_a(WorldServer p_181652_1_, int p_181652_2_, BlockPos p_181652_3_, Facing p_181652_4_) - { - this.setBlockAndNotifyAdequately(p_181652_1_, p_181652_3_, Blocks.cocoa.getState().withProperty(BlockCocoa.AGE, p_181652_2_).withProperty(BlockCocoa.FACING, p_181652_4_)); - } - private void func_181651_a(WorldServer p_181651_1_, BlockPos p_181651_2_, PropertyBool p_181651_3_) { this.setBlockAndNotifyAdequately(p_181651_1_, p_181651_2_, Blocks.vine.getState().withProperty(p_181651_3_, Boolean.valueOf(true)));