diff --git a/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/StevenDimDoors/mod_pocketDim/EventHookContainer.java index e39e944..8b15acc 100644 --- a/StevenDimDoors/mod_pocketDim/EventHookContainer.java +++ b/StevenDimDoors/mod_pocketDim/EventHookContainer.java @@ -43,6 +43,7 @@ public class EventHookContainer event.manager.soundPoolSounds.addSound("mods/DimensionalDoors/sounds/Monolith.ogg", (mod_pocketDim.class.getResource("/mods/DimensionalDoors/sounds/Monolith.ogg"))); event.manager.soundPoolSounds.addSound("mods/DimensionalDoors/sounds/wylkermaxcrack.ogg", (mod_pocketDim.class.getResource("/mods/DimensionalDoors/sounds/wylkermaxcrack.ogg"))); + event.manager.soundPoolSounds.addSound("mods/DimensionalDoors/sounds/tearing.ogg", (mod_pocketDim.class.getResource("/mods/DimensionalDoors/sounds/tearing.ogg"))); } diff --git a/StevenDimDoors/mod_pocketDim/TileEntityRift.java b/StevenDimDoors/mod_pocketDim/TileEntityRift.java index 692d9f9..733c1fb 100644 --- a/StevenDimDoors/mod_pocketDim/TileEntityRift.java +++ b/StevenDimDoors/mod_pocketDim/TileEntityRift.java @@ -80,6 +80,7 @@ public class TileEntityRift extends TileEntity worldObj.spawnEntityInWorld(creeper); } + /** if(dimHelper.dimList.get(this.worldObj.provider.dimensionId)!=null) { ArrayList rifts = dimHelper.dimList.get(this.worldObj.provider.dimensionId).findRiftsInRange(worldObj, 6, this.xCoord, this.yCoord, this.zCoord); @@ -89,7 +90,9 @@ public class TileEntityRift extends TileEntity creeper.setLocationAndAngles(this.xCoord+.5, yCoordHelper.getFirstUncovered(this.worldObj, this.xCoord, this.yCoord, this.zCoord), this.zCoord+.5, 5, 6); worldObj.spawnEntityInWorld(creeper); } + } + **/ } diff --git a/StevenDimDoors/mod_pocketDim/dimHelper.java b/StevenDimDoors/mod_pocketDim/dimHelper.java index ba8f5c7..d040abe 100644 --- a/StevenDimDoors/mod_pocketDim/dimHelper.java +++ b/StevenDimDoors/mod_pocketDim/dimHelper.java @@ -344,7 +344,7 @@ public class dimHelper extends DimensionManager if(entity instanceof EntityPlayerMP) { - entity = this.teleportEntity(world, entity, linkData); + entity = this.teleportEntity(world, entity, linkData); diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index d5fe3bf..846f584 100644 --- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -420,10 +420,10 @@ public class mod_pocketDim GameRegistry.registerTileEntity(TileEntityDimDoor.class, "TileEntityDimDoor"); GameRegistry.registerTileEntity(TileEntityRift.class, "TileEntityRift"); - EntityRegistry.registerModEntity(MobObelisk.class, "Obelisk", this.obeliskID, this,50, 1, true); + EntityRegistry.registerModEntity(MobObelisk.class, "Obelisk", this.obeliskID, this,70, 1, true); EntityList.IDtoClassMapping.put(this.obeliskID, MobObelisk.class); EntityList.entityEggs.put(this.obeliskID, new EntityEggInfo(this.obeliskID, 0, 0xffffff)); - LanguageRegistry.instance().addStringLocalization("entity.MobObelisk.Obelisk.name", "Obelisk"); + LanguageRegistry.instance().addStringLocalization("entity.DimensionalDoors.Obelisk.name", "Monolith"); diff --git a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java index 5207f9f..6632aad 100644 --- a/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java +++ b/StevenDimDoors/mod_pocketDim/ticking/MobObelisk.java @@ -119,7 +119,7 @@ public class MobObelisk extends EntityFlying implements IMob - EntityPlayer entityPlayer = this.worldObj.getClosestPlayerToEntity(this, 25); + EntityPlayer entityPlayer = this.worldObj.getClosestPlayerToEntity(this, 30); if(entityPlayer != null) { @@ -133,10 +133,8 @@ public class MobObelisk extends EntityFlying implements IMob { if(soundTime<=0) { - if(this.worldObj.isRemote) - { - FMLClientHandler.instance().getClient().sndManager.playEntitySound("mods.DimensionalDoors.sounds.Monolith", this, 1, 1, false); - } + this.playSound("mods.DimensionalDoors.sounds.Monolith", 1F, 1F); + soundTime=100; } if(aggro<470) @@ -157,40 +155,45 @@ public class MobObelisk extends EntityFlying implements IMob if(this.worldObj.provider instanceof pocketProvider) { - aggro++; - if(aggro==455) + + + if(rand.nextBoolean()) { - FMLClientHandler.instance().getClient().sndManager.playSoundFX("mods.DimensionalDoors.sounds.wylkermaxcrack", 12, 1); - + aggro++; } - aggro++; - if(aggro==455) + else if(rand.nextBoolean()) { - FMLClientHandler.instance().getClient().sndManager.playSoundFX("mods.DimensionalDoors.sounds.wylkermaxcrack", 12, 1); - + aggro++; } + } - if(aggro>455&&aggro<460) + if(aggro>445) { - FMLClientHandler.instance().getClient().sndManager.playSoundFX("mods.DimensionalDoors.sounds.wylkermaxcrack", 12, 1); + this.worldObj.playSoundAtEntity(entityPlayer,"mods.DimensionalDoors.sounds.tearing",6, 1); } + } else { - if(this.worldObj.isRemote) - { - FMLClientHandler.instance().getClient().sndManager.stopEntitySound(this); - } + + this.worldObj.playSoundAtEntity(entityPlayer,"mods.DimensionalDoors.sounds.wylkermaxcrack",13, 1); + + + + LinkData link = new LinkData(this.worldObj.provider.dimensionId, mod_pocketDim.limboDimID, (int)this.posX, (int)this.posY, (int)this.posZ, (int)this.posX+rand.nextInt(500)-250, (int)this.posY+500, (int)this.posZ+rand.nextInt(500)-250, false,0); + dimHelper.instance.teleportToPocket(worldObj, link, entityPlayer); + entityPlayer.worldObj.playSoundAtEntity(entityPlayer,"mods.DimensionalDoors.sounds.wylkermaxcrack",13, 1); + } - for (int i = 0; i < -1+this.textureState/2; ++i) + for (int i = 0; i < -1+this.textureState/3; ++i) { entityPlayer.worldObj.spawnParticle("portal", entityPlayer.posX + (this.rand.nextDouble() - 0.5D) * (double)this.width, entityPlayer.posY + this.rand.nextDouble() * (double)entityPlayer.height - 0.75D, entityPlayer.posZ + (this.rand.nextDouble() - 0.5D) * (double)entityPlayer.width, (this.rand.nextDouble() - 0.5D) * 2.0D, -this.rand.nextDouble(), (this.rand.nextDouble() - 0.5D) * 2.0D); } @@ -198,6 +201,17 @@ public class MobObelisk extends EntityFlying implements IMob } + else + { + if(aggro>0) + { + if(rand.nextInt(10)==0) + { + aggro--; + } + + } + } } @@ -210,6 +224,11 @@ public class MobObelisk extends EntityFlying implements IMob if(aggro>0) { aggro--; + + if(rand.nextBoolean()) + { + aggro--; + } } } if(soundTime>0) diff --git a/resources/mods/DimensionalDoors/sounds/tearing.ogg b/resources/mods/DimensionalDoors/sounds/tearing.ogg new file mode 100644 index 0000000..89c5398 Binary files /dev/null and b/resources/mods/DimensionalDoors/sounds/tearing.ogg differ diff --git a/resources/mods/DimensionalDoors/sounds/wylkermaxcrack - Copy.wav b/resources/mods/DimensionalDoors/sounds/wylkermaxcrack - Copy.wav new file mode 100644 index 0000000..45a3e4a Binary files /dev/null and b/resources/mods/DimensionalDoors/sounds/wylkermaxcrack - Copy.wav differ