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

Working on server client

Browse source
This commit is contained in:
StevenRS11 2013-10-16 17:17:46 -04:00
parent 2f98bf91e8
commit c08fa15f40
4 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
StevenDimDoors/mod_pocketDim/core/DimLink.java
View file

@ -31,7 +31,7 @@ public abstract class DimLink
protected DimLink(Point4D source, int linkType, int orientation) protected DimLink(Point4D source, int linkType, int orientation)
{ {
if (linkType < LinkTypes.ENUM_MIN || linkType > LinkTypes.ENUM_MAX && linkType != LinkTypes.CLIENT_SIDE) if ((linkType < LinkTypes.ENUM_MIN || linkType > LinkTypes.ENUM_MAX) && linkType != LinkTypes.CLIENT_SIDE)
{ {
throw new IllegalArgumentException("The specified link type is invalid."); throw new IllegalArgumentException("The specified link type is invalid.");
} }

5
StevenDimDoors/mod_pocketDim/core/NewDimData.java
View file

@ -267,7 +267,10 @@ public abstract class NewDimData
link.overwrite(linkType,orientation); link.overwrite(linkType,orientation);
} }
//Link created! //Link created!
linkWatcher.onCreated(link.source); if(linkType!=LinkTypes.CLIENT_SIDE)
{
linkWatcher.onCreated(link.source);
}
return link; return link;
} }

8
StevenDimDoors/mod_pocketDim/core/PocketManager.java
View file

@ -386,7 +386,7 @@ public class PocketManager
private static NewDimData registerClientDimension(int dimensionID, int rootID) private static NewDimData registerClientDimension(int dimensionID, int rootID)
{ {
// No need to raise events here since this code should only run on the client side // No need to raise events heres since this code should only run on the client side
// getDimensionData() always handles root dimensions properly, even if the weren't defined before // getDimensionData() always handles root dimensions properly, even if the weren't defined before
// SenseiKiwi: I'm a little worried about how getDimensionData will raise // SenseiKiwi: I'm a little worried about how getDimensionData will raise
@ -408,6 +408,12 @@ public class PocketManager
{ {
dimension = root; dimension = root;
} }
if(dimension.isPocketDimension())
{
//Im registering pocket dims here. I *think* we can assume that if its a pocket and we are
//registering its dim data, we also need to register it with forge.
DimensionManager.registerDimension(dimensionID, mod_pocketDim.properties.PocketProviderID);
}
return dimension; return dimension;
} }

13
StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java
View file

@ -21,6 +21,8 @@ import cpw.mods.fml.relauncher.SideOnly;
public class RenderDimDoor extends TileEntitySpecialRenderer public class RenderDimDoor extends TileEntitySpecialRenderer
{ {
FloatBuffer field_76908_a = GLAllocation.createDirectFloatBuffer(16); FloatBuffer field_76908_a = GLAllocation.createDirectFloatBuffer(16);
public RenderDimDoor() public RenderDimDoor()
{ {
@ -78,6 +80,7 @@ public class RenderDimDoor extends TileEntitySpecialRenderer
GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE);
var16 = .5F; var16 = .5F;
} }
/**
float startY = (float)(+(y + (double)var13)); float startY = (float)(+(y + (double)var13));
float ratioY = startY + ActiveRenderInfo.objectY; float ratioY = startY + ActiveRenderInfo.objectY;
@ -93,14 +96,12 @@ public class RenderDimDoor extends TileEntitySpecialRenderer
float ratioX = startX + ActiveRenderInfo.objectX; float ratioX = startX + ActiveRenderInfo.objectX;
float ratioX2 = startX + var15 + ActiveRenderInfo.objectX; float ratioX2 = startX + var15 + ActiveRenderInfo.objectX;
float xConverted = ratioX / ratioX2; float xConverted = ratioX / ratioX2;
yConverted += (float)(y + (double)var13); yConverted += (float)(y + (double)var13);
xConverted += (float)(x + (double)var13); xConverted += (float)(x + (double)var13);
zConverted += (float)(z + (double)var13); zConverted += (float)(z + (double)var13);
**/
GL11.glTranslatef( (float)(Minecraft.getSystemTime() % 200000L) / 200000.0F,0, 0.0F); GL11.glTranslatef( (float)(Minecraft.getSystemTime() % 200000L) / 200000.0F,0, 0.0F);
GL11.glTranslatef(0, (float)(Minecraft.getSystemTime() % 200000L) / 200000.0F, 0.0F); GL11.glTranslatef(0, (float)(Minecraft.getSystemTime() % 200000L) / 200000.0F, 0.0F);
@ -176,7 +177,7 @@ public class RenderDimDoor extends TileEntitySpecialRenderer
{ {
var23 = 1.0F; var23 = 1.0F;
var22 = 1.0F; var22 = 1.0F;
yConverted = 1.0F; //yConverted = 1.0F;
} }
GL11.glColor4d(var21 * var17, var22 * var17, var23 * var17, 1.0F); GL11.glColor4d(var21 * var17, var22 * var17, var23 * var17, 1.0F);
if(tile.openOrClosed) if(tile.openOrClosed)