i don't think you need to save and load gl states anymore

add a JsonConfig constructor that accept direct file make fabric api a compile only dependency
badasintended · Mar 25, 2021 · 7509488 · 7509488
1 parent 13febd8
commit 7509488
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 37 deletions.
diff --git a/common/src/main/java/mcp/mobius/waila/WailaPlugins.java b/common/src/main/java/mcp/mobius/waila/WailaPlugins.java
@@ -47,7 +47,7 @@ public void initializePlugins() {
 
     protected static void createPlugin(String id, String initializer) {
         try {
-            IWailaPlugin plugin = (IWailaPlugin) Class.forName(initializer).newInstance();
+            IWailaPlugin plugin = (IWailaPlugin) Class.forName(initializer).getConstructor().newInstance();
             PLUGINS.put(id, plugin);
             Waila.LOGGER.info("Discovered plugin {} at {}", id, plugin.getClass().getCanonicalName());
         } catch (Exception e) {

diff --git a/common/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java b/common/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java
@@ -10,21 +10,14 @@
 import mcp.mobius.waila.api.impl.config.WailaConfig;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ChatScreen;
-import net.minecraft.client.render.DiffuseLighting;
 import net.minecraft.client.util.math.MatrixStack;
-import org.lwjgl.opengl.GL11;
 
 import static mcp.mobius.waila.overlay.DisplayUtil.drawGradientRect;
 import static mcp.mobius.waila.overlay.DisplayUtil.enable2DRender;
 import static mcp.mobius.waila.overlay.DisplayUtil.renderStack;
 
 public class OverlayRenderer {
 
-    protected static boolean hasLight;
-    protected static boolean hasDepthTest;
-    protected static boolean depthMask;
-    protected static int depthFunc;
-
     public static Function<Tooltip, Rectangle> onPreRender;
     public static Consumer<Rectangle> onPostRender;
 
@@ -62,7 +55,6 @@ public static void renderOverlay(MatrixStack matrices, Tooltip tooltip) {
 
         MinecraftClient.getInstance().getProfiler().push("Waila Overlay");
         RenderSystem.pushMatrix();
-        saveGLState();
 
         float scale = Waila.CONFIG.get().getOverlay().getScale();
         RenderSystem.scalef(scale, scale, 1.0F);
@@ -72,7 +64,6 @@ public static void renderOverlay(MatrixStack matrices, Tooltip tooltip) {
         Rectangle rect = onPreRender.apply(tooltip);
 
         if (rect == null) {
-            loadGLState();
             RenderSystem.enableDepthTest();
             RenderSystem.popMatrix();
             MinecraftClient.getInstance().getProfiler().pop();
@@ -91,33 +82,11 @@ public static void renderOverlay(MatrixStack matrices, Tooltip tooltip) {
 
         onPostRender.accept(rect);
 
-        loadGLState();
         RenderSystem.enableDepthTest();
         RenderSystem.popMatrix();
         MinecraftClient.getInstance().getProfiler().pop();
     }
 
-    public static void saveGLState() {
-        hasLight = GL11.glGetBoolean(GL11.GL_LIGHTING);
-        hasDepthTest = GL11.glGetBoolean(GL11.GL_DEPTH_TEST);
-        depthFunc = GL11.glGetInteger(GL11.GL_DEPTH_FUNC);
-        depthMask = GL11.glGetBoolean(GL11.GL_DEPTH_WRITEMASK);
-    }
-
-    public static void loadGLState() {
-        RenderSystem.depthMask(depthMask);
-        RenderSystem.depthFunc(depthFunc);
-        if (hasLight)
-            DiffuseLighting.enable();
-        else
-            DiffuseLighting.disable();
-
-        if (hasDepthTest)
-            RenderSystem.enableDepthTest();
-        else
-            RenderSystem.disableDepthTest();
-    }
-
     public static void drawTooltipBox(MatrixStack matrices, int x, int y, int w, int h, int bg, int grad1, int grad2) {
         drawGradientRect(matrices, x + 1, y, w - 1, 1, bg, bg);
         drawGradientRect(matrices, x + 1, y + h, w - 1, 1, bg, bg);

diff --git a/common/src/main/java/mcp/mobius/waila/utils/JsonConfig.java b/common/src/main/java/mcp/mobius/waila/utils/JsonConfig.java
@@ -18,8 +18,8 @@ public class JsonConfig<T> {
     private final CachedSupplier<T> configGetter;
     private Gson gson = DEFAULT_GSON;
 
-    public JsonConfig(String fileName, Class<T> configClass, Supplier<T> defaultFactory) {
-        this.configFile = Waila.configDir.resolve(fileName + (fileName.endsWith(".json") ? "" : ".json")).toFile();
+    public JsonConfig(File file, Class<T> configClass, Supplier<T> defaultFactory) {
+        this.configFile = file;
         this.configGetter = new CachedSupplier<>(() -> {
             if (!configFile.exists()) {
                 T def = defaultFactory.get();
@@ -36,11 +36,15 @@ public JsonConfig(String fileName, Class<T> configClass, Supplier<T> defaultFact
         });
     }
 
+    public JsonConfig(String fileName, Class<T> configClass, Supplier<T> defaultFactory) {
+        this(Waila.configDir.resolve(fileName + (fileName.endsWith(".json") ? "" : ".json")).toFile(), configClass, defaultFactory);
+    }
+
     public JsonConfig(String fileName, Class<T> configClass) {
         this(fileName, configClass, () -> {
             try {
-                return configClass.newInstance();
-            } catch (InstantiationException | IllegalAccessException e) {
+                return configClass.getConstructor().newInstance();
+            } catch (Exception e) {
                 throw new RuntimeException("Failed to create new config instance", e);
             }
         });

diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -10,7 +10,8 @@ repositories {
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:$fabricLoader"
 
-    modImplementation "net.fabricmc.fabric-api:fabric-api:$fabricApi"
+    modCompileOnly "net.fabricmc.fabric-api:fabric-api:$fabricApi"
+    modRuntime "net.fabricmc.fabric-api:fabric-api:$fabricApi"
 
     modCompileOnly "com.terraformersmc:modmenu:$modMenu"
     modRuntime "com.terraformersmc:modmenu:$modMenu"