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

Make less calls to Pony.getBufferedImage() and actually close it.

Browse source
This commit is contained in:
Matthew Messinger 2019-07-13 19:12:19 -04:00
parent 1911a6dde8
commit e3a496be16
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/minelittlepony/client/hdskins/gui/PonyPreview.java
View file

@ -1,10 +1,8 @@
package com.minelittlepony.client.hdskins.gui; package com.minelittlepony.client.hdskins.gui;
import net.minecraft.client.texture.MissingSprite;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import com.minelittlepony.client.MineLittlePony; import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.client.pony.Pony;
import com.minelittlepony.hdskins.dummy.DummyPlayer; import com.minelittlepony.hdskins.dummy.DummyPlayer;
import com.minelittlepony.hdskins.dummy.PlayerPreview; import com.minelittlepony.hdskins.dummy.PlayerPreview;
import com.minelittlepony.pony.IPony; import com.minelittlepony.pony.IPony;
@ -37,7 +35,7 @@ class PonyPreview extends PlayerPreview {
protected DummyPlayer ponify(DummyPlayer human, DummyPlayer pony) { protected DummyPlayer ponify(DummyPlayer human, DummyPlayer pony) {
Identifier loc = human.getTextures().get(Type.SKIN).getId(); Identifier loc = human.getTextures().get(Type.SKIN).getId();
if (loc == null || Pony.getBufferedImage(loc) == MissingSprite.getMissingSpriteTexture().getImage()) { if (loc == null) {
return pony; return pony;
} }

5
src/main/java/com/minelittlepony/client/pony/Pony.java
View file

@ -71,9 +71,10 @@ public class Pony implements IPony {
return data; return data;
} }
NativeImage ponyTexture = getBufferedImage(resource); try (NativeImage ponyTexture = getBufferedImage(resource)) {
return checkSkin(ponyTexture); return checkSkin(ponyTexture);
} }
}
@Override @Override
public void updateForEntity(Entity entity) { public void updateForEntity(Entity entity) {
@ -102,7 +103,7 @@ public class Pony implements IPony {
return null; return null;
} }
public static NativeImage getBufferedImage(@Nullable Identifier resource) { private static NativeImage getBufferedImage(@Nullable Identifier resource) {
if (resource != null) { if (resource != null) {
try { try {
Texture texture = MinecraftClient.getInstance().getTextureManager().getTexture(resource); Texture texture = MinecraftClient.getInstance().getTextureManager().getTexture(resource);

3
src/main/java/com/minelittlepony/client/pony/PonyManager.java
View file

@ -20,7 +20,6 @@ import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.AbstractClientPlayerEntity; import net.minecraft.client.network.AbstractClientPlayerEntity;
import net.minecraft.client.network.PlayerListEntry; import net.minecraft.client.network.PlayerListEntry;
import net.minecraft.client.texture.MissingSprite;
import net.minecraft.client.util.DefaultSkinHelper; import net.minecraft.client.util.DefaultSkinHelper;
import net.minecraft.resource.Resource; import net.minecraft.resource.Resource;
import net.minecraft.resource.ResourceManager; import net.minecraft.resource.ResourceManager;
@ -99,7 +98,7 @@ public class PonyManager implements IPonyManager, IdentifiableResourceReloadList
Identifier skin = playerInfo.getSkinTexture(); Identifier skin = playerInfo.getSkinTexture();
UUID uuid = playerInfo.getProfile().getId(); UUID uuid = playerInfo.getProfile().getId();
if (Pony.getBufferedImage(skin) == MissingSprite.getMissingSpriteTexture().getImage()) { if (skin == null) {
return getDefaultPony(uuid); return getDefaultPony(uuid);
} }