From 99d4a88df013c03aa3e82bc75ec3e6ece65b9df9 Mon Sep 17 00:00:00 2001
From: nextdaydelivery <79922345+nxtdaydelivery@users.noreply.github.com>
Date: Sun, 3 Jul 2022 12:35:21 +0100
Subject: changes to ESC behavior

---
 .../oneconfig/platform/impl/GLPlatformImpl.java    | 23 +++++++++++++---------
 .../platform/impl/LoaderPlatformImpl.java          |  4 ++++
 2 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'versions/src/main/java/cc/polyfrost/oneconfig/platform')

diff --git a/versions/src/main/java/cc/polyfrost/oneconfig/platform/impl/GLPlatformImpl.java b/versions/src/main/java/cc/polyfrost/oneconfig/platform/impl/GLPlatformImpl.java
index 3ee962b..b53b357 100644
--- a/versions/src/main/java/cc/polyfrost/oneconfig/platform/impl/GLPlatformImpl.java
+++ b/versions/src/main/java/cc/polyfrost/oneconfig/platform/impl/GLPlatformImpl.java
@@ -1,10 +1,9 @@
 package cc.polyfrost.oneconfig.platform.impl;
 
+import cc.polyfrost.oneconfig.libs.universal.UGraphics;
 import cc.polyfrost.oneconfig.libs.universal.UMatrixStack;
 import cc.polyfrost.oneconfig.libs.universal.UMinecraft;
 import cc.polyfrost.oneconfig.platform.GLPlatform;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.WorldRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
@@ -33,23 +32,23 @@ public class GLPlatformImpl implements GLPlatform {
         float j = (float)(color & 0xFF) / 255.0F;
         Tessellator tessellator = Tessellator.getInstance();
         WorldRenderer worldRenderer = tessellator.getWorldRenderer();
-        GlStateManager.enableBlend();
-        GlStateManager.disableTexture2D();
-        GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
-        GlStateManager.color(g, h, j, f);
+        UGraphics.enableBlend();
+        UGraphics.disableTexture2D();
+        UGraphics.tryBlendFuncSeparate(770, 771, 1, 0);
+        UGraphics.color4f(g, h, j, f);
         worldRenderer.begin(7, DefaultVertexFormats.POSITION);
         worldRenderer.pos(x, y2, 0.0).endVertex();
         worldRenderer.pos(x2, y2, 0.0).endVertex();
         worldRenderer.pos(x2, y, 0.0).endVertex();
         worldRenderer.pos(x, y, 0.0).endVertex();
         tessellator.draw();
-        GlStateManager.enableTexture2D();
-        GlStateManager.disableBlend();
+        UGraphics.enableTexture2D();
+        UGraphics.disableBlend();
     }
 
     @Override
     public void enableStencil() {
-        Framebuffer framebuffer = Minecraft.getMinecraft().getFramebuffer();
+        Framebuffer framebuffer = UMinecraft.getMinecraft().getFramebuffer();
         if (!framebuffer.isStencilEnabled()) {
             framebuffer.enableStencil();
         }
@@ -57,7 +56,13 @@ public class GLPlatformImpl implements GLPlatform {
 
     @Override
     public float drawText(UMatrixStack matrixStack, String text, float x, float y, int color, boolean shadow) {
+        //#if MC<=11202
         return UMinecraft.getFontRenderer().drawString(text, x, y, color, shadow);
+        //#else
+        //$$ if(shadow) {
+        //$$    return UMinecraft.getFontRenderer().drawStringWithShadow(matrixStack.toMC(), text, x, y, color);
+        //$$ } else return UMinecraft.getFontRenderer().drawString(matrixStack.toMC(), text, x, y, color);
+        //#endif
     }
 
     @Override
diff --git a/versions/src/main/java/cc/polyfrost/oneconfig/platform/impl/LoaderPlatformImpl.java b/versions/src/main/java/cc/polyfrost/oneconfig/platform/impl/LoaderPlatformImpl.java
index 01269cd..2755f7f 100644
--- a/versions/src/main/java/cc/polyfrost/oneconfig/platform/impl/LoaderPlatformImpl.java
+++ b/versions/src/main/java/cc/polyfrost/oneconfig/platform/impl/LoaderPlatformImpl.java
@@ -21,6 +21,10 @@ public class LoaderPlatformImpl implements LoaderPlatform {
         ModContainer container = Loader.instance().activeModContainer();
         if (container == null)
             return null;
+        //#if MC<=11202
         return new ActiveMod(container.getName(), container.getModId(), container.getVersion());
+        //#else
+        //$$ return new ActiveMod(container.getModInfo().getDisplayName(), container.getModId(), container.getModInfo().getVersion().getQualifier());
+        //#endif
     }
 }
-- 
cgit