diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java b/StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java index 3ec1e8b7..37910d86 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java +++ b/StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java @@ -52,7 +52,14 @@ public class BlockDimWall extends Block @Override public Icon getIcon(int par1, int par2) { - return blockIcon[par2]; + if(par2==1) + { + return blockIcon[par2]; + } + else + { + return blockIcon[0]; + } } @Override diff --git a/StevenDimDoors/mod_pocketDim/helpers/BlockRotationHelper.java b/StevenDimDoors/mod_pocketDim/helpers/BlockRotationHelper.java index 728b7244..8150f183 100644 --- a/StevenDimDoors/mod_pocketDim/helpers/BlockRotationHelper.java +++ b/StevenDimDoors/mod_pocketDim/helpers/BlockRotationHelper.java @@ -83,6 +83,22 @@ public class BlockRotationHelper repeaterComparatorDoorTripwire0.put(14, 15); repeaterComparatorDoorTripwire0.put(15, 12); + HashMap rails0 = new HashMap(); + rails0.put(0, 1); + rails0.put(1, 0); + rails0.put(8, 9); + rails0.put(9, 6); + rails0.put(6, 7); + rails0.put(7, 8); + + + HashMap railsSpecial0 = new HashMap(); + railsSpecial0.put(0, 1); + railsSpecial0.put(1, 0); + railsSpecial0.put(8, 9); + railsSpecial0.put(9, 8); + + HashMap> orientation1 = new HashMap>(); HashMap stairs1 = new HashMap(); @@ -152,6 +168,21 @@ public class BlockRotationHelper repeaterComparatorDoorTripwire1.put(14, 12); repeaterComparatorDoorTripwire1.put(15, 13); + HashMap rails1 = new HashMap(); + rails1.put(0, 0); + rails1.put(1, 1); + rails1.put(8, 6); + rails1.put(9, 7); + rails1.put(6, 8); + rails1.put(7, 9); + + + HashMap railsSpecial1 = new HashMap(); + railsSpecial1.put(1, 1); + railsSpecial1.put(0, 0); + railsSpecial1.put(8, 8); + railsSpecial1.put(9, 9); + HashMap> orientation2 = new HashMap>(); HashMap stairs2 = new HashMap(); @@ -220,6 +251,21 @@ public class BlockRotationHelper repeaterComparatorDoorTripwire2.put(14, 13); repeaterComparatorDoorTripwire2.put(15, 14); repeaterComparatorDoorTripwire2.put(12, 15); + + HashMap rails2 = new HashMap(); + rails2.put(0, 1); + rails2.put(1, 0); + rails2.put(8, 7); + rails2.put(9, 8); + rails2.put(6, 9); + rails2.put(7, 6); + + + HashMap railsSpecial2 = new HashMap(); + railsSpecial2.put(0, 1); + railsSpecial2.put(1, 0); + railsSpecial2.put(8, 9); + railsSpecial2.put(9, 8); @@ -258,6 +304,10 @@ public class BlockRotationHelper orientation0.put(Block.doorWood.blockID,pistonDropperDispenser0); orientation0.put(Block.doorIron.blockID,pistonDropperDispenser0); orientation0.put(Block.tripWireSource.blockID,pistonDropperDispenser0); + orientation0.put(Block.railDetector.blockID,railsSpecial0); + orientation0.put(Block.railActivator.blockID,railsSpecial0); + orientation0.put(Block.railPowered.blockID,railsSpecial0); + orientation0.put(Block.rail.blockID,rails0); orientation1.put(Block.stairsBrick.blockID, stairs1); orientation1.put(Block.stairsCobblestone.blockID, stairs1); @@ -293,7 +343,10 @@ public class BlockRotationHelper orientation1.put(Block.doorWood.blockID,pistonDropperDispenser1); orientation1.put(Block.doorIron.blockID,pistonDropperDispenser1); orientation1.put(Block.tripWireSource.blockID,pistonDropperDispenser1); - + orientation1.put(Block.railDetector.blockID,railsSpecial1); + orientation1.put(Block.railActivator.blockID,railsSpecial1); + orientation1.put(Block.railPowered.blockID,railsSpecial1); + orientation1.put(Block.rail.blockID,rails1); orientation2.put(Block.stairsBrick.blockID, stairs2); orientation2.put(Block.stairsCobblestone.blockID, stairs2); @@ -329,6 +382,10 @@ public class BlockRotationHelper orientation2.put(Block.doorWood.blockID,pistonDropperDispenser2); orientation2.put(Block.doorIron.blockID,pistonDropperDispenser2); orientation2.put(Block.tripWireSource.blockID,pistonDropperDispenser2); + orientation2.put(Block.railDetector.blockID,railsSpecial2); + orientation2.put(Block.railActivator.blockID,railsSpecial2); + orientation2.put(Block.railPowered.blockID,railsSpecial2); + orientation2.put(Block.rail.blockID,rails2); this.rotationMappings.put(2, orientation2); this.rotationMappings.put(1, orientation1); @@ -347,7 +404,7 @@ public class BlockRotationHelper } } } - return 0 ; + return metaData ; } diff --git a/schematics/renamedDungeons/Exit_lockingExitHall_closed_100.schematic b/schematics/renamedDungeons/Exit_lockingExitHall_closed_100.schematic new file mode 100644 index 00000000..5adbe706 Binary files /dev/null and b/schematics/renamedDungeons/Exit_lockingExitHall_closed_100.schematic differ diff --git a/schematics/renamedDungeons/Hub_4WayBasicHall_closed_200.schematic b/schematics/renamedDungeons/Hub_4WayBasicHall_closed_200.schematic new file mode 100644 index 00000000..50ac14ae Binary files /dev/null and b/schematics/renamedDungeons/Hub_4WayBasicHall_closed_200.schematic differ diff --git a/schematics/renamedDungeons/Hub_4WayHallExit_closed_200.schematic b/schematics/renamedDungeons/Hub_4WayHallExit_closed_200.schematic new file mode 100644 index 00000000..0adb3e9c Binary files /dev/null and b/schematics/renamedDungeons/Hub_4WayHallExit_closed_200.schematic differ diff --git a/schematics/renamedDungeons/complexHall_buggyTopEntry1_open_100.schematic b/schematics/renamedDungeons/complexHall_buggyTopEntry1_open_100.schematic new file mode 100644 index 00000000..d82ac2c2 Binary files /dev/null and b/schematics/renamedDungeons/complexHall_buggyTopEntry1_open_100.schematic differ diff --git a/schematics/renamedDungeons/complexHall_exitRuinsWithHiddenDoor_open_100.schematic b/schematics/renamedDungeons/complexHall_exitRuinsWithHiddenDoor_open_100.schematic new file mode 100644 index 00000000..eef2733e Binary files /dev/null and b/schematics/renamedDungeons/complexHall_exitRuinsWithHiddenDoor_open_100.schematic differ diff --git a/schematics/renamedDungeons/complexHall_hallwayHiddenTreasure_closed_100.schematic b/schematics/renamedDungeons/complexHall_hallwayHiddenTreasure_closed_100.schematic new file mode 100644 index 00000000..f088af77 Binary files /dev/null and b/schematics/renamedDungeons/complexHall_hallwayHiddenTreasure_closed_100.schematic differ diff --git a/schematics/renamedDungeons/complexHall_mediumPillarStairs_open_100.schematic b/schematics/renamedDungeons/complexHall_mediumPillarStairs_open_100.schematic new file mode 100644 index 00000000..499f0b36 Binary files /dev/null and b/schematics/renamedDungeons/complexHall_mediumPillarStairs_open_100.schematic differ diff --git a/schematics/renamedDungeons/complexHall_pitStairs_open_100.schematic b/schematics/renamedDungeons/complexHall_pitStairs_open_100.schematic new file mode 100644 index 00000000..653f09f8 Binary files /dev/null and b/schematics/renamedDungeons/complexHall_pitStairs_open_100.schematic differ diff --git a/schematics/renamedDungeons/complexHall_ruinsO_open_100.schematic b/schematics/renamedDungeons/complexHall_ruinsO_open_100.schematic new file mode 100644 index 00000000..d5ad2095 Binary files /dev/null and b/schematics/renamedDungeons/complexHall_ruinsO_open_100.schematic differ diff --git a/schematics/renamedDungeons/complexHall_smallBranchWithExit_closed_100.schematic b/schematics/renamedDungeons/complexHall_smallBranchWithExit_closed_100.schematic new file mode 100644 index 00000000..acc9cd44 Binary files /dev/null and b/schematics/renamedDungeons/complexHall_smallBranchWithExit_closed_100.schematic differ diff --git a/schematics/renamedDungeons/complexHall_smallRotundaWithExit_closed_100_NOT DONE.schematic b/schematics/renamedDungeons/complexHall_smallRotundaWithExit_closed_100_NOT DONE.schematic new file mode 100644 index 00000000..56deba25 Binary files /dev/null and b/schematics/renamedDungeons/complexHall_smallRotundaWithExit_closed_100_NOT DONE.schematic differ diff --git a/schematics/renamedDungeons/complexHall_tntPuzzleTrap_closed_50.schematic b/schematics/renamedDungeons/complexHall_tntPuzzleTrap_closed_50.schematic new file mode 100644 index 00000000..8d6898ee Binary files /dev/null and b/schematics/renamedDungeons/complexHall_tntPuzzleTrap_closed_50.schematic differ diff --git a/schematics/renamedDungeons/deadEnd_azersDungeonO_closed_100.schematic b/schematics/renamedDungeons/deadEnd_azersDungeonO_closed_100.schematic new file mode 100644 index 00000000..9766d121 Binary files /dev/null and b/schematics/renamedDungeons/deadEnd_azersDungeonO_closed_100.schematic differ diff --git a/schematics/renamedDungeons/deadEnd_brokenPillarsO_open_100.schematic b/schematics/renamedDungeons/deadEnd_brokenPillarsO_open_100.schematic new file mode 100644 index 00000000..40fa1ad4 Binary files /dev/null and b/schematics/renamedDungeons/deadEnd_brokenPillarsO_open_100.schematic differ diff --git a/schematics/renamedDungeons/deadEnd_diamondTowerTemple1_open_100.schematic b/schematics/renamedDungeons/deadEnd_diamondTowerTemple1_open_100.schematic new file mode 100644 index 00000000..030299d6 Binary files /dev/null and b/schematics/renamedDungeons/deadEnd_diamondTowerTemple1_open_100.schematic differ diff --git a/schematics/renamedDungeons/deadEnd_fallingTrapO_open_100.schematic b/schematics/renamedDungeons/deadEnd_fallingTrapO_open_100.schematic new file mode 100644 index 00000000..b631bf96 Binary files /dev/null and b/schematics/renamedDungeons/deadEnd_fallingTrapO_open_100.schematic differ diff --git a/schematics/renamedDungeons/deadEnd_hiddenStaircaseO_open_100.schematic b/schematics/renamedDungeons/deadEnd_hiddenStaircaseO_open_100.schematic new file mode 100644 index 00000000..82b1c984 Binary files /dev/null and b/schematics/renamedDungeons/deadEnd_hiddenStaircaseO_open_100.schematic differ diff --git a/schematics/renamedDungeons/deadEnd_lavaTrapO_open_100.schematic b/schematics/renamedDungeons/deadEnd_lavaTrapO_open_100.schematic new file mode 100644 index 00000000..bee6b2aa Binary files /dev/null and b/schematics/renamedDungeons/deadEnd_lavaTrapO_open_100.schematic differ diff --git a/schematics/renamedDungeons/deadEnd_smallDesert_open_75.schematic b/schematics/renamedDungeons/deadEnd_smallDesert_open_75.schematic new file mode 100644 index 00000000..6fded48b Binary files /dev/null and b/schematics/renamedDungeons/deadEnd_smallDesert_open_75.schematic differ diff --git a/schematics/renamedDungeons/deadEnd_smallHiddenTowerO_open_100.schematic b/schematics/renamedDungeons/deadEnd_smallHiddenTowerO_open_100.schematic new file mode 100644 index 00000000..e75cc10c Binary files /dev/null and b/schematics/renamedDungeons/deadEnd_smallHiddenTowerO_open_100.schematic differ diff --git a/schematics/renamedDungeons/deadEnd_smallPond_open_75.schematic b/schematics/renamedDungeons/deadEnd_smallPond_open_75.schematic new file mode 100644 index 00000000..ccb790a5 Binary files /dev/null and b/schematics/renamedDungeons/deadEnd_smallPond_open_75.schematic differ diff --git a/schematics/renamedDungeons/deadEnd_smallSilverfishRoom_closed_100.schematic b/schematics/renamedDungeons/deadEnd_smallSilverfishRoom_closed_100.schematic new file mode 100644 index 00000000..46ddfda5 Binary files /dev/null and b/schematics/renamedDungeons/deadEnd_smallSilverfishRoom_closed_100.schematic differ diff --git a/schematics/renamedDungeons/deadEnd_tntTrapO_open_100.schematic b/schematics/renamedDungeons/deadEnd_tntTrapO_open_100.schematic new file mode 100644 index 00000000..5d0d4240 Binary files /dev/null and b/schematics/renamedDungeons/deadEnd_tntTrapO_open_100.schematic differ diff --git a/schematics/renamedDungeons/deadend_randomTree_open_75.schematic b/schematics/renamedDungeons/deadend_randomTree_open_75.schematic new file mode 100644 index 00000000..e6b0edb2 Binary files /dev/null and b/schematics/renamedDungeons/deadend_randomTree_open_75.schematic differ diff --git a/schematics/renamedDungeons/dungeon.schematic b/schematics/renamedDungeons/dungeon.schematic new file mode 100644 index 00000000..8a23dd02 Binary files /dev/null and b/schematics/renamedDungeons/dungeon.schematic differ diff --git a/schematics/renamedDungeons/dungeon6.schematic b/schematics/renamedDungeons/dungeon6.schematic new file mode 100644 index 00000000..9f0dca4f Binary files /dev/null and b/schematics/renamedDungeons/dungeon6.schematic differ diff --git a/schematics/renamedDungeons/dungeon7.schematic b/schematics/renamedDungeons/dungeon7.schematic new file mode 100644 index 00000000..37ff31b7 Binary files /dev/null and b/schematics/renamedDungeons/dungeon7.schematic differ diff --git a/schematics/renamedDungeons/exit_exitCube_open_100.schematic b/schematics/renamedDungeons/exit_exitCube_open_100.schematic new file mode 100644 index 00000000..411c4eca Binary files /dev/null and b/schematics/renamedDungeons/exit_exitCube_open_100.schematic differ diff --git a/schematics/renamedDungeons/exit_smallExitPrison_open_100.schematic b/schematics/renamedDungeons/exit_smallExitPrison_open_100.schematic new file mode 100644 index 00000000..bb7a7ef3 Binary files /dev/null and b/schematics/renamedDungeons/exit_smallExitPrison_open_100.schematic differ diff --git a/schematics/renamedDungeons/hub_doorTotemRuins_open_100.schematic b/schematics/renamedDungeons/hub_doorTotemRuins_open_100.schematic new file mode 100644 index 00000000..32996f57 Binary files /dev/null and b/schematics/renamedDungeons/hub_doorTotemRuins_open_100.schematic differ diff --git a/schematics/renamedDungeons/hub_fortRuins_open_100.schematic b/schematics/renamedDungeons/hub_fortRuins_open_100.schematic new file mode 100644 index 00000000..f67c75c7 Binary files /dev/null and b/schematics/renamedDungeons/hub_fortRuins_open_100.schematic differ diff --git a/schematics/renamedDungeons/hub_hallwayTrapRooms1_closed_100.schematic b/schematics/renamedDungeons/hub_hallwayTrapRooms1_closed_100.schematic new file mode 100644 index 00000000..192207c9 Binary files /dev/null and b/schematics/renamedDungeons/hub_hallwayTrapRooms1_closed_100.schematic differ diff --git a/schematics/renamedDungeons/hub_longDoorHallway_closed_100.schematic b/schematics/renamedDungeons/hub_longDoorHallway_closed_100.schematic new file mode 100644 index 00000000..86d815d1 Binary files /dev/null and b/schematics/renamedDungeons/hub_longDoorHallway_closed_100.schematic differ diff --git a/schematics/renamedDungeons/maze_smallMaze1_closed_100.schematic b/schematics/renamedDungeons/maze_smallMaze1_closed_100.schematic new file mode 100644 index 00000000..c32d95f1 Binary files /dev/null and b/schematics/renamedDungeons/maze_smallMaze1_closed_100.schematic differ diff --git a/schematics/renamedDungeons/maze_smallMultilevelMaze_closed_100.schematic b/schematics/renamedDungeons/maze_smallMultilevelMaze_closed_100.schematic new file mode 100644 index 00000000..5866b055 Binary files /dev/null and b/schematics/renamedDungeons/maze_smallMultilevelMaze_closed_100.schematic differ diff --git a/schematics/renamedDungeons/simpleHall_collapsedSingleTunnel1_closed_100.schematic b/schematics/renamedDungeons/simpleHall_collapsedSingleTunnel1_closed_100.schematic new file mode 100644 index 00000000..dfbf69a0 Binary files /dev/null and b/schematics/renamedDungeons/simpleHall_collapsedSingleTunnel1_closed_100.schematic differ diff --git a/schematics/renamedDungeons/simpleHall_simpleDropHall_closed_100.schematic b/schematics/renamedDungeons/simpleHall_simpleDropHall_closed_100.schematic new file mode 100644 index 00000000..70fa7657 Binary files /dev/null and b/schematics/renamedDungeons/simpleHall_simpleDropHall_closed_100.schematic differ diff --git a/schematics/renamedDungeons/simpleHall_simpleSmallT1_closed_100.schematic b/schematics/renamedDungeons/simpleHall_simpleSmallT1_closed_100.schematic new file mode 100644 index 00000000..a8bc35e0 Binary files /dev/null and b/schematics/renamedDungeons/simpleHall_simpleSmallT1_closed_100.schematic differ diff --git a/schematics/renamedDungeons/simpleHall_simpleStairsDown_closed_100.schematic b/schematics/renamedDungeons/simpleHall_simpleStairsDown_closed_100.schematic new file mode 100644 index 00000000..63659d28 Binary files /dev/null and b/schematics/renamedDungeons/simpleHall_simpleStairsDown_closed_100.schematic differ diff --git a/schematics/renamedDungeons/simpleHall_simpleStairsUp_closed_100.schematic b/schematics/renamedDungeons/simpleHall_simpleStairsUp_closed_100.schematic new file mode 100644 index 00000000..965c2cf9 Binary files /dev/null and b/schematics/renamedDungeons/simpleHall_simpleStairsUp_closed_100.schematic differ diff --git a/schematics/renamedDungeons/simpleHall_singleStraightHall1_closed_100.schematic b/schematics/renamedDungeons/simpleHall_singleStraightHall1_closed_100.schematic new file mode 100644 index 00000000..7f9f11c8 Binary files /dev/null and b/schematics/renamedDungeons/simpleHall_singleStraightHall1_closed_100.schematic differ diff --git a/schematics/renamedDungeons/simpleHall_smallSimpleLeft_closed_100.schematic b/schematics/renamedDungeons/simpleHall_smallSimpleLeft_closed_100.schematic new file mode 100644 index 00000000..5a9d50a5 Binary files /dev/null and b/schematics/renamedDungeons/simpleHall_smallSimpleLeft_closed_100.schematic differ diff --git a/schematics/renamedDungeons/simpleHall_smallSimpleRight_closed_100.schematic b/schematics/renamedDungeons/simpleHall_smallSimpleRight_closed_100.schematic new file mode 100644 index 00000000..3aedb166 Binary files /dev/null and b/schematics/renamedDungeons/simpleHall_smallSimpleRight_closed_100.schematic differ diff --git a/schematics/renamedDungeons/somethingBroke.schematic b/schematics/renamedDungeons/somethingBroke.schematic new file mode 100644 index 00000000..1bd78ea7 Binary files /dev/null and b/schematics/renamedDungeons/somethingBroke.schematic differ diff --git a/schematics/renamedDungeons/trap_fakeTNTTrap_closed_100.schematic b/schematics/renamedDungeons/trap_fakeTNTTrap_closed_100.schematic new file mode 100644 index 00000000..d2811b0e Binary files /dev/null and b/schematics/renamedDungeons/trap_fakeTNTTrap_closed_100.schematic differ diff --git a/schematics/renamedDungeons/trap_fallingTNThall_closed_100.schematic b/schematics/renamedDungeons/trap_fallingTNThall_closed_100.schematic new file mode 100644 index 00000000..819575f7 Binary files /dev/null and b/schematics/renamedDungeons/trap_fallingTNThall_closed_100.schematic differ diff --git a/schematics/renamedDungeons/trap_hallwayPitFallTrap_closed_200.schematic b/schematics/renamedDungeons/trap_hallwayPitFallTrap_closed_200.schematic new file mode 100644 index 00000000..a292fd63 Binary files /dev/null and b/schematics/renamedDungeons/trap_hallwayPitFallTrap_closed_200.schematic differ diff --git a/schematics/renamedDungeons/trap_lavaPyramid_open_100.schematic b/schematics/renamedDungeons/trap_lavaPyramid_open_100.schematic new file mode 100644 index 00000000..fdf741f5 Binary files /dev/null and b/schematics/renamedDungeons/trap_lavaPyramid_open_100.schematic differ diff --git a/schematics/renamedDungeons/trap_pistonFallRuins_open_100.schematic b/schematics/renamedDungeons/trap_pistonFallRuins_open_100.schematic new file mode 100644 index 00000000..198d5291 Binary files /dev/null and b/schematics/renamedDungeons/trap_pistonFallRuins_open_100.schematic differ diff --git a/schematics/renamedDungeons/trap_pistonFloorHall_closed_150.schematic b/schematics/renamedDungeons/trap_pistonFloorHall_closed_150.schematic new file mode 100644 index 00000000..523dc929 Binary files /dev/null and b/schematics/renamedDungeons/trap_pistonFloorHall_closed_150.schematic differ diff --git a/schematics/renamedDungeons/trap_pistonHallway_closed_100_NOTDONE.schematic b/schematics/renamedDungeons/trap_pistonHallway_closed_100_NOTDONE.schematic new file mode 100644 index 00000000..7606995e Binary files /dev/null and b/schematics/renamedDungeons/trap_pistonHallway_closed_100_NOTDONE.schematic differ diff --git a/schematics/renamedDungeons/trap_pistonSmasherHall_closed_100.schematic b/schematics/renamedDungeons/trap_pistonSmasherHall_closed_100.schematic new file mode 100644 index 00000000..6b83a346 Binary files /dev/null and b/schematics/renamedDungeons/trap_pistonSmasherHall_closed_100.schematic differ diff --git a/schematics/renamedDungeons/trap_raceTheTNTHall_closed_50.schematic b/schematics/renamedDungeons/trap_raceTheTNTHall_closed_50.schematic new file mode 100644 index 00000000..5e689a46 Binary files /dev/null and b/schematics/renamedDungeons/trap_raceTheTNTHall_closed_50.schematic differ diff --git a/schematics/renamedDungeons/trap_wallFallcomboPistonHall_closed_200.schematic b/schematics/renamedDungeons/trap_wallFallcomboPistonHall_closed_200.schematic new file mode 100644 index 00000000..d2d9453e Binary files /dev/null and b/schematics/renamedDungeons/trap_wallFallcomboPistonHall_closed_200.schematic differ