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

more work on import

Browse source
This commit is contained in:
StevenRS11 2013-06-02 09:57:05 -04:00
parent c16dd49a18
commit 004d06ab7d
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
StevenDimDoors/mod_pocketDim/SchematicLoader.java
View file

@ -98,7 +98,10 @@ public class SchematicLoader
blocks=new short[blockId.length];
if(nbtdata.getByteArray("AddBlocks")!=null)
{
this.addId = nbtdata.getByteArray("AddBlocks");
}
entities = nbtdata.getTagList("Entities");
tileentities = nbtdata.getTagList("TileEntities");
@ -106,13 +109,20 @@ public class SchematicLoader
input.close();
for (int index = 0; index < blockId.length; index++) {
if ((index >> 1) >= addId.length) { // No corresponding AddBlocks index
for (int index = 0; index < blockId.length; index++)
{
if ((index >> 1) >= addId.length)
{
blocks[index] = (short) (blockId[index] & 0xFF);
} else {
if ((index & 1) == 0) {
}
else
{
if ((index & 1) == 0)
{
blocks[index] = (short) (((addId[index >> 1] & 0x0F) << 8) + (blockId[index] & 0xFF));
} else {
} else
{
blocks[index] = (short) (((addId[index >> 1] & 0xF0) << 4) + (blockId[index] & 0xFF));
}
}
@ -759,7 +769,7 @@ public class SchematicLoader
if(Block.blocksList[blockToReplace]==null&&blockToReplace!=0||blockToReplace>158)
{
blockToReplace=mod_pocketDim.blockDimWall.blockID;
// blockToReplace=mod_pocketDim.blockDimWall.blockID;
}
if(blockToReplace>0)

2
StevenDimDoors/mod_pocketDim/dimHelper.java
View file

@ -343,7 +343,7 @@ public class dimHelper extends DimensionManager
}
if(entity instanceof EntityPlayerMP)
if(!world.isRemote)
{
entity = this.teleportEntity(world, entity, linkData);

2
StevenDimDoors/mod_pocketDim/mod_pocketDim.java
View file

@ -438,7 +438,7 @@ public class mod_pocketDim
DimensionManager.registerProviderType(this.providerID, pocketProvider.class, false);
DimensionManager.registerProviderType(this.limboProviderID, LimboProvider.class, true);
DimensionManager.registerProviderType(this.limboProviderID, LimboProvider.class, false);