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

Changes to dimHelper

Browse source 
replaced dimHelper.dimList.get with dimHelper.instance.getDimData
added functions to make working with rifts easier
This commit is contained in:
StevenRS11 2013-07-31 19:34:08 -04:00
parent 7190a4ac6d
commit b278af0c23
25 changed files with 135 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
StevenDimDoors/mod_pocketDim/EventHookContainer.java
View file

@ -56,7 +56,7 @@ public class EventHookContainer
//TODO added temporary Try/catch block to prevent a crash here, getLinksInDim needs to be looked at
try
{
for (LinkData link:dimHelper.dimList.get(world.provider.dimensionId).getLinksInDim())
for (LinkData link:dimHelper.instance.getDimData(world.provider.dimensionId).getLinksInDim())
{
if(linkCount>100) //TODO: Wtf? wouldn't this cause some links to not load on servers with several links? Not sure what's going on here. ~SenseiKiwi
{

4
StevenDimDoors/mod_pocketDim/PacketHandler.java
View file

@ -103,7 +103,7 @@ public class PacketHandler implements IPacketHandler
int dimId = data.readInt();
try
{
DimData dimDataToAddLink= dimHelper.dimList.get(dimId);
DimData dimDataToAddLink= dimHelper.instance.getDimData(dimId);
LinkData linkToAdd = new LinkData(dimId, data.readInt(), data.readInt(), data.readInt(), data.readInt(), data.readInt(), data.readInt(), data.readInt(), data.readBoolean(),data.readInt());
linkToAdd.hasGennedDoor=data.readBoolean();
@ -128,7 +128,7 @@ public class PacketHandler implements IPacketHandler
int dimId = data.readInt();
try
{
DimData dimDataToRemoveFrom= dimHelper.dimList.get(dimId);
DimData dimDataToRemoveFrom= dimHelper.instance.getDimData(dimId);
LinkData linkToAdd = new LinkData(dimId, data.readInt(), data.readInt(), data.readInt(), data.readInt(), data.readInt(), data.readInt(), data.readInt(), data.readBoolean(),data.readInt());
dimDataToRemoveFrom.removeLinkAtCoords(linkToAdd.locDimID, linkToAdd.locXCoord,linkToAdd.locYCoord, linkToAdd.locZCoord);

10
StevenDimDoors/mod_pocketDim/TileEntityRift.java
View file

@ -45,14 +45,14 @@ public class TileEntityRift extends TileEntity
public void updateEntity()
{
if(count>200&&dimHelper.dimList.get(this.worldObj.provider.dimensionId)!=null)
if(count>200&&dimHelper.instance.getDimData(this.worldObj.provider.dimensionId)!=null)
{
/**
if(rand.nextBoolean())
{
}
**/
nearestRiftData = dimHelper.dimList.get(this.worldObj.provider.dimensionId).findNearestRift(worldObj, 5, xCoord, yCoord, zCoord);
nearestRiftData = dimHelper.instance.getDimData(this.worldObj.provider.dimensionId).findNearestRift(worldObj, 5, xCoord, yCoord, zCoord);
if(nearestRiftData!=null)
{
this.xOffset=this.xCoord-nearestRiftData.locXCoord;
@ -88,9 +88,9 @@ public class TileEntityRift extends TileEntity
}
/**
if(dimHelper.dimList.get(this.worldObj.provider.dimensionId)!=null)
if(dimHelper.instance.getDimData(this.worldObj.provider.dimensionId)!=null)
{
ArrayList rifts = dimHelper.dimList.get(this.worldObj.provider.dimensionId).findRiftsInRange(worldObj, 6, this.xCoord, this.yCoord, this.zCoord);
ArrayList rifts = dimHelper.instance.getDimData(this.worldObj.provider.dimensionId).findRiftsInRange(worldObj, 6, this.xCoord, this.yCoord, this.zCoord);
if(rifts.size()>15)
{
MobObelisk creeper = new MobObelisk(worldObj);
@ -124,7 +124,7 @@ public class TileEntityRift extends TileEntity
// System.out.println(count2);
if(count2>20&&count2<22)
{
nearestRiftData = dimHelper.dimList.get(this.worldObj.provider.dimensionId).findNearestRift(worldObj, 10, xCoord, yCoord, zCoord);
nearestRiftData = dimHelper.instance.getDimData(this.worldObj.provider.dimensionId).findNearestRift(worldObj, 10, xCoord, yCoord, zCoord);
if(this.nearestRiftData!=null)
{
TileEntityRift rift = (TileEntityRift) this.worldObj.getBlockTileEntity(nearestRiftData.locXCoord, nearestRiftData.locYCoord, nearestRiftData.locZCoord);

4
StevenDimDoors/mod_pocketDim/TransientDoor.java
View file

@ -93,7 +93,7 @@ public class TransientDoor extends ExitDoor
{
par1World.setBlock(par2, par3-1, par4, 0);
par1World.setBlock(par2, par3, par4, properties.RiftBlockID);
dimHelper.instance.teleportToPocket(par1World, linkData, par5Entity);
dimHelper.instance.traverseDimDoor(par1World, linkData, par5Entity);
}
@ -108,7 +108,7 @@ public class TransientDoor extends ExitDoor
{
par1World.setBlock(par2, par3, par4, 0);
par1World.setBlock(par2, par3+1, par4, properties.RiftBlockID);
dimHelper.instance.teleportToPocket(par1World, linkData, par5Entity);
dimHelper.instance.traverseDimDoor(par1World, linkData, par5Entity);
}

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

@ -127,7 +127,7 @@ public class ChaosDoor extends dimDoor
{
foundRandomDest=true;
dimHelper.instance.teleportToPocket(par1World, new LinkData(link.destDimID,link.locDimID,link.destXCoord,link.destYCoord,link.destZCoord,link.locXCoord,link.locYCoord,link.locZCoord,link.isLocPocket,0), par5Entity);
dimHelper.instance.traverseDimDoor(par1World, new LinkData(link.destDimID,link.locDimID,link.destXCoord,link.destYCoord,link.destZCoord,link.locXCoord,link.locYCoord,link.locZCoord,link.isLocPocket,0), par5Entity);
if(dimHelper.getWorld(link.locDimID)!=null)
{

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

@ -59,9 +59,9 @@ public class ExitDoor extends dimDoor
if(dimHelper.instance.dimList.containsKey(locDimID)&&dimHelper.instance.getLinkDataFromCoords(par2, par3, par4, par1World)==null)
{
DimData dimData = dimHelper.dimList.get(locDimID);
DimData dimData = dimHelper.instance.getDimData(locDimID);
int ExitDimID = dimData.exitDimLink.destDimID;
if(dimHelper.dimList.get(par1World.provider.dimensionId).isPocket)
if(dimHelper.instance.getDimData(par1World.provider.dimensionId).isPocket)
{
int yCoord=yCoordHelper.getFirstUncovered(ExitDimID, par2, par3, par4);
@ -88,7 +88,7 @@ public class ExitDoor extends dimDoor
}
else if(dimHelper.dimList.get(par1World.provider.dimensionId).isPocket)
else if(dimHelper.instance.getDimData(par1World.provider.dimensionId).isPocket)
{
//System.out.println("Created new dim from "+String.valueOf(par1World.provider.dimensionId));

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

@ -105,7 +105,7 @@ public class dimDoor extends BlockContainer
if(!(par5Entity instanceof EntityPlayer)&&num>3)
{
this.onPoweredBlockChange(par1World, par2, par3, par4, false);
dimHelper.instance.teleportToPocket(par1World, linkData, par5Entity);
dimHelper.instance.traverseDimDoor(par1World, linkData, par5Entity);
}
else if(!par1World.isRemote&&(num==5||num==4||num==6||num==7)&&(num-4)==var12)
@ -116,7 +116,7 @@ public class dimDoor extends BlockContainer
this.onPoweredBlockChange(par1World, par2, par3, par4, false);
dimHelper.instance.teleportToPocket(par1World, linkData, par5Entity);
dimHelper.instance.traverseDimDoor(par1World, linkData, par5Entity);

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

@ -59,7 +59,7 @@ public class dimHatch extends BlockTrapDoor
exitLink.locDimID=par1World.provider.dimensionId;
dimHelper.instance.teleportToPocket(par1World, exitLink, par5Entity);
dimHelper.instance.traverseDimDoor(par1World, exitLink, par5Entity);
}

2
StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java
View file

@ -79,7 +79,7 @@ public class CommandCreateDungeonRift extends DDCommandBase
{
//Create a rift to our selected dungeon and notify the player
link = dimHelper.instance.createPocket(link, true, true);
dimHelper.dimList.get(link.destDimID).dungeonGenerator = result;
dimHelper.instance.getDimData(link.destDimID).dungeonGenerator = result;
sender.sendChatToPlayer("Created a rift to \"" + getSchematicName(result) + "\" dungeon (Dimension ID = " + link.destDimID + ").");
}
else

2
StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java
View file

@ -56,7 +56,7 @@ public class CommandDeleteAllLinks extends DDCommandBase
{
if(dimHelper.dimList.containsKey(targetDim))
{
DimData dim = dimHelper.dimList.get(targetDim);
DimData dim = dimHelper.instance.getDimData(targetDim);
ArrayList<LinkData> linksInDim = dim.getLinksInDim();
for (LinkData link : linksInDim)

2
StevenDimDoors/mod_pocketDim/commands/CommandDeleteDimensionData.java
View file

@ -67,7 +67,7 @@ public class CommandDeleteDimensionData extends DDCommandBase
{
if(link.destDimID==targetDim)
{
dimHelper.dimList.get(link.locDimID).removeLinkAtCoords(link);
dimHelper.instance.getDimData(link.locDimID).removeLinkAtCoords(link);
linksRemoved++;
}
if(dimData.dimID==targetDim)

2
StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java
View file

@ -57,7 +57,7 @@ public class CommandDeleteRifts extends DDCommandBase
{
if(dimHelper.dimList.containsKey(targetDim))
{
DimData dim = dimHelper.dimList.get(targetDim);
DimData dim = dimHelper.instance.getDimData(targetDim);
ArrayList<LinkData> linksInDim = dim.getLinksInDim();
for(LinkData link : linksInDim)

2
StevenDimDoors/mod_pocketDim/commands/CommandPrintDimensionData.java
View file

@ -50,7 +50,7 @@ public class CommandPrintDimensionData extends DDCommandBase
return DDCommandResult.TOO_MANY_ARGUMENTS;
}
dimData = dimHelper.dimList.get(targetDim);
dimData = dimHelper.instance.getDimData(targetDim);
if (dimData == null)
{
return DDCommandResult.UNREGISTERED_DIMENSION;

2
StevenDimDoors/mod_pocketDim/dungeon/DungeonSchematic.java
View file

@ -319,7 +319,7 @@ public class DungeonSchematic extends Schematic {
LinkData randomLink = dimHelper.instance.getRandomLinkData(false);
LinkData sideLink = new LinkData(destDimID,
dimHelper.dimList.get(originDimID).exitDimLink.destDimID,
dimHelper.instance.getDimData(originDimID).exitDimLink.destDimID,
location.getX(),
location.getY(),
location.getZ(),

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

@ -481,7 +481,7 @@ public class DungeonHelper
flag = false;
}
if(getDungeonDataInChain(dimHelper.dimList.get(incoming.locDimID)).contains(dungeon))
if(getDungeonDataInChain(dimHelper.instance.getDimData(incoming.locDimID)).contains(dungeon))
{
flag=false;
}
@ -506,8 +506,8 @@ public class DungeonHelper
return;
}
}
dimHelper.dimList.get(incoming.destDimID).dungeonGenerator = dungeon;
//dimHelper.dimList.get(incoming.destDimID).dungeonGenerator = defaultUp;
dimHelper.instance.getDimData(incoming.destDimID).dungeonGenerator = dungeon;
//dimHelper.instance.getDimData(incoming.destDimID).dungeonGenerator = defaultUp;
}
public Collection<String> getDungeonNames() {
@ -558,7 +558,7 @@ public class DungeonHelper
}
public static ArrayList<DungeonGenerator> getDungeonDataInChain(DimData dimData)
{
DimData startingDim = dimHelper.dimList.get(dimHelper.instance.getLinkDataFromCoords(dimData.exitDimLink.destXCoord, dimData.exitDimLink.destYCoord, dimData.exitDimLink.destZCoord, dimData.exitDimLink.destDimID).destDimID);
DimData startingDim = dimHelper.instance.getDimData(dimHelper.instance.getLinkDataFromCoords(dimData.exitDimLink.destXCoord, dimData.exitDimLink.destYCoord, dimData.exitDimLink.destZCoord, dimData.exitDimLink.destDimID).destDimID);
return getDungeonDataBelow(startingDim);
}
@ -573,9 +573,9 @@ public class DungeonHelper
{
if(dimHelper.dimList.containsKey(link.destDimID))
{
if(dimHelper.dimList.get(link.destDimID).dungeonGenerator!=null&&dimHelper.instance.getDimDepth(link.destDimID)==dimData.depth+1)
if(dimHelper.instance.getDimData(link.destDimID).dungeonGenerator!=null&&dimHelper.instance.getDimDepth(link.destDimID)==dimData.depth+1)
{
for(DungeonGenerator dungeonGen :getDungeonDataBelow(dimHelper.dimList.get(link.destDimID)) )
for(DungeonGenerator dungeonGen :getDungeonDataBelow(dimHelper.instance.getDimData(link.destDimID)) )
{
if(!dungeonData.contains(dungeonGen))
{

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

@ -251,7 +251,7 @@ public class dimHelper extends DimensionManager
* @param orientation- the orientation of the door used to teleport, determines player orientation and door placement on arrival
* @Return
*/
public void teleportToPocket(World world,LinkData linkData, Entity entity)
public void traverseDimDoor(World world,LinkData linkData, Entity entity)
{
DDProperties properties = DDProperties.instance();
@ -285,7 +285,7 @@ public class dimHelper extends DimensionManager
int playerYCoord=MathHelper.floor_double(entity.posY);
int playerZCoord=MathHelper.floor_double(entity.posZ);
if(!entity.worldObj.isBlockOpaqueCube(playerXCoord, playerYCoord-1,playerZCoord )&&dimHelper.dimList.get(linkData.locDimID).isDimRandomRift&&!linkData.hasGennedDoor)
if(!entity.worldObj.isBlockOpaqueCube(playerXCoord, playerYCoord-1,playerZCoord )&&dimHelper.instance.getDimData(linkData.locDimID).isDimRandomRift&&!linkData.hasGennedDoor)
{
for(int count=0;count<20;count++)
{
@ -391,7 +391,7 @@ public class dimHelper extends DimensionManager
{
dimHelper.dimList.put(link.destDimID, new DimData(link.destDimID, false, 0, link.locDimID,link.locXCoord,link.locYCoord,link.locZCoord));
}
DimData locationDimData= dimHelper.dimList.get(link.locDimID);
DimData locationDimData= dimHelper.instance.getDimData(link.locDimID);
link.isLocPocket=locationDimData.isPocket;
locationDimData.addLinkToDim(link);
@ -453,7 +453,7 @@ public class dimHelper extends DimensionManager
dimHelper.dimList.put(locationDimID, locationDimData);
}
LinkData link = this.getLinkDataFromCoords(locationXCoord, locationYCoord, locationZCoord, locationDimID);
dimHelper.dimList.get(locationDimID).removeLinkAtCoords(link);
dimHelper.instance.getDimData(locationDimID).removeLinkAtCoords(link);
//updates clients that a rift has been removed
if(FMLCommonHandler.instance().getEffectiveSide()==Side.SERVER)
{
@ -463,7 +463,7 @@ public class dimHelper extends DimensionManager
}
public LinkData findNearestRift(World world, int x, int y, int z, int range)
{
return dimHelper.dimList.get(world).findNearestRift(world, range, x, y, z);
return dimHelper.instance.getDimData(world).findNearestRift(world, range, x, y, z);
}
/**
* generates a door based on what door was used to teleport. Only funtions once per linking.
@ -546,7 +546,7 @@ public class dimHelper extends DimensionManager
return;
}
// World world = this.getWorld(incomingLink.destDimID);
DimData data = dimHelper.dimList.get(incomingLink.destDimID);
DimData data = dimHelper.instance.getDimData(incomingLink.destDimID);
if(!data.hasBeenFilled&&data.isPocket&&!data.isDimRandomRift)
{
@ -1094,7 +1094,7 @@ public class dimHelper extends DimensionManager
ArrayList<LinkData> linksInDim = new ArrayList<LinkData>();
for(size--;size>0;)
{
dimData = dimHelper.dimList.get(dimList.keySet().toArray()[rand.nextInt(dimList.keySet().size())]);
dimData = dimHelper.instance.getDimData((Integer)dimList.keySet().toArray()[rand.nextInt(dimList.keySet().size())]);
if(dimData==null)
{
break;
@ -1128,8 +1128,89 @@ public class dimHelper extends DimensionManager
}
/**
* Gets a link at the destination of the link provided. Returns null if none exists.
* @param link
* @return
*/
public LinkData getLinkDataAtDestination(LinkData link)
{
return this.getLinkDataFromCoords(link.destXCoord, link.destYCoord, link.destZCoord, link.destDimID);
}
/**
* Moves the location of the link passed in to the provided coords. Does not change the links destination coords.
* The boolean flag determines whether or not to update other links that point to this link- true causes all links that pointed to this link to be updated
* to point to the new link location.
*
* Return true if there was an actual link to be moved.
*
* @param link
* @param x
* @param y
* @param z
* @param dimID
* @param updateLinksPointingHere
* @return
*/
public boolean moveLinkDataLocation(LinkData link, int x,int y, int z, int dimID, boolean updateLinksPointingHere)
{
LinkData linkToMove = this.getLinkDataFromCoords(link.locXCoord, link.locYCoord, link.locZCoord, link.locDimID);
if(linkToMove!=null)
{
if(updateLinksPointingHere)
{
ArrayList<LinkData> incomingLinks = new ArrayList<LinkData>();
for(DimData dimData : dimHelper.dimList.values())
{
for(LinkData allLink : dimData.getLinksInDim())
{
if(this.getLinkDataAtDestination(allLink)==linkToMove)
{
this.moveLinkDataDestination(allLink, x, y, z, dimID, false);
}
}
}
}
linkToMove.locDimID=dimID;
linkToMove.locXCoord=x;
linkToMove.locYCoord=y;
linkToMove.locZCoord=z;
return true;
}
return false;
}
/**
* Changes the destination coords of the link passed in if it exists to the provided coords.
* @param link
* @param x
* @param y
* @param z
* @param dimID
* @param updateLinksAtDestination
* @return
*/
public boolean moveLinkDataDestination(LinkData link, int x, int y, int z, int dimID, boolean updateLinksAtDestination)
{
LinkData linkToMove = this.getLinkDataFromCoords(link.locXCoord, link.locYCoord, link.locZCoord, link.locDimID);
if(linkToMove!=null)
{
if(updateLinksAtDestination)
{
LinkData linkAtDestination = this.getLinkDataAtDestination(linkToMove);
if(linkAtDestination!=null)
{
this.moveLinkDataLocation(linkAtDestination, x, y, z, dimID, false);
}
}
linkToMove.destDimID=dimID;
linkToMove.destXCoord=x;
linkToMove.destYCoord=y;
linkToMove.destZCoord=z;
return true;
}
return false;
}
/**
* gets a link based on coords and a world object
@ -1155,7 +1236,7 @@ public class dimHelper extends DimensionManager
{
if(dimHelper.dimList.containsKey(worldID))
{
DimData dimData=dimHelper.dimList.get(worldID);
DimData dimData=dimHelper.instance.getDimData(worldID);
return dimData.findLinkAtCoords(x, y, z);
@ -1270,15 +1351,8 @@ public class dimHelper extends DimensionManager
}
public DimData getDimData(World world)
{
if(dimHelper.dimList.containsKey(world.provider.dimensionId))
{
return dimHelper.dimList.get(world.provider.dimensionId);
}
else
{
return null;
}
{
return dimHelper.instance.getDimData(world.provider.dimensionId);
}
public DimData getDimData(int dimID)
{

6
StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java
View file

@ -188,9 +188,9 @@ public class ItemRiftBlade extends ItemSword
if(this.getMaxItemUseDuration(par1ItemStack)-par4>12&&!par2World.isRemote&&itemDimDoor.canPlace(par2World, x, y, z, rotation))
{
if(dimHelper.dimList.get(par2World.provider.dimensionId)!=null)
if(dimHelper.instance.getDimData(par2World.provider.dimensionId)!=null)
{
if(dimHelper.dimList.get(par2World.provider.dimensionId).depth==0)
if(dimHelper.instance.getDimData(par2World.provider.dimensionId).depth==0)
{
dimHelper.instance.createPocket(link,true, false);
}
@ -285,7 +285,7 @@ public class ItemRiftBlade extends ItemSword
}
// if(dimHelper.dimList.get(par2World.provider.dimensionId)!=null&&!par2World.isRemote&&!didFindThing)
// if(dimHelper.instance.getDimData(par2World.provider.dimensionId)!=null&&!par2World.isRemote&&!didFindThing)
{
par3EntityPlayer.setItemInUse(par1ItemStack, this.getMaxItemUseDuration(par1ItemStack));

6
StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java
View file

@ -57,11 +57,11 @@ public class ItemStableFabric extends Item
if(dimHelper.dimList.containsKey(par3World.provider.dimensionId))
{
if(dimHelper.dimList.get(par3World.provider.dimensionId).isPocket)
if(dimHelper.instance.getDimData(par3World.provider.dimensionId).isPocket)
{
if(dimHelper.dimList.get(par3World.provider.dimensionId).dungeonGenerator!=null)
if(dimHelper.instance.getDimData(par3World.provider.dimensionId).dungeonGenerator!=null)
{
System.out.println("Dungeon name "+dimHelper.dimList.get(par3World.provider.dimensionId).dungeonGenerator.schematicPath);
System.out.println("Dungeon name "+dimHelper.instance.getDimData(par3World.provider.dimensionId).dungeonGenerator.schematicPath);
}
}

2
StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java
View file

@ -173,7 +173,7 @@ public class MobMonolith extends EntityFlying implements IMob
LinkData link = new LinkData(this.worldObj.provider.dimensionId, properties.LimboDimensionID, (int)this.posX, (int)this.posY, (int)this.posZ, (int)this.posX+rand.nextInt(500)-250, (int)this.posY+500, (int)this.posZ+rand.nextInt(500)-250, false,0);
dimHelper.instance.teleportToPocket(worldObj, link, entityPlayer);
dimHelper.instance.traverseDimDoor(worldObj, link, entityPlayer);
this.aggro=0;
entityPlayer.worldObj.playSoundAtEntity(entityPlayer,"mods.DimDoors.sfx.crack",13, 1);

2
StevenDimDoors/mod_pocketDim/ticking/MonolithSpawner.java
View file

@ -70,7 +70,7 @@ public class MonolithSpawner implements IRegularTickReceiver {
private void placeMonolithsInPocket(int dimensionID, int chunkX, int chunkZ)
{
World pocket = dimHelper.getWorld(dimensionID);
DimData dimData = dimHelper.dimList.get(dimensionID);
DimData dimData = dimHelper.instance.getDimData(dimensionID);
int sanity = 0;
int blockID = 0;
boolean didSpawn = false;

2
StevenDimDoors/mod_pocketDim/world/PocketGenerator.java
View file

@ -69,7 +69,7 @@ public class PocketGenerator extends ChunkProviderGenerate implements IChunkProv
@Override
public List getPossibleCreatures(EnumCreatureType var1, int var2, int var3, int var4)
{
DimData data = dimHelper.dimList.get(this.worldObj.provider.dimensionId);
DimData data = dimHelper.instance.getDimData(this.worldObj.provider.dimensionId);
if (data != null)
{
if (data.dungeonGenerator != null)

2
StevenDimDoors/mod_pocketDim/world/PocketProvider.java
View file

@ -113,7 +113,7 @@ public class PocketProvider extends WorldProvider
}
else
{
respawnDim = dimHelper.dimList.get(this.dimensionId).exitDimLink.destDimID;
respawnDim = dimHelper.instance.getDimData(this.dimensionId).exitDimLink.destDimID;
}
if (dimHelper.getWorld(respawnDim) == null)

2
StevenDimDoors/mod_pocketDimClient/ClosingRiftFX.java
View file

@ -98,7 +98,7 @@ public class ClosingRiftFX extends EntityFX
float var16 = .8F;
try
{
if(dimHelper.dimList.get(this.worldObj.provider.dimensionId).isPocket)
if(dimHelper.instance.getDimData(this.worldObj.provider.dimensionId).isPocket)
{
var16=.4F;
}

2
StevenDimDoors/mod_pocketDimClient/GoggleRiftFX.java
View file

@ -55,7 +55,7 @@ public class GoggleRiftFX extends EntityFireworkSparkFX
float var16 = .0F;
try
{
if(dimHelper.dimList.get(this.worldObj.provider.dimensionId).isPocket)
if(dimHelper.instance.getDimData(this.worldObj.provider.dimensionId).isPocket)
{
var16=.7F;
}

2
StevenDimDoors/mod_pocketDimClient/RiftFX.java
View file

@ -112,7 +112,7 @@ public class RiftFX extends EntityFX
try
{
if(dimHelper.dimList.get(this.worldObj.provider.dimensionId).isPocket)
if(dimHelper.instance.getDimData(this.worldObj.provider.dimensionId).isPocket)
{
f14=.7F;
}