diff --git a/fml b/fml index 6f96d89e2b..2336002f20 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit 6f96d89e2bf9313b26eeb4c334a208bf3e1c9ad4 +Subproject commit 2336002f20e9412a7663781b23c51de0eff6a692 diff --git a/patches/minecraft/net/minecraft/client/audio/SoundPool.java.patch b/patches/minecraft/net/minecraft/client/audio/SoundPool.java.patch index 456e957e2b..fbf82fb285 100644 --- a/patches/minecraft/net/minecraft/client/audio/SoundPool.java.patch +++ b/patches/minecraft/net/minecraft/client/audio/SoundPool.java.patch @@ -1,20 +1,10 @@ --- ../src_base/minecraft/net/minecraft/client/audio/SoundPool.java +++ ../src_work/minecraft/net/minecraft/client/audio/SoundPool.java -@@ -11,6 +11,7 @@ - import java.util.Map; +@@ -12,6 +12,7 @@ import java.util.Random; + import net.minecraft.client.resources.ResourceLocation; import net.minecraft.client.resources.ResourceManager; +import net.minecraftforge.client.ForgeHooksClient; @SideOnly(Side.CLIENT) public class SoundPool -@@ -71,7 +72,8 @@ - - private URL func_110654_c(String par1Str) throws MalformedURLException - { -- return new URL((URL)null, "minecraft:" + this.field_110656_d + "/" + par1Str, new SoundPoolProtocolHandler(this)); -+ String path = ForgeHooksClient.fixDomain(field_110656_d + "/", par1Str); -+ return new URL((URL)null, "minecraft:" + path, new SoundPoolProtocolHandler(this)); - } - - /** diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch index 4731005d12..e0a511cd19 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch @@ -22,24 +22,7 @@ Iterator iterator = this.field_110574_e.entrySet().iterator(); while (iterator.hasNext()) -@@ -69,11 +73,14 @@ - Entry entry = (Entry)iterator.next(); - String s = (String)entry.getKey(); - TextureAtlasSprite textureatlassprite = (TextureAtlasSprite)entry.getValue(); -- ResourceLocation resourcelocation = new ResourceLocation(this.basePath + s + ".png"); -+ ResourceLocation resourcelocation = new ResourceLocation(ForgeHooksClient.fixDomain(basePath, s) + ".png"); - - try - { -- textureatlassprite.func_130100_a(par1ResourceManager.func_110536_a(resourcelocation)); -+ if (!textureatlassprite.load(par1ResourceManager, resourcelocation)) -+ { -+ continue; -+ } - } - catch (RuntimeException runtimeexception) - { -@@ -142,6 +149,7 @@ +@@ -142,6 +146,7 @@ textureatlassprite1 = (TextureAtlasSprite)iterator1.next(); textureatlassprite1.copyFrom(this.missingImage); } @@ -47,7 +30,7 @@ } private void func_110573_f() -@@ -212,6 +220,7 @@ +@@ -212,6 +217,7 @@ if (par1Str == null) { (new RuntimeException("Don\'t register null!")).printStackTrace(); @@ -55,7 +38,7 @@ } Object object = (TextureAtlasSprite)this.field_110574_e.get(par1Str); -@@ -253,4 +262,37 @@ +@@ -253,4 +259,37 @@ { this.updateAnimations(); }