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

Fixed Explosion Resistance Bug and Hopper Metadata Rotation #44

Merged
SenseiKiwi merged 3 commits from master into master 2013-07-19 16:00:08 +00:00
Conversation 0 Commits 3 Files Changed 3 +63 -28
1 changed files with 63 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7044d80457 - Show all commits

91
StevenDimDoors/mod_pocketDim/SchematicLoader.java
View File

@@ -36,6 +36,8 @@ import StevenDimDoors.mod_pocketDim.ticking.MobObelisk;
public class SchematicLoader public class SchematicLoader
{ {
private final static int EAST_DOOR_METADATA = 0; private final static int EAST_DOOR_METADATA = 0;
private final static int SOUTH_DOOR_METADATA = 1;
private final static int WEST_DOOR_METADATA = 2;
private final static int NORTH_DOOR_METADATA = 3; private final static int NORTH_DOOR_METADATA = 3;
private final static int MAX_VANILLA_BLOCK_ID = 158; private final static int MAX_VANILLA_BLOCK_ID = 158;
@@ -49,8 +51,26 @@ public class SchematicLoader
{ {
switch (orientation) switch (orientation)
{ {
case 0: case EAST_DOOR_METADATA:
if (blockID == Block.hopperBlock.blockID)
{
switch (metadata)
{
case 2:
metadata = 5;
break;
case 3:
metadata = 4;
break;
case 4:
metadata = 2;
break;
case 5:
metadata = 3;
break;
}
}
if(Block.blocksList[blockID] instanceof BlockStairs) if(Block.blocksList[blockID] instanceof BlockStairs)
{ {
@@ -238,7 +258,27 @@ public class SchematicLoader
} }
} }
break; break;
case 1: case SOUTH_DOOR_METADATA:
if (blockID == Block.hopperBlock.blockID)
{
switch (metadata)
{
case 2:
metadata = 3;
break;
case 3:
metadata = 2;
break;
case 4:
metadata = 5;
break;
case 5:
metadata = 4;
break;
}
}
if(Block.blocksList[blockID] instanceof BlockStairs) if(Block.blocksList[blockID] instanceof BlockStairs)
{ {
switch (metadata) switch (metadata)
@@ -443,7 +483,26 @@ public class SchematicLoader
} }
break; break;
case 2: case WEST_DOOR_METADATA:
if (blockID == Block.hopperBlock.blockID)
{
switch (metadata)
{
case 2:
metadata = 4;
break;
case 3:
metadata = 5;
break;
case 4:
metadata = 3;
break;
case 5:
metadata = 2;
break;
}
}
if(Block.blocksList[blockID] instanceof BlockStairs) if(Block.blocksList[blockID] instanceof BlockStairs)
{ {
@@ -588,14 +647,8 @@ public class SchematicLoader
case 13: case 13:
metadata = 10; metadata = 10;
break; break;
} }
} }
else if(Block.blocksList[blockID] instanceof BlockRedstoneRepeater ||Block.blocksList[blockID] instanceof BlockDoor ||blockID== Block.tripWireSource.blockID||Block.blocksList[blockID] instanceof BlockComparator) else if(Block.blocksList[blockID] instanceof BlockRedstoneRepeater ||Block.blocksList[blockID] instanceof BlockDoor ||blockID== Block.tripWireSource.blockID||Block.blocksList[blockID] instanceof BlockComparator)
{ {
switch (metadata) switch (metadata)
@@ -648,34 +701,16 @@ public class SchematicLoader
case 12: case 12:
metadata = 15; metadata = 15;
break; break;
} }
} }
break; break;
case 3: case NORTH_DOOR_METADATA:
/** /**
* this is the default case- never need to change anything here * this is the default case- never need to change anything here
* *
*/ */
break; break;
} }
} }
return metadata; return metadata;
} }