Start Clean Up Gui

This commit is contained in:
Nedelosk committed 2017-08-01 00:37:15 +02:00
1 parent 1b338efca9
commit 3e3c9c30a4
59 files changed
+134 -127

No files matched your search

@@ -18,7 +18,7 @@ public class ControlColorDisplay extends Control implements IControlValue<IFlowe
public ControlColorDisplay(IWidget parent, int x, int y, IFlowerColor value) {
super(parent, x, y, 16, 16);
this.value = value;
addAttribute(Attribute.MouseOver);
addAttribute(Attribute.MOUSE_OVER);
}
@Override
@@ -27,7 +27,7 @@ public class ControlColorMixSymbol extends Control implements ITooltip {
super(parent, x, y, 16 + type * 16, 16);
this.value = value;
this.type = type;
addAttribute(Attribute.MouseOver);
addAttribute(Attribute.MOUSE_OVER);
}
@Override
@@ -20,7 +20,7 @@ public class ControlColorOption extends ControlTextOption<IFlowerColor> {
super(controlList, option, option.getColorName(), y);
setSize(new Point(getSize().x(), 20));
controlBee = new ControlColorDisplay(this, 2, 2, option);
addAttribute(Attribute.MouseOver);
addAttribute(Attribute.MOUSE_OVER);
CraftGUIUtil.moveWidget(textWidget, new Point(22, 0));
textWidget.setSize(textWidget.getSize().sub(new Point(24, 0)));
int th = CraftGUI.RENDER.textHeight(textWidget.getValue(), textWidget.getSize().x());
+5 -5
View File
@@ -1,9 +1,9 @@
package binnie.core.gui;
public enum Attribute implements IWidgetAttribute {
MouseOver,
CanFocus,
NeedsDeletion,
AlwaysOnTop,
BlockTooltip
MOUSE_OVER,
CAN_FOCUS,
NEEDS_DELETION,
ALWAYS_ON_TOP,
BLOCK_TOOLTIP
}
+1 -1
View File
@@ -91,7 +91,7 @@ public interface IWidget {
IWidget addWidget(final IWidget p0);
List<IWidget> getWidgets();
List<IWidget> getChildren();
void callEvent(final Event p0);
@@ -176,9 +176,9 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget {
addChildren = croppedZone.contains(widget.getCropWidget().getRelativeMousePosition());
}
if (addChildren) {
final ListIterator<IWidget> li = widget.getWidgets().listIterator(widget.getWidgets().size());
while (li.hasPrevious()) {
final IWidget child = li.previous();
ListIterator<IWidget> iterator = widget.getChildren().listIterator(widget.getChildren().size());
while (iterator.hasPrevious()) {
final IWidget child = iterator.previous();
widgets.addAll(this.getQueuedWidgets(child));
}
}
+33 -21
View File
@@ -23,7 +23,7 @@ public class Widget implements IWidget {
IWidget cropWidget;
boolean cropped;
int colour;
private List<IWidget> subWidgets;
private List<IWidget> children;
private List<IWidgetAttribute> attributes;
private Point position;
private Point size;
@@ -33,7 +33,7 @@ public class Widget implements IWidget {
private boolean visible;
public Widget(@Nullable final IWidget parent) {
this.subWidgets = new ArrayList<>();
this.children = new ArrayList<>();
this.attributes = new ArrayList<>();
this.position = Point.ZERO;
this.size = Point.ZERO;
@@ -70,13 +70,13 @@ public class Widget implements IWidget {
return;
}
child.delete();
this.subWidgets.remove(child);
this.children.remove(child);
}
@Override
public final void deleteAllChildren() {
while (!this.subWidgets.isEmpty()) {
this.deleteChild(this.subWidgets.get(0));
while (!this.children.isEmpty()) {
this.deleteChild(this.children.get(0));
}
}
@@ -97,10 +97,10 @@ public class Widget implements IWidget {
@Override
public final IWidget addWidget(final IWidget widget) {
if (this.subWidgets.size() != 0 && this.subWidgets.get(this.subWidgets.size() - 1).hasAttribute(Attribute.AlwaysOnTop)) {
this.subWidgets.add(this.subWidgets.size() - 1, widget);
if (this.children.size() != 0 && this.children.get(this.children.size() - 1).hasAttribute(Attribute.ALWAYS_ON_TOP)) {
this.children.add(this.children.size() - 1, widget);
} else {
this.subWidgets.add(widget);
this.children.add(widget);
}
this.onAddChild(widget);
return widget;
@@ -109,9 +109,21 @@ public class Widget implements IWidget {
protected void onAddChild(final IWidget widget) {
}
protected boolean hasChildren(){
return !children.isEmpty();
}
@Nullable
protected IWidget getFirstChild(){
if(!hasChildren()){
return null;
}
return children.get(0);
}
@Override
public final List<IWidget> getWidgets() {
return this.subWidgets;
public final List<IWidget> getChildren() {
return this.children;
}
@Override
@@ -218,12 +230,12 @@ public class Widget implements IWidget {
@Override
public boolean canMouseOver() {
return this.hasAttribute(Attribute.MouseOver);
return this.hasAttribute(Attribute.MOUSE_OVER);
}
@Override
public boolean canFocus() {
return this.hasAttribute(Attribute.CanFocus);
return this.hasAttribute(Attribute.CAN_FOCUS);
}
@Override
@@ -233,7 +245,7 @@ public class Widget implements IWidget {
@Override
public <E extends Event> void addSelfEventHandler(final EventHandler<E> handler) {
this.addEventHandler(handler.setOrigin(EventHandler.Origin.Self, this));
this.addEventHandler(handler.setOrigin(EventHandler.Origin.SELF, this));
}
@Override
@@ -249,7 +261,7 @@ public class Widget implements IWidget {
((EventHandler<Event>) handler).onEvent(event);
}
}
List<IWidget> widgets = new ArrayList<>(this.getWidgets());
List<IWidget> widgets = new ArrayList<>(this.getChildren());
for (final IWidget child : widgets) {
child.recieveEvent(event);
}
@@ -282,10 +294,10 @@ public class Widget implements IWidget {
if (this.isVisible()) {
CraftGUI.RENDER.preRender(this, guiWidth, guiHeight);
this.onRender(RenderStage.PRE_CHILDREN, guiWidth, guiHeight);
for (final IWidget widget : this.getWidgets()) {
for (final IWidget widget : this.getChildren()) {
widget.render(guiWidth, guiHeight);
}
for (final IWidget widget : this.getWidgets()) {
for (final IWidget widget : this.getChildren()) {
CraftGUI.RENDER.preRender(widget, guiWidth, guiHeight);
widget.onRender(RenderStage.POST_SIBLINGS, guiWidth, guiHeight);
CraftGUI.RENDER.postRender(widget);
@@ -306,8 +318,8 @@ public class Widget implements IWidget {
}
this.onUpdateClient();
final List<IWidget> deletedWidgets = new ArrayList<>();
for (final IWidget widget : this.getWidgets()) {
if (widget.hasAttribute(Attribute.NeedsDeletion)) {
for (final IWidget widget : this.getChildren()) {
if (widget.hasAttribute(Attribute.NEEDS_DELETION)) {
deletedWidgets.add(widget);
} else {
widget.updateClient();
@@ -457,7 +469,7 @@ public class Widget implements IWidget {
@Override
@Nullable
public <T> T getWidget(final Class<T> widgetClass) {
for (final IWidget child : this.getWidgets()) {
for (final IWidget child : this.getChildren()) {
if (widgetClass.isInstance(child)) {
return widgetClass.cast(child);
}
@@ -475,7 +487,7 @@ public class Widget implements IWidget {
}
public void scheduleDeletion() {
this.addAttribute(Attribute.NeedsDeletion);
this.addAttribute(Attribute.NEEDS_DELETION);
}
@Override
@@ -484,7 +496,7 @@ public class Widget implements IWidget {
int level = 0;
int index = 0;
if(parent != null){
List<IWidget> widgets = parent.getWidgets();
List<IWidget> widgets = parent.getChildren();
level = parent.getLevel();
index = widgets.indexOf(this);
}
@@ -120,7 +120,7 @@ public class WindowGenesis extends Window {
WindowGenesis.this.template = WindowGenesis.this.root.getDefaultTemplate();
WindowGenesis.this.refreshTemplate(null);
}
}.setOrigin(EventHandler.Origin.Self, tabSystems));
}.setOrigin(EventHandler.Origin.SELF, tabSystems));
this.geneList.addEventHandler(new EventValueChanged.Handler() {
@Override
public void onEvent(final EventValueChanged event) {
@@ -133,7 +133,7 @@ public class WindowGenesis extends Window {
}
WindowGenesis.this.geneOptions.setOptions(opts);
}
}.setOrigin(EventHandler.Origin.Self, this.geneList));
}.setOrigin(EventHandler.Origin.SELF, this.geneList));
this.geneOptions.addEventHandler(new EventValueChanged.Handler() {
@Override
public void onEvent(final EventValueChanged event) {
@@ -149,7 +149,7 @@ public class WindowGenesis extends Window {
}
WindowGenesis.this.refreshTemplate(chromo);
}
}.setOrigin(EventHandler.Origin.Self, this.geneOptions));
}.setOrigin(EventHandler.Origin.SELF, this.geneOptions));
this.panelPickup = new Panel(this, 16, 140, 60, 42, MinecraftGUI.PanelType.Black);
this.refreshTemplate(null);
}
@@ -192,7 +192,7 @@ public class WindowGenesis extends Window {
stack.writeToNBT(nbt);
Window.get(event.getOrigin()).sendClientAction("genesis", nbt);
}
}.setOrigin(EventHandler.Origin.Self, display));
}.setOrigin(EventHandler.Origin.SELF, display));
++i;
}
}
@@ -31,13 +31,13 @@ public class ControlCheckbox extends Control implements IControlValue<Boolean> {
if (w > 16) {
new ControlText(this, new Area(16, 1, w - 16, 16), text, TextJustification.MIDDLE_CENTER).setColor(4473924);
}
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
this.addEventHandler(new EventMouse.Down.Handler() {
@Override
public void onEvent(final EventMouse.Down event) {
ControlCheckbox.this.toggleValue();
}
}.setOrigin(EventHandler.Origin.Self, this));
}.setOrigin(EventHandler.Origin.SELF, this));
}
protected void onValueChanged(final boolean value) {
@@ -26,8 +26,8 @@ public class ControlTextEdit extends Control implements IControlValue<String> {
super(parent, x, y, width, height);
this.cachedValue = "";
this.field = new GuiTextField(0, this.getWindow().getGui().getFontRenderer(), 0, 0, 10, 10);
this.addAttribute(Attribute.CanFocus);
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.CAN_FOCUS);
this.addAttribute(Attribute.MOUSE_OVER);
this.field.setEnableBackgroundDrawing(false);
this.addEventHandler(new EventKey.Down.Handler() {
@Override
@@ -40,25 +40,25 @@ public class ControlTextEdit extends Control implements IControlValue<String> {
ControlTextEdit.this.onTextEdit(ControlTextEdit.this.cachedValue);
}
}
}.setOrigin(EventHandler.Origin.Self, this));
}.setOrigin(EventHandler.Origin.SELF, this));
this.addEventHandler(new EventMouse.Down.Handler() {
@Override
public void onEvent(final EventMouse.Down event) {
ControlTextEdit.this.field.mouseClicked(ControlTextEdit.this.getRelativeMousePosition().x(), ControlTextEdit.this.getRelativeMousePosition().y(), event.getButton());
}
}.setOrigin(EventHandler.Origin.Self, this));
}.setOrigin(EventHandler.Origin.SELF, this));
this.addEventHandler(new EventWidget.GainFocus.Handler() {
@Override
public void onEvent(final EventWidget.GainFocus event) {
ControlTextEdit.this.field.setFocused(true);
}
}.setOrigin(EventHandler.Origin.Self, this));
}.setOrigin(EventHandler.Origin.SELF, this));
this.addEventHandler(new EventWidget.LoseFocus.Handler() {
@Override
public void onEvent(final EventWidget.LoseFocus event) {
ControlTextEdit.this.field.setFocused(false);
}
}.setOrigin(EventHandler.Origin.Self, this));
}.setOrigin(EventHandler.Origin.SELF, this));
}
@Override
@@ -24,14 +24,14 @@ public class ControlButton extends Control {
public ControlButton(final IWidget parent, final int x, final int y, final int width, final int height) {
super(parent, x, y, width, height);
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
this.addEventHandler(new EventMouse.Down.Handler() {
@Override
public void onEvent(final EventMouse.Down event) {
ControlButton.this.callEvent(new EventButtonClicked(ControlButton.this.getWidget()));
ControlButton.this.onMouseClick(event);
}
}.setOrigin(EventHandler.Origin.Self, this));
}.setOrigin(EventHandler.Origin.SELF, this));
}
public ControlButton(final IWidget parent, final int x, final int y, final int width, final int height, final String text) {
@@ -62,7 +62,7 @@ public class Control extends Widget implements ITooltipHelp, ITooltip {
}
public void addTooltip(final String string) {
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
this.tooltipStrings.add(string);
}
@@ -20,7 +20,7 @@ public class ControlOption<T> extends Control implements IControlValue<T> {
public ControlOption(final ControlList<T> controlList, final T option, final int height) {
super(controlList, 0, height, controlList.getSize().x(), 20);
this.value = option;
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
this.addSelfEventHandler(new EventMouse.Down.Handler() {
@Override
public void onEvent(final EventMouse.Down event) {
@@ -17,7 +17,7 @@ public class ControlTextOption<T> extends ControlOption<T> {
public void onEvent(final EventWidget.ChangeColour event) {
ControlTextOption.this.textWidget.setColor(ControlTextOption.this.getColor());
}
}.setOrigin(EventHandler.Origin.Self, this));
}.setOrigin(EventHandler.Origin.SELF, this));
}
public ControlTextOption(final ControlList<T> controlList, final T option, final int y) {
@@ -43,7 +43,7 @@ public class ControlPages<T> extends Control implements IControlValues<T>, ICont
@Override
public Collection<T> getValues() {
final List<T> list = new ArrayList<>();
for (final IWidget child : this.getWidgets()) {
for (final IWidget child : this.getChildren()) {
list.add((T) ((IControlValue) child).getValue());
}
return list;
@@ -21,7 +21,7 @@ public class ControlScrollBar extends Control {
public ControlScrollBar(final IWidget parent, final int x, final int y, final int w, final int h, final IControlScrollable scrollable2) {
super(parent, x, y, w, h);
this.scrollable = scrollable2;
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
this.addSelfEventHandler(new EventMouse.Drag.Handler() {
@Override
public void onEvent(final EventMouse.Drag event) {
@@ -28,7 +28,7 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
super(parent, x, y, w, h);
this.value = value;
this.tabBar = parent;
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
this.addSelfEventHandler(new EventMouse.Down.Handler() {
@Override
public void onEvent(final EventMouse.Down event) {
@@ -94,7 +94,7 @@ public class ControlTab<T> extends Control implements ITooltip, IControlValue<T>
CraftGUI.RENDER.texture(iTexture, area);
if (this instanceof ControlTabIcon) {
final ControlTabIcon icon = (ControlTabIcon) this;
final ControlItemDisplay item = (ControlItemDisplay) this.getWidgets().get(0);
final ControlItemDisplay item = (ControlItemDisplay) getFirstChild();
if (texture == CraftGUITexture.TabDisabled) {
item.setColor(-1431655766);
} else {
@@ -29,14 +29,11 @@ public class ControlTabBar<T> extends Control implements IControlValue<T> {
public void onEvent(final EventValueChanged event) {
ControlTabBar.this.setValue((T) event.getValue());
}
}.setOrigin(EventHandler.Origin.DirectChild, this));
}.setOrigin(EventHandler.Origin.DIRECT_CHILD, this));
}
private void setValues(final Collection<T> values) {
final int i = 0;
while (i < this.getWidgets().size()) {
this.deleteChild(this.getWidgets().get(0));
}
deleteAllChildren();
final float length = values.size();
int tabDimension = (int) (this.getSize().y() / length);
if (this.position == Position.Top || this.position == Position.BOTTOM) {
@@ -69,7 +69,7 @@ public class ControlDatabaseIndividualDisplay extends ControlItemDisplay impleme
state = EnumDiscoveryState.Show;
}
this.discovered = state;
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
}
@Override
@@ -21,7 +21,7 @@ public class ControlItemStackOption extends ControlTextOption<ItemStack> {
super(controlList, option, option.getDisplayName(), y);
this.setSize(new Point(this.getSize().x(), 20));
(this.controlBee = new ControlItemDisplay(this, 2, 2)).setItemStack(option);
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
CraftGUIUtil.moveWidget(this.textWidget, new Point(22, 0));
this.textWidget.setSize(this.textWidget.getSize().sub(new Point(24, 0)));
final int th = CraftGUI.RENDER.textHeight(this.textWidget.getValue(), this.textWidget.getSize().x());
@@ -31,7 +31,7 @@ class ControlMutationSymbol extends Control implements ITooltip {
super(parent, x, y, 16 + type * 16, 16);
this.value = null;
this.type = type;
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
}
@Override
@@ -25,7 +25,7 @@ class ControlSpeciesBoxOption extends ControlTextOption<IAlleleSpecies> {
}
this.textWidget.setValue((this.controlBee.discovered == EnumDiscoveryState.Show) ? option.getAlleleName() : DatabaseConstants.CONTROL_KEY + ".undiscovered");
if (this.controlBee.discovered == EnumDiscoveryState.Show) {
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
}
CraftGUIUtil.moveWidget(this.textWidget, new Point(22, 0));
this.textWidget.setSize(this.textWidget.getSize().sub(new Point(24, 0)));
@@ -21,9 +21,7 @@ public class PageBreeder extends ControlPage<DatabaseTab> {
}
public void onPageRefresh() {
while (this.getWidgets().size() > 0) {
this.deleteChild(this.getWidgets().get(0));
}
this.deleteAllChildren();
final BreedingSystem system = ((WindowAbstractDatabase) Window.get(this)).getBreedingSystem();
final String descriptor = system.getDescriptor();
new ControlTextCentered(this, 8, TextFormatting.UNDERLINE + system.getDescriptor() + " " + I18N.localise(DatabaseConstants.BREEDER_KEY + ".profile"));
@@ -106,15 +106,15 @@ public abstract class WindowAbstractDatabase extends Window {
if (event.getOrigin().getParent() instanceof ControlPage && !(event.getValue() instanceof DatabaseTab)) {
final ControlPage parent = (ControlPage) event.getOrigin().getParent();
if (parent.getValue() instanceof IDatabaseMode) {
for (final IWidget widget : parent.getWidgets()) {
if (widget instanceof ControlPages) {
for (final IWidget child : parent.getChildren()) {
if (child instanceof ControlPages) {
if (event.getValue() == null) {
widget.hide();
child.hide();
} else {
widget.show();
for (final IWidget widget2 : widget.getWidgets()) {
if (widget2 instanceof PageAbstract) {
((PageAbstract) widget2).onValueChanged(event.getValue());
child.show();
for (final IWidget widget : child.getChildren()) {
if (widget instanceof PageAbstract) {
((PageAbstract) widget).onValueChanged(event.getValue());
}
}
}
@@ -131,7 +131,7 @@ public abstract class WindowAbstractDatabase extends Window {
widgets.listBox.setValidator(object -> Objects.equals(event.getValue(), "") || ((ControlTextOption) object).getText().toLowerCase().contains(event.getValue().toLowerCase()));
}
}
}.setOrigin(EventHandler.Origin.DirectChild, this));
}.setOrigin(EventHandler.Origin.DIRECT_CHILD, this));
new ControlHelp(this, 4, 4);
(this.panelInformation = new Panel(this, 24, 24, 144, 176, MinecraftGUI.PanelType.Black)).setColor(860416);
(this.panelSearch = new Panel(this, 176, 24, this.selectionBoxWidth, 160, MinecraftGUI.PanelType.Black)).setColor(860416);
@@ -8,7 +8,7 @@ public abstract class EventHandler<E extends Event> {
IWidget relative;
public EventHandler(final Class<E> eventClass) {
this.origin = Origin.Any;
this.origin = Origin.ANY;
this.relative = null;
this.eventClass = eventClass;
}
@@ -26,23 +26,23 @@ public abstract class EventHandler<E extends Event> {
}
public enum Origin {
Any,
Self,
Parent,
DirectChild;
ANY,
SELF,
PARENT,
DIRECT_CHILD;
public boolean isOrigin(final IWidget origin, final IWidget test) {
switch (this) {
case Any: {
case ANY: {
return true;
}
case DirectChild: {
return test.getWidgets().contains(origin);
case DIRECT_CHILD: {
return test.getChildren().contains(origin);
}
case Parent: {
case PARENT: {
return test.getParent() == origin;
}
case Self: {
case SELF: {
return test == origin;
}
default: {
@@ -29,7 +29,7 @@ public class ControlChromoPicker extends Control implements ITooltip {
Selected = new StandardTexture(160, 18, 16, 16, BinnieCoreTexture.GUI_PUNNETT);
Texture = new StandardTexture(160, 34, 16, 16, BinnieCoreTexture.GUI_PUNNETT);
type = chromo;
addAttribute(Attribute.MouseOver);
addAttribute(Attribute.MOUSE_OVER);
this.parent = parent;
addSelfEventHandler(new EventWidget.StartMouseOver.Handler() {
@Override
@@ -116,7 +116,7 @@ public class WindowFieldKit extends Window {
WindowFieldKit.this.text.setValue("");
}
}
}.setOrigin(EventHandler.Origin.DirectChild, this.chromo));
}.setOrigin(EventHandler.Origin.DIRECT_CHILD, this.chromo));
}
@Override
@@ -17,9 +17,9 @@ import binnie.core.gui.resource.minecraft.CraftGUITexture;
public abstract class Dialog extends Control {
public Dialog(final IWidget parent, final int w, final int h) {
super(parent, (parent.width() - w) / 2, (parent.height() - h) / 2, w, h);
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.AlwaysOnTop);
this.addAttribute(Attribute.BlockTooltip);
this.addAttribute(Attribute.MOUSE_OVER);
this.addAttribute(Attribute.ALWAYS_ON_TOP);
this.addAttribute(Attribute.BLOCK_TOOLTIP);
this.initialise();
this.addEventHandler(new EventMouse.Down.Handler() {
@Override
@@ -29,7 +29,7 @@ public abstract class Dialog extends Control {
Dialog.this.getParent().deleteChild(Dialog.this);
}
}
}.setOrigin(EventHandler.Origin.Any, this));
}.setOrigin(EventHandler.Origin.ANY, this));
}
@Override
@@ -126,7 +126,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG
return;
}
}
if (widget.hasAttribute(Attribute.BlockTooltip)) {
if (widget.hasAttribute(Attribute.BLOCK_TOOLTIP)) {
return;
}
}
@@ -144,7 +144,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG
return;
}
}
if (widget.hasAttribute(Attribute.BlockTooltip)) {
if (widget.hasAttribute(Attribute.BLOCK_TOOLTIP)) {
return;
}
}
@@ -33,7 +33,7 @@ public class ControlEnergyBar extends Control implements ITooltip {
public ControlEnergyBar(final IWidget parent, final int x, final int y, final int width, final int height, final Position direction) {
super(parent, x, y, width, height);
this.direction = direction;
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
}
@Nullable
@@ -28,7 +28,7 @@ public class ControlErrorState extends Control implements ITooltip {
public ControlErrorState(final IWidget parent, final int x, final int y) {
super(parent, x, y, 16, 16);
this.type = 0;
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
}
@Override
@@ -14,7 +14,7 @@ import binnie.core.gui.resource.minecraft.CraftGUITexture;
public class ControlHelp extends Control implements ITooltip {
public ControlHelp(final IWidget parent, final int x, final int y) {
super(parent, x, y, 16, 16);
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
}
@Override
@@ -16,7 +16,7 @@ public class ControlInfo extends Control implements ITooltip {
public ControlInfo(final IWidget parent, final int x, final int y, final String info) {
super(parent, x, y, 16, 16);
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
this.info = info;
}
@@ -44,7 +44,7 @@ public class ControlItemDisplay extends Control implements ITooltip {
public void setTooltip() {
this.hastooltip = true;
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
}
@Override
@@ -51,7 +51,7 @@ public class ControlLiquidTank extends Control implements ITooltip {
this.tankID = 0;
this.horizontal = false;
this.horizontal = horizontal;
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
this.addSelfEventHandler(new EventMouse.Down.Handler() {
@Override
public void onEvent(final EventMouse.Down event) {
@@ -17,7 +17,7 @@ public class ControlPowerSystem extends Control implements ITooltip {
public ControlPowerSystem(final IWidget parent, final int x, final int y, final PowerSystem system) {
super(parent, x, y, 16, 16);
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
this.system = system;
}
@@ -15,7 +15,7 @@ public class ControlProgressBase extends Control {
public ControlProgressBase(final IWidget parent, final int x, final int y, final int w, final int h) {
super(parent, x, y, w, h);
this.progress = 0.0f;
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
}
public static String convertTime(final int time) {
@@ -29,8 +29,8 @@ public class ControlSlide extends Control {
super(parent, x, y, w, h);
this.slideActive = true;
this.label = null;
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.BlockTooltip);
this.addAttribute(Attribute.MOUSE_OVER);
this.addAttribute(Attribute.BLOCK_TOOLTIP);
this.expanded = new Area(this.getPosition(), this.getSize());
this.anchor = anchor2.opposite();
final int border = (this.anchor.x() != 0) ? (this.expanded.width() - 6) : (this.expanded.height() - 6);
@@ -159,7 +159,7 @@ public class ControlSlot extends ControlSlotBase {
private List<ControlSlot> getControlSlots() {
final List<ControlSlot> slots = new ArrayList<>();
if (this.getParent() instanceof ControlSlotArray || this.getParent() instanceof ControlPlayerInventory) {
for (final IWidget child : this.getParent().getWidgets()) {
for (final IWidget child : this.getParent().getChildren()) {
slots.add((ControlSlot) child);
}
} else {
@@ -30,7 +30,7 @@ public abstract class ControlSlotBase extends Control implements ITooltip {
public ControlSlotBase(final IWidget parent, final int x, final int y, final int size) {
super(parent, x, y, size, size);
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
this.itemDisplay = new ControlItemDisplay(this, 1, 1, size - 2);
this.addSelfEventHandler(new EventWidget.ChangeSize.Handler() {
@Override
@@ -21,7 +21,7 @@ public class ControlUser extends Control implements ITooltip {
super(parent, x, y, 16, 16);
this.username = "";
this.team = "";
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
this.username = username;
}
@@ -18,7 +18,7 @@ class ControlColourSelector extends Control implements ITooltip, IControlValue<E
public ControlColourSelector(final IWidget parent, final int x, final int y, final int w, final int h, final EnumColor value) {
super(parent, x, y, w, h);
this.setValue(value);
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
}
@Override
@@ -144,7 +144,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
Window.get(tab).sendClientAction("tab-change", nbt);
WindowCompartment.this.currentTab = i;
}
}.setOrigin(EventHandler.Origin.DirectChild, tab));
}.setOrigin(EventHandler.Origin.DIRECT_CHILD, tab));
x += 24;
final ControlPages<Integer> compartmentPages = new ControlPages<>(controlCompartment, 24, 0, compartmentPageWidth, compartmentPageHeight);
final ControlPage[] page = new ControlPage[inv.getTabNumber()];
@@ -209,7 +209,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
Window.get(tab).sendClientAction("tab-change", nbt);
WindowCompartment.this.currentTab = i;
}
}.setOrigin(EventHandler.Origin.DirectChild, tab2));
}.setOrigin(EventHandler.Origin.DIRECT_CHILD, tab2));
CraftGUIUtil.linkWidgets(tab2, compartmentPages);
x += 24;
}
@@ -237,11 +237,11 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh
tab.writeToNBT(nbt);
WindowCompartment.this.sendClientAction("comp-change-tab", nbt);
}
}.setOrigin(EventHandler.Origin.Self, this.tabName));
}.setOrigin(EventHandler.Origin.SELF, this.tabName));
y2 += 20;
new ControlText(tabPropertyPanel, new Point(4, y2), "Tab Icon: ");
(this.tabIcon = new ControlItemDisplay(tabPropertyPanel, 58, y2 - 4)).setItemStack(new ItemStack(Items.PAPER));
this.tabIcon.addAttribute(Attribute.MouseOver);
this.tabIcon.addAttribute(Attribute.MOUSE_OVER);
this.tabIcon.addSelfEventHandler(new EventMouse.Down.Handler() {
@Override
public void onEvent(final EventMouse.Down event) {
@@ -31,7 +31,7 @@ public class ControlBreweryProgress extends ControlProgressBase {
protected ControlBreweryProgress(final IWidget parent, final int x, final int y) {
super(parent, x, y, 34, 39);
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
}
@Override
@@ -32,7 +32,7 @@ public class ControlFruitPressProgress extends ControlProgressBase {
protected ControlFruitPressProgress(final IWidget parent, final int x, final int y) {
super(parent, x, y, 37, 69);
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
this.addSelfEventHandler(new EventMouse.Down.Handler() {
@Override
public void onEvent(final EventMouse.Down event) {
@@ -131,7 +131,7 @@ public class ControlTileSelect extends Control implements IControlValue<IDesign>
protected ControlTile(final IWidget parent, final int x, final int y, final IDesign value) {
super(parent, x, y, 18, 18);
this.value = value;
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
this.addSelfEventHandler(new EventMouse.Down.Handler() {
@Override
public void onEvent(final EventMouse.Down event) {
@@ -41,7 +41,7 @@ public class WindowDesigner extends Window {
public void onEvent(final EventTextEdit event) {
WindowDesigner.this.tileSelect.refresh(event.getValue());
}
}.setOrigin(EventHandler.Origin.DirectChild, this));
}.setOrigin(EventHandler.Origin.DIRECT_CHILD, this));
}
@Nullable
@@ -11,6 +11,6 @@ public class ControlDropDownMenu extends Panel {
public ControlDropDownMenu(final IWidget parent, final int x, final int y, final int width, final int height) {
super(parent, x, y, width, 2, MinecraftGUI.PanelType.Gray);
this.stayOpenOnChildClick = false;
this.addAttribute(Attribute.CanFocus);
this.addAttribute(Attribute.CAN_FOCUS);
}
}
@@ -47,7 +47,7 @@ public class ControlFluidDisplay extends Control implements ITooltip {
public void setTooltip() {
this.hastooltip = true;
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
}
@Override
@@ -30,7 +30,7 @@ public class ControlSlotFluid extends Control implements ITooltip {
public ControlSlotFluid(final IWidget parent, final int x, final int y, final int size, @Nullable final FluidStack fluid) {
super(parent, x, y, size, size);
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
this.itemDisplay = new ControlFluidDisplay(this, 1, 1, size - 2);
this.fluidStack = fluid;
this.addSelfEventHandler(new EventWidget.ChangeSize.Handler() {
@@ -271,7 +271,7 @@ public class AnalystPageMutations extends ControlAnalystPage {
static class ControlUnknownMutation extends Control {
public ControlUnknownMutation(IWidget parent, int x, int y, int w, int h) {
super(parent, x, y, w, h);
addAttribute(Attribute.MouseOver);
addAttribute(Attribute.MOUSE_OVER);
addTooltip(I18N.localise(AnalystConstants.MUTATIONS_KEY + ".unknown.tooltip"));
}
@@ -32,7 +32,7 @@ public class ControlAnalystChromosome extends Control implements ITooltip {
super(parent, x, y, 16, 22);
Homozygous = new StandardTexture(0, 0, 16, 22, BinnieCoreTexture.GUI_ANALYST);
Heterozygous = new StandardTexture(16, 0, 16, 22, BinnieCoreTexture.GUI_ANALYST);
addAttribute(Attribute.MouseOver);
addAttribute(Attribute.MOUSE_OVER);
this.root = root;
chromosomeType = type;
this.allele0 = allele0;
@@ -27,7 +27,7 @@ public abstract class ControlToleranceBar<T extends Enum<T>> extends Control imp
public ControlToleranceBar(IWidget parent, int x, int y, int width, int height, Class<T> clss) {
super(parent, x, y, width, height);
addAttribute(Attribute.MouseOver);
addAttribute(Attribute.MOUSE_OVER);
enumClass = clss;
tolerated = EnumSet.noneOf(enumClass);
fullSet = EnumSet.allOf(enumClass);
@@ -160,7 +160,7 @@ public class WindowAnalyst extends Window {
new Control(this, x, y, 20, 20) {
@Override
public void initialise() {
addAttribute(Attribute.MouseOver);
addAttribute(Attribute.MOUSE_OVER);
addSelfEventHandler(new EventMouse.Down.Handler() {
@Override
@SideOnly(Side.CLIENT)
@@ -356,7 +356,7 @@ public class WindowAnalyst extends Window {
@Override
protected void initialise() {
super.initialise();
addAttribute(Attribute.MouseOver);
addAttribute(Attribute.MOUSE_OVER);
value = page;
addSelfEventHandler(new EventMouse.Down.Handler() {
@Override
@@ -28,7 +28,7 @@ public class ControlBiomes extends Control implements ITooltip {
public ControlBiomes(IWidget parent, int x, int y, int width, int height) {
super(parent, x, y, width * 16, height * 16);
tolerated = new ArrayList<>();
addAttribute(Attribute.MouseOver);
addAttribute(Attribute.MOUSE_OVER);
}
@Override
@@ -50,7 +50,7 @@ public class ControlClimateBar extends Control implements ITooltip {
super(parent, x, y, width, height);
isHumidity = false;
tolerated = new ArrayList<>();
addAttribute(Attribute.MouseOver);
addAttribute(Attribute.MOUSE_OVER);
isHumidity = humidity;
}
@@ -20,7 +20,7 @@ public class ControlChromosome extends Control implements IControlValue<IChromos
protected ControlChromosome(IWidget parent, int x, int y, IChromosomeType type) {
super(parent, x, y, 16, 16);
value = type;
addAttribute(Attribute.MouseOver);
addAttribute(Attribute.MOUSE_OVER);
}
@Override
@@ -28,7 +28,7 @@ public class ControlGene extends Control implements IControlValue<IGene>, IToolt
protected ControlGene(final IWidget parent, final int x, final int y, final IGene gene) {
super(parent, x, y, 16, 16);
this.gene = gene;
this.addAttribute(Attribute.MouseOver);
this.addAttribute(Attribute.MOUSE_OVER);
this.addSelfEventHandler(new EventMouse.Down.Handler() {
@Override
public void onEvent(final EventMouse.Down event) {
@@ -110,7 +110,7 @@ public class WindowGeneBank extends WindowMachine {
}
WindowGeneBank.this.genes.setFilter(value);
}
}.setOrigin(EventHandler.Origin.Self, edit));
}.setOrigin(EventHandler.Origin.SELF, edit));
this.genes = new ControlGeneScroll(scroll, 1, 1, geneBoxWidth, 116);
scroll.setScrollableContent(this.genes);
this.genes.setGenes(Binnie.GENETICS.beeBreedingSystem);