From b5b3fffdd3711ff1671cf61c17d45ca873a26a85 Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Fri, 14 Jun 2013 23:16:27 -0400 Subject: [PATCH 1/2] Fixed it even MORE --- StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java index 463ee5b..6c3c044 100644 --- a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java +++ b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java @@ -172,13 +172,17 @@ public class MobObelisk extends EntityFlying implements IMob } if(aggro>430&&this.soundTime<100) { - this.worldObj.playSoundAtEntity(entityPlayer,"mods.DimDoors.sfx.tearing",2, 1); + //this.worldObj.playSoundAtEntity(entityPlayer,"mods.DimDoors.sfx.tearing",2, 1); + this.worldObj.playSoundEffect(entityPlayer.posX, entityPlayer.posY, entityPlayer.posZ,"mods.DimDoors.sfx.tearing",2F, 1F); + this.soundTime=100; } if(aggro>445&&this.soundTime<200) { - this.worldObj.playSoundAtEntity(entityPlayer,"mods.DimDoors.sfx.tearing",5, 1); + //this.worldObj.playSoundAtEntity(entityPlayer,"mods.DimDoors.sfx.tearing",5, 1); + this.worldObj.playSoundEffect(entityPlayer.posX, entityPlayer.posY, entityPlayer.posZ,"mods.DimDoors.sfx.tearing",5F, 1F); + this.soundTime=200; } From fa4055f19883d2e6e0baea0b00b3f9102c123dfe Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Sat, 15 Jun 2013 02:09:17 -0400 Subject: [PATCH 2/2] Fixed monolith spawning --- .../mod_pocketDim/helpers/yCoordHelper.java | 4 +- .../mod_pocketDim/items/ItemStableFabric.java | 2 + .../mod_pocketDim/ticking/MobObelisk.java | 2 +- .../mod_pocketDim/world/BiomeGenLimbo.java | 12 ++--- .../mod_pocketDim/world/BiomeGenPocket.java | 8 ++-- .../mod_pocketDim/world/LimboGenerator.java | 47 ++++++++++++++++++- .../mod_pocketDim/world/pocketGenerator.java | 45 +++++++++++++++++- 7 files changed, 105 insertions(+), 15 deletions(-) diff --git a/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java b/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java index 789bb27..66d0bab 100644 --- a/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java +++ b/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java @@ -37,7 +37,7 @@ public class yCoordHelper do { flag=false; - if(chunk.getBlockID(xC, yC-1, zC)!=0) + if(yC>0&&chunk.getBlockID(xC, yC-1, zC)!=0) { if(!Block.blocksList[chunk.getBlockID(xC, yC-1, zC)].blockMaterial.isReplaceable()||Block.blocksList[chunk.getBlockID(xC, yC-1, zC)].blockMaterial.isLiquid()) { @@ -47,7 +47,7 @@ public class yCoordHelper } } - if(chunk.getBlockID(xC, yC, zC)!=0) + if(yC>0&&chunk.getBlockID(xC, yC, zC)!=0) { if(!Block.blocksList[chunk.getBlockID(xC, yC, zC)].blockMaterial.isReplaceable()||Block.blocksList[chunk.getBlockID(xC, yC, zC)].blockMaterial.isLiquid()) { diff --git a/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java b/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java index bc38025..c152e66 100644 --- a/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java +++ b/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java @@ -49,6 +49,8 @@ public class ItemStableFabric extends Item { System.out.println("Block metadata is "+par3World.getBlockMetadata(par4, par5, par6)); System.out.println(par3World.getBiomeGenForCoords(par4, par6).biomeName); + + this.onItemRightClick(par1ItemStack, par3World, par2EntityPlayer); Block block = Block.blocksList[par3World.getBlockId(par4, par5, par6)]; diff --git a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java index 6c3c044..e399f07 100644 --- a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java +++ b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java @@ -137,7 +137,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", 1.7F, 1F); this.soundTime=100; } diff --git a/StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java b/StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java index 4ea4821..e8b48e1 100644 --- a/StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java +++ b/StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java @@ -20,14 +20,14 @@ public class BiomeGenLimbo extends BiomeGenBase this.spawnableCreatureList.clear(); this.spawnableWaterCreatureList.clear(); this.spawnableCaveCreatureList.clear(); - this.spawnableMonsterList.add(new SpawnListEntry(MobObelisk.class, 1, 1, 1)); - this.spawnableMonsterList.add(new SpawnListEntry(MobObelisk.class, 300, 0, 0)); + // this.spawnableMonsterList.add(new SpawnListEntry(MobObelisk.class, 1, 1, 1)); + // this.spawnableMonsterList.add(new SpawnListEntry(MobObelisk.class, 300, 0, 0)); - this.spawnableCreatureList.add(new SpawnListEntry(MobObelisk.class, 1, 1, 1)); - this.spawnableCreatureList.add(new SpawnListEntry(MobObelisk.class, 300, 0, 0)); + // this.spawnableCreatureList.add(new SpawnListEntry(MobObelisk.class, 1, 1, 1)); + // this.spawnableCreatureList.add(new SpawnListEntry(MobObelisk.class, 300, 0, 0)); - this.spawnableCaveCreatureList.add(new SpawnListEntry(MobObelisk.class, 1, 1, 1)); - this.spawnableCaveCreatureList.add(new SpawnListEntry(MobObelisk.class, 300, 0, 0)); + // this.spawnableCaveCreatureList.add(new SpawnListEntry(MobObelisk.class, 1, 1, 1)); + // this.spawnableCaveCreatureList.add(new SpawnListEntry(MobObelisk.class, 300, 0, 0)); diff --git a/StevenDimDoors/mod_pocketDim/world/BiomeGenPocket.java b/StevenDimDoors/mod_pocketDim/world/BiomeGenPocket.java index 44abb78..7a884a8 100644 --- a/StevenDimDoors/mod_pocketDim/world/BiomeGenPocket.java +++ b/StevenDimDoors/mod_pocketDim/world/BiomeGenPocket.java @@ -19,10 +19,10 @@ public class BiomeGenPocket extends BiomeGenBase this.spawnableCreatureList.clear(); this.spawnableWaterCreatureList.clear(); this.spawnableCaveCreatureList.clear(); - this.spawnableMonsterList.add(new SpawnListEntry(MobObelisk.class, 1, 1, 1)); - this.spawnableCreatureList.add(new SpawnListEntry(MobObelisk.class, 1, 1, 1)); - - this.spawnableCaveCreatureList.add(new SpawnListEntry(MobObelisk.class, 1, 1, 1)); + // this.spawnableMonsterList.add(new SpawnListEntry(MobObelisk.class, 1, 1, 1)); + // this.spawnableCreatureList.add(new SpawnListEntry(MobObelisk.class, 1, 1, 1)); +// + // this.spawnableCaveCreatureList.add(new SpawnListEntry(MobObelisk.class, 1, 1, 1)); } diff --git a/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java b/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java index 909a109..60d1768 100644 --- a/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java +++ b/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java @@ -5,8 +5,12 @@ import java.util.Random; import StevenDimDoors.mod_pocketDim.DDProperties; import StevenDimDoors.mod_pocketDim.mod_pocketDim; +import StevenDimDoors.mod_pocketDim.helpers.dimHelper; +import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper; +import StevenDimDoors.mod_pocketDim.ticking.MobObelisk; import net.minecraft.block.Block; +import net.minecraft.entity.Entity; import net.minecraft.entity.EnumCreatureType; import net.minecraft.util.IProgressUpdate; import net.minecraft.util.MathHelper; @@ -173,7 +177,48 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi @Override public void populate(IChunkProvider var1, int var2, int var3) { - // TODO Auto-generated method stub + + + + if(true) + { + return; + } + int y =0; + int x = var2*16 + rand.nextInt(16); + int z = var3*16 + rand.nextInt(16); + int yTest; + do + { + + x = var2*16 + rand.nextInt(16); + z = var3*16 + rand.nextInt(16); + + while(this.worldObj.getBlockId(x, y, z)==0&&y<255) + { + y++; + } + y = yCoordHelper.getFirstUncovered(this.worldObj,x , y+2, z); + + Entity mob = new MobObelisk(this.worldObj); + mob.setLocationAndAngles(x, y, z, 1, 1); + + yTest=yCoordHelper.getFirstUncovered(this.worldObj,x , y+5, z); + if(yTest>245) + { + return; + } + this.worldObj.spawnEntityInWorld(mob); + + } + while(yTest >y); + + + + + // TODO Auto-generated method stub + + } diff --git a/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java b/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java index b70ddca..752167b 100644 --- a/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java +++ b/StevenDimDoors/mod_pocketDim/world/pocketGenerator.java @@ -2,11 +2,15 @@ package StevenDimDoors.mod_pocketDim.world; import java.util.ArrayList; import java.util.List; +import java.util.Random; import StevenDimDoors.mod_pocketDim.DimData; +import StevenDimDoors.mod_pocketDim.mod_pocketDim; import StevenDimDoors.mod_pocketDim.helpers.dimHelper; +import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper; import StevenDimDoors.mod_pocketDim.ticking.MobObelisk; +import net.minecraft.entity.Entity; import net.minecraft.entity.EnumCreatureType; import net.minecraft.world.ChunkPosition; import net.minecraft.world.World; @@ -17,6 +21,7 @@ import net.minecraft.world.gen.ChunkProviderGenerate; public class pocketGenerator extends ChunkProviderGenerate implements IChunkProvider { private World worldObj; + private Random rand = new Random(); public pocketGenerator(World par1World, long par2, boolean par4) { @@ -58,7 +63,45 @@ public class pocketGenerator extends ChunkProviderGenerate implements IChunkProv } @Override - public void populate(IChunkProvider var1, int var2, int var3) { + public void populate(IChunkProvider var1, int var2, int var3) + { + if(dimHelper.dimList.containsKey(worldObj.provider.dimensionId)) + { + if(!dimHelper.dimList.get(worldObj.provider.dimensionId).isDimRandomRift) + { + // return; + } + } + int y =0; + int x = var2*16 + rand.nextInt(32)-8; + int z = var3*16 + rand.nextInt(32)-8; + do + { + + x = var2*16 + rand.nextInt(32-8); + z = var3*16 + rand.nextInt(32)-8; + + while(this.worldObj.getBlockId(x, y, z)==0&&y<255) + { + y++; + } + y = yCoordHelper.getFirstUncovered(this.worldObj,x , y+2, z); + + Entity mob = new MobObelisk(this.worldObj); + mob.setLocationAndAngles(x, y+rand.nextInt(4), z, 1, 1); + this.worldObj.spawnEntityInWorld(mob); + + } + while( yCoordHelper.getFirstUncovered(this.worldObj,x , y, z)>y); + + if(rand.nextBoolean()) + { + this.populate(var1, var2, var3); + } + + + + // TODO Auto-generated method stub }