Merge branch 'R1.4.0-improvements'
This commit is contained in:
commit
dae6fbfbb8
10 changed files with 227 additions and 193 deletions
|
@ -37,15 +37,15 @@ public class SchematicLoader
|
||||||
private Random rand = new Random();
|
private Random rand = new Random();
|
||||||
public HashMap<Integer,HashMap<Integer, HashMap<Integer,Integer>>> rotationMap = new HashMap<Integer,HashMap<Integer, HashMap<Integer,Integer>>>();
|
public HashMap<Integer,HashMap<Integer, HashMap<Integer,Integer>>> rotationMap = new HashMap<Integer,HashMap<Integer, HashMap<Integer,Integer>>>();
|
||||||
public int transMeta;
|
public int transMeta;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private DDProperties properties = DDProperties.instance();
|
private DDProperties properties = DDProperties.instance();
|
||||||
|
|
||||||
public SchematicLoader() { }
|
public SchematicLoader() { }
|
||||||
|
|
||||||
public int transformMetadata(int metadata, int orientation, int blockID)
|
public int transformMetadata(int metadata, int orientation, int blockID)
|
||||||
|
@ -733,17 +733,17 @@ public class SchematicLoader
|
||||||
|
|
||||||
public void generateSchematic(int incX, int incY, int incZ, int orientation, int destDimID, int originDimID, String schematicPath)
|
public void generateSchematic(int incX, int incY, int incZ, int orientation, int destDimID, int originDimID, String schematicPath)
|
||||||
{
|
{
|
||||||
|
|
||||||
short width=0;
|
short width=0;
|
||||||
short height=0;
|
short height=0;
|
||||||
short length=0;
|
short length=0;
|
||||||
|
|
||||||
//list of combined blockIds
|
//list of combined blockIds
|
||||||
short[] blocks = new short[0];
|
short[] blocks = new short[0];
|
||||||
|
|
||||||
//block metaData
|
//block metaData
|
||||||
byte[] blockData = new byte[0];
|
byte[] blockData = new byte[0];
|
||||||
|
|
||||||
//first 4 bytes of the block ID
|
//first 4 bytes of the block ID
|
||||||
byte[] blockId = new byte[0];
|
byte[] blockId = new byte[0];
|
||||||
|
|
||||||
|
@ -756,19 +756,19 @@ public class SchematicLoader
|
||||||
NBTTagList entities;
|
NBTTagList entities;
|
||||||
NBTTagList tileEntities=null;
|
NBTTagList tileEntities=null;
|
||||||
|
|
||||||
|
|
||||||
//the wooden door leading into the pocket
|
//the wooden door leading into the pocket
|
||||||
Point3D incomingLink= new Point3D(0,0,0);
|
Point3D incomingLink= new Point3D(0,0,0);
|
||||||
|
|
||||||
//the iron dim doors leading to more pockets
|
//the iron dim doors leading to more pockets
|
||||||
ArrayList<Point3D> sideLinks = new ArrayList<Point3D>();
|
ArrayList<Point3D> sideLinks = new ArrayList<Point3D>();
|
||||||
|
|
||||||
//the wooden dim doors leading to the surface
|
//the wooden dim doors leading to the surface
|
||||||
ArrayList<Point3D> exitLinks = new ArrayList<Point3D>();
|
ArrayList<Point3D> exitLinks = new ArrayList<Point3D>();
|
||||||
|
|
||||||
//the locations to spawn monoliths
|
//the locations to spawn monoliths
|
||||||
ArrayList<Point3D> monolithSpawns = new ArrayList<Point3D>();
|
ArrayList<Point3D> monolithSpawns = new ArrayList<Point3D>();
|
||||||
|
|
||||||
//load the schematic from disk
|
//load the schematic from disk
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -793,7 +793,7 @@ public class SchematicLoader
|
||||||
width = nbtdata.getShort("Width");
|
width = nbtdata.getShort("Width");
|
||||||
height = nbtdata.getShort("Height");
|
height = nbtdata.getShort("Height");
|
||||||
length = nbtdata.getShort("Length");
|
length = nbtdata.getShort("Length");
|
||||||
|
|
||||||
//load block info
|
//load block info
|
||||||
blockId = nbtdata.getByteArray("Blocks");
|
blockId = nbtdata.getByteArray("Blocks");
|
||||||
blockData = nbtdata.getByteArray("Data");
|
blockData = nbtdata.getByteArray("Data");
|
||||||
|
@ -814,7 +814,7 @@ public class SchematicLoader
|
||||||
|
|
||||||
entities = nbtdata.getTagList("Entities");
|
entities = nbtdata.getTagList("Entities");
|
||||||
tileentities = nbtdata.getTagList("TileEntities");
|
tileentities = nbtdata.getTagList("TileEntities");
|
||||||
**/
|
**/
|
||||||
input.close();
|
input.close();
|
||||||
|
|
||||||
//combine the split block IDs into a single short[]
|
//combine the split block IDs into a single short[]
|
||||||
|
@ -871,16 +871,16 @@ public class SchematicLoader
|
||||||
{
|
{
|
||||||
for ( z = 0; z < length; ++z)
|
for ( z = 0; z < length; ++z)
|
||||||
{
|
{
|
||||||
|
|
||||||
int index = y * width * length + z * width + x;
|
int index = y * width * length + z * width + x;
|
||||||
|
|
||||||
int blockToReplace=blocks[index];
|
int blockToReplace=blocks[index];
|
||||||
int blockMetaData=blockData[index];
|
int blockMetaData=blockData[index];
|
||||||
|
|
||||||
//NBTTagList tileEntity = tileEntities;
|
//NBTTagList tileEntity = tileEntities;
|
||||||
//int size = tileEntity.tagCount();
|
//int size = tileEntity.tagCount();
|
||||||
|
|
||||||
|
|
||||||
if(blockToReplace==Block.doorIron.blockID&&blocks[ (y-1) * width * length + z * width + x]==Block.doorIron.blockID)
|
if(blockToReplace==Block.doorIron.blockID&&blocks[ (y-1) * width * length + z * width + x]==Block.doorIron.blockID)
|
||||||
{
|
{
|
||||||
sideLinks.add(new Point3D(x,y,z));
|
sideLinks.add(new Point3D(x,y,z));
|
||||||
|
@ -900,56 +900,52 @@ public class SchematicLoader
|
||||||
else if(blockToReplace==Block.endPortalFrame.blockID)
|
else if(blockToReplace==Block.endPortalFrame.blockID)
|
||||||
{
|
{
|
||||||
monolithSpawns.add(new Point3D(x,y,z));
|
monolithSpawns.add(new Point3D(x,y,z));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//determines necessary rotation, reflection, and translation to build the .schematic by finding the difference between the
|
|
||||||
//.schematic incomingLink location which is relative to the .schematic only, and comparing it with the world incoming link coordinates
|
|
||||||
//must also factor in the orientation of the incoming door.
|
|
||||||
if(orientation==0) //TODO currently broken, only orientation 3 works atm
|
|
||||||
{
|
|
||||||
xCooe=-incomingLink.getX()+incX;
|
|
||||||
yCooe=-incomingLink.getY()+incY;
|
|
||||||
zCooe=-incomingLink.getZ()+incZ;
|
|
||||||
|
|
||||||
}
|
//Compute the Y-axis translation that places our structure correctly
|
||||||
if(orientation==1)//TODO currently broken, only orientation 3 works atm
|
yCooe = incY - incomingLink.getY();
|
||||||
{
|
|
||||||
xCooe=-incomingLink.getX()+incX;
|
|
||||||
yCooe=-incomingLink.getY()+incY;
|
|
||||||
zCooe=-incomingLink.getZ()+incZ;
|
|
||||||
}
|
|
||||||
if(orientation==2)//TODO currently broken, only orientation 3 works atm
|
|
||||||
{
|
|
||||||
xCooe=-incomingLink.getX()+incX;
|
|
||||||
yCooe=-incomingLink.getY()+incY;
|
|
||||||
zCooe=-incomingLink.getZ()+incZ;
|
|
||||||
}
|
|
||||||
if(orientation==3)//TODO this only works because it is the default orientation of the pocket dim
|
|
||||||
{
|
|
||||||
xCooe=-incomingLink.getX()+incX;
|
|
||||||
yCooe=-incomingLink.getY()+incY;
|
|
||||||
zCooe=-incomingLink.getZ()+incZ;
|
|
||||||
}
|
|
||||||
|
|
||||||
//loop to actually place the blocks
|
//Loop to actually place the blocks
|
||||||
for ( x = 0; x < width; ++x)
|
for ( x = 0; x < width; x++)
|
||||||
{
|
{
|
||||||
for ( y = 0; y < height; ++y)
|
for ( z = 0; z < length; z++)
|
||||||
{
|
{
|
||||||
for ( z = 0; z < length; ++z)
|
//Compute the X-axis and Z-axis translations that will shift
|
||||||
|
//and rotate our structure properly.
|
||||||
|
switch (orientation)
|
||||||
{
|
{
|
||||||
|
case 0:
|
||||||
|
xCooe = -incomingLink.getX() + incX;
|
||||||
|
zCooe = -incomingLink.getZ() + incZ;
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
xCooe = -incomingLink.getX() + incX;
|
||||||
|
zCooe = -incomingLink.getZ() + incZ;
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
xCooe = -incomingLink.getX() + incX;
|
||||||
|
zCooe = -incomingLink.getZ() + incZ;
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
xCooe = -incomingLink.getX() + incX;
|
||||||
|
zCooe = -incomingLink.getZ() + incZ;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
for ( y = 0; y < height; y++)
|
||||||
|
{
|
||||||
|
|
||||||
int index = y * width * length + z * width + x;
|
int index = y * width * length + z * width + x;
|
||||||
|
|
||||||
int blockToReplace=blocks[index];
|
int blockToReplace=blocks[index];
|
||||||
int blockMetaData=blockData[index];
|
int blockMetaData=blockData[index];
|
||||||
NBTTagList tileEntity = tileEntities;
|
NBTTagList tileEntity = tileEntities;
|
||||||
|
|
||||||
//replace tagging blocks with air, and mob blocks with FoR
|
//replace tagging blocks with air, and mob blocks with FoR
|
||||||
if(blockToReplace==Block.endPortalFrame.blockID)
|
if(blockToReplace==Block.endPortalFrame.blockID)
|
||||||
{
|
{
|
||||||
|
@ -959,7 +955,7 @@ public class SchematicLoader
|
||||||
{
|
{
|
||||||
blockToReplace=mod_pocketDim.blockDimWall.blockID;
|
blockToReplace=mod_pocketDim.blockDimWall.blockID;
|
||||||
}
|
}
|
||||||
|
|
||||||
//place blocks and metaData
|
//place blocks and metaData
|
||||||
if(blockToReplace>0)
|
if(blockToReplace>0)
|
||||||
{
|
{
|
||||||
|
@ -990,23 +986,23 @@ public class SchematicLoader
|
||||||
{
|
{
|
||||||
tile.readFromNBT(tag);
|
tile.readFromNBT(tag);
|
||||||
}
|
}
|
||||||
**/
|
**/
|
||||||
|
|
||||||
//fill chests
|
|
||||||
if(world.getBlockTileEntity(x+xCooe, y+yCooe, z+zCooe) instanceof TileEntityChest)
|
|
||||||
{
|
|
||||||
TileEntityChest chest = (TileEntityChest) world.getBlockTileEntity(x+xCooe, y+yCooe, z+zCooe);
|
|
||||||
ChestGenHooks info = DDLoot.DungeonChestInfo;
|
|
||||||
WeightedRandomChestContent.generateChestContents(rand, info.getItems(rand), (TileEntityChest)world.getBlockTileEntity(x+xCooe, y+yCooe, z+zCooe), info.getCount(rand));
|
|
||||||
}
|
|
||||||
|
|
||||||
//fill dispensers
|
|
||||||
if(world.getBlockTileEntity(x+xCooe, y+yCooe, z+zCooe) instanceof TileEntityDispenser)
|
|
||||||
{
|
|
||||||
TileEntityDispenser dispenser = (TileEntityDispenser) world.getBlockTileEntity(x+xCooe, y+yCooe, z+zCooe);
|
|
||||||
dispenser.addItem(new ItemStack(Item.arrow, 64));
|
|
||||||
|
|
||||||
}
|
//fill chests
|
||||||
|
if(world.getBlockTileEntity(x+xCooe, y+yCooe, z+zCooe) instanceof TileEntityChest)
|
||||||
|
{
|
||||||
|
TileEntityChest chest = (TileEntityChest) world.getBlockTileEntity(x+xCooe, y+yCooe, z+zCooe);
|
||||||
|
ChestGenHooks info = DDLoot.DungeonChestInfo;
|
||||||
|
WeightedRandomChestContent.generateChestContents(rand, info.getItems(rand), (TileEntityChest)world.getBlockTileEntity(x+xCooe, y+yCooe, z+zCooe), info.getCount(rand));
|
||||||
|
}
|
||||||
|
|
||||||
|
//fill dispensers
|
||||||
|
if(world.getBlockTileEntity(x+xCooe, y+yCooe, z+zCooe) instanceof TileEntityDispenser)
|
||||||
|
{
|
||||||
|
TileEntityDispenser dispenser = (TileEntityDispenser) world.getBlockTileEntity(x+xCooe, y+yCooe, z+zCooe);
|
||||||
|
dispenser.addItem(new ItemStack(Item.arrow, 64));
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1016,39 +1012,39 @@ public class SchematicLoader
|
||||||
//generate the LinkData defined by the door placement, Iron Dim doors first
|
//generate the LinkData defined by the door placement, Iron Dim doors first
|
||||||
for(Point3D point : sideLinks)
|
for(Point3D point : sideLinks)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
int depth = dimHelper.instance.getDimDepth(originDimID);
|
|
||||||
int xNoise = 0;
|
|
||||||
int zNoise =0;
|
|
||||||
switch(world.getBlockMetadata(point.getX()+xCooe, point.getY()+yCooe-1, point.getZ()+zCooe))
|
|
||||||
{
|
|
||||||
case 0:
|
|
||||||
xNoise = (int)rand.nextInt(depth+1*200)+depth*50;
|
|
||||||
zNoise = (int)rand.nextInt(depth+1*20)-(10)*depth;
|
|
||||||
|
|
||||||
break;
|
int depth = dimHelper.instance.getDimDepth(originDimID);
|
||||||
case 1:
|
int xNoise = 0;
|
||||||
xNoise = (int)rand.nextInt(depth+1*20)-(10)*depth;
|
int zNoise =0;
|
||||||
zNoise = (int) rand.nextInt(depth+1*200)+depth*50;
|
switch(world.getBlockMetadata(point.getX()+xCooe, point.getY()+yCooe-1, point.getZ()+zCooe))
|
||||||
|
{
|
||||||
|
case 0:
|
||||||
|
xNoise = (int)rand.nextInt(depth+1*200)+depth*50;
|
||||||
|
zNoise = (int)rand.nextInt(depth+1*20)-(10)*depth;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 1:
|
||||||
xNoise = - (rand.nextInt(depth+1*200)+depth*50);
|
xNoise = (int)rand.nextInt(depth+1*20)-(10)*depth;
|
||||||
zNoise = (int)rand.nextInt(depth+1*20)-(10)*depth;
|
zNoise = (int) rand.nextInt(depth+1*200)+depth*50;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 2:
|
||||||
xNoise = (int)rand.nextInt(depth+1*20)-(10)*depth;
|
xNoise = - (rand.nextInt(depth+1*200)+depth*50);
|
||||||
zNoise = -(rand.nextInt(depth+1*200)+depth*50);
|
zNoise = (int)rand.nextInt(depth+1*20)-(10)*depth;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
case 3:
|
||||||
|
xNoise = (int)rand.nextInt(depth+1*20)-(10)*depth;
|
||||||
|
zNoise = -(rand.nextInt(depth+1*200)+depth*50);
|
||||||
|
|
||||||
LinkData sideLink = new LinkData(destDimID,0,point.getX()+xCooe, point.getY()+yCooe, point.getZ()+zCooe,xNoise+point.getX()+xCooe, point.getY()+yCooe+1, zNoise+point.getZ()+zCooe,true,world.getBlockMetadata(point.getX()+xCooe, point.getY()+yCooe-1, point.getZ()+zCooe));
|
break;
|
||||||
dimHelper.instance.createPocket(sideLink, true, true);
|
}
|
||||||
|
|
||||||
|
LinkData sideLink = new LinkData(destDimID,0,point.getX()+xCooe, point.getY()+yCooe, point.getZ()+zCooe,xNoise+point.getX()+xCooe, point.getY()+yCooe+1, zNoise+point.getZ()+zCooe,true,world.getBlockMetadata(point.getX()+xCooe, point.getY()+yCooe-1, point.getZ()+zCooe));
|
||||||
|
dimHelper.instance.createPocket(sideLink, true, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
//generate linkData for wooden dim doors leading to the overworld
|
//generate linkData for wooden dim doors leading to the overworld
|
||||||
for(Point3D point : exitLinks)
|
for(Point3D point : exitLinks)
|
||||||
{
|
{
|
||||||
|
@ -1064,7 +1060,7 @@ public class SchematicLoader
|
||||||
else if((rand.nextBoolean()&&randomLink!=null))
|
else if((rand.nextBoolean()&&randomLink!=null))
|
||||||
{
|
{
|
||||||
sideLink.destDimID=randomLink.locDimID;
|
sideLink.destDimID=randomLink.locDimID;
|
||||||
// System.out.println("randomLink");
|
// System.out.println("randomLink");
|
||||||
}
|
}
|
||||||
|
|
||||||
sideLink.destYCoord=yCoordHelper.getFirstUncovered(sideLink.destDimID, point.getX()+xCooe,10,point.getZ()+zCooe);
|
sideLink.destYCoord=yCoordHelper.getFirstUncovered(sideLink.destDimID, point.getX()+xCooe,10,point.getZ()+zCooe);
|
||||||
|
@ -1075,7 +1071,7 @@ public class SchematicLoader
|
||||||
}
|
}
|
||||||
|
|
||||||
sideLink.linkOrientation=world.getBlockMetadata(point.getX()+xCooe, point.getY()+yCooe-1, point.getZ()+zCooe);
|
sideLink.linkOrientation=world.getBlockMetadata(point.getX()+xCooe, point.getY()+yCooe-1, point.getZ()+zCooe);
|
||||||
|
|
||||||
dimHelper.instance.createLink(sideLink);
|
dimHelper.instance.createLink(sideLink);
|
||||||
dimHelper.instance.createLink(sideLink.destDimID , sideLink.locDimID, sideLink.destXCoord, sideLink.destYCoord, sideLink.destZCoord, sideLink.locXCoord, sideLink.locYCoord, sideLink.locZCoord, dimHelper.instance.flipDoorMetadata(sideLink.linkOrientation));
|
dimHelper.instance.createLink(sideLink.destDimID , sideLink.locDimID, sideLink.destXCoord, sideLink.destYCoord, sideLink.destZCoord, sideLink.locXCoord, sideLink.locYCoord, sideLink.locZCoord, dimHelper.instance.flipDoorMetadata(sideLink.linkOrientation));
|
||||||
|
|
||||||
|
@ -1093,7 +1089,7 @@ public class SchematicLoader
|
||||||
E.printStackTrace();
|
E.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//spawn monoliths
|
//spawn monoliths
|
||||||
for(Point3D point : monolithSpawns)
|
for(Point3D point : monolithSpawns)
|
||||||
{
|
{
|
||||||
|
@ -1102,7 +1098,7 @@ public class SchematicLoader
|
||||||
world.spawnEntityInWorld(mob);
|
world.spawnEntityInWorld(mob);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void generateDungeonPocket(LinkData link)
|
public void generateDungeonPocket(LinkData link)
|
||||||
{
|
{
|
||||||
String filePath=DungeonHelper.instance().defaultBreak.schematicPath;
|
String filePath=DungeonHelper.instance().defaultBreak.schematicPath;
|
||||||
|
@ -1124,15 +1120,15 @@ public class SchematicLoader
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
int cX;
|
int cX;
|
||||||
int cZ;
|
int cZ;
|
||||||
int cY;
|
int cY;
|
||||||
|
|
||||||
Chunk chunk;
|
Chunk chunk;
|
||||||
cX = x >> 4;
|
cX = x >> 4;
|
||||||
cZ = z >> 4;
|
cZ = z >> 4;
|
||||||
cY=y >>4;
|
cY=y >>4;
|
||||||
|
|
||||||
int chunkX=(x % 16)< 0 ? ((x) % 16)+16 : ((x) % 16);
|
int chunkX=(x % 16)< 0 ? ((x) % 16)+16 : ((x) % 16);
|
||||||
int chunkZ=((z) % 16)< 0 ? ((z) % 16)+16 : ((z) % 16);
|
int chunkZ=((z) % 16)< 0 ? ((z) % 16)+16 : ((z) % 16);
|
||||||
|
|
|
@ -14,7 +14,7 @@ public class CommandDeleteAllLinks extends DDCommandBase
|
||||||
|
|
||||||
private CommandDeleteAllLinks()
|
private CommandDeleteAllLinks()
|
||||||
{
|
{
|
||||||
super("dd-deletelinks");
|
super("dd-deletelinks", "FIXME");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static CommandDeleteAllLinks instance()
|
public static CommandDeleteAllLinks instance()
|
||||||
|
@ -80,5 +80,6 @@ public class CommandDeleteAllLinks extends DDCommandBase
|
||||||
sender.sendChatToPlayer("Removed " + linksRemoved + " links.");
|
sender.sendChatToPlayer("Removed " + linksRemoved + " links.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return DDCommandResult.SUCCESS; //TEMPORARY HACK
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -14,7 +14,7 @@ public class CommandDeleteDimensionData extends DDCommandBase
|
||||||
|
|
||||||
private CommandDeleteDimensionData()
|
private CommandDeleteDimensionData()
|
||||||
{
|
{
|
||||||
super("dd-deletedimension");
|
super("dd-deletedimension", "FIXME");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static CommandDeleteDimensionData instance()
|
public static CommandDeleteDimensionData instance()
|
||||||
|
@ -90,5 +90,6 @@ public class CommandDeleteDimensionData extends DDCommandBase
|
||||||
sender.sendChatToPlayer("Error- dimension "+targetDim+" not registered with dimDoors");
|
sender.sendChatToPlayer("Error- dimension "+targetDim+" not registered with dimDoors");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return DDCommandResult.SUCCESS; //TEMPORARY HACK
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -15,7 +15,7 @@ public class CommandDeleteRifts extends DDCommandBase
|
||||||
|
|
||||||
private CommandDeleteRifts()
|
private CommandDeleteRifts()
|
||||||
{
|
{
|
||||||
super("dd-???");
|
super("dd-???", "FIXME");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static CommandDeleteRifts instance()
|
public static CommandDeleteRifts instance()
|
||||||
|
@ -84,5 +84,6 @@ public class CommandDeleteRifts extends DDCommandBase
|
||||||
sender.sendChatToPlayer("Removed "+linksRemoved+" rifts.");
|
sender.sendChatToPlayer("Removed "+linksRemoved+" rifts.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return DDCommandResult.SUCCESS; //TEMPORARY HACK
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -2,6 +2,8 @@ package StevenDimDoors.mod_pocketDim.commands;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import StevenDimDoors.mod_pocketDim.DimData;
|
import StevenDimDoors.mod_pocketDim.DimData;
|
||||||
|
@ -14,7 +16,7 @@ public class CommandPruneDimensions extends DDCommandBase
|
||||||
|
|
||||||
private CommandPruneDimensions()
|
private CommandPruneDimensions()
|
||||||
{
|
{
|
||||||
super("dd-prune");
|
super("dd-prune", "['delete']");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static CommandPruneDimensions instance()
|
public static CommandPruneDimensions instance()
|
||||||
|
@ -28,36 +30,44 @@ public class CommandPruneDimensions extends DDCommandBase
|
||||||
@Override
|
@Override
|
||||||
protected DDCommandResult processCommand(EntityPlayer sender, String[] command)
|
protected DDCommandResult processCommand(EntityPlayer sender, String[] command)
|
||||||
{
|
{
|
||||||
int numRemoved=0;
|
if (command.length > 1)
|
||||||
ArrayList<Integer> dimsWithLinks = new ArrayList<Integer>();
|
{
|
||||||
|
return DDCommandResult.TOO_MANY_ARGUMENTS;
|
||||||
|
}
|
||||||
|
if (command.length == 1 && !command[0].equalsIgnoreCase("delete"))
|
||||||
|
{
|
||||||
|
return DDCommandResult.INVALID_ARGUMENTS;
|
||||||
|
}
|
||||||
|
|
||||||
|
int removedCount = 0;
|
||||||
|
boolean deleteFolders = (command.length == 1);
|
||||||
|
Set<Integer> linkedDimensions = new HashSet<Integer>();
|
||||||
Collection<DimData> allDims = new ArrayList<DimData>();
|
Collection<DimData> allDims = new ArrayList<DimData>();
|
||||||
allDims.addAll(dimHelper.dimList.values());
|
allDims.addAll(dimHelper.dimList.values());
|
||||||
for(DimData data: allDims)
|
|
||||||
|
for (DimData data : allDims)
|
||||||
{
|
{
|
||||||
for(LinkData link:data.printAllLinkData())
|
for (LinkData link : data.printAllLinkData())
|
||||||
{
|
{
|
||||||
if(!dimsWithLinks.contains(link.destDimID))
|
linkedDimensions.add(link.destDimID);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (LinkData link : dimHelper.instance.interDimLinkList.values())
|
||||||
|
{
|
||||||
|
linkedDimensions.add(link.destDimID);
|
||||||
|
}
|
||||||
|
for (DimData data : allDims)
|
||||||
|
{
|
||||||
|
if (!linkedDimensions.contains(data.dimID))
|
||||||
|
{
|
||||||
|
if (dimHelper.instance.pruneDimension(data, deleteFolders))
|
||||||
{
|
{
|
||||||
dimsWithLinks.add(link.destDimID);
|
removedCount++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for(LinkData link : dimHelper.instance.interDimLinkList.values())
|
|
||||||
{
|
|
||||||
if(!dimsWithLinks.contains(link.destDimID))
|
|
||||||
{
|
|
||||||
dimsWithLinks.add(link.destDimID);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for(DimData data : allDims)
|
|
||||||
{
|
|
||||||
if(!dimsWithLinks.contains(data.dimID))
|
|
||||||
{
|
|
||||||
dimHelper.dimList.remove(data.dimID);
|
|
||||||
numRemoved++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
dimHelper.instance.save();
|
dimHelper.instance.save();
|
||||||
sender.sendChatToPlayer("Removed " + numRemoved + " unreachable pocket dims.");
|
sender.sendChatToPlayer("Removed " + removedCount + " unreachable pocket dims.");
|
||||||
|
return DDCommandResult.SUCCESS;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,43 +0,0 @@
|
||||||
package StevenDimDoors.mod_pocketDim.commands;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
|
||||||
import StevenDimDoors.mod_pocketDim.DDProperties;
|
|
||||||
import StevenDimDoors.mod_pocketDim.DimData;
|
|
||||||
import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper;
|
|
||||||
import StevenDimDoors.mod_pocketDim.helpers.dimHelper;
|
|
||||||
|
|
||||||
public class CommandRegenPocket extends DDCommandBase
|
|
||||||
{
|
|
||||||
private static CommandRegenPocket instance = null;
|
|
||||||
|
|
||||||
private CommandRegenPocket()
|
|
||||||
{
|
|
||||||
super("dd-regenDungeons");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static CommandRegenPocket instance()
|
|
||||||
{
|
|
||||||
if (instance == null)
|
|
||||||
instance = new CommandRegenPocket();
|
|
||||||
|
|
||||||
return instance;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected DDCommandResult processCommand(EntityPlayer sender, String[] command)
|
|
||||||
{
|
|
||||||
DungeonHelper dungeonHelper = DungeonHelper.instance();
|
|
||||||
DDProperties properties = DDProperties.instance();
|
|
||||||
|
|
||||||
for(DimData data : dimHelper.dimList.values())
|
|
||||||
{
|
|
||||||
if(data.isDimRandomRift)
|
|
||||||
{
|
|
||||||
dimHelper.instance.regenPocket(data);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,51 @@
|
||||||
|
package StevenDimDoors.mod_pocketDim.commands;
|
||||||
|
|
||||||
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import StevenDimDoors.mod_pocketDim.DimData;
|
||||||
|
import StevenDimDoors.mod_pocketDim.helpers.dimHelper;
|
||||||
|
|
||||||
|
public class CommandResetDungeons extends DDCommandBase
|
||||||
|
{
|
||||||
|
private static CommandResetDungeons instance = null;
|
||||||
|
|
||||||
|
private CommandResetDungeons()
|
||||||
|
{
|
||||||
|
super("dd-resetdungeons", "");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static CommandResetDungeons instance()
|
||||||
|
{
|
||||||
|
if (instance == null)
|
||||||
|
instance = new CommandResetDungeons();
|
||||||
|
|
||||||
|
return instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected DDCommandResult processCommand(EntityPlayer sender, String[] command)
|
||||||
|
{
|
||||||
|
if (command.length > 0)
|
||||||
|
{
|
||||||
|
return DDCommandResult.TOO_FEW_ARGUMENTS;
|
||||||
|
}
|
||||||
|
|
||||||
|
int dungeonCount = 0;
|
||||||
|
int resetCount = 0;
|
||||||
|
|
||||||
|
for (DimData data : dimHelper.dimList.values())
|
||||||
|
{
|
||||||
|
if (data.isDimRandomRift)
|
||||||
|
{
|
||||||
|
dungeonCount++;
|
||||||
|
if (dimHelper.instance.resetPocket(data))
|
||||||
|
{
|
||||||
|
resetCount++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Notify the user of the results
|
||||||
|
sender.sendChatToPlayer("Reset complete. " + resetCount + " out of " + dungeonCount + " dungeons were reset.");
|
||||||
|
return DDCommandResult.SUCCESS;
|
||||||
|
}
|
||||||
|
}
|
|
@ -8,6 +8,7 @@ public class DDCommandResult {
|
||||||
public static final DDCommandResult TOO_MANY_ARGUMENTS = new DDCommandResult(2, "Error: Too many arguments passed to the command", true);
|
public static final DDCommandResult TOO_MANY_ARGUMENTS = new DDCommandResult(2, "Error: Too many arguments passed to the command", true);
|
||||||
public static final DDCommandResult INVALID_DIMENSION_ID = new DDCommandResult(3, "Error: Invalid dimension ID", true);
|
public static final DDCommandResult INVALID_DIMENSION_ID = new DDCommandResult(3, "Error: Invalid dimension ID", true);
|
||||||
public static final DDCommandResult UNREGISTERED_DIMENSION = new DDCommandResult(4, "Error: Dimension is not registered", false);
|
public static final DDCommandResult UNREGISTERED_DIMENSION = new DDCommandResult(4, "Error: Dimension is not registered", false);
|
||||||
|
public static final DDCommandResult INVALID_ARGUMENTS = new DDCommandResult(5, "Error: Invalid arguments passed to the command.", true);
|
||||||
|
|
||||||
public static final int CUSTOM_ERROR_CODE = -1;
|
public static final int CUSTOM_ERROR_CODE = -1;
|
||||||
|
|
||||||
|
|
|
@ -38,6 +38,7 @@ import StevenDimDoors.mod_pocketDim.DimData;
|
||||||
import StevenDimDoors.mod_pocketDim.LinkData;
|
import StevenDimDoors.mod_pocketDim.LinkData;
|
||||||
import StevenDimDoors.mod_pocketDim.ObjectSaveInputStream;
|
import StevenDimDoors.mod_pocketDim.ObjectSaveInputStream;
|
||||||
import StevenDimDoors.mod_pocketDim.PacketHandler;
|
import StevenDimDoors.mod_pocketDim.PacketHandler;
|
||||||
|
import StevenDimDoors.mod_pocketDim.Point3D;
|
||||||
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.world.LimboProvider;
|
import StevenDimDoors.mod_pocketDim.world.LimboProvider;
|
||||||
|
@ -64,7 +65,7 @@ public class dimHelper extends DimensionManager
|
||||||
* ArrayList containing any blocks in limbo that have been placed by the player. Cycled through in the common tick manager
|
* ArrayList containing any blocks in limbo that have been placed by the player. Cycled through in the common tick manager
|
||||||
* @Return
|
* @Return
|
||||||
*/
|
*/
|
||||||
public static ArrayList blocksToDecay= new ArrayList();
|
public static ArrayList<Point3D> blocksToDecay = new ArrayList<Point3D>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* instance of the dimHelper
|
* instance of the dimHelper
|
||||||
|
@ -812,33 +813,48 @@ public class dimHelper extends DimensionManager
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void regenPocket(DimData dimData)
|
public boolean resetPocket(DimData dimData)
|
||||||
{
|
{
|
||||||
if(this.getWorld(dimData.dimID)!=null ||!dimData.isPocket)
|
//TODO: Should we add a check to see if the dimension is currently loaded? How could we check that? ~SenseiKiwi
|
||||||
|
if (!dimData.isPocket || getWorld(dimData.dimID) != null)
|
||||||
{
|
{
|
||||||
return;
|
return false;
|
||||||
}
|
}
|
||||||
File save = new File( this.getCurrentSaveRootDirectory()+"/DimensionalDoors/pocketDimID" + dimData.dimID);
|
File save = new File(getCurrentSaveRootDirectory() + "/DimensionalDoors/pocketDimID" + dimData.dimID);
|
||||||
DeleteFolder.deleteFolder(save);
|
DeleteFolder.deleteFolder(save);
|
||||||
dimData.hasBeenFilled=false;
|
dimData.hasBeenFilled = false;
|
||||||
dimData.hasDoor=false;
|
dimData.hasDoor = false;
|
||||||
for(LinkData link : dimData.printAllLinkData())
|
for(LinkData link : dimData.printAllLinkData())
|
||||||
{
|
{
|
||||||
link.hasGennedDoor=false;
|
link.hasGennedDoor = false;
|
||||||
LinkData linkOut =this.getLinkDataFromCoords(link.destXCoord, link.destYCoord, link.destZCoord, link.destDimID);
|
LinkData linkOut = this.getLinkDataFromCoords(link.destXCoord, link.destYCoord, link.destZCoord, link.destDimID);
|
||||||
if(linkOut!=null)
|
if (linkOut != null)
|
||||||
{
|
{
|
||||||
linkOut.hasGennedDoor=false;
|
linkOut.hasGennedDoor = false;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean pruneDimension(DimData dimData, boolean deleteFolder)
|
||||||
|
{
|
||||||
|
//TODO: Should we add a check to see if the dimension is currently loaded? How could we check that? ~SenseiKiwi
|
||||||
|
//TODO: All the logic for checking that this is an isolated pocket should be moved in here.
|
||||||
|
if (!dimData.isPocket || getWorld(dimData.dimID) != null)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
dimList.remove(dimData.dimID);
|
||||||
|
if (deleteFolder)
|
||||||
|
{
|
||||||
|
File save = new File(getCurrentSaveRootDirectory() + "/DimensionalDoors/pocketDimID" + dimData.dimID);
|
||||||
|
DeleteFolder.deleteFolder(save);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* method called when the client disconects/server stops to unregister dims.
|
* method called when the client disconnects/server stops to unregister dims.
|
||||||
* @Return
|
* @Return
|
||||||
*/
|
*/
|
||||||
public void unregsisterDims()
|
public void unregsisterDims()
|
||||||
|
|
|
@ -29,7 +29,7 @@ import StevenDimDoors.mod_pocketDim.commands.CommandDeleteRifts;
|
||||||
import StevenDimDoors.mod_pocketDim.commands.CommandEndDungeonCreation;
|
import StevenDimDoors.mod_pocketDim.commands.CommandEndDungeonCreation;
|
||||||
import StevenDimDoors.mod_pocketDim.commands.CommandPrintDimensionData;
|
import StevenDimDoors.mod_pocketDim.commands.CommandPrintDimensionData;
|
||||||
import StevenDimDoors.mod_pocketDim.commands.CommandPruneDimensions;
|
import StevenDimDoors.mod_pocketDim.commands.CommandPruneDimensions;
|
||||||
import StevenDimDoors.mod_pocketDim.commands.CommandRegenPocket;
|
import StevenDimDoors.mod_pocketDim.commands.CommandResetDungeons;
|
||||||
import StevenDimDoors.mod_pocketDim.commands.CommandStartDungeonCreation;
|
import StevenDimDoors.mod_pocketDim.commands.CommandStartDungeonCreation;
|
||||||
import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper;
|
import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper;
|
||||||
import StevenDimDoors.mod_pocketDim.helpers.dimHelper;
|
import StevenDimDoors.mod_pocketDim.helpers.dimHelper;
|
||||||
|
@ -391,7 +391,7 @@ public class mod_pocketDim
|
||||||
@ServerStarting
|
@ServerStarting
|
||||||
public void serverStarting(FMLServerStartingEvent event)
|
public void serverStarting(FMLServerStartingEvent event)
|
||||||
{
|
{
|
||||||
CommandRegenPocket.instance().register(event);
|
CommandResetDungeons.instance().register(event);
|
||||||
CommandCreateDungeonRift.instance().register(event);
|
CommandCreateDungeonRift.instance().register(event);
|
||||||
CommandDeleteAllLinks.instance().register(event);
|
CommandDeleteAllLinks.instance().register(event);
|
||||||
CommandDeleteDimensionData.instance().register(event);
|
CommandDeleteDimensionData.instance().register(event);
|
||||||
|
|
Loading…
Reference in a new issue