Improve/refactoring (#15)

* Improve the code

* Code improve in binnie.core.utils package

* Code improve in binnie.core.triggers package

* Code improve in binnie.core.resource package

* Code improve in binnie.core.proxy package

* Code improve readability in binnie.core package

* Add missed constructors

* Some improve code readabilty

* Expand import with *

* Revert "Expand import with *"

This reverts commit 3bb4a44f3b69a8559bd5753337e0f6793ad18dc4.

* Fix using fully qualified names in imports

* Fix missed unnessesary "this."

* Removed binnie.craftgui package
Optimised imports and removed unnessesary "this."

* Some refactoring code in binnie.core.craftgui package

* Merge from master1.7.10

* Improve code readability in binnie.core.craftgui.database package

* Improve code readability in binnie.core.craftgui.events package

* Improve code readability in binnie.core.craftgui.geometry package

* Improve code readability in binnie.core.craftgui.* package
This commit is contained in:
Alexander Kornilov authored and mezz committed 2017-04-26 15:09:09 -07:00
1 parent a3c2360ba6
commit f402cb155f
428 files changed
+9515 -10103

No files matched your search

@@ -8,18 +8,18 @@ import forestry.api.genetics.EnumTolerance;
import forestry.api.apiculture.IBeeGenome;
import binnie.Binnie;
import forestry.api.apiculture.IAlleleBeeSpecies;
import binnie.craftgui.core.geometry.IArea;
import binnie.craftgui.resource.minecraft.CraftGUITexture;
import binnie.craftgui.core.CraftGUI;
import binnie.core.craftgui.geometry.IArea;
import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.craftgui.CraftGUI;
import forestry.api.core.EnumTemperature;
import forestry.api.core.EnumHumidity;
import binnie.craftgui.core.Tooltip;
import binnie.craftgui.core.Attribute;
import binnie.core.craftgui.Tooltip;
import binnie.core.craftgui.WidgetAttribute;
import java.util.ArrayList;
import binnie.craftgui.core.IWidget;
import binnie.core.craftgui.IWidget;
import java.util.List;
import binnie.craftgui.core.ITooltip;
import binnie.craftgui.controls.core.Control;
import binnie.core.craftgui.ITooltip;
import binnie.core.craftgui.controls.core.Control;
public class ControlClimateBar extends Control implements ITooltip
{
@@ -34,7 +34,7 @@ public class ControlClimateBar extends Control implements ITooltip
this.tolerated = new ArrayList<Integer>();
this.tempColours = new int[] { 65531, 7912447, 5242672, 16776960, 16753152, 16711680 };
this.humidColours = new int[] { 16770979, 1769216, 3177727 };
this.addAttribute(Attribute.MouseOver);
this.addAttribute(WidgetAttribute.MouseOver);
}
public ControlClimateBar(final IWidget parent, final int x, final int y, final int width, final int height, final boolean humidity) {
@@ -43,12 +43,12 @@ public class ControlClimateBar extends Control implements ITooltip
this.tolerated = new ArrayList<Integer>();
this.tempColours = new int[] { 65531, 7912447, 5242672, 16776960, 16753152, 16711680 };
this.humidColours = new int[] { 16770979, 1769216, 3177727 };
this.addAttribute(Attribute.MouseOver);
this.addAttribute(WidgetAttribute.MouseOver);
this.isHumidity = true;
}
@Override
public void getTooltip(final Tooltip list) {
public void getTooltip(final Tooltip tooltip) {
if (this.tolerated.isEmpty()) {
return;
}
@@ -59,10 +59,10 @@ public class ControlClimateBar extends Control implements ITooltip
}
if (type < types) {
if (this.isHumidity) {
list.add(EnumHumidity.values()[type].name);
tooltip.add(EnumHumidity.values()[type].name);
}
else {
list.add(EnumTemperature.values()[type + 1].name);
tooltip.add(EnumTemperature.values()[type + 1].name);
}
}
}