diff --git a/StevenDimDoors/mod_pocketDim/CommonTickHandler.java b/StevenDimDoors/mod_pocketDim/CommonTickHandler.java index 09e2c47..5270fb1 100644 --- a/StevenDimDoors/mod_pocketDim/CommonTickHandler.java +++ b/StevenDimDoors/mod_pocketDim/CommonTickHandler.java @@ -115,7 +115,7 @@ public class CommonTickHandler implements ITickHandler blockID = worldObj.getBlockId(x, y, z); } - while(blockID == mod_pocketDim.blockDimWall.blockID&&y>0) + while((blockID == mod_pocketDim.blockDimWall.blockID||blockID == mod_pocketDim.blockDimWallPerm.blockID)&&y>0) { y--; blockID = worldObj.getBlockId(x, y, z); diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java b/StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java index d7bcd5e..73e6808 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java +++ b/StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java @@ -62,7 +62,7 @@ public class BlockDimWall extends Block public void registerIcons(IconRegister par1IconRegister) { this.blockIcon[0] = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()); - this.blockIcon[1] = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2() + "perm"); + this.blockIcon[1] = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2() + "Perm"); } @SideOnly(Side.CLIENT) diff --git a/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java b/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java index ab388b8..d74c8ca 100644 --- a/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java +++ b/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java @@ -335,6 +335,8 @@ public class DungeonHelper simpleHalls.add(new DungeonGenerator(50, "/schematics/SimpleHall_SK-RightDownStairs_Open_50.schematic", true)); simpleHalls.add(new DungeonGenerator(50, "/schematics/SimpleHall_SK-RightUpPath_Open_50.schematic", true)); simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/SimpleHall_SK-SpiralHallway_Open_100.schematic", true)); + simpleHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/complexHall_largeBrokenHall_closed_100.schematic", false)); + complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/tntPuzzleTrap.schematic", false)); complexHalls.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/brokenPillarsO.schematic", true)); @@ -365,12 +367,14 @@ public class DungeonHelper pistonTraps.add(new DungeonGenerator(2 * DEFAULT_DUNGEON_WEIGHT, "/schematics/pistonFloorHall.schematic", false)); pistonTraps.add(new DungeonGenerator(2 * DEFAULT_DUNGEON_WEIGHT, "/schematics/wallFallcomboPistonHall.schematic", false)); pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/fakeTNTTrap.schematic", false)); - pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/pistonFallRuins.schematic", false)); + pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/pistonFallRuins.schematic", true)); pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/pistonSmasherHall.schematic", false)); pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/simpleDropHall.schematic", false)); pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/fallingTNThall.schematic", false)); pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/lavaPyramid.schematic", true)); pistonTraps.add(new DungeonGenerator(10, "/schematics/Trap_SK-RestlessCorridor_Open_10.schematic", true)); + pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/trap_pistonFloorPlatform_closed_100.schematic", false)); + pistonTraps.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT/2, "/schematics/trap_pistonFloorPlatform2_closed_100.schematic", false)); mazes.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallMaze1.schematic", false)); mazes.add(new DungeonGenerator(DEFAULT_DUNGEON_WEIGHT, "/schematics/smallMultilevelMaze.schematic", false)); diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index 40a3b57..89d6146 100644 --- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -85,7 +85,7 @@ channels={"DimDoorPackets"}, packetHandler = PacketHandler.class, connectionHand public class mod_pocketDim { - public static final String version = "1.5.2R1.4.0RC1"; + public static final String version = "1.5.2R1.4.1RC1"; public static final String modid = "DimDoors"; //need to clean up @@ -211,7 +211,7 @@ public class mod_pocketDim GameRegistry.registerBlock(blockDimWallPerm, "Fabric of RealityPerm"); GameRegistry.registerBlock(transientDoor, "transientDoor"); - GameRegistry.registerBlock(blockDimWall, ItemBlockDimWall.class, "Fablic of Reality"); + GameRegistry.registerBlock(blockDimWall, ItemBlockDimWall.class, "Fabric of Reality"); GameRegistry.registerPlayerTracker(tracker); @@ -441,4 +441,4 @@ public class mod_pocketDim } -} \ No newline at end of file +} diff --git a/build.xml b/build.xml index d6124d8..c6bed13 100644 --- a/build.xml +++ b/build.xml @@ -155,22 +155,21 @@ --> - - - - - - - - - - - -
- + + + + + + + + + + + + + diff --git a/mcmod.info b/mcmod.info index 0aff7ac..89eaa2b 100644 --- a/mcmod.info +++ b/mcmod.info @@ -3,7 +3,7 @@ "modid": "DimDoors", "name": "Dimensional Doors", "description": "Bend and twist reality itself, creating pocket dimensions, rifts, and much more", -"version": "1.5.2R1.4.0RC1", +"version": "1.5.2R1.4.1RC1", "credits": "Created by StevenRS11, Coded by StevenRS11 and SenseiKiwi, Logo and Testing by Jaitsu", "logoFile": "/dimdoors_logo.png", "mcversion": "", diff --git a/schematics/complexHall_largeBrokenHall_closed_100.schematic b/schematics/complexHall_largeBrokenHall_closed_100.schematic new file mode 100644 index 0000000..e908b39 Binary files /dev/null and b/schematics/complexHall_largeBrokenHall_closed_100.schematic differ diff --git a/schematics/trap_pistonFloorPlatform2_closed_100.schematic b/schematics/trap_pistonFloorPlatform2_closed_100.schematic new file mode 100644 index 0000000..cbaff4c Binary files /dev/null and b/schematics/trap_pistonFloorPlatform2_closed_100.schematic differ diff --git a/schematics/trap_pistonFloorPlatform_closed_100.schematic b/schematics/trap_pistonFloorPlatform_closed_100.schematic new file mode 100644 index 0000000..c16b568 Binary files /dev/null and b/schematics/trap_pistonFloorPlatform_closed_100.schematic differ