apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
SenseiKiwi
2013-06-12 21:48:49 -04:00
parent d54b7c287f e531c1e301
commit 2990e393e8
12 changed files with 217 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
StevenDimDoors/mod_pocketDim/SchematicLoader.java
View File

@@ -54,6 +54,8 @@ public class SchematicLoader
public ArrayList<Point3D> sideLinks = new ArrayList<Point3D>();
public ArrayList<Point3D> exitLinks = new ArrayList<Point3D>();
public HashMap<Integer,HashMap<Integer, HashMap<Integer,Integer>>> rotationMap = new HashMap<Integer,HashMap<Integer, HashMap<Integer,Integer>>>();
public int transMeta;
public int cX;
@@ -67,6 +69,9 @@ public class SchematicLoader
public SchematicLoader()
{
}
@@ -203,6 +208,56 @@ public class SchematicLoader
}
}
else if(blockID== Block.chest.blockID||blockID== Block.chestTrapped.blockID||blockID== Block.ladder.blockID)
{
switch (metadata)
{
case 2:
metadata = 5;
break;
case 3:
metadata = 4;
break;
case 4:
metadata = 2;
break;
case 5:
metadata = 3;
break;
}
}
else if(blockID==Block.vine.blockID)
{
switch (metadata)
{
case 1:
metadata = 2;
break;
case 2:
metadata = 4;
break;
case 4:
metadata = 8;
break;
case 8:
metadata = 1;
break;
}
}
else if(blockID== Block.lever.blockID||blockID== Block.stoneButton.blockID||blockID== Block.woodenButton.blockID||blockID== Block.torchWood.blockID||blockID== Block.torchRedstoneIdle.blockID||blockID== Block.torchRedstoneActive.blockID)
{
switch (metadata)
@@ -376,6 +431,53 @@ public class SchematicLoader
}
}
else if(blockID== Block.chest.blockID||blockID== Block.chestTrapped.blockID||blockID==Block.ladder.blockID)
{
switch (metadata)
{
case 2:
metadata = 3;
break;
case 3:
metadata = 2;
break;
case 4:
metadata = 5;
break;
case 5:
metadata = 4;
break;
}
}
else if(blockID==Block.vine.blockID)
{
switch (metadata)
{
case 1:
metadata = 4;
break;
case 2:
metadata = 8;
break;
case 4:
metadata = 1;
break;
case 8:
metadata = 2;
break;
}
}
else if(blockID== Block.lever.blockID||blockID== Block.torchWood.blockID||blockID== Block.torchRedstoneIdle.blockID||blockID== Block.torchRedstoneActive.blockID)
{
switch (metadata)
@@ -541,6 +643,53 @@ public class SchematicLoader
}
}
else if(blockID== Block.chest.blockID||blockID== Block.chestTrapped.blockID||blockID==Block.ladder.blockID)
{
switch (metadata)
{
case 2:
metadata = 4;
break;
case 3:
metadata = 5;
break;
case 4:
metadata = 3;
break;
case 5:
metadata = 2;
break;
}
}
else if(blockID==Block.vine.blockID)
{
switch (metadata)
{
case 1:
metadata = 8;
break;
case 2:
metadata = 1;
break;
case 4:
metadata = 2;
break;
case 8:
metadata = 4;
break;
}
}
else if(blockID== Block.lever.blockID||blockID== Block.torchWood.blockID||blockID== Block.torchRedstoneIdle.blockID||blockID== Block.torchRedstoneActive.blockID)
{
switch (metadata)

2
StevenDimDoors/mod_pocketDim/commands/CommandAddDungeonRift.java
View File

@@ -19,7 +19,7 @@ public class CommandAddDungeonRift extends CommandBase
{
public String getCommandName()//the name of our command
{
return "add_dungeon_rift";
return "dimdoors-genDungeonRift";
}

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

@@ -16,7 +16,7 @@ public class CommandDeleteAllLinks extends CommandBase
{
public String getCommandName()//the name of our command
{
return "delete_all_links";
return "dimdoors-deleteLinksInDim";
}

2
StevenDimDoors/mod_pocketDim/commands/CommandDeleteDimData.java
View File

@@ -17,7 +17,7 @@ public class CommandDeleteDimData extends CommandBase
{
public String getCommandName()//the name of our command
{
return "delete_dim_data";
return "dimdoors-deleteDimData";
}

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

@@ -16,7 +16,7 @@ public class CommandDeleteRifts extends CommandBase
{
public String getCommandName()//the name of our command
{
return "delete_rifts";
return "dimdoors-cleanupRifts";
}

2
StevenDimDoors/mod_pocketDim/commands/CommandEndDungeonCreation.java
View File

@@ -12,7 +12,7 @@ public class CommandEndDungeonCreation extends CommandBase
{
public String getCommandName()//the name of our command
{
return "end_dungeon_creation";
return "dimdoors-endDungeonCreation";
}

2
StevenDimDoors/mod_pocketDim/commands/CommandPrintDimData.java
View File

@@ -17,7 +17,7 @@ public class CommandPrintDimData extends CommandBase
{
public String getCommandName()//the name of our command
{
return "print_dim_data";
return "dimdoors-printDimData";
}

2
StevenDimDoors/mod_pocketDim/commands/CommandPruneDims.java
View File

@@ -13,7 +13,7 @@ public class CommandPruneDims extends CommandBase
{
public String getCommandName()//the name of our command
{
return "prune_pocket_dims";
return "dimdoors-prunePockets";
}

2
StevenDimDoors/mod_pocketDim/commands/CommandStartDungeonCreation.java
View File

@@ -20,7 +20,7 @@ public class CommandStartDungeonCreation extends CommandBase
{
public String getCommandName()//the name of our command
{
return "start_dungeon_creation";
return "dimdoors-startDungeonCreation";
}
@Override

40
StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java
View File

@@ -11,7 +11,6 @@ import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import StevenDimDoors.mod_pocketDim.DungeonGenerator;
@@ -20,6 +19,7 @@ import StevenDimDoors.mod_pocketDim.mod_pocketDim;
import StevenDimDoors.mod_pocketDim.helpers.jnbt.ByteArrayTag;
import StevenDimDoors.mod_pocketDim.helpers.jnbt.CompoundTag;
import StevenDimDoors.mod_pocketDim.helpers.jnbt.IntTag;
import StevenDimDoors.mod_pocketDim.helpers.jnbt.ListTag;
import StevenDimDoors.mod_pocketDim.helpers.jnbt.NBTOutputStream;
import StevenDimDoors.mod_pocketDim.helpers.jnbt.ShortTag;
import StevenDimDoors.mod_pocketDim.helpers.jnbt.StringTag;
@@ -70,6 +70,8 @@ public class DungeonHelper
public ArrayList<DungeonGenerator> exits = new ArrayList<DungeonGenerator>();
public ArrayList<String> tagList = new ArrayList<String>();
@@ -90,11 +92,18 @@ public class DungeonHelper
if(name.length<4)
{
System.out.println("Importing custom dungeon gen mechanics failed, adding to secondary list");
System.out.println("Could not parse filename tags, not adding dungeon to generation lists");
this.customDungeons.add(new DungeonGenerator(0,schematicFile.getAbsolutePath(),true));
System.out.println("Imported "+schematicFile.getName());
}
else if(!(name[2].equals("open")||name[2].equals("closed"))||!this.tagList.contains(name[0]))
{
System.out.println("Could not parse filename tags, not adding dungeon to generation lists");
this.customDungeons.add(new DungeonGenerator(0,schematicFile.getAbsolutePath(),true));
System.out.println("Imported "+schematicFile.getName());
}
else
{
@@ -137,7 +146,7 @@ public class DungeonHelper
this.exits.add(new DungeonGenerator(weight,path,open));
}
else if(name[0].equals("mazes"))
else if(name[0].equals("maze"))
{
this.mazes.add(new DungeonGenerator(weight,path,open));
@@ -231,7 +240,16 @@ public class DungeonHelper
this.metadataNextList.add(Block.redstoneRepeaterActive.blockID);
}
public void registerDungeonTypeTags()
{
tagList.add("hub");
tagList.add("trap");
tagList.add("simpleHall");
tagList.add("complexHall");
tagList.add("exit");
tagList.add("deadEnd");
tagList.add("maze");
}
public void registerBaseDungeons()
{
this.hubs.add(new DungeonGenerator(0, "/schematics/4WayBasicHall.schematic", false));
@@ -376,7 +394,7 @@ public class DungeonHelper
//ArrayList<NBTTagCompound> tileEntities = new ArrayList<NBTTagCompound>();
NBTTagList tileEntites = new NBTTagList();
ArrayList<Tag> tileEntites= new ArrayList<Tag>();
byte[] blocks = new byte[width * height * length];
byte[] addBlocks = null;
byte[] blockData = new byte[width * height * length];
@@ -419,17 +437,23 @@ public class DungeonHelper
if (Block.blocksList[blockID] instanceof BlockContainer)
{
//TODO fix this
/**
TileEntity tileEntityBlock = world.getBlockTileEntity(x+xMin, y+yMin, z+zMin);
NBTTagCompound tag = new NBTTagCompound();
tileEntityBlock.writeToNBT(tag);
CompoundTag tagC = new CompoundTag("TileEntity",Map.class.cast(tag.getTags()));
// Get the list of key/values from the block
if (tag != null)
if (tagC != null)
{
tileEntites.appendTag(tag);
tileEntites.add(tagC);
}
**/
}
@@ -453,7 +477,7 @@ public class DungeonHelper
schematic.put("Width", new ShortTag("Width", (short) width));
schematic.put("Length", new ShortTag("Length", (short) length));
schematic.put("Height", new ShortTag("Height", (short) height));
schematic.put("TileEntites", tileEntites);
schematic.put("TileEntites", new ListTag("TileEntities",CompoundTag.class,tileEntites));
if (addBlocks != null) {
schematic.put("AddBlocks", new ByteArrayTag("AddBlocks", addBlocks));
}

2
StevenDimDoors/mod_pocketDim/mod_pocketDim.java
View File

@@ -2,6 +2,7 @@ package StevenDimDoors.mod_pocketDim;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
@@ -269,6 +270,7 @@ public class mod_pocketDim
dungeonHelper.importCustomDungeons(schematicDir);
dungeonHelper.registerBaseDungeons();
dungeonHelper.registerDungeonTypeTags();