aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/shedaniel/gui/widget
diff options
context:
space:
mode:
authorUnknown <shekwancheung0528@gmail.com>2019-01-08 18:23:00 +0800
committerUnknown <shekwancheung0528@gmail.com>2019-01-08 18:23:00 +0800
commit72e1653cbb38282f8dce59a00fb381e18bfc795d (patch)
tree468a1d03c3a7295b43f28e71b84856a512e72b3f /src/main/java/me/shedaniel/gui/widget
parent6d5101aad169bc5d4d8bcd638aee0d4ce71c120a (diff)
downloadRoughlyEnoughItems-72e1653cbb38282f8dce59a00fb381e18bfc795d.tar.gz
RoughlyEnoughItems-72e1653cbb38282f8dce59a00fb381e18bfc795d.tar.bz2
RoughlyEnoughItems-72e1653cbb38282f8dce59a00fb381e18bfc795d.zip
Craftable Only WIP
Diffstat (limited to 'src/main/java/me/shedaniel/gui/widget')
-rwxr-xr-xsrc/main/java/me/shedaniel/gui/widget/Button.java2
-rwxr-xr-xsrc/main/java/me/shedaniel/gui/widget/Control.java6
-rwxr-xr-xsrc/main/java/me/shedaniel/gui/widget/IFocusable.java2
-rwxr-xr-xsrc/main/java/me/shedaniel/gui/widget/REISlot.java1
-rwxr-xr-xsrc/main/java/me/shedaniel/gui/widget/TextBox.java1
-rwxr-xr-xsrc/main/java/me/shedaniel/gui/widget/WidgetArrow.java2
6 files changed, 9 insertions, 5 deletions
diff --git a/src/main/java/me/shedaniel/gui/widget/Button.java b/src/main/java/me/shedaniel/gui/widget/Button.java
index e4339fd64..f87b72f73 100755
--- a/src/main/java/me/shedaniel/gui/widget/Button.java
+++ b/src/main/java/me/shedaniel/gui/widget/Button.java
@@ -17,7 +17,6 @@ public class Button extends Control {
private String buttonText;
protected static final Identifier BUTTON_TEXTURES = new Identifier("textures/gui/widgets.png");
-
public Button(int x, int y, int width, int height, String buttonText) {
super(x, y, width, height);
this.buttonText = buttonText;
@@ -32,7 +31,6 @@ public class Button extends Control {
buttonText = text;
}
-
@Override
public void draw() {
GlStateManager.pushMatrix();
diff --git a/src/main/java/me/shedaniel/gui/widget/Control.java b/src/main/java/me/shedaniel/gui/widget/Control.java
index 9be17a0c2..18e89113f 100755
--- a/src/main/java/me/shedaniel/gui/widget/Control.java
+++ b/src/main/java/me/shedaniel/gui/widget/Control.java
@@ -1,7 +1,7 @@
package me.shedaniel.gui.widget;
import com.mojang.blaze3d.platform.GlStateManager;
-import me.shedaniel.api.TriBooleanProducer;
+import me.shedaniel.api.TriBooleanSupplier;
import me.shedaniel.gui.Drawable;
import net.minecraft.client.render.BufferBuilder;
import net.minecraft.client.render.Tessellator;
@@ -15,9 +15,10 @@ import java.util.function.IntFunction;
* Created by James on 7/29/2018.
*/
public abstract class Control extends Drawable {
+
private boolean enabled = true;
public IntFunction<Boolean> onClick;
- public TriBooleanProducer onKeyDown;
+ public TriBooleanSupplier onKeyDown;
public BiConsumer<Character, Integer> charPressed;
public Control(int x, int y, int width, int height) {
@@ -55,7 +56,6 @@ public abstract class Control extends Drawable {
p_drawRect_1_ = p_drawRect_3_;
p_drawRect_3_ = lvt_5_3_;
}
-
float lvt_5_3_1 = (float) (p_drawRect_4_ >> 24 & 255) / 255.0F;
float lvt_6_1_ = (float) (p_drawRect_4_ >> 16 & 255) / 255.0F;
float lvt_7_1_ = (float) (p_drawRect_4_ >> 8 & 255) / 255.0F;
diff --git a/src/main/java/me/shedaniel/gui/widget/IFocusable.java b/src/main/java/me/shedaniel/gui/widget/IFocusable.java
index 54a0b9426..5735ab3f1 100755
--- a/src/main/java/me/shedaniel/gui/widget/IFocusable.java
+++ b/src/main/java/me/shedaniel/gui/widget/IFocusable.java
@@ -4,7 +4,9 @@ package me.shedaniel.gui.widget;
* Created by James on 8/3/2018.
*/
public interface IFocusable {
+
public boolean hasFocus();
public void setFocused(boolean val);
+
}
diff --git a/src/main/java/me/shedaniel/gui/widget/REISlot.java b/src/main/java/me/shedaniel/gui/widget/REISlot.java
index d1a41ac59..6896163cf 100755
--- a/src/main/java/me/shedaniel/gui/widget/REISlot.java
+++ b/src/main/java/me/shedaniel/gui/widget/REISlot.java
@@ -22,6 +22,7 @@ import java.util.stream.Collectors;
* Created by James on 7/28/2018.
*/
public class REISlot extends Control {
+
private static final Identifier RECIPE_GUI = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png");
private boolean cheatable = false;
private List<ItemStack> itemList = new LinkedList<>();
diff --git a/src/main/java/me/shedaniel/gui/widget/TextBox.java b/src/main/java/me/shedaniel/gui/widget/TextBox.java
index 6329c5c23..566839eb2 100755
--- a/src/main/java/me/shedaniel/gui/widget/TextBox.java
+++ b/src/main/java/me/shedaniel/gui/widget/TextBox.java
@@ -81,4 +81,5 @@ public class TextBox extends Control implements IFocusable {
public void tick() {
textField.tick();
}
+
}
diff --git a/src/main/java/me/shedaniel/gui/widget/WidgetArrow.java b/src/main/java/me/shedaniel/gui/widget/WidgetArrow.java
index 524f1ce39..8c0229f36 100755
--- a/src/main/java/me/shedaniel/gui/widget/WidgetArrow.java
+++ b/src/main/java/me/shedaniel/gui/widget/WidgetArrow.java
@@ -6,6 +6,7 @@ import net.minecraft.client.render.GuiLighting;
import net.minecraft.util.Identifier;
public class WidgetArrow extends Control {
+
private static final Identifier RECIPE_GUI = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png");
private int progress = 0;
private int updateTick = 0;
@@ -45,4 +46,5 @@ public class WidgetArrow extends Control {
progress = 0;
}
}
+
}