Fix rendering issue with fonts.

Author: AlexIIL

src/main/java/alexiil/mc/mod/load/Tips.java

@@ -1,13 +1,18 @@
 package alexiil.mc.mod.load;
 
+import java.io.BufferedReader;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-/** Basic tips manager. Provides access to a single list of */
+import javax.annotation.Nullable;
+
+/** Basic tips manager. Provides access to a single list of tips. */
 public class Tips {
 
     private static final List<String> tips = new ArrayList<>();
+    private static boolean anyTips = false;
 
     static {
         // Just ensure that nothing can crash by having an empty list
@@ -23,17 +28,52 @@ public static void load(List<String> from) {
         Collections.shuffle(tips);
         if (tips.isEmpty()) {
             tips.add("Tips file was empty!");
+            anyTips = false;
+        } else {
+            anyTips = true;
+        }
+    }
+
+    public static void parseTips(BufferedReader from, List<String> to) throws IOException {
+        String line;
+        while ((line = from.readLine()) != null) {
+            if (line.isEmpty() || line.startsWith("#")) {
+                // Comment
+            } else {
+                to.add(line);
+            }
         }
     }
 
+    public static List<String> parseTips(BufferedReader from) throws IOException {
+        List<String> list = new ArrayList<>();
+        parseTips(from, list);
+        return list;
+    }
+
     public static String getFirstTip() {
         return tips.get(0);
     }
 
+    /** Checks to see if any valid tips have been loaded ({@link #getFirstTip()} will return the default tip if this
+     * returns false). */
+    public static boolean hasAnyTips() {
+        return anyTips;
+    }
+
     public static int getTipCount() {
         return tips.size();
     }
 
+    /** @return The tip at the given index, or null if the index is out of bounds. */
+    @Nullable
+    public static String getTipAt(int index) {
+        if (index < 0 || index >= tips.size()) {
+            return null;
+        }
+        return tips.get(index);
+    }
+
     /** @return The tip at the given index. Wraps around if the index was outside of bounds */
     public static String getTip(int index) {
         int count = tips.size();
@@ -50,4 +90,8 @@ public static String getTip(int index) {
     public static String getTip(long index) {
         return getTip((int) index);
     }
+
+    public static class TipsInstance {
+
+    }
 }

src/main/java/alexiil/mc/mod/load/render/FontRendererSeparate.java

@@ -0,0 +1,70 @@
+package alexiil.mc.mod.load.render;
+
+import java.awt.image.BufferedImage;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.lwjgl.opengl.GL11;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.texture.TextureUtil;
+import net.minecraft.client.resources.IResource;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.util.ResourceLocation;
+
+public class FontRendererSeparate extends FontRenderer {
+
+    private final Map<ResourceLocation, BufferedImage> textureData = new HashMap<>();
+    private final Map<ResourceLocation, Integer> textureLocations = new HashMap<>();
+
+    public FontRendererSeparate(GameSettings settings, ResourceLocation location, TextureManager textureManagerIn,
+        boolean unicode) {
+        super(settings, location, textureManagerIn, unicode);
+
+        loadTex(location);
+        // for (int i = 0; i < 256; i++) {
+
+        // }
+    }
+
+    private void loadTex(ResourceLocation location) {
+        try (IResource resource = Minecraft.getMinecraft().getResourceManager().getResource(location)) {
+            textureData.put(location, TextureUtil.readBufferedImage(resource.getInputStream()));
+        } catch (FileNotFoundException e) {
+            throw new Error(e);
+        } catch (IOException e) {
+            throw new Error(e);
+        }
+    }
+
+    @Override
+    protected void bindTexture(ResourceLocation location) {
+        if (textureLocations == null) {
+            // During init, so we don't care
+            return;
+        }
+        Integer value = textureLocations.get(location);
+        if (value == null) {
+            BufferedImage img = textureData.get(location);
+            if (img == null) {
+                return;
+            }
+            int next = GL11.glGenTextures();
+            TextureUtil.uploadTextureImage(next, img);
+            textureLocations.put(location, next);
+            value = next;
+        }
+        GL11.glBindTexture(GL11.GL_TEXTURE_2D, value.intValue());
+    }
+
+    public void destroy() {
+        for (Integer value : textureLocations.values()) {
+            GL11.glDeleteTextures(value.intValue());
+        }
+        textureLocations.clear();
+    }
+}

src/main/java/alexiil/mc/mod/load/render/MainSplashRenderer.java

@@ -40,6 +40,7 @@
 
 import org.lwjgl.LWJGLException;
 import org.lwjgl.opengl.Display;
+import org.lwjgl.opengl.GL11;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
@@ -143,17 +144,18 @@ public static void run() {
             mutex.acquireUninterruptibly();
             Display.update();
             mutex.release();
+            GL11.glFlush();
 
             if (finishedLoading && !reachedConstruct) {
                 // We crashed
                 break;
             }
 
+            Display.sync(100);
             boolean grabUngrab = pause;// & !finishedLoading;
             if (grabUngrab) {
                 clearGL();
             }
-            Display.sync(100);
             if (grabUngrab) {
                 setGL();
             }

src/main/java/alexiil/mc/mod/load/render/MinecraftDisplayerRenderer.java

@@ -1,5 +1,8 @@
 package alexiil.mc.mod.load.render;
 
+import static org.lwjgl.opengl.GL11.GL_TEXTURE_2D;
+import static org.lwjgl.opengl.GL11.glEnable;
+
 import java.util.Map;
 
 import com.google.common.collect.Maps;
@@ -22,6 +25,8 @@
 import alexiil.mc.mod.load.baked.BakedVariable;
 
 public class MinecraftDisplayerRenderer {
+    private static final ResourceLocation FONT_LOCATION = new ResourceLocation("textures/font/ascii.png");
+
     public final TextureAnimator animator;
     private final BakedVariable[] variables;
     private final BakedRenderingPart[] renderingParts;
@@ -30,7 +35,7 @@ public class MinecraftDisplayerRenderer {
     private long lastTime;
     private Minecraft mc;
     private final Map<String, FontRenderer> fontRenderers = Maps.newHashMap();
-    private final FontRenderer _font_render_instance;
+    private final FontRendererSeparate _font_render_instance;
     public TextureManager textureManager;
     private boolean first = true;
     private SharedDrawable drawable;
@@ -40,7 +45,7 @@ public MinecraftDisplayerRenderer(BakedConfig config, TextureAnimator animator)
         mc = Minecraft.getMinecraft();
 
         textureManager = new TextureManager(mc.getResourceManager());
-        _font_render_instance = new FontRenderer(mc.gameSettings, new ResourceLocation("textures/font/ascii.png"), textureManager, false);
+        _font_render_instance = new FontRendererSeparate(mc.gameSettings, FONT_LOCATION, textureManager, false);
         mc.refreshResources();
         textureManager.onResourceManagerReload(mc.getResourceManager());
         _font_render_instance.onResourceManagerReload(mc.getResourceManager());
@@ -65,6 +70,7 @@ public void render() {
         GlStateManager.disableLighting();
         GlStateManager.disableFog();
         GlStateManager.disableDepth();
+        glEnable(GL_TEXTURE_2D);
         GlStateManager.enableTexture2D();
 
         GlStateManager.clearColor(1, 1, 1, 1);
@@ -102,7 +108,6 @@ public void render() {
         GlStateManager.enableAlpha();
         GlStateManager.alphaFunc(GL11.GL_GREATER, 0.1F);
         GlStateManager.color(1, 1, 1, 1);
-        mc.updateDisplay();
     }
 
     public FontRenderer fontRenderer(String fontTexture) {
@@ -116,7 +121,6 @@ public FontRenderer fontRenderer(String fontTexture) {
         // font.onResourceManagerReload(mc.getResourceManager());
         // fontRenderers.put(fontTexture, font);
         // return font;
-
         return _font_render_instance;
     }
 
@@ -127,6 +131,7 @@ public void close() {
         GlStateManager.alphaFunc(GL11.GL_GREATER, 0.1F);
         GlStateManager.clearColor(1, 1, 1, 0);
         GlStateManager.clear(GL11.GL_COLOR_BUFFER_BIT);
+        _font_render_instance.destroy();
         drawable.destroy();
     }
 }