diff --git a/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/StevenDimDoors/mod_pocketDim/EventHookContainer.java index 5aec195..6fe6e41 100644 --- a/StevenDimDoors/mod_pocketDim/EventHookContainer.java +++ b/StevenDimDoors/mod_pocketDim/EventHookContainer.java @@ -1,6 +1,8 @@ package StevenDimDoors.mod_pocketDim; import paulscode.sound.SoundSystem; +import net.minecraft.client.audio.SoundManager; +import net.minecraft.client.audio.SoundPool; import net.minecraft.client.audio.SoundPoolEntry; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -36,15 +38,15 @@ public class EventHookContainer @ForgeSubscribe public void onSoundLoad(SoundLoadEvent event) { - event.manager.soundPoolSounds.addSound(mod_pocketDim.modid+":/sfx/monk.ogg"); - event.manager.soundPoolSounds.addSound(mod_pocketDim.modid+":/sfx/crack.ogg"); - event.manager.soundPoolSounds.addSound(mod_pocketDim.modid+":/sfx/tearing.ogg"); - event.manager.soundPoolSounds.addSound(mod_pocketDim.modid+":/sfx/rift.ogg"); - event.manager.soundPoolSounds.addSound(mod_pocketDim.modid+":/sfx/riftStart.ogg"); - event.manager.soundPoolSounds.addSound(mod_pocketDim.modid+":/sfx/riftEnd.ogg"); - event.manager.soundPoolSounds.addSound(mod_pocketDim.modid+":/sfx/riftClose.ogg"); - event.manager.soundPoolSounds.addSound(mod_pocketDim.modid+":/sfx/riftDoor.ogg"); - event.manager.soundPoolMusic.addSound(mod_pocketDim.modid+":/sfx/creepy.ogg"); + event.manager.addSound(mod_pocketDim.modid+":monk.ogg"); + event.manager.addSound(mod_pocketDim.modid+":crack.ogg"); + event.manager.addSound(mod_pocketDim.modid+":tearing.ogg"); + event.manager.addSound(mod_pocketDim.modid+":rift.ogg"); + event.manager.addSound(mod_pocketDim.modid+":riftStart.ogg"); + event.manager.addSound(mod_pocketDim.modid+":riftEnd.ogg"); + event.manager.addSound(mod_pocketDim.modid+":riftClose.ogg"); + event.manager.addSound(mod_pocketDim.modid+":riftDoor.ogg"); + event.manager.addMusic(mod_pocketDim.modid+":creepy.ogg"); } @SideOnly(Side.CLIENT) @@ -93,6 +95,7 @@ public class EventHookContainer { player.inventory.clearInventory(-1, -1); } + ChunkCoordinates coords = LimboProvider.getLimboSkySpawn(player.worldObj.rand); Point4D destination = new Point4D((int) (coords.posX+entity.posX), coords.posY, (int) (coords.posZ+entity.posZ ), mod_pocketDim.properties.LimboDimensionID); DDTeleporter.teleportEntity(player, destination, false); @@ -118,9 +121,13 @@ public class EventHookContainer { SoundSystem sndSystem = FMLClientHandler.instance().getClient().sndManager.sndSystem; sndSystem.stop("BgMusic"); - SoundPoolEntry soundPoolEntry = FMLClientHandler.instance().getClient().sndManager.soundPoolMusic.getRandomSoundFromSoundPool("mods.DimDoors.sfx.creepy"); - sndSystem.backgroundMusic("LimboMusic", soundPoolEntry.getSoundUrl(), soundPoolEntry.getSoundName(), false); - sndSystem.play("LimboMusic"); + SoundPoolEntry soundPoolEntry = FMLClientHandler.instance().getClient().sndManager.soundPoolMusic.getRandomSoundFromSoundPool(mod_pocketDim.modid+":creepy"); + + if(soundPoolEntry!=null) + { + sndSystem.backgroundMusic("LimboMusic", soundPoolEntry.getSoundUrl(), soundPoolEntry.getSoundName(), false); + sndSystem.play("LimboMusic"); + } } else if(world.isRemote && !(world.provider instanceof LimboProvider)) { diff --git a/StevenDimDoors/mod_pocketDim/world/CustomSkyProvider.java b/StevenDimDoors/mod_pocketDim/world/CustomSkyProvider.java index 3a66802..1a31386 100644 --- a/StevenDimDoors/mod_pocketDim/world/CustomSkyProvider.java +++ b/StevenDimDoors/mod_pocketDim/world/CustomSkyProvider.java @@ -18,6 +18,7 @@ public class CustomSkyProvider extends IRenderHandler int starGLCallList; int glSkyList; int glSkyList2; + private static final ResourceLocation locationEndSkyPng = new ResourceLocation("textures/environment/end_sky.png"); public ResourceLocation getMoonRenderPath() @@ -44,7 +45,7 @@ public class CustomSkyProvider extends IRenderHandler GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); RenderHelper.disableStandardItemLighting(); GL11.glDepthMask(false); - mc.renderEngine.bindTexture(new ResourceLocation("/misc/tunnel.png")); + mc.renderEngine.bindTexture((locationEndSkyPng)); if (mc.theWorld.provider.isSurfaceWorld()) { diff --git a/resources/mods/dimdoors/textures/blocks/tile.blockDimWallPerm.png b/resources/mods/dimdoors/textures/blocks/tile.blockDimWallPerm.png index c8f4daf..31806d4 100644 Binary files a/resources/mods/dimdoors/textures/blocks/tile.blockDimWallPerm.png and b/resources/mods/dimdoors/textures/blocks/tile.blockDimWallPerm.png differ diff --git a/resources/mods/dimdoors/textures/blocks/tile.blockDimWallPerm.png.mcmeta b/resources/mods/dimdoors/textures/blocks/tile.blockDimWallPerm.png.mcmeta index 01e04a7..7511680 100644 --- a/resources/mods/dimdoors/textures/blocks/tile.blockDimWallPerm.png.mcmeta +++ b/resources/mods/dimdoors/textures/blocks/tile.blockDimWallPerm.png.mcmeta @@ -1,22 +1,62 @@ { "animation": { - "frametime": 7, + "frametime": 2, "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 5, - 4, - 3, - 2, - 1, + + 0 +,1 +,2 +,3 +,4 +,5 +,6 +,7 +,8 +,9 +,10 +,11 +,13 +,14 +,15 +,16 +,17 +,18 +,19 +,20 +,21 +,22 +,23 +,24 +,25 +,16 +,17 +,28 +,29 +,30 +,31 +,32 +,33 +,34 +,35 +,36 +,37 +,38 +,39 +,40 +,41 +,42 +,43 +,44 +,45 +,46 +,47 +,48 +,49 + + ] } } \ No newline at end of file diff --git a/resources/mods/dimdoors/textures/blocks/tile.blockDimWallPerm.psd b/resources/mods/dimdoors/textures/blocks/tile.blockDimWallPerm.psd new file mode 100644 index 0000000..d37e313 Binary files /dev/null and b/resources/mods/dimdoors/textures/blocks/tile.blockDimWallPerm.psd differ