From c0b7e7d2d31d4d7ef1af646becac243fa345d3eb Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Sat, 15 Jun 2013 03:09:46 -0400 Subject: [PATCH 1/3] more monolith spawning --- .../mod_pocketDim/ticking/MobObelisk.java | 7 ++---- .../mod_pocketDim/world/pocketGenerator.java | 24 ++++++++++++++++--- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java index 6c3c044..8b7ca50 100644 --- a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java +++ b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java @@ -122,10 +122,7 @@ public class MobObelisk extends EntityFlying implements IMob if (this.isEntityAlive() && this.isEntityInsideOpaqueBlock()) { - this.pushOutOfBlocks(this.posX - (double)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ + (double)this.width * 0.35D); - this.pushOutOfBlocks(this.posX - (double)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ - (double)this.width * 0.35D); - this.pushOutOfBlocks(this.posX + (double)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ - (double)this.width * 0.35D); - this.pushOutOfBlocks(this.posX + (double)this.width * 0.35D, this.boundingBox.minY + 0.5D, this.posZ + (double)this.width * 0.35D); + this.setDead(); } @@ -137,7 +134,7 @@ public class MobObelisk extends EntityFlying implements IMob { if(this.soundTime<=0) { - this.playSound("mods.DimDoors.sfx.monk", 1.5F, 1F); + this.playSound("mods.DimDoors.sfx.monk", 1F, 1F); this.soundTime=100; } diff --git a/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java b/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java index ae37045..67a90e6 100644 --- a/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java +++ b/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java @@ -67,18 +67,26 @@ public class pocketGenerator extends ChunkProviderGenerate implements IChunkProv { if(dimHelper.dimList.containsKey(worldObj.provider.dimensionId)) { - if(!dimHelper.dimList.get(worldObj.provider.dimensionId).isDimRandomRift) + if(dimHelper.dimList.get(worldObj.provider.dimensionId).dungeonGenerator==null) { return; } + else + { + if(dimHelper.dimList.get(worldObj.provider.dimensionId).dungeonGenerator.isOpen) + { + return; + } + } } int y =0; int x = var2*16 + rand.nextInt(32)-8; int z = var3*16 + rand.nextInt(32)-8; + int yTest; do { - x = var2*16 + rand.nextInt(32-8); + x = var2*16 + rand.nextInt(32)-8; z = var3*16 + rand.nextInt(32)-8; while(this.worldObj.getBlockId(x, y, z)==0&&y<255) @@ -87,8 +95,18 @@ public class pocketGenerator extends ChunkProviderGenerate implements IChunkProv } y = yCoordHelper.getFirstUncovered(this.worldObj,x , y+2, z); + if(this.worldObj.getBlockId(x, y-1, z)!=mod_pocketDim.blockDimWall.blockID) + { + y= yCoordHelper.getFirstUncovered(this.worldObj,x , y+4+rand.nextInt(4), z); + } + + if(y>245) + { + return; + } + Entity mob = new MobObelisk(this.worldObj); - mob.setLocationAndAngles(x, y+rand.nextInt(4), z, 1, 1); + mob.setLocationAndAngles(x, y, z, 1, 1); this.worldObj.spawnEntityInWorld(mob); } From 7ebcfb6c20f694a74b2a21db7b62f7febe349efb Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Sat, 15 Jun 2013 04:19:08 -0400 Subject: [PATCH 2/3] release --- StevenDimDoors/mod_pocketDim/SchematicLoader.java | 2 +- StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java | 1 + StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java | 3 +++ StevenDimDoors/mod_pocketDim/world/pocketGenerator.java | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/StevenDimDoors/mod_pocketDim/SchematicLoader.java b/StevenDimDoors/mod_pocketDim/SchematicLoader.java index 96da6d8..1b4a5ee 100644 --- a/StevenDimDoors/mod_pocketDim/SchematicLoader.java +++ b/StevenDimDoors/mod_pocketDim/SchematicLoader.java @@ -287,7 +287,7 @@ public class SchematicLoader } - else if(blockID== Block.pistonBase.blockID||blockID==Block.pistonStickyBase.blockID||blockID==Block.dispenser.blockID||blockID==Block.dropper.blockID) + else if(blockID== Block.pistonBase.blockID||blockID==Block.pistonExtension.blockID||blockID==Block.pistonStickyBase.blockID||blockID==Block.dispenser.blockID||blockID==Block.dropper.blockID) { switch (metadata) { diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java b/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java index 2668925..ba7c763 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java +++ b/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java @@ -119,6 +119,7 @@ public class BlockDimWallPerm extends Block { EntityPlayer.class.cast(par5Entity).setPositionAndUpdate( x, y, z ); + EntityPlayer.class.cast(par5Entity).fallDistance=0; } diff --git a/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java b/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java index 70ed9d7..1c915e9 100644 --- a/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java +++ b/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java @@ -221,6 +221,9 @@ public class DungeonHelper this.metadataFlipList.add(Block.pistonBase.blockID); this.metadataFlipList.add(Block.pistonStickyBase.blockID); + this.metadataFlipList.add(Block.pistonExtension.blockID); + + this.metadataFlipList.add(Block.redstoneComparatorIdle.blockID); this.metadataFlipList.add(Block.redstoneComparatorActive.blockID); this.metadataFlipList.add(Block.signPost.blockID); diff --git a/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java b/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java index 67a90e6..e3d80bd 100644 --- a/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java +++ b/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java @@ -97,7 +97,7 @@ public class pocketGenerator extends ChunkProviderGenerate implements IChunkProv if(this.worldObj.getBlockId(x, y-1, z)!=mod_pocketDim.blockDimWall.blockID) { - y= yCoordHelper.getFirstUncovered(this.worldObj,x , y+4+rand.nextInt(4), z); + y= y+rand.nextInt(4)+2; } if(y>245) From 4a58f793a9da6916aa7f081f7498e4137e6ad0cf Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Sat, 15 Jun 2013 04:30:46 -0400 Subject: [PATCH 3/3] oknow --- StevenDimDoors/mod_pocketDim/world/pocketGenerator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java b/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java index e3d80bd..ced0c7f 100644 --- a/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java +++ b/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java @@ -80,8 +80,8 @@ public class pocketGenerator extends ChunkProviderGenerate implements IChunkProv } } int y =0; - int x = var2*16 + rand.nextInt(32)-8; - int z = var3*16 + rand.nextInt(32)-8; + int x = var2*16 + rand.nextInt(16); + int z = var3*16 + rand.nextInt(16); int yTest; do {