aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java2
-rw-r--r--src/main/java/io/github/cottonmc/cotton/gui/client/modmenu/ConfigGui.java2
-rw-r--r--src/main/java/io/github/cottonmc/cotton/gui/widget/WWidget.java6
-rw-r--r--src/main/resources/assets/libgui/lang/en_us.json3
4 files changed, 6 insertions, 7 deletions
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java b/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java
index dd55eea..f6aaef1 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/client/ScreenDrawing.java
@@ -19,7 +19,7 @@ public class ScreenDrawing {
}
public static void rect(Identifier texture, int left, int top, int width, int height, float u1, float v1, float u2, float v2, int color) {
- rect(texture, left, top, width, height, u1, v1, u2, v2, 0xFFFFFFFF, 0);
+ rect(texture, left, top, width, height, u1, v1, u2, v2, color, 0);
}
public static void rect(Identifier texture, int left, int top, int width, int height, float u1, float v1, float u2, float v2, int color, int z) {
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/client/modmenu/ConfigGui.java b/src/main/java/io/github/cottonmc/cotton/gui/client/modmenu/ConfigGui.java
index 4edf03d..8b3c3ee 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/client/modmenu/ConfigGui.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/client/modmenu/ConfigGui.java
@@ -28,7 +28,7 @@ public class ConfigGui extends LightweightGuiDescription {
root.add(new WKirbSprite(), 5, 4);
- WButton doneButton = new WButton(new TranslatableText("option.libgui.done"));
+ WButton doneButton = new WButton(new TranslatableText("gui.done"));
doneButton.setOnClick(()->{
MinecraftClient.getInstance().openScreen(previous);
});
diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WWidget.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WWidget.java
index 4a3f806..4eff4f7 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WWidget.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WWidget.java
@@ -63,9 +63,9 @@ public class WWidget {
return false;
}
- //public void setParent(WPanel parent) {
- // this.parent = parent;
- //}
+ public void setParent(WPanel parent) {
+ this.parent = parent;
+ }
//public boolean getRenderTooltip() {
// return renderTooltip;
diff --git a/src/main/resources/assets/libgui/lang/en_us.json b/src/main/resources/assets/libgui/lang/en_us.json
index 9b20325..5ed8bfb 100644
--- a/src/main/resources/assets/libgui/lang/en_us.json
+++ b/src/main/resources/assets/libgui/lang/en_us.json
@@ -1,5 +1,4 @@
{
"options.libgui.libgui_settings": "LibGui Settings",
- "option.libgui.darkmode": "Dark Mode",
- "option.libgui.done": "Done"
+ "option.libgui.darkmode": "Dark Mode"
}