diff --git a/client/src/client/gui/container/GuiContainer.java b/client/src/client/gui/container/GuiContainer.java index 7ae0eb8..c88a15b 100755 --- a/client/src/client/gui/container/GuiContainer.java +++ b/client/src/client/gui/container/GuiContainer.java @@ -42,7 +42,7 @@ public abstract class GuiContainer extends Gui private static final List ITEM_LIST = Lists.newArrayList(); - private static CheatTab selectedTab = CheatTab.tabBlocks; + private static CheatTab selectedTab = CheatTab.BLOCKS; // /** The location of the inventory background texture */ // protected static final String inventoryBackground = "textures/gui/inventory.png"; @@ -1151,7 +1151,7 @@ public abstract class GuiContainer extends Gui protected void drawTab(CheatTab tab) { this.itemRender.zLevel = 100.0F; - ItemStack itemstack = tab.getIconItemStack(); + ItemStack itemstack = tab.getIcon(); GlState.enableDepth(); this.itemRender.renderItemAndEffectIntoGUI(itemstack, this.xSize + 2 + 18 * tab.getHorizontal() + 1, 9 * 18 + 4 + 20 * tab.getVertical() + 1); this.itemRender.zLevel = 0.0F; @@ -1176,7 +1176,7 @@ public abstract class GuiContainer extends Gui selectedTab = tab; this.dragSplittingSlots.clear(); ITEM_LIST.clear(); - tab.displayAllReleventItems(ITEM_LIST); + tab.filter(ITEM_LIST); this.currentScroll = 0.0F; } diff --git a/client/src/client/renderer/BlockRenderer.java b/client/src/client/renderer/BlockRenderer.java index ce1f00d..6a3ff0b 100755 --- a/client/src/client/renderer/BlockRenderer.java +++ b/client/src/client/renderer/BlockRenderer.java @@ -15,12 +15,12 @@ import client.renderer.texture.TextureAtlasSprite; import client.renderer.texture.TextureMap; import client.renderer.tileentity.TileEntityItemStackRenderer; import common.block.Block; +import common.block.Material; import common.block.liquid.BlockLiquid; import common.collect.Maps; import common.init.BlockRegistry; import common.init.FluidRegistry; import common.item.ItemStack; -import common.material.Material; import common.util.BlockPos; import common.util.ExtMath; import common.util.Facing; diff --git a/client/src/client/renderer/EntityRenderer.java b/client/src/client/renderer/EntityRenderer.java index 919707d..6caa036 100755 --- a/client/src/client/renderer/EntityRenderer.java +++ b/client/src/client/renderer/EntityRenderer.java @@ -16,6 +16,7 @@ import client.renderer.texture.TextureMap; import client.world.WorldClient; import common.biome.Biome; import common.block.Block; +import common.block.Material; import common.entity.Entity; import common.entity.npc.EntityNPC; import common.entity.types.EntityAnimal; @@ -23,7 +24,6 @@ import common.entity.types.EntityLiving; import common.init.Blocks; import common.init.Items; import common.init.SoundEvent; -import common.material.Material; import common.model.BlockLayer; import common.model.ParticleType; import common.potion.Potion; @@ -1155,7 +1155,7 @@ public class EntityRenderer { double d3 = this.random.doublev(); double d4 = this.random.doublev(); - if (temp >= 194.0f || block.getMaterial() == Material.lava) + if (temp >= 194.0f || block.getMaterial() == Material.LAVA) { if(temp >= 194.0f) { ++n; diff --git a/client/src/client/renderer/particle/EntityBubbleFX.java b/client/src/client/renderer/particle/EntityBubbleFX.java index 44c03f7..909b2b5 100755 --- a/client/src/client/renderer/particle/EntityBubbleFX.java +++ b/client/src/client/renderer/particle/EntityBubbleFX.java @@ -1,6 +1,6 @@ package client.renderer.particle; -import common.material.Material; +import common.block.Material; import common.util.BlockPos; import common.world.World; @@ -35,7 +35,7 @@ public class EntityBubbleFX extends EntityFX this.motionY *= 0.8500000238418579D; this.motionZ *= 0.8500000238418579D; - if (this.worldObj.getState(new BlockPos(this)).getBlock().getMaterial() != Material.water) + if (this.worldObj.getState(new BlockPos(this)).getBlock().getMaterial() != Material.WATER) { this.setDead(); } diff --git a/client/src/client/renderer/particle/EntityDownfallFX.java b/client/src/client/renderer/particle/EntityDownfallFX.java index 6b5191e..d8d69eb 100755 --- a/client/src/client/renderer/particle/EntityDownfallFX.java +++ b/client/src/client/renderer/particle/EntityDownfallFX.java @@ -1,8 +1,8 @@ package client.renderer.particle; import common.block.Block; +import common.block.Material; import common.block.liquid.BlockLiquid; -import common.material.Material; import common.util.BlockPos; import common.util.ExtMath; import common.world.State; diff --git a/client/src/client/renderer/particle/EntityDropParticleFX.java b/client/src/client/renderer/particle/EntityDropParticleFX.java index 6bed5e8..bce2874 100755 --- a/client/src/client/renderer/particle/EntityDropParticleFX.java +++ b/client/src/client/renderer/particle/EntityDropParticleFX.java @@ -1,7 +1,7 @@ package client.renderer.particle; +import common.block.Material; import common.block.liquid.BlockLiquid; -import common.material.Material; import common.model.ParticleType; import common.util.BlockPos; import common.util.ExtMath; @@ -21,7 +21,7 @@ public class EntityDropParticleFX extends EntityFX super(worldIn, xCoordIn, yCoordIn, zCoordIn, 0.0D, 0.0D, 0.0D); this.motionX = this.motionY = this.motionZ = 0.0D; - if (p_i1203_8_ == Material.water) + if (p_i1203_8_ == Material.WATER) { this.particleRed = 0.0F; this.particleGreen = 0.0F; @@ -45,7 +45,7 @@ public class EntityDropParticleFX extends EntityFX public int getBrightnessForRender(float partialTicks) { - return this.materialType == Material.water ? super.getBrightnessForRender(partialTicks) : 257; + return this.materialType == Material.WATER ? super.getBrightnessForRender(partialTicks) : 257; } /** @@ -53,7 +53,7 @@ public class EntityDropParticleFX extends EntityFX */ public float getBrightness(float partialTicks) { - return this.materialType == Material.water ? super.getBrightness(partialTicks) : 1.0F; + return this.materialType == Material.WATER ? super.getBrightness(partialTicks) : 1.0F; } /** @@ -65,7 +65,7 @@ public class EntityDropParticleFX extends EntityFX this.prevY = this.posY; this.prevZ = this.posZ; - if (this.materialType == Material.water) + if (this.materialType == Material.WATER) { this.particleRed = 0.2F; this.particleGreen = 0.3F; @@ -104,7 +104,7 @@ public class EntityDropParticleFX extends EntityFX if (this.onGround) { - if (this.materialType == Material.water) + if (this.materialType == Material.WATER) { this.setDead(); this.worldObj.spawnParticle(ParticleType.WATER_SPLASH, this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D); @@ -144,7 +144,7 @@ public class EntityDropParticleFX extends EntityFX { public EntityFX getEntityFX(int particleID, World worldIn, double xCoordIn, double yCoordIn, double zCoordIn, double xSpeedIn, double ySpeedIn, double zSpeedIn, int... p_178902_15_) { - return new EntityDropParticleFX(worldIn, xCoordIn, yCoordIn, zCoordIn, Material.lava); + return new EntityDropParticleFX(worldIn, xCoordIn, yCoordIn, zCoordIn, Material.LAVA); } } @@ -152,7 +152,7 @@ public class EntityDropParticleFX extends EntityFX { public EntityFX getEntityFX(int particleID, World worldIn, double xCoordIn, double yCoordIn, double zCoordIn, double xSpeedIn, double ySpeedIn, double zSpeedIn, int... p_178902_15_) { - return new EntityDropParticleFX(worldIn, xCoordIn, yCoordIn, zCoordIn, Material.water); + return new EntityDropParticleFX(worldIn, xCoordIn, yCoordIn, zCoordIn, Material.WATER); } } } diff --git a/client/src/client/renderer/particle/EntitySuspendFX.java b/client/src/client/renderer/particle/EntitySuspendFX.java index 4047b03..2e9893f 100755 --- a/client/src/client/renderer/particle/EntitySuspendFX.java +++ b/client/src/client/renderer/particle/EntitySuspendFX.java @@ -1,6 +1,6 @@ package client.renderer.particle; -import common.material.Material; +import common.block.Material; import common.util.BlockPos; import common.world.World; @@ -31,7 +31,7 @@ public class EntitySuspendFX extends EntityFX this.prevZ = this.posZ; this.moveEntity(this.motionX, this.motionY, this.motionZ); - if (this.worldObj.getState(new BlockPos(this)).getBlock().getMaterial() != Material.water) + if (this.worldObj.getState(new BlockPos(this)).getBlock().getMaterial() != Material.WATER) { this.setDead(); } diff --git a/common/src/common/ai/EntityAIDoorInteract.java b/common/src/common/ai/EntityAIDoorInteract.java index dc1d8e5..e98a1f4 100755 --- a/common/src/common/ai/EntityAIDoorInteract.java +++ b/common/src/common/ai/EntityAIDoorInteract.java @@ -1,9 +1,9 @@ package common.ai; import common.block.Block; +import common.block.Material; import common.block.artificial.BlockDoor; import common.entity.types.EntityLiving; -import common.material.Material; import common.pathfinding.PathEntity; import common.pathfinding.PathNavigateGround; import common.pathfinding.PathPoint; @@ -113,6 +113,6 @@ public abstract class EntityAIDoorInteract extends EntityAIBase private BlockDoor getBlockDoor(BlockPos pos) { Block block = this.theEntity.worldObj.getState(pos).getBlock(); - return block instanceof BlockDoor && block.getMaterial() == Material.wood ? (BlockDoor)block : null; + return block instanceof BlockDoor && block.getMaterial() == Material.WOOD ? (BlockDoor)block : null; } } diff --git a/common/src/common/block/Block.java b/common/src/common/block/Block.java index 94fc8bc..d25e4d7 100755 --- a/common/src/common/block/Block.java +++ b/common/src/common/block/Block.java @@ -29,7 +29,6 @@ import common.init.ItemRegistry; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -265,9 +264,9 @@ public class Block { } public Block(Material material) { - this.miningLevel = (material == Material.rock || material == Material.iron || material == Material.anvil) ? 0 : -1; - this.axeHarvest = material == Material.wood || material == Material.plants || material == Material.vine || material == Material.gourd; - this.shearsEfficiency = (material == Material.leaves || material == Material.web) ? 3 : -1; + this.miningLevel = (material == Material.SOLID || material == Material.HEAVY) ? 0 : -1; + this.axeHarvest = material == Material.WOOD || material == Material.PLANT || material == Material.BUSH || material == Material.SOFT; + this.shearsEfficiency = (material == Material.LEAVES || material == Material.FLUFF) ? 3 : -1; this.sound = SoundType.STONE; this.slipperiness = 0.6F; this.material = material; @@ -495,10 +494,6 @@ public class Block { : !worldIn.getState(pos).getBlock().isOpaqueCube()))))); } - public boolean isBlockSolid(IBlockAccess worldIn, BlockPos pos, Facing side) { - return worldIn.getState(pos).getBlock().getMaterial().isSolid(); - } - public BoundingBox getSelectedBoundingBox(World worldIn, BlockPos pos) { return new BoundingBox((double)pos.getX() + this.minX, (double)pos.getY() + this.minY, (double)pos.getZ() + this.minZ, (double)pos.getX() + this.maxX, (double)pos.getY() + this.maxY, (double)pos.getZ() + this.maxZ); @@ -760,7 +755,7 @@ public class Block { } public boolean canPlaceBlockAt(World worldIn, BlockPos pos) { - return worldIn.getState(pos).getBlock().material.isReplaceable(); + return worldIn.getState(pos).getBlock().getMaterial().isReplaceable(); } public boolean onBlockActivated(World worldIn, BlockPos pos, State state, EntityNPC playerIn, Facing side, float hitX, float hitY, float hitZ) { @@ -887,7 +882,7 @@ public class Block { } public int getMobilityFlag() { - return this.material.getMaterialMobility(); + return this.material.getMobility(); } public float getAmbientOcclusionLightValue() { diff --git a/common/src/common/block/BlockAir.java b/common/src/common/block/BlockAir.java index a5177a8..588e87e 100755 --- a/common/src/common/block/BlockAir.java +++ b/common/src/common/block/BlockAir.java @@ -1,6 +1,5 @@ package common.block; -import common.material.MaterialTransparent; import common.util.BlockPos; import common.util.BoundingBox; import common.world.State; @@ -8,7 +7,7 @@ import common.world.World; public final class BlockAir extends Block { public BlockAir() { - super(new MaterialTransparent()); + super(Material.NONE); } public int getRenderType() { diff --git a/common/src/common/block/BlockColored.java b/common/src/common/block/BlockColored.java index ae9af9d..6ff3755 100755 --- a/common/src/common/block/BlockColored.java +++ b/common/src/common/block/BlockColored.java @@ -6,7 +6,6 @@ import common.color.DyeColor; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.properties.IProperty; @@ -19,7 +18,7 @@ public class BlockColored extends Block { public BlockColored(Material material) { super(material); this.setDefaultState(this.getBaseState().withProperty(COLOR, DyeColor.WHITE)); - this.setTab(CheatTab.tabBlocks); + this.setTab(CheatTab.BLOCKS); } public int damageDropped(State state) { diff --git a/common/src/common/block/BlockContainer.java b/common/src/common/block/BlockContainer.java index 8c1a06f..561a8a8 100755 --- a/common/src/common/block/BlockContainer.java +++ b/common/src/common/block/BlockContainer.java @@ -1,6 +1,5 @@ package common.block; -import common.material.Material; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.Facing; @@ -15,7 +14,7 @@ public abstract class BlockContainer extends Block implements ITileEntityProvide } protected boolean isInvalidNeighbor(World world, BlockPos pos, Facing face) { - return world.getState(pos.offset(face)).getBlock().getMaterial() == Material.cactus; + return world.getState(pos.offset(face)).getBlock().getMaterial() == Material.BLOCKING; } protected boolean hasInvalidNeighbor(World world, BlockPos pos) { diff --git a/common/src/common/block/BlockDirectional.java b/common/src/common/block/BlockDirectional.java index bd75e9c..0cb7a7a 100755 --- a/common/src/common/block/BlockDirectional.java +++ b/common/src/common/block/BlockDirectional.java @@ -1,6 +1,5 @@ package common.block; -import common.material.Material; import common.properties.PropertyDirection; import common.util.Facing; diff --git a/common/src/common/block/BlockFalling.java b/common/src/common/block/BlockFalling.java index 41ebf28..2643515 100755 --- a/common/src/common/block/BlockFalling.java +++ b/common/src/common/block/BlockFalling.java @@ -4,7 +4,6 @@ import common.block.natural.BlockFire; import common.entity.item.EntityFalling; import common.init.Blocks; import common.init.Config; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.world.State; @@ -16,7 +15,7 @@ public class BlockFalling extends Block { public static boolean canFallInto(World world, BlockPos pos) { Block block = world.getState(pos).getBlock(); - return block instanceof BlockFire || block == Blocks.air || block.material.isLiquid(); + return block instanceof BlockFire || block == Blocks.air || block.getMaterial().isLiquid(); } public BlockFalling(Material material) { diff --git a/common/src/common/block/BlockRotatedPillar.java b/common/src/common/block/BlockRotatedPillar.java index 3c72302..5071e8a 100755 --- a/common/src/common/block/BlockRotatedPillar.java +++ b/common/src/common/block/BlockRotatedPillar.java @@ -1,6 +1,5 @@ package common.block; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; diff --git a/common/src/common/block/BlockTranslucent.java b/common/src/common/block/BlockTranslucent.java index d8466d4..e74012f 100755 --- a/common/src/common/block/BlockTranslucent.java +++ b/common/src/common/block/BlockTranslucent.java @@ -1,6 +1,5 @@ package common.block; -import common.material.Material; import common.model.BlockLayer; import common.util.BlockPos; import common.util.Facing; diff --git a/common/src/common/block/BlockTreasure.java b/common/src/common/block/BlockTreasure.java index d855f06..b5548e0 100755 --- a/common/src/common/block/BlockTreasure.java +++ b/common/src/common/block/BlockTreasure.java @@ -1,7 +1,5 @@ package common.block; -import common.material.Material; - public class BlockTreasure extends Block { public BlockTreasure(Material material) { super(material); diff --git a/common/src/common/block/Material.java b/common/src/common/block/Material.java new file mode 100755 index 0000000..5abbdb0 --- /dev/null +++ b/common/src/common/block/Material.java @@ -0,0 +1,192 @@ +package common.block; + +public enum Material { + NONE {{ + this.setNonSolid().setReplaceable(); + }}, + LOOSE {{ + ; + }}, + WOOD {{ + this.setBurning(); + }}, + SOLID {{ + this.setRequiresTool(); + }}, + DIGGABLE {{ // can harvest with shovel + this.setRequiresTool(); + }}, + TRANSLUCENT {{ + this.setTranslucent(); + }}, + BURNABLE {{ + this.setBurning(); + }}, + SOFT {{ // can break faster with sword, can't connect to fences+walls + this.setNoPushMobility(); + }}, + PISTON {{ + this.setImmovableMobility(); + }}, + HEAVY {{ + this.setRequiresTool().setImmovableMobility(); + }}, + PLANT {{ // can break faster with sword + this.setNonSolid().setNoPushMobility(); + }}, + SMALL {{ // can be placed more easily + this.setNonSolid().setNoPushMobility(); + }}, + FLEECE {{ + this.setNonSolid().setBurning(); + }}, + EXPLOSIVE {{ + this.setBurning().setTranslucent(); + }}, + BLOCKING {{ // can't be placed next to signs and banners + this.setTranslucent().setNoPushMobility(); + }}, + PORTAL {{ // not floodable by liquids + this.setNonSolid().setImmovableMobility(); + }}, + WATER {{ + this.setLiquid(false).setReplaceable().setNoPushMobility(); + }}, + COLD {{ + this.setLiquid(false).setReplaceable().setNoPushMobility(); + }}, + LAVA {{ + this.setLiquid(true).setReplaceable().setNoPushMobility(); + }}, + HOT {{ + this.setLiquid(true).setReplaceable().setNoPushMobility(); + }}, + LEAVES {{ // can break faster with sword, precipitation block, special treatment in some worldgen + this.setBurning().setTranslucent().setNoPushMobility(); + }}, + BUSH {{ // can break faster with sword, can be replaced by small tree leaves + this.setNonSolid().setBurning().setNoPushMobility().setReplaceable(); + }}, + FIRE {{ + this.setNonSolid().setReplaceable().setNoPushMobility(); + }}, + POWDER {{ // can harvest with shovel, precipitation block + this.setNonSolid().setReplaceable().setRequiresTool().setNoPushMobility(); + }}, + FLUFF {{ // can harvest with shears + this.setPassable().setRequiresTool().setNoPushMobility(); + }}; + + private boolean solid = true; + private boolean lightOpaque = true; + private boolean unpassable = true; + private boolean opaque = true; + private boolean liquid; + private boolean cold; + private boolean hot; + private boolean burnable; + private boolean replaceable; + private boolean requiresTool; + // 0 - normal; 1 - can't push other blocks; 2 - can't be pushed + private int mobility; + + protected Material setTranslucent() { + this.opaque = false; + return this; + } + + protected Material setNonSolid() { + this.solid = false; + this.lightOpaque = false; + this.unpassable = false; + this.opaque = false; + return this; + } + + protected Material setPassable() { + this.unpassable = false; + this.opaque = false; + return this; + } + + protected Material setLiquid(boolean hot) { + this.solid = false; + this.unpassable = false; + this.opaque = false; + this.liquid = true; + if(hot) + this.hot = true; + else + this.cold = true; + return this; + } + + protected Material setRequiresTool() { + this.requiresTool = true; + return this; + } + + protected Material setBurning() { + this.burnable = true; + return this; + } + + protected Material setReplaceable() { + this.replaceable = true; + return this; + } + + protected Material setNoPushMobility() { + this.mobility = 1; + return this; + } + + protected Material setImmovableMobility() { + this.mobility = 2; + return this; + } + + public boolean isLiquid() { + return this.liquid; + } + + public boolean isColdLiquid() { + return this.cold; + } + + public boolean isHotLiquid() { + return this.hot; + } + + public boolean isSolid() { + return this.solid; + } + + public boolean blocksLight() { + return this.lightOpaque; + } + + public boolean blocksMovement() { + return this.unpassable; + } + + public boolean getCanBurn() { + return this.burnable; + } + + public boolean isReplaceable() { + return this.replaceable; + } + + public boolean isOpaque() { + return this.opaque; + } + + public boolean isToolRequired() { + return this.requiresTool; + } + + public int getMobility() { + return this.mobility; + } +} diff --git a/common/src/common/block/artificial/BlockBed.java b/common/src/common/block/artificial/BlockBed.java index 057a671..371619d 100755 --- a/common/src/common/block/artificial/BlockBed.java +++ b/common/src/common/block/artificial/BlockBed.java @@ -2,12 +2,12 @@ package common.block.artificial; import common.block.Block; import common.block.BlockDirectional; +import common.block.Material; import common.color.DyeColor; import common.color.TextColor; import common.entity.npc.EntityNPC; import common.init.ItemRegistry; import common.item.Item; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -50,7 +50,7 @@ public class BlockBed extends BlockDirectional { private final DyeColor color; public BlockBed(DyeColor color) { - super(Material.cloth); + super(Material.BURNABLE); this.color = color; this.setDefaultState(this.getBaseState().withProperty(PART, BlockBed.EnumPartType.FOOT)); this.setBedBounds(); diff --git a/common/src/common/block/artificial/BlockBookshelf.java b/common/src/common/block/artificial/BlockBookshelf.java index 1a05805..756f574 100755 --- a/common/src/common/block/artificial/BlockBookshelf.java +++ b/common/src/common/block/artificial/BlockBookshelf.java @@ -1,10 +1,10 @@ package common.block.artificial; import common.block.Block; +import common.block.Material; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.rng.Random; @@ -14,8 +14,8 @@ public class BlockBookshelf extends Block { public BlockBookshelf() { - super(Material.wood); - this.setTab(CheatTab.tabDeco); + super(Material.WOOD); + this.setTab(CheatTab.DECORATION); } /** diff --git a/common/src/common/block/artificial/BlockCake.java b/common/src/common/block/artificial/BlockCake.java index 7416723..425c641 100755 --- a/common/src/common/block/artificial/BlockCake.java +++ b/common/src/common/block/artificial/BlockCake.java @@ -1,10 +1,10 @@ package common.block.artificial; import common.block.Block; +import common.block.Material; import common.entity.npc.EntityNPC; import common.init.Items; import common.item.Item; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -90,7 +90,7 @@ public class BlockCake extends Block public BlockCake() { - super(Material.cake); + super(Material.SOFT); this.setDefaultState(this.getBaseState().withProperty(BITES, Integer.valueOf(0))); // this.setTickRandomly(true); } diff --git a/common/src/common/block/artificial/BlockCarpet.java b/common/src/common/block/artificial/BlockCarpet.java index b65b714..6deb687 100755 --- a/common/src/common/block/artificial/BlockCarpet.java +++ b/common/src/common/block/artificial/BlockCarpet.java @@ -3,11 +3,11 @@ package common.block.artificial; import java.util.List; import common.block.Block; +import common.block.Material; import common.color.DyeColor; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.Transforms; @@ -25,11 +25,11 @@ public class BlockCarpet extends Block public BlockCarpet() { - super(Material.carpet); + super(Material.FLEECE); this.setDefaultState(this.getBaseState().withProperty(COLOR, DyeColor.WHITE)); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F); // this.setTickRandomly(true); - this.setTab(CheatTab.tabDeco); + this.setTab(CheatTab.DECORATION); this.setBlockBoundsFromMeta(0); } diff --git a/common/src/common/block/artificial/BlockCompressedPowered.java b/common/src/common/block/artificial/BlockCompressedPowered.java index 94f5d1d..bd2af8d 100755 --- a/common/src/common/block/artificial/BlockCompressedPowered.java +++ b/common/src/common/block/artificial/BlockCompressedPowered.java @@ -1,7 +1,7 @@ package common.block.artificial; import common.block.Block; -import common.material.Material; +import common.block.Material; import common.util.BlockPos; import common.util.Facing; import common.world.IWorldAccess; diff --git a/common/src/common/block/artificial/BlockDoor.java b/common/src/common/block/artificial/BlockDoor.java index a57ff29..0747230 100755 --- a/common/src/common/block/artificial/BlockDoor.java +++ b/common/src/common/block/artificial/BlockDoor.java @@ -3,12 +3,12 @@ package common.block.artificial; import java.util.List; import common.block.Block; +import common.block.Material; import common.collect.Lists; import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.Items; import common.item.Item; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -163,7 +163,7 @@ public class BlockDoor extends Block public boolean onBlockActivated(World worldIn, BlockPos pos, State state, EntityNPC playerIn, Facing side, float hitX, float hitY, float hitZ) { - if (this.material == Material.iron) + if (this.material == Material.SOLID) { return true; } diff --git a/common/src/common/block/artificial/BlockDragonEgg.java b/common/src/common/block/artificial/BlockDragonEgg.java index 505977d..4fb515b 100755 --- a/common/src/common/block/artificial/BlockDragonEgg.java +++ b/common/src/common/block/artificial/BlockDragonEgg.java @@ -2,11 +2,11 @@ package common.block.artificial; import common.block.Block; import common.block.BlockFalling; +import common.block.Material; import common.entity.item.EntityFalling; import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.Config; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ParticleType; @@ -81,7 +81,7 @@ public class BlockDragonEgg extends Block public BlockDragonEgg() { - super(Material.dragonEgg); + super(Material.SOFT); this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 1.0F, 0.9375F); } diff --git a/common/src/common/block/artificial/BlockFence.java b/common/src/common/block/artificial/BlockFence.java index f13437d..dfd3cad 100755 --- a/common/src/common/block/artificial/BlockFence.java +++ b/common/src/common/block/artificial/BlockFence.java @@ -3,12 +3,12 @@ package common.block.artificial; import java.util.List; import common.block.Block; +import common.block.Material; import common.collect.Lists; import common.entity.Entity; import common.entity.npc.EntityNPC; import common.item.CheatTab; import common.item.ItemLead; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; @@ -44,7 +44,7 @@ public class BlockFence extends Block { super(p_i46395_1_); this.setDefaultState(this.getBaseState().withProperty(NORTH, Boolean.valueOf(false)).withProperty(EAST, Boolean.valueOf(false)).withProperty(SOUTH, Boolean.valueOf(false)).withProperty(WEST, Boolean.valueOf(false))); - this.setTab(p_i46395_1_ == Material.wood ? CheatTab.tabWood : CheatTab.tabBlocks); + this.setTab(p_i46395_1_ == Material.WOOD ? CheatTab.WOOD : CheatTab.BLOCKS); this.texture = texture; FENCES.add(this); } @@ -166,7 +166,7 @@ public class BlockFence extends Block public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { Block block = worldIn.getState(pos).getBlock(); - return ((!(block instanceof BlockFence) || block.getMaterial() != this.material) && !(block instanceof BlockFenceGate) ? (block.getMaterial().isOpaque() && block.isFullCube() ? block.getMaterial() != Material.gourd : false) : true); + return ((!(block instanceof BlockFence) || block.getMaterial() != this.material) && !(block instanceof BlockFenceGate) ? (block.getMaterial().isOpaque() && block.isFullCube() ? block.getMaterial() != Material.SOFT : false) : true); } public boolean shouldSideBeRendered(IWorldAccess worldIn, BlockPos pos, Facing side) diff --git a/common/src/common/block/artificial/BlockFenceGate.java b/common/src/common/block/artificial/BlockFenceGate.java index 41305d5..85314c9 100755 --- a/common/src/common/block/artificial/BlockFenceGate.java +++ b/common/src/common/block/artificial/BlockFenceGate.java @@ -2,12 +2,12 @@ package common.block.artificial; import common.block.Block; import common.block.BlockDirectional; +import common.block.Material; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.Blocks; import common.init.WoodType; import common.item.CheatTab; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; @@ -32,9 +32,9 @@ public class BlockFenceGate extends BlockDirectional public BlockFenceGate(WoodType p_i46394_1_) { - super(Material.wood); // , p_i46394_1_.getMapColor()); + super(Material.WOOD); // , p_i46394_1_.getMapColor()); this.setDefaultState(this.getBaseState().withProperty(OPEN, Boolean.valueOf(false)).withProperty(POWERED, Boolean.valueOf(false)).withProperty(IN_WALL, Boolean.valueOf(false))); - this.setTab(CheatTab.tabWood); + this.setTab(CheatTab.WOOD); this.texture = p_i46394_1_.getName() + "_planks"; } diff --git a/common/src/common/block/artificial/BlockFloorPortal.java b/common/src/common/block/artificial/BlockFloorPortal.java index 7ae4afc..c9b3c33 100755 --- a/common/src/common/block/artificial/BlockFloorPortal.java +++ b/common/src/common/block/artificial/BlockFloorPortal.java @@ -5,10 +5,10 @@ import java.util.Map; import java.util.Set; import common.block.Block; +import common.block.Material; import common.collect.Sets; import common.entity.Entity; import common.item.Item; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ParticleType; diff --git a/common/src/common/block/artificial/BlockFlowerPot.java b/common/src/common/block/artificial/BlockFlowerPot.java index 85884a6..6f68e0c 100755 --- a/common/src/common/block/artificial/BlockFlowerPot.java +++ b/common/src/common/block/artificial/BlockFlowerPot.java @@ -1,6 +1,7 @@ package common.block.artificial; import common.block.Block; +import common.block.Material; import common.block.foliage.BlockFlower; import common.entity.npc.EntityNPC; import common.init.Blocks; @@ -9,7 +10,6 @@ import common.init.Items; import common.item.Item; import common.item.ItemBlock; import common.item.ItemStack; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -103,7 +103,7 @@ public class BlockFlowerPot extends Block // Container public BlockFlowerPot() { - super(Material.circuits); + super(Material.SMALL); this.setDefaultState(this.getBaseState().withProperty(CONTENTS, 0)); // .withProperty(LEGACY_DATA, Integer.valueOf(0))); this.setBlockBoundsForItemRender(); } diff --git a/common/src/common/block/artificial/BlockGlass.java b/common/src/common/block/artificial/BlockGlass.java index fb3fe69..feb69da 100755 --- a/common/src/common/block/artificial/BlockGlass.java +++ b/common/src/common/block/artificial/BlockGlass.java @@ -1,8 +1,8 @@ package common.block.artificial; import common.block.Block; +import common.block.Material; import common.item.CheatTab; -import common.material.Material; import common.model.BlockLayer; import common.rng.Random; import common.util.BlockPos; @@ -12,8 +12,8 @@ import common.world.State; public class BlockGlass extends Block { public BlockGlass() { - super(Material.glass); - this.setTab(CheatTab.tabBlocks); + super(Material.TRANSLUCENT); + this.setTab(CheatTab.BLOCKS); } public int quantityDropped(Random rand) { diff --git a/common/src/common/block/artificial/BlockHay.java b/common/src/common/block/artificial/BlockHay.java index e57d006..eefc04f 100755 --- a/common/src/common/block/artificial/BlockHay.java +++ b/common/src/common/block/artificial/BlockHay.java @@ -1,11 +1,11 @@ package common.block.artificial; import common.block.BlockRotatedPillar; +import common.block.Material; import common.entity.types.EntityLiving; import common.init.ItemRegistry; import common.item.CheatTab; import common.item.ItemStack; -import common.material.Material; import common.properties.IProperty; import common.util.BlockPos; import common.util.Facing; @@ -16,9 +16,9 @@ public class BlockHay extends BlockRotatedPillar { public BlockHay() { - super(Material.grass); + super(Material.LOOSE); this.setDefaultState(this.getBaseState().withProperty(AXIS, Facing.Axis.Y)); - this.setTab(CheatTab.tabBlocks); + this.setTab(CheatTab.BLOCKS); } /** diff --git a/common/src/common/block/artificial/BlockLadder.java b/common/src/common/block/artificial/BlockLadder.java index b858fa4..1400468 100755 --- a/common/src/common/block/artificial/BlockLadder.java +++ b/common/src/common/block/artificial/BlockLadder.java @@ -2,9 +2,9 @@ package common.block.artificial; import common.block.Block; import common.block.BlockDirectional; +import common.block.Material; import common.entity.types.EntityLiving; import common.item.CheatTab; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -24,9 +24,9 @@ public class BlockLadder extends Block public BlockLadder() { - super(Material.circuits); + super(Material.SMALL); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH)); - this.setTab(CheatTab.tabWood); + this.setTab(CheatTab.WOOD); } public BoundingBox getCollisionBoundingBox(World worldIn, BlockPos pos, State state) diff --git a/common/src/common/block/artificial/BlockPane.java b/common/src/common/block/artificial/BlockPane.java index 7637b62..39e3da2 100755 --- a/common/src/common/block/artificial/BlockPane.java +++ b/common/src/common/block/artificial/BlockPane.java @@ -3,11 +3,11 @@ package common.block.artificial; import java.util.List; import common.block.Block; +import common.block.Material; import common.entity.Entity; import common.init.Blocks; import common.item.CheatTab; import common.item.Item; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -35,7 +35,7 @@ public class BlockPane extends Block super(materialIn); this.setDefaultState(this.getBaseState().withProperty(NORTH, Boolean.valueOf(false)).withProperty(EAST, Boolean.valueOf(false)).withProperty(SOUTH, Boolean.valueOf(false)).withProperty(WEST, Boolean.valueOf(false))); this.canDrop = canDrop; - this.setTab(CheatTab.tabBlocks); + this.setTab(CheatTab.BLOCKS); } /** @@ -207,7 +207,7 @@ public class BlockPane extends Block } public boolean isMagnetic() { - return this.material == Material.iron; + return this.material == Material.SOLID; } protected String getPaneBase(State state) { diff --git a/common/src/common/block/artificial/BlockPortal.java b/common/src/common/block/artificial/BlockPortal.java index f072880..a140f4b 100755 --- a/common/src/common/block/artificial/BlockPortal.java +++ b/common/src/common/block/artificial/BlockPortal.java @@ -3,11 +3,11 @@ package common.block.artificial; import java.util.Map; import common.block.Block; +import common.block.Material; import common.block.natural.BlockFire; import common.entity.Entity; import common.init.Blocks; import common.item.Item; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -34,7 +34,7 @@ public class BlockPortal extends Block public BlockPortal() { - super(Material.portal); + super(Material.PORTAL); this.setDefaultState(this.getBaseState().withProperty(AXIS, Facing.Axis.X).withProperty(DIM, 0)); // this.setTickRandomly(); } diff --git a/common/src/common/block/artificial/BlockPortalFrame.java b/common/src/common/block/artificial/BlockPortalFrame.java index 7be3dc0..0c5a300 100755 --- a/common/src/common/block/artificial/BlockPortalFrame.java +++ b/common/src/common/block/artificial/BlockPortalFrame.java @@ -3,6 +3,7 @@ package common.block.artificial; import java.util.List; import common.block.Block; +import common.block.Material; import common.entity.Entity; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; @@ -11,7 +12,6 @@ import common.init.ItemRegistry; import common.init.Items; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; @@ -33,7 +33,7 @@ public class BlockPortalFrame extends Block public BlockPortalFrame() { - super(Material.rock); + super(Material.SOLID); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH).withProperty(ORB, Boolean.valueOf(false))); } diff --git a/common/src/common/block/artificial/BlockQuartz.java b/common/src/common/block/artificial/BlockQuartz.java index 8aa5018..5e78fc2 100755 --- a/common/src/common/block/artificial/BlockQuartz.java +++ b/common/src/common/block/artificial/BlockQuartz.java @@ -3,12 +3,12 @@ package common.block.artificial; import java.util.List; import common.block.Block; +import common.block.Material; import common.entity.types.EntityLiving; import common.init.ItemRegistry; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; @@ -28,9 +28,9 @@ public class BlockQuartz extends Block public BlockQuartz(String prefix) { - super(Material.rock); + super(Material.SOLID); this.setDefaultState(this.getBaseState().withProperty(VARIANT, BlockQuartz.EnumType.DEFAULT)); - this.setTab(CheatTab.tabBlocks); + this.setTab(CheatTab.BLOCKS); this.prefix = prefix; } diff --git a/common/src/common/block/artificial/BlockSlab.java b/common/src/common/block/artificial/BlockSlab.java index 30c0ca2..223745c 100755 --- a/common/src/common/block/artificial/BlockSlab.java +++ b/common/src/common/block/artificial/BlockSlab.java @@ -3,13 +3,13 @@ package common.block.artificial; import java.util.List; import common.block.Block; +import common.block.Material; import common.collect.Lists; import common.entity.Entity; import common.entity.types.EntityLiving; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.properties.IProperty; @@ -44,7 +44,7 @@ public class BlockSlab extends Block super(materialIn); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.DOWN).withProperty(DOUBLE, false) .withProperty(SEAMLESS, false)); - this.setTab(materialIn == Material.wood ? CheatTab.tabWood : CheatTab.tabBlocks); + this.setTab(materialIn == Material.WOOD ? CheatTab.WOOD : CheatTab.BLOCKS); // this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 0.5F); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); diff --git a/common/src/common/block/artificial/BlockStainedGlassPane.java b/common/src/common/block/artificial/BlockStainedGlassPane.java index 985dedd..9c29581 100755 --- a/common/src/common/block/artificial/BlockStainedGlassPane.java +++ b/common/src/common/block/artificial/BlockStainedGlassPane.java @@ -2,11 +2,11 @@ package common.block.artificial; import java.util.List; +import common.block.Material; import common.color.DyeColor; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.BlockLayer; import common.properties.IProperty; import common.properties.PropertyEnum; @@ -18,9 +18,9 @@ public class BlockStainedGlassPane extends BlockPane public BlockStainedGlassPane() { - super(Material.glass, false); + super(Material.TRANSLUCENT, false); this.setDefaultState(this.getBaseState().withProperty(NORTH, Boolean.valueOf(false)).withProperty(EAST, Boolean.valueOf(false)).withProperty(SOUTH, Boolean.valueOf(false)).withProperty(WEST, Boolean.valueOf(false)).withProperty(COLOR, DyeColor.WHITE)); - this.setTab(CheatTab.tabBlocks); + this.setTab(CheatTab.BLOCKS); } /** diff --git a/common/src/common/block/artificial/BlockStairs.java b/common/src/common/block/artificial/BlockStairs.java index 6631556..7eee78a 100755 --- a/common/src/common/block/artificial/BlockStairs.java +++ b/common/src/common/block/artificial/BlockStairs.java @@ -4,13 +4,13 @@ import java.util.Arrays; import java.util.List; import common.block.Block; +import common.block.Material; import common.entity.Entity; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.BlockRegistry; import common.init.Blocks; import common.item.CheatTab; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -61,7 +61,7 @@ public class BlockStairs extends Block this.setResistance(this.modelBlock.getRawResistance() / 3.0F); this.setStepSound(this.modelBlock.sound); this.setLightOpacity(255); - this.setTab(modelState.getBlock().getMaterial() == Material.wood ? CheatTab.tabWood : CheatTab.tabBlocks); + this.setTab(modelState.getBlock().getMaterial() == Material.WOOD ? CheatTab.WOOD : CheatTab.BLOCKS); this.downTex = down; this.upTex = up; } diff --git a/common/src/common/block/artificial/BlockStoneBrick.java b/common/src/common/block/artificial/BlockStoneBrick.java index cf3b2e5..f0a7508 100755 --- a/common/src/common/block/artificial/BlockStoneBrick.java +++ b/common/src/common/block/artificial/BlockStoneBrick.java @@ -3,10 +3,10 @@ package common.block.artificial; import java.util.List; import common.block.Block; +import common.block.Material; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.properties.IProperty; @@ -24,9 +24,9 @@ public class BlockStoneBrick extends Block public BlockStoneBrick() { - super(Material.rock); + super(Material.SOLID); this.setDefaultState(this.getBaseState().withProperty(VARIANT, BlockStoneBrick.EnumType.DEFAULT)); - this.setTab(CheatTab.tabBlocks); + this.setTab(CheatTab.BLOCKS); } /** diff --git a/common/src/common/block/artificial/BlockTrapDoor.java b/common/src/common/block/artificial/BlockTrapDoor.java index ce757a3..3f970d6 100755 --- a/common/src/common/block/artificial/BlockTrapDoor.java +++ b/common/src/common/block/artificial/BlockTrapDoor.java @@ -1,11 +1,11 @@ package common.block.artificial; import common.block.Block; +import common.block.Material; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.Blocks; import common.item.CheatTab; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -39,7 +39,7 @@ public class BlockTrapDoor extends Block float f = 0.5F; float f1 = 1.0F; this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - this.setTab(materialIn == Material.wood ? CheatTab.tabWood : CheatTab.tabTech); + this.setTab(materialIn == Material.WOOD ? CheatTab.WOOD : CheatTab.TECHNOLOGY); } /** @@ -131,7 +131,7 @@ public class BlockTrapDoor extends Block public boolean onBlockActivated(World worldIn, BlockPos pos, State state, EntityNPC playerIn, Facing side, float hitX, float hitY, float hitZ) { - if (this.material == Material.iron) + if (this.material == Material.SOLID) { return true; } @@ -293,7 +293,7 @@ public class BlockTrapDoor extends Block } public boolean isMagnetic() { - return this.material == Material.iron; + return this.material == Material.SOLID; } public Transforms getTransform() { diff --git a/common/src/common/block/artificial/BlockWall.java b/common/src/common/block/artificial/BlockWall.java index ad017d8..703eed4 100755 --- a/common/src/common/block/artificial/BlockWall.java +++ b/common/src/common/block/artificial/BlockWall.java @@ -3,11 +3,11 @@ package common.block.artificial; import java.util.List; import common.block.Block; +import common.block.Material; import common.init.Blocks; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; @@ -39,7 +39,7 @@ public class BlockWall extends Block this.setHardness(modelBlock.getRawHardness()); this.setResistance(modelBlock.getRawResistance() / 3.0F); this.setStepSound(modelBlock.sound); - this.setTab(CheatTab.tabBlocks); + this.setTab(CheatTab.BLOCKS); } // /** @@ -126,7 +126,7 @@ public class BlockWall extends Block public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos) { Block block = worldIn.getState(pos).getBlock(); - return (block != this && !(block instanceof BlockFenceGate) ? (block.getMaterial().isOpaque() && block.isFullCube() ? block.getMaterial() != Material.gourd : false) : true); + return (block != this && !(block instanceof BlockFenceGate) ? (block.getMaterial().isOpaque() && block.isFullCube() ? block.getMaterial() != Material.SOFT : false) : true); } /** diff --git a/common/src/common/block/foliage/BlockBlackenedSoil.java b/common/src/common/block/foliage/BlockBlackenedSoil.java index 03d9df4..2690e13 100644 --- a/common/src/common/block/foliage/BlockBlackenedSoil.java +++ b/common/src/common/block/foliage/BlockBlackenedSoil.java @@ -2,11 +2,11 @@ package common.block.foliage; import common.biome.Biome; import common.block.Block; +import common.block.Material; import common.init.Blocks; import common.init.Config; import common.item.CheatTab; import common.item.Item; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.rng.Random; @@ -18,9 +18,9 @@ public class BlockBlackenedSoil extends Block { public BlockBlackenedSoil() { - super(Material.grass); + super(Material.LOOSE); this.setTickRandomly(); - this.setTab(CheatTab.tabNature); + this.setTab(CheatTab.NATURE); } public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) diff --git a/common/src/common/block/foliage/BlockBush.java b/common/src/common/block/foliage/BlockBush.java index 361bfeb..acc0c1b 100755 --- a/common/src/common/block/foliage/BlockBush.java +++ b/common/src/common/block/foliage/BlockBush.java @@ -1,9 +1,9 @@ package common.block.foliage; import common.block.Block; +import common.block.Material; import common.init.Blocks; import common.item.CheatTab; -import common.material.Material; import common.model.BlockLayer; import common.rng.Random; import common.util.BlockPos; @@ -16,7 +16,7 @@ public class BlockBush extends Block { public BlockBush() { - this(Material.plants); + this(Material.PLANT); } public BlockBush(Material p_i46452_1_) @@ -25,7 +25,7 @@ public class BlockBush extends Block this.setTickRandomly(); float f = 0.2F; this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f * 3.0F, 0.5F + f); - this.setTab(CheatTab.tabPlants); + this.setTab(CheatTab.PLANTS); } public boolean canPlaceBlockAt(World worldIn, BlockPos pos) diff --git a/common/src/common/block/foliage/BlockCactus.java b/common/src/common/block/foliage/BlockCactus.java index 5504d57..5fe8b0b 100755 --- a/common/src/common/block/foliage/BlockCactus.java +++ b/common/src/common/block/foliage/BlockCactus.java @@ -1,12 +1,12 @@ package common.block.foliage; import common.block.Block; +import common.block.Material; import common.entity.DamageSource; import common.entity.Entity; import common.init.Blocks; import common.init.Config; import common.item.CheatTab; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -38,10 +38,10 @@ public class BlockCactus extends Block public BlockCactus() { - super(Material.cactus); + super(Material.BLOCKING); this.setDefaultState(this.getBaseState().withProperty(AGE, Integer.valueOf(0))); this.setTickRandomly(); - this.setTab(CheatTab.tabPlants); + this.setTab(CheatTab.PLANTS); } public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) diff --git a/common/src/common/block/foliage/BlockCocoa.java b/common/src/common/block/foliage/BlockCocoa.java index b8166d1..7c62bb9 100755 --- a/common/src/common/block/foliage/BlockCocoa.java +++ b/common/src/common/block/foliage/BlockCocoa.java @@ -2,6 +2,7 @@ package common.block.foliage; import common.block.Block; import common.block.BlockDirectional; +import common.block.Material; import common.color.DyeColor; import common.entity.types.EntityLiving; import common.init.Blocks; @@ -9,7 +10,6 @@ import common.init.Config; import common.init.Items; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -31,7 +31,7 @@ public class BlockCocoa extends BlockDirectional implements IGrowable public BlockCocoa() { - super(Material.plants); + super(Material.PLANT); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH).withProperty(AGE, Integer.valueOf(0))); this.setTickRandomly(); } diff --git a/common/src/common/block/foliage/BlockDeadBush.java b/common/src/common/block/foliage/BlockDeadBush.java index 87ae7aa..9e24f13 100755 --- a/common/src/common/block/foliage/BlockDeadBush.java +++ b/common/src/common/block/foliage/BlockDeadBush.java @@ -1,13 +1,13 @@ package common.block.foliage; import common.block.Block; +import common.block.Material; import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.Items; import common.item.Item; import common.item.ItemShears; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.rng.Random; @@ -20,7 +20,7 @@ public class BlockDeadBush extends BlockBush { public BlockDeadBush() { - super(Material.vine); + super(Material.BUSH); float f = 0.4F; this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.8F, 0.5F + f); } diff --git a/common/src/common/block/foliage/BlockDoublePlant.java b/common/src/common/block/foliage/BlockDoublePlant.java index b854fb7..fb4b135 100755 --- a/common/src/common/block/foliage/BlockDoublePlant.java +++ b/common/src/common/block/foliage/BlockDoublePlant.java @@ -4,6 +4,7 @@ import java.util.List; import common.block.Block; import common.block.BlockDirectional; +import common.block.Material; import common.block.SoundType; import common.color.Colorizer; import common.entity.npc.EntityNPC; @@ -16,7 +17,6 @@ import common.item.CheatTab; import common.item.Item; import common.item.ItemShears; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.properties.IProperty; @@ -40,7 +40,7 @@ public class BlockDoublePlant extends BlockBush implements IGrowable public BlockDoublePlant() { - super(Material.vine); + super(Material.BUSH); this.setDefaultState(this.getBaseState().withProperty(VARIANT, BlockDoublePlant.EnumPlantType.SUNFLOWER).withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER).withProperty(FACING, Facing.NORTH)); this.setHardness(0.0F); this.setStepSound(SoundType.GRASS); diff --git a/common/src/common/block/foliage/BlockDryLeaves.java b/common/src/common/block/foliage/BlockDryLeaves.java index d0d363a..a227249 100755 --- a/common/src/common/block/foliage/BlockDryLeaves.java +++ b/common/src/common/block/foliage/BlockDryLeaves.java @@ -1,10 +1,10 @@ package common.block.foliage; +import common.block.Material; import common.block.SoundType; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.material.Material; import common.rng.Random; import common.world.State; @@ -14,8 +14,8 @@ public class BlockDryLeaves extends BlockLeavesBase public BlockDryLeaves() { - super(Material.gourd); - this.setTab(CheatTab.tabPlants); + super(Material.SOFT); + this.setTab(CheatTab.PLANTS); this.setHardness(0.2F); this.setLightOpacity(1); this.setStepSound(SoundType.GRASS); diff --git a/common/src/common/block/foliage/BlockFarmland.java b/common/src/common/block/foliage/BlockFarmland.java index c195ff4..80dec93 100755 --- a/common/src/common/block/foliage/BlockFarmland.java +++ b/common/src/common/block/foliage/BlockFarmland.java @@ -1,6 +1,7 @@ package common.block.foliage; import common.block.Block; +import common.block.Material; import common.block.natural.BlockDirt; import common.entity.Entity; import common.entity.types.EntityLiving; @@ -8,7 +9,6 @@ import common.init.Blocks; import common.init.Config; import common.init.ItemRegistry; import common.item.Item; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.properties.IProperty; @@ -28,7 +28,7 @@ public class BlockFarmland extends Block public BlockFarmland() { - super(Material.ground); + super(Material.LOOSE); this.setDefaultState(this.getBaseState().withProperty(MOISTURE, Integer.valueOf(0))); this.setTickRandomly(); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.9375F, 1.0F); @@ -103,7 +103,7 @@ public class BlockFarmland extends Block { for (BlockPos.MutableBlockPos blockpos$mutableblockpos : BlockPos.getAllInBoxMutable(pos.add(-4, 0, -4), pos.add(4, 1, 4))) { - if (worldIn.getState(blockpos$mutableblockpos).getBlock().getMaterial() == Material.water) + if (worldIn.getState(blockpos$mutableblockpos).getBlock().getMaterial() == Material.WATER) { return true; } diff --git a/common/src/common/block/foliage/BlockGrass.java b/common/src/common/block/foliage/BlockGrass.java index d121dd4..88f7c05 100755 --- a/common/src/common/block/foliage/BlockGrass.java +++ b/common/src/common/block/foliage/BlockGrass.java @@ -2,13 +2,13 @@ package common.block.foliage; import common.biome.IBiome; import common.block.Block; +import common.block.Material; import common.block.natural.BlockDirt; import common.color.Colorizer; import common.init.Blocks; import common.init.Config; import common.item.CheatTab; import common.item.Item; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -27,10 +27,10 @@ public class BlockGrass extends Block implements IGrowable public BlockGrass() { - super(Material.grass); + super(Material.LOOSE); this.setDefaultState(this.getBaseState().withProperty(SNOWY, Boolean.valueOf(false))); this.setTickRandomly(); - this.setTab(CheatTab.tabNature); + this.setTab(CheatTab.NATURE); } /** diff --git a/common/src/common/block/foliage/BlockHugeMushroom.java b/common/src/common/block/foliage/BlockHugeMushroom.java index 57d8da5..873240b 100755 --- a/common/src/common/block/foliage/BlockHugeMushroom.java +++ b/common/src/common/block/foliage/BlockHugeMushroom.java @@ -1,10 +1,10 @@ package common.block.foliage; import common.block.Block; +import common.block.Material; import common.entity.types.EntityLiving; import common.init.ItemRegistry; import common.item.Item; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.properties.IProperty; diff --git a/common/src/common/block/foliage/BlockLeaves.java b/common/src/common/block/foliage/BlockLeaves.java index d3eaddb..a40c380 100755 --- a/common/src/common/block/foliage/BlockLeaves.java +++ b/common/src/common/block/foliage/BlockLeaves.java @@ -3,6 +3,7 @@ package common.block.foliage; import java.util.List; import common.block.Block; +import common.block.Material; import common.block.SoundType; import common.collect.Lists; import common.color.Colorizer; @@ -15,7 +16,6 @@ import common.item.CheatTab; import common.item.Item; import common.item.ItemShears; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ParticleType; @@ -43,11 +43,11 @@ public class BlockLeaves extends BlockLeavesBase public BlockLeaves(WoodType type) { - super(Material.leaves); + super(Material.LEAVES); this.type = type; this.setDefaultState(this.getBaseState().withProperty(TYPE, LeavesType.SPRING).withProperty(DECAY, Boolean.valueOf(true))); this.setTickRandomly(); - this.setTab(CheatTab.tabPlants); + this.setTab(CheatTab.PLANTS); this.setHardness(0.2F); this.setLightOpacity(1); this.setStepSound(SoundType.GRASS); @@ -88,7 +88,7 @@ public class BlockLeaves extends BlockLeavesBase BlockPos blockpos = pos.add(j1, k1, l1); State iblockstate = worldIn.getState(blockpos); - if (iblockstate.getBlock().getMaterial() == Material.leaves && !((Boolean)iblockstate.getValue(DECAY)).booleanValue()) + if (iblockstate.getBlock().getMaterial() == Material.LEAVES && !((Boolean)iblockstate.getValue(DECAY)).booleanValue()) { worldIn.setState(blockpos, iblockstate.withProperty(DECAY, Boolean.valueOf(true)), 4); } @@ -138,7 +138,7 @@ public class BlockLeaves extends BlockLeavesBase if (!(block instanceof BlockLog)) { - if (block.getMaterial() == Material.leaves) + if (block.getMaterial() == Material.LEAVES) { this.surroundings[(i2 + l1) * k1 + (j2 + l1) * j1 + k2 + l1] = -2; } diff --git a/common/src/common/block/foliage/BlockLeavesBase.java b/common/src/common/block/foliage/BlockLeavesBase.java index f2e8cad..1bf0fd0 100755 --- a/common/src/common/block/foliage/BlockLeavesBase.java +++ b/common/src/common/block/foliage/BlockLeavesBase.java @@ -1,7 +1,7 @@ package common.block.foliage; import common.block.Block; -import common.material.Material; +import common.block.Material; import common.model.BlockLayer; public class BlockLeavesBase extends Block diff --git a/common/src/common/block/foliage/BlockLilyPad.java b/common/src/common/block/foliage/BlockLilyPad.java index 42f22ba..c2273a7 100755 --- a/common/src/common/block/foliage/BlockLilyPad.java +++ b/common/src/common/block/foliage/BlockLilyPad.java @@ -30,7 +30,7 @@ public class BlockLilyPad extends BlockBush float f1 = 0.015625F; this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f1, 0.5F + f); this.setDefaultState(this.getBaseState().withProperty(BlockDirectional.FACING, Facing.NORTH)); - this.setTab(CheatTab.tabPlants); + this.setTab(CheatTab.PLANTS); } public void addCollisionBoxesToList(World worldIn, BlockPos pos, State state, BoundingBox mask, List list, Entity collidingEntity) diff --git a/common/src/common/block/foliage/BlockLog.java b/common/src/common/block/foliage/BlockLog.java index 9397b97..8c9fbab 100755 --- a/common/src/common/block/foliage/BlockLog.java +++ b/common/src/common/block/foliage/BlockLog.java @@ -1,10 +1,10 @@ package common.block.foliage; import common.block.BlockRotatedPillar; +import common.block.Material; import common.block.SoundType; import common.entity.types.EntityLiving; import common.item.CheatTab; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; @@ -23,9 +23,9 @@ public class BlockLog extends BlockRotatedPillar public BlockLog() { - super(Material.wood); + super(Material.WOOD); this.setDefaultState(this.getBaseState().withProperty(LOG_AXIS, BlockLog.EnumAxis.Y)); - this.setTab(CheatTab.tabWood); + this.setTab(CheatTab.WOOD); this.setHardness(2.0F); this.setStepSound(SoundType.WOOD); } @@ -41,7 +41,7 @@ public class BlockLog extends BlockRotatedPillar { State iblockstate = worldIn.getState(blockpos); - if (iblockstate.getBlock().getMaterial() == Material.leaves && !((Boolean)iblockstate.getValue(BlockLeaves.DECAY)).booleanValue()) + if (iblockstate.getBlock().getMaterial() == Material.LEAVES && !((Boolean)iblockstate.getValue(BlockLeaves.DECAY)).booleanValue()) { worldIn.setState(blockpos, iblockstate.withProperty(BlockLeaves.DECAY, Boolean.valueOf(true)), 4); } diff --git a/common/src/common/block/foliage/BlockMelon.java b/common/src/common/block/foliage/BlockMelon.java index 03988f0..ea81ba1 100755 --- a/common/src/common/block/foliage/BlockMelon.java +++ b/common/src/common/block/foliage/BlockMelon.java @@ -1,10 +1,10 @@ package common.block.foliage; import common.block.Block; +import common.block.Material; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.rng.Random; @@ -14,8 +14,8 @@ public class BlockMelon extends Block { public BlockMelon() { - super(Material.gourd); - this.setTab(CheatTab.tabPlants); + super(Material.SOFT); + this.setTab(CheatTab.PLANTS); } /** diff --git a/common/src/common/block/foliage/BlockMycelium.java b/common/src/common/block/foliage/BlockMycelium.java index f1580ef..b4a6fa7 100755 --- a/common/src/common/block/foliage/BlockMycelium.java +++ b/common/src/common/block/foliage/BlockMycelium.java @@ -1,12 +1,12 @@ package common.block.foliage; import common.block.Block; +import common.block.Material; import common.block.natural.BlockDirt; import common.init.Blocks; import common.init.Config; import common.item.CheatTab; import common.item.Item; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ParticleType; @@ -25,10 +25,10 @@ public class BlockMycelium extends Block public BlockMycelium() { - super(Material.grass); + super(Material.LOOSE); this.setDefaultState(this.getBaseState().withProperty(SNOWY, Boolean.valueOf(false))); this.setTickRandomly(); - this.setTab(CheatTab.tabNature); + this.setTab(CheatTab.NATURE); } /** diff --git a/common/src/common/block/foliage/BlockPumpkin.java b/common/src/common/block/foliage/BlockPumpkin.java index 49a23bd..302a14d 100755 --- a/common/src/common/block/foliage/BlockPumpkin.java +++ b/common/src/common/block/foliage/BlockPumpkin.java @@ -1,9 +1,9 @@ package common.block.foliage; import common.block.BlockDirectional; +import common.block.Material; import common.entity.types.EntityLiving; import common.item.CheatTab; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; @@ -29,10 +29,10 @@ public class BlockPumpkin extends BlockDirectional public BlockPumpkin() { - super(Material.gourd); + super(Material.SOFT); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH)); // this.setTickRandomly(true); - this.setTab(CheatTab.tabPlants); + this.setTab(CheatTab.PLANTS); } // public void onBlockAdded(IWorldServer worldIn, BlockPos pos, IBlockState state) diff --git a/common/src/common/block/foliage/BlockReed.java b/common/src/common/block/foliage/BlockReed.java index 16a91e4..4b74a5c 100755 --- a/common/src/common/block/foliage/BlockReed.java +++ b/common/src/common/block/foliage/BlockReed.java @@ -1,11 +1,11 @@ package common.block.foliage; import common.block.Block; +import common.block.Material; import common.init.Blocks; import common.init.Config; import common.init.Items; import common.item.Item; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -26,7 +26,7 @@ public class BlockReed extends Block public BlockReed() { - super(Material.plants); + super(Material.PLANT); this.setDefaultState(this.getBaseState().withProperty(AGE, Integer.valueOf(0))); float f = 0.375F; this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 1.0F, 0.5F + f); @@ -85,7 +85,7 @@ public class BlockReed extends Block { for (Facing enumfacing : Facing.Plane.HORIZONTAL) { - if (worldIn.getState(pos.offset(enumfacing).down()).getBlock().getMaterial() == Material.water) + if (worldIn.getState(pos.offset(enumfacing).down()).getBlock().getMaterial() == Material.WATER) { return true; } diff --git a/common/src/common/block/foliage/BlockSapling.java b/common/src/common/block/foliage/BlockSapling.java index b2b4702..dfc718d 100755 --- a/common/src/common/block/foliage/BlockSapling.java +++ b/common/src/common/block/foliage/BlockSapling.java @@ -31,7 +31,7 @@ public class BlockSapling extends BlockBush implements IGrowable this.setDefaultState(this.getBaseState() /* .withProperty(TYPE, BlockPlanks.EnumType.OAK) */ .withProperty(STAGE, Integer.valueOf(0))); float f = 0.4F; this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f * 2.0F, 0.5F + f); - this.setTab(CheatTab.tabPlants); + this.setTab(CheatTab.PLANTS); this.type = type; SAPLINGS.add(this); } diff --git a/common/src/common/block/foliage/BlockTallGrass.java b/common/src/common/block/foliage/BlockTallGrass.java index f7cf36d..b72c760 100755 --- a/common/src/common/block/foliage/BlockTallGrass.java +++ b/common/src/common/block/foliage/BlockTallGrass.java @@ -2,6 +2,7 @@ package common.block.foliage; import java.util.List; +import common.block.Material; import common.color.Colorizer; import common.entity.npc.EntityNPC; import common.init.Blocks; @@ -11,7 +12,6 @@ import common.item.CheatTab; import common.item.Item; import common.item.ItemShears; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.properties.IProperty; @@ -31,7 +31,7 @@ public class BlockTallGrass extends BlockBush implements IGrowable public BlockTallGrass() { - super(Material.vine); + super(Material.BUSH); this.setDefaultState(this.getBaseState().withProperty(TYPE, BlockTallGrass.EnumType.DEAD_BUSH)); float f = 0.4F; this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.8F, 0.5F + f); diff --git a/common/src/common/block/foliage/BlockTianSoil.java b/common/src/common/block/foliage/BlockTianSoil.java index de7465e..bf7aa44 100755 --- a/common/src/common/block/foliage/BlockTianSoil.java +++ b/common/src/common/block/foliage/BlockTianSoil.java @@ -1,10 +1,10 @@ package common.block.foliage; import common.block.Block; +import common.block.Material; import common.init.Blocks; import common.item.CheatTab; import common.item.Item; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.properties.IProperty; @@ -20,9 +20,9 @@ public class BlockTianSoil extends Block public BlockTianSoil() { - super(Material.rock); + super(Material.SOLID); this.setDefaultState(this.getBaseState().withProperty(SNOWY, Boolean.valueOf(false))); - this.setTab(CheatTab.tabNature); + this.setTab(CheatTab.NATURE); } public State getActualState(State state, IWorldAccess worldIn, BlockPos pos) diff --git a/common/src/common/block/foliage/BlockVine.java b/common/src/common/block/foliage/BlockVine.java index 7f2a9a1..fc0868e 100755 --- a/common/src/common/block/foliage/BlockVine.java +++ b/common/src/common/block/foliage/BlockVine.java @@ -1,6 +1,7 @@ package common.block.foliage; import common.block.Block; +import common.block.Material; import common.color.Colorizer; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; @@ -10,7 +11,6 @@ import common.item.CheatTab; import common.item.Item; import common.item.ItemShears; import common.item.ItemStack; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -38,10 +38,10 @@ public class BlockVine extends Block public BlockVine() { - super(Material.vine); + super(Material.BUSH); this.setDefaultState(this.getBaseState().withProperty(UP, Boolean.valueOf(false)).withProperty(NORTH, Boolean.valueOf(false)).withProperty(EAST, Boolean.valueOf(false)).withProperty(SOUTH, Boolean.valueOf(false)).withProperty(WEST, Boolean.valueOf(false))); this.setTickRandomly(); - this.setTab(CheatTab.tabPlants); + this.setTab(CheatTab.PLANTS); } /** diff --git a/common/src/common/block/foliage/BlockWart.java b/common/src/common/block/foliage/BlockWart.java index 7ac9919..72c7b1f 100755 --- a/common/src/common/block/foliage/BlockWart.java +++ b/common/src/common/block/foliage/BlockWart.java @@ -1,13 +1,13 @@ package common.block.foliage; import common.block.Block; +import common.block.Material; import common.init.Blocks; import common.init.Config; import common.init.Items; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.properties.IProperty; @@ -24,7 +24,7 @@ public class BlockWart extends BlockBush public BlockWart() { - super(Material.plants); + super(Material.PLANT); this.setDefaultState(this.getBaseState().withProperty(AGE, Integer.valueOf(0))); this.setTickRandomly(); float f = 0.5F; diff --git a/common/src/common/block/liquid/BlockDynamicLiquid.java b/common/src/common/block/liquid/BlockDynamicLiquid.java index 3684eec..a8bab57 100755 --- a/common/src/common/block/liquid/BlockDynamicLiquid.java +++ b/common/src/common/block/liquid/BlockDynamicLiquid.java @@ -4,10 +4,10 @@ import java.util.EnumSet; import java.util.Set; import common.block.Block; +import common.block.Material; import common.block.artificial.BlockDoor; import common.init.Blocks; import common.init.Config; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.util.Facing; @@ -76,10 +76,10 @@ public class BlockDynamicLiquid extends BlockLiquid } } - if (this.adjacentSourceBlocks >= 2 && ((Config.mergeWater && this.material == Material.water) - || (Config.mergeLava && this.material == Material.lava) - || (this.infinite && Config.mergeInfinite && this.material != Material.water && this.material != Material.lava) - || (!this.infinite && Config.mergeFinite && this.material != Material.water && this.material != Material.lava))) + if (this.adjacentSourceBlocks >= 2 && ((Config.mergeWater && this.material == Material.WATER) + || (Config.mergeLava && this.material == Material.LAVA) + || (this.infinite && Config.mergeInfinite && this.material != Material.WATER && this.material != Material.LAVA) + || (!this.infinite && Config.mergeFinite && this.material != Material.WATER && this.material != Material.LAVA))) { State iblockstate1 = worldIn.getState(pos.down()); @@ -128,7 +128,7 @@ public class BlockDynamicLiquid extends BlockLiquid if (this.canFlowInto(worldIn, pos.down(), iblockstate)) { - if (this.material == Material.lava && worldIn.getState(pos.down()).getBlock().getMaterial().isColdLiquid()) + if (this.material == Material.LAVA && worldIn.getState(pos.down()).getBlock().getMaterial().isColdLiquid()) { worldIn.setState(pos.down(), Blocks.stone.getState()); this.triggerMixEffects(worldIn, pos.down()); @@ -172,7 +172,7 @@ public class BlockDynamicLiquid extends BlockLiquid { if (state.getBlock() != Blocks.air) { - if (this.material == Material.lava) + if (this.material == Material.LAVA) { this.triggerMixEffects(worldIn, pos); } @@ -262,7 +262,7 @@ public class BlockDynamicLiquid extends BlockLiquid private boolean isBlocked(World worldIn, BlockPos pos, State state) { Block block = worldIn.getState(pos).getBlock(); - return !(block instanceof BlockDoor) && block != Blocks.sign && block != Blocks.ladder && block != Blocks.reeds ? (block.getMaterial() == Material.portal ? true : block.getMaterial().blocksMovement()) : true; + return !(block instanceof BlockDoor) && block != Blocks.sign && block != Blocks.ladder && block != Blocks.reeds ? (block.getMaterial() == Material.PORTAL ? true : block.getMaterial().blocksMovement()) : true; } protected int checkAdjacentBlock(World worldIn, BlockPos pos, int currentMinLevel) @@ -292,7 +292,7 @@ public class BlockDynamicLiquid extends BlockLiquid private boolean canFlowInto(World worldIn, BlockPos pos, State state) { Material material = state.getBlock().getMaterial(); - return material != this.material && material != Material.lava && !this.isBlocked(worldIn, pos, state); + return material != this.material && material != Material.LAVA && !this.isBlocked(worldIn, pos, state); } public void onBlockAdded(AWorldServer worldIn, BlockPos pos, State state) diff --git a/common/src/common/block/liquid/BlockLiquid.java b/common/src/common/block/liquid/BlockLiquid.java index 2b82174..c247744 100755 --- a/common/src/common/block/liquid/BlockLiquid.java +++ b/common/src/common/block/liquid/BlockLiquid.java @@ -1,6 +1,7 @@ package common.block.liquid; import common.block.Block; +import common.block.Material; import common.color.Colorizer; import common.entity.Entity; import common.init.Blocks; @@ -8,7 +9,6 @@ import common.init.Config; import common.init.FluidRegistry; import common.init.SoundEvent; import common.item.Item; -import common.material.Material; import common.model.BlockLayer; import common.model.ParticleType; import common.properties.IProperty; @@ -51,7 +51,7 @@ public abstract class BlockLiquid extends Block public int colorMultiplier(IWorldAccess worldIn, BlockPos pos, int renderPass) { - return this.material == Material.water ? Colorizer.getWaterColor(worldIn, pos) : 16777215; + return this.material == Material.WATER ? Colorizer.getWaterColor(worldIn, pos) : 16777215; } /** @@ -96,13 +96,10 @@ public abstract class BlockLiquid extends Block return liquid && ((Integer)state.getValue(LEVEL)).intValue() == 0; } - /** - * Whether this Block is solid on the given Side - */ public boolean isBlockSolid(IBlockAccess worldIn, BlockPos pos, Facing side) { - Material material = worldIn.getState(pos).getBlock().getMaterial(); - return material == this.material ? false : (side == Facing.UP ? true : (material == Material.ice ? false : super.isBlockSolid(worldIn, pos, side))); + Block block = worldIn.getState(pos).getBlock(); + return block.getMaterial() == this.material ? false : (side == Facing.UP ? true : (block != Blocks.ice && worldIn.getState(pos).getBlock().getMaterial().isSolid())); } public boolean shouldSideBeRendered(IWorldAccess worldIn, BlockPos pos, Facing side) @@ -241,7 +238,7 @@ public abstract class BlockLiquid extends Block double d1 = (double)pos.getY(); double d2 = (double)pos.getZ(); - if (this.material == Material.water) + if (this.material == Material.WATER) { int i = ((Integer)state.getValue(LEVEL)).intValue(); @@ -258,7 +255,7 @@ public abstract class BlockLiquid extends Block } } - if (this.material == Material.lava && worldIn.getState(pos.up()).getBlock() == Blocks.air && !worldIn.getState(pos.up()).getBlock().isOpaqueCube()) + if (this.material == Material.LAVA && worldIn.getState(pos.up()).getBlock() == Blocks.air && !worldIn.getState(pos.up()).getBlock().isOpaqueCube()) { if (rand.chance(100)) { @@ -285,7 +282,7 @@ public abstract class BlockLiquid extends Block double d5 = d1 - 1.05D; double d7 = d2 + (double)rand.floatv(); - if (this.material == Material.water) + if (this.material == Material.WATER) { worldIn.spawnParticle(ParticleType.DRIP_WATER, d3, d5, d7, 0.0D, 0.0D, 0.0D); } @@ -320,7 +317,7 @@ public abstract class BlockLiquid extends Block { if(worldIn.client || !Config.liquidPhysics) return true; - if (this.material == Material.lava) + if (this.material == Material.LAVA) { boolean flag = false; @@ -397,11 +394,11 @@ public abstract class BlockLiquid extends Block public static BlockDynamicLiquid getFlowingBlock(BlockStaticLiquid block) { - if (block.getMaterial() == Material.water) + if (block.getMaterial() == Material.WATER) { return Blocks.flowing_water; } - else if (block.getMaterial() == Material.lava) + else if (block.getMaterial() == Material.LAVA) { return Blocks.flowing_lava; } @@ -413,11 +410,11 @@ public abstract class BlockLiquid extends Block public static BlockStaticLiquid getStaticBlock(BlockDynamicLiquid block) { - if (block.getMaterial() == Material.water) + if (block.getMaterial() == Material.WATER) { return Blocks.water; } - else if (block.getMaterial() == Material.lava) + else if (block.getMaterial() == Material.LAVA) { return Blocks.lava; } diff --git a/common/src/common/block/liquid/BlockStaticLiquid.java b/common/src/common/block/liquid/BlockStaticLiquid.java index 5c7f069..f2770ca 100755 --- a/common/src/common/block/liquid/BlockStaticLiquid.java +++ b/common/src/common/block/liquid/BlockStaticLiquid.java @@ -1,9 +1,9 @@ package common.block.liquid; import common.block.Block; +import common.block.Material; import common.init.Blocks; import common.init.Config; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.util.Facing; @@ -15,7 +15,7 @@ public class BlockStaticLiquid extends BlockLiquid { public BlockStaticLiquid(Material materialIn, boolean opaque, int rate) { - super(materialIn, materialIn == Material.lava, opaque, rate); + super(materialIn, materialIn == Material.LAVA, opaque, rate); // this.setTickRandomly(false); // // if (materialIn == Material.lava) @@ -44,7 +44,7 @@ public class BlockStaticLiquid extends BlockLiquid public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) { - if (Config.lavaFire && this.material == Material.lava) + if (Config.lavaFire && this.material == Material.LAVA) { if (Config.fire) { diff --git a/common/src/common/block/natural/BlockBedrock.java b/common/src/common/block/natural/BlockBedrock.java index 831e002..a1c0a9b 100755 --- a/common/src/common/block/natural/BlockBedrock.java +++ b/common/src/common/block/natural/BlockBedrock.java @@ -1,7 +1,7 @@ package common.block.natural; import common.block.Block; -import common.material.Material; +import common.block.Material; import common.model.ParticleType; import common.rng.Random; import common.util.BlockPos; @@ -10,7 +10,7 @@ import common.world.State; public class BlockBedrock extends Block { public BlockBedrock() { - super(Material.rock); + super(Material.SOLID); } public void randomDisplayTick(AWorldClient worldIn, BlockPos pos, State state, Random rand) diff --git a/common/src/common/block/natural/BlockBlackenedDirt.java b/common/src/common/block/natural/BlockBlackenedDirt.java index 6eff390..5cf0837 100644 --- a/common/src/common/block/natural/BlockBlackenedDirt.java +++ b/common/src/common/block/natural/BlockBlackenedDirt.java @@ -2,10 +2,10 @@ package common.block.natural; import common.biome.Biome; import common.block.Block; +import common.block.Material; import common.init.Blocks; import common.init.Config; import common.item.CheatTab; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.world.State; @@ -15,9 +15,9 @@ public class BlockBlackenedDirt extends Block { public BlockBlackenedDirt() { - super(Material.ground); + super(Material.LOOSE); this.setTickRandomly(); - this.setTab(CheatTab.tabNature); + this.setTab(CheatTab.NATURE); } public void updateTick(AWorldServer worldIn, BlockPos pos, State state, Random rand) diff --git a/common/src/common/block/natural/BlockBlackenedStone.java b/common/src/common/block/natural/BlockBlackenedStone.java index 6e8dec7..bf35ab6 100644 --- a/common/src/common/block/natural/BlockBlackenedStone.java +++ b/common/src/common/block/natural/BlockBlackenedStone.java @@ -1,18 +1,18 @@ package common.block.natural; import common.block.Block; +import common.block.Material; import common.init.Blocks; import common.init.ItemRegistry; import common.item.CheatTab; import common.item.Item; -import common.material.Material; import common.rng.Random; import common.world.State; public class BlockBlackenedStone extends Block { public BlockBlackenedStone() { - super(Material.rock); - this.setTab(CheatTab.tabNature); + super(Material.SOLID); + this.setTab(CheatTab.NATURE); } public Item getItemDropped(State state, Random rand, int fortune) { diff --git a/common/src/common/block/natural/BlockClay.java b/common/src/common/block/natural/BlockClay.java index 1e34ea9..9f15600 100755 --- a/common/src/common/block/natural/BlockClay.java +++ b/common/src/common/block/natural/BlockClay.java @@ -1,10 +1,10 @@ package common.block.natural; import common.block.Block; +import common.block.Material; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.material.Material; import common.rng.Random; import common.world.State; @@ -12,8 +12,8 @@ public class BlockClay extends Block { public BlockClay() { - super(Material.clay); - this.setTab(CheatTab.tabNature); + super(Material.LOOSE); + this.setTab(CheatTab.NATURE); } /** diff --git a/common/src/common/block/natural/BlockDirt.java b/common/src/common/block/natural/BlockDirt.java index 682418e..f93a03c 100755 --- a/common/src/common/block/natural/BlockDirt.java +++ b/common/src/common/block/natural/BlockDirt.java @@ -3,11 +3,11 @@ package common.block.natural; import java.util.List; import common.block.Block; +import common.block.Material; import common.init.Blocks; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.properties.IProperty; @@ -26,9 +26,9 @@ public class BlockDirt extends Block public BlockDirt() { - super(Material.ground); + super(Material.LOOSE); this.setDefaultState(this.getBaseState().withProperty(VARIANT, BlockDirt.DirtType.DIRT).withProperty(SNOWY, Boolean.valueOf(false))); - this.setTab(CheatTab.tabNature); + this.setTab(CheatTab.NATURE); } // /** diff --git a/common/src/common/block/natural/BlockFire.java b/common/src/common/block/natural/BlockFire.java index bf1a0fe..fe048ea 100755 --- a/common/src/common/block/natural/BlockFire.java +++ b/common/src/common/block/natural/BlockFire.java @@ -3,11 +3,11 @@ package common.block.natural; import java.util.Map; import common.block.Block; +import common.block.Material; import common.init.Blocks; import common.init.Config; import common.init.FlammabilityRegistry; import common.init.SoundEvent; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -69,7 +69,7 @@ public class BlockFire extends Block public BlockFire() { - super(Material.fire); + super(Material.FIRE); this.setDefaultState(this.getBaseState().withProperty(AGE, Integer.valueOf(0)).withProperty(FLIP, Boolean.valueOf(false)).withProperty(ALT, Boolean.valueOf(false)).withProperty(NORTH, Boolean.valueOf(false)).withProperty(EAST, Boolean.valueOf(false)).withProperty(SOUTH, Boolean.valueOf(false)).withProperty(WEST, Boolean.valueOf(false)).withProperty(UPPER, Integer.valueOf(0))); this.setTickRandomly(); } diff --git a/common/src/common/block/natural/BlockGlowstone.java b/common/src/common/block/natural/BlockGlowstone.java index acd4128..9e39e91 100755 --- a/common/src/common/block/natural/BlockGlowstone.java +++ b/common/src/common/block/natural/BlockGlowstone.java @@ -1,10 +1,10 @@ package common.block.natural; import common.block.Block; +import common.block.Material; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.material.Material; import common.rng.Random; import common.util.ExtMath; import common.world.State; @@ -14,7 +14,7 @@ public class BlockGlowstone extends Block public BlockGlowstone(Material materialIn) { super(materialIn); - this.setTab(CheatTab.tabNature); + this.setTab(CheatTab.NATURE); } /** diff --git a/common/src/common/block/natural/BlockGravel.java b/common/src/common/block/natural/BlockGravel.java index 7324de7..4c0db73 100755 --- a/common/src/common/block/natural/BlockGravel.java +++ b/common/src/common/block/natural/BlockGravel.java @@ -1,20 +1,20 @@ package common.block.natural; import common.block.BlockFalling; +import common.block.Material; import common.init.Config; import common.init.ItemRegistry; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.material.Material; import common.rng.Random; import common.world.State; public class BlockGravel extends BlockFalling { public BlockGravel() { - super(Material.sand); - this.setTab(CheatTab.tabNature); + super(Material.LOOSE); + this.setTab(CheatTab.NATURE); } public Item getItemDropped(State state, Random rand, int fortune) diff --git a/common/src/common/block/natural/BlockHardenedClay.java b/common/src/common/block/natural/BlockHardenedClay.java index ce20f4c..93e8b74 100755 --- a/common/src/common/block/natural/BlockHardenedClay.java +++ b/common/src/common/block/natural/BlockHardenedClay.java @@ -1,15 +1,15 @@ package common.block.natural; import common.block.Block; +import common.block.Material; import common.item.CheatTab; -import common.material.Material; public class BlockHardenedClay extends Block { public BlockHardenedClay() { - super(Material.rock); - this.setTab(CheatTab.tabNature); + super(Material.SOLID); + this.setTab(CheatTab.NATURE); } // /** diff --git a/common/src/common/block/natural/BlockHellRock.java b/common/src/common/block/natural/BlockHellRock.java index f381c4d..63c6b72 100755 --- a/common/src/common/block/natural/BlockHellRock.java +++ b/common/src/common/block/natural/BlockHellRock.java @@ -1,15 +1,15 @@ package common.block.natural; import common.block.Block; +import common.block.Material; import common.item.CheatTab; -import common.material.Material; public class BlockHellRock extends Block { public BlockHellRock() { - super(Material.rock); - this.setTab(CheatTab.tabNature); + super(Material.SOLID); + this.setTab(CheatTab.NATURE); } // /** diff --git a/common/src/common/block/natural/BlockIce.java b/common/src/common/block/natural/BlockIce.java index e63c36d..1662bd4 100755 --- a/common/src/common/block/natural/BlockIce.java +++ b/common/src/common/block/natural/BlockIce.java @@ -1,13 +1,13 @@ package common.block.natural; import common.block.BlockTranslucent; +import common.block.Material; import common.enchantment.EnchantmentHelper; import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.Config; import common.item.CheatTab; import common.item.ItemStack; -import common.material.Material; import common.rng.Random; import common.tileentity.TileEntity; import common.util.BlockPos; @@ -18,10 +18,10 @@ import common.world.AWorldServer; public class BlockIce extends BlockTranslucent { public BlockIce() { - super(Material.ice); + super(Material.TRANSLUCENT); this.slipperiness = 0.98F; this.setTickRandomly(); - this.setTab(CheatTab.tabNature); + this.setTab(CheatTab.NATURE); } public void harvestBlock(World world, EntityNPC player, BlockPos pos, State state, TileEntity tile) { diff --git a/common/src/common/block/natural/BlockObsidian.java b/common/src/common/block/natural/BlockObsidian.java index b8d60e9..97cdf05 100755 --- a/common/src/common/block/natural/BlockObsidian.java +++ b/common/src/common/block/natural/BlockObsidian.java @@ -1,11 +1,11 @@ package common.block.natural; import common.block.Block; +import common.block.Material; import common.init.Blocks; import common.init.ItemRegistry; import common.item.CheatTab; import common.item.Item; -import common.material.Material; import common.rng.Random; import common.world.State; @@ -13,8 +13,8 @@ public class BlockObsidian extends Block { public BlockObsidian() { - super(Material.rock); - this.setTab(CheatTab.tabNature); + super(Material.SOLID); + this.setTab(CheatTab.NATURE); } /** diff --git a/common/src/common/block/natural/BlockOre.java b/common/src/common/block/natural/BlockOre.java index 3b7c759..d4d6540 100755 --- a/common/src/common/block/natural/BlockOre.java +++ b/common/src/common/block/natural/BlockOre.java @@ -1,12 +1,12 @@ package common.block.natural; import common.block.Block; +import common.block.Material; import common.init.Config; import common.init.ItemRegistry; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.world.State; @@ -22,8 +22,8 @@ public class BlockOre extends Block public BlockOre() { - super(Material.rock); - this.setTab(CheatTab.tabGems); + super(Material.SOLID); + this.setTab(CheatTab.GEMS); } public void setDropItem(ItemStack item, int chance, int minXp) { diff --git a/common/src/common/block/natural/BlockPackedIce.java b/common/src/common/block/natural/BlockPackedIce.java index b79cee6..59ddc47 100755 --- a/common/src/common/block/natural/BlockPackedIce.java +++ b/common/src/common/block/natural/BlockPackedIce.java @@ -1,17 +1,17 @@ package common.block.natural; import common.block.Block; +import common.block.Material; import common.item.CheatTab; -import common.material.Material; import common.rng.Random; public class BlockPackedIce extends Block { public BlockPackedIce() { - super(Material.packedIce); + super(Material.LOOSE); this.slipperiness = 0.98F; - this.setTab(CheatTab.tabNature); + this.setTab(CheatTab.NATURE); } /** diff --git a/common/src/common/block/natural/BlockRedstoneOre.java b/common/src/common/block/natural/BlockRedstoneOre.java index 48f4345..f42bba2 100755 --- a/common/src/common/block/natural/BlockRedstoneOre.java +++ b/common/src/common/block/natural/BlockRedstoneOre.java @@ -1,6 +1,7 @@ package common.block.natural; import common.block.Block; +import common.block.Material; import common.entity.Entity; import common.entity.npc.EntityNPC; import common.init.Blocks; @@ -8,7 +9,6 @@ import common.init.ItemRegistry; import common.init.Items; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ParticleType; @@ -26,7 +26,7 @@ public class BlockRedstoneOre extends Block public BlockRedstoneOre(boolean isOn) { - super(Material.rock); + super(Material.SOLID); if (isOn) { diff --git a/common/src/common/block/natural/BlockRock.java b/common/src/common/block/natural/BlockRock.java index 83faa97..92b0352 100755 --- a/common/src/common/block/natural/BlockRock.java +++ b/common/src/common/block/natural/BlockRock.java @@ -3,10 +3,10 @@ package common.block.natural; import java.util.List; import common.block.Block; +import common.block.Material; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.properties.IProperty; @@ -17,9 +17,9 @@ public class BlockRock extends Block { public static final PropertyBool SMOOTH = PropertyBool.create("smooth"); public BlockRock() { - super(Material.rock); + super(Material.SOLID); this.setDefaultState(this.getBaseState().withProperty(SMOOTH, false)); - this.setTab(CheatTab.tabNature); + this.setTab(CheatTab.NATURE); } public int damageDropped(State state) { diff --git a/common/src/common/block/natural/BlockSand.java b/common/src/common/block/natural/BlockSand.java index d875ca4..ae5d6cb 100755 --- a/common/src/common/block/natural/BlockSand.java +++ b/common/src/common/block/natural/BlockSand.java @@ -3,10 +3,10 @@ package common.block.natural; import java.util.List; import common.block.BlockFalling; +import common.block.Material; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.properties.IProperty; @@ -20,9 +20,9 @@ public class BlockSand extends BlockFalling public BlockSand() { - super(Material.sand); + super(Material.LOOSE); this.setDefaultState(this.getBaseState().withProperty(VARIANT, BlockSand.EnumType.SAND)); - this.setTab(CheatTab.tabNature); + this.setTab(CheatTab.NATURE); } /** diff --git a/common/src/common/block/natural/BlockSandStone.java b/common/src/common/block/natural/BlockSandStone.java index 76ff781..ca1bcac 100755 --- a/common/src/common/block/natural/BlockSandStone.java +++ b/common/src/common/block/natural/BlockSandStone.java @@ -3,10 +3,10 @@ package common.block.natural; import java.util.List; import common.block.Block; +import common.block.Material; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.properties.IProperty; @@ -20,9 +20,9 @@ public class BlockSandStone extends Block public BlockSandStone() { - super(Material.rock); + super(Material.SOLID); this.setDefaultState(this.getBaseState().withProperty(TYPE, BlockSandStone.EnumType.DEFAULT)); - this.setTab(CheatTab.tabNature); + this.setTab(CheatTab.NATURE); } /** diff --git a/common/src/common/block/natural/BlockSlime.java b/common/src/common/block/natural/BlockSlime.java index 7ea4f3d..1d1f6f6 100755 --- a/common/src/common/block/natural/BlockSlime.java +++ b/common/src/common/block/natural/BlockSlime.java @@ -1,9 +1,9 @@ package common.block.natural; import common.block.BlockTranslucent; +import common.block.Material; import common.entity.Entity; import common.item.CheatTab; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.util.BlockPos; @@ -29,8 +29,8 @@ public class BlockSlime extends BlockTranslucent { ; public BlockSlime() { - super(Material.clay); - this.setTab(CheatTab.tabTech); + super(Material.LOOSE); + this.setTab(CheatTab.TECHNOLOGY); this.slipperiness = 0.8F; } diff --git a/common/src/common/block/natural/BlockSnow.java b/common/src/common/block/natural/BlockSnow.java index e87a6ed..2bbcf17 100755 --- a/common/src/common/block/natural/BlockSnow.java +++ b/common/src/common/block/natural/BlockSnow.java @@ -1,6 +1,7 @@ package common.block.natural; import common.block.Block; +import common.block.Material; import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.Config; @@ -8,7 +9,6 @@ import common.init.Items; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.Transforms; @@ -32,11 +32,11 @@ public class BlockSnow extends Block public BlockSnow() { - super(Material.snow); + super(Material.POWDER); this.setDefaultState(this.getBaseState().withProperty(LAYERS, Integer.valueOf(1))); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F); this.setTickRandomly(); - this.setTab(CheatTab.tabDeco); + this.setTab(CheatTab.DECORATION); this.setBlockBoundsForItemRender(); } @@ -88,7 +88,7 @@ public class BlockSnow extends Block { State iblockstate = worldIn.getState(pos.down()); Block block = iblockstate.getBlock(); - return block != Blocks.ice && block != Blocks.packed_ice ? (block.getMaterial() == Material.leaves ? true : (block == this && ((Integer)iblockstate.getValue(LAYERS)).intValue() >= 7 ? true : block.isOpaqueCube() && block.getMaterial().blocksMovement())) : false; + return block != Blocks.ice && block != Blocks.packed_ice ? (block.getMaterial() == Material.LEAVES ? true : (block == this && ((Integer)iblockstate.getValue(LAYERS)).intValue() >= 7 ? true : block.isOpaqueCube() && block.getMaterial().blocksMovement())) : false; } /** diff --git a/common/src/common/block/natural/BlockSnowBlock.java b/common/src/common/block/natural/BlockSnowBlock.java index 6721f0f..405ea66 100755 --- a/common/src/common/block/natural/BlockSnowBlock.java +++ b/common/src/common/block/natural/BlockSnowBlock.java @@ -1,11 +1,11 @@ package common.block.natural; import common.block.Block; +import common.block.Material; import common.init.Config; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.world.LightType; @@ -14,9 +14,9 @@ import common.world.AWorldServer; public class BlockSnowBlock extends Block { public BlockSnowBlock() { - super(Material.craftedSnow); + super(Material.DIGGABLE); this.setTickRandomly(); - this.setTab(CheatTab.tabNature); + this.setTab(CheatTab.NATURE); } public Item getItemDropped(State state, Random rand, int fortune) { diff --git a/common/src/common/block/natural/BlockSoulSand.java b/common/src/common/block/natural/BlockSoulSand.java index efce90e..e521c5f 100755 --- a/common/src/common/block/natural/BlockSoulSand.java +++ b/common/src/common/block/natural/BlockSoulSand.java @@ -1,9 +1,9 @@ package common.block.natural; import common.block.Block; +import common.block.Material; import common.entity.Entity; import common.item.CheatTab; -import common.material.Material; import common.util.BlockPos; import common.util.BoundingBox; import common.world.State; @@ -13,8 +13,8 @@ public class BlockSoulSand extends Block { public BlockSoulSand() { - super(Material.sand); - this.setTab(CheatTab.tabNature); + super(Material.LOOSE); + this.setTab(CheatTab.NATURE); } public BoundingBox getCollisionBoundingBox(World worldIn, BlockPos pos, State state) diff --git a/common/src/common/block/natural/BlockStone.java b/common/src/common/block/natural/BlockStone.java index b2fe230..7bb352a 100755 --- a/common/src/common/block/natural/BlockStone.java +++ b/common/src/common/block/natural/BlockStone.java @@ -1,18 +1,18 @@ package common.block.natural; import common.block.Block; +import common.block.Material; import common.init.Blocks; import common.init.ItemRegistry; import common.item.CheatTab; import common.item.Item; -import common.material.Material; import common.rng.Random; import common.world.State; public class BlockStone extends Block { public BlockStone() { - super(Material.rock); - this.setTab(CheatTab.tabNature); + super(Material.SOLID); + this.setTab(CheatTab.NATURE); } public Item getItemDropped(State state, Random rand, int fortune) { diff --git a/common/src/common/block/natural/BlockWeb.java b/common/src/common/block/natural/BlockWeb.java index 156da3d..4dbaf5d 100755 --- a/common/src/common/block/natural/BlockWeb.java +++ b/common/src/common/block/natural/BlockWeb.java @@ -1,11 +1,11 @@ package common.block.natural; import common.block.Block; +import common.block.Material; import common.entity.Entity; import common.init.Items; import common.item.CheatTab; import common.item.Item; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -19,8 +19,8 @@ public class BlockWeb extends Block { public BlockWeb() { - super(Material.web); - this.setTab(CheatTab.tabDeco); + super(Material.FLUFF); + this.setTab(CheatTab.DECORATION); } /** diff --git a/common/src/common/block/tech/BlockAnvil.java b/common/src/common/block/tech/BlockAnvil.java index 34a19c9..8a00352 100755 --- a/common/src/common/block/tech/BlockAnvil.java +++ b/common/src/common/block/tech/BlockAnvil.java @@ -3,6 +3,7 @@ package common.block.tech; import java.util.List; import common.block.BlockFalling; +import common.block.Material; import common.entity.item.EntityFalling; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; @@ -12,7 +13,6 @@ import common.inventory.InventoryPlayer; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; @@ -34,10 +34,10 @@ public class BlockAnvil extends BlockFalling public BlockAnvil() { - super(Material.anvil); + super(Material.HEAVY); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH).withProperty(DAMAGE, Integer.valueOf(0))); this.setLightOpacity(0); - this.setTab(CheatTab.tabTech); + this.setTab(CheatTab.TECHNOLOGY); } public boolean isFullCube() diff --git a/common/src/common/block/tech/BlockBasePressurePlate.java b/common/src/common/block/tech/BlockBasePressurePlate.java index f0c48de..a920fbe 100755 --- a/common/src/common/block/tech/BlockBasePressurePlate.java +++ b/common/src/common/block/tech/BlockBasePressurePlate.java @@ -1,11 +1,11 @@ package common.block.tech; import common.block.Block; +import common.block.Material; import common.block.artificial.BlockFence; import common.entity.Entity; import common.init.SoundEvent; import common.item.CheatTab; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.rng.Random; @@ -23,7 +23,7 @@ public abstract class BlockBasePressurePlate extends Block public BlockBasePressurePlate(Material p_i46401_1_) { super(p_i46401_1_); - this.setTab(CheatTab.tabTech); + this.setTab(CheatTab.TECHNOLOGY); // this.setTickRandomly(true); } diff --git a/common/src/common/block/tech/BlockBeacon.java b/common/src/common/block/tech/BlockBeacon.java index 3a752a1..521e9ce 100755 --- a/common/src/common/block/tech/BlockBeacon.java +++ b/common/src/common/block/tech/BlockBeacon.java @@ -2,9 +2,9 @@ package common.block.tech; import common.block.Block; import common.block.BlockContainer; +import common.block.Material; import common.entity.npc.EntityNPC; import common.item.CheatTab; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -43,9 +43,9 @@ public class BlockBeacon extends BlockContainer public BlockBeacon() { - super(Material.glass); + super(Material.TRANSLUCENT); this.setHardness(3.0F); - this.setTab(CheatTab.tabTech); + this.setTab(CheatTab.TECHNOLOGY); } /** diff --git a/common/src/common/block/tech/BlockBrewingStand.java b/common/src/common/block/tech/BlockBrewingStand.java index 036b238..bcde12f 100755 --- a/common/src/common/block/tech/BlockBrewingStand.java +++ b/common/src/common/block/tech/BlockBrewingStand.java @@ -3,6 +3,7 @@ package common.block.tech; import java.util.List; import common.block.BlockContainer; +import common.block.Material; import common.entity.Entity; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; @@ -11,7 +12,6 @@ import common.inventory.Container; import common.inventory.InventoryHelper; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -352,7 +352,7 @@ public class BlockBrewingStand extends BlockContainer public BlockBrewingStand() { - super(Material.iron); + super(Material.SOLID); this.setDefaultState(this.getBaseState().withProperty(HAS_BOTTLE[0], Boolean.valueOf(false)).withProperty(HAS_BOTTLE[1], Boolean.valueOf(false)).withProperty(HAS_BOTTLE[2], Boolean.valueOf(false))); } diff --git a/common/src/common/block/tech/BlockButton.java b/common/src/common/block/tech/BlockButton.java index c0b60fb..956d0fe 100755 --- a/common/src/common/block/tech/BlockButton.java +++ b/common/src/common/block/tech/BlockButton.java @@ -3,6 +3,7 @@ package common.block.tech; import java.util.List; import common.block.Block; +import common.block.Material; import common.collect.Lists; import common.entity.Entity; import common.entity.npc.EntityNPC; @@ -10,7 +11,6 @@ import common.entity.projectile.EntityArrow; import common.entity.types.EntityLiving; import common.init.SoundEvent; import common.item.CheatTab; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; @@ -39,10 +39,10 @@ public class BlockButton extends Block public BlockButton(boolean arrows, int onTime, String texture) { - super(Material.circuits); + super(Material.SMALL); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH).withProperty(POWERED, Boolean.valueOf(false))); // this.setTickRandomly(true); - this.setTab(CheatTab.tabTech); + this.setTab(CheatTab.TECHNOLOGY); this.checkArrows = arrows; this.onTime = onTime; this.texture = texture; diff --git a/common/src/common/block/tech/BlockCauldron.java b/common/src/common/block/tech/BlockCauldron.java index 75e05e8..d686055 100755 --- a/common/src/common/block/tech/BlockCauldron.java +++ b/common/src/common/block/tech/BlockCauldron.java @@ -3,6 +3,7 @@ package common.block.tech; import java.util.List; import common.block.Block; +import common.block.Material; import common.entity.Entity; import common.entity.item.EntityItem; import common.entity.npc.EntityNPC; @@ -13,7 +14,6 @@ import common.item.Item; import common.item.ItemArmor; import common.item.ItemBanner; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.properties.IProperty; @@ -414,7 +414,7 @@ public class BlockCauldron extends Block public BlockCauldron() { - super(Material.iron); + super(Material.SOLID); this.setDefaultState(this.getBaseState().withProperty(LEVEL, Integer.valueOf(0))); } diff --git a/common/src/common/block/tech/BlockChest.java b/common/src/common/block/tech/BlockChest.java index 11c0e60..b4bcac3 100755 --- a/common/src/common/block/tech/BlockChest.java +++ b/common/src/common/block/tech/BlockChest.java @@ -2,6 +2,7 @@ package common.block.tech; import common.block.Block; import common.block.BlockContainer; +import common.block.Material; import common.color.TextColor; import common.entity.Entity; import common.entity.animal.EntityOcelot; @@ -16,7 +17,6 @@ import common.inventory.InventoryHelper; import common.inventory.InventoryLargeChest; import common.item.CheatTab; import common.item.ItemStack; -import common.material.Material; import common.packet.SPacketSoundEffect; import common.properties.IProperty; import common.properties.PropertyDirection; @@ -42,10 +42,10 @@ public class BlockChest extends BlockContainer public BlockChest(int type) { - super(Material.wood); + super(Material.WOOD); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH)); this.chestType = type; - this.setTab(CheatTab.tabTech); + this.setTab(CheatTab.TECHNOLOGY); this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F); } diff --git a/common/src/common/block/tech/BlockCore.java b/common/src/common/block/tech/BlockCore.java index 3378fea..640fe9d 100755 --- a/common/src/common/block/tech/BlockCore.java +++ b/common/src/common/block/tech/BlockCore.java @@ -1,17 +1,17 @@ package common.block.tech; import common.block.Block; +import common.block.Material; import common.init.Config; import common.item.CheatTab; -import common.material.Material; import common.util.BlockPos; import common.world.State; import common.world.AWorldServer; public class BlockCore extends Block { public BlockCore() { - super(Material.iron); - this.setTab(CheatTab.tabTech); + super(Material.SOLID); + this.setTab(CheatTab.TECHNOLOGY); } public void onBlockRemoved(AWorldServer world, BlockPos pos, State state) diff --git a/common/src/common/block/tech/BlockDaylightDetector.java b/common/src/common/block/tech/BlockDaylightDetector.java index 9b6a91a..f35f530 100755 --- a/common/src/common/block/tech/BlockDaylightDetector.java +++ b/common/src/common/block/tech/BlockDaylightDetector.java @@ -3,6 +3,7 @@ package common.block.tech; import java.util.List; import common.block.BlockContainer; +import common.block.Material; import common.block.SoundType; import common.entity.npc.EntityNPC; import common.init.Blocks; @@ -10,7 +11,6 @@ import common.init.ItemRegistry; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.Transforms; @@ -35,11 +35,11 @@ public class BlockDaylightDetector extends BlockContainer public BlockDaylightDetector(boolean inverted) { - super(Material.wood); + 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.tabTech); + this.setTab(CheatTab.TECHNOLOGY); this.setHardness(0.2F); this.setStepSound(SoundType.WOOD); // this.setDisplay("daylightDetector"); diff --git a/common/src/common/block/tech/BlockDispenser.java b/common/src/common/block/tech/BlockDispenser.java index 15d1875..ed3cd28 100755 --- a/common/src/common/block/tech/BlockDispenser.java +++ b/common/src/common/block/tech/BlockDispenser.java @@ -2,6 +2,7 @@ package common.block.tech; import common.block.Block; import common.block.BlockContainer; +import common.block.Material; import common.dispenser.BehaviorDefaultDispenseItem; import common.dispenser.IBehaviorDispenseItem; import common.dispenser.IBlockSource; @@ -15,7 +16,6 @@ import common.inventory.InventoryHelper; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; @@ -41,9 +41,9 @@ public class BlockDispenser extends BlockContainer public BlockDispenser() { - super(Material.rock); + super(Material.SOLID); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH).withProperty(TRIGGERED, Boolean.valueOf(false))); - this.setTab(CheatTab.tabTech); + this.setTab(CheatTab.TECHNOLOGY); } /** diff --git a/common/src/common/block/tech/BlockEnchantmentTable.java b/common/src/common/block/tech/BlockEnchantmentTable.java index 3c8b3da..d242f81 100755 --- a/common/src/common/block/tech/BlockEnchantmentTable.java +++ b/common/src/common/block/tech/BlockEnchantmentTable.java @@ -1,12 +1,12 @@ package common.block.tech; import common.block.BlockContainer; +import common.block.Material; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.Blocks; import common.item.CheatTab; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ParticleType; @@ -33,10 +33,10 @@ public class BlockEnchantmentTable extends BlockContainer public BlockEnchantmentTable() { - super(Material.rock); + super(Material.SOLID); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.75F, 1.0F); this.setLightOpacity(0); - this.setTab(CheatTab.tabTech); + this.setTab(CheatTab.TECHNOLOGY); } public boolean isFullCube() diff --git a/common/src/common/block/tech/BlockFurnace.java b/common/src/common/block/tech/BlockFurnace.java index dfb8811..4a3d9fa 100755 --- a/common/src/common/block/tech/BlockFurnace.java +++ b/common/src/common/block/tech/BlockFurnace.java @@ -2,6 +2,7 @@ package common.block.tech; import common.block.Block; import common.block.BlockContainer; +import common.block.Material; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.Blocks; @@ -10,7 +11,6 @@ import common.inventory.Container; import common.inventory.InventoryHelper; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; @@ -35,7 +35,7 @@ public class BlockFurnace extends BlockContainer public BlockFurnace(boolean isBurning) { - super(Material.rock); + super(Material.SOLID); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH)); this.isBurning = isBurning; } diff --git a/common/src/common/block/tech/BlockHopper.java b/common/src/common/block/tech/BlockHopper.java index 729dfca..5690a9c 100755 --- a/common/src/common/block/tech/BlockHopper.java +++ b/common/src/common/block/tech/BlockHopper.java @@ -5,6 +5,7 @@ import java.util.function.Predicate; import common.block.Block; import common.block.BlockContainer; +import common.block.Material; import common.entity.Entity; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; @@ -12,7 +13,6 @@ import common.inventory.Container; import common.inventory.InventoryHelper; import common.item.CheatTab; import common.item.ItemStack; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -95,9 +95,9 @@ public class BlockHopper extends BlockContainer public BlockHopper() { - super(Material.iron); + super(Material.SOLID); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.DOWN).withProperty(ENABLED, Boolean.valueOf(true))); - this.setTab(CheatTab.tabTech); + this.setTab(CheatTab.TECHNOLOGY); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); } diff --git a/common/src/common/block/tech/BlockJukebox.java b/common/src/common/block/tech/BlockJukebox.java index fde7f5e..cfe625d 100755 --- a/common/src/common/block/tech/BlockJukebox.java +++ b/common/src/common/block/tech/BlockJukebox.java @@ -1,10 +1,10 @@ package common.block.tech; import common.block.Block; +import common.block.Material; import common.entity.npc.EntityNPC; import common.init.SoundEvent; import common.item.CheatTab; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.util.BlockPos; @@ -14,8 +14,8 @@ import common.world.World; public class BlockJukebox extends Block { public BlockJukebox() { - super(Material.wood); - this.setTab(CheatTab.tabTech); + super(Material.WOOD); + this.setTab(CheatTab.TECHNOLOGY); } public boolean onBlockActivated(World worldIn, BlockPos pos, State state, EntityNPC playerIn, Facing side, float hitX, float hitY, float hitZ) { diff --git a/common/src/common/block/tech/BlockLever.java b/common/src/common/block/tech/BlockLever.java index fef2544..369c363 100755 --- a/common/src/common/block/tech/BlockLever.java +++ b/common/src/common/block/tech/BlockLever.java @@ -1,11 +1,11 @@ package common.block.tech; import common.block.Block; +import common.block.Material; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.SoundEvent; import common.item.CheatTab; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; @@ -28,9 +28,9 @@ public class BlockLever extends Block public BlockLever() { - super(Material.circuits); + super(Material.SMALL); this.setDefaultState(this.getBaseState().withProperty(FACING, BlockLever.EnumOrientation.NORTH).withProperty(POWERED, Boolean.valueOf(false))); - this.setTab(CheatTab.tabTech); + this.setTab(CheatTab.TECHNOLOGY); } public BoundingBox getCollisionBoundingBox(World worldIn, BlockPos pos, State state) diff --git a/common/src/common/block/tech/BlockMachine.java b/common/src/common/block/tech/BlockMachine.java index be00a26..3275f8d 100755 --- a/common/src/common/block/tech/BlockMachine.java +++ b/common/src/common/block/tech/BlockMachine.java @@ -3,12 +3,12 @@ package common.block.tech; import common.block.Block; import common.block.BlockDirectional; import common.block.ITileEntityProvider; +import common.block.Material; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.inventory.Container; import common.inventory.InventoryHelper; import common.item.CheatTab; -import common.material.Material; import common.properties.IProperty; import common.tileentity.TileEntity; import common.tileentity.TileEntityMachine; @@ -20,10 +20,10 @@ import common.world.AWorldServer; public abstract class BlockMachine extends BlockDirectional implements ITileEntityProvider { public BlockMachine() { - super(Material.iron); + super(Material.SOLID); this.hasTile = true; this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH)); - this.setTab(CheatTab.tabTech); + this.setTab(CheatTab.TECHNOLOGY); } public abstract TileEntity createNewTileEntity(World worldIn); diff --git a/common/src/common/block/tech/BlockMobSpawner.java b/common/src/common/block/tech/BlockMobSpawner.java index acfbb2f..4a46f35 100755 --- a/common/src/common/block/tech/BlockMobSpawner.java +++ b/common/src/common/block/tech/BlockMobSpawner.java @@ -1,9 +1,9 @@ package common.block.tech; import common.block.BlockContainer; +import common.block.Material; import common.item.CheatTab; import common.item.Item; -import common.material.Material; import common.model.BlockLayer; import common.rng.Random; import common.tileentity.TileEntity; @@ -16,8 +16,8 @@ public class BlockMobSpawner extends BlockContainer { public BlockMobSpawner() { - super(Material.rock); - this.setTab(CheatTab.tabTech); + super(Material.SOLID); + this.setTab(CheatTab.TECHNOLOGY); } /** diff --git a/common/src/common/block/tech/BlockNote.java b/common/src/common/block/tech/BlockNote.java index 7d2f198..f89f2b1 100755 --- a/common/src/common/block/tech/BlockNote.java +++ b/common/src/common/block/tech/BlockNote.java @@ -2,10 +2,10 @@ package common.block.tech; import common.block.Block; import common.block.BlockContainer; +import common.block.Material; import common.entity.npc.EntityNPC; import common.init.SoundEvent; import common.item.CheatTab; -import common.material.Material; import common.model.ParticleType; import common.tileentity.TileEntity; import common.tileentity.TileEntityNote; @@ -20,8 +20,8 @@ public class BlockNote extends BlockContainer public BlockNote() { - super(Material.wood); - this.setTab(CheatTab.tabTech); + super(Material.WOOD); + this.setTab(CheatTab.TECHNOLOGY); } /** diff --git a/common/src/common/block/tech/BlockNuke.java b/common/src/common/block/tech/BlockNuke.java index add3c4c..1413eed 100755 --- a/common/src/common/block/tech/BlockNuke.java +++ b/common/src/common/block/tech/BlockNuke.java @@ -1,11 +1,11 @@ package common.block.tech; import common.block.Block; +import common.block.Material; import common.entity.item.EntityNuke; import common.init.Blocks; import common.init.SoundEvent; import common.item.CheatTab; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.util.BlockPos; @@ -18,8 +18,8 @@ public class BlockNuke extends Block { public BlockNuke() { - super(Material.tnt); - this.setTab(CheatTab.tabTech); + super(Material.EXPLOSIVE); + this.setTab(CheatTab.TECHNOLOGY); } public void onBlockAdded(AWorldServer worldIn, BlockPos pos, State state) diff --git a/common/src/common/block/tech/BlockPistonBase.java b/common/src/common/block/tech/BlockPistonBase.java index 313a9a2..e5a2db7 100755 --- a/common/src/common/block/tech/BlockPistonBase.java +++ b/common/src/common/block/tech/BlockPistonBase.java @@ -4,6 +4,7 @@ import java.util.List; import common.block.Block; import common.block.ITileEntityProvider; +import common.block.Material; import common.block.SoundType; import common.collect.Lists; import common.entity.Entity; @@ -13,7 +14,6 @@ import common.init.Config; import common.init.SoundEvent; import common.item.CheatTab; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; @@ -254,12 +254,12 @@ public class BlockPistonBase extends Block public BlockPistonBase(boolean isSticky) { - super(Material.piston); + super(Material.PISTON); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH).withProperty(EXTENDED, Boolean.valueOf(false))); this.isSticky = isSticky; this.setStepSound(SoundType.STONE); this.setHardness(0.5F); - this.setTab(CheatTab.tabTech); + this.setTab(CheatTab.TECHNOLOGY); } /** diff --git a/common/src/common/block/tech/BlockPistonHead.java b/common/src/common/block/tech/BlockPistonHead.java index ce55cce..21aa5e2 100755 --- a/common/src/common/block/tech/BlockPistonHead.java +++ b/common/src/common/block/tech/BlockPistonHead.java @@ -3,12 +3,12 @@ package common.block.tech; import java.util.List; import common.block.Block; +import common.block.Material; import common.block.SoundType; import common.entity.Entity; import common.init.Blocks; import common.init.ItemRegistry; import common.item.Item; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; @@ -34,7 +34,7 @@ public class BlockPistonHead extends Block public BlockPistonHead() { - super(Material.piston); + super(Material.PISTON); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH).withProperty(TYPE, BlockPistonHead.EnumPistonType.DEFAULT).withProperty(SHORT, Boolean.valueOf(false))); this.setStepSound(SoundType.STONE); this.setHardness(0.5F); diff --git a/common/src/common/block/tech/BlockPistonMoving.java b/common/src/common/block/tech/BlockPistonMoving.java index 9da811e..666061d 100755 --- a/common/src/common/block/tech/BlockPistonMoving.java +++ b/common/src/common/block/tech/BlockPistonMoving.java @@ -2,10 +2,10 @@ package common.block.tech; import common.block.Block; import common.block.BlockContainer; +import common.block.Material; import common.entity.npc.EntityNPC; import common.init.Blocks; import common.item.Item; -import common.material.Material; import common.properties.IProperty; import common.properties.PropertyDirection; import common.properties.PropertyEnum; @@ -29,7 +29,7 @@ public class BlockPistonMoving extends BlockContainer public BlockPistonMoving() { - super(Material.piston); + super(Material.PISTON); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH).withProperty(TYPE, BlockPistonHead.EnumPistonType.DEFAULT)); this.setHardness(-1.0F); } diff --git a/common/src/common/block/tech/BlockPressurePlate.java b/common/src/common/block/tech/BlockPressurePlate.java index 677f88d..b17b4b0 100755 --- a/common/src/common/block/tech/BlockPressurePlate.java +++ b/common/src/common/block/tech/BlockPressurePlate.java @@ -2,9 +2,9 @@ package common.block.tech; import java.util.List; +import common.block.Material; import common.entity.Entity; import common.entity.types.EntityLiving; -import common.material.Material; import common.properties.IProperty; import common.properties.PropertyBool; import common.util.BlockPos; diff --git a/common/src/common/block/tech/BlockPressurePlateWeighted.java b/common/src/common/block/tech/BlockPressurePlateWeighted.java index 55e7b7c..eeac2ec 100755 --- a/common/src/common/block/tech/BlockPressurePlateWeighted.java +++ b/common/src/common/block/tech/BlockPressurePlateWeighted.java @@ -1,7 +1,7 @@ package common.block.tech; +import common.block.Material; import common.entity.Entity; -import common.material.Material; import common.properties.IProperty; import common.properties.PropertyInteger; import common.util.BlockPos; diff --git a/common/src/common/block/tech/BlockRailBase.java b/common/src/common/block/tech/BlockRailBase.java index 2ef7c4c..198c04e 100755 --- a/common/src/common/block/tech/BlockRailBase.java +++ b/common/src/common/block/tech/BlockRailBase.java @@ -3,10 +3,10 @@ package common.block.tech; import java.util.List; import common.block.Block; +import common.block.Material; import common.collect.Lists; import common.init.Blocks; import common.item.CheatTab; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -40,10 +40,10 @@ public abstract class BlockRailBase extends Block public BlockRailBase(boolean isPowered) { - super(Material.circuits); + super(Material.SMALL); this.isPowered = isPowered; this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F); - this.setTab(CheatTab.tabTech); + this.setTab(CheatTab.TECHNOLOGY); } public BoundingBox getCollisionBoundingBox(World worldIn, BlockPos pos, State state) diff --git a/common/src/common/block/tech/BlockRedstoneDiode.java b/common/src/common/block/tech/BlockRedstoneDiode.java index 63cf8e9..5c61033 100755 --- a/common/src/common/block/tech/BlockRedstoneDiode.java +++ b/common/src/common/block/tech/BlockRedstoneDiode.java @@ -2,10 +2,10 @@ package common.block.tech; import common.block.Block; import common.block.BlockDirectional; +import common.block.Material; import common.entity.types.EntityLiving; import common.init.Blocks; import common.item.ItemStack; -import common.material.Material; import common.model.BlockLayer; import common.rng.Random; import common.util.BlockPos; @@ -22,7 +22,7 @@ public abstract class BlockRedstoneDiode extends BlockDirectional public BlockRedstoneDiode(boolean powered) { - super(Material.circuits); + super(Material.SMALL); this.isRepeaterPowered = powered; this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 1.0F); } diff --git a/common/src/common/block/tech/BlockRedstoneLight.java b/common/src/common/block/tech/BlockRedstoneLight.java index 4ca9c78..dad8d50 100755 --- a/common/src/common/block/tech/BlockRedstoneLight.java +++ b/common/src/common/block/tech/BlockRedstoneLight.java @@ -1,11 +1,11 @@ package common.block.tech; import common.block.Block; +import common.block.Material; import common.init.Blocks; import common.init.ItemRegistry; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.world.State; @@ -18,7 +18,7 @@ public class BlockRedstoneLight extends Block public BlockRedstoneLight(boolean isOn) { - super(Material.redstoneLight); + super(Material.LOOSE); this.isOn = isOn; if (isOn) diff --git a/common/src/common/block/tech/BlockRedstoneWire.java b/common/src/common/block/tech/BlockRedstoneWire.java index ba4c65c..c461f4f 100755 --- a/common/src/common/block/tech/BlockRedstoneWire.java +++ b/common/src/common/block/tech/BlockRedstoneWire.java @@ -5,12 +5,12 @@ import java.util.List; import java.util.Set; import common.block.Block; +import common.block.Material; import common.collect.Lists; import common.collect.Sets; import common.init.Blocks; import common.init.Items; import common.item.Item; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -369,7 +369,7 @@ public class BlockRedstoneWire extends Block public BlockRedstoneWire() { - super(Material.circuits); + super(Material.SMALL); this.setDefaultState(this.getBaseState().withProperty(NORTH, BlockRedstoneWire.EnumAttachPosition.NONE).withProperty(EAST, BlockRedstoneWire.EnumAttachPosition.NONE).withProperty(SOUTH, BlockRedstoneWire.EnumAttachPosition.NONE).withProperty(WEST, BlockRedstoneWire.EnumAttachPosition.NONE).withProperty(POWER, Integer.valueOf(0))); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F); } diff --git a/common/src/common/block/tech/BlockTNT.java b/common/src/common/block/tech/BlockTNT.java index a5f3769..6d595a3 100755 --- a/common/src/common/block/tech/BlockTNT.java +++ b/common/src/common/block/tech/BlockTNT.java @@ -3,6 +3,7 @@ package common.block.tech; import java.util.List; import common.block.Block; +import common.block.Material; import common.entity.Entity; import common.entity.item.EntityTnt; import common.entity.npc.EntityNPC; @@ -13,7 +14,6 @@ import common.init.SoundEvent; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.properties.IProperty; @@ -33,9 +33,9 @@ public class BlockTNT extends Block public BlockTNT() { - super(Material.tnt); + super(Material.EXPLOSIVE); this.setDefaultState(this.getBaseState().withProperty(EXPLODE, Boolean.valueOf(false))); - this.setTab(CheatTab.tabTech); + this.setTab(CheatTab.TECHNOLOGY); } public void onBlockAdded(AWorldServer worldIn, BlockPos pos, State state) diff --git a/common/src/common/block/tech/BlockTorch.java b/common/src/common/block/tech/BlockTorch.java index 090960c..eed80aa 100755 --- a/common/src/common/block/tech/BlockTorch.java +++ b/common/src/common/block/tech/BlockTorch.java @@ -4,11 +4,11 @@ import java.util.function.Predicate; import common.block.Block; import common.block.BlockDirectional; +import common.block.Material; import common.block.artificial.BlockFence; import common.entity.types.EntityLiving; import common.init.Blocks; import common.item.CheatTab; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -46,10 +46,10 @@ public class BlockTorch extends Block public BlockTorch() { - super(Material.circuits); + super(Material.SMALL); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.UP)); // this.setTickRandomly(true); - this.setTab(CheatTab.tabTech); + this.setTab(CheatTab.TECHNOLOGY); } public BoundingBox getCollisionBoundingBox(World worldIn, BlockPos pos, State state) diff --git a/common/src/common/block/tech/BlockTripWire.java b/common/src/common/block/tech/BlockTripWire.java index 258db32..2ed4b05 100755 --- a/common/src/common/block/tech/BlockTripWire.java +++ b/common/src/common/block/tech/BlockTripWire.java @@ -3,13 +3,13 @@ package common.block.tech; import java.util.List; import common.block.Block; +import common.block.Material; import common.entity.Entity; import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.Items; import common.item.Item; import common.item.ItemShears; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -39,7 +39,7 @@ public class BlockTripWire extends Block public BlockTripWire() { - super(Material.circuits); + super(Material.SMALL); this.setDefaultState(this.getBaseState().withProperty(POWERED, Boolean.valueOf(false)).withProperty(SUSPENDED, Boolean.valueOf(false)).withProperty(ATTACHED, Boolean.valueOf(false)).withProperty(DISARMED, Boolean.valueOf(false)).withProperty(NORTH, Boolean.valueOf(false)).withProperty(EAST, Boolean.valueOf(false)).withProperty(SOUTH, Boolean.valueOf(false)).withProperty(WEST, Boolean.valueOf(false))); this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.15625F, 1.0F); // this.setTickRandomly(true); diff --git a/common/src/common/block/tech/BlockTripWireHook.java b/common/src/common/block/tech/BlockTripWireHook.java index af7e37a..95cb387 100755 --- a/common/src/common/block/tech/BlockTripWireHook.java +++ b/common/src/common/block/tech/BlockTripWireHook.java @@ -1,12 +1,12 @@ package common.block.tech; import common.block.Block; +import common.block.Material; import common.entity.types.EntityLiving; import common.init.Blocks; import common.init.SoundEvent; import common.item.CheatTab; import common.item.ItemStack; -import common.material.Material; import common.model.BlockLayer; import common.model.Model; import common.model.ModelProvider; @@ -32,9 +32,9 @@ public class BlockTripWireHook extends Block public BlockTripWireHook() { - super(Material.circuits); + super(Material.SMALL); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH).withProperty(POWERED, Boolean.valueOf(false)).withProperty(ATTACHED, Boolean.valueOf(false)).withProperty(SUSPENDED, Boolean.valueOf(false))); - this.setTab(CheatTab.tabTech); + this.setTab(CheatTab.TECHNOLOGY); // this.setTickRandomly(true); } diff --git a/common/src/common/block/tech/BlockWarpChest.java b/common/src/common/block/tech/BlockWarpChest.java index d6270b7..e1cfa54 100755 --- a/common/src/common/block/tech/BlockWarpChest.java +++ b/common/src/common/block/tech/BlockWarpChest.java @@ -1,6 +1,7 @@ package common.block.tech; import common.block.Block; +import common.block.Material; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.Blocks; @@ -9,7 +10,6 @@ import common.inventory.InventoryWarpChest; import common.item.CheatTab; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ModelRotation; @@ -29,9 +29,9 @@ public class BlockWarpChest extends Block public BlockWarpChest() { - super(Material.rock); + super(Material.SOLID); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH)); - this.setTab(CheatTab.tabTech); + this.setTab(CheatTab.TECHNOLOGY); this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F); } diff --git a/common/src/common/block/tech/BlockWorkbench.java b/common/src/common/block/tech/BlockWorkbench.java index fcaea1d..bc54d96 100755 --- a/common/src/common/block/tech/BlockWorkbench.java +++ b/common/src/common/block/tech/BlockWorkbench.java @@ -1,13 +1,13 @@ package common.block.tech; import common.block.Block; +import common.block.Material; import common.entity.npc.EntityNPC; import common.init.BlockRegistry; import common.inventory.Container; import common.inventory.ContainerWorkbench; import common.inventory.InventoryPlayer; import common.item.CheatTab; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.tileentity.IInteractionObject; @@ -22,8 +22,8 @@ public class BlockWorkbench extends Block public BlockWorkbench(int size) { - super(Material.wood); - this.setTab(CheatTab.tabTech); + super(Material.WOOD); + this.setTab(CheatTab.TECHNOLOGY); this.size = size; } diff --git a/common/src/common/block/tile/BlockBanner.java b/common/src/common/block/tile/BlockBanner.java index 78a419b..cec3815 100755 --- a/common/src/common/block/tile/BlockBanner.java +++ b/common/src/common/block/tile/BlockBanner.java @@ -2,11 +2,11 @@ package common.block.tile; import common.block.Block; import common.block.BlockContainer; +import common.block.Material; import common.entity.npc.EntityNPC; import common.init.Items; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Transforms; import common.nbt.NBTTagCompound; import common.properties.IProperty; @@ -30,7 +30,7 @@ public class BlockBanner extends BlockContainer public BlockBanner() { - super(Material.wood); + super(Material.WOOD); float f = 0.25F; float f1 = 1.0F; this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f1, 0.5F + f); diff --git a/common/src/common/block/tile/BlockSign.java b/common/src/common/block/tile/BlockSign.java index 639a546..76fde3c 100755 --- a/common/src/common/block/tile/BlockSign.java +++ b/common/src/common/block/tile/BlockSign.java @@ -1,11 +1,11 @@ package common.block.tile; import common.block.BlockContainer; +import common.block.Material; import common.entity.npc.EntityNPC; import common.init.Config; import common.init.Items; import common.item.Item; -import common.material.Material; import common.rng.Random; import common.tileentity.TileEntity; import common.tileentity.TileEntitySign; @@ -20,7 +20,7 @@ public class BlockSign extends BlockContainer { public BlockSign() { - super(Material.wood); + super(Material.WOOD); float f = 0.25F; float f1 = 1.0F; this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f1, 0.5F + f); diff --git a/common/src/common/block/tile/BlockSkull.java b/common/src/common/block/tile/BlockSkull.java index e85a740..e72d161 100755 --- a/common/src/common/block/tile/BlockSkull.java +++ b/common/src/common/block/tile/BlockSkull.java @@ -1,11 +1,11 @@ package common.block.tile; import common.block.BlockContainer; +import common.block.Material; import common.entity.types.EntityLiving; import common.init.Items; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.Transforms; import common.properties.IProperty; import common.properties.PropertyDirection; @@ -26,7 +26,7 @@ public class BlockSkull extends BlockContainer public BlockSkull() { - super(Material.circuits); + super(Material.SMALL); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH)); this.setBlockBounds(0.25F, 0.0F, 0.25F, 0.75F, 0.5F, 0.75F); } diff --git a/common/src/common/entity/Entity.java b/common/src/common/entity/Entity.java index 890739c..d8bd638 100755 --- a/common/src/common/entity/Entity.java +++ b/common/src/common/entity/Entity.java @@ -3,6 +3,7 @@ package common.entity; import java.util.List; import common.block.Block; +import common.block.Material; import common.block.SoundType; import common.block.artificial.BlockFence; import common.block.artificial.BlockFenceGate; @@ -25,7 +26,6 @@ import common.init.SoundEvent; import common.init.UniverseRegistry; import common.item.Item; import common.item.ItemStack; -import common.material.Material; import common.model.ParticleType; import common.nbt.NBTTagCompound; import common.nbt.NBTTagDouble; @@ -1014,7 +1014,7 @@ public abstract class Entity this.worldObj.spawnParticle(ParticleType.WATER_BUBBLE, this.posX + (double)f2, (double)(f1 + 1.0F), this.posZ + (double)f3, this.motionX, this.motionY - (double)(this.rand.floatv() * 0.2F), this.motionZ); } - if(this.worldObj.getState(new BlockPos(this.posX, this.posY, this.posZ)).getBlock().getMaterial() == Material.water) { + if(this.worldObj.getState(new BlockPos(this.posX, this.posY, this.posZ)).getBlock().getMaterial() == Material.WATER) { for (int j = 0; (float)j < 1.0F + this.width * 20.0F; ++j) { float f4 = (this.rand.floatv() * 2.0F - 1.0F) * this.width; diff --git a/common/src/common/entity/item/EntityItem.java b/common/src/common/entity/item/EntityItem.java index 6b7abf7..82f47e4 100755 --- a/common/src/common/entity/item/EntityItem.java +++ b/common/src/common/entity/item/EntityItem.java @@ -1,5 +1,6 @@ package common.entity.item; +import common.block.Material; import common.color.TextColor; import common.entity.DamageSource; import common.entity.Entity; @@ -12,7 +13,6 @@ import common.init.ItemRegistry; import common.init.SoundEvent; import common.item.ItemStack; import common.log.Log; -import common.material.Material; import common.model.ParticleType; import common.nbt.NBTTagCompound; import common.util.BlockPos; @@ -125,7 +125,7 @@ public class EntityItem extends Entity if (flag || this.ticksExisted % 25 == 0) { - if (this.worldObj.getState(new BlockPos(this)).getBlock().getMaterial() == Material.lava) + if (this.worldObj.getState(new BlockPos(this)).getBlock().getMaterial() == Material.LAVA) { this.motionY = 0.20000000298023224D; this.motionX = (double)((this.rand.floatv() - this.rand.floatv()) * 0.2F); diff --git a/common/src/common/entity/item/EntityXp.java b/common/src/common/entity/item/EntityXp.java index 43a5e6a..a097b69 100755 --- a/common/src/common/entity/item/EntityXp.java +++ b/common/src/common/entity/item/EntityXp.java @@ -1,5 +1,6 @@ package common.entity.item; +import common.block.Material; import common.color.TextColor; import common.entity.DamageSource; import common.entity.Entity; @@ -8,7 +9,6 @@ import common.entity.npc.EntityNPC; import common.entity.types.IObjectData; import common.init.Config; import common.init.SoundEvent; -import common.material.Material; import common.model.ParticleType; import common.nbt.NBTTagCompound; import common.util.BlockPos; @@ -106,7 +106,7 @@ public class EntityXp extends Entity implements IObjectData this.prevZ = this.posZ; this.motionY -= 0.029999999329447746D; - if (this.worldObj.getState(new BlockPos(this)).getBlock().getMaterial() == Material.lava) + if (this.worldObj.getState(new BlockPos(this)).getBlock().getMaterial() == Material.LAVA) { this.motionY = 0.20000000298023224D; this.motionX = (double)((this.rand.floatv() - this.rand.floatv()) * 0.2F); diff --git a/common/src/common/init/BlockRegistry.java b/common/src/common/init/BlockRegistry.java index 036be1a..509cb19 100755 --- a/common/src/common/init/BlockRegistry.java +++ b/common/src/common/init/BlockRegistry.java @@ -126,7 +126,6 @@ import common.block.tile.BlockWallSign; import common.color.DyeColor; import common.init.FluidRegistry.LiquidType; import common.item.CheatTab; -import common.material.Material; import common.util.ObjectIntIdentityMap; import common.util.RegistryNamespacedDefaultedByKey; import common.world.State; @@ -271,19 +270,19 @@ public abstract class BlockRegistry { Block stone = (new BlockStone()).setHardness(1.5F).setResistance(10.0F).setStepSound(SoundType.STONE).setDisplay("Stein"); registerBlock(1, "stone", stone); registerBlock(2, "bedrock", (new BlockBedrock()).setHardness(1000.0F).setResistance(100000.0F).setStepSound(SoundType.STONE) - .setDisplay("Grundgestein").setTab(CheatTab.tabNature).setMiningLevel(6)); + .setDisplay("Grundgestein").setTab(CheatTab.NATURE).setMiningLevel(6)); registerBlock(3, "rock", (new BlockRock()).setHardness(2.0F).setResistance(15.0F).setStepSound(SoundType.STONE).setDisplay("Felsen")); registerBlock(4, "hellrock", (new BlockHellRock()).setHardness(0.4F).setStepSound(SoundType.STONE).setDisplay("Höllenstein")); - registerBlock(5, "cell_rock", (new Block(Material.clay)).setHardness(1.0F).setResistance(3.0F) - .setStepSound(SoundType.SLIME).setDisplay("Zellstein").setTab(CheatTab.tabNature)); - registerBlock(6, "moon_rock", (new Block(Material.rock)).setHardness(2.5F).setResistance(10.0F) - .setStepSound(SoundType.STONE).setDisplay("Mondgestein").setTab(CheatTab.tabNature)); - Block cobblestone = (new Block(Material.rock)).setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE) - .setDisplay("Bruchstein").setTab(CheatTab.tabNature); + registerBlock(5, "cell_rock", (new Block(Material.LOOSE)).setHardness(1.0F).setResistance(3.0F) + .setStepSound(SoundType.SLIME).setDisplay("Zellstein").setTab(CheatTab.NATURE)); + registerBlock(6, "moon_rock", (new Block(Material.SOLID)).setHardness(2.5F).setResistance(10.0F) + .setStepSound(SoundType.STONE).setDisplay("Mondgestein").setTab(CheatTab.NATURE)); + Block cobblestone = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE) + .setDisplay("Bruchstein").setTab(CheatTab.NATURE); registerBlock(7, "cobblestone", cobblestone); - registerBlock(8, "mossy_cobblestone", (new Block(Material.rock)).setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE) - .setDisplay("Bemooster Bruchstein").setTab(CheatTab.tabNature)); + registerBlock(8, "mossy_cobblestone", (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE) + .setDisplay("Bemooster Bruchstein").setTab(CheatTab.NATURE)); Block sandstone = (new BlockSandStone()).setStepSound(SoundType.STONE).setHardness(0.8F).setDisplay("Sandstein"); registerBlock(9, "sandstone", sandstone); registerBlock(10, "obsidian", (new BlockObsidian()).setHardness(50.0F).setResistance(2000.0F).setStepSound(SoundType.STONE) @@ -292,16 +291,16 @@ public abstract class BlockRegistry { (new BlockClay()).setHardness(0.6F).setStepSound(SoundType.GRAVEL).setDisplay("Ton").setShovelHarvestable()); registerBlock(12, "hardened_clay", (new BlockHardenedClay()).setHardness(1.25F).setResistance(7.0F).setStepSound(SoundType.STONE).setDisplay("Gebrannter Ton")); - registerBlock(13, "stained_hardened_clay", (new BlockColored(Material.rock)).setHardness(1.25F).setResistance(7.0F) - .setStepSound(SoundType.STONE).setDisplay("gefärbter Ton").setTab(CheatTab.tabNature)); - registerBlock(14, "coal_block", (new Block(Material.rock)).setHardness(5.0F).setResistance(10.0F) - .setStepSound(SoundType.STONE).setDisplay("Kohleblock").setTab(CheatTab.tabNature)); + registerBlock(13, "stained_hardened_clay", (new BlockColored(Material.SOLID)).setHardness(1.25F).setResistance(7.0F) + .setStepSound(SoundType.STONE).setDisplay("gefärbter Ton").setTab(CheatTab.NATURE)); + registerBlock(14, "coal_block", (new Block(Material.SOLID)).setHardness(5.0F).setResistance(10.0F) + .setStepSound(SoundType.STONE).setDisplay("Kohleblock").setTab(CheatTab.NATURE)); registerBlock(15, "sand", (new BlockSand()).setHardness(0.5F).setStepSound(SoundType.SAND).setDisplay("Sand").setShovelHarvestable()); registerBlock(16, "gravel", (new BlockGravel()).setHardness(0.6F).setStepSound(SoundType.GRAVEL).setDisplay("Kies").setShovelHarvestable()); registerBlock(17, "ash", - (new Block(Material.sand)).setHardness(0.2F).setStepSound(SoundType.SAND).setDisplay("Asche") - .setTab(CheatTab.tabNature).setShovelHarvestable()); + (new Block(Material.LOOSE)).setHardness(0.2F).setStepSound(SoundType.SAND).setDisplay("Asche") + .setTab(CheatTab.NATURE).setShovelHarvestable()); registerBlock(18, "snow_layer", (new BlockSnow()).setHardness(0.1F).setStepSound(SoundType.SNOW).setDisplay("Schnee").setLightOpacity(0) .setShovelHarvestable()); registerBlock(19, "snow", @@ -312,11 +311,11 @@ public abstract class BlockRegistry { (new BlockPackedIce()).setHardness(0.5F).setStepSound(SoundType.GLASS).setDisplay("Packeis").setMiningLevel(0)); registerBlock(22, "soul_sand", (new BlockSoulSand()).setHardness(0.5F).setStepSound(SoundType.SAND).setDisplay("Seelensand").setShovelHarvestable()); - registerBlock(23, "glowstone", (new BlockGlowstone(Material.glass)).setHardness(0.3F).setStepSound(SoundType.GLASS).setLightLevel(1.0F) + registerBlock(23, "glowstone", (new BlockGlowstone(Material.TRANSLUCENT)).setHardness(0.3F).setStepSound(SoundType.GLASS).setLightLevel(1.0F) .setDisplay("Glowstone")); registerBlock(24, "blackened_stone", (new BlockBlackenedStone()).setHardness(1.5F).setResistance(10.0F).setStepSound(SoundType.STONE).setDisplay("Schwarzstein")); - registerBlock(25, "blackened_cobble", (new Block(Material.rock)).setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE) - .setDisplay("Schwarzbruchstein").setTab(CheatTab.tabNature)); + registerBlock(25, "blackened_cobble", (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE) + .setDisplay("Schwarzbruchstein").setTab(CheatTab.NATURE)); registerFluid(32, 33, "water", "Wasser", true, LiquidType.WATER, false, 0, 5, 0.0f, "water", "waterflow"); @@ -343,7 +342,7 @@ public abstract class BlockRegistry { .setDisplay("Schwarzes Quarzerz")); registerBlock(68, "redstone_ore", (new BlockRedstoneOre(false)).setHardness(3.0F).setResistance(5.0F).setStepSound(SoundType.STONE) - .setDisplay("Redstone-Erz").setTab(CheatTab.tabGems).setMiningLevel(2)); + .setDisplay("Redstone-Erz").setTab(CheatTab.GEMS).setMiningLevel(2)); registerBlock(69, "lit_redstone_ore", (new BlockRedstoneOre(true)).setLightLevel(0.625F).setHardness(3.0F).setResistance(5.0F) .setStepSound(SoundType.STONE).setDisplay("Redstone-Erz").setMiningLevel(2)); int bid = 70; @@ -369,12 +368,12 @@ public abstract class BlockRegistry { (new BlockGrass()).setHardness(0.6F).setStepSound(SoundType.GRASS).setDisplay("Gras").setShovelHarvestable()); registerBlock(130, "mycelium", (new BlockMycelium()).setHardness(0.6F).setStepSound(SoundType.GRASS).setDisplay("Myzel").setShovelHarvestable()); - registerBlock(131, "tian", (new Block(Material.rock)).setHardness(2.0F).setResistance(15.0F).setStepSound(SoundType.STONE) - .setDisplay("Tian").setTab(CheatTab.tabNature)); + registerBlock(131, "tian", (new Block(Material.SOLID)).setHardness(2.0F).setResistance(15.0F).setStepSound(SoundType.STONE) + .setDisplay("Tian").setTab(CheatTab.NATURE)); registerBlock(132, "tian_soil", (new BlockTianSoil()).setHardness(2.0F).setResistance(15.0F).setStepSound(SoundType.STONE) - .setDisplay("Tianerde").setTab(CheatTab.tabNature)); - registerBlock(133, "moon_cheese", (new BlockTreasure(Material.gourd)).setHardness(1.5F).setResistance(5.0F) - .setStepSound(SoundType.CLOTH).setDisplay("Mondkäse").setTab(CheatTab.tabNature)); + .setDisplay("Tianerde").setTab(CheatTab.NATURE)); + registerBlock(133, "moon_cheese", (new BlockTreasure(Material.SOFT)).setHardness(1.5F).setResistance(5.0F) + .setStepSound(SoundType.CLOTH).setDisplay("Mondkäse").setTab(CheatTab.NATURE)); registerBlock(134, "slime_block", (new BlockSlime()).setDisplay("Schleimblock").setStepSound(SoundType.SLIME)); registerBlock(135, "blackened_dirt", (new BlockBlackenedDirt()).setHardness(0.5F).setStepSound(SoundType.GRAVEL).setDisplay("Schwarzerde").setShovelHarvestable()); @@ -402,12 +401,12 @@ public abstract class BlockRegistry { Block brownMushroom = (new BlockMushroom()).setHardness(0.0F).setStepSound(SoundType.GRASS).setLightLevel(0.125F) .setDisplay("Pilz"); registerBlock(160, "brown_mushroom", brownMushroom); - registerBlock(161, "brown_mushroom_block", (new BlockHugeMushroom(Material.wood, brownMushroom)).setHardness(0.2F) - .setStepSound(SoundType.WOOD).setDisplay("Pilzblock").setTab(CheatTab.tabPlants)); + registerBlock(161, "brown_mushroom_block", (new BlockHugeMushroom(Material.WOOD, brownMushroom)).setHardness(0.2F) + .setStepSound(SoundType.WOOD).setDisplay("Pilzblock").setTab(CheatTab.PLANTS)); Block redMushrooom = (new BlockMushroom()).setHardness(0.0F).setStepSound(SoundType.GRASS).setDisplay("Pilz"); registerBlock(162, "red_mushroom", redMushrooom); - registerBlock(163, "red_mushroom_block", (new BlockHugeMushroom(Material.wood, redMushrooom)).setHardness(0.2F) - .setStepSound(SoundType.WOOD).setDisplay("Pilzblock").setTab(CheatTab.tabPlants)); + registerBlock(163, "red_mushroom_block", (new BlockHugeMushroom(Material.WOOD, redMushrooom)).setHardness(0.2F) + .setStepSound(SoundType.WOOD).setDisplay("Pilzblock").setTab(CheatTab.PLANTS)); registerBlock(164, "blue_mushroom", (new BlockBlueShroom()).setHardness(0.0F).setStepSound(SoundType.GRASS).setLightLevel(0.5F) .setDisplay("Tianpilz")); @@ -438,25 +437,25 @@ public abstract class BlockRegistry { - registerBlock(256, "lapis_block", (new Block(Material.iron)).setHardness(3.0F).setResistance(5.0F) - .setStepSound(SoundType.STONE).setDisplay("Lapislazuliblock").setTab(CheatTab.tabGems).setMiningLevel(1)); - registerBlock(257, "emerald_block", (new Block(Material.iron)).setHardness(5.0F).setResistance(10.0F) - .setStepSound(SoundType.STONE).setDisplay("Smaragdblock").setTab(CheatTab.tabGems).setMiningLevel(2)); - registerBlock(258, "redstone_block", (new BlockCompressedPowered(Material.iron)).setHardness(5.0F).setResistance(10.0F) - .setStepSound(SoundType.STONE).setDisplay("Redstone-Block").setTab(CheatTab.tabTech)); + registerBlock(256, "lapis_block", (new Block(Material.SOLID)).setHardness(3.0F).setResistance(5.0F) + .setStepSound(SoundType.STONE).setDisplay("Lapislazuliblock").setTab(CheatTab.GEMS).setMiningLevel(1)); + registerBlock(257, "emerald_block", (new Block(Material.SOLID)).setHardness(5.0F).setResistance(10.0F) + .setStepSound(SoundType.STONE).setDisplay("Smaragdblock").setTab(CheatTab.GEMS).setMiningLevel(2)); + registerBlock(258, "redstone_block", (new BlockCompressedPowered(Material.SOLID)).setHardness(5.0F).setResistance(10.0F) + .setStepSound(SoundType.STONE).setDisplay("Redstone-Block").setTab(CheatTab.TECHNOLOGY)); registerBlock(270, "glass", (new BlockGlass()).setHardness(0.3F).setStepSound(SoundType.GLASS).setDisplay("Glas")); registerBlock(271, "stained_glass", (new BlockStainedGlass()).setHardness(0.3F).setStepSound(SoundType.GLASS).setDisplay("gefärbtes Glas")); registerBlock(272, "glass_pane", - (new BlockPane(Material.glass, false)).setHardness(0.3F).setStepSound(SoundType.GLASS).setDisplay("Glasscheibe")); + (new BlockPane(Material.TRANSLUCENT, false)).setHardness(0.3F).setStepSound(SoundType.GLASS).setDisplay("Glasscheibe")); registerBlock(273, "stained_glass_pane", (new BlockStainedGlassPane()).setHardness(0.3F).setStepSound(SoundType.GLASS).setDisplay("gefärbte Glasscheibe")); - registerBlock(280, "wool", (new BlockColored(Material.cloth)).setHardness(0.8F).setStepSound(SoundType.CLOTH).setDisplay("Wolle") + registerBlock(280, "wool", (new BlockColored(Material.BURNABLE)).setHardness(0.8F).setStepSound(SoundType.CLOTH).setDisplay("Wolle") .setShearsEfficiency(1)); registerBlock(281, "carpet", (new BlockCarpet()).setHardness(0.1F).setStepSound(SoundType.CLOTH).setDisplay("Teppich").setLightOpacity(0)); @@ -469,20 +468,20 @@ public abstract class BlockRegistry { (new BlockLadder()).setHardness(0.4F).setStepSound(SoundType.LADDER).setDisplay("Leiter").setAxeHarvestable()); registerBlock(301, "torch", (new BlockTorch()).setHardness(0.0F).setLightLevel(0.9375F).setStepSound(SoundType.WOOD).setDisplay("Fackel")); - registerBlock(302, "lamp", (new Block(Material.glass)).setHardness(0.3F).setStepSound(SoundType.GLASS).setLightLevel(1.0F) - .setDisplay("Lampe").setTab(CheatTab.tabTech)); + registerBlock(302, "lamp", (new Block(Material.TRANSLUCENT)).setHardness(0.3F).setStepSound(SoundType.GLASS).setLightLevel(1.0F) + .setDisplay("Lampe").setTab(CheatTab.TECHNOLOGY)); registerBlock(304, "bookshelf", (new BlockBookshelf()).setHardness(1.5F).setStepSound(SoundType.WOOD).setDisplay("Bücherregal")); registerBlock(305, "cake", (new BlockCake()).setHardness(0.5F).setStepSound(SoundType.CLOTH).setDisplay("Kuchen")); registerBlock(306, "dragon_egg", (new BlockDragonEgg()).setHardness(3.0F).setResistance(15.0F).setStepSound(SoundType.STONE) - .setLightLevel(0.125F).setDisplay("Drachenei").setTab(CheatTab.tabDeco)); + .setLightLevel(0.125F).setDisplay("Drachenei").setTab(CheatTab.DECORATION)); registerBlock(307, "flower_pot", (new BlockFlowerPot()).setHardness(0.0F).setStepSound(SoundType.STONE).setDisplay("Blumentopf")); - registerBlock(308, "sponge", (new Block(Material.sponge)).setHardness(0.6F).setStepSound(SoundType.GRASS).setDisplay("Schwamm") - .setTab(CheatTab.tabDeco)); + registerBlock(308, "sponge", (new Block(Material.LOOSE)).setHardness(0.6F).setStepSound(SoundType.GRASS).setDisplay("Schwamm") + .setTab(CheatTab.DECORATION)); registerBlock(309, "skull", (new BlockSkull()).setHardness(1.0F).setStepSound(SoundType.STONE).setDisplay("Kopf")); registerBlock(310, "lit_pumpkin", (new BlockPumpkin()).setHardness(1.0F).setStepSound(SoundType.WOOD).setLightLevel(1.0F).setDisplay("Kürbislaterne")); registerBlock(311, "hay_block", (new BlockHay()).setHardness(0.5F).setStepSound(SoundType.GRASS).setDisplay("Strohballen") - .setTab(CheatTab.tabDeco)); + .setTab(CheatTab.DECORATION)); registerBlock(312, "sign", (new BlockStandingSign()).setHardness(1.0F).setStepSound(SoundType.WOOD).setDisplay("Schild")); registerBlock(313, "wall_sign", @@ -494,12 +493,12 @@ public abstract class BlockRegistry { registerBlock(390, "portal", (new BlockPortal()).setHardness(0.0F).setStepSound(SoundType.GLASS).setLightLevel(0.75F).setDisplay("Portal")); - registerBlock(391, "floor_portal", (new BlockFloorPortal(Material.portal)).setHardness(0.0F).setDisplay("Portal")); + registerBlock(391, "floor_portal", (new BlockFloorPortal(Material.PORTAL)).setHardness(0.0F).setDisplay("Portal")); registerBlock(392, "portal_frame", (new BlockPortalFrame()).setStepSound(SoundType.GLASS).setLightLevel(0.125F).setHardness(5.0F) - .setDisplay("Portalrahmen").setResistance(2000.0F).setTab(CheatTab.tabTech)); + .setDisplay("Portalrahmen").setResistance(2000.0F).setTab(CheatTab.TECHNOLOGY)); registerBlock(400, "farmland", (new BlockFarmland()).setHardness(0.6F).setStepSound(SoundType.GRAVEL).setDisplay("Ackerboden") - .setShovelHarvestable().setTab(CheatTab.tabPlants)); + .setShovelHarvestable().setTab(CheatTab.PLANTS)); registerBlock(401, "wheat", (new BlockCrops()).setDisplay("Getreide")); registerBlock(402, "carrot", (new BlockCarrot()).setDisplay("Karotten")); registerBlock(403, "potato", (new BlockPotato()).setDisplay("Kartoffeln")); @@ -512,16 +511,16 @@ public abstract class BlockRegistry { for(MetalType metal : MetalType.values()) { // String loc = metal.name.substring(0, 1).toUpperCase() + metal.name.substring(1); registerBlock(bid++, metal.name + "_block", - (new Block(Material.iron)).setHardness(5.0F).setResistance(10.0F).setStepSound(SoundType.STONE) - .setDisplay(metal.display + "block").setTab(CheatTab.tabGems).setMiningLevel(1) + (new Block(Material.SOLID)).setHardness(5.0F).setResistance(10.0F).setStepSound(SoundType.STONE) + .setDisplay(metal.display + "block").setTab(CheatTab.GEMS).setMiningLevel(1) .setLightLevel(metal.radioactivity > 0.0F ? 0.25F : 0.0F).setRadiation(metal.radioactivity * 2.0f)); } bid = 540; for(OreType ore : OreType.values()) { // String loc = ore.name.substring(0, 1).toUpperCase() + ore.name.substring(1); registerBlock(bid++, ore.name + "_block", - (new Block(Material.iron)).setHardness(5.0F).setResistance(10.0F).setStepSound(SoundType.STONE) - .setDisplay(ore.display + "block").setTab(CheatTab.tabGems) + (new Block(Material.SOLID)).setHardness(5.0F).setResistance(10.0F).setStepSound(SoundType.STONE) + .setDisplay(ore.display + "block").setTab(CheatTab.GEMS) .setMiningLevel(ore.material.getHarvestLevel() - 1)); } @@ -531,18 +530,18 @@ public abstract class BlockRegistry { registerBlock(600, "stone_slab", - (new BlockSlab(Material.rock, "stone_slab_side", "double_stone_top", "double_stone_top")) + (new BlockSlab(Material.SOLID, "stone_slab_side", "double_stone_top", "double_stone_top")) .setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE).setDisplay("Steinstufe")); registerBlock(601, "stone_stairs", (new BlockStairs(stone.getState())).setDisplay("Steintreppe")); registerBlock(610, "cobblestone_slab", - (new BlockSlab(Material.rock, "cobblestone")) + (new BlockSlab(Material.SOLID, "cobblestone")) .setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE).setDisplay("Bruchsteinstufe")); registerBlock(611, "cobblestone_stairs", (new BlockStairs(cobblestone.getState())).setDisplay("Bruchsteintreppe")); registerBlock(612, "cobblestone_wall", (new BlockWall(cobblestone)).setDisplay("Bruchsteinmauer")); registerBlock(620, "sandstone_slab", - (new BlockSlab(Material.rock, "sandstone_normal", "sandstone_bottom", "sandstone_all")) + (new BlockSlab(Material.SOLID, "sandstone_normal", "sandstone_bottom", "sandstone_all")) .setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE).setDisplay("Sandsteinstufe")); registerBlock(621, "sandstone_stairs", (new BlockStairs(sandstone.getState().withProperty(BlockSandStone.TYPE, BlockSandStone.EnumType.DEFAULT), @@ -552,25 +551,25 @@ public abstract class BlockRegistry { Block quartz = (new BlockQuartz("")).setStepSound(SoundType.STONE).setHardness(0.8F).setDisplay("Quarzblock"); registerBlock(630, "quartz_block", quartz); registerBlock(631, "quartz_slab", - (new BlockSlab(Material.rock, "quartz_block_side", "quartz_block_bottom", "quartz_top")) + (new BlockSlab(Material.SOLID, "quartz_block_side", "quartz_block_bottom", "quartz_top")) .setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE).setDisplay("Quarzstufe")); registerBlock(632, "quartz_stairs", (new BlockStairs(quartz.getState().withProperty(BlockQuartz.VARIANT, BlockQuartz.EnumType.DEFAULT), "quartz_block_bottom", "quartz_top")) .setDisplay("Quarztreppe")); - registerBlock(640, "iron_bars", (new BlockPane(Material.iron, true)).setHardness(5.0F).setResistance(10.0F).setStepSound(SoundType.STONE) + registerBlock(640, "iron_bars", (new BlockPane(Material.SOLID, true)).setHardness(5.0F).setResistance(10.0F).setStepSound(SoundType.STONE) .setDisplay("Eisengitter")); registerBlock(641, "iron_door", - (new BlockDoor(Material.iron)).setHardness(5.0F).setStepSound(SoundType.STONE).setDisplay("Eisentür")); + (new BlockDoor(Material.SOLID)).setHardness(5.0F).setStepSound(SoundType.STONE).setDisplay("Eisentür")); registerBlock(642, "iron_trapdoor", - (new BlockTrapDoor(Material.iron)).setHardness(5.0F).setStepSound(SoundType.STONE).setDisplay("Eisenfalltür")); + (new BlockTrapDoor(Material.SOLID)).setHardness(5.0F).setStepSound(SoundType.STONE).setDisplay("Eisenfalltür")); - Block brick = (new Block(Material.rock)).setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE) - .setDisplay("Ziegelsteine").setTab(CheatTab.tabBlocks); + Block brick = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE) + .setDisplay("Ziegelsteine").setTab(CheatTab.BLOCKS); registerBlock(650, "brick_block", brick); registerBlock(651, "brick_slab", - (new BlockSlab(Material.rock, "brick_block")) + (new BlockSlab(Material.SOLID, "brick_block")) .setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE).setDisplay("Ziegelstufe")); registerBlock(652, "brick_stairs", (new BlockStairs(brick.getState())).setDisplay("Ziegeltreppe")); @@ -578,38 +577,38 @@ public abstract class BlockRegistry { .setDisplay("Steinziegel"); registerBlock(660, "stonebrick", stonebrick); registerBlock(661, "stonebrick_slab", - (new BlockSlab(Material.rock, "stonebrick_default")) + (new BlockSlab(Material.SOLID, "stonebrick_default")) .setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE).setDisplay("Steinziegelstufe")); registerBlock(662, "stonebrick_stairs", (new BlockStairs(stonebrick.getState().withProperty(BlockStoneBrick.VARIANT, BlockStoneBrick.EnumType.DEFAULT))) .setDisplay("Steinziegeltreppe")); - Block bloodBrick = (new Block(Material.rock)).setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE) - .setDisplay("Blutrote Ziegel").setTab(CheatTab.tabBlocks); + Block bloodBrick = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE) + .setDisplay("Blutrote Ziegel").setTab(CheatTab.BLOCKS); registerBlock(670, "blood_brick", bloodBrick); registerBlock(671, "blood_brick_slab", - (new BlockSlab(Material.rock, "blood_brick")) + (new BlockSlab(Material.SOLID, "blood_brick")) .setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE).setDisplay("Blutrote Ziegelstufe")); - registerBlock(672, "blood_brick_fence", (new BlockFence(Material.rock, "blood_brick")).setHardness(2.0F).setResistance(10.0F) + registerBlock(672, "blood_brick_fence", (new BlockFence(Material.SOLID, "blood_brick")).setHardness(2.0F).setResistance(10.0F) .setStepSound(SoundType.STONE).setDisplay("Blutroter Ziegelzaun")); registerBlock(673, "blood_brick_stairs", (new BlockStairs(bloodBrick.getState())).setDisplay("Blutrote Ziegeltreppe")); - Block blackBrick = (new Block(Material.rock)).setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE) - .setDisplay("Schwarze Ziegel").setTab(CheatTab.tabBlocks); + Block blackBrick = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE) + .setDisplay("Schwarze Ziegel").setTab(CheatTab.BLOCKS); registerBlock(680, "black_brick", blackBrick); registerBlock(681, "black_brick_slab", - (new BlockSlab(Material.rock, "black_brick")) + (new BlockSlab(Material.SOLID, "black_brick")) .setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE).setDisplay("Schwarze Ziegelstufe")); registerBlock(682, "black_brick_stairs", (new BlockStairs(blackBrick.getState())).setDisplay("Schwarze Ziegeltreppe")); - registerBlock(683, "black_brick_fence", (new BlockFence(Material.rock, "black_brick")).setHardness(2.0F).setResistance(10.0F) + registerBlock(683, "black_brick_fence", (new BlockFence(Material.SOLID, "black_brick")).setHardness(2.0F).setResistance(10.0F) .setStepSound(SoundType.STONE).setDisplay("Schwarzer Ziegelzaun")); Block bquartz = (new BlockQuartz("black_")).setStepSound(SoundType.STONE).setHardness(0.8F).setDisplay("Schwarzer Quarzblock"); registerBlock(690, "black_quartz_block", bquartz); registerBlock(691, "black_quartz_slab", - (new BlockSlab(Material.rock, "black_quartz_block_side", "black_quartz_block_bottom", "black_quartz_top")) + (new BlockSlab(Material.SOLID, "black_quartz_block_side", "black_quartz_block_bottom", "black_quartz_top")) .setHardness(2.0F).setResistance(10.0F).setStepSound(SoundType.STONE).setDisplay("Schwarze Quarzstufe")); registerBlock(692, "black_quartz_stairs", (new BlockStairs(bquartz.getState().withProperty(BlockQuartz.VARIANT, BlockQuartz.EnumType.DEFAULT), @@ -618,29 +617,29 @@ public abstract class BlockRegistry { bid = 700; for(DecoType deco : DecoType.values()) { - registerBlock(bid++, deco.name, (new Block(Material.rock)).setHardness(2.0F).setResistance(10.0F) - .setStepSound(SoundType.STONE).setDisplay(deco.display).setTab(CheatTab.tabBlocks)); + registerBlock(bid++, deco.name, (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F) + .setStepSound(SoundType.STONE).setDisplay(deco.display).setTab(CheatTab.BLOCKS)); } registerBlock(1000, "trapdoor", - (new BlockTrapDoor(Material.wood)).setHardness(3.0F).setStepSound(SoundType.WOOD).setDisplay("Holzfalltür")); + (new BlockTrapDoor(Material.WOOD)).setHardness(3.0F).setStepSound(SoundType.WOOD).setDisplay("Holzfalltür")); bid = 1100; for(WoodType wood : WoodType.values()) { - Block planks = (new Block(Material.wood)).setHardness(2.0F).setResistance(5.0F).setStepSound(SoundType.WOOD) - .setDisplay(wood.getDisplay() + "holzbretter").setTab(CheatTab.tabWood); + Block planks = (new Block(Material.WOOD)).setHardness(2.0F).setResistance(5.0F).setStepSound(SoundType.WOOD) + .setDisplay(wood.getDisplay() + "holzbretter").setTab(CheatTab.WOOD); registerBlock(bid++, wood.getName() + "_planks", planks); registerBlock(bid++, wood.getName() + "_stairs", (new BlockStairs(planks.getState())) .setDisplay(wood.getDisplay() + "holztreppe")); - registerBlock(bid++, wood.getName() + "_slab", (new BlockSlab(Material.wood, wood.getName() + "_planks")) + registerBlock(bid++, wood.getName() + "_slab", (new BlockSlab(Material.WOOD, wood.getName() + "_planks")) .setHardness(2.0F).setResistance(5.0F).setStepSound(SoundType.WOOD).setDisplay(wood.getDisplay() + "holzstufe")); - registerBlock(bid++, wood.getName() + "_fence", (new BlockFence(Material.wood, wood.getName() + "_planks")) + registerBlock(bid++, wood.getName() + "_fence", (new BlockFence(Material.WOOD, wood.getName() + "_planks")) .setHardness(2.0F).setResistance(5.0F).setStepSound(SoundType.WOOD).setDisplay(wood.getDisplay() + "holzzaun")); registerBlock(bid++, wood.getName() + "_fence_gate", (new BlockFenceGate(wood)).setHardness(2.0F).setResistance(5.0F) .setStepSound(SoundType.WOOD).setDisplay(wood.getDisplay() + "holzzauntor")); - registerBlock(bid++, wood.getName() + "_door", (new BlockDoor(Material.wood)).setHardness(3.0F).setStepSound(SoundType.WOOD) + registerBlock(bid++, wood.getName() + "_door", (new BlockDoor(Material.WOOD)).setHardness(3.0F).setStepSound(SoundType.WOOD) .setDisplay(wood.getDisplay() + "holztür")); } @@ -651,9 +650,9 @@ public abstract class BlockRegistry { (new BlockMobSpawner()).setHardness(5.0F).setStepSound(SoundType.STONE).setDisplay("Monsterspawner")); registerBlock(2002, "workbench", (new BlockWorkbench(3)).setHardness(2.5F).setStepSound(SoundType.WOOD).setDisplay("Werkbank")); registerBlock(2003, "furnace", (new BlockFurnace(false)).setHardness(3.5F).setStepSound(SoundType.STONE).setDisplay("Ofen") - .setTab(CheatTab.tabTech)); + .setTab(CheatTab.TECHNOLOGY)); registerBlock(2004, "lit_furnace", (new BlockFurnace(true)).setHardness(3.5F).setStepSound(SoundType.STONE).setLightLevel(0.875F) - .setDisplay("Ofen (Gefeuert)").setTab(CheatTab.tabTech)); + .setDisplay("Ofen (Gefeuert)").setTab(CheatTab.TECHNOLOGY)); registerBlock(2005, "anvil", (new BlockAnvil()).setHardness(5.0F).setStepSound(SoundType.ANVIL).setResistance(2000.0F).setDisplay("Amboss")); registerBlock(2006, "enchanting_table", @@ -696,13 +695,13 @@ public abstract class BlockRegistry { registerBlock(2500, "lever", (new BlockLever()).setHardness(0.5F).setStepSound(SoundType.WOOD).setDisplay("Hebel")); - registerBlock(2510, "stone_pressure_plate", (new BlockPressurePlate(Material.rock, BlockPressurePlate.Sensitivity.MOBS)).setHardness(0.5F) + registerBlock(2510, "stone_pressure_plate", (new BlockPressurePlate(Material.SOLID, BlockPressurePlate.Sensitivity.MOBS)).setHardness(0.5F) .setStepSound(SoundType.STONE).setDisplay("Steindruckplatte")); - registerBlock(2511, "wooden_pressure_plate", (new BlockPressurePlate(Material.wood, BlockPressurePlate.Sensitivity.EVERYTHING)) + registerBlock(2511, "wooden_pressure_plate", (new BlockPressurePlate(Material.WOOD, BlockPressurePlate.Sensitivity.EVERYTHING)) .setHardness(0.5F).setStepSound(SoundType.WOOD).setDisplay("Holzdruckplatte")); - registerBlock(2512, "light_weighted_pressure_plate", (new BlockPressurePlateWeighted(Material.iron, 15)).setHardness(0.5F) + registerBlock(2512, "light_weighted_pressure_plate", (new BlockPressurePlateWeighted(Material.SOLID, 15)).setHardness(0.5F) .setStepSound(SoundType.WOOD).setDisplay("Wägeplatte (niedrige Gewichte)")); - registerBlock(2513, "heavy_weighted_pressure_plate", (new BlockPressurePlateWeighted(Material.iron, 150)).setHardness(0.5F) + registerBlock(2513, "heavy_weighted_pressure_plate", (new BlockPressurePlateWeighted(Material.SOLID, 150)).setHardness(0.5F) .setStepSound(SoundType.WOOD).setDisplay("Wägeplatte (hohe Gewichte)")); registerBlock(2520, "stone_button", (new BlockButton(false, 20, "stone")).setHardness(0.5F).setStepSound(SoundType.STONE).setDisplay("Knopf")); @@ -714,7 +713,7 @@ public abstract class BlockRegistry { registerBlock(2601, "unlit_redstone_torch", (new BlockRedstoneTorch(false)).setHardness(0.0F).setStepSound(SoundType.WOOD).setDisplay("Redstone-Fackel")); registerBlock(2602, "redstone_torch", (new BlockRedstoneTorch(true)).setHardness(0.0F).setLightLevel(0.5F).setStepSound(SoundType.WOOD) - .setDisplay("Redstone-Fackel").setTab(CheatTab.tabTech)); + .setDisplay("Redstone-Fackel").setTab(CheatTab.TECHNOLOGY)); registerBlock(2603, "repeater", (new BlockRedstoneRepeater(false)).setHardness(0.0F).setStepSound(SoundType.WOOD).setDisplay("Redstone-Verstärker")); registerBlock(2604, "powered_repeater", @@ -724,7 +723,7 @@ public abstract class BlockRegistry { registerBlock(2606, "powered_comparator", (new BlockRedstoneComparator(true)).setHardness(0.0F).setLightLevel(0.625F) .setStepSound(SoundType.WOOD).setDisplay("Redstone-Komparator")); registerBlock(2607, "redstone_lamp", (new BlockRedstoneLight(false)).setHardness(0.3F).setStepSound(SoundType.GLASS) - .setDisplay("Redstone-Lampe").setTab(CheatTab.tabTech)); + .setDisplay("Redstone-Lampe").setTab(CheatTab.TECHNOLOGY)); registerBlock(2608, "lit_redstone_lamp", (new BlockRedstoneLight(true)).setHardness(0.3F).setStepSound(SoundType.GLASS).setDisplay("Redstone-Lampe")); registerBlock(2609, "daylight_detector", new BlockDaylightDetector(false).setDisplay("Tageslichtsensor")); diff --git a/common/src/common/init/DispenserRegistry.java b/common/src/common/init/DispenserRegistry.java index d4ef76d..7b1fcb2 100755 --- a/common/src/common/init/DispenserRegistry.java +++ b/common/src/common/init/DispenserRegistry.java @@ -1,6 +1,7 @@ package common.init; import common.block.Block; +import common.block.Material; import common.block.liquid.BlockDynamicLiquid; import common.block.liquid.BlockLiquid; import common.block.tech.BlockDispenser; @@ -32,7 +33,6 @@ import common.item.ItemDye; import common.item.ItemMonsterPlacer; import common.item.ItemPotion; import common.item.ItemStack; -import common.material.Material; import common.rng.Random; import common.tileentity.TileEntityDispenser; import common.util.BlockPos; diff --git a/common/src/common/init/FluidRegistry.java b/common/src/common/init/FluidRegistry.java index c808342..ad5b6ac 100755 --- a/common/src/common/init/FluidRegistry.java +++ b/common/src/common/init/FluidRegistry.java @@ -4,16 +4,16 @@ import java.util.List; import java.util.Map; import common.block.Block; +import common.block.Material; import common.block.liquid.BlockDynamicLiquid; import common.block.liquid.BlockLiquid; import common.block.liquid.BlockStaticLiquid; import common.collect.Lists; import common.collect.Maps; -import common.material.Material; public abstract class FluidRegistry { public static enum LiquidType { - COLD(Material.coldFluid), HOT(Material.hotFluid), WATER(Material.water), LAVA(Material.lava); + COLD(Material.COLD), HOT(Material.HOT), WATER(Material.WATER), LAVA(Material.LAVA); public final Material material; diff --git a/common/src/common/init/ItemRegistry.java b/common/src/common/init/ItemRegistry.java index d16839e..5c0a660 100755 --- a/common/src/common/init/ItemRegistry.java +++ b/common/src/common/init/ItemRegistry.java @@ -113,7 +113,7 @@ import common.item.ItemSnow; import common.item.ItemSnowball; import common.item.ItemSoup; import common.item.ItemSpaceNavigator; -import common.item.ItemSpade; +import common.item.ItemShovel; import common.item.ItemStack; import common.item.ItemStick; import common.item.ItemSword; @@ -188,7 +188,7 @@ public abstract class ItemRegistry { private static void registerTools(ToolMaterial material, String name, String prefix) { // String loc = name.substring(0, 1).toUpperCase() + name.substring(1); if(material.hasTools()) { - registerItem(name + "_shovel", (new ItemSpade(material)).setDisplay(prefix + "schaufel")); + registerItem(name + "_shovel", (new ItemShovel(material)).setDisplay(prefix + "schaufel")); registerItem(name + "_pickaxe", (new ItemPickaxe(material)).setDisplay(prefix + "spitzhacke")); registerItem(name + "_axe", (new ItemAxe(material)).setDisplay(prefix + "axt")); registerItem(name + "_hoe", (new ItemHoe(material)).setDisplay(prefix + "hacke")); @@ -386,15 +386,15 @@ public abstract class ItemRegistry { registerItem("wand", (new ItemEditWand()).setDisplay("Bearbeitungswerkzeug")); registerItem("info_wand", (new ItemInfoWand()).setDisplay("Infowerkzeug")); registerItem("lightning_wand", (new ItemLightning()).setDisplay("Geladenes Zepter")); - registerItem("banhammer", (new ItemBanHammer()).setDisplay("Hammer der Verbannung").setTab(CheatTab.tabTools)); - registerItem("key", (new ItemKey()).setDisplay("Schlüssel").setTab(CheatTab.tabTools).setMaxStackSize(128)); + registerItem("banhammer", (new ItemBanHammer()).setDisplay("Hammer der Verbannung").setTab(CheatTab.TOOLS)); + registerItem("key", (new ItemKey()).setDisplay("Schlüssel").setTab(CheatTab.TOOLS).setMaxStackSize(128)); registerItem("die", (new ItemDie()).setDisplay("Würfel").setMaxStackSize(128)); registerItem("chick_magnet", (new ItemMagnet(true)).setDisplay("Kükenmagnet")); registerItem("magnet", (new ItemMagnet(false)).setDisplay("Magnet")); - registerItem("camera", (new ItemCamera()).setDisplay("Kamera").setTab(CheatTab.tabTools)); + registerItem("camera", (new ItemCamera()).setDisplay("Kamera").setTab(CheatTab.TOOLS)); for(Weather weather : Weather.values()) { - registerItem("weather_token_" + weather.getName(), new ItemWeatherToken(weather).setDisplay("Wetterkristall").setTab(CheatTab.tabTools)); + registerItem("weather_token_" + weather.getName(), new ItemWeatherToken(weather).setDisplay("Wetterkristall").setTab(CheatTab.TOOLS)); } registerItem("flint_and_steel", (new ItemFlintAndSteel(Blocks.fire)).setDisplay("Feuerzeug")); @@ -404,19 +404,19 @@ public abstract class ItemRegistry { registerItem("bow", (new ItemBow()).setDisplay("Bogen")); registerItem("boltgun", (new ItemBoltgun()).setDisplay("Bolter")); registerItem("bolt", (new ItemAmmo(5, 1.0f, 128)).setDisplay("Bolter-Munition")); - registerItem("arrow", (new Item()).setDisplay("Pfeil").setTab(CheatTab.tabCombat).setMaxStackSize(128)); + registerItem("arrow", (new Item()).setDisplay("Pfeil").setTab(CheatTab.COMBAT).setMaxStackSize(128)); Item coal = (new ItemCoal()).setDisplay("Kohle"); registerItem("coal", coal); - registerItem("stick", (new ItemStick()).setDisplay("Stock").setTab(CheatTab.tabMaterials).setMaxStackSize(256)); - registerItem("bowl", (new ItemSmall()).setDisplay("Schüssel").setTab(CheatTab.tabMisc)); + registerItem("stick", (new ItemStick()).setDisplay("Stock").setTab(CheatTab.MATERIALS).setMaxStackSize(256)); + registerItem("bowl", (new ItemSmall()).setDisplay("Schüssel").setTab(CheatTab.MISC)); registerItem("mushroom_stew", (new ItemSoup(6)).setDisplay("Pilzsuppe")); - registerItem((new ItemReed(Blocks.string)).setDisplay("Faden").setTab(CheatTab.tabTech).setMaxStackSize(1024)); - registerItem("feather", (new Item()).setDisplay("Feder").setTab(CheatTab.tabMaterials).setMaxStackSize(512)); - registerItem("gunpowder", (new Item()).setDisplay("Schwarzpulver").setPotionEffect(PotionHelper.gunpowderEffect).setTab(CheatTab.tabMaterials).setMaxStackSize(256)); + registerItem((new ItemReed(Blocks.string)).setDisplay("Faden").setTab(CheatTab.TECHNOLOGY).setMaxStackSize(1024)); + registerItem("feather", (new Item()).setDisplay("Feder").setTab(CheatTab.MATERIALS).setMaxStackSize(512)); + registerItem("gunpowder", (new Item()).setDisplay("Schwarzpulver").setPotionEffect(PotionHelper.gunpowderEffect).setTab(CheatTab.MATERIALS).setMaxStackSize(256)); registerItem((new ItemSeeds(Blocks.wheat, Blocks.farmland)).setDisplay("Weizenkörner").setMaxStackSize(256)); - registerItem("wheats", (new Item()).setDisplay("Weizen").setTab(CheatTab.tabMaterials).setMaxStackSize(128)); + registerItem("wheats", (new Item()).setDisplay("Weizen").setTab(CheatTab.MATERIALS).setMaxStackSize(128)); registerItem("bread", (new ItemFood(5, false)).setDisplay("Brot")); - registerItem("flint", (new Item()).setDisplay("Feuerstein").setTab(CheatTab.tabMaterials).setMaxStackSize(128)); + registerItem("flint", (new Item()).setDisplay("Feuerstein").setTab(CheatTab.MATERIALS).setMaxStackSize(128)); registerItem("porkchop", (new ItemFood(3, true)).setDisplay("Rohes Schweinefleisch")); registerItem("cooked_porkchop", (new ItemFood(8, true)).setDisplay("Gebratenes Schweinefleisch")); registerItem("golden_apple", (new ItemAppleGold(4, false)).setPotionEffect(Potion.REGENERATION, 5, 1, 1.0F) @@ -429,27 +429,27 @@ public abstract class ItemRegistry { // registerItem("iron_door", (new ItemDoor(Blocks.iron_door)).setUnlocalizedName("doorIron")); registerItem((new ItemRedstone()).setDisplay("Redstone").setPotionEffect(PotionHelper.redstoneEffect).setMaxStackSize(256)); registerItem("snowball", (new ItemSnowball()).setDisplay("Schneeball").setMaxStackSize(128)); - registerItem("leather", (new Item()).setDisplay("Leder").setTab(CheatTab.tabMaterials)); - registerItem("brick", (new Item()).setDisplay("Ziegel").setTab(CheatTab.tabMaterials)); - registerItem("clay_ball", (new Item()).setDisplay("Ton").setTab(CheatTab.tabMaterials).setMaxStackSize(128)); - registerItem((new ItemReed(Blocks.reeds)).setDisplay("Zuckerrohr").setTab(CheatTab.tabPlants).setMaxStackSize(128)); - registerItem("paper", (new Item()).setDisplay("Papier").setTab(CheatTab.tabMaterials).setMaxStackSize(256)); - registerItem("book", (new ItemBook()).setDisplay("Buch").setTab(CheatTab.tabMisc)); - registerItem("slime_ball", (new Item()).setDisplay("Schleimball").setTab(CheatTab.tabMaterials).setMaxStackSize(128)); + registerItem("leather", (new Item()).setDisplay("Leder").setTab(CheatTab.MATERIALS)); + registerItem("brick", (new Item()).setDisplay("Ziegel").setTab(CheatTab.MATERIALS)); + registerItem("clay_ball", (new Item()).setDisplay("Ton").setTab(CheatTab.MATERIALS).setMaxStackSize(128)); + registerItem((new ItemReed(Blocks.reeds)).setDisplay("Zuckerrohr").setTab(CheatTab.PLANTS).setMaxStackSize(128)); + registerItem("paper", (new Item()).setDisplay("Papier").setTab(CheatTab.MATERIALS).setMaxStackSize(256)); + registerItem("book", (new ItemBook()).setDisplay("Buch").setTab(CheatTab.MISC)); + registerItem("slime_ball", (new Item()).setDisplay("Schleimball").setTab(CheatTab.MATERIALS).setMaxStackSize(128)); registerItem("egg", (new ItemEgg()).setDisplay("Ei").setMaxStackSize(128)); - registerItem("navigator", (new ItemSpaceNavigator()).setDisplay("Elektronischer Navigator").setTab(CheatTab.tabTools)); - registerItem("exterminator", (new ItemExterminator()).setDisplay("Weltenzerstörer").setTab(CheatTab.tabTools)); + registerItem("navigator", (new ItemSpaceNavigator()).setDisplay("Elektronischer Navigator").setTab(CheatTab.TOOLS)); + registerItem("exterminator", (new ItemExterminator()).setDisplay("Weltenzerstörer").setTab(CheatTab.TOOLS)); registerItem("fishing_rod", (new ItemFishingRod()).setDisplay("Angel")); registerItem("glowstone_dust", (new Item()).setDisplay("Glowstonestaub").setPotionEffect(PotionHelper.glowstoneEffect) - .setTab(CheatTab.tabMaterials).setMaxStackSize(256)); + .setTab(CheatTab.MATERIALS).setMaxStackSize(256)); registerItem("fish", (new ItemFishFood(false)).setDisplay("Fisch").setHasSubtypes(true)); registerItem("cooked_fish", (new ItemFishFood(true)).setDisplay("Fisch").setHasSubtypes(true)); Item dye = (new ItemDye()).setDisplay("Farbstoff").setMaxStackSize(512); registerItem("dye", dye); - registerItem("bone", (new ItemStick()).setDisplay("Knochen").setTab(CheatTab.tabMaterials).setMaxStackSize(128)); - registerItem("sugar", (new Item()).setDisplay("Zucker").setPotionEffect(PotionHelper.sugarEffect).setTab(CheatTab.tabMaterials).setMaxStackSize(512)); - registerItem((new ItemReed(Blocks.cake)).setMaxStackSize(1).setDisplay("Kuchen").setTab(CheatTab.tabDeco)); - registerItem((new ItemReed(Blocks.repeater)).setDisplay("Redstone-Verstärker").setTab(CheatTab.tabTech)); + registerItem("bone", (new ItemStick()).setDisplay("Knochen").setTab(CheatTab.MATERIALS).setMaxStackSize(128)); + registerItem("sugar", (new Item()).setDisplay("Zucker").setPotionEffect(PotionHelper.sugarEffect).setTab(CheatTab.MATERIALS).setMaxStackSize(512)); + registerItem((new ItemReed(Blocks.cake)).setMaxStackSize(1).setDisplay("Kuchen").setTab(CheatTab.DECORATION)); + registerItem((new ItemReed(Blocks.repeater)).setDisplay("Redstone-Verstärker").setTab(CheatTab.TECHNOLOGY)); registerItem("cookie", (new ItemFood(2, false)).setDisplay("Keks").setMaxStackSize(128)); registerItem("melon", (new ItemFood(2, false)).setDisplay("Melone")); registerItem((new ItemSeeds(Blocks.pumpkin_stem, Blocks.farmland)).setDisplay("Kürbiskerne").setMaxStackSize(256)); @@ -459,51 +459,51 @@ public abstract class ItemRegistry { registerItem("chicken", (new ItemFood(2, true)).setDisplay("Rohes Hühnchen")); registerItem("cooked_chicken", (new ItemFood(6, true)).setDisplay("Gebratenes Hühnchen")); registerItem("rotten_flesh", (new ItemFood(4, true)).setDisplay("Verrottetes Fleisch")); - registerItem("orb", (new ItemFragile()).setDisplay("Kugel").setTab(CheatTab.tabTools)); - registerItem("blaze_rod", (new ItemRod()).setDisplay("Lohenrute").setTab(CheatTab.tabMaterials).setMaxStackSize(256)); - registerItem("ghast_tear", (new ItemTiny()).setDisplay("Ghastträne").setPotionEffect(PotionHelper.ghastTearEffect).setTab(CheatTab.tabMaterials).setMaxStackSize(256)); - registerItem("gold_nugget", (new ItemNugget()).setDisplay("Goldnugget").setTab(CheatTab.tabMetals).setMaxStackSize(256)); + registerItem("orb", (new ItemFragile()).setDisplay("Kugel").setTab(CheatTab.TOOLS)); + registerItem("blaze_rod", (new ItemRod()).setDisplay("Lohenrute").setTab(CheatTab.MATERIALS).setMaxStackSize(256)); + registerItem("ghast_tear", (new ItemTiny()).setDisplay("Ghastträne").setPotionEffect(PotionHelper.ghastTearEffect).setTab(CheatTab.MATERIALS).setMaxStackSize(256)); + registerItem("gold_nugget", (new ItemNugget()).setDisplay("Goldnugget").setTab(CheatTab.METALS).setMaxStackSize(256)); registerItem((new ItemSeeds(Blocks.soul_wart, Blocks.soul_sand)).setDisplay("Seelenwarze").setPotionEffect("+4").setMaxStackSize(128)); registerItem("potion", (new ItemPotion()).setDisplay("Trank")); registerItem("glass_bottle", (new ItemGlassBottle()).setDisplay("Glasflasche")); registerItem("spider_eye", (new ItemFood(2, false)).setPotionEffect(Potion.POISON, 5, 0, 1.0F).setDisplay("Spinnenauge") .setPotionEffect(PotionHelper.spiderEyeEffect).setMaxStackSize(128)); registerItem("fermented_spider_eye", (new Item()).setDisplay("Fermentiertes Spinnenauge") - .setPotionEffect(PotionHelper.fermentedSpiderEyeEffect).setTab(CheatTab.tabMisc).setMaxStackSize(128)); + .setPotionEffect(PotionHelper.fermentedSpiderEyeEffect).setTab(CheatTab.MISC).setMaxStackSize(128)); registerItem("blaze_powder", (new Item()).setDisplay("Lohenstaub").setPotionEffect(PotionHelper.blazePowderEffect) - .setTab(CheatTab.tabMaterials).setMaxStackSize(256)); - registerItem("magma_cream", (new Item()).setDisplay("Magmacreme").setPotionEffect(PotionHelper.magmaCreamEffect).setTab(CheatTab.tabMaterials).setMaxStackSize(128)); - registerItem((new ItemReed(Blocks.brewing_stand)).setDisplay("Braustand").setTab(CheatTab.tabTech)); - registerItem((new ItemReed(Blocks.cauldron)).setDisplay("Kessel").setTab(CheatTab.tabTech)); + .setTab(CheatTab.MATERIALS).setMaxStackSize(256)); + registerItem("magma_cream", (new Item()).setDisplay("Magmacreme").setPotionEffect(PotionHelper.magmaCreamEffect).setTab(CheatTab.MATERIALS).setMaxStackSize(128)); + registerItem((new ItemReed(Blocks.brewing_stand)).setDisplay("Braustand").setTab(CheatTab.TECHNOLOGY)); + registerItem((new ItemReed(Blocks.cauldron)).setDisplay("Kessel").setTab(CheatTab.TECHNOLOGY)); registerItem("charged_orb", (new ItemChargedOrb()).setDisplay("Geladene Kugel")); registerItem("speckled_melon", (new Item()).setDisplay("Glitzernde Melone").setPotionEffect(PotionHelper.speckledMelonEffect) - .setTab(CheatTab.tabMisc)); + .setTab(CheatTab.MISC)); registerItem("experience_bottle", (new ItemExpBottle()).setDisplay("Erfahrungsfläschchen")); registerItem("fire_charge", (new ItemFireball()).setDisplay("Feuerkugel")); - registerItem("writable_book", (new Item()).setDisplay("Buch und Feder").setTab(CheatTab.tabTools)); - registerItem("written_book", (new Item()).setDisplay("Beschriebenes Buch").setTab(CheatTab.tabMisc)); - Item emerald = (new Item()).setDisplay("Smaragd").setTab(CheatTab.tabMetals); + registerItem("writable_book", (new Item()).setDisplay("Buch und Feder").setTab(CheatTab.TOOLS)); + registerItem("written_book", (new Item()).setDisplay("Beschriebenes Buch").setTab(CheatTab.MISC)); + Item emerald = (new Item()).setDisplay("Smaragd").setTab(CheatTab.METALS); registerItem("emerald", emerald); - registerItem((new ItemReed(Blocks.flower_pot)).setDisplay("Blumentopf").setTab(CheatTab.tabDeco)); + registerItem((new ItemReed(Blocks.flower_pot)).setDisplay("Blumentopf").setTab(CheatTab.DECORATION)); registerItem((new ItemSeedFood(3, Blocks.carrot, Blocks.farmland)).setDisplay("Karotte").setMaxStackSize(128)); registerItem((new ItemSeedFood(1, Blocks.potato, Blocks.farmland)).setDisplay("Kartoffel").setMaxStackSize(128)); registerItem("baked_potato", (new ItemFood(5, false)).setDisplay("Ofenkartoffel").setMaxStackSize(128)); registerItem("poisonous_potato", (new ItemFood(2, false)).setPotionEffect(Potion.POISON, 5, 0, 0.6F).setDisplay("Giftige Kartoffel").setMaxStackSize(128)); registerItem("golden_carrot", (new ItemFood(6, false)).setDisplay("Goldene Karotte") - .setPotionEffect(PotionHelper.goldenCarrotEffect).setTab(CheatTab.tabMisc)); + .setPotionEffect(PotionHelper.goldenCarrotEffect).setTab(CheatTab.MISC)); registerItem((new ItemSkull()).setDisplay("Kopf")); registerItem("carrot_on_a_stick", (new ItemCarrotOnAStick()).setDisplay("Karottenrute")); - registerItem("charge_crystal", (new ItemEffect()).setDisplay("Energiekristall").setTab(CheatTab.tabMisc).setColor(TextColor.DMAGENTA)); - registerItem("pumpkin_pie", (new ItemFood(8, false)).setDisplay("Kürbiskuchen").setTab(CheatTab.tabMisc)); + registerItem("charge_crystal", (new ItemEffect()).setDisplay("Energiekristall").setTab(CheatTab.MISC).setColor(TextColor.DMAGENTA)); + registerItem("pumpkin_pie", (new ItemFood(8, false)).setDisplay("Kürbiskuchen").setTab(CheatTab.MISC)); registerItem("fireworks", (new ItemFirework()).setDisplay("Feuerwerksrakete")); - registerItem("firework_charge", (new ItemFireworkCharge()).setDisplay("Feuerwerksstern").setTab(CheatTab.tabMaterials)); - registerItem("enchanted_book", (new ItemEnchantedBook()).setMaxStackSize(1).setDisplay("Verzaubertes Buch").setTab(CheatTab.tabMagic)); - registerItem((new ItemReed(Blocks.comparator)).setDisplay("Redstone-Komparator").setTab(CheatTab.tabTech)); - registerItem("bloodbrick", (new Item()).setDisplay("Blutroter Ziegel").setTab(CheatTab.tabMaterials)); - registerItem("blackbrick", (new Item()).setDisplay("Schwarzer Ziegel").setTab(CheatTab.tabMaterials)); - Item quartz = (new Item()).setDisplay("Quarz").setTab(CheatTab.tabMetals); + registerItem("firework_charge", (new ItemFireworkCharge()).setDisplay("Feuerwerksstern").setTab(CheatTab.MATERIALS)); + registerItem("enchanted_book", (new ItemEnchantedBook()).setMaxStackSize(1).setDisplay("Verzaubertes Buch").setTab(CheatTab.MAGIC)); + registerItem((new ItemReed(Blocks.comparator)).setDisplay("Redstone-Komparator").setTab(CheatTab.TECHNOLOGY)); + registerItem("bloodbrick", (new Item()).setDisplay("Blutroter Ziegel").setTab(CheatTab.MATERIALS)); + registerItem("blackbrick", (new Item()).setDisplay("Schwarzer Ziegel").setTab(CheatTab.MATERIALS)); + Item quartz = (new Item()).setDisplay("Quarz").setTab(CheatTab.METALS); registerItem("quartz", quartz); - Item bquartz = (new Item()).setDisplay("Schwarzes Quarz").setTab(CheatTab.tabMetals); + Item bquartz = (new Item()).setDisplay("Schwarzes Quarz").setTab(CheatTab.METALS); registerItem("black_quartz", bquartz); registerItem("lead", (new ItemLead()).setDisplay("Leine").setMaxStackSize(128)); registerItem("name_tag", (new ItemNameTag()).setDisplay("Namensschild")); @@ -516,14 +516,14 @@ public abstract class ItemRegistry { registerItem("dynamite", (new ItemDynamite()).setDisplay("Dynamit").setColor(TextColor.RED)); // registerItem("cherry_door", (new ItemDoor(Blocks.cherry_door)).setUnlocalizedName("doorCherry")); // registerItem("maple_door", (new ItemDoor(Blocks.maple_door)).setUnlocalizedName("doorMaple")); - registerItem("chain", (new ItemMagnetic()).setDisplay("Kette").setTab(CheatTab.tabMaterials)); + registerItem("chain", (new ItemMagnetic()).setDisplay("Kette").setTab(CheatTab.MATERIALS)); for(OreType ore : OreType.values()) { // String loc = ore.name.substring(0, 1).toUpperCase() + ore.name.substring(1); // registerItemBlock(BlockRegistry.getRegisteredBlock(ore.name + "_ore")); // registerItemBlock(BlockRegistry.getRegisteredBlock(ore.name + "_block")); // if(ore.gem != null) { - Item itm = (new Item()).setDisplay(ore.itemDisplay).setTab(CheatTab.tabMetals); + Item itm = (new Item()).setDisplay(ore.itemDisplay).setTab(CheatTab.METALS); registerItem(ore.item, itm); ((BlockOre)BlockRegistry.getRegisteredBlock(ore.name + "_ore")).setDropItem(new ItemStack(itm, ore.dropQuantity), ore.bonusChance, ore.experience); @@ -544,12 +544,12 @@ public abstract class ItemRegistry { ItemBlock block = new ItemMetalBlock(fullBlock, metal, false); registerBlock(fullBlock, block); if(metal.isPowder) { - Item itm = (new ItemMetal(metal)).setDisplay(metal.display + "pulver").setTab(CheatTab.tabMetals); + Item itm = (new ItemMetal(metal)).setDisplay(metal.display + "pulver").setTab(CheatTab.METALS); registerItem(metal.name + "_powder", itm); ((BlockOre)BlockRegistry.getRegisteredBlock(metal.name + "_ore")).setDropItem(new ItemStack(itm), 0, 2); } else { - Item itm = (new ItemMetal(metal)).setDisplay(metal.display + "barren").setTab(CheatTab.tabMetals); + Item itm = (new ItemMetal(metal)).setDisplay(metal.display + "barren").setTab(CheatTab.METALS); registerItem(metal.name + "_ingot", itm); ((BlockOre)BlockRegistry.getRegisteredBlock(metal.name + "_ore")).setSmeltItem(new ItemStack(itm)); } diff --git a/common/src/common/inventory/InventoryPlayer.java b/common/src/common/inventory/InventoryPlayer.java index 7b651c8..6dd9243 100755 --- a/common/src/common/inventory/InventoryPlayer.java +++ b/common/src/common/inventory/InventoryPlayer.java @@ -564,17 +564,11 @@ public class InventoryPlayer implements IInventory return ItemStack.MAX_SIZE; } - public boolean canHeldItemHarvest(Block blockIn) - { - if (blockIn.getMaterial().isToolNotRequired()) - { + public boolean canHeldItemHarvest(Block block) { + if(!block.getMaterial().isToolRequired()) return true; - } - else - { - ItemStack itemstack = this.getStackInSlot(this.currentItem); - return itemstack != null ? itemstack.canHarvestBlock(blockIn) : false; - } + ItemStack stack = this.getStackInSlot(this.currentItem); + return stack != null && stack.canHarvestBlock(block); } /** diff --git a/common/src/common/item/CheatTab.java b/common/src/common/item/CheatTab.java index 83729d0..b92c840 100755 --- a/common/src/common/item/CheatTab.java +++ b/common/src/common/item/CheatTab.java @@ -6,166 +6,116 @@ import common.init.Blocks; import common.init.ItemRegistry; import common.init.Items; -public enum CheatTab -{ - tabBlocks("Baumaterial") - { - protected Item getTabIconItem() - { - return ItemRegistry.getItemFromBlock(Blocks.glass); - } - }, - tabNature("Gestein und Natur") - { - protected Item getTabIconItem() - { - return ItemRegistry.getItemFromBlock(Blocks.grass); - } - }, - tabWood("Holz") - { - protected Item getTabIconItem() - { - return ItemRegistry.getItemFromBlock(Blocks.maple_planks); - } - }, - tabPlants("Pflanzen") - { - protected Item getTabIconItem() - { - return ItemRegistry.getItemFromBlock(Blocks.oak_leaves); - } - }, - tabDeco("Dekoration") - { - protected Item getTabIconItem() - { - return ItemRegistry.getItemFromBlock(Blocks.hay_block); - } - }, - tabTech("Redstone & Technik") - { - protected Item getTabIconItem() - { - return ItemRegistry.getItemFromBlock(Blocks.tnt); - } - }, - tabGems("Erze & Teure Blöcke") - { - protected Item getTabIconItem() - { - return ItemRegistry.getItemFromBlock(Blocks.diamond_block); - } - }, - tabSpawners("Mob & Itemspawner") - { - protected Item getTabIconItem() - { - return Items.minecart; - } - }, - tabTools("Werkzeug") - { - protected Item getTabIconItem() - { - return Items.flint_and_steel; - } - }, - tabLiquids("Flüssigkeiten") - { - protected Item getTabIconItem() - { - return Items.water_bucket; - } - }, - tabCombat("Kampf") - { - protected Item getTabIconItem() - { - return Items.bow; - } - }, - tabMagic("Tränke & Verzauberungen") - { - protected Item getTabIconItem() - { - return Items.potion; - } - protected int getIconItemDamage() - { - return 8261; - } - }, - tabMaterials("Werkstoffe") - { - protected Item getTabIconItem() - { - return Items.leather; - } - }, - tabMetals("Metalle und Juwelen") - { - protected Item getTabIconItem() - { - return Items.iron_ingot; - } - }, - tabMisc("Verschiedenes & Nahrung") - { - protected Item getTabIconItem() - { - return Items.charge_crystal; - } - }; - - private final String name; - private ItemStack iconItemStack; +public enum CheatTab { + BLOCKS("Baumaterial") { + protected Item getIconItem() { + return ItemRegistry.getItemFromBlock(Blocks.glass); + } + }, + NATURE("Gestein und Natur") { + protected Item getIconItem() { + return ItemRegistry.getItemFromBlock(Blocks.grass); + } + }, + WOOD("Holz") { + protected Item getIconItem() { + return ItemRegistry.getItemFromBlock(Blocks.maple_planks); + } + }, + PLANTS("Pflanzen") { + protected Item getIconItem() { + return ItemRegistry.getItemFromBlock(Blocks.oak_leaves); + } + }, + DECORATION("Dekoration") { + protected Item getIconItem() { + return ItemRegistry.getItemFromBlock(Blocks.hay_block); + } + }, + TECHNOLOGY("Redstone & Technik") { + protected Item getIconItem() { + return ItemRegistry.getItemFromBlock(Blocks.tnt); + } + }, + GEMS("Erze & Teure Blöcke") { + protected Item getIconItem() { + return ItemRegistry.getItemFromBlock(Blocks.diamond_block); + } + }, + SPAWNERS("Mob & Itemspawner") { + protected Item getIconItem() { + return Items.minecart; + } + }, + TOOLS("Werkzeug") { + protected Item getIconItem() { + return Items.flint_and_steel; + } + }, + LIQUIDS("Flüssigkeiten") { + protected Item getIconItem() { + return Items.water_bucket; + } + }, + COMBAT("Kampf") { + protected Item getIconItem() { + return Items.bow; + } + }, + MAGIC("Tränke & Verzauberungen") { + protected Item getIconItem() { + return Items.potion; + } + }, + MATERIALS("Werkstoffe") { + protected Item getIconItem() { + return Items.leather; + } + }, + METALS("Metalle und Juwelen") { + protected Item getIconItem() { + return Items.iron_ingot; + } + }, + MISC("Verschiedenes & Nahrung") { + protected Item getIconItem() { + return Items.charge_crystal; + } + }; - private CheatTab(String name) - { - this.name = name; - } + private final String name; - public int getHorizontal() - { - return this.ordinal() % 12; - } + private ItemStack icon; - public int getVertical() - { - return this.ordinal() / 12; - } - - public String getName() - { - return this.name; - } + private CheatTab(String name) { + this.name = name; + } - public ItemStack getIconItemStack() - { - if (this.iconItemStack == null) - { - this.iconItemStack = new ItemStack(this.getTabIconItem(), 1, this.getIconItemDamage()); - } + public int getHorizontal() { + return this.ordinal() % 12; + } - return this.iconItemStack; - } + public int getVertical() { + return this.ordinal() / 12; + } - protected abstract Item getTabIconItem(); + public String getName() { + return this.name; + } - protected int getIconItemDamage() - { - return 0; - } - - public void displayAllReleventItems(List list) - { - for (Item item : ItemRegistry.REGISTRY) - { - if (item != null && item.getTab() == this) - { - item.getSubItems(item, this, list); - } - } - } + public ItemStack getIcon() { + if(this.icon == null) + this.icon = new ItemStack(this.getIconItem()); + return this.icon; + } + + protected abstract Item getIconItem(); + + public void filter(List list) { + for(Item item : ItemRegistry.REGISTRY) { + if(item != null && item.getTab() == this) { + item.getSubItems(item, this, list); + } + } + } } diff --git a/common/src/common/item/ItemAmmo.java b/common/src/common/item/ItemAmmo.java index 9f1b64b..e76602a 100755 --- a/common/src/common/item/ItemAmmo.java +++ b/common/src/common/item/ItemAmmo.java @@ -6,7 +6,7 @@ public class ItemAmmo extends ItemMagnetic { public ItemAmmo(int damage, float explosion, int stack) { this.maxStackSize = stack; - this.setTab(CheatTab.tabCombat); + this.setTab(CheatTab.COMBAT); this.damage = damage; this.explosion = explosion; } diff --git a/common/src/common/item/ItemArmor.java b/common/src/common/item/ItemArmor.java index 9c2f2ab..20723b5 100755 --- a/common/src/common/item/ItemArmor.java +++ b/common/src/common/item/ItemArmor.java @@ -95,7 +95,7 @@ public class ItemArmor extends Item this.damageReduceAmount = material.getDamageReduction(armorType); this.setMaxDamage(material.getDurability(armorType)); this.maxStackSize = 1; - this.setTab(CheatTab.tabCombat); + this.setTab(CheatTab.COMBAT); DispenserRegistry.REGISTRY.putObject(this, dispenserBehavior); } diff --git a/common/src/common/item/ItemAxe.java b/common/src/common/item/ItemAxe.java index 2a2ccc6..d2230ed 100755 --- a/common/src/common/item/ItemAxe.java +++ b/common/src/common/item/ItemAxe.java @@ -3,20 +3,12 @@ package common.item; import common.block.Block; import common.init.ToolMaterial; -public class ItemAxe extends ItemTool -{ -// private static final Set EFFECTIVE_ON = Sets.newHashSet(new Block[] { -// Blocks.planks, Blocks.bookshelf, Blocks.log, Blocks.log2, Blocks.chest, Blocks.pumpkin, Blocks.lit_pumpkin, Blocks.melon_block, Blocks.ladder -// }); +public class ItemAxe extends ItemTool { + public ItemAxe(ToolMaterial material) { + super(3, material); + } - public ItemAxe(ToolMaterial material) - { - super(3, material); - } - - public boolean canUseOn(ItemStack stack, Block state) - { - return state.canAxeHarvest() /* state.getMaterial() != Material.wood && state.getMaterial() != Material.plants && state.getMaterial() != Material.vine ? - super.getStrVsBlock(stack, state) */; - } + public boolean canUseOn(ItemStack stack, Block block) { + return block.canAxeHarvest(); + } } diff --git a/common/src/common/item/ItemBanner.java b/common/src/common/item/ItemBanner.java index 32989a3..fd76926 100755 --- a/common/src/common/item/ItemBanner.java +++ b/common/src/common/item/ItemBanner.java @@ -24,7 +24,7 @@ public class ItemBanner extends ItemBlock public ItemBanner() { super(Blocks.banner); - this.setTab(CheatTab.tabDeco); + this.setTab(CheatTab.DECORATION); this.setHasSubtypes(true); this.setMaxDamage(0); } @@ -152,7 +152,7 @@ public class ItemBanner extends ItemBlock */ public CheatTab getTab() { - return CheatTab.tabDeco; + return CheatTab.DECORATION; } private DyeColor getBaseColor(ItemStack stack) diff --git a/common/src/common/item/ItemBed.java b/common/src/common/item/ItemBed.java index 403a0b0..5baaa20 100755 --- a/common/src/common/item/ItemBed.java +++ b/common/src/common/item/ItemBed.java @@ -16,7 +16,7 @@ public class ItemBed extends Item public ItemBed(BlockBed bedBlock) { this.bedBlock = bedBlock; - this.setTab(CheatTab.tabDeco); + this.setTab(CheatTab.DECORATION); } public Block getBlock() diff --git a/common/src/common/item/ItemBoat.java b/common/src/common/item/ItemBoat.java index 1aa2ae3..d6810ba 100755 --- a/common/src/common/item/ItemBoat.java +++ b/common/src/common/item/ItemBoat.java @@ -18,7 +18,7 @@ public class ItemBoat extends Item public ItemBoat() { this.maxStackSize = 1; - this.setTab(CheatTab.tabSpawners); + this.setTab(CheatTab.SPAWNERS); } /** diff --git a/common/src/common/item/ItemBow.java b/common/src/common/item/ItemBow.java index ddd477d..54b300d 100755 --- a/common/src/common/item/ItemBow.java +++ b/common/src/common/item/ItemBow.java @@ -19,7 +19,7 @@ public class ItemBow extends Item { this.maxStackSize = 1; this.setMaxDamage(384); - this.setTab(CheatTab.tabCombat); + this.setTab(CheatTab.COMBAT); } /** diff --git a/common/src/common/item/ItemBucket.java b/common/src/common/item/ItemBucket.java index d5e3ee9..a3aa306 100755 --- a/common/src/common/item/ItemBucket.java +++ b/common/src/common/item/ItemBucket.java @@ -8,6 +8,7 @@ import java.util.Queue; import java.util.Set; import common.block.Block; +import common.block.Material; import common.block.liquid.BlockDynamicLiquid; import common.block.liquid.BlockLiquid; import common.block.liquid.BlockStaticLiquid; @@ -19,7 +20,6 @@ import common.init.FluidRegistry; import common.init.ItemRegistry; import common.init.Items; import common.init.SoundEvent; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.model.ParticleType; @@ -104,7 +104,7 @@ public class ItemBucket extends Item this.maxStackSize = liquid == null ? 16 : 1; this.liquid = liquid; this.recursive = recursive; - this.setTab(liquid == null ? CheatTab.tabTools : CheatTab.tabLiquids); + this.setTab(liquid == null ? CheatTab.TOOLS : CheatTab.LIQUIDS); // if(!empty) // this.setHasSubtypes(true); } @@ -251,7 +251,7 @@ public class ItemBucket extends Item } else { - if (worldIn.doesWaterVaporize(pos) && this.liquid.getMaterial() == Material.water) + if (worldIn.doesWaterVaporize(pos) && this.liquid.getMaterial() == Material.WATER) { int i = pos.getX(); int j = pos.getY(); diff --git a/common/src/common/item/ItemBucketMilk.java b/common/src/common/item/ItemBucketMilk.java index 7eaecfa..0da249b 100755 --- a/common/src/common/item/ItemBucketMilk.java +++ b/common/src/common/item/ItemBucketMilk.java @@ -16,7 +16,7 @@ public class ItemBucketMilk extends Item public ItemBucketMilk() { this.setMaxStackSize(1); - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); } /** diff --git a/common/src/common/item/ItemCarrotOnAStick.java b/common/src/common/item/ItemCarrotOnAStick.java index 1a7983e..18290c5 100755 --- a/common/src/common/item/ItemCarrotOnAStick.java +++ b/common/src/common/item/ItemCarrotOnAStick.java @@ -10,7 +10,7 @@ public class ItemCarrotOnAStick extends Item { public ItemCarrotOnAStick() { - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); this.setMaxStackSize(1); this.setMaxDamage(25); } diff --git a/common/src/common/item/ItemChargedOrb.java b/common/src/common/item/ItemChargedOrb.java index 0016734..ba3a48e 100755 --- a/common/src/common/item/ItemChargedOrb.java +++ b/common/src/common/item/ItemChargedOrb.java @@ -18,7 +18,7 @@ public class ItemChargedOrb extends ItemFragile public ItemChargedOrb() { this.maxStackSize = 1; - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); this.setMaxDamage(16); this.setColor(TextColor.DMAGENTA); } diff --git a/common/src/common/item/ItemCoal.java b/common/src/common/item/ItemCoal.java index bef0689..aa192ae 100755 --- a/common/src/common/item/ItemCoal.java +++ b/common/src/common/item/ItemCoal.java @@ -11,7 +11,7 @@ public class ItemCoal extends Item { this.setHasSubtypes(true); this.setMaxDamage(0); - this.setTab(CheatTab.tabMetals); + this.setTab(CheatTab.METALS); } /** diff --git a/common/src/common/item/ItemDie.java b/common/src/common/item/ItemDie.java index 5565fb4..4976c5b 100755 --- a/common/src/common/item/ItemDie.java +++ b/common/src/common/item/ItemDie.java @@ -20,7 +20,7 @@ public class ItemDie extends Item public ItemDie() { - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); this.setMaxDamage(0); this.setHasSubtypes(true); } diff --git a/common/src/common/item/ItemDoor.java b/common/src/common/item/ItemDoor.java index 244bc09..996c573 100755 --- a/common/src/common/item/ItemDoor.java +++ b/common/src/common/item/ItemDoor.java @@ -1,10 +1,10 @@ package common.item; import common.block.Block; +import common.block.Material; import common.block.artificial.BlockDoor; import common.entity.npc.EntityNPC; import common.init.Blocks; -import common.material.Material; import common.util.BlockPos; import common.util.Facing; import common.world.State; @@ -17,7 +17,7 @@ public class ItemDoor extends Item public ItemDoor(Block block) { this.block = block; - this.setTab(block.getMaterial() == Material.wood ? CheatTab.tabWood : CheatTab.tabTech); + this.setTab(block.getMaterial() == Material.WOOD ? CheatTab.WOOD : CheatTab.TECHNOLOGY); } public Block getBlock() diff --git a/common/src/common/item/ItemDye.java b/common/src/common/item/ItemDye.java index 5013ce7..eb745f7 100755 --- a/common/src/common/item/ItemDye.java +++ b/common/src/common/item/ItemDye.java @@ -30,7 +30,7 @@ public class ItemDye extends Item { this.setHasSubtypes(true); this.setMaxDamage(0); - this.setTab(CheatTab.tabMaterials); + this.setTab(CheatTab.MATERIALS); } /** diff --git a/common/src/common/item/ItemDynamite.java b/common/src/common/item/ItemDynamite.java index 56a3d46..073d23a 100755 --- a/common/src/common/item/ItemDynamite.java +++ b/common/src/common/item/ItemDynamite.java @@ -16,7 +16,7 @@ public class ItemDynamite extends Item public ItemDynamite() { this.maxStackSize = 32; - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); this.setMaxDamage(0); this.setHasSubtypes(true); } diff --git a/common/src/common/item/ItemEditWand.java b/common/src/common/item/ItemEditWand.java index ca542f9..6d1baa9 100755 --- a/common/src/common/item/ItemEditWand.java +++ b/common/src/common/item/ItemEditWand.java @@ -8,7 +8,7 @@ import common.world.World; public class ItemEditWand extends Item { public ItemEditWand() { this.maxStackSize = 1; - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); } // public boolean canBreakBlocks() { diff --git a/common/src/common/item/ItemEgg.java b/common/src/common/item/ItemEgg.java index ec3c8ff..2d9d77c 100755 --- a/common/src/common/item/ItemEgg.java +++ b/common/src/common/item/ItemEgg.java @@ -9,7 +9,7 @@ public class ItemEgg extends Item { public ItemEgg() { - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); } /** diff --git a/common/src/common/item/ItemExpBottle.java b/common/src/common/item/ItemExpBottle.java index ce0b567..8c0ee7f 100755 --- a/common/src/common/item/ItemExpBottle.java +++ b/common/src/common/item/ItemExpBottle.java @@ -9,7 +9,7 @@ public class ItemExpBottle extends Item { public ItemExpBottle() { - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); } public boolean hasEffect(ItemStack stack) diff --git a/common/src/common/item/ItemFireball.java b/common/src/common/item/ItemFireball.java index 51cbe0a..86d6e01 100755 --- a/common/src/common/item/ItemFireball.java +++ b/common/src/common/item/ItemFireball.java @@ -11,7 +11,7 @@ public class ItemFireball extends Item { public ItemFireball() { - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); } /** diff --git a/common/src/common/item/ItemFishingRod.java b/common/src/common/item/ItemFishingRod.java index 91f0c75..f7278f8 100755 --- a/common/src/common/item/ItemFishingRod.java +++ b/common/src/common/item/ItemFishingRod.java @@ -16,7 +16,7 @@ public class ItemFishingRod extends Item { this.setMaxDamage(64); this.setMaxStackSize(1); - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); } // /** diff --git a/common/src/common/item/ItemFlintAndSteel.java b/common/src/common/item/ItemFlintAndSteel.java index e0096ae..55ff3be 100755 --- a/common/src/common/item/ItemFlintAndSteel.java +++ b/common/src/common/item/ItemFlintAndSteel.java @@ -17,7 +17,7 @@ public class ItemFlintAndSteel extends Item this.fireBlock = fireBlock; this.maxStackSize = 1; this.setMaxDamage(64); - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); } /** diff --git a/common/src/common/item/ItemFood.java b/common/src/common/item/ItemFood.java index cf71fa5..c7ee6bc 100755 --- a/common/src/common/item/ItemFood.java +++ b/common/src/common/item/ItemFood.java @@ -21,7 +21,7 @@ public class ItemFood extends Item this.itemUseDuration = 32; this.healAmount = amount; this.isWolfsFavoriteMeat = isWolfFood; - this.setTab(CheatTab.tabMisc); + this.setTab(CheatTab.MISC); } /** diff --git a/common/src/common/item/ItemGlassBottle.java b/common/src/common/item/ItemGlassBottle.java index aabb0ed..7f73248 100755 --- a/common/src/common/item/ItemGlassBottle.java +++ b/common/src/common/item/ItemGlassBottle.java @@ -1,8 +1,8 @@ package common.item; +import common.block.Material; import common.entity.npc.EntityNPC; import common.init.Items; -import common.material.Material; import common.model.Model; import common.model.ModelProvider; import common.util.BlockPos; @@ -13,7 +13,7 @@ public class ItemGlassBottle extends Item { public ItemGlassBottle() { - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); } /** @@ -43,7 +43,7 @@ public class ItemGlassBottle extends Item return itemStackIn; } - if (worldIn.getState(blockpos).getBlock().getMaterial() == Material.water) + if (worldIn.getState(blockpos).getBlock().getMaterial() == Material.WATER) { --itemStackIn.stackSize; // playerIn.triggerAchievement(StatRegistry.objectUseStats[ItemRegistry.getIdFromItem(this)]); diff --git a/common/src/common/item/ItemGunBase.java b/common/src/common/item/ItemGunBase.java index 26fbc81..d80d82c 100755 --- a/common/src/common/item/ItemGunBase.java +++ b/common/src/common/item/ItemGunBase.java @@ -17,7 +17,7 @@ public abstract class ItemGunBase extends Item { this.maxStackSize = 1; this.setMaxDamage(durability); - this.setTab(CheatTab.tabCombat); + this.setTab(CheatTab.COMBAT); } public ItemAction getItemPosition(ItemStack stack) diff --git a/common/src/common/item/ItemHoe.java b/common/src/common/item/ItemHoe.java index 7512f93..9e7b7b7 100755 --- a/common/src/common/item/ItemHoe.java +++ b/common/src/common/item/ItemHoe.java @@ -20,7 +20,7 @@ public class ItemHoe extends Item this.theToolMaterial = material; this.maxStackSize = 1; this.setMaxDamage(material.getDurability()); - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); } diff --git a/common/src/common/item/ItemHorseArmor.java b/common/src/common/item/ItemHorseArmor.java index a976e1a..3b60d1f 100755 --- a/common/src/common/item/ItemHorseArmor.java +++ b/common/src/common/item/ItemHorseArmor.java @@ -10,7 +10,7 @@ public class ItemHorseArmor extends Item { this.material = material; this.texture = texture; this.setMaxStackSize(1); - this.setTab(CheatTab.tabCombat); + this.setTab(CheatTab.COMBAT); } public boolean isMagnetic() { diff --git a/common/src/common/item/ItemLead.java b/common/src/common/item/ItemLead.java index 6ea2819..fc914a4 100755 --- a/common/src/common/item/ItemLead.java +++ b/common/src/common/item/ItemLead.java @@ -14,7 +14,7 @@ public class ItemLead extends Item { public ItemLead() { - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); } /** diff --git a/common/src/common/item/ItemMagnet.java b/common/src/common/item/ItemMagnet.java index c7dfa31..f2b8527 100755 --- a/common/src/common/item/ItemMagnet.java +++ b/common/src/common/item/ItemMagnet.java @@ -15,7 +15,7 @@ public class ItemMagnet extends Item { private final boolean chicken; public ItemMagnet(boolean chicken) { - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); this.setMaxStackSize(1); this.chicken = chicken; } diff --git a/common/src/common/item/ItemMinecart.java b/common/src/common/item/ItemMinecart.java index 25b0513..4146eb5 100755 --- a/common/src/common/item/ItemMinecart.java +++ b/common/src/common/item/ItemMinecart.java @@ -84,7 +84,7 @@ public class ItemMinecart extends Item { this.maxStackSize = 1; this.minecartType = type; - this.setTab(CheatTab.tabSpawners); + this.setTab(CheatTab.SPAWNERS); // if(type != EntityMinecart.EnumMinecartType.COMMAND_BLOCK) DispenserRegistry.REGISTRY.putObject(this, dispenserMinecartBehavior); } diff --git a/common/src/common/item/ItemMonsterPlacer.java b/common/src/common/item/ItemMonsterPlacer.java index 995adc8..e98d610 100755 --- a/common/src/common/item/ItemMonsterPlacer.java +++ b/common/src/common/item/ItemMonsterPlacer.java @@ -31,7 +31,7 @@ public class ItemMonsterPlacer extends Item public ItemMonsterPlacer(String entityId) { // this.setHasSubtypes(true); - this.setTab(CheatTab.tabSpawners); + this.setTab(CheatTab.SPAWNERS); this.entityId = entityId; } diff --git a/common/src/common/item/ItemNameTag.java b/common/src/common/item/ItemNameTag.java index 8b6d2dd..fd24634 100755 --- a/common/src/common/item/ItemNameTag.java +++ b/common/src/common/item/ItemNameTag.java @@ -7,7 +7,7 @@ public class ItemNameTag extends Item { public ItemNameTag() { - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); } /** diff --git a/common/src/common/item/ItemNpcSpawner.java b/common/src/common/item/ItemNpcSpawner.java index 934dbca..c0f707e 100755 --- a/common/src/common/item/ItemNpcSpawner.java +++ b/common/src/common/item/ItemNpcSpawner.java @@ -30,7 +30,7 @@ public class ItemNpcSpawner extends Item public ItemNpcSpawner(CharacterInfo spawned) { // this.setHasSubtypes(true); - this.setTab(CheatTab.tabSpawners); + this.setTab(CheatTab.SPAWNERS); this.spawned = spawned; } diff --git a/common/src/common/item/ItemPickaxe.java b/common/src/common/item/ItemPickaxe.java index 1abbc61..1a2c7ba 100755 --- a/common/src/common/item/ItemPickaxe.java +++ b/common/src/common/item/ItemPickaxe.java @@ -3,44 +3,16 @@ package common.item; import common.block.Block; import common.init.ToolMaterial; -public class ItemPickaxe extends ItemTool -{ -// private static final Set EFFECTIVE_ON = Sets.newHashSet(new Block[] { -// Blocks.activator_rail, Blocks.coal_ore, Blocks.cobblestone, Blocks.detector_rail, Blocks.diamond_block, Blocks.diamond_ore, Blocks.double_stone_slab, -// Blocks.golden_rail, Blocks.gold_block, Blocks.gold_ore, Blocks.ice, Blocks.iron_block, Blocks.iron_ore, Blocks.lapis_block, Blocks.lapis_ore, -// Blocks.lit_redstone_ore, Blocks.mossy_cobblestone, Blocks.netherrack, Blocks.packed_ice, Blocks.rail, Blocks.redstone_ore, Blocks.sandstone, -// Blocks.red_sandstone, Blocks.stone, Blocks.stone_slab -// }); +public class ItemPickaxe extends ItemTool { + public ItemPickaxe(ToolMaterial material) { + super(2, material); + } - public ItemPickaxe(ToolMaterial material) - { - super(2, material); - } - - public boolean canHarvestBlock(Block blockIn) - { - return blockIn.getMiningLevel() >= 0 && this.toolMaterial.getHarvestLevel() >= blockIn.getMiningLevel(); -// blockIn == Blocks.obsidian ? this.toolMaterial.getHarvestLevel() == 3 : -// (blockIn != Blocks.diamond_block && blockIn != Blocks.diamond_ore ? -// (blockIn != Blocks.emerald_ore && blockIn != Blocks.emerald_block ? -// (blockIn != Blocks.gold_block && blockIn != Blocks.gold_ore ? -// (blockIn != Blocks.iron_block && blockIn != Blocks.iron_ore ? -// (blockIn != Blocks.lapis_block && blockIn != Blocks.lapis_ore ? -// (blockIn != Blocks.redstone_ore && blockIn != Blocks.lit_redstone_ore ? -// (blockIn.getMaterial() == Material.rock ? true : -// (blockIn.getMaterial() == Material.iron ? true : -// blockIn.getMaterial() == Material.anvil)) : -// this.toolMaterial.getHarvestLevel() >= 2) : -// this.toolMaterial.getHarvestLevel() >= 1) : -// this.toolMaterial.getHarvestLevel() >= 1) : -// this.toolMaterial.getHarvestLevel() >= 2) : -// this.toolMaterial.getHarvestLevel() >= 2) : -// this.toolMaterial.getHarvestLevel() >= 2); - } + public boolean canHarvestBlock(Block block) { + return block.getMiningLevel() >= 0 && this.getToolMaterial().getHarvestLevel() >= block.getMiningLevel(); + } - public boolean canUseOn(ItemStack stack, Block state) - { - return state.getMiningLevel() >= 0 /* state.getMaterial() != Material.iron && state.getMaterial() != Material.anvil && state.getMaterial() != Material.rock - ? super.getStrVsBlock(stack, state) */; - } + public boolean canUseOn(ItemStack stack, Block block) { + return block.getMiningLevel() >= 0; + } } diff --git a/common/src/common/item/ItemPotion.java b/common/src/common/item/ItemPotion.java index a254127..c7dcbe1 100755 --- a/common/src/common/item/ItemPotion.java +++ b/common/src/common/item/ItemPotion.java @@ -34,7 +34,7 @@ public class ItemPotion extends Item this.setMaxStackSize(1); this.setHasSubtypes(true); this.setMaxDamage(0); - this.setTab(CheatTab.tabMagic); + this.setTab(CheatTab.MAGIC); this.setColor(TextColor.ORK); } diff --git a/common/src/common/item/ItemRecord.java b/common/src/common/item/ItemRecord.java index ae209bc..d43a90e 100755 --- a/common/src/common/item/ItemRecord.java +++ b/common/src/common/item/ItemRecord.java @@ -5,7 +5,7 @@ import common.model.ModelProvider; public class ItemRecord extends Item { public ItemRecord() { - this.setTab(CheatTab.tabMisc); + this.setTab(CheatTab.MISC); } public Model getModel(ModelProvider provider, String name, int meta) { diff --git a/common/src/common/item/ItemRedstone.java b/common/src/common/item/ItemRedstone.java index fa090d4..0abb535 100755 --- a/common/src/common/item/ItemRedstone.java +++ b/common/src/common/item/ItemRedstone.java @@ -12,7 +12,7 @@ public class ItemRedstone extends Item { public ItemRedstone() { - this.setTab(CheatTab.tabTech); + this.setTab(CheatTab.TECHNOLOGY); } public Block getBlock() diff --git a/common/src/common/item/ItemSaddle.java b/common/src/common/item/ItemSaddle.java index f872541..2ed413f 100755 --- a/common/src/common/item/ItemSaddle.java +++ b/common/src/common/item/ItemSaddle.java @@ -9,7 +9,7 @@ public class ItemSaddle extends Item public ItemSaddle() { this.maxStackSize = 1; - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); } /** diff --git a/common/src/common/item/ItemSeedFood.java b/common/src/common/item/ItemSeedFood.java index 7347a5c..09e565e 100755 --- a/common/src/common/item/ItemSeedFood.java +++ b/common/src/common/item/ItemSeedFood.java @@ -18,7 +18,7 @@ public class ItemSeedFood extends ItemFood super(healAmount, false); this.crops = crops; this.soilId = soil; - this.setTab(CheatTab.tabPlants); + this.setTab(CheatTab.PLANTS); } public Block getBlock() diff --git a/common/src/common/item/ItemSeeds.java b/common/src/common/item/ItemSeeds.java index 2bf6656..dc70608 100755 --- a/common/src/common/item/ItemSeeds.java +++ b/common/src/common/item/ItemSeeds.java @@ -18,7 +18,7 @@ public class ItemSeeds extends Item { this.crops = crops; this.soilBlockID = soil; - this.setTab(CheatTab.tabPlants); + this.setTab(CheatTab.PLANTS); } public Block getBlock() diff --git a/common/src/common/item/ItemShears.java b/common/src/common/item/ItemShears.java index 81c0b0a..b3e3556 100755 --- a/common/src/common/item/ItemShears.java +++ b/common/src/common/item/ItemShears.java @@ -1,10 +1,10 @@ package common.item; import common.block.Block; +import common.block.Material; import common.entity.types.EntityLiving; import common.init.Blocks; import common.init.ToolMaterial; -import common.material.Material; import common.util.BlockPos; import common.world.World; @@ -16,7 +16,7 @@ public class ItemShears extends Item { this.setMaxStackSize(1); this.setMaxDamage(material.getDurability() - 12); - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); this.material = material; } @@ -35,7 +35,7 @@ public class ItemShears extends Item public boolean canHarvestBlock(Block blockIn) { - return blockIn.getMaterial() == Material.web || blockIn == Blocks.redstone || blockIn == Blocks.string; + return blockIn.getMaterial() == Material.FLUFF || blockIn == Blocks.redstone || blockIn == Blocks.string; } public float getStrVsBlock(ItemStack stack, Block state) diff --git a/common/src/common/item/ItemShovel.java b/common/src/common/item/ItemShovel.java new file mode 100755 index 0000000..5419e23 --- /dev/null +++ b/common/src/common/item/ItemShovel.java @@ -0,0 +1,19 @@ +package common.item; + +import common.block.Block; +import common.block.Material; +import common.init.ToolMaterial; + +public class ItemShovel extends ItemTool { + public ItemShovel(ToolMaterial material) { + super(1, material); + } + + public boolean canUseOn(ItemStack stack, Block block) { + return block.canShovelHarvest(); + } + + public boolean canHarvestBlock(Block block) { + return block.getMaterial() == Material.POWDER || block.getMaterial() == Material.DIGGABLE; + } +} diff --git a/common/src/common/item/ItemSign.java b/common/src/common/item/ItemSign.java index 1708631..b8e8cdc 100755 --- a/common/src/common/item/ItemSign.java +++ b/common/src/common/item/ItemSign.java @@ -16,7 +16,7 @@ public class ItemSign extends Item { public ItemSign() { - this.setTab(CheatTab.tabDeco); + this.setTab(CheatTab.DECORATION); } public Block getBlock() diff --git a/common/src/common/item/ItemSkull.java b/common/src/common/item/ItemSkull.java index 20ee545..ac039ad 100755 --- a/common/src/common/item/ItemSkull.java +++ b/common/src/common/item/ItemSkull.java @@ -19,7 +19,7 @@ public class ItemSkull extends Item { public ItemSkull() { - this.setTab(CheatTab.tabDeco); + this.setTab(CheatTab.DECORATION); // this.setMaxDamage(0); // this.setHasSubtypes(true); } diff --git a/common/src/common/item/ItemSnowball.java b/common/src/common/item/ItemSnowball.java index efdf480..f048210 100755 --- a/common/src/common/item/ItemSnowball.java +++ b/common/src/common/item/ItemSnowball.java @@ -9,7 +9,7 @@ public class ItemSnowball extends Item { public ItemSnowball() { - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); } /** diff --git a/common/src/common/item/ItemSpade.java b/common/src/common/item/ItemSpade.java deleted file mode 100755 index f2633c7..0000000 --- a/common/src/common/item/ItemSpade.java +++ /dev/null @@ -1,28 +0,0 @@ -package common.item; - -import common.block.Block; -import common.init.ToolMaterial; -import common.material.Material; - -public class ItemSpade extends ItemTool -{ -// private static final Set EFFECTIVE_ON = Sets.newHashSet(new Block[] { -// Blocks.clay, Blocks.dirt, Blocks.farmland, Blocks.grass, Blocks.gravel, Blocks.mycelium, Blocks.sand, Blocks.snow, Blocks.snow_layer, Blocks.soul_sand -// }); - - public ItemSpade(ToolMaterial material) - { - super(1, material); - } - - public boolean canUseOn(ItemStack stack, Block state) - { - return state.canShovelHarvest(); - } - - public boolean canHarvestBlock(Block blockIn) - { -// return blockIn == Blocks.snow_layer ? true : blockIn == Blocks.snow; - return blockIn.getMaterial() == Material.snow ? true : blockIn.getMaterial() == Material.craftedSnow; - } -} diff --git a/common/src/common/item/ItemSword.java b/common/src/common/item/ItemSword.java index 1634327..43ce9a5 100755 --- a/common/src/common/item/ItemSword.java +++ b/common/src/common/item/ItemSword.java @@ -7,12 +7,12 @@ import common.attributes.Attribute; import common.attributes.AttributeModifier; import common.attributes.Attributes; import common.block.Block; +import common.block.Material; import common.collect.Sets; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.Blocks; import common.init.ToolMaterial; -import common.material.Material; import common.model.Transforms; import common.util.BlockPos; import common.world.World; @@ -27,7 +27,7 @@ public class ItemSword extends Item this.material = material; this.maxStackSize = 1; this.setMaxDamage(material.getDurability()); - this.setTab(CheatTab.tabCombat); + this.setTab(CheatTab.COMBAT); this.attackDamage = 4 + material.getDamage(); } @@ -53,7 +53,7 @@ public class ItemSword extends Item else { Material material = state.getMaterial(); - return material != Material.plants && material != Material.vine && material != Material.leaves && material != Material.gourd ? 1.0F : 1.5F; + return material != Material.PLANT && material != Material.BUSH && material != Material.LEAVES && material != Material.SOFT ? 1.0F : 1.5F; } } diff --git a/common/src/common/item/ItemTool.java b/common/src/common/item/ItemTool.java index 2e2f8b6..cd9f96a 100755 --- a/common/src/common/item/ItemTool.java +++ b/common/src/common/item/ItemTool.java @@ -14,113 +14,65 @@ import common.model.Transforms; import common.util.BlockPos; import common.world.World; -public abstract class ItemTool extends Item -{ -// private Set effectiveBlocks; - protected float efficiencyOnProperMaterial = 4.0F; +public abstract class ItemTool extends Item { + private final float efficiency; + private final int damage; + private final ToolMaterial material; - /** Damage versus entities. */ - private int damageVsEntity; + public ItemTool(int damage, ToolMaterial material) { + this.material = material; + this.maxStackSize = 1; + this.setMaxDamage(material.getDurability()); + this.efficiency = material.getEfficiency(); + this.damage = damage + material.getDamage(); + this.setTab(CheatTab.TOOLS); + } - /** The material this tool is made from. */ - protected ToolMaterial toolMaterial; + public abstract boolean canUseOn(ItemStack stack, Block block); - public ItemTool(int attackDamage, ToolMaterial material) - { - this.toolMaterial = material; -// this.effectiveBlocks = effectiveBlocks; - this.maxStackSize = 1; - this.setMaxDamage(material.getDurability()); - this.efficiencyOnProperMaterial = material.getEfficiency(); - this.damageVsEntity = attackDamage + material.getDamage(); - this.setTab(CheatTab.tabTools); - } - - public abstract boolean canUseOn(ItemStack stack, Block state); + public float getStrVsBlock(ItemStack stack, Block block) { + return !this.canUseOn(stack, block) ? 1.0F : this.efficiency; + } - public float getStrVsBlock(ItemStack stack, Block state) { - return !this.canUseOn(stack, state) ? 1.0F : this.efficiencyOnProperMaterial; - } -// { -// return this.effectiveBlocks.contains(state) ? this.efficiencyOnProperMaterial : 1.0F; -// } + public boolean hitEntity(ItemStack stack, EntityLiving target, EntityLiving attacker) { + stack.damageItem(2, attacker); + return true; + } - /** - * Current implementations of this method in child classes do not use the entry argument beside ev. They just raise - * the damage on the stack. - */ - public boolean hitEntity(ItemStack stack, EntityLiving target, EntityLiving attacker) - { - stack.damageItem(2, attacker); - return true; - } + public boolean onBlockDestroyed(ItemStack stack, World world, Block block, BlockPos pos, EntityLiving player) { + if(block.getBlockHardness(world, pos) != 0.0f) + stack.damageItem(1, player); + return true; + } - /** - * Called when a Block is destroyed using this Item. Return true to trigger the "Use Item" statistic. - */ - public boolean onBlockDestroyed(ItemStack stack, World worldIn, Block blockIn, BlockPos pos, EntityLiving playerIn) - { - if ((double)blockIn.getBlockHardness(worldIn, pos) != 0.0D) - { - stack.damageItem(1, playerIn); - } + public ToolMaterial getToolMaterial() { + return this.material; + } - return true; - } + public int getItemEnchantability() { + return this.material.getEnchantability(); + } -// /** -// * Returns True is the item is renderer in full 3D when hold. -// */ -// public boolean isFull3D() -// { -// return true; -// } + public boolean getIsRepairable(ItemStack stack, ItemStack repair) { + return this.material.isRepairItem(repair.getItem()) ? true : super.getIsRepairable(stack, repair); + } - public ToolMaterial getToolMaterial() - { - return this.toolMaterial; - } + public Map> getItemAttributeModifiers() { + Map> mods = super.getItemAttributeModifiers(); + mods.put(Attributes.ATTACK_DAMAGE, + Sets.newHashSet(new AttributeModifier(Attributes.ITEM_VAL_ID, "Tool modifier", this.damage, false))); + return mods; + } - /** - * Return the enchantability factor of the item, most of the time is based on material. - */ - public int getItemEnchantability() - { - return this.toolMaterial.getEnchantability(); - } + public boolean isMagnetic() { + return this.material.isMagnetic(); + } -// /** -// * Return the name for this tool's material. -// */ -// public String getToolMaterialName() -// { -// return this.toolMaterial.toString(); -// } + public Transforms getTransform() { + return Transforms.TOOL; + } - /** - * Return whether this item is repairable in an anvil. - */ - public boolean getIsRepairable(ItemStack toRepair, ItemStack repair) - { - return this.toolMaterial.isRepairItem(repair.getItem()) ? true : super.getIsRepairable(toRepair, repair); - } - - public Map> getItemAttributeModifiers() - { - Map> multimap = super.getItemAttributeModifiers(); - multimap.put(Attributes.ATTACK_DAMAGE, Sets.newHashSet(new AttributeModifier(Attributes.ITEM_VAL_ID, "Tool modifier", this.damageVsEntity, false))); - return multimap; - } - - public boolean isMagnetic() { - return this.toolMaterial.isMagnetic(); - } - - public Transforms getTransform() { - return Transforms.TOOL; - } - - public boolean canBeWielded() { - return true; - } + public boolean canBeWielded() { + return true; + } } diff --git a/common/src/common/item/ItemWand.java b/common/src/common/item/ItemWand.java index 8b69b69..f0a494d 100755 --- a/common/src/common/item/ItemWand.java +++ b/common/src/common/item/ItemWand.java @@ -15,7 +15,7 @@ import common.world.AWorldServer; public abstract class ItemWand extends Item { public ItemWand() { this.maxStackSize = 1; - this.setTab(CheatTab.tabTools); + this.setTab(CheatTab.TOOLS); } // public boolean canBreakBlocks() { diff --git a/common/src/common/material/Material.java b/common/src/common/material/Material.java deleted file mode 100755 index 28a2f84..0000000 --- a/common/src/common/material/Material.java +++ /dev/null @@ -1,228 +0,0 @@ -package common.material; - -public class Material -{ - public static final Material grass = new Material(); - public static final Material ground = new Material(); - public static final Material wood = (new Material()).setBurning(); - public static final Material rock = (new Material()).setRequiresTool(); - public static final Material iron = (new Material()).setRequiresTool(); - public static final Material anvil = (new Material()).setRequiresTool().setImmovableMobility(); - public static final Material water = (new MaterialColdFluid()).setNoPushMobility(); - public static final Material coldFluid = (new MaterialColdFluid()).setNoPushMobility(); - public static final Material lava = (new MaterialHotFluid()).setNoPushMobility(); - public static final Material hotFluid = (new MaterialHotFluid()).setNoPushMobility(); - public static final Material leaves = (new Material()).setBurning().setTranslucent().setNoPushMobility(); - public static final Material plants = (new MaterialLogic()).setNoPushMobility(); - public static final Material vine = (new MaterialLogic()).setBurning().setNoPushMobility().setReplaceable(); - public static final Material sponge = new Material(); - public static final Material cloth = (new Material()).setBurning(); - public static final Material fire = (new MaterialTransparent()).setNoPushMobility(); - public static final Material sand = new Material(); - public static final Material circuits = (new MaterialLogic()).setNoPushMobility(); - public static final Material carpet = (new MaterialLogic()).setBurning(); - public static final Material glass = (new Material()).setTranslucent(); - public static final Material redstoneLight = (new Material()); - public static final Material tnt = (new Material()).setBurning().setTranslucent(); - public static final Material ice = (new Material()).setTranslucent(); - public static final Material packedIce = (new Material()); - public static final Material snow = (new MaterialLogic()).setReplaceable().setTranslucent().setRequiresTool().setNoPushMobility(); - public static final Material craftedSnow = (new Material()).setRequiresTool(); - public static final Material cactus = (new Material()).setTranslucent().setNoPushMobility(); - public static final Material clay = new Material(); - public static final Material gourd = (new Material()).setNoPushMobility(); - public static final Material dragonEgg = (new Material()).setNoPushMobility(); - public static final Material portal = (new MaterialPortal()).setImmovableMobility(); - public static final Material cake = (new Material()).setNoPushMobility(); - public static final Material web = (new Material() - { - public boolean blocksMovement() - { - return false; - } - }).setRequiresTool().setNoPushMobility(); - public static final Material piston = (new Material()).setImmovableMobility(); - - /** Bool defining if the block can burn or not. */ - private boolean canBurn; - - /** - * Determines whether blocks with this material can be "overwritten" by other blocks when placed - eg snow, vines - * and tall grass. - */ - private boolean replaceable; - - /** Indicates if the material is translucent */ - private boolean isTranslucent; - -// /** The color index used to draw the blocks of this material on maps. */ -// private final MapColor materialMapColor; - - /** - * Determines if the material can be harvested without a tool (or with the wrong tool) - */ - private boolean requiresNoTool = true; - - /** - * Mobility information flag. 0 indicates that this block is normal, 1 indicates that it can't push other blocks, 2 - * indicates that it can't be pushed. - */ - private int mobilityFlag; -// private boolean isAdventureModeExempt; - -// public Material(MapColor color) -// { -//// this.materialMapColor = color; -// } - - /** - * Returns if blocks of these materials are liquids. - */ - public boolean isLiquid() - { - return false; - } - - public boolean isColdLiquid() - { - return false; - } - - public boolean isHotLiquid() - { - return false; - } - - /** - * Returns true if the block is a considered solid. This is true by default. - */ - public boolean isSolid() - { - return true; - } - - /** - * Will prevent grass from growing on dirt underneath and kill any grass below it if it returns true - */ - public boolean blocksLight() - { - return true; - } - - /** - * Returns if this material is considered solid or not - */ - public boolean blocksMovement() - { - return true; - } - - /** - * Marks the material as translucent - */ - private Material setTranslucent() - { - this.isTranslucent = true; - return this; - } - - /** - * Makes blocks with this material require the correct tool to be harvested. - */ - protected Material setRequiresTool() - { - this.requiresNoTool = false; - return this; - } - - /** - * Set the canBurn bool to True and return the current object. - */ - protected Material setBurning() - { - this.canBurn = true; - return this; - } - - /** - * Returns if the block can burn or not. - */ - public boolean getCanBurn() - { - return this.canBurn; - } - - /** - * Sets {@link #replaceable} to true. - */ - public Material setReplaceable() - { - this.replaceable = true; - return this; - } - - /** - * Returns whether the material can be replaced by other blocks when placed - eg snow, vines and tall grass. - */ - public boolean isReplaceable() - { - return this.replaceable; - } - - /** - * Indicate if the material is opaque - */ - public boolean isOpaque() - { - return this.isTranslucent ? false : this.blocksMovement(); - } - - /** - * Returns true if the material can be harvested without a tool (or with the wrong tool) - */ - public boolean isToolNotRequired() - { - return this.requiresNoTool; - } - - /** - * Returns the mobility information of the material, 0 = free, 1 = can't push but can move over, 2 = total - * immobility and stop pistons. - */ - public int getMaterialMobility() - { - return this.mobilityFlag; - } - - /** - * This type of material can't be pushed, but pistons can move over it. - */ - protected Material setNoPushMobility() - { - this.mobilityFlag = 1; - return this; - } - - /** - * This type of material can't be pushed, and pistons are blocked to move. - */ - protected Material setImmovableMobility() - { - this.mobilityFlag = 2; - return this; - } - -// protected Material setAdventureModeExempt() -// { -// this.isAdventureModeExempt = true; -// return this; -// } - -// /** -// * Retrieves the color index of the block. This is is the same color used by vanilla maps to represent this block. -// */ -// public MapColor getMaterialMapColor() -// { -// return this.materialMapColor; -// } -} diff --git a/common/src/common/material/MaterialColdFluid.java b/common/src/common/material/MaterialColdFluid.java deleted file mode 100755 index 9187ad2..0000000 --- a/common/src/common/material/MaterialColdFluid.java +++ /dev/null @@ -1,24 +0,0 @@ -package common.material; - -public class MaterialColdFluid extends Material { - public MaterialColdFluid() { - this.setReplaceable(); - this.setNoPushMobility(); - } - - public boolean isLiquid() { - return true; - } - - public boolean isColdLiquid() { - return true; - } - - public boolean blocksMovement() { - return false; - } - - public boolean isSolid() { - return false; - } -} diff --git a/common/src/common/material/MaterialHotFluid.java b/common/src/common/material/MaterialHotFluid.java deleted file mode 100755 index 03b6ca1..0000000 --- a/common/src/common/material/MaterialHotFluid.java +++ /dev/null @@ -1,24 +0,0 @@ -package common.material; - -public class MaterialHotFluid extends Material { - public MaterialHotFluid() { - this.setReplaceable(); - this.setNoPushMobility(); - } - - public boolean isLiquid() { - return true; - } - - public boolean isHotLiquid() { - return true; - } - - public boolean blocksMovement() { - return false; - } - - public boolean isSolid() { - return false; - } -} diff --git a/common/src/common/material/MaterialLogic.java b/common/src/common/material/MaterialLogic.java deleted file mode 100755 index 137eb9a..0000000 --- a/common/src/common/material/MaterialLogic.java +++ /dev/null @@ -1,28 +0,0 @@ -package common.material; - -public class MaterialLogic extends Material -{ - /** - * Returns true if the block is a considered solid. This is true by default. - */ - public boolean isSolid() - { - return false; - } - - /** - * Will prevent grass from growing on dirt underneath and kill any grass below it if it returns true - */ - public boolean blocksLight() - { - return false; - } - - /** - * Returns if this material is considered solid or not - */ - public boolean blocksMovement() - { - return false; - } -} diff --git a/common/src/common/material/MaterialPortal.java b/common/src/common/material/MaterialPortal.java deleted file mode 100755 index 778d739..0000000 --- a/common/src/common/material/MaterialPortal.java +++ /dev/null @@ -1,28 +0,0 @@ -package common.material; - -public class MaterialPortal extends Material -{ - /** - * Returns true if the block is a considered solid. This is true by default. - */ - public boolean isSolid() - { - return false; - } - - /** - * Will prevent grass from growing on dirt underneath and kill any grass below it if it returns true - */ - public boolean blocksLight() - { - return false; - } - - /** - * Returns if this material is considered solid or not - */ - public boolean blocksMovement() - { - return false; - } -} diff --git a/common/src/common/material/MaterialTransparent.java b/common/src/common/material/MaterialTransparent.java deleted file mode 100755 index 82af6d1..0000000 --- a/common/src/common/material/MaterialTransparent.java +++ /dev/null @@ -1,33 +0,0 @@ -package common.material; - -public class MaterialTransparent extends Material -{ - public MaterialTransparent() - { - this.setReplaceable(); - } - - /** - * Returns true if the block is a considered solid. This is true by default. - */ - public boolean isSolid() - { - return false; - } - - /** - * Will prevent grass from growing on dirt underneath and kill any grass below it if it returns true - */ - public boolean blocksLight() - { - return false; - } - - /** - * Returns if this material is considered solid or not - */ - public boolean blocksMovement() - { - return false; - } -} diff --git a/common/src/common/pathfinding/PathNavigateGround.java b/common/src/common/pathfinding/PathNavigateGround.java index 0ecbf86..7a6c5de 100755 --- a/common/src/common/pathfinding/PathNavigateGround.java +++ b/common/src/common/pathfinding/PathNavigateGround.java @@ -1,11 +1,11 @@ package common.pathfinding; import common.block.Block; +import common.block.Material; import common.entity.animal.EntityChicken; import common.entity.npc.EntityZombie; import common.entity.types.EntityLiving; import common.init.Blocks; -import common.material.Material; import common.util.BlockPos; import common.util.ExtMath; import common.util.Vec3; diff --git a/common/src/common/pathfinding/WalkNodeProcessor.java b/common/src/common/pathfinding/WalkNodeProcessor.java index 8ba5d42..cfe84a6 100755 --- a/common/src/common/pathfinding/WalkNodeProcessor.java +++ b/common/src/common/pathfinding/WalkNodeProcessor.java @@ -1,6 +1,7 @@ package common.pathfinding; import common.block.Block; +import common.block.Material; import common.block.artificial.BlockDoor; import common.block.artificial.BlockFence; import common.block.artificial.BlockFenceGate; @@ -8,7 +9,6 @@ import common.block.artificial.BlockWall; import common.block.tech.BlockRailBase; import common.entity.Entity; import common.init.Blocks; -import common.material.Material; import common.util.BlockPos; import common.util.ExtMath; import common.world.IBlockAccess; @@ -211,7 +211,7 @@ public class WalkNodeProcessor extends NodeProcessor { if (!block.getMaterial().isColdLiquid()) { - if (!enterDoors && block instanceof BlockDoor && block.getMaterial() == Material.wood) + if (!enterDoors && block instanceof BlockDoor && block.getMaterial() == Material.WOOD) { return 0; } @@ -238,7 +238,7 @@ public class WalkNodeProcessor extends NodeProcessor return -3; } } - else if (!block.isPassable(world, mpos) && (!breakDoors || !(block instanceof BlockDoor) || block.getMaterial() != Material.wood)) + else if (!block.isPassable(world, mpos) && (!breakDoors || !(block instanceof BlockDoor) || block.getMaterial() != Material.WOOD)) { if (block instanceof BlockFence || block instanceof BlockFenceGate || block instanceof BlockWall) { diff --git a/common/src/common/tileentity/TileEntityFurnace.java b/common/src/common/tileentity/TileEntityFurnace.java index 2f3a1f6..c103aa7 100755 --- a/common/src/common/tileentity/TileEntityFurnace.java +++ b/common/src/common/tileentity/TileEntityFurnace.java @@ -1,6 +1,7 @@ package common.tileentity; import common.block.Block; +import common.block.Material; import common.block.artificial.BlockSlab; import common.block.foliage.BlockSapling; import common.block.tech.BlockFurnace; @@ -22,7 +23,6 @@ import common.item.ItemHoe; import common.item.ItemStack; import common.item.ItemSword; import common.item.ItemTool; -import common.material.Material; import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; import common.util.ExtMath; @@ -381,7 +381,7 @@ public class TileEntityFurnace extends TileEntityLockable implements ITickable, // return 150; // } - if (block.getMaterial() == Material.wood) + if (block.getMaterial() == Material.WOOD) { return block instanceof BlockSlab ? 150 : 300; } @@ -398,7 +398,7 @@ public class TileEntityFurnace extends TileEntityLockable implements ITickable, (item == Items.stick ? 100 : (item == Items.coal ? 1600 : (item instanceof ItemBucket && ((ItemBucket)item).getLiquid() != null && - ((ItemBucket)item).getLiquid().getMaterial() == Material.lava ? 20000 : + ((ItemBucket)item).getLiquid().getMaterial() == Material.LAVA ? 20000 : (item.getBlock() instanceof BlockSapling ? 100 : (item == Items.blaze_rod ? 2400 : 0))))))); } diff --git a/common/src/common/village/Village.java b/common/src/common/village/Village.java index 4a805dc..3801d4e 100755 --- a/common/src/common/village/Village.java +++ b/common/src/common/village/Village.java @@ -4,9 +4,9 @@ import java.util.Iterator; import java.util.List; import common.block.Block; +import common.block.Material; import common.block.artificial.BlockDoor; import common.collect.Lists; -import common.material.Material; import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; import common.util.BlockPos; @@ -183,7 +183,7 @@ public class Village private boolean isWoodDoor(AWorldServer world, BlockPos pos) { Block block = world.getState(pos).getBlock(); - return block instanceof BlockDoor ? block.getMaterial() == Material.wood : false; + return block instanceof BlockDoor ? block.getMaterial() == Material.WOOD : false; } private void updatePosition() diff --git a/common/src/common/world/Chunk.java b/common/src/common/world/Chunk.java index 16af85a..359339a 100755 --- a/common/src/common/world/Chunk.java +++ b/common/src/common/world/Chunk.java @@ -9,12 +9,12 @@ import java.util.function.Predicate; import common.block.Block; import common.block.ITileEntityProvider; +import common.block.Material; import common.collect.Maps; import common.collect.Sets; import common.entity.Entity; import common.init.Blocks; import common.log.Log; -import common.material.Material; import common.tileentity.TileEntity; import common.util.BlockPos; import common.util.BoundingBox; @@ -645,8 +645,8 @@ public abstract class Chunk { Material mat = block.getMaterial(); if((!mat.blocksMovement() && !mat.isLiquid()) - || (mat == Material.leaves && ((mat = this.getBlock(loc.up()).getMaterial()) == Material.snow) - || mat == Material.leaves)) { + || (mat == Material.LEAVES && ((mat = this.getBlock(loc.up()).getMaterial()) == Material.POWDER) + || mat == Material.LEAVES)) { loc = loc.down(); } else { diff --git a/common/src/common/world/World.java b/common/src/common/world/World.java index 42a7f98..6bd37b7 100755 --- a/common/src/common/world/World.java +++ b/common/src/common/world/World.java @@ -8,6 +8,7 @@ import java.util.function.Predicate; import common.biome.Biome; import common.block.Block; +import common.block.Material; import common.block.artificial.BlockSlab; import common.block.artificial.BlockStairs; import common.block.foliage.LeavesType; @@ -24,7 +25,6 @@ import common.init.BlockRegistry; import common.init.Blocks; import common.init.SoundEvent; import common.item.ItemStack; -import common.material.Material; import common.model.ParticleType; import common.rng.Random; import common.tileentity.ITickable; @@ -1831,7 +1831,7 @@ public abstract class World implements IWorldAccess { Block block = this.getState(pos).getBlock(); BoundingBox axisalignedbb = p_175716_3_ ? null : blockIn.getCollisionBoundingBox(this, pos, blockIn.getState()); return axisalignedbb != null && !this.checkNoEntityCollision(axisalignedbb, entityIn) ? false - : (block.getMaterial() == Material.circuits && blockIn == Blocks.anvil ? true + : (block.getMaterial() == Material.SMALL && blockIn == Blocks.anvil ? true : block.getMaterial().isReplaceable() && blockIn.canReplace(this, pos, side, itemStackIn)); } diff --git a/server/src/server/biome/GenBiome.java b/server/src/server/biome/GenBiome.java index 4878746..4c563e0 100755 --- a/server/src/server/biome/GenBiome.java +++ b/server/src/server/biome/GenBiome.java @@ -4,6 +4,7 @@ import common.biome.Biome; import common.biome.IBiome; import common.block.Block; import common.block.BlockColored; +import common.block.Material; import common.block.foliage.BlockFlower; import common.block.foliage.BlockSapling; import common.block.foliage.BlockTallGrass; @@ -26,7 +27,6 @@ import common.entity.npc.EntityZombie; import common.init.Blocks; import common.init.WoodType; import common.log.Log; -import common.material.Material; import common.rng.PerlinGen; import common.rng.Random; import common.rng.WeightedList; @@ -554,7 +554,7 @@ public abstract class GenBiome implements IBiome { Block worldBlock = worldState.getBlock(); State worldAlt = worldIn.dimension.getAltFiller1(); State liquid = worldIn.getSurfaceLiquid(); - boolean freeze = liquid.getBlock().getMaterial() == Material.water; + boolean freeze = liquid.getBlock().getMaterial() == Material.WATER; State iblockstate = this.topBlock; State iblockstate1 = this.fillerBlock; int j = -1; diff --git a/server/src/server/village/VillageCollection.java b/server/src/server/village/VillageCollection.java index 59c9ccb..4e7b939 100755 --- a/server/src/server/village/VillageCollection.java +++ b/server/src/server/village/VillageCollection.java @@ -4,9 +4,9 @@ import java.util.Iterator; import java.util.List; import common.block.Block; +import common.block.Material; import common.block.artificial.BlockDoor; import common.collect.Lists; -import common.material.Material; import common.nbt.NBTTagCompound; import common.nbt.NBTTagList; import common.util.BlockPos; @@ -245,7 +245,7 @@ public class VillageCollection private boolean isWoodDoor(WorldServer world, BlockPos doorPos) { Block block = world.getState(doorPos).getBlock(); - return block instanceof BlockDoor ? block.getMaterial() == Material.wood : false; + return block instanceof BlockDoor ? block.getMaterial() == Material.WOOD : false; } public NBTTagCompound writeToNBT() diff --git a/server/src/server/world/WorldServer.java b/server/src/server/world/WorldServer.java index 6c9f485..7079f71 100755 --- a/server/src/server/world/WorldServer.java +++ b/server/src/server/world/WorldServer.java @@ -16,6 +16,7 @@ import java.util.function.Predicate; import common.biome.Biome; import common.block.Block; import common.block.BlockFalling; +import common.block.Material; import common.block.artificial.BlockDoor; import common.block.liquid.BlockLiquid; import common.block.natural.BlockSnow; @@ -38,7 +39,6 @@ import common.init.SoundEvent; import common.init.UniverseRegistry; import common.item.ItemDoor; import common.log.Log; -import common.material.Material; import common.model.ParticleType; import common.nbt.NBTLoader; import common.nbt.NBTTagCompound; @@ -2381,10 +2381,10 @@ public final class WorldServer extends AWorldServer { return true; } - boolean flag = this.getState(pos.west()).getBlock().getMaterial() == Material.water && - this.getState(pos.east()).getBlock().getMaterial() == Material.water && - this.getState(pos.north()).getBlock().getMaterial() == Material.water && - this.getState(pos.south()).getBlock().getMaterial() == Material.water; + boolean flag = this.getState(pos.west()).getBlock().getMaterial() == Material.WATER && + this.getState(pos.east()).getBlock().getMaterial() == Material.WATER && + this.getState(pos.north()).getBlock().getMaterial() == Material.WATER && + this.getState(pos.south()).getBlock().getMaterial() == Material.WATER; if(!flag) { return true; @@ -2435,7 +2435,7 @@ public final class WorldServer extends AWorldServer { blockpos1 = blockpos.down(); Material material = chunk.getBlock(blockpos1).getMaterial(); - if(material.blocksMovement() && material != Material.leaves) { + if(material.blocksMovement() && material != Material.LEAVES) { break; } } diff --git a/server/src/server/worldgen/FeatureDungeons.java b/server/src/server/worldgen/FeatureDungeons.java index 816c0d8..0ea7248 100755 --- a/server/src/server/worldgen/FeatureDungeons.java +++ b/server/src/server/worldgen/FeatureDungeons.java @@ -1,10 +1,10 @@ package server.worldgen; +import common.block.Material; import common.init.Blocks; import common.init.Items; import common.item.RngLoot; import common.log.Log; -import common.material.Material; import common.rng.Random; import common.rng.WeightedList; import common.tileentity.TileEntity; diff --git a/server/src/server/worldgen/FeatureLakes.java b/server/src/server/worldgen/FeatureLakes.java index 98fe8bd..2f6fa82 100755 --- a/server/src/server/worldgen/FeatureLakes.java +++ b/server/src/server/worldgen/FeatureLakes.java @@ -1,8 +1,8 @@ package server.worldgen; import common.block.Block; +import common.block.Material; import common.init.Blocks; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.world.LightType; @@ -199,7 +199,7 @@ public class FeatureLakes } } - if (this.block.getMaterial() == Material.water) + if (this.block.getMaterial() == Material.WATER) { for (int k2 = 0; k2 < 16; ++k2) { diff --git a/server/src/server/worldgen/feature/WorldGenAbandonedChest.java b/server/src/server/worldgen/feature/WorldGenAbandonedChest.java index c71efea..7e12f6b 100755 --- a/server/src/server/worldgen/feature/WorldGenAbandonedChest.java +++ b/server/src/server/worldgen/feature/WorldGenAbandonedChest.java @@ -1,9 +1,9 @@ package server.worldgen.feature; import common.block.Block; +import common.block.Material; import common.init.Blocks; import common.item.RngLoot; -import common.material.Material; import common.rng.Random; import common.rng.WeightedList; import common.tileentity.TileEntity; @@ -33,7 +33,7 @@ public class WorldGenAbandonedChest extends FeatureGenerator public boolean generate(WorldServer worldIn, Random rand, BlockPos position) { Block block; - while (((block = worldIn.getState(position).getBlock()) == Blocks.air || block.getMaterial() == Material.leaves) && position.getY() > 1) + while (((block = worldIn.getState(position).getBlock()) == Blocks.air || block.getMaterial() == Material.LEAVES) && position.getY() > 1) { position = position.down(); } diff --git a/server/src/server/worldgen/foliage/WorldGenBigMushroom.java b/server/src/server/worldgen/foliage/WorldGenBigMushroom.java index 450cd1a..15c3723 100755 --- a/server/src/server/worldgen/foliage/WorldGenBigMushroom.java +++ b/server/src/server/worldgen/foliage/WorldGenBigMushroom.java @@ -1,9 +1,9 @@ package server.worldgen.foliage; import common.block.Block; +import common.block.Material; import common.block.foliage.BlockHugeMushroom; import common.init.Blocks; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import server.world.WorldServer; @@ -56,7 +56,7 @@ public class WorldGenBigMushroom extends FeatureGenerator { Block block = worldIn.getState(blockpos$mutableblockpos.set(l, j, i1)).getBlock(); - if (block != Blocks.air && block.getMaterial() != Material.leaves) + if (block != Blocks.air && block.getMaterial() != Material.LEAVES) { flag = false; } diff --git a/server/src/server/worldgen/foliage/WorldGenDeadBush.java b/server/src/server/worldgen/foliage/WorldGenDeadBush.java index 422576f..ae5c9f7 100755 --- a/server/src/server/worldgen/foliage/WorldGenDeadBush.java +++ b/server/src/server/worldgen/foliage/WorldGenDeadBush.java @@ -1,8 +1,8 @@ package server.worldgen.foliage; import common.block.Block; +import common.block.Material; import common.init.Blocks; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import server.world.WorldServer; @@ -14,7 +14,7 @@ public class WorldGenDeadBush extends FeatureGenerator { Block block; - while (((block = worldIn.getState(position).getBlock()) == Blocks.air || block.getMaterial() == Material.leaves) && position.getY() > 0) + while (((block = worldIn.getState(position).getBlock()) == Blocks.air || block.getMaterial() == Material.LEAVES) && position.getY() > 0) { position = position.down(); } diff --git a/server/src/server/worldgen/foliage/WorldGenReed.java b/server/src/server/worldgen/foliage/WorldGenReed.java index 459216e..45be4d9 100755 --- a/server/src/server/worldgen/foliage/WorldGenReed.java +++ b/server/src/server/worldgen/foliage/WorldGenReed.java @@ -1,7 +1,7 @@ package server.worldgen.foliage; +import common.block.Material; import common.init.Blocks; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import server.world.WorldServer; @@ -19,7 +19,7 @@ public class WorldGenReed extends FeatureGenerator { BlockPos blockpos1 = blockpos.down(); - if (worldIn.getState(blockpos1.west()).getBlock().getMaterial() == Material.water || worldIn.getState(blockpos1.east()).getBlock().getMaterial() == Material.water || worldIn.getState(blockpos1.north()).getBlock().getMaterial() == Material.water || worldIn.getState(blockpos1.south()).getBlock().getMaterial() == Material.water) + if (worldIn.getState(blockpos1.west()).getBlock().getMaterial() == Material.WATER || worldIn.getState(blockpos1.east()).getBlock().getMaterial() == Material.WATER || worldIn.getState(blockpos1.north()).getBlock().getMaterial() == Material.WATER || worldIn.getState(blockpos1.south()).getBlock().getMaterial() == Material.WATER) { int j = 2 + rand.zrange(rand.zrange(3) + 1); diff --git a/server/src/server/worldgen/foliage/WorldGenShrub.java b/server/src/server/worldgen/foliage/WorldGenShrub.java index ec49a02..65d9376 100755 --- a/server/src/server/worldgen/foliage/WorldGenShrub.java +++ b/server/src/server/worldgen/foliage/WorldGenShrub.java @@ -1,9 +1,9 @@ package server.worldgen.foliage; import common.block.Block; +import common.block.Material; import common.block.foliage.BlockLeaves; import common.init.Blocks; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.world.State; @@ -26,7 +26,7 @@ public class WorldGenShrub extends WorldGenBaseTree { Block block; - while (((block = worldIn.getState(position).getBlock()) == Blocks.air || block.getMaterial() == Material.leaves) && position.getY() > 0) + while (((block = worldIn.getState(position).getBlock()) == Blocks.air || block.getMaterial() == Material.LEAVES) && position.getY() > 0) { position = position.down(); } diff --git a/server/src/server/worldgen/foliage/WorldGenTallGrass.java b/server/src/server/worldgen/foliage/WorldGenTallGrass.java index cd8d788..81a1d75 100755 --- a/server/src/server/worldgen/foliage/WorldGenTallGrass.java +++ b/server/src/server/worldgen/foliage/WorldGenTallGrass.java @@ -1,9 +1,9 @@ package server.worldgen.foliage; import common.block.Block; +import common.block.Material; import common.block.foliage.BlockTallGrass; import common.init.Blocks; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.world.State; @@ -23,7 +23,7 @@ public class WorldGenTallGrass extends FeatureGenerator { Block block; - while (((block = worldIn.getState(position).getBlock()) == Blocks.air || block.getMaterial() == Material.leaves) && position.getY() > 0) + while (((block = worldIn.getState(position).getBlock()) == Blocks.air || block.getMaterial() == Material.LEAVES) && position.getY() > 0) { position = position.down(); } diff --git a/server/src/server/worldgen/tree/WorldGenBaseTree.java b/server/src/server/worldgen/tree/WorldGenBaseTree.java index 43e2221..5858316 100755 --- a/server/src/server/worldgen/tree/WorldGenBaseTree.java +++ b/server/src/server/worldgen/tree/WorldGenBaseTree.java @@ -1,11 +1,11 @@ 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; -import common.material.Material; import common.properties.PropertyBool; import common.rng.Random; import common.util.BlockPos; @@ -116,7 +116,7 @@ public class WorldGenBaseTree extends WorldGenTree BlockPos blockpos = new BlockPos(k1, i3, i2); Block block = worldIn.getState(blockpos).getBlock(); - if (block == Blocks.air || block.getMaterial() == Material.leaves || block.getMaterial() == Material.vine) + if (block == Blocks.air || block.getMaterial() == Material.LEAVES || block.getMaterial() == Material.BUSH) { this.setBlockAndNotifyAdequately(worldIn, blockpos, this.metaLeaves.withProperty(BlockLeaves.TYPE, worldIn.getLeavesGen(blockpos))); } @@ -129,7 +129,7 @@ public class WorldGenBaseTree extends WorldGenTree { Block block2 = worldIn.getState(position.up(j3)).getBlock(); - if (block2 == Blocks.air || block2.getMaterial() == Material.leaves || block2.getMaterial() == Material.vine) + if (block2 == Blocks.air || block2.getMaterial() == Material.LEAVES || block2.getMaterial() == Material.BUSH) { this.setBlockAndNotifyAdequately(worldIn, position.up(j3), this.metaWood); @@ -172,7 +172,7 @@ public class WorldGenBaseTree extends WorldGenTree { blockpos$mutableblockpos1.set(l4, k3, i5); - if (worldIn.getState(blockpos$mutableblockpos1).getBlock().getMaterial() == Material.leaves) + if (worldIn.getState(blockpos$mutableblockpos1).getBlock().getMaterial() == Material.LEAVES) { BlockPos blockpos2 = blockpos$mutableblockpos1.west(); BlockPos blockpos3 = blockpos$mutableblockpos1.east(); diff --git a/server/src/server/worldgen/tree/WorldGenBigTree.java b/server/src/server/worldgen/tree/WorldGenBigTree.java index d9482a6..4daf686 100755 --- a/server/src/server/worldgen/tree/WorldGenBigTree.java +++ b/server/src/server/worldgen/tree/WorldGenBigTree.java @@ -3,11 +3,11 @@ package server.worldgen.tree; import java.util.List; import common.block.Block; +import common.block.Material; import common.block.foliage.BlockLeaves; import common.block.foliage.BlockLog; import common.collect.Lists; import common.init.Blocks; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.util.ExtMath; @@ -127,7 +127,7 @@ public class WorldGenBigTree extends WorldGenTree BlockPos blockpos = p_181631_1_.add(j, 0, k); Block block = this.world.getState(blockpos).getBlock(); - if (block == Blocks.air || block.getMaterial() == Material.leaves) + if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { this.setBlockAndNotifyAdequately(this.world, blockpos, p_181631_3_); } diff --git a/server/src/server/worldgen/tree/WorldGenBirch.java b/server/src/server/worldgen/tree/WorldGenBirch.java index ba62e4c..58bdda1 100755 --- a/server/src/server/worldgen/tree/WorldGenBirch.java +++ b/server/src/server/worldgen/tree/WorldGenBirch.java @@ -1,9 +1,9 @@ package server.worldgen.tree; import common.block.Block; +import common.block.Material; import common.block.foliage.BlockLeaves; import common.init.Blocks; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.world.State; @@ -101,7 +101,7 @@ public class WorldGenBirch extends WorldGenTree BlockPos blockpos = new BlockPos(i3, i2, k1); Block block = worldIn.getState(blockpos).getBlock(); - if (block == Blocks.air || block.getMaterial() == Material.leaves) + if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { this.setBlockAndNotifyAdequately(worldIn, blockpos, leavesBlock.withProperty(BlockLeaves.TYPE, worldIn.getLeavesGen(blockpos))); } @@ -114,7 +114,7 @@ public class WorldGenBirch extends WorldGenTree { Block block2 = worldIn.getState(position.up(j2)).getBlock(); - if (block2 == Blocks.air || block2.getMaterial() == Material.leaves) + if (block2 == Blocks.air || block2.getMaterial() == Material.LEAVES) { this.setBlockAndNotifyAdequately(worldIn, position.up(j2), logBlock); } diff --git a/server/src/server/worldgen/tree/WorldGenDarkOak.java b/server/src/server/worldgen/tree/WorldGenDarkOak.java index 51a021a..65286b2 100755 --- a/server/src/server/worldgen/tree/WorldGenDarkOak.java +++ b/server/src/server/worldgen/tree/WorldGenDarkOak.java @@ -1,9 +1,9 @@ package server.worldgen.tree; import common.block.Block; +import common.block.Material; import common.block.foliage.BlockLeaves; import common.init.Blocks; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.util.Facing; @@ -68,7 +68,7 @@ public class WorldGenDarkOak extends WorldGenTree BlockPos blockpos1 = new BlockPos(k1, k2, l1); Block block1 = worldIn.getState(blockpos1).getBlock(); - if (block1 == Blocks.air || block1.getMaterial() == Material.leaves) + if (block1 == Blocks.air || block1.getMaterial() == Material.LEAVES) { this.func_181639_b(worldIn, blockpos1); this.func_181639_b(worldIn, blockpos1.east()); diff --git a/server/src/server/worldgen/tree/WorldGenHugeTree.java b/server/src/server/worldgen/tree/WorldGenHugeTree.java index 24b9553..05ddd76 100755 --- a/server/src/server/worldgen/tree/WorldGenHugeTree.java +++ b/server/src/server/worldgen/tree/WorldGenHugeTree.java @@ -1,9 +1,9 @@ package server.worldgen.tree; import common.block.Block; +import common.block.Material; import common.block.foliage.BlockLeaves; import common.init.Blocks; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.world.State; @@ -121,7 +121,7 @@ public abstract class WorldGenHugeTree extends WorldGenTree BlockPos blockpos = p_175925_2_.add(j, 0, k); Block block = worldIn.getState(blockpos).getBlock(); - if (block == Blocks.air || block.getMaterial() == Material.leaves) + if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { this.setBlockAndNotifyAdequately(worldIn, blockpos, this.leavesMetadata.withProperty(BlockLeaves.TYPE, worldIn.getLeavesGen(blockpos))); } @@ -143,7 +143,7 @@ public abstract class WorldGenHugeTree extends WorldGenTree BlockPos blockpos = p_175928_2_.add(j, 0, k); Block block = worldIn.getState(blockpos).getBlock(); - if (block == Blocks.air || block.getMaterial() == Material.leaves) + if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { this.setBlockAndNotifyAdequately(worldIn, blockpos, this.leavesMetadata.withProperty(BlockLeaves.TYPE, worldIn.getLeavesGen(blockpos))); } diff --git a/server/src/server/worldgen/tree/WorldGenPine.java b/server/src/server/worldgen/tree/WorldGenPine.java index 497e880..26b9820 100755 --- a/server/src/server/worldgen/tree/WorldGenPine.java +++ b/server/src/server/worldgen/tree/WorldGenPine.java @@ -1,9 +1,9 @@ package server.worldgen.tree; import common.block.Block; +import common.block.Material; import common.block.natural.BlockDirt; import common.init.Blocks; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.util.ExtMath; @@ -39,7 +39,7 @@ public class WorldGenPine extends WorldGenHugeTree { Block block = worldIn.getState(position.up(j)).getBlock(); - if (block == Blocks.air || block.getMaterial() == Material.leaves) + if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { this.setBlockAndNotifyAdequately(worldIn, position.up(j), this.woodMetadata); } @@ -48,21 +48,21 @@ public class WorldGenPine extends WorldGenHugeTree { block = worldIn.getState(position.add(1, j, 0)).getBlock(); - if (block == Blocks.air || block.getMaterial() == Material.leaves) + if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { this.setBlockAndNotifyAdequately(worldIn, position.add(1, j, 0), this.woodMetadata); } block = worldIn.getState(position.add(1, j, 1)).getBlock(); - if (block == Blocks.air || block.getMaterial() == Material.leaves) + if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { this.setBlockAndNotifyAdequately(worldIn, position.add(1, j, 1), this.woodMetadata); } block = worldIn.getState(position.add(0, j, 1)).getBlock(); - if (block == Blocks.air || block.getMaterial() == Material.leaves) + if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { this.setBlockAndNotifyAdequately(worldIn, position.add(0, j, 1), this.woodMetadata); } diff --git a/server/src/server/worldgen/tree/WorldGenSavanna.java b/server/src/server/worldgen/tree/WorldGenSavanna.java index 7c85bee..dfd389b 100755 --- a/server/src/server/worldgen/tree/WorldGenSavanna.java +++ b/server/src/server/worldgen/tree/WorldGenSavanna.java @@ -1,9 +1,9 @@ package server.worldgen.tree; import common.block.Block; +import common.block.Material; import common.block.foliage.BlockLeaves; import common.init.Blocks; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.util.Facing; @@ -97,7 +97,7 @@ public class WorldGenSavanna extends WorldGenTree BlockPos blockpos = new BlockPos(i3, i2, j1); Block block1 = worldIn.getState(blockpos).getBlock(); - if (block1 == Blocks.air || block1.getMaterial() == Material.leaves) + if (block1 == Blocks.air || block1.getMaterial() == Material.LEAVES) { this.func_181642_b(worldIn, blockpos); k1 = i2; @@ -151,7 +151,7 @@ public class WorldGenSavanna extends WorldGenTree BlockPos blockpos1 = new BlockPos(i3, j2, j1); Block block1 = worldIn.getState(blockpos1).getBlock(); - if (block1 == Blocks.air || block1.getMaterial() == Material.leaves) + if (block1 == Blocks.air || block1.getMaterial() == Material.LEAVES) { this.func_181642_b(worldIn, blockpos1); k1 = j2; @@ -211,7 +211,7 @@ public class WorldGenSavanna extends WorldGenTree { Block block = worldIn.getState(p_175924_2_).getBlock(); - if (block == Blocks.air || block.getMaterial() == Material.leaves) + if (block == Blocks.air || block.getMaterial() == Material.LEAVES) { this.setBlockAndNotifyAdequately(worldIn, p_175924_2_, field_181644_b.withProperty(BlockLeaves.TYPE, worldIn.getLeavesGen(p_175924_2_))); } diff --git a/server/src/server/worldgen/tree/WorldGenSwamp.java b/server/src/server/worldgen/tree/WorldGenSwamp.java index 9773b8d..276ed3c 100755 --- a/server/src/server/worldgen/tree/WorldGenSwamp.java +++ b/server/src/server/worldgen/tree/WorldGenSwamp.java @@ -1,10 +1,10 @@ package server.worldgen.tree; import common.block.Block; +import common.block.Material; import common.block.foliage.BlockLeaves; import common.block.foliage.BlockVine; import common.init.Blocks; -import common.material.Material; import common.properties.PropertyBool; import common.rng.Random; import common.util.BlockPos; @@ -28,7 +28,7 @@ public class WorldGenSwamp extends WorldGenTree { int i; - for (i = rand.zrange(4) + 5; worldIn.getState(position.down()).getBlock().getMaterial() == Material.water; position = position.down()) + for (i = rand.zrange(4) + 5; worldIn.getState(position.down()).getBlock().getMaterial() == Material.WATER; position = position.down()) { ; } @@ -61,7 +61,7 @@ public class WorldGenSwamp extends WorldGenTree { Block block = worldIn.getState(blockpos$mutableblockpos.set(l, j, i1)).getBlock(); - if (block != Blocks.air && block.getMaterial() != Material.leaves) + if (block != Blocks.air && block.getMaterial() != Material.LEAVES) { if (block != Blocks.water && block != Blocks.flowing_water) { @@ -123,7 +123,7 @@ public class WorldGenSwamp extends WorldGenTree { Block block2 = worldIn.getState(position.up(i2)).getBlock(); - if (block2 == Blocks.air || block2.getMaterial() == Material.leaves || block2 == Blocks.flowing_water || block2 == Blocks.water) + if (block2 == Blocks.air || block2.getMaterial() == Material.LEAVES || block2 == Blocks.flowing_water || block2 == Blocks.water) { this.setBlockAndNotifyAdequately(worldIn, position.up(i2), field_181648_a); } @@ -141,7 +141,7 @@ public class WorldGenSwamp extends WorldGenTree { blockpos$mutableblockpos1.set(i4, j2, j4); - if (worldIn.getState(blockpos$mutableblockpos1).getBlock().getMaterial() == Material.leaves) + if (worldIn.getState(blockpos$mutableblockpos1).getBlock().getMaterial() == Material.LEAVES) { BlockPos blockpos3 = blockpos$mutableblockpos1.west(); BlockPos blockpos4 = blockpos$mutableblockpos1.east(); diff --git a/server/src/server/worldgen/tree/WorldGenTaiga1.java b/server/src/server/worldgen/tree/WorldGenTaiga1.java index 8774152..2ae3859 100755 --- a/server/src/server/worldgen/tree/WorldGenTaiga1.java +++ b/server/src/server/worldgen/tree/WorldGenTaiga1.java @@ -1,9 +1,9 @@ package server.worldgen.tree; import common.block.Block; +import common.block.Material; import common.block.foliage.BlockLeaves; import common.init.Blocks; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.world.State; @@ -115,7 +115,7 @@ public class WorldGenTaiga1 extends WorldGenTree { Block block1 = worldIn.getState(position.up(i3)).getBlock(); - if (block1 == Blocks.air || block1.getMaterial() == Material.leaves) + if (block1 == Blocks.air || block1.getMaterial() == Material.LEAVES) { this.setBlockAndNotifyAdequately(worldIn, position.up(i3), field_181636_a); } diff --git a/server/src/server/worldgen/tree/WorldGenTaiga2.java b/server/src/server/worldgen/tree/WorldGenTaiga2.java index a38208f..ba017a3 100755 --- a/server/src/server/worldgen/tree/WorldGenTaiga2.java +++ b/server/src/server/worldgen/tree/WorldGenTaiga2.java @@ -1,9 +1,9 @@ package server.worldgen.tree; import common.block.Block; +import common.block.Material; import common.block.foliage.BlockLeaves; import common.init.Blocks; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import common.world.State; @@ -55,7 +55,7 @@ public class WorldGenTaiga2 extends WorldGenTree { Block block = worldIn.getState(blockpos$mutableblockpos.set(k1, i1, l1)).getBlock(); - if (block != Blocks.air && block.getMaterial() != Material.leaves) + if (block != Blocks.air && block.getMaterial() != Material.LEAVES) { flag = false; } @@ -130,7 +130,7 @@ public class WorldGenTaiga2 extends WorldGenTree { Block block2 = worldIn.getState(position.up(k4)).getBlock(); - if (block2 == Blocks.air || block2.getMaterial() == Material.leaves) + if (block2 == Blocks.air || block2.getMaterial() == Material.LEAVES) { this.setBlockAndNotifyAdequately(worldIn, position.up(k4), field_181645_a); } diff --git a/server/src/server/worldgen/tree/WorldGenTree.java b/server/src/server/worldgen/tree/WorldGenTree.java index e444636..412f0e6 100755 --- a/server/src/server/worldgen/tree/WorldGenTree.java +++ b/server/src/server/worldgen/tree/WorldGenTree.java @@ -1,10 +1,10 @@ package server.worldgen.tree; import common.block.Block; +import common.block.Material; import common.block.foliage.BlockLog; import common.block.foliage.BlockSapling; import common.init.Blocks; -import common.material.Material; import common.rng.Random; import common.util.BlockPos; import server.world.WorldServer; @@ -19,7 +19,7 @@ public abstract class WorldGenTree extends FeatureGenerator protected boolean canBeReplaced(Block block) { - return block == Blocks.air || block.getMaterial() == Material.leaves || block == Blocks.grass || block == Blocks.dirt || block instanceof BlockLog || block instanceof BlockSapling || block == Blocks.vine; + return block == Blocks.air || block.getMaterial() == Material.LEAVES || block == Blocks.grass || block == Blocks.dirt || block instanceof BlockLog || block instanceof BlockSapling || block == Blocks.vine; } public void prepare()