From bd21ed16aee07304f2e74a71acca68a2f347f7d3 Mon Sep 17 00:00:00 2001 From: johni0702 Date: Sat, 11 Jul 2015 17:49:06 +0200 Subject: [PATCH] Fix generics in most of the Gui interfaces --- .../java/de/johni0702/minecraft/gui/element/IGuiButton.java | 2 +- .../java/de/johni0702/minecraft/gui/element/IGuiCheckbox.java | 2 +- .../java/de/johni0702/minecraft/gui/element/IGuiClickable.java | 2 +- .../java/de/johni0702/minecraft/gui/element/IGuiImage.java | 2 +- .../java/de/johni0702/minecraft/gui/element/IGuiLabel.java | 2 +- .../de/johni0702/minecraft/gui/element/IGuiToggleButton.java | 2 +- .../minecraft/gui/element/advanced/AbstractGuiProgressBar.java | 2 +- .../minecraft/gui/element/advanced/IGuiProgressBar.java | 3 +-- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiButton.java b/src/main/java/de/johni0702/minecraft/gui/element/IGuiButton.java index c225b24a..3440d266 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiButton.java +++ b/src/main/java/de/johni0702/minecraft/gui/element/IGuiButton.java @@ -22,7 +22,7 @@ package de.johni0702.minecraft.gui.element; -public interface IGuiButton> extends IGuiClickable { +public interface IGuiButton> extends IGuiClickable { T setLabel(String label); T setI18nLabel(String label, Object... args); diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiCheckbox.java b/src/main/java/de/johni0702/minecraft/gui/element/IGuiCheckbox.java index f88e1392..b0fb71fd 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiCheckbox.java +++ b/src/main/java/de/johni0702/minecraft/gui/element/IGuiCheckbox.java @@ -22,7 +22,7 @@ package de.johni0702.minecraft.gui.element; -public interface IGuiCheckbox> extends IGuiClickable { +public interface IGuiCheckbox> extends IGuiClickable { T setLabel(String label); T setI18nLabel(String label, Object... args); diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiClickable.java b/src/main/java/de/johni0702/minecraft/gui/element/IGuiClickable.java index e22586a4..5c27ac79 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiClickable.java +++ b/src/main/java/de/johni0702/minecraft/gui/element/IGuiClickable.java @@ -22,6 +22,6 @@ package de.johni0702.minecraft.gui.element; -public interface IGuiClickable> extends GuiElement { +public interface IGuiClickable> extends GuiElement { T onClick(Runnable onClick); } diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiImage.java b/src/main/java/de/johni0702/minecraft/gui/element/IGuiImage.java index 6f50f70d..988c2a7c 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiImage.java +++ b/src/main/java/de/johni0702/minecraft/gui/element/IGuiImage.java @@ -24,6 +24,6 @@ package de.johni0702.minecraft.gui.element; import java.awt.image.BufferedImage; -public interface IGuiImage> extends GuiElement { +public interface IGuiImage> extends GuiElement { T setTexture(BufferedImage img); } diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiLabel.java b/src/main/java/de/johni0702/minecraft/gui/element/IGuiLabel.java index fafbc4be..c4fbcffc 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiLabel.java +++ b/src/main/java/de/johni0702/minecraft/gui/element/IGuiLabel.java @@ -24,7 +24,7 @@ package de.johni0702.minecraft.gui.element; import org.lwjgl.util.ReadableColor; -public interface IGuiLabel> extends GuiElement { +public interface IGuiLabel> extends GuiElement { T setText(String text); T setI18nText(String text, Object... args); diff --git a/src/main/java/de/johni0702/minecraft/gui/element/IGuiToggleButton.java b/src/main/java/de/johni0702/minecraft/gui/element/IGuiToggleButton.java index 11aa289f..36e758bb 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/IGuiToggleButton.java +++ b/src/main/java/de/johni0702/minecraft/gui/element/IGuiToggleButton.java @@ -22,7 +22,7 @@ package de.johni0702.minecraft.gui.element; -public interface IGuiToggleButton> extends IGuiButton { +public interface IGuiToggleButton> extends IGuiButton { T setValues(V[] values); T setSelected(int selected); diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiProgressBar.java b/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiProgressBar.java index 90cb47cd..257808a7 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiProgressBar.java +++ b/src/main/java/de/johni0702/minecraft/gui/element/advanced/AbstractGuiProgressBar.java @@ -33,7 +33,7 @@ import org.lwjgl.util.Dimension; import org.lwjgl.util.ReadableColor; import org.lwjgl.util.ReadableDimension; -public abstract class AbstractGuiProgressBar> extends AbstractGuiElement implements IGuiProgressBar { +public abstract class AbstractGuiProgressBar> extends AbstractGuiElement implements IGuiProgressBar { private static final int BORDER = 2; @Getter diff --git a/src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiProgressBar.java b/src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiProgressBar.java index 389e097c..52c8925c 100644 --- a/src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiProgressBar.java +++ b/src/main/java/de/johni0702/minecraft/gui/element/advanced/IGuiProgressBar.java @@ -22,10 +22,9 @@ package de.johni0702.minecraft.gui.element.advanced; -import de.johni0702.minecraft.gui.element.AbstractGuiElement; import de.johni0702.minecraft.gui.element.GuiElement; -public interface IGuiProgressBar> extends GuiElement { +public interface IGuiProgressBar> extends GuiElement { T setProgress(float progress); T setLabel(String label);