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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
SenseiKiwi 2013-08-01 23:42:01 -04:00
commit 8817653ce8
4 changed files with 46 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
StevenDimDoors/mod_pocketDim/SchematicLoader.java
View file

@ -89,8 +89,7 @@ public class SchematicLoader
if (fixedY != link.destYCoord) if (fixedY != link.destYCoord)
{ {
dimHelper helperInstance = dimHelper.instance; dimHelper helperInstance = dimHelper.instance;
LinkData reverseLink = helperInstance.getLinkDataAtDestination(link); helperInstance.moveLinkDataDestination(link, link.destXCoord, fixedY, link.destZCoord, link.destDimID, true);
helperInstance.moveLinkDataLocation(reverseLink, reverseLink.locXCoord, fixedY, reverseLink.locZCoord, reverseLink.locDimID, true);
} }
dungeon.copyToWorld(world, new Point3D(link.destXCoord, link.destYCoord, link.destZCoord), link.linkOrientation, originDimID, destDimID); dungeon.copyToWorld(world, new Point3D(link.destXCoord, link.destYCoord, link.destZCoord), link.linkOrientation, originDimID, destDimID);
return true; return true;

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

@ -46,7 +46,7 @@ public class BlockRift extends BlockContainer
{ {
try try
{ {
PacketHandler.onLinkCreatedPacket(dimHelper.instance.getLinkDataFromCoords(par2, par3, par4, par1World)); // PacketHandler.onLinkCreatedPacket(dimHelper.instance.getLinkDataFromCoords(par2, par3, par4, par1World));
} }
catch(Exception e) catch(Exception e)
{ {

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

@ -42,6 +42,7 @@ import StevenDimDoors.mod_pocketDim.Point3D;
import StevenDimDoors.mod_pocketDim.SchematicLoader; import StevenDimDoors.mod_pocketDim.SchematicLoader;
import StevenDimDoors.mod_pocketDim.TileEntityRift; import StevenDimDoors.mod_pocketDim.TileEntityRift;
import StevenDimDoors.mod_pocketDim.mod_pocketDim; import StevenDimDoors.mod_pocketDim.mod_pocketDim;
import StevenDimDoors.mod_pocketDim.dungeon.DungeonSchematic;
import StevenDimDoors.mod_pocketDim.world.LimboProvider; import StevenDimDoors.mod_pocketDim.world.LimboProvider;
import StevenDimDoors.mod_pocketDim.world.PocketProvider; import StevenDimDoors.mod_pocketDim.world.PocketProvider;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
@ -88,6 +89,9 @@ public class dimHelper extends DimensionManager
//public ArrayList<LinkData> linksForRendering =new ArrayList<LinkData>(); //public ArrayList<LinkData> linksForRendering =new ArrayList<LinkData>();
Random rand= new Random(); Random rand= new Random();
public static final int DEFAULT_POCKET_SIZE = 39;
public static final int DEFAULT_POCKET_WALL_THICKNESS = 5;
public static final int MAX_WORLD_HEIGHT = 254;
//Stupid function I use because I don't understand bitwise operations yet. Used in door orientation //Stupid function I use because I don't understand bitwise operations yet. Used in door orientation
//TODO get rid of this //TODO get rid of this
public int flipDoorMetadata(int data) public int flipDoorMetadata(int data)
@ -785,21 +789,19 @@ public class dimHelper extends DimensionManager
{ {
return link; return link;
} }
if (dimHelper.getWorld(link.locDimID) == null) if (dimHelper.getWorld(link.locDimID) == null)
{ {
dimHelper.initDimension(link.locDimID); dimHelper.initDimension(link.locDimID);
} }
int dimensionID; int dimensionID;
int depth = this.getDimDepth(link.locDimID); int depth = this.getDimDepth(link.locDimID);
// World world = this.getWorld(link.locDimID);
dimensionID = getNextFreeDimId(); dimensionID = getNextFreeDimId();
registerDimension(dimensionID, properties.PocketProviderID); registerDimension(dimensionID, properties.PocketProviderID);
DimData locationDimData; DimData locationDimData;
DimData destDimData; DimData destDimData;
if(dimHelper.dimList.containsKey(link.locDimID)&&!DimensionManager.getWorld(link.locDimID).isRemote) //checks to see if dim is already registered. If not, it creates a DimData entry for it later if(dimHelper.dimList.containsKey(link.locDimID)&&!DimensionManager.getWorld(link.locDimID).isRemote) //checks to see if dim is already registered. If not, it creates a DimData entry for it later
{ {
//randomizes exit if deep enough //randomizes exit if deep enough
@ -813,75 +815,59 @@ public class dimHelper extends DimensionManager
} }
if(rand.nextInt(13-depth)==0) if(rand.nextInt(13-depth)==0)
{ {
LinkData link1=getRandomLinkData(false); LinkData link1=getRandomLinkData(false);
if(link1!=null)
{
// locationDimData.exitDimLink=new LinkData(link1.locDimID, link1.locDimID, link1.locXCoord, link1.locYCoord, link1.locZCoord, link1.locXCoord, link1.locYCoord, link1.locZCoord, false);
}
} }
} }
if(locationDimData.isPocket) //determines the qualites of the pocket dim being created, based on parent dim. if(locationDimData.isPocket) //determines the qualites of the pocket dim being created, based on parent dim.
{ {
if(isGoingDown) if(isGoingDown)
{ {
destDimData= new DimData(dimensionID, true, locationDimData.depth+1, locationDimData.exitDimLink); destDimData= new DimData(dimensionID, true, locationDimData.depth+1, locationDimData.exitDimLink);
} }
else else
{ {
destDimData= new DimData(dimensionID, true, locationDimData.depth-1, locationDimData.exitDimLink); destDimData= new DimData(dimensionID, true, locationDimData.depth-1, locationDimData.exitDimLink);
} }
} }
else else
{ {
destDimData= new DimData(dimensionID, true, 1, link.locDimID,link.locXCoord,link.locYCoord,link.locZCoord); destDimData= new DimData(dimensionID, true, 1, link.locDimID,link.locXCoord,link.locYCoord,link.locZCoord);
} }
} }
else else
{ {
locationDimData= new DimData(link.locDimID, false, 0, link.locDimID,link.locXCoord,link.locYCoord,link.locZCoord); locationDimData= new DimData(link.locDimID, false, 0, link.locDimID,link.locXCoord,link.locYCoord,link.locZCoord);
destDimData= new DimData(dimensionID, true, 1, link.locDimID,link.locXCoord,link.locYCoord,link.locZCoord); destDimData= new DimData(dimensionID, true, 1, link.locDimID,link.locXCoord,link.locYCoord,link.locZCoord);
} }
destDimData.isDimRandomRift=isRandomRift; destDimData.isDimRandomRift=isRandomRift;
dimHelper.dimList.put(DimensionManager.getWorld(link.locDimID).provider.dimensionId, locationDimData); dimHelper.dimList.put(DimensionManager.getWorld(link.locDimID).provider.dimensionId, locationDimData);
dimHelper.dimList.put(dimensionID, destDimData); dimHelper.dimList.put(dimensionID, destDimData);
if(FMLCommonHandler.instance().getEffectiveSide()==Side.SERVER)//sends packet to clients notifying them that a new dim has been created. if(FMLCommonHandler.instance().getEffectiveSide()==Side.SERVER)//sends packet to clients notifying them that a new dim has been created.
{ {
PacketHandler.onDimCreatedPacket(destDimData); PacketHandler.onDimCreatedPacket(destDimData);
} }
link = this.createLink(DimensionManager.getWorld(link.locDimID).provider.dimensionId,dimensionID,link.locXCoord,link.locYCoord,link.locZCoord, link.destXCoord,constrainPocketY(link.destYCoord),link.destZCoord,link.linkOrientation); //creates and registers the two rifts that link the parent and pocket dim.
link = this.createLink(DimensionManager.getWorld(link.locDimID).provider.dimensionId,dimensionID,link.locXCoord,link.locYCoord,link.locZCoord, link.destXCoord,link.destYCoord,link.destZCoord,link.linkOrientation); //creates and registers the two rifts that link the parent and pocket dim. this.createLink(dimensionID,DimensionManager.getWorld(link.locDimID).provider.dimensionId, link.destXCoord,constrainPocketY(link.destYCoord),link.destZCoord, link.locXCoord,link.locYCoord,link.locZCoord, this.flipDoorMetadata(link.linkOrientation));
this.createLink(dimensionID,DimensionManager.getWorld(link.locDimID).provider.dimensionId, link.destXCoord,link.destYCoord,link.destZCoord, link.locXCoord,link.locYCoord,link.locZCoord, this.flipDoorMetadata(link.linkOrientation));
return link; return link;
} }
public static int constrainPocketY(int entranceDoorYPos)
{
if(entranceDoorYPos+DEFAULT_POCKET_SIZE-DEFAULT_POCKET_WALL_THICKNESS>= MAX_WORLD_HEIGHT)
{
return entranceDoorYPos-DEFAULT_POCKET_SIZE+DEFAULT_POCKET_WALL_THICKNESS;
}
if(entranceDoorYPos-1-DEFAULT_POCKET_WALL_THICKNESS<=0)
{
return entranceDoorYPos+DEFAULT_POCKET_WALL_THICKNESS;
}
else return entranceDoorYPos;
}
/** /**
* function that saves all dim data in a hashMap. Calling too often can cause Concurrent modification exceptions, so be careful. * function that saves all dim data in a hashMap. Calling too often can cause Concurrent modification exceptions, so be careful.
* @return * @return
@ -1157,6 +1143,11 @@ public class dimHelper extends DimensionManager
LinkData linkToMove = this.getLinkDataFromCoords(link.locXCoord, link.locYCoord, link.locZCoord, link.locDimID); LinkData linkToMove = this.getLinkDataFromCoords(link.locXCoord, link.locYCoord, link.locZCoord, link.locDimID);
if(linkToMove!=null) if(linkToMove!=null)
{ {
int oldX = linkToMove.locXCoord;
int oldY = linkToMove.locYCoord;
int oldZ = linkToMove.locZCoord;
int oldDimID = linkToMove.locDimID;
if(updateLinksPointingHere) if(updateLinksPointingHere)
{ {
ArrayList<LinkData> incomingLinks = new ArrayList<LinkData>(); ArrayList<LinkData> incomingLinks = new ArrayList<LinkData>();
@ -1175,6 +1166,13 @@ public class dimHelper extends DimensionManager
linkToMove.locXCoord=x; linkToMove.locXCoord=x;
linkToMove.locYCoord=y; linkToMove.locYCoord=y;
linkToMove.locZCoord=z; linkToMove.locZCoord=z;
if(this.getLinkDataFromCoords(oldX,oldY,oldZ,oldDimID)!=null)
{
// this.removeLink(this.getLinkDataFromCoords(oldX,oldY,oldZ,oldDimID));
}
this.createLink(linkToMove);
LinkData linkTest = dimHelper.instance.getLinkDataFromCoords(x, y, z, dimID);
linkTest.printLinkData();
return true; return true;
} }
return false; return false;
@ -1206,7 +1204,9 @@ public class dimHelper extends DimensionManager
linkToMove.destXCoord=x; linkToMove.destXCoord=x;
linkToMove.destYCoord=y; linkToMove.destYCoord=y;
linkToMove.destZCoord=z; linkToMove.destZCoord=z;
this.createLink(linkToMove);
LinkData testLink = this.getLinkDataFromCoords(link.locXCoord, link.locYCoord, link.locZCoord, link.locDimID);
return true; return true;
} }
return false; return false;

7
StevenDimDoors/mod_pocketDim/ticking/RiftRegenerator.java
View file

@ -57,7 +57,12 @@ public class RiftRegenerator implements IRegularTickReceiver {
if(dimHelper.instance.getLinkDataFromCoords(link.locXCoord, link.locYCoord, link.locZCoord, link.locDimID) != null) if(dimHelper.instance.getLinkDataFromCoords(link.locXCoord, link.locYCoord, link.locZCoord, link.locDimID) != null)
{ {
dimHelper.getWorld(link.locDimID).setBlock(link.locXCoord, link.locYCoord, link.locZCoord, properties.RiftBlockID); dimHelper.getWorld(link.locDimID).setBlock(link.locXCoord, link.locYCoord, link.locZCoord, properties.RiftBlockID);
TileEntityRift.class.cast(dimHelper.getWorld(link.locDimID).getBlockTileEntity(link.locXCoord, link.locYCoord, link.locZCoord)).hasGrownRifts=true; TileEntityRift rift = TileEntityRift.class.cast(dimHelper.getWorld(link.locDimID).getBlockTileEntity(link.locXCoord, link.locYCoord, link.locZCoord));
if(rift == null)
{
dimHelper.getWorld(link.locDimID).setBlockTileEntity(link.locXCoord, link.locYCoord, link.locZCoord, new TileEntityRift());
}
rift.hasGrownRifts=true;
} }
} }
} }