From bd1c1d0118b49db79badff9027f7cfe443ae4461 Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Mon, 10 Jun 2013 17:03:52 -0400 Subject: [PATCH] finished update, starting testing builds --- .../mod_pocketDim/CommonTickHandler.java | 2 + .../mod_pocketDim/ConnectionHandler.java | 2 + StevenDimDoors/mod_pocketDim/DimData.java | 2 +- .../mod_pocketDim/DimDoorsConfig.java | 2 +- StevenDimDoors/mod_pocketDim/DungeonData.java | 42 ++ .../mod_pocketDim/DungeonGenerator.java | 217 ------- .../mod_pocketDim/EventHookContainer.java | 2 + .../mod_pocketDim/OldSaveHandler.java | 1 - .../mod_pocketDim/PacketHandler.java | 2 + .../mod_pocketDim/RailTeleporter.java | 1 + .../mod_pocketDim/RiftGenerator.java | 1 + .../mod_pocketDim/SchematicLoader.java | 3 +- .../mod_pocketDim/TileEntityRift.java | 1 + .../mod_pocketDim/TransientDoor.java | 1 + .../blocks/BlockDimWallPerm.java | 2 +- .../mod_pocketDim/blocks/BlockLimbo.java | 2 +- .../mod_pocketDim/blocks/BlockRift.java | 2 +- .../mod_pocketDim/blocks/ChaosDoor.java | 2 +- .../mod_pocketDim/blocks/ExitDoor.java | 2 +- .../mod_pocketDim/blocks/dimDoor.java | 2 +- .../mod_pocketDim/blocks/dimHatch.java | 2 +- .../commands/CommandAddDungeonRift.java | 12 +- .../commands/CommandDeleteAllLinks.java | 2 +- .../commands/CommandDeleteDimData.java | 2 +- .../commands/CommandDeleteRifts.java | 2 +- .../commands/CommandEndDungeonCreation.java | 16 +- .../commands/CommandPrintDimData.java | 2 +- .../commands/CommandPrintDungeonData.java | 3 +- .../commands/CommandPruneDims.java | 2 +- .../commands/CommandStartDungeonCreation.java | 6 +- .../mod_pocketDim/customDungeonImporter.java | 153 ----- .../mod_pocketDim/helpers/DungeonHelper.java | 607 ++++++++++++++++++ .../{ => helpers}/dimHelper.java | 144 ++--- .../mod_pocketDim/helpers/yCoordHelper.java | 1 - .../mod_pocketDim/items/ItemRiftBlade.java | 2 +- .../items/ItemStabilizedRiftSignature.java | 2 +- .../mod_pocketDim/items/ItemStableFabric.java | 2 +- .../mod_pocketDim/items/itemDimDoor.java | 2 +- .../items/itemLinkSignature.java | 2 +- .../mod_pocketDim/items/itemRiftRemover.java | 2 +- .../mod_pocketDim/mod_pocketDim.java | 233 +------ .../mod_pocketDim/pocketTeleporter.java | 1 + .../mod_pocketDim/ticking/MobObelisk.java | 2 +- .../{ => world}/CustomCaveGen.java | 4 +- .../mod_pocketDim/world/LimboGenerator.java | 1 - .../mod_pocketDim/world/LimboProvider.java | 1 - .../{ => world}/limboSkyProvider.java | 2 +- .../mod_pocketDim/world/pocketGenerator.java | 2 +- .../mod_pocketDim/world/pocketProvider.java | 2 +- .../mod_pocketDimClient/ClosingRiftFX.java | 2 +- .../mod_pocketDimClient/GoggleRiftFX.java | 2 +- .../mod_pocketDimClient/RiftFX.java | 2 +- 52 files changed, 786 insertions(+), 725 deletions(-) create mode 100644 StevenDimDoors/mod_pocketDim/DungeonData.java delete mode 100644 StevenDimDoors/mod_pocketDim/DungeonGenerator.java delete mode 100644 StevenDimDoors/mod_pocketDim/OldSaveHandler.java delete mode 100644 StevenDimDoors/mod_pocketDim/customDungeonImporter.java create mode 100644 StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java rename StevenDimDoors/mod_pocketDim/{ => helpers}/dimHelper.java (92%) rename StevenDimDoors/mod_pocketDim/{ => world}/CustomCaveGen.java (99%) rename StevenDimDoors/mod_pocketDim/{ => world}/limboSkyProvider.java (99%) diff --git a/StevenDimDoors/mod_pocketDim/CommonTickHandler.java b/StevenDimDoors/mod_pocketDim/CommonTickHandler.java index e74feea0..14ccd98b 100644 --- a/StevenDimDoors/mod_pocketDim/CommonTickHandler.java +++ b/StevenDimDoors/mod_pocketDim/CommonTickHandler.java @@ -2,6 +2,8 @@ package StevenDimDoors.mod_pocketDim; import java.util.EnumSet; import java.util.Random; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.world.World; diff --git a/StevenDimDoors/mod_pocketDim/ConnectionHandler.java b/StevenDimDoors/mod_pocketDim/ConnectionHandler.java index 6b042483..df659bc0 100644 --- a/StevenDimDoors/mod_pocketDim/ConnectionHandler.java +++ b/StevenDimDoors/mod_pocketDim/ConnectionHandler.java @@ -3,6 +3,8 @@ package StevenDimDoors.mod_pocketDim; import java.util.ArrayList; import java.util.Collection; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; + import net.minecraft.network.INetworkManager; import net.minecraft.network.NetLoginHandler; import net.minecraft.network.packet.NetHandler; diff --git a/StevenDimDoors/mod_pocketDim/DimData.java b/StevenDimDoors/mod_pocketDim/DimData.java index 8998e835..fcfaf8b9 100644 --- a/StevenDimDoors/mod_pocketDim/DimData.java +++ b/StevenDimDoors/mod_pocketDim/DimData.java @@ -25,7 +25,7 @@ public class DimData implements Serializable public boolean hasBeenFilled=false; public boolean hasDoor=false; public boolean isDimRandomRift=false; - public DungeonGenerator dungeonGenerator = null; + public DungeonData dungeonGenerator = null; //public boolean isPrivatePocket = false; public HashMap>> linksInThisDim=new HashMap(); HashMap dimX; diff --git a/StevenDimDoors/mod_pocketDim/DimDoorsConfig.java b/StevenDimDoors/mod_pocketDim/DimDoorsConfig.java index 1032bf30..8aa493c0 100644 --- a/StevenDimDoors/mod_pocketDim/DimDoorsConfig.java +++ b/StevenDimDoors/mod_pocketDim/DimDoorsConfig.java @@ -173,7 +173,7 @@ public class DimDoorsConfig limboReturnRange=config.get(Configuration.CATEGORY_GENERAL, "limboReturnRange", 500); limboReturnRange.comment = "The farthest possible distance that limbo can send you upon return to the overworld."; - pocketProviderID=config.get(Configuration.CATEGORY_GENERAL, "pocketProviderID", 14); + pocketProviderID=config.get(Configuration.CATEGORY_GENERAL, "pocketProviderID", 24); limboProviderID=config.get(Configuration.CATEGORY_GENERAL, "limboProvider ID", 13); diff --git a/StevenDimDoors/mod_pocketDim/DungeonData.java b/StevenDimDoors/mod_pocketDim/DungeonData.java new file mode 100644 index 00000000..0d5ff151 --- /dev/null +++ b/StevenDimDoors/mod_pocketDim/DungeonData.java @@ -0,0 +1,42 @@ +package StevenDimDoors.mod_pocketDim; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Random; + +import net.minecraft.world.World; + + + +public class DungeonData implements Serializable +{ + + public int weight; + public String schematicPath; + public ArrayList sideRifts = new ArrayList(); + public LinkData exitLink; + public static Random rand = new Random(); + public boolean isOpen; + public int sideDoorsSoFar=0; + public int exitDoorsSoFar=0; + public int deadEndsSoFar=0; + + + + + + public DungeonData(int weight, String schematicPath, Boolean isOpen) + { + this.weight=weight; + this.schematicPath=schematicPath; + this.isOpen=isOpen; + + } + + + + + + +} \ No newline at end of file diff --git a/StevenDimDoors/mod_pocketDim/DungeonGenerator.java b/StevenDimDoors/mod_pocketDim/DungeonGenerator.java deleted file mode 100644 index cf9f1202..00000000 --- a/StevenDimDoors/mod_pocketDim/DungeonGenerator.java +++ /dev/null @@ -1,217 +0,0 @@ -package StevenDimDoors.mod_pocketDim; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Random; - -import net.minecraft.world.World; - - - -public class DungeonGenerator implements Serializable -{ - - public int weight; - public String schematicPath; - public ArrayList sideRifts = new ArrayList(); - public LinkData exitLink; - public static Random rand = new Random(); - public boolean isOpen; - public int sideDoorsSoFar=0; - public int exitDoorsSoFar=0; - public int deadEndsSoFar=0; - - - - - - public DungeonGenerator(int weight, String schematicPath, Boolean isOpen) - { - this.weight=weight; - this.schematicPath=schematicPath; - this.isOpen=isOpen; - - } - - - - - public static void generateDungeonlink(LinkData incoming) - { - //DungeonGenerator dungeon = mod_pocketDim.registeredDungeons.get(new Random().nextInt(mod_pocketDim.registeredDungeons.size())); - DungeonGenerator dungeon; - int depth = dimHelper.instance.getDimDepth(incoming.locDimID)+2; - - int depthWeight = rand.nextInt(depth)+rand.nextInt(depth)-2; - - depth=depth-2; - // DungeonGenerator - boolean flag = true; - int count=10; - try - { - - if(dimHelper.dimList.get(incoming.destDimID)!=null&&dimHelper.dimList.get(incoming.destDimID).dungeonGenerator!=null) - { - mod_pocketDim.loader.init(incoming); - dimHelper.dimList.get(incoming.destDimID).dungeonGenerator=dimHelper.dimList.get(incoming.destDimID).dungeonGenerator; - return; - } - if(incoming.destYCoord>15) - { - do - { - count--; - flag = true; - dungeon = mod_pocketDim.registeredDungeons.get(rand.nextInt(mod_pocketDim.registeredDungeons.size())); - - if(depth<=1) - { - if(rand.nextBoolean()) - { - dungeon = mod_pocketDim.complexHalls.get(rand.nextInt(mod_pocketDim.complexHalls.size())); - - } - else if(rand.nextBoolean()) - { - dungeon = mod_pocketDim.hubs.get(rand.nextInt(mod_pocketDim.hubs.size())); - - } - else if(rand.nextBoolean()) - { - dungeon = mod_pocketDim.hubs.get(rand.nextInt(mod_pocketDim.hubs.size())); - - } - else if(mod_pocketDim.deadEnds.contains(dungeon)||mod_pocketDim.exits.contains(dungeon)) - { - flag=false; - } - - - - } - else if(depth<=3&&(mod_pocketDim.deadEnds.contains(dungeon)||mod_pocketDim.exits.contains(dungeon)||rand.nextBoolean())) - { - if(rand.nextBoolean()) - { - dungeon = mod_pocketDim.hubs.get(rand.nextInt(mod_pocketDim.hubs.size())); - - } - else if(rand.nextBoolean()) - { - dungeon = mod_pocketDim.mazes.get(rand.nextInt(mod_pocketDim.mazes.size())); - } - else if(rand.nextBoolean()) - { - dungeon = mod_pocketDim.pistonTraps.get(rand.nextInt(mod_pocketDim.pistonTraps.size())); - - } - else - { - flag=false; - } - } - else if(rand.nextInt(3)==0&&!mod_pocketDim.complexHalls.contains(dungeon)) - { - if(rand.nextInt(3)==0) - { - dungeon = mod_pocketDim.simpleHalls.get(rand.nextInt(mod_pocketDim.simpleHalls.size())); - } - else if(rand.nextBoolean()) - { - dungeon = mod_pocketDim.pistonTraps.get(rand.nextInt(mod_pocketDim.pistonTraps.size())); - - } - else if(depth<4) - { - dungeon = mod_pocketDim.hubs.get(rand.nextInt(mod_pocketDim.hubs.size())); - - } - - } - else if(depthWeight-depthWeight/2>depth-4&&(mod_pocketDim.deadEnds.contains(dungeon)||mod_pocketDim.exits.contains(dungeon))) - { - if(rand.nextBoolean()) - { - dungeon = mod_pocketDim.simpleHalls.get(rand.nextInt(mod_pocketDim.simpleHalls.size())); - } - else if(rand.nextBoolean()) - { - dungeon = mod_pocketDim.complexHalls.get(rand.nextInt(mod_pocketDim.complexHalls.size())); - } - else if(rand.nextBoolean()) - { - dungeon = mod_pocketDim.pistonTraps.get(rand.nextInt(mod_pocketDim.pistonTraps.size())); - - } - else - { - flag=false; - } - } - else if(depthWeight>7&&mod_pocketDim.hubs.contains(dungeon)) - { - if(rand.nextInt(12)+510&&mod_pocketDim.hubs.contains(dungeon)) - { - flag = false; - } - - } - while(!flag&&count>0); - } - else - { - dungeon= mod_pocketDim.defaultUp; - } - } - catch(Exception e) - { - if(mod_pocketDim.registeredDungeons.size()>0) - { - dungeon = mod_pocketDim.registeredDungeons.get(rand.nextInt(mod_pocketDim.registeredDungeons.size())); - } - else - { - e.printStackTrace(); - return; - } - } - - - - dimHelper.dimList.get(incoming.destDimID).dungeonGenerator=dungeon; - //mod_pocketDim.loader.generateSchematic(incoming,0,0,0); - - - - - - - - - } - -} \ No newline at end of file diff --git a/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/StevenDimDoors/mod_pocketDim/EventHookContainer.java index 83cf06b4..9f47f4d4 100644 --- a/StevenDimDoors/mod_pocketDim/EventHookContainer.java +++ b/StevenDimDoors/mod_pocketDim/EventHookContainer.java @@ -5,6 +5,8 @@ import java.util.Iterator; import java.util.List; import java.util.Random; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; + import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/StevenDimDoors/mod_pocketDim/OldSaveHandler.java b/StevenDimDoors/mod_pocketDim/OldSaveHandler.java deleted file mode 100644 index cdd62dbb..00000000 --- a/StevenDimDoors/mod_pocketDim/OldSaveHandler.java +++ /dev/null @@ -1 +0,0 @@ -//doesnt do anything \ No newline at end of file diff --git a/StevenDimDoors/mod_pocketDim/PacketHandler.java b/StevenDimDoors/mod_pocketDim/PacketHandler.java index fc518bd0..66b96a0a 100644 --- a/StevenDimDoors/mod_pocketDim/PacketHandler.java +++ b/StevenDimDoors/mod_pocketDim/PacketHandler.java @@ -14,6 +14,8 @@ import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.world.World; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; + import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteStreams; diff --git a/StevenDimDoors/mod_pocketDim/RailTeleporter.java b/StevenDimDoors/mod_pocketDim/RailTeleporter.java index cb9d12ef..6fb350d9 100644 --- a/StevenDimDoors/mod_pocketDim/RailTeleporter.java +++ b/StevenDimDoors/mod_pocketDim/RailTeleporter.java @@ -1,5 +1,6 @@ package StevenDimDoors.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.player.EntityPlayer; diff --git a/StevenDimDoors/mod_pocketDim/RiftGenerator.java b/StevenDimDoors/mod_pocketDim/RiftGenerator.java index faac10d3..2282a5f5 100644 --- a/StevenDimDoors/mod_pocketDim/RiftGenerator.java +++ b/StevenDimDoors/mod_pocketDim/RiftGenerator.java @@ -2,6 +2,7 @@ package StevenDimDoors.mod_pocketDim; import java.util.Random; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.items.ItemRiftBlade; import net.minecraft.block.Block; diff --git a/StevenDimDoors/mod_pocketDim/SchematicLoader.java b/StevenDimDoors/mod_pocketDim/SchematicLoader.java index 48bfdedd..bd0618b8 100644 --- a/StevenDimDoors/mod_pocketDim/SchematicLoader.java +++ b/StevenDimDoors/mod_pocketDim/SchematicLoader.java @@ -24,6 +24,7 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.storage.ExtendedBlockStorage; import net.minecraftforge.common.ChestGenHooks; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper; public class SchematicLoader @@ -146,7 +147,7 @@ public class SchematicLoader } public int transformMetadata(int metadata, int orientation, int blockID) { - if(mod_pocketDim.metadataFlipList.contains(blockID)) + if(mod_pocketDim.dungeonHelper.metadataFlipList.contains(blockID)) { diff --git a/StevenDimDoors/mod_pocketDim/TileEntityRift.java b/StevenDimDoors/mod_pocketDim/TileEntityRift.java index 733c1fb0..42d317ec 100644 --- a/StevenDimDoors/mod_pocketDim/TileEntityRift.java +++ b/StevenDimDoors/mod_pocketDim/TileEntityRift.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper; import StevenDimDoors.mod_pocketDim.ticking.MobObelisk; diff --git a/StevenDimDoors/mod_pocketDim/TransientDoor.java b/StevenDimDoors/mod_pocketDim/TransientDoor.java index ae5a069c..bc99b2b2 100644 --- a/StevenDimDoors/mod_pocketDim/TransientDoor.java +++ b/StevenDimDoors/mod_pocketDim/TransientDoor.java @@ -3,6 +3,7 @@ package StevenDimDoors.mod_pocketDim; import java.util.Random; import StevenDimDoors.mod_pocketDim.blocks.ExitDoor; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java b/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java index e2f19f53..bd195504 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java +++ b/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java @@ -3,8 +3,8 @@ package StevenDimDoors.mod_pocketDim.blocks; import java.util.Random; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper; import net.minecraft.block.Block; diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockLimbo.java b/StevenDimDoors/mod_pocketDim/blocks/BlockLimbo.java index c68b9ea1..68b935d0 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/BlockLimbo.java +++ b/StevenDimDoors/mod_pocketDim/blocks/BlockLimbo.java @@ -6,8 +6,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import StevenDimDoors.mod_pocketDim.Point3D; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java b/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java index e598292f..63055b6a 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java +++ b/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java @@ -13,8 +13,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import StevenDimDoors.mod_pocketDim.PacketHandler; import StevenDimDoors.mod_pocketDim.TileEntityRift; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDimClient.ClosingRiftFX; import StevenDimDoors.mod_pocketDimClient.GoggleRiftFX; import StevenDimDoors.mod_pocketDimClient.RiftFX; diff --git a/StevenDimDoors/mod_pocketDim/blocks/ChaosDoor.java b/StevenDimDoors/mod_pocketDim/blocks/ChaosDoor.java index a1dfffc5..611b3572 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/ChaosDoor.java +++ b/StevenDimDoors/mod_pocketDim/blocks/ChaosDoor.java @@ -3,8 +3,8 @@ package StevenDimDoors.mod_pocketDim.blocks; import java.util.Random; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; diff --git a/StevenDimDoors/mod_pocketDim/blocks/ExitDoor.java b/StevenDimDoors/mod_pocketDim/blocks/ExitDoor.java index 885534c0..0b904147 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/ExitDoor.java +++ b/StevenDimDoors/mod_pocketDim/blocks/ExitDoor.java @@ -4,8 +4,8 @@ import java.util.Random; import StevenDimDoors.mod_pocketDim.DimData; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper; import cpw.mods.fml.relauncher.Side; diff --git a/StevenDimDoors/mod_pocketDim/blocks/dimDoor.java b/StevenDimDoors/mod_pocketDim/blocks/dimDoor.java index 64de4f68..82ffb50b 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/dimDoor.java +++ b/StevenDimDoors/mod_pocketDim/blocks/dimDoor.java @@ -4,8 +4,8 @@ import java.util.Random; import StevenDimDoors.mod_pocketDim.LinkData; import StevenDimDoors.mod_pocketDim.TileEntityDimDoor; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; diff --git a/StevenDimDoors/mod_pocketDim/blocks/dimHatch.java b/StevenDimDoors/mod_pocketDim/blocks/dimHatch.java index b9a0a821..97de7736 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/dimHatch.java +++ b/StevenDimDoors/mod_pocketDim/blocks/dimHatch.java @@ -2,8 +2,8 @@ package StevenDimDoors.mod_pocketDim.blocks; import StevenDimDoors.mod_pocketDim.DimData; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.world.pocketProvider; import net.minecraft.block.BlockTrapDoor; import net.minecraft.block.material.Material; diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandAddDungeonRift.java b/StevenDimDoors/mod_pocketDim/commands/CommandAddDungeonRift.java index a4440664..51d65c6a 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandAddDungeonRift.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandAddDungeonRift.java @@ -5,10 +5,10 @@ import java.util.ArrayList; import cpw.mods.fml.common.FMLCommonHandler; import StevenDimDoors.mod_pocketDim.DimData; -import StevenDimDoors.mod_pocketDim.DungeonGenerator; +import StevenDimDoors.mod_pocketDim.DungeonData; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.util.MathHelper; @@ -54,7 +54,7 @@ public class CommandAddDungeonRift extends CommandBase } else if(var2.length!=0&&var2[0].equals("list")) { - for(DungeonGenerator dungeonGen : mod_pocketDim.registeredDungeons) + for(DungeonData dungeonGen : mod_pocketDim.dungeonHelper.registeredDungeons) { String dungeonName =dungeonGen.schematicPath; if(dungeonName.contains("DimDoors_Custom_schematics")) @@ -69,7 +69,7 @@ public class CommandAddDungeonRift extends CommandBase } - for(DungeonGenerator dungeonGen : mod_pocketDim.customDungeons) + for(DungeonData dungeonGen : mod_pocketDim.dungeonHelper.customDungeons) { String dungeonName =dungeonGen.schematicPath; if(dungeonName.contains("DimDoors_Custom_schematics")) @@ -89,7 +89,7 @@ public class CommandAddDungeonRift extends CommandBase else if(var2.length!=0) { - for(DungeonGenerator dungeonGen : mod_pocketDim.registeredDungeons) + for(DungeonData dungeonGen : mod_pocketDim.dungeonHelper.registeredDungeons) { String dungeonName =dungeonGen.schematicPath.toLowerCase(); @@ -113,7 +113,7 @@ public class CommandAddDungeonRift extends CommandBase } - for(DungeonGenerator dungeonGen : mod_pocketDim.customDungeons) + for(DungeonData dungeonGen : mod_pocketDim.dungeonHelper.customDungeons) { String dungeonName =dungeonGen.schematicPath.toLowerCase(); diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java b/StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java index daa6c7f2..2f406c97 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java @@ -6,8 +6,8 @@ import cpw.mods.fml.common.FMLCommonHandler; import StevenDimDoors.mod_pocketDim.DimData; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.world.World; diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteDimData.java b/StevenDimDoors/mod_pocketDim/commands/CommandDeleteDimData.java index 5dcca588..4865ef14 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteDimData.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandDeleteDimData.java @@ -7,8 +7,8 @@ import cpw.mods.fml.common.FMLCommonHandler; import StevenDimDoors.mod_pocketDim.DimData; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.world.World; diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java b/StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java index 9c916885..cc1cadbc 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java @@ -6,8 +6,8 @@ import cpw.mods.fml.common.FMLCommonHandler; import StevenDimDoors.mod_pocketDim.DimData; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.world.World; diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandEndDungeonCreation.java b/StevenDimDoors/mod_pocketDim/commands/CommandEndDungeonCreation.java index c5946e5f..79edafc8 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandEndDungeonCreation.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandEndDungeonCreation.java @@ -1,9 +1,9 @@ package StevenDimDoors.mod_pocketDim.commands; -import StevenDimDoors.mod_pocketDim.DungeonGenerator; -import StevenDimDoors.mod_pocketDim.customDungeonImporter; -import StevenDimDoors.mod_pocketDim.dimHelper; +import StevenDimDoors.mod_pocketDim.DungeonData; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; @@ -25,7 +25,7 @@ public class CommandEndDungeonCreation extends CommandBase EntityPlayer player =this.getCommandSenderAsPlayer(var1); - if(!customDungeonImporter.customDungeonStatus.containsKey(player.worldObj.provider.dimensionId)) + if(!mod_pocketDim.dungeonHelper.customDungeonStatus.containsKey(player.worldObj.provider.dimensionId)) { if(var2.length<2) { @@ -53,13 +53,13 @@ public class CommandEndDungeonCreation extends CommandBase } else { - DungeonGenerator newDungeon = customDungeonImporter.exportDungeon(player.worldObj, x, y, z, mod_pocketDim.schematicContainer+"/"+var2[0]+".schematic"); + DungeonData newDungeon = mod_pocketDim.dungeonHelper.exportDungeon(player.worldObj, x, y, z, mod_pocketDim.schematicContainer+"/"+var2[0]+".schematic"); player.sendChatToPlayer("created dungeon schematic in " +mod_pocketDim.schematicContainer+"/"+var2[0]+".schematic"); - mod_pocketDim.customDungeons.add(newDungeon); + mod_pocketDim.dungeonHelper.customDungeons.add(newDungeon); - if(customDungeonImporter.customDungeonStatus.containsKey(player.worldObj.provider.dimensionId)&&!player.worldObj.isRemote) + if(mod_pocketDim.dungeonHelper.customDungeonStatus.containsKey(player.worldObj.provider.dimensionId)&&!player.worldObj.isRemote) { - dimHelper.instance.teleportToPocket(player.worldObj, customDungeonImporter.customDungeonStatus.get(player.worldObj.provider.dimensionId), player); + dimHelper.instance.teleportToPocket(player.worldObj, mod_pocketDim.dungeonHelper.customDungeonStatus.get(player.worldObj.provider.dimensionId), player); } } diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandPrintDimData.java b/StevenDimDoors/mod_pocketDim/commands/CommandPrintDimData.java index 2d12e0a8..143bd838 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandPrintDimData.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandPrintDimData.java @@ -7,8 +7,8 @@ import cpw.mods.fml.common.FMLCommonHandler; import StevenDimDoors.mod_pocketDim.DimData; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.world.World; diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandPrintDungeonData.java b/StevenDimDoors/mod_pocketDim/commands/CommandPrintDungeonData.java index e5871bd1..67459489 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandPrintDungeonData.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandPrintDungeonData.java @@ -6,9 +6,8 @@ import cpw.mods.fml.common.FMLCommonHandler; import StevenDimDoors.mod_pocketDim.DimData; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.customDungeonImporter; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandPruneDims.java b/StevenDimDoors/mod_pocketDim/commands/CommandPruneDims.java index d64d20c3..d5eae82c 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandPruneDims.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandPruneDims.java @@ -7,7 +7,7 @@ import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import StevenDimDoors.mod_pocketDim.DimData; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.dimHelper; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; public class CommandPruneDims extends CommandBase { diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandStartDungeonCreation.java b/StevenDimDoors/mod_pocketDim/commands/CommandStartDungeonCreation.java index 90b4c21e..aecc33f8 100644 --- a/StevenDimDoors/mod_pocketDim/commands/CommandStartDungeonCreation.java +++ b/StevenDimDoors/mod_pocketDim/commands/CommandStartDungeonCreation.java @@ -6,9 +6,9 @@ import cpw.mods.fml.common.FMLCommonHandler; import StevenDimDoors.mod_pocketDim.DimData; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.customDungeonImporter; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; @@ -40,7 +40,7 @@ public class CommandStartDungeonCreation extends CommandBase dimHelper.instance.teleportToPocket(player.worldObj, link, player); - customDungeonImporter.customDungeonStatus.put(player.worldObj.provider.dimensionId, dimHelper.instance.getLinkDataFromCoords(link.destXCoord, link.destYCoord, link.destZCoord, link.destDimID)); + mod_pocketDim.dungeonHelper.customDungeonStatus.put(player.worldObj.provider.dimensionId, dimHelper.instance.getLinkDataFromCoords(link.destXCoord, link.destYCoord, link.destZCoord, link.destDimID)); this.getCommandSenderAsPlayer(var1).sendChatToPlayer("DimID = "+ link.destDimID); } diff --git a/StevenDimDoors/mod_pocketDim/customDungeonImporter.java b/StevenDimDoors/mod_pocketDim/customDungeonImporter.java deleted file mode 100644 index a44b2dad..00000000 --- a/StevenDimDoors/mod_pocketDim/customDungeonImporter.java +++ /dev/null @@ -1,153 +0,0 @@ -package StevenDimDoors.mod_pocketDim; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockComparator; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.BlockDoor; -import net.minecraft.block.BlockRedstoneRepeater; -import net.minecraft.block.BlockStairs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompressedStreamTools; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.tileentity.TileEntityDispenser; -import net.minecraft.util.WeightedRandomChestContent; -import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.storage.ExtendedBlockStorage; -import net.minecraftforge.common.ChestGenHooks; -import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper; -import StevenDimDoors.mod_pocketDim.helpers.jnbt.ByteArrayTag; -import StevenDimDoors.mod_pocketDim.helpers.jnbt.CompoundTag; -import StevenDimDoors.mod_pocketDim.helpers.jnbt.NBTOutputStream; -import StevenDimDoors.mod_pocketDim.helpers.jnbt.ShortTag; - -public class customDungeonImporter -{ - NBTTagCompound nbtdata= new NBTTagCompound(); - - public static HashMap customDungeonStatus = new HashMap(); - - - public static DungeonGenerator exportDungeon(World world, int xI, int yI, int zI, String file) - { - int xMin; - int yMin; - int zMin; - - int xMax; - int yMax; - int zMax; - - xMin=xMax=xI; - yMin=yMax=yI; - zMin=zMax=zI; - - for(int count=0;count<50;count++) - { - - if(world.getBlockId(xMin, yI, zI)!=mod_pocketDim.blockDimWallPermID) - { - xMin--; - } - if(world.getBlockId(xI, yMin, zI)!=mod_pocketDim.blockDimWallPermID) - { - yMin--; - } - if(world.getBlockId(xI, yI, zMin)!=mod_pocketDim.blockDimWallPermID) - { - zMin--; - } - if(world.getBlockId(xMax, yI, zI)!=mod_pocketDim.blockDimWallPermID) - { - xMax++; - } - if(world.getBlockId(xI, yMax, zI)!=mod_pocketDim.blockDimWallPermID) - { - yMax++; - } - if(world.getBlockId(xI, yI, zMax)!=mod_pocketDim.blockDimWallPermID) - { - zMax++; - } - } - - short width =(short) (xMax-xMin); - short height= (short) (yMax-yMin); - short length= (short) (zMax-zMin); - - - - byte[] blocks = new byte[width * height * length]; - byte[] addBlocks = null; - byte[] blockData = new byte[width * height * length]; - - for (int x = 0; x < width; ++x) - { - for (int y = 0; y < height; ++y) { - for (int z = 0; z < length; ++z) { - int index = y * width * length + z * width + x; - int blockID = world.getBlockId(x+xMin, y+yMin, z+zMin); - int meta= world.getBlockMetadata(x+xMin, y+yMin, z+zMin); - // Save 4096 IDs in an AddBlocks section - if (blockID > 255) { - if (addBlocks == null) { // Lazily create section - addBlocks = new byte[(blocks.length >> 1) + 1]; - } - - addBlocks[index >> 1] = (byte) (((index & 1) == 0) ? - addBlocks[index >> 1] & 0xF0 | (blockID >> 8) & 0xF - : addBlocks[index >> 1] & 0xF | ((blockID >> 8) & 0xF) << 4); - } - - blocks[index] = (byte) blockID; - blockData[index] = (byte) meta; - } - } - } - /** - * - * this.nbtdata.setShort("Width", width); - this.nbtdata.setShort("Height", height); - this.nbtdata.setShort("Length", length); - - this.nbtdata.setByteArray("Blocks", blocks); - this.nbtdata.setByteArray("Data", blockData); - */ - - HashMap schematic = new HashMap(); - schematic.put("Blocks", new ByteArrayTag("Blocks", blocks)); - schematic.put("Data", new ByteArrayTag("Data", blockData)); - - schematic.put("Width", new ShortTag("Width", (short) width)); - schematic.put("Length", new ShortTag("Length", (short) length)); - schematic.put("Height", new ShortTag("Height", (short) height)); - if (addBlocks != null) { - schematic.put("AddBlocks", new ByteArrayTag("AddBlocks", addBlocks)); - } - - CompoundTag schematicTag = new CompoundTag("Schematic", schematic); - try{ - - - NBTOutputStream stream = new NBTOutputStream(new FileOutputStream(file)); - stream.writeTag(schematicTag); - stream.close(); - } - catch(Exception e) - { - e.printStackTrace(); - } - return new DungeonGenerator(0,file,true); - } - -} \ No newline at end of file diff --git a/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java b/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java new file mode 100644 index 00000000..0774e5b3 --- /dev/null +++ b/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java @@ -0,0 +1,607 @@ +package StevenDimDoors.mod_pocketDim.helpers; + +import java.io.File; +import java.io.FileOutputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.world.World; +import StevenDimDoors.mod_pocketDim.DungeonData; +import StevenDimDoors.mod_pocketDim.LinkData; +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.NBTOutputStream; +import StevenDimDoors.mod_pocketDim.helpers.jnbt.ShortTag; + +/** + + * @Return + */ + + + +public class DungeonHelper +{ + + public DungeonHelper() + { + + } + + private Random rand = new Random(); + + public HashMap customDungeonStatus = new HashMap(); + + public ArrayList customDungeons = new ArrayList(); + + public ArrayList registeredDungeons = new ArrayList(); + + public ArrayList weightedDungeonGenList = new ArrayList(); + + + public ArrayList simpleHalls = new ArrayList(); + + + public ArrayList complexHalls = new ArrayList(); + + + public ArrayList deadEnds = new ArrayList(); + + + public ArrayList hubs = new ArrayList(); + + + public ArrayList mazes = new ArrayList(); + + + public ArrayList pistonTraps = new ArrayList(); + + + public ArrayList exits = new ArrayList(); + + + + public ArrayList metadataFlipList = new ArrayList(); + + public ArrayList metadataNextList = new ArrayList(); + + public DungeonData defaultUp = new DungeonData(0, "/schematic/simpleStairsUp.schematic", true); + + public void registerCustomDungeon(File schematicFile) + { + try + { + + if(schematicFile.getName().contains(".schematic")) + { + String[] name = schematicFile.getName().split("_"); + + if(name.length<4) + { + System.out.println("Importing custom dungeon gen mechanics failed, adding to secondary list"); + this.customDungeons.add(new DungeonData(0,schematicFile.getAbsolutePath(),true)); + System.out.println("Imported "+schematicFile.getName()); + + + } + else + { + int count=0; + + boolean open= name[2].equals("open"); + + int weight = Integer.parseInt(name[3].replace(".schematic", "")); + + String path = schematicFile.getAbsolutePath(); + + while(count 255) { + if (addBlocks == null) { // Lazily create section + addBlocks = new byte[(blocks.length >> 1) + 1]; + } + + addBlocks[index >> 1] = (byte) (((index & 1) == 0) ? + addBlocks[index >> 1] & 0xF0 | (blockID >> 8) & 0xF + : addBlocks[index >> 1] & 0xF | ((blockID >> 8) & 0xF) << 4); + } + + blocks[index] = (byte) blockID; + blockData[index] = (byte) meta; + } + } + } + /** + * + * this.nbtdata.setShort("Width", width); + this.nbtdata.setShort("Height", height); + this.nbtdata.setShort("Length", length); + + this.nbtdata.setByteArray("Blocks", blocks); + this.nbtdata.setByteArray("Data", blockData); + */ + + HashMap schematic = new HashMap(); + schematic.put("Blocks", new ByteArrayTag("Blocks", blocks)); + schematic.put("Data", new ByteArrayTag("Data", blockData)); + + schematic.put("Width", new ShortTag("Width", (short) width)); + schematic.put("Length", new ShortTag("Length", (short) length)); + schematic.put("Height", new ShortTag("Height", (short) height)); + if (addBlocks != null) { + schematic.put("AddBlocks", new ByteArrayTag("AddBlocks", addBlocks)); + } + + CompoundTag schematicTag = new CompoundTag("Schematic", schematic); + try + { + + + NBTOutputStream stream = new NBTOutputStream(new FileOutputStream(file)); + stream.writeTag(schematicTag); + stream.close(); + } + catch(Exception e) + { + e.printStackTrace(); + } + this.registerCustomDungeon(new File(file)); + + return new DungeonData(0,file,true); + } + + + + public void generateDungeonlink(LinkData incoming) + { + //DungeonGenerator dungeon = mod_pocketDim.registeredDungeons.get(new Random().nextInt(mod_pocketDim.registeredDungeons.size())); + DungeonData dungeon; + int depth = dimHelper.instance.getDimDepth(incoming.locDimID)+2; + + int depthWeight = rand.nextInt(depth)+rand.nextInt(depth)-2; + + depth=depth-2; + // DungeonGenerator + boolean flag = true; + int count=10; + try + { + + if(dimHelper.dimList.get(incoming.destDimID)!=null&&dimHelper.dimList.get(incoming.destDimID).dungeonGenerator!=null) + { + mod_pocketDim.loader.init(incoming); + dimHelper.dimList.get(incoming.destDimID).dungeonGenerator=dimHelper.dimList.get(incoming.destDimID).dungeonGenerator; + return; + } + if(incoming.destYCoord>15) + { + do + { + count--; + flag = true; + dungeon = this.weightedDungeonGenList.get(rand.nextInt(weightedDungeonGenList.size())); + + if(depth<=1) + { + if(rand.nextBoolean()) + { + dungeon = complexHalls.get(rand.nextInt(complexHalls.size())); + + } + else if(rand.nextBoolean()) + { + dungeon = hubs.get(rand.nextInt(hubs.size())); + + } + else if(rand.nextBoolean()) + { + dungeon = hubs.get(rand.nextInt(hubs.size())); + + } + else if(deadEnds.contains(dungeon)||exits.contains(dungeon)) + { + flag=false; + } + + + + } + else if(depth<=3&&(deadEnds.contains(dungeon)||exits.contains(dungeon)||rand.nextBoolean())) + { + if(rand.nextBoolean()) + { + dungeon = hubs.get(rand.nextInt(hubs.size())); + + } + else if(rand.nextBoolean()) + { + dungeon = mazes.get(rand.nextInt(mazes.size())); + } + else if(rand.nextBoolean()) + { + dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size())); + + } + else + { + flag=false; + } + } + else if(rand.nextInt(3)==0&&!complexHalls.contains(dungeon)) + { + if(rand.nextInt(3)==0) + { + dungeon = simpleHalls.get(rand.nextInt(simpleHalls.size())); + } + else if(rand.nextBoolean()) + { + dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size())); + + } + else if(depth<4) + { + dungeon = hubs.get(rand.nextInt(hubs.size())); + + } + + } + else if(depthWeight-depthWeight/2>depth-4&&(deadEnds.contains(dungeon)||exits.contains(dungeon))) + { + if(rand.nextBoolean()) + { + dungeon = simpleHalls.get(rand.nextInt(simpleHalls.size())); + } + else if(rand.nextBoolean()) + { + dungeon = complexHalls.get(rand.nextInt(complexHalls.size())); + } + else if(rand.nextBoolean()) + { + dungeon = pistonTraps.get(rand.nextInt(pistonTraps.size())); + + } + else + { + flag=false; + } + } + else if(depthWeight>7&&hubs.contains(dungeon)) + { + if(rand.nextInt(12)+510&&hubs.contains(dungeon)) + { + flag = false; + } + + } + while(!flag&&count>0); + } + else + { + dungeon= defaultUp; + } + } + catch(Exception e) + { + if(weightedDungeonGenList.size()>0) + { + dungeon = weightedDungeonGenList.get(rand.nextInt(weightedDungeonGenList.size())); + } + else + { + e.printStackTrace(); + return; + } + } + + + + dimHelper.dimList.get(incoming.destDimID).dungeonGenerator=dungeon; + //loader.generateSchematic(incoming,0,0,0); + + + + + + + + + } + + + + +} \ No newline at end of file diff --git a/StevenDimDoors/mod_pocketDim/dimHelper.java b/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java similarity index 92% rename from StevenDimDoors/mod_pocketDim/dimHelper.java rename to StevenDimDoors/mod_pocketDim/helpers/dimHelper.java index 96ebfbe5..c3ac18da 100644 --- a/StevenDimDoors/mod_pocketDim/dimHelper.java +++ b/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java @@ -1,4 +1,4 @@ -package StevenDimDoors.mod_pocketDim; +package StevenDimDoors.mod_pocketDim.helpers; /** * This class regulates all the operations involving the storage and manipulation of dimensions. It handles saving dim data, teleporting the player, and * creating/registering new dimensions as well as loading old dimensions on startup @@ -16,6 +16,12 @@ import java.util.Iterator; import java.util.Random; import java.util.Set; +import StevenDimDoors.mod_pocketDim.DimData; +import StevenDimDoors.mod_pocketDim.LinkData; +import StevenDimDoors.mod_pocketDim.ObjectSaveInputStream; +import StevenDimDoors.mod_pocketDim.PacketHandler; +import StevenDimDoors.mod_pocketDim.TileEntityRift; +import StevenDimDoors.mod_pocketDim.mod_pocketDim; import StevenDimDoors.mod_pocketDim.world.LimboProvider; import StevenDimDoors.mod_pocketDim.world.pocketProvider; @@ -214,7 +220,6 @@ public class dimHelper extends DimensionManager PotionEffect effect = (PotionEffect)potionEffect; player.playerNetServerHandler.sendPacketToPlayer(new Packet41EntityEffect(player.entityId, effect)); - } player.playerNetServerHandler.sendPacketToPlayer(new Packet43Experience(player.experience, player.experienceTotal, player.experienceLevel)); @@ -347,92 +352,67 @@ public class dimHelper extends DimensionManager if(!world.isRemote) - { - + { entity = this.teleportEntity(world, entity, linkData); - - - } - if(entity instanceof EntityPlayerMP) - { + if(entity instanceof EntityPlayerMP) + { - if(world.provider.dimensionId!=linkData.destDimID) - { - GameRegistry.onPlayerChangedDimension((EntityPlayer)entity); - } + if(world.provider.dimensionId!=linkData.destDimID) + { + GameRegistry.onPlayerChangedDimension((EntityPlayer)entity); + } - } - + } + - entity.worldObj.playSoundEffect(entity.posX, entity.posY, entity.posZ, "mob.endermen.portal", 1.0F, 1.0F); + entity.worldObj.playSoundEffect(entity.posX, entity.posY, entity.posZ, "mob.endermen.portal", 1.0F, 1.0F); + - - int playerXCoord=MathHelper.floor_double(entity.posX); - int playerYCoord=MathHelper.floor_double(entity.posY); - int playerZCoord=MathHelper.floor_double(entity.posZ); - - if(!entity.worldObj.isBlockOpaqueCube(playerXCoord, playerYCoord-1,playerZCoord )&&this.dimList.get(linkData.locDimID).isDimRandomRift&&!linkData.hasGennedDoor) - { - - for(int count=0;count<20;count++) - { - if(entity.worldObj.isBlockOpaqueCube(playerXCoord, playerYCoord-1-count,playerZCoord)) - { - break; - } - if(count==19) - { - entity.worldObj.setBlock(playerXCoord, playerYCoord-1, playerZCoord, mod_pocketDim.blockDimWallID); - - } - } - - - } - - if(entity.worldObj.getBlockId(playerXCoord, playerYCoord-1,playerZCoord )==Block.lavaStill.blockID) - { - entity.worldObj.setBlock(playerXCoord, playerYCoord-1, playerZCoord, mod_pocketDim.blockDimWallID); - - } - - this.generateDoor(world,linkData); - - - - if(Block.blocksList.length>=entity.worldObj.getBlockId(playerXCoord,playerYCoord+1,playerZCoord)&&!entity.worldObj.isAirBlock(playerXCoord,playerYCoord+1,playerZCoord)) - { - if(Block.blocksList[entity.worldObj.getBlockId(playerXCoord,playerYCoord+1,playerZCoord)].isOpaqueCube()) - { - entity.worldObj.setBlock(playerXCoord,playerYCoord+1,playerZCoord,0); - - } - } - if(Block.blocksList.length>=entity.worldObj.getBlockId(playerXCoord,playerYCoord,playerZCoord)&&!entity.worldObj.isAirBlock(playerXCoord,playerYCoord,playerZCoord)) - { - if(Block.blocksList[entity.worldObj.getBlockId(playerXCoord,playerYCoord,playerZCoord)].isOpaqueCube()) - { - entity.worldObj.setBlock(playerXCoord,playerYCoord,playerZCoord,0); - - } - } - /** - if(entity.worldObj.getBlockId(x, y, z)==mod_pocketDim.dimDoorID||entity.worldObj.getBlockId(x, y, z)==mod_pocketDim.ExitDoorID) - { - if(this.getLinkDataFromCoords(x, y, z, entity.worldObj)!=null) - { - //System.out.println("updated link orientation"); - this.getLinkDataFromCoords(x, y, z, entity.worldObj).linkOrientation= entity.worldObj.getBlockMetadata(x, y -1, z); - - } - - - - } - **/ - + int playerXCoord=MathHelper.floor_double(entity.posX); + int playerYCoord=MathHelper.floor_double(entity.posY); + int playerZCoord=MathHelper.floor_double(entity.posZ); + + if(!entity.worldObj.isBlockOpaqueCube(playerXCoord, playerYCoord-1,playerZCoord )&&this.dimList.get(linkData.locDimID).isDimRandomRift&&!linkData.hasGennedDoor) + { + for(int count=0;count<20;count++) + { + if(entity.worldObj.isBlockOpaqueCube(playerXCoord, playerYCoord-1-count,playerZCoord)) + { + break; + } + if(count==19) + { + entity.worldObj.setBlock(playerXCoord, playerYCoord-1, playerZCoord, mod_pocketDim.blockDimWallID); + } + } + } + + if(entity.worldObj.getBlockId(playerXCoord, playerYCoord-1,playerZCoord )==Block.lavaStill.blockID) + { + entity.worldObj.setBlock(playerXCoord, playerYCoord-1, playerZCoord, mod_pocketDim.blockDimWallID); + } + + this.generateDoor(world,linkData); + + + + if(Block.blocksList.length>=entity.worldObj.getBlockId(playerXCoord,playerYCoord+1,playerZCoord)&&!entity.worldObj.isAirBlock(playerXCoord,playerYCoord+1,playerZCoord)) + { + if(Block.blocksList[entity.worldObj.getBlockId(playerXCoord,playerYCoord+1,playerZCoord)].isOpaqueCube()) + { + entity.worldObj.setBlock(playerXCoord,playerYCoord+1,playerZCoord,0); + } + } + if(Block.blocksList.length>=entity.worldObj.getBlockId(playerXCoord,playerYCoord,playerZCoord)&&!entity.worldObj.isAirBlock(playerXCoord,playerYCoord,playerZCoord)) + { + if(Block.blocksList[entity.worldObj.getBlockId(playerXCoord,playerYCoord,playerZCoord)].isOpaqueCube()) + { + entity.worldObj.setBlock(playerXCoord,playerYCoord,playerZCoord,0); + + } + } } } else if(!this.dimList.containsKey(world.provider.dimensionId)) @@ -1028,7 +1008,7 @@ public class dimHelper extends DimensionManager if(isRandomRift) { - DungeonGenerator.generateDungeonlink(link); + mod_pocketDim.dungeonHelper.generateDungeonlink(link); } diff --git a/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java b/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java index 098b5a65..789bb272 100644 --- a/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java +++ b/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java @@ -1,7 +1,6 @@ package StevenDimDoors.mod_pocketDim.helpers; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.dimHelper; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; diff --git a/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java b/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java index 191c93d2..d263bb94 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Random; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java b/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java index 1c09fe6f..21c343ed 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java @@ -3,8 +3,8 @@ package StevenDimDoors.mod_pocketDim.items; import java.util.List; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java b/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java index 8c93bdf8..c0ed6682 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java @@ -6,8 +6,8 @@ import StevenDimDoors.mod_pocketDim.CommonTickHandler; import StevenDimDoors.mod_pocketDim.LinkData; import StevenDimDoors.mod_pocketDim.SchematicLoader; import StevenDimDoors.mod_pocketDim.Spells; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDimClient.ClientTickHandler; import net.minecraft.block.Block; diff --git a/StevenDimDoors/mod_pocketDim/items/itemDimDoor.java b/StevenDimDoors/mod_pocketDim/items/itemDimDoor.java index 047377c3..5af39f2d 100644 --- a/StevenDimDoors/mod_pocketDim/items/itemDimDoor.java +++ b/StevenDimDoors/mod_pocketDim/items/itemDimDoor.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.Random; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/StevenDimDoors/mod_pocketDim/items/itemLinkSignature.java b/StevenDimDoors/mod_pocketDim/items/itemLinkSignature.java index 82b36779..86aff59d 100644 --- a/StevenDimDoors/mod_pocketDim/items/itemLinkSignature.java +++ b/StevenDimDoors/mod_pocketDim/items/itemLinkSignature.java @@ -4,8 +4,8 @@ import java.util.List; import StevenDimDoors.mod_pocketDim.DimData; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java b/StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java index 00e6f5e5..1e7a4f05 100644 --- a/StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java +++ b/StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java @@ -2,8 +2,8 @@ package StevenDimDoors.mod_pocketDim.items; import java.util.List; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index 50e1cb38..594b2b0b 100644 --- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -60,7 +60,9 @@ import StevenDimDoors.mod_pocketDim.commands.CommandEndDungeonCreation; import StevenDimDoors.mod_pocketDim.commands.CommandPrintDimData; import StevenDimDoors.mod_pocketDim.commands.CommandPruneDims; import StevenDimDoors.mod_pocketDim.commands.CommandStartDungeonCreation; +import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper; import StevenDimDoors.mod_pocketDim.helpers.copyfile; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.items.ItemChaosDoor; import StevenDimDoors.mod_pocketDim.items.ItemRiftBlade; import StevenDimDoors.mod_pocketDim.items.ItemStabilizedRiftSignature; @@ -102,6 +104,7 @@ public class mod_pocketDim public static mod_pocketDim instance = new mod_pocketDim(); public static SchematicLoader loader = new SchematicLoader(); public static pocketTeleporter teleporter = new pocketTeleporter(); + public static DungeonHelper dungeonHelper= new DungeonHelper(); @@ -187,35 +190,7 @@ public class mod_pocketDim public static HashMap> limboSpawnInventory=new HashMap>(); public static ArrayList blocksImmuneToRift= new ArrayList(); - public static ArrayList registeredDungeons = new ArrayList(); - public static ArrayList simpleHalls = new ArrayList(); - - - public static ArrayList complexHalls = new ArrayList(); - - - public static ArrayList deadEnds = new ArrayList(); - - - public static ArrayList hubs = new ArrayList(); - - - public static ArrayList mazes = new ArrayList(); - - - public static ArrayList pistonTraps = new ArrayList(); - - - public static ArrayList exits = new ArrayList(); - - public static ArrayList customDungeons = new ArrayList(); - - - public static ArrayList metadataFlipList = new ArrayList(); - public static ArrayList metadataNextList = new ArrayList(); - - public static DungeonGenerator defaultUp = new DungeonGenerator(0, "/schematic/simpleStairsUp.schematic", true); @@ -299,99 +274,12 @@ public class mod_pocketDim { copyfile.copyFile(helpFile, file+"/How_to_add_dungeons.txt"); } + + dungeonHelper.importCustomDungeons(schematicDir); + dungeonHelper.registerBaseDungeons(); + - File[] schematicNames=file.listFiles(); - - if(schematicNames!=null) - { - - - for(File schematicFile: schematicNames) - { - - try - { - - if(schematicFile.getName().contains("schematic")) - { - String[] name = schematicFile.getName().split("_"); - - if(name.length<4) - { - System.out.println("Importing custom dungeon gen mechanics failed, adding to secondary list"); - this.customDungeons.add(new DungeonGenerator(0,schematicFile.getAbsolutePath(),true)); - System.out.println("Imported "+schematicFile.getName()); - - - } - else - { - boolean open= name[2].equals("open"); - - int weight = Integer.parseInt(name[3].replace(".schematic", "")); - - String path = schematicFile.getAbsolutePath(); - - if(name[0].equals("hub")) - { - this.hubs.add(new DungeonGenerator(weight,path,open)); - } - else if(name[0].equals("simpleHall")) - { - this.simpleHalls.add(new DungeonGenerator(weight,path,open)); - - } - else if(name[0].equals("complexHall")) - { - this.complexHalls.add(new DungeonGenerator(weight,path,open)); - - } - else if(name[0].equals("trap")) - { - this.pistonTraps.add(new DungeonGenerator(weight,path,open)); - - } - else if(name[0].equals("deadEnd")) - { - this.deadEnds.add(new DungeonGenerator(weight,path,open)); - - } - else if(name[0].equals("exit")) - { - this.exits.add(new DungeonGenerator(weight,path,open)); - - } - else if(name[0].equals("mazes")) - { - this.mazes.add(new DungeonGenerator(weight,path,open)); - - } - - - System.out.println("Imported "+schematicFile.getName()); - } - - - - } - - - - - } - catch(Exception e) - { - e.printStackTrace(); - System.out.println("Importing custom dungeon failed"); - } - - - } - - - - } @@ -634,115 +522,18 @@ public class mod_pocketDim this.blocksImmuneToRift.add(Block.blockGold.blockID); this.blocksImmuneToRift.add(Block.blockLapis.blockID); this.blocksImmuneToRift.add(Block.bedrock.blockID); + + dungeonHelper.registerFlipBlocks(); +/** - this.hubs.add(new DungeonGenerator(0, "/schematics/4WayBasicHall.schematic", false)); - this.hubs.add(new DungeonGenerator(0, "/schematics/4WayBasicHall.schematic", false)); - this.hubs.add(new DungeonGenerator(0, "/schematics/doorTotemRuins.schematic", true)); - this.hubs.add(new DungeonGenerator(0, "/schematics/hallwayTrapRooms1.schematic", false)); - this.hubs.add(new DungeonGenerator(0, "/schematics/longDoorHallway.schematic", false)); - this.hubs.add(new DungeonGenerator(0, "/schematics/smallRotundaWithExit.schematic", false)); - this.hubs.add(new DungeonGenerator(0, "/schematics/fortRuins.schematic", true)); - this.hubs.add(new DungeonGenerator(0, "/schematics/4WayHallExit.schematic", false)); - this.hubs.add(new DungeonGenerator(0, "/schematics/4WayHallExit.schematic", false)); - - - this.simpleHalls.add(new DungeonGenerator(0, "/schematics/collapsedSingleTunnel1.schematic", false)); - this.simpleHalls.add(new DungeonGenerator(0, "/schematics/singleStraightHall1.schematic", false)); - this.simpleHalls.add(new DungeonGenerator(0, "/schematics/smallBranchWithExit.schematic", false)); - this.simpleHalls.add(new DungeonGenerator(0, "/schematics/smallSimpleLeft.schematic", false)); - this.simpleHalls.add(new DungeonGenerator(0, "/schematics/smallSimpleRight.schematic", false)); - this.simpleHalls.add(new DungeonGenerator(0, "/schematics/simpleStairsUp.schematic", false)); - this.simpleHalls.add(new DungeonGenerator(0, "/schematics/simpleStairsDown.schematic", false)); - this.simpleHalls.add(new DungeonGenerator(0, "/schematics/simpleSmallT1.schematic", false)); - - - this.complexHalls.add(new DungeonGenerator(0, "/schematics/brokenPillarsO.schematic", true)); - this.complexHalls.add(new DungeonGenerator(0, "/schematics/buggyTopEntry1.schematic", true)); - this.complexHalls.add(new DungeonGenerator(0, "/schematics/exitRuinsWithHiddenDoor.schematic", true)); - this.complexHalls.add(new DungeonGenerator(0, "/schematics/hallwayHiddenTreasure.schematic", false)); - this.complexHalls.add(new DungeonGenerator(0, "/schematics/mediumPillarStairs.schematic", true)); - this.complexHalls.add(new DungeonGenerator(0, "/schematics/ruinsO.schematic", true)); - this.complexHalls.add(new DungeonGenerator(0, "/schematics/pitStairs.schematic", true)); - - - this.deadEnds.add(new DungeonGenerator(0, "/schematics/azersDungeonO.schematic", false)); - this.deadEnds.add(new DungeonGenerator(0, "/schematics/diamondTowerTemple1.schematic", true)); - this.deadEnds.add(new DungeonGenerator(0, "/schematics/fallingTrapO.schematic", false)); - this.deadEnds.add(new DungeonGenerator(0, "/schematics/hiddenStaircaseO.schematic", true)); - this.deadEnds.add(new DungeonGenerator(0, "/schematics/lavaTrapO.schematic", true)); - this.deadEnds.add(new DungeonGenerator(0, "/schematics/randomTree.schematic", true)); - this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallHiddenTowerO.schematic", true)); - this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallSilverfishRoom.schematic", false)); - this.deadEnds.add(new DungeonGenerator(0, "/schematics/tntTrapO.schematic", false)); - this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallDesert.schematic", true)); - this.deadEnds.add(new DungeonGenerator(0, "/schematics/smallPond.schematic", true)); - - - this.pistonTraps.add(new DungeonGenerator(0, "/schematics/fakeTNTTrap.schematic", false)); - this.pistonTraps.add(new DungeonGenerator(0, "/schematics/hallwayPitFallTrap.schematic", false)); - this.pistonTraps.add(new DungeonGenerator(0, "/schematics/hallwayPitFallTrap.schematic", false)); - this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonFallRuins.schematic", false)); - this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonFloorHall.schematic", false)); - this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonFloorHall.schematic", false)); - // this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonHallway.schematic", null)); - this.pistonTraps.add(new DungeonGenerator(0, "/schematics/pistonSmasherHall.schematic", false)); - // this.pistonTraps.add(new DungeonGenerator(0, "/schematics/raceTheTNTHall.schematic", false)); - this.pistonTraps.add(new DungeonGenerator(0, "/schematics/simpleDropHall.schematic", false)); - this.pistonTraps.add(new DungeonGenerator(0, "/schematics/wallFallcomboPistonHall.schematic", false)); - this.pistonTraps.add(new DungeonGenerator(0, "/schematics/wallFallcomboPistonHall.schematic", false)); - this.pistonTraps.add(new DungeonGenerator(0, "/schematics/lavaPyramid.schematic", true)); - - - - this.mazes.add(new DungeonGenerator(0, "/schematics/smallMaze1.schematic", false)); - this.mazes.add(new DungeonGenerator(0, "/schematics/smallMultilevelMaze.schematic", false)); - - - this.exits.add(new DungeonGenerator(0, "/schematics/exitCube.schematic", true)); - this.exits.add(new DungeonGenerator(0, "/schematics/lockingExitHall.schematic", false)); - this.exits.add(new DungeonGenerator(0, "/schematics/smallExitPrison.schematic", true)); - this.exits.add(new DungeonGenerator(0, "/schematics/lockingExitHall.schematic", false)); - - this.registeredDungeons.addAll(this.simpleHalls); - this.registeredDungeons.addAll(this.exits); - this.registeredDungeons.addAll(this.pistonTraps); - this.registeredDungeons.addAll(this.mazes); - this.registeredDungeons.addAll(this.deadEnds); - this.registeredDungeons.addAll(this.complexHalls); - this.registeredDungeons.addAll(this.hubs); - + + **/ - this.metadataFlipList.add(Block.dispenser.blockID); - this.metadataFlipList.add(Block.stairsStoneBrick.blockID); - this.metadataFlipList.add(Block.lever.blockID); - this.metadataFlipList.add(Block.stoneButton.blockID); - this.metadataFlipList.add(Block.redstoneRepeaterIdle.blockID); - this.metadataFlipList.add(Block.redstoneRepeaterActive.blockID); - this.metadataFlipList.add(Block.tripWireSource.blockID); - this.metadataFlipList.add(Block.torchWood.blockID); - this.metadataFlipList.add(Block.torchRedstoneIdle.blockID); - this.metadataFlipList.add(Block.torchRedstoneActive.blockID); - this.metadataFlipList.add(Block.doorIron.blockID); - this.metadataFlipList.add(Block.doorWood.blockID); - this.metadataFlipList.add(Block.pistonBase.blockID); - this.metadataFlipList.add(Block.pistonStickyBase.blockID); - this.metadataFlipList.add(Block.redstoneComparatorActive); - this.metadataFlipList.add(Block.redstoneComparatorIdle); - - this.metadataFlipList.add(Block.stairsNetherBrick.blockID); - this.metadataFlipList.add(Block.stairsCobblestone.blockID); - this.metadataFlipList.add(Block.stairsNetherBrick.blockID); - this.metadataFlipList.add(Block.stairsNetherQuartz.blockID); - this.metadataFlipList.add(Block.stairsSandStone.blockID); - - - this.metadataNextList.add(Block.redstoneRepeaterIdle.blockID); - this.metadataNextList.add(Block.redstoneRepeaterActive.blockID); diff --git a/StevenDimDoors/mod_pocketDim/pocketTeleporter.java b/StevenDimDoors/mod_pocketDim/pocketTeleporter.java index ad5e69f1..743fe65f 100644 --- a/StevenDimDoors/mod_pocketDim/pocketTeleporter.java +++ b/StevenDimDoors/mod_pocketDim/pocketTeleporter.java @@ -1,5 +1,6 @@ package StevenDimDoors.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.player.EntityPlayer; diff --git a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java index e3f9b018..65681268 100644 --- a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java +++ b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java @@ -14,8 +14,8 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import StevenDimDoors.mod_pocketDim.LinkData; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.world.LimboProvider; import StevenDimDoors.mod_pocketDim.world.pocketProvider; diff --git a/StevenDimDoors/mod_pocketDim/CustomCaveGen.java b/StevenDimDoors/mod_pocketDim/world/CustomCaveGen.java similarity index 99% rename from StevenDimDoors/mod_pocketDim/CustomCaveGen.java rename to StevenDimDoors/mod_pocketDim/world/CustomCaveGen.java index 0b8a4501..a7ba272d 100644 --- a/StevenDimDoors/mod_pocketDim/CustomCaveGen.java +++ b/StevenDimDoors/mod_pocketDim/world/CustomCaveGen.java @@ -1,7 +1,9 @@ -package StevenDimDoors.mod_pocketDim; +package StevenDimDoors.mod_pocketDim.world; import java.util.Random; +import StevenDimDoors.mod_pocketDim.mod_pocketDim; + import net.minecraft.block.Block; import net.minecraft.util.MathHelper; import net.minecraft.world.World; diff --git a/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java b/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java index 13cbf58c..c784735f 100644 --- a/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java +++ b/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java @@ -3,7 +3,6 @@ package StevenDimDoors.mod_pocketDim.world; import java.util.List; import java.util.Random; -import StevenDimDoors.mod_pocketDim.CustomCaveGen; import StevenDimDoors.mod_pocketDim.mod_pocketDim; import net.minecraft.block.Block; diff --git a/StevenDimDoors/mod_pocketDim/world/LimboProvider.java b/StevenDimDoors/mod_pocketDim/world/LimboProvider.java index 829010af..2d23016a 100644 --- a/StevenDimDoors/mod_pocketDim/world/LimboProvider.java +++ b/StevenDimDoors/mod_pocketDim/world/LimboProvider.java @@ -1,7 +1,6 @@ package StevenDimDoors.mod_pocketDim.world; import StevenDimDoors.mod_pocketDim.CloudRenderBlank; -import StevenDimDoors.mod_pocketDim.limboSkyProvider; import StevenDimDoors.mod_pocketDim.mod_pocketDim; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/StevenDimDoors/mod_pocketDim/limboSkyProvider.java b/StevenDimDoors/mod_pocketDim/world/limboSkyProvider.java similarity index 99% rename from StevenDimDoors/mod_pocketDim/limboSkyProvider.java rename to StevenDimDoors/mod_pocketDim/world/limboSkyProvider.java index fd31976b..52e4cfe3 100644 --- a/StevenDimDoors/mod_pocketDim/limboSkyProvider.java +++ b/StevenDimDoors/mod_pocketDim/world/limboSkyProvider.java @@ -1,4 +1,4 @@ -package StevenDimDoors.mod_pocketDim; +package StevenDimDoors.mod_pocketDim.world; import org.lwjgl.opengl.GL11; diff --git a/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java b/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java index 0639c9b1..b70ddca9 100644 --- a/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java +++ b/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import StevenDimDoors.mod_pocketDim.DimData; -import StevenDimDoors.mod_pocketDim.dimHelper; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.ticking.MobObelisk; import net.minecraft.entity.EnumCreatureType; diff --git a/StevenDimDoors/mod_pocketDim/world/pocketProvider.java b/StevenDimDoors/mod_pocketDim/world/pocketProvider.java index 97d9276b..9015fd1a 100644 --- a/StevenDimDoors/mod_pocketDim/world/pocketProvider.java +++ b/StevenDimDoors/mod_pocketDim/world/pocketProvider.java @@ -1,8 +1,8 @@ package StevenDimDoors.mod_pocketDim.world; import StevenDimDoors.mod_pocketDim.CloudRenderBlank; -import StevenDimDoors.mod_pocketDim.dimHelper; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.Vec3; diff --git a/StevenDimDoors/mod_pocketDimClient/ClosingRiftFX.java b/StevenDimDoors/mod_pocketDimClient/ClosingRiftFX.java index 4c7754bb..dc648a9c 100644 --- a/StevenDimDoors/mod_pocketDimClient/ClosingRiftFX.java +++ b/StevenDimDoors/mod_pocketDimClient/ClosingRiftFX.java @@ -1,6 +1,6 @@ package StevenDimDoors.mod_pocketDimClient; -import StevenDimDoors.mod_pocketDim.dimHelper; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; diff --git a/StevenDimDoors/mod_pocketDimClient/GoggleRiftFX.java b/StevenDimDoors/mod_pocketDimClient/GoggleRiftFX.java index 6651ab75..a9aff124 100644 --- a/StevenDimDoors/mod_pocketDimClient/GoggleRiftFX.java +++ b/StevenDimDoors/mod_pocketDimClient/GoggleRiftFX.java @@ -1,6 +1,6 @@ package StevenDimDoors.mod_pocketDimClient; -import StevenDimDoors.mod_pocketDim.dimHelper; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.particle.EntityFireworkSparkFX; diff --git a/StevenDimDoors/mod_pocketDimClient/RiftFX.java b/StevenDimDoors/mod_pocketDimClient/RiftFX.java index a46d6e00..ee8984c3 100644 --- a/StevenDimDoors/mod_pocketDimClient/RiftFX.java +++ b/StevenDimDoors/mod_pocketDimClient/RiftFX.java @@ -1,6 +1,6 @@ package StevenDimDoors.mod_pocketDimClient; -import StevenDimDoors.mod_pocketDim.dimHelper; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.particle.EntityFireworkSparkFX;