diff --git a/lwjgl-rundir/_start_desktop_runtime.sh b/lwjgl-rundir/_start_desktop_runtime.sh index 14bfb2a..753740e 100755 --- a/lwjgl-rundir/_start_desktop_runtime.sh +++ b/lwjgl-rundir/_start_desktop_runtime.sh @@ -1,2 +1,2 @@ #!/bin/sh -java -Xmx4G -Xms4G -Djava.library.path=. -cp "eaglercraft.jar:UnsafeMemcpy.jar:lwjgl.jar:lwjgl-egl.jar:lwjgl-glfw.jar:lwjgl-jemalloc.jar:lwjgl-openal.jar:lwjgl-opengles.jar:soundsystem-20120107.jar:codecjorbis-20101023.jar:codecwav-20101023.jar:Java-WebSocket-1.5.1-with-dependencies.jar" net.lax1dude.eaglercraft.internal.MainClass +java -Xmx4G -Xms4G -XX:-CreateCoredumpOnCrash -Djava.library.path=. -cp "eaglercraft.jar:UnsafeMemcpy.jar:lwjgl.jar:lwjgl-egl.jar:lwjgl-glfw.jar:lwjgl-jemalloc.jar:lwjgl-openal.jar:lwjgl-opengles.jar:soundsystem-20120107.jar:codecjorbis-20101023.jar:codecwav-20101023.jar:Java-WebSocket-1.5.1-with-dependencies.jar" net.lax1dude.eaglercraft.internal.MainClass diff --git a/lwjgl-rundir/eaglercraft.jar b/lwjgl-rundir/eaglercraft.jar index c8420ae..0069114 100644 Binary files a/lwjgl-rundir/eaglercraft.jar and b/lwjgl-rundir/eaglercraft.jar differ diff --git a/lwjgl-rundir/resources/newmusic/hal1.ogg b/lwjgl-rundir/resources/music/hal1.ogg similarity index 100% rename from lwjgl-rundir/resources/newmusic/hal1.ogg rename to lwjgl-rundir/resources/music/hal1.ogg diff --git a/lwjgl-rundir/resources/newmusic/hal2.ogg b/lwjgl-rundir/resources/music/hal2.ogg similarity index 100% rename from lwjgl-rundir/resources/newmusic/hal2.ogg rename to lwjgl-rundir/resources/music/hal2.ogg diff --git a/lwjgl-rundir/resources/newmusic/hal3.ogg b/lwjgl-rundir/resources/music/hal3.ogg similarity index 100% rename from lwjgl-rundir/resources/newmusic/hal3.ogg rename to lwjgl-rundir/resources/music/hal3.ogg diff --git a/lwjgl-rundir/resources/newmusic/hal4.ogg b/lwjgl-rundir/resources/music/hal4.ogg similarity index 100% rename from lwjgl-rundir/resources/newmusic/hal4.ogg rename to lwjgl-rundir/resources/music/hal4.ogg diff --git a/lwjgl-rundir/resources/newmusic/nuance1.ogg b/lwjgl-rundir/resources/music/nuance1.ogg similarity index 100% rename from lwjgl-rundir/resources/newmusic/nuance1.ogg rename to lwjgl-rundir/resources/music/nuance1.ogg diff --git a/lwjgl-rundir/resources/newmusic/nuance2.ogg b/lwjgl-rundir/resources/music/nuance2.ogg similarity index 100% rename from lwjgl-rundir/resources/newmusic/nuance2.ogg rename to lwjgl-rundir/resources/music/nuance2.ogg diff --git a/lwjgl-rundir/resources/newmusic/piano1.ogg b/lwjgl-rundir/resources/music/piano1.ogg similarity index 100% rename from lwjgl-rundir/resources/newmusic/piano1.ogg rename to lwjgl-rundir/resources/music/piano1.ogg diff --git a/lwjgl-rundir/resources/newmusic/piano2.ogg b/lwjgl-rundir/resources/music/piano2.ogg similarity index 100% rename from lwjgl-rundir/resources/newmusic/piano2.ogg rename to lwjgl-rundir/resources/music/piano2.ogg diff --git a/lwjgl-rundir/resources/newmusic/piano3.ogg b/lwjgl-rundir/resources/music/piano3.ogg similarity index 100% rename from lwjgl-rundir/resources/newmusic/piano3.ogg rename to lwjgl-rundir/resources/music/piano3.ogg diff --git a/lwjgl-rundir/resources/newsound/step/grass1.ogg b/lwjgl-rundir/resources/newsound/step/grass1.ogg deleted file mode 100755 index 12f5751..0000000 Binary files a/lwjgl-rundir/resources/newsound/step/grass1.ogg and /dev/null differ diff --git a/lwjgl-rundir/resources/newsound/step/grass2.ogg b/lwjgl-rundir/resources/newsound/step/grass2.ogg deleted file mode 100755 index 05dff55..0000000 Binary files a/lwjgl-rundir/resources/newsound/step/grass2.ogg and /dev/null differ diff --git a/lwjgl-rundir/resources/newsound/step/grass3.ogg b/lwjgl-rundir/resources/newsound/step/grass3.ogg deleted file mode 100755 index e792b34..0000000 Binary files a/lwjgl-rundir/resources/newsound/step/grass3.ogg and /dev/null differ diff --git a/lwjgl-rundir/resources/newsound/step/grass4.ogg b/lwjgl-rundir/resources/newsound/step/grass4.ogg deleted file mode 100755 index 8421e6a..0000000 Binary files a/lwjgl-rundir/resources/newsound/step/grass4.ogg and /dev/null differ diff --git a/lwjgl-rundir/resources/newsound/step/gravel1.ogg b/lwjgl-rundir/resources/newsound/step/gravel1.ogg deleted file mode 100755 index 97ae71e..0000000 Binary files a/lwjgl-rundir/resources/newsound/step/gravel1.ogg and /dev/null differ diff --git a/lwjgl-rundir/resources/newsound/step/gravel2.ogg b/lwjgl-rundir/resources/newsound/step/gravel2.ogg deleted file mode 100755 index 5133141..0000000 Binary files a/lwjgl-rundir/resources/newsound/step/gravel2.ogg and /dev/null differ diff --git a/lwjgl-rundir/resources/newsound/step/gravel3.ogg b/lwjgl-rundir/resources/newsound/step/gravel3.ogg deleted file mode 100755 index 1b8debd..0000000 Binary files a/lwjgl-rundir/resources/newsound/step/gravel3.ogg and /dev/null differ diff --git a/lwjgl-rundir/resources/newsound/step/gravel4.ogg b/lwjgl-rundir/resources/newsound/step/gravel4.ogg deleted file mode 100755 index 94a0c1c..0000000 Binary files a/lwjgl-rundir/resources/newsound/step/gravel4.ogg and /dev/null differ diff --git a/lwjgl-rundir/resources/newsound/step/stone1.ogg b/lwjgl-rundir/resources/newsound/step/stone1.ogg deleted file mode 100755 index 746d282..0000000 Binary files a/lwjgl-rundir/resources/newsound/step/stone1.ogg and /dev/null differ diff --git a/lwjgl-rundir/resources/newsound/step/stone2.ogg b/lwjgl-rundir/resources/newsound/step/stone2.ogg deleted file mode 100755 index 333c970..0000000 Binary files a/lwjgl-rundir/resources/newsound/step/stone2.ogg and /dev/null differ diff --git a/lwjgl-rundir/resources/newsound/step/stone3.ogg b/lwjgl-rundir/resources/newsound/step/stone3.ogg deleted file mode 100755 index f8b629f..0000000 Binary files a/lwjgl-rundir/resources/newsound/step/stone3.ogg and /dev/null differ diff --git a/lwjgl-rundir/resources/newsound/step/stone4.ogg b/lwjgl-rundir/resources/newsound/step/stone4.ogg deleted file mode 100755 index d705cf3..0000000 Binary files a/lwjgl-rundir/resources/newsound/step/stone4.ogg and /dev/null differ diff --git a/lwjgl-rundir/resources/newsound/step/wood1.ogg b/lwjgl-rundir/resources/newsound/step/wood1.ogg deleted file mode 100755 index f9a474a..0000000 Binary files a/lwjgl-rundir/resources/newsound/step/wood1.ogg and /dev/null differ diff --git a/lwjgl-rundir/resources/newsound/step/wood2.ogg b/lwjgl-rundir/resources/newsound/step/wood2.ogg deleted file mode 100755 index b55d49b..0000000 Binary files a/lwjgl-rundir/resources/newsound/step/wood2.ogg and /dev/null differ diff --git a/lwjgl-rundir/resources/newsound/step/wood3.ogg b/lwjgl-rundir/resources/newsound/step/wood3.ogg deleted file mode 100755 index 61922ae..0000000 Binary files a/lwjgl-rundir/resources/newsound/step/wood3.ogg and /dev/null differ diff --git a/lwjgl-rundir/resources/newsound/step/wood4.ogg b/lwjgl-rundir/resources/newsound/step/wood4.ogg deleted file mode 100755 index f5a02c5..0000000 Binary files a/lwjgl-rundir/resources/newsound/step/wood4.ogg and /dev/null differ diff --git a/lwjgl-rundir/resources/newsound/ambient/cave/cave1.ogg b/lwjgl-rundir/resources/sound/ambient/cave/cave1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/cave/cave1.ogg rename to lwjgl-rundir/resources/sound/ambient/cave/cave1.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/cave/cave10.ogg b/lwjgl-rundir/resources/sound/ambient/cave/cave10.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/cave/cave10.ogg rename to lwjgl-rundir/resources/sound/ambient/cave/cave10.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/cave/cave11.ogg b/lwjgl-rundir/resources/sound/ambient/cave/cave11.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/cave/cave11.ogg rename to lwjgl-rundir/resources/sound/ambient/cave/cave11.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/cave/cave12.ogg b/lwjgl-rundir/resources/sound/ambient/cave/cave12.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/cave/cave12.ogg rename to lwjgl-rundir/resources/sound/ambient/cave/cave12.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/cave/cave13.ogg b/lwjgl-rundir/resources/sound/ambient/cave/cave13.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/cave/cave13.ogg rename to lwjgl-rundir/resources/sound/ambient/cave/cave13.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/cave/cave2.ogg b/lwjgl-rundir/resources/sound/ambient/cave/cave2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/cave/cave2.ogg rename to lwjgl-rundir/resources/sound/ambient/cave/cave2.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/cave/cave3.ogg b/lwjgl-rundir/resources/sound/ambient/cave/cave3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/cave/cave3.ogg rename to lwjgl-rundir/resources/sound/ambient/cave/cave3.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/cave/cave4.ogg b/lwjgl-rundir/resources/sound/ambient/cave/cave4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/cave/cave4.ogg rename to lwjgl-rundir/resources/sound/ambient/cave/cave4.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/cave/cave5.ogg b/lwjgl-rundir/resources/sound/ambient/cave/cave5.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/cave/cave5.ogg rename to lwjgl-rundir/resources/sound/ambient/cave/cave5.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/cave/cave6.ogg b/lwjgl-rundir/resources/sound/ambient/cave/cave6.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/cave/cave6.ogg rename to lwjgl-rundir/resources/sound/ambient/cave/cave6.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/cave/cave7.ogg b/lwjgl-rundir/resources/sound/ambient/cave/cave7.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/cave/cave7.ogg rename to lwjgl-rundir/resources/sound/ambient/cave/cave7.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/cave/cave8.ogg b/lwjgl-rundir/resources/sound/ambient/cave/cave8.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/cave/cave8.ogg rename to lwjgl-rundir/resources/sound/ambient/cave/cave8.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/cave/cave9.ogg b/lwjgl-rundir/resources/sound/ambient/cave/cave9.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/cave/cave9.ogg rename to lwjgl-rundir/resources/sound/ambient/cave/cave9.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/weather/rain1.ogg b/lwjgl-rundir/resources/sound/ambient/weather/rain1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/weather/rain1.ogg rename to lwjgl-rundir/resources/sound/ambient/weather/rain1.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/weather/rain2.ogg b/lwjgl-rundir/resources/sound/ambient/weather/rain2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/weather/rain2.ogg rename to lwjgl-rundir/resources/sound/ambient/weather/rain2.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/weather/rain3.ogg b/lwjgl-rundir/resources/sound/ambient/weather/rain3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/weather/rain3.ogg rename to lwjgl-rundir/resources/sound/ambient/weather/rain3.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/weather/rain4.ogg b/lwjgl-rundir/resources/sound/ambient/weather/rain4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/weather/rain4.ogg rename to lwjgl-rundir/resources/sound/ambient/weather/rain4.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/weather/thunder1.ogg b/lwjgl-rundir/resources/sound/ambient/weather/thunder1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/weather/thunder1.ogg rename to lwjgl-rundir/resources/sound/ambient/weather/thunder1.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/weather/thunder2.ogg b/lwjgl-rundir/resources/sound/ambient/weather/thunder2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/weather/thunder2.ogg rename to lwjgl-rundir/resources/sound/ambient/weather/thunder2.ogg diff --git a/lwjgl-rundir/resources/newsound/ambient/weather/thunder3.ogg b/lwjgl-rundir/resources/sound/ambient/weather/thunder3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/ambient/weather/thunder3.ogg rename to lwjgl-rundir/resources/sound/ambient/weather/thunder3.ogg diff --git a/lwjgl-rundir/resources/newsound/damage/fallbig1.ogg b/lwjgl-rundir/resources/sound/damage/fallbig1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/damage/fallbig1.ogg rename to lwjgl-rundir/resources/sound/damage/fallbig1.ogg diff --git a/lwjgl-rundir/resources/newsound/damage/fallbig2.ogg b/lwjgl-rundir/resources/sound/damage/fallbig2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/damage/fallbig2.ogg rename to lwjgl-rundir/resources/sound/damage/fallbig2.ogg diff --git a/lwjgl-rundir/resources/newsound/damage/fallsmall.ogg b/lwjgl-rundir/resources/sound/damage/fallsmall.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/damage/fallsmall.ogg rename to lwjgl-rundir/resources/sound/damage/fallsmall.ogg diff --git a/lwjgl-rundir/resources/newsound/damage/hurtflesh1.ogg b/lwjgl-rundir/resources/sound/damage/hurtflesh1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/damage/hurtflesh1.ogg rename to lwjgl-rundir/resources/sound/damage/hurtflesh1.ogg diff --git a/lwjgl-rundir/resources/newsound/damage/hurtflesh2.ogg b/lwjgl-rundir/resources/sound/damage/hurtflesh2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/damage/hurtflesh2.ogg rename to lwjgl-rundir/resources/sound/damage/hurtflesh2.ogg diff --git a/lwjgl-rundir/resources/newsound/damage/hurtflesh3.ogg b/lwjgl-rundir/resources/sound/damage/hurtflesh3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/damage/hurtflesh3.ogg rename to lwjgl-rundir/resources/sound/damage/hurtflesh3.ogg diff --git a/lwjgl-rundir/resources/newsound/fire/fire.ogg b/lwjgl-rundir/resources/sound/fire/fire.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/fire/fire.ogg rename to lwjgl-rundir/resources/sound/fire/fire.ogg diff --git a/lwjgl-rundir/resources/newsound/fire/ignite.ogg b/lwjgl-rundir/resources/sound/fire/ignite.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/fire/ignite.ogg rename to lwjgl-rundir/resources/sound/fire/ignite.ogg diff --git a/lwjgl-rundir/resources/newsound/liquid/lava.ogg b/lwjgl-rundir/resources/sound/liquid/lava.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/liquid/lava.ogg rename to lwjgl-rundir/resources/sound/liquid/lava.ogg diff --git a/lwjgl-rundir/resources/newsound/liquid/lavapop.ogg b/lwjgl-rundir/resources/sound/liquid/lavapop.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/liquid/lavapop.ogg rename to lwjgl-rundir/resources/sound/liquid/lavapop.ogg diff --git a/lwjgl-rundir/resources/newsound/liquid/splash.ogg b/lwjgl-rundir/resources/sound/liquid/splash.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/liquid/splash.ogg rename to lwjgl-rundir/resources/sound/liquid/splash.ogg diff --git a/lwjgl-rundir/resources/newsound/liquid/water.ogg b/lwjgl-rundir/resources/sound/liquid/water.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/liquid/water.ogg rename to lwjgl-rundir/resources/sound/liquid/water.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/blaze/breathe1.ogg b/lwjgl-rundir/resources/sound/mob/blaze/breathe1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/blaze/breathe1.ogg rename to lwjgl-rundir/resources/sound/mob/blaze/breathe1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/blaze/breathe2.ogg b/lwjgl-rundir/resources/sound/mob/blaze/breathe2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/blaze/breathe2.ogg rename to lwjgl-rundir/resources/sound/mob/blaze/breathe2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/blaze/breathe3.ogg b/lwjgl-rundir/resources/sound/mob/blaze/breathe3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/blaze/breathe3.ogg rename to lwjgl-rundir/resources/sound/mob/blaze/breathe3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/blaze/breathe4.ogg b/lwjgl-rundir/resources/sound/mob/blaze/breathe4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/blaze/breathe4.ogg rename to lwjgl-rundir/resources/sound/mob/blaze/breathe4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/blaze/death.ogg b/lwjgl-rundir/resources/sound/mob/blaze/death.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/blaze/death.ogg rename to lwjgl-rundir/resources/sound/mob/blaze/death.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/blaze/hit1.ogg b/lwjgl-rundir/resources/sound/mob/blaze/hit1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/blaze/hit1.ogg rename to lwjgl-rundir/resources/sound/mob/blaze/hit1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/blaze/hit2.ogg b/lwjgl-rundir/resources/sound/mob/blaze/hit2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/blaze/hit2.ogg rename to lwjgl-rundir/resources/sound/mob/blaze/hit2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/blaze/hit3.ogg b/lwjgl-rundir/resources/sound/mob/blaze/hit3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/blaze/hit3.ogg rename to lwjgl-rundir/resources/sound/mob/blaze/hit3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/blaze/hit4.ogg b/lwjgl-rundir/resources/sound/mob/blaze/hit4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/blaze/hit4.ogg rename to lwjgl-rundir/resources/sound/mob/blaze/hit4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cat/hiss1.ogg b/lwjgl-rundir/resources/sound/mob/cat/hiss1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cat/hiss1.ogg rename to lwjgl-rundir/resources/sound/mob/cat/hiss1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cat/hiss2.ogg b/lwjgl-rundir/resources/sound/mob/cat/hiss2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cat/hiss2.ogg rename to lwjgl-rundir/resources/sound/mob/cat/hiss2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cat/hiss3.ogg b/lwjgl-rundir/resources/sound/mob/cat/hiss3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cat/hiss3.ogg rename to lwjgl-rundir/resources/sound/mob/cat/hiss3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cat/hitt1.ogg b/lwjgl-rundir/resources/sound/mob/cat/hitt1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cat/hitt1.ogg rename to lwjgl-rundir/resources/sound/mob/cat/hitt1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cat/hitt2.ogg b/lwjgl-rundir/resources/sound/mob/cat/hitt2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cat/hitt2.ogg rename to lwjgl-rundir/resources/sound/mob/cat/hitt2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cat/hitt3.ogg b/lwjgl-rundir/resources/sound/mob/cat/hitt3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cat/hitt3.ogg rename to lwjgl-rundir/resources/sound/mob/cat/hitt3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cat/meow1.ogg b/lwjgl-rundir/resources/sound/mob/cat/meow1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cat/meow1.ogg rename to lwjgl-rundir/resources/sound/mob/cat/meow1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cat/meow2.ogg b/lwjgl-rundir/resources/sound/mob/cat/meow2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cat/meow2.ogg rename to lwjgl-rundir/resources/sound/mob/cat/meow2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cat/meow3.ogg b/lwjgl-rundir/resources/sound/mob/cat/meow3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cat/meow3.ogg rename to lwjgl-rundir/resources/sound/mob/cat/meow3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cat/meow4.ogg b/lwjgl-rundir/resources/sound/mob/cat/meow4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cat/meow4.ogg rename to lwjgl-rundir/resources/sound/mob/cat/meow4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cat/purr1.ogg b/lwjgl-rundir/resources/sound/mob/cat/purr1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cat/purr1.ogg rename to lwjgl-rundir/resources/sound/mob/cat/purr1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cat/purr2.ogg b/lwjgl-rundir/resources/sound/mob/cat/purr2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cat/purr2.ogg rename to lwjgl-rundir/resources/sound/mob/cat/purr2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cat/purr3.ogg b/lwjgl-rundir/resources/sound/mob/cat/purr3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cat/purr3.ogg rename to lwjgl-rundir/resources/sound/mob/cat/purr3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cat/purreow1.ogg b/lwjgl-rundir/resources/sound/mob/cat/purreow1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cat/purreow1.ogg rename to lwjgl-rundir/resources/sound/mob/cat/purreow1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cat/purreow2.ogg b/lwjgl-rundir/resources/sound/mob/cat/purreow2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cat/purreow2.ogg rename to lwjgl-rundir/resources/sound/mob/cat/purreow2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/chicken1.ogg b/lwjgl-rundir/resources/sound/mob/chicken1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/chicken1.ogg rename to lwjgl-rundir/resources/sound/mob/chicken1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/chicken2.ogg b/lwjgl-rundir/resources/sound/mob/chicken2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/chicken2.ogg rename to lwjgl-rundir/resources/sound/mob/chicken2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/chicken3.ogg b/lwjgl-rundir/resources/sound/mob/chicken3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/chicken3.ogg rename to lwjgl-rundir/resources/sound/mob/chicken3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/chickenhurt1.ogg b/lwjgl-rundir/resources/sound/mob/chickenhurt1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/chickenhurt1.ogg rename to lwjgl-rundir/resources/sound/mob/chickenhurt1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/chickenhurt2.ogg b/lwjgl-rundir/resources/sound/mob/chickenhurt2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/chickenhurt2.ogg rename to lwjgl-rundir/resources/sound/mob/chickenhurt2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/chickenplop.ogg b/lwjgl-rundir/resources/sound/mob/chickenplop.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/chickenplop.ogg rename to lwjgl-rundir/resources/sound/mob/chickenplop.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cow1.ogg b/lwjgl-rundir/resources/sound/mob/cow1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cow1.ogg rename to lwjgl-rundir/resources/sound/mob/cow1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cow2.ogg b/lwjgl-rundir/resources/sound/mob/cow2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cow2.ogg rename to lwjgl-rundir/resources/sound/mob/cow2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cow3.ogg b/lwjgl-rundir/resources/sound/mob/cow3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cow3.ogg rename to lwjgl-rundir/resources/sound/mob/cow3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cow4.ogg b/lwjgl-rundir/resources/sound/mob/cow4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cow4.ogg rename to lwjgl-rundir/resources/sound/mob/cow4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cowhurt1.ogg b/lwjgl-rundir/resources/sound/mob/cowhurt1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cowhurt1.ogg rename to lwjgl-rundir/resources/sound/mob/cowhurt1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cowhurt2.ogg b/lwjgl-rundir/resources/sound/mob/cowhurt2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cowhurt2.ogg rename to lwjgl-rundir/resources/sound/mob/cowhurt2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/cowhurt3.ogg b/lwjgl-rundir/resources/sound/mob/cowhurt3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/cowhurt3.ogg rename to lwjgl-rundir/resources/sound/mob/cowhurt3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/creeper1.ogg b/lwjgl-rundir/resources/sound/mob/creeper1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/creeper1.ogg rename to lwjgl-rundir/resources/sound/mob/creeper1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/creeper2.ogg b/lwjgl-rundir/resources/sound/mob/creeper2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/creeper2.ogg rename to lwjgl-rundir/resources/sound/mob/creeper2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/creeper3.ogg b/lwjgl-rundir/resources/sound/mob/creeper3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/creeper3.ogg rename to lwjgl-rundir/resources/sound/mob/creeper3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/creeper4.ogg b/lwjgl-rundir/resources/sound/mob/creeper4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/creeper4.ogg rename to lwjgl-rundir/resources/sound/mob/creeper4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/creeperdeath.ogg b/lwjgl-rundir/resources/sound/mob/creeperdeath.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/creeperdeath.ogg rename to lwjgl-rundir/resources/sound/mob/creeperdeath.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/endermen/death.ogg b/lwjgl-rundir/resources/sound/mob/endermen/death.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/endermen/death.ogg rename to lwjgl-rundir/resources/sound/mob/endermen/death.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/endermen/hit1.ogg b/lwjgl-rundir/resources/sound/mob/endermen/hit1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/endermen/hit1.ogg rename to lwjgl-rundir/resources/sound/mob/endermen/hit1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/endermen/hit2.ogg b/lwjgl-rundir/resources/sound/mob/endermen/hit2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/endermen/hit2.ogg rename to lwjgl-rundir/resources/sound/mob/endermen/hit2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/endermen/hit3.ogg b/lwjgl-rundir/resources/sound/mob/endermen/hit3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/endermen/hit3.ogg rename to lwjgl-rundir/resources/sound/mob/endermen/hit3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/endermen/hit4.ogg b/lwjgl-rundir/resources/sound/mob/endermen/hit4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/endermen/hit4.ogg rename to lwjgl-rundir/resources/sound/mob/endermen/hit4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/endermen/idle1.ogg b/lwjgl-rundir/resources/sound/mob/endermen/idle1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/endermen/idle1.ogg rename to lwjgl-rundir/resources/sound/mob/endermen/idle1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/endermen/idle2.ogg b/lwjgl-rundir/resources/sound/mob/endermen/idle2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/endermen/idle2.ogg rename to lwjgl-rundir/resources/sound/mob/endermen/idle2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/endermen/idle3.ogg b/lwjgl-rundir/resources/sound/mob/endermen/idle3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/endermen/idle3.ogg rename to lwjgl-rundir/resources/sound/mob/endermen/idle3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/endermen/idle4.ogg b/lwjgl-rundir/resources/sound/mob/endermen/idle4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/endermen/idle4.ogg rename to lwjgl-rundir/resources/sound/mob/endermen/idle4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/endermen/idle5.ogg b/lwjgl-rundir/resources/sound/mob/endermen/idle5.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/endermen/idle5.ogg rename to lwjgl-rundir/resources/sound/mob/endermen/idle5.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/endermen/portal.ogg b/lwjgl-rundir/resources/sound/mob/endermen/portal.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/endermen/portal.ogg rename to lwjgl-rundir/resources/sound/mob/endermen/portal.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/endermen/portal2.ogg b/lwjgl-rundir/resources/sound/mob/endermen/portal2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/endermen/portal2.ogg rename to lwjgl-rundir/resources/sound/mob/endermen/portal2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/endermen/scream1.ogg b/lwjgl-rundir/resources/sound/mob/endermen/scream1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/endermen/scream1.ogg rename to lwjgl-rundir/resources/sound/mob/endermen/scream1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/endermen/scream2.ogg b/lwjgl-rundir/resources/sound/mob/endermen/scream2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/endermen/scream2.ogg rename to lwjgl-rundir/resources/sound/mob/endermen/scream2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/endermen/scream3.ogg b/lwjgl-rundir/resources/sound/mob/endermen/scream3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/endermen/scream3.ogg rename to lwjgl-rundir/resources/sound/mob/endermen/scream3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/endermen/scream4.ogg b/lwjgl-rundir/resources/sound/mob/endermen/scream4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/endermen/scream4.ogg rename to lwjgl-rundir/resources/sound/mob/endermen/scream4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/endermen/stare.ogg b/lwjgl-rundir/resources/sound/mob/endermen/stare.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/endermen/stare.ogg rename to lwjgl-rundir/resources/sound/mob/endermen/stare.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/ghast/affectionate scream.ogg b/lwjgl-rundir/resources/sound/mob/ghast/affectionate scream.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/ghast/affectionate scream.ogg rename to lwjgl-rundir/resources/sound/mob/ghast/affectionate scream.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/ghast/charge.ogg b/lwjgl-rundir/resources/sound/mob/ghast/charge.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/ghast/charge.ogg rename to lwjgl-rundir/resources/sound/mob/ghast/charge.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/ghast/death.ogg b/lwjgl-rundir/resources/sound/mob/ghast/death.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/ghast/death.ogg rename to lwjgl-rundir/resources/sound/mob/ghast/death.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/ghast/fireball4.ogg b/lwjgl-rundir/resources/sound/mob/ghast/fireball4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/ghast/fireball4.ogg rename to lwjgl-rundir/resources/sound/mob/ghast/fireball4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/ghast/moan1.ogg b/lwjgl-rundir/resources/sound/mob/ghast/moan1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/ghast/moan1.ogg rename to lwjgl-rundir/resources/sound/mob/ghast/moan1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/ghast/moan2.ogg b/lwjgl-rundir/resources/sound/mob/ghast/moan2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/ghast/moan2.ogg rename to lwjgl-rundir/resources/sound/mob/ghast/moan2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/ghast/moan3.ogg b/lwjgl-rundir/resources/sound/mob/ghast/moan3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/ghast/moan3.ogg rename to lwjgl-rundir/resources/sound/mob/ghast/moan3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/ghast/moan4.ogg b/lwjgl-rundir/resources/sound/mob/ghast/moan4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/ghast/moan4.ogg rename to lwjgl-rundir/resources/sound/mob/ghast/moan4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/ghast/moan5.ogg b/lwjgl-rundir/resources/sound/mob/ghast/moan5.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/ghast/moan5.ogg rename to lwjgl-rundir/resources/sound/mob/ghast/moan5.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/ghast/moan6.ogg b/lwjgl-rundir/resources/sound/mob/ghast/moan6.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/ghast/moan6.ogg rename to lwjgl-rundir/resources/sound/mob/ghast/moan6.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/ghast/moan7.ogg b/lwjgl-rundir/resources/sound/mob/ghast/moan7.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/ghast/moan7.ogg rename to lwjgl-rundir/resources/sound/mob/ghast/moan7.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/ghast/scream1.ogg b/lwjgl-rundir/resources/sound/mob/ghast/scream1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/ghast/scream1.ogg rename to lwjgl-rundir/resources/sound/mob/ghast/scream1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/ghast/scream2.ogg b/lwjgl-rundir/resources/sound/mob/ghast/scream2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/ghast/scream2.ogg rename to lwjgl-rundir/resources/sound/mob/ghast/scream2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/ghast/scream3.ogg b/lwjgl-rundir/resources/sound/mob/ghast/scream3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/ghast/scream3.ogg rename to lwjgl-rundir/resources/sound/mob/ghast/scream3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/ghast/scream4.ogg b/lwjgl-rundir/resources/sound/mob/ghast/scream4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/ghast/scream4.ogg rename to lwjgl-rundir/resources/sound/mob/ghast/scream4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/ghast/scream5.ogg b/lwjgl-rundir/resources/sound/mob/ghast/scream5.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/ghast/scream5.ogg rename to lwjgl-rundir/resources/sound/mob/ghast/scream5.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/irongolem/death.ogg b/lwjgl-rundir/resources/sound/mob/irongolem/death.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/irongolem/death.ogg rename to lwjgl-rundir/resources/sound/mob/irongolem/death.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/irongolem/hit1.ogg b/lwjgl-rundir/resources/sound/mob/irongolem/hit1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/irongolem/hit1.ogg rename to lwjgl-rundir/resources/sound/mob/irongolem/hit1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/irongolem/hit2.ogg b/lwjgl-rundir/resources/sound/mob/irongolem/hit2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/irongolem/hit2.ogg rename to lwjgl-rundir/resources/sound/mob/irongolem/hit2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/irongolem/hit3.ogg b/lwjgl-rundir/resources/sound/mob/irongolem/hit3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/irongolem/hit3.ogg rename to lwjgl-rundir/resources/sound/mob/irongolem/hit3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/irongolem/hit4.ogg b/lwjgl-rundir/resources/sound/mob/irongolem/hit4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/irongolem/hit4.ogg rename to lwjgl-rundir/resources/sound/mob/irongolem/hit4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/irongolem/throw.ogg b/lwjgl-rundir/resources/sound/mob/irongolem/throw.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/irongolem/throw.ogg rename to lwjgl-rundir/resources/sound/mob/irongolem/throw.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/irongolem/walk1.ogg b/lwjgl-rundir/resources/sound/mob/irongolem/walk1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/irongolem/walk1.ogg rename to lwjgl-rundir/resources/sound/mob/irongolem/walk1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/irongolem/walk2.ogg b/lwjgl-rundir/resources/sound/mob/irongolem/walk2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/irongolem/walk2.ogg rename to lwjgl-rundir/resources/sound/mob/irongolem/walk2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/irongolem/walk3.ogg b/lwjgl-rundir/resources/sound/mob/irongolem/walk3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/irongolem/walk3.ogg rename to lwjgl-rundir/resources/sound/mob/irongolem/walk3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/irongolem/walk4.ogg b/lwjgl-rundir/resources/sound/mob/irongolem/walk4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/irongolem/walk4.ogg rename to lwjgl-rundir/resources/sound/mob/irongolem/walk4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/magmacube/big1.ogg b/lwjgl-rundir/resources/sound/mob/magmacube/big1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/magmacube/big1.ogg rename to lwjgl-rundir/resources/sound/mob/magmacube/big1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/magmacube/big2.ogg b/lwjgl-rundir/resources/sound/mob/magmacube/big2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/magmacube/big2.ogg rename to lwjgl-rundir/resources/sound/mob/magmacube/big2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/magmacube/big3.ogg b/lwjgl-rundir/resources/sound/mob/magmacube/big3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/magmacube/big3.ogg rename to lwjgl-rundir/resources/sound/mob/magmacube/big3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/magmacube/big4.ogg b/lwjgl-rundir/resources/sound/mob/magmacube/big4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/magmacube/big4.ogg rename to lwjgl-rundir/resources/sound/mob/magmacube/big4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/magmacube/jump1.ogg b/lwjgl-rundir/resources/sound/mob/magmacube/jump1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/magmacube/jump1.ogg rename to lwjgl-rundir/resources/sound/mob/magmacube/jump1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/magmacube/jump2.ogg b/lwjgl-rundir/resources/sound/mob/magmacube/jump2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/magmacube/jump2.ogg rename to lwjgl-rundir/resources/sound/mob/magmacube/jump2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/magmacube/jump3.ogg b/lwjgl-rundir/resources/sound/mob/magmacube/jump3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/magmacube/jump3.ogg rename to lwjgl-rundir/resources/sound/mob/magmacube/jump3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/magmacube/jump4.ogg b/lwjgl-rundir/resources/sound/mob/magmacube/jump4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/magmacube/jump4.ogg rename to lwjgl-rundir/resources/sound/mob/magmacube/jump4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/magmacube/small1.ogg b/lwjgl-rundir/resources/sound/mob/magmacube/small1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/magmacube/small1.ogg rename to lwjgl-rundir/resources/sound/mob/magmacube/small1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/magmacube/small2.ogg b/lwjgl-rundir/resources/sound/mob/magmacube/small2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/magmacube/small2.ogg rename to lwjgl-rundir/resources/sound/mob/magmacube/small2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/magmacube/small3.ogg b/lwjgl-rundir/resources/sound/mob/magmacube/small3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/magmacube/small3.ogg rename to lwjgl-rundir/resources/sound/mob/magmacube/small3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/magmacube/small4.ogg b/lwjgl-rundir/resources/sound/mob/magmacube/small4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/magmacube/small4.ogg rename to lwjgl-rundir/resources/sound/mob/magmacube/small4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/magmacube/small5.ogg b/lwjgl-rundir/resources/sound/mob/magmacube/small5.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/magmacube/small5.ogg rename to lwjgl-rundir/resources/sound/mob/magmacube/small5.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/pig1.ogg b/lwjgl-rundir/resources/sound/mob/pig1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/pig1.ogg rename to lwjgl-rundir/resources/sound/mob/pig1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/pig2.ogg b/lwjgl-rundir/resources/sound/mob/pig2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/pig2.ogg rename to lwjgl-rundir/resources/sound/mob/pig2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/pig3.ogg b/lwjgl-rundir/resources/sound/mob/pig3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/pig3.ogg rename to lwjgl-rundir/resources/sound/mob/pig3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/pigdeath.ogg b/lwjgl-rundir/resources/sound/mob/pigdeath.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/pigdeath.ogg rename to lwjgl-rundir/resources/sound/mob/pigdeath.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/sheep1.ogg b/lwjgl-rundir/resources/sound/mob/sheep1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/sheep1.ogg rename to lwjgl-rundir/resources/sound/mob/sheep1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/sheep2.ogg b/lwjgl-rundir/resources/sound/mob/sheep2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/sheep2.ogg rename to lwjgl-rundir/resources/sound/mob/sheep2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/sheep3.ogg b/lwjgl-rundir/resources/sound/mob/sheep3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/sheep3.ogg rename to lwjgl-rundir/resources/sound/mob/sheep3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/silverfish/hit1.ogg b/lwjgl-rundir/resources/sound/mob/silverfish/hit1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/silverfish/hit1.ogg rename to lwjgl-rundir/resources/sound/mob/silverfish/hit1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/silverfish/hit2.ogg b/lwjgl-rundir/resources/sound/mob/silverfish/hit2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/silverfish/hit2.ogg rename to lwjgl-rundir/resources/sound/mob/silverfish/hit2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/silverfish/hit3.ogg b/lwjgl-rundir/resources/sound/mob/silverfish/hit3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/silverfish/hit3.ogg rename to lwjgl-rundir/resources/sound/mob/silverfish/hit3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/silverfish/kill.ogg b/lwjgl-rundir/resources/sound/mob/silverfish/kill.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/silverfish/kill.ogg rename to lwjgl-rundir/resources/sound/mob/silverfish/kill.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/silverfish/say1.ogg b/lwjgl-rundir/resources/sound/mob/silverfish/say1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/silverfish/say1.ogg rename to lwjgl-rundir/resources/sound/mob/silverfish/say1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/silverfish/say2.ogg b/lwjgl-rundir/resources/sound/mob/silverfish/say2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/silverfish/say2.ogg rename to lwjgl-rundir/resources/sound/mob/silverfish/say2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/silverfish/say3.ogg b/lwjgl-rundir/resources/sound/mob/silverfish/say3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/silverfish/say3.ogg rename to lwjgl-rundir/resources/sound/mob/silverfish/say3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/silverfish/say4.ogg b/lwjgl-rundir/resources/sound/mob/silverfish/say4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/silverfish/say4.ogg rename to lwjgl-rundir/resources/sound/mob/silverfish/say4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/silverfish/step1.ogg b/lwjgl-rundir/resources/sound/mob/silverfish/step1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/silverfish/step1.ogg rename to lwjgl-rundir/resources/sound/mob/silverfish/step1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/silverfish/step2.ogg b/lwjgl-rundir/resources/sound/mob/silverfish/step2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/silverfish/step2.ogg rename to lwjgl-rundir/resources/sound/mob/silverfish/step2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/silverfish/step3.ogg b/lwjgl-rundir/resources/sound/mob/silverfish/step3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/silverfish/step3.ogg rename to lwjgl-rundir/resources/sound/mob/silverfish/step3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/silverfish/step4.ogg b/lwjgl-rundir/resources/sound/mob/silverfish/step4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/silverfish/step4.ogg rename to lwjgl-rundir/resources/sound/mob/silverfish/step4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/skeleton1.ogg b/lwjgl-rundir/resources/sound/mob/skeleton1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/skeleton1.ogg rename to lwjgl-rundir/resources/sound/mob/skeleton1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/skeleton2.ogg b/lwjgl-rundir/resources/sound/mob/skeleton2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/skeleton2.ogg rename to lwjgl-rundir/resources/sound/mob/skeleton2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/skeleton3.ogg b/lwjgl-rundir/resources/sound/mob/skeleton3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/skeleton3.ogg rename to lwjgl-rundir/resources/sound/mob/skeleton3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/skeletondeath.ogg b/lwjgl-rundir/resources/sound/mob/skeletondeath.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/skeletondeath.ogg rename to lwjgl-rundir/resources/sound/mob/skeletondeath.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/skeletonhurt1.ogg b/lwjgl-rundir/resources/sound/mob/skeletonhurt1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/skeletonhurt1.ogg rename to lwjgl-rundir/resources/sound/mob/skeletonhurt1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/skeletonhurt2.ogg b/lwjgl-rundir/resources/sound/mob/skeletonhurt2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/skeletonhurt2.ogg rename to lwjgl-rundir/resources/sound/mob/skeletonhurt2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/skeletonhurt3.ogg b/lwjgl-rundir/resources/sound/mob/skeletonhurt3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/skeletonhurt3.ogg rename to lwjgl-rundir/resources/sound/mob/skeletonhurt3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/skeletonhurt4.ogg b/lwjgl-rundir/resources/sound/mob/skeletonhurt4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/skeletonhurt4.ogg rename to lwjgl-rundir/resources/sound/mob/skeletonhurt4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/slime1.ogg b/lwjgl-rundir/resources/sound/mob/slime1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/slime1.ogg rename to lwjgl-rundir/resources/sound/mob/slime1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/slime2.ogg b/lwjgl-rundir/resources/sound/mob/slime2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/slime2.ogg rename to lwjgl-rundir/resources/sound/mob/slime2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/slime3.ogg b/lwjgl-rundir/resources/sound/mob/slime3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/slime3.ogg rename to lwjgl-rundir/resources/sound/mob/slime3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/slime4.ogg b/lwjgl-rundir/resources/sound/mob/slime4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/slime4.ogg rename to lwjgl-rundir/resources/sound/mob/slime4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/slime5.ogg b/lwjgl-rundir/resources/sound/mob/slime5.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/slime5.ogg rename to lwjgl-rundir/resources/sound/mob/slime5.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/slimeattack1.ogg b/lwjgl-rundir/resources/sound/mob/slimeattack1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/slimeattack1.ogg rename to lwjgl-rundir/resources/sound/mob/slimeattack1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/slimeattack2.ogg b/lwjgl-rundir/resources/sound/mob/slimeattack2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/slimeattack2.ogg rename to lwjgl-rundir/resources/sound/mob/slimeattack2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/spider1.ogg b/lwjgl-rundir/resources/sound/mob/spider1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/spider1.ogg rename to lwjgl-rundir/resources/sound/mob/spider1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/spider2.ogg b/lwjgl-rundir/resources/sound/mob/spider2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/spider2.ogg rename to lwjgl-rundir/resources/sound/mob/spider2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/spider3.ogg b/lwjgl-rundir/resources/sound/mob/spider3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/spider3.ogg rename to lwjgl-rundir/resources/sound/mob/spider3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/spider4.ogg b/lwjgl-rundir/resources/sound/mob/spider4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/spider4.ogg rename to lwjgl-rundir/resources/sound/mob/spider4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/spiderdeath.ogg b/lwjgl-rundir/resources/sound/mob/spiderdeath.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/spiderdeath.ogg rename to lwjgl-rundir/resources/sound/mob/spiderdeath.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/wolf/bark1.ogg b/lwjgl-rundir/resources/sound/mob/wolf/bark1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/wolf/bark1.ogg rename to lwjgl-rundir/resources/sound/mob/wolf/bark1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/wolf/bark2.ogg b/lwjgl-rundir/resources/sound/mob/wolf/bark2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/wolf/bark2.ogg rename to lwjgl-rundir/resources/sound/mob/wolf/bark2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/wolf/bark3.ogg b/lwjgl-rundir/resources/sound/mob/wolf/bark3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/wolf/bark3.ogg rename to lwjgl-rundir/resources/sound/mob/wolf/bark3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/wolf/death.ogg b/lwjgl-rundir/resources/sound/mob/wolf/death.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/wolf/death.ogg rename to lwjgl-rundir/resources/sound/mob/wolf/death.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/wolf/growl1.ogg b/lwjgl-rundir/resources/sound/mob/wolf/growl1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/wolf/growl1.ogg rename to lwjgl-rundir/resources/sound/mob/wolf/growl1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/wolf/growl2.ogg b/lwjgl-rundir/resources/sound/mob/wolf/growl2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/wolf/growl2.ogg rename to lwjgl-rundir/resources/sound/mob/wolf/growl2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/wolf/growl3.ogg b/lwjgl-rundir/resources/sound/mob/wolf/growl3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/wolf/growl3.ogg rename to lwjgl-rundir/resources/sound/mob/wolf/growl3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/wolf/howl1.ogg b/lwjgl-rundir/resources/sound/mob/wolf/howl1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/wolf/howl1.ogg rename to lwjgl-rundir/resources/sound/mob/wolf/howl1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/wolf/howl2.ogg b/lwjgl-rundir/resources/sound/mob/wolf/howl2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/wolf/howl2.ogg rename to lwjgl-rundir/resources/sound/mob/wolf/howl2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/wolf/hurt1.ogg b/lwjgl-rundir/resources/sound/mob/wolf/hurt1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/wolf/hurt1.ogg rename to lwjgl-rundir/resources/sound/mob/wolf/hurt1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/wolf/hurt2.ogg b/lwjgl-rundir/resources/sound/mob/wolf/hurt2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/wolf/hurt2.ogg rename to lwjgl-rundir/resources/sound/mob/wolf/hurt2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/wolf/hurt3.ogg b/lwjgl-rundir/resources/sound/mob/wolf/hurt3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/wolf/hurt3.ogg rename to lwjgl-rundir/resources/sound/mob/wolf/hurt3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/wolf/panting.ogg b/lwjgl-rundir/resources/sound/mob/wolf/panting.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/wolf/panting.ogg rename to lwjgl-rundir/resources/sound/mob/wolf/panting.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/wolf/shake.ogg b/lwjgl-rundir/resources/sound/mob/wolf/shake.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/wolf/shake.ogg rename to lwjgl-rundir/resources/sound/mob/wolf/shake.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/wolf/whine.ogg b/lwjgl-rundir/resources/sound/mob/wolf/whine.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/wolf/whine.ogg rename to lwjgl-rundir/resources/sound/mob/wolf/whine.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombie/metal1.ogg b/lwjgl-rundir/resources/sound/mob/zombie/metal1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombie/metal1.ogg rename to lwjgl-rundir/resources/sound/mob/zombie/metal1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombie/metal2.ogg b/lwjgl-rundir/resources/sound/mob/zombie/metal2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombie/metal2.ogg rename to lwjgl-rundir/resources/sound/mob/zombie/metal2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombie/metal3.ogg b/lwjgl-rundir/resources/sound/mob/zombie/metal3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombie/metal3.ogg rename to lwjgl-rundir/resources/sound/mob/zombie/metal3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombie/wood1.ogg b/lwjgl-rundir/resources/sound/mob/zombie/wood1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombie/wood1.ogg rename to lwjgl-rundir/resources/sound/mob/zombie/wood1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombie/wood2.ogg b/lwjgl-rundir/resources/sound/mob/zombie/wood2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombie/wood2.ogg rename to lwjgl-rundir/resources/sound/mob/zombie/wood2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombie/wood3.ogg b/lwjgl-rundir/resources/sound/mob/zombie/wood3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombie/wood3.ogg rename to lwjgl-rundir/resources/sound/mob/zombie/wood3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombie/wood4.ogg b/lwjgl-rundir/resources/sound/mob/zombie/wood4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombie/wood4.ogg rename to lwjgl-rundir/resources/sound/mob/zombie/wood4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombie/woodbreak.ogg b/lwjgl-rundir/resources/sound/mob/zombie/woodbreak.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombie/woodbreak.ogg rename to lwjgl-rundir/resources/sound/mob/zombie/woodbreak.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombie1.ogg b/lwjgl-rundir/resources/sound/mob/zombie1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombie1.ogg rename to lwjgl-rundir/resources/sound/mob/zombie1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombie2.ogg b/lwjgl-rundir/resources/sound/mob/zombie2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombie2.ogg rename to lwjgl-rundir/resources/sound/mob/zombie2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombie3.ogg b/lwjgl-rundir/resources/sound/mob/zombie3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombie3.ogg rename to lwjgl-rundir/resources/sound/mob/zombie3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombiedeath.ogg b/lwjgl-rundir/resources/sound/mob/zombiedeath.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombiedeath.ogg rename to lwjgl-rundir/resources/sound/mob/zombiedeath.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombiehurt1.ogg b/lwjgl-rundir/resources/sound/mob/zombiehurt1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombiehurt1.ogg rename to lwjgl-rundir/resources/sound/mob/zombiehurt1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombiehurt2.ogg b/lwjgl-rundir/resources/sound/mob/zombiehurt2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombiehurt2.ogg rename to lwjgl-rundir/resources/sound/mob/zombiehurt2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombiepig/zpig1.ogg b/lwjgl-rundir/resources/sound/mob/zombiepig/zpig1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombiepig/zpig1.ogg rename to lwjgl-rundir/resources/sound/mob/zombiepig/zpig1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombiepig/zpig2.ogg b/lwjgl-rundir/resources/sound/mob/zombiepig/zpig2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombiepig/zpig2.ogg rename to lwjgl-rundir/resources/sound/mob/zombiepig/zpig2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombiepig/zpig3.ogg b/lwjgl-rundir/resources/sound/mob/zombiepig/zpig3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombiepig/zpig3.ogg rename to lwjgl-rundir/resources/sound/mob/zombiepig/zpig3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombiepig/zpig4.ogg b/lwjgl-rundir/resources/sound/mob/zombiepig/zpig4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombiepig/zpig4.ogg rename to lwjgl-rundir/resources/sound/mob/zombiepig/zpig4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombiepig/zpigangry1.ogg b/lwjgl-rundir/resources/sound/mob/zombiepig/zpigangry1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombiepig/zpigangry1.ogg rename to lwjgl-rundir/resources/sound/mob/zombiepig/zpigangry1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombiepig/zpigangry2.ogg b/lwjgl-rundir/resources/sound/mob/zombiepig/zpigangry2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombiepig/zpigangry2.ogg rename to lwjgl-rundir/resources/sound/mob/zombiepig/zpigangry2.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombiepig/zpigangry3.ogg b/lwjgl-rundir/resources/sound/mob/zombiepig/zpigangry3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombiepig/zpigangry3.ogg rename to lwjgl-rundir/resources/sound/mob/zombiepig/zpigangry3.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombiepig/zpigangry4.ogg b/lwjgl-rundir/resources/sound/mob/zombiepig/zpigangry4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombiepig/zpigangry4.ogg rename to lwjgl-rundir/resources/sound/mob/zombiepig/zpigangry4.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombiepig/zpigdeath.ogg b/lwjgl-rundir/resources/sound/mob/zombiepig/zpigdeath.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombiepig/zpigdeath.ogg rename to lwjgl-rundir/resources/sound/mob/zombiepig/zpigdeath.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombiepig/zpighurt1.ogg b/lwjgl-rundir/resources/sound/mob/zombiepig/zpighurt1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombiepig/zpighurt1.ogg rename to lwjgl-rundir/resources/sound/mob/zombiepig/zpighurt1.ogg diff --git a/lwjgl-rundir/resources/newsound/mob/zombiepig/zpighurt2.ogg b/lwjgl-rundir/resources/sound/mob/zombiepig/zpighurt2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/mob/zombiepig/zpighurt2.ogg rename to lwjgl-rundir/resources/sound/mob/zombiepig/zpighurt2.ogg diff --git a/lwjgl-rundir/resources/newsound/note/bass.ogg b/lwjgl-rundir/resources/sound/note/bass.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/note/bass.ogg rename to lwjgl-rundir/resources/sound/note/bass.ogg diff --git a/lwjgl-rundir/resources/newsound/note/bassattack.ogg b/lwjgl-rundir/resources/sound/note/bassattack.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/note/bassattack.ogg rename to lwjgl-rundir/resources/sound/note/bassattack.ogg diff --git a/lwjgl-rundir/resources/newsound/note/bd.ogg b/lwjgl-rundir/resources/sound/note/bd.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/note/bd.ogg rename to lwjgl-rundir/resources/sound/note/bd.ogg diff --git a/lwjgl-rundir/resources/newsound/note/harp.ogg b/lwjgl-rundir/resources/sound/note/harp.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/note/harp.ogg rename to lwjgl-rundir/resources/sound/note/harp.ogg diff --git a/lwjgl-rundir/resources/newsound/note/hat.ogg b/lwjgl-rundir/resources/sound/note/hat.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/note/hat.ogg rename to lwjgl-rundir/resources/sound/note/hat.ogg diff --git a/lwjgl-rundir/resources/newsound/note/pling.ogg b/lwjgl-rundir/resources/sound/note/pling.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/note/pling.ogg rename to lwjgl-rundir/resources/sound/note/pling.ogg diff --git a/lwjgl-rundir/resources/newsound/note/snare.ogg b/lwjgl-rundir/resources/sound/note/snare.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/note/snare.ogg rename to lwjgl-rundir/resources/sound/note/snare.ogg diff --git a/lwjgl-rundir/resources/newsound/portal/portal.ogg b/lwjgl-rundir/resources/sound/portal/portal.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/portal/portal.ogg rename to lwjgl-rundir/resources/sound/portal/portal.ogg diff --git a/lwjgl-rundir/resources/newsound/portal/travel.ogg b/lwjgl-rundir/resources/sound/portal/travel.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/portal/travel.ogg rename to lwjgl-rundir/resources/sound/portal/travel.ogg diff --git a/lwjgl-rundir/resources/newsound/portal/trigger.ogg b/lwjgl-rundir/resources/sound/portal/trigger.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/portal/trigger.ogg rename to lwjgl-rundir/resources/sound/portal/trigger.ogg diff --git a/lwjgl-rundir/resources/newsound/random/bow.ogg b/lwjgl-rundir/resources/sound/random/bow.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/bow.ogg rename to lwjgl-rundir/resources/sound/random/bow.ogg diff --git a/lwjgl-rundir/resources/newsound/random/bowhit1.ogg b/lwjgl-rundir/resources/sound/random/bowhit1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/bowhit1.ogg rename to lwjgl-rundir/resources/sound/random/bowhit1.ogg diff --git a/lwjgl-rundir/resources/newsound/random/bowhit2.ogg b/lwjgl-rundir/resources/sound/random/bowhit2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/bowhit2.ogg rename to lwjgl-rundir/resources/sound/random/bowhit2.ogg diff --git a/lwjgl-rundir/resources/newsound/random/bowhit3.ogg b/lwjgl-rundir/resources/sound/random/bowhit3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/bowhit3.ogg rename to lwjgl-rundir/resources/sound/random/bowhit3.ogg diff --git a/lwjgl-rundir/resources/newsound/random/bowhit4.ogg b/lwjgl-rundir/resources/sound/random/bowhit4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/bowhit4.ogg rename to lwjgl-rundir/resources/sound/random/bowhit4.ogg diff --git a/lwjgl-rundir/resources/newsound/random/break.ogg b/lwjgl-rundir/resources/sound/random/break.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/break.ogg rename to lwjgl-rundir/resources/sound/random/break.ogg diff --git a/lwjgl-rundir/resources/newsound/random/breath.ogg b/lwjgl-rundir/resources/sound/random/breath.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/breath.ogg rename to lwjgl-rundir/resources/sound/random/breath.ogg diff --git a/lwjgl-rundir/resources/newsound/random/burp.ogg b/lwjgl-rundir/resources/sound/random/burp.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/burp.ogg rename to lwjgl-rundir/resources/sound/random/burp.ogg diff --git a/lwjgl-rundir/resources/newsound/random/chestclosed.ogg b/lwjgl-rundir/resources/sound/random/chestclosed.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/chestclosed.ogg rename to lwjgl-rundir/resources/sound/random/chestclosed.ogg diff --git a/lwjgl-rundir/resources/newsound/random/chestopen.ogg b/lwjgl-rundir/resources/sound/random/chestopen.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/chestopen.ogg rename to lwjgl-rundir/resources/sound/random/chestopen.ogg diff --git a/lwjgl-rundir/resources/newsound/random/click.ogg b/lwjgl-rundir/resources/sound/random/click.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/click.ogg rename to lwjgl-rundir/resources/sound/random/click.ogg diff --git a/lwjgl-rundir/resources/newsound/random/door_close.ogg b/lwjgl-rundir/resources/sound/random/door_close.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/door_close.ogg rename to lwjgl-rundir/resources/sound/random/door_close.ogg diff --git a/lwjgl-rundir/resources/newsound/random/door_open.ogg b/lwjgl-rundir/resources/sound/random/door_open.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/door_open.ogg rename to lwjgl-rundir/resources/sound/random/door_open.ogg diff --git a/lwjgl-rundir/resources/newsound/random/drink.ogg b/lwjgl-rundir/resources/sound/random/drink.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/drink.ogg rename to lwjgl-rundir/resources/sound/random/drink.ogg diff --git a/lwjgl-rundir/resources/newsound/random/drr.ogg b/lwjgl-rundir/resources/sound/random/drr.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/drr.ogg rename to lwjgl-rundir/resources/sound/random/drr.ogg diff --git a/lwjgl-rundir/resources/newsound/random/eat1.ogg b/lwjgl-rundir/resources/sound/random/eat1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/eat1.ogg rename to lwjgl-rundir/resources/sound/random/eat1.ogg diff --git a/lwjgl-rundir/resources/newsound/random/eat2.ogg b/lwjgl-rundir/resources/sound/random/eat2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/eat2.ogg rename to lwjgl-rundir/resources/sound/random/eat2.ogg diff --git a/lwjgl-rundir/resources/newsound/random/eat3.ogg b/lwjgl-rundir/resources/sound/random/eat3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/eat3.ogg rename to lwjgl-rundir/resources/sound/random/eat3.ogg diff --git a/lwjgl-rundir/resources/newsound/random/explode1.ogg b/lwjgl-rundir/resources/sound/random/explode1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/explode1.ogg rename to lwjgl-rundir/resources/sound/random/explode1.ogg diff --git a/lwjgl-rundir/resources/newsound/random/explode2.ogg b/lwjgl-rundir/resources/sound/random/explode2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/explode2.ogg rename to lwjgl-rundir/resources/sound/random/explode2.ogg diff --git a/lwjgl-rundir/resources/newsound/random/explode3.ogg b/lwjgl-rundir/resources/sound/random/explode3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/explode3.ogg rename to lwjgl-rundir/resources/sound/random/explode3.ogg diff --git a/lwjgl-rundir/resources/newsound/random/explode4.ogg b/lwjgl-rundir/resources/sound/random/explode4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/explode4.ogg rename to lwjgl-rundir/resources/sound/random/explode4.ogg diff --git a/lwjgl-rundir/resources/newsound/random/fizz.ogg b/lwjgl-rundir/resources/sound/random/fizz.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/fizz.ogg rename to lwjgl-rundir/resources/sound/random/fizz.ogg diff --git a/lwjgl-rundir/resources/newsound/random/fuse.ogg b/lwjgl-rundir/resources/sound/random/fuse.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/fuse.ogg rename to lwjgl-rundir/resources/sound/random/fuse.ogg diff --git a/lwjgl-rundir/resources/newsound/random/glass1.ogg b/lwjgl-rundir/resources/sound/random/glass1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/glass1.ogg rename to lwjgl-rundir/resources/sound/random/glass1.ogg diff --git a/lwjgl-rundir/resources/newsound/random/glass2.ogg b/lwjgl-rundir/resources/sound/random/glass2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/glass2.ogg rename to lwjgl-rundir/resources/sound/random/glass2.ogg diff --git a/lwjgl-rundir/resources/newsound/random/glass3.ogg b/lwjgl-rundir/resources/sound/random/glass3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/glass3.ogg rename to lwjgl-rundir/resources/sound/random/glass3.ogg diff --git a/lwjgl-rundir/resources/newsound/random/hurt.ogg b/lwjgl-rundir/resources/sound/random/hurt.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/hurt.ogg rename to lwjgl-rundir/resources/sound/random/hurt.ogg diff --git a/lwjgl-rundir/resources/newsound/random/levelup.ogg b/lwjgl-rundir/resources/sound/random/levelup.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/levelup.ogg rename to lwjgl-rundir/resources/sound/random/levelup.ogg diff --git a/lwjgl-rundir/resources/newsound/random/old_explode.ogg b/lwjgl-rundir/resources/sound/random/old_explode.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/old_explode.ogg rename to lwjgl-rundir/resources/sound/random/old_explode.ogg diff --git a/lwjgl-rundir/resources/newsound/random/orb.ogg b/lwjgl-rundir/resources/sound/random/orb.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/orb.ogg rename to lwjgl-rundir/resources/sound/random/orb.ogg diff --git a/lwjgl-rundir/resources/newsound/random/pop.ogg b/lwjgl-rundir/resources/sound/random/pop.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/pop.ogg rename to lwjgl-rundir/resources/sound/random/pop.ogg diff --git a/lwjgl-rundir/resources/newsound/random/splash.ogg b/lwjgl-rundir/resources/sound/random/splash.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/splash.ogg rename to lwjgl-rundir/resources/sound/random/splash.ogg diff --git a/lwjgl-rundir/resources/newsound/random/wood click.ogg b/lwjgl-rundir/resources/sound/random/wood click.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/random/wood click.ogg rename to lwjgl-rundir/resources/sound/random/wood click.ogg diff --git a/lwjgl-rundir/resources/newsound/step/cloth1.ogg b/lwjgl-rundir/resources/sound/step/cloth1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/step/cloth1.ogg rename to lwjgl-rundir/resources/sound/step/cloth1.ogg diff --git a/lwjgl-rundir/resources/newsound/step/cloth2.ogg b/lwjgl-rundir/resources/sound/step/cloth2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/step/cloth2.ogg rename to lwjgl-rundir/resources/sound/step/cloth2.ogg diff --git a/lwjgl-rundir/resources/newsound/step/cloth3.ogg b/lwjgl-rundir/resources/sound/step/cloth3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/step/cloth3.ogg rename to lwjgl-rundir/resources/sound/step/cloth3.ogg diff --git a/lwjgl-rundir/resources/newsound/step/cloth4.ogg b/lwjgl-rundir/resources/sound/step/cloth4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/step/cloth4.ogg rename to lwjgl-rundir/resources/sound/step/cloth4.ogg diff --git a/lwjgl-rundir/resources/newsound/step/sand1.ogg b/lwjgl-rundir/resources/sound/step/sand1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/step/sand1.ogg rename to lwjgl-rundir/resources/sound/step/sand1.ogg diff --git a/lwjgl-rundir/resources/newsound/step/sand2.ogg b/lwjgl-rundir/resources/sound/step/sand2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/step/sand2.ogg rename to lwjgl-rundir/resources/sound/step/sand2.ogg diff --git a/lwjgl-rundir/resources/newsound/step/sand3.ogg b/lwjgl-rundir/resources/sound/step/sand3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/step/sand3.ogg rename to lwjgl-rundir/resources/sound/step/sand3.ogg diff --git a/lwjgl-rundir/resources/newsound/step/sand4.ogg b/lwjgl-rundir/resources/sound/step/sand4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/step/sand4.ogg rename to lwjgl-rundir/resources/sound/step/sand4.ogg diff --git a/lwjgl-rundir/resources/newsound/step/snow1.ogg b/lwjgl-rundir/resources/sound/step/snow1.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/step/snow1.ogg rename to lwjgl-rundir/resources/sound/step/snow1.ogg diff --git a/lwjgl-rundir/resources/newsound/step/snow2.ogg b/lwjgl-rundir/resources/sound/step/snow2.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/step/snow2.ogg rename to lwjgl-rundir/resources/sound/step/snow2.ogg diff --git a/lwjgl-rundir/resources/newsound/step/snow3.ogg b/lwjgl-rundir/resources/sound/step/snow3.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/step/snow3.ogg rename to lwjgl-rundir/resources/sound/step/snow3.ogg diff --git a/lwjgl-rundir/resources/newsound/step/snow4.ogg b/lwjgl-rundir/resources/sound/step/snow4.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/step/snow4.ogg rename to lwjgl-rundir/resources/sound/step/snow4.ogg diff --git a/lwjgl-rundir/resources/newsound/tile/piston/in.ogg b/lwjgl-rundir/resources/sound/tile/piston/in.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/tile/piston/in.ogg rename to lwjgl-rundir/resources/sound/tile/piston/in.ogg diff --git a/lwjgl-rundir/resources/newsound/tile/piston/out.ogg b/lwjgl-rundir/resources/sound/tile/piston/out.ogg similarity index 100% rename from lwjgl-rundir/resources/newsound/tile/piston/out.ogg rename to lwjgl-rundir/resources/sound/tile/piston/out.ogg diff --git a/src/game/java/net/minecraft/src/ThreadConnectToServer.java b/src/game/java/net/minecraft/src/ThreadConnectToServer.java deleted file mode 100644 index e8f3a8e..0000000 --- a/src/game/java/net/minecraft/src/ThreadConnectToServer.java +++ /dev/null @@ -1,50 +0,0 @@ -package net.minecraft.src; - -import java.net.ConnectException; -import java.net.UnknownHostException; -import net.minecraft.client.Minecraft; - -class ThreadConnectToServer extends Thread { - final Minecraft mc; - final String ip; - final int port; - final GuiConnecting connectingGui; - - ThreadConnectToServer(GuiConnecting var1, Minecraft var2, String var3, int var4) { - this.connectingGui = var1; - this.mc = var2; - this.ip = var3; - this.port = var4; - } - - public void run() { - try { - GuiConnecting.setNetClientHandler(this.connectingGui, new NetClientHandler(this.mc, this.ip, this.port)); - if(GuiConnecting.isCancelled(this.connectingGui)) { - return; - } - - GuiConnecting.getNetClientHandler(this.connectingGui).addToSendQueue(new Packet2Handshake(this.mc.session.username)); - } catch (UnknownHostException var2) { - if(GuiConnecting.isCancelled(this.connectingGui)) { - return; - } - - this.mc.displayGuiScreen(new GuiConnectFailed("Failed to connect to the server", "Unknown host \'" + this.ip + "\'")); - } catch (ConnectException var3) { - if(GuiConnecting.isCancelled(this.connectingGui)) { - return; - } - - this.mc.displayGuiScreen(new GuiConnectFailed("Failed to connect to the server", var3.getMessage())); - } catch (Exception var4) { - if(GuiConnecting.isCancelled(this.connectingGui)) { - return; - } - - var4.printStackTrace(); - this.mc.displayGuiScreen(new GuiConnectFailed("Failed to connect to the server", var4.toString())); - } - - } -} diff --git a/src/game/java/net/minecraft/src/ThreadSleepForever.java b/src/game/java/net/minecraft/src/ThreadSleepForever.java deleted file mode 100644 index fa88a2a..0000000 --- a/src/game/java/net/minecraft/src/ThreadSleepForever.java +++ /dev/null @@ -1,24 +0,0 @@ -package net.minecraft.src; - -import net.minecraft.client.Minecraft; - -public class ThreadSleepForever extends Thread { - final Minecraft mc; - - public ThreadSleepForever(Minecraft var1, String var2) { - super(var2); - this.mc = var1; - this.setDaemon(true); - this.start(); - } - - public void run() { - while(this.mc.running) { - try { - Thread.sleep(2147483647L); - } catch (InterruptedException var2) { - } - } - - } -}