Signed-off-by: StevenRS11 <stevenrs11@aol.com>
This commit is contained in:
parent
ddc7bf0f64
commit
e24acd4038
4 changed files with 29 additions and 17 deletions
|
@ -33,9 +33,13 @@ public class LimboProvider extends WorldProvider
|
|||
}
|
||||
public boolean canRespawnHere()
|
||||
{
|
||||
return true;
|
||||
|
||||
return mod_pocketDim.hardcoreLimbo;
|
||||
}
|
||||
public boolean isBlockHighHumidity(int x, int y, int z)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
|
@ -139,7 +143,7 @@ public class LimboProvider extends WorldProvider
|
|||
{
|
||||
ChunkCoordinates var5 = new ChunkCoordinates(this.worldObj.getSpawnPoint());
|
||||
|
||||
boolean isAdventure = worldObj.getWorldInfo().getGameType() == EnumGameType.ADVENTURE;
|
||||
|
||||
int spawnFuzz = 10000;
|
||||
int spawnFuzzHalf = spawnFuzz / 2;
|
||||
|
||||
|
|
|
@ -393,7 +393,10 @@ public class dimHelper extends DimensionManager
|
|||
return this.createLink(locationDimID, destinationDimID, locationXCoord, locationYCoord, locationZCoord, destinationXCoord, destinationYCoord, destinationZCoord, this.getLinkDataFromCoords(locationXCoord, locationYCoord, locationZCoord, locationDimID).linkOrientation);
|
||||
|
||||
}
|
||||
return this.createLink(locationDimID, destinationDimID, locationXCoord, locationYCoord, locationZCoord, destinationXCoord, destinationYCoord, destinationZCoord, -10);
|
||||
else
|
||||
{
|
||||
return this.createLink(locationDimID, destinationDimID, locationXCoord, locationYCoord, locationZCoord, destinationXCoord, destinationYCoord, destinationZCoord, -10);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -676,7 +679,7 @@ public class dimHelper extends DimensionManager
|
|||
while(zCount<=searchRadius)
|
||||
{
|
||||
|
||||
if((Math.abs(xCount)>=15||Math.abs(yCount)>=15||Math.abs(zCount)>=15)&&this.getWorld(incomingLink.destDimID).isAirBlock( x+xCount, y+yCount, z+zCount))
|
||||
if((Math.abs(xCount)>=15||Math.abs(yCount)>=15||Math.abs(zCount)>=15)&&this.getWorld(incomingLink.destDimID).isAirBlock( x+xCount, y+yCount, z+zCount)&&((yCount+y)>0))
|
||||
{
|
||||
if(Math.abs(xCount)>=19||Math.abs(yCount)>=19||Math.abs(zCount)>=19)
|
||||
{
|
||||
|
@ -1025,11 +1028,7 @@ public class dimHelper extends DimensionManager
|
|||
}
|
||||
|
||||
|
||||
File oldSave=new File( world.getSaveHandler().getMapFileFromName("idcounts").getParent()+"/PocketDimData"); //checks to see if old save data is present
|
||||
if(oldSave.exists())
|
||||
{
|
||||
OldSaveHandler.handleOldSaveData(oldSave);
|
||||
}
|
||||
|
||||
|
||||
|
||||
saveFile = new FileInputStream(dataStore);
|
||||
|
|
|
@ -176,6 +176,7 @@ public class mod_pocketDim
|
|||
|
||||
public static boolean enableDoorOpenGL;
|
||||
|
||||
public static boolean hardcoreLimbo;
|
||||
|
||||
|
||||
public static boolean hasInitDims=false;
|
||||
|
@ -218,6 +219,7 @@ public class mod_pocketDim
|
|||
|
||||
config.load();
|
||||
// this.enableDimRail = config.get("BOOLEAN", "true to enable dim rail crafting", true).getBoolean(true);
|
||||
this.hardcoreLimbo = config.get("BOOLEAN", "true to cause player to respawn in Limbo", false).getBoolean(false);
|
||||
this.enableDimTrapDoor = config.get("BOOLEAN", "true to enable trap door crafting", true).getBoolean(true);
|
||||
this.enableIronDimDoor = config.get("BOOLEAN", "true to enable iron dim door crafting", true).getBoolean(true);
|
||||
this.enableRiftBlade = config.get("BOOLEAN", "true to enable rift blade crafting", true).getBoolean(true);
|
||||
|
@ -261,7 +263,7 @@ public class mod_pocketDim
|
|||
|
||||
|
||||
this.riftsInWorldGen = config.get("BOOLEAN", "Should rifts generate natrually in the world? ", true).getBoolean(true);
|
||||
this.isLimboActive = config.get("BOOLEAN", "Toggles limbo", true).getBoolean(true);
|
||||
this.isLimboActive = false;//config.get("BOOLEAN", "Toggles limbo", true).getBoolean(true);
|
||||
|
||||
this.riftSpreadFactor = config.get("Int", "How many times a rift can spread- 0 prevents rifts from spreading at all. I dont recommend putting it highter than 5, because its rather exponential. ", 3).getInt();
|
||||
|
||||
|
|
|
@ -83,35 +83,42 @@ public class pocketTeleporter extends Teleporter
|
|||
}
|
||||
else if(par1Entity instanceof EntityMinecart)
|
||||
{
|
||||
par1Entity.motionX=0;
|
||||
par1Entity.motionZ=0;
|
||||
par1Entity.motionY=0;
|
||||
int id;
|
||||
|
||||
id=dimHelper.instance.getDestOrientation(sendingLink);
|
||||
|
||||
|
||||
par1Entity.rotationYaw=(id*90)+90;
|
||||
|
||||
|
||||
if(id==2||id==6)
|
||||
{
|
||||
|
||||
par1Entity.motionX =2;
|
||||
this.setEntityPosition(par1Entity, x+1.5, y, z+.5 );
|
||||
par1Entity.motionX =2;
|
||||
}
|
||||
else if(id==3||id==7)
|
||||
{
|
||||
|
||||
this.setEntityPosition(par1Entity, x+.5, y, z+1.5 );
|
||||
par1Entity.motionZ =2;
|
||||
this.setEntityPosition(par1Entity, x+.5, y, z+1.5 );
|
||||
|
||||
|
||||
}
|
||||
else if(id==0||id==4)
|
||||
{
|
||||
|
||||
this.setEntityPosition(par1Entity,x-.5, y, z+.5);
|
||||
par1Entity.motionX =-2;
|
||||
this.setEntityPosition(par1Entity,x-.5, y, z+.5);
|
||||
|
||||
}
|
||||
else if(id==1||id==5)
|
||||
{
|
||||
this.setEntityPosition(par1Entity,x+.5, y, z-.5);
|
||||
par1Entity.motionZ =-2;
|
||||
this.setEntityPosition(par1Entity,x+.5, y, z-.5);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -119,7 +126,7 @@ public class pocketTeleporter extends Teleporter
|
|||
|
||||
}
|
||||
|
||||
|
||||
par1Entity.rotationYaw=(id*90)+90;
|
||||
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue