mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-20 20:22:35 +00:00
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:
1 parent
a3c2360ba6
commit
f402cb155f
428 files changed
+9515
-10103
No files matched your search
@@ -5,36 +5,35 @@
|
||||
package binnie.genetics.gui;
|
||||
|
||||
import forestry.api.arboriculture.ITreeGenome;
|
||||
import binnie.craftgui.core.geometry.IPoint;
|
||||
import binnie.core.craftgui.geometry.IPoint;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
import binnie.craftgui.minecraft.control.ControlItemDisplay;
|
||||
import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import binnie.core.util.UniqueItemStackSet;
|
||||
import binnie.craftgui.minecraft.control.ControlIconDisplay;
|
||||
import binnie.core.craftgui.minecraft.control.ControlIconDisplay;
|
||||
import binnie.genetics.item.ModuleItem;
|
||||
import forestry.api.genetics.IChromosomeType;
|
||||
import forestry.api.arboriculture.EnumTreeChromosome;
|
||||
import forestry.api.genetics.IAlleleBoolean;
|
||||
import binnie.craftgui.controls.ControlTextCentered;
|
||||
import binnie.core.craftgui.controls.ControlTextCentered;
|
||||
import forestry.api.arboriculture.ITree;
|
||||
import binnie.craftgui.core.geometry.IArea;
|
||||
import binnie.craftgui.core.IWidget;
|
||||
import binnie.core.craftgui.geometry.IArea;
|
||||
import binnie.core.craftgui.IWidget;
|
||||
import binnie.extratrees.FakeWorld;
|
||||
|
||||
public class AnalystPageWood extends AnalystPageProduce
|
||||
{
|
||||
public AnalystPageWood(final IWidget parent, final IArea area, final ITree ind) {
|
||||
super(parent, area);
|
||||
this.setColour(6697728);
|
||||
this.setColor(6697728);
|
||||
final ITreeGenome genome = ind.getGenome();
|
||||
int y = 4;
|
||||
new ControlTextCentered(this, y, "§nWood").setColour(this.getColour());
|
||||
new ControlTextCentered(this, y, "§nWood").setColor(this.getColor());
|
||||
y += 12;
|
||||
if (((IAlleleBoolean) ind.getGenome().getActiveAllele(EnumTreeChromosome.FIREPROOF)).getValue()) {
|
||||
new ControlIconDisplay(this, (this.w() - 16.0f) / 2.0f, y, ModuleItem.iconNoFire.getIcon()).addTooltip("Fireproof");
|
||||
@@ -55,7 +54,7 @@ public class AnalystPageWood extends AnalystPageProduce
|
||||
// products.add(stack);
|
||||
// }
|
||||
if (products.size() > 0) {
|
||||
new ControlTextCentered(this, y, "Logs").setColour(this.getColour());
|
||||
new ControlTextCentered(this, y, "Logs").setColor(this.getColor());
|
||||
y += 10;
|
||||
final int w = products.size() * 18 - 2;
|
||||
final int i = 0;
|
||||
@@ -77,7 +76,7 @@ public class AnalystPageWood extends AnalystPageProduce
|
||||
y += 8;
|
||||
}
|
||||
if (products.size() == 0) {
|
||||
new ControlTextCentered(this, y, "This tree has no \nfruits or nuts").setColour(this.getColour());
|
||||
new ControlTextCentered(this, y, "This tree has no \nfruits or nuts").setColor(this.getColor());
|
||||
y += 28;
|
||||
}
|
||||
this.setSize(new IPoint(this.w(), y + 8));
|
||||
|
||||
Reference in new issue
Block a user