diff --git a/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java b/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java index e33d68b..2f8624f 100644 --- a/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java +++ b/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java @@ -61,6 +61,9 @@ public class PocketGenerator extends ChunkProviderGenerate implements IChunkProv { //Check whether we want to populate this chunk with Monoliths. DimData dimData = dimHelper.dimList.get(worldObj.provider.dimensionId); + int sanity = 0; + int blockID = 0; + boolean didSpawn=false; if (dimData == null || dimData.dungeonGenerator == null || @@ -82,26 +85,39 @@ public class PocketGenerator extends ChunkProviderGenerate implements IChunkProv //Select a random column within the chunk x = chunkX * CHUNK_SIZE + random.nextInt(CHUNK_SIZE); z = chunkZ * CHUNK_SIZE + random.nextInt(CHUNK_SIZE); - y = 0; + y = MAX_MONOLITH_SPAWN_Y; + blockID = worldObj.getBlockId(x, y, z); - while (worldObj.getBlockId(x, y, z) == 0 && y < 255) + while (blockID == 0 &&y>0) { - y++; + y--; + blockID = worldObj.getBlockId(x, y, z); + } - y = yCoordHelper.getFirstUncovered(worldObj,x , y + 2, z); + while(blockID == mod_pocketDim.blockDimWall.blockID&&y>0) + { + y--; + blockID = worldObj.getBlockId(x, y, z); + } + while (blockID == 0 &&y>0) + { + y--; + blockID = worldObj.getBlockId(x, y, z); + + } + if(y > 0) + { - if (worldObj.getBlockId(x, y - 1, z) != mod_pocketDim.blockDimWall.blockID) - { - y += random.nextInt(4) + 2; - } - if (y <= MAX_MONOLITH_SPAWN_Y) - { Entity mob = new MobObelisk(worldObj); - mob.setLocationAndAngles(x, y, z, 1, 1); + mob.setLocationAndAngles(x, y+2+random.nextInt(5), z, 1, 1); worldObj.spawnEntityInWorld(mob); + didSpawn=true; } + + sanity++; + } - while (yCoordHelper.getFirstUncovered(worldObj, x , y, z) > y || random.nextBoolean()); + while (sanity<15&&!didSpawn); } @Override diff --git a/resources/mods/DimDoors/textures/mobs/Untitled-2.psd b/resources/mods/DimDoors/textures/mobs/eye.psd similarity index 100% rename from resources/mods/DimDoors/textures/mobs/Untitled-2.psd rename to resources/mods/DimDoors/textures/mobs/eye.psd diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith10.png b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith10.png new file mode 100644 index 0000000..5460b62 Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith10.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith11.png b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith11.png new file mode 100644 index 0000000..cb01528 Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith11.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith12.png b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith12.png new file mode 100644 index 0000000..65c9b07 Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith12.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith13.png b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith13.png new file mode 100644 index 0000000..67630aa Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith13.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith14.png b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith14.png new file mode 100644 index 0000000..6757ad3 Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith14.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith15.png b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith15.png new file mode 100644 index 0000000..3acb2e9 Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith15.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith16.png b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith16.png new file mode 100644 index 0000000..59f2d23 Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith16.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith17.png b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith17.png new file mode 100644 index 0000000..305166f Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith17.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith18.png b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith18.png new file mode 100644 index 0000000..b02ffcf Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith18.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith2.png b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith2.png new file mode 100644 index 0000000..6b4d956 Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith2.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith3.png b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith3.png new file mode 100644 index 0000000..e45e6c0 Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith3.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith4.png b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith4.png new file mode 100644 index 0000000..a1b1df6 Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith4.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith5.png b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith5.png new file mode 100644 index 0000000..1ea2a22 Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith5.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith6.png b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith6.png new file mode 100644 index 0000000..bd9bcc1 Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith6.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith7.png b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith7.png new file mode 100644 index 0000000..ce48ec0 Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith7.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith8.png b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith8.png new file mode 100644 index 0000000..f8a4395 Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith8.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith9.png b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith9.png new file mode 100644 index 0000000..5d236d1 Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith9.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/monolith0.png b/resources/mods/DimDoors/textures/mobs/testMonolith/monolith0.png new file mode 100644 index 0000000..ec09cbe Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/monolith0.png differ diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/monolith1.png b/resources/mods/DimDoors/textures/mobs/testMonolith/monolith1.png new file mode 100644 index 0000000..54215c2 Binary files /dev/null and b/resources/mods/DimDoors/textures/mobs/testMonolith/monolith1.png differ