Finished Packing DungeonData
This commit is contained in:
@@ -97,7 +97,14 @@ public class PocketManager
|
|||||||
ArrayList<Integer> ChildIDs = new ArrayList<Integer>();
|
ArrayList<Integer> ChildIDs = new ArrayList<Integer>();
|
||||||
ArrayList<PackedLinkData> Links = new ArrayList<PackedLinkData>();
|
ArrayList<PackedLinkData> Links = new ArrayList<PackedLinkData>();
|
||||||
ArrayList<PackedLinkTail> Tails = new ArrayList<PackedLinkTail>();
|
ArrayList<PackedLinkTail> Tails = new ArrayList<PackedLinkTail>();
|
||||||
PackedDungeonData packedDungeon = new PackedDungeonData(); //TODO pack dungeon Data
|
PackedDungeonData packedDungeon=null;
|
||||||
|
|
||||||
|
if(this.dungeon!=null)
|
||||||
|
{
|
||||||
|
packedDungeon= new PackedDungeonData(dungeon.weight(), dungeon.isOpen(), dungeon.isInternal(),
|
||||||
|
dungeon.schematicPath(), dungeon.schematicName(), dungeon.dungeonType().Name,
|
||||||
|
dungeon.dungeonType().Owner.getName());
|
||||||
|
}
|
||||||
//Make a list of children
|
//Make a list of children
|
||||||
for(NewDimData data : this.children)
|
for(NewDimData data : this.children)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -44,6 +44,11 @@ public class DungeonData
|
|||||||
return isOpen;
|
return isOpen;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isInternal()
|
||||||
|
{
|
||||||
|
return isInternal;
|
||||||
|
}
|
||||||
|
|
||||||
public String schematicPath()
|
public String schematicPath()
|
||||||
{
|
{
|
||||||
return schematicPath;
|
return schematicPath;
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ public class DimDataProcessor extends BaseConfigurationProcessor<PackedDimData>
|
|||||||
int PackDepth;
|
int PackDepth;
|
||||||
int ParentID;
|
int ParentID;
|
||||||
int RootID;
|
int RootID;
|
||||||
PackedDungeonData Dungeon;
|
PackedDungeonData Dungeon = null;
|
||||||
Point3D Origin;
|
Point3D Origin;
|
||||||
int Orientation;
|
int Orientation;
|
||||||
List<Integer> ChildIDs;
|
List<Integer> ChildIDs;
|
||||||
@@ -122,9 +122,12 @@ public class DimDataProcessor extends BaseConfigurationProcessor<PackedDimData>
|
|||||||
reader.nextName();
|
reader.nextName();
|
||||||
RootID= reader.nextInt();
|
RootID= reader.nextInt();
|
||||||
|
|
||||||
reader.nextName();
|
if(reader.nextName().equals("DungeonData"))
|
||||||
|
{
|
||||||
Dungeon = createDungeonDataFromJson(reader);
|
Dungeon = createDungeonDataFromJson(reader);
|
||||||
reader.nextName();
|
reader.nextName();
|
||||||
|
}
|
||||||
|
|
||||||
Origin = createPointFromJson(reader);
|
Origin = createPointFromJson(reader);
|
||||||
|
|
||||||
reader.nextName();
|
reader.nextName();
|
||||||
@@ -242,11 +245,46 @@ public class DimDataProcessor extends BaseConfigurationProcessor<PackedDimData>
|
|||||||
}
|
}
|
||||||
private PackedDungeonData createDungeonDataFromJson(JsonReader reader) throws IOException
|
private PackedDungeonData createDungeonDataFromJson(JsonReader reader) throws IOException
|
||||||
{
|
{
|
||||||
|
int Weight;
|
||||||
|
boolean IsOpen;
|
||||||
|
boolean IsInternal;
|
||||||
|
String SchematicPath;
|
||||||
|
String SchematicName;
|
||||||
|
String DungeonTypeName;
|
||||||
|
String DungeonPackName;
|
||||||
|
|
||||||
reader.beginObject();
|
reader.beginObject();
|
||||||
//TODO read in dungeon Data
|
JsonToken test = reader.peek();
|
||||||
reader.endObject();
|
|
||||||
|
if(reader.peek() == JsonToken.END_OBJECT)
|
||||||
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
reader.nextName();
|
||||||
|
Weight=reader.nextInt();
|
||||||
|
|
||||||
|
reader.nextName();
|
||||||
|
IsOpen=reader.nextBoolean();
|
||||||
|
|
||||||
|
reader.nextName();
|
||||||
|
IsInternal=reader.nextBoolean();
|
||||||
|
|
||||||
|
reader.nextName();
|
||||||
|
SchematicPath=reader.nextString();
|
||||||
|
|
||||||
|
reader.nextName();
|
||||||
|
SchematicName=reader.nextString();
|
||||||
|
|
||||||
|
reader.nextName();
|
||||||
|
DungeonTypeName=reader.nextString();
|
||||||
|
|
||||||
|
reader.nextName();
|
||||||
|
DungeonPackName=reader.nextString();
|
||||||
|
|
||||||
|
reader.endObject();
|
||||||
|
return new PackedDungeonData(Weight, IsOpen, IsInternal, SchematicPath, SchematicName, DungeonTypeName, DungeonPackName);
|
||||||
|
}
|
||||||
private PackedLinkTail createLinkTailFromJson(JsonReader reader) throws IOException
|
private PackedLinkTail createLinkTailFromJson(JsonReader reader) throws IOException
|
||||||
{
|
{
|
||||||
Point4D destination=null;
|
Point4D destination=null;
|
||||||
|
|||||||
@@ -1,5 +1,29 @@
|
|||||||
package StevenDimDoors.mod_pocketDim.saving;
|
package StevenDimDoors.mod_pocketDim.saving;
|
||||||
|
|
||||||
public class PackedDungeonData {
|
import StevenDimDoors.mod_pocketDim.dungeon.pack.DungeonType;
|
||||||
|
|
||||||
|
public class PackedDungeonData
|
||||||
|
{
|
||||||
|
|
||||||
|
public final int Weight;
|
||||||
|
public final boolean IsOpen;
|
||||||
|
public final boolean IsInternal;
|
||||||
|
public final String SchematicPath;
|
||||||
|
public final String SchematicName;
|
||||||
|
public final String DungeonTypeName;
|
||||||
|
public final String DungeonPackName;
|
||||||
|
|
||||||
|
public PackedDungeonData(int weight, boolean isOpen, boolean isInternal, String schematicPath, String schematicName, String dungeonTypeName, String dungeonPackName)
|
||||||
|
{
|
||||||
|
this.Weight= weight;
|
||||||
|
this.IsOpen=isOpen;
|
||||||
|
this.IsInternal=isInternal;
|
||||||
|
this.SchematicName=schematicName;
|
||||||
|
this.SchematicPath=schematicPath;
|
||||||
|
this.DungeonTypeName=dungeonTypeName;
|
||||||
|
this.DungeonPackName=dungeonPackName;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user