diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java index a6dc04d..4333d66 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java @@ -66,7 +66,7 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata) { - return this.upperTextures[0]; + return upperTextures[0]; } @Override @@ -390,14 +390,16 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn return isUpperDoorBlock(metadata) ? null : this.getDoorItem(); } + @Override + @SideOnly(Side.CLIENT) + public Item getItem(World world, int x, int y, int z) { + return this.getDoorItem(); + } + @Override public TileEntity createNewTileEntity(World world, int metadata) { - if ((metadata & 8) != 0) { - return new TileEntityDimDoor(); - } - - return null; + return new TileEntityDimDoor(); } @Override diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java index 9f27eae..b7f8fe9 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java @@ -5,7 +5,9 @@ import java.util.Random; import net.minecraft.block.BlockDoor; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.IconFlipped; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; +import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import StevenDimDoors.mod_pocketDim.mod_pocketDim; @@ -25,10 +27,15 @@ public class BlockDoorGold extends BlockDoor return mod_pocketDim.modid + ":" + this.getUnlocalizedName(); } - @Override public Item getItemDropped(int par1, Random par2Random, int par3) { return (par1 & 8) != 0 ? null : mod_pocketDim.itemGoldenDoor; } + + @Override + @SideOnly(Side.CLIENT) + public Item getItem(World world, int x, int y, int z) { + return mod_pocketDim.itemGoldenDoor; + } } diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDoorQuartz.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDoorQuartz.java index 58a4048..8abe39e 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDoorQuartz.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDoorQuartz.java @@ -7,6 +7,7 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockDoor; import net.minecraft.block.material.Material; import net.minecraft.item.Item; +import net.minecraft.world.World; public class BlockDoorQuartz extends BlockDoor { @@ -24,6 +25,12 @@ public class BlockDoorQuartz extends BlockDoor @Override public Item getItemDropped(int par1, Random par2Random, int par3) { - return (par1 & 8) != 0 ? null : mod_pocketDim.itemGoldenDoor; + return (par1 & 8) != 0 ? null : mod_pocketDim.itemQuartzDoor; + } + + @Override + @SideOnly(Side.CLIENT) + public Item getItem(World world, int x, int y, int z) { + return mod_pocketDim.itemQuartzDoor; } } diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index 4189cc2..ea118d0 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -191,19 +191,19 @@ public class mod_pocketDim // Initialize blocks and items transientDoor = new TransientDoor(Material.iron, properties).setHardness(1.0F) .setBlockName("transientDoor"); - goldenDimensionalDoor = new BlockGoldDimDoor(Material.iron, properties).setHardness(1.0F).setBlockName("dimDoorGold"); + goldenDimensionalDoor = new BlockGoldDimDoor(Material.iron, properties).setHardness(1.0F).setBlockName("dimDoorGold").setBlockTextureName("itemGoldDimDoor"); - quartzDoor = new BlockDoorQuartz(Material.rock).setHardness(0.1F).setBlockName("doorQuartz"); - personalDimDoor = new PersonalDimDoor(Material.rock,properties).setHardness(0.1F).setBlockName("dimDoorPersonal"); + quartzDoor = new BlockDoorQuartz(Material.rock).setHardness(0.1F).setBlockName("doorQuartz").setBlockTextureName("itemQuartzDoor"); + personalDimDoor = new PersonalDimDoor(Material.rock,properties).setHardness(0.1F).setBlockName("dimDoorPersonal").setBlockTextureName("itemQuartzDimDoor"); - goldenDoor = new BlockDoorGold(Material.iron).setHardness(0.1F).setBlockName("doorGold"); + goldenDoor = new BlockDoorGold(Material.iron).setHardness(0.1F).setBlockName("doorGold").setBlockTextureName("itemGoldDoor"); blockDimWall = new BlockDimWall(0, Material.iron).setLightLevel(1.0F).setHardness(0.1F).setBlockName("blockDimWall"); blockDimWallPerm = (new BlockDimWallPerm(0, Material.iron)).setLightLevel(1.0F).setBlockUnbreakable().setResistance(6000000.0F).setBlockName("blockDimWallPerm"); - warpDoor = new WarpDoor(Material.wood, properties).setHardness(1.0F) .setBlockName("dimDoorWarp"); + warpDoor = new WarpDoor(Material.wood, properties).setHardness(1.0F) .setBlockName("dimDoorWarp").setBlockTextureName("itemDimDoorWarp"); blockRift = (BlockRift) (new BlockRift(Material.fire, properties).setHardness(1.0F) .setBlockName("rift")); blockLimbo = new BlockLimbo(15, Material.iron, properties.LimboDimensionID, limboDecay).setHardness(.2F).setBlockName("BlockLimbo").setLightLevel(.0F); - unstableDoor = (new UnstableDoor(Material.iron, properties).setHardness(.2F).setBlockName("chaosDoor").setLightLevel(.0F) ); - dimensionalDoor = (DimensionalDoor) (new DimensionalDoor(Material.iron, properties).setHardness(1.0F).setResistance(2000.0F) .setBlockName("dimDoor")); + unstableDoor = (new UnstableDoor(Material.iron, properties).setHardness(.2F).setBlockName("chaosDoor").setLightLevel(.0F).setBlockTextureName("itemChaosDoor") ); + dimensionalDoor = (DimensionalDoor) (new DimensionalDoor(Material.iron, properties).setHardness(1.0F).setResistance(2000.0F) .setBlockName("dimDoor").setBlockTextureName("itemDimDoor")); transTrapdoor = (TransTrapdoor) (new TransTrapdoor(Material.wood).setHardness(1.0F) .setBlockName("dimHatch")); itemDDKey = (new ItemDDKey()).setUnlocalizedName("itemDDKey"); @@ -229,15 +229,15 @@ public class mod_pocketDim mod_pocketDim.limboBiome = (new BiomeGenLimbo(properties.LimboBiomeID)); mod_pocketDim.pocketBiome = (new BiomeGenPocket(properties.PocketBiomeID)); - GameRegistry.registerBlock(quartzDoor, "Quartz Door"); - GameRegistry.registerBlock(personalDimDoor, "Personal Dimensional Door"); - GameRegistry.registerBlock(goldenDoor, "Golden Door"); - GameRegistry.registerBlock(goldenDimensionalDoor, "Golden Dimensional Door"); - GameRegistry.registerBlock(unstableDoor, "Unstable Door"); - GameRegistry.registerBlock(warpDoor, "Warp Door"); + GameRegistry.registerBlock(quartzDoor, null, "Quartz Door"); + GameRegistry.registerBlock(personalDimDoor, null, "Personal Dimensional Door"); + GameRegistry.registerBlock(goldenDoor, null, "Golden Door"); + GameRegistry.registerBlock(goldenDimensionalDoor, null, "Golden Dimensional Door"); + GameRegistry.registerBlock(unstableDoor, null, "Unstable Door"); + GameRegistry.registerBlock(warpDoor, null, "Warp Door"); GameRegistry.registerBlock(blockRift, "Rift"); GameRegistry.registerBlock(blockLimbo, "Unraveled Fabric"); - GameRegistry.registerBlock(dimensionalDoor, "Dimensional Door"); + GameRegistry.registerBlock(dimensionalDoor, null, "Dimensional Door"); GameRegistry.registerBlock(transTrapdoor,"Transdimensional Trapdoor"); GameRegistry.registerBlock(blockDimWallPerm, "Fabric of RealityPerm"); GameRegistry.registerBlock(transientDoor, "transientDoor");