diff --git a/build.properties b/build.properties index b7862f5f..5600e4ed 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ # #Sat Dec 28 00:14:08 EST 2013 minecraft_version = 1.7.10 -forge_version = 10.13.4.1566-1.7.10 +forge_version = 10.13.4.1614-1.7.10 mod_version = 0.3.0 api_version = 1.3.0 release_type = beta diff --git a/src/main/java/com/pahimar/ee3/client/gui/component/GuiComponent.java b/src/main/java/com/pahimar/ee3/client/gui/component/GuiComponent.java index e1f9f7c0..c1aae127 100644 --- a/src/main/java/com/pahimar/ee3/client/gui/component/GuiComponent.java +++ b/src/main/java/com/pahimar/ee3/client/gui/component/GuiComponent.java @@ -58,6 +58,7 @@ public abstract class GuiComponent implements Comparable { protected int zIndex = 0; protected boolean isVisible = true; protected boolean isEnabled = true; + protected boolean isFocusable = true; public GuiComponent(GuiBase parentGui, String id) { this(parentGui, id, null, 0, 0); @@ -197,6 +198,23 @@ public abstract class GuiComponent implements Comparable { return this; } + public boolean isFocusable() { + return isFocusable; + } + + public GuiComponent setIsFocusable(boolean isFocusable) { + this.isFocusable = isFocusable; + return this; + } + + public boolean hasFocus() { + if (isFocusable) { + return getParentGui().getActiveGuiComponentId().equals(getId()); + } + + return false; + } + public abstract void drawForeground(int rawMouseX, int rawMouseY, float partialTicks); public abstract void drawBackground(int rawMouseX, int rawMouseY, float partialTicks); @@ -274,7 +292,7 @@ public abstract class GuiComponent implements Comparable { return false; } - public abstract void onFocusGain(); + public abstract void onFocusGained(); public abstract void onFocusLost();