From 843328658aa34975d7748acf090cd79b78e2f520 Mon Sep 17 00:00:00 2001 From: johni0702 Date: Fri, 10 Jul 2015 22:49:21 +0200 Subject: [PATCH] Add text color and setI18nText to GuiTextField --- .../gui/element/AbstractGuiTextField.java | 16 ++++++++++++++++ .../minecraft/gui/element/IGuiTextField.java | 5 +++++ 2 files changed, 21 insertions(+) diff --git a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiTextField.java b/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiTextField.java index 8a419259..72d4f97a 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiTextField.java +++ b/src/main/java/de/johni0702/minecraft/gui/element/AbstractGuiTextField.java @@ -34,6 +34,7 @@ import lombok.Getter; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import org.lwjgl.input.Keyboard; +import org.lwjgl.util.ReadableColor; import org.lwjgl.util.ReadableDimension; import org.lwjgl.util.ReadablePoint; @@ -49,6 +50,9 @@ public abstract class AbstractGuiTextField> @Getter private String hint; + @Getter + private ReadableColor textColor; + public AbstractGuiTextField() { this.wrapped = new net.minecraft.client.gui.GuiTextField(0, Minecraft.getMinecraft().fontRendererObj, 0, 0, 0, 0); } @@ -128,6 +132,11 @@ public abstract class AbstractGuiTextField> return getThis(); } + @Override + public T setI18nText(String text, Object... args) { + return setText(I18n.format(text, args)); + } + @Override public String getText() { return wrapped.text; @@ -224,4 +233,11 @@ public abstract class AbstractGuiTextField> public T setI18nHint(String hint, Object... args) { return setHint(I18n.format(hint)); } + + @Override + public T setTextColor(ReadableColor textColor) { + this.textColor = textColor; + wrapped.setTextColor(textColor.getAlpha() << 24 | textColor.getRed() << 16 | textColor.getGreen() << 8 | textColor.getBlue()); + return getThis(); + } } diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiTextField.java b/src/main/java/de/johni0702/minecraft/gui/element/IGuiTextField.java index 499af025..b89a41ed 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiTextField.java +++ b/src/main/java/de/johni0702/minecraft/gui/element/IGuiTextField.java @@ -23,9 +23,11 @@ package de.johni0702.minecraft.gui.element; import de.johni0702.minecraft.gui.function.Focusable; +import org.lwjgl.util.ReadableColor; public interface IGuiTextField> extends GuiElement, Focusable { T setText(String text); + T setI18nText(String text, Object... args); String getText(); int getMaxLength(); @@ -38,4 +40,7 @@ public interface IGuiTextField> extends GuiElement T setHint(String hint); T setI18nHint(String hint, Object... args); + + ReadableColor getTextColor(); + T setTextColor(ReadableColor textColor); }