diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index cd2d4343b6..a0eb2e1f6a 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -13,7 +13,7 @@ this.field_135017_as = new LanguageManager(this.field_110452_an, this.field_71474_y.field_74363_ab); this.field_110451_am.func_110542_a(this.field_135017_as); - this.func_110436_a(); -+ net.minecraftforge.fml.client.FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am); ++ net.minecraftforge.fml.client.FMLClientHandler.instance().beginMinecraftLoading(this, this.field_110449_ao, this.field_110451_am, this.field_110452_an); this.field_71446_o = new TextureManager(this.field_110451_am); this.field_110451_am.func_110542_a(this.field_71446_o); - this.func_180510_a(this.field_71446_o); diff --git a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java index 9bb217cfb8..c796af8234 100644 --- a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java +++ b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java @@ -52,7 +52,10 @@ import net.minecraft.client.resources.AbstractResourcePack; import net.minecraft.client.resources.FallbackResourceManager; import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.client.resources.IResourcePack; +import net.minecraft.client.resources.LegacyV2Adapter; import net.minecraft.client.resources.SimpleReloadableResourceManager; +import net.minecraft.client.resources.data.MetadataSerializer; +import net.minecraft.client.resources.data.PackMetadataSection; import net.minecraft.crash.CrashReport; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.launchwrapper.Launch; @@ -181,6 +184,8 @@ public class FMLClientHandler implements IFMLSidedHandler private List resourcePackList; + private MetadataSerializer metaSerializer; + private Map resourcePackMap; private BiMap guiFactories; @@ -198,12 +203,13 @@ public class FMLClientHandler implements IFMLSidedHandler * @param resourceManager The resource manager */ @SuppressWarnings("unchecked") - public void beginMinecraftLoading(Minecraft minecraft, List resourcePackList, IReloadableResourceManager resourceManager) + public void beginMinecraftLoading(Minecraft minecraft, List resourcePackList, IReloadableResourceManager resourceManager, MetadataSerializer metaSerializer) { detectOptifine(); SplashProgress.start(); client = minecraft; this.resourcePackList = resourcePackList; + this.metaSerializer = metaSerializer; this.resourcePackMap = Maps.newHashMap(); if (minecraft.isDemo()) { @@ -623,6 +629,14 @@ public class FMLClientHandler implements IFMLSidedHandler try { IResourcePack pack = (IResourcePack) resourcePackType.getConstructor(ModContainer.class).newInstance(container); + + PackMetadataSection meta = (PackMetadataSection)pack.getPackMetadata(this.metaSerializer, "pack"); + + if (meta != null && meta.getPackFormat() == 2) + { + pack = new LegacyV2Adapter(pack); + } + resourcePackList.add(pack); resourcePackMap.put(container.getModId(), pack); } diff --git a/src/main/java/net/minecraftforge/fml/client/FMLFileResourcePack.java b/src/main/java/net/minecraftforge/fml/client/FMLFileResourcePack.java index 4a67323561..2503998c00 100644 --- a/src/main/java/net/minecraftforge/fml/client/FMLFileResourcePack.java +++ b/src/main/java/net/minecraftforge/fml/client/FMLFileResourcePack.java @@ -65,7 +65,7 @@ public class FMLFileResourcePack extends FileResourcePack implements FMLContaine return new ByteArrayInputStream(("{\n" + " \"pack\": {\n"+ " \"description\": \"dummy FML pack for "+container.getName()+"\",\n"+ - " \"pack_format\": 1\n"+ + " \"pack_format\": 2\n"+ "}\n" + "}").getBytes(Charsets.UTF_8)); } diff --git a/src/main/java/net/minecraftforge/fml/client/FMLFolderResourcePack.java b/src/main/java/net/minecraftforge/fml/client/FMLFolderResourcePack.java index 6d5a71b109..7fc85865a8 100644 --- a/src/main/java/net/minecraftforge/fml/client/FMLFolderResourcePack.java +++ b/src/main/java/net/minecraftforge/fml/client/FMLFolderResourcePack.java @@ -70,7 +70,7 @@ public class FMLFolderResourcePack extends FolderResourcePack implements FMLCont return new ByteArrayInputStream(("{\n" + " \"pack\": {\n"+ " \"description\": \"dummy FML pack for "+container.getName()+"\",\n"+ - " \"pack_format\": 1\n"+ + " \"pack_format\": 2\n"+ "}\n" + "}").getBytes(Charsets.UTF_8)); }