Fixed a lot of WAILA weirdness
This commit is contained in:
parent
e5af4f5964
commit
585b0685d0
4 changed files with 38 additions and 22 deletions
|
@ -66,7 +66,7 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public IIcon getIcon(int side, int metadata)
|
public IIcon getIcon(int side, int metadata)
|
||||||
{
|
{
|
||||||
return this.upperTextures[0];
|
return upperTextures[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -390,14 +390,16 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
|
||||||
return isUpperDoorBlock(metadata) ? null : this.getDoorItem();
|
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
|
@Override
|
||||||
public TileEntity createNewTileEntity(World world, int metadata)
|
public TileEntity createNewTileEntity(World world, int metadata)
|
||||||
{
|
{
|
||||||
if ((metadata & 8) != 0) {
|
return new TileEntityDimDoor();
|
||||||
return new TileEntityDimDoor();
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -5,7 +5,9 @@ import java.util.Random;
|
||||||
import net.minecraft.block.BlockDoor;
|
import net.minecraft.block.BlockDoor;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.client.renderer.IconFlipped;
|
import net.minecraft.client.renderer.IconFlipped;
|
||||||
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.util.IIcon;
|
||||||
import net.minecraft.world.IBlockAccess;
|
import net.minecraft.world.IBlockAccess;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import StevenDimDoors.mod_pocketDim.mod_pocketDim;
|
import StevenDimDoors.mod_pocketDim.mod_pocketDim;
|
||||||
|
@ -25,10 +27,15 @@ public class BlockDoorGold extends BlockDoor
|
||||||
return mod_pocketDim.modid + ":" + this.getUnlocalizedName();
|
return mod_pocketDim.modid + ":" + this.getUnlocalizedName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Item getItemDropped(int par1, Random par2Random, int par3)
|
public Item getItemDropped(int par1, Random par2Random, int par3)
|
||||||
{
|
{
|
||||||
return (par1 & 8) != 0 ? null : mod_pocketDim.itemGoldenDoor;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import net.minecraft.block.BlockDoor;
|
import net.minecraft.block.BlockDoor;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
public class BlockDoorQuartz extends BlockDoor
|
public class BlockDoorQuartz extends BlockDoor
|
||||||
{
|
{
|
||||||
|
@ -24,6 +25,12 @@ public class BlockDoorQuartz extends BlockDoor
|
||||||
@Override
|
@Override
|
||||||
public Item getItemDropped(int par1, Random par2Random, int par3)
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -191,19 +191,19 @@ public class mod_pocketDim
|
||||||
|
|
||||||
// Initialize blocks and items
|
// Initialize blocks and items
|
||||||
transientDoor = new TransientDoor(Material.iron, properties).setHardness(1.0F) .setBlockName("transientDoor");
|
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");
|
quartzDoor = new BlockDoorQuartz(Material.rock).setHardness(0.1F).setBlockName("doorQuartz").setBlockTextureName("itemQuartzDoor");
|
||||||
personalDimDoor = new PersonalDimDoor(Material.rock,properties).setHardness(0.1F).setBlockName("dimDoorPersonal");
|
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");
|
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");
|
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"));
|
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);
|
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) );
|
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"));
|
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"));
|
transTrapdoor = (TransTrapdoor) (new TransTrapdoor(Material.wood).setHardness(1.0F) .setBlockName("dimHatch"));
|
||||||
|
|
||||||
itemDDKey = (new ItemDDKey()).setUnlocalizedName("itemDDKey");
|
itemDDKey = (new ItemDDKey()).setUnlocalizedName("itemDDKey");
|
||||||
|
@ -229,15 +229,15 @@ public class mod_pocketDim
|
||||||
mod_pocketDim.limboBiome = (new BiomeGenLimbo(properties.LimboBiomeID));
|
mod_pocketDim.limboBiome = (new BiomeGenLimbo(properties.LimboBiomeID));
|
||||||
mod_pocketDim.pocketBiome = (new BiomeGenPocket(properties.PocketBiomeID));
|
mod_pocketDim.pocketBiome = (new BiomeGenPocket(properties.PocketBiomeID));
|
||||||
|
|
||||||
GameRegistry.registerBlock(quartzDoor, "Quartz Door");
|
GameRegistry.registerBlock(quartzDoor, null, "Quartz Door");
|
||||||
GameRegistry.registerBlock(personalDimDoor, "Personal Dimensional Door");
|
GameRegistry.registerBlock(personalDimDoor, null, "Personal Dimensional Door");
|
||||||
GameRegistry.registerBlock(goldenDoor, "Golden Door");
|
GameRegistry.registerBlock(goldenDoor, null, "Golden Door");
|
||||||
GameRegistry.registerBlock(goldenDimensionalDoor, "Golden Dimensional Door");
|
GameRegistry.registerBlock(goldenDimensionalDoor, null, "Golden Dimensional Door");
|
||||||
GameRegistry.registerBlock(unstableDoor, "Unstable Door");
|
GameRegistry.registerBlock(unstableDoor, null, "Unstable Door");
|
||||||
GameRegistry.registerBlock(warpDoor, "Warp Door");
|
GameRegistry.registerBlock(warpDoor, null, "Warp Door");
|
||||||
GameRegistry.registerBlock(blockRift, "Rift");
|
GameRegistry.registerBlock(blockRift, "Rift");
|
||||||
GameRegistry.registerBlock(blockLimbo, "Unraveled Fabric");
|
GameRegistry.registerBlock(blockLimbo, "Unraveled Fabric");
|
||||||
GameRegistry.registerBlock(dimensionalDoor, "Dimensional Door");
|
GameRegistry.registerBlock(dimensionalDoor, null, "Dimensional Door");
|
||||||
GameRegistry.registerBlock(transTrapdoor,"Transdimensional Trapdoor");
|
GameRegistry.registerBlock(transTrapdoor,"Transdimensional Trapdoor");
|
||||||
GameRegistry.registerBlock(blockDimWallPerm, "Fabric of RealityPerm");
|
GameRegistry.registerBlock(blockDimWallPerm, "Fabric of RealityPerm");
|
||||||
GameRegistry.registerBlock(transientDoor, "transientDoor");
|
GameRegistry.registerBlock(transientDoor, "transientDoor");
|
||||||
|
|
Loading…
Reference in a new issue