From bdcefcb5bef1fba1ac6bebd1f11bd669c9171d17 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 11 Feb 2017 23:51:03 -0800 Subject: [PATCH] Fix some gui crashes --- .../java/binnie/craftgui/controls/core/IControlValue.java | 5 ++++- .../binnie/craftgui/controls/listbox/ControlList.java | 8 ++++++-- .../binnie/craftgui/controls/listbox/ControlListBox.java | 2 +- src/main/java/binnie/craftgui/core/Widget.java | 3 ++- src/main/java/binnie/craftgui/minecraft/Window.java | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/binnie/craftgui/controls/core/IControlValue.java b/src/main/java/binnie/craftgui/controls/core/IControlValue.java index 9f9724cb..7fcac715 100644 --- a/src/main/java/binnie/craftgui/controls/core/IControlValue.java +++ b/src/main/java/binnie/craftgui/controls/core/IControlValue.java @@ -2,8 +2,11 @@ package binnie.craftgui.controls.core; import binnie.craftgui.core.IWidget; +import javax.annotation.Nullable; + public interface IControlValue extends IWidget { + @Nullable T getValue(); - void setValue(final T value); + void setValue(@Nullable final T value); } diff --git a/src/main/java/binnie/craftgui/controls/listbox/ControlList.java b/src/main/java/binnie/craftgui/controls/listbox/ControlList.java index d8cc41fa..46b96279 100644 --- a/src/main/java/binnie/craftgui/controls/listbox/ControlList.java +++ b/src/main/java/binnie/craftgui/controls/listbox/ControlList.java @@ -14,7 +14,9 @@ import java.util.Map; public class ControlList extends Control implements IControlValue { ControlListBox parent; + @Nullable private T defaultValue; + @Nullable private T value; Map allOptions; Map optionWidgets; @@ -22,7 +24,7 @@ public class ControlList extends Control implements IControlValue { @Nullable IValidator validator; - protected ControlList(final ControlListBox parent, final int x, final int y, final int w, final int h, final T defaultValue) { + protected ControlList(final ControlListBox parent, final int x, final int y, final int w, final int h, @Nullable final T defaultValue) { super(parent, x, y, w, h); this.value = defaultValue; this.defaultValue = defaultValue; @@ -33,16 +35,18 @@ public class ControlList extends Control implements IControlValue { } @Override + @Nullable public T getValue() { return this.value; } + @Nullable public T getDefaultValue() { return defaultValue; } @Override - public void setValue(final T value) { + public void setValue(@Nullable final T value) { if (value == this.value) { return; } diff --git a/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java b/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java index feab16e9..edb3fb14 100644 --- a/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java +++ b/src/main/java/binnie/craftgui/controls/listbox/ControlListBox.java @@ -17,7 +17,7 @@ public class ControlListBox extends ControlScrollableContent> @Override public void initialise() { ControlList content = this.getContent(); - T defaultValue = content.getDefaultValue(); + T defaultValue = content == null ? null : content.getDefaultValue(); ControlList child = new ControlList<>(this, 1, 1, this.w() - 2 - this.scrollBarSize, this.h() - 2, defaultValue); this.setScrollableContent(child); this.addEventHandler(new EventKey.Down.Handler() { diff --git a/src/main/java/binnie/craftgui/core/Widget.java b/src/main/java/binnie/craftgui/core/Widget.java index 7957a0a8..fcc6ce5e 100644 --- a/src/main/java/binnie/craftgui/core/Widget.java +++ b/src/main/java/binnie/craftgui/core/Widget.java @@ -253,7 +253,8 @@ public class Widget implements IWidget { ((EventHandler)handler).onEvent(event); } } - for (final IWidget child : this.getWidgets()) { + List widgets = new ArrayList<>(this.getWidgets()); + for (final IWidget child : widgets) { child.recieveEvent(event); } } diff --git a/src/main/java/binnie/craftgui/minecraft/Window.java b/src/main/java/binnie/craftgui/minecraft/Window.java index a8aa03d0..320289f5 100644 --- a/src/main/java/binnie/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/craftgui/minecraft/Window.java @@ -247,8 +247,8 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG return this.player.inventory.getItemStack(); } + @Nullable public IInventory getInventory() { - Preconditions.checkState(this.entityInventory != null, "This window has no inventory."); return this.entityInventory; }