1.5.5:

* Now CLS creates an empty tips file ("config/customloadingscreen_tips.txt") if it doesn't already exist.
* Stopped a few rendering parts from sharding state with the main thread.
* Removed the warning when CLS fails to find a RENDERING_PART type but finds an IMAGE instead.

Author: AlexIIL

build.properties

@@ -2,4 +2,4 @@ mc_version=1.12.2
 forge_version=14.23.0.2544
 mcp_mappings=snapshot_20171120
 
-mod_version=1.5.4
+mod_version=1.5.5

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

@@ -24,6 +24,14 @@ public class Tips {
 
     public static void load() {
         File f = new File("config/customloadingscreen_tips.txt");
+        if (!f.exists()) {
+            try {
+                f.createNewFile();
+            } catch (IOException io) {
+                io.printStackTrace();
+            }
+        }
+
         try (BufferedReader br = new BufferedReader(new FileReader(f))) {
             load(parseTips(br));
         } catch (FileNotFoundException e) {

src/main/java/alexiil/mc/mod/load/baked/BakedRenderingPart.java

@@ -2,8 +2,6 @@
 
 import org.lwjgl.opengl.GL11;
 
-import net.minecraft.client.renderer.GlStateManager;
-
 import alexiil.mc.mod.load.baked.insn.BakedInsn;
 import alexiil.mc.mod.load.render.MinecraftDisplayerRenderer;
 
@@ -22,19 +20,19 @@ public BakedRenderingPart(BakedInsn[] instructions, BakedRender render, INodeBoo
     }
 
     public void render(MinecraftDisplayerRenderer renderer) {
-        GlStateManager.pushMatrix();
-        GlStateManager.matrixMode(GL11.GL_PROJECTION);
-        GlStateManager.pushMatrix();
-        GlStateManager.matrixMode(GL11.GL_MODELVIEW);
+        GL11.glPushMatrix();
+        GL11.glMatrixMode(GL11.GL_PROJECTION);
+        GL11.glPushMatrix();
+        GL11.glMatrixMode(GL11.GL_MODELVIEW);
         render.evaluateVariables(renderer);
         for (BakedInsn insn : instructions) {
             insn.render();
         }
         render.render(renderer);
-        GlStateManager.popMatrix();
-        GlStateManager.matrixMode(GL11.GL_PROJECTION);
-        GlStateManager.popMatrix();
-        GlStateManager.matrixMode(GL11.GL_MODELVIEW);
+        GL11.glPopMatrix();
+        GL11.glMatrixMode(GL11.GL_PROJECTION);
+        GL11.glPopMatrix();
+        GL11.glMatrixMode(GL11.GL_MODELVIEW);
     }
 
     @Override

src/main/java/alexiil/mc/mod/load/baked/render/BakedPanoramaRender.java

@@ -4,7 +4,6 @@
 import org.lwjgl.util.glu.Project;
 
 import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.ResourceLocation;
@@ -65,49 +64,48 @@ public void render(MinecraftDisplayerRenderer renderer) {
     private void drawPanorama(MinecraftDisplayerRenderer renderer) {
         BufferBuilder vb = tess.getBuffer();
 
-        GlStateManager.matrixMode(GL11.GL_PROJECTION);
-        GlStateManager.pushMatrix();
-        GlStateManager.loadIdentity();
+        GL11.glMatrixMode(GL11.GL_PROJECTION);
+        GL11.glPushMatrix();
+        GL11.glLoadIdentity();
         Project.gluPerspective(120.0F, 1.0F, 0.05F, 10.0F);
-        GlStateManager.matrixMode(GL11.GL_MODELVIEW);
-        GlStateManager.pushMatrix();
-        GlStateManager.loadIdentity();
-        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
-        GlStateManager.rotate(180.0F, 1.0F, 0.0F, 0.0F);
-        GlStateManager.disableAlpha();
+        GL11.glMatrixMode(GL11.GL_MODELVIEW);
+        GL11.glPushMatrix();
+        GL11.glLoadIdentity();
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        GL11.glRotatef(180.0F, 1.0F, 0.0F, 0.0F);
+        GL11.glDisable(GL11.GL_ALPHA);
         byte b0 = 8;
 
         for (int k = 0; k < b0 * b0; ++k) {
-            GlStateManager.pushMatrix();
+            GL11.glPushMatrix();
             float f1 = ((float) (k % b0) / (float) b0 - 0.5F) / 64.0F;
             float f2 = ((float) (k / b0) / (float) b0 - 0.5F) / 64.0F;
             float f3 = 0.0F;
-            GlStateManager.translate(f1, f2, f3);
-            GlStateManager
-                .rotate(MathHelper.sin(((float) this.actualAngle) / 400.0F) * 25.0F + 20.0F, 1.0F, 0.0F, 0.0F);
-            GlStateManager.rotate(-((float) this.actualAngle) * 0.1F, 0.0F, 1.0F, 0.0F);
+            GL11.glTranslatef(f1, f2, f3);
+            GL11.glRotatef(MathHelper.sin(((float) this.actualAngle) / 400.0F) * 25.0F + 20.0F, 1.0F, 0.0F, 0.0F);
+            GL11.glRotatef(-((float) this.actualAngle) * 0.1F, 0.0F, 1.0F, 0.0F);
 
             for (int l = 0; l < 6; ++l) {
-                GlStateManager.pushMatrix();
+                GL11.glPushMatrix();
 
                 if (l == 1) {
-                    GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F);
+                    GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
                 }
 
                 if (l == 2) {
-                    GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F);
+                    GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F);
                 }
 
                 if (l == 3) {
-                    GlStateManager.rotate(-90.0F, 0.0F, 1.0F, 0.0F);
+                    GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
                 }
 
                 if (l == 4) {
-                    GlStateManager.rotate(90.0F, 1.0F, 0.0F, 0.0F);
+                    GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F);
                 }
 
                 if (l == 5) {
-                    GlStateManager.rotate(-90.0F, 1.0F, 0.0F, 0.0F);
+                    GL11.glRotatef(-90.0F, 1.0F, 0.0F, 0.0F);
                 }
 
                 renderer.textureManager.bindTexture(cubeSides[l]);
@@ -120,21 +118,21 @@ private void drawPanorama(MinecraftDisplayerRenderer renderer) {
                 vb.pos(1.0D, 1.0D, 1.0D).tex(1.0F - f4, 1.0F - f4).color(rgb, rgb, rgb, alpha).endVertex();
                 vb.pos(-1.0D, 1.0D, 1.0D).tex(0.0F + f4, 1.0F - f4).color(rgb, rgb, rgb, alpha).endVertex();
                 tess.draw();
-                GlStateManager.popMatrix();
+                GL11.glPopMatrix();
             }
 
-            GlStateManager.popMatrix();
-            GlStateManager.colorMask(true, true, true, false);
+            GL11.glPopMatrix();
+            GL11.glColorMask(true, true, true, false);
         }
 
         vb.setTranslation(0.0D, 0.0D, 0.0D);
-        GlStateManager.colorMask(true, true, true, true);
-        GlStateManager.rotate(-180.0F, 1.0F, 0.0F, 0.0F);
-        GlStateManager.matrixMode(GL11.GL_PROJECTION);
-        GlStateManager.popMatrix();
-        GlStateManager.matrixMode(GL11.GL_MODELVIEW);
-        GlStateManager.popMatrix();
-        GlStateManager.enableAlpha();
+        GL11.glColorMask(true, true, true, true);
+        GL11.glRotatef(-180.0F, 1.0F, 0.0F, 0.0F);
+        GL11.glMatrixMode(GL11.GL_PROJECTION);
+        GL11.glPopMatrix();
+        GL11.glMatrixMode(GL11.GL_MODELVIEW);
+        GL11.glPopMatrix();
+        GL11.glEnable(GL11.GL_ALPHA);
     }
 
     @Override

src/main/java/alexiil/mc/mod/load/baked/render/BakedSlideshowRender.java

@@ -3,7 +3,6 @@
 import org.lwjgl.opengl.GL11;
 
 import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.ResourceLocation;
@@ -61,7 +60,7 @@ public void render(MinecraftDisplayerRenderer renderer) {
         }
 
         if (c != -1) {
-            GlStateManager.color(
+            GL11.glColor4f(
                 ((c >>> 16) & 0xFF) / 255f,
                 ((c >>>  8) & 0xFF) / 255f,
                 ((c >>>  0) & 0xFF) / 255f,
@@ -78,7 +77,7 @@ public void render(MinecraftDisplayerRenderer renderer) {
         tess.draw();
 
         if (c != -1) {
-            GlStateManager.color(1, 1, 1, 1);
+            GL11.glColor4f(1, 1, 1, 1);
         }
     }
 

src/main/java/alexiil/mc/mod/load/baked/render/BakedTextRender.java

@@ -1,7 +1,8 @@
 package alexiil.mc.mod.load.baked.render;
 
+import org.lwjgl.opengl.GL11;
+
 import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.renderer.GlStateManager;
 
 import alexiil.mc.mod.load.render.MinecraftDisplayerRenderer;
 
@@ -57,12 +58,12 @@ public void evaluateVariables(MinecraftDisplayerRenderer renderer) {
     @Override
     public void render(MinecraftDisplayerRenderer renderer) {
         FontRenderer font = renderer.fontRenderer(fontTexture);
-        GlStateManager.pushMatrix();
-        GlStateManager.translate(_x, _y, 0);
-        GlStateManager.scale(_scale, _scale, _scale);
+        GL11.glPushMatrix();
+        GL11.glTranslated(_x, _y, 0);
+        GL11.glScaled(_scale, _scale, _scale);
         font.drawString(_text, 0, 0, (int) _colour, false);
-        GlStateManager.popMatrix();
-        GlStateManager.color(1, 1, 1, 1);
+        GL11.glPopMatrix();
+        GL11.glColor4f(1, 1, 1, 1);
     }
 
     public abstract String getText();

src/main/java/alexiil/mc/mod/load/coremod/ClsTransformer.java

@@ -1,5 +1,7 @@
 package alexiil.mc.mod.load.coremod;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.ListIterator;
 
 import org.apache.logging.log4j.LogManager;
@@ -24,11 +26,17 @@
 import net.minecraft.util.ResourceLocation;
 
 public class ClsTransformer implements IClassTransformer, Opcodes {
+
     public static final Logger LOG = LogManager.getLogger("cls.transform");
 
     private static final String OWNER_MAIN_SPLASH_RENDERER;
     private static final String OWNER_ASM_CALLBACKS;
 
+    private static final String MC_FONT_RENDERER = "net.minecraft.client.gui.FontRenderer";
+
+    private static String fontRendererUnderlineName = "ClsWentWrong_Underline";
+    private static String fontRendererStrikethroughName = "ClsWentWrong_Strikethrough";
+
     static {
         OWNER_MAIN_SPLASH_RENDERER = "alexiil/mc/mod/load/render/MainSplashRenderer";
         OWNER_ASM_CALLBACKS = "alexiil/mc/mod/load/coremod/Callbacks";
@@ -48,6 +56,12 @@ public byte[] transform(String name, String transformedName, byte[] basicClass)
         if (name.equals("alexiil.mc.mod.load.render.MainSplashRenderer")) {
             return transformMainSplashRenderer(basicClass);
         }
+        if (name.equals("alexiil.mc.mod.load.render.FontRendererSeparate")) {
+            return transformFontRendererSeparate(basicClass);
+        }
+        if (transformedName.equals(MC_FONT_RENDERER)) {
+            return transformFontRenderer(basicClass);
+        }
         return basicClass;
     }
 
@@ -241,6 +255,82 @@ private static byte[] transformMainSplashRenderer(byte[] before) {
         return cw.toByteArray();
     }
 
+    private static byte[] transformFontRendererSeparate(byte[] before) {
+        LOG.info("Transforming CLS.FontRendererSeparate");
+        if (fontRendererStrikethroughName.contains("ClsWentWrong")) {
+            LOG.warn("Transformed before minecraft's FontRenderer!");
+            LOG.warn(" (force-loading FontRenderer)");
+            try {
+                Class<?> cls = Class.forName(MC_FONT_RENDERER);
+                if (cls == null) {
+                    throw new IllegalStateException(MC_FONT_RENDERER);
+                } else {
+                    LOG.info("Loaded " + cls);
+                }
+            } catch (ClassNotFoundException e) {
+                throw new Error(e);
+            }
+        }
+
+        ClassNode classNode = new ClassNode();
+        ClassReader reader = new ClassReader(before);
+        reader.accept(classNode, 0);
+
+        for (MethodNode m : classNode.methods) {
+            ListIterator<AbstractInsnNode> iter = m.instructions.iterator();
+            while (iter.hasNext()) {
+                AbstractInsnNode i = iter.next();
+                if (i instanceof FieldInsnNode) {
+                    FieldInsnNode fn = (FieldInsnNode) i;
+                    if ("__cls__replaced__underline".equals(fn.name)) {
+                        fn.name = fontRendererUnderlineName;
+                    } else if ("__cls__replaced__strikethrough".equals(fn.name)) {
+                        fn.name = fontRendererStrikethroughName;
+                    }
+                }
+            }
+        }
+
+        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
+        classNode.accept(cw);
+        return cw.toByteArray();
+    }
+
+    private static byte[] transformFontRenderer(byte[] before) {
+        LOG.info("Transforming Minecraft.FontRenderer");
+        ClassNode classNode = new ClassNode();
+        ClassReader reader = new ClassReader(before);
+        reader.accept(classNode, 0);
+
+        List<FieldNode> fields = classNode.fields;
+        List<FieldNode> boolFields = new ArrayList<>();
+        for (FieldNode n : fields) {
+            if ("Z".equals(n.desc) && (n.access & Opcodes.ACC_STATIC) == 0) {
+                boolFields.add(n);
+            }
+        }
+
+        FieldNode fldUnderline = boolFields.get(5);
+        FieldNode fldStrike = boolFields.get(6);
+
+        fontRendererUnderlineName = fldUnderline.name;
+        fontRendererStrikethroughName = fldStrike.name;
+
+        if ((fldUnderline.access & ACC_PUBLIC) == 0) {
+            fldUnderline.access &= ~ACC_PRIVATE;
+            fldUnderline.access |= ACC_PROTECTED;
+        }
+
+        if ((fldStrike.access & ACC_PUBLIC) == 0) {
+            fldStrike.access &= ~ACC_PRIVATE;
+            fldStrike.access |= ACC_PROTECTED;
+        }
+
+        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
+        classNode.accept(cw);
+        return cw.toByteArray();
+    }
+
     private static void changeLineNumbers(ClassNode node) {
         // for (MethodNode m : node.methods) {
         // changeLineNumbers(m);