aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>2022-06-16 18:54:20 +0200
committerDeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>2022-06-16 18:54:20 +0200
commit7cf9731db5f34c8a413746161957e0e094e2374d (patch)
tree0602ea1b5fb40b46ec34201675a88ad64269b7e0
parentd6b6c28790d5a9d1fd991f95d5e18a26d3726650 (diff)
downloadOneConfig-7cf9731db5f34c8a413746161957e0e094e2374d.tar.gz
OneConfig-7cf9731db5f34c8a413746161957e0e094e2374d.tar.bz2
OneConfig-7cf9731db5f34c8a413746161957e0e094e2374d.zip
undo high DPI since mc doesn't support it or smthing
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/config/data/Mod.java6
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/renderer/RenderManager.java17
2 files changed, 9 insertions, 14 deletions
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/data/Mod.java b/src/main/java/cc/polyfrost/oneconfig/config/data/Mod.java
index bb3cccc..27730ce 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/data/Mod.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/data/Mod.java
@@ -57,10 +57,6 @@ public class Mod implements Comparable<Mod> {
@Override
public int compareTo(@NotNull Mod mod) {
- int result = name.compareTo(mod.name);
- //if (mod.modType != ModType.THIRD_PARTY) result *= 10;
- //if (OneConfigConfig.favoriteMods.contains(name)) result *= 100;
- System.out.println(name + " " + mod.name + " " + result);
- return result;
+ return name.compareTo(mod.name);
}
}
diff --git a/src/main/java/cc/polyfrost/oneconfig/renderer/RenderManager.java b/src/main/java/cc/polyfrost/oneconfig/renderer/RenderManager.java
index ff9a3de..d894d1e 100644
--- a/src/main/java/cc/polyfrost/oneconfig/renderer/RenderManager.java
+++ b/src/main/java/cc/polyfrost/oneconfig/renderer/RenderManager.java
@@ -1,23 +1,22 @@
package cc.polyfrost.oneconfig.renderer;
-import cc.polyfrost.oneconfig.internal.assets.Colors;
import cc.polyfrost.oneconfig.config.data.InfoType;
import cc.polyfrost.oneconfig.gui.OneConfigGui;
-import cc.polyfrost.oneconfig.renderer.font.Font;
-import cc.polyfrost.oneconfig.renderer.font.FontManager;
-import cc.polyfrost.oneconfig.renderer.font.Fonts;
+import cc.polyfrost.oneconfig.internal.assets.Colors;
import cc.polyfrost.oneconfig.internal.assets.Images;
import cc.polyfrost.oneconfig.internal.assets.SVGs;
-import cc.polyfrost.oneconfig.utils.InputUtils;
-import cc.polyfrost.oneconfig.utils.NetworkUtils;
import cc.polyfrost.oneconfig.libs.universal.UGraphics;
import cc.polyfrost.oneconfig.libs.universal.UMinecraft;
import cc.polyfrost.oneconfig.libs.universal.UResolution;
+import cc.polyfrost.oneconfig.renderer.font.Font;
+import cc.polyfrost.oneconfig.renderer.font.FontManager;
+import cc.polyfrost.oneconfig.renderer.font.Fonts;
+import cc.polyfrost.oneconfig.utils.InputUtils;
+import cc.polyfrost.oneconfig.utils.NetworkUtils;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.shader.Framebuffer;
import org.lwjgl.nanovg.NVGColor;
import org.lwjgl.nanovg.NVGPaint;
-import org.lwjgl.opengl.Display;
import org.lwjgl.opengl.GL11;
import java.util.function.LongConsumer;
@@ -71,9 +70,9 @@ public final class RenderManager {
GL11.glDisable(GL11.GL_ALPHA_TEST);
if (mcScaling) {
- nvgBeginFrame(vg, (float) UResolution.getScaledWidth(), (float) UResolution.getScaledHeight(), (float) UResolution.getScaleFactor() * Display.getPixelScaleFactor());
+ nvgBeginFrame(vg, (float) UResolution.getScaledWidth(), (float) UResolution.getScaledHeight(), (float) UResolution.getScaleFactor());
} else {
- nvgBeginFrame(vg, UResolution.getWindowWidth(), UResolution.getWindowHeight(), Display.getPixelScaleFactor());
+ nvgBeginFrame(vg, UResolution.getWindowWidth(), UResolution.getWindowHeight(), 1);
}
consumer.accept(vg);