PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-18 02:24:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Try a little harder to parse skins when they're not yet uploaded. Should fix ponies randomly appearing as humans early in-game

Browse source
This commit is contained in:
Sollace 2022-12-13 00:26:11 +00:00
parent aedb4e49f7
commit 69a7806ad1
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/com/minelittlepony/client/util/render/NativeUtil.java
View file

@ -9,6 +9,8 @@ import com.mojang.blaze3d.systems.RenderSystem;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer; import java.util.function.Consumer;
import static com.mojang.blaze3d.platform.GlStateManager._getTexLevelParameter; import static com.mojang.blaze3d.platform.GlStateManager._getTexLevelParameter;
@ -92,9 +94,13 @@ public class NativeUtil {
} }
public static void parseImage(Identifier resource, Consumer<NativeImage> consumer, Consumer<Exception> fail) { public static void parseImage(Identifier resource, Consumer<NativeImage> consumer, Consumer<Exception> fail) {
parseImage(resource, consumer, fail, 0);
}
private static void parseImage(Identifier resource, Consumer<NativeImage> consumer, Consumer<Exception> fail, int attempt) {
try { try {
if (!RenderSystem.isOnRenderThread()) { if (!RenderSystem.isOnRenderThread()) {
RenderSystem.recordRenderCall(() -> parseImage(resource, consumer, fail)); RenderSystem.recordRenderCall(() -> parseImage(resource, consumer, fail, attempt));
return; return;
} }
@ -112,7 +118,13 @@ public class NativeUtil {
int height = _getTexLevelParameter(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT); int height = _getTexLevelParameter(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT);
if (width * height == 0) { if (width * height == 0) {
throw new IllegalStateException("GL texture not uploaded yet: " + resource); if (attempt < 3) {
CompletableFuture.delayedExecutor(500, TimeUnit.MILLISECONDS, mc).execute(() -> {
parseImage(resource, consumer, fail, attempt + 1);
});
} else {
throw new IllegalStateException("GL texture not uploaded yet: " + resource + " Parse failed 3/3 attempts");
}
} }
try (NativeImage image = new NativeImage(InternalFormat.valueOf(format).getClassification(), width, height, false)) { try (NativeImage image = new NativeImage(InternalFormat.valueOf(format).getClassification(), width, height, false)) {