diff --git a/botany/src/main/java/binnie/botany/Botany.java b/botany/src/main/java/binnie/botany/Botany.java index b1bb624c..d05aeeb0 100644 --- a/botany/src/main/java/binnie/botany/Botany.java +++ b/botany/src/main/java/binnie/botany/Botany.java @@ -1,5 +1,7 @@ package binnie.botany; +import binnie.botany.genetics.gui.analyst.FlowerAnalystPagePlugin; +import binnie.genetics.api.GeneticsApi; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; @@ -35,6 +37,7 @@ public class Botany extends BlankModuleContainer { @Mod.EventHandler public void preInit(FMLPreInitializationEvent evt) { super.preInit(evt); + GeneticsApi.registerAnalystPagePlugin(new FlowerAnalystPagePlugin()); } @Mod.EventHandler diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageAppearance.java b/botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageAppearance.java similarity index 94% rename from genetics/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageAppearance.java rename to botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageAppearance.java index f9f03059..baa1a37c 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageAppearance.java +++ b/botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageAppearance.java @@ -1,5 +1,6 @@ -package binnie.genetics.gui.analyst.flower; +package binnie.botany.genetics.gui.analyst; +import binnie.core.api.gui.IArea; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; @@ -13,9 +14,8 @@ import binnie.botany.api.genetics.IFlowerGenome; import binnie.botany.api.genetics.IFlowerType; import binnie.botany.gui.database.ControlColorDisplay; import binnie.botany.models.FlowerSpriteManager; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; -import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.control.ControlIconDisplay; import binnie.core.gui.renderer.RenderUtil; @@ -24,7 +24,7 @@ import binnie.genetics.gui.analyst.AnalystConstants; import binnie.genetics.gui.analyst.ControlAnalystPage; public class AnalystPageAppearance extends ControlAnalystPage { - public AnalystPageAppearance(IWidget parent, Area area, IFlower flower) { + public AnalystPageAppearance(IWidget parent, IArea area, IFlower flower) { super(parent, area); setColor(3355443); int y = 4; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageSoil.java b/botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageSoil.java similarity index 96% rename from genetics/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageSoil.java rename to botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageSoil.java index 12d6e98a..24a676ef 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/flower/AnalystPageSoil.java +++ b/botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageSoil.java @@ -1,19 +1,17 @@ -package binnie.genetics.gui.analyst.flower; +package binnie.botany.genetics.gui.analyst; import java.util.ArrayList; import java.util.EnumSet; import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.TextFormatting; - import binnie.botany.api.gardening.EnumAcidity; import binnie.botany.api.gardening.EnumMoisture; import binnie.botany.api.genetics.IFlower; import binnie.botany.blocks.BlockSoil; import binnie.botany.modules.ModuleGardening; +import binnie.core.api.gui.IArea; +import binnie.core.api.gui.IWidget; import binnie.core.genetics.Tolerance; -import binnie.core.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.geometry.Area; @@ -23,9 +21,11 @@ import binnie.core.util.I18N; import binnie.genetics.gui.analyst.AnalystConstants; import binnie.genetics.gui.analyst.ControlAnalystPage; import binnie.genetics.gui.analyst.ControlToleranceBar; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; public class AnalystPageSoil extends ControlAnalystPage { - public AnalystPageSoil(IWidget parent, Area area, IFlower flower) { + public AnalystPageSoil(IWidget parent, IArea area, IFlower flower) { super(parent, area); setColor(6697728); EnumMoisture moisture = flower.getGenome().getPrimary().getMoisture(); diff --git a/botany/src/main/java/binnie/botany/genetics/gui/analyst/FlowerAnalystPagePlugin.java b/botany/src/main/java/binnie/botany/genetics/gui/analyst/FlowerAnalystPagePlugin.java new file mode 100644 index 00000000..1341109a --- /dev/null +++ b/botany/src/main/java/binnie/botany/genetics/gui/analyst/FlowerAnalystPagePlugin.java @@ -0,0 +1,91 @@ +package binnie.botany.genetics.gui.analyst; + +import java.util.List; + +import binnie.botany.api.genetics.IFlower; +import binnie.core.Constants; +import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; +import binnie.core.api.gui.IWidget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.util.I18N; +import binnie.core.util.TimeUtil; +import binnie.genetics.api.IAnalystPagePlugin; +import binnie.genetics.gui.analyst.AnalystConstants; +import binnie.genetics.gui.analyst.AnalystPageBiology; +import binnie.genetics.gui.analyst.tree.AnalystPageClimate; +import forestry.api.genetics.IIndividual; +import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class FlowerAnalystPagePlugin implements IAnalystPagePlugin, AnalystPageBiology.IBiologyPlugin { + @Override + public boolean handles(IIndividual individual) { + return individual instanceof IFlower; + } + + @Override + @SideOnly(Side.CLIENT) + public void addAnalystPages(IFlower individual, IWidget parent, IArea pageSize, List analystPages) { + analystPages.add(new AnalystPageClimate(parent, pageSize, individual)); + analystPages.add(new AnalystPageSoil(parent, pageSize, individual)); + analystPages.add(new AnalystPageBiology<>(parent, pageSize, individual, this)); + analystPages.add(new AnalystPageAppearance(parent, pageSize, individual)); + } + + @Override + @SideOnly(Side.CLIENT) + public int addBiologyPages(IFlower flower, IWidget parent, int y) { + y += 10; + int butterflySpawn2 = Math.round(Constants.SPAWN_KOEF / (flower.getGenome().getSappiness() * 0.2f)); + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".mothSpawn", TimeUtil.getTimeString(butterflySpawn2))) + .setColor(parent.getColor()); + y += 30; + + int fertility = flower.getGenome().getFertility(); + float chanceDispersal = 0.8f; + chanceDispersal += 0.2f * fertility; + if (chanceDispersal > 1.0f) { + chanceDispersal = 1.0f; + } + + float chancePollinate = 0.6f; + chancePollinate += 0.25f * fertility; + if (chancePollinate > 1.0f) { + chancePollinate = 1.0f; + } + + float maxAge = flower.getMaxAge(); + float ageChance = flower.getGenome().getAgeChance(); + float dispersalTime = Constants.SPAWN_KOEF / chanceDispersal; + float pollinateTime = Constants.SPAWN_KOEF / chancePollinate; + float lifespan2 = maxAge * 20.0f * 68.27f / ageChance; + float floweringLifespan = (maxAge - 1) * 20.0f * 68.27f / ageChance - Constants.SPAWN_KOEF; + + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".averageLifespan")) + .setColor(parent.getColor()); + y += 12; + + new ControlTextCentered(parent, y, TextFormatting.BOLD + TimeUtil.getMCDayString(lifespan2)) + .setColor(parent.getColor()); + y += 22; + + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".seedDispersal")) + .setColor(parent.getColor()); + y += 12; + + new ControlTextCentered(parent, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".perLifetime", (int) (floweringLifespan / dispersalTime))) + .setColor(parent.getColor()); + y += 22; + + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".pollination")) + .setColor(parent.getColor()); + y += 12; + + new ControlTextCentered(parent, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".perLifetime", (int) (floweringLifespan / pollinateTime))) + .setColor(parent.getColor()); + y += 22; + return y; + } +} diff --git a/botany/src/main/java/binnie/botany/genetics/gui/analyst/package-info.java b/botany/src/main/java/binnie/botany/genetics/gui/analyst/package-info.java new file mode 100644 index 00000000..80a79f79 --- /dev/null +++ b/botany/src/main/java/binnie/botany/genetics/gui/analyst/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.botany.genetics.gui.analyst; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/botany/src/main/java/binnie/botany/gui/database/ControlColorDisplay.java b/botany/src/main/java/binnie/botany/gui/database/ControlColorDisplay.java index ad1046b4..de1b0433 100644 --- a/botany/src/main/java/binnie/botany/gui/database/ControlColorDisplay.java +++ b/botany/src/main/java/binnie/botany/gui/database/ControlColorDisplay.java @@ -7,7 +7,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.botany.api.genetics.IFlowerColor; import binnie.core.gui.Attribute; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.core.IControlValue; @@ -40,6 +40,7 @@ public class ControlColorDisplay extends Control implements IControlValue { diff --git a/botany/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java b/botany/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java index bb84a4e2..0d3c46f2 100644 --- a/botany/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java +++ b/botany/src/main/java/binnie/botany/gui/database/ControlColorMixSymbol.java @@ -8,7 +8,7 @@ import binnie.botany.api.genetics.IColorMix; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.database.DatabaseConstants; diff --git a/botany/src/main/java/binnie/botany/gui/database/PageColorMix.java b/botany/src/main/java/binnie/botany/gui/database/PageColorMix.java index 99acaa5e..3422ea8e 100644 --- a/botany/src/main/java/binnie/botany/gui/database/PageColorMix.java +++ b/botany/src/main/java/binnie/botany/gui/database/PageColorMix.java @@ -6,7 +6,7 @@ import java.util.List; import binnie.botany.api.genetics.IColorMix; import binnie.botany.api.genetics.IFlowerColor; import binnie.botany.core.BotanyCore; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.database.DatabaseConstants; diff --git a/botany/src/main/java/binnie/botany/gui/database/PageColorMixResultant.java b/botany/src/main/java/binnie/botany/gui/database/PageColorMixResultant.java index ce3570ea..3b36e285 100644 --- a/botany/src/main/java/binnie/botany/gui/database/PageColorMixResultant.java +++ b/botany/src/main/java/binnie/botany/gui/database/PageColorMixResultant.java @@ -6,7 +6,7 @@ import java.util.List; import binnie.botany.api.genetics.IColorMix; import binnie.botany.api.genetics.IFlowerColor; import binnie.botany.core.BotanyCore; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.database.DatabaseConstants; diff --git a/botany/src/main/java/binnie/botany/gui/database/PageSpeciesFlowerGenome.java b/botany/src/main/java/binnie/botany/gui/database/PageSpeciesFlowerGenome.java index 1d571fcf..d84f0530 100644 --- a/botany/src/main/java/binnie/botany/gui/database/PageSpeciesFlowerGenome.java +++ b/botany/src/main/java/binnie/botany/gui/database/PageSpeciesFlowerGenome.java @@ -13,7 +13,7 @@ import binnie.botany.api.genetics.IAlleleFlowerSpecies; import binnie.botany.api.genetics.IFlower; import binnie.botany.api.genetics.IFlowerGenome; import binnie.botany.core.BotanyCore; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.scroll.ControlScrollableContent; diff --git a/botany/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java b/botany/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java index de5c369e..c5fe80a0 100644 --- a/botany/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java +++ b/botany/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java @@ -15,7 +15,7 @@ import binnie.botany.api.genetics.IFlowerColor; import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.modules.ModuleFlowers; import binnie.core.AbstractMod; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.listbox.ControlListBox; import binnie.core.gui.database.DatabaseConstants; import binnie.core.gui.database.DatabaseTab; diff --git a/botany/src/main/java/binnie/botany/modules/ModuleDatabase.java b/botany/src/main/java/binnie/botany/modules/ModuleDatabase.java index ae24cbda..4ee4e955 100644 --- a/botany/src/main/java/binnie/botany/modules/ModuleDatabase.java +++ b/botany/src/main/java/binnie/botany/modules/ModuleDatabase.java @@ -18,6 +18,7 @@ import binnie.botany.items.ItemDatabaseBotany; import binnie.core.liquid.ManagerLiquid; import binnie.core.modules.BinnieModule; import binnie.core.modules.Module; +import net.minecraftforge.oredict.OreDictionary; @BinnieModule(moduleID = BotanyModuleUIDs.DATABASE, moduleContainerID = Constants.BOTANY_MOD_ID, name = "Database", unlocalizedDescription = "botany.module.database") public class ModuleDatabase extends Module { @@ -27,6 +28,7 @@ public class ModuleDatabase extends Module { public void registerItemsAndBlocks() { database = new ItemDatabaseBotany(); Botany.proxy.registerItem(database); + OreDictionary.registerOre("binnie_database", database); } @Override diff --git a/core-api/src/main/java/binnie/core/api/gui/ITitledWidget.java b/core-api/src/main/java/binnie/core/api/gui/ITitledWidget.java new file mode 100644 index 00000000..799309c3 --- /dev/null +++ b/core-api/src/main/java/binnie/core/api/gui/ITitledWidget.java @@ -0,0 +1,5 @@ +package binnie.core.api.gui; + +public interface ITitledWidget extends IWidget { + String getTitle(); +} diff --git a/core/src/main/java/binnie/core/gui/ITopLevelWidget.java b/core-api/src/main/java/binnie/core/api/gui/ITopLevelWidget.java similarity index 82% rename from core/src/main/java/binnie/core/gui/ITopLevelWidget.java rename to core-api/src/main/java/binnie/core/api/gui/ITopLevelWidget.java index 811a605a..823b8b41 100644 --- a/core/src/main/java/binnie/core/gui/ITopLevelWidget.java +++ b/core-api/src/main/java/binnie/core/api/gui/ITopLevelWidget.java @@ -1,8 +1,9 @@ -package binnie.core.gui; +package binnie.core.api.gui; import javax.annotation.Nullable; import binnie.core.api.gui.IPoint; +import binnie.core.api.gui.IWidget; public interface ITopLevelWidget extends IWidget { IPoint getAbsoluteMousePosition(); diff --git a/core/src/main/java/binnie/core/gui/IWidget.java b/core-api/src/main/java/binnie/core/api/gui/IWidget.java similarity index 82% rename from core/src/main/java/binnie/core/gui/IWidget.java rename to core-api/src/main/java/binnie/core/api/gui/IWidget.java index 8dd10fee..afe7d1dd 100644 --- a/core/src/main/java/binnie/core/gui/IWidget.java +++ b/core-api/src/main/java/binnie/core/api/gui/IWidget.java @@ -1,19 +1,16 @@ -package binnie.core.gui; +package binnie.core.api.gui; import javax.annotation.Nullable; import java.util.List; -import binnie.core.api.gui.IArea; -import binnie.core.api.gui.IPoint; +import binnie.core.api.gui.events.Event; +import binnie.core.api.gui.events.EventHandlerOrigin; +import binnie.core.api.gui.events.OnEventHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.gui.events.Event; -import binnie.core.gui.events.EventHandler; - public interface IWidget { /** - * * @return the parent of this widget */ @Nullable @@ -82,7 +79,7 @@ public interface IWidget { List getChildren(); @Nullable - W getWidget(Class widgetClass); + W getWidget(Class widgetClass); void deleteChild(IWidget child); @@ -93,14 +90,14 @@ public interface IWidget { */ void receiveEvent(Event event); - void addEventHandler(Class eventClass, EventHandler.OnEventHandler handler); + void addEventHandler(Class eventClass, OnEventHandler handler); - void addEventHandler(Class eventClass, EventHandler.Origin origin, IWidget relative, EventHandler.OnEventHandler handler); + void addEventHandler(Class eventClass, EventHandlerOrigin origin, IWidget relative, OnEventHandler handler); /** * Adds an event handler to this widget and sets his origin to self */ - void addSelfEventHandler(Class eventClass, EventHandler.OnEventHandler handler); + void addSelfEventHandler(Class eventClass, OnEventHandler handler); void delete(); diff --git a/core/src/main/java/binnie/core/gui/IWidgetAttribute.java b/core-api/src/main/java/binnie/core/api/gui/IWidgetAttribute.java similarity index 57% rename from core/src/main/java/binnie/core/gui/IWidgetAttribute.java rename to core-api/src/main/java/binnie/core/api/gui/IWidgetAttribute.java index c31077eb..f56fab89 100644 --- a/core/src/main/java/binnie/core/gui/IWidgetAttribute.java +++ b/core-api/src/main/java/binnie/core/api/gui/IWidgetAttribute.java @@ -1,4 +1,4 @@ -package binnie.core.gui; +package binnie.core.api.gui; public interface IWidgetAttribute { } diff --git a/core/src/main/java/binnie/core/gui/RenderStage.java b/core-api/src/main/java/binnie/core/api/gui/RenderStage.java similarity index 72% rename from core/src/main/java/binnie/core/gui/RenderStage.java rename to core-api/src/main/java/binnie/core/api/gui/RenderStage.java index e5a0b109..9b230138 100644 --- a/core/src/main/java/binnie/core/gui/RenderStage.java +++ b/core-api/src/main/java/binnie/core/api/gui/RenderStage.java @@ -1,4 +1,4 @@ -package binnie.core.gui; +package binnie.core.api.gui; public enum RenderStage { PRE_CHILDREN, diff --git a/core/src/main/java/binnie/core/gui/events/Event.java b/core-api/src/main/java/binnie/core/api/gui/events/Event.java similarity index 77% rename from core/src/main/java/binnie/core/gui/events/Event.java rename to core-api/src/main/java/binnie/core/api/gui/events/Event.java index a22a5827..191bee3f 100644 --- a/core/src/main/java/binnie/core/gui/events/Event.java +++ b/core-api/src/main/java/binnie/core/api/gui/events/Event.java @@ -1,6 +1,6 @@ -package binnie.core.gui.events; +package binnie.core.api.gui.events; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; public class Event { IWidget origin; diff --git a/core-api/src/main/java/binnie/core/api/gui/events/EventHandlerOrigin.java b/core-api/src/main/java/binnie/core/api/gui/events/EventHandlerOrigin.java new file mode 100644 index 00000000..1b27a1d2 --- /dev/null +++ b/core-api/src/main/java/binnie/core/api/gui/events/EventHandlerOrigin.java @@ -0,0 +1,30 @@ +package binnie.core.api.gui.events; + +import binnie.core.api.gui.IWidget; + +public enum EventHandlerOrigin { + ANY, + SELF, + PARENT, + DIRECT_CHILD; + + public boolean isOrigin(IWidget origin, IWidget test) { + switch (this) { + case ANY: { + return true; + } + case DIRECT_CHILD: { + return test.getChildren().contains(origin); + } + case PARENT: { + return test.getParent() == origin; + } + case SELF: { + return test == origin; + } + default: { + return false; + } + } + } +} diff --git a/core-api/src/main/java/binnie/core/api/gui/events/OnEventHandler.java b/core-api/src/main/java/binnie/core/api/gui/events/OnEventHandler.java new file mode 100644 index 00000000..274b80d3 --- /dev/null +++ b/core-api/src/main/java/binnie/core/api/gui/events/OnEventHandler.java @@ -0,0 +1,5 @@ +package binnie.core.api.gui.events; + +public interface OnEventHandler { + void onEvent(E event); +} diff --git a/core/src/main/java/binnie/core/Constants.java b/core/src/main/java/binnie/core/Constants.java index 7a843327..5acb54d6 100644 --- a/core/src/main/java/binnie/core/Constants.java +++ b/core/src/main/java/binnie/core/Constants.java @@ -9,4 +9,5 @@ public final class Constants { public static final String EXTRA_TREES_MOD_ID = "extratrees"; public static final String GENETICS_MOD_ID = "genetics"; + public static final float SPAWN_KOEF = 1365.3999f; } diff --git a/core/src/main/java/binnie/core/gui/Attribute.java b/core/src/main/java/binnie/core/gui/Attribute.java index 04cb4a84..1cc06de3 100644 --- a/core/src/main/java/binnie/core/gui/Attribute.java +++ b/core/src/main/java/binnie/core/gui/Attribute.java @@ -1,5 +1,7 @@ package binnie.core.gui; +import binnie.core.api.gui.IWidgetAttribute; + public enum Attribute implements IWidgetAttribute { MOUSE_OVER, CAN_FOCUS, diff --git a/core/src/main/java/binnie/core/gui/TopLevelWidget.java b/core/src/main/java/binnie/core/gui/TopLevelWidget.java index 9bcf5f36..cfa313fe 100644 --- a/core/src/main/java/binnie/core/gui/TopLevelWidget.java +++ b/core/src/main/java/binnie/core/gui/TopLevelWidget.java @@ -10,6 +10,8 @@ import java.util.ListIterator; import binnie.core.api.gui.IArea; import binnie.core.api.gui.IPoint; +import binnie.core.api.gui.ITopLevelWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.geometry.Point; import org.lwjgl.input.Mouse; diff --git a/core/src/main/java/binnie/core/gui/Widget.java b/core/src/main/java/binnie/core/gui/Widget.java index 6897a597..a51c39c3 100644 --- a/core/src/main/java/binnie/core/gui/Widget.java +++ b/core/src/main/java/binnie/core/gui/Widget.java @@ -8,11 +8,17 @@ import java.util.List; import binnie.core.api.gui.IArea; import binnie.core.api.gui.IPoint; +import binnie.core.api.gui.ITopLevelWidget; +import binnie.core.api.gui.IWidget; +import binnie.core.api.gui.IWidgetAttribute; +import binnie.core.api.gui.RenderStage; +import binnie.core.api.gui.events.EventHandlerOrigin; +import binnie.core.api.gui.events.OnEventHandler; import binnie.core.gui.geometry.Point; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.gui.events.Event; +import binnie.core.api.gui.events.Event; import binnie.core.gui.events.EventHandler; import binnie.core.gui.events.EventWidget; import binnie.core.gui.geometry.Area; @@ -104,7 +110,7 @@ public class Widget implements IWidget { @Override @Nullable - public W getWidget(Class widgetClass) { + public W getWidget(Class widgetClass) { for (IWidget child : this.getChildren()) { if (widgetClass.isInstance(child)) { return widgetClass.cast(child); @@ -239,18 +245,18 @@ public class Widget implements IWidget { } @Override - public void addEventHandler(Class eventClass, EventHandler.OnEventHandler handler) { + public void addEventHandler(Class eventClass, OnEventHandler handler) { this.eventHandlers.add(new EventHandler<>(eventClass, handler)); } @Override - public void addEventHandler(Class eventClass, EventHandler.Origin origin, IWidget relative, EventHandler.OnEventHandler handler) { + public void addEventHandler(Class eventClass, EventHandlerOrigin origin, IWidget relative, OnEventHandler handler) { this.eventHandlers.add(new EventHandler<>(eventClass, origin, relative, handler)); } @Override - public void addSelfEventHandler(Class eventClass, EventHandler.OnEventHandler handler) { - this.eventHandlers.add(new EventHandler<>(eventClass, EventHandler.Origin.SELF, this, handler)); + public void addSelfEventHandler(Class eventClass, OnEventHandler handler) { + this.eventHandlers.add(new EventHandler<>(eventClass, EventHandlerOrigin.SELF, this, handler)); } public void callEvent(final Event event) { diff --git a/core/src/main/java/binnie/core/gui/controls/ControlCheckbox.java b/core/src/main/java/binnie/core/gui/controls/ControlCheckbox.java index abc3c06b..427ec12f 100644 --- a/core/src/main/java/binnie/core/gui/controls/ControlCheckbox.java +++ b/core/src/main/java/binnie/core/gui/controls/ControlCheckbox.java @@ -5,7 +5,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.core.IControlValue; import binnie.core.gui.events.EventMouse; diff --git a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java b/core/src/main/java/binnie/core/gui/controls/ControlFluidDisplay.java similarity index 97% rename from extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java rename to core/src/main/java/binnie/core/gui/controls/ControlFluidDisplay.java index a5dfb128..8542d253 100644 --- a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlFluidDisplay.java +++ b/core/src/main/java/binnie/core/gui/controls/ControlFluidDisplay.java @@ -1,4 +1,4 @@ -package binnie.extratrees.kitchen.craftgui; +package binnie.core.gui.controls; import javax.annotation.Nullable; @@ -18,7 +18,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.minecraft.Window; diff --git a/core/src/main/java/binnie/core/gui/controls/ControlText.java b/core/src/main/java/binnie/core/gui/controls/ControlText.java index e6d8e2fe..f065ffc0 100644 --- a/core/src/main/java/binnie/core/gui/controls/ControlText.java +++ b/core/src/main/java/binnie/core/gui/controls/ControlText.java @@ -6,7 +6,7 @@ import binnie.core.gui.geometry.Point; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.core.IControlValue; import binnie.core.gui.geometry.Area; diff --git a/core/src/main/java/binnie/core/gui/controls/ControlTextCentered.java b/core/src/main/java/binnie/core/gui/controls/ControlTextCentered.java index dc8cfce4..d8951f77 100644 --- a/core/src/main/java/binnie/core/gui/controls/ControlTextCentered.java +++ b/core/src/main/java/binnie/core/gui/controls/ControlTextCentered.java @@ -1,6 +1,6 @@ package binnie.core.gui.controls; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Point; import binnie.core.gui.geometry.TextJustification; diff --git a/core/src/main/java/binnie/core/gui/controls/ControlTextEdit.java b/core/src/main/java/binnie/core/gui/controls/ControlTextEdit.java index 50fadd29..8f1a437f 100644 --- a/core/src/main/java/binnie/core/gui/controls/ControlTextEdit.java +++ b/core/src/main/java/binnie/core/gui/controls/ControlTextEdit.java @@ -7,7 +7,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.core.IControlValue; import binnie.core.gui.events.EventKey; diff --git a/core/src/main/java/binnie/core/gui/controls/button/ControlButton.java b/core/src/main/java/binnie/core/gui/controls/button/ControlButton.java index 9ed4fabc..80f14724 100644 --- a/core/src/main/java/binnie/core/gui/controls/button/ControlButton.java +++ b/core/src/main/java/binnie/core/gui/controls/button/ControlButton.java @@ -7,7 +7,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.core.Control; import binnie.core.gui.events.EventButtonClicked; diff --git a/core/src/main/java/binnie/core/gui/controls/core/Control.java b/core/src/main/java/binnie/core/gui/controls/core/Control.java index 2d8721b3..4c0574be 100644 --- a/core/src/main/java/binnie/core/gui/controls/core/Control.java +++ b/core/src/main/java/binnie/core/gui/controls/core/Control.java @@ -4,6 +4,7 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; +import binnie.core.api.gui.IArea; import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -11,10 +12,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.ITooltip; import binnie.core.gui.ITooltipHelp; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.Widget; -import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.Window; @@ -33,7 +33,7 @@ public class Control extends Widget implements ITooltipHelp, ITooltip { this.initialise(); } - public Control(IWidget parent, Area area) { + public Control(IWidget parent, IArea area) { this(parent, area.xPos(), area.yPos(), area.width(), area.height()); } diff --git a/core/src/main/java/binnie/core/gui/controls/core/IControlValue.java b/core/src/main/java/binnie/core/gui/controls/core/IControlValue.java index 9087fbac..0102898f 100644 --- a/core/src/main/java/binnie/core/gui/controls/core/IControlValue.java +++ b/core/src/main/java/binnie/core/gui/controls/core/IControlValue.java @@ -2,7 +2,7 @@ package binnie.core.gui.controls.core; import javax.annotation.Nullable; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; public interface IControlValue extends IWidget { @Nullable diff --git a/core/src/main/java/binnie/core/gui/controls/listbox/ControlList.java b/core/src/main/java/binnie/core/gui/controls/listbox/ControlList.java index 100505c8..971c5567 100644 --- a/core/src/main/java/binnie/core/gui/controls/listbox/ControlList.java +++ b/core/src/main/java/binnie/core/gui/controls/listbox/ControlList.java @@ -5,7 +5,7 @@ import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.core.IControlValue; import binnie.core.gui.events.EventValueChanged; diff --git a/core/src/main/java/binnie/core/gui/controls/listbox/ControlListBox.java b/core/src/main/java/binnie/core/gui/controls/listbox/ControlListBox.java index 92d30aaf..f6c9ff38 100644 --- a/core/src/main/java/binnie/core/gui/controls/listbox/ControlListBox.java +++ b/core/src/main/java/binnie/core/gui/controls/listbox/ControlListBox.java @@ -2,7 +2,7 @@ package binnie.core.gui.controls.listbox; import java.util.Collection; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.IControlValue; import binnie.core.gui.controls.scroll.ControlScrollableContent; import binnie.core.gui.events.EventKey; diff --git a/core/src/main/java/binnie/core/gui/controls/page/ControlPage.java b/core/src/main/java/binnie/core/gui/controls/page/ControlPage.java index c22e4525..5aee1f7f 100644 --- a/core/src/main/java/binnie/core/gui/controls/page/ControlPage.java +++ b/core/src/main/java/binnie/core/gui/controls/page/ControlPage.java @@ -1,6 +1,6 @@ package binnie.core.gui.controls.page; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.core.IControlValue; diff --git a/core/src/main/java/binnie/core/gui/controls/page/ControlPages.java b/core/src/main/java/binnie/core/gui/controls/page/ControlPages.java index 9d439561..ab70dbc4 100644 --- a/core/src/main/java/binnie/core/gui/controls/page/ControlPages.java +++ b/core/src/main/java/binnie/core/gui/controls/page/ControlPages.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.core.IControlValue; import binnie.core.gui.controls.core.IControlValues; diff --git a/core/src/main/java/binnie/core/gui/controls/scroll/ControlScroll.java b/core/src/main/java/binnie/core/gui/controls/scroll/ControlScroll.java index f2ac3a6d..05c85955 100644 --- a/core/src/main/java/binnie/core/gui/controls/scroll/ControlScroll.java +++ b/core/src/main/java/binnie/core/gui/controls/scroll/ControlScroll.java @@ -1,6 +1,6 @@ package binnie.core.gui.controls.scroll; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; public class ControlScroll extends Control { diff --git a/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java b/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java index 5e6aa44f..cbc12675 100644 --- a/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java +++ b/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollBar.java @@ -5,7 +5,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.events.EventMouse; import binnie.core.gui.geometry.Area; diff --git a/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollableContent.java b/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollableContent.java index 122e3fb1..abb8546e 100644 --- a/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollableContent.java +++ b/core/src/main/java/binnie/core/gui/controls/scroll/ControlScrollableContent.java @@ -2,7 +2,7 @@ package binnie.core.gui.controls.scroll; import javax.annotation.Nullable; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.events.EventMouse; import binnie.core.gui.events.EventWidget; diff --git a/core/src/main/java/binnie/core/gui/controls/scroll/IControlScrollable.java b/core/src/main/java/binnie/core/gui/controls/scroll/IControlScrollable.java index 83998596..55ece96c 100644 --- a/core/src/main/java/binnie/core/gui/controls/scroll/IControlScrollable.java +++ b/core/src/main/java/binnie/core/gui/controls/scroll/IControlScrollable.java @@ -1,6 +1,6 @@ package binnie.core.gui.controls.scroll; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; public interface IControlScrollable extends IWidget { float getPercentageShown(); diff --git a/core/src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java b/core/src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java index 9aa086ab..c792c2d4 100644 --- a/core/src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java +++ b/core/src/main/java/binnie/core/gui/controls/tab/ControlTabBar.java @@ -1,13 +1,13 @@ package binnie.core.gui.controls.tab; +import binnie.core.api.gui.events.EventHandlerOrigin; import com.google.common.collect.Iterables; import java.util.Collection; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.core.IControlValue; -import binnie.core.gui.events.EventHandler; import binnie.core.gui.events.EventValueChanged; import binnie.core.api.gui.Alignment; @@ -24,7 +24,7 @@ public class ControlTabBar extends Control implements IControlValue { super(parent, x, y, width, height); this.value = value; this.alignment = alignment; - this.addEventHandler(EventValueChanged.class, EventHandler.Origin.DIRECT_CHILD, this, event -> { + this.addEventHandler(EventValueChanged.class, EventHandlerOrigin.DIRECT_CHILD, this, event -> { ControlTabBar.this.setValue((T) event.getValue()); }); } diff --git a/core/src/main/java/binnie/core/gui/database/ControlBranchBox.java b/core/src/main/java/binnie/core/gui/database/ControlBranchBox.java index 23d47840..08e85ae1 100644 --- a/core/src/main/java/binnie/core/gui/database/ControlBranchBox.java +++ b/core/src/main/java/binnie/core/gui/database/ControlBranchBox.java @@ -2,7 +2,7 @@ package binnie.core.gui.database; import forestry.api.genetics.IClassification; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.listbox.ControlListBox; class ControlBranchBox extends ControlListBox { diff --git a/core/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java b/core/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java index 7cca62db..50e4dee0 100644 --- a/core/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java +++ b/core/src/main/java/binnie/core/gui/database/ControlBreedingProgress.java @@ -6,7 +6,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.api.genetics.IBreedingSystem; import binnie.core.api.gui.IArea; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Point; import binnie.core.gui.renderer.RenderUtil; diff --git a/core/src/main/java/binnie/core/gui/database/ControlIndividualDisplay.java b/core/src/main/java/binnie/core/gui/database/ControlIndividualDisplay.java index 65cfa250..c5f0f4a7 100644 --- a/core/src/main/java/binnie/core/gui/database/ControlIndividualDisplay.java +++ b/core/src/main/java/binnie/core/gui/database/ControlIndividualDisplay.java @@ -19,7 +19,7 @@ import binnie.core.Binnie; import binnie.core.api.genetics.IBreedingSystem; import binnie.core.gui.Attribute; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.events.EventMouse; import binnie.core.gui.geometry.Point; diff --git a/core/src/main/java/binnie/core/gui/database/ControlMutationBox.java b/core/src/main/java/binnie/core/gui/database/ControlMutationBox.java index 10c30d6f..10946694 100644 --- a/core/src/main/java/binnie/core/gui/database/ControlMutationBox.java +++ b/core/src/main/java/binnie/core/gui/database/ControlMutationBox.java @@ -7,7 +7,7 @@ import binnie.core.api.genetics.IBreedingSystem; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.listbox.ControlListBox; import binnie.core.gui.minecraft.Window; diff --git a/core/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java b/core/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java index f07ca799..83bca772 100644 --- a/core/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java +++ b/core/src/main/java/binnie/core/gui/database/ControlMutationSymbol.java @@ -12,7 +12,7 @@ import binnie.core.api.genetics.IBreedingSystem; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Point; diff --git a/core/src/main/java/binnie/core/gui/database/ControlSpeciesBox.java b/core/src/main/java/binnie/core/gui/database/ControlSpeciesBox.java index 108be0c2..71fb9b31 100644 --- a/core/src/main/java/binnie/core/gui/database/ControlSpeciesBox.java +++ b/core/src/main/java/binnie/core/gui/database/ControlSpeciesBox.java @@ -12,7 +12,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.listbox.ControlListBox; import binnie.core.gui.minecraft.Window; diff --git a/core/src/main/java/binnie/core/gui/database/PageAbstract.java b/core/src/main/java/binnie/core/gui/database/PageAbstract.java index 61fc07f6..3f0f4776 100644 --- a/core/src/main/java/binnie/core/gui/database/PageAbstract.java +++ b/core/src/main/java/binnie/core/gui/database/PageAbstract.java @@ -1,6 +1,6 @@ package binnie.core.gui.database; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.page.ControlPage; public abstract class PageAbstract extends ControlPage { diff --git a/core/src/main/java/binnie/core/gui/database/PageBranch.java b/core/src/main/java/binnie/core/gui/database/PageBranch.java index 68e265ab..2b1505c9 100644 --- a/core/src/main/java/binnie/core/gui/database/PageBranch.java +++ b/core/src/main/java/binnie/core/gui/database/PageBranch.java @@ -2,7 +2,7 @@ package binnie.core.gui.database; import forestry.api.genetics.IClassification; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; abstract class PageBranch extends PageAbstract { public PageBranch(final IWidget parent, final DatabaseTab tab) { diff --git a/core/src/main/java/binnie/core/gui/database/PageBranchOverview.java b/core/src/main/java/binnie/core/gui/database/PageBranchOverview.java index a6a68fb9..b999004c 100644 --- a/core/src/main/java/binnie/core/gui/database/PageBranchOverview.java +++ b/core/src/main/java/binnie/core/gui/database/PageBranchOverview.java @@ -11,7 +11,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IClassification; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.renderer.RenderUtil; diff --git a/core/src/main/java/binnie/core/gui/database/PageBranchSpecies.java b/core/src/main/java/binnie/core/gui/database/PageBranchSpecies.java index 3fc3e15f..68891d83 100644 --- a/core/src/main/java/binnie/core/gui/database/PageBranchSpecies.java +++ b/core/src/main/java/binnie/core/gui/database/PageBranchSpecies.java @@ -6,7 +6,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.events.EventValueChanged; diff --git a/core/src/main/java/binnie/core/gui/database/PageBreeder.java b/core/src/main/java/binnie/core/gui/database/PageBreeder.java index ce6ced79..801b1137 100644 --- a/core/src/main/java/binnie/core/gui/database/PageBreeder.java +++ b/core/src/main/java/binnie/core/gui/database/PageBreeder.java @@ -5,7 +5,7 @@ import net.minecraft.util.text.TextFormatting; import com.mojang.authlib.GameProfile; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.controls.page.ControlPage; import binnie.core.gui.minecraft.Window; diff --git a/core/src/main/java/binnie/core/gui/database/PageSpecies.java b/core/src/main/java/binnie/core/gui/database/PageSpecies.java index db5dc502..ec340559 100644 --- a/core/src/main/java/binnie/core/gui/database/PageSpecies.java +++ b/core/src/main/java/binnie/core/gui/database/PageSpecies.java @@ -2,7 +2,7 @@ package binnie.core.gui.database; import forestry.api.genetics.IAlleleSpecies; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; public abstract class PageSpecies extends PageAbstract { public PageSpecies(final IWidget parent, final DatabaseTab tab) { diff --git a/core/src/main/java/binnie/core/gui/database/PageSpeciesClassification.java b/core/src/main/java/binnie/core/gui/database/PageSpeciesClassification.java index dac13095..9b7e824a 100644 --- a/core/src/main/java/binnie/core/gui/database/PageSpeciesClassification.java +++ b/core/src/main/java/binnie/core/gui/database/PageSpeciesClassification.java @@ -6,7 +6,7 @@ import java.util.Map; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IClassification; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; diff --git a/core/src/main/java/binnie/core/gui/database/PageSpeciesMutations.java b/core/src/main/java/binnie/core/gui/database/PageSpeciesMutations.java index 19852d74..2990411b 100644 --- a/core/src/main/java/binnie/core/gui/database/PageSpeciesMutations.java +++ b/core/src/main/java/binnie/core/gui/database/PageSpeciesMutations.java @@ -2,7 +2,7 @@ package binnie.core.gui.database; import forestry.api.genetics.IAlleleSpecies; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.util.I18N; diff --git a/core/src/main/java/binnie/core/gui/database/PageSpeciesOverview.java b/core/src/main/java/binnie/core/gui/database/PageSpeciesOverview.java index 934e9988..0fb9fad9 100644 --- a/core/src/main/java/binnie/core/gui/database/PageSpeciesOverview.java +++ b/core/src/main/java/binnie/core/gui/database/PageSpeciesOverview.java @@ -10,7 +10,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.geometry.Area; diff --git a/core/src/main/java/binnie/core/gui/database/PageSpeciesResultant.java b/core/src/main/java/binnie/core/gui/database/PageSpeciesResultant.java index e08f1e4b..de48af0f 100644 --- a/core/src/main/java/binnie/core/gui/database/PageSpeciesResultant.java +++ b/core/src/main/java/binnie/core/gui/database/PageSpeciesResultant.java @@ -2,7 +2,7 @@ package binnie.core.gui.database; import forestry.api.genetics.IAlleleSpecies; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.util.I18N; diff --git a/core/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java b/core/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java index 219e55c2..0b1f9789 100644 --- a/core/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java +++ b/core/src/main/java/binnie/core/gui/database/WindowAbstractDatabase.java @@ -8,6 +8,7 @@ import java.util.Objects; import binnie.core.api.genetics.IBreedingSystem; import binnie.core.api.gui.IArea; +import binnie.core.api.gui.events.EventHandlerOrigin; import binnie.core.gui.geometry.Point; import net.minecraft.entity.player.EntityPlayer; @@ -20,7 +21,7 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IClassification; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlTextEdit; import binnie.core.gui.controls.listbox.ControlListBox; import binnie.core.gui.controls.listbox.ControlTextOption; @@ -28,7 +29,6 @@ import binnie.core.gui.controls.page.ControlPage; import binnie.core.gui.controls.page.ControlPages; import binnie.core.gui.controls.tab.ControlTab; import binnie.core.gui.controls.tab.ControlTabBar; -import binnie.core.gui.events.EventHandler; import binnie.core.gui.events.EventTextEdit; import binnie.core.gui.events.EventValueChanged; import binnie.core.gui.geometry.CraftGUIUtil; @@ -112,7 +112,7 @@ public abstract class WindowAbstractDatabase extends Window { } } }); - this.addEventHandler(EventTextEdit.class, EventHandler.Origin.DIRECT_CHILD, this, event -> { + this.addEventHandler(EventTextEdit.class, EventHandlerOrigin.DIRECT_CHILD, this, event -> { for (final ModeWidgets widgets : WindowAbstractDatabase.this.modes.values()) { widgets.listBox.setValidator(object -> { if (Objects.equals(event.getValue(), "")) { diff --git a/core/src/main/java/binnie/core/gui/events/EventButtonClicked.java b/core/src/main/java/binnie/core/gui/events/EventButtonClicked.java index 9cc99d94..30538e4d 100644 --- a/core/src/main/java/binnie/core/gui/events/EventButtonClicked.java +++ b/core/src/main/java/binnie/core/gui/events/EventButtonClicked.java @@ -1,6 +1,7 @@ package binnie.core.gui.events; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; +import binnie.core.api.gui.events.Event; public class EventButtonClicked extends Event { public EventButtonClicked(final IWidget origin) { diff --git a/core/src/main/java/binnie/core/gui/events/EventHandler.java b/core/src/main/java/binnie/core/gui/events/EventHandler.java index 7f1bacb9..00a61b44 100644 --- a/core/src/main/java/binnie/core/gui/events/EventHandler.java +++ b/core/src/main/java/binnie/core/gui/events/EventHandler.java @@ -2,23 +2,26 @@ package binnie.core.gui.events; import javax.annotation.Nullable; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.events.Event; +import binnie.core.api.gui.events.EventHandlerOrigin; +import binnie.core.api.gui.events.OnEventHandler; +import binnie.core.api.gui.IWidget; public final class EventHandler { private final OnEventHandler onEventHandler; private final Class eventClass; - private final Origin origin; + private final EventHandlerOrigin origin; @Nullable private final IWidget relative; public EventHandler(Class eventClass, OnEventHandler onEventHandler) { - this.origin = Origin.ANY; + this.origin = EventHandlerOrigin.ANY; this.relative = null; this.eventClass = eventClass; this.onEventHandler = onEventHandler; } - public EventHandler(Class eventClass, Origin origin, IWidget relative, OnEventHandler onEventHandler) { + public EventHandler(Class eventClass, EventHandlerOrigin origin, IWidget relative, OnEventHandler onEventHandler) { this.origin = origin; this.relative = relative; this.eventClass = eventClass; @@ -34,34 +37,4 @@ public final class EventHandler { return instance && this.origin.isOrigin(event.getOrigin(), this.relative); } - public interface OnEventHandler { - void onEvent(E event); - } - - public enum Origin { - ANY, - SELF, - PARENT, - DIRECT_CHILD; - - public boolean isOrigin(IWidget origin, IWidget test) { - switch (this) { - case ANY: { - return true; - } - case DIRECT_CHILD: { - return test.getChildren().contains(origin); - } - case PARENT: { - return test.getParent() == origin; - } - case SELF: { - return test == origin; - } - default: { - return false; - } - } - } - } } diff --git a/core/src/main/java/binnie/core/gui/events/EventKey.java b/core/src/main/java/binnie/core/gui/events/EventKey.java index c4040e75..17b8b583 100644 --- a/core/src/main/java/binnie/core/gui/events/EventKey.java +++ b/core/src/main/java/binnie/core/gui/events/EventKey.java @@ -1,6 +1,7 @@ package binnie.core.gui.events; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; +import binnie.core.api.gui.events.Event; public abstract class EventKey extends Event { char character; diff --git a/core/src/main/java/binnie/core/gui/events/EventMouse.java b/core/src/main/java/binnie/core/gui/events/EventMouse.java index c58d021f..751a6644 100644 --- a/core/src/main/java/binnie/core/gui/events/EventMouse.java +++ b/core/src/main/java/binnie/core/gui/events/EventMouse.java @@ -1,6 +1,7 @@ package binnie.core.gui.events; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; +import binnie.core.api.gui.events.Event; public abstract class EventMouse extends Event { public EventMouse(final IWidget origin) { diff --git a/core/src/main/java/binnie/core/gui/events/EventTextEdit.java b/core/src/main/java/binnie/core/gui/events/EventTextEdit.java index 29edf20f..306009d8 100644 --- a/core/src/main/java/binnie/core/gui/events/EventTextEdit.java +++ b/core/src/main/java/binnie/core/gui/events/EventTextEdit.java @@ -1,6 +1,6 @@ package binnie.core.gui.events; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; public class EventTextEdit extends EventValueChanged { public EventTextEdit(final IWidget origin, final String text) { diff --git a/core/src/main/java/binnie/core/gui/events/EventValueChanged.java b/core/src/main/java/binnie/core/gui/events/EventValueChanged.java index 6f206dc6..39703010 100644 --- a/core/src/main/java/binnie/core/gui/events/EventValueChanged.java +++ b/core/src/main/java/binnie/core/gui/events/EventValueChanged.java @@ -2,7 +2,8 @@ package binnie.core.gui.events; import javax.annotation.Nullable; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; +import binnie.core.api.gui.events.Event; public class EventValueChanged extends Event { @Nullable diff --git a/core/src/main/java/binnie/core/gui/events/EventWidget.java b/core/src/main/java/binnie/core/gui/events/EventWidget.java index 468aa9b4..2604673f 100644 --- a/core/src/main/java/binnie/core/gui/events/EventWidget.java +++ b/core/src/main/java/binnie/core/gui/events/EventWidget.java @@ -1,6 +1,7 @@ package binnie.core.gui.events; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; +import binnie.core.api.gui.events.Event; public class EventWidget extends Event { public EventWidget(final IWidget origin) { diff --git a/core/src/main/java/binnie/core/gui/fieldkit/ControlChromosome.java b/core/src/main/java/binnie/core/gui/fieldkit/ControlChromosome.java index 001c3050..0f39807a 100644 --- a/core/src/main/java/binnie/core/gui/fieldkit/ControlChromosome.java +++ b/core/src/main/java/binnie/core/gui/fieldkit/ControlChromosome.java @@ -8,7 +8,7 @@ import binnie.core.api.genetics.IFieldKitPlugin; import binnie.core.api.gui.IPoint; import binnie.core.api.gui.ITexture; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.core.IControlValue; import binnie.core.gui.geometry.Point; diff --git a/core/src/main/java/binnie/core/gui/fieldkit/WindowFieldKit.java b/core/src/main/java/binnie/core/gui/fieldkit/WindowFieldKit.java index 38bde024..6042108d 100644 --- a/core/src/main/java/binnie/core/gui/fieldkit/WindowFieldKit.java +++ b/core/src/main/java/binnie/core/gui/fieldkit/WindowFieldKit.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Random; +import binnie.core.api.gui.events.EventHandlerOrigin; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Items; @@ -31,7 +32,6 @@ import binnie.core.genetics.ManagerGenetics; import binnie.core.gui.CraftGUI; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.core.Control; -import binnie.core.gui.events.EventHandler; import binnie.core.gui.events.EventValueChanged; import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Point; @@ -109,7 +109,7 @@ public class WindowFieldKit extends Window { (this.text = new ControlText(this, new Point(232, 13), I18N.localise("binniecore.gui.fieldkit.paper"))).setColor(2236962); (this.text = new ControlText(this, new Area(0, 120, this.getWidth(), 24), "", TextJustification.MIDDLE_CENTER)).setColor(2236962); this.chromo = new ControlChromosome(this, 150, 24); - this.addEventHandler(EventValueChanged.class, EventHandler.Origin.DIRECT_CHILD, this.chromo, event -> { + this.addEventHandler(EventValueChanged.class, EventHandlerOrigin.DIRECT_CHILD, this.chromo, event -> { final IChromosomeType type = (IChromosomeType) event.getValue(); if (type != null && WindowFieldKit.this.info.containsKey(type)) { final String t = WindowFieldKit.this.info.get(type); diff --git a/core/src/main/java/binnie/core/gui/genesis/WindowGenesis.java b/core/src/main/java/binnie/core/gui/genesis/WindowGenesis.java index f7752cc1..8468ad76 100644 --- a/core/src/main/java/binnie/core/gui/genesis/WindowGenesis.java +++ b/core/src/main/java/binnie/core/gui/genesis/WindowGenesis.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import binnie.core.api.genetics.IBreedingSystem; +import binnie.core.api.gui.events.EventHandlerOrigin; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; @@ -26,12 +27,11 @@ import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.listbox.ControlListBox; import binnie.core.gui.controls.listbox.ControlTextOption; import binnie.core.gui.controls.tab.ControlTab; import binnie.core.gui.controls.tab.ControlTabBar; -import binnie.core.gui.events.EventHandler; import binnie.core.gui.events.EventMouse; import binnie.core.gui.events.EventValueChanged; import binnie.core.gui.geometry.Area; @@ -118,7 +118,7 @@ public class WindowGenesis extends Window { return new ControlTextOption<>(this.getContent(), value, y); } }; - tabSystems.addEventHandler(EventValueChanged.class, EventHandler.Origin.SELF, tabSystems, event -> { + tabSystems.addEventHandler(EventValueChanged.class, EventHandlerOrigin.SELF, tabSystems, event -> { Object value = event.getValue(); if (!(value instanceof BreedingSystem)) { return; @@ -128,7 +128,7 @@ public class WindowGenesis extends Window { template = root.getDefaultTemplate(); refreshTemplate(null); }); - this.geneList.addEventHandler(EventValueChanged.class, EventHandler.Origin.SELF, this.geneList, event -> { + this.geneList.addEventHandler(EventValueChanged.class, EventHandlerOrigin.SELF, this.geneList, event -> { Object value = event.getValue(); if (!(value instanceof Gene)) { return; @@ -143,7 +143,7 @@ public class WindowGenesis extends Window { } geneOptions.setOptions(options); }); - this.geneOptions.addEventHandler(EventValueChanged.class, EventHandler.Origin.SELF, this.geneOptions, event -> { + this.geneOptions.addEventHandler(EventValueChanged.class, EventHandlerOrigin.SELF, this.geneOptions, event -> { Object value = event.getValue(); if (!(value instanceof Gene)) { return; @@ -193,7 +193,7 @@ public class WindowGenesis extends Window { ControlItemDisplay display = new ControlItemDisplay(this.panelPickup, 4 + i % 3 * 18, 4 + i / 3 * 18); display.setItemStack(stack); display.setTooltip(); - display.addEventHandler(EventMouse.Down.class, EventHandler.Origin.SELF, display, event -> { + display.addEventHandler(EventMouse.Down.class, EventHandlerOrigin.SELF, display, event -> { NBTTagCompound nbt = new NBTTagCompound(); stack.writeToNBT(nbt); Window.get(event.getOrigin()).sendClientAction(ACTION_GENESIS, nbt); diff --git a/core/src/main/java/binnie/core/gui/geometry/CraftGUIUtil.java b/core/src/main/java/binnie/core/gui/geometry/CraftGUIUtil.java index 4472981a..e8c120e8 100644 --- a/core/src/main/java/binnie/core/gui/geometry/CraftGUIUtil.java +++ b/core/src/main/java/binnie/core/gui/geometry/CraftGUIUtil.java @@ -1,7 +1,7 @@ package binnie.core.gui.geometry; import binnie.core.api.gui.IPoint; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.IControlValue; import binnie.core.gui.events.EventValueChanged; diff --git a/core/src/main/java/binnie/core/gui/minecraft/Dialog.java b/core/src/main/java/binnie/core/gui/minecraft/Dialog.java index 5673c03e..5fd30027 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/Dialog.java +++ b/core/src/main/java/binnie/core/gui/minecraft/Dialog.java @@ -1,14 +1,14 @@ package binnie.core.gui.minecraft; import binnie.core.api.gui.IPoint; +import binnie.core.api.gui.events.EventHandlerOrigin; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; -import binnie.core.gui.events.EventHandler; import binnie.core.gui.events.EventMouse; import binnie.core.gui.renderer.RenderUtil; import binnie.core.gui.resource.textures.CraftGUITexture; @@ -21,7 +21,7 @@ public abstract class Dialog extends Control { this.addAttribute(Attribute.ALWAYS_ON_TOP); this.addAttribute(Attribute.BLOCK_TOOLTIP); this.initialise(); - this.addEventHandler(EventMouse.Down.class, EventHandler.Origin.ANY, this, event -> { + this.addEventHandler(EventMouse.Down.class, EventHandlerOrigin.ANY, this, event -> { if (!Dialog.this.getArea().contains(Dialog.this.getRelativeMousePosition())) { Dialog.this.onClose(); Dialog.this.getParent().deleteChild(Dialog.this); diff --git a/core/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java b/core/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java index d0a58364..0f25de24 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java +++ b/core/src/main/java/binnie/core/gui/minecraft/GuiCraftGUI.java @@ -27,7 +27,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.events.EventKey; import binnie.core.gui.events.EventMouse; diff --git a/core/src/main/java/binnie/core/gui/minecraft/Window.java b/core/src/main/java/binnie/core/gui/minecraft/Window.java index 21056df3..17066e5f 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/Window.java +++ b/core/src/main/java/binnie/core/gui/minecraft/Window.java @@ -25,7 +25,7 @@ import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; import binnie.core.gui.ITooltipHelp; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.TopLevelWidget; import binnie.core.gui.controls.ControlText; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java index 32782ed4..e61bdfbe 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlEnergyBar.java @@ -14,7 +14,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.api.gui.Alignment; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java index b35fe4b9..e59b5965 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlErrorState.java @@ -11,7 +11,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Point; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java index d2ee1f33..94b0c4ce 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlHelp.java @@ -7,7 +7,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.resource.textures.CraftGUITexture; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlIconDisplay.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlIconDisplay.java index f666cbed..629a25bb 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlIconDisplay.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlIconDisplay.java @@ -7,7 +7,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.BinnieCore; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Point; import binnie.core.gui.renderer.RenderUtil; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlImage.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlImage.java index e5a2c3c3..0bdc38f9 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlImage.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlImage.java @@ -4,7 +4,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Point; import binnie.core.gui.resource.textures.Texture; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java index 1824da4f..7c3b4122 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlInfo.java @@ -7,7 +7,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.resource.textures.CraftGUITexture; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java index 00f3beef..6285c44a 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlItemDisplay.java @@ -13,7 +13,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.minecraft.Window; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java index ab47c292..2e1439c3 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlLiquidTank.java @@ -24,7 +24,7 @@ import binnie.core.BinnieCore; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.events.EventMouse; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlMachineProgress.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlMachineProgress.java index 9792f0b1..75300f7e 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlMachineProgress.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlMachineProgress.java @@ -1,6 +1,6 @@ package binnie.core.gui.minecraft.control; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.api.gui.Alignment; import binnie.core.gui.resource.textures.Texture; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java index bb397dc0..91f7bc70 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlPlayerInventory.java @@ -3,7 +3,7 @@ package binnie.core.gui.minecraft.control; import java.util.ArrayList; import java.util.List; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.minecraft.InventoryType; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java index f50983ae..97a7d49a 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlPowerSystem.java @@ -7,7 +7,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.resource.textures.CraftGUITexture; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java index 4c39d50b..c410df15 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgress.java @@ -4,7 +4,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.api.gui.Alignment; import binnie.core.gui.resource.textures.Texture; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgressBase.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgressBase.java index ce645757..4f18a3ec 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgressBase.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlProgressBase.java @@ -1,7 +1,7 @@ package binnie.core.gui.minecraft.control; import binnie.core.gui.Attribute; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.minecraft.Window; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java index b126a038..0616bd23 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlide.java @@ -11,7 +11,7 @@ import binnie.core.api.gui.IPoint; import binnie.core.api.gui.ITexture; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Border; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java index 22f9d69e..2b6ac074 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlot.java @@ -21,7 +21,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.api.gui.IArea; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.events.EventMouse; import binnie.core.gui.geometry.Area; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotArray.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotArray.java index d0505b69..96fbbf8f 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotArray.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotArray.java @@ -7,7 +7,7 @@ import java.util.List; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.minecraft.InventoryType; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java index df4e14bc..8e1ecaec 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotBase.java @@ -12,7 +12,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.events.EventWidget; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java index 2edaae2a..99ea5a95 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlSlotCharge.java @@ -4,7 +4,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.api.gui.Alignment; diff --git a/core/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java b/core/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java index 8b5cb1ad..a80b34ba 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java +++ b/core/src/main/java/binnie/core/gui/minecraft/control/ControlUser.java @@ -9,7 +9,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.resource.textures.CraftGUITexture; diff --git a/core/src/main/java/binnie/core/gui/renderer/TextureRenderer.java b/core/src/main/java/binnie/core/gui/renderer/TextureRenderer.java index 40fefbce..37b723ac 100644 --- a/core/src/main/java/binnie/core/gui/renderer/TextureRenderer.java +++ b/core/src/main/java/binnie/core/gui/renderer/TextureRenderer.java @@ -13,12 +13,12 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import binnie.core.BinnieCore; +import binnie.core.api.gui.IWidget; import binnie.core.api.gui.Alignment; import binnie.core.api.gui.IArea; import binnie.core.api.gui.IBorder; import binnie.core.api.gui.IPoint; import binnie.core.api.gui.ITexture; -import binnie.core.gui.IWidget; import binnie.core.gui.geometry.Area; import binnie.core.gui.resource.stylesheet.IStyleSheet; import binnie.core.gui.resource.stylesheet.StyleSheetManager; diff --git a/core/src/main/java/binnie/core/gui/window/Panel.java b/core/src/main/java/binnie/core/gui/window/Panel.java index b9b70459..90b03981 100644 --- a/core/src/main/java/binnie/core/gui/window/Panel.java +++ b/core/src/main/java/binnie/core/gui/window/Panel.java @@ -5,7 +5,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.minecraft.MinecraftGUI; import binnie.core.gui.resource.textures.CraftGUITexture; diff --git a/core/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java b/core/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java index 06bef25f..fa4c4f24 100644 --- a/core/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java +++ b/core/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java @@ -3,7 +3,6 @@ package binnie.core.integration.extrabees; import com.google.common.base.Preconditions; import net.minecraft.block.Block; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -21,7 +20,6 @@ public class ExtraBeesIntegration implements IInitializable { private static final boolean loaded; public static IAlleleBeeSpecies water, rock, basalt, marble; public static Block hive; - public static Item dictionary; static { loaded = Loader.isModLoaded("extrabees"); @@ -39,7 +37,6 @@ public class ExtraBeesIntegration implements IInitializable { @Override public void init() { hive = Preconditions.checkNotNull(ForgeRegistries.BLOCKS.getValue(new ResourceLocation("extrabees", "hive"))); - dictionary = Preconditions.checkNotNull(ForgeRegistries.ITEMS.getValue(new ResourceLocation("genetics", "dictionary"))); } @Override diff --git a/core/src/main/java/binnie/core/machines/storage/ControlColourSelector.java b/core/src/main/java/binnie/core/machines/storage/ControlColourSelector.java index 412f2021..a20bba9b 100644 --- a/core/src/main/java/binnie/core/machines/storage/ControlColourSelector.java +++ b/core/src/main/java/binnie/core/machines/storage/ControlColourSelector.java @@ -6,7 +6,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.core.IControlValue; diff --git a/core/src/main/java/binnie/core/machines/storage/WindowCompartment.java b/core/src/main/java/binnie/core/machines/storage/WindowCompartment.java index 4bde488a..f0500479 100644 --- a/core/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/core/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -10,6 +10,7 @@ import java.util.Map; import java.util.Map.Entry; import binnie.core.api.gui.ITexture; +import binnie.core.api.gui.events.EventHandlerOrigin; import binnie.core.gui.geometry.Point; import binnie.core.gui.window.WindowMachine; import net.minecraft.block.Block; @@ -27,7 +28,7 @@ import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlCheckbox; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextEdit; @@ -38,7 +39,6 @@ import binnie.core.gui.controls.page.ControlPages; import binnie.core.gui.controls.scroll.ControlScrollableContent; import binnie.core.gui.controls.tab.ControlTab; import binnie.core.gui.controls.tab.ControlTabBar; -import binnie.core.gui.events.EventHandler; import binnie.core.gui.events.EventMouse; import binnie.core.gui.events.EventTextEdit; import binnie.core.gui.events.EventValueChanged; @@ -131,7 +131,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh }; final String[] tabHelp = {"Compartment Tab", "Tabs that divide the inventory into sections. Each one can be labelled seperately."}; tab.addHelp(tabHelp); - tab.addEventHandler(EventValueChanged.class, EventHandler.Origin.DIRECT_CHILD, tab, event -> { + tab.addEventHandler(EventValueChanged.class, EventHandlerOrigin.DIRECT_CHILD, tab, event -> { if (event.getValue() == null) { return; } @@ -196,7 +196,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } }; tab2.addHelp(tabHelp); - tab2.addEventHandler(EventValueChanged.class, EventHandler.Origin.DIRECT_CHILD, tab2, event -> { + tab2.addEventHandler(EventValueChanged.class, EventHandlerOrigin.DIRECT_CHILD, tab2, event -> { if (event.getValue() == null) { return; } @@ -224,7 +224,7 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh final Panel parent = tabPropertyPanel; final int x2 = 4; y2 += 12; - (this.tabName = new ControlTextEdit(parent, x2, y2, 104, 12)).addEventHandler(EventTextEdit.class, EventHandler.Origin.SELF, this.tabName, event -> { + (this.tabName = new ControlTextEdit(parent, x2, y2, 104, 12)).addEventHandler(EventTextEdit.class, EventHandlerOrigin.SELF, this.tabName, event -> { final CompartmentTab currentTab = WindowCompartment.this.getCurrentTab(); currentTab.setName(event.getValue()); final NBTTagCompound nbt = new NBTTagCompound(); diff --git a/core/src/main/java/binnie/core/util/FluidStackUtil.java b/core/src/main/java/binnie/core/util/FluidStackUtil.java index b3d6c813..20d34257 100644 --- a/core/src/main/java/binnie/core/util/FluidStackUtil.java +++ b/core/src/main/java/binnie/core/util/FluidStackUtil.java @@ -1,8 +1,16 @@ package binnie.core.util; +import javax.annotation.Nullable; +import java.util.Collection; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.fluids.capability.IFluidHandlerItem; public class FluidStackUtil { @@ -13,4 +21,39 @@ public class FluidStackUtil { NBTTagCompound tag = fluidStack.tag; return fluidStack.getFluid().getName() + ":" + fluidStack.amount + (tag != null ? ":" + fluidStack.tag : ""); } + + public static NonNullList removeEqualFluids(Collection fluidsStacks) { + NonNullList dedupedFluidStacks = NonNullList.create(); + for (FluidStack fluidStack : fluidsStacks) { + if (!containsEqualFluid(dedupedFluidStacks, fluidStack)) { + dedupedFluidStacks.add(fluidStack); + } + } + return dedupedFluidStacks; + } + + public static boolean containsEqualFluid(NonNullList fluidStacks, FluidStack query) { + for (FluidStack fluidStack : fluidStacks) { + if (fluidStack.isFluidEqual(query)) { + return true; + } + } + return false; + } + + @Nullable + public static ItemStack getContainer(FluidStack fluidStack) { + ItemStack[] containers = { + new ItemStack(Items.GLASS_BOTTLE), + new ItemStack(Items.BUCKET) + }; + + for (ItemStack container : containers) { + IFluidHandlerItem fluidHandler = FluidUtil.getFluidHandler(container); + if (fluidHandler != null && fluidHandler.fill(fluidStack, true) > 0) { + return fluidHandler.getContainer(); + } + } + return null; + } } diff --git a/core/src/main/java/binnie/core/util/ForestryRecipeUtil.java b/core/src/main/java/binnie/core/util/ForestryRecipeUtil.java new file mode 100644 index 00000000..8d6c4a50 --- /dev/null +++ b/core/src/main/java/binnie/core/util/ForestryRecipeUtil.java @@ -0,0 +1,49 @@ +package binnie.core.util; + +import forestry.api.recipes.ICentrifugeRecipe; +import forestry.api.recipes.ISqueezerRecipe; +import forestry.api.recipes.RecipeManagers; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fluids.FluidStack; + +public final class ForestryRecipeUtil { + private ForestryRecipeUtil() { + + } + + public static void getCentrifugeOutputs(ItemStack inputStack, NonNullList outputItems) { + for (ICentrifugeRecipe recipe : RecipeManagers.centrifugeManager.recipes()) { + if (inputStack.isItemEqual(recipe.getInput())) { + outputItems.addAll(recipe.getAllProducts().keySet()); + } + } + } + + public static void getSqueezerOutputs(ItemStack inputStack, NonNullList outputItems) { + for (ISqueezerRecipe recipe : RecipeManagers.squeezerManager.recipes()) { + if (matches(recipe, inputStack)) { + if (!recipe.getRemnants().isEmpty()) { + outputItems.add(recipe.getRemnants()); + } + } + } + } + + public static void getSqueezerFluidOutputs(ItemStack inputStack, NonNullList outputFluids) { + for (ISqueezerRecipe recipe : RecipeManagers.squeezerManager.recipes()) { + if (matches(recipe, inputStack)) { + outputFluids.add(recipe.getFluidOutput()); + } + } + } + + private static boolean matches(ISqueezerRecipe recipe, ItemStack inputStack) { + for (ItemStack obj : recipe.getResources()) { + if (inputStack.isItemEqual(obj)) { + return true; + } + } + return false; + } +} diff --git a/core/src/main/java/binnie/core/util/OreDictionaryUtil.java b/core/src/main/java/binnie/core/util/OreDictionaryUtil.java index 97779ca5..d3b5464c 100644 --- a/core/src/main/java/binnie/core/util/OreDictionaryUtil.java +++ b/core/src/main/java/binnie/core/util/OreDictionaryUtil.java @@ -5,6 +5,7 @@ import java.util.List; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.oredict.OreDictionary; public class OreDictionaryUtil { @@ -29,7 +30,7 @@ public class OreDictionaryUtil { } } - public static List getOres(String oreName) { + public static NonNullList getOres(String oreName) { return OreDictionary.getOres(oreName); } diff --git a/core/src/main/java/binnie/core/util/RecipeUtil.java b/core/src/main/java/binnie/core/util/RecipeUtil.java index cababf0c..14b235fb 100644 --- a/core/src/main/java/binnie/core/util/RecipeUtil.java +++ b/core/src/main/java/binnie/core/util/RecipeUtil.java @@ -4,11 +4,12 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import net.minecraftforge.fml.common.registry.ForgeRegistries; - public class RecipeUtil { private final String modId; @@ -35,4 +36,9 @@ public class RecipeUtil { recipe.setRegistryName(modId, recipeName); ForgeRegistries.RECIPES.register(recipe); } + + public void addRecipe(String recipeName, IRecipe recipe) { + recipe.setRegistryName(new ResourceLocation(modId, recipeName)); + ForgeRegistries.RECIPES.register(recipe); + } } diff --git a/core/src/main/java/binnie/core/util/TimeUtil.java b/core/src/main/java/binnie/core/util/TimeUtil.java new file mode 100644 index 00000000..bf7dcc29 --- /dev/null +++ b/core/src/main/java/binnie/core/util/TimeUtil.java @@ -0,0 +1,33 @@ +package binnie.core.util; + +import java.text.DecimalFormat; + +public final class TimeUtil { + private TimeUtil() { + + } + + //TODO: localise + public static String getTimeString(int time) { + int seconds = time / 20; + int minutes = seconds / 60; + int hours = minutes / 60; + DecimalFormat df = new DecimalFormat("#.0"); + if (hours > 1) { + return df.format(hours) + " hours"; + } + if (minutes > 1) { + return df.format(minutes) + " min."; + } + return df.format(seconds) + " sec."; + } + + public static String getMCDayString(float time) { + float seconds = time / 20.0f; + float minutes = seconds / 60.0f; + float days = minutes / 20.0f; + DecimalFormat df = new DecimalFormat("#.#"); + // TODO: move this key to core + return I18N.localise("genetics.gui.analyst.biology.mcDays", df.format(days)); + } +} diff --git a/extrabees/build.gradle b/extrabees/build.gradle index 8502a5d0..4efe5444 100644 --- a/extrabees/build.gradle +++ b/extrabees/build.gradle @@ -4,4 +4,8 @@ dependencies { compile project(":core") compile project(":core-api") compile project(":extrabees-api") + compile project(":genetics-api") + + // TODO: remove genetics dependency + compile project(":genetics") } diff --git a/extrabees/src/main/java/binnie/extrabees/ExtraBees.java b/extrabees/src/main/java/binnie/extrabees/ExtraBees.java index dbd81fdb..6085f9a5 100644 --- a/extrabees/src/main/java/binnie/extrabees/ExtraBees.java +++ b/extrabees/src/main/java/binnie/extrabees/ExtraBees.java @@ -1,5 +1,7 @@ package binnie.extrabees; +import binnie.extrabees.genetics.gui.analyst.AnalystPagePlugin; +import binnie.genetics.api.GeneticsApi; import com.google.common.collect.Lists; import java.io.File; @@ -101,6 +103,8 @@ public class ExtraBees { BeeBreedingSystem beeBreedingSystem = new BeeBreedingSystem(); ExtraBeesAPI.beeBreedingSystem = beeBreedingSystem; Binnie.GENETICS.registerBreedingSystem(beeBreedingSystem); + + GeneticsApi.registerAnalystPagePlugin(new AnalystPagePlugin()); } @Mod.EventHandler diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java b/extrabees/src/main/java/binnie/extrabees/genetics/gui/analyst/AnalystPageBeeProducts.java similarity index 78% rename from genetics/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java rename to extrabees/src/main/java/binnie/extrabees/genetics/gui/analyst/AnalystPageBeeProducts.java index fe321a93..e3cfce1d 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/bee/AnalystPageProducts.java +++ b/extrabees/src/main/java/binnie/extrabees/genetics/gui/analyst/AnalystPageBeeProducts.java @@ -1,22 +1,23 @@ -package binnie.genetics.gui.analyst.bee; +package binnie.extrabees.genetics.gui.analyst; -import javax.annotation.Nullable; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import binnie.core.api.gui.IArea; +import binnie.core.gui.controls.ControlFluidDisplay; +import binnie.core.util.FluidStackUtil; +import binnie.core.util.ForestryRecipeUtil; +import binnie.core.util.TimeUtil; import binnie.extrabees.api.ExtraBeesAPI; import forestry.api.apiculture.BeeManager; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -27,22 +28,20 @@ import forestry.api.apiculture.IBeeGenome; import forestry.apiculture.PluginApiculture; import binnie.core.BinnieCore; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; -import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.CraftGUIUtil; import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.util.I18N; import binnie.core.util.UniqueItemStackSet; -import binnie.extratrees.kitchen.craftgui.ControlFluidDisplay; import binnie.genetics.gui.analyst.AnalystConstants; import binnie.genetics.gui.analyst.AnalystPageProduce; -public class AnalystPageProducts extends AnalystPageProduce { - public AnalystPageProducts(IWidget parent, Area area, IBee ind) { +public class AnalystPageBeeProducts extends AnalystPageProduce { + public AnalystPageBeeProducts(IWidget parent, IArea area, IBee ind) { super(parent, area); setColor(0xcc3300); IBeeGenome genome = ind.getGenome(); @@ -104,20 +103,7 @@ public class AnalystPageProducts extends AnalystPageProduce { } refinedProducts.addAll(level2Products); - Collection allFluids = new ArrayList<>(); - for (ItemStack itemStack : refinedProducts) { - for (FluidStack addition : getAllFluids(itemStack)) { - boolean alreadyIn = false; - for (FluidStack existing : allFluids) { - if (existing.isFluidEqual(addition)) { - alreadyIn = true; - } - } - if (!alreadyIn) { - allFluids.add(addition); - } - } - } + NonNullList allFluids = getAllFluidsFromItems(refinedProducts); int maxBiomePerLine = (int) ((getWidth() + 2.0f - 16.0f) / 18.0f); int biomeListX = (getWidth() - (Math.min(maxBiomePerLine, allFluids.size() + refinedProducts.size()) * 18 - 2)) / 2; @@ -139,7 +125,7 @@ public class AnalystPageProducts extends AnalystPageProduce { dx = 0; dy += 18; } - ItemStack container = getContainer(fluidStack); + ItemStack container = FluidStackUtil.getContainer(fluidStack); if (container == null) { ControlFluidDisplay display2 = new ControlFluidDisplay(this, biomeListX + dx, y + dy); display2.setFluidStack(fluidStack); @@ -154,41 +140,27 @@ public class AnalystPageProducts extends AnalystPageProduce { setSize(new Point(getWidth(), y + dy + 18 + 8)); } - @Nullable - public static ItemStack getContainer(FluidStack fluidStack) { - ItemStack[] containers = { - new ItemStack(Items.GLASS_BOTTLE), - new ItemStack(Items.BUCKET) - }; - - for (ItemStack container : containers) { - IFluidHandlerItem fluidHandler = FluidUtil.getFluidHandler(container); - if (fluidHandler != null && fluidHandler.fill(fluidStack, true) > 0) { - return fluidHandler.getContainer(); - } - } - return null; - } - private void createProductEntry(ItemStack key, Float value, int y, float speed) { ControlItemDisplay item = new ControlItemDisplay(this, 16, y) { @Override @SideOnly(Side.CLIENT) public void getTooltip(Tooltip tooltip, ITooltipFlag tooltipFlag) { super.getTooltip(tooltip, tooltipFlag); - Collection products = getCentrifuge(key); - if (!products.isEmpty()) { + NonNullList centrifugeProducts = NonNullList.create(); + ForestryRecipeUtil.getCentrifugeOutputs(key, centrifugeProducts); + if (!centrifugeProducts.isEmpty()) { tooltip.add(I18N.localise(AnalystConstants.PRODUCTS_KEY + ".centrifuges") + ": "); - for (ItemStack prod : products) { + for (ItemStack prod : centrifugeProducts) { NBTTagCompound nbt = new NBTTagCompound(); prod.writeToNBT(nbt); tooltip.add(prod, prod.getDisplayName()); } } - Collection liquids = getSqueezer(key); - if (!liquids.isEmpty()) { + NonNullList squeezerProducts = NonNullList.create(); + ForestryRecipeUtil.getSqueezerOutputs(key, squeezerProducts); + if (!squeezerProducts.isEmpty()) { tooltip.add(I18N.localise(AnalystConstants.PRODUCTS_KEY + ".squeezes") + ": "); - for (ItemStack prod2 : liquids) { + for (ItemStack prod2 : squeezerProducts) { NBTTagCompound nbt2 = new NBTTagCompound(); prod2.writeToNBT(nbt2); tooltip.add(prod2, prod2.getDisplayName()); @@ -203,7 +175,7 @@ public class AnalystPageProducts extends AnalystPageProduce { CraftGUIUtil.moveWidget(textWidget, new Point(12, 0)); item.setItemStack(key); int time = (int) (PluginApiculture.ticksPerBeeWorkCycle * 100.0 / (speed * value)); - textWidget.setValue(I18N.localise(AnalystConstants.PRODUCTS_KEY + ".every") + " " + getTimeString(time)); + textWidget.setValue(I18N.localise(AnalystConstants.PRODUCTS_KEY + ".every") + " " + TimeUtil.getTimeString(time)); } @Override diff --git a/extrabees/src/main/java/binnie/extrabees/genetics/gui/analyst/AnalystPagePlugin.java b/extrabees/src/main/java/binnie/extrabees/genetics/gui/analyst/AnalystPagePlugin.java new file mode 100644 index 00000000..a1724129 --- /dev/null +++ b/extrabees/src/main/java/binnie/extrabees/genetics/gui/analyst/AnalystPagePlugin.java @@ -0,0 +1,133 @@ +package binnie.extrabees.genetics.gui.analyst; + +import java.util.List; + +import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; +import binnie.core.api.gui.IWidget; +import binnie.core.gui.CraftGUI; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.minecraft.control.ControlIconDisplay; +import binnie.core.util.I18N; +import binnie.core.util.TimeUtil; +import binnie.genetics.api.IAnalystPagePlugin; +import binnie.genetics.gui.analyst.AnalystConstants; +import binnie.genetics.gui.analyst.AnalystPageBehaviour; +import binnie.genetics.gui.analyst.AnalystPageBiology; +import binnie.genetics.gui.analyst.tree.AnalystPageClimate; +import binnie.genetics.item.ModuleItems; +import forestry.api.apiculture.IAlleleBeeEffect; +import forestry.api.apiculture.IBee; +import forestry.api.genetics.IIndividual; +import forestry.apiculture.PluginApiculture; +import net.minecraft.util.math.Vec3i; +import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class AnalystPagePlugin implements IAnalystPagePlugin, AnalystPageBiology.IBiologyPlugin, AnalystPageBehaviour.IBehaviourPlugin { + @Override + public boolean handles(IIndividual individual) { + return individual instanceof IBee; + } + + @Override + @SideOnly(Side.CLIENT) + public void addAnalystPages(IBee individual, IWidget parent, IArea pageSize, List analystPages) { + analystPages.add(new AnalystPageClimate(parent, pageSize, individual)); + analystPages.add(new AnalystPageBeeProducts(parent, pageSize, individual)); + analystPages.add(new AnalystPageBiology<>(parent, pageSize, individual, this)); + analystPages.add(new AnalystPageBehaviour<>(parent, pageSize, individual, this)); + } + + @Override + @SideOnly(Side.CLIENT) + public int addBiologyPages(IBee bee, IWidget parent, int y) { + if (bee.getGenome().getNeverSleeps()) { + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, ModuleItems.iconAllDay) + .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".allDay")); + } else if (bee.getGenome().getPrimary().isNocturnal()) { + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, ModuleItems.iconNight) + .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".night")); + } else { + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, ModuleItems.iconDaytime) + .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".day")); + } + + if (!bee.getGenome().getToleratesRain()) { + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 24, y, ModuleItems.iconNoRain) + .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".notRain")); + } else { + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 24, y, ModuleItems.iconRain) + .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".rain")); + } + + if (bee.getGenome().getCaveDwelling()) { + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 48, y, ModuleItems.iconNoSky) + .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".underground")); + } else { + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 48, y, ModuleItems.iconSky) + .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".notUnderground")); + } + y += 30; + + int fertility = bee.getGenome().getFertility(); + if (fertility > 1) { + new ControlTextCentered(parent, y, TextFormatting.BOLD + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.drones", fertility)) + .setColor(parent.getColor()); + } else { + new ControlTextCentered(parent, y, TextFormatting.BOLD + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.drone")) + .setColor(parent.getColor()); + } + + y += 22; + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".averageLifespan")) + .setColor(parent.getColor()); + + y += 12; + int lifespan = bee.getGenome().getLifespan() * PluginApiculture.ticksPerBeeWorkCycle; + new ControlTextCentered(parent, y, TextFormatting.BOLD + TimeUtil.getMCDayString(lifespan * (bee.getGenome().getNeverSleeps() ? 1.0f : 2.0f))) + .setColor(parent.getColor()); + y += 22; + return y; + } + + @Override + @SideOnly(Side.CLIENT) + public int addBehaviourPages(IBee bee, IWidget parent, int y) { + y += 8; + int fertility = bee.getGenome().getFlowering(); + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".pollinatesNearby") + "\n" + bee.getGenome().getFlowerProvider().getDescription()) + .setColor(parent.getColor()); + y += 20; + + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".everyTime", TimeUtil.getTimeString(PluginApiculture.ticksPerBeeWorkCycle * 100 / fertility))) + .setColor(parent.getColor()); + y += 22; + + IAlleleBeeEffect effect = bee.getGenome().getEffect(); + Vec3i t = bee.getGenome().getTerritory(); + if (!effect.getUID().contains("None")) { + String effectDesc = I18N.localiseOrBlank("binniecore.allele." + effect.getUID() + ".desc"); + String loc = effectDesc.isEmpty() + ? I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".effect", effect.getAlleleName()) + : effectDesc; + + new ControlText(parent, new Area(4, y, parent.getWidth() - 8, 0), loc, TextJustification.TOP_CENTER) + .setColor(parent.getColor()); + y += (int) (CraftGUI.RENDER.textHeight(loc, parent.getWidth() - 8) + 1.0f); + + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".withinBlocks", (int) (t.getX() / 2.0f))) + .setColor(parent.getColor()); + y += 22; + } + + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".territory", t.getX(), t.getY(), t.getZ())) + .setColor(parent.getColor()); + y += 22; + return y; + } +} diff --git a/extrabees/src/main/java/binnie/extrabees/genetics/gui/analyst/package-info.java b/extrabees/src/main/java/binnie/extrabees/genetics/gui/analyst/package-info.java new file mode 100644 index 00000000..ad69a261 --- /dev/null +++ b/extrabees/src/main/java/binnie/extrabees/genetics/gui/analyst/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.genetics.gui.analyst; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/extrabees/src/main/java/binnie/extrabees/genetics/gui/package-info.java b/extrabees/src/main/java/binnie/extrabees/genetics/gui/package-info.java new file mode 100644 index 00000000..3ea9ffbe --- /dev/null +++ b/extrabees/src/main/java/binnie/extrabees/genetics/gui/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extrabees.genetics.gui; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.extrabees.utils.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/extratrees/build.gradle b/extratrees/build.gradle index 293413d1..15f29e3d 100644 --- a/extratrees/build.gradle +++ b/extratrees/build.gradle @@ -5,4 +5,6 @@ dependencies { compile project(":core-api") compile project(":extratrees-api") compile project(":botany-api") + compile project(":genetics") + compile project(":genetics-api") } diff --git a/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java b/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java index 885e3b83..b829454f 100644 --- a/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java @@ -1,5 +1,9 @@ package binnie.extratrees; +import binnie.extratrees.genetics.gui.analyst.ButterflyAnalystPagePlugin; +import binnie.extratrees.genetics.gui.analyst.TreeAnalystPagePlugin; +import binnie.extratrees.genetics.gui.analyst.TreeProducePlugin; +import binnie.genetics.api.GeneticsApi; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; @@ -49,6 +53,10 @@ public class ExtraTrees extends BlankModuleContainer { super.preInit(evt); mothBreedingSystem = new MothBreedingSystem(); Binnie.GENETICS.registerBreedingSystem(mothBreedingSystem); + + GeneticsApi.registerAnalystPagePlugin(new TreeAnalystPagePlugin()); + GeneticsApi.registerAnalystPagePlugin(new ButterflyAnalystPagePlugin()); + GeneticsApi.registerProducePlugin(new TreeProducePlugin()); } @Mod.EventHandler diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageFruit.java similarity index 96% rename from genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java rename to extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageFruit.java index 2d5a2a7e..cc638aa4 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageFruit.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageFruit.java @@ -1,10 +1,12 @@ -package binnie.genetics.gui.analyst.tree; +package binnie.extratrees.genetics.gui.analyst; import java.lang.reflect.Field; import java.util.Collection; import java.util.Collections; import java.util.Map; +import binnie.core.api.gui.IArea; +import forestry.api.arboriculture.TreeManager; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; @@ -13,15 +15,13 @@ import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.IAlleleFruit; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenome; -import forestry.api.arboriculture.TreeManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IFruitFamily; import forestry.arboriculture.FruitProviderPod; import binnie.core.Binnie; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; -import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.util.I18N; @@ -31,7 +31,7 @@ import binnie.genetics.gui.analyst.AnalystConstants; import binnie.genetics.gui.analyst.AnalystPageProduce; public class AnalystPageFruit extends AnalystPageProduce { - public AnalystPageFruit(IWidget parent, Area area, ITree ind) { + public AnalystPageFruit(IWidget parent, IArea area, ITree ind) { super(parent, area); setColor(13382400); ITreeGenome genome = ind.getGenome(); diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageGrowth.java similarity index 82% rename from genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java rename to extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageGrowth.java index e4f59193..817a678c 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageGrowth.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageGrowth.java @@ -1,5 +1,7 @@ -package binnie.genetics.gui.analyst.tree; +package binnie.extratrees.genetics.gui.analyst; +import binnie.core.api.gui.IArea; +import binnie.core.util.TimeUtil; import net.minecraft.util.text.TextFormatting; import forestry.api.arboriculture.EnumTreeChromosome; @@ -7,16 +9,15 @@ import forestry.api.arboriculture.ITree; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; -import binnie.core.gui.geometry.Area; import binnie.core.util.I18N; import binnie.extratrees.modules.ModuleWood; import binnie.genetics.gui.analyst.AnalystConstants; import binnie.genetics.gui.analyst.ControlAnalystPage; public class AnalystPageGrowth extends ControlAnalystPage { - public AnalystPageGrowth(IWidget parent, Area area, IIndividual ind) { + public AnalystPageGrowth(IWidget parent, IArea area, IIndividual ind) { super(parent, area); setColor(3355443); int y = 4; @@ -28,7 +29,7 @@ public class AnalystPageGrowth extends ControlAnalystPage { int mat = tree.getGenome().getMaturationTime(); new ControlTextCentered(this, y, I18N.localise(AnalystConstants.GROWTH_KEY + ".mature")).setColor(getColor()); y += 12; - new ControlTextCentered(this, y, TextFormatting.BOLD + getTimeString(Math.round(1373.3999f * mat))).setColor(getColor()); + new ControlTextCentered(this, y, TextFormatting.BOLD + TimeUtil.getTimeString(Math.round(1373.3999f * mat))).setColor(getColor()); y += 22; new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.GROWTH_KEY + ".height") + ": " + ModuleWood.treeBreedingSystem.getAlleleName(EnumTreeChromosome.HEIGHT, ind.getGenome().getActiveAllele(EnumTreeChromosome.HEIGHT))).setColor(getColor()); y += 12; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageWood.java b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageWood.java similarity index 94% rename from genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageWood.java rename to extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageWood.java index fa3f45fb..89c8362a 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageWood.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageWood.java @@ -1,7 +1,8 @@ -package binnie.genetics.gui.analyst.tree; +package binnie.extratrees.genetics.gui.analyst; import java.util.Collection; +import binnie.core.api.gui.IArea; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; @@ -14,9 +15,8 @@ import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.ITreeGenome; import forestry.api.genetics.IAlleleBoolean; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; -import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.control.ControlIconDisplay; import binnie.core.gui.minecraft.control.ControlItemDisplay; @@ -28,7 +28,7 @@ import binnie.genetics.item.ModuleItems; @SideOnly(Side.CLIENT) public class AnalystPageWood extends AnalystPageProduce { - public AnalystPageWood(IWidget parent, Area area, ITree ind) { + public AnalystPageWood(IWidget parent, IArea area, ITree ind) { super(parent, area); setColor(6697728); ITreeGenome genome = ind.getGenome(); diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/ButterflyAnalystPagePlugin.java b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/ButterflyAnalystPagePlugin.java new file mode 100644 index 00000000..df5a03ad --- /dev/null +++ b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/ButterflyAnalystPagePlugin.java @@ -0,0 +1,137 @@ +package binnie.extratrees.genetics.gui.analyst; + +import java.util.List; + +import binnie.core.Constants; +import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; +import binnie.core.api.gui.IWidget; +import binnie.core.gui.controls.ControlText; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.geometry.Area; +import binnie.core.gui.geometry.TextJustification; +import binnie.core.gui.minecraft.control.ControlIconDisplay; +import binnie.core.util.I18N; +import binnie.core.util.TimeUtil; +import binnie.extratrees.ExtraTrees; +import binnie.genetics.api.IAnalystPagePlugin; +import binnie.genetics.gui.analyst.AnalystConstants; +import binnie.genetics.gui.analyst.AnalystPageBehaviour; +import binnie.genetics.gui.analyst.AnalystPageBiology; +import binnie.genetics.gui.analyst.butterfly.AnalystPageSpecimen; +import binnie.genetics.gui.analyst.tree.AnalystPageClimate; +import binnie.genetics.item.ModuleItems; +import forestry.api.genetics.IIndividual; +import forestry.api.lepidopterology.EnumButterflyChromosome; +import forestry.api.lepidopterology.IAlleleButterflyEffect; +import forestry.api.lepidopterology.IButterfly; +import forestry.api.lepidopterology.IButterflyGenome; +import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class ButterflyAnalystPagePlugin implements IAnalystPagePlugin, AnalystPageBiology.IBiologyPlugin, AnalystPageBehaviour.IBehaviourPlugin { + @Override + public boolean handles(IIndividual individual) { + return individual instanceof IButterfly; + } + + @Override + @SideOnly(Side.CLIENT) + public void addAnalystPages(IButterfly individual, IWidget parent, IArea pageSize, List analystPages) { + analystPages.add(new AnalystPageClimate(parent, pageSize, individual)); + analystPages.add(new AnalystPageSpecimen(parent, pageSize, individual)); + analystPages.add(new AnalystPageBiology<>(parent, pageSize, individual, this)); + analystPages.add(new AnalystPageBehaviour<>(parent, pageSize, individual, this)); + } + + @Override + @SideOnly(Side.CLIENT) + public int addBiologyPages(IButterfly butterfly, IWidget parent, int y) { + if (butterfly.getGenome().getNocturnal()) { + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, ModuleItems.iconAllDay) + .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".allDay")); + } else if (butterfly.getGenome().getPrimary().isNocturnal()) { + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, ModuleItems.iconNight) + .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".night")); + } else { + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, ModuleItems.iconDaytime) + .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".day")); + } + + if (!butterfly.getGenome().getTolerantFlyer()) { + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 24, y, ModuleItems.iconNoRain) + .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".notRain")); + } else { + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 24, y, ModuleItems.iconRain) + .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".rain")); + } + + if (butterfly.getGenome().getFireResist()) { + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 48, y, ModuleItems.iconNoFire) + .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".nonflammable")); + } else { + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 48, y, ModuleItems.iconFire) + .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".flammable")); + } + y += 30; + + int fertility = butterfly.getGenome().getFertility(); + if (fertility > 1) { + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.moths", fertility)) + .setColor(parent.getColor()); + } else { + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.moth")) + .setColor(parent.getColor()); + } + + y += 32; + float caterpillarMatureTime = Constants.SPAWN_KOEF * Math.round(butterfly.getGenome().getLifespan() / (butterfly.getGenome().getFertility() * 2)); + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".caterpillarGestation")) + .setColor(parent.getColor()); + + y += 12; + new ControlTextCentered(parent, y, TextFormatting.BOLD + TimeUtil.getMCDayString(caterpillarMatureTime)) + .setColor(parent.getColor()); + + y += 22; + int speed = (int) (20.0f * butterfly.getGenome().getSpeed()); + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".flightSpeed")) + .setColor(parent.getColor()); + + y += 12; + new ControlTextCentered(parent, y, TextFormatting.BOLD + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".blocksPerSec", speed)) + .setColor(parent.getColor()); + y += 22; + return y; + } + + @Override + public int addBehaviourPages(IButterfly individual, IWidget parent, int y) { + IButterflyGenome genome = individual.getGenome(); + String metabolismAlleleName = ExtraTrees.mothBreedingSystem.getAlleleName(EnumButterflyChromosome.METABOLISM, genome.getActiveAllele(EnumButterflyChromosome.METABOLISM)); + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".metabolism", metabolismAlleleName)) + .setColor(parent.getColor()); + y += 20; + + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".pollinatesNearby") + "\n" + genome.getFlowerProvider().getDescription()) + .setColor(parent.getColor()); + y += 20; + + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".everyTime", TimeUtil.getTimeString(1500))) + .setColor(parent.getColor()); + y += 22; + + IAlleleButterflyEffect effect2 = genome.getEffect(); + if (!effect2.getUID().contains("None")) { + String effectDesc2 = I18N.localiseOrBlank("binniecore.allele." + effect2.getUID() + ".desc"); + String loc2 = effectDesc2.isEmpty() + ? I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".effect", effect2.getAlleleName()) + : effectDesc2; + + new ControlText(parent, new Area(4, y, parent.getWidth() - 8, 0), loc2, TextJustification.TOP_CENTER) + .setColor(parent.getColor()); + } + return y; + } +} diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/TreeAnalystPagePlugin.java b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/TreeAnalystPagePlugin.java new file mode 100644 index 00000000..39d49772 --- /dev/null +++ b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/TreeAnalystPagePlugin.java @@ -0,0 +1,68 @@ +package binnie.extratrees.genetics.gui.analyst; + +import java.util.List; + +import binnie.core.Constants; +import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; +import binnie.core.api.gui.IWidget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.util.I18N; +import binnie.core.util.TimeUtil; +import binnie.extratrees.modules.ModuleWood; +import binnie.genetics.api.IAnalystPagePlugin; +import binnie.genetics.gui.analyst.AnalystConstants; +import binnie.genetics.gui.analyst.AnalystPageBiology; +import forestry.api.arboriculture.EnumTreeChromosome; +import forestry.api.arboriculture.ITree; +import forestry.api.genetics.IIndividual; +import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class TreeAnalystPagePlugin implements IAnalystPagePlugin, AnalystPageBiology.IBiologyPlugin { + @Override + public boolean handles(IIndividual individual) { + return individual instanceof ITree; + } + + @Override + @SideOnly(Side.CLIENT) + public void addAnalystPages(ITree individual, IWidget parent, IArea pageSize, List analystPages) { + analystPages.add(new AnalystPageFruit(parent, pageSize, individual)); + analystPages.add(new AnalystPageWood(parent, pageSize, individual)); + analystPages.add(new AnalystPageBiology<>(parent, pageSize, individual, this)); + analystPages.add(new AnalystPageGrowth(parent, pageSize, individual)); + } + + @Override + @SideOnly(Side.CLIENT) + public int addBiologyPages(ITree tree, IWidget parent, int y) { + String alleleName = ModuleWood.treeBreedingSystem.getAlleleName(EnumTreeChromosome.SAPPINESS, tree.getGenome().getActiveAllele(EnumTreeChromosome.SAPPINESS)); + new ControlTextCentered(parent, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".sappiness", alleleName)) + .setColor(parent.getColor()); + y += 20; + + int fertility = (int) (1.0f / tree.getGenome().getFertility()); + if (fertility > 1) { + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.leaves", fertility)) + .setColor(parent.getColor()); + } else { + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.leaf")) + .setColor(parent.getColor()); + } + + y += 22; + int butterflySpawn = Math.round(Constants.SPAWN_KOEF / (tree.getGenome().getSappiness() * tree.getGenome().getYield() * 0.5f)); + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".mothSpawn.perLeaf", TimeUtil.getTimeString(butterflySpawn))) + .setColor(parent.getColor()); + + y += 34; + new ControlTextCentered(parent, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".plantTypes")).setColor(parent.getColor()); + + y += 12; + new ControlTextCentered(parent, y, TextFormatting.ITALIC + tree.getGenome().getPrimary().getPlantType().toString()) + .setColor(parent.getColor()); + return y; + } +} diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/TreeProducePlugin.java b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/TreeProducePlugin.java new file mode 100644 index 00000000..4cce4ed5 --- /dev/null +++ b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/TreeProducePlugin.java @@ -0,0 +1,35 @@ +package binnie.extratrees.genetics.gui.analyst; + +import binnie.extratrees.machines.brewery.recipes.BreweryRecipeManager; +import binnie.extratrees.machines.distillery.recipes.DistilleryRecipeManager; +import binnie.extratrees.machines.fruitpress.recipes.FruitPressRecipeManager; +import binnie.genetics.api.IProducePlugin; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fluids.FluidStack; + +public class TreeProducePlugin implements IProducePlugin { + @Override + public void getFluids(ItemStack inputStack, NonNullList outputFluids) { + FluidStack output = FruitPressRecipeManager.getOutput(inputStack); + if (output != null) { + outputFluids.add(output); + } + } + + @Override + public void getFluids(FluidStack inputFluid, NonNullList outputFluids) { + BreweryRecipeManager.getOutput(inputFluid, outputFluids); + for (int level = 0; level < 3; level++) { + FluidStack output = DistilleryRecipeManager.getOutput(inputFluid, level); + if (output != null) { + outputFluids.add(output); + } + } + } + + @Override + public void getItems(ItemStack inputStack, NonNullList outputItems) { + + } +} diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/package-info.java b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/package-info.java new file mode 100644 index 00000000..f486703b --- /dev/null +++ b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.extratrees.genetics.gui.analyst; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file diff --git a/extratrees/src/main/java/binnie/extratrees/gui/database/ControlBlockIconDisplay.java b/extratrees/src/main/java/binnie/extratrees/gui/database/ControlBlockIconDisplay.java index dcb3c19d..062000f6 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/ControlBlockIconDisplay.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/ControlBlockIconDisplay.java @@ -5,7 +5,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Point; import binnie.core.gui.renderer.RenderUtil; diff --git a/extratrees/src/main/java/binnie/extratrees/gui/database/PageFruit.java b/extratrees/src/main/java/binnie/extratrees/gui/database/PageFruit.java index 2c5e00bd..07e9427d 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/PageFruit.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/PageFruit.java @@ -10,7 +10,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import binnie.extratrees.genetics.TreeBreedingSystem; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.database.ControlSpeciesBox; import binnie.core.gui.database.DatabaseTab; diff --git a/extratrees/src/main/java/binnie/extratrees/gui/database/PagePlanksOverview.java b/extratrees/src/main/java/binnie/extratrees/gui/database/PagePlanksOverview.java index e1b4b9b2..426803a1 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/PagePlanksOverview.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/PagePlanksOverview.java @@ -7,7 +7,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.database.DatabaseTab; import binnie.core.gui.database.PageAbstract; diff --git a/extratrees/src/main/java/binnie/extratrees/gui/database/PagePlanksTrees.java b/extratrees/src/main/java/binnie/extratrees/gui/database/PagePlanksTrees.java index 11963736..ac5d8174 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/PagePlanksTrees.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/PagePlanksTrees.java @@ -10,7 +10,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import binnie.extratrees.genetics.TreeBreedingSystem; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.database.ControlSpeciesBox; import binnie.core.gui.database.DatabaseTab; diff --git a/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesImage.java b/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesImage.java index a8ebb629..e2dd04ba 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesImage.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesImage.java @@ -2,7 +2,7 @@ package binnie.extratrees.gui.database; import forestry.api.genetics.IAlleleSpecies; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.database.ControlIndividualDisplay; import binnie.core.gui.database.DatabaseTab; diff --git a/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesTreeGenome.java b/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesTreeGenome.java index aa92020e..edaf0fef 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesTreeGenome.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/PageSpeciesTreeGenome.java @@ -24,7 +24,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import binnie.core.api.genetics.IBreedingSystem; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.scroll.ControlScrollableContent; diff --git a/extratrees/src/main/java/binnie/extratrees/gui/database/PageWood.java b/extratrees/src/main/java/binnie/extratrees/gui/database/PageWood.java index 7aa05478..0dd11ed7 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/PageWood.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/PageWood.java @@ -10,7 +10,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import binnie.extratrees.genetics.TreeBreedingSystem; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.database.ControlSpeciesBox; import binnie.core.gui.database.DatabaseTab; diff --git a/extratrees/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java b/extratrees/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java index 10954651..f6d2234e 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java @@ -11,7 +11,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.AbstractMod; import binnie.extratrees.genetics.TreeBreedingSystem; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.listbox.ControlListBox; import binnie.core.gui.database.ControlItemStackOption; import binnie.core.gui.database.DatabaseTab; diff --git a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropDownMenu.java b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropDownMenu.java index 11c1f1bc..7a6584c3 100644 --- a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropDownMenu.java +++ b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlDropDownMenu.java @@ -1,7 +1,7 @@ package binnie.extratrees.kitchen.craftgui; import binnie.core.gui.Attribute; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.minecraft.MinecraftGUI; import binnie.core.gui.window.Panel; diff --git a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java index 8eae79cb..5e545f6f 100644 --- a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java +++ b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotFluid.java @@ -2,6 +2,7 @@ package binnie.extratrees.kitchen.craftgui; import javax.annotation.Nullable; +import binnie.core.gui.controls.ControlFluidDisplay; import net.minecraft.client.util.ITooltipFlag; import net.minecraftforge.fluids.FluidStack; @@ -11,7 +12,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.events.EventWidget; diff --git a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java index 7873b440..3f1ea419 100644 --- a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java +++ b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlSlotGlassware.java @@ -2,7 +2,7 @@ package binnie.extratrees.kitchen.craftgui; import net.minecraft.item.ItemStack; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.IControlValue; import binnie.core.gui.minecraft.control.ControlSlotBase; import binnie.extratrees.alcohol.GlasswareType; diff --git a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java index 5204cb72..140c3ef0 100644 --- a/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java +++ b/extratrees/src/main/java/binnie/extratrees/kitchen/craftgui/ControlTankSlot.java @@ -5,7 +5,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.events.EventMouse; import binnie.core.gui.geometry.Area; import binnie.core.gui.minecraft.Window; diff --git a/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java index 98acf791..6b87f1ed 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/brewery/recipes/BreweryRecipeManager.java @@ -7,6 +7,7 @@ import java.util.Set; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.Optional; @@ -39,16 +40,14 @@ public class BreweryRecipeManager implements IBreweryManager { return false; } - @Nullable - public static FluidStack getOutput(final FluidStack stack) { + public static void getOutput(final FluidStack stack, NonNullList outputFluids) { final BreweryCrafting crafting = new BreweryCrafting(stack, ItemStack.EMPTY, null, ItemStack.EMPTY); for (final IBreweryRecipe recipe : recipes) { FluidStack output = recipe.getOutput(crafting); if (output != null) { - return output; + outputFluids.add(output); } } - return null; } @Nullable diff --git a/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/ControlBreweryProgress.java b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/ControlBreweryProgress.java index 37eb6f09..a2e42ed4 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/ControlBreweryProgress.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/brewery/window/ControlBreweryProgress.java @@ -13,7 +13,7 @@ import org.lwjgl.opengl.GL11; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.Window; diff --git a/extratrees/src/main/java/binnie/extratrees/machines/designer/window/ControlRecipeSlot.java b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/ControlRecipeSlot.java index 635ea8cf..caeaec1f 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/designer/window/ControlRecipeSlot.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/ControlRecipeSlot.java @@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.events.EventMouse; import binnie.core.gui.minecraft.Window; import binnie.core.gui.minecraft.control.ControlSlotBase; diff --git a/extratrees/src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java index ecdbbd20..b6ce9346 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java @@ -17,7 +17,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.core.Control; diff --git a/extratrees/src/main/java/binnie/extratrees/machines/designer/window/WindowDesigner.java b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/WindowDesigner.java index 56253abe..6ebcc101 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/designer/window/WindowDesigner.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/designer/window/WindowDesigner.java @@ -2,6 +2,7 @@ package binnie.extratrees.machines.designer.window; import javax.annotation.Nullable; +import binnie.core.api.gui.events.EventHandlerOrigin; import binnie.extratrees.machines.designer.IDesignerType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -13,7 +14,6 @@ import binnie.core.AbstractMod; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextEdit; import binnie.core.gui.controls.scroll.ControlScrollableContent; -import binnie.core.gui.events.EventHandler; import binnie.core.gui.events.EventTextEdit; import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Point; @@ -35,7 +35,7 @@ public class WindowDesigner extends Window { public WindowDesigner(final EntityPlayer player, final IInventory inventory, final Side side) { super(320, 216, player, inventory, side); - this.addEventHandler(EventTextEdit.class, EventHandler.Origin.DIRECT_CHILD, this, event -> { + this.addEventHandler(EventTextEdit.class, EventHandlerOrigin.DIRECT_CHILD, this, event -> { WindowDesigner.this.tileSelect.refresh(event.getValue()); }); } diff --git a/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java b/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java index 37a54070..4dea3e85 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java @@ -10,7 +10,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.events.EventMouse; import binnie.core.gui.geometry.Area; import binnie.core.api.gui.Alignment; diff --git a/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/ControlFruitPressProgress.java b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/ControlFruitPressProgress.java index cf68b5f7..e54da999 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/ControlFruitPressProgress.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/fruitpress/window/ControlFruitPressProgress.java @@ -13,7 +13,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.events.EventMouse; import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.ContainerCraftGUI; diff --git a/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java index 578dc429..dcc9bbd8 100644 --- a/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java +++ b/extratrees/src/main/java/binnie/extratrees/machines/lumbermill/window/ControlLumbermillProgress.java @@ -18,7 +18,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.MinecraftGUI; diff --git a/extratrees/src/main/java/binnie/extratrees/modules/ModuleMothDatabase.java b/extratrees/src/main/java/binnie/extratrees/modules/ModuleMothDatabase.java index 633434e9..a4ac8489 100644 --- a/extratrees/src/main/java/binnie/extratrees/modules/ModuleMothDatabase.java +++ b/extratrees/src/main/java/binnie/extratrees/modules/ModuleMothDatabase.java @@ -17,6 +17,7 @@ import binnie.extratrees.ExtraTrees; import binnie.extratrees.items.ItemMothDatabase; import binnie.core.modules.BinnieModule; import binnie.core.modules.Module; +import net.minecraftforge.oredict.OreDictionary; @BinnieModule(moduleID = ExtraTreesModuleUIDs.MOTH_DATABASE, moduleContainerID = Constants.EXTRA_TREES_MOD_ID, name = "Database", unlocalizedDescription = "extratrees.module.database.moth") public class ModuleMothDatabase extends Module { @@ -27,6 +28,7 @@ public class ModuleMothDatabase extends Module { public void registerItemsAndBlocks() { itemDictionaryLepi = new ItemMothDatabase(); ExtraTrees.proxy.registerItem(itemDictionaryLepi); + OreDictionary.registerOre("binnie_database", itemDictionaryLepi); } @Override diff --git a/extratrees/src/main/java/binnie/extratrees/modules/ModuleTreeDatabase.java b/extratrees/src/main/java/binnie/extratrees/modules/ModuleTreeDatabase.java index 56e2d617..4836479c 100644 --- a/extratrees/src/main/java/binnie/extratrees/modules/ModuleTreeDatabase.java +++ b/extratrees/src/main/java/binnie/extratrees/modules/ModuleTreeDatabase.java @@ -16,6 +16,7 @@ import binnie.extratrees.ExtraTrees; import binnie.extratrees.items.ItemArboristDatabase; import binnie.core.modules.BinnieModule; import binnie.core.modules.Module; +import net.minecraftforge.oredict.OreDictionary; @BinnieModule(moduleID = ExtraTreesModuleUIDs.TREE_DATABASE, moduleContainerID = Constants.EXTRA_TREES_MOD_ID, name = "Database", unlocalizedDescription = "extratrees.module.database.tree") public class ModuleTreeDatabase extends Module { @@ -25,6 +26,7 @@ public class ModuleTreeDatabase extends Module { public void registerItemsAndBlocks() { itemDictionary = new ItemArboristDatabase(); ExtraTrees.proxy.registerItem(itemDictionary); + OreDictionary.registerOre("binnie_database", itemDictionary); } @Override diff --git a/genetics-api/src/main/java/binnie/genetics/api/GeneticsApi.java b/genetics-api/src/main/java/binnie/genetics/api/GeneticsApi.java new file mode 100644 index 00000000..df49d09b --- /dev/null +++ b/genetics-api/src/main/java/binnie/genetics/api/GeneticsApi.java @@ -0,0 +1,36 @@ +package binnie.genetics.api; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; + +import forestry.api.genetics.IIndividual; + +public class GeneticsApi { + private static Collection analystPagePlugins = new ArrayList<>(); + private static Collection producePlugins = new ArrayList<>(); + + public static void registerAnalystPagePlugin(IAnalystPagePlugin analystPageFactory) { + analystPagePlugins.add(analystPageFactory); + } + + @Nullable + public static IAnalystPagePlugin getAnalystPagePlugin(T individual) { + for (IAnalystPagePlugin plugin : analystPagePlugins) { + if (plugin.handles(individual)) { + //noinspection unchecked + return plugin; + } + } + return null; + } + + public static void registerProducePlugin(IProducePlugin producePlugin) { + producePlugins.add(producePlugin); + } + + public static Collection getProducePlugins() { + return Collections.unmodifiableCollection(producePlugins); + } +} diff --git a/genetics-api/src/main/java/binnie/genetics/api/IAnalystPagePlugin.java b/genetics-api/src/main/java/binnie/genetics/api/IAnalystPagePlugin.java new file mode 100644 index 00000000..c1192c92 --- /dev/null +++ b/genetics-api/src/main/java/binnie/genetics/api/IAnalystPagePlugin.java @@ -0,0 +1,17 @@ +package binnie.genetics.api; + +import java.util.List; + +import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; +import binnie.core.api.gui.IWidget; +import forestry.api.genetics.IIndividual; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public interface IAnalystPagePlugin { + boolean handles(IIndividual individual); + + @SideOnly(Side.CLIENT) + void addAnalystPages(T individual, IWidget parent, IArea pageSize, List analystPages); +} diff --git a/genetics-api/src/main/java/binnie/genetics/api/IProducePlugin.java b/genetics-api/src/main/java/binnie/genetics/api/IProducePlugin.java new file mode 100644 index 00000000..30cca6e9 --- /dev/null +++ b/genetics-api/src/main/java/binnie/genetics/api/IProducePlugin.java @@ -0,0 +1,11 @@ +package binnie.genetics.api; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fluids.FluidStack; + +public interface IProducePlugin { + void getFluids(ItemStack inputStack, NonNullList outputFluids); + void getFluids(FluidStack inputFluid, NonNullList outputFluids); + void getItems(ItemStack inputStack, NonNullList outputItems); +} diff --git a/genetics/build.gradle b/genetics/build.gradle index 8e36e9d0..8dbd24fc 100644 --- a/genetics/build.gradle +++ b/genetics/build.gradle @@ -5,8 +5,8 @@ dependencies { compile project(":genetics-api") // TODO: remove these, they should add on to genetics instead - compile project(":botany") +// compile project(":botany") compile project(":botany-api") compile project(":extrabees-api") - compile project(":extratrees") +// compile project(":extratrees") } diff --git a/genetics/src/main/java/binnie/genetics/Genetics.java b/genetics/src/main/java/binnie/genetics/Genetics.java index 4bcdec24..7b0e4b85 100644 --- a/genetics/src/main/java/binnie/genetics/Genetics.java +++ b/genetics/src/main/java/binnie/genetics/Genetics.java @@ -1,6 +1,8 @@ package binnie.genetics; +import binnie.genetics.api.GeneticsApi; import binnie.genetics.core.GeneticsTexture; +import binnie.genetics.gui.analyst.GeneticsProducePlugin; import binnie.genetics.machine.sequencer.Sequencer; import com.google.common.base.Preconditions; @@ -35,6 +37,7 @@ import binnie.genetics.item.ItemPunnettSquare; import binnie.genetics.item.ModuleItems; import binnie.genetics.machine.ModuleMachine; import binnie.genetics.proxy.Proxy; +import net.minecraftforge.oredict.OreDictionary; @Mod( modid = Constants.GENETICS_MOD_ID, @@ -68,6 +71,7 @@ public class Genetics extends AbstractMod { public void preInit(FMLPreInitializationEvent evt) { dictionaryBees = proxy.registerItem(new ItemBeeDictionary()); proxy.registerItem(new ItemPunnettSquare()); + OreDictionary.registerOre("binnie_database", dictionaryBees); super.preInit(evt); GeneticsTexture.dnaIcon = Binnie.RESOURCE.getItemSprite(Genetics.instance, "dna"); @@ -75,6 +79,8 @@ public class Genetics extends AbstractMod { Sequencer.fxSeqG = Binnie.RESOURCE.getBlockSprite(Genetics.instance, "fx/sequencer.g"); Sequencer.fxSeqT = Binnie.RESOURCE.getBlockSprite(Genetics.instance, "fx/sequencer.t"); Sequencer.fxSeqC = Binnie.RESOURCE.getBlockSprite(Genetics.instance, "fx/sequencer.c"); + + GeneticsApi.registerProducePlugin(new GeneticsProducePlugin()); } @Mod.EventHandler diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java index 24cd7e79..d678cac5 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java @@ -1,97 +1,27 @@ package binnie.genetics.gui.analyst; -import binnie.extratrees.ExtraTrees; -import net.minecraft.util.math.Vec3i; +import binnie.core.api.gui.IArea; +import binnie.core.api.gui.IWidget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.util.I18N; +import forestry.api.genetics.IIndividual; import net.minecraft.util.text.TextFormatting; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.apiculture.IAlleleBeeEffect; -import forestry.api.apiculture.IBee; -import forestry.api.genetics.IIndividual; -import forestry.api.lepidopterology.EnumButterflyChromosome; -import forestry.api.lepidopterology.IAlleleButterflyEffect; -import forestry.api.lepidopterology.IButterfly; -import forestry.apiculture.PluginApiculture; - -import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; -import binnie.core.gui.controls.ControlText; -import binnie.core.gui.controls.ControlTextCentered; -import binnie.core.gui.geometry.Area; -import binnie.core.gui.geometry.TextJustification; -import binnie.core.util.I18N; - @SideOnly(Side.CLIENT) -public class AnalystPageBehaviour extends ControlAnalystPage { - public AnalystPageBehaviour(IWidget parent, Area area, IIndividual ind) { +public class AnalystPageBehaviour extends ControlAnalystPage { + public interface IBehaviourPlugin { + int addBehaviourPages(T individual, IWidget parent, int y); + } + + public AnalystPageBehaviour(IWidget parent, IArea area, T ind, IBehaviourPlugin behaviourPlugin) { super(parent, area); setColor(0x660033); int y = 4; - new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()) - .setColor(getColor()); + new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColor(getColor()); y += 12; - - if (ind instanceof IBee) { - IBee bee = (IBee) ind; - y += 8; - int fertility = bee.getGenome().getFlowering(); - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".pollinatesNearby") + "\n" + bee.getGenome().getFlowerProvider().getDescription()) - .setColor(getColor()); - y += 20; - - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".everyTime", getTimeString(PluginApiculture.ticksPerBeeWorkCycle * 100 / fertility))) - .setColor(getColor()); - y += 22; - - IAlleleBeeEffect effect = bee.getGenome().getEffect(); - Vec3i t = bee.getGenome().getTerritory(); - if (!effect.getUID().contains("None")) { - String effectDesc = I18N.localiseOrBlank("binniecore.allele." + effect.getUID() + ".desc"); - String loc = effectDesc.isEmpty() - ? I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".effect", effect.getAlleleName()) - : effectDesc; - - new ControlText(this, new Area(4, y, getWidth() - 8, 0), loc, TextJustification.TOP_CENTER) - .setColor(getColor()); - y += (int) (CraftGUI.RENDER.textHeight(loc, getWidth() - 8) + 1.0f); - - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".withinBlocks", (int) (t.getX() / 2.0f))) - .setColor(getColor()); - y += 22; - } - - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".territory", t.getX(), t.getY(), t.getZ())) - .setColor(getColor()); - y += 22; - } - - if (ind instanceof IButterfly) { - IButterfly bee2 = (IButterfly) ind; - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".metabolism", ExtraTrees.mothBreedingSystem.getAlleleName(EnumButterflyChromosome.METABOLISM, ind.getGenome().getActiveAllele(EnumButterflyChromosome.METABOLISM)))) - .setColor(getColor()); - y += 20; - - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".pollinatesNearby") + "\n" + bee2.getGenome().getFlowerProvider().getDescription()) - .setColor(getColor()); - y += 20; - - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".everyTime", getTimeString(1500))) - .setColor(getColor()); - y += 22; - - IAlleleButterflyEffect effect2 = bee2.getGenome().getEffect(); - if (!effect2.getUID().contains("None")) { - String effectDesc2 = I18N.localiseOrBlank("binniecore.allele." + effect2.getUID() + ".desc"); - String loc2 = effectDesc2.isEmpty() - ? I18N.localise(AnalystConstants.BEHAVIOUR_KEY + ".effect", effect2.getAlleleName()) - : effectDesc2; - - new ControlText(this, new Area(4, y, getWidth() - 8, 0), loc2, TextJustification.TOP_CENTER) - .setColor(getColor()); - } - } + y = behaviourPlugin.addBehaviourPages(ind, this, y); } @Override diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java index ac523f00..b500f960 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java @@ -1,391 +1,33 @@ package binnie.genetics.gui.analyst; -import java.text.DecimalFormat; - +import binnie.core.api.gui.IArea; +import binnie.core.api.gui.IWidget; +import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.geometry.Point; +import binnie.core.util.I18N; +import forestry.api.genetics.IIndividual; import net.minecraft.util.text.TextFormatting; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -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 binnie.botany.api.genetics.IFlower; -import binnie.core.gui.IWidget; -import binnie.core.gui.controls.ControlTextCentered; -import binnie.core.gui.geometry.Area; -import binnie.core.gui.geometry.Point; -import binnie.core.gui.minecraft.control.ControlIconDisplay; -import binnie.core.util.I18N; -import binnie.extratrees.modules.ModuleWood; -import binnie.genetics.item.ModuleItems; - @SideOnly(Side.CLIENT) -public class AnalystPageBiology extends ControlAnalystPage { - private static final float SPAWN_KOEF = 1365.3999f; +public class AnalystPageBiology extends ControlAnalystPage { - public AnalystPageBiology(IWidget parent, Area area, IIndividual ind) { + public interface IBiologyPlugin { + @SideOnly(Side.CLIENT) + int addBiologyPages(T individual, IWidget parent, int y); + } + + public AnalystPageBiology(IWidget parent, IArea area, T ind, IBiologyPlugin plugin) { super(parent, area); setColor(0x006666); int y = 4; - new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()) - .setColor(getColor()); + new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColor(getColor()); y += 12; - - /*if (ind instanceof IBee) { - IBee bee = (IBee) ind; - if (bee.getGenome().getNeverSleeps()) { - new ControlIconDisplay(this, (getWidth() - 64) / 2, y, ModuleItems.iconAllDay) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".allDay")); - } else if (bee.getGenome().getPrimary().isNocturnal()) { - new ControlIconDisplay(this, (getWidth() - 64) / 2, y, ModuleItems.iconNight) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".night")); - } else { - new ControlIconDisplay(this, (getWidth() - 64) / 2, y, ModuleItems.iconDaytime) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".day")); - } - - if (!bee.getGenome().getToleratesRain()) { - new ControlIconDisplay(this, (getWidth() - 64) / 2 + 24, y, ModuleItems.iconNoRain) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".notRain")); - } else { - new ControlIconDisplay(this, (getWidth() - 64) / 2 + 24, y, ModuleItems.iconRain) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".rain")); - } - - if (bee.getGenome().getCaveDwelling()) { - new ControlIconDisplay(this, (getWidth() - 64) / 2 + 48, y, ModuleItems.iconNoSky) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".underground")); - } else { - new ControlIconDisplay(this, (getWidth() - 64) / 2 + 48, y, ModuleItems.iconSky) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".notUnderground")); - } - y += 30; - } else if (ind instanceof IButterfly) { - IButterfly moth = (IButterfly) ind; - if (moth.getGenome().getNocturnal()) { - new ControlIconDisplay(this, (getWidth() - 64) / 2, y, ModuleItems.iconAllDay) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".allDay")); - } else if (moth.getGenome().getPrimary().isNocturnal()) { - new ControlIconDisplay(this, (getWidth() - 64) / 2, y, ModuleItems.iconNight) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".night")); - } else { - new ControlIconDisplay(this, (getWidth() - 64) / 2, y, ModuleItems.iconDaytime) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".day")); - } - - if (!moth.getGenome().getTolerantFlyer()) { - new ControlIconDisplay(this, (getWidth() - 64) / 2 + 24, y, ModuleItems.iconNoRain) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".notRain")); - } else { - new ControlIconDisplay(this, (getWidth() - 64) / 2 + 24, y, ModuleItems.iconRain) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".rain")); - } - - if (moth.getGenome().getFireResist()) { - new ControlIconDisplay(this, (getWidth() - 64) / 2 + 48, y, ModuleItems.iconNoFire) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".nonflammable")); - } else { - new ControlIconDisplay(this, (getWidth() - 64) / 2 + 48, y, ModuleItems.iconFire) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".flammable")); - } - y += 30; - } else if (ind instanceof ITree) { - String alleleName = Binnie.GENETICS.treeBreedingSystem.getAlleleName(EnumTreeChromosome.SAPPINESS, ind.getGenome().getActiveAllele(EnumTreeChromosome.SAPPINESS)); - new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".sappiness", alleleName)) - .setColor(getColor()); - y += 20; - } else { - y += 10; - } - - if (ind instanceof IBee) { - IBee bee = (IBee) ind; - int fertility = bee.getGenome().getFertility(); - if (fertility > 1) { - new ControlTextCentered(this, y, TextFormatting.BOLD + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.drones", fertility)) - .setColor(getColor()); - } else { - new ControlTextCentered(this, y, TextFormatting.BOLD + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.drone")) - .setColor(getColor()); - } - - y += 22; - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".averageLifespan")) - .setColor(getColor()); - - y += 12; - int lifespan = bee.getGenome().getLifespan() * PluginApiculture.ticksPerBeeWorkCycle; - new ControlTextCentered(this, y, TextFormatting.BOLD + getMCDayString(lifespan * (bee.getGenome().getNeverSleeps() ? 1.0f : 2.0f))) - .setColor(getColor()); - y += 22; - } - - if (ind instanceof IButterfly) { - IButterfly bee2 = (IButterfly) ind; - int fertility = bee2.getGenome().getFertility(); - if (fertility > 1) { - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.moths", fertility)) - .setColor(getColor()); - } else { - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.moth")) - .setColor(getColor()); - } - - y += 32; - float caterpillarMatureTime = SPAWN_KOEF * Math.round(bee2.getGenome().getLifespan() / (bee2.getGenome().getFertility() * 2)); - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".caterpillarGestation")) - .setColor(getColor()); - - y += 12; - new ControlTextCentered(this, y, TextFormatting.BOLD + getMCDayString(caterpillarMatureTime)) - .setColor(getColor()); - - y += 22; - int speed = (int) (20.0f * bee2.getGenome().getSpeed()); - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".flightSpeed")) - .setColor(getColor()); - - y += 12; - new ControlTextCentered(this, y, TextFormatting.BOLD + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".blocksPerSec", speed)) - .setColor(getColor()); - y += 22; - } - - if (ind instanceof ITree) { - ITree tree = (ITree) ind; - int fertility = (int) (1.0f / tree.getGenome().getFertility()); - if (fertility > 1) { - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.leaves", fertility)) - .setColor(getColor()); - } else { - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.leaf")) - .setColor(getColor()); - } - - y += 22; - int butterflySpawn = Math.round(SPAWN_KOEF / (tree.getGenome().getSappiness() * tree.getGenome().getYield() * 0.5f)); - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".mothSpawn.perLeaf", getTimeString(butterflySpawn))) - .setColor(getColor()); - - y += 34; - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".plantTypes")).setColor(getColor()); - - y += 12; - new ControlTextCentered(this, y, TextFormatting.ITALIC + tree.getGenome().getPrimary().getPlantType().toString()) - .setColor(getColor()); - }*/ - if(ind instanceof IBee){ - addBeePages((IBee) ind, y); - }else if(ind instanceof ITree){ - addTreePages((ITree) ind, y); - }else if(ind instanceof IButterfly){ - addButterflyPages((IButterfly)ind, y); - } else if(ind instanceof IFlower){ - addFlowerPages((IFlower) ind, y); - } + y = plugin.addBiologyPages(ind, this, y); setSize(new Point(getWidth(), y)); } - private void addBeePages(IBee bee, int y){ - if (bee.getGenome().getNeverSleeps()) { - new ControlIconDisplay(this, (getWidth() - 64) / 2, y, ModuleItems.iconAllDay) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".allDay")); - } else if (bee.getGenome().getPrimary().isNocturnal()) { - new ControlIconDisplay(this, (getWidth() - 64) / 2, y, ModuleItems.iconNight) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".night")); - } else { - new ControlIconDisplay(this, (getWidth() - 64) / 2, y, ModuleItems.iconDaytime) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".day")); - } - - if (!bee.getGenome().getToleratesRain()) { - new ControlIconDisplay(this, (getWidth() - 64) / 2 + 24, y, ModuleItems.iconNoRain) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".notRain")); - } else { - new ControlIconDisplay(this, (getWidth() - 64) / 2 + 24, y, ModuleItems.iconRain) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".rain")); - } - - if (bee.getGenome().getCaveDwelling()) { - new ControlIconDisplay(this, (getWidth() - 64) / 2 + 48, y, ModuleItems.iconNoSky) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".underground")); - } else { - new ControlIconDisplay(this, (getWidth() - 64) / 2 + 48, y, ModuleItems.iconSky) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".notUnderground")); - } - y += 30; - - int fertility = bee.getGenome().getFertility(); - if (fertility > 1) { - new ControlTextCentered(this, y, TextFormatting.BOLD + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.drones", fertility)) - .setColor(getColor()); - } else { - new ControlTextCentered(this, y, TextFormatting.BOLD + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.drone")) - .setColor(getColor()); - } - - y += 22; - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".averageLifespan")) - .setColor(getColor()); - - y += 12; - int lifespan = bee.getGenome().getLifespan() * PluginApiculture.ticksPerBeeWorkCycle; - new ControlTextCentered(this, y, TextFormatting.BOLD + getMCDayString(lifespan * (bee.getGenome().getNeverSleeps() ? 1.0f : 2.0f))) - .setColor(getColor()); - y += 22; - } - - private void addTreePages(ITree tree, int y){ - String alleleName = ModuleWood.treeBreedingSystem.getAlleleName(EnumTreeChromosome.SAPPINESS, tree.getGenome().getActiveAllele(EnumTreeChromosome.SAPPINESS)); - new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".sappiness", alleleName)) - .setColor(getColor()); - y += 20; - - int fertility = (int) (1.0f / tree.getGenome().getFertility()); - if (fertility > 1) { - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.leaves", fertility)) - .setColor(getColor()); - } else { - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.leaf")) - .setColor(getColor()); - } - - y += 22; - int butterflySpawn = Math.round(SPAWN_KOEF / (tree.getGenome().getSappiness() * tree.getGenome().getYield() * 0.5f)); - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".mothSpawn.perLeaf", getTimeString(butterflySpawn))) - .setColor(getColor()); - - y += 34; - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".plantTypes")).setColor(getColor()); - - y += 12; - new ControlTextCentered(this, y, TextFormatting.ITALIC + tree.getGenome().getPrimary().getPlantType().toString()) - .setColor(getColor()); - } - - private void addButterflyPages(IButterfly butterfly, int y){ - if (butterfly.getGenome().getNocturnal()) { - new ControlIconDisplay(this, (getWidth() - 64) / 2, y, ModuleItems.iconAllDay) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".allDay")); - } else if (butterfly.getGenome().getPrimary().isNocturnal()) { - new ControlIconDisplay(this, (getWidth() - 64) / 2, y, ModuleItems.iconNight) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".night")); - } else { - new ControlIconDisplay(this, (getWidth() - 64) / 2, y, ModuleItems.iconDaytime) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".day")); - } - - if (!butterfly.getGenome().getTolerantFlyer()) { - new ControlIconDisplay(this, (getWidth() - 64) / 2 + 24, y, ModuleItems.iconNoRain) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".notRain")); - } else { - new ControlIconDisplay(this, (getWidth() - 64) / 2 + 24, y, ModuleItems.iconRain) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".rain")); - } - - if (butterfly.getGenome().getFireResist()) { - new ControlIconDisplay(this, (getWidth() - 64) / 2 + 48, y, ModuleItems.iconNoFire) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".nonflammable")); - } else { - new ControlIconDisplay(this, (getWidth() - 64) / 2 + 48, y, ModuleItems.iconFire) - .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".flammable")); - } - y += 30; - - int fertility = butterfly.getGenome().getFertility(); - if (fertility > 1) { - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.moths", fertility)) - .setColor(getColor()); - } else { - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".fertility.moth")) - .setColor(getColor()); - } - - y += 32; - float caterpillarMatureTime = SPAWN_KOEF * Math.round(butterfly.getGenome().getLifespan() / (butterfly.getGenome().getFertility() * 2)); - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".caterpillarGestation")) - .setColor(getColor()); - - y += 12; - new ControlTextCentered(this, y, TextFormatting.BOLD + getMCDayString(caterpillarMatureTime)) - .setColor(getColor()); - - y += 22; - int speed = (int) (20.0f * butterfly.getGenome().getSpeed()); - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".flightSpeed")) - .setColor(getColor()); - - y += 12; - new ControlTextCentered(this, y, TextFormatting.BOLD + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".blocksPerSec", speed)) - .setColor(getColor()); - y += 22; - } - - private void addFlowerPages(IFlower flower, int y){ - y += 10; - int butterflySpawn2 = Math.round(SPAWN_KOEF / (flower.getGenome().getSappiness() * 0.2f)); - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".mothSpawn", getTimeString(butterflySpawn2))) - .setColor(getColor()); - y += 30; - - int fertility = flower.getGenome().getFertility(); - float chanceDispersal = 0.8f; - chanceDispersal += 0.2f * fertility; - if (chanceDispersal > 1.0f) { - chanceDispersal = 1.0f; - } - - float chancePollinate = 0.6f; - chancePollinate += 0.25f * fertility; - if (chancePollinate > 1.0f) { - chancePollinate = 1.0f; - } - - float maxAge = flower.getMaxAge(); - float ageChance = flower.getGenome().getAgeChance(); - float dispersalTime = SPAWN_KOEF / chanceDispersal; - float pollinateTime = SPAWN_KOEF / chancePollinate; - float lifespan2 = maxAge * 20.0f * 68.27f / ageChance; - float floweringLifespan = (maxAge - 1) * 20.0f * 68.27f / ageChance - SPAWN_KOEF; - - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".averageLifespan")) - .setColor(getColor()); - y += 12; - - new ControlTextCentered(this, y, TextFormatting.BOLD + getMCDayString(lifespan2)) - .setColor(getColor()); - y += 22; - - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".seedDispersal")) - .setColor(getColor()); - y += 12; - - new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".perLifetime", (int) (floweringLifespan / dispersalTime))) - .setColor(getColor()); - y += 22; - - new ControlTextCentered(this, y, I18N.localise(AnalystConstants.BIOLOGY_KEY + ".pollination")) - .setColor(getColor()); - y += 12; - - new ControlTextCentered(this, y, TextFormatting.ITALIC + I18N.localise(AnalystConstants.BIOLOGY_KEY + ".perLifetime", (int) (floweringLifespan / pollinateTime))) - .setColor(getColor()); - y += 22; - } - - private String getMCDayString(float time) { - float seconds = time / 20.0f; - float minutes = seconds / 60.0f; - float days = minutes / 20.0f; - DecimalFormat df = new DecimalFormat("#.#"); - return I18N.localise(AnalystConstants.BIOLOGY_KEY + ".mcDays", df.format(days)); - } - @Override public String getTitle() { return I18N.localise(AnalystConstants.BIOLOGY_KEY + ""); diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java index 11fa9adb..690e6607 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java @@ -5,6 +5,7 @@ import java.util.Collection; import java.util.Objects; import binnie.core.api.genetics.IBreedingSystem; +import binnie.core.api.gui.IArea; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; @@ -15,7 +16,7 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.controls.ControlTextEdit; import binnie.core.gui.controls.core.Control; @@ -23,7 +24,6 @@ import binnie.core.gui.controls.listbox.ControlListBox; import binnie.core.gui.controls.scroll.ControlScrollBar; import binnie.core.gui.controls.scroll.ControlScrollableContent; import binnie.core.gui.events.EventMouse; -import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Point; import binnie.core.gui.geometry.TextJustification; import binnie.core.gui.minecraft.MinecraftGUI; @@ -36,7 +36,7 @@ public class AnalystPageDatabase extends ControlAnalystPage { private final ControlScrollableContent scroll; boolean isMaster; - public AnalystPageDatabase(IWidget parent, Area area, IBreedingSystem system, boolean isMaster) { + public AnalystPageDatabase(IWidget parent, IArea area, IBreedingSystem system, boolean isMaster) { super(parent, area); this.isMaster = isMaster; setColor(getColor(system)); diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDescription.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDescription.java index 3c80390f..aee39db1 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDescription.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDescription.java @@ -2,6 +2,7 @@ package binnie.genetics.gui.analyst; import java.util.Objects; +import binnie.core.api.gui.IArea; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; @@ -11,7 +12,7 @@ import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IIndividual; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.geometry.Area; @@ -21,7 +22,7 @@ import binnie.core.util.I18N; @SideOnly(Side.CLIENT) public class AnalystPageDescription extends ControlAnalystPage { - public AnalystPageDescription(IWidget parent, Area area, IIndividual ind) { + public AnalystPageDescription(IWidget parent, IArea area, IIndividual ind) { super(parent, area); setColor(3355443); int y = 4; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java index 9a564869..21158f0e 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java @@ -1,6 +1,7 @@ package binnie.genetics.gui.analyst; import binnie.core.api.genetics.IBreedingSystem; +import binnie.core.api.gui.IArea; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; @@ -15,7 +16,7 @@ import forestry.api.genetics.ISpeciesRoot; import binnie.core.Binnie; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.controls.core.Control; @@ -28,7 +29,7 @@ import binnie.core.util.I18N; public class AnalystPageGenome extends ControlAnalystPage { boolean active; - public AnalystPageGenome(IWidget parent, Area area, boolean active, IIndividual ind) { + public AnalystPageGenome(IWidget parent, IArea area, boolean active, IIndividual ind) { super(parent, area); this.active = active; setColor(26265); diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java index 7c3e1008..a8db432b 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java @@ -1,6 +1,7 @@ package binnie.genetics.gui.analyst; import binnie.core.api.genetics.IBreedingSystem; +import binnie.core.api.gui.IArea; import net.minecraft.util.text.TextFormatting; import forestry.api.genetics.AlleleManager; @@ -9,13 +10,12 @@ import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import binnie.core.Binnie; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; -import binnie.core.gui.geometry.Area; import binnie.core.util.I18N; public class AnalystPageKaryogram extends ControlAnalystPage { - public AnalystPageKaryogram(IWidget parent, Area area, IIndividual ind) { + public AnalystPageKaryogram(IWidget parent, IArea area, IIndividual ind) { super(parent, area); setColor(10040319); int y = 4; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java index 7b38a956..483ac177 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java @@ -4,6 +4,7 @@ import java.util.Collection; import java.util.List; import binnie.core.api.genetics.IBreedingSystem; +import binnie.core.api.gui.IArea; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; @@ -21,10 +22,9 @@ import binnie.core.Binnie; import binnie.core.Mods; import binnie.core.genetics.ForestryAllele; import binnie.core.gui.Attribute; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.controls.core.Control; -import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.Point; import binnie.core.gui.geometry.TextJustification; import binnie.core.gui.minecraft.EnumColor; @@ -35,7 +35,7 @@ import binnie.core.integration.extrabees.ExtraBeesIntegration; import binnie.core.util.I18N; public class AnalystPageMutations extends ControlAnalystPage { - public AnalystPageMutations(IWidget parent, Area area, IIndividual ind, boolean isMaster) { + public AnalystPageMutations(IWidget parent, IArea area, IIndividual ind, boolean isMaster) { super(parent, area); setColor(3355392); int y = 4; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java index 91b3e876..324d23b8 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java @@ -1,139 +1,54 @@ package binnie.genetics.gui.analyst; -import java.util.ArrayList; import java.util.Collection; -import java.util.List; +import binnie.core.api.gui.IArea; +import binnie.core.util.FluidStackUtil; +import binnie.genetics.api.GeneticsApi; +import binnie.genetics.api.IProducePlugin; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.NonNullList; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.fml.common.registry.ForgeRegistries; -import forestry.api.recipes.ICentrifugeRecipe; -import forestry.api.recipes.ISqueezerRecipe; -import forestry.api.recipes.RecipeManagers; - -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; -import binnie.core.gui.geometry.Area; import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.util.UniqueFluidStackSet; import binnie.core.util.UniqueItemStackSet; -import binnie.extratrees.machines.brewery.recipes.BreweryRecipeManager; -import binnie.extratrees.machines.distillery.recipes.DistilleryRecipeManager; -import binnie.extratrees.machines.fruitpress.recipes.FruitPressRecipeManager; -import binnie.genetics.gui.analyst.bee.AnalystPageProducts; public abstract class AnalystPageProduce extends ControlAnalystPage { - public AnalystPageProduce(IWidget parent, Area area) { + public AnalystPageProduce(IWidget parent, IArea area) { super(parent, area); } - protected Collection getAllProducts(ItemStack key) { - Collection products = new UniqueItemStackSet(); - products.addAll(getCentrifuge(key)); - products.addAll(getSqueezer(key)); - products.add(FurnaceRecipes.instance().getSmeltingResult(key)); - products.addAll(getCrafting(key)); - return products; - } - - public Collection getCentrifuge(ItemStack stack) { - List products = new ArrayList<>(); - for (ICentrifugeRecipe recipe : RecipeManagers.centrifugeManager.recipes()) { - boolean isRecipe = false; - if (stack.isItemEqual(recipe.getInput())) { - isRecipe = true; - } - if (isRecipe) { - for (Object obj : recipe.getAllProducts().keySet()) { - if (obj instanceof ItemStack) { - products.add((ItemStack) obj); - } - } - } - } - return products; - } - - public NonNullList getSqueezer(ItemStack stack) { + protected NonNullList getAllProducts(ItemStack key) { NonNullList products = NonNullList.create(); - for (ISqueezerRecipe recipe : RecipeManagers.squeezerManager.recipes()) { - boolean isRecipe = false; - for (Object obj : recipe.getResources()) { - if (obj instanceof ItemStack && stack.isItemEqual((ItemStack) obj)) { - isRecipe = true; - } - } - if (isRecipe) { - if (!recipe.getRemnants().isEmpty()) { - products.add(recipe.getRemnants()); - } - } + for (IProducePlugin plugin : GeneticsApi.getProducePlugins()) { + plugin.getItems(key, products); } return products; } - public Collection getCrafting(ItemStack stack) { - List products = new ArrayList<>(); - for (IRecipe recipe : ForgeRegistries.RECIPES.getValues()) { - ItemStack recipeOutput = recipe.getRecipeOutput(); - if (!recipeOutput.isEmpty()) { - NonNullList ingredients = recipe.getIngredients(); - if (!ingredients.isEmpty()) { - boolean match = true; - for (Ingredient ingredient : ingredients) { - if (!ingredient.apply(stack)) { - match = false; - break; - } - } - if (match) { - products.add(recipeOutput); - } - } + public NonNullList getAllFluidsFromItems(Collection itemStacks) { + NonNullList allFluids = NonNullList.create(); + for (ItemStack itemStack : itemStacks) { + for (IProducePlugin producePlugin : GeneticsApi.getProducePlugins()) { + producePlugin.getFluids(itemStack, allFluids); } } - return products; + return FluidStackUtil.removeEqualFluids(allFluids); } - public Collection getAllFluids(ItemStack stack) { - List products = new ArrayList<>(); - products.addAll(getSqueezerFluid(stack)); - if (FruitPressRecipeManager.getOutput(stack) != null) { - products.add(FruitPressRecipeManager.getOutput(stack)); - } - return products; - } - - public Collection getSqueezerFluid(ItemStack stack) { - List products = new ArrayList<>(); - for (ISqueezerRecipe recipe : RecipeManagers.squeezerManager.recipes()) { - boolean isRecipe = false; - for (Object obj : recipe.getResources()) { - if (obj instanceof ItemStack && stack.isItemEqual((ItemStack) obj)) { - isRecipe = true; - } - } - if (isRecipe) { - products.add(recipe.getFluidOutput()); + public NonNullList getAllFluidsFromFluids(Collection fluidStacks) { + NonNullList allFluids = NonNullList.create(); + for (FluidStack itemStack : fluidStacks) { + for (IProducePlugin producePlugin : GeneticsApi.getProducePlugins()) { + producePlugin.getFluids(itemStack, allFluids); } } - return products; - } - - protected Collection getAllProducts(FluidStack stack) { - Collection fluids = new UniqueFluidStackSet(); - fluids.add(BreweryRecipeManager.getOutput(stack)); - fluids.add(DistilleryRecipeManager.getOutput(stack, 0)); - fluids.add(DistilleryRecipeManager.getOutput(stack, 1)); - fluids.add(DistilleryRecipeManager.getOutput(stack, 2)); - return fluids; + return FluidStackUtil.removeEqualFluids(allFluids); } protected Collection getAllProductsAndFluids(Collection collection) { @@ -152,21 +67,18 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { products.addAll(products2); products.addAll(products3); Collection allFluids = new UniqueFluidStackSet(); - for (ItemStack stack4 : collection) { - allFluids.addAll(getAllFluids(stack4)); - } + allFluids.addAll(getAllFluidsFromItems(collection)); + Collection fluids2 = new UniqueFluidStackSet(); - for (FluidStack stack5 : allFluids) { - fluids2.addAll(getAllProducts(stack5)); - } + fluids2.addAll(getAllFluidsFromFluids(allFluids)); + Collection fluids3 = new UniqueFluidStackSet(); - for (FluidStack stack6 : fluids2) { - fluids3.addAll(getAllProducts(stack6)); - } + fluids3.addAll(getAllFluidsFromFluids(fluids2)); + allFluids.addAll(fluids2); allFluids.addAll(fluids3); for (FluidStack fluid : allFluids) { - ItemStack container = AnalystPageProducts.getContainer(fluid); + ItemStack container = FluidStackUtil.getContainer(fluid); if (container != null) { products.add(container); } diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPanel.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPanel.java index 2e015ce0..26432430 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPanel.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPanel.java @@ -4,7 +4,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.scroll.ControlScrollBar; import binnie.core.gui.controls.scroll.ControlScrollableContent; import binnie.core.gui.geometry.Area; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java index 46bdaa96..0843a76c 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystButton.java @@ -2,6 +2,7 @@ package binnie.genetics.gui.analyst; import java.util.List; +import binnie.core.api.gui.ITitledWidget; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.util.ITooltipFlag; @@ -10,7 +11,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.events.EventMouse; @@ -18,16 +19,16 @@ import binnie.core.gui.renderer.RenderUtil; import binnie.core.gui.resource.textures.CraftGUITexture; public class ControlAnalystButton extends Control { - ControlAnalystPage value; + ITitledWidget value; WindowAnalyst window; - public ControlAnalystButton(IWidget parent, int x, int y, int width, int height, WindowAnalyst window, ControlAnalystPage page) { + public ControlAnalystButton(IWidget parent, int x, int y, int width, int height, WindowAnalyst window, ITitledWidget page) { super(parent, x, y, width, height); this.window = window; addAttribute(Attribute.MOUSE_OVER); this.value = page; addSelfEventHandler(EventMouse.Down.class, event -> { - List pages = window.analystPages; + List pages = window.analystPages; int currentIndex = pages.indexOf(window.rightPage.getContent()); int clickedIndex = pages.indexOf(value); if (window.isDatabase) { diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java index f30d4795..cdbed2dd 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystChromosome.java @@ -13,7 +13,7 @@ import binnie.core.Binnie; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Point; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java index e21cf14b..603e30c8 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java @@ -1,13 +1,12 @@ package binnie.genetics.gui.analyst; -import java.text.DecimalFormat; - -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; -import binnie.core.gui.geometry.Area; -public abstract class ControlAnalystPage extends Control { - public ControlAnalystPage(IWidget parent, Area area) { +public abstract class ControlAnalystPage extends Control implements ITitledWidget { + public ControlAnalystPage(IWidget parent, IArea area) { super(parent, area); hide(); } @@ -16,20 +15,4 @@ public abstract class ControlAnalystPage extends Control { public void onRenderBackground(int guiWidth, int guiHeight) { } - public abstract String getTitle(); - - //TODO: localise - protected String getTimeString(int time) { - int seconds = time / 20; - int minutes = seconds / 60; - int hours = minutes / 60; - DecimalFormat df = new DecimalFormat("#.0"); - if (hours > 1) { - return df.format(hours) + " hours"; - } - if (minutes > 1) { - return df.format(minutes) + " min."; - } - return df.format(seconds) + " sec."; - } } diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java index b03a234d..c0217a71 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlBiome.java @@ -12,7 +12,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.core.ForestryAPI; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Point; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlFurtherMutation.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlFurtherMutation.java index a842e207..4a7551a2 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlFurtherMutation.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlFurtherMutation.java @@ -9,7 +9,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.geometry.Point; import binnie.core.gui.renderer.RenderUtil; import binnie.core.util.I18N; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java index 5d9cf446..f26901c5 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java @@ -9,7 +9,7 @@ import forestry.api.genetics.IIndividual; import binnie.core.Binnie; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.minecraft.control.ControlItemDisplay; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlMutation.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlMutation.java index 2b76ccf0..253f7755 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlMutation.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlMutation.java @@ -7,7 +7,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.EnumColor; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlResultantMutation.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlResultantMutation.java index 85ba9b34..52f55151 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlResultantMutation.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlResultantMutation.java @@ -9,7 +9,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.IAlleleSpecies; import forestry.api.genetics.IMutation; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.geometry.Point; import binnie.core.gui.renderer.RenderUtil; import binnie.core.util.I18N; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java index 42c2119b..17fe6202 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java @@ -13,7 +13,7 @@ import forestry.api.core.EnumTemperature; import binnie.core.genetics.Tolerance; import binnie.core.gui.Attribute; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Area; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/GeneticsProducePlugin.java b/genetics/src/main/java/binnie/genetics/gui/analyst/GeneticsProducePlugin.java new file mode 100644 index 00000000..4881af91 --- /dev/null +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/GeneticsProducePlugin.java @@ -0,0 +1,59 @@ +package binnie.genetics.gui.analyst; + +import binnie.core.util.ForestryRecipeUtil; +import binnie.genetics.api.IProducePlugin; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.common.registry.ForgeRegistries; + +public class GeneticsProducePlugin implements IProducePlugin { + @Override + public void getFluids(ItemStack inputStack, NonNullList outputFluids) { + ForestryRecipeUtil.getSqueezerFluidOutputs(inputStack, outputFluids); + } + + @Override + public void getFluids(FluidStack inputFluid, NonNullList outputFluids) { + + } + + @Override + public void getItems(ItemStack inputStack, NonNullList outputItems) { + ForestryRecipeUtil.getCentrifugeOutputs(inputStack, outputItems); + ForestryRecipeUtil.getSqueezerOutputs(inputStack, outputItems); + ItemStack smeltingResult = FurnaceRecipes.instance().getSmeltingResult(inputStack); + if (!smeltingResult.isEmpty()) { + outputItems.add(smeltingResult); + } + getCrafting(inputStack, outputItems); + } + + /** + * Get all recipes that has inputStack as its only ingredient, and return their outputs. + */ + private static void getCrafting(ItemStack inputStack, NonNullList outputItems) { + for (IRecipe recipe : ForgeRegistries.RECIPES.getValues()) { + ItemStack recipeOutput = recipe.getRecipeOutput(); + if (!recipeOutput.isEmpty() && matches(recipe, inputStack)) { + outputItems.add(recipeOutput); + } + } + } + + private static boolean matches(IRecipe recipe, ItemStack inputStack) { + NonNullList ingredients = recipe.getIngredients(); + if (ingredients.isEmpty()) { + return false; + } + for (Ingredient ingredient : ingredients) { + if (!ingredient.apply(inputStack)) { + return false; + } + } + return true; + } +} diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/WindowAnalyst.java b/genetics/src/main/java/binnie/genetics/gui/analyst/WindowAnalyst.java index 63c3dd92..a1828c72 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/WindowAnalyst.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/WindowAnalyst.java @@ -4,35 +4,19 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -import binnie.core.api.genetics.IBreedingSystem; -import binnie.core.genetics.ManagerGenetics; -import binnie.extrabees.api.ExtraBeesAPI; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import forestry.api.apiculture.IBee; -import forestry.api.arboriculture.ITree; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.ISpeciesRoot; -import forestry.api.lepidopterology.IButterfly; - -import binnie.core.Binnie; -import binnie.botany.api.genetics.IFlower; import binnie.core.AbstractMod; -import binnie.core.gui.IWidget; +import binnie.core.Binnie; +import binnie.core.api.genetics.IBreedingSystem; +import binnie.core.api.gui.Alignment; +import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; +import binnie.core.api.gui.IWidget; +import binnie.core.genetics.ManagerGenetics; import binnie.core.gui.Widget; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.scroll.ControlScrollableContent; import binnie.core.gui.events.EventKey; -import binnie.core.gui.geometry.Area; -import binnie.core.api.gui.Alignment; import binnie.core.gui.minecraft.InventoryType; import binnie.core.gui.minecraft.Window; import binnie.core.gui.minecraft.WindowInventory; @@ -42,18 +26,23 @@ import binnie.core.gui.minecraft.control.ControlSlot; import binnie.core.gui.window.Panel; import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; +import binnie.core.util.Log; +import binnie.extrabees.api.ExtraBeesAPI; import binnie.genetics.Genetics; +import binnie.genetics.api.GeneticsApi; +import binnie.genetics.api.IAnalystPagePlugin; import binnie.genetics.core.GeneticsGUI; -import binnie.genetics.gui.analyst.bee.AnalystPageProducts; -import binnie.genetics.gui.analyst.butterfly.AnalystPageSpecimen; -import binnie.genetics.gui.analyst.flower.AnalystPageAppearance; -import binnie.genetics.gui.analyst.flower.AnalystPageSoil; -import binnie.genetics.gui.analyst.tree.AnalystPageClimate; -import binnie.genetics.gui.analyst.tree.AnalystPageFruit; -import binnie.genetics.gui.analyst.tree.AnalystPageGrowth; -import binnie.genetics.gui.analyst.tree.AnalystPageWood; import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ModuleMachine; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IBreedingTracker; +import forestry.api.genetics.IIndividual; +import forestry.api.genetics.ISpeciesRoot; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class WindowAnalyst extends Window { @Nullable @@ -63,9 +52,9 @@ public class WindowAnalyst extends Window { @Nullable Control tabBar; Panel analystPanel; - List analystPages; + List analystPages; @Nullable - Area analystPageSize; + IArea analystPageSize; boolean isDatabase; boolean isMaster; boolean lockedSearch; @@ -78,15 +67,7 @@ public class WindowAnalyst extends Window { public WindowAnalyst(EntityPlayer player, @Nullable IInventory inventory, Side side, boolean database, boolean master) { super(312, 230, player, inventory, side); - baseWidget = null; - tabBar = null; analystPages = new ArrayList<>(); - analystPageSize = null; - isDatabase = false; - isMaster = false; - lockedSearch = false; - current = null; - currentSystem = null; isDatabase = database; isMaster = master; lockedSearch = isDatabase; @@ -191,7 +172,7 @@ public class WindowAnalyst extends Window { oldLeft = analystPages.indexOf(leftPage.getContent()); oldRight = analystPages.indexOf(rightPage.getContent()); } - ControlAnalystPage databasePage = null; + ITitledWidget databasePage = null; if (isDatabase && !systemChange) { databasePage = ((analystPages.size() > 0) ? analystPages.get(0) : null); } @@ -203,7 +184,7 @@ public class WindowAnalyst extends Window { if (analystPages.size() > 0) { int width = tabBar.getWidth() / analystPages.size(); int x = 0; - for (ControlAnalystPage page : analystPages) { + for (ITitledWidget page : analystPages) { new ControlAnalystButton(tabBar, x, 0, width, tabBar.getHeight(), this, page); x += width; } @@ -215,7 +196,7 @@ public class WindowAnalyst extends Window { } @SideOnly(Side.CLIENT) - private void createPages(ControlAnalystPage databasePage){ + private void createPages(@Nullable ITitledWidget databasePage){ if (isDatabase) { analystPages.add((databasePage != null) ? databasePage : new AnalystPageDatabase(analystPanel, analystPageSize, currentSystem, isMaster)); } @@ -226,31 +207,23 @@ public class WindowAnalyst extends Window { analystPages.add(new AnalystPageGenome(analystPanel, analystPageSize, false, current)); analystPages.add(new AnalystPageKaryogram(analystPanel, analystPageSize, current)); } - if (!(current instanceof ITree)) { - analystPages.add(new AnalystPageClimate(analystPanel, analystPageSize, current)); - } - if (current instanceof IBee) { - analystPages.add(new AnalystPageProducts(analystPanel, analystPageSize, (IBee) current)); - } else if (current instanceof ITree) { - analystPages.add(new AnalystPageFruit(analystPanel, analystPageSize, (ITree) current)); - analystPages.add(new AnalystPageWood(analystPanel, analystPageSize, (ITree) current)); - } else if (current instanceof IFlower) { - analystPages.add(new AnalystPageSoil(analystPanel, analystPageSize, (IFlower) current)); - } else if (current instanceof IButterfly) { - analystPages.add(new AnalystPageSpecimen(analystPanel, analystPageSize, (IButterfly) current)); - } - analystPages.add(new AnalystPageBiology(analystPanel, analystPageSize, current)); - if (current instanceof IBee || current instanceof IButterfly) { - analystPages.add(new AnalystPageBehaviour(analystPanel, analystPageSize, current)); - } else if (current instanceof ITree) { - analystPages.add(new AnalystPageGrowth(analystPanel, analystPageSize, current)); - } else if (current instanceof IFlower) { - analystPages.add(new AnalystPageAppearance(analystPanel, analystPageSize, (IFlower) current)); - } + + createPages(current, analystPanel, analystPageSize, analystPages); + analystPages.add(new AnalystPageMutations(analystPanel, analystPageSize, current, isMaster)); } } + @SideOnly(Side.CLIENT) + private static void createPages(T individual, IWidget parent, IArea pageSize, List analystPages) { + IAnalystPagePlugin analystPageFactory = GeneticsApi.getAnalystPagePlugin(individual); + if (analystPageFactory != null) { + analystPageFactory.addAnalystPages(individual, parent, pageSize, analystPages); + } else { + Log.error("Could not find IAnalystPagePlugin for {}", individual.getClass()); + } + } + public void shiftPages(boolean right) { if (analystPages.size() < 2) { return; @@ -289,8 +262,8 @@ public class WindowAnalyst extends Window { } } - public void setPage(ControlScrollableContent side, @Nullable ControlAnalystPage page) { - ControlAnalystPage existingPage = (ControlAnalystPage) side.getContent(); + public void setPage(ControlScrollableContent side, @Nullable IWidget page) { + Control existingPage = (Control) side.getContent(); if (existingPage != null) { existingPage.hide(); side.setScrollableContent(null); @@ -330,7 +303,7 @@ public class WindowAnalyst extends Window { } @SideOnly(Side.CLIENT) - public void setIndividual(IIndividual ind) { + public void setIndividual(@Nullable IIndividual ind) { if (!isDatabase) { if (ind == null) { analystNone.show(); @@ -340,14 +313,14 @@ public class WindowAnalyst extends Window { slideUpInv.show(); } } - if (ind == current || (ind != null && current != null && ind.isGeneticEqual(current))) { - return; + if (ind != current && (ind == null || current == null || !ind.isGeneticEqual(current))) { + current = ind; + boolean systemChange = current != null && ind.getGenome().getSpeciesRoot() != getSystem().getSpeciesRoot(); + if (systemChange) { + currentSystem = Binnie.GENETICS.getSystem(ind.getGenome().getSpeciesRoot()); + } + updatePages(systemChange); } - boolean systemChange = (current = ind) != null && ind.getGenome().getSpeciesRoot() != getSystem().getSpeciesRoot(); - if (systemChange) { - currentSystem = Binnie.GENETICS.getSystem(ind.getGenome().getSpeciesRoot()); - } - updatePages(systemChange); } public IBreedingSystem getSystem() { diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java b/genetics/src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java index 985da52c..12890c61 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java @@ -1,19 +1,19 @@ package binnie.genetics.gui.analyst.butterfly; +import binnie.core.api.gui.IArea; import net.minecraft.util.text.TextFormatting; import forestry.api.lepidopterology.IButterfly; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; -import binnie.core.gui.geometry.Area; import binnie.core.util.I18N; import binnie.genetics.gui.analyst.AnalystConstants; import binnie.genetics.gui.analyst.ControlAnalystPage; import binnie.genetics.gui.analyst.ControlIndividualDisplay; public class AnalystPageSpecimen extends ControlAnalystPage { - public AnalystPageSpecimen(IWidget parent, Area area, IButterfly ind) { + public AnalystPageSpecimen(IWidget parent, IArea area, IButterfly ind) { super(parent, area); setColor(3355443); int y = 4; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java b/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java index 866e485c..cc164371 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/tree/AnalystPageClimate.java @@ -3,6 +3,7 @@ package binnie.genetics.gui.analyst.tree; import java.util.ArrayList; import java.util.List; +import binnie.core.api.gui.IArea; import net.minecraft.init.Biomes; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.biome.Biome; @@ -19,7 +20,7 @@ import forestry.api.lepidopterology.IButterfly; import binnie.botany.api.genetics.EnumFlowerChromosome; import binnie.botany.api.genetics.IFlower; import binnie.core.genetics.Tolerance; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.geometry.Area; @@ -33,7 +34,7 @@ import binnie.genetics.gui.analyst.ControlToleranceBar; import net.minecraftforge.fml.common.registry.ForgeRegistries; public class AnalystPageClimate extends ControlAnalystPage { - public AnalystPageClimate(IWidget parent, Area area, IIndividual ind) { + public AnalystPageClimate(IWidget parent, IArea area, IIndividual ind) { super(parent, area); setColor(26163); EnumTemperature temp = ind.getGenome().getPrimary().getTemperature(); diff --git a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java b/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java index 51fe01d3..9e5f94c3 100644 --- a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java +++ b/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java @@ -17,7 +17,7 @@ import forestry.api.apiculture.IBeeGenome; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Area; diff --git a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java b/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java index 2147f98a..92b37ac1 100644 --- a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java +++ b/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java @@ -19,7 +19,7 @@ import forestry.api.genetics.IAllele; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Area; diff --git a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java b/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java index dfb99d2c..d3dc16ec 100644 --- a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java +++ b/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java @@ -12,7 +12,7 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.genetics.IAllele; import binnie.core.BinnieCore; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.listbox.ControlListBox; public class ControlProductsBox extends ControlListBox { diff --git a/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java b/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java index 21f1f8ed..de42b803 100644 --- a/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java +++ b/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java @@ -3,7 +3,7 @@ package binnie.genetics.gui.database.bee; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.IAlleleSpecies; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.database.DatabaseTab; import binnie.core.gui.database.PageSpecies; diff --git a/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java b/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java index 5f36883e..50536a87 100644 --- a/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java +++ b/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java @@ -10,7 +10,7 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; import forestry.core.genetics.alleles.EnumAllele; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.database.DatabaseConstants; diff --git a/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java b/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java index 98cab9e0..0e7d31db 100644 --- a/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java +++ b/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java @@ -3,7 +3,7 @@ package binnie.genetics.gui.database.bee; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.IAlleleSpecies; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.gui.database.DatabaseConstants; diff --git a/genetics/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java b/genetics/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java index 9cd9a6c6..a5c198ea 100644 --- a/genetics/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java +++ b/genetics/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java @@ -10,7 +10,7 @@ import forestry.api.genetics.IChromosomeType; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.core.IControlValue; diff --git a/genetics/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java b/genetics/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java index 9ad4946c..448988e0 100644 --- a/genetics/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java +++ b/genetics/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java @@ -11,7 +11,7 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Area; diff --git a/genetics/src/main/java/binnie/genetics/item/ModuleItems.java b/genetics/src/main/java/binnie/genetics/item/ModuleItems.java index 65eed915..014bacb9 100644 --- a/genetics/src/main/java/binnie/genetics/item/ModuleItems.java +++ b/genetics/src/main/java/binnie/genetics/item/ModuleItems.java @@ -1,37 +1,27 @@ package binnie.genetics.item; -import com.google.common.base.Preconditions; - import javax.annotation.Nullable; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fml.common.registry.GameRegistry; - -import forestry.api.recipes.RecipeManagers; - import binnie.core.Binnie; -import binnie.core.Constants; -import binnie.core.modules.BotanyModuleUIDs; -import binnie.botany.modules.ModuleDatabase; import binnie.core.BinnieCore; +import binnie.core.Constants; import binnie.core.IInitializable; import binnie.core.Mods; -import binnie.core.integration.extrabees.ExtraBeesIntegration; import binnie.core.item.ItemMisc; import binnie.core.liquid.FluidContainerType; import binnie.core.liquid.ManagerLiquid; import binnie.core.resource.BinnieSprite; import binnie.core.util.RecipeUtil; -import binnie.core.modules.ExtraTreesModuleUIDs; -import binnie.extratrees.modules.ModuleMothDatabase; -import binnie.extratrees.modules.ModuleTreeDatabase; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; -import binnie.core.modules.ModuleManager; +import binnie.genetics.recipes.RegistryRecipe; +import com.google.common.base.Preconditions; +import forestry.api.recipes.RecipeManagers; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.registry.GameRegistry; public class ModuleItems implements IInitializable { public static BinnieSprite iconNight; @@ -180,26 +170,7 @@ public class ModuleItems implements IInitializable { 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'a', Mods.Forestry.item("portable_alyzer"), 'd', new ItemStack(Items.DIAMOND) ); - // TODO: make this crazy list of recipes into one custom recipe - Item[] databases = {ExtraBeesIntegration.dictionary, ModuleTreeDatabase.itemDictionary, ModuleMothDatabase.itemDictionaryLepi, ModuleDatabase.database}; - if (ModuleManager.isModuleEnabled(Constants.BOTANY_MOD_ID, BotanyModuleUIDs.DATABASE) && BinnieCore.isExtraBeesActive() && ModuleManager.isModuleEnabled(Constants.EXTRA_TREES_MOD_ID, ExtraTreesModuleUIDs.TREE_DATABASE) && ModuleManager.isModuleEnabled(Constants.EXTRA_TREES_MOD_ID, ExtraTreesModuleUIDs.MOTH_DATABASE)) { - int recipeNum = 0; - for (Item databaseA : databases) { - for (Item databaseB : databases) { - for (Item databaseC : databases) { - for (Item databaseD : databases) { - if (databaseA != databaseB && databaseA != databaseC && databaseA != databaseD && databaseB != databaseC && databaseB != databaseD && databaseC != databaseD) { - recipeUtil.addRecipe("registry_" + recipeNum, new ItemStack(registry), - " b ", - "fct", - " l ", 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), 'b', databaseA, 't', databaseB, 'f', databaseC, 'l', databaseD - ); - recipeNum++; - } - } - } - } - } - } + RegistryRecipe recipe = RegistryRecipe.create(registry, itemGenetics); + recipeUtil.addRecipe("registry", recipe); } } diff --git a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java index 0c76226b..4bea01b8 100644 --- a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java +++ b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/ToleranceType.java @@ -1,10 +1,9 @@ package binnie.genetics.machine.acclimatiser; -import net.minecraft.item.ItemStack; - +import binnie.botany.api.BotanyAPI; import binnie.botany.api.gardening.EnumFertiliserType; import binnie.botany.api.gardening.IGardeningManager; -import binnie.botany.core.BotanyCore; +import net.minecraft.item.ItemStack; public enum ToleranceType { Temperature, @@ -20,7 +19,7 @@ public enum ToleranceType { return Acclimatiser.getHumidityEffect(stack); } case PH: { - IGardeningManager gardening = BotanyCore.getGardening(); + IGardeningManager gardening = BotanyAPI.gardening; if (gardening.isFertiliser(EnumFertiliserType.ACID, stack)) { return -0.5f * gardening.getFertiliserStrength(stack); } diff --git a/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java b/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java index 54cc2857..6653536a 100644 --- a/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java +++ b/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGene.java @@ -12,7 +12,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.Binnie; import binnie.core.gui.Attribute; import binnie.core.gui.ITooltip; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.Tooltip; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.core.IControlValue; diff --git a/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java b/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java index 29d122a3..90531a17 100644 --- a/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java +++ b/genetics/src/main/java/binnie/genetics/machine/craftgui/ControlGeneScroll.java @@ -11,7 +11,7 @@ import forestry.api.genetics.IChromosomeType; import binnie.core.Binnie; import binnie.core.genetics.Gene; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.core.Control; import binnie.core.gui.controls.core.IControlValue; diff --git a/genetics/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java b/genetics/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java index 23a1c0aa..590b7708 100644 --- a/genetics/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java +++ b/genetics/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Map; import binnie.core.api.genetics.IBreedingSystem; +import binnie.core.api.gui.events.EventHandlerOrigin; import binnie.core.gui.geometry.Point; import binnie.core.gui.window.WindowMachine; import binnie.extrabees.api.ExtraBeesAPI; @@ -31,7 +32,6 @@ import binnie.core.gui.controls.ControlTextEdit; import binnie.core.gui.controls.scroll.ControlScrollableContent; import binnie.core.gui.controls.tab.ControlTab; import binnie.core.gui.controls.tab.ControlTabBar; -import binnie.core.gui.events.EventHandler; import binnie.core.gui.events.EventTextEdit; import binnie.core.gui.events.EventValueChanged; import binnie.core.api.gui.Alignment; @@ -102,7 +102,7 @@ public class WindowGeneBank extends WindowMachine { new Panel(this, boxX + 24 + geneBoxWidth, 32, 14, 120, MinecraftGUI.PanelType.GRAY); final ControlScrollableContent scroll = new ControlScrollableContent<>(this, boxX + 24 + 2, 34, geneBoxWidth + 10, 116, 12); final ControlTextEdit edit = new ControlTextEdit(this, boxX + 27 + geneBoxWidth - 70, 18, 80, 12); - this.addEventHandler(EventTextEdit.class, EventHandler.Origin.SELF, edit, event -> { + this.addEventHandler(EventTextEdit.class, EventHandlerOrigin.SELF, edit, event -> { String value = event.getValue(); if (value == null) { value = ""; diff --git a/genetics/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java b/genetics/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java index e35e5390..06358d49 100644 --- a/genetics/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java +++ b/genetics/src/main/java/binnie/genetics/machine/sequencer/ControlSequencerProgress.java @@ -5,7 +5,7 @@ import java.util.Random; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlText; import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.TextJustification; diff --git a/genetics/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java b/genetics/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java index 77227cd5..39c62632 100644 --- a/genetics/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java +++ b/genetics/src/main/java/binnie/genetics/machine/splicer/ControlSplicerProgress.java @@ -3,7 +3,7 @@ package binnie.genetics.machine.splicer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.gui.IWidget; +import binnie.core.api.gui.IWidget; import binnie.core.gui.geometry.Area; import binnie.core.gui.minecraft.control.ControlProgressBase; import binnie.core.gui.renderer.RenderUtil; diff --git a/genetics/src/main/java/binnie/genetics/recipes/RegistryRecipe.java b/genetics/src/main/java/binnie/genetics/recipes/RegistryRecipe.java new file mode 100644 index 00000000..2f2188b7 --- /dev/null +++ b/genetics/src/main/java/binnie/genetics/recipes/RegistryRecipe.java @@ -0,0 +1,59 @@ +package binnie.genetics.recipes; + +import binnie.genetics.item.GeneticsItems; +import forestry.core.utils.ItemStackUtil; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; +import net.minecraft.world.World; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.OreIngredient; +import net.minecraftforge.oredict.ShapedOreRecipe; + +public class RegistryRecipe extends ShapedOreRecipe { + public static RegistryRecipe create(Item registry, Item itemGenetics) { + return new RegistryRecipe(registry, " d ", "dcd", " d ", + 'c', GeneticsItems.IntegratedCircuit.get(itemGenetics, 1), + 'd', "binnie_database"); + } + + private RegistryRecipe(Item result, Object... recipe) { + super(null, result, recipe); + rotateIngredients(); + } + + + private void rotateIngredients() { + int offset = 0; + for (int i = 0; i < input.size(); i++) { + Ingredient ingredient = input.get(i); + if (ingredient instanceof OreIngredient) { + RotatedOreIngredient rotatedOreIngredient = new RotatedOreIngredient("binnie_database", offset); + input.set(i, rotatedOreIngredient); + offset++; + } + } + } + + @Override + public boolean matches(InventoryCrafting inv, World world) { + if (super.matches(inv, world)) { + int distinctDatabaseCount = OreDictionary.getOres("binnie_database").size(); + distinctDatabaseCount = Math.min(distinctDatabaseCount, 4); + + NonNullList databases = NonNullList.create(); + databases.add(inv.getStackInRowAndColumn(0, 1)); + databases.add(inv.getStackInRowAndColumn(1, 0)); + databases.add(inv.getStackInRowAndColumn(1, 2)); + databases.add(inv.getStackInRowAndColumn(2, 1)); + + databases = ItemStackUtil.condenseStacks(databases); + if (databases.size() >= distinctDatabaseCount) { + return true; + } + } + return false; + } +} diff --git a/genetics/src/main/java/binnie/genetics/recipes/RotatedOreIngredient.java b/genetics/src/main/java/binnie/genetics/recipes/RotatedOreIngredient.java new file mode 100644 index 00000000..3be50f75 --- /dev/null +++ b/genetics/src/main/java/binnie/genetics/recipes/RotatedOreIngredient.java @@ -0,0 +1,109 @@ +package binnie.genetics.recipes; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import java.util.Collections; + +import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntComparators; +import it.unimi.dsi.fastutil.ints.IntList; +import net.minecraft.client.util.RecipeItemHelper; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.OreIngredient; + +/** + * Copy of {@link OreIngredient} to make the ingredients rotate in JEI properly, + * instead of showing 4 of the same dictionary together. + */ +class RotatedOreIngredient extends Ingredient { + private final NonNullList ores; + private final int offset; + @Nullable + private IntList itemIds = null; + @Nullable + private ItemStack[] array = null; + + public RotatedOreIngredient(String ore, int offset) { + super(0); + this.ores = OreDictionary.getOres(ore); + this.offset = offset; + } + + @Override + @Nonnull + public ItemStack[] getMatchingStacks() + { + if (array == null || this.array.length != ores.size()) + { + NonNullList lst = NonNullList.create(); + for (ItemStack itemstack : this.ores) + { + if (itemstack.getMetadata() == OreDictionary.WILDCARD_VALUE) + itemstack.getItem().getSubItems(CreativeTabs.SEARCH, lst); + else + lst.add(itemstack); + } + Collections.rotate(lst, offset); + this.array = lst.toArray(new ItemStack[lst.size()]); + } + return this.array; + } + + + @Override + @Nonnull + @SideOnly(Side.CLIENT) + public IntList getValidItemStacksPacked() + { + if (this.itemIds == null || this.itemIds.size() != ores.size()) + { + this.itemIds = new IntArrayList(this.ores.size()); + + for (ItemStack itemstack : this.ores) + { + if (itemstack.getMetadata() == OreDictionary.WILDCARD_VALUE) + { + NonNullList lst = NonNullList.create(); + itemstack.getItem().getSubItems(CreativeTabs.SEARCH, lst); + for (ItemStack item : lst) + this.itemIds.add(RecipeItemHelper.pack(item)); + } + else + { + this.itemIds.add(RecipeItemHelper.pack(itemstack)); + } + } + + this.itemIds.sort(IntComparators.NATURAL_COMPARATOR); + } + + return this.itemIds; + } + + + @Override + public boolean apply(@Nullable ItemStack input) + { + if (input == null) + return false; + + for (ItemStack target : this.ores) + if (OreDictionary.itemMatches(target, input, false)) + return true; + + return false; + } + + @Override + protected void invalidate() + { + this.itemIds = null; + } +} diff --git a/genetics/src/main/java/binnie/genetics/recipes/package-info.java b/genetics/src/main/java/binnie/genetics/recipes/package-info.java new file mode 100644 index 00000000..7dd3cb26 --- /dev/null +++ b/genetics/src/main/java/binnie/genetics/recipes/package-info.java @@ -0,0 +1,9 @@ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault +@FieldsAreNonnullByDefault +package binnie.genetics.recipes; + +import javax.annotation.ParametersAreNonnullByDefault; + +import binnie.core.util.FieldsAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file