Files
MinecraftForge/patches/minecraft/net/minecraft/resources/SimpleReloadableResourceManager.java.patch
T
LexManos bf9158172f Most client patches done except the render pipeline.
Someone who has more in depth knowledge of that rendering system will need to do it.
2018-11-28 22:15:05 -08:00

58 lines
2.4 KiB
Diff

--- a/net/minecraft/resources/SimpleReloadableResourceManager.java
+++ b/net/minecraft/resources/SimpleReloadableResourceManager.java
@@ -45,7 +45,6 @@
}
- @OnlyIn(Dist.CLIENT)
public Set<String> func_199001_a() {
return this.field_199016_e;
}
@@ -86,35 +85,46 @@
}
public void func_199005_a(List<IResourcePack> p_199005_1_) {
+ net.minecraftforge.fml.common.ProgressManager.ProgressBar resReload = net.minecraftforge.fml.common.ProgressManager.push("Loading Resources", p_199005_1_.size() + 1, true);
this.func_199008_b();
field_199012_a.info("Reloading ResourceManager: {}", p_199005_1_.stream().map(IResourcePack::func_195762_a).collect(Collectors.joining(", ")));
for(IResourcePack iresourcepack : p_199005_1_) {
+ resReload.step(iresourcepack.func_195762_a());
this.func_199009_a(iresourcepack);
}
+ resReload.step("Reloading listeners");
if (field_199012_a.isDebugEnabled()) {
this.func_199011_d();
} else {
this.func_199010_c();
}
+ net.minecraftforge.fml.common.ProgressManager.pop(resReload);
}
public void func_199006_a(IResourceManagerReloadListener p_199006_1_) {
+ net.minecraftforge.fml.common.ProgressManager.ProgressBar resReload = net.minecraftforge.fml.common.ProgressManager.push("Loading Resource", 1);
+ resReload.step(p_199006_1_.getClass());
this.field_199015_d.add(p_199006_1_);
if (field_199012_a.isDebugEnabled()) {
field_199012_a.info(this.func_199007_b(p_199006_1_));
} else {
p_199006_1_.func_195410_a(this);
}
+ net.minecraftforge.fml.common.ProgressManager.pop(resReload);
}
private void func_199010_c() {
+ net.minecraftforge.fml.common.ProgressManager.ProgressBar resReload = net.minecraftforge.fml.common.ProgressManager.push("Reloading", this.field_199015_d.size());
for(IResourceManagerReloadListener iresourcemanagerreloadlistener : this.field_199015_d) {
+ resReload.step(iresourcemanagerreloadlistener.getClass());
+ if (!net.minecraftforge.resource.SelectiveReloadStateHandler.INSTANCE.test(iresourcemanagerreloadlistener)) continue; // Forge: Selective reloading for vanilla listeners
iresourcemanagerreloadlistener.func_195410_a(this);
}
+ net.minecraftforge.fml.common.ProgressManager.pop(resReload);
}