From a03fbc3ba869350e07f3bff3660ee7ccc3b3f1af Mon Sep 17 00:00:00 2001 From: NatanFudge Date: Sun, 19 May 2024 14:53:23 +0300 Subject: [PATCH] fabric for now --- .../java/fudge/notenoughcrashes/config/MidnightConfig.java | 3 ++- .../src/main/java/fudge/notenoughcrashes/gui/CrashScreen.java | 2 +- .../main/java/fudge/notenoughcrashes/gui/InitErrorScreen.java | 4 +++- .../main/java/fudge/notenoughcrashes/gui/ProblemScreen.java | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/fudge/notenoughcrashes/config/MidnightConfig.java b/common/src/main/java/fudge/notenoughcrashes/config/MidnightConfig.java index d5d26b1..1547be4 100644 --- a/common/src/main/java/fudge/notenoughcrashes/config/MidnightConfig.java +++ b/common/src/main/java/fudge/notenoughcrashes/config/MidnightConfig.java @@ -6,6 +6,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.mojang.blaze3d.systems.RenderSystem; +import fudge.notenoughcrashes.NotEnoughCrashes; import fudge.notenoughcrashes.platform.NecPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -320,7 +321,7 @@ public void fillList() { info.index = 0; list.clear(); fillList(); - }), true).texture(new Identifier("midnightlib","icon/reset"), 12, 12).dimension(40, 20).build(); + }), true).texture(new Identifier(NotEnoughCrashes.MOD_ID,"icon/reset"), 12, 12).dimension(40, 20).build(); resetButton.setPosition(width - 205, 0); if (info.widget instanceof Map.Entry) { diff --git a/common/src/main/java/fudge/notenoughcrashes/gui/CrashScreen.java b/common/src/main/java/fudge/notenoughcrashes/gui/CrashScreen.java index 5311639..f899e4b 100644 --- a/common/src/main/java/fudge/notenoughcrashes/gui/CrashScreen.java +++ b/common/src/main/java/fudge/notenoughcrashes/gui/CrashScreen.java @@ -48,6 +48,7 @@ public void init() { @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { renderBackground(context, mouseX, mouseY, delta); + super.render(context, mouseX, mouseY, delta); context.drawCenteredTextWithShadow(textRenderer, NecLocalization.localize("notenoughcrashes.crashscreen.title"), width / 2, height / 4 - 40, 0xFFFFFF); int textColor = 0xD0D0D0; @@ -70,7 +71,6 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) { context.drawTextWithShadow(textRenderer, NecLocalization.localize("notenoughcrashes.crashscreen.paragraph3.line3"), x, y += 9, textColor); context.drawTextWithShadow(textRenderer, NecLocalization.localize("notenoughcrashes.crashscreen.paragraph3.line4"), x, y + 9, textColor); - super.render(context, mouseX, mouseY, delta); } } diff --git a/common/src/main/java/fudge/notenoughcrashes/gui/InitErrorScreen.java b/common/src/main/java/fudge/notenoughcrashes/gui/InitErrorScreen.java index ed16827..351f9d3 100644 --- a/common/src/main/java/fudge/notenoughcrashes/gui/InitErrorScreen.java +++ b/common/src/main/java/fudge/notenoughcrashes/gui/InitErrorScreen.java @@ -5,6 +5,7 @@ import net.fabricmc.api.Environment; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.gui.widget.TextWidget; import net.minecraft.text.Text; import net.minecraft.util.crash.CrashReport; @@ -32,11 +33,13 @@ public void init() { }).dimensions(width / 2 - 155, height / 4 + 120 + 12, 150, 20).build(); addDrawableChild(exitButton); + } @Override public void render(DrawContext context, int mouseX, int i, float f) { renderBackground(context, mouseX, i, f); + super.render(context, mouseX, i, f); context.drawCenteredTextWithShadow(textRenderer, NecLocalization.localize("notenoughcrashes.initerrorscreen.title"), width / 2, height / 4 - 40, 0xFFFFFF); context.drawTextWithShadow(textRenderer, NecLocalization.localize("notenoughcrashes.initerrorscreen.summary"), x, y, TEXT_COLOR); @@ -53,7 +56,6 @@ public void render(DrawContext context, int mouseX, int i, float f) { context.drawTextWithShadow(textRenderer, NecLocalization.localize("notenoughcrashes.initerrorscreen.paragraph3.line3"), x, y + 90, TEXT_COLOR); context.drawTextWithShadow(textRenderer, NecLocalization.localize("notenoughcrashes.initerrorscreen.paragraph3.line4"), x, y + 99, TEXT_COLOR); - super.render(context, mouseX, i, f); } } diff --git a/common/src/main/java/fudge/notenoughcrashes/gui/ProblemScreen.java b/common/src/main/java/fudge/notenoughcrashes/gui/ProblemScreen.java index 7bcb81f..03177c7 100644 --- a/common/src/main/java/fudge/notenoughcrashes/gui/ProblemScreen.java +++ b/common/src/main/java/fudge/notenoughcrashes/gui/ProblemScreen.java @@ -183,8 +183,8 @@ protected void drawFileNameString(DrawContext context, int y) { @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { - for (Widget widget : widgets) widget.draw(context); super.render(context, mouseX, mouseY, delta); + for (Widget widget : widgets) widget.draw(context); } }