diff --git a/StevenDimDoors/mod_pocketDim/core/DimLink.java b/StevenDimDoors/mod_pocketDim/core/DimLink.java index cc7ca374..8c11bb7a 100644 --- a/StevenDimDoors/mod_pocketDim/core/DimLink.java +++ b/StevenDimDoors/mod_pocketDim/core/DimLink.java @@ -31,7 +31,7 @@ public abstract class DimLink 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."); } diff --git a/StevenDimDoors/mod_pocketDim/core/NewDimData.java b/StevenDimDoors/mod_pocketDim/core/NewDimData.java index ac06ed52..33d12dfe 100644 --- a/StevenDimDoors/mod_pocketDim/core/NewDimData.java +++ b/StevenDimDoors/mod_pocketDim/core/NewDimData.java @@ -267,7 +267,10 @@ public abstract class NewDimData link.overwrite(linkType,orientation); } //Link created! - linkWatcher.onCreated(link.source); + if(linkType!=LinkTypes.CLIENT_SIDE) + { + linkWatcher.onCreated(link.source); + } return link; } diff --git a/StevenDimDoors/mod_pocketDim/core/PocketManager.java b/StevenDimDoors/mod_pocketDim/core/PocketManager.java index da43bec0..1272ecd7 100644 --- a/StevenDimDoors/mod_pocketDim/core/PocketManager.java +++ b/StevenDimDoors/mod_pocketDim/core/PocketManager.java @@ -386,7 +386,7 @@ public class PocketManager 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 // SenseiKiwi: I'm a little worried about how getDimensionData will raise @@ -408,6 +408,12 @@ public class PocketManager { 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; } diff --git a/StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java b/StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java index 9c2145e3..b31d8091 100644 --- a/StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java +++ b/StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java @@ -21,6 +21,8 @@ import cpw.mods.fml.relauncher.SideOnly; public class RenderDimDoor extends TileEntitySpecialRenderer { FloatBuffer field_76908_a = GLAllocation.createDirectFloatBuffer(16); + + public RenderDimDoor() { @@ -78,6 +80,7 @@ public class RenderDimDoor extends TileEntitySpecialRenderer GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); var16 = .5F; } + /** float startY = (float)(+(y + (double)var13)); float ratioY = startY + ActiveRenderInfo.objectY; @@ -93,14 +96,12 @@ public class RenderDimDoor extends TileEntitySpecialRenderer float ratioX = startX + ActiveRenderInfo.objectX; float ratioX2 = startX + var15 + ActiveRenderInfo.objectX; float xConverted = ratioX / ratioX2; - - - - + yConverted += (float)(y + (double)var13); xConverted += (float)(x + (double)var13); zConverted += (float)(z + (double)var13); - + **/ + GL11.glTranslatef( (float)(Minecraft.getSystemTime() % 200000L) / 200000.0F,0, 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; var22 = 1.0F; - yConverted = 1.0F; + //yConverted = 1.0F; } GL11.glColor4d(var21 * var17, var22 * var17, var23 * var17, 1.0F); if(tile.openOrClosed)