43 lines
2.1 KiB
Diff
43 lines
2.1 KiB
Diff
--- ../src-base/minecraft/net/minecraft/client/renderer/texture/Stitcher.java
|
|
+++ ../src-work/minecraft/net/minecraft/client/renderer/texture/Stitcher.java
|
|
@@ -60,6 +60,7 @@
|
|
public void func_94305_f()
|
|
{
|
|
Stitcher.Holder[] aholder = (Stitcher.Holder[])this.field_94319_a.toArray(new Stitcher.Holder[this.field_94319_a.size()]);
|
|
+ net.minecraftforge.fml.common.ProgressManager.ProgressBar bar = net.minecraftforge.fml.common.ProgressManager.push("Texture stitching", aholder.length);
|
|
Arrays.sort(aholder);
|
|
Stitcher.Holder[] aholder1 = aholder;
|
|
int i = aholder.length;
|
|
@@ -67,10 +68,14 @@
|
|
for (int j = 0; j < i; ++j)
|
|
{
|
|
Stitcher.Holder holder = aholder1[j];
|
|
+ bar.step(holder.func_98150_a().func_94215_i());
|
|
|
|
if (!this.func_94310_b(holder))
|
|
{
|
|
String s = String.format("Unable to fit: %s - size: %dx%d - Maybe try a lowerresolution resourcepack?", new Object[] {holder.func_98150_a().func_94215_i(), Integer.valueOf(holder.func_98150_a().func_94211_a()), Integer.valueOf(holder.func_98150_a().func_94216_b())});
|
|
+ net.minecraftforge.fml.common.FMLLog.info(s);
|
|
+ for (Stitcher.Holder h : aholder)
|
|
+ net.minecraftforge.fml.common.FMLLog.info(" %s", h);
|
|
throw new StitcherException(holder, s);
|
|
}
|
|
}
|
|
@@ -80,6 +85,7 @@
|
|
this.field_94318_c = MathHelper.func_151236_b(this.field_94318_c);
|
|
this.field_94315_d = MathHelper.func_151236_b(this.field_94315_d);
|
|
}
|
|
+ net.minecraftforge.fml.common.ProgressManager.pop(bar);
|
|
}
|
|
|
|
public List func_94309_g()
|
|
@@ -273,7 +279,7 @@
|
|
|
|
public String toString()
|
|
{
|
|
- return "Holder{width=" + this.field_94204_c + ", height=" + this.field_94201_d + '}';
|
|
+ return "Holder{width=" + this.field_94204_c + ", height=" + this.field_94201_d + ", name=" + this.field_98151_a.func_94215_i() + '}';
|
|
}
|
|
|
|
public int compareTo(Stitcher.Holder p_compareTo_1_)
|