From 47f515a86bddc5094dba802b1a2ddd072e329096 Mon Sep 17 00:00:00 2001
From: Evie Viau <evie@eviee.gay>
Date: Wed, 21 Jun 2023 14:08:15 -0400
Subject: [PATCH] Force GLSL version 140 for macOS

---
 .gitlab-ci.yml                                        |  2 --
 gradle.properties                                     |  2 +-
 .../java/gay/eviee/imguiquilt/imgui/ImguiLoader.java  | 11 ++++++++++-
 src/main/resources/quilt.mod.json                     |  6 +++---
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c475fc9..c0a82e1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,5 +17,3 @@ publish-maven:
   stage: publish
   script:
     - 'gradle publish'
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
diff --git a/gradle.properties b/gradle.properties
index b3c68b3..7d5164a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx1G
 org.gradle.parallel = true
 
 # Mod Properties
-version = 1.0.2+1.20
+version = 1.0.4-DEV+1.20
 maven_group = gay.eviee
 archives_base_name = imguiquilt
 
diff --git a/src/main/java/gay/eviee/imguiquilt/imgui/ImguiLoader.java b/src/main/java/gay/eviee/imguiquilt/imgui/ImguiLoader.java
index 913c2d8..a77648d 100644
--- a/src/main/java/gay/eviee/imguiquilt/imgui/ImguiLoader.java
+++ b/src/main/java/gay/eviee/imguiquilt/imgui/ImguiLoader.java
@@ -8,6 +8,8 @@ import imgui.flag.ImGuiConfigFlags;
 import imgui.gl3.ImGuiImplGl3;
 import imgui.glfw.ImGuiImplGlfw;
 
+import java.util.Locale;
+
 import static org.lwjgl.glfw.GLFW.*;
 
 public class ImguiLoader {
@@ -20,7 +22,14 @@ public class ImguiLoader {
 	public static void onGlfwInit(long handle) {
 		initializeImGui(handle);
 		imGuiGlfw.init(handle,true);
-		imGuiGl3.init();
+
+		if (System.getProperty("os.name").toLowerCase(Locale.getDefault()).contains("mac")) {
+			// force it to use opengl 3.1 instead of 3.0 because Apple
+			imGuiGl3.init("#version 140");
+		} else {
+			imGuiGl3.init("#version 130");
+		}
+
 		windowHandle = handle;
 	}
 
diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json
index 9b61f45..1283b1f 100644
--- a/src/main/resources/quilt.mod.json
+++ b/src/main/resources/quilt.mod.json
@@ -12,9 +12,9 @@
 			},
 			"license": "Apache-2.0",
 			"contact": {
-				"homepage": "https://sr.ht/~eviee/imgui-quilt/",
-				"issues":  "https://todo.sr.ht/~eviee/imgui-quilt",
-				"sources": "https://git.sr.ht/~eviee/imgui-quilt"
+				"homepage": "https://git.gaycatgirl.sex/evie/imgui-quilt",
+				"issues":  "https://git.gaycatgirl.sex/evie/imgui-quilt/-/issues",
+				"sources": "https://git.gaycatgirl.sex/evie/imgui-quilt"
 			},
 			"icon": "assets/imguiquilt/icon.png"
 		},