aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/io/polyfrost/oneconfig/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/io/polyfrost/oneconfig/gui')
-rw-r--r--src/main/java/io/polyfrost/oneconfig/gui/Window.java28
1 files changed, 17 insertions, 11 deletions
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/Window.java b/src/main/java/io/polyfrost/oneconfig/gui/Window.java
index d20a203..aea1851 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/Window.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/Window.java
@@ -1,5 +1,6 @@
package io.polyfrost.oneconfig.gui;
+import io.polyfrost.oneconfig.renderer.Renderer;
import io.polyfrost.oneconfig.renderer.TrueTypeFont;
import io.polyfrost.oneconfig.themes.Theme;
import io.polyfrost.oneconfig.themes.ThemeElement;
@@ -10,6 +11,7 @@ import net.minecraft.client.gui.GuiScreen;
import java.awt.*;
import java.io.IOException;
+import java.util.Objects;
import static io.polyfrost.oneconfig.renderer.Renderer.clamp;
import static io.polyfrost.oneconfig.renderer.Renderer.easeOut;
@@ -23,7 +25,7 @@ public class Window extends GuiScreen {
public Window() {
try {
- Font tempFont = Font.createFont(Font.TRUETYPE_FONT, Window.class.getResourceAsStream("/assets/oneconfig/fonts/font.ttf"));
+ Font tempFont = Font.createFont(Font.TRUETYPE_FONT, Objects.requireNonNull(Window.class.getResourceAsStream("/assets/oneconfig/fonts/font.ttf")));
font = new TrueTypeFont(tempFont.deriveFont(30f), true);
} catch (FontFormatException | IOException e) {
e.printStackTrace();
@@ -51,19 +53,23 @@ public class Window extends GuiScreen {
//System.out.println(testingColor.getRGB());
int middleX = this.width / 2;
int middleY = this.height / 2;
- int left = middleX - 600;
- int right = (int) (left + 1200 * currentProgress);
- int top = middleY - 350;
- int bottom = (int) (top + 700 * currentProgress);
- Gui.drawRect(left - 1, top - 1, right + 1, bottom + 1, testingColor.getRGB());
- Gui.drawRect(left, top, right, bottom, t.getBaseColor().getRGB());
+ int left = middleX - 800;
+ int right = (int) (1600 * currentProgress);
+ int top = middleY - 512;
+ int bottom = (int) (1024 * currentProgress);
+ //Gui.drawRect(left - 1, top - 1, right + 1, bottom + 1, testingColor.getRGB());
+ //new Color(16, 17, 19, 255).getRGB()
+ Renderer.drawRoundRect(left,top,right,bottom,30, testingColor.getRGB());
+ Renderer.drawRoundRect(left + 1,top + 1,right - 2,bottom - 2,30, t.getBaseColor().getRGB());
+ t.getTextureManager().draw(ThemeElement.LOGO, left + 24, top + 24, 64, 64); // 0.875
+ font.drawString("OneConfig", left + 93f, top + 25, 1f,1f);
+ //Gui.drawRect(left, top, right, bottom, t.getBaseColor().getRGB());
- Gui.drawRect(left, top, right, top + 100, t.getTitleBarColor().getRGB());
- Gui.drawRect(left, top + 100, right, top + 101, testingColor.getRGB());
+ //Gui.drawRect(left, top, right, top + 100, t.getTitleBarColor().getRGB());
+ //Gui.drawRect(left, top + 100, right, top + 101, testingColor.getRGB());
- t.getTextureManager().draw(ThemeElement.ALL_MODS, 10, 10, 32, 32);
- font.drawString("OneConfig is pog!\nWow, this font renderer actually works :D", 50, 50, 1, 1);
+ //font.drawString("OneConfig is pog!\nWow, this font renderer actually works :D", 50, 50, 1f, 1f);
}
public static Window getWindow() {