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

Fix crash on exiting personal pocket dimension #185

Closed
notabadminer wants to merge 67 commits from master into master
pull from: master
merge into: apex:master
Conversation 1 Commits 67 Files Changed 366 -41
3 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 198d1ac56f - Show all commits

30
src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
View File

@@ -333,36 +333,6 @@ public class mod_pocketDim
DDLoot.registerInfo(properties); DDLoot.registerInfo(properties);
proxy.loadTextures(); proxy.loadTextures();
proxy.registerRenderers(); proxy.registerRenderers();
LSystem.generateLSystem("terdragon", LSystem.TERDRAGON, 4);
LSystem.generateLSystem("terdragon", LSystem.TERDRAGON, 5);
// LSystem.generateLSystem("terdragon", LSystem.TERDRAGON, 6); //degenerate
LSystem.generateLSystem("terdragon", LSystem.TERDRAGON, 7);
// LSystem.generateLSystem("terdragon", LSystem.TERDRAGON, 8);
// LSystem.generateLSystem("terdragon", LSystem.TERDRAGON, 9);
// LSystem.generateLSystem("vortex", LSystem.VORTEX, 8);
LSystem.generateLSystem("vortex", LSystem.VORTEX, 9);
LSystem.generateLSystem("vortex", LSystem.VORTEX, 10);
LSystem.generateLSystem("vortex", LSystem.VORTEX, 11);
// LSystem.generateLSystem("vortex", LSystem.VORTEX, 12);
LSystem.generateLSystem("twindragon", LSystem.TWINDRAGON, 7);
LSystem.generateLSystem("twindragon", LSystem.TWINDRAGON, 8);
LSystem.generateLSystem("twindragon", LSystem.TWINDRAGON, 9);
LSystem.generateLSystem("twindragon", LSystem.TWINDRAGON, 10);
// LSystem.generateLSystem("twindragon", LSystem.TWINDRAGON, 11);
LSystem.generateLSystem("dragon", LSystem.DRAGON, 8);
LSystem.generateLSystem("dragon", LSystem.DRAGON, 9);
LSystem.generateLSystem("dragon", LSystem.DRAGON, 10);
LSystem.generateLSystem("dragon", LSystem.DRAGON, 11);
// LSystem.generateLSystem("dragon", LSystem.DRAGON, 12);
// LSystem.generateLSystem("dragon", LSystem.DRAGON, 13);
} }
@EventHandler @EventHandler

10
src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java
View File

@@ -51,7 +51,6 @@ public class TileEntityRift extends DDTileEntityBase
public int spawnedEndermenID = 0; public int spawnedEndermenID = 0;
public int riftRotation = random.nextInt(360); public int riftRotation = random.nextInt(360);
public int renderKey = random.nextInt(LSystem.curves.size());
public float growth = 0; public float growth = 0;
public TileEntityRift() public TileEntityRift()
@@ -265,7 +264,6 @@ public class TileEntityRift extends DDTileEntityBase
this.shouldClose = nbt.getBoolean("shouldClose"); this.shouldClose = nbt.getBoolean("shouldClose");
this.spawnedEndermenID = nbt.getInteger("spawnedEndermenID"); this.spawnedEndermenID = nbt.getInteger("spawnedEndermenID");
this.riftRotation = nbt.getInteger("riftRotation"); this.riftRotation = nbt.getInteger("riftRotation");
this.renderKey = nbt.getInteger("renderKey");
this.growth = nbt.getFloat("growth"); this.growth = nbt.getFloat("growth");
} }
@@ -280,7 +278,6 @@ public class TileEntityRift extends DDTileEntityBase
nbt.setInteger("zOffset", this.zOffset); nbt.setInteger("zOffset", this.zOffset);
nbt.setBoolean("shouldClose", this.shouldClose); nbt.setBoolean("shouldClose", this.shouldClose);
nbt.setInteger("spawnedEndermenID", this.spawnedEndermenID); nbt.setInteger("spawnedEndermenID", this.spawnedEndermenID);
nbt.setInteger("renderKey", this.renderKey);
nbt.setInteger("riftRotation", this.riftRotation); nbt.setInteger("riftRotation", this.riftRotation);
nbt.setFloat("growth", this.growth); nbt.setFloat("growth", this.growth);
@@ -320,11 +317,4 @@ public class TileEntityRift extends DDTileEntityBase
{ {
return null; return null;
} }
public PolygonStorage getCurve()
{
return (LSystem.curves.get(renderKey));
}
} }

1
src/main/java/StevenDimDoors/mod_pocketDimClient/RenderRift.java
View File

@@ -35,7 +35,6 @@ public class RenderRift extends TileEntitySpecialRenderer
*/ */
TileEntityRift rift = (TileEntityRift) te; TileEntityRift rift = (TileEntityRift) te;
// draws the verticies corresponding to the passed it // draws the verticies corresponding to the passed it
this.drawCrack(rift.riftRotation, rift.getCurve(), rift.growth/15, xWorld, yWorld, zWorld);
GL11.glDisable(GL_BLEND); GL11.glDisable(GL_BLEND);
// reenable all the stuff we disabled // reenable all the stuff we disabled