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

Fixed vulkan mod crash

Browse source
This commit is contained in:
Sollace 2023-08-19 22:14:01 +01:00
parent 7c099cd0b1
commit 0096dec423
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
1 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/com/minelittlepony/client/util/render/TextureFlattener.java
View file

@ -7,8 +7,6 @@ import net.minecraft.util.Identifier;
import net.minecraft.util.math.ColorHelper; import net.minecraft.util.math.ColorHelper;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.mojang.blaze3d.platform.TextureUtil;
import com.mojang.blaze3d.systems.RenderSystem;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
@ -19,28 +17,21 @@ public class TextureFlattener {
Preconditions.checkArgument(textures.size() > 0, "Must have at least one image to flatten"); Preconditions.checkArgument(textures.size() > 0, "Must have at least one image to flatten");
MinecraftClient.getInstance().getTextureManager().registerTexture(output, new ResourceTexture(output) { MinecraftClient.getInstance().getTextureManager().registerTexture(output, new ResourceTexture(output) {
@Override @Override
public void load(ResourceManager resManager) throws IOException { protected TextureData loadTextureData(ResourceManager resourceManager) {
try {
NativeImage image = NativeImage.read(resManager.getResourceOrThrow(textures.get(0)).getInputStream()); NativeImage image = NativeImage.read(resourceManager.getResourceOrThrow(textures.get(0)).getInputStream());
for (int i = 1; i < textures.size(); i++) { for (int i = 1; i < textures.size(); i++) {
try (NativeImage data = NativeImage.read(resManager.getResourceOrThrow(textures.get(i)).getInputStream())) { try (NativeImage data = NativeImage.read(resourceManager.getResourceOrThrow(textures.get(i)).getInputStream())) {
copyOver(data, image); copyOver(data, image);
} }
} }
if (!RenderSystem.isOnRenderThreadOrInit()) { return new TextureData(null, image);
final NativeImage i = image; } catch (IOException e) {
RenderSystem.recordRenderCall(() -> upload(i)); return new TextureData(e);
} else {
upload(image);
} }
} }
private void upload(NativeImage image) {
TextureUtil.prepareImage(getGlId(), 0, image.getWidth(), image.getHeight());
image.upload(0, 0, 0, 0, 0, image.getWidth(), image.getHeight(), false, false, false, true);
}
}); });
} }