diff --git a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java index 31b84cd9..a7691eea 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourMixSymbol.java @@ -7,7 +7,7 @@ import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.resource.Texture; import binnie.craftgui.resource.minecraft.CraftGUITextureSheet; import binnie.craftgui.resource.minecraft.StandardTexture; @@ -25,9 +25,9 @@ public class ControlColourMixSymbol extends Control implements ITooltip { public void onRenderBackground(int guiWidth, int guiHeight) { super.onRenderBackground(guiWidth, guiHeight); if (this.type == 0) { - CraftGUI.render.texture(ControlColourMixSymbol.MutationPlus, IPoint.ZERO); + CraftGUI.render.texture(ControlColourMixSymbol.MutationPlus, Point.ZERO); } else { - CraftGUI.render.texture(ControlColourMixSymbol.MutationArrow, IPoint.ZERO); + CraftGUI.render.texture(ControlColourMixSymbol.MutationArrow, Point.ZERO); } } diff --git a/src/main/java/binnie/botany/craftgui/ControlColourOption.java b/src/main/java/binnie/botany/craftgui/ControlColourOption.java index 72eedc15..e9177d81 100644 --- a/src/main/java/binnie/botany/craftgui/ControlColourOption.java +++ b/src/main/java/binnie/botany/craftgui/ControlColourOption.java @@ -6,23 +6,23 @@ import binnie.craftgui.controls.listbox.ControlTextOption; import binnie.craftgui.core.Attribute; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.geometry.CraftGUIUtil; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; public class ControlColourOption extends ControlTextOption { ControlColourDisplay controlBee; - IPoint boxPosition; + Point boxPosition; public ControlColourOption(final ControlList controlList, final IFlowerColour option, final int y) { super(controlList, option, option.getColourName(), y); - this.setSize(new IPoint(this.getSize().x(), 20)); + this.setSize(new Point(this.getSize().x(), 20)); this.controlBee = new ControlColourDisplay(this, 2, 2, option); this.addAttribute(Attribute.MouseOver); - CraftGUIUtil.moveWidget(this.textWidget, new IPoint(22, 0)); - this.textWidget.setSize(this.textWidget.getSize().sub(new IPoint(24, 0))); + 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()); final int height = Math.max(20, th + 6); - this.setSize(new IPoint(this.size().x(), height)); - this.textWidget.setSize(new IPoint(this.textWidget.getSize().x(), height)); - this.boxPosition = new IPoint(2, (height - 18) / 2); + this.setSize(new Point(this.size().x(), height)); + this.textWidget.setSize(new Point(this.textWidget.getSize().x(), height)); + this.boxPosition = new Point(2, (height - 18) / 2); } } diff --git a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java index a666e217..eb6bd5e2 100644 --- a/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java +++ b/src/main/java/binnie/botany/craftgui/PageSpeciesFlowerGenome.java @@ -11,8 +11,8 @@ import binnie.craftgui.controls.ControlText; import binnie.craftgui.controls.core.Control; import binnie.craftgui.controls.scroll.ControlScrollableContent; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.TextJustification; import binnie.craftgui.minecraft.control.ControlItemDisplay; import binnie.craftgui.mod.database.DatabaseTab; @@ -42,7 +42,7 @@ public class PageSpeciesFlowerGenome extends PageSpecies { final IAlleleFlowerSpecies treeSpecies = genome.getPrimary(); final int w = 144; final int h = 176; - new ControlText(this, new IArea(0, 4, w, 16), "Genome", TextJustification.MiddleCenter); + new ControlText(this, new Area(0, 4, w, 16), "Genome", TextJustification.MiddleCenter); final ControlScrollableContent scrollable = new ControlScrollableContent(this, 4, 20, w - 8, h - 8 - 16, 12); final Control contents = new Control(scrollable, 0, 0, w - 8 - 12, h - 8 - 16); final int tw = w - 8 - 12; @@ -51,24 +51,24 @@ public class PageSpeciesFlowerGenome extends PageSpecies { int y = 0; final int th = 14; final int th2 = 18; - new ControlText(contents, new IArea(0, y, w2, th), "Temp. : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MIDDLE_LEFTt); + new ControlText(contents, new Area(0, y, w2, th), "Temp. : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MIDDLE_LEFTt); y += th; - new ControlText(contents, new IArea(0, y, w2, th), "Moist. : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), Binnie.LANGUAGE.localise(treeSpecies.getMoisture()), TextJustification.MIDDLE_LEFTt); + new ControlText(contents, new Area(0, y, w2, th), "Moist. : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(w2, y, w3, th), Binnie.LANGUAGE.localise(treeSpecies.getMoisture()), TextJustification.MIDDLE_LEFTt); y += th; - new ControlText(contents, new IArea(0, y, w2, th), "pH. : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), Binnie.LANGUAGE.localise(treeSpecies.getPH()), TextJustification.MIDDLE_LEFTt); + new ControlText(contents, new Area(0, y, w2, th), "pH. : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(w2, y, w3, th), Binnie.LANGUAGE.localise(treeSpecies.getPH()), TextJustification.MIDDLE_LEFTt); y += th; - new ControlText(contents, new IArea(0, y, w2, th), "Fertility : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MIDDLE_LEFTt); + new ControlText(contents, new Area(0, y, w2, th), "Fertility : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MIDDLE_LEFTt); y += th; final float lifespan = genome.getLifespan() * 68.27f / genome.getAgeChance() / 24000.0f; - new ControlText(contents, new IArea(0, y, w2, th), "Lifespan : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), "" + String.format("%.2f", lifespan) + " days", TextJustification.MIDDLE_LEFTt); + new ControlText(contents, new Area(0, y, w2, th), "Lifespan : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(w2, y, w3, th), "" + String.format("%.2f", lifespan) + " days", TextJustification.MIDDLE_LEFTt); y += th; - new ControlText(contents, new IArea(0, y, w2, th), "Nectar : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), genome.getActiveAllele(EnumFlowerChromosome.SAPPINESS).getName(), TextJustification.MIDDLE_LEFTt); + new ControlText(contents, new Area(0, y, w2, th), "Nectar : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(w2, y, w3, th), genome.getActiveAllele(EnumFlowerChromosome.SAPPINESS).getName(), TextJustification.MIDDLE_LEFTt); y += th; int x = w2; int tot = 0; @@ -86,9 +86,9 @@ public class PageSpeciesFlowerGenome extends PageSpecies { } } final int numOfLines = 1 + (tot - 1) / 3; - new ControlText(contents, new IArea(0, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines), "Varieties : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(0, y - (numOfLines - 1) * 18, w2, 4 + 18 * numOfLines), "Varieties : ", TextJustification.MiddleRight); y += th; - contents.setSize(new IPoint(contents.size().x(), y)); + contents.setSize(new Point(contents.size().x(), y)); scrollable.setScrollableContent(contents); } diff --git a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java index 7b5dff74..ff45fc61 100644 --- a/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java +++ b/src/main/java/binnie/botany/craftgui/WindowBotanistDatabase.java @@ -7,7 +7,7 @@ import binnie.botany.genetics.EnumFlowerColor; import binnie.core.AbstractMod; import binnie.craftgui.controls.listbox.ControlListBox; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; import binnie.craftgui.minecraft.Window; import binnie.craftgui.mod.database.DatabaseTab; import binnie.craftgui.mod.database.IDatabaseMode; @@ -48,7 +48,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { new PageBranchSpecies(this.getInfoPages(Mode.BRANCHES), new DatabaseTab(Botany.instance, "branches.species", 0)); this.createMode(FlowerMode.Colour, new ModeWidgets(FlowerMode.Colour, this) { @Override - public void createListBox(final IArea area) { + public void createListBox(final Area area) { this.listBox = new ControlListBox(this.modePage, area.xPos(), area.yPos(), area.width(), area.height(), 12) { @Override public IWidget createOption(final IFlowerColour value, final int y) { diff --git a/src/main/java/binnie/botany/flower/FlowerSpriteManager.java b/src/main/java/binnie/botany/flower/FlowerSpriteManager.java new file mode 100644 index 00000000..aa63bba4 --- /dev/null +++ b/src/main/java/binnie/botany/flower/FlowerSpriteManager.java @@ -0,0 +1,95 @@ +package binnie.botany.flower; + +import java.util.HashMap; +import java.util.Map; + +import javax.annotation.Nullable; + +import binnie.Binnie; +import binnie.botany.Botany; +import binnie.botany.api.IFlowerType; +import binnie.botany.genetics.EnumFlowerType; +import binnie.core.resource.BinnieSprite; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +public class FlowerSpriteManager { + + private static final Map flowerSprites = new HashMap<>(); + + public static void initSprites(IFlowerType type) { + if(flowerSprites.containsKey(type)){ + return; + } + flowerSprites.put(type, new FlowerSprites(type)); + } + + @Nullable + public static TextureAtlasSprite getStem(IFlowerType type, int section, boolean flowered){ + FlowerSprites flower = flowerSprites.get(type); + if(flower == null){ + return null; + } + return flower.getStem(type, section, flowered); + } + + @Nullable + public static TextureAtlasSprite getPetal(IFlowerType type, int section, boolean flowered){ + FlowerSprites flower = flowerSprites.get(type); + if(flower == null){ + return null; + } + return flower.getPetal(type, section, flowered); + } + + @Nullable + public static TextureAtlasSprite getVariant(IFlowerType type, int section, boolean flowered){ + FlowerSprites flower = flowerSprites.get(type); + if(flower == null){ + return null; + } + return flower.getVariant(type, section, flowered); + } + + private static class FlowerSprites{ + private BinnieSprite[] stem; + private BinnieSprite[] variant; + private BinnieSprite[] petal; + private BinnieSprite[] unflowered; + private int sections; + + public FlowerSprites(IFlowerType type) { + this.sections = type.getSections(); + this.stem = new BinnieSprite[sections]; + this.petal = new BinnieSprite[sections]; + this.variant = new BinnieSprite[sections]; + this.unflowered = new BinnieSprite[sections]; + for (int section = 0; section < sections; ++section) { + final String suf = (section == 0) ? "" : ("" + (section + 1)); + final String pre = (sections == 1) ? "" : "double/"; + this.stem[section] = Binnie.RESOURCE.getBlockSprite(Botany.instance, "flowers/" + pre + type.toString().toLowerCase() + suf + ".0"); + this.petal[section] = Binnie.RESOURCE.getBlockSprite(Botany.instance, "flowers/" + pre + type.toString().toLowerCase() + suf + ".1"); + this.variant[section] = Binnie.RESOURCE.getBlockSprite(Botany.instance, "flowers/" + pre + type.toString().toLowerCase() + suf + ".2"); + this.unflowered[section] = Binnie.RESOURCE.getBlockSprite(Botany.instance, "flowers/" + pre + type.toString().toLowerCase() + suf + ".3"); + } + } + + public TextureAtlasSprite getStem(IFlowerType type, int section, boolean flowered){ + return stem[section % sections].getSprite(); + } + + public TextureAtlasSprite getPetal(IFlowerType type, int section, boolean flowered){ + return (flowered ? petal[section % this.sections] : this.unflowered[section % this.sections]).getSprite(); + } + + @Nullable + public TextureAtlasSprite getVariant(IFlowerType type, int section, boolean flowered){ + return flowered ? variant[section % this.sections].getSprite() : null; + } + + } + +} diff --git a/src/main/java/binnie/botany/gardening/ModuleGardening.java b/src/main/java/binnie/botany/gardening/ModuleGardening.java index 70ac56de..d505fcdb 100644 --- a/src/main/java/binnie/botany/gardening/ModuleGardening.java +++ b/src/main/java/binnie/botany/gardening/ModuleGardening.java @@ -17,8 +17,10 @@ import binnie.botany.ceramic.brick.BlockCeramicBrick; import binnie.botany.ceramic.brick.ItemCeramicBrick; import binnie.botany.ceramic.brick.TileCeramicBrick; import binnie.botany.farm.CircuitGarden; +import binnie.botany.flower.FlowerSpriteManager; import binnie.botany.flower.ItemInsulatedTube; import binnie.botany.genetics.EnumFlowerColor; +import binnie.botany.genetics.EnumFlowerType; import binnie.botany.items.BotanyItems; import binnie.botany.items.ItemClay; import binnie.botany.items.ItemPigment; diff --git a/src/main/java/binnie/botany/genetics/EnumFlowerType.java b/src/main/java/binnie/botany/genetics/EnumFlowerType.java index 18bc2f75..15c86d0e 100644 --- a/src/main/java/binnie/botany/genetics/EnumFlowerType.java +++ b/src/main/java/binnie/botany/genetics/EnumFlowerType.java @@ -61,6 +61,7 @@ public enum EnumFlowerType implements IFlowerType { Delphinium(2), Hollyhock(2); + public static EnumFlowerType[] VALUES = values(); public static int highestSection = 2; int sections; diff --git a/src/main/java/binnie/botany/genetics/FlowerDefinition.java b/src/main/java/binnie/botany/genetics/FlowerDefinition.java index 579a546b..175c0f92 100644 --- a/src/main/java/binnie/botany/genetics/FlowerDefinition.java +++ b/src/main/java/binnie/botany/genetics/FlowerDefinition.java @@ -15,6 +15,7 @@ import binnie.botany.api.IFlowerMutationBuilder; import binnie.botany.api.IFlowerRoot; import binnie.botany.api.IFlowerType; import binnie.botany.core.BotanyCore; +import binnie.botany.flower.FlowerSpriteManager; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.core.EnumTemperature; diff --git a/src/main/java/binnie/botany/genetics/FlowerFactory.java b/src/main/java/binnie/botany/genetics/FlowerFactory.java index 002248b1..f77cb707 100644 --- a/src/main/java/binnie/botany/genetics/FlowerFactory.java +++ b/src/main/java/binnie/botany/genetics/FlowerFactory.java @@ -6,6 +6,7 @@ import binnie.botany.api.IAlleleFlowerSpeciesBuilder; import binnie.botany.api.IFlowerFactory; import binnie.botany.api.IFlowerMutationBuilder; import binnie.botany.api.IFlowerType; +import binnie.botany.flower.FlowerSpriteManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; @@ -13,6 +14,7 @@ public class FlowerFactory implements IFlowerFactory { @Override public IAlleleFlowerSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean isDominant, IClassification branch, String binomial, IFlowerType flowerType) { + FlowerSpriteManager.initSprites(flowerType); return new AlleleFlowerSpecies(uid, unlocalizedName, authority, unlocalizedDescription, isDominant, branch, binomial, flowerType); } diff --git a/src/main/java/binnie/botany/genetics/ModuleGenetics.java b/src/main/java/binnie/botany/genetics/ModuleGenetics.java index 028468b8..5dd687cf 100644 --- a/src/main/java/binnie/botany/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/botany/genetics/ModuleGenetics.java @@ -5,6 +5,7 @@ import binnie.botany.Botany; import binnie.botany.api.EnumFlowerStage; import binnie.botany.core.BotanyCore; import binnie.botany.flower.BlockFlower; +import binnie.botany.flower.FlowerSpriteManager; import binnie.botany.flower.ItemBotany; import binnie.botany.flower.TileEntityFlower; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 21bffa70..cf5a96a9 100644 --- a/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -18,8 +18,8 @@ import binnie.craftgui.core.Attribute; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.geometry.CraftGUIUtil; -import binnie.craftgui.core.geometry.IBorder; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Border; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.Position; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventHandler; @@ -212,8 +212,8 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh x += 24; } x += 16; - this.setSize(new IPoint(Math.max(32 + compartmentWidth, 252), this.height())); - controlCompartment.setPosition(new IPoint((this.width() - controlCompartment.width()) / 2, controlCompartment.yPos())); + this.setSize(new Point(Math.max(32 + compartmentWidth, 252), this.height())); + controlCompartment.setPosition(new Point((this.width() - controlCompartment.width()) / 2, controlCompartment.yPos())); final ControlPlayerInventory invent = new ControlPlayerInventory(this, true); final ControlSlide slide = new ControlSlide(this, 0, 134, 136, 92, Position.LEFT); slide.setLabel("Tab Properties"); @@ -222,7 +222,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh slide.addHelp("The label, colour and icon of the Tab can be altered here. Clicking on the icon with a held item will change it."); final Panel tabPropertyPanel = new Panel(slide, 16, 8, 112, 76, MinecraftGUI.PanelType.Gray); int y2 = 4; - new ControlText(tabPropertyPanel, new IPoint(4, y2), "Tab Name:"); + new ControlText(tabPropertyPanel, new Point(4, y2), "Tab Name:"); final Panel parent = tabPropertyPanel; final int x2 = 4; y2 += 12; @@ -237,7 +237,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } }.setOrigin(EventHandler.Origin.Self, this.tabName)); y2 += 20; - new ControlText(tabPropertyPanel, new IPoint(4, y2), "Tab Icon: "); + 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.addSelfEventHandler(new EventMouse.Down.Handler() { @@ -259,7 +259,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh this.tabIcon.addHelp("Icon for Current Tab"); this.tabIcon.addHelp("Click here with an item to change"); y2 += 20; - new ControlText(tabPropertyPanel, new IPoint(4, y2), "Colour: "); + new ControlText(tabPropertyPanel, new Point(4, y2), "Colour: "); final int cw = 8; final Panel panelColour = new Panel(tabPropertyPanel, 40, y2 - 4, cw * 8 + 2, cw * 2 + 1, MinecraftGUI.PanelType.Gray); for (int cc = 0; cc < 16; ++cc) { @@ -316,7 +316,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { RenderUtil.setColour(11184810); - CraftGUI.render.texture(CraftGUITexture.Outline, this.getArea().inset(new IBorder(0, 6, 0, 0))); + CraftGUI.render.texture(CraftGUITexture.Outline, this.getArea().inset(new Border(0, 6, 0, 0))); } }; scroll.setScrollableContent(this.slotGrid = new Control(scroll, 1, 1, 108, 18)); @@ -384,7 +384,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh final int width = 108; final int height = 2 + 18 * (1 + (slotIds.size() - 1) / 6); this.slotGrid.deleteAllChildren(); - this.slotGrid.setSize(new IPoint(width, height)); + this.slotGrid.setSize(new Point(width, height)); for (final int k : slotIds.keySet()) { new ControlSlot.Builder(this.slotGrid, x, y).assign(k); x += 18; diff --git a/src/main/java/binnie/core/machines/transfer/TransferRequest.java b/src/main/java/binnie/core/machines/transfer/TransferRequest.java index 0a5d8290..e608400f 100644 --- a/src/main/java/binnie/core/machines/transfer/TransferRequest.java +++ b/src/main/java/binnie/core/machines/transfer/TransferRequest.java @@ -136,10 +136,13 @@ public class TransferRequest { public ItemStack transfer(final boolean doAdd) { ItemStack item = this.returnItem; - if (item.isEmpty() || this.destination == null || this.origin == null) { + if (item.isEmpty() || this.destination == null) { return ItemStack.EMPTY; } if (this.transferLiquids && this.destination instanceof ITankMachine) { + if(origin == null){ + return ItemStack.EMPTY; + } ItemStack itemIn = item.copy(); for (final int tankID : this.targetTanks) { item = transferToTank(item, this.origin, (ITankMachine) this.destination, tankID, doAdd); diff --git a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java index 0f74aa60..ff5b6e3e 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java +++ b/src/main/java/binnie/craftgui/binniecore/WindowFieldKit.java @@ -7,8 +7,8 @@ import binnie.core.machines.inventory.SlotValidator; import binnie.craftgui.controls.ControlText; import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.TextJustification; import binnie.craftgui.events.EventHandler; import binnie.craftgui.events.EventValueChanged; @@ -113,12 +113,12 @@ public class WindowFieldKit extends Window { this.getWindowInventory().createSlot(1); this.setupValidators(); new ControlPlayerInventory(this); - final IPoint handGlass = new IPoint(16, 32); + final Point handGlass = new Point(16, 32); this.GlassControl = new ControlImage(this, handGlass.x(), handGlass.y(), new StandardTexture(0, 160, 96, 96, ExtraBeeTexture.GUIPunnett)); new ControlSlot.Builder(this, handGlass.x() + 54, handGlass.y() + 26).assign(InventoryType.Window, 0); new ControlSlot.Builder(this, 208, 8).assign(InventoryType.Window, 1); - (this.text = new ControlText(this, new IPoint(232, 13), "Paper")).setColour(2236962); - (this.text = new ControlText(this, new IArea(0, 120, this.width(), 24), "", TextJustification.MiddleCenter)).setColour(2236962); + (this.text = new ControlText(this, new Point(232, 13), "Paper")).setColour(2236962); + (this.text = new ControlText(this, new Area(0, 120, this.width(), 24), "", TextJustification.MiddleCenter)).setColour(2236962); this.chromo = new ControlChromosome(this, 150, 24); this.addEventHandler(new EventValueChanged.Handler() { @Override @@ -166,7 +166,7 @@ public class WindowFieldKit extends Window { this.glassOffsetX *= 1 - this.analyseProgress; this.glassOffsetY += this.glassVY; this.glassOffsetY *= 1 - this.analyseProgress; - this.GlassControl.setOffset(new IPoint(this.glassOffsetX, this.glassOffsetY)); + this.GlassControl.setOffset(new Point(this.glassOffsetX, this.glassOffsetY)); } private void refreshSpecies() { diff --git a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java b/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java index 33a33eba..9ab1a525 100644 --- a/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java +++ b/src/main/java/binnie/craftgui/binniecore/WindowGenesis.java @@ -10,7 +10,7 @@ import binnie.craftgui.controls.listbox.ControlTextOption; import binnie.craftgui.controls.tab.ControlTab; import binnie.craftgui.controls.tab.ControlTabBar; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; import binnie.craftgui.core.geometry.Position; import binnie.craftgui.events.EventHandler; import binnie.craftgui.events.EventMouse; @@ -95,8 +95,8 @@ public class WindowGenesis extends Window { }; this.root = Binnie.GENETICS.getActiveSystems().iterator().next().getSpeciesRoot(); this.template = this.root.getDefaultTemplate(); - final IArea one = new IArea(32, 28, 170, 100); - final IArea two = new IArea(214, 28, 100, 100); + final Area one = new Area(32, 28, 170, 100); + final Area two = new Area(214, 28, 100, 100); new Panel(this, one.outset(1), MinecraftGUI.PanelType.Black); new Panel(this, two.outset(1), MinecraftGUI.PanelType.Black); this.geneList = new ControlListBox(this, one.xPos(), one.yPos(), one.width(), one.height(), 10) { diff --git a/src/main/java/binnie/craftgui/controls/ControlCheckbox.java b/src/main/java/binnie/craftgui/controls/ControlCheckbox.java index abcb9114..0d444917 100644 --- a/src/main/java/binnie/craftgui/controls/ControlCheckbox.java +++ b/src/main/java/binnie/craftgui/controls/ControlCheckbox.java @@ -5,8 +5,8 @@ import binnie.craftgui.controls.core.IControlValue; import binnie.craftgui.core.Attribute; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.TextJustification; import binnie.craftgui.events.EventHandler; import binnie.craftgui.events.EventMouse; @@ -28,7 +28,7 @@ public class ControlCheckbox extends Control implements IControlValue { this.text = text; this.value = bool; if (w > 16) { - new ControlText(this, new IArea(16, 1, w - 16, 16), text, TextJustification.MiddleCenter).setColour(4473924); + new ControlText(this, new Area(16, 1, w - 16, 16), text, TextJustification.MiddleCenter).setColour(4473924); } this.addAttribute(Attribute.MouseOver); this.addEventHandler(new EventMouse.Down.Handler() { @@ -65,6 +65,6 @@ public class ControlCheckbox extends Control implements IControlValue { if (this.isMouseOver()) { texture = (this.getValue() ? CraftGUITexture.CheckboxCheckedHighlighted : CraftGUITexture.CheckboxHighlighted); } - CraftGUI.render.texture(texture, IPoint.ZERO); + CraftGUI.render.texture(texture, Point.ZERO); } } diff --git a/src/main/java/binnie/craftgui/controls/ControlText.java b/src/main/java/binnie/craftgui/controls/ControlText.java index 032d36da..1c1480fa 100644 --- a/src/main/java/binnie/craftgui/controls/ControlText.java +++ b/src/main/java/binnie/craftgui/controls/ControlText.java @@ -3,8 +3,8 @@ package binnie.craftgui.controls; import binnie.craftgui.controls.core.Control; import binnie.craftgui.controls.core.IControlValue; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.TextJustification; import binnie.craftgui.core.renderer.RenderUtil; import net.minecraftforge.fml.relauncher.Side; @@ -14,15 +14,15 @@ public class ControlText extends Control implements IControlValue { private String text; private TextJustification align; - public ControlText(final IWidget parent, final IPoint pos, final String text) { - this(parent, new IArea(pos, new IPoint(500, 0)), text, TextJustification.TopLeft); + public ControlText(final IWidget parent, final Point pos, final String text) { + this(parent, new Area(pos, new Point(500, 0)), text, TextJustification.TopLeft); } public ControlText(final IWidget parent, final String text, final TextJustification align) { this(parent, parent.getArea(), text, align); } - public ControlText(final IWidget parent, final IArea area, final String text, final TextJustification align) { + public ControlText(final IWidget parent, final Area area, final String text, final TextJustification align) { super(parent, area.pos().x(), area.pos().y(), area.size().x(), area.size().y()); this.text = text; this.align = align; diff --git a/src/main/java/binnie/craftgui/controls/ControlTextCentered.java b/src/main/java/binnie/craftgui/controls/ControlTextCentered.java index 33fa56de..e6cc32b3 100644 --- a/src/main/java/binnie/craftgui/controls/ControlTextCentered.java +++ b/src/main/java/binnie/craftgui/controls/ControlTextCentered.java @@ -1,12 +1,12 @@ package binnie.craftgui.controls; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.TextJustification; public class ControlTextCentered extends ControlText { public ControlTextCentered(final IWidget parent, final int y, final String text) { - super(parent, new IArea(new IPoint(0, y), new IPoint(parent.size().x(), 0)), text, TextJustification.TopCenter); + super(parent, new Area(new Point(0, y), new Point(parent.size().x(), 0)), text, TextJustification.TopCenter); } } diff --git a/src/main/java/binnie/craftgui/controls/core/Control.java b/src/main/java/binnie/craftgui/controls/core/Control.java index 64ad4b50..cbb13d4a 100644 --- a/src/main/java/binnie/craftgui/controls/core/Control.java +++ b/src/main/java/binnie/craftgui/controls/core/Control.java @@ -6,8 +6,8 @@ import binnie.craftgui.core.ITooltipHelp; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; import binnie.craftgui.core.Widget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.minecraft.Window; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -26,12 +26,12 @@ public class Control extends Widget implements ITooltipHelp, ITooltip { this.helpStrings = new ArrayList<>(); this.tooltipStrings = new ArrayList<>(); this.extraLevel = 0; - this.setPosition(new IPoint(x, y)); - this.setSize(new IPoint(w, h)); + this.setPosition(new Point(x, y)); + this.setSize(new Point(w, h)); this.initialise(); } - public Control(final IWidget parent, final IArea area) { + public Control(final IWidget parent, final Area area) { this(parent, area.xPos(), area.yPos(), area.width(), area.height()); } diff --git a/src/main/java/binnie/craftgui/controls/listbox/ControlList.java b/src/main/java/binnie/craftgui/controls/listbox/ControlList.java index d1eef37c..316c4822 100644 --- a/src/main/java/binnie/craftgui/controls/listbox/ControlList.java +++ b/src/main/java/binnie/craftgui/controls/listbox/ControlList.java @@ -4,7 +4,7 @@ import binnie.core.util.IValidator; import binnie.craftgui.controls.core.Control; import binnie.craftgui.controls.core.IControlValue; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.events.EventValueChanged; import javax.annotation.Nullable; @@ -75,7 +75,7 @@ public class ControlList extends Control implements IControlValue { if (this.isValidOption(entry.getValue())) { entry.getValue().show(); this.optionWidgets.put(entry.getKey(), entry.getValue()); - entry.getValue().setPosition(new IPoint(0, height)); + entry.getValue().setPosition(new Point(0, height)); height += entry.getValue().getSize().y(); } else { entry.getValue().hide(); @@ -83,7 +83,7 @@ public class ControlList extends Control implements IControlValue { } this.creating = true; this.setValue(this.getValue()); - this.setSize(new IPoint(this.getSize().x(), height)); + this.setSize(new Point(this.getSize().x(), height)); } public Collection getOptions() { diff --git a/src/main/java/binnie/craftgui/controls/scroll/ControlScrollBar.java b/src/main/java/binnie/craftgui/controls/scroll/ControlScrollBar.java index 250c480b..3abf17a4 100644 --- a/src/main/java/binnie/craftgui/controls/scroll/ControlScrollBar.java +++ b/src/main/java/binnie/craftgui/controls/scroll/ControlScrollBar.java @@ -4,7 +4,7 @@ import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.Attribute; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; import binnie.craftgui.events.EventMouse; import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; @@ -59,19 +59,19 @@ public class ControlScrollBar extends Control { return Math.round(this.height() * this.scrollable.getPercentageShown()); } - protected IArea getRenderArea() { + protected Area getRenderArea() { int height = this.getBarHeight(); if (height < 6) { height = 6; } final int yOffset = Math.round((this.height() - this.getBarHeight()) * this.scrollable.getPercentageIndex()); - return new IArea(0, yOffset, this.getSize().x(), height); + return new Area(0, yOffset, this.getSize().x(), height); } @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { - final IArea renderArea = this.getRenderArea(); + final Area renderArea = this.getRenderArea(); Object texture = CraftGUITexture.ScrollDisabled; if (this.isMouseOver()) { texture = CraftGUITexture.ScrollHighlighted; diff --git a/src/main/java/binnie/craftgui/controls/scroll/ControlScrollableContent.java b/src/main/java/binnie/craftgui/controls/scroll/ControlScrollableContent.java index e7912736..20e7905f 100644 --- a/src/main/java/binnie/craftgui/controls/scroll/ControlScrollableContent.java +++ b/src/main/java/binnie/craftgui/controls/scroll/ControlScrollableContent.java @@ -2,8 +2,8 @@ package binnie.craftgui.controls.scroll; import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.events.EventMouse; import binnie.craftgui.events.EventWidget; @@ -42,12 +42,12 @@ public class ControlScrollableContent extends Control impleme return; } - child.setCroppedZone(this, new IArea(1, 1, getSize().x() - 2 - this.scrollBarSize, getSize().y() - 2)); + child.setCroppedZone(this, new Area(1, 1, getSize().x() - 2 - this.scrollBarSize, getSize().y() - 2)); child.addSelfEventHandler(new EventWidget.ChangeSize.Handler() { @Override public void onEvent(final EventWidget.ChangeSize event) { - child.setOffset(new IPoint(0, Math.round(-ControlScrollableContent.this.percentageIndex * ControlScrollableContent.this.getMovementRange()))); + child.setOffset(new Point(0, Math.round(-ControlScrollableContent.this.percentageIndex * ControlScrollableContent.this.getMovementRange()))); if (ControlScrollableContent.this.getMovementRange() == 0) { ControlScrollableContent.this.percentageIndex = 0; } @@ -88,7 +88,7 @@ public class ControlScrollableContent extends Control impleme if (this.getMovementRange() == 0) { this.percentageIndex = 0; } - this.controlChild.setOffset(new IPoint(0, Math.round(-this.percentageIndex * this.getMovementRange()))); + this.controlChild.setOffset(new Point(0, Math.round(-this.percentageIndex * this.getMovementRange()))); } @Override diff --git a/src/main/java/binnie/craftgui/controls/tab/ControlTab.java b/src/main/java/binnie/craftgui/controls/tab/ControlTab.java index f62f9f48..ae5d605c 100644 --- a/src/main/java/binnie/craftgui/controls/tab/ControlTab.java +++ b/src/main/java/binnie/craftgui/controls/tab/ControlTab.java @@ -6,8 +6,8 @@ import binnie.craftgui.core.Attribute; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.Position; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventMouse; @@ -81,13 +81,13 @@ public class ControlTab extends Control implements ITooltip, IControlValue final Texture lTexture = CraftGUI.render.getTexture(texture); final Position position = this.getTabPosition(); Texture iTexture = lTexture.crop(position, 8); - final IArea area = this.getArea(); + final Area area = this.getArea(); if (texture == CraftGUITexture.TabDisabled) { if (position == Position.Top || position == Position.LEFT) { - area.setPosition(area.getPosition().sub(new IPoint(4 * position.x(), 4 * position.y()))); - area.setSize(area.getSize().add(new IPoint(4 * position.x(), 4 * position.y()))); + area.setPosition(area.getPosition().sub(new Point(4 * position.x(), 4 * position.y()))); + area.setSize(area.getSize().add(new Point(4 * position.x(), 4 * position.y()))); } else { - area.setSize(area.getSize().sub(new IPoint(4 * position.x(), 4 * position.y()))); + area.setSize(area.getSize().sub(new Point(4 * position.x(), 4 * position.y()))); } } CraftGUI.render.texture(iTexture, area); diff --git a/src/main/java/binnie/craftgui/core/ITopLevelWidget.java b/src/main/java/binnie/craftgui/core/ITopLevelWidget.java index aacc9c23..3130ba24 100644 --- a/src/main/java/binnie/craftgui/core/ITopLevelWidget.java +++ b/src/main/java/binnie/craftgui/core/ITopLevelWidget.java @@ -1,13 +1,13 @@ package binnie.craftgui.core; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import javax.annotation.Nullable; public interface ITopLevelWidget extends IWidget { void setMousePosition(final int p0, final int p1); - IPoint getAbsoluteMousePosition(); + Point getAbsoluteMousePosition(); @Nullable IWidget getFocusedWidget(); @@ -28,5 +28,5 @@ public interface ITopLevelWidget extends IWidget { void widgetDeleted(final IWidget p0); - IPoint getDragDistance(); + Point getDragDistance(); } diff --git a/src/main/java/binnie/craftgui/core/IWidget.java b/src/main/java/binnie/craftgui/core/IWidget.java index cef0369e..ee103fa4 100644 --- a/src/main/java/binnie/craftgui/core/IWidget.java +++ b/src/main/java/binnie/craftgui/core/IWidget.java @@ -1,7 +1,7 @@ package binnie.craftgui.core; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.events.Event; import binnie.craftgui.events.EventHandler; import net.minecraftforge.fml.relauncher.Side; @@ -22,35 +22,35 @@ public interface IWidget { boolean isTopLevel(); - IPoint getPosition(); + Point getPosition(); - IPoint pos(); + Point pos(); - void setPosition(final IPoint p0); + void setPosition(final Point p0); - IPoint getSize(); + Point getSize(); - IPoint size(); + Point size(); - void setSize(final IPoint p0); + void setSize(final Point p0); - IPoint getOriginalPosition(); + Point getOriginalPosition(); - IPoint getAbsolutePosition(); + Point getAbsolutePosition(); - IPoint getOriginalAbsolutePosition(); + Point getOriginalAbsolutePosition(); - IPoint getOffset(); + Point getOffset(); - IArea getArea(); + Area getArea(); - IArea area(); + Area area(); - void setOffset(final IPoint p0); + void setOffset(final Point p0); - IPoint getMousePosition(); + Point getMousePosition(); - IPoint getRelativeMousePosition(); + Point getRelativeMousePosition(); void setColour(final int p0); @@ -109,15 +109,15 @@ public interface IWidget { T getWidget(final Class widgetClass); @Nullable - IArea getCroppedZone(); + Area getCroppedZone(); - void setCroppedZone(final IWidget p0, final IArea p1); + void setCroppedZone(final IWidget p0, final Area p1); boolean isCroppedWidet(); IWidget getCropWidget(); - boolean isMouseOverWidget(final IPoint p0); + boolean isMouseOverWidget(final Point p0); int getLevel(); @@ -133,7 +133,7 @@ public interface IWidget { void addSelfEventHandler(final EventHandler p0); - boolean contains(final IPoint point); + boolean contains(final Point point); int xPos(); diff --git a/src/main/java/binnie/craftgui/core/TopLevelWidget.java b/src/main/java/binnie/craftgui/core/TopLevelWidget.java index abc5f58a..6558310e 100644 --- a/src/main/java/binnie/craftgui/core/TopLevelWidget.java +++ b/src/main/java/binnie/craftgui/core/TopLevelWidget.java @@ -1,7 +1,7 @@ package binnie.craftgui.core; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.events.EventMouse; import binnie.craftgui.events.EventWidget; import org.lwjgl.input.Mouse; @@ -21,16 +21,16 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { IWidget draggedWidget; @Nullable IWidget focusedWidget; - protected IPoint mousePosition; - IPoint dragStart; + protected Point mousePosition; + Point dragStart; public TopLevelWidget() { super(null); this.mousedOverWidget = null; this.draggedWidget = null; this.focusedWidget = null; - this.mousePosition = IPoint.ZERO; - this.dragStart = IPoint.ZERO; + this.mousePosition = Point.ZERO; + this.dragStart = Point.ZERO; this.addEventHandler(new EventMouse.Down.Handler() { @Override public void onEvent(final EventMouse.Down event) { @@ -170,7 +170,7 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { private Collection getQueuedWidgets(final IWidget widget) { final List widgets = new ArrayList<>(); boolean addChildren = true; - IArea croppedZone = widget.getCroppedZone(); + Area croppedZone = widget.getCroppedZone(); if (croppedZone != null) { addChildren = croppedZone.contains(widget.getCropWidget().getRelativeMousePosition()); } @@ -197,13 +197,13 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { } } if (this.mousePosition.x() != x || this.mousePosition.y() != y) { - this.mousePosition = new IPoint(x, y); + this.mousePosition = new Point(x, y); this.setMousedOverWidget(this.calculateMousedOverWidget()); } } @Override - public IPoint getAbsoluteMousePosition() { + public Point getAbsoluteMousePosition() { return this.mousePosition; } @@ -221,7 +221,7 @@ public abstract class TopLevelWidget extends Widget implements ITopLevelWidget { } @Override - public IPoint getDragDistance() { + public Point getDragDistance() { return this.getRelativeMousePosition().sub(this.dragStart); } } diff --git a/src/main/java/binnie/craftgui/core/Widget.java b/src/main/java/binnie/craftgui/core/Widget.java index 9c3d113d..5f699ed6 100644 --- a/src/main/java/binnie/craftgui/core/Widget.java +++ b/src/main/java/binnie/craftgui/core/Widget.java @@ -1,7 +1,7 @@ package binnie.craftgui.core; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.events.Event; import binnie.craftgui.events.EventHandler; import binnie.craftgui.events.EventWidget; @@ -18,11 +18,11 @@ public class Widget implements IWidget { private final IWidget parent; private List subWidgets; private List attributes; - private IPoint position; - private IPoint size; - private IPoint offset; + private Point position; + private Point size; + private Point offset; @Nullable - IArea cropArea; + Area cropArea; @Nullable IWidget cropWidget; boolean cropped; @@ -34,9 +34,9 @@ public class Widget implements IWidget { public Widget(@Nullable final IWidget parent) { this.subWidgets = new ArrayList<>(); this.attributes = new ArrayList<>(); - this.position = IPoint.ZERO; - this.size = IPoint.ZERO; - this.offset = IPoint.ZERO; + this.position = Point.ZERO; + this.size = Point.ZERO; + this.offset = Point.ZERO; this.cropped = false; this.colour = 16777215; this.globalEventHandlers = new ArrayList<>(); @@ -119,90 +119,90 @@ public class Widget implements IWidget { } @Override - public final IPoint pos() { + public final Point pos() { return this.position.add(this.offset); } @Override - public final IPoint size() { + public final Point size() { return this.size; } @Override - public final IArea area() { + public final Area area() { return this.getArea(); } @Override - public final IPoint getPosition() { + public final Point getPosition() { return this.pos(); } @Override - public final IArea getArea() { - return new IArea(IPoint.ZERO, this.size()); + public final Area getArea() { + return new Area(Point.ZERO, this.size()); } @Override - public final IPoint getOriginalPosition() { + public final Point getOriginalPosition() { return this.position; } @Override @Nullable - public IArea getCroppedZone() { + public Area getCroppedZone() { return this.cropArea; } @Override - public void setCroppedZone(final IWidget relative, final IArea area) { + public void setCroppedZone(final IWidget relative, final Area area) { this.cropArea = area; this.cropped = true; this.cropWidget = relative; } @Override - public final IPoint getAbsolutePosition() { + public final Point getAbsolutePosition() { IWidget parent = this.getParent(); return parent == null ? this.getPosition() : parent.getAbsolutePosition().add(this.getPosition()); } @Override - public final IPoint getOriginalAbsolutePosition() { + public final Point getOriginalAbsolutePosition() { IWidget parent = this.getParent(); return parent == null ? this.getOriginalPosition() : parent.getOriginalPosition().sub(this.getOriginalPosition()); } @Override - public final IPoint getSize() { + public final Point getSize() { return this.size(); } @Override - public final IPoint getOffset() { + public final Point getOffset() { return this.offset; } @Override - public final void setPosition(final IPoint vector) { + public final void setPosition(final Point vector) { if (!vector.equals(this.position)) { - this.position = new IPoint(vector); + this.position = new Point(vector); this.callEvent(new EventWidget.ChangePosition(this)); } } @Override - public final void setSize(final IPoint vector) { + public final void setSize(final Point vector) { if (!vector.equals(this.size)) { - this.size = new IPoint(vector); + this.size = new Point(vector); this.callEvent(new EventWidget.ChangeSize(this)); } } @Override - public final void setOffset(final IPoint vector) { + public final void setOffset(final Point vector) { if (vector != this.offset) { - this.offset = new IPoint(vector); + this.offset = new Point(vector); this.callEvent(new EventWidget.ChangeOffset(this)); } } @@ -260,12 +260,12 @@ public class Widget implements IWidget { } @Override - public final IPoint getMousePosition() { + public final Point getMousePosition() { return this.getTopParent().getAbsoluteMousePosition(); } @Override - public final IPoint getRelativeMousePosition() { + public final Point getRelativeMousePosition() { IWidget parent = this.getParent(); return parent == null ? this.getMousePosition() : parent.getRelativeMousePosition().sub(this.getPosition()); } @@ -324,19 +324,19 @@ public class Widget implements IWidget { @Override public final boolean calculateIsMouseOver() { - final IPoint mouse = this.getRelativeMousePosition(); + final Point mouse = this.getRelativeMousePosition(); if (!this.cropped || this.cropArea == null) { return this.isMouseOverWidget(mouse); } final IWidget cropRelative = (this.cropWidget != null) ? this.cropWidget : this; - final IPoint pos = IPoint.sub(cropRelative.getAbsolutePosition(), this.getAbsolutePosition()); - final IPoint size = new IPoint(this.cropArea.size().x(), this.cropArea.size().y()); + final Point pos = Point.sub(cropRelative.getAbsolutePosition(), this.getAbsolutePosition()); + final Point size = new Point(this.cropArea.size().x(), this.cropArea.size().y()); final boolean inCrop = mouse.x() > pos.x() && mouse.y() > pos.y() && mouse.x() < pos.x() + size.x() && mouse.y() < pos.y() + size.y(); return inCrop && this.isMouseOverWidget(mouse); } @Override - public boolean isMouseOverWidget(final IPoint relativeMouse) { + public boolean isMouseOverWidget(final Point relativeMouse) { return this.getArea().contains(relativeMouse); } @@ -474,7 +474,7 @@ public class Widget implements IWidget { } @Override - public final boolean contains(final IPoint position) { + public final boolean contains(final Point position) { return this.getArea().contains(position); } diff --git a/src/main/java/binnie/craftgui/core/geometry/Area.java b/src/main/java/binnie/craftgui/core/geometry/Area.java new file mode 100644 index 00000000..f6ad77a2 --- /dev/null +++ b/src/main/java/binnie/craftgui/core/geometry/Area.java @@ -0,0 +1,116 @@ +package binnie.craftgui.core.geometry; + +public class Area { + private Point pos; + private Point size; + + public Area(final Area area) { + this(area.pos().x(), area.pos().y(), area.size().x(), area.size().y()); + } + + public Area(final Point pos, final Point size) { + this(pos.x(), pos.y(), size.x(), size.y()); + } + + public Area(final int xywh) { + this(xywh, xywh, xywh, xywh); + } + + public Area(final int xy, final int wh) { + this(xy, xy, wh, wh); + } + + public Area(final int x, final int y, final int wh) { + this(x, y, wh, wh); + } + + public Area(final int x, final int y, final int w, final int h) { + this.setPosition(new Point(x, y)); + this.setSize(new Point(w, h)); + } + + public Point pos() { + return this.pos; + } + + public Point getPosition() { + return this.pos; + } + + public void setPosition(final Point position) { + this.pos = position.copy(); + } + + public Point size() { + return this.size; + } + + public Point getSize() { + return this.size; + } + + public void setSize(final Point size) { + this.size = size.copy(); + } + + public boolean contains(final Point position) { + return position.x() >= this.pos().x() && position.y() >= this.pos.y() && position.x() <= this.pos().x() + this.size().x() && position.y() <= this.pos().y() + this.size().y(); + } + + public int xPos() { + return this.pos().x(); + } + + public int yPos() { + return this.pos().y(); + } + + public int width() { + return this.size().x(); + } + + public int height() { + return this.size().y(); + } + + public void setXPos(final int xPos) { + this.pos = new Point(xPos, this.pos.y()); + } + + public void setYPos(final int yPos) { + this.pos = new Point(this.pos.x(), yPos); + } + + public void setWidth(final int width) { + this.size = new Point(width, this.size.y()); + } + + public void setHeight(final int height) { + this.size = new Point(this.size.x(), height); + } + + public Area inset(final Border border) { + return new Area(this.xPos() + border.l(), this.yPos() + border.t(), this.width() - border.l() - border.r(), this.height() - border.t() - border.b()); + } + + public Area outset(final int outset) { + return this.outset(new Border(outset)); + } + + public Area outset(final Border border) { + return new Area(this.xPos() - border.l(), this.yPos() - border.t(), this.width() + border.l() + border.r(), this.height() + border.t() + border.b()); + } + + public Area inset(final int inset) { + return this.inset(new Border(inset)); + } + + @Override + public String toString() { + return this.width() + "x" + this.height() + "@" + this.xPos() + "," + this.yPos(); + } + + public Area shift(final int dx, final int f) { + return new Area(this.xPos() + dx, this.yPos() + f, this.width(), this.height()); + } +} diff --git a/src/main/java/binnie/craftgui/core/geometry/IBorder.java b/src/main/java/binnie/craftgui/core/geometry/Border.java similarity index 59% rename from src/main/java/binnie/craftgui/core/geometry/IBorder.java rename to src/main/java/binnie/craftgui/core/geometry/Border.java index c9f378ec..ca23383c 100644 --- a/src/main/java/binnie/craftgui/core/geometry/IBorder.java +++ b/src/main/java/binnie/craftgui/core/geometry/Border.java @@ -1,36 +1,36 @@ package binnie.craftgui.core.geometry; -public class IBorder { - public static final IBorder ZERO = new IBorder(0); +public class Border { + public static final Border ZERO = new Border(0); int t; int b; int l; int r; - public IBorder(final int pad) { + public Border(final int pad) { this(pad, pad, pad, pad); } - public IBorder(final int tb, final int rl) { + public Border(final int tb, final int rl) { this(tb, rl, tb, rl); } - public IBorder(final int t, final int rl, final int b) { + public Border(final int t, final int rl, final int b) { this(t, rl, b, rl); } - public IBorder(final int t, final int r, final int b, final int l) { + public Border(final int t, final int r, final int b, final int l) { this.t = t; this.b = b; this.l = l; this.r = r; } - public IBorder(final Position edge, final int n) { + public Border(final Position edge, final int n) { this((edge == Position.Top) ? n : 0, (edge == Position.RIGHT) ? n : 0, (edge == Position.BOTTOM) ? n : 0, (edge == Position.LEFT) ? n : 0); } - public IBorder(final IBorder padding) { + public Border(final Border padding) { this(padding.t(), padding.r(), padding.b(), padding.l()); } @@ -71,27 +71,27 @@ public class IBorder { } @Deprecated - public IPoint tl() { - return new IPoint(this.l(), this.t()); + public Point tl() { + return new Point(this.l(), this.t()); } @Deprecated - public IPoint tr() { - return new IPoint(this.r(), this.t()); + public Point tr() { + return new Point(this.r(), this.t()); } @Deprecated - public IPoint bl() { - return new IPoint(this.l(), this.b()); + public Point bl() { + return new Point(this.l(), this.b()); } @Deprecated - public IPoint br() { - return new IPoint(this.r(), this.b()); + public Point br() { + return new Point(this.r(), this.b()); } - public IBorder add(final IBorder o) { - return new IBorder(this.t() + o.t(), this.r() + o.r(), this.b() + o.b(), this.l() + o.l()); + public Border add(final Border o) { + return new Border(this.t() + o.t(), this.r() + o.r(), this.b() + o.b(), this.l() + o.l()); } @Override diff --git a/src/main/java/binnie/craftgui/core/geometry/CraftGUIUtil.java b/src/main/java/binnie/craftgui/core/geometry/CraftGUIUtil.java index 7d47282b..d1f4eb9a 100644 --- a/src/main/java/binnie/craftgui/core/geometry/CraftGUIUtil.java +++ b/src/main/java/binnie/craftgui/core/geometry/CraftGUIUtil.java @@ -6,12 +6,12 @@ import binnie.craftgui.events.EventValueChanged; public class CraftGUIUtil { public static void alignToWidget(final IWidget target, final IWidget relativeTo) { - final IPoint startPos = target.getAbsolutePosition(); - final IPoint endPos = relativeTo.getAbsolutePosition(); + final Point startPos = target.getAbsolutePosition(); + final Point endPos = relativeTo.getAbsolutePosition(); moveWidget(target, endPos.sub(startPos)); } - public static void moveWidget(final IWidget target, final IPoint movement) { + public static void moveWidget(final IWidget target, final Point movement) { target.setPosition(target.getPosition().add(movement)); } @@ -26,7 +26,7 @@ public class CraftGUIUtil { h = Math.max(h, widget.getSize().y()); } for (final IWidget widget : widgets) { - widget.setPosition(new IPoint(px + x, py + Math.round((h - widget.getSize().y()) * just.getYOffset()))); + widget.setPosition(new Point(px + x, py + Math.round((h - widget.getSize().y()) * just.getYOffset()))); x += widget.getSize().x() + spacing; } } @@ -42,7 +42,7 @@ public class CraftGUIUtil { w = Math.max(w, widget.getSize().x()); } for (final IWidget widget : widgets) { - widget.setPosition(new IPoint(px + Math.round((w - widget.getSize().x()) * just.getXOffset()), py + y)); + widget.setPosition(new Point(px + Math.round((w - widget.getSize().x()) * just.getXOffset()), py + y)); y += widget.getSize().y() + spacing; } } diff --git a/src/main/java/binnie/craftgui/core/geometry/IArea.java b/src/main/java/binnie/craftgui/core/geometry/IArea.java deleted file mode 100644 index d95203e0..00000000 --- a/src/main/java/binnie/craftgui/core/geometry/IArea.java +++ /dev/null @@ -1,116 +0,0 @@ -package binnie.craftgui.core.geometry; - -public class IArea { - private IPoint pos; - private IPoint size; - - public IArea(final IArea area) { - this(area.pos().x(), area.pos().y(), area.size().x(), area.size().y()); - } - - public IArea(final IPoint pos, final IPoint size) { - this(pos.x(), pos.y(), size.x(), size.y()); - } - - public IArea(final int xywh) { - this(xywh, xywh, xywh, xywh); - } - - public IArea(final int xy, final int wh) { - this(xy, xy, wh, wh); - } - - public IArea(final int x, final int y, final int wh) { - this(x, y, wh, wh); - } - - public IArea(final int x, final int y, final int w, final int h) { - this.setPosition(new IPoint(x, y)); - this.setSize(new IPoint(w, h)); - } - - public IPoint pos() { - return this.pos; - } - - public IPoint getPosition() { - return this.pos; - } - - public void setPosition(final IPoint position) { - this.pos = position.copy(); - } - - public IPoint size() { - return this.size; - } - - public IPoint getSize() { - return this.size; - } - - public void setSize(final IPoint size) { - this.size = size.copy(); - } - - public boolean contains(final IPoint position) { - return position.x() >= this.pos().x() && position.y() >= this.pos.y() && position.x() <= this.pos().x() + this.size().x() && position.y() <= this.pos().y() + this.size().y(); - } - - public int xPos() { - return this.pos().x(); - } - - public int yPos() { - return this.pos().y(); - } - - public int width() { - return this.size().x(); - } - - public int height() { - return this.size().y(); - } - - public void setXPos(final int xPos) { - this.pos = new IPoint(xPos, this.pos.y()); - } - - public void setYPos(final int yPos) { - this.pos = new IPoint(this.pos.x(), yPos); - } - - public void setWidth(final int width) { - this.size = new IPoint(width, this.size.y()); - } - - public void setHeight(final int height) { - this.size = new IPoint(this.size.x(), height); - } - - public IArea inset(final IBorder border) { - return new IArea(this.xPos() + border.l(), this.yPos() + border.t(), this.width() - border.l() - border.r(), this.height() - border.t() - border.b()); - } - - public IArea outset(final int outset) { - return this.outset(new IBorder(outset)); - } - - public IArea outset(final IBorder border) { - return new IArea(this.xPos() - border.l(), this.yPos() - border.t(), this.width() + border.l() + border.r(), this.height() + border.t() + border.b()); - } - - public IArea inset(final int inset) { - return this.inset(new IBorder(inset)); - } - - @Override - public String toString() { - return this.width() + "x" + this.height() + "@" + this.xPos() + "," + this.yPos(); - } - - public IArea shift(final int dx, final int f) { - return new IArea(this.xPos() + dx, this.yPos() + f, this.width(), this.height()); - } -} diff --git a/src/main/java/binnie/craftgui/core/geometry/IPoint.java b/src/main/java/binnie/craftgui/core/geometry/IPoint.java deleted file mode 100644 index b1c740f1..00000000 --- a/src/main/java/binnie/craftgui/core/geometry/IPoint.java +++ /dev/null @@ -1,54 +0,0 @@ -package binnie.craftgui.core.geometry; - -public class IPoint { - public static final IPoint ZERO = new IPoint(0, 0); - private final int x; - private final int y; - - public IPoint(final int x, final int y) { - this.x = x; - this.y = y; - } - - public IPoint(final IPoint o) { - this.x = o.x(); - this.y = o.y(); - } - - public static IPoint add(final IPoint a, final IPoint b) { - return new IPoint(a.x() + b.x(), a.y() + b.y()); - } - - public static IPoint sub(final IPoint a, final IPoint b) { - return new IPoint(a.x() - b.x(), a.y() - b.y()); - } - - public IPoint sub(final IPoint a) { - return sub(this, a); - } - - public IPoint add(final IPoint other) { - return add(this, other); - } - - public IPoint add(final int dx, final int dy) { - return add(this, new IPoint(dx, dy)); - } - - public IPoint copy() { - return new IPoint(this); - } - - public int x() { - return this.x; - } - - public int y() { - return this.y; - } - - public boolean equals(final IPoint other) { - return this.x() == other.x() && this.y() == other.y(); - } - -} diff --git a/src/main/java/binnie/craftgui/core/geometry/Point.java b/src/main/java/binnie/craftgui/core/geometry/Point.java new file mode 100644 index 00000000..a297ec08 --- /dev/null +++ b/src/main/java/binnie/craftgui/core/geometry/Point.java @@ -0,0 +1,54 @@ +package binnie.craftgui.core.geometry; + +public class Point { + public static final Point ZERO = new Point(0, 0); + private final int x; + private final int y; + + public Point(final int x, final int y) { + this.x = x; + this.y = y; + } + + public Point(final Point o) { + this.x = o.x(); + this.y = o.y(); + } + + public static Point add(final Point a, final Point b) { + return new Point(a.x() + b.x(), a.y() + b.y()); + } + + public static Point sub(final Point a, final Point b) { + return new Point(a.x() - b.x(), a.y() - b.y()); + } + + public Point sub(final Point a) { + return sub(this, a); + } + + public Point add(final Point other) { + return add(this, other); + } + + public Point add(final int dx, final int dy) { + return add(this, new Point(dx, dy)); + } + + public Point copy() { + return new Point(this); + } + + public int x() { + return this.x; + } + + public int y() { + return this.y; + } + + public boolean equals(final Point other) { + return this.x() == other.x() && this.y() == other.y(); + } + +} diff --git a/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java b/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java index e826b779..fed7f084 100644 --- a/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java +++ b/src/main/java/binnie/craftgui/core/renderer/RenderUtil.java @@ -1,9 +1,11 @@ package binnie.craftgui.core.renderer; import binnie.core.BinnieCore; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.TextJustification; +import forestry.core.render.TextureManager; + import com.google.common.base.Preconditions; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -31,11 +33,11 @@ public class RenderUtil { } - public static void drawItem(final IPoint pos, final ItemStack itemStack) { + public static void drawItem(final Point pos, final ItemStack itemStack) { drawItem(pos, itemStack, false); } - public static void drawItem(final IPoint pos, final ItemStack itemStack, final boolean rotating) { + public static void drawItem(final Point pos, final ItemStack itemStack, final boolean rotating) { Preconditions.checkNotNull(itemStack); Minecraft minecraft = Minecraft.getMinecraft(); net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting(); @@ -111,12 +113,12 @@ public class RenderUtil { return (fontRendererObj == null) ? 0 : fontRendererObj.FONT_HEIGHT; } - public static void drawText(final IPoint pos, final String text, final int colour) { - drawText(new IArea(pos, new IPoint(500, 500)), TextJustification.TopLeft, text, colour); + public static void drawText(final Point pos, final String text, final int colour) { + drawText(new Area(pos, new Point(500, 500)), TextJustification.TopLeft, text, colour); } - public static void drawText(final IArea area, final TextJustification justification, final String text, final int colour) { - final IPoint pos = area.pos(); + public static void drawText(final Area area, final TextJustification justification, final String text, final int colour) { + final Point pos = area.pos(); if (area.size().x() <= 0.0f) { return; } @@ -142,26 +144,33 @@ public class RenderUtil { GuiUtils.drawGradientRect(0, (int) left, (int) top, (int) right, (int) bottom, color, color); } - public static void drawSolidRect(final IArea area, final int colour) { + public static void drawSolidRect(final Area area, final int colour) { drawSolidRect(area.pos().x(), area.pos().y(), area.pos().x() + area.size().x(), area.pos().y() + area.size().y(), 0xFF000000 | colour); } - public static void drawSolidRectWithAlpha(final IArea area, final int color) { + public static void drawSolidRectWithAlpha(final Area area, final int color) { drawSolidRect(area.pos().x(), area.pos().y(), area.pos().x() + area.size().x(), area.pos().y() + area.size().y(), color); } - public static void drawGradientRect(final IArea area, final int startColor, final int endColor) { + public static void drawGradientRect(final Area area, final int startColor, final int endColor) { GuiUtils.drawGradientRect(0, area.pos().x(), area.pos().y(), area.pos().x() + area.size().x(), area.pos().y() + area.size().y(), startColor, endColor); } - public static void drawSprite(final IPoint pos, final TextureAtlasSprite icon) { + public static void drawSprite(final Point pos, final TextureAtlasSprite icon) { if (icon != null) { BinnieCore.getBinnieProxy().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); drawTexture(pos.x(), pos.y(), icon, 0, 0, 0); } } + + public static void drawGuiSprite(final Point pos, final TextureAtlasSprite icon) { + if (icon != null) { + BinnieCore.getBinnieProxy().bindTexture(TextureManager.LOCATION_FORESTRY_TEXTURE); + drawTexture(pos.x(), pos.y(), icon, 0, 0, 0); + } + } - public static void drawFluid(IPoint pos, @Nullable FluidStack fluid) { + public static void drawFluid(Point pos, @Nullable FluidStack fluid) { GlStateManager.enableBlend(); GlStateManager.enableAlpha(); diff --git a/src/main/java/binnie/craftgui/core/renderer/TextureRenderer.java b/src/main/java/binnie/craftgui/core/renderer/TextureRenderer.java index b666ba67..dfbea8bf 100644 --- a/src/main/java/binnie/craftgui/core/renderer/TextureRenderer.java +++ b/src/main/java/binnie/craftgui/core/renderer/TextureRenderer.java @@ -2,9 +2,9 @@ package binnie.craftgui.core.renderer; import binnie.core.BinnieCore; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IBorder; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Border; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.Position; import binnie.craftgui.resource.IStyleSheet; import binnie.craftgui.resource.Texture; @@ -20,7 +20,7 @@ import javax.annotation.Nullable; @SideOnly(Side.CLIENT) public class TextureRenderer { - private static void renderTexturePadded(final IArea area, final IArea texture, final IBorder padding) { + private static void renderTexturePadded(final Area area, final Area texture, final Border padding) { int borderLeft = padding.l(); int borderRight = padding.r(); int borderTop = padding.t(); @@ -41,7 +41,7 @@ public class TextureRenderer { borderLeft = width / 2; borderRight = width / 2; } - final IPoint origin = area.pos(); + final Point origin = area.pos(); GuiUtils.drawTexturedModalRect(posX, posY, u, v, borderLeft, borderTop, 0); GuiUtils.drawTexturedModalRect(posX + width - borderRight, posY, u + textWidth - borderRight, v, borderRight, borderTop, 0); GuiUtils.drawTexturedModalRect(posX, posY + height - borderBottom, u, v + textHeight - borderBottom, borderLeft, borderBottom, 0); @@ -98,10 +98,10 @@ public class TextureRenderer { RenderUtil.setColour(widget.getColour()); if (widget.isCroppedWidet()) { final IWidget cropRelative = (widget.getCropWidget() != null) ? widget.getCropWidget() : widget; - final IPoint pos = cropRelative.getAbsolutePosition(); - final IArea cropZone = widget.getCroppedZone(); + final Point pos = cropRelative.getAbsolutePosition(); + final Area cropZone = widget.getCroppedZone(); GL11.glEnable(GL11.GL_SCISSOR_TEST); - this.limitArea(new IArea(pos.add(cropZone.pos()), cropZone.size()), guiWidth, guiHeight); + this.limitArea(new Area(pos.add(cropZone.pos()), cropZone.size()), guiWidth, guiHeight); } GlStateManager.disableDepth(); @@ -128,40 +128,40 @@ public class TextureRenderer { } } - public void texture(final Object texture, final IPoint position) { + public void texture(final Object texture, final Point position) { this.texture(this.getTexture(texture), position); } - public void texture(@Nullable final Texture texture, final IPoint position) { + public void texture(@Nullable final Texture texture, final Point position) { if (texture == null) { return; } this.setTexture(texture); - final IPoint point = position.sub(new IPoint(texture.getBorder().l(), texture.getBorder().t())); - final IArea textureArea = texture.getArea().outset(texture.getBorder()); + final Point point = position.sub(new Point(texture.getBorder().l(), texture.getBorder().t())); + final Area textureArea = texture.getArea().outset(texture.getBorder()); GuiUtils.drawTexturedModalRect(point.x(), point.y(), textureArea.pos().x(), textureArea.pos().y(), textureArea.size().x(), textureArea.size().y(), 0); } - public void texture(final Object window, final IArea area) { + public void texture(final Object window, final Area area) { this.texture(this.getTexture(window), area); } - public void texture(@Nullable final Texture texture, final IArea area) { + public void texture(@Nullable final Texture texture, final Area area) { if (texture == null) { return; } this.setTexture(texture); - final IArea textureArea = texture.getArea().outset(texture.getBorder()); - final IArea targetArea = area.outset(texture.getBorder()); + final Area textureArea = texture.getArea().outset(texture.getBorder()); + final Area targetArea = area.outset(texture.getBorder()); if (textureArea.width() == targetArea.width() && textureArea.height() == targetArea.height()) { - final IPoint position = targetArea.pos(); + final Point position = targetArea.pos(); GuiUtils.drawTexturedModalRect(position.x(), position.y(), textureArea.pos().x(), textureArea.pos().y(), textureArea.size().x(), textureArea.size().y(), 0); } else { renderTexturePadded(targetArea, textureArea, texture.getTotalPadding()); } } - public void limitArea(final IArea area, int guiWidth, int guiHeight) { + public void limitArea(final Area area, int guiWidth, int guiHeight) { float x = area.pos().x(); float y = area.pos().y(); float w = area.size().x(); @@ -183,7 +183,7 @@ public class TextureRenderer { return fontRenderer.listFormattedStringToWidth(text, width).size() * RenderUtil.getTextHeight(); } - public void texturePercentage(final Texture texture, final IArea area, final Position direction, final float percentage) { + public void texturePercentage(final Texture texture, final Area area, final Position direction, final float percentage) { final int dist = (direction == Position.Top || direction == Position.BOTTOM) ? Math.round(percentage * texture.height()) : Math.round(percentage * texture.width()); final int dim = (direction == Position.Top || direction == Position.BOTTOM) ? texture.height() : texture.width(); int x = area.pos().x(); @@ -210,7 +210,7 @@ public class TextureRenderer { break; } } - this.texture(texture.crop(direction, dim - dist), new IArea(x, y, w, h)); + this.texture(texture.crop(direction, dim - dist), new Area(x, y, w, h)); } public void test(final IWidget widget) { diff --git a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java index 44fe3356..1667304c 100644 --- a/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/craftgui/minecraft/ContainerCraftGUI.java @@ -84,7 +84,7 @@ public class ContainerCraftGUI extends Container { public void onContainerClosed(final EntityPlayer par1EntityPlayer) { this.crafters.remove(par1EntityPlayer); super.onContainerClosed(par1EntityPlayer); - final WindowInventory inventory = this.window.getWindowInventory(); + WindowInventory inventory = this.window.getWindowInventory(); for (int i = 0; i < inventory.getSizeInventory(); ++i) { if (inventory.dispenseOnClose(i)) { ItemStack stack = inventory.getStackInSlot(i); diff --git a/src/main/java/binnie/craftgui/minecraft/Dialog.java b/src/main/java/binnie/craftgui/minecraft/Dialog.java index 48b9a247..16c7989c 100644 --- a/src/main/java/binnie/craftgui/minecraft/Dialog.java +++ b/src/main/java/binnie/craftgui/minecraft/Dialog.java @@ -4,7 +4,7 @@ import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.Attribute; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventHandler; import binnie.craftgui.events.EventMouse; @@ -44,7 +44,7 @@ public abstract class Dialog extends Control { } @Override - public boolean isMouseOverWidget(final IPoint relativeMouse) { + public boolean isMouseOverWidget(final Point relativeMouse) { return true; } } diff --git a/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java index 9ebbddce..bd2a8d0e 100644 --- a/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/craftgui/minecraft/GuiCraftGUI.java @@ -2,7 +2,7 @@ package binnie.craftgui.minecraft; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventKey; import binnie.craftgui.events.EventMouse; @@ -29,7 +29,7 @@ import java.util.List; @SideOnly(Side.CLIENT) public class GuiCraftGUI extends GuiContainer { - IPoint mousePos; + Point mousePos; private Window window; private ItemStack draggedItem; @@ -44,7 +44,7 @@ public class GuiCraftGUI extends GuiContainer { public GuiCraftGUI(final Window window) { super(window.getContainer()); - this.mousePos = IPoint.ZERO; + this.mousePos = Point.ZERO; this.window = window; this.draggedItem = ItemStack.EMPTY; this.resize(window.getSize()); @@ -60,8 +60,8 @@ public class GuiCraftGUI extends GuiContainer { this.mc.player.openContainer = this.inventorySlots; this.guiLeft = (this.width - this.xSize) / 2; this.guiTop = (this.height - this.ySize) / 2; - this.window.setSize(new IPoint(this.xSize, this.ySize)); - this.window.setPosition(new IPoint(this.guiLeft, this.guiTop)); + this.window.setSize(new Point(this.xSize, this.ySize)); + this.window.setPosition(new Point(this.guiLeft, this.guiTop)); this.window.initGui(); } @@ -88,7 +88,7 @@ public class GuiCraftGUI extends GuiContainer { final InventoryPlayer playerInventory = this.mc.player.inventory; this.draggedItem = playerInventory.getItemStack(); if (!this.draggedItem.isEmpty()) { - RenderUtil.drawItem(new IPoint(mouseX - 8, mouseY - 8), this.draggedItem, false); + RenderUtil.drawItem(new Point(mouseX - 8, mouseY - 8), this.draggedItem, false); } RenderHelper.enableGUIStandardItemLighting(); GlStateManager.disableRescaleNormal(); @@ -104,14 +104,14 @@ public class GuiCraftGUI extends GuiContainer { this.window.getTooltip(tooltip); } if (tooltip.exists()) { - this.renderTooltip(new IPoint(mouseX, mouseY), tooltip); + this.renderTooltip(new Point(mouseX, mouseY), tooltip); } this.zLevel = 0.0f; GlStateManager.enableLighting(); GlStateManager.enableDepth(); } - public void renderTooltip(final IPoint mousePosition, final MinecraftTooltip tooltip) { + public void renderTooltip(final Point mousePosition, final MinecraftTooltip tooltip) { final int mouseX = mousePosition.x(); final int mouseY = mousePosition.y(); final FontRenderer font = this.getFontRenderer(); @@ -190,7 +190,7 @@ public class GuiCraftGUI extends GuiContainer { GlStateManager.pushMatrix(); GlStateManager.translate(i1, j1 - 1.5f, 0.0f); GlStateManager.scale(0.6f, 0.6f, 1.0f); - RenderUtil.drawItem(IPoint.ZERO, stack, false); + RenderUtil.drawItem(Point.ZERO, stack, false); GlStateManager.popMatrix(); } catch (NBTException e) { e.printStackTrace(); @@ -282,12 +282,12 @@ public class GuiCraftGUI extends GuiContainer { return this.fontRendererObj; } - public void resize(final IPoint size) { + public void resize(final Point size) { this.xSize = size.x(); this.ySize = size.y(); this.guiLeft = (this.width - this.xSize) / 2; this.guiTop = (this.height - this.ySize) / 2; - this.window.setPosition(new IPoint(this.guiLeft, this.guiTop)); + this.window.setPosition(new Point(this.guiLeft, this.guiTop)); } } diff --git a/src/main/java/binnie/craftgui/minecraft/Window.java b/src/main/java/binnie/craftgui/minecraft/Window.java index 2c029fab..3ae4f7ac 100644 --- a/src/main/java/binnie/craftgui/minecraft/Window.java +++ b/src/main/java/binnie/craftgui/minecraft/Window.java @@ -20,7 +20,7 @@ import binnie.craftgui.core.ITooltipHelp; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; import binnie.craftgui.core.TopLevelWidget; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventWidget; import binnie.craftgui.minecraft.control.ControlHelp; @@ -82,7 +82,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG return; } - this.setSize(new IPoint(width, height)); + this.setSize(new Point(width, height)); this.gui = new GuiCraftGUI(this); for (final EnumHighlighting h : EnumHighlighting.values()) { ControlSlot.highlighting.put(h, new ArrayList<>()); @@ -102,7 +102,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG if (Window.this.isClient()) { Window.this.getGui().resize(Window.this.getSize()); if (Window.this.title != null) { - Window.this.title.setSize(new IPoint(Window.this.width(), Window.this.title.height())); + Window.this.title.setSize(new Point(Window.this.width(), Window.this.title.height())); } } } @@ -218,10 +218,10 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG public void onRenderBackground(int guiWidth, int guiHeight) { RenderUtil.setColour(16777215); if (this.getBackground1() != null) { - CraftGUI.render.texture(this.getBackground1(), IPoint.ZERO); + CraftGUI.render.texture(this.getBackground1(), Point.ZERO); } if (this.getBackground2() != null) { - CraftGUI.render.texture(this.getBackground2(), new IPoint(256, 0)); + CraftGUI.render.texture(this.getBackground2(), new Point(256, 0)); } RenderUtil.setColour(this.getColour()); CraftGUI.render.texture(CraftGUITexture.Window, this.getArea()); diff --git a/src/main/java/binnie/craftgui/minecraft/WindowInventory.java b/src/main/java/binnie/craftgui/minecraft/WindowInventory.java index eb07029d..6bb9a1ef 100644 --- a/src/main/java/binnie/craftgui/minecraft/WindowInventory.java +++ b/src/main/java/binnie/craftgui/minecraft/WindowInventory.java @@ -100,7 +100,7 @@ public class WindowInventory implements IInventory { } public void createSlot(final int slot) { - this.inventory.put(slot, null); + this.inventory.put(slot, ItemStack.EMPTY); } public void setValidator(final int slot, final SlotValidator validator) { diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlEnergyBar.java b/src/main/java/binnie/craftgui/minecraft/control/ControlEnergyBar.java index a09b6b32..614633cc 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlEnergyBar.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlEnergyBar.java @@ -10,8 +10,8 @@ import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.Position; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.minecraft.MinecraftTooltip; @@ -84,18 +84,18 @@ public class ControlEnergyBar extends Control implements ITooltip { final float percentage = this.getPercentage() / 100.0f; int colourFromPercentage = this.getColourFromPercentage(percentage); RenderUtil.setColour(colourFromPercentage); - final IArea area = this.getArea(); + final Area area = this.getArea(); switch (this.direction) { case Top: case BOTTOM: { final int height = Math.round(area.size().y() * percentage); - area.setSize(new IPoint(area.size().x(), height)); + area.setSize(new Point(area.size().x(), height)); break; } case LEFT: case RIGHT: { final int width = Math.round(area.size().x() * percentage); - area.setSize(new IPoint(width, area.size().y())); + area.setSize(new Point(width, area.size().y())); break; } } @@ -115,11 +115,11 @@ public class ControlEnergyBar extends Control implements ITooltip { @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { if (this.isMouseOver() && Window.get(this).getGui().isHelpMode()) { - final IArea area = this.getArea(); + final Area area = this.getArea(); RenderUtil.setColour(MinecraftTooltip.getOutline(Tooltip.Type.Help)); CraftGUI.render.texture(CraftGUITexture.Outline, area.outset(1)); } else if (ControlEnergyBar.isError) { - final IArea area = this.getArea(); + final Area area = this.getArea(); RenderUtil.setColour(MinecraftTooltip.getOutline(MinecraftTooltip.Type.Error)); CraftGUI.render.texture(CraftGUITexture.Outline, area.outset(1)); } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlErrorState.java b/src/main/java/binnie/craftgui/minecraft/control/ControlErrorState.java index fad294c4..962d8427 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlErrorState.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlErrorState.java @@ -7,7 +7,7 @@ import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.minecraft.CustomSlot; import binnie.craftgui.minecraft.MinecraftTooltip; import binnie.craftgui.minecraft.Window; @@ -32,7 +32,7 @@ public class ControlErrorState extends Control implements ITooltip { } else if (this.type == 0) { texture = CraftGUITexture.StateError; } - CraftGUI.render.texture(texture, IPoint.ZERO); + CraftGUI.render.texture(texture, Point.ZERO); super.onRenderBackground(guiWidth, guiHeight); } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java b/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java index ee570a78..3a69a48b 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlIconDisplay.java @@ -1,9 +1,10 @@ package binnie.craftgui.minecraft.control; import binnie.core.BinnieCore; +import binnie.core.resource.BinnieSprite; import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.renderer.RenderUtil; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; @@ -11,16 +12,31 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class ControlIconDisplay extends Control { - private TextureAtlasSprite sprite; + private final TextureAtlasSprite sprite; + public ControlIconDisplay(final IWidget parent, final int x, final int y) { + super(parent, x, y, 16, 16); + this.sprite = null; + } + public ControlIconDisplay(final IWidget parent, final int x, final int y, final ResourceLocation icon) { super(parent, x, y, 16, 16); this.sprite = BinnieCore.getBinnieProxy().getTextureAtlasSprite(icon); } + + public ControlIconDisplay(final IWidget parent, final int x, final int y, BinnieSprite sprite) { + super(parent, x, y, 16, 16); + this.sprite = sprite.getSprite(); + } + + public ControlIconDisplay(final IWidget parent, final int x, final int y, TextureAtlasSprite sprite) { + super(parent, x, y, 16, 16); + this.sprite = sprite; + } @Override @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { - RenderUtil.drawSprite(IPoint.ZERO, this.sprite); + RenderUtil.drawSprite(Point.ZERO, this.sprite); } } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlImage.java b/src/main/java/binnie/craftgui/minecraft/control/ControlImage.java index 7b45bb2a..8c4d611e 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlImage.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlImage.java @@ -3,7 +3,7 @@ package binnie.craftgui.minecraft.control; import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.resource.Texture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -19,6 +19,6 @@ public class ControlImage extends Control { @Override @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { - CraftGUI.render.texture(this.key, IPoint.ZERO); + CraftGUI.render.texture(this.key, Point.ZERO); } } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlItemDisplay.java b/src/main/java/binnie/craftgui/minecraft/control/ControlItemDisplay.java index c5e0bd27..f44556b8 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlItemDisplay.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlItemDisplay.java @@ -5,7 +5,7 @@ import binnie.craftgui.core.Attribute; import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.minecraft.Window; import net.minecraft.client.Minecraft; @@ -52,7 +52,7 @@ public class ControlItemDisplay extends Control implements ITooltip { return; } - final IPoint relativeToWindow = this.getAbsolutePosition().sub(this.getTopParent().getPosition()); + final Point relativeToWindow = this.getAbsolutePosition().sub(this.getTopParent().getPosition()); if (relativeToWindow.x() > Window.get(this).getSize().x() + 100 || relativeToWindow.y() > Window.get(this).getSize().y() + 100) { return; } @@ -62,15 +62,15 @@ public class ControlItemDisplay extends Control implements ITooltip { GlStateManager.pushMatrix(); final float scale = this.getSize().x() / 16.0f; GlStateManager.scale(scale, scale, 1); - RenderUtil.drawItem(IPoint.ZERO, this.itemStack, this.rotating); + RenderUtil.drawItem(Point.ZERO, this.itemStack, this.rotating); GlStateManager.popMatrix(); } else { - RenderUtil.drawItem(IPoint.ZERO, this.itemStack, this.rotating); + RenderUtil.drawItem(Point.ZERO, this.itemStack, this.rotating); } GlStateManager.enableAlpha(); } - public void setItemStack(final ItemStack itemStack) { + public void setItemStack(ItemStack itemStack) { this.itemStack = itemStack; } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java b/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java index cc192f23..c7f4d90d 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlLiquidTank.java @@ -12,8 +12,8 @@ import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventMouse; import binnie.craftgui.minecraft.GuiCraftGUI; @@ -79,7 +79,7 @@ public class ControlLiquidTank extends Control implements ITooltip { @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { - CraftGUI.render.texture(this.horizontal ? CraftGUITexture.HorizontalLiquidTank : CraftGUITexture.LiquidTank, IPoint.ZERO); + CraftGUI.render.texture(this.horizontal ? CraftGUITexture.HorizontalLiquidTank : CraftGUITexture.LiquidTank, Point.ZERO); GuiCraftGUI gui = Window.get(this).getGui(); if (this.isMouseOver() && gui.isHelpMode()) { final int c = -1442840576 + MinecraftTooltip.getOutline(Tooltip.Type.Help); @@ -108,20 +108,20 @@ public class ControlLiquidTank extends Control implements ITooltip { GlStateManager.enableBlend(); { GlStateManager.blendFunc(770, 771); - final IPoint pos = this.getAbsolutePosition(); - final IPoint offset = new IPoint(0, height - squaled); - final IArea limited = this.getArea().inset(1); + final Point pos = this.getAbsolutePosition(); + final Point offset = new Point(0, height - squaled); + final Area limited = this.getArea().inset(1); if (this.horizontal) { - limited.setSize(new IPoint(limited.width() - 1, limited.height())); + limited.setSize(new Point(limited.width() - 1, limited.height())); } - CraftGUI.render.limitArea(new IArea(limited.pos().add(pos).add(offset), limited.size().sub(offset)), guiWidth, guiHeight); + CraftGUI.render.limitArea(new Area(limited.pos().add(pos).add(offset), limited.size().sub(offset)), guiWidth, guiHeight); GL11.glEnable(GL11.GL_SCISSOR_TEST); { BinnieCore.getBinnieProxy().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); for (int y = 0; y < height; y += 16) { for (int x = 0; x < (this.horizontal ? 58 : 16); x += 16) { final TextureAtlasSprite icon = BinnieCore.getBinnieProxy().getTextureAtlasSprite(fluid.getStill()); - RenderUtil.drawSprite(new IPoint(1 + x, 1 + y), icon); + RenderUtil.drawSprite(new Point(1 + x, 1 + y), icon); } } } @@ -135,15 +135,15 @@ public class ControlLiquidTank extends Control implements ITooltip { @Override @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { - CraftGUI.render.texture(this.horizontal ? CraftGUITexture.HorizontalLiquidTankOverlay : CraftGUITexture.LiquidTankOverlay, IPoint.ZERO); + CraftGUI.render.texture(this.horizontal ? CraftGUITexture.HorizontalLiquidTankOverlay : CraftGUITexture.LiquidTankOverlay, Point.ZERO); GuiCraftGUI gui = Window.get(this).getGui(); if (this.isMouseOver() && gui.isHelpMode()) { - final IArea area = this.getArea(); + final Area area = this.getArea(); RenderUtil.setColour(MinecraftTooltip.getOutline(Tooltip.Type.Help)); CraftGUI.render.texture(CraftGUITexture.Outline, area.outset(1)); } if (ControlLiquidTank.tankError.contains(this.tankID)) { - final IArea area = this.getArea(); + final Area area = this.getArea(); RenderUtil.setColour(MinecraftTooltip.getOutline(MinecraftTooltip.Type.Error)); CraftGUI.render.texture(CraftGUITexture.Outline, area.outset(1)); } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlide.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlide.java index e6041451..5eb7e37c 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlide.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlide.java @@ -4,9 +4,9 @@ import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.Attribute; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IBorder; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Border; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.Position; import binnie.craftgui.core.geometry.TextJustification; import binnie.craftgui.core.renderer.RenderUtil; @@ -17,8 +17,8 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class ControlSlide extends Control { - private IArea expanded; - private IArea shrunk; + private Area expanded; + private Area shrunk; private boolean slideActive; private Position anchor; private String label; @@ -29,10 +29,10 @@ public class ControlSlide extends Control { this.label = null; this.addAttribute(Attribute.MouseOver); this.addAttribute(Attribute.BlockTooltip); - this.expanded = new IArea(this.getPosition(), this.getSize()); + 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); - this.shrunk = this.expanded.inset(new IBorder(this.anchor, border)); + this.shrunk = this.expanded.inset(new Border(this.anchor, border)); this.slideActive = false; } @@ -44,15 +44,15 @@ public class ControlSlide extends Control { final int lw = RenderUtil.getTextWidth(this.label) + 16; final int lh = RenderUtil.getTextHeight() + 16; final boolean hor = this.anchor.x() != 0; - final IArea ar = this.isSlideActive() ? this.expanded : this.shrunk; - IArea tabArea = new IArea(hor ? (-lh / 2) : (-lw / 2), hor ? (-lw / 2) : (-lh / 2), hor ? lh : lw, hor ? lw : lh); - final IPoint shift = new IPoint(ar.width() * (1 - this.anchor.x()) / 2, ar.height() * (1 - this.anchor.y()) / 2); + final Area ar = this.isSlideActive() ? this.expanded : this.shrunk; + Area tabArea = new Area(hor ? (-lh / 2) : (-lw / 2), hor ? (-lw / 2) : (-lh / 2), hor ? lh : lw, hor ? lw : lh); + final Point shift = new Point(ar.width() * (1 - this.anchor.x()) / 2, ar.height() * (1 - this.anchor.y()) / 2); tabArea = tabArea.shift(shift.x() - (-3 + lh / 2) * this.anchor.x(), shift.y() - (-3 + lh / 2) * this.anchor.y()); Texture texture = CraftGUI.render.getTexture(this.isSlideActive() ? CraftGUITexture.Tab : CraftGUITexture.TabDisabled).crop(this.anchor.opposite(), 8); CraftGUI.render.texture(texture, tabArea); texture = CraftGUI.render.getTexture(CraftGUITexture.TabOutline).crop(this.anchor.opposite(), 8); CraftGUI.render.texture(texture, tabArea.inset(2)); - final IArea labelArea = new IArea(-lw / 2, 0, lw, lh); + final Area labelArea = new Area(-lw / 2, 0, lw, lh); GlStateManager.pushMatrix(); GlStateManager.translate(shift.x() + this.anchor.x() * 2, shift.y() + this.anchor.y() * 2, 0); if (this.anchor.x() != 0) { @@ -66,7 +66,7 @@ public class ControlSlide extends Control { } CraftGUI.render.texture(CraftGUITexture.Window, this.getArea()); final Object slideTexture = (this.anchor == Position.BOTTOM) ? CraftGUITexture.SlideDown : ((this.anchor == Position.Top) ? CraftGUITexture.SlideUp : ((this.anchor == Position.LEFT) ? CraftGUITexture.SlideLeft : CraftGUITexture.SlideRight)); - CraftGUI.render.texture(slideTexture, new IPoint((this.anchor.x() + 1) * this.width() / 2 - 8, (this.anchor.y() + 1) * this.height() / 2 - 8)); + CraftGUI.render.texture(slideTexture, new Point((this.anchor.x() + 1) * this.width() / 2 - 8, (this.anchor.y() + 1) * this.height() / 2 - 8)); } public boolean isSlideActive() { @@ -82,8 +82,8 @@ public class ControlSlide extends Control { } @Override - public boolean isMouseOverWidget(final IPoint relativeMouse) { - return this.getArea().outset(this.isSlideActive() ? 16 : 8).outset(new IBorder(this.anchor.opposite(), 16)).contains(relativeMouse); + public boolean isMouseOverWidget(final Point relativeMouse) { + return this.getArea().outset(this.isSlideActive() ? 16 : 8).outset(new Border(this.anchor.opposite(), 16)).contains(relativeMouse); } @Override @@ -93,7 +93,7 @@ public class ControlSlide extends Control { public void setSlide(final boolean b) { this.slideActive = b; - final IArea area = this.isSlideActive() ? this.expanded : this.shrunk; + final Area area = this.isSlideActive() ? this.expanded : this.shrunk; this.setSize(area.size()); this.setPosition(area.pos()); } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java index a5319a59..ff92c415 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlot.java @@ -6,8 +6,8 @@ import binnie.core.machines.inventory.SlotValidator; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventMouse; import binnie.craftgui.minecraft.CustomSlot; @@ -92,7 +92,7 @@ public class ControlSlot extends ControlSlotBase { @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { - CraftGUI.render.texture(CraftGUITexture.Slot, IPoint.ZERO); + CraftGUI.render.texture(CraftGUITexture.Slot, Point.ZERO); final InventorySlot islot = this.getInventorySlot(); if (islot != null) { SlotValidator validator = islot.getValidator(); @@ -100,7 +100,7 @@ public class ControlSlot extends ControlSlotBase { final TextureAtlasSprite icon = validator.getIcon(!islot.getInputSides().isEmpty()); if (icon != null && icon != Minecraft.getMinecraft().getTextureMapBlocks().getMissingSprite()) { GlStateManager.enableBlend(); - RenderUtil.drawSprite(new IPoint(1, 1), icon); + RenderUtil.drawSprite(new Point(1, 1), icon); GlStateManager.disableBlend(); } } @@ -115,14 +115,14 @@ public class ControlSlot extends ControlSlotBase { } highlighted = true; final int c = -1442840576 + Math.min(highlight.getKey().getColour(), 16777215); - RenderUtil.drawGradientRect(new IArea(1, 1, 16, 16), c, c); + RenderUtil.drawGradientRect(new Area(1, 1, 16, 16), c, c); } if (!highlighted && this.getTopParent().getMousedOverWidget() == this) { GuiCraftGUI gui = Window.get(this).getGui(); if (!gui.getDraggedItem().isEmpty() && !this.slot.isItemValid(gui.getDraggedItem())) { - RenderUtil.drawGradientRect(new IArea(1, 1, 16, 16), -1426089575, -1426089575); + RenderUtil.drawGradientRect(new Area(1, 1, 16, 16), -1426089575, -1426089575); } else { - RenderUtil.drawGradientRect(new IArea(1, 1, 16, 16), -2130706433, -2130706433); + RenderUtil.drawGradientRect(new Area(1, 1, 16, 16), -2130706433, -2130706433); } } } @@ -140,10 +140,10 @@ public class ControlSlot extends ControlSlotBase { } highlighted = true; final int c = highlight.getKey().getColour(); - IArea area = this.getArea(); + Area area = this.getArea(); if (this.getParent() instanceof ControlSlotArray || this.getParent() instanceof ControlPlayerInventory) { area = this.getParent().getArea(); - area.setPosition(IPoint.ZERO.sub(this.getPosition())); + area.setPosition(Point.ZERO.sub(this.getPosition())); } RenderUtil.setColour(c); CraftGUI.render.texture(CraftGUITexture.Outline, area.outset(1)); diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java index e63f9e49..e4506507 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlSlotBase.java @@ -6,8 +6,8 @@ import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventWidget; import binnie.craftgui.minecraft.Window; @@ -30,7 +30,7 @@ public abstract class ControlSlotBase extends Control implements ITooltip { this.addSelfEventHandler(new EventWidget.ChangeSize.Handler() { @Override public void onEvent(final EventWidget.ChangeSize event) { - ControlSlotBase.this.itemDisplay.setSize(ControlSlotBase.this.getSize().sub(new IPoint(2, 2))); + ControlSlotBase.this.itemDisplay.setSize(ControlSlotBase.this.getSize().sub(new Point(2, 2))); } }); } @@ -45,7 +45,7 @@ public abstract class ControlSlotBase extends Control implements ITooltip { final int size = this.getSize().x(); CraftGUI.render.texture(CraftGUITexture.Slot, this.getArea()); if (this.getTopParent().getMousedOverWidget() == this) { - RenderUtil.drawGradientRect(new IArea(new IPoint(1, 1), this.getArea().size().sub(new IPoint(2, 2))), -2130706433, -2130706433); + RenderUtil.drawGradientRect(new Area(new Point(1, 1), this.getArea().size().sub(new Point(2, 2))), -2130706433, -2130706433); } } diff --git a/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java b/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java index 9c4a8fc6..011f537c 100644 --- a/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java +++ b/src/main/java/binnie/craftgui/minecraft/control/ControlTabIcon.java @@ -3,7 +3,7 @@ package binnie.craftgui.minecraft.control; import binnie.core.genetics.IItemStackRepresentitive; import binnie.craftgui.controls.tab.ControlTab; import binnie.craftgui.controls.tab.ControlTabBar; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -31,7 +31,7 @@ public class ControlTabIcon extends ControlTab { this.item.setItemStack(this.getItemStack()); ControlTabBar parent = (ControlTabBar) this.getParent(); final int x = parent.getDirection().x(); - this.item.setOffset(new IPoint((this.isCurrentSelection() || this.isMouseOver()) ? 0 : (-4 * x), 0)); + this.item.setOffset(new Point((this.isCurrentSelection() || this.isMouseOver()) ? 0 : (-4 * x), 0)); } public boolean hasOutline() { diff --git a/src/main/java/binnie/craftgui/minecraft/render/MinecraftTexture.java b/src/main/java/binnie/craftgui/minecraft/render/MinecraftTexture.java index cd21bd67..ff73a1d8 100644 --- a/src/main/java/binnie/craftgui/minecraft/render/MinecraftTexture.java +++ b/src/main/java/binnie/craftgui/minecraft/render/MinecraftTexture.java @@ -1,13 +1,13 @@ package binnie.craftgui.minecraft.render; import binnie.core.resource.IBinnieTexture; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; public class MinecraftTexture { - IArea textureArea; + Area textureArea; IBinnieTexture texture; public MinecraftTexture() { - this.textureArea = new IArea(0, 0, 0, 0); + this.textureArea = new Area(0, 0, 0, 0); } } diff --git a/src/main/java/binnie/craftgui/mod/database/ControlBreedingProgress.java b/src/main/java/binnie/craftgui/mod/database/ControlBreedingProgress.java index e925dcc1..d36130e8 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlBreedingProgress.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlBreedingProgress.java @@ -4,8 +4,8 @@ import binnie.core.genetics.BreedingSystem; import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.resource.Texture; import binnie.craftgui.resource.minecraft.CraftGUITexture; @@ -29,8 +29,8 @@ class ControlBreedingProgress extends Control { @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { CraftGUI.render.texture(CraftGUITexture.PanelBlack, this.getArea()); - final IArea area = this.getArea().inset(1); - area.setSize(new IPoint(Math.round(area.size().x() * this.percentage), area.size().y())); + final Area area = this.getArea().inset(1); + area.setSize(new Point(Math.round(area.size().x() * this.percentage), area.size().y())); RenderUtil.setColour(this.colour); CraftGUI.render.texture(ControlBreedingProgress.Progress, area); } diff --git a/src/main/java/binnie/craftgui/mod/database/ControlItemStackOption.java b/src/main/java/binnie/craftgui/mod/database/ControlItemStackOption.java index 08a42586..247e9dab 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlItemStackOption.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlItemStackOption.java @@ -5,7 +5,7 @@ import binnie.craftgui.controls.listbox.ControlTextOption; import binnie.craftgui.core.Attribute; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.geometry.CraftGUIUtil; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.minecraft.control.ControlItemDisplay; import net.minecraft.item.ItemStack; @@ -14,15 +14,15 @@ public class ControlItemStackOption extends ControlTextOption { public ControlItemStackOption(final ControlList controlList, final ItemStack option, final int y) { super(controlList, option, option.getDisplayName(), y); - this.setSize(new IPoint(this.getSize().x(), 20)); + this.setSize(new Point(this.getSize().x(), 20)); (this.controlBee = new ControlItemDisplay(this, 2, 2)).setItemStack(option); this.addAttribute(Attribute.MouseOver); - CraftGUIUtil.moveWidget(this.textWidget, new IPoint(22, 0)); - this.textWidget.setSize(this.textWidget.getSize().sub(new IPoint(24, 0))); + 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()); final int height = Math.max(20, th + 6); - this.setSize(new IPoint(this.size().x(), height)); - this.textWidget.setSize(new IPoint(this.textWidget.getSize().x(), height)); - this.controlBee.setPosition(new IPoint(this.controlBee.pos().x(), (height - 18) / 2)); + this.setSize(new Point(this.size().x(), height)); + this.textWidget.setSize(new Point(this.textWidget.getSize().x(), height)); + this.controlBee.setPosition(new Point(this.controlBee.pos().x(), (height - 18) / 2)); } } diff --git a/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java b/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java index 4b14b985..4f1277e7 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlMutationSymbol.java @@ -7,7 +7,7 @@ import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.minecraft.Window; import binnie.craftgui.resource.Texture; import binnie.craftgui.resource.minecraft.CraftGUITextureSheet; @@ -29,9 +29,9 @@ class ControlMutationSymbol extends Control implements ITooltip { public void onRenderBackground(int guiWidth, int guiHeight) { super.onRenderBackground(guiWidth, guiHeight); if (this.type == 0) { - CraftGUI.render.texture(ControlMutationSymbol.MutationPlus, IPoint.ZERO); + CraftGUI.render.texture(ControlMutationSymbol.MutationPlus, Point.ZERO); } else { - CraftGUI.render.texture(ControlMutationSymbol.MutationArrow, IPoint.ZERO); + CraftGUI.render.texture(ControlMutationSymbol.MutationArrow, Point.ZERO); } } diff --git a/src/main/java/binnie/craftgui/mod/database/ControlSpeciexBoxOption.java b/src/main/java/binnie/craftgui/mod/database/ControlSpeciexBoxOption.java index fe7240e7..cd8b3e0d 100644 --- a/src/main/java/binnie/craftgui/mod/database/ControlSpeciexBoxOption.java +++ b/src/main/java/binnie/craftgui/mod/database/ControlSpeciexBoxOption.java @@ -5,7 +5,7 @@ import binnie.craftgui.controls.listbox.ControlTextOption; import binnie.craftgui.core.Attribute; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.geometry.CraftGUIUtil; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import forestry.api.genetics.IAlleleSpecies; class ControlSpeciexBoxOption extends ControlTextOption { @@ -13,7 +13,7 @@ class ControlSpeciexBoxOption extends ControlTextOption { public ControlSpeciexBoxOption(final ControlList controlList, final IAlleleSpecies option, final int y) { super(controlList, option, option.getName(), y); - this.setSize(new IPoint(this.getSize().x(), 20)); + this.setSize(new Point(this.getSize().x(), 20)); (this.controlBee = new ControlDatabaseIndividualDisplay(this, 2, 2)).setSpecies(this.getValue(), EnumDiscoveryState.Undetermined); if (this.controlBee.discovered == EnumDiscoveryState.Discovered) { this.controlBee.discovered = EnumDiscoveryState.Show; @@ -22,12 +22,12 @@ class ControlSpeciexBoxOption extends ControlTextOption { if (this.controlBee.discovered == EnumDiscoveryState.Show) { this.addAttribute(Attribute.MouseOver); } - CraftGUIUtil.moveWidget(this.textWidget, new IPoint(22, 0)); - this.textWidget.setSize(this.textWidget.getSize().sub(new IPoint(24, 0))); + 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()); final int height = Math.max(20, th + 6); - this.setSize(new IPoint(this.size().x(), height)); - this.textWidget.setSize(new IPoint(this.textWidget.getSize().x(), height)); - this.controlBee.setPosition(new IPoint(this.controlBee.pos().x(), (height - 18) / 2)); + this.setSize(new Point(this.size().x(), height)); + this.textWidget.setSize(new Point(this.textWidget.getSize().x(), height)); + this.controlBee.setPosition(new Point(this.controlBee.pos().x(), (height - 18) / 2)); } } diff --git a/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java b/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java index 5a645e1d..5b987502 100644 --- a/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java +++ b/src/main/java/binnie/craftgui/mod/database/PageSpeciesOverview.java @@ -5,8 +5,8 @@ import binnie.craftgui.controls.ControlText; import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.TextJustification; import forestry.api.genetics.IAlleleSpecies; import net.minecraft.util.text.TextFormatting; @@ -31,8 +31,8 @@ public class PageSpeciesOverview extends PageSpecies { this.controlScientific = new ControlTextCentered(this, 32, ""); this.controlAuthority = new ControlTextCentered(this, 44, ""); this.controlComplexity = new ControlTextCentered(this, 68, ""); - this.controlDescription = new ControlText(this, new IArea(8, 84, this.getSize().x() - 16, 0), "", TextJustification.MiddleCenter); - this.controlSignature = new ControlText(this, new IArea(8, 84, this.getSize().x() - 16, 0), "", TextJustification.BottomRight); + this.controlDescription = new ControlText(this, new Area(8, 84, this.getSize().x() - 16, 0), "", TextJustification.MiddleCenter); + this.controlSignature = new ControlText(this, new Area(8, 84, this.getSize().x() - 16, 0), "", TextJustification.BottomRight); } @Override @@ -63,6 +63,6 @@ public class PageSpeciesOverview extends PageSpecies { this.controlDescription.setValue(descBody + TextFormatting.RESET); this.controlSignature.setValue(descSig); final int descHeight = CraftGUI.render.textHeight(this.controlDescription.getValue(), this.controlDescription.getSize().x()); - this.controlSignature.setPosition(new IPoint(this.controlSignature.pos().x(), this.controlDescription.getPosition().y() + descHeight + 10)); + this.controlSignature.setPosition(new Point(this.controlSignature.pos().x(), this.controlDescription.getPosition().y() + descHeight + 10)); } } diff --git a/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java b/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java index 8a85cf31..cccb5565 100644 --- a/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java +++ b/src/main/java/binnie/craftgui/mod/database/WindowAbstractDatabase.java @@ -12,8 +12,8 @@ import binnie.craftgui.controls.tab.ControlTab; import binnie.craftgui.controls.tab.ControlTabBar; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.geometry.CraftGUIUtil; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.Position; import binnie.craftgui.events.EventHandler; import binnie.craftgui.events.EventTextEdit; @@ -96,7 +96,7 @@ public abstract class WindowAbstractDatabase extends Window { @Override @SideOnly(Side.CLIENT) public void initialiseClient() { - this.setSize(new IPoint(176 + this.selectionBoxWidth + 22 + 8, 208)); + this.setSize(new Point(176 + this.selectionBoxWidth + 22 + 8, 208)); this.addEventHandler(new EventValueChanged.Handler() { @Override public void onEvent(final EventValueChanged event) { @@ -141,7 +141,7 @@ public abstract class WindowAbstractDatabase extends Window { new ControlTextEdit(this, 176, 184, this.selectionBoxWidth, 16); this.createMode(Mode.SPECIES, new ModeWidgets(Mode.SPECIES, this) { @Override - public void createListBox(final IArea area) { + public void createListBox(final Area area) { final GameProfile playerName = WindowAbstractDatabase.this.getUsername(); final Collection speciesList = this.database.isNEI ? this.database.system.getAllSpecies() : this.database.system.getDiscoveredSpecies(this.database.getWorld(), playerName); (this.listBox = new ControlSpeciesBox(this.modePage, area.xPos(), area.yPos(), area.width(), area.height())).setOptions(speciesList); @@ -149,7 +149,7 @@ public abstract class WindowAbstractDatabase extends Window { }); this.createMode(Mode.BRANCHES, new ModeWidgets(Mode.BRANCHES, this) { @Override - public void createListBox(final IArea area) { + public void createListBox(final Area area) { final EntityPlayer player = this.database.getPlayer(); final GameProfile playerName = WindowAbstractDatabase.this.getUsername(); final Collection speciesList = this.database.isNEI ? this.database.system.getAllBranches() : this.database.system.getDiscoveredBranches(this.database.getWorld(), playerName); @@ -158,7 +158,7 @@ public abstract class WindowAbstractDatabase extends Window { }); this.createMode(Mode.BREEDER, new ModeWidgets(Mode.BREEDER, this) { @Override - public void createListBox(final IArea area) { + public void createListBox(final Area area) { this.listBox = new ControlListBox(this.modePage, area.xPos(), area.yPos(), area.width(), area.height(), 12); } }); @@ -236,13 +236,13 @@ public abstract class WindowAbstractDatabase extends Window { public ModeWidgets(final IDatabaseMode mode, final WindowAbstractDatabase database) { this.database = database; this.modePage = new ControlPage<>(database.modePages, 0, 0, database.getSize().x(), database.getSize().y(), mode); - final IArea listBoxArea = database.panelSearch.area().inset(2); + final Area listBoxArea = database.panelSearch.area().inset(2); this.createListBox(listBoxArea); CraftGUIUtil.alignToWidget(this.listBox, database.panelSearch); - CraftGUIUtil.moveWidget(this.listBox, new IPoint(2, 2)); + CraftGUIUtil.moveWidget(this.listBox, new Point(2, 2)); CraftGUIUtil.alignToWidget(this.infoPages = new ControlPages<>(this.modePage, 0, 0, 144, 176), database.panelInformation); } - public abstract void createListBox(final IArea p0); + public abstract void createListBox(final Area p0); } } diff --git a/src/main/java/binnie/craftgui/resource/Texture.java b/src/main/java/binnie/craftgui/resource/Texture.java index e7ccff10..94f8b707 100644 --- a/src/main/java/binnie/craftgui/resource/Texture.java +++ b/src/main/java/binnie/craftgui/resource/Texture.java @@ -2,42 +2,42 @@ package binnie.craftgui.resource; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IBorder; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Border; import binnie.craftgui.core.geometry.Position; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class Texture { - private final IArea area; - private final IBorder padding; - private final IBorder border; + private final Area area; + private final Border padding; + private final Border border; private final IBinnieTexture binnieTexture; - public Texture(final IArea area, final IBinnieTexture binnieTexture) { - this(area, IBorder.ZERO, IBorder.ZERO, binnieTexture); + public Texture(final Area area, final IBinnieTexture binnieTexture) { + this(area, Border.ZERO, Border.ZERO, binnieTexture); } - public Texture(final IArea area, final IBorder padding, final IBinnieTexture binnieTexture) { - this(area, padding, IBorder.ZERO, binnieTexture); + public Texture(final Area area, final Border padding, final IBinnieTexture binnieTexture) { + this(area, padding, Border.ZERO, binnieTexture); } - public Texture(final IArea area, final IBorder padding, final IBorder border, final IBinnieTexture binnieTexture) { - this.area = new IArea(area); - this.padding = new IBorder(padding); - this.border = new IBorder(border); + public Texture(final Area area, final Border padding, final Border border, final IBinnieTexture binnieTexture) { + this.area = new Area(area); + this.padding = new Border(padding); + this.border = new Border(border); this.binnieTexture = binnieTexture; } - public IArea getArea() { + public Area getArea() { return this.area; } - public IBorder getPadding() { + public Border getPadding() { return this.padding; } - public IBorder getBorder() { + public Border getBorder() { return this.border; } @@ -46,7 +46,7 @@ public class Texture { return this.binnieTexture.getTexture(); } - public IBorder getTotalPadding() { + public Border getTotalPadding() { return this.padding.add(this.border); } @@ -67,10 +67,10 @@ public class Texture { } public Texture crop(final Position anchor, final int dist) { - return this.crop(new IBorder(anchor.opposite(), dist)); + return this.crop(new Border(anchor.opposite(), dist)); } - public Texture crop(final IBorder crop) { + public Texture crop(final Border crop) { final Texture copy = new Texture(this.area, this.padding, this.border, this.binnieTexture); if (crop.b() > 0) { copy.border.b(0); diff --git a/src/main/java/binnie/craftgui/resource/minecraft/CraftGUIResourceManager.java b/src/main/java/binnie/craftgui/resource/minecraft/CraftGUIResourceManager.java index 35282fd3..84a56716 100644 --- a/src/main/java/binnie/craftgui/resource/minecraft/CraftGUIResourceManager.java +++ b/src/main/java/binnie/craftgui/resource/minecraft/CraftGUIResourceManager.java @@ -2,8 +2,8 @@ package binnie.craftgui.resource.minecraft; import binnie.core.resource.IBinnieTexture; import binnie.craftgui.core.CraftGUI; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IBorder; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Border; import binnie.craftgui.resource.Texture; import com.google.common.base.Charsets; import com.google.gson.JsonElement; @@ -61,9 +61,9 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener { final JsonObject sheet = (JsonObject) el; final String name = sheet.get("name").getAsString(); final IBinnieTexture textureSheet = this.getTextureSheet(sheet.get("sheet").getAsString()); - final IArea uv = this.getArea(sheet.get("uv").getAsString()); - IBorder border = IBorder.ZERO; - IBorder padding = IBorder.ZERO; + final Area uv = this.getArea(sheet.get("uv").getAsString()); + Border border = Border.ZERO; + Border padding = Border.ZERO; if (sheet.has("border")) { border = this.getBorder(sheet.get("border").getAsString()); } @@ -83,7 +83,7 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener { } } - public IArea getArea(final String name) { + public Area getArea(final String name) { final String[] split = name.split(" "); if (split.length < 1 || split.length > 4) { throw new RuntimeException("Parameter must have between one and four numbers"); @@ -93,18 +93,18 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener { i.add(Integer.parseInt(string)); } if (i.size() == 1) { - return new IArea(i.get(0)); + return new Area(i.get(0)); } if (i.size() == 2) { - return new IArea(i.get(0), i.get(1)); + return new Area(i.get(0), i.get(1)); } if (i.size() == 3) { - return new IArea(i.get(0), i.get(1), i.get(2)); + return new Area(i.get(0), i.get(1), i.get(2)); } - return new IArea(i.get(0), i.get(1), i.get(2), i.get(3)); + return new Area(i.get(0), i.get(1), i.get(2), i.get(3)); } - public IBorder getBorder(final String name) { + public Border getBorder(final String name) { final String[] split = name.split(" "); if (split.length < 1 || split.length > 4) { throw new RuntimeException("Parameter must have between one and four numbers"); @@ -114,15 +114,15 @@ public class CraftGUIResourceManager implements IResourceManagerReloadListener { i.add(Integer.parseInt(string)); } if (i.size() == 1) { - return new IBorder(i.get(0)); + return new Border(i.get(0)); } if (i.size() == 2) { - return new IBorder(i.get(0), i.get(1)); + return new Border(i.get(0), i.get(1)); } if (i.size() == 3) { - return new IBorder(i.get(0), i.get(1), i.get(2)); + return new Border(i.get(0), i.get(1), i.get(2)); } - return new IBorder(i.get(0), i.get(1), i.get(2), i.get(3)); + return new Border(i.get(0), i.get(1), i.get(2), i.get(3)); } public IBinnieTexture getTextureSheet(final String name) { diff --git a/src/main/java/binnie/craftgui/resource/minecraft/PaddedTexture.java b/src/main/java/binnie/craftgui/resource/minecraft/PaddedTexture.java index 8e462f82..bdd2927d 100644 --- a/src/main/java/binnie/craftgui/resource/minecraft/PaddedTexture.java +++ b/src/main/java/binnie/craftgui/resource/minecraft/PaddedTexture.java @@ -1,12 +1,12 @@ package binnie.craftgui.resource.minecraft; import binnie.core.resource.IBinnieTexture; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IBorder; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Border; import binnie.craftgui.resource.Texture; public class PaddedTexture extends Texture { public PaddedTexture(final int u, final int v, final int w, final int h, final int offset, final IBinnieTexture textureFile, final int leftPadding, final int rightPadding, final int topPadding, final int bottomPadding) { - super(new IArea(u, v, w, h), new IBorder(topPadding, rightPadding, bottomPadding, leftPadding), new IBorder(offset), textureFile); + super(new Area(u, v, w, h), new Border(topPadding, rightPadding, bottomPadding, leftPadding), new Border(offset), textureFile); } } diff --git a/src/main/java/binnie/craftgui/resource/minecraft/StandardTexture.java b/src/main/java/binnie/craftgui/resource/minecraft/StandardTexture.java index 4f56b21d..6021d32d 100644 --- a/src/main/java/binnie/craftgui/resource/minecraft/StandardTexture.java +++ b/src/main/java/binnie/craftgui/resource/minecraft/StandardTexture.java @@ -2,8 +2,8 @@ package binnie.craftgui.resource.minecraft; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IBorder; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Border; import binnie.craftgui.resource.Texture; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -14,7 +14,7 @@ public class StandardTexture extends Texture { } public StandardTexture(final int u, final int v, final int w, final int h, final int padding, final IBinnieTexture textureFile) { - super(new IArea(u, v, w, h), IBorder.ZERO, new IBorder(padding), textureFile); + super(new Area(u, v, w, h), Border.ZERO, new Border(padding), textureFile); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/binnie/craftgui/window/Panel.java b/src/main/java/binnie/craftgui/window/Panel.java index 687b5585..dd7899d8 100644 --- a/src/main/java/binnie/craftgui/window/Panel.java +++ b/src/main/java/binnie/craftgui/window/Panel.java @@ -3,7 +3,7 @@ package binnie.craftgui.window; import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; import binnie.craftgui.minecraft.MinecraftGUI; import binnie.craftgui.resource.minecraft.CraftGUITexture; import net.minecraftforge.fml.relauncher.Side; @@ -17,7 +17,7 @@ public class Panel extends Control { this.type = type; } - public Panel(final IWidget parent, final IArea area, final IPanelType type) { + public Panel(final IWidget parent, final Area area, final IPanelType type) { this(parent, area.xPos(), area.yPos(), area.width(), area.height(), type); } diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java index c8587cf4..19a4160b 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java @@ -2,7 +2,7 @@ package binnie.extrabees.gui; import binnie.core.AbstractMod; import binnie.craftgui.controls.ControlText; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; import binnie.craftgui.core.geometry.TextJustification; import binnie.craftgui.minecraft.Window; import binnie.craftgui.minecraft.control.ControlItemDisplay; @@ -39,7 +39,7 @@ public class WindowAlvearyMutator extends Window { this.setTitle("Mutator"); new ControlPlayerInventory(this); new ControlSlot.Builder(this, 79, 30).assign(0); - new ControlText(this, new IArea(0, 52, this.width(), 16), "Possible Mutagens:", TextJustification.MiddleCenter).setColour(5592405); + new ControlText(this, new Area(0, 52, this.width(), 16), "Possible Mutagens:", TextJustification.MiddleCenter).setColour(5592405); final int size = AlvearyMutator.getMutagens().size(); final int w = size * 18; NumberFormat numberFormat = NumberFormat.getNumberInstance(MinecraftForgeClient.getLocale()); diff --git a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java b/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java index 21bde0db..3503e598 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlBiomes.java @@ -7,7 +7,7 @@ import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; import binnie.craftgui.resource.minecraft.CraftGUITexture; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; @@ -54,7 +54,7 @@ public class ControlBiomes extends Control implements ITooltip { //TODO FIND COLOR //CraftGUI.Render.colour(Biome.getBiome(i).color); } - CraftGUI.render.texture(CraftGUITexture.Button, new IArea(x, y, 16, 16)); + CraftGUI.render.texture(CraftGUITexture.Button, new Area(x, y, 16, 16)); } } diff --git a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java index 45152364..401e2db6 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlClimateBar.java @@ -7,7 +7,7 @@ import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.resource.minecraft.CraftGUITexture; import forestry.api.apiculture.IAlleleBeeSpecies; @@ -81,7 +81,7 @@ public class ControlClimateBar extends Control implements ITooltip { } else { colour = this.tempColours[i]; } - RenderUtil.drawSolidRect(new IArea(x + 1, 1, w, this.getSize().y() - 2), colour); + RenderUtil.drawSolidRect(new Area(x + 1, 1, w, this.getSize().y() - 2), colour); } } CraftGUI.render.texture(CraftGUITexture.EnergyBarGlass, this.getArea()); diff --git a/src/main/java/binnie/extrabees/gui/database/ControlProductsItem.java b/src/main/java/binnie/extrabees/gui/database/ControlProductsItem.java index 5cc31a3f..258cfa77 100644 --- a/src/main/java/binnie/extrabees/gui/database/ControlProductsItem.java +++ b/src/main/java/binnie/extrabees/gui/database/ControlProductsItem.java @@ -5,7 +5,7 @@ import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.controls.listbox.ControlList; import binnie.craftgui.controls.listbox.ControlOption; import binnie.craftgui.core.geometry.CraftGUIUtil; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.minecraft.control.ControlItemDisplay; import java.text.DecimalFormat; @@ -17,7 +17,7 @@ public class ControlProductsItem extends ControlOption Window.get(this).getSize().x() + 100 || relativeToWindow.y() > Window.get(this).getSize().y() + 100) { return; } @@ -72,10 +72,10 @@ public class ControlFluidDisplay extends Control implements ITooltip { GlStateManager.pushMatrix(); final float scale = this.getSize().x() / 16.0f; GlStateManager.scale(scale, scale, 1.0f); - RenderUtil.drawSprite(IPoint.ZERO, icon); + RenderUtil.drawSprite(Point.ZERO, icon); GlStateManager.popMatrix(); } else { - RenderUtil.drawSprite(IPoint.ZERO, icon); + RenderUtil.drawSprite(Point.ZERO, icon); } GlStateManager.disableBlend(); } diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java index 0886023a..10647b63 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java @@ -6,8 +6,8 @@ import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventWidget; import binnie.craftgui.resource.minecraft.CraftGUITexture; @@ -34,7 +34,7 @@ public class ControlSlotFluid extends Control implements ITooltip { this.addSelfEventHandler(new EventWidget.ChangeSize.Handler() { @Override public void onEvent(final EventWidget.ChangeSize event) { - ControlSlotFluid.this.itemDisplay.setSize(ControlSlotFluid.this.getSize().sub(new IPoint(2, 2))); + ControlSlotFluid.this.itemDisplay.setSize(ControlSlotFluid.this.getSize().sub(new Point(2, 2))); } }); } @@ -45,7 +45,7 @@ public class ControlSlotFluid extends Control implements ITooltip { final int size = this.getSize().x(); CraftGUI.render.texture(CraftGUITexture.Slot, this.getArea()); if (this.getTopParent().getMousedOverWidget() == this) { - RenderUtil.drawGradientRect(new IArea(new IPoint(1, 1), this.getArea().size().sub(new IPoint(2, 2))), -2130706433, -2130706433); + RenderUtil.drawGradientRect(new Area(new Point(1, 1), this.getArea().size().sub(new Point(2, 2))), -2130706433, -2130706433); } } diff --git a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java index 36308fc1..815f3944 100644 --- a/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java +++ b/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java @@ -1,7 +1,7 @@ package binnie.extratrees.kitchen.craftgui; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; import binnie.craftgui.events.EventMouse; import binnie.craftgui.minecraft.Window; import net.minecraft.nbt.NBTTagCompound; @@ -32,7 +32,7 @@ public class ControlTankSlot extends ControlSlotFluid { public void onUpdateClient() { this.fluidStack = Window.get(this).getContainer().getTankInfo(this.tankID).liquid; final int height = 16 * (((this.fluidStack == null) ? 0 : this.fluidStack.amount) / 1000); - this.itemDisplay.setCroppedZone(this.itemDisplay, new IArea(0, 16 - height, 16, 16)); + this.itemDisplay.setCroppedZone(this.itemDisplay, new Area(0, 16 - height, 16, 16)); super.onUpdateClient(); } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java index 1c68f7b4..f7b938a4 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlBlockIconDisplay.java @@ -2,7 +2,7 @@ package binnie.extratrees.machines.craftgui; import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.renderer.RenderUtil; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraftforge.fml.relauncher.Side; @@ -19,6 +19,6 @@ public class ControlBlockIconDisplay extends Control { @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { - RenderUtil.drawSprite(IPoint.ZERO, this.icon); + RenderUtil.drawSprite(Point.ZERO, this.icon); } } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java index da3e831d..165414d3 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlBreweryProgress.java @@ -5,8 +5,8 @@ import binnie.core.util.ItemStackSet; import binnie.craftgui.core.Attribute; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.minecraft.Window; import binnie.craftgui.minecraft.control.ControlProgressBase; @@ -29,25 +29,25 @@ public class ControlBreweryProgress extends ControlProgressBase { @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { - CraftGUI.render.texture(ControlBreweryProgress.Brewery, IPoint.ZERO); + CraftGUI.render.texture(ControlBreweryProgress.Brewery, Point.ZERO); final BreweryLogic logic = Machine.getInterface(BreweryLogic.class, Window.get(this).getInventory()); if (logic == null || logic.currentCrafting == null || logic.currentCrafting.inputFluid == null) { return; } final int fermentedHeight = (int) (32.0f * logic.getProgress() / 100.0f); - CraftGUI.render.limitArea(new IArea(new IPoint(1, 6).add(this.getAbsolutePosition()), new IPoint(32, 32 - fermentedHeight)), guiWidth, guiHeight); + CraftGUI.render.limitArea(new Area(new Point(1, 6).add(this.getAbsolutePosition()), new Point(32, 32 - fermentedHeight)), guiWidth, guiHeight); GL11.glEnable(GL11.GL_SCISSOR_TEST); - RenderUtil.drawFluid(new IPoint(1, 6), logic.currentCrafting.inputFluid); - RenderUtil.drawFluid(new IPoint(17, 6), logic.currentCrafting.inputFluid); - RenderUtil.drawFluid(new IPoint(1, 22), logic.currentCrafting.inputFluid); - RenderUtil.drawFluid(new IPoint(17, 22), logic.currentCrafting.inputFluid); + RenderUtil.drawFluid(new Point(1, 6), logic.currentCrafting.inputFluid); + RenderUtil.drawFluid(new Point(17, 6), logic.currentCrafting.inputFluid); + RenderUtil.drawFluid(new Point(1, 22), logic.currentCrafting.inputFluid); + RenderUtil.drawFluid(new Point(17, 22), logic.currentCrafting.inputFluid); GL11.glDisable(GL11.GL_SCISSOR_TEST); - CraftGUI.render.limitArea(new IArea(new IPoint(1, 38 - fermentedHeight).add(this.getAbsolutePosition()), new IPoint(32, fermentedHeight)), guiWidth, guiHeight); + CraftGUI.render.limitArea(new Area(new Point(1, 38 - fermentedHeight).add(this.getAbsolutePosition()), new Point(32, fermentedHeight)), guiWidth, guiHeight); GL11.glEnable(GL11.GL_SCISSOR_TEST); - RenderUtil.drawFluid(new IPoint(1, 6), BreweryRecipes.getOutput(logic.currentCrafting)); - RenderUtil.drawFluid(new IPoint(17, 6), BreweryRecipes.getOutput(logic.currentCrafting)); - RenderUtil.drawFluid(new IPoint(1, 22), BreweryRecipes.getOutput(logic.currentCrafting)); - RenderUtil.drawFluid(new IPoint(17, 22), BreweryRecipes.getOutput(logic.currentCrafting)); + RenderUtil.drawFluid(new Point(1, 6), BreweryRecipes.getOutput(logic.currentCrafting)); + RenderUtil.drawFluid(new Point(17, 6), BreweryRecipes.getOutput(logic.currentCrafting)); + RenderUtil.drawFluid(new Point(1, 22), BreweryRecipes.getOutput(logic.currentCrafting)); + RenderUtil.drawFluid(new Point(17, 22), BreweryRecipes.getOutput(logic.currentCrafting)); GL11.glDisable(GL11.GL_SCISSOR_TEST); final ItemStackSet stacks = new ItemStackSet(); Collections.addAll(stacks, logic.currentCrafting.inputGrains); @@ -55,7 +55,7 @@ public class ControlBreweryProgress extends ControlProgressBase { int x = 1; int y = 6; for (final ItemStack stack : stacks) { - RenderUtil.drawItem(new IPoint(x, y), stack); + RenderUtil.drawItem(new Point(x, y), stack); x += 16; if (x > 18) { x = 1; diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java index 224da62d..f4037b8b 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlDistilleryProgress.java @@ -3,8 +3,8 @@ package binnie.extratrees.machines.craftgui; import binnie.core.machines.Machine; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.Position; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventMouse; @@ -29,8 +29,8 @@ public class ControlDistilleryProgress extends ControlProgressBase { @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { - CraftGUI.render.texture(DISTILLERY_BASE, IPoint.ZERO); - CraftGUI.render.texturePercentage(LIQUID_FLOW, new IArea(18, 0, 38, 66), Position.LEFT, this.progress); + CraftGUI.render.texture(DISTILLERY_BASE, Point.ZERO); + CraftGUI.render.texturePercentage(LIQUID_FLOW, new Area(18, 0, 38, 66), Position.LEFT, this.progress); final DistilleryLogic component = Machine.getInterface(DistilleryLogic.class, Window.get(this).getInventory()); FluidStack stack = null; if (component != null) { @@ -38,7 +38,7 @@ public class ControlDistilleryProgress extends ControlProgressBase { } if (stack != null) { for (int y = 0; y < 4; ++y) { - RenderUtil.drawFluid(new IPoint(1, 1 + y * 16), stack); + RenderUtil.drawFluid(new Point(1, 1 + y * 16), stack); } } } @@ -50,8 +50,8 @@ public class ControlDistilleryProgress extends ControlProgressBase { if (distilleryLogic != null) { final int level = distilleryLogic.level; GlStateManager.enableAlpha(); - CraftGUI.render.texture(OUTPUT, new IPoint(47, 14 + level * 15)); - CraftGUI.render.texture(DISTILLERY_OVERLAY, IPoint.ZERO); + CraftGUI.render.texture(OUTPUT, new Point(47, 14 + level * 15)); + CraftGUI.render.texture(DISTILLERY_OVERLAY, Point.ZERO); } } @@ -61,11 +61,11 @@ public class ControlDistilleryProgress extends ControlProgressBase { @Override public void onEvent(final EventMouse.Down event) { int distillationLevel = -1; - if (new IArea(45, 8, 19, 11).contains(ControlDistilleryProgress.this.getRelativeMousePosition())) { + if (new Area(45, 8, 19, 11).contains(ControlDistilleryProgress.this.getRelativeMousePosition())) { distillationLevel = 0; - } else if (new IArea(45, 23, 19, 11).contains(ControlDistilleryProgress.this.getRelativeMousePosition())) { + } else if (new Area(45, 23, 19, 11).contains(ControlDistilleryProgress.this.getRelativeMousePosition())) { distillationLevel = 1; - } else if (new IArea(45, 38, 19, 11).contains(ControlDistilleryProgress.this.getRelativeMousePosition())) { + } else if (new Area(45, 38, 19, 11).contains(ControlDistilleryProgress.this.getRelativeMousePosition())) { distillationLevel = 2; } if (distillationLevel >= 0) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java index 4e4738b9..d7b78936 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlFruitPressProgress.java @@ -3,7 +3,7 @@ package binnie.extratrees.machines.craftgui; import binnie.craftgui.core.Attribute; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventMouse; import binnie.craftgui.minecraft.ContainerCraftGUI; @@ -30,7 +30,7 @@ public class ControlFruitPressProgress extends ControlProgressBase { @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { - CraftGUI.render.texture(ControlFruitPressProgress.PressSlot, new IPoint(3, 52)); + CraftGUI.render.texture(ControlFruitPressProgress.PressSlot, new Point(3, 52)); ContainerCraftGUI container = Window.get(this).getContainer(); IInventory inventory = Window.get(this).getInventory(); Slot slotFromInventory = container.getSlotFromInventory(inventory, FruitPressMachine.SLOT_CURRENT); @@ -42,15 +42,15 @@ public class ControlFruitPressProgress extends ControlProgressBase { return; } FluidStack fluid = FruitPressRecipes.getOutput(input); - RenderUtil.drawFluid(new IPoint(4, 52), fluid); - RenderUtil.drawItem(new IPoint(4, 52), input); + RenderUtil.drawFluid(new Point(4, 52), fluid); + RenderUtil.drawItem(new Point(4, 52), input); } @Override @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { GlStateManager.enableBlend(); - CraftGUI.render.texture(ControlFruitPressProgress.PressTexture, new IPoint(0, Math.round(16 * this.progress))); + CraftGUI.render.texture(ControlFruitPressProgress.PressTexture, new Point(0, Math.round(16 * this.progress))); } protected ControlFruitPressProgress(final IWidget parent, final int x, final int y) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java index b5f7c99b..46abcfff 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlLumbermillProgress.java @@ -2,8 +2,8 @@ package binnie.extratrees.machines.craftgui; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.minecraft.MinecraftGUI; import binnie.craftgui.minecraft.Window; import binnie.craftgui.minecraft.control.ControlProgressBase; @@ -41,7 +41,7 @@ public class ControlLumbermillProgress extends ControlProgressBase { public void onRenderForeground(int guiWidth, int guiHeight) { GlStateManager.disableLighting(); final int sawX = (int) (63 * this.progress); - CraftGUI.render.texture(ControlLumbermillProgress.Saw, new IPoint(sawX, -8 + Math.round(6 * (float) Math.sin(this.animation)))); + CraftGUI.render.texture(ControlLumbermillProgress.Saw, new Point(sawX, -8 + Math.round(6 * (float) Math.sin(this.animation)))); final ItemStack item = Window.get(this).getInventory().getStackInSlot(LumbermillMachine.SLOT_LOG); if (item.isEmpty()) { return; @@ -71,16 +71,16 @@ public class ControlLumbermillProgress extends ControlProgressBase { return; } //final IIcon icon2 = block2.getIcon(2, result.getItemDamage()); - final IPoint size = this.getSize(); - final IPoint pos = this.getAbsolutePosition(); - CraftGUI.render.limitArea(new IArea(pos.add(IPoint.ZERO), new IPoint(Math.round(this.progress * 64) + 2, 18)), guiWidth, guiHeight); + final Point size = this.getSize(); + final Point pos = this.getAbsolutePosition(); + CraftGUI.render.limitArea(new Area(pos.add(Point.ZERO), new Point(Math.round(this.progress * 64) + 2, 18)), guiWidth, guiHeight); GL11.glEnable(GL11.GL_SCISSOR_TEST); for (int j = 0; j < 4; ++j) { //TODO RENDERING //CraftGUI.Render.iconBlock(new IPoint(1 + j * 16, 1), icon2); } GL11.glDisable(GL11.GL_SCISSOR_TEST); - CraftGUI.render.texture(ControlLumbermillProgress.Saw2, new IPoint(sawX + 2, -8 + Math.round(6 * (float) Math.sin(this.animation)))); + CraftGUI.render.texture(ControlLumbermillProgress.Saw2, new Point(sawX + 2, -8 + Math.round(6 * (float) Math.sin(this.animation)))); } protected ControlLumbermillProgress(final IWidget parent, final int x, final int y) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java index 425f8a49..29b3f3ea 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/ControlTileSelect.java @@ -12,7 +12,7 @@ import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventMouse; import binnie.craftgui.minecraft.Window; @@ -93,7 +93,7 @@ public class ControlTileSelect extends Control implements IControlValue } for (final IDesignCategory category : designs.keySet()) { cx = 2; - new ControlText(this, new IPoint(cx, cy + 3), category.getName()); + new ControlText(this, new Point(cx, cy + 3), category.getName()); cy += 16; for (final IDesign tile : designs.get(category)) { if (cx > 90) { @@ -106,7 +106,7 @@ public class ControlTileSelect extends Control implements IControlValue cy += 20; } final int height = cy; - this.setSize(new IPoint(this.getSize().x(), height)); + this.setSize(new Point(this.getSize().x(), height)); } @Override @@ -159,14 +159,14 @@ public class ControlTileSelect extends Control implements IControlValue @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { - CraftGUI.render.texture(CraftGUITexture.Slot, IPoint.ZERO); + CraftGUI.render.texture(CraftGUITexture.Slot, Point.ZERO); } @Override @SideOnly(Side.CLIENT) public void onRenderForeground(int guiWidth, int guiHeight) { final ItemStack image = ((WindowWoodworker) this.getTopParent()).getDesignerType().getDisplayStack(this.getValue()); - RenderUtil.drawItem(new IPoint(1, 1), image); + RenderUtil.drawItem(new Point(1, 1), image); if (((IControlValue) this.getParent()).getValue() != this.getValue()) { if (Window.get(this).getMousedOverWidget() == this) { RenderUtil.drawGradientRect(this.getArea().inset(1), 1157627903, 1157627903); diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java b/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java index dd31e57b..ef3221e4 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageFruit.java @@ -3,7 +3,7 @@ package binnie.extratrees.machines.craftgui; import binnie.core.genetics.TreeBreedingSystem; import binnie.craftgui.controls.ControlText; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; import binnie.craftgui.core.geometry.TextJustification; import binnie.craftgui.minecraft.Window; import binnie.craftgui.mod.database.ControlSpeciesBox; @@ -28,7 +28,7 @@ public class PageFruit extends PageAbstract { public void onValueChanged(final ItemStack species) { this.deleteAllChildren(); final WindowAbstractDatabase database = Window.get(this); - new ControlText(this, new IArea(0, 0, this.size().x(), 24), ExtraTrees.proxy.localise("gui.database.tab.fruit." + (this.treesThatBearFruit ? "natural" : "potential")), TextJustification.MiddleCenter); + new ControlText(this, new Area(0, 0, this.size().x(), 24), ExtraTrees.proxy.localise("gui.database.tab.fruit." + (this.treesThatBearFruit ? "natural" : "potential")), TextJustification.MiddleCenter); final Collection trees = this.treesThatBearFruit ? ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatBearFruit(species, database.isNEI(), database.getWorld(), database.getUsername()) : ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatCanBearFruit(species, database.isNEI(), database.getWorld(), database.getUsername()); new ControlSpeciesBox(this, 4, 24, this.size().x() - 8, this.size().y() - 4 - 24).setOptions(trees); } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java index 844b2718..2b5ea6f4 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksOverview.java @@ -4,8 +4,8 @@ import binnie.core.BinnieCore; import binnie.craftgui.controls.ControlText; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.TextJustification; import binnie.craftgui.minecraft.Window; import binnie.craftgui.minecraft.control.ControlItemDisplay; @@ -28,8 +28,8 @@ public class PagePlanksOverview extends PageAbstract { public void onValueChanged(final ItemStack species) { this.deleteAllChildren(); final WindowAbstractDatabase database = Window.get(this); - new ControlText(this, new IArea(0, 0, this.size().x(), 24), species.getDisplayName(), TextJustification.MiddleCenter); - new ControlText(this, new IArea(12, 24, this.size().x() - 24, 24), ExtraTrees.proxy.localise("gui.database.planks.use"), TextJustification.MIDDLE_LEFTt); + new ControlText(this, new Area(0, 0, this.size().x(), 24), species.getDisplayName(), TextJustification.MiddleCenter); + new ControlText(this, new Area(12, 24, this.size().x() - 24, 24), ExtraTrees.proxy.localise("gui.database.planks.use"), TextJustification.MIDDLE_LEFTt); final IPlankType type = WoodManager.get(species); int x = 12; if (type != null) { @@ -49,8 +49,8 @@ public class PagePlanksOverview extends PageAbstract { x += 22; } } - final ControlText controlDescription = new ControlText(this, new IArea(8, 84, this.getSize().x() - 16, 0), "", TextJustification.MiddleCenter); - final ControlText controlSignature = new ControlText(this, new IArea(8, 84, this.getSize().x() - 16, 0), "", TextJustification.BottomRight); + final ControlText controlDescription = new ControlText(this, new Area(8, 84, this.getSize().x() - 16, 0), "", TextJustification.MiddleCenter); + final ControlText controlSignature = new ControlText(this, new Area(8, 84, this.getSize().x() - 16, 0), "", TextJustification.BottomRight); String desc = ""; if (type != null) { desc = type.getDescription(); @@ -72,6 +72,6 @@ public class PagePlanksOverview extends PageAbstract { controlDescription.setValue(descBody + "§r"); controlSignature.setValue(descSig + "§r"); final int descHeight = CraftGUI.render.textHeight(controlDescription.getValue(), controlDescription.getSize().x()); - controlSignature.setPosition(new IPoint(controlSignature.pos().x(), controlDescription.getPosition().y() + descHeight + 10)); + controlSignature.setPosition(new Point(controlSignature.pos().x(), controlDescription.getPosition().y() + descHeight + 10)); } } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java index 2630edcb..66fe320b 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PagePlanksTrees.java @@ -3,7 +3,7 @@ package binnie.extratrees.machines.craftgui; import binnie.core.genetics.TreeBreedingSystem; import binnie.craftgui.controls.ControlText; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; import binnie.craftgui.core.geometry.TextJustification; import binnie.craftgui.minecraft.Window; import binnie.craftgui.mod.database.ControlSpeciesBox; @@ -24,7 +24,7 @@ public class PagePlanksTrees extends PageAbstract { public void onValueChanged(final ItemStack species) { this.deleteAllChildren(); final WindowAbstractDatabase database = Window.get(this); - new ControlText(this, new IArea(0, 0, this.size().x(), 24), species.getDisplayName(), TextJustification.MiddleCenter); + new ControlText(this, new Area(0, 0, this.size().x(), 24), species.getDisplayName(), TextJustification.MiddleCenter); final Collection trees = ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatMakePlanks(species, database.isNEI(), database.getWorld(), database.getUsername()); new ControlSpeciesBox(this, 4, 24, this.size().x() - 8, this.size().y() - 4 - 24).setOptions(trees); } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java index a5a67b8e..890d394f 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageSpeciesTreeGenome.java @@ -7,8 +7,8 @@ import binnie.craftgui.controls.ControlText; import binnie.craftgui.controls.core.Control; import binnie.craftgui.controls.scroll.ControlScrollableContent; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.TextJustification; import binnie.craftgui.minecraft.control.ControlItemDisplay; import binnie.craftgui.mod.database.DatabaseTab; @@ -45,7 +45,7 @@ public class PageSpeciesTreeGenome extends PageSpecies { final ItemStack log = treeSpecies.getWoodProvider().getWoodStack(); final int w = 144; final int h = 176; - new ControlText(this, new IArea(0, 4, w, 16), this.getValue().toString(), TextJustification.MiddleCenter); + new ControlText(this, new Area(0, 4, w, 16), this.getValue().toString(), TextJustification.MiddleCenter); final ControlScrollableContent scrollable = new ControlScrollableContent(this, 4, 20, w - 8, h - 8 - 16, 12); final Control contents = new Control(scrollable, 0, 0, w - 8 - 12, h - 8 - 16); final int tw = w - 8 - 12; @@ -55,10 +55,10 @@ public class PageSpeciesTreeGenome extends PageSpecies { final int th = 14; final int th2 = 18; final BreedingSystem syst = Binnie.GENETICS.treeBreedingSystem; - new ControlText(contents, new IArea(w2, y, w3, th), treeSpecies.getPlantType().toString(), TextJustification.MIDDLE_LEFTt); + new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getPlantType().toString(), TextJustification.MIDDLE_LEFTt); y += th; - new ControlText(contents, new IArea(0, y, w2, th), BinnieCore.getBinnieProxy().localise("gui.temperature.short") + " : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MIDDLE_LEFTt); + new ControlText(contents, new Area(0, y, w2, th), BinnieCore.getBinnieProxy().localise("gui.temperature.short") + " : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(w2, y, w3, th), treeSpecies.getTemperature().getName(), TextJustification.MIDDLE_LEFTt); y += th; //TODO RENDERING //final IIcon leaf = treeSpecies.getLeafIcon(false, false); @@ -84,24 +84,24 @@ public class PageSpeciesTreeGenome extends PageSpecies { // final ItemStack log = (genome.getFruitProvider().getProducts().length // > 0) ? genome.getFruitProvider().getProducts()[0] : null; if (log != null) { - new ControlText(contents, new IArea(0, y, w2, th2), ExtraTrees.proxy.localise("gui.database.log") + " : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(0, y, w2, th2), ExtraTrees.proxy.localise("gui.database.log") + " : ", TextJustification.MiddleRight); final ControlItemDisplay display = new ControlItemDisplay(contents, w2, y); display.setItemStack(log); display.setTooltip(); y += th2; } - new ControlText(contents, new IArea(0, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.HEIGHT) + " : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), genome.getHeight() + "x", TextJustification.MIDDLE_LEFTt); + new ControlText(contents, new Area(0, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.HEIGHT) + " : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(w2, y, w3, th), genome.getHeight() + "x", TextJustification.MIDDLE_LEFTt); y += th; - new ControlText(contents, new IArea(0, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.FERTILITY) + " : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MIDDLE_LEFTt); + new ControlText(contents, new Area(0, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.FERTILITY) + " : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(w2, y, w3, th), genome.getFertility() + "x", TextJustification.MIDDLE_LEFTt); y += th; final List fruits = new ArrayList<>(); for (final ItemStack stack : genome.getFruitProvider().getProducts().keySet()) { fruits.add(stack); } if (!fruits.isEmpty()) { - new ControlText(contents, new IArea(0, y, w2, th2), syst.getChromosomeShortName(EnumTreeChromosome.FRUITS) + " : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(0, y, w2, th2), syst.getChromosomeShortName(EnumTreeChromosome.FRUITS) + " : ", TextJustification.MiddleRight); for (final ItemStack fruitw : fruits) { final ControlItemDisplay display2 = new ControlItemDisplay(contents, w2, y); display2.setItemStack(fruitw); @@ -109,19 +109,19 @@ public class PageSpeciesTreeGenome extends PageSpecies { y += th2; } } - new ControlText(contents, new IArea(0, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.YIELD) + " : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), genome.getYield() + "x", TextJustification.MIDDLE_LEFTt); + new ControlText(contents, new Area(0, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.YIELD) + " : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(w2, y, w3, th), genome.getYield() + "x", TextJustification.MIDDLE_LEFTt); y += th; - new ControlText(contents, new IArea(0, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.SAPPINESS) + " : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), genome.getSappiness() + "x", TextJustification.MIDDLE_LEFTt); + new ControlText(contents, new Area(0, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.SAPPINESS) + " : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(w2, y, w3, th), genome.getSappiness() + "x", TextJustification.MIDDLE_LEFTt); y += th; - new ControlText(contents, new IArea(0, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.MATURATION) + " : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), genome.getMaturationTime() + "x", TextJustification.MIDDLE_LEFTt); + new ControlText(contents, new Area(0, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.MATURATION) + " : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(w2, y, w3, th), genome.getMaturationTime() + "x", TextJustification.MIDDLE_LEFTt); y += th; - new ControlText(contents, new IArea(0, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.GIRTH) + " : ", TextJustification.MiddleRight); - new ControlText(contents, new IArea(w2, y, w3, th), genome.getGirth() + "x" + genome.getGirth(), TextJustification.MIDDLE_LEFTt); + new ControlText(contents, new Area(0, y, w2, th), syst.getChromosomeShortName(EnumTreeChromosome.GIRTH) + " : ", TextJustification.MiddleRight); + new ControlText(contents, new Area(w2, y, w3, th), genome.getGirth() + "x" + genome.getGirth(), TextJustification.MIDDLE_LEFTt); y += th; - contents.setSize(new IPoint(contents.size().x(), y)); + contents.setSize(new Point(contents.size().x(), y)); scrollable.setScrollableContent(contents); } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java b/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java index 71ac5f54..b036929e 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/PageWood.java @@ -3,7 +3,7 @@ package binnie.extratrees.machines.craftgui; import binnie.core.genetics.TreeBreedingSystem; import binnie.craftgui.controls.ControlText; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; import binnie.craftgui.core.geometry.TextJustification; import binnie.craftgui.minecraft.Window; import binnie.craftgui.mod.database.ControlSpeciesBox; @@ -24,7 +24,7 @@ public class PageWood extends PageAbstract { public void onValueChanged(final ItemStack species) { this.deleteAllChildren(); final WindowAbstractDatabase database = Window.get(this); - new ControlText(this, new IArea(0, 0, this.size().x(), 24), this.getValue().toString(), TextJustification.MiddleCenter); + new ControlText(this, new Area(0, 0, this.size().x(), 24), this.getValue().toString(), TextJustification.MiddleCenter); final Collection trees = ((TreeBreedingSystem) database.getBreedingSystem()).getTreesThatHaveWood(species, database.isNEI(), database.getWorld(), database.getUsername()); new ControlSpeciesBox(this, 4, 24, this.size().x() - 8, this.size().y() - 4 - 24).setOptions(trees); } diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java index 4113f24a..0efc11df 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowArboristDatabase.java @@ -5,7 +5,7 @@ import binnie.core.AbstractMod; import binnie.core.genetics.TreeBreedingSystem; import binnie.craftgui.controls.listbox.ControlListBox; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; import binnie.craftgui.minecraft.Window; import binnie.craftgui.mod.database.ControlItemStackOption; import binnie.craftgui.mod.database.DatabaseTab; @@ -51,7 +51,7 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { new PageBreeder(this.getInfoPages(Mode.BREEDER), this.getUsername(), new DatabaseTab(ExtraTrees.instance, "breeder", 0)); this.createMode(TreeMode.FRUIT, new ModeWidgets(TreeMode.FRUIT, this) { @Override - public void createListBox(final IArea area) { + public void createListBox(final Area area) { (this.listBox = new ControlListBox(this.modePage, area.xPos(), area.yPos(), area.width(), area.height(), 12) { @Override public IWidget createOption(final ItemStack value, final int y) { @@ -62,7 +62,7 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { }); this.createMode(TreeMode.WOOD, new ModeWidgets(TreeMode.WOOD, this) { @Override - public void createListBox(final IArea area) { + public void createListBox(final Area area) { (this.listBox = new ControlListBox(this.modePage, area.xPos(), area.yPos(), area.width(), area.height(), 12) { @Override public IWidget createOption(final ItemStack value, final int y) { @@ -73,7 +73,7 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { }); this.createMode(TreeMode.PLANKS, new ModeWidgets(TreeMode.PLANKS, this) { @Override - public void createListBox(final IArea area) { + public void createListBox(final Area area) { (this.listBox = new ControlListBox(this.modePage, area.xPos(), area.yPos(), area.width(), area.height(), 12) { @Override public IWidget createOption(final ItemStack value, final int y) { diff --git a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java index 559b2664..a45e19cc 100644 --- a/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java +++ b/src/main/java/binnie/extratrees/machines/craftgui/WindowWoodworker.java @@ -6,8 +6,8 @@ import binnie.core.machines.Machine; import binnie.craftgui.controls.ControlText; import binnie.craftgui.controls.ControlTextEdit; import binnie.craftgui.controls.scroll.ControlScrollableContent; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.TextJustification; import binnie.craftgui.events.EventHandler; import binnie.craftgui.events.EventTextEdit; @@ -35,12 +35,12 @@ public class WindowWoodworker extends Window { @SideOnly(Side.CLIENT) public void initialiseClient() { this.setTitle(Machine.getMachine(this.getInventory()).getPackage().getDisplayName()); - new ControlText(this, new IArea(190, 36, 114, 10), BinnieCore.getBinnieProxy().localise("gui.design"), TextJustification.TopCenter).setColour(4473924); + new ControlText(this, new Area(190, 36, 114, 10), BinnieCore.getBinnieProxy().localise("gui.design"), TextJustification.TopCenter).setColour(4473924); new Panel(this, 188, 48, 118, 126, MinecraftGUI.PanelType.Gray); this.textEdit = new ControlTextEdit(this, 188, 178, 118, 12); final ControlScrollableContent scroll = new ControlScrollableContent(this, 190, 50, 114, 122, 12); scroll.setScrollableContent(this.tileSelect = new ControlTileSelect(scroll, 0, 0)); - new ControlPlayerInventory(this).setPosition(new IPoint(14, 96)); + new ControlPlayerInventory(this).setPosition(new Point(14, 96)); new ControlErrorState(this, 76, 65); if (this.getInventory() != null) { final ControlSlot slotWood1 = new ControlSlot.Builder(this, 22, 34).assign(Designer.design1Slot); diff --git a/src/main/java/binnie/genetics/CreativeTabGenetics.java b/src/main/java/binnie/genetics/CreativeTabGenetics.java index a7f21592..f6dbe5d9 100644 --- a/src/main/java/binnie/genetics/CreativeTabGenetics.java +++ b/src/main/java/binnie/genetics/CreativeTabGenetics.java @@ -29,7 +29,7 @@ public class CreativeTabGenetics extends CreativeTabs { @Override @SideOnly(Side.CLIENT) public ItemStack getTabIconItem() { - return GeneticsItems.EmptySerum.get(1); + return GeneticsItems.EMPTY_SERUM.get(1); } } diff --git a/src/main/java/binnie/genetics/genetics/Engineering.java b/src/main/java/binnie/genetics/genetics/Engineering.java index 671e4100..3c9a8734 100644 --- a/src/main/java/binnie/genetics/genetics/Engineering.java +++ b/src/main/java/binnie/genetics/genetics/Engineering.java @@ -7,6 +7,7 @@ import binnie.genetics.api.IItemSerum; import binnie.genetics.item.GeneticsItems; import binnie.genetics.item.ItemSerum; import binnie.genetics.item.ItemSerumArray; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import javax.annotation.Nullable; @@ -16,18 +17,21 @@ public class Engineering { if (stack.isEmpty()) { return false; } - if (stack.getItem() instanceof IItemSerum) { - return ((IItemSerum) stack.getItem()).getCharges(stack) == 0; + Item item = stack.getItem(); + if (item instanceof IItemSerum) { + return ((IItemSerum) item).getCharges(stack) == 0; } - return stack.getItem() == Genetics.items().getItemGenetics() && (stack.getItemDamage() == GeneticsItems.EmptySerum.ordinal() || stack.getItemDamage() == GeneticsItems.EmptyGenome.ordinal()); + int metadata = stack.getMetadata(); + return item == Genetics.items().getItemGenetics() && (metadata == GeneticsItems.EMPTY_SERUM.ordinal() || metadata == GeneticsItems.EMPTY_GENOME.ordinal()); } public static boolean canAcceptGene(final ItemStack stack, final IGene gene) { - if (stack.getItem() instanceof ItemSerum) { + Item item = stack.getItem(); + if (item instanceof ItemSerum) { return true; } - if (stack.getItem() instanceof IItemSerum) { - return ((IItemSerum) stack.getItem()).getSpeciesRoot(stack) == gene.getSpeciesRoot(); + if (item instanceof IItemSerum) { + return ((IItemSerum) item).getSpeciesRoot(stack) == gene.getSpeciesRoot(); } return isGeneAcceptor(stack); } @@ -41,24 +45,28 @@ public class Engineering { } public static ItemStack addGene(final ItemStack stack, final IGene gene) { - if (stack.getItem() instanceof IItemSerum) { - ((IItemSerum) stack.getItem()).addGene(stack, gene); + Item item = stack.getItem(); + int metadata = stack.getMetadata(); + if (item instanceof IItemSerum) { + ((IItemSerum) item).addGene(stack, gene); } - if (stack.getItem() == Genetics.items().getItemGenetics() && stack.getItemDamage() == GeneticsItems.EmptySerum.ordinal()) { - return ItemSerum.create(gene); - } - if (stack.getItem() == Genetics.items().getItemGenetics() && stack.getItemDamage() == GeneticsItems.EmptyGenome.ordinal()) { - return ItemSerumArray.create(gene); + if(item == Genetics.items().getItemGenetics()){ + if (metadata == GeneticsItems.EMPTY_SERUM.ordinal()) { + return ItemSerum.create(gene); + }else if (metadata == GeneticsItems.EMPTY_GENOME.ordinal()) { + return ItemSerumArray.create(gene); + } } return stack; } public static IGene[] getGenes(final ItemStack serum) { if (!serum.isEmpty()) { - if (serum.getItem() instanceof IItemSerum) { - return ((IItemSerum) serum.getItem()).getGenes(serum); + Item item = serum.getItem(); + if (item instanceof IItemSerum) { + return ((IItemSerum) item).getGenes(serum); } - if (serum.getItem() == Genetics.items().itemSequencer) { + if (item == Genetics.items().itemSequencer) { SequencerItem sequencerItem = SequencerItem.create(serum); if (sequencerItem != null) { return new IGene[]{sequencerItem.getGene()}; diff --git a/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java b/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java deleted file mode 100644 index ccdf64e4..00000000 --- a/src/main/java/binnie/genetics/gui/AnalystPageAppearance.java +++ /dev/null @@ -1,60 +0,0 @@ -package binnie.genetics.gui; - -import binnie.botany.api.IFlower; -import binnie.botany.craftgui.ControlColourDisplay; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.minecraft.control.ControlIconDisplay; -import forestry.api.genetics.IAlleleSpecies; - -public class AnalystPageAppearance extends ControlAnalystPage { - public AnalystPageAppearance(final IWidget parent, final IArea area, final IFlower ind) { - super(parent, area); - this.setColour(3355443); - int y = 4; - final IAlleleSpecies species = ind.getGenome().getPrimary(); - new ControlTextCentered(this, y, "§nAppearance").setColour(this.getColour()); - y += 12; - final ControlColourDisplay a = new ControlColourDisplay(this, this.width() / 2 - 28, y, ind.getGenome().getPrimaryColor()); - a.addTooltip("Primary Petal Colour"); - final ControlColourDisplay b = new ControlColourDisplay(this, this.width() / 2 - 8, y, ind.getGenome().getSecondaryColor()); - b.addTooltip("Secondary Petal Colour"); - final ControlColourDisplay c = new ControlColourDisplay(this, this.width() / 2 + 12, y, ind.getGenome().getStemColor()); - c.addTooltip("Stem Colour"); - y += 26; - final int sections = ind.getGenome().getType().getSections(); - final int w = (sections > 1) ? 50 : 100; - // TODO fix this control icon display - new ControlIconDisplay(this, (this.width() - w) / 2, y - ((sections == 1) ? 0 : 0), null) { - @Override - public void onRenderForeground(int guiWidth, int guiHeight) { -// GlStateManager.pushMatrix(); -// final float scale = w / 16.0f; -// final float dy = (sections > 1) ? 16.0f : 0.0f; -// GlStateManager.scale(scale, scale, 1.0f); -// CraftGUI.Render.colour(ind.getGenome().getStemColor().getColor(false)); -// if (sections > 1) { -// CraftGUI.Render.iconBlock(IPoint.ZERO, ind.getGenome().getType().getStem(EnumFlowerStage.FLOWER, true, 1)); -// } -// CraftGUI.Render.iconBlock(new IPoint(0, dy), ind.getGenome().getType().getStem(EnumFlowerStage.FLOWER, true, 0)); -// CraftGUI.Render.colour(ind.getGenome().getPrimaryColor().getColor(false)); -// if (sections > 1) { -// CraftGUI.Render.iconBlock(IPoint.ZERO, ind.getGenome().getType().getPetalIcon(EnumFlowerStage.FLOWER, true, 1)); -// } -// CraftGUI.Render.iconBlock(new IPoint(0, dy), ind.getGenome().getType().getPetalIcon(EnumFlowerStage.FLOWER, true, 0)); -// CraftGUI.Render.colour(ind.getGenome().getSecondaryColor().getColor(false)); -// if (sections > 1) { -// CraftGUI.Render.iconBlock(IPoint.ZERO, ind.getGenome().getType().getVariantIcon(EnumFlowerStage.FLOWER, true, 1)); -// } -// CraftGUI.Render.iconBlock(new IPoint(0, dy), ind.getGenome().getType().getVariantIcon(EnumFlowerStage.FLOWER, true, 0)); -// GlStateManager.popMatrix(); - } - }; - } - - @Override - public String getTitle() { - return "Appearance"; - } -} diff --git a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java index a542a9db..0a362f4e 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageBehaviour.java @@ -6,7 +6,7 @@ import binnie.craftgui.controls.ControlText; import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; import binnie.craftgui.core.geometry.TextJustification; import forestry.api.apiculture.IAlleleBeeEffect; import forestry.api.apiculture.IBee; @@ -19,9 +19,10 @@ import net.minecraft.util.math.Vec3i; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +//TODO:localise @SideOnly(Side.CLIENT) public class AnalystPageBehaviour extends ControlAnalystPage { - public AnalystPageBehaviour(final IWidget parent, final IArea area, final IIndividual ind) { + public AnalystPageBehaviour(final IWidget parent, final Area area, final IIndividual ind) { super(parent, area); this.setColour(6684723); int y = 4; @@ -40,7 +41,7 @@ public class AnalystPageBehaviour extends ControlAnalystPage { if (!effect.getUID().contains("None")) { final String effectDesc = BinnieCore.getBinnieProxy().localiseOrBlank("allele." + effect.getUID() + ".desc"); final String loc = effectDesc.equals("") ? ("Effect: " + effect.getName()) : effectDesc; - new ControlText(this, new IArea(4, y, this.width() - 8, 0), loc, TextJustification.TopCenter).setColour(this.getColour()); + new ControlText(this, new Area(4, y, this.width() - 8, 0), loc, TextJustification.TopCenter).setColour(this.getColour()); y += CraftGUI.render.textHeight(loc, this.width() - 8) + 1; new ControlTextCentered(this, y, "§oWithin " + t.getX() / 2 + " blocks").setColour(this.getColour()); y += 22; @@ -60,7 +61,7 @@ public class AnalystPageBehaviour extends ControlAnalystPage { if (!effect2.getUID().contains("None")) { final String effectDesc2 = BinnieCore.getBinnieProxy().localiseOrBlank("allele." + effect2.getUID() + ".desc"); final String loc2 = effectDesc2.equals("") ? ("Effect: " + effect2.getName()) : effectDesc2; - new ControlText(this, new IArea(4, y, this.width() - 8, 0), loc2, TextJustification.TopCenter).setColour(this.getColour()); + new ControlText(this, new Area(4, y, this.width() - 8, 0), loc2, TextJustification.TopCenter).setColour(this.getColour()); y += CraftGUI.render.textHeight(loc2, this.width() - 8) + 1; y += 22; } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageBiology.java b/src/main/java/binnie/genetics/gui/AnalystPageBiology.java index 394e779b..828b26d0 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageBiology.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageBiology.java @@ -4,62 +4,67 @@ import binnie.Binnie; import binnie.botany.api.IFlower; import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; +import binnie.craftgui.minecraft.control.ControlIconDisplay; +import binnie.genetics.Genetics; +import binnie.genetics.item.ModuleItems; import forestry.api.apiculture.IBee; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.ITree; import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.IButterfly; import forestry.apiculture.PluginApiculture; - +import net.minecraft.util.text.TextFormatting; import java.text.DecimalFormat; +import java.util.Locale; +//TODO:localise public class AnalystPageBiology extends ControlAnalystPage { - public AnalystPageBiology(final IWidget parent, final IArea area, final IIndividual ind) { + public AnalystPageBiology(final IWidget parent, final Area area, final IIndividual ind) { super(parent, area); this.setColour(26214); int y = 4; - new ControlTextCentered(this, y, "§nBiology").setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); y += 12; if (ind instanceof IBee) { final IBee bee = (IBee) ind; if (bee.getGenome().getNeverSleeps()) { - //new ControlIconDisplay(this, (this.w() - 64.0f) / 2.0f, y, ModuleItem.iconAllDay.getIcon()).addTooltip("Active all day and night"); + new ControlIconDisplay(this, (width() - 64) / 2, y, ModuleItems.iconAllDay).addTooltip(Genetics.proxy.localise("gui.analyst.biology.bee.allday")); } else if (bee.getGenome().getPrimary().isNocturnal()) { - //new ControlIconDisplay(this, (this.w() - 64.0f) / 2.0f, y, ModuleItem.iconNight.getIcon()).addTooltip("Active at night"); + new ControlIconDisplay(this, (width() - 64) / 2, y, ModuleItems.iconNight).addTooltip(Genetics.proxy.localise("gui.analyst.biology.bee.night")); } else { - //new ControlIconDisplay(this, (this.w() - 64.0f) / 2.0f, y, ModuleItem.iconDaytime.getIcon()).addTooltip("Active during the day"); + new ControlIconDisplay(this, (width() - 64) / 2, y, ModuleItems.iconDaytime).addTooltip(Genetics.proxy.localise("gui.analyst.biology.bee.day")); } if (!bee.getGenome().getToleratesRain()) { - //new ControlIconDisplay(this, (this.w() - 64.0f) / 2.0f + 24.0f, y, ModuleItem.iconNoRain.getIcon()).addTooltip("Cannot work during rain"); + new ControlIconDisplay(this, (width() - 64) / 2 + 24, y, ModuleItems.iconNoRain).addTooltip(Genetics.proxy.localise("gui.analyst.biology.bee.norain")); } else { - //new ControlIconDisplay(this, (this.w() - 64.0f) / 2.0f + 24.0f, y, ModuleItem.iconRain.getIcon()).addTooltip("Can work during rain"); + new ControlIconDisplay(this, (width() - 64) / 2 + 24, y, ModuleItems.iconRain).addTooltip(Genetics.proxy.localise("gui.analyst.biology.bee.rain")); } if (bee.getGenome().getCaveDwelling()) { - //new ControlIconDisplay(this, (this.w() - 64.0f) / 2.0f + 48.0f, y, ModuleItem.iconNoSky.getIcon()).addTooltip("Can work underground"); + new ControlIconDisplay(this, (width() - 64) / 2 + 48, y, ModuleItems.iconNoSky).addTooltip(Genetics.proxy.localise("gui.analyst.biology.bee.nosky")); } else { - //new ControlIconDisplay(this, (this.w() - 64.0f) / 2.0f + 48.0f, y, ModuleItem.iconSky.getIcon()).addTooltip("Cannot work underground"); + new ControlIconDisplay(this, (width() - 64) / 2 + 48, y, ModuleItems.iconSky).addTooltip(Genetics.proxy.localise("gui.analyst.biology.bee.sky")); } y += 30; } else if (ind instanceof IButterfly) { final IButterfly moth = (IButterfly) ind; if (moth.getGenome().getNocturnal()) { - //new ControlIconDisplay(this, (this.w() - 64.0f) / 2.0f, y, ModuleItem.iconAllDay.getIcon()).addTooltip("Active all day and night"); + new ControlIconDisplay(this, (width() - 64) / 2, y, ModuleItems.iconAllDay).addTooltip("Active all day and night"); } else if (moth.getGenome().getPrimary().isNocturnal()) { - //new ControlIconDisplay(this, (this.w() - 64.0f) / 2.0f, y, ModuleItem.iconNight.getIcon()).addTooltip("Active at night"); + new ControlIconDisplay(this, (width() - 64) / 2, y, ModuleItems.iconNight).addTooltip("Active at night"); } else { - //new ControlIconDisplay(this, (this.w() - 64.0f) / 2.0f, y, ModuleItem.iconDaytime.getIcon()).addTooltip("Active during the day"); + new ControlIconDisplay(this, (width() - 64) / 2, y, ModuleItems.iconDaytime).addTooltip("Active during the day"); } if (!moth.getGenome().getTolerantFlyer()) { - //new ControlIconDisplay(this, (this.w() - 64.0f) / 2.0f + 24.0f, y, ModuleItem.iconNoRain.getIcon()).addTooltip("Cannot work during rain"); + new ControlIconDisplay(this, (width() - 64) / 2 + 24, y, ModuleItems.iconNoRain).addTooltip("Cannot work during rain"); } else { - //new ControlIconDisplay(this, (this.w() - 64.0f) / 2.0f + 24.0f, y, ModuleItem.iconRain.getIcon()).addTooltip("Can work during rain"); + new ControlIconDisplay(this, (width() - 64) / 2 + 24, y, ModuleItems.iconRain).addTooltip("Can work during rain"); } if (moth.getGenome().getFireResist()) { - //new ControlIconDisplay(this, (this.w() - 64.0f) / 2.0f + 48.0f, y, ModuleItem.iconNoFire.getIcon()).addTooltip("Nonflammable"); + new ControlIconDisplay(this, (width() - 64) / 2 + 48, y, ModuleItems.iconNoFire).addTooltip("Nonflammable"); } else { - //new ControlIconDisplay(this, (this.w() - 64.0f) / 2.0f + 48.0f, y, ModuleItem.iconFire.getIcon()).addTooltip("Flammable"); + new ControlIconDisplay(this, (width() - 64) / 2 + 48, y, ModuleItems.iconFire).addTooltip("Flammable"); } y += 30; } else if (ind instanceof ITree) { @@ -103,12 +108,9 @@ public class AnalystPageBiology extends ControlAnalystPage { final int butterflySpawn = Math.round(1365.3999f / (tree.getGenome().getSappiness() * tree.getGenome().getYield() * 0.5f)); new ControlTextCentered(this, y, "Butterfies spawn every\n" + this.getTimeString(butterflySpawn) + " per leaf").setColour(this.getColour()); y += 34; - new ControlTextCentered(this, y, "Plant Types").setColour(this.getColour()); + new ControlTextCentered(this, y, "Plant Type").setColour(this.getColour()); y += 12; -// for (final EnumPlantType type : tree.getGenome().getPlantTypes()) { -// new ControlTextCentered(this, y, "§o" + type.name()).setColour(this.getColour()); -// y += 12; -// } + new ControlTextCentered(this, y, "§o" + tree.getGenome().getPrimary().getPlantType().toString().toLowerCase(Locale.ENGLISH)).setColour(this.getColour()); } if (ind instanceof IFlower) { final IFlower flower = (IFlower) ind; @@ -144,7 +146,7 @@ public class AnalystPageBiology extends ControlAnalystPage { new ControlTextCentered(this, y, "§o" + (int) (floweringLifespan / pollinateTime) + " per lifetime").setColour(this.getColour()); y += 22; } - this.setSize(new IPoint(this.width(), y)); + this.setSize(new Point(this.width(), y)); } private String getMCDayString(final float time) { @@ -157,6 +159,6 @@ public class AnalystPageBiology extends ControlAnalystPage { @Override public String getTitle() { - return "Biology"; + return Genetics.proxy.localise("gui.analyst.biology.title"); } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java index 2923b8ff..a77246bd 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDatabase.java @@ -9,17 +9,19 @@ import binnie.craftgui.controls.scroll.ControlScrollBar; import binnie.craftgui.controls.scroll.ControlScrollableContent; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.TextJustification; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventMouse; import binnie.craftgui.minecraft.MinecraftGUI; import binnie.craftgui.resource.minecraft.CraftGUITexture; import binnie.craftgui.window.Panel; +import binnie.genetics.Genetics; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; +import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -31,7 +33,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { private final ControlScrollableContent scroll; boolean isMaster; - public AnalystPageDatabase(final IWidget parent, final IArea area, final BreedingSystem system, final boolean isMaster) { + public AnalystPageDatabase(final IWidget parent, final Area area, final BreedingSystem system, final boolean isMaster) { super(parent, area); this.isMaster = isMaster; final int cOfSystem = system.getColour(); @@ -46,7 +48,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { final int newColour = (int) (cr * brightness) * 65536 + (int) (cg * brightness) * 256 + (int) (cb * brightness); this.setColour(newColour); int y = 4; - new ControlTextCentered(this, y, "§nRegistry").setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); y += 16; new ControlTextEdit(this, 20, y, this.width() - 40, 16) { @Override @@ -171,14 +173,14 @@ public class AnalystPageDatabase extends ControlAnalystPage { dy += 18; } } - this.setSize(new IPoint(this.width(), 4 + dy + 18)); + this.setSize(new Point(this.width(), 4 + dy + 18)); } }; } @Override public String getTitle() { - return "Registry"; + return Genetics.proxy.localise("gui.analyst.registry.title"); } private Collection getSpecies(final BreedingSystem system) { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java index a24d493c..1d528a72 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageDescription.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageDescription.java @@ -4,11 +4,13 @@ import binnie.craftgui.controls.ControlText; import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.TextJustification; +import binnie.genetics.Genetics; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; +import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -16,7 +18,7 @@ import java.util.Objects; @SideOnly(Side.CLIENT) public class AnalystPageDescription extends ControlAnalystPage { - public AnalystPageDescription(final IWidget parent, final IArea area, final IIndividual ind) { + public AnalystPageDescription(final IWidget parent, final Area area, final IIndividual ind) { super(parent, area); this.setColour(3355443); int y = 4; @@ -24,7 +26,7 @@ public class AnalystPageDescription extends ControlAnalystPage { final String branchBinomial = species.getBranch().getScientific(); final String branchName = species.getBranch().getName(); final String desc = species.getDescription(); - String descBody = "§o"; + String descBody = TextFormatting.ITALIC.toString(); String descSig = ""; if (Objects.equals(desc, "") || desc.contains("for.description")) { descBody += ""; @@ -40,35 +42,36 @@ public class AnalystPageDescription extends ControlAnalystPage { } String authority = species.getAuthority(); if (authority.contains("Binnie")) { - authority = "§1§l" + authority; + authority = TextFormatting.DARK_BLUE.toString() + TextFormatting.BOLD + authority; } if (authority.contains("Sengir")) { - authority = "§2§l" + authority; + authority = TextFormatting.DARK_GREEN.toString() + TextFormatting.BOLD + authority; } if (authority.contains("MysteriousAges")) { - authority = "§5§l" + authority; + authority = TextFormatting.DARK_PURPLE.toString() + TextFormatting.BOLD + authority; } - new ControlTextCentered(this, y, "§nDescription").setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); y += 16; - new ControlTextCentered(this, y, species.getName() + "§r").setColour(this.getColour()); + new ControlTextCentered(this, y, species.getName() + TextFormatting.RESET).setColour(this.getColour()); y += 10; - new ControlTextCentered(this, y, "§o" + branchBinomial + " " + species.getBinomial() + "§r").setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + branchBinomial + " " + species.getBinomial() + TextFormatting.RESET).setColour(this.getColour()); y += 20; - new ControlTextCentered(this, y, "Discovered by §l" + authority + "§r").setColour(this.getColour()); - y += (int) (3.0f + CraftGUI.render.textHeight("Discovered by §l" + authority + "§r", this.width())); - new ControlTextCentered(this, y, "Genetic Complexity: " + species.getComplexity()).setColour(this.getColour()); + String discovered = Genetics.proxy.localise("gui.analyst.desc.discovered") + " " + TextFormatting.BOLD + authority + TextFormatting.RESET; + new ControlTextCentered(this, y, discovered).setColour(this.getColour()); + y += (int) (3.0f + CraftGUI.render.textHeight(discovered, this.width())); + new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.desc.complexity") + ": " + species.getComplexity()).setColour(this.getColour()); y += 26; - final ControlText descText = new ControlText(this, new IArea(8, y, this.width() - 16, 0), descBody + "§r", TextJustification.TopCenter); - final IWidget signatureText = new ControlText(this, new IArea(8, y, this.width() - 16, 0), descSig + "§r", TextJustification.BottomRight); + final ControlText descText = new ControlText(this, new Area(8, y, this.width() - 16, 0), descBody + "§r", TextJustification.TopCenter); + final IWidget signatureText = new ControlText(this, new Area(8, y, this.width() - 16, 0), descSig + "§r", TextJustification.BottomRight); descText.setColour(this.getColour()); signatureText.setColour(this.getColour()); final int descHeight = CraftGUI.render.textHeight(descText.getValue(), descText.getSize().x()); - signatureText.setPosition(new IPoint(signatureText.pos().x(), descText.getPosition().y() + descHeight + 10)); - this.setSize(new IPoint(this.width(), 20 + signatureText.yPos())); + signatureText.setPosition(new Point(signatureText.pos().x(), descText.getPosition().y() + descHeight + 10)); + this.setSize(new Point(this.width(), 20 + signatureText.yPos())); } @Override public String getTitle() { - return "Description"; + return Genetics.proxy.localise("gui.analyst.desc.title"); } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java index 7d3f531d..b616147f 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageGenome.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageGenome.java @@ -7,15 +7,17 @@ import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.TextJustification; +import binnie.genetics.Genetics; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -23,12 +25,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class AnalystPageGenome extends ControlAnalystPage { boolean active; - public AnalystPageGenome(final IWidget parent, final IArea area, final boolean active, final IIndividual ind) { + public AnalystPageGenome(final IWidget parent, final Area area, final boolean active, final IIndividual ind) { super(parent, area); this.active = active; this.setColour(26265); int y = 4; - new ControlTextCentered(this, y, "§n" + this.getTitle()).setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.UNDERLINE + this.getTitle()).setColour(this.getColour()); y += 16; final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(ind); final BreedingSystem system = Binnie.GENETICS.getSystem(root); @@ -51,15 +53,15 @@ public class AnalystPageGenome extends ControlAnalystPage { final IAllele allele = active ? ind.getGenome().getActiveAllele(chromo) : ind.getGenome().getInactiveAllele(chromo); final String alleleName = system.getAlleleName(chromo, allele); final int height = CraftGUI.render.textHeight(alleleName, this.width() / 2 - 2); - new ControlText(scaled, new IArea(0, y + (height - 9) / 2, this.width() / 2 - 2, 0), system.getChromosomeShortName(chromo) + " :", TextJustification.TopRight).setColour(this.getColour()); - new ControlText(scaled, new IArea(this.width() / 2 + 2, y, this.width() / 2 - 2, 0), alleleName, TextJustification.TopLeft).setColour(this.getColour()); + new ControlText(scaled, new Area(0, y + (height - 9) / 2, this.width() / 2 - 2, 0), system.getChromosomeShortName(chromo) + " :", TextJustification.TopRight).setColour(this.getColour()); + new ControlText(scaled, new Area(this.width() / 2 + 2, y, this.width() / 2 - 2, 0), alleleName, TextJustification.TopLeft).setColour(this.getColour()); y += 3 + height; } - this.setSize(new IPoint(this.width(), y + 8)); + this.setSize(new Point(this.width(), y + 8)); } @Override public String getTitle() { - return (this.active ? "Active" : "Inactive") + " Genome"; + return Genetics.proxy.localise("gui.analyst.genome." + (this.active ? "active" : "inactive")) + " " + Genetics.proxy.localise("gui.analyst.genome.title"); } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageGrowth.java b/src/main/java/binnie/genetics/gui/AnalystPageGrowth.java deleted file mode 100644 index afc297a0..00000000 --- a/src/main/java/binnie/genetics/gui/AnalystPageGrowth.java +++ /dev/null @@ -1,46 +0,0 @@ -package binnie.genetics.gui; - -import binnie.Binnie; -import binnie.craftgui.controls.ControlTextCentered; -import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import forestry.api.arboriculture.EnumTreeChromosome; -import forestry.api.arboriculture.ITree; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IIndividual; - -public class AnalystPageGrowth extends ControlAnalystPage { - public AnalystPageGrowth(final IWidget parent, final IArea area, final IIndividual ind) { - super(parent, area); - this.setColour(3355443); - int y = 4; - final IAlleleSpecies species = ind.getGenome().getPrimary(); - new ControlTextCentered(this, y, "§nGrowth").setColour(this.getColour()); - y += 12; - if (ind instanceof ITree) { - final ITree tree = (ITree) ind; - final int mat = tree.getGenome().getMaturationTime(); - new ControlTextCentered(this, y, "Saplings mature in").setColour(this.getColour()); - y += 12; - new ControlTextCentered(this, y, "§l" + this.getTimeString(Math.round(1373.3999f * mat))).setColour(this.getColour()); - y += 22; - new ControlTextCentered(this, y, "§oHeight: " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.HEIGHT, ind.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT))).setColour(this.getColour()); - y += 12; - new ControlTextCentered(this, y, "§oGirth: " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.GIRTH, ind.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH))).setColour(this.getColour()); - y += 20; - new ControlTextCentered(this, y, "Growth Conditions").setColour(this.getColour()); - y += 12; - //new ControlTextCentered(this, y, "§o" + tree.getGenome().getGrowthProvider().getDescription()).setColour(this.getColour()); - y += 12; -// for (final String s : tree.getGenome().getGrowthProvider().getInfo()) { -// new ControlTextCentered(this, y, "§o" + s).setColour(this.getColour()); -// y += 12; -// } - } - } - - @Override - public String getTitle() { - return "Growth"; - } -} diff --git a/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java b/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java index 5a41e5a2..fa04487e 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageKaryogram.java @@ -4,18 +4,20 @@ import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; +import binnie.genetics.Genetics; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; +import net.minecraft.util.text.TextFormatting; public class AnalystPageKaryogram extends ControlAnalystPage { - public AnalystPageKaryogram(final IWidget parent, final IArea area, final IIndividual ind) { + public AnalystPageKaryogram(final IWidget parent, final Area area, final IIndividual ind) { super(parent, area); this.setColour(10040319); int y = 4; - new ControlTextCentered(this, y, "§nKaryogram").setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); y += 16; y += 8; final ISpeciesRoot root = AlleleManager.alleleRegistry.getSpeciesRoot(ind); @@ -41,6 +43,6 @@ public class AnalystPageKaryogram extends ControlAnalystPage { @Override public String getTitle() { - return "Karyogram"; + return Genetics.proxy.localise("gui.analyst.karyogram.title"); } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java index 79c29d19..4bcdc638 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageMutations.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageMutations.java @@ -4,12 +4,13 @@ import binnie.Binnie; import binnie.core.Mods; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.ForestryAllele; +import binnie.core.resource.BinnieSprite; import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.Attribute; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.TextJustification; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.minecraft.EnumColor; @@ -17,6 +18,8 @@ import binnie.craftgui.minecraft.Window; import binnie.craftgui.minecraft.control.ControlItemDisplay; import binnie.extrabees.ExtraBees; import binnie.extrabees.genetics.ExtraBeesSpecies; +import binnie.genetics.Genetics; +import binnie.genetics.item.ModuleItems; import forestry.api.apiculture.IBee; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; @@ -24,6 +27,7 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -31,11 +35,11 @@ import java.util.Collection; import java.util.List; public class AnalystPageMutations extends ControlAnalystPage { - public AnalystPageMutations(final IWidget parent, final IArea area, final IIndividual ind, final boolean isMaster) { + public AnalystPageMutations(final IWidget parent, final Area area, final IIndividual ind, final boolean isMaster) { super(parent, area); this.setColour(3355392); int y = 4; - new ControlTextCentered(this, y, "§nMutations").setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); y += 18; final BreedingSystem system = Binnie.GENETICS.getSystem(ind.getGenome().getSpeciesRoot()); final List discovered = system.getDiscoveredMutations(Window.get(this).getWorld(), Window.get(this).getUsername()); @@ -78,21 +82,21 @@ public class AnalystPageMutations extends ControlAnalystPage { hive = new ItemStack(Blocks.CHEST); } if (ind.getGenome().getPrimary() == ForestryAllele.BeeSpecies.Valiant.getAllele()) { - new ControlTextCentered(this, y, "Natural Habitat").setColour(this.getColour()); + new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.mutations.bee.natural")).setColour(this.getColour()); y += 10; - new ControlTextCentered(this, y, "§oFound in any Hive").setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + Genetics.proxy.localise("gui.analyst.mutations.bee.hive")).setColour(this.getColour()); y += 22; } else if (ind.getGenome().getPrimary() == ForestryAllele.BeeSpecies.Monastic.getAllele()) { - new ControlTextCentered(this, y, "Natural Habitat").setColour(this.getColour()); + new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.mutations.bee.natural")).setColour(this.getColour()); y += 10; - new ControlTextCentered(this, y, "§oBought from Villagers").setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + Genetics.proxy.localise("gui.analyst.mutations.bee.villager")).setColour(this.getColour()); y += 22; } else if (hive != null) { - new ControlTextCentered(this, y, "Natural Habitat").setColour(this.getColour()); + new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.mutations.bee.natural")).setColour(this.getColour()); y += 10; final ControlItemDisplay display = new ControlItemDisplay(this, (this.width() - 16) / 2, y); if (ind.getGenome().getPrimary() == ForestryAllele.BeeSpecies.Steadfast.getAllele()) { - display.addTooltip("Dungeon Chests"); + display.addTooltip(Genetics.proxy.localise("gui.analyst.mutations.bee.dungeon")); } else { display.setTooltip(); } @@ -106,7 +110,7 @@ public class AnalystPageMutations extends ControlAnalystPage { if (resultant.size() == 1) { ox = (this.width() - 44) / 2; } - new ControlTextCentered(this, y, "Resultant Mutations").setColour(this.getColour()); + new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.mutations.resultant")).setColour(this.getColour()); y += 10; for (final IMutation mutation : resultant) { final float specificChance = this.getSpecificChance(ind, mutation, system); @@ -120,9 +124,9 @@ public class AnalystPageMutations extends ControlAnalystPage { final IAlleleSpecies species2 = mutation.getAllele1(); final String comb = species0.getName() + " + " + species2.getName(); this.addTooltip(comb); - String chance = AnalystPageMutations.this.getMutationColour(mutation.getBaseChance()).getCode() + (int) mutation.getBaseChance() + "% Chance"; + String chance = getMutationColour(mutation.getBaseChance()).getCode() + (int) mutation.getBaseChance() + "% " + Genetics.proxy.localise("gui.analyst.mutations.chance"); if (specificChance != mutation.getBaseChance()) { - chance = chance + AnalystPageMutations.this.getMutationColour(specificChance).getCode() + " (" + (int) specificChance + "% currently)"; + chance = chance + getMutationColour(specificChance).getCode() + " (" + (int) specificChance + "% " + Genetics.proxy.localise("gui.analyst.mutations.currently") + ")"; } this.addTooltip(chance); for (final String s : mutation.getSpecialConditions()) { @@ -133,16 +137,16 @@ public class AnalystPageMutations extends ControlAnalystPage { @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { - RenderUtil.drawItem(IPoint.ZERO, system.getDefaultMember(mutation.getAllele0().getUID())); - RenderUtil.drawItem(new IPoint(28, 0), system.getDefaultMember(mutation.getAllele1().getUID())); + RenderUtil.drawItem(Point.ZERO, system.getDefaultMember(mutation.getAllele0().getUID())); + RenderUtil.drawItem(new Point(28, 0), system.getDefaultMember(mutation.getAllele1().getUID())); if (specificChance != mutation.getBaseChance()) { - RenderUtil.setColour(AnalystPageMutations.this.getMutationColour(mutation.getBaseChance()).getColour()); - //CraftGUI.Render.iconItem(new IPoint(14, 0), ModuleItem.iconAdd0.getIcon()); - RenderUtil.setColour(AnalystPageMutations.this.getMutationColour(specificChance).getColour()); - //CraftGUI.Render.iconItem(new IPoint(14, 0), ModuleItem.iconAdd1.getIcon()); + RenderUtil.setColour(getMutationColour(mutation.getBaseChance()).getColour()); + drawSprite(ModuleItems.iconAdd0); + RenderUtil.setColour(getMutationColour(specificChance).getColour()); + drawSprite(ModuleItems.iconAdd1); } else { - RenderUtil.setColour(AnalystPageMutations.this.getMutationColour(mutation.getBaseChance()).getColour()); - //CraftGUI.Render.iconItem(new IPoint(14, 0), ModuleItem.iconAdd.getIcon()); + RenderUtil.setColour(getMutationColour(mutation.getBaseChance()).getColour()); + drawSprite(ModuleItems.iconAdd); } } }; @@ -163,7 +167,7 @@ public class AnalystPageMutations extends ControlAnalystPage { if (further.size() == 1) { ox = (this.width() - 44) / 2; } - new ControlTextCentered(this, y, "Further Mutations").setColour(this.getColour()); + new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.mutations.further")).setColour(this.getColour()); y += 10; for (final IMutation mutation : further) { final IAllele speciesComb = mutation.getPartner(speciesCurrent); @@ -179,9 +183,9 @@ public class AnalystPageMutations extends ControlAnalystPage { this.addTooltip(species2.getName()); final String comb = speciesCurrent.getName() + " + " + species0.getName(); this.addTooltip(comb); - String chance = AnalystPageMutations.this.getMutationColour(mutation.getBaseChance()).getCode() + (int) mutation.getBaseChance() + "% Chance"; + String chance = getMutationColour(mutation.getBaseChance()).getCode() + (int) mutation.getBaseChance() + "% " + Genetics.proxy.localise("gui.analyst.mutations.chance"); if (specificChance2 != mutation.getBaseChance()) { - chance = chance + AnalystPageMutations.this.getMutationColour(specificChance2).getCode() + " (" + (int) specificChance2 + "% currently)"; + chance = chance + getMutationColour(specificChance2).getCode() + " (" + (int) specificChance2 + "% " + Genetics.proxy.localise("gui.analyst.mutations.currently") + ")"; } this.addTooltip(chance); for (final String s : mutation.getSpecialConditions()) { @@ -192,17 +196,17 @@ public class AnalystPageMutations extends ControlAnalystPage { @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { - RenderUtil.drawItem(IPoint.ZERO, system.getDefaultMember(speciesComb.getUID())); - RenderUtil.drawItem(new IPoint(28, 0), system.getDefaultMember(mutation.getTemplate()[0].getUID())); - RenderUtil.setColour(AnalystPageMutations.this.getMutationColour(mutation.getBaseChance()).getColour()); + RenderUtil.drawItem(Point.ZERO, system.getDefaultMember(speciesComb.getUID())); + RenderUtil.drawItem(new Point(28, 0), system.getDefaultMember(mutation.getTemplate()[0].getUID())); + RenderUtil.setColour(getMutationColour(mutation.getBaseChance()).getColour()); if (specificChance2 != mutation.getBaseChance()) { - RenderUtil.setColour(AnalystPageMutations.this.getMutationColour(mutation.getBaseChance()).getColour()); - //CraftGUI.Render.iconItem(new IPoint(14, 0), ModuleItem.iconArrow0.getIcon()); - RenderUtil.setColour(AnalystPageMutations.this.getMutationColour(specificChance2).getColour()); - //CraftGUI.Render.iconItem(new IPoint(14, 0), ModuleItem.iconArrow1.getIcon()); + RenderUtil.setColour(getMutationColour(mutation.getBaseChance()).getColour()); + drawSprite(ModuleItems.iconArrow0); + RenderUtil.setColour(getMutationColour(specificChance2).getColour()); + drawSprite(ModuleItems.iconArrow1); } else { - RenderUtil.setColour(AnalystPageMutations.this.getMutationColour(mutation.getBaseChance()).getColour()); - //CraftGUI.Render.iconItem(new IPoint(14, 0), ModuleItem.iconArrow.getIcon()); + RenderUtil.setColour(getMutationColour(mutation.getBaseChance()).getColour()); + drawSprite(ModuleItems.iconArrow); } } }; @@ -217,7 +221,11 @@ public class AnalystPageMutations extends ControlAnalystPage { } } y += 8; - this.setSize(new IPoint(this.width(), y)); + this.setSize(new Point(this.width(), y)); + } + + private void drawSprite(BinnieSprite sprite){ + RenderUtil.drawSprite(new Point(14, 0), sprite.getSprite()); } private boolean isKnown(final BreedingSystem system, final IMutation mutation) { @@ -230,7 +238,7 @@ public class AnalystPageMutations extends ControlAnalystPage { @Override public String getTitle() { - return "Mutations"; + return Genetics.proxy.localise("gui.analyst.mutations.title"); } protected EnumColor getMutationColour(final float percent) { @@ -256,13 +264,13 @@ public class AnalystPageMutations extends ControlAnalystPage { public ControlUnknownMutation(final IWidget parent, final int x, final int y, final int w, final int h) { super(parent, x, y, w, h); this.addAttribute(Attribute.MouseOver); - this.addTooltip("Unknown Mutation"); + this.addTooltip(Genetics.proxy.localise("gui.analyst.mutations.unknown.tooltip")); } @Override @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { - RenderUtil.drawText(this.getArea(), TextJustification.MiddleCenter, "UNKNOWN", 11184810); + RenderUtil.drawText(this.getArea(), TextJustification.MiddleCenter, Genetics.proxy.localise("gui.analyst.mutations.unknown"), 11184810); } } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java index 7b88f8c2..6de826c9 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProduce.java +++ b/src/main/java/binnie/genetics/gui/AnalystPageProduce.java @@ -4,11 +4,12 @@ import binnie.core.util.UniqueFluidStackSet; import binnie.core.util.UniqueItemStackSet; import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; import binnie.craftgui.minecraft.control.ControlItemDisplay; import binnie.extratrees.machines.brewery.BreweryRecipes; import binnie.extratrees.machines.distillery.DistilleryRecipes; import binnie.extratrees.machines.fruitpress.FruitPressRecipes; +import binnie.genetics.gui.bee.AnalystPageProducts; import forestry.api.recipes.ICentrifugeRecipe; import forestry.api.recipes.ISqueezerRecipe; import forestry.api.recipes.RecipeManagers; @@ -27,7 +28,7 @@ import java.util.Collection; import java.util.List; public abstract class AnalystPageProduce extends ControlAnalystPage { - public AnalystPageProduce(final IWidget parent, final IArea area) { + public AnalystPageProduce(final IWidget parent, final Area area) { super(parent, area); } diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java index 663b6179..02db4d7e 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlAnalystChromosome.java @@ -9,7 +9,7 @@ import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.resource.Texture; import binnie.craftgui.resource.minecraft.StandardTexture; import forestry.api.genetics.IAllele; @@ -45,7 +45,7 @@ public class ControlAnalystChromosome extends Control implements ITooltip { @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { super.onRenderBackground(guiWidth, guiHeight); - CraftGUI.render.texture(this.isHomozygous() ? this.Homozygous : this.Heterozygous, IPoint.ZERO); + CraftGUI.render.texture(this.isHomozygous() ? this.Homozygous : this.Heterozygous, Point.ZERO); } @Override diff --git a/src/main/java/binnie/genetics/gui/ControlAnalystPage.java b/src/main/java/binnie/genetics/gui/ControlAnalystPage.java index abd4ed05..b3218051 100644 --- a/src/main/java/binnie/genetics/gui/ControlAnalystPage.java +++ b/src/main/java/binnie/genetics/gui/ControlAnalystPage.java @@ -2,12 +2,12 @@ package binnie.genetics.gui; import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; import java.text.DecimalFormat; public abstract class ControlAnalystPage extends Control { - public ControlAnalystPage(final IWidget parent, final IArea area) { + public ControlAnalystPage(final IWidget parent, final Area area) { super(parent, area); this.hide(); } diff --git a/src/main/java/binnie/genetics/gui/ControlBiome.java b/src/main/java/binnie/genetics/gui/ControlBiome.java index dcbd51ba..204f3e37 100644 --- a/src/main/java/binnie/genetics/gui/ControlBiome.java +++ b/src/main/java/binnie/genetics/gui/ControlBiome.java @@ -4,6 +4,10 @@ import binnie.craftgui.controls.core.Control; import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; +import binnie.craftgui.core.geometry.Point; +import binnie.craftgui.core.renderer.RenderUtil; +import forestry.core.render.TextureManager; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.world.biome.Biome; import net.minecraftforge.common.BiomeDictionary; @@ -19,10 +23,7 @@ public class ControlBiome extends Control implements ITooltip { @Override public void onRenderBackground(int guiWidth, int guiHeight) { - if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.MOUNTAIN)) { - this.iconCategory = "hills"; - } - if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.HILLS)) { + if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.MOUNTAIN) || BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.HILLS)) { this.iconCategory = "hills"; } if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.SANDY)) { @@ -55,8 +56,8 @@ public class ControlBiome extends Control implements ITooltip { if (BiomeDictionary.hasType(this.biome, BiomeDictionary.Type.END)) { this.iconCategory = "end"; } -// final IIcon icon = TextureManager.getInstance().getDefault("habitats/" + this.iconCategory); -// CraftGUI.Render.iconItem(IPoint.ZERO, icon); + TextureAtlasSprite sprite = TextureManager.getInstance().getDefault("habitats/" + this.iconCategory); + RenderUtil.drawGuiSprite(Point.ZERO, sprite); } @Override diff --git a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java index 074e28c7..cc21ef72 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromoPicker.java +++ b/src/main/java/binnie/genetics/gui/ControlChromoPicker.java @@ -6,7 +6,7 @@ import binnie.craftgui.core.Attribute; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.events.EventValueChanged; import binnie.craftgui.events.EventWidget; import binnie.craftgui.resource.Texture; @@ -49,7 +49,7 @@ public class ControlChromoPicker extends Control implements ITooltip { super.onRenderBackground(guiWidth, guiHeight); final boolean selected = this.isMouseOver(); final Texture text = selected ? this.Selected : this.Texture; - CraftGUI.render.texture(text, IPoint.ZERO); + CraftGUI.render.texture(text, Point.ZERO); } @Override diff --git a/src/main/java/binnie/genetics/gui/ControlChromosome.java b/src/main/java/binnie/genetics/gui/ControlChromosome.java index 794a554e..f9d23f37 100644 --- a/src/main/java/binnie/genetics/gui/ControlChromosome.java +++ b/src/main/java/binnie/genetics/gui/ControlChromosome.java @@ -7,7 +7,7 @@ import binnie.craftgui.controls.core.Control; import binnie.craftgui.controls.core.IControlValue; import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.resource.Texture; import binnie.craftgui.resource.minecraft.StandardTexture; import com.google.common.base.Preconditions; @@ -125,7 +125,7 @@ public class ControlChromosome extends Control implements IControlValue { @SideOnly(Side.CLIENT) public void onRenderBackground(int guiWidth, int guiHeight) { super.onRenderBackground(guiWidth, guiHeight); - RenderUtil.drawText(new IArea(0, 0, 70, 22), TextJustification.MiddleCenter, this.getChromosomeName(), this.getColour()); - RenderUtil.drawText(new IArea(75, 0, 80, 22), TextJustification.MiddleCenter, this.getAlleleName(), this.getColour()); - RenderUtil.drawSolidRect(new IArea(70, 2, 1, 16), -16777216 + this.getColour()); + RenderUtil.drawText(new Area(0, 0, 70, 22), TextJustification.MiddleCenter, this.getChromosomeName(), this.getColour()); + RenderUtil.drawText(new Area(75, 0, 80, 22), TextJustification.MiddleCenter, this.getAlleleName(), this.getColour()); + RenderUtil.drawSolidRect(new Area(70, 2, 1, 16), -16777216 + this.getColour()); } } diff --git a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java b/src/main/java/binnie/genetics/gui/ControlToleranceBar.java index 6257aec9..c469d58a 100644 --- a/src/main/java/binnie/genetics/gui/ControlToleranceBar.java +++ b/src/main/java/binnie/genetics/gui/ControlToleranceBar.java @@ -6,8 +6,8 @@ import binnie.craftgui.core.Attribute; import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IBorder; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Border; import binnie.craftgui.core.renderer.RenderUtil; import forestry.api.core.EnumTemperature; import forestry.api.genetics.EnumTolerance; @@ -56,8 +56,8 @@ public abstract class ControlToleranceBar> extends Control imp int t = 0; for (final T value : this.fullSet) { final int col = (this.tolerated.contains(value) ? -16777216 : 855638016) + this.getColour(value); - final IBorder inset = new IBorder(this.tolerated.contains(value) ? 1 : 3); - RenderUtil.drawGradientRect(new IArea(w * t, 0, w, this.height()).inset(inset), col, col); + final Border inset = new Border(this.tolerated.contains(value) ? 1 : 3); + RenderUtil.drawGradientRect(new Area(w * t, 0, w, this.height()).inset(inset), col, col); ++t; } } diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index 3a64057c..11e57a33 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -14,8 +14,8 @@ import binnie.craftgui.core.CraftGUI; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; import binnie.craftgui.core.Widget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.Position; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventKey; @@ -23,6 +23,7 @@ import binnie.craftgui.events.EventMouse; import binnie.craftgui.minecraft.InventoryType; import binnie.craftgui.minecraft.MinecraftGUI; import binnie.craftgui.minecraft.Window; +import binnie.craftgui.minecraft.WindowInventory; import binnie.craftgui.minecraft.control.ControlPlayerInventory; import binnie.craftgui.minecraft.control.ControlSlide; import binnie.craftgui.minecraft.control.ControlSlot; @@ -30,6 +31,14 @@ import binnie.craftgui.resource.minecraft.CraftGUITexture; import binnie.craftgui.window.Panel; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; +import binnie.genetics.gui.bee.AnalystPageProducts; +import binnie.genetics.gui.butterfly.AnalystPageSpecimen; +import binnie.genetics.gui.flower.AnalystPageAppearance; +import binnie.genetics.gui.flower.AnalystPageSoil; +import binnie.genetics.gui.tree.AnalystPageClimate; +import binnie.genetics.gui.tree.AnalystPageFruit; +import binnie.genetics.gui.tree.AnalystPageGrowth; +import binnie.genetics.gui.tree.AnalystPageWood; import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ModuleMachine; import binnie.genetics.machine.analyser.Analyser; @@ -60,7 +69,7 @@ public class WindowAnalyst extends Window { Panel analystPanel; List analystPages; @Nullable - IArea analystPageSize; + Area analystPageSize; boolean isDatabase; boolean isMaster; boolean lockedSearch; @@ -106,7 +115,7 @@ public class WindowAnalyst extends Window { this.getWindowInventory().setValidator(0, new SlotValidator.Individual() { @Override public boolean isValid(final ItemStack itemStack) { - return Analyser.isAnalysed(itemStack) || (Analyser.isAnalysable(itemStack) && WindowAnalyst.this.getWindowInventory().getStackInSlot(1) != null); + return Analyser.isAnalysed(itemStack) || (Analyser.isAnalysable(itemStack) && !WindowAnalyst.this.getWindowInventory().getStackInSlot(1).isEmpty()); } }); this.getWindowInventory().setValidator(1, new SlotValidator.Item(GeneticsItems.DNADye.get(1), ModuleMachine.spriteDye)); @@ -168,7 +177,7 @@ public class WindowAnalyst extends Window { RenderUtil.setColour(1140850688 + syst.getColour()); CraftGUI.render.texture(CraftGUITexture.TabSolid, this.getArea().outset(outset)); } - RenderUtil.drawItem(new IPoint(2, 2), syst.getItemStackRepresentitive()); + RenderUtil.drawItem(new Point(2, 2), syst.getItemStackRepresentitive()); } }; x += 22; @@ -243,7 +252,7 @@ public class WindowAnalyst extends Window { RenderUtil.drawSolidRect(this.getRenderArea(), WindowAnalyst.this.rightPage.getContent().getColour()); } }; - WindowAnalyst.this.analystPageSize = new IArea(1, 1, sectionWidth, this.height() - 8); + WindowAnalyst.this.analystPageSize = new Area(1, 1, sectionWidth, this.height() - 8); } }; if (!this.isDatabase) { @@ -355,6 +364,7 @@ public class WindowAnalyst extends Window { this.analystPages.add(new AnalystPageMutations(this.analystPanel, this.analystPageSize, this.current, this.isMaster)); } this.tabBar.deleteAllChildren(); + if (this.analystPages.size() > 0) { final int width = this.tabBar.width() / this.analystPages.size(); int x = 0; for (final ControlAnalystPage page : this.analystPages) { @@ -408,12 +418,11 @@ public class WindowAnalyst extends Window { } }; x += width; - } - if (this.analystPages.size() > 0) { + } this.setPage(this.leftPage, this.analystPages.get((oldLeft >= 0) ? oldLeft : 0)); - } - if (this.analystPages.size() > 1) { - this.setPage(this.rightPage, this.analystPages.get((oldRight >= 0) ? oldRight : 1)); + if (this.analystPages.size() > 1) { + this.setPage(this.rightPage, this.analystPages.get((oldRight >= 0) ? oldRight : 1)); + } } } @@ -472,18 +481,20 @@ public class WindowAnalyst extends Window { @Override public void onWindowInventoryChanged() { super.onWindowInventoryChanged(); - if (this.getWindowInventory().getStackInSlot(0) != null && !Analyser.isAnalysed(this.getWindowInventory().getStackInSlot(0))) { - this.getWindowInventory().setInventorySlotContents(0, Analyser.analyse(this.getWindowInventory().getStackInSlot(0))); - this.getWindowInventory().decrStackSize(1, 1); + WindowInventory inv = getWindowInventory(); + ItemStack stack = inv.getStackInSlot(0); + if (!stack.isEmpty() && !Analyser.isAnalysed(stack)) { + inv.setInventorySlotContents(0, Analyser.analyse(stack)); + inv.decrStackSize(1, 1); } - final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(this.getWindowInventory().getStackInSlot(0)); + final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(stack); if (ind != null) { ind.getGenome().getSpeciesRoot().getBreedingTracker(this.getWorld(), this.getUsername()).registerBirth(ind); } if (this.isClient()) { //noinspection MethodCallSideOnly - this.setStack(this.getWindowInventory().getStackInSlot(0)); + this.setStack(stack); } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageProducts.java b/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java similarity index 94% rename from src/main/java/binnie/genetics/gui/AnalystPageProducts.java rename to src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java index dac670ec..c87a9f1e 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageProducts.java +++ b/src/main/java/binnie/genetics/gui/bee/AnalystPageProducts.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui; +package binnie.genetics.gui.bee; import binnie.Binnie; import binnie.core.BinnieCore; @@ -8,11 +8,12 @@ import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; import binnie.craftgui.core.geometry.CraftGUIUtil; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.minecraft.control.ControlItemDisplay; import binnie.extratrees.kitchen.craftgui.ControlFluidDisplay; import binnie.genetics.Genetics; +import binnie.genetics.gui.AnalystPageProduce; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; @@ -34,7 +35,7 @@ import java.util.HashMap; import java.util.Map; public class AnalystPageProducts extends AnalystPageProduce { - public AnalystPageProducts(final IWidget parent, final IArea area, final IBee ind) { + public AnalystPageProducts(final IWidget parent, final Area area, final IBee ind) { super(parent, area); this.setColour(13382400); final IBeeGenome genome = ind.getGenome(); @@ -132,7 +133,7 @@ public class AnalystPageProducts extends AnalystPageProduce { } dx += 18; } - this.setSize(new IPoint(this.width(), y + dy + 18 + 8)); + this.setSize(new Point(this.width(), y + dy + 18 + 8)); } @Nullable @@ -181,7 +182,7 @@ public class AnalystPageProducts extends AnalystPageProduce { item.setTooltip(); final ControlText textWidget = new ControlTextCentered(this, y + 4, ""); textWidget.setColour(this.getColour()); - CraftGUIUtil.moveWidget(textWidget, new IPoint(12, 0)); + CraftGUIUtil.moveWidget(textWidget, new Point(12, 0)); item.setItemStack(key); final int time = (int) (PluginApiculture.ticksPerBeeWorkCycle * 100.0 / (speed * value)); textWidget.setValue(Genetics.proxy.localise("gui.analyst.products.every") + " " + this.getTimeString(time)); @@ -189,6 +190,6 @@ public class AnalystPageProducts extends AnalystPageProduce { @Override public String getTitle() { - return Genetics.proxy.localise("gui.analyst.produces.tile"); + return Genetics.proxy.localise("gui.analyst.produces.title"); } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageSpecimen.java b/src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java similarity index 72% rename from src/main/java/binnie/genetics/gui/AnalystPageSpecimen.java rename to src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java index 042e9c85..014d5867 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageSpecimen.java +++ b/src/main/java/binnie/genetics/gui/butterfly/AnalystPageSpecimen.java @@ -1,14 +1,16 @@ -package binnie.genetics.gui; +package binnie.genetics.gui.butterfly; import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; import binnie.genetics.Genetics; +import binnie.genetics.gui.ControlAnalystPage; +import binnie.genetics.gui.ControlIndividualDisplay; import forestry.api.lepidopterology.IButterfly; import net.minecraft.util.text.TextFormatting; public class AnalystPageSpecimen extends ControlAnalystPage { - public AnalystPageSpecimen(final IWidget parent, final IArea area, final IButterfly ind) { + public AnalystPageSpecimen(final IWidget parent, final Area area, final IButterfly ind) { super(parent, area); this.setColour(3355443); int y = 4; diff --git a/src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java b/src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java new file mode 100644 index 00000000..4a2220b4 --- /dev/null +++ b/src/main/java/binnie/genetics/gui/flower/AnalystPageAppearance.java @@ -0,0 +1,71 @@ +package binnie.genetics.gui.flower; + +import binnie.botany.api.EnumFlowerStage; +import binnie.botany.api.IFlower; +import binnie.botany.api.IFlowerGenome; +import binnie.botany.api.IFlowerType; +import binnie.botany.craftgui.ControlColourDisplay; +import binnie.botany.flower.FlowerSpriteManager; +import binnie.craftgui.controls.ControlTextCentered; +import binnie.craftgui.core.IWidget; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; +import binnie.craftgui.core.renderer.RenderUtil; +import binnie.craftgui.minecraft.control.ControlIconDisplay; +import binnie.genetics.Genetics; +import binnie.genetics.gui.ControlAnalystPage; +import forestry.api.genetics.IAlleleSpecies; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.util.text.TextFormatting; + +public class AnalystPageAppearance extends ControlAnalystPage { + public AnalystPageAppearance(final IWidget parent, final Area area, final IFlower flower) { + super(parent, area); + this.setColour(3355443); + int y = 4; + IFlowerGenome genome = flower.getGenome(); + final IAlleleSpecies species = genome.getPrimary(); + new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); + y += 12; + final ControlColourDisplay a = new ControlColourDisplay(this, this.width() / 2 - 28, y, genome.getPrimaryColor()); + a.addTooltip(Genetics.proxy.localise("gui.analyst.appearance.primary")); + final ControlColourDisplay b = new ControlColourDisplay(this, this.width() / 2 - 8, y, genome.getSecondaryColor()); + b.addTooltip(Genetics.proxy.localise("gui.analyst.appearance.secondary")); + final ControlColourDisplay c = new ControlColourDisplay(this, this.width() / 2 + 12, y, genome.getStemColor()); + c.addTooltip(Genetics.proxy.localise("gui.analyst.appearance.stem")); + y += 26; + IFlowerType type = genome.getType(); + final int sections = type.getSections(); + final int width = (sections > 1) ? 50 : 100; + new ControlIconDisplay(this, (this.width() - width) / 2, y - ((sections == 1) ? 0 : 0)) { + @Override + public void onRenderForeground(int guiWidth, int guiHeight) { + GlStateManager.pushMatrix(); + final float scale = width / 16.0f; + int dy = (sections > 1) ? 16 : 0; + GlStateManager.scale(scale, scale, 1.0f); + RenderUtil.setColour(flower.getGenome().getStemColor().getColor(false)); + if (sections > 1) { + RenderUtil.drawSprite(Point.ZERO, FlowerSpriteManager.getStem(type, 1, true)); + } + RenderUtil.drawSprite(new Point(0, dy), FlowerSpriteManager.getStem(type, 0, true)); + RenderUtil.setColour(flower.getGenome().getPrimaryColor().getColor(false)); + if (sections > 1) { + RenderUtil.drawSprite(Point.ZERO, FlowerSpriteManager.getPetal(type, 1, true)); + } + RenderUtil.drawSprite(new Point(0, dy), FlowerSpriteManager.getPetal(type, 0, true)); + RenderUtil.setColour(flower.getGenome().getSecondaryColor().getColor(false)); + if (sections > 1) { + RenderUtil.drawSprite(Point.ZERO, FlowerSpriteManager.getVariant(type, 1, true)); + } + RenderUtil.drawSprite(new Point(0, dy), FlowerSpriteManager.getVariant(type, 0, true)); + GlStateManager.popMatrix(); + } + }; + } + + @Override + public String getTitle() { + return Genetics.proxy.localise("gui.analyst.appearance.title"); + } +} diff --git a/src/main/java/binnie/genetics/gui/AnalystPageSoil.java b/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java similarity index 84% rename from src/main/java/binnie/genetics/gui/AnalystPageSoil.java rename to src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java index 9f46c4ca..0d9cff4f 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageSoil.java +++ b/src/main/java/binnie/genetics/gui/flower/AnalystPageSoil.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui; +package binnie.genetics.gui.flower; import binnie.botany.Botany; import binnie.botany.api.EnumAcidity; @@ -9,10 +9,12 @@ import binnie.core.genetics.Tolerance; import binnie.craftgui.controls.ControlText; import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; +import binnie.craftgui.core.geometry.Area; import binnie.craftgui.core.geometry.TextJustification; import binnie.craftgui.minecraft.control.ControlItemDisplay; import binnie.genetics.Genetics; +import binnie.genetics.gui.ControlAnalystPage; +import binnie.genetics.gui.ControlToleranceBar; import forestry.api.genetics.EnumTolerance; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; @@ -22,7 +24,7 @@ import java.util.EnumSet; import java.util.List; public class AnalystPageSoil extends ControlAnalystPage { - public AnalystPageSoil(final IWidget parent, final IArea area, final IFlower flower) { + public AnalystPageSoil(final IWidget parent, final Area area, final IFlower flower) { super(parent, area); this.setColour(6697728); final EnumMoisture moisture = flower.getGenome().getPrimary().getMoisture(); @@ -32,15 +34,15 @@ public class AnalystPageSoil extends ControlAnalystPage { int y = 4; new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); y += 16; - new ControlText(this, new IArea(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.soil.tolerance.moisture"), TextJustification.MiddleCenter).setColour(this.getColour()); + new ControlText(this, new Area(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.soil.tolerance.moisture"), TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; this.createMoisture(this, (this.width() - 100) / 2, y, 100, 10, moisture, moistureTol); y += 16; - new ControlText(this, new IArea(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.soil.tolerance.ph"), TextJustification.MiddleCenter).setColour(this.getColour()); + new ControlText(this, new Area(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.soil.tolerance.ph"), TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; this.createAcidity(this, (this.width() - 100) / 2, y, 100, 10, pH, pHTol); y += 16; - new ControlText(this, new IArea(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.soil.recommended"), TextJustification.MiddleCenter).setColour(this.getColour()); + new ControlText(this, new Area(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.soil.recommended"), TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; EnumMoisture recomMoisture = EnumMoisture.Normal; final boolean canTolNormal = Tolerance.canTolerate(moisture, EnumMoisture.Normal, moistureTol); @@ -83,7 +85,7 @@ public class AnalystPageSoil extends ControlAnalystPage { recomSoil.setItemStack(stack); recomSoil.setTooltip(); y += 32; - new ControlText(this, new IArea(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.soil.other"), TextJustification.MiddleCenter).setColour(this.getColour()); + new ControlText(this, new Area(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.soil.other"), TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; final List stacks = new ArrayList<>(); for (final EnumAcidity a : EnumSet.range(EnumAcidity.Acid, EnumAcidity.Alkaline)) { diff --git a/src/main/java/binnie/genetics/gui/AnalystPageClimate.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java similarity index 79% rename from src/main/java/binnie/genetics/gui/AnalystPageClimate.java rename to src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java index 9ee6b471..e209c12c 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageClimate.java +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageClimate.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui; +package binnie.genetics.gui.tree; import binnie.botany.api.EnumFlowerChromosome; import binnie.botany.api.IFlower; @@ -6,9 +6,13 @@ import binnie.core.genetics.Tolerance; import binnie.craftgui.controls.ControlText; import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.geometry.TextJustification; +import binnie.genetics.Genetics; +import binnie.genetics.gui.ControlAnalystPage; +import binnie.genetics.gui.ControlBiome; +import binnie.genetics.gui.ControlToleranceBar; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IBee; import forestry.api.core.EnumHumidity; @@ -19,13 +23,14 @@ import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.EnumButterflyChromosome; import forestry.api.lepidopterology.IButterfly; import net.minecraft.init.Biomes; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.biome.Biome; import java.util.ArrayList; import java.util.List; public class AnalystPageClimate extends ControlAnalystPage { - public AnalystPageClimate(final IWidget parent, final IArea area, final IIndividual ind) { + public AnalystPageClimate(final IWidget parent, final Area area, final IIndividual ind) { super(parent, area); this.setColour(26163); final EnumTemperature temp = ind.getGenome().getPrimary().getTemperature(); @@ -45,19 +50,19 @@ public class AnalystPageClimate extends ControlAnalystPage { humidTol = ((IAlleleTolerance) ind.getGenome().getActiveAllele(EnumButterflyChromosome.HUMIDITY_TOLERANCE)).getValue(); } int y = 4; - new ControlTextCentered(this, y, "§nClimate").setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); y += 16; - new ControlText(this, new IArea(4, y, this.width() - 8, 14), "Temp. Tolerance", TextJustification.MiddleCenter).setColour(this.getColour()); + new ControlText(this, new Area(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.climate.temp"), TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; this.createTemperatureBar(this, (this.width() - 100) / 2, y, 100, 10, temp, tempTol); y += 16; if (!(ind instanceof IFlower)) { - new ControlText(this, new IArea(4, y, this.width() - 8, 14), "Humidity Tolerance", TextJustification.MiddleCenter).setColour(this.getColour()); + new ControlText(this, new Area(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.climate.hum"), TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; this.createHumidity(this, (this.width() - 100) / 2, y, 100, 10, humid, humidTol); y += 16; } - new ControlText(this, new IArea(4, y, this.width() - 8, 14), "Biomes", TextJustification.MiddleCenter).setColour(this.getColour()); + new ControlText(this, new Area(4, y, this.width() - 8, 14), Genetics.proxy.localise("gui.analyst.climate.biomes"), TextJustification.MiddleCenter).setColour(this.getColour()); y += 12; final List biomes = new ArrayList<>(); for (final Biome biome : Biome.EXPLORATION_BIOMES_LIST) { //TODO check @@ -88,7 +93,7 @@ public class AnalystPageClimate extends ControlAnalystPage { dy += 18; } } - this.setSize(new IPoint(this.width(), y + dy + 18 + 8)); + this.setSize(new Point(this.width(), y + dy + 18 + 8)); } protected void createTemperatureBar(final IWidget parent, final int x, final int y, final int w, final int h, final EnumTemperature value, final EnumTolerance tol) { @@ -121,6 +126,6 @@ public class AnalystPageClimate extends ControlAnalystPage { @Override public String getTitle() { - return "Climate"; + return Genetics.proxy.localise("gui.analyst.climate.title"); } } diff --git a/src/main/java/binnie/genetics/gui/AnalystPageFruit.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java similarity index 73% rename from src/main/java/binnie/genetics/gui/AnalystPageFruit.java rename to src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java index ee5d2338..a4822454 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageFruit.java +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageFruit.java @@ -1,12 +1,15 @@ -package binnie.genetics.gui; +package binnie.genetics.gui.tree; import binnie.Binnie; import binnie.core.util.UniqueItemStackSet; import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.minecraft.control.ControlItemDisplay; +import binnie.genetics.Genetics; +import binnie.genetics.gui.AnalystPageProduce; + import com.google.common.base.Throwables; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; @@ -17,20 +20,21 @@ import forestry.api.genetics.IFruitFamily; import forestry.arboriculture.FruitProviderPod; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; import java.lang.reflect.Field; import java.util.Collection; import java.util.Collections; public class AnalystPageFruit extends AnalystPageProduce { - public AnalystPageFruit(final IWidget parent, final IArea area, final ITree ind) { + public AnalystPageFruit(final IWidget parent, final Area area, final ITree ind) { super(parent, area); this.setColour(13382400); final ITreeGenome genome = ind.getGenome(); int y = 4; - new ControlTextCentered(this, y, "§nFruit").setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); y += 12; - new ControlTextCentered(this, y, "§oYield: " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.YIELD, ind.getGenome().getActiveAllele(EnumTreeChromosome.YIELD))).setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.ITALIC + Genetics.proxy.localise("gui.analyst.fruit.yield") + ": " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.YIELD, ind.getGenome().getActiveAllele(EnumTreeChromosome.YIELD))).setColour(this.getColour()); y += 20; final Collection products = new UniqueItemStackSet(); final Collection specialties = new UniqueItemStackSet(); @@ -52,7 +56,7 @@ public class AnalystPageFruit extends AnalystPageProduce { throw Throwables.propagate(e); } if (products.size() > 0) { - new ControlTextCentered(this, y, "Natural Fruit").setColour(this.getColour()); + new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.fruit.natural")).setColour(this.getColour()); y += 10; final int w = products.size() * 18 - 2; final int i = 0; @@ -64,7 +68,7 @@ public class AnalystPageFruit extends AnalystPageProduce { y += 26; } if (specialties.size() > 0) { - new ControlTextCentered(this, y, "Specialty Fruit").setColour(this.getColour()); + new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.fruit.specialty")).setColour(this.getColour()); y += 10; final int w = products.size() * 18 - 2; final int i = 0; @@ -85,14 +89,14 @@ public class AnalystPageFruit extends AnalystPageProduce { final Collection refinedProducts = new UniqueItemStackSet(); refinedProducts.addAll(this.getAllProductsAndFluids(allProducts)); if (refinedProducts.size() > 0) { - y = this.getRefined("Refined Products", y, refinedProducts); + y = this.getRefined(Genetics.proxy.localise("gui.analyst.fruit.refined"), y, refinedProducts); y += 8; } if (products.size() == 0 && specialties.size() == 0) { - new ControlTextCentered(this, y, "This tree has no \nfruits or nuts").setColour(this.getColour()); + new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.fruit.noFruits")).setColour(this.getColour()); y += 28; } - new ControlTextCentered(this, y, "Possible Fruits").setColour(this.getColour()); + new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.fruit.possible")).setColour(this.getColour()); y += 12; final Collection fruitAlleles = Binnie.GENETICS.getChromosomeMap(Binnie.GENETICS.getTreeRoot()).get(EnumTreeChromosome.FRUITS); for (final IFruitFamily fam : ind.getGenome().getPrimary().getSuitableFruit()) { @@ -122,14 +126,14 @@ public class AnalystPageFruit extends AnalystPageProduce { } } } - y = this.getRefined("§o" + fam.getName(), y, stacks); + y = this.getRefined(TextFormatting.ITALIC + fam.getName(), y, stacks); y += 2; } - this.setSize(new IPoint(this.width(), y + 8)); + this.setSize(new Point(this.width(), y + 8)); } @Override public String getTitle() { - return "Fruit"; + return Genetics.proxy.localise("gui.analyst.fruit.title"); } } diff --git a/src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java new file mode 100644 index 00000000..431f6f98 --- /dev/null +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageGrowth.java @@ -0,0 +1,40 @@ +package binnie.genetics.gui.tree; + +import binnie.Binnie; +import binnie.craftgui.controls.ControlTextCentered; +import binnie.craftgui.core.IWidget; +import binnie.craftgui.core.geometry.Area; +import binnie.genetics.Genetics; +import binnie.genetics.gui.ControlAnalystPage; +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.ITree; +import forestry.api.genetics.IAlleleSpecies; +import forestry.api.genetics.IIndividual; +import net.minecraft.util.text.TextFormatting; + +public class AnalystPageGrowth extends ControlAnalystPage { + public AnalystPageGrowth(final IWidget parent, final Area area, final IIndividual ind) { + super(parent, area); + this.setColour(3355443); + int y = 4; + final IAlleleSpecies species = ind.getGenome().getPrimary(); + new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); + y += 12; + if (ind instanceof ITree) { + final ITree tree = (ITree) ind; + final int mat = tree.getGenome().getMaturationTime(); + new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.growth.mature")).setColour(this.getColour()); + y += 12; + new ControlTextCentered(this, y, TextFormatting.BOLD + this.getTimeString(Math.round(1373.3999f * mat))).setColour(this.getColour()); + y += 22; + new ControlTextCentered(this, y, TextFormatting.ITALIC + Genetics.proxy.localise("gui.analyst.growth.height") + ": " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.HEIGHT, ind.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT))).setColour(this.getColour()); + y += 12; + new ControlTextCentered(this, y, TextFormatting.ITALIC + Genetics.proxy.localise("gui.analyst.growth.girth") + ": " + Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.GIRTH, ind.getGenome().getActiveAllele(EnumTreeChromosome.GIRTH))).setColour(this.getColour()); + } + } + + @Override + public String getTitle() { + return Genetics.proxy.localise("gui.analyst.growth.title"); + } +} diff --git a/src/main/java/binnie/genetics/gui/AnalystPageWood.java b/src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java similarity index 56% rename from src/main/java/binnie/genetics/gui/AnalystPageWood.java rename to src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java index 7ad9f1fe..a39fed0f 100644 --- a/src/main/java/binnie/genetics/gui/AnalystPageWood.java +++ b/src/main/java/binnie/genetics/gui/tree/AnalystPageWood.java @@ -1,32 +1,37 @@ -package binnie.genetics.gui; +package binnie.genetics.gui.tree; import binnie.core.util.UniqueItemStackSet; import binnie.craftgui.controls.ControlTextCentered; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IArea; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Area; +import binnie.craftgui.core.geometry.Point; +import binnie.craftgui.minecraft.control.ControlIconDisplay; import binnie.craftgui.minecraft.control.ControlItemDisplay; +import binnie.genetics.Genetics; +import binnie.genetics.gui.AnalystPageProduce; +import binnie.genetics.item.ModuleItems; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenome; import forestry.api.genetics.IAlleleBoolean; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; import java.util.Collection; public class AnalystPageWood extends AnalystPageProduce { - public AnalystPageWood(final IWidget parent, final IArea area, final ITree ind) { + public AnalystPageWood(final IWidget parent, final Area area, final ITree ind) { super(parent, area); this.setColour(6697728); final ITreeGenome genome = ind.getGenome(); int y = 4; - new ControlTextCentered(this, y, "§nWood").setColour(this.getColour()); + new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColour(this.getColour()); 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"); + new ControlIconDisplay(this, (width() - 16) / 2, y, ModuleItems.iconNoFire).addTooltip(Genetics.proxy.localise("gui.analyst.wood.fireproof")); } else { - //new ControlIconDisplay(this, (this.w() - 16.0f) / 2.0f, y, ModuleItem.iconFire.getIcon()).addTooltip("Flammable"); + new ControlIconDisplay(this, (width() - 16) / 2, y, ModuleItems.iconFire).addTooltip(Genetics.proxy.localise("gui.analyst.wood.flammable")); } y += 30; final Collection products = new UniqueItemStackSet(); @@ -36,12 +41,11 @@ public class AnalystPageWood extends AnalystPageProduce { if (!stackWood.isEmpty()) { products.add(stackWood); } - // for (final ItemStack stack : - // ind.getGenome().getFruitProvider().getProducts()) { - // products.add(stack); - // } + for (final ItemStack stack : ind.getGenome().getFruitProvider().getProducts().keySet()) { + products.add(stack); + } if (products.size() > 0) { - new ControlTextCentered(this, y, "Logs").setColour(this.getColour()); + new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.wood.logs")).setColour(this.getColour()); y += 10; final int w = products.size() * 18 - 2; final int i = 0; @@ -59,18 +63,18 @@ public class AnalystPageWood extends AnalystPageProduce { final Collection refinedProducts = new UniqueItemStackSet(); refinedProducts.addAll(this.getAllProductsAndFluids(allProducts)); if (refinedProducts.size() > 0) { - y = this.getRefined("Refined Products", y, refinedProducts); + y = this.getRefined(Genetics.proxy.localise("gui.analyst.wood.refined"), y, refinedProducts); y += 8; } if (products.size() == 0) { - new ControlTextCentered(this, y, "This tree has no \nfruits or nuts").setColour(this.getColour()); + new ControlTextCentered(this, y, Genetics.proxy.localise("gui.analyst.wood.noFruits")).setColour(this.getColour()); y += 28; } - this.setSize(new IPoint(this.width(), y + 8)); + this.setSize(new Point(this.width(), y + 8)); } @Override public String getTitle() { - return "Wood"; + return Genetics.proxy.localise("gui.analyst.wood.title"); } } diff --git a/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeMaker.java index 3ee34fb4..3dc24af5 100644 --- a/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeMaker.java @@ -17,7 +17,7 @@ public class DatabaseRecipeMaker { ModuleItems items = Genetics.items(); { - ItemStack emptySerum = GeneticsItems.EmptySerum.get(1); + ItemStack emptySerum = GeneticsItems.EMPTY_SERUM.get(1); ItemStack resultSerum = new ItemStack(items.itemSerum, 1, OreDictionary.WILDCARD_VALUE); IStackHelper stackHelper = GeneticsJeiPlugin.jeiHelpers.getStackHelper(); List subtypes = stackHelper.toItemStackList(resultSerum); @@ -31,7 +31,7 @@ public class DatabaseRecipeMaker { } { - ItemStack emptySerumArray = GeneticsItems.EmptyGenome.get(1); + ItemStack emptySerumArray = GeneticsItems.EMPTY_GENOME.get(1); ItemStack resultSerumArray = new ItemStack(items.itemSerumArray, 1, OreDictionary.WILDCARD_VALUE); IStackHelper stackHelper = GeneticsJeiPlugin.jeiHelpers.getStackHelper(); List subtypes = stackHelper.toItemStackList(resultSerumArray); diff --git a/src/main/java/binnie/genetics/item/GeneticsItems.java b/src/main/java/binnie/genetics/item/GeneticsItems.java index 9360c027..211a6482 100644 --- a/src/main/java/binnie/genetics/item/GeneticsItems.java +++ b/src/main/java/binnie/genetics/item/GeneticsItems.java @@ -14,8 +14,8 @@ public enum GeneticsItems implements IItemMiscProvider { Enzyme("Enzyme", "enzyme"), GrowthMedium("Growth Medium", "growth_medium"), EmptySequencer("Blank Sequence", "sequencer_empty"), - EmptySerum("Empty Serum Vial", "serum_empty"), - EmptyGenome("Empty Serum Array", "genome_empty"), + EMPTY_SERUM("Empty Serum Vial", "serum_empty"), + EMPTY_GENOME("Empty Serum Array", "genome_empty"), IntegratedCircuit("Integrated Circuit Board", "integrated_circuit"), IntegratedCPU("Integrated CPU", "integrated_cpu"), IntegratedCasing("Integrated Casing", "casing_circuit"); diff --git a/src/main/java/binnie/genetics/item/ModuleItems.java b/src/main/java/binnie/genetics/item/ModuleItems.java index a4ff02c1..dab5e890 100644 --- a/src/main/java/binnie/genetics/item/ModuleItems.java +++ b/src/main/java/binnie/genetics/item/ModuleItems.java @@ -116,16 +116,16 @@ public class ModuleItems implements IInitializable { "iGi", " p ", 'i', "ingotGold", 'G', Blocks.GLASS_PANE, 'p', Items.PAPER)); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EmptySerum.get(itemGenetics, 1), + GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EMPTY_SERUM.get(itemGenetics, 1), " g ", " G ", "GGG", 'g', "ingotGold", 'G', Blocks.GLASS_PANE)); - GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EmptyGenome.get(itemGenetics, 1), + GameRegistry.addRecipe(new ShapedOreRecipe(GeneticsItems.EMPTY_GENOME.get(itemGenetics, 1), "sss", "sss", "sss", - 's', GeneticsItems.EmptySerum.get(itemGenetics, 1))); + 's', GeneticsItems.EMPTY_SERUM.get(itemGenetics, 1))); GameRegistry.addRecipe(new ShapedOreRecipe(FluidContainerType.CYLINDER.get(8), " g ", "g g", @@ -160,8 +160,8 @@ public class ModuleItems implements IInitializable { "RDR", '#', Blocks.GLASS_PANE, 'X', Items.DIAMOND, 'Y', Items.DIAMOND, 'R', Items.REDSTONE, 'D', Items.ENDER_EYE, 'E', Blocks.OBSIDIAN); GameRegistry.addSmelting(itemSequencer, GeneticsItems.EmptySequencer.get(itemGenetics, 1), 0.0f); - GameRegistry.addSmelting(itemSerum, GeneticsItems.EmptySerum.get(itemGenetics, 1), 0.0f); - GameRegistry.addSmelting(itemSerumArray, GeneticsItems.EmptyGenome.get(itemGenetics, 1), 0.0f); + GameRegistry.addSmelting(itemSerum, GeneticsItems.EMPTY_SERUM.get(itemGenetics, 1), 0.0f); + GameRegistry.addSmelting(itemSerumArray, GeneticsItems.EMPTY_GENOME.get(itemGenetics, 1), 0.0f); GameRegistry.addShapedRecipe(new ItemStack(analyst), " c ", diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java index c2329bbf..6b582ce0 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java @@ -8,7 +8,7 @@ import binnie.craftgui.core.Attribute; import binnie.craftgui.core.ITooltip; import binnie.craftgui.core.IWidget; import binnie.craftgui.core.Tooltip; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.core.renderer.RenderUtil; import binnie.craftgui.events.EventMouse; import binnie.craftgui.minecraft.Window; @@ -83,6 +83,6 @@ public class ControlGene extends Control implements IControlValue, IToolt RenderUtil.drawSolidRect(this.getArea().inset(1), -12303292); } RenderUtil.setColour(-1); - RenderUtil.drawSprite(IPoint.ZERO, GeneticsTexture.dnaIcon.getSprite()); + RenderUtil.drawSprite(Point.ZERO, GeneticsTexture.dnaIcon.getSprite()); } } diff --git a/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java b/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java index 4bade5d1..6ba81186 100644 --- a/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java +++ b/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java @@ -7,7 +7,7 @@ import binnie.craftgui.controls.ControlText; import binnie.craftgui.controls.core.Control; import binnie.craftgui.controls.core.IControlValue; import binnie.craftgui.core.IWidget; -import binnie.craftgui.core.geometry.IPoint; +import binnie.craftgui.core.geometry.Point; import binnie.craftgui.minecraft.Window; import binnie.genetics.genetics.GeneTracker; import forestry.api.genetics.IAllele; @@ -61,7 +61,7 @@ public class ControlGeneScroll extends Control implements IControlValue this.getSize().x()) { @@ -73,7 +73,7 @@ public class ControlGeneScroll extends Control implements IControlValue