apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Various Updates #128

Merged
SenseiKiwi merged 10 commits from master into master 2014-01-20 06:32:34 +00:00
Conversation 0 Commits 10 Files Changed 15 +9 -17
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b31cf9abd6 - Show all commits

20
src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java
View File

@@ -44,19 +44,16 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
this.blockIconBottom = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()+"_bottom"); this.blockIconBottom = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()+"_bottom");
} }
@Override
@SideOnly(Side.CLIENT)
/** /**
* From the specified side and block metadata retrieves the blocks texture. Args: side, metadata * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata
*/ */
@Override
@SideOnly(Side.CLIENT)
public Icon getIcon(int par1, int par2) public Icon getIcon(int par1, int par2)
{ {
return this.blockIcon; return this.blockIcon;
} }
@Override @Override
public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity)
{ {
@@ -66,11 +63,9 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
@Override @Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)
{ {
boolean shouldOpen = true;
boolean shouldOpen=true; if (player.inventory.getCurrentItem()!=null)
//System.out.println(String.valueOf(par1World.getBlockMetadata(par2, par3, par4)));
if(player.inventory.getCurrentItem()!=null)
{ {
if(player.inventory.getCurrentItem().getItem() == mod_pocketDim.itemRiftBlade) if(player.inventory.getCurrentItem().getItem() == mod_pocketDim.itemRiftBlade)
{ {
@@ -392,8 +387,6 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
} }
if (canUse) if (canUse)
{ {
// Teleport the entity through the link, if it exists // Teleport the entity through the link, if it exists
DimLink link = PocketManager.getLink(x, y, z, world.provider.dimensionId); DimLink link = PocketManager.getLink(x, y, z, world.provider.dimensionId);
if (link != null) if (link != null)
@@ -402,12 +395,11 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
{ {
DDTeleporter.traverseDimDoor(world, link, entity, this); DDTeleporter.traverseDimDoor(world, link, entity, this);
} }
catch(Exception e) catch (Exception e)
{ {
System.err.println("Something when wrong teleporting to a dim:"); System.err.println("Something went wrong teleporting to a dimension:");
e.printStackTrace(); e.printStackTrace();
} }
} }
// Close the door only after the entity goes through // Close the door only after the entity goes through