mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-22 21:20:12 +00:00
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
--- ../src-base/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java
|
|
+++ ../src-work/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java
|
|
@@ -6,16 +6,22 @@
|
|
import com.google.common.collect.Lists;
|
|
import com.google.common.collect.Maps;
|
|
import com.google.common.collect.Sets;
|
|
+
|
|
+import cpw.mods.fml.common.ProgressManager;
|
|
+import cpw.mods.fml.common.ProgressManager.ProgressBar;
|
|
import cpw.mods.fml.relauncher.Side;
|
|
import cpw.mods.fml.relauncher.SideOnly;
|
|
+
|
|
import java.io.FileNotFoundException;
|
|
import java.io.IOException;
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Set;
|
|
+
|
|
import net.minecraft.client.resources.data.IMetadataSerializer;
|
|
import net.minecraft.util.ResourceLocation;
|
|
+
|
|
import org.apache.logging.log4j.LogManager;
|
|
import org.apache.logging.log4j.Logger;
|
|
|
|
@@ -95,6 +101,7 @@
|
|
public void func_110541_a(List p_110541_1_)
|
|
{
|
|
this.func_110543_a();
|
|
+ ProgressBar resReload = ProgressManager.push("Resource loading", p_110541_1_.size());
|
|
field_147967_a.info("Reloading ResourceManager: " + field_130074_a.join(Iterables.transform(p_110541_1_, new Function()
|
|
{
|
|
private static final String __OBFID = "CL_00001092";
|
|
@@ -112,10 +119,12 @@
|
|
while (iterator.hasNext())
|
|
{
|
|
IResourcePack iresourcepack = (IResourcePack)iterator.next();
|
|
+ resReload.step(iresourcepack.func_130077_b());
|
|
this.func_110545_a(iresourcepack);
|
|
}
|
|
|
|
this.func_110544_b();
|
|
+ ProgressManager.pop(resReload);
|
|
}
|
|
|
|
public void func_110542_a(IResourceManagerReloadListener p_110542_1_)
|