From e1f691617f76fbe3deb58d47d0fd307ffacee14e Mon Sep 17 00:00:00 2001 From: Bartek Bok Date: Thu, 1 Feb 2018 06:08:29 +0100 Subject: [PATCH] Remove texture loads from SimpleModelFontRenderer (#4721) --- .../client/model/SimpleModelFontRenderer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/client/model/SimpleModelFontRenderer.java b/src/main/java/net/minecraftforge/client/model/SimpleModelFontRenderer.java index ca7a2e2a5e..2bf60fdcf6 100644 --- a/src/main/java/net/minecraftforge/client/model/SimpleModelFontRenderer.java +++ b/src/main/java/net/minecraftforge/client/model/SimpleModelFontRenderer.java @@ -14,7 +14,6 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.settings.GameSettings; @@ -36,7 +35,6 @@ public abstract class SimpleModelFontRenderer extends FontRenderer { public SimpleModelFontRenderer(GameSettings settings, ResourceLocation font, TextureManager manager, boolean isUnicode, Matrix4f matrix, VertexFormat format) { super(settings, font, manager, isUnicode); - manager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); this.matrix = new Matrix4f(matrix); Matrix3f nm = new Matrix3f(); this.matrix.getRotationScale(nm); @@ -173,6 +171,11 @@ public abstract class SimpleModelFontRenderer extends FontRenderer { { } + @Override + protected void bindTexture(ResourceLocation location) + { + } + public ImmutableList build() { ImmutableList ret = builder.build();