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

Fixed a few bugs, more rendering changes

Browse Source
This commit is contained in:
StevenRS11
2013-08-22 16:04:08 -04:00
parent c7ddff97b2
commit 758f5e5062
6 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
StevenDimDoors/mod_pocketDim/TileEntityRift.java
View File

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

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

@@ -1125,17 +1125,13 @@ public class dimHelper extends DimensionManager
} }
} }
} }
linkToMove.locDimID=dimID; this.createLink(new LinkData(dimID,linkToMove.destDimID,x,y,z,linkToMove.destXCoord,linkToMove.destYCoord,linkToMove.destZCoord,linkToMove.isLocPocket,linkToMove.linkOrientation));
linkToMove.locXCoord=x;
linkToMove.locYCoord=y;
linkToMove.locZCoord=z;
if(this.getLinkDataFromCoords(oldX,oldY,oldZ,oldDimID)!=null) 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 true;
} }
return false; return false;

46
StevenDimDoors/mod_pocketDimClient/RenderRift.java
View File

@@ -26,6 +26,7 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class RenderRift extends TileEntitySpecialRenderer public class RenderRift extends TileEntitySpecialRenderer
{ {
private Random rand = new Random();
@Override @Override
public void renderTileEntityAt(TileEntity te, double xWorld, double yWorld, public void renderTileEntityAt(TileEntity te, double xWorld, double yWorld,
@@ -41,7 +42,7 @@ public class RenderRift extends TileEntitySpecialRenderer
//GL11.glLogicOp(GL11.GL_INVERT); //GL11.glLogicOp(GL11.GL_INVERT);
// GL11.glEnable(GL11.GL_COLOR_LOGIC_OP); // GL11.glEnable(GL11.GL_COLOR_LOGIC_OP);
GL11.glColor4f(.3F, .3F, .3F, 1F); GL11.glColor4f(.2F, .2F, .2F, 1F);
GL11.glEnable(GL_BLEND); GL11.glEnable(GL_BLEND);
glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ZERO); glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ZERO);
@@ -71,11 +72,16 @@ public class RenderRift extends TileEntitySpecialRenderer
drawVertex(xWorld+.5, yWorld+Math.log(Math.pow(quads.size(),2)+1)/14, zWorld+.5); drawVertex(xWorld+.5, yWorld+Math.log(Math.pow(quads.size(),2)+1)/14, zWorld+.5);
for(int i = 0;;i++) for(int i = 0;;i++)
{ {
if(!quads.containsKey(i)) if(!quads.containsKey(i))
{ {
break; break;
} }
double[] coords = quads.get(i); double[] coords = quads.get(i);
float driftX = (float)(Minecraft.getSystemTime() % 200000L) / 200000.0F;
float driftY =(float)(Minecraft.getSystemTime() % 200000L) / 200000.0F;
float driftZ = (float) (float)(Minecraft.getSystemTime() % 200000L) / 200000.0F;
double width=Math.log(Math.pow(quads.size(),2-Math.log(i+1))+1)/14; double width=Math.log(Math.pow(quads.size(),2-Math.log(i+1))+1)/14;
if(coords[3]==0) if(coords[3]==0)
{ {
@@ -83,16 +89,16 @@ public class RenderRift extends TileEntitySpecialRenderer
if(quads.containsKey(i+1)) if(quads.containsKey(i+1))
{ {
drawVertex(xWorld+coords[0]+.5, yWorld+coords[1]-width/2 , zWorld+coords[2]); drawVertex(xWorld+coords[0]+driftX+.5, yWorld+coords[1]+driftY-width/2 , zWorld+coords[2]+driftZ);
drawVertex(xWorld+coords[0]+.5 , yWorld+coords[1]+width/2 , zWorld+coords[2]); drawVertex(xWorld+coords[0]+driftX+.5 , yWorld+coords[1]+driftY+width/2 , zWorld+coords[2]+driftZ);
} }
else else
{ {
drawVertex(xWorld+coords[0]+.5, yWorld+coords[1]-width/200 , zWorld+coords[2]); drawVertex(xWorld+coords[0]+driftX+.5, yWorld+coords[1]+driftY-width/200 , zWorld+coords[2]+driftZ);
drawVertex(xWorld+coords[0]+.5 , yWorld+coords[1]+width/200 , zWorld+coords[2]); drawVertex(xWorld+coords[0]+driftX+.5 , yWorld+coords[1]+driftY+width/200 , zWorld+coords[2]+driftZ);
} }
} }
else else
@@ -102,15 +108,15 @@ public class RenderRift extends TileEntitySpecialRenderer
if(quads.containsKey(i+1)) if(quads.containsKey(i+1))
{ {
drawVertex(xWorld+coords[0], yWorld+coords[1]-width/2 , zWorld+coords[2]+.5); drawVertex(xWorld+coords[0]+driftX, yWorld+coords[1]+driftY-width/2 , zWorld+coords[2]+driftZ+.5);
drawVertex(xWorld+coords[0], yWorld+coords[1]+width/2 , zWorld+coords[2]+.5); drawVertex(xWorld+coords[0]+driftX, yWorld+coords[1]+driftY+width/2 , zWorld+coords[2]+driftZ+.5);
} }
else else
{ {
drawVertex(xWorld+coords[0], yWorld+coords[1]+width/200 , zWorld+coords[2]+.5); drawVertex(xWorld+coords[0]+driftX, yWorld+coords[1]+driftY+width/200 , zWorld+coords[2]+driftZ+.5);
drawVertex(xWorld+coords[0], yWorld+coords[1]-width/200, zWorld+coords[2]+.5); drawVertex(xWorld+coords[0]+driftX, yWorld+coords[1]+driftY-width/200, zWorld+coords[2]+driftZ+.5);
} }
@@ -137,6 +143,12 @@ public class RenderRift extends TileEntitySpecialRenderer
break; break;
} }
double[] coords = quads.get(i); double[] coords = quads.get(i);
float driftX = (float) (rand.nextGaussian()/100)*i;
float driftY = (float) (rand.nextGaussian()/100)*i;
float driftZ = (float) (rand.nextGaussian()/100)*i;
double width=Math.log(Math.pow(quads.size(),2-Math.log(i+1))+1)/14; double width=Math.log(Math.pow(quads.size(),2-Math.log(i+1))+1)/14;
if(coords[3]==0) if(coords[3]==0)
{ {
@@ -144,15 +156,15 @@ public class RenderRift extends TileEntitySpecialRenderer
if(quads.containsKey(i+1)) if(quads.containsKey(i+1))
{ {
drawVertex(xWorld+coords[0]+.5, yWorld-(coords[1]-width/2) , zWorld-coords[2]+1); drawVertex(xWorld+coords[0]+driftX+.5, yWorld-(coords[1]-width/2) , zWorld-coords[2]+1);
drawVertex(xWorld+coords[0]+.5 , yWorld-(coords[1]+width/2) , zWorld-coords[2]+1); drawVertex(xWorld+coords[0]+driftX+.5 , yWorld-(coords[1]+width/2) , zWorld-coords[2]+1);
} }
else else
{ {
drawVertex(xWorld+coords[0]+.5, yWorld-(coords[1]-width/200) , zWorld-coords[2]+1); drawVertex(xWorld+coords[0]+driftX+.5, yWorld-(coords[1]-width/200) , zWorld-coords[2]+1);
drawVertex(xWorld+coords[0]+.5 , yWorld-(coords[1]+width/200) , zWorld-coords[2]+1); drawVertex(xWorld+coords[0]+driftX+.5 , yWorld-(coords[1]+width/200) , zWorld-coords[2]+1);
} }
} }
@@ -163,14 +175,14 @@ public class RenderRift extends TileEntitySpecialRenderer
if(quads.containsKey(i+1)) if(quads.containsKey(i+1))
{ {
drawVertex(xWorld-coords[0]+1, yWorld-(coords[1]-width/2) , zWorld+coords[2]+.5); drawVertex(xWorld-coords[0]+1, yWorld-(coords[1]-width/2) , zWorld+coords[2]+driftZ+.5);
drawVertex(xWorld-coords[0]+1, yWorld-(coords[1]+width/2) , zWorld+coords[2]+.5); drawVertex(xWorld-coords[0]+1, yWorld-(coords[1]+width/2) , zWorld+coords[2]+driftZ+.5);
} }
else else
{ {
drawVertex(xWorld-coords[0]+1, yWorld-(coords[1]+width/200) , zWorld+coords[2]+.5); drawVertex(xWorld-coords[0]+1, yWorld-(coords[1]+width/200) , zWorld+coords[2]+driftZ+.5);
drawVertex(xWorld-coords[0]+1, yWorld-(coords[1]-width/200), zWorld+coords[2]+.5); drawVertex(xWorld-coords[0]+1, yWorld-(coords[1]-width/200), zWorld+coords[2]+driftZ+.5);
} }
} }