diff --git a/client/src/main/java/client/renderer/BlockRenderer.java b/client/src/main/java/client/renderer/BlockRenderer.java index 944e220a..7b8bd48d 100755 --- a/client/src/main/java/client/renderer/BlockRenderer.java +++ b/client/src/main/java/client/renderer/BlockRenderer.java @@ -20,6 +20,7 @@ import common.block.liquid.BlockLiquid; import common.block.liquid.BlockStaticLiquid; import common.collect.Maps; import common.init.BlockRegistry; +import common.init.Blocks; import common.util.BlockPos; import common.util.ExtMath; import common.util.Facing; @@ -50,7 +51,7 @@ public class BlockRenderer public void renderBlockDamage(State state, BlockPos pos, Sprite texture, IWorldAccess blockAccess) { Block block = state.getBlock(); - if (block.getRenderType() == 3) + if (block != Blocks.air && !block.getMaterial().isLiquid()) { state = block.getState(state, blockAccess, pos); IBakedModel ibakedmodel = this.manager.getModelForState(state); @@ -60,30 +61,17 @@ public class BlockRenderer } } - public boolean renderBlock(State state, BlockPos pos, IWorldAccess blockAccess, RenderBuffer worldRendererIn) - { - if(this.gm.xrayActive && !state.getBlock().isXrayVisible()) - return false; - int i = state.getBlock().getRenderType(); - - if (i == -1) - { - return false; - } - else - { - switch (i) - { - case 1: - return this.renderFluid(blockAccess, state, pos, worldRendererIn); - case 3: - IBakedModel ibakedmodel = this.getModelFromBlockState(state, blockAccess, pos); - return this.renderBase(blockAccess, ibakedmodel, state, pos, worldRendererIn, !this.gm.xrayActive); - default: - return false; - } - } - } + public boolean renderBlock(State state, BlockPos pos, IWorldAccess world, RenderBuffer rb) { + Block block = state.getBlock(); + if(this.gm.xrayActive && !block.isXrayVisible()) + return false; + if(block == Blocks.air) + return false; + else if(block.getMaterial().isLiquid()) + return this.renderFluid(world, state, pos, rb); + IBakedModel model = this.getModelFromBlockState(state, world, pos); + return this.renderBase(world, model, state, pos, rb, !this.gm.xrayActive); + } public IBakedModel getModelFromBlockState(State state, IWorldAccess worldIn, BlockPos pos) { @@ -113,7 +101,7 @@ public class BlockRenderer public void renderBlockEntity(State state, float brightness) { - if (state.getBlock().getRenderType() == 3) + if (state.getBlock() != Blocks.air && !state.getBlock().getMaterial().isLiquid()) { IBakedModel model = this.manager.getModelForState(state); this.renderModelBrightness(model, state, brightness, true); diff --git a/client/src/main/java/client/renderer/EffectRenderer.java b/client/src/main/java/client/renderer/EffectRenderer.java index 332de632..17d20827 100755 --- a/client/src/main/java/client/renderer/EffectRenderer.java +++ b/client/src/main/java/client/renderer/EffectRenderer.java @@ -1100,7 +1100,7 @@ public class EffectRenderer { State iblockstate = this.world.getState(pos); Block block = iblockstate.getBlock(); - if(block.getRenderType() != -1) { + if(block != Blocks.air) { int i = pos.getX(); int j = pos.getY(); int k = pos.getZ(); diff --git a/client/src/main/java/client/renderer/ItemRenderer.java b/client/src/main/java/client/renderer/ItemRenderer.java index 5a3b5db8..eb8c4143 100755 --- a/client/src/main/java/client/renderer/ItemRenderer.java +++ b/client/src/main/java/client/renderer/ItemRenderer.java @@ -17,11 +17,11 @@ import client.renderer.texture.TextureMap; import common.block.Block; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; +import common.init.Blocks; import common.item.Item; import common.item.ItemAction; import common.item.ItemStack; import common.model.BlockLayer; -import common.model.GuiPosition; import common.util.BlockPos; import common.util.ExtMath; import common.util.Vec3; @@ -429,7 +429,7 @@ public class ItemRenderer } } - if (iblockstate.getBlock().getRenderType() != -1) + if (iblockstate.getBlock() != Blocks.air) { this.renderBlockInside(partialTicks, this.gm.getBlockRendererDispatcher().getModelManager().getTexture(iblockstate)); } diff --git a/client/src/main/java/client/renderer/blockmodel/ModelBakery.java b/client/src/main/java/client/renderer/blockmodel/ModelBakery.java index 2ccb13eb..cea5608c 100755 --- a/client/src/main/java/client/renderer/blockmodel/ModelBakery.java +++ b/client/src/main/java/client/renderer/blockmodel/ModelBakery.java @@ -19,7 +19,6 @@ import common.collect.Sets; import common.init.BlockRegistry; import common.init.ItemRegistry; import common.item.Item; -import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; import common.model.GuiPosition; diff --git a/client/src/main/java/client/renderer/blockmodel/ModelManager.java b/client/src/main/java/client/renderer/blockmodel/ModelManager.java index 0d20ab73..63d7f6d8 100755 --- a/client/src/main/java/client/renderer/blockmodel/ModelManager.java +++ b/client/src/main/java/client/renderer/blockmodel/ModelManager.java @@ -9,9 +9,9 @@ import client.renderer.texture.Sprite; import client.renderer.texture.TextureMap; import common.block.Block; import common.block.liquid.BlockDynamicLiquid; -import common.block.liquid.BlockLiquid; import common.collect.Maps; import common.init.BlockRegistry; +import common.init.Blocks; import common.properties.Property; import common.world.State; @@ -29,9 +29,8 @@ public class ModelManager { this.texMap = textures; for(Block block : BlockRegistry.blocks()) { - if(block.getRenderType() != 3) { + if(block == Blocks.air || block.getMaterial().isLiquid()) { this.builtin.add(block); - // Log.info("Builtin: " + BlockRegistry.getNameFromBlock(block)); } else { Property[] ignored = block.getIgnoredProperties(); diff --git a/client/src/main/java/client/renderer/chunk/RenderChunk.java b/client/src/main/java/client/renderer/chunk/RenderChunk.java index 5f143bc0..6ca7f3a3 100755 --- a/client/src/main/java/client/renderer/chunk/RenderChunk.java +++ b/client/src/main/java/client/renderer/chunk/RenderChunk.java @@ -23,6 +23,7 @@ import common.block.Block; import common.block.ITileEntityProvider; import common.collect.Maps; import common.collect.Sets; +import common.init.Blocks; import common.model.BlockLayer; import common.tileentity.TileEntity; import common.util.BlockPos; @@ -172,7 +173,7 @@ public class RenderChunk BlockLayer enumworldblocklayer1 = block.getRenderLayer(); int j = enumworldblocklayer1.ordinal(); - if (block.getRenderType() != -1) + if (block != Blocks.air) { RenderBuffer worldrenderer = generator.getRegionRenderCacheBuilder().getWorldRendererByLayerId(j); diff --git a/client/src/main/java/client/renderer/entity/RenderFallingBlock.java b/client/src/main/java/client/renderer/entity/RenderFallingBlock.java index efad9b45..5b500acb 100755 --- a/client/src/main/java/client/renderer/entity/RenderFallingBlock.java +++ b/client/src/main/java/client/renderer/entity/RenderFallingBlock.java @@ -12,6 +12,7 @@ import client.renderer.blockmodel.IBakedModel; import client.renderer.texture.TextureMap; import common.block.Block; import common.entity.item.EntityFalling; +import common.init.Blocks; import common.util.BlockPos; import common.world.State; import common.world.World; @@ -37,7 +38,7 @@ public class RenderFallingBlock extends Render BlockPos blockpos = new BlockPos(entity); World world = entity.getWorldObj(); - if (iblockstate != world.getState(blockpos) && block.getRenderType() == 3) + if (iblockstate != world.getState(blockpos) && block != Blocks.air && !block.getMaterial().isLiquid()) { GL11.glPushMatrix(); GL11.glTranslatef((float)x, (float)y, (float)z); diff --git a/client/src/main/java/client/renderer/entity/RenderItemEntity.java b/client/src/main/java/client/renderer/entity/RenderItemEntity.java index 3a6d29e5..a8745c2c 100755 --- a/client/src/main/java/client/renderer/entity/RenderItemEntity.java +++ b/client/src/main/java/client/renderer/entity/RenderItemEntity.java @@ -7,7 +7,6 @@ import client.renderer.texture.TextureMap; import common.entity.Entity; import common.item.Item; import common.item.ItemStack; -import common.model.GuiPosition; public class RenderItemEntity extends Render diff --git a/client/src/main/java/client/renderer/entity/RenderMinecart.java b/client/src/main/java/client/renderer/entity/RenderMinecart.java index 37806266..2cdf5cf9 100755 --- a/client/src/main/java/client/renderer/entity/RenderMinecart.java +++ b/client/src/main/java/client/renderer/entity/RenderMinecart.java @@ -8,6 +8,7 @@ import client.renderer.model.ModelBase; import client.renderer.model.ModelMinecart; import client.renderer.texture.TextureMap; import common.entity.item.EntityCart; +import common.init.Blocks; import common.util.ExtMath; import common.util.Vec3; import common.world.State; @@ -93,7 +94,7 @@ public class RenderMinecart extends Render int j = entity.getDisplayTileOffset(); State iblockstate = entity.getDisplayTile(); - if (iblockstate.getBlock().getRenderType() == 3) + if (iblockstate.getBlock() != Blocks.air && !iblockstate.getBlock().getMaterial().isLiquid()) { GL11.glPushMatrix(); this.bindTexture(TextureMap.BLOCKS); diff --git a/client/src/main/java/client/renderer/layers/LayerHeldItem.java b/client/src/main/java/client/renderer/layers/LayerHeldItem.java index 250f5e69..02f5003e 100755 --- a/client/src/main/java/client/renderer/layers/LayerHeldItem.java +++ b/client/src/main/java/client/renderer/layers/LayerHeldItem.java @@ -10,7 +10,6 @@ import common.entity.types.EntityLiving; import common.init.Items; import common.item.Item; import common.item.ItemStack; -import common.model.GuiPosition; public class LayerHeldItem implements LayerRenderer { diff --git a/client/src/main/java/client/renderer/tileentity/SignRenderer.java b/client/src/main/java/client/renderer/tileentity/SignRenderer.java index 0ca5e823..b944dc16 100755 --- a/client/src/main/java/client/renderer/tileentity/SignRenderer.java +++ b/client/src/main/java/client/renderer/tileentity/SignRenderer.java @@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11; import client.renderer.Drawing; import client.renderer.GlState; -import common.block.tile.BlockStandingSign; -import common.block.tile.BlockWallSign; +import common.block.tech.BlockStandingSign; +import common.block.tech.BlockWallSign; import common.tileentity.TileEntitySign; import common.world.State; diff --git a/common/src/main/java/common/block/Block.java b/common/src/main/java/common/block/Block.java index 43ba7860..f73040fb 100755 --- a/common/src/main/java/common/block/Block.java +++ b/common/src/main/java/common/block/Block.java @@ -1069,10 +1069,6 @@ public class Block { return light; } - public int getRenderType() { - return 3; - } - @Clientside public BlockLayer getRenderLayer() { return BlockLayer.SOLID; diff --git a/common/src/main/java/common/block/BlockAir.java b/common/src/main/java/common/block/BlockAir.java index d3cb81d5..678b31af 100755 --- a/common/src/main/java/common/block/BlockAir.java +++ b/common/src/main/java/common/block/BlockAir.java @@ -1,6 +1,5 @@ package common.block; -import common.item.Item; import common.util.BlockPos; import common.util.BoundingBox; import common.world.State; @@ -11,10 +10,6 @@ public final class BlockAir extends Block { super(Material.NONE); } - public int getRenderType() { - return -1; - } - public BoundingBox getCollisionBox(World world, BlockPos pos, State state) { return null; } diff --git a/common/src/main/java/common/block/artificial/BlockCarpet.java b/common/src/main/java/common/block/artificial/BlockCarpet.java index 93c16633..ce984cbc 100755 --- a/common/src/main/java/common/block/artificial/BlockCarpet.java +++ b/common/src/main/java/common/block/artificial/BlockCarpet.java @@ -6,7 +6,6 @@ import common.color.DyeColor; import common.item.CheatTab; import common.model.Model; import common.model.ModelProvider; -import common.model.GuiPosition; import common.util.BlockPos; import common.util.Facing; import common.world.AWorldServer; diff --git a/common/src/main/java/common/block/artificial/BlockFence.java b/common/src/main/java/common/block/artificial/BlockFence.java index 018d3879..d2f6c653 100755 --- a/common/src/main/java/common/block/artificial/BlockFence.java +++ b/common/src/main/java/common/block/artificial/BlockFence.java @@ -8,7 +8,6 @@ import common.collect.Lists; import common.entity.Entity; import common.entity.npc.EntityNPC; import common.item.CheatTab; -import common.item.Item; import common.item.tool.ItemLead; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/block/artificial/BlockFenceGate.java b/common/src/main/java/common/block/artificial/BlockFenceGate.java index 4b74eb34..1c05df53 100755 --- a/common/src/main/java/common/block/artificial/BlockFenceGate.java +++ b/common/src/main/java/common/block/artificial/BlockFenceGate.java @@ -11,7 +11,6 @@ import common.item.CheatTab; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; -import common.model.GuiPosition; import common.properties.Property; import common.properties.PropertyBool; import common.util.BlockPos; diff --git a/common/src/main/java/common/block/artificial/BlockFloorPortal.java b/common/src/main/java/common/block/artificial/BlockFloorPortal.java index 52c35b81..1de6a3e6 100755 --- a/common/src/main/java/common/block/artificial/BlockFloorPortal.java +++ b/common/src/main/java/common/block/artificial/BlockFloorPortal.java @@ -8,7 +8,6 @@ import common.block.Block; import common.block.Material; import common.collect.Sets; import common.entity.Entity; -import common.item.Item; import common.model.Model; import common.model.ModelProvider; import common.rng.Random; diff --git a/common/src/main/java/common/block/artificial/BlockFlowerPot.java b/common/src/main/java/common/block/artificial/BlockFlowerPot.java index c7733d5c..78856ddc 100755 --- a/common/src/main/java/common/block/artificial/BlockFlowerPot.java +++ b/common/src/main/java/common/block/artificial/BlockFlowerPot.java @@ -10,7 +10,6 @@ import common.entity.npc.EntityNPC; import common.init.BlockRegistry; import common.init.Blocks; import common.init.Items; -import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; import common.model.BlockLayer; diff --git a/common/src/main/java/common/block/artificial/BlockHay.java b/common/src/main/java/common/block/artificial/BlockHay.java index 7bbc87ef..41613c3a 100755 --- a/common/src/main/java/common/block/artificial/BlockHay.java +++ b/common/src/main/java/common/block/artificial/BlockHay.java @@ -4,7 +4,6 @@ import common.block.BlockRotatedPillar; import common.block.Material; import common.entity.types.EntityLiving; import common.item.CheatTab; -import common.item.ItemStack; import common.properties.Property; import common.util.BlockPos; import common.util.Facing; diff --git a/common/src/main/java/common/block/artificial/BlockMetalBlock.java b/common/src/main/java/common/block/artificial/BlockMetalBlock.java index f0d95f55..e6e2d840 100644 --- a/common/src/main/java/common/block/artificial/BlockMetalBlock.java +++ b/common/src/main/java/common/block/artificial/BlockMetalBlock.java @@ -11,7 +11,6 @@ import common.block.SoundType; import common.entity.npc.EntityNPC; import common.init.MetalType; import common.item.CheatTab; -import common.item.Item; import common.item.ItemStack; public class BlockMetalBlock extends Block { diff --git a/common/src/main/java/common/block/artificial/BlockPortal.java b/common/src/main/java/common/block/artificial/BlockPortal.java index 4e091d25..83905e3b 100755 --- a/common/src/main/java/common/block/artificial/BlockPortal.java +++ b/common/src/main/java/common/block/artificial/BlockPortal.java @@ -1,21 +1,17 @@ package common.block.artificial; -import java.util.List; import java.util.Map; import common.block.Block; import common.block.Material; import common.block.natural.BlockFire; -import common.collect.Lists; import common.entity.Entity; import common.init.Blocks; -import common.item.Item; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; import common.properties.Property; import common.properties.PropertyEnum; -import common.properties.PropertyInteger; import common.rng.Random; import common.util.BlockPos; import common.util.BoundingBox; diff --git a/common/src/main/java/common/block/artificial/BlockSlab.java b/common/src/main/java/common/block/artificial/BlockSlab.java index 7119642a..2d2bc4d5 100755 --- a/common/src/main/java/common/block/artificial/BlockSlab.java +++ b/common/src/main/java/common/block/artificial/BlockSlab.java @@ -11,7 +11,6 @@ import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.BlockRegistry; import common.item.CheatTab; -import common.item.Item; import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/block/artificial/BlockStainedGlassPane.java b/common/src/main/java/common/block/artificial/BlockStainedGlassPane.java index 5e622d1f..daada4af 100755 --- a/common/src/main/java/common/block/artificial/BlockStainedGlassPane.java +++ b/common/src/main/java/common/block/artificial/BlockStainedGlassPane.java @@ -3,7 +3,6 @@ package common.block.artificial; import common.block.Material; import common.color.DyeColor; import common.item.CheatTab; -import common.item.Item; import common.model.BlockLayer; import common.properties.Property; diff --git a/common/src/main/java/common/block/artificial/BlockTrapDoor.java b/common/src/main/java/common/block/artificial/BlockTrapDoor.java index 86f5db85..91457c42 100755 --- a/common/src/main/java/common/block/artificial/BlockTrapDoor.java +++ b/common/src/main/java/common/block/artificial/BlockTrapDoor.java @@ -11,7 +11,6 @@ import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; -import common.model.GuiPosition; import common.properties.Property; import common.properties.PropertyBool; import common.properties.PropertyEnum; diff --git a/common/src/main/java/common/block/artificial/BlockWall.java b/common/src/main/java/common/block/artificial/BlockWall.java index 3ea8a287..5a63a7c9 100755 --- a/common/src/main/java/common/block/artificial/BlockWall.java +++ b/common/src/main/java/common/block/artificial/BlockWall.java @@ -7,7 +7,6 @@ import common.block.Material; import common.collect.Lists; import common.init.Blocks; import common.item.CheatTab; -import common.item.Item; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; diff --git a/common/src/main/java/common/block/foliage/BlockCarrot.java b/common/src/main/java/common/block/foliage/BlockCarrot.java index 0eb00774..08f1bc02 100755 --- a/common/src/main/java/common/block/foliage/BlockCarrot.java +++ b/common/src/main/java/common/block/foliage/BlockCarrot.java @@ -1,10 +1,7 @@ package common.block.foliage; -import common.init.Blocks; import common.init.Items; import common.item.Item; -import common.item.StackSize; -import common.item.consumable.ItemSeedFood; import common.model.Model; import common.model.ModelProvider; import common.world.State; diff --git a/common/src/main/java/common/block/foliage/BlockCrops.java b/common/src/main/java/common/block/foliage/BlockCrops.java index eeaef566..7fc5903f 100755 --- a/common/src/main/java/common/block/foliage/BlockCrops.java +++ b/common/src/main/java/common/block/foliage/BlockCrops.java @@ -7,8 +7,6 @@ import common.init.Items; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.item.StackSize; -import common.item.material.ItemSeeds; import common.model.Model; import common.model.ModelProvider; import common.properties.Property; diff --git a/common/src/main/java/common/block/foliage/BlockLilyPad.java b/common/src/main/java/common/block/foliage/BlockLilyPad.java index 187efe63..454e1f66 100755 --- a/common/src/main/java/common/block/foliage/BlockLilyPad.java +++ b/common/src/main/java/common/block/foliage/BlockLilyPad.java @@ -23,7 +23,6 @@ import common.util.BlockPos; import common.util.BoundingBox; import common.util.Facing; import common.util.HitPosition; -import common.world.IWorldAccess; import common.world.State; import common.world.World; diff --git a/common/src/main/java/common/block/foliage/BlockPotato.java b/common/src/main/java/common/block/foliage/BlockPotato.java index f3310be5..b4ea2b2a 100755 --- a/common/src/main/java/common/block/foliage/BlockPotato.java +++ b/common/src/main/java/common/block/foliage/BlockPotato.java @@ -1,11 +1,8 @@ package common.block.foliage; -import common.init.Blocks; import common.init.Items; import common.item.Item; import common.item.ItemStack; -import common.item.StackSize; -import common.item.consumable.ItemSeedFood; import common.model.Model; import common.model.ModelProvider; import common.util.BlockPos; diff --git a/common/src/main/java/common/block/foliage/BlockReed.java b/common/src/main/java/common/block/foliage/BlockReed.java index 8cfbbaae..c4abb986 100755 --- a/common/src/main/java/common/block/foliage/BlockReed.java +++ b/common/src/main/java/common/block/foliage/BlockReed.java @@ -3,7 +3,6 @@ package common.block.foliage; import common.block.Block; import common.block.Material; import common.init.Blocks; -import common.item.Item; import common.item.StackSize; import common.model.BlockLayer; import common.model.Model; @@ -16,7 +15,6 @@ 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; diff --git a/common/src/main/java/common/block/foliage/BlockStem.java b/common/src/main/java/common/block/foliage/BlockStem.java index 3c685751..648c7b4d 100755 --- a/common/src/main/java/common/block/foliage/BlockStem.java +++ b/common/src/main/java/common/block/foliage/BlockStem.java @@ -4,10 +4,7 @@ import common.block.Block; import common.init.Blocks; import common.init.Items; import common.item.CheatTab; -import common.item.Item; import common.item.ItemStack; -import common.item.StackSize; -import common.item.material.ItemSeeds; import common.model.Model; import common.model.ModelProvider; import common.properties.Property; diff --git a/common/src/main/java/common/block/foliage/BlockWart.java b/common/src/main/java/common/block/foliage/BlockWart.java index ffb5876a..c4807d59 100755 --- a/common/src/main/java/common/block/foliage/BlockWart.java +++ b/common/src/main/java/common/block/foliage/BlockWart.java @@ -5,10 +5,7 @@ import common.block.Material; import common.init.Blocks; import common.init.Items; import common.item.CheatTab; -import common.item.Item; import common.item.ItemStack; -import common.item.StackSize; -import common.item.material.ItemSeeds; import common.model.Model; import common.model.ModelProvider; import common.properties.Property; diff --git a/common/src/main/java/common/block/liquid/BlockLiquid.java b/common/src/main/java/common/block/liquid/BlockLiquid.java index fbeb7aa7..05c61134 100755 --- a/common/src/main/java/common/block/liquid/BlockLiquid.java +++ b/common/src/main/java/common/block/liquid/BlockLiquid.java @@ -136,14 +136,6 @@ public abstract class BlockLiquid extends Block return null; } - /** - * The type of render function called. 3 for standard block models, 2 for TESR's, 1 for liquids, -1 is no render - */ - public int getRenderType() - { - return 1; - } - /** * Get the Item that this Block should drop when harvested. */ diff --git a/common/src/main/java/common/block/natural/BlockFire.java b/common/src/main/java/common/block/natural/BlockFire.java index 2a558c59..f44a55b1 100755 --- a/common/src/main/java/common/block/natural/BlockFire.java +++ b/common/src/main/java/common/block/natural/BlockFire.java @@ -5,9 +5,7 @@ import java.util.Map; import common.block.Block; import common.block.Material; import common.block.artificial.BlockPortal; -import common.init.Blocks; import common.init.SoundEvent; -import common.item.Item; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/block/natural/BlockMetalOre.java b/common/src/main/java/common/block/natural/BlockMetalOre.java index 5ea107b0..9ac39dde 100644 --- a/common/src/main/java/common/block/natural/BlockMetalOre.java +++ b/common/src/main/java/common/block/natural/BlockMetalOre.java @@ -8,7 +8,6 @@ import common.attributes.UsageSlot; import common.block.SoundType; import common.entity.npc.EntityNPC; import common.init.MetalType; -import common.item.Item; import common.item.ItemStack; public class BlockMetalOre extends BlockOre { diff --git a/common/src/main/java/common/block/natural/BlockSnow.java b/common/src/main/java/common/block/natural/BlockSnow.java index 2b9f6553..652b449e 100755 --- a/common/src/main/java/common/block/natural/BlockSnow.java +++ b/common/src/main/java/common/block/natural/BlockSnow.java @@ -10,7 +10,6 @@ import common.item.Item; import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; -import common.model.GuiPosition; import common.properties.Property; import common.properties.PropertyInteger; import common.rng.Random; diff --git a/common/src/main/java/common/block/tile/BlockSign.java b/common/src/main/java/common/block/tech/BlockSign.java similarity index 99% rename from common/src/main/java/common/block/tile/BlockSign.java rename to common/src/main/java/common/block/tech/BlockSign.java index 5477c6f2..9467ebd8 100755 --- a/common/src/main/java/common/block/tile/BlockSign.java +++ b/common/src/main/java/common/block/tech/BlockSign.java @@ -1,4 +1,4 @@ -package common.block.tile; +package common.block.tech; import common.block.Block; import common.block.ITileEntityProvider; diff --git a/common/src/main/java/common/block/tile/BlockStandingSign.java b/common/src/main/java/common/block/tech/BlockStandingSign.java similarity index 96% rename from common/src/main/java/common/block/tile/BlockStandingSign.java rename to common/src/main/java/common/block/tech/BlockStandingSign.java index 5264a8e1..5d1185d6 100755 --- a/common/src/main/java/common/block/tile/BlockStandingSign.java +++ b/common/src/main/java/common/block/tech/BlockStandingSign.java @@ -1,20 +1,17 @@ -package common.block.tile; +package common.block.tech; import common.block.Block; import common.block.Rotatable; import common.entity.npc.EntityNPC; import common.init.Blocks; -import common.item.CheatTab; import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; -import common.properties.PropertyInteger; import common.tileentity.TileEntity; import common.tileentity.TileEntitySign; import common.util.BlockPos; import common.util.Clientside; -import common.util.ExtMath; import common.util.Facing; import common.world.AWorldServer; import common.world.IWorldAccess; diff --git a/common/src/main/java/common/block/tech/BlockTNT.java b/common/src/main/java/common/block/tech/BlockTNT.java index 636e0fcf..d563073e 100755 --- a/common/src/main/java/common/block/tech/BlockTNT.java +++ b/common/src/main/java/common/block/tech/BlockTNT.java @@ -2,7 +2,6 @@ package common.block.tech; import common.block.Block; import common.block.Material; -import common.color.DyeColor; import common.color.TextColor; import common.entity.Entity; import common.entity.item.EntityTnt; diff --git a/common/src/main/java/common/block/tile/BlockWallSign.java b/common/src/main/java/common/block/tech/BlockWallSign.java similarity index 98% rename from common/src/main/java/common/block/tile/BlockWallSign.java rename to common/src/main/java/common/block/tech/BlockWallSign.java index 6d965ad7..a10b7721 100755 --- a/common/src/main/java/common/block/tile/BlockWallSign.java +++ b/common/src/main/java/common/block/tech/BlockWallSign.java @@ -1,4 +1,4 @@ -package common.block.tile; +package common.block.tech; import common.block.Block; import common.block.Rotatable; diff --git a/common/src/main/java/common/dimension/Semi.java b/common/src/main/java/common/dimension/Semi.java index 442fb316..c24c4afc 100755 --- a/common/src/main/java/common/dimension/Semi.java +++ b/common/src/main/java/common/dimension/Semi.java @@ -1,6 +1,5 @@ package common.dimension; -import common.block.Block; import common.world.State; public final class Semi extends Dimension { diff --git a/common/src/main/java/common/entity/Entity.java b/common/src/main/java/common/entity/Entity.java index faa4e018..d14d36bb 100755 --- a/common/src/main/java/common/entity/Entity.java +++ b/common/src/main/java/common/entity/Entity.java @@ -10,7 +10,6 @@ import common.block.artificial.BlockFenceGate; import common.block.artificial.BlockWall; import common.block.liquid.BlockLiquid; import common.color.TextColor; -import common.dimension.DimType; import common.dimension.Dimension; import common.dimension.Space; import common.enchantment.Enchantment; @@ -1042,7 +1041,7 @@ public abstract class Entity State iblockstate = this.worldObj.getState(blockpos); Block block = iblockstate.getBlock(); - if (block.getRenderType() != -1) + if (block != Blocks.air) { this.worldObj.clientParticle(ParticleType.BLOCK_CRACK, this.posX + ((double)this.rand.floatv() - 0.5D) * (double)this.width, this.getEntityBoundingBox().minY + 0.1D, this.posZ + ((double)this.rand.floatv() - 0.5D) * (double)this.width, BlockRegistry.getId(iblockstate)); } diff --git a/common/src/main/java/common/init/BlockRegistry.java b/common/src/main/java/common/init/BlockRegistry.java index 553f3dbf..79b6318a 100755 --- a/common/src/main/java/common/init/BlockRegistry.java +++ b/common/src/main/java/common/init/BlockRegistry.java @@ -113,6 +113,7 @@ import common.block.tech.BlockPistonHead; import common.block.tech.BlockPressurePlate; import common.block.tech.BlockPressurePlateWeighted; import common.block.tech.BlockRail; +import common.block.tech.BlockStandingSign; import common.block.tech.BlockToggleableLight; import common.block.tech.BlockLitTorch; import common.block.tech.BlockWire; @@ -121,10 +122,9 @@ import common.block.tech.BlockTianReactor; import common.block.tech.BlockTripWire; import common.block.tech.BlockTripWireHook; import common.block.tech.BlockUnlitTorch; +import common.block.tech.BlockWallSign; import common.block.tech.BlockWarpChest; import common.block.tech.BlockWorkbench; -import common.block.tile.BlockStandingSign; -import common.block.tile.BlockWallSign; import common.collect.BiMap; import common.collect.HashBiMap; import common.collect.Lists; diff --git a/common/src/main/java/common/init/Blocks.java b/common/src/main/java/common/init/Blocks.java index 778ae51f..9c1859ca 100755 --- a/common/src/main/java/common/init/Blocks.java +++ b/common/src/main/java/common/init/Blocks.java @@ -13,7 +13,6 @@ import common.block.foliage.*; import common.block.liquid.*; import common.block.natural.*; import common.block.tech.*; -import common.block.tile.*; import common.collect.Lists; import common.collect.Sets; import common.util.Util; diff --git a/common/src/main/java/common/item/consumable/ItemSeedFood.java b/common/src/main/java/common/item/consumable/ItemSeedFood.java index 376a0558..f68431c7 100755 --- a/common/src/main/java/common/item/consumable/ItemSeedFood.java +++ b/common/src/main/java/common/item/consumable/ItemSeedFood.java @@ -3,7 +3,6 @@ package common.item.consumable; import common.block.Block; import common.block.foliage.BlockCrops; import common.entity.npc.EntityNPC; -import common.item.CheatTab; import common.item.ItemStack; import common.util.BlockPos; import common.util.Facing; diff --git a/server/src/main/java/server/world/Converter.java b/server/src/main/java/server/world/Converter.java index 9ded5a22..f488ca01 100644 --- a/server/src/main/java/server/world/Converter.java +++ b/server/src/main/java/server/world/Converter.java @@ -71,14 +71,14 @@ import common.block.tech.BlockPistonHead; import common.block.tech.BlockPressurePlate; import common.block.tech.BlockPressurePlateWeighted; import common.block.tech.BlockRail; +import common.block.tech.BlockStandingSign; import common.block.tech.BlockRail.EnumRailDirection; import common.block.tech.BlockTorch; import common.block.tech.BlockTNT; import common.block.tech.BlockTripWire; import common.block.tech.BlockTripWireHook; +import common.block.tech.BlockWallSign; import common.block.tech.BlockWarpChest; -import common.block.tile.BlockStandingSign; -import common.block.tile.BlockWallSign; import common.collect.Lists; import common.collect.Maps; import common.color.DyeColor; diff --git a/server/src/main/java/server/worldgen/ReplacerMesa.java b/server/src/main/java/server/worldgen/ReplacerMesa.java index 4993ae52..17590d99 100644 --- a/server/src/main/java/server/worldgen/ReplacerMesa.java +++ b/server/src/main/java/server/worldgen/ReplacerMesa.java @@ -2,7 +2,6 @@ package server.worldgen; import java.util.Arrays; -import common.block.Material; import common.block.natural.BlockColoredClay; import common.dimension.Dimension; import common.init.Blocks; diff --git a/server/src/main/java/server/worldgen/structure/MapGenScatteredFeature.java b/server/src/main/java/server/worldgen/structure/MapGenScatteredFeature.java index a9cb4b6d..caaa6252 100755 --- a/server/src/main/java/server/worldgen/structure/MapGenScatteredFeature.java +++ b/server/src/main/java/server/worldgen/structure/MapGenScatteredFeature.java @@ -1,12 +1,8 @@ package server.worldgen.structure; -import java.util.Arrays; -import java.util.List; - import common.rng.Random; import common.util.BlockPos; import server.world.WorldServer; -import server.worldgen.Biome; public class MapGenScatteredFeature extends MapGenStructure { diff --git a/server/src/main/java/server/worldgen/structure/MapGenVillage.java b/server/src/main/java/server/worldgen/structure/MapGenVillage.java index da08c5f6..fb9e77f9 100755 --- a/server/src/main/java/server/worldgen/structure/MapGenVillage.java +++ b/server/src/main/java/server/worldgen/structure/MapGenVillage.java @@ -1,13 +1,9 @@ package server.worldgen.structure; import java.util.List; -import java.util.Set; - -import common.collect.Sets; import common.rng.Random; import common.tags.TagObject; import server.world.WorldServer; -import server.worldgen.Biome; public class MapGenVillage extends MapGenStructure { diff --git a/server/src/main/java/server/worldgen/structure/StructureVillage.java b/server/src/main/java/server/worldgen/structure/StructureVillage.java index 1b51897b..803c8aa6 100755 --- a/server/src/main/java/server/worldgen/structure/StructureVillage.java +++ b/server/src/main/java/server/worldgen/structure/StructureVillage.java @@ -21,8 +21,6 @@ import common.vars.Vars; import common.world.State; import server.vars.SVars; import server.world.WorldServer; -import server.worldgen.Biome; -import server.worldgen.BiomeGenerator; import server.worldgen.LootConstants;