Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
SenseiKiwi 2013-08-22 17:43:25 -04:00
commit 35e97b03e2
6 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
StevenDimDoors/mod_pocketDim/TileEntityRift.java
View file

@ -55,6 +55,7 @@ public class TileEntityRift extends TileEntity
}
public void clearBlocksOnRift()
{
for(double[] coord: this.renderingCenters.values())
{
int x = MathHelper.floor_double(coord[0]+.5);
@ -164,6 +165,11 @@ public class TileEntityRift extends TileEntity
this.invalidate();
this.worldObj.setBlockToAir(xCoord, yCoord, zCoord);
}
if(this.worldObj.getBlockId(xCoord, yCoord, zCoord)!=mod_pocketDim.blockRift.blockID)
{
this.invalidate();
}
}
public void grow(int distance)
{

2
StevenDimDoors/mod_pocketDim/blocks/ExitDoor.java
View file

@ -125,7 +125,7 @@ public class ExitDoor extends dimDoor
}
//this.onPoweredBlockChange(par1World, par2, par3, par4, false);
par1World.setBlockTileEntity(par2, par3, par4, this.createNewTileEntity(par1World));
}
@SideOnly(Side.CLIENT)

2
StevenDimDoors/mod_pocketDim/blocks/dimDoor.java
View file

@ -281,6 +281,8 @@ public class dimDoor extends BlockContainer
}
}
par1World.setBlockTileEntity(par2, par3, par4, this.createNewTileEntity(par1World));
}

2
StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPack.java
View file

@ -52,7 +52,7 @@ public class DungeonPack
{
String standardName = typeName.toUpperCase();
this.nameToTypeMapping.put(standardName, new DungeonType(this, standardName, index));
this.groupedDungeons.add(new ArrayList<DungeonGenerator>());
this.groupedDungeons.add(new ArrayList<DungeonGenerator>());
index++;
}

12
StevenDimDoors/mod_pocketDim/helpers/dimHelper.java
View file

@ -1168,17 +1168,13 @@ public class dimHelper extends DimensionManager
}
}
}
linkToMove.locDimID=dimID;
linkToMove.locXCoord=x;
linkToMove.locYCoord=y;
linkToMove.locZCoord=z;
this.createLink(new LinkData(dimID,linkToMove.destDimID,x,y,z,linkToMove.destXCoord,linkToMove.destYCoord,linkToMove.destZCoord,linkToMove.isLocPocket,linkToMove.linkOrientation));
if(this.getLinkDataFromCoords(oldX,oldY,oldZ,oldDimID)!=null)
{
// this.removeLink(this.getLinkDataFromCoords(oldX,oldY,oldZ,oldDimID));
this.removeLink(this.getLinkDataFromCoords(oldX,oldY,oldZ,oldDimID));
}
this.createLink(linkToMove);
LinkData linkTest = dimHelper.instance.getLinkDataFromCoords(x, y, z, dimID);
linkTest.printLinkData();
return true;
}
return false;

2
StevenDimDoors/mod_pocketDimClient/RenderRift.java
View file

@ -41,7 +41,7 @@ public class RenderRift extends TileEntitySpecialRenderer
//GL11.glLogicOp(GL11.GL_INVERT);
// GL11.glEnable(GL11.GL_COLOR_LOGIC_OP);
GL11.glColor4f(.3F, .3F, .3F, 1F);
GL11.glColor4f(.2F, .2F, .2F, 1F);
GL11.glEnable(GL_BLEND);
glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ZERO);