diff --git a/botany/build.gradle b/botany/build.gradle index 6b6adeda..50133210 100644 --- a/botany/build.gradle +++ b/botany/build.gradle @@ -4,6 +4,7 @@ dependencies { compile project(":core") compile project(":botany-api") compile project(":extratrees-api") + compile project(":genetics-api") // TODO: remove compile project(":extratrees") diff --git a/botany/src/main/java/binnie/botany/Botany.java b/botany/src/main/java/binnie/botany/Botany.java index 4cefd4e0..0b665aed 100644 --- a/botany/src/main/java/binnie/botany/Botany.java +++ b/botany/src/main/java/binnie/botany/Botany.java @@ -1,5 +1,6 @@ package binnie.botany; +import binnie.genetics.api.analyst.IAnalystManager; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; @@ -42,7 +43,10 @@ public class Botany extends BlankModuleContainer { public void preInit(FMLPreInitializationEvent evt) { super.preInit(evt); - GeneticsApi.registerAnalystPagePlugin(new FlowerAnalystPagePlugin()); + IAnalystManager analystManager = GeneticsApi.analystManager; + if (analystManager != null) { + analystManager.registerAnalystPagePlugin(new FlowerAnalystPagePlugin()); + } IAcclimatiserManager acclimatiserManager = GeneticsApi.acclimatiserManager; if(acclimatiserManager != null) { @@ -92,7 +96,7 @@ public class Botany extends BlankModuleContainer { } @Override - public String getModID() { + public String getModId() { return Constants.BOTANY_MOD_ID; } diff --git a/botany/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java b/botany/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java index ce80fcad..4b896dec 100644 --- a/botany/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java +++ b/botany/src/main/java/binnie/botany/ceramic/CeramicDesignSystem.java @@ -18,7 +18,6 @@ import binnie.botany.Botany; import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.items.CeramicItems; import binnie.botany.modules.ModuleCeramic; -import binnie.core.AbstractMod; import binnie.extratrees.api.IDesignMaterial; import binnie.extratrees.api.IDesignSystem; import binnie.extratrees.api.IPattern; @@ -87,15 +86,15 @@ public class CeramicDesignSystem implements IDesignSystem { public void registerSprites() { TextureMap textureMap = Minecraft.getMinecraft().getTextureMapBlocks(); for (EnumPattern pattern : EnumPattern.values()) { - ResourceLocation primaryLocation = new ResourceLocation(getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"); - ResourceLocation secondaryLocation = new ResourceLocation(getMod().getModID(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1"); + ResourceLocation primaryLocation = new ResourceLocation(getModId(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"); + ResourceLocation secondaryLocation = new ResourceLocation(getModId(), getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1"); primary.put(pattern.getIndex(), textureMap.registerSprite(primaryLocation)); secondary.put(pattern.getIndex(), textureMap.registerSprite(secondaryLocation)); } } - public AbstractMod getMod() { - return Botany.instance; + public String getModId() { + return Botany.instance.getModId(); } @Override diff --git a/botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageAppearance.java b/botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageAppearance.java index baa1a37c..079c3b09 100644 --- a/botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageAppearance.java +++ b/botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageAppearance.java @@ -1,6 +1,8 @@ package binnie.botany.genetics.gui.analyst; import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; +import binnie.core.gui.controls.core.Control; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; @@ -20,10 +22,9 @@ import binnie.core.gui.geometry.Point; import binnie.core.gui.minecraft.control.ControlIconDisplay; import binnie.core.gui.renderer.RenderUtil; import binnie.core.util.I18N; -import binnie.genetics.gui.analyst.AnalystConstants; -import binnie.genetics.gui.analyst.ControlAnalystPage; +import binnie.genetics.api.analyst.AnalystConstants; -public class AnalystPageAppearance extends ControlAnalystPage { +public class AnalystPageAppearance extends Control implements ITitledWidget { public AnalystPageAppearance(IWidget parent, IArea area, IFlower flower) { super(parent, area); setColor(3355443); diff --git a/botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageSoil.java b/botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageSoil.java index 24a676ef..8961f8af 100644 --- a/botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageSoil.java +++ b/botany/src/main/java/binnie/botany/genetics/gui/analyst/AnalystPageSoil.java @@ -10,21 +10,22 @@ 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.ITitledWidget; import binnie.core.api.gui.IWidget; import binnie.core.genetics.Tolerance; import binnie.core.gui.controls.ControlText; import binnie.core.gui.controls.ControlTextCentered; +import binnie.core.gui.controls.ControlToleranceBar; +import binnie.core.gui.controls.core.Control; import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.TextJustification; import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.util.I18N; -import binnie.genetics.gui.analyst.AnalystConstants; -import binnie.genetics.gui.analyst.ControlAnalystPage; -import binnie.genetics.gui.analyst.ControlToleranceBar; +import binnie.genetics.api.analyst.AnalystConstants; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; -public class AnalystPageSoil extends ControlAnalystPage { +public class AnalystPageSoil extends Control implements ITitledWidget { public AnalystPageSoil(IWidget parent, IArea area, IFlower flower) { super(parent, area); setColor(6697728); 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 index b0000b0f..ed5f198c 100644 --- a/botany/src/main/java/binnie/botany/genetics/gui/analyst/FlowerAnalystPagePlugin.java +++ b/botany/src/main/java/binnie/botany/genetics/gui/analyst/FlowerAnalystPagePlugin.java @@ -12,10 +12,11 @@ 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 binnie.genetics.api.analyst.IAnalystManager; +import binnie.genetics.api.analyst.IAnalystPagePlugin; +import binnie.genetics.api.analyst.IBiologyPlugin; +import binnie.genetics.api.analyst.IClimatePlugin; +import binnie.genetics.api.analyst.AnalystConstants; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAlleleTolerance; import forestry.api.genetics.IIndividual; @@ -31,17 +32,17 @@ public class FlowerAnalystPagePlugin implements IAnalystPagePlugin { @Override @SideOnly(Side.CLIENT) - public void addAnalystPages(IFlower individual, IWidget parent, IArea pageSize, List analystPages) { - analystPages.add(new AnalystPageClimate<>(parent, pageSize, individual, new ClimatePlugin())); + public void addAnalystPages(IFlower individual, IWidget parent, IArea pageSize, List analystPages, IAnalystManager analystManager) { + analystPages.add(analystManager.createClimatePage(parent, pageSize, individual, new ClimatePlugin())); analystPages.add(new AnalystPageSoil(parent, pageSize, individual)); - analystPages.add(new AnalystPageBiology<>(parent, pageSize, individual, new BiologyPlugin())); + analystPages.add(analystManager.createBiologyPage(parent, pageSize, individual, new BiologyPlugin())); analystPages.add(new AnalystPageAppearance(parent, pageSize, individual)); } - private static class BiologyPlugin implements AnalystPageBiology.IBiologyPlugin { + private static class BiologyPlugin implements IBiologyPlugin { @Override @SideOnly(Side.CLIENT) - public int addBiologyPages(IFlower flower, IWidget parent, int y) { + public int addBiologyPages(IFlower flower, IWidget parent, int y, IAnalystManager analystManager) { 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))) @@ -95,7 +96,7 @@ public class FlowerAnalystPagePlugin implements IAnalystPagePlugin { } } - private static class ClimatePlugin implements AnalystPageClimate.IClimatePlugin { + private static class ClimatePlugin implements IClimatePlugin { @Override public EnumTolerance getTemperatureTolerance(IFlower flower) { 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 c5fe80a0..0c55f965 100644 --- a/botany/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java +++ b/botany/src/main/java/binnie/botany/gui/database/WindowBotanistDatabase.java @@ -14,7 +14,6 @@ import binnie.botany.Botany; import binnie.botany.api.genetics.IFlowerColor; import binnie.botany.api.genetics.EnumFlowerColor; import binnie.botany.modules.ModuleFlowers; -import binnie.core.AbstractMod; import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.listbox.ControlListBox; import binnie.core.gui.database.DatabaseConstants; @@ -57,8 +56,8 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase { } @Override - protected AbstractMod getMod() { - return Botany.instance; + protected String getModId() { + return Botany.instance.getModId(); } @Override diff --git a/core-api/src/main/java/binnie/core/api/gui/IBinnieSprite.java b/core-api/src/main/java/binnie/core/api/gui/IBinnieSprite.java new file mode 100644 index 00000000..bdc44b94 --- /dev/null +++ b/core-api/src/main/java/binnie/core/api/gui/IBinnieSprite.java @@ -0,0 +1,10 @@ +package binnie.core.api.gui; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public interface IBinnieSprite { + @SideOnly(Side.CLIENT) + TextureAtlasSprite getSprite(); +} diff --git a/core/src/main/java/binnie/core/AbstractMod.java b/core/src/main/java/binnie/core/AbstractMod.java index 15681059..1e6e530d 100644 --- a/core/src/main/java/binnie/core/AbstractMod.java +++ b/core/src/main/java/binnie/core/AbstractMod.java @@ -53,7 +53,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable { public abstract IProxyCore getProxy(); - public abstract String getModID(); + public abstract String getModId(); public SimpleNetworkWrapper getNetworkWrapper() { Preconditions.checkState(wrapper != null, "Tried to get network wrapper before it has been init."); diff --git a/core/src/main/java/binnie/core/BinnieCore.java b/core/src/main/java/binnie/core/BinnieCore.java index 5c2aeb40..0a34c77a 100644 --- a/core/src/main/java/binnie/core/BinnieCore.java +++ b/core/src/main/java/binnie/core/BinnieCore.java @@ -217,7 +217,7 @@ public final class BinnieCore extends AbstractMod { //Module handling @Override - public String getModID() { + public String getModId() { return Constants.CORE_MOD_ID; } diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java b/core/src/main/java/binnie/core/gui/controls/ControlIndividualDisplay.java similarity index 97% rename from genetics/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java rename to core/src/main/java/binnie/core/gui/controls/ControlIndividualDisplay.java index f26901c5..19a4f844 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlIndividualDisplay.java +++ b/core/src/main/java/binnie/core/gui/controls/ControlIndividualDisplay.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.analyst; +package binnie.core.gui.controls; import binnie.core.api.genetics.IBreedingSystem; import net.minecraft.client.util.ITooltipFlag; diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java b/core/src/main/java/binnie/core/gui/controls/ControlToleranceBar.java similarity index 98% rename from genetics/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java rename to core/src/main/java/binnie/core/gui/controls/ControlToleranceBar.java index 17fe6202..d0f8940f 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlToleranceBar.java +++ b/core/src/main/java/binnie/core/gui/controls/ControlToleranceBar.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.analyst; +package binnie.core.gui.controls; import java.util.EnumSet; 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 4c0574be..928cbf81 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 @@ -1,6 +1,5 @@ package binnie.core.gui.controls.core; -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -43,13 +42,6 @@ public class Control extends Widget implements ITooltipHelp, ITooltip { protected void initialise() { } - @Nonnull - @Override - public IWidget getParent() { - //noinspection ConstantConditions - return super.getParent(); - } - public void addHelp(final String string) { this.helpStrings.add(string); } diff --git a/core/src/main/java/binnie/core/gui/database/DatabaseTab.java b/core/src/main/java/binnie/core/gui/database/DatabaseTab.java index 0ef202eb..5052f850 100644 --- a/core/src/main/java/binnie/core/gui/database/DatabaseTab.java +++ b/core/src/main/java/binnie/core/gui/database/DatabaseTab.java @@ -6,21 +6,26 @@ import binnie.core.gui.Tooltip; import binnie.core.util.I18N; public class DatabaseTab implements ITooltipHelp { - private AbstractMod mod; + private String modId; private String unloc; public DatabaseTab(final AbstractMod mod, final String unloc) { - this.mod = mod; + this.modId = mod.getModId(); + this.unloc = unloc; + } + + public DatabaseTab(String modId, String unloc) { + this.modId = modId; this.unloc = unloc; } @Override public String toString() { - return I18N.localise(this.mod.getModID() + ".gui.database.tab." + this.unloc); + return I18N.localise(this.modId + ".gui.database.tab." + this.unloc); } @Override public void getHelpTooltip(final Tooltip tooltip) { - tooltip.add(I18N.localiseOrBlank(this.mod.getModID() + ".gui.database.tab." + this.unloc + ".help")); + tooltip.add(I18N.localiseOrBlank(this.modId + ".gui.database.tab." + this.unloc + ".help")); } } 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 6042108d..c73489eb 100644 --- a/core/src/main/java/binnie/core/gui/fieldkit/WindowFieldKit.java +++ b/core/src/main/java/binnie/core/gui/fieldkit/WindowFieldKit.java @@ -24,7 +24,6 @@ import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; -import binnie.core.AbstractMod; import binnie.core.Binnie; import binnie.core.BinnieCore; import binnie.core.api.genetics.IBreedingSystem; @@ -76,8 +75,8 @@ public class WindowFieldKit extends Window { } @Override - protected AbstractMod getMod() { - return BinnieCore.getInstance(); + protected String getModId() { + return BinnieCore.getInstance().getModId(); } @Override 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 8468ad76..b793dd15 100644 --- a/core/src/main/java/binnie/core/gui/genesis/WindowGenesis.java +++ b/core/src/main/java/binnie/core/gui/genesis/WindowGenesis.java @@ -23,7 +23,6 @@ import forestry.api.genetics.ISpeciesRoot; import forestry.api.genetics.ISpeciesType; import binnie.core.Binnie; -import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; @@ -59,8 +58,8 @@ public class WindowGenesis extends Window { } @Override - protected AbstractMod getMod() { - return BinnieCore.getInstance(); + protected String getModId() { + return BinnieCore.getInstance().getModId(); } @Override 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 17066e5f..ef5fda37 100644 --- a/core/src/main/java/binnie/core/gui/minecraft/Window.java +++ b/core/src/main/java/binnie/core/gui/minecraft/Window.java @@ -18,7 +18,6 @@ import com.mojang.authlib.GameProfile; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.AbstractMod; import binnie.core.Binnie; import binnie.core.BinnieCore; import binnie.core.gui.Attribute; @@ -150,7 +149,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG } } - protected abstract AbstractMod getMod(); + protected abstract String getModId(); protected abstract String getBackgroundTextureName(); @@ -159,7 +158,7 @@ public abstract class Window extends TopLevelWidget implements INetwork.ReceiveG @Override @SideOnly(Side.CLIENT) public BinnieResource getTexture() { - return Binnie.RESOURCE.getPNG(getMod(), ResourceType.GUI, getBackgroundTextureName() + ((i == 1) ? "" : i)); + return Binnie.RESOURCE.getPNG(getModId(), ResourceType.GUI, getBackgroundTextureName() + ((i == 1) ? "" : i)); } }; } 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 629a25bb..0db36df2 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 @@ -1,5 +1,6 @@ package binnie.core.gui.minecraft.control; +import binnie.core.api.gui.IBinnieSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; @@ -11,7 +12,6 @@ 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; -import binnie.core.resource.BinnieSprite; @SideOnly(Side.CLIENT) public class ControlIconDisplay extends Control { @@ -27,7 +27,7 @@ public class ControlIconDisplay extends Control { this.sprite = BinnieCore.getBinnieProxy().getTextureAtlasSprite(icon); } - public ControlIconDisplay(final IWidget parent, final int x, final int y, BinnieSprite sprite) { + public ControlIconDisplay(final IWidget parent, final int x, final int y, IBinnieSprite sprite) { super(parent, x, y, 16, 16); this.sprite = sprite.getSprite(); } diff --git a/core/src/main/java/binnie/core/machines/MachineGroup.java b/core/src/main/java/binnie/core/machines/MachineGroup.java index 809e6aa4..8172c0fc 100644 --- a/core/src/main/java/binnie/core/machines/MachineGroup.java +++ b/core/src/main/java/binnie/core/machines/MachineGroup.java @@ -74,7 +74,7 @@ public class MachineGroup { } public String getUID() { - return this.mod.getModID() + "." + this.uid; + return this.mod.getModId() + "." + this.uid; } public String getShortUID() { diff --git a/core/src/main/java/binnie/core/machines/MachinePackage.java b/core/src/main/java/binnie/core/machines/MachinePackage.java index 1423310e..b7d115c0 100644 --- a/core/src/main/java/binnie/core/machines/MachinePackage.java +++ b/core/src/main/java/binnie/core/machines/MachinePackage.java @@ -29,7 +29,7 @@ public abstract class MachinePackage { public abstract void register(); public final String getDisplayName() { - return I18N.localise(this.group.getMod().getModID() + '.' + "machine." + this.group.getShortUID() + "." + this.getUID()); + return I18N.localise(this.group.getMod().getModId() + '.' + "machine." + this.group.getShortUID() + "." + this.getUID()); } public final Integer getMetadata() { @@ -57,6 +57,6 @@ public abstract class MachinePackage { } public final String getInformation() { - return I18N.localise(this.group.getMod().getModID() + '.' + "machine." + this.group.getShortUID() + "." + this.getUID() + ".info"); + return I18N.localise(this.group.getMod().getModId() + '.' + "machine." + this.group.getShortUID() + "." + this.getUID() + ".info"); } } 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 918c6558..cb44a755 100644 --- a/core/src/main/java/binnie/core/machines/storage/WindowCompartment.java +++ b/core/src/main/java/binnie/core/machines/storage/WindowCompartment.java @@ -26,7 +26,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.AbstractMod; import binnie.core.BinnieCore; import binnie.core.gui.Attribute; import binnie.core.gui.CraftGUI; @@ -323,8 +322,8 @@ public class WindowCompartment extends WindowMachine implements IWindowAffectsSh } @Override - protected AbstractMod getMod() { - return BinnieCore.getInstance(); + protected String getModId() { + return BinnieCore.getInstance().getModId(); } @Override diff --git a/core/src/main/java/binnie/core/modules/BlankModuleContainer.java b/core/src/main/java/binnie/core/modules/BlankModuleContainer.java index 5bfa6025..3783e3fa 100644 --- a/core/src/main/java/binnie/core/modules/BlankModuleContainer.java +++ b/core/src/main/java/binnie/core/modules/BlankModuleContainer.java @@ -11,7 +11,7 @@ public abstract class BlankModuleContainer extends AbstractMod { public BlankModuleContainer() { super(); - this.container = new ModuleContainer(getModID(), this::isAvailable); + this.container = new ModuleContainer(getModId(), this::isAvailable); ModuleManager.register(container); } diff --git a/core/src/main/java/binnie/core/resource/BinnieResource.java b/core/src/main/java/binnie/core/resource/BinnieResource.java index 6cf6b46a..288d790d 100644 --- a/core/src/main/java/binnie/core/resource/BinnieResource.java +++ b/core/src/main/java/binnie/core/resource/BinnieResource.java @@ -10,7 +10,7 @@ public class BinnieResource { private ResourceType type; public BinnieResource(final AbstractMod mod, final ResourceType type, final String path) { - this(mod.getModID(), type, path); + this(mod.getModId(), type, path); } public BinnieResource(final String modid, final ResourceType type, final String path) { diff --git a/core/src/main/java/binnie/core/resource/BinnieSprite.java b/core/src/main/java/binnie/core/resource/BinnieSprite.java index ff704803..11323e58 100644 --- a/core/src/main/java/binnie/core/resource/BinnieSprite.java +++ b/core/src/main/java/binnie/core/resource/BinnieSprite.java @@ -1,5 +1,6 @@ package binnie.core.resource; +import binnie.core.api.gui.IBinnieSprite; import com.google.common.base.Preconditions; import javax.annotation.Nullable; @@ -14,13 +15,13 @@ import net.minecraftforge.fml.relauncher.SideOnly; import binnie.core.Binnie; import binnie.core.AbstractMod; -public class BinnieSprite extends BinnieResource { +public class BinnieSprite extends BinnieResource implements IBinnieSprite { @Nullable private TextureAtlasSprite sprite; public BinnieSprite(final AbstractMod mod, final ResourceType type, final String path) { - this(mod.getModID(), type, path); + this(mod.getModId(), type, path); } public BinnieSprite(final String modid, final ResourceType type, final String path) { diff --git a/extrabees/build.gradle b/extrabees/build.gradle index 889dd1c6..a369737d 100644 --- a/extrabees/build.gradle +++ b/extrabees/build.gradle @@ -4,7 +4,4 @@ dependencies { compile project(":core") compile project(":core-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 1eb7b0ba..7e0fdf0a 100644 --- a/extrabees/src/main/java/binnie/extrabees/ExtraBees.java +++ b/extrabees/src/main/java/binnie/extrabees/ExtraBees.java @@ -1,5 +1,6 @@ package binnie.extrabees; +import binnie.genetics.api.analyst.IAnalystManager; import com.google.common.collect.Lists; import javax.annotation.Nullable; @@ -117,7 +118,10 @@ public class ExtraBees { beeBreedingSystem = new BeeBreedingSystem(); Binnie.GENETICS.registerBreedingSystem(beeBreedingSystem); - GeneticsApi.registerAnalystPagePlugin(new AnalystPagePlugin()); + IAnalystManager analystManager = GeneticsApi.analystManager; + if (analystManager != null) { + analystManager.registerAnalystPagePlugin(new AnalystPagePlugin()); + } } @Mod.EventHandler diff --git a/extrabees/src/main/java/binnie/extrabees/genetics/gui/analyst/AnalystPageBeeProducts.java b/extrabees/src/main/java/binnie/extrabees/genetics/gui/analyst/AnalystPageBeeProducts.java index bb6e7688..c5cbeb50 100644 --- a/extrabees/src/main/java/binnie/extrabees/genetics/gui/analyst/AnalystPageBeeProducts.java +++ b/extrabees/src/main/java/binnie/extrabees/genetics/gui/analyst/AnalystPageBeeProducts.java @@ -5,11 +5,15 @@ import java.util.HashMap; import java.util.Map; import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; import binnie.core.gui.controls.ControlFluidDisplay; +import binnie.core.gui.controls.core.Control; import binnie.core.util.FluidStackUtil; import binnie.core.util.ForestryRecipeUtil; import binnie.core.util.TimeUtil; import binnie.extrabees.ExtraBees; +import binnie.genetics.api.analyst.AnalystConstants; +import binnie.genetics.api.analyst.IAnalystManager; import forestry.api.apiculture.BeeManager; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; @@ -37,11 +41,9 @@ 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.genetics.gui.analyst.AnalystConstants; -import binnie.genetics.gui.analyst.AnalystPageProduce; -public class AnalystPageBeeProducts extends AnalystPageProduce { - public AnalystPageBeeProducts(IWidget parent, IArea area, IBee ind) { +public class AnalystPageBeeProducts extends Control implements ITitledWidget { + public AnalystPageBeeProducts(IWidget parent, IArea area, IBee ind, IAnalystManager analystManager) { super(parent, area); setColor(0xcc3300); IBeeGenome genome = ind.getGenome(); @@ -69,7 +71,7 @@ public class AnalystPageBeeProducts extends AnalystPageProduce { if (!productList.add(entry.getKey())) { continue; } - refinedProducts.addAll(getAllProducts(entry.getKey())); + refinedProducts.addAll(analystManager.getAllProducts(entry.getKey())); createProductEntry(entry.getKey(), entry.getValue(), y, speed * modeSpeed); y += 18; } @@ -81,7 +83,7 @@ public class AnalystPageBeeProducts extends AnalystPageProduce { new ControlTextCentered(this, y, I18N.localise(AnalystConstants.PRODUCTS_KEY + ".specialty")).setColor(getColor()); y += 12; for (Map.Entry entry : products.entrySet()) { - refinedProducts.addAll(getAllProducts(entry.getKey())); + refinedProducts.addAll(analystManager.getAllProducts(entry.getKey())); createProductEntry(entry.getKey(), entry.getValue(), y, speed * modeSpeed); y += 18; } @@ -93,17 +95,17 @@ public class AnalystPageBeeProducts extends AnalystPageProduce { y += 12; Collection level2Products = new UniqueItemStackSet(); for (ItemStack stack : refinedProducts) { - level2Products.addAll(getAllProducts(stack)); + level2Products.addAll(analystManager.getAllProducts(stack)); } refinedProducts.addAll(level2Products); level2Products = new UniqueItemStackSet(); for (ItemStack stack : refinedProducts) { - level2Products.addAll(getAllProducts(stack)); + level2Products.addAll(analystManager.getAllProducts(stack)); } refinedProducts.addAll(level2Products); - NonNullList allFluids = getAllFluidsFromItems(refinedProducts); + NonNullList allFluids = analystManager.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; 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 index b28cd662..3172892c 100644 --- a/extrabees/src/main/java/binnie/extrabees/genetics/gui/analyst/AnalystPagePlugin.java +++ b/extrabees/src/main/java/binnie/extrabees/genetics/gui/analyst/AnalystPagePlugin.java @@ -13,12 +13,13 @@ 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 binnie.genetics.api.analyst.AnalystConstants; +import binnie.genetics.api.analyst.IAnalystIcons; +import binnie.genetics.api.analyst.IAnalystManager; +import binnie.genetics.api.analyst.IAnalystPagePlugin; +import binnie.genetics.api.analyst.IBehaviourPlugin; +import binnie.genetics.api.analyst.IBiologyPlugin; +import binnie.genetics.api.analyst.IClimatePlugin; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.IAlleleBeeEffect; import forestry.api.apiculture.IBee; @@ -40,41 +41,42 @@ public class AnalystPagePlugin implements IAnalystPagePlugin { @Override @SideOnly(Side.CLIENT) - public void addAnalystPages(IBee individual, IWidget parent, IArea pageSize, List analystPages) { - analystPages.add(new AnalystPageClimate<>(parent, pageSize, individual, new ClimatePlugin())); - analystPages.add(new AnalystPageBeeProducts(parent, pageSize, individual)); - analystPages.add(new AnalystPageBiology<>(parent, pageSize, individual, new BiologyPlugin())); - analystPages.add(new AnalystPageBehaviour<>(parent, pageSize, individual, new BehaviorPlugin())); + public void addAnalystPages(IBee individual, IWidget parent, IArea pageSize, List analystPages, IAnalystManager analystManager) { + analystPages.add(analystManager.createClimatePage(parent, pageSize, individual, new ClimatePlugin())); + analystPages.add(new AnalystPageBeeProducts(parent, pageSize, individual, analystManager)); + analystPages.add(analystManager.createBiologyPage(parent, pageSize, individual, new BiologyPlugin())); + analystPages.add(analystManager.createBehaviorPage(parent, pageSize, individual, new BehaviorPlugin())); } - private static class BiologyPlugin implements AnalystPageBiology.IBiologyPlugin { + private static class BiologyPlugin implements IBiologyPlugin { @Override @SideOnly(Side.CLIENT) - public int addBiologyPages(IBee bee, IWidget parent, int y) { + public int addBiologyPages(IBee bee, IWidget parent, int y, IAnalystManager analystManager) { + IAnalystIcons icons = analystManager.getIcons(); if (bee.getGenome().getNeverSleeps()) { - new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, ModuleItems.iconAllDay) + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, icons.getIconAllDay()) .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".allDay")); } else if (bee.getGenome().getPrimary().isNocturnal()) { - new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, ModuleItems.iconNight) + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, icons.getIconNight()) .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".night")); } else { - new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, ModuleItems.iconDaytime) + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, icons.getIconDaytime()) .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".day")); } if (!bee.getGenome().getToleratesRain()) { - new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 24, y, ModuleItems.iconNoRain) + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 24, y, icons.getIconNoRain()) .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".notRain")); } else { - new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 24, y, ModuleItems.iconRain) + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 24, y, icons.getIconRain()) .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".rain")); } if (bee.getGenome().getCaveDwelling()) { - new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 48, y, ModuleItems.iconNoSky) + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 48, y, icons.getIconNoSky()) .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".underground")); } else { - new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 48, y, ModuleItems.iconSky) + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 48, y, icons.getIconSky()) .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".notUnderground")); } y += 30; @@ -101,7 +103,7 @@ public class AnalystPagePlugin implements IAnalystPagePlugin { } } - private static class BehaviorPlugin implements AnalystPageBehaviour.IBehaviourPlugin { + private static class BehaviorPlugin implements IBehaviourPlugin { @Override @SideOnly(Side.CLIENT) public int addBehaviourPages(IBee bee, IWidget parent, int y) { @@ -139,7 +141,7 @@ public class AnalystPagePlugin implements IAnalystPagePlugin { } } - private static class ClimatePlugin implements AnalystPageClimate.IClimatePlugin { + private static class ClimatePlugin implements IClimatePlugin { @Override public EnumTolerance getTemperatureTolerance(IBee bee) { diff --git a/extrabees/src/main/java/binnie/extrabees/genetics/gui/database/WindowApiaristDatabase.java b/extrabees/src/main/java/binnie/extrabees/genetics/gui/database/WindowApiaristDatabase.java index 9156584b..afd51078 100644 --- a/extrabees/src/main/java/binnie/extrabees/genetics/gui/database/WindowApiaristDatabase.java +++ b/extrabees/src/main/java/binnie/extrabees/genetics/gui/database/WindowApiaristDatabase.java @@ -1,15 +1,15 @@ package binnie.extrabees.genetics.gui.database; +import binnie.core.Constants; import binnie.extrabees.ExtraBees; -import binnie.genetics.gui.database.bee.PageSpeciesClimate; -import binnie.genetics.gui.database.bee.PageSpeciesGenome; -import binnie.genetics.gui.database.bee.PageSpeciesProducts; +import binnie.extrabees.gui.PageSpeciesClimate; +import binnie.extrabees.gui.PageSpeciesGenome; +import binnie.extrabees.gui.PageSpeciesProducts; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.AbstractMod; import binnie.core.gui.database.DatabaseTab; import binnie.core.gui.database.PageBranchOverview; import binnie.core.gui.database.PageBranchSpecies; @@ -20,7 +20,6 @@ import binnie.core.gui.database.PageSpeciesOverview; import binnie.core.gui.database.PageSpeciesResultant; import binnie.core.gui.database.WindowAbstractDatabase; import binnie.core.gui.minecraft.Window; -import binnie.genetics.Genetics; public class WindowApiaristDatabase extends WindowAbstractDatabase { public WindowApiaristDatabase(EntityPlayer player, Side side, boolean master) { @@ -34,21 +33,21 @@ public class WindowApiaristDatabase extends WindowAbstractDatabase { @Override @SideOnly(Side.CLIENT) protected void addTabs() { - new PageSpeciesOverview(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.overview")); - new PageSpeciesClassification(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.classification")); - new PageSpeciesGenome(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.genome")); - new PageSpeciesProducts(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.products")); - new PageSpeciesClimate(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.climate")); - new PageSpeciesResultant(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.resultant")); - new PageSpeciesMutations(getInfoPages(Mode.SPECIES), new DatabaseTab(Genetics.instance, "species.further")); - new PageBranchOverview(getInfoPages(Mode.BRANCHES), new DatabaseTab(Genetics.instance, "branches.overview")); - new PageBranchSpecies(getInfoPages(Mode.BRANCHES), new DatabaseTab(Genetics.instance, "branches.species")); - new PageBreeder(getInfoPages(Mode.BREEDER), getUsername(), new DatabaseTab(Genetics.instance, "breeder")); + new PageSpeciesOverview(getInfoPages(Mode.SPECIES), new DatabaseTab(Constants.GENETICS_MOD_ID, "species.overview")); + new PageSpeciesClassification(getInfoPages(Mode.SPECIES), new DatabaseTab(Constants.GENETICS_MOD_ID, "species.classification")); + new PageSpeciesGenome(getInfoPages(Mode.SPECIES), new DatabaseTab(Constants.GENETICS_MOD_ID, "species.genome")); + new PageSpeciesProducts(getInfoPages(Mode.SPECIES), new DatabaseTab(Constants.GENETICS_MOD_ID,"species.products")); + new PageSpeciesClimate(getInfoPages(Mode.SPECIES), new DatabaseTab(Constants.GENETICS_MOD_ID, "species.climate")); + new PageSpeciesResultant(getInfoPages(Mode.SPECIES), new DatabaseTab(Constants.GENETICS_MOD_ID, "species.resultant")); + new PageSpeciesMutations(getInfoPages(Mode.SPECIES), new DatabaseTab(Constants.GENETICS_MOD_ID, "species.further")); + new PageBranchOverview(getInfoPages(Mode.BRANCHES), new DatabaseTab(Constants.GENETICS_MOD_ID, "branches.overview")); + new PageBranchSpecies(getInfoPages(Mode.BRANCHES), new DatabaseTab(Constants.GENETICS_MOD_ID, "branches.species")); + new PageBreeder(getInfoPages(Mode.BREEDER), getUsername(), new DatabaseTab(Constants.GENETICS_MOD_ID, "breeder")); } @Override - public AbstractMod getMod() { - return Genetics.instance; + public String getModId() { + return ExtraBees.MODID; } @Override diff --git a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java b/extrabees/src/main/java/binnie/extrabees/gui/ControlBiomes.java similarity index 98% rename from genetics/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java rename to extrabees/src/main/java/binnie/extrabees/gui/ControlBiomes.java index 9e5f94c3..ce494b5c 100644 --- a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlBiomes.java +++ b/extrabees/src/main/java/binnie/extrabees/gui/ControlBiomes.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.database.bee; +package binnie.extrabees.gui; import java.util.ArrayList; import java.util.List; diff --git a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java b/extrabees/src/main/java/binnie/extrabees/gui/ControlClimateBar.java similarity index 98% rename from genetics/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java rename to extrabees/src/main/java/binnie/extrabees/gui/ControlClimateBar.java index 92b37ac1..7416170e 100644 --- a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlClimateBar.java +++ b/extrabees/src/main/java/binnie/extrabees/gui/ControlClimateBar.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.database.bee; +package binnie.extrabees.gui; import java.util.ArrayList; import java.util.List; diff --git a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java b/extrabees/src/main/java/binnie/extrabees/gui/ControlProductsBox.java similarity index 97% rename from genetics/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java rename to extrabees/src/main/java/binnie/extrabees/gui/ControlProductsBox.java index d3dc16ec..76c27b24 100644 --- a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlProductsBox.java +++ b/extrabees/src/main/java/binnie/extrabees/gui/ControlProductsBox.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.database.bee; +package binnie.extrabees.gui; import java.util.ArrayList; import java.util.List; diff --git a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlProductsItem.java b/extrabees/src/main/java/binnie/extrabees/gui/ControlProductsItem.java similarity index 97% rename from genetics/src/main/java/binnie/genetics/gui/database/bee/ControlProductsItem.java rename to extrabees/src/main/java/binnie/extrabees/gui/ControlProductsItem.java index e08c027f..b00b289d 100644 --- a/genetics/src/main/java/binnie/genetics/gui/database/bee/ControlProductsItem.java +++ b/extrabees/src/main/java/binnie/extrabees/gui/ControlProductsItem.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.database.bee; +package binnie.extrabees.gui; import java.text.DecimalFormat; diff --git a/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java b/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesClimate.java similarity index 95% rename from genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java rename to extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesClimate.java index de42b803..3323a172 100644 --- a/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesClimate.java +++ b/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesClimate.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.database.bee; +package binnie.extrabees.gui; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.IAlleleSpecies; diff --git a/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java b/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesGenome.java similarity index 99% rename from genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java rename to extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesGenome.java index 50536a87..ed0342c6 100644 --- a/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesGenome.java +++ b/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesGenome.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.database.bee; +package binnie.extrabees.gui; import forestry.api.apiculture.BeeManager; import net.minecraft.util.math.Vec3i; diff --git a/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java b/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesProducts.java similarity index 96% rename from genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java rename to extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesProducts.java index 0e7d31db..874fa977 100644 --- a/genetics/src/main/java/binnie/genetics/gui/database/bee/PageSpeciesProducts.java +++ b/extrabees/src/main/java/binnie/extrabees/gui/PageSpeciesProducts.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.database.bee; +package binnie.extrabees.gui; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.IAlleleSpecies; diff --git a/extratrees/build.gradle b/extratrees/build.gradle index 1550fcf6..5dd3701e 100644 --- a/extratrees/build.gradle +++ b/extratrees/build.gradle @@ -6,7 +6,4 @@ dependencies { compile project(":extratrees-api") compile project(":botany-api") compile project(":genetics-api") - - // TODO: remove dependency on genetics - compile project(":genetics") } diff --git a/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java b/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java index b829454f..6c92ff05 100644 --- a/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/extratrees/src/main/java/binnie/extratrees/ExtraTrees.java @@ -4,6 +4,7 @@ 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 binnie.genetics.api.analyst.IAnalystManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; @@ -54,9 +55,12 @@ public class ExtraTrees extends BlankModuleContainer { mothBreedingSystem = new MothBreedingSystem(); Binnie.GENETICS.registerBreedingSystem(mothBreedingSystem); - GeneticsApi.registerAnalystPagePlugin(new TreeAnalystPagePlugin()); - GeneticsApi.registerAnalystPagePlugin(new ButterflyAnalystPagePlugin()); - GeneticsApi.registerProducePlugin(new TreeProducePlugin()); + IAnalystManager analystManager = GeneticsApi.analystManager; + if (analystManager != null) { + analystManager.registerAnalystPagePlugin(new TreeAnalystPagePlugin()); + analystManager.registerAnalystPagePlugin(new ButterflyAnalystPagePlugin()); + analystManager.registerProducePlugin(new TreeProducePlugin()); + } } @Mod.EventHandler @@ -94,7 +98,7 @@ public class ExtraTrees extends BlankModuleContainer { } @Override - public String getModID() { + public String getModId() { return Constants.EXTRA_TREES_MOD_ID; } diff --git a/extratrees/src/main/java/binnie/extratrees/carpentry/DesignSystem.java b/extratrees/src/main/java/binnie/extratrees/carpentry/DesignSystem.java index ec1f3a02..f645fe7f 100644 --- a/extratrees/src/main/java/binnie/extratrees/carpentry/DesignSystem.java +++ b/extratrees/src/main/java/binnie/extratrees/carpentry/DesignSystem.java @@ -13,7 +13,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.AbstractMod; import binnie.extratrees.ExtraTrees; import binnie.extratrees.api.CarpentryManager; import binnie.extratrees.api.IDesignMaterial; @@ -167,14 +166,14 @@ public enum DesignSystem implements IDesignSystem { public void registerSprites() { TextureMap textureMap = Minecraft.getMinecraft().getTextureMapBlocks(); for (final EnumPattern pattern : EnumPattern.values()) { - ResourceLocation primaryLocation = new ResourceLocation(getMod().getModID(), "blocks/" + getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"); - ResourceLocation secondaryLocation = new ResourceLocation(getMod().getModID(), "blocks/" + getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1"); + ResourceLocation primaryLocation = new ResourceLocation(getModId(), "blocks/" + getTexturePath() + "/" + pattern.toString().toLowerCase() + ".0"); + ResourceLocation secondaryLocation = new ResourceLocation(getModId(), "blocks/" + getTexturePath() + "/" + pattern.toString().toLowerCase() + ".1"); this.primary.put(pattern.ordinal(), textureMap.registerSprite(primaryLocation)); this.secondary.put(pattern.ordinal(), textureMap.registerSprite(secondaryLocation)); } } - public AbstractMod getMod() { - return ExtraTrees.instance; + public String getModId() { + return ExtraTrees.instance.getModId(); } } diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageFruit.java b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageFruit.java index cc638aa4..a97fda45 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageFruit.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageFruit.java @@ -6,6 +6,9 @@ import java.util.Collections; import java.util.Map; import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; +import binnie.core.gui.controls.core.Control; +import binnie.genetics.api.analyst.IAnalystManager; import forestry.api.arboriculture.TreeManager; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -27,11 +30,13 @@ import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.util.I18N; import binnie.core.util.UniqueItemStackSet; import binnie.extratrees.modules.ModuleWood; -import binnie.genetics.gui.analyst.AnalystConstants; -import binnie.genetics.gui.analyst.AnalystPageProduce; +import binnie.genetics.api.analyst.AnalystConstants; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; -public class AnalystPageFruit extends AnalystPageProduce { - public AnalystPageFruit(IWidget parent, IArea area, ITree ind) { +@SideOnly(Side.CLIENT) +public class AnalystPageFruit extends Control implements ITitledWidget { + public AnalystPageFruit(IWidget parent, IArea area, ITree ind, IAnalystManager analystManager) { super(parent, area); setColor(13382400); ITreeGenome genome = ind.getGenome(); @@ -83,9 +88,9 @@ public class AnalystPageFruit extends AnalystPageProduce { allProducts.addAll(products); allProducts.addAll(specialties); Collection refinedProducts = new UniqueItemStackSet(); - refinedProducts.addAll(getAllProductsAndFluids(allProducts)); + refinedProducts.addAll(analystManager.getAllProductsAndFluids(allProducts)); if (refinedProducts.size() > 0) { - y = getRefined(I18N.localise(AnalystConstants.FRUIT_KEY + ".refined"), y, refinedProducts); + y = analystManager.drawRefined(this, I18N.localise(AnalystConstants.FRUIT_KEY + ".refined"), y, refinedProducts); y += 8; } if (products.size() == 0 && specialties.size() == 0) { @@ -118,7 +123,7 @@ public class AnalystPageFruit extends AnalystPageProduce { } } } - y = getRefined(TextFormatting.ITALIC + fam.getName(), y, stacks); + y = analystManager.drawRefined(this, TextFormatting.ITALIC + fam.getName(), y, stacks); y += 2; } setSize(new Point(getWidth(), y + 8)); diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageGrowth.java b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageGrowth.java index 817a678c..bf0195e0 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageGrowth.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageGrowth.java @@ -1,6 +1,8 @@ package binnie.extratrees.genetics.gui.analyst; import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; +import binnie.core.gui.controls.core.Control; import binnie.core.util.TimeUtil; import net.minecraft.util.text.TextFormatting; @@ -13,10 +15,9 @@ import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.util.I18N; import binnie.extratrees.modules.ModuleWood; -import binnie.genetics.gui.analyst.AnalystConstants; -import binnie.genetics.gui.analyst.ControlAnalystPage; +import binnie.genetics.api.analyst.AnalystConstants; -public class AnalystPageGrowth extends ControlAnalystPage { +public class AnalystPageGrowth extends Control implements ITitledWidget { public AnalystPageGrowth(IWidget parent, IArea area, IIndividual ind) { super(parent, area); setColor(3355443); diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageSpecimen.java similarity index 70% rename from genetics/src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java rename to extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageSpecimen.java index 12890c61..e91e751a 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/butterfly/AnalystPageSpecimen.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageSpecimen.java @@ -1,6 +1,9 @@ -package binnie.genetics.gui.analyst.butterfly; +package binnie.extratrees.genetics.gui.analyst; import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; +import binnie.core.gui.controls.ControlIndividualDisplay; +import binnie.core.gui.controls.core.Control; import net.minecraft.util.text.TextFormatting; import forestry.api.lepidopterology.IButterfly; @@ -8,11 +11,9 @@ import forestry.api.lepidopterology.IButterfly; import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.util.I18N; -import binnie.genetics.gui.analyst.AnalystConstants; -import binnie.genetics.gui.analyst.ControlAnalystPage; -import binnie.genetics.gui.analyst.ControlIndividualDisplay; +import binnie.genetics.api.analyst.AnalystConstants; -public class AnalystPageSpecimen extends ControlAnalystPage { +public class AnalystPageSpecimen extends Control implements ITitledWidget { public AnalystPageSpecimen(IWidget parent, IArea area, IButterfly ind) { super(parent, area); setColor(3355443); diff --git a/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageWood.java b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageWood.java index 89c8362a..dafdda99 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageWood.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/AnalystPageWood.java @@ -3,6 +3,9 @@ package binnie.extratrees.genetics.gui.analyst; import java.util.Collection; import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; +import binnie.core.gui.controls.core.Control; +import binnie.genetics.api.analyst.IAnalystManager; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; @@ -22,13 +25,11 @@ import binnie.core.gui.minecraft.control.ControlIconDisplay; import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.util.I18N; import binnie.core.util.UniqueItemStackSet; -import binnie.genetics.gui.analyst.AnalystConstants; -import binnie.genetics.gui.analyst.AnalystPageProduce; -import binnie.genetics.item.ModuleItems; +import binnie.genetics.api.analyst.AnalystConstants; @SideOnly(Side.CLIENT) -public class AnalystPageWood extends AnalystPageProduce { - public AnalystPageWood(IWidget parent, IArea area, ITree ind) { +public class AnalystPageWood extends Control implements ITitledWidget { + public AnalystPageWood(IWidget parent, IArea area, ITree ind, IAnalystManager analystManager) { super(parent, area); setColor(6697728); ITreeGenome genome = ind.getGenome(); @@ -36,9 +37,9 @@ public class AnalystPageWood extends AnalystPageProduce { new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColor(getColor()); y += 12; if (((IAlleleBoolean) ind.getGenome().getActiveAllele(EnumTreeChromosome.FIREPROOF)).getValue()) { - new ControlIconDisplay(this, (getWidth() - 16) / 2, y, ModuleItems.iconNoFire).addTooltip(I18N.localise(AnalystConstants.WOOD_KEY + ".fireproof")); + new ControlIconDisplay(this, (getWidth() - 16) / 2, y, analystManager.getIcons().getIconNoFire()).addTooltip(I18N.localise(AnalystConstants.WOOD_KEY + ".fireproof")); } else { - new ControlIconDisplay(this, (getWidth() - 16) / 2, y, ModuleItems.iconFire).addTooltip(I18N.localise(AnalystConstants.WOOD_KEY + ".flammable")); + new ControlIconDisplay(this, (getWidth() - 16) / 2, y, analystManager.getIcons().getIconFire()).addTooltip(I18N.localise(AnalystConstants.WOOD_KEY + ".flammable")); } y += 30; Collection products = new UniqueItemStackSet(); @@ -66,9 +67,9 @@ public class AnalystPageWood extends AnalystPageProduce { Collection allProducts = new UniqueItemStackSet(); allProducts.addAll(products); Collection refinedProducts = new UniqueItemStackSet(); - refinedProducts.addAll(getAllProductsAndFluids(allProducts)); + refinedProducts.addAll(analystManager.getAllProductsAndFluids(allProducts)); if (refinedProducts.size() > 0) { - y = getRefined(I18N.localise(AnalystConstants.WOOD_KEY + ".refined"), y, refinedProducts); + y = analystManager.drawRefined(this, I18N.localise(AnalystConstants.WOOD_KEY + ".refined"), y, refinedProducts); y += 8; } if (products.size() == 0) { 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 index 470556c1..91b1b504 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/ButterflyAnalystPagePlugin.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/ButterflyAnalystPagePlugin.java @@ -14,13 +14,13 @@ 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 binnie.genetics.api.analyst.IAnalystIcons; +import binnie.genetics.api.analyst.IAnalystManager; +import binnie.genetics.api.analyst.IAnalystPagePlugin; +import binnie.genetics.api.analyst.IBehaviourPlugin; +import binnie.genetics.api.analyst.IBiologyPlugin; +import binnie.genetics.api.analyst.IClimatePlugin; +import binnie.genetics.api.analyst.AnalystConstants; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAlleleTolerance; import forestry.api.genetics.IIndividual; @@ -40,41 +40,42 @@ public class ButterflyAnalystPagePlugin implements IAnalystPagePlugin analystPages) { - analystPages.add(new AnalystPageClimate<>(parent, pageSize, individual, new ClimatePlugin())); + public void addAnalystPages(IButterfly individual, IWidget parent, IArea pageSize, List analystPages, IAnalystManager analystManager) { + analystPages.add(analystManager.createClimatePage(parent, pageSize, individual, new ClimatePlugin())); analystPages.add(new AnalystPageSpecimen(parent, pageSize, individual)); - analystPages.add(new AnalystPageBiology<>(parent, pageSize, individual, new BiologyPlugin())); - analystPages.add(new AnalystPageBehaviour<>(parent, pageSize, individual, new BehaviorPlugin())); + analystPages.add(analystManager.createBiologyPage(parent, pageSize, individual, new BiologyPlugin())); + analystPages.add(analystManager.createBehaviorPage(parent, pageSize, individual, new BehaviorPlugin())); } - private static class BiologyPlugin implements AnalystPageBiology.IBiologyPlugin { + private static class BiologyPlugin implements IBiologyPlugin { @Override @SideOnly(Side.CLIENT) - public int addBiologyPages(IButterfly butterfly, IWidget parent, int y) { + public int addBiologyPages(IButterfly butterfly, IWidget parent, int y, IAnalystManager analystManager) { + IAnalystIcons icons = analystManager.getIcons(); if (butterfly.getGenome().getNocturnal()) { - new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, ModuleItems.iconAllDay) + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, icons.getIconAllDay()) .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".allDay")); } else if (butterfly.getGenome().getPrimary().isNocturnal()) { - new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, ModuleItems.iconNight) + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, icons.getIconNight()) .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".night")); } else { - new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, ModuleItems.iconDaytime) + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2, y, icons.getIconDaytime()) .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".day")); } if (!butterfly.getGenome().getTolerantFlyer()) { - new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 24, y, ModuleItems.iconNoRain) + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 24, y, icons.getIconNoRain()) .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".notRain")); } else { - new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 24, y, ModuleItems.iconRain) + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 24, y, icons.getIconRain()) .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".rain")); } if (butterfly.getGenome().getFireResist()) { - new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 48, y, ModuleItems.iconNoFire) + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 48, y, icons.getIconNoFire()) .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".nonflammable")); } else { - new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 48, y, ModuleItems.iconFire) + new ControlIconDisplay(parent, (parent.getWidth() - 64) / 2 + 48, y, icons.getIconFire()) .addTooltip(I18N.localise(AnalystConstants.BIOLOGY_KEY + ".flammable")); } y += 30; @@ -110,7 +111,7 @@ public class ButterflyAnalystPagePlugin implements IAnalystPagePlugin { + private static class BehaviorPlugin implements IBehaviourPlugin { @Override public int addBehaviourPages(IButterfly individual, IWidget parent, int y) { @@ -142,7 +143,7 @@ public class ButterflyAnalystPagePlugin implements IAnalystPagePlugin { + private static class ClimatePlugin implements IClimatePlugin { @Override public EnumTolerance getTemperatureTolerance(IButterfly butterfly) { 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 index 7246bed4..55e91688 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/TreeAnalystPagePlugin.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/TreeAnalystPagePlugin.java @@ -10,9 +10,10 @@ 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 binnie.genetics.api.analyst.IAnalystManager; +import binnie.genetics.api.analyst.IAnalystPagePlugin; +import binnie.genetics.api.analyst.IBiologyPlugin; +import binnie.genetics.api.analyst.AnalystConstants; import forestry.api.arboriculture.EnumTreeChromosome; import forestry.api.arboriculture.ITree; import forestry.api.genetics.IIndividual; @@ -28,17 +29,17 @@ public class TreeAnalystPagePlugin implements IAnalystPagePlugin { @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, new BiologyPlugin())); + public void addAnalystPages(ITree individual, IWidget parent, IArea pageSize, List analystPages, IAnalystManager analystManager) { + analystPages.add(new AnalystPageFruit(parent, pageSize, individual, analystManager)); + analystPages.add(new AnalystPageWood(parent, pageSize, individual, analystManager)); + analystPages.add(analystManager.createBiologyPage(parent, pageSize, individual, new BiologyPlugin())); analystPages.add(new AnalystPageGrowth(parent, pageSize, individual)); } - private static class BiologyPlugin implements AnalystPageBiology.IBiologyPlugin { + private static class BiologyPlugin implements IBiologyPlugin { @Override @SideOnly(Side.CLIENT) - public int addBiologyPages(ITree tree, IWidget parent, int y) { + public int addBiologyPages(ITree tree, IWidget parent, int y, IAnalystManager analystManager) { 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()); 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 index 4cce4ed5..aed8a518 100644 --- a/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/TreeProducePlugin.java +++ b/extratrees/src/main/java/binnie/extratrees/genetics/gui/analyst/TreeProducePlugin.java @@ -3,7 +3,7 @@ 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 binnie.genetics.api.analyst.IProducePlugin; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fluids.FluidStack; diff --git a/extratrees/src/main/java/binnie/extratrees/gui/WindowSetSquare.java b/extratrees/src/main/java/binnie/extratrees/gui/WindowSetSquare.java index d13c2f52..426f6906 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/WindowSetSquare.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/WindowSetSquare.java @@ -8,7 +8,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; -import binnie.core.AbstractMod; import binnie.core.gui.minecraft.Window; import binnie.extratrees.ExtraTrees; @@ -22,8 +21,8 @@ public class WindowSetSquare extends Window { } @Override - protected AbstractMod getMod() { - return ExtraTrees.instance; + protected String getModId() { + return ExtraTrees.instance.getModId(); } @Override 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 8b80b37b..74efbe33 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/WindowArboristDatabase.java @@ -9,7 +9,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.AbstractMod; import binnie.extratrees.genetics.TreeBreedingSystem; import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.listbox.ControlListBox; @@ -103,8 +102,8 @@ public class WindowArboristDatabase extends WindowAbstractDatabase { } @Override - protected AbstractMod getMod() { - return ExtraTrees.instance; + protected String getModId() { + return ExtraTrees.instance.getModId(); } @Override diff --git a/extratrees/src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java b/extratrees/src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java index bf29f1d2..dc149be3 100644 --- a/extratrees/src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java +++ b/extratrees/src/main/java/binnie/extratrees/gui/database/WindowLepidopteristDatabase.java @@ -5,7 +5,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.AbstractMod; import binnie.core.gui.database.DatabaseTab; import binnie.core.gui.database.PageBranchOverview; import binnie.core.gui.database.PageBranchSpecies; @@ -41,8 +40,8 @@ public class WindowLepidopteristDatabase extends WindowAbstractDatabase { } @Override - protected AbstractMod getMod() { - return ExtraTrees.instance; + protected String getModId() { + return ExtraTrees.instance.getModId(); } @Override diff --git a/extratrees/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java b/extratrees/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java index 49433e66..ab10259c 100644 --- a/extratrees/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java +++ b/extratrees/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java @@ -38,7 +38,7 @@ public class BreweryRecipeCategory implements IRecipeCategory analystPagePlugins = new ArrayList<>(); - private static Collection producePlugins = new ArrayList<>(); - + @Nullable public static IAcclimatiserManager acclimatiserManager; - 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); - } + public static IAnalystManager analystManager; } diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystConstants.java b/genetics-api/src/main/java/binnie/genetics/api/analyst/AnalystConstants.java similarity index 96% rename from genetics/src/main/java/binnie/genetics/gui/analyst/AnalystConstants.java rename to genetics-api/src/main/java/binnie/genetics/api/analyst/AnalystConstants.java index fdf0a81b..80f8dcf9 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystConstants.java +++ b/genetics-api/src/main/java/binnie/genetics/api/analyst/AnalystConstants.java @@ -1,4 +1,4 @@ -package binnie.genetics.gui.analyst; +package binnie.genetics.api.analyst; public class AnalystConstants { public static final String KEY = "genetics.gui.analyst"; diff --git a/genetics-api/src/main/java/binnie/genetics/api/analyst/IAnalystIcons.java b/genetics-api/src/main/java/binnie/genetics/api/analyst/IAnalystIcons.java new file mode 100644 index 00000000..901b7878 --- /dev/null +++ b/genetics-api/src/main/java/binnie/genetics/api/analyst/IAnalystIcons.java @@ -0,0 +1,35 @@ +package binnie.genetics.api.analyst; + +import binnie.core.api.gui.IBinnieSprite; + +public interface IAnalystIcons { + IBinnieSprite getIconNight(); + + IBinnieSprite getIconDaytime(); + + IBinnieSprite getIconAllDay(); + + IBinnieSprite getIconRain(); + + IBinnieSprite getIconNoRain(); + + IBinnieSprite getIconSky(); + + IBinnieSprite getIconNoSky(); + + IBinnieSprite getIconFire(); + + IBinnieSprite getIconNoFire(); + + IBinnieSprite getIconAdd(); + + IBinnieSprite getIconArrow(); + + IBinnieSprite getIconAdd0(); + + IBinnieSprite getIconArrow0(); + + IBinnieSprite getIconAdd1(); + + IBinnieSprite getIconArrow1(); +} diff --git a/genetics-api/src/main/java/binnie/genetics/api/analyst/IAnalystManager.java b/genetics-api/src/main/java/binnie/genetics/api/analyst/IAnalystManager.java new file mode 100644 index 00000000..a113b7a5 --- /dev/null +++ b/genetics-api/src/main/java/binnie/genetics/api/analyst/IAnalystManager.java @@ -0,0 +1,46 @@ +package binnie.genetics.api.analyst; + +import java.util.Collection; + +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.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public interface IAnalystManager { + void registerAnalystPagePlugin(IAnalystPagePlugin analystPageFactory); + + IAnalystPagePlugin getAnalystPagePlugin(T individual); + + void registerProducePlugin(IProducePlugin producePlugin); + + Collection getProducePlugins(); + + NonNullList getAllProducts(ItemStack key); + + NonNullList getAllFluidsFromItems(Collection itemStacks); + + NonNullList getAllFluidsFromFluids(Collection fluidStacks); + + Collection getAllProductsAndFluids(Collection collection); + + @SideOnly(Side.CLIENT) + IAnalystIcons getIcons(); + + @SideOnly(Side.CLIENT) + ITitledWidget createClimatePage(IWidget parent, IArea area, T ind, IClimatePlugin plugin); + + @SideOnly(Side.CLIENT) + ITitledWidget createBiologyPage(IWidget parent, IArea area, T ind, IBiologyPlugin plugin); + + @SideOnly(Side.CLIENT) + ITitledWidget createBehaviorPage(IWidget parent, IArea area, T ind, IBehaviourPlugin behaviourPlugin); + + @SideOnly(Side.CLIENT) + int drawRefined(IWidget parent, String string, int y, Collection products); +} diff --git a/genetics-api/src/main/java/binnie/genetics/api/IAnalystPagePlugin.java b/genetics-api/src/main/java/binnie/genetics/api/analyst/IAnalystPagePlugin.java similarity index 81% rename from genetics-api/src/main/java/binnie/genetics/api/IAnalystPagePlugin.java rename to genetics-api/src/main/java/binnie/genetics/api/analyst/IAnalystPagePlugin.java index c1192c92..c3eb0133 100644 --- a/genetics-api/src/main/java/binnie/genetics/api/IAnalystPagePlugin.java +++ b/genetics-api/src/main/java/binnie/genetics/api/analyst/IAnalystPagePlugin.java @@ -1,4 +1,4 @@ -package binnie.genetics.api; +package binnie.genetics.api.analyst; import java.util.List; @@ -13,5 +13,5 @@ public interface IAnalystPagePlugin { boolean handles(IIndividual individual); @SideOnly(Side.CLIENT) - void addAnalystPages(T individual, IWidget parent, IArea pageSize, List analystPages); + void addAnalystPages(T individual, IWidget parent, IArea pageSize, List analystPages, IAnalystManager analystManager); } diff --git a/genetics-api/src/main/java/binnie/genetics/api/analyst/IBehaviourPlugin.java b/genetics-api/src/main/java/binnie/genetics/api/analyst/IBehaviourPlugin.java new file mode 100644 index 00000000..c0627e48 --- /dev/null +++ b/genetics-api/src/main/java/binnie/genetics/api/analyst/IBehaviourPlugin.java @@ -0,0 +1,8 @@ +package binnie.genetics.api.analyst; + +import binnie.core.api.gui.IWidget; +import forestry.api.genetics.IIndividual; + +public interface IBehaviourPlugin { + int addBehaviourPages(T individual, IWidget parent, int y); +} diff --git a/genetics-api/src/main/java/binnie/genetics/api/analyst/IBiologyPlugin.java b/genetics-api/src/main/java/binnie/genetics/api/analyst/IBiologyPlugin.java new file mode 100644 index 00000000..2df6d7dd --- /dev/null +++ b/genetics-api/src/main/java/binnie/genetics/api/analyst/IBiologyPlugin.java @@ -0,0 +1,11 @@ +package binnie.genetics.api.analyst; + +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 IBiologyPlugin { + @SideOnly(Side.CLIENT) + int addBiologyPages(T individual, IWidget parent, int y, IAnalystManager analystManager); +} diff --git a/genetics-api/src/main/java/binnie/genetics/api/analyst/IClimatePlugin.java b/genetics-api/src/main/java/binnie/genetics/api/analyst/IClimatePlugin.java new file mode 100644 index 00000000..969b9c01 --- /dev/null +++ b/genetics-api/src/main/java/binnie/genetics/api/analyst/IClimatePlugin.java @@ -0,0 +1,12 @@ +package binnie.genetics.api.analyst; + +import forestry.api.genetics.EnumTolerance; +import forestry.api.genetics.IIndividual; + +public interface IClimatePlugin { + EnumTolerance getTemperatureTolerance(T individual); + + EnumTolerance getHumidityTolerance(T individual); + + boolean showHumiditySection(); +} diff --git a/genetics-api/src/main/java/binnie/genetics/api/IProducePlugin.java b/genetics-api/src/main/java/binnie/genetics/api/analyst/IProducePlugin.java similarity index 91% rename from genetics-api/src/main/java/binnie/genetics/api/IProducePlugin.java rename to genetics-api/src/main/java/binnie/genetics/api/analyst/IProducePlugin.java index 30cca6e9..4cb8e3ab 100644 --- a/genetics-api/src/main/java/binnie/genetics/api/IProducePlugin.java +++ b/genetics-api/src/main/java/binnie/genetics/api/analyst/IProducePlugin.java @@ -1,4 +1,4 @@ -package binnie.genetics.api; +package binnie.genetics.api.analyst; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; diff --git a/genetics/src/main/java/binnie/genetics/Genetics.java b/genetics/src/main/java/binnie/genetics/Genetics.java index 2d54bfb0..aa575d59 100644 --- a/genetics/src/main/java/binnie/genetics/Genetics.java +++ b/genetics/src/main/java/binnie/genetics/Genetics.java @@ -1,7 +1,11 @@ package binnie.genetics; import binnie.genetics.api.GeneticsApi; +import binnie.genetics.api.acclimatiser.IAcclimatiserManager; +import binnie.genetics.api.analyst.IAnalystManager; import binnie.genetics.core.GeneticsTexture; +import binnie.genetics.gui.Icons; +import binnie.genetics.gui.analyst.AnalystManager; import binnie.genetics.gui.analyst.GeneticsProducePlugin; import binnie.genetics.machine.acclimatiser.AcclimatiserManager; import binnie.genetics.machine.sequencer.Sequencer; @@ -45,6 +49,12 @@ public class Genetics extends AbstractMod { private static ModuleItems items; @Nullable private static ModuleMachine machine; + @Nullable + private static IAnalystManager analystManager; + @Nullable + private static IAcclimatiserManager acclimatiserManager; + @Nullable + private static Icons icons; public static ModuleItems items() { Preconditions.checkState(items != null); @@ -56,6 +66,21 @@ public class Genetics extends AbstractMod { return machine; } + public static IAnalystManager getAnalystManager() { + Preconditions.checkNotNull(analystManager); + return analystManager; + } + + public static IAcclimatiserManager getAcclimatiserManager() { + Preconditions.checkNotNull(acclimatiserManager); + return acclimatiserManager; + } + + public static Icons getIcons() { + Preconditions.checkNotNull(icons); + return icons; + } + @Mod.EventHandler public void preInit(FMLPreInitializationEvent evt) { proxy.registerItem(new ItemPunnettSquare()); @@ -67,8 +92,14 @@ public class Genetics extends AbstractMod { Sequencer.fxSeqT = Binnie.RESOURCE.getBlockSprite(Genetics.instance, "fx/sequencer.t"); Sequencer.fxSeqC = Binnie.RESOURCE.getBlockSprite(Genetics.instance, "fx/sequencer.c"); - GeneticsApi.acclimatiserManager = new AcclimatiserManager(); - GeneticsApi.registerProducePlugin(new GeneticsProducePlugin()); + AnalystManager analystManager = new AnalystManager(); + Genetics.analystManager = GeneticsApi.analystManager = analystManager; + AcclimatiserManager acclimatiserManager = new AcclimatiserManager(); + Genetics.acclimatiserManager = GeneticsApi.acclimatiserManager = acclimatiserManager; + + analystManager.registerProducePlugin(new GeneticsProducePlugin()); + + Genetics.icons = new Icons(); } @Mod.EventHandler @@ -108,7 +139,7 @@ public class Genetics extends AbstractMod { } @Override - public String getModID() { + public String getModId() { return Constants.GENETICS_MOD_ID; } diff --git a/genetics/src/main/java/binnie/genetics/gui/Icons.java b/genetics/src/main/java/binnie/genetics/gui/Icons.java new file mode 100644 index 00000000..7d9456e6 --- /dev/null +++ b/genetics/src/main/java/binnie/genetics/gui/Icons.java @@ -0,0 +1,99 @@ +package binnie.genetics.gui; + +import binnie.core.Binnie; +import binnie.core.BinnieCore; +import binnie.core.resource.BinnieSprite; +import binnie.genetics.api.analyst.IAnalystIcons; + +public final class Icons implements IAnalystIcons { + private final BinnieSprite iconNight = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.night"); + private final BinnieSprite iconDaytime = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.day"); + private final BinnieSprite iconAllDay = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.allday"); + private final BinnieSprite iconRain = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.rain"); + private final BinnieSprite iconNoRain = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.norain"); + private final BinnieSprite iconSky = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.sky"); + private final BinnieSprite iconNoSky = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.nosky"); + private final BinnieSprite iconFire = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.fire"); + private final BinnieSprite iconNoFire = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.nofire"); + private final BinnieSprite iconAdd = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.add"); + private final BinnieSprite iconArrow = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.arrow"); + private final BinnieSprite iconAdd0 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.add.0"); + private final BinnieSprite iconArrow0 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.arrow.0"); + private final BinnieSprite iconAdd1 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.add.1"); + private final BinnieSprite iconArrow1 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.arrow.1"); + + @Override + public BinnieSprite getIconNight() { + return iconNight; + } + + @Override + public BinnieSprite getIconDaytime() { + return iconDaytime; + } + + @Override + public BinnieSprite getIconAllDay() { + return iconAllDay; + } + + @Override + public BinnieSprite getIconRain() { + return iconRain; + } + + @Override + public BinnieSprite getIconNoRain() { + return iconNoRain; + } + + @Override + public BinnieSprite getIconSky() { + return iconSky; + } + + @Override + public BinnieSprite getIconNoSky() { + return iconNoSky; + } + + @Override + public BinnieSprite getIconFire() { + return iconFire; + } + + @Override + public BinnieSprite getIconNoFire() { + return iconNoFire; + } + + @Override + public BinnieSprite getIconAdd() { + return iconAdd; + } + + @Override + public BinnieSprite getIconArrow() { + return iconArrow; + } + + @Override + public BinnieSprite getIconAdd0() { + return iconAdd0; + } + + @Override + public BinnieSprite getIconArrow0() { + return iconArrow0; + } + + @Override + public BinnieSprite getIconAdd1() { + return iconAdd1; + } + + @Override + public BinnieSprite getIconArrow1() { + return iconArrow1; + } +} diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystManager.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystManager.java new file mode 100644 index 00000000..80d828a6 --- /dev/null +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystManager.java @@ -0,0 +1,182 @@ +package binnie.genetics.gui.analyst; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; + +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.gui.minecraft.control.ControlItemDisplay; +import binnie.core.util.FluidStackUtil; +import binnie.core.util.UniqueFluidStackSet; +import binnie.core.util.UniqueItemStackSet; +import binnie.genetics.Genetics; +import binnie.genetics.api.analyst.IAnalystIcons; +import binnie.genetics.api.analyst.IAnalystManager; +import binnie.genetics.api.analyst.IAnalystPagePlugin; +import binnie.genetics.api.analyst.IBehaviourPlugin; +import binnie.genetics.api.analyst.IBiologyPlugin; +import binnie.genetics.api.analyst.IClimatePlugin; +import binnie.genetics.api.analyst.IProducePlugin; +import binnie.genetics.gui.analyst.tree.AnalystPageClimate; +import forestry.api.genetics.IIndividual; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class AnalystManager implements IAnalystManager { + private Collection analystPagePlugins = new ArrayList<>(); + private Collection producePlugins = new ArrayList<>(); + + @Override + public void registerAnalystPagePlugin(IAnalystPagePlugin analystPageFactory) { + analystPagePlugins.add(analystPageFactory); + } + + @Override + @Nullable + public IAnalystPagePlugin getAnalystPagePlugin(T individual) { + for (IAnalystPagePlugin plugin : analystPagePlugins) { + if (plugin.handles(individual)) { + //noinspection unchecked + return plugin; + } + } + return null; + } + + @Override + public void registerProducePlugin(IProducePlugin producePlugin) { + producePlugins.add(producePlugin); + } + + @Override + public Collection getProducePlugins() { + return Collections.unmodifiableCollection(producePlugins); + } + + @Override + public NonNullList getAllProducts(ItemStack key) { + NonNullList products = NonNullList.create(); + for (IProducePlugin plugin : getProducePlugins()) { + plugin.getItems(key, products); + } + return products; + } + + @Override + public NonNullList getAllFluidsFromItems(Collection itemStacks) { + NonNullList allFluids = NonNullList.create(); + for (ItemStack itemStack : itemStacks) { + for (IProducePlugin producePlugin : getProducePlugins()) { + producePlugin.getFluids(itemStack, allFluids); + } + } + return FluidStackUtil.removeEqualFluids(allFluids); + } + + @Override + public NonNullList getAllFluidsFromFluids(Collection fluidStacks) { + NonNullList allFluids = NonNullList.create(); + for (FluidStack itemStack : fluidStacks) { + for (IProducePlugin producePlugin : Genetics.getAnalystManager().getProducePlugins()) { + producePlugin.getFluids(itemStack, allFluids); + } + } + return FluidStackUtil.removeEqualFluids(allFluids); + } + + @Override + public Collection getAllProductsAndFluids(Collection collection) { + Collection products = new UniqueItemStackSet(); + for (ItemStack stack : collection) { + products.addAll(getAllProducts(stack)); + } + Collection products2 = new UniqueItemStackSet(); + for (ItemStack stack2 : products) { + products2.addAll(getAllProducts(stack2)); + } + Collection products3 = new UniqueItemStackSet(); + for (ItemStack stack3 : products2) { + products3.addAll(getAllProducts(stack3)); + } + products.addAll(products2); + products.addAll(products3); + Collection allFluids = new UniqueFluidStackSet(); + allFluids.addAll(getAllFluidsFromItems(collection)); + + Collection fluids2 = new UniqueFluidStackSet(); + fluids2.addAll(getAllFluidsFromFluids(allFluids)); + + Collection fluids3 = new UniqueFluidStackSet(); + fluids3.addAll(getAllFluidsFromFluids(fluids2)); + + allFluids.addAll(fluids2); + allFluids.addAll(fluids3); + for (FluidStack fluid : allFluids) { + ItemStack container = FluidStackUtil.getContainer(fluid); + if (container != null) { + products.add(container); + } + } + return products; + } + + @Override + public IAnalystIcons getIcons() { + return Genetics.getIcons(); + } + + @Override + @SideOnly(Side.CLIENT) + public ITitledWidget createClimatePage(IWidget parent, IArea area, T ind, IClimatePlugin plugin) { + return new AnalystPageClimate<>(parent, area, ind, plugin); + } + + @Override + @SideOnly(Side.CLIENT) + public ITitledWidget createBiologyPage(IWidget parent, IArea area, T ind, IBiologyPlugin plugin) { + return new AnalystPageBiology<>(parent, area, ind, plugin, this); + } + + @Override + @SideOnly(Side.CLIENT) + public ITitledWidget createBehaviorPage(IWidget parent, IArea area, T ind, IBehaviourPlugin behaviourPlugin) { + return new AnalystPageBehaviour<>(parent, area, ind, behaviourPlugin); + } + + @Override + @SideOnly(Side.CLIENT) + public int drawRefined(IWidget parent, String string, int y, Collection products) { + new ControlTextCentered(parent, y, string).setColor(parent.getColor()); + y += 10; + int maxBiomePerLine = (parent.getWidth() + 2 - 16) / 18; + int biomeListX = (parent.getWidth() - (Math.min(maxBiomePerLine, products.size()) * 18 - 2)) / 2; + int dx = 0; + int dy = 0; + for (ItemStack soilStack : products) { + if (dx >= 18 * maxBiomePerLine) { + dx = 0; + dy += 18; + } + FluidStack fluid = FluidUtil.getFluidContained(soilStack); + soilStack.setCount(1); + ControlItemDisplay display = new ControlItemDisplay(parent, biomeListX + dx, y + dy, soilStack, fluid == null); + if (fluid != null) { + display.addTooltip(fluid.getLocalizedName()); + } + dx += 18; + } + if (dx != 0) { + dy += 18; + } + y += dy; + return y; + } +} 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 d678cac5..562010f3 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBehaviour.java @@ -1,19 +1,20 @@ package binnie.genetics.gui.analyst; 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.gui.controls.core.Control; import binnie.core.util.I18N; +import binnie.genetics.api.analyst.AnalystConstants; +import binnie.genetics.api.analyst.IBehaviourPlugin; import forestry.api.genetics.IIndividual; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class AnalystPageBehaviour extends ControlAnalystPage { - public interface IBehaviourPlugin { - int addBehaviourPages(T individual, IWidget parent, int y); - } +public class AnalystPageBehaviour extends Control implements ITitledWidget { public AnalystPageBehaviour(IWidget parent, IArea area, T ind, IBehaviourPlugin behaviourPlugin) { super(parent, area); 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 b500f960..b54dc578 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageBiology.java @@ -1,30 +1,30 @@ package binnie.genetics.gui.analyst; 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.gui.controls.core.Control; import binnie.core.gui.geometry.Point; import binnie.core.util.I18N; +import binnie.genetics.api.analyst.AnalystConstants; +import binnie.genetics.api.analyst.IAnalystManager; +import binnie.genetics.api.analyst.IBiologyPlugin; import forestry.api.genetics.IIndividual; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class AnalystPageBiology extends ControlAnalystPage { +public class AnalystPageBiology extends Control implements ITitledWidget { - public interface IBiologyPlugin { - @SideOnly(Side.CLIENT) - int addBiologyPages(T individual, IWidget parent, int y); - } - - public AnalystPageBiology(IWidget parent, IArea area, T ind, IBiologyPlugin plugin) { + public AnalystPageBiology(IWidget parent, IArea area, T ind, IBiologyPlugin plugin, IAnalystManager analystManager) { super(parent, area); setColor(0x006666); int y = 4; new ControlTextCentered(this, y, TextFormatting.UNDERLINE + getTitle()).setColor(getColor()); y += 12; - y = plugin.addBiologyPages(ind, this, y); + y = plugin.addBiologyPages(ind, this, y, analystManager); setSize(new Point(getWidth(), y)); } 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 690e6607..798041dc 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDatabase.java @@ -6,6 +6,8 @@ import java.util.Objects; import binnie.core.api.genetics.IBreedingSystem; import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; +import binnie.core.gui.controls.ControlIndividualDisplay; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; @@ -32,7 +34,7 @@ import binnie.core.gui.resource.textures.CraftGUITexture; import binnie.core.gui.window.Panel; import binnie.core.util.I18N; -public class AnalystPageDatabase extends ControlAnalystPage { +public class AnalystPageDatabase extends Control implements ITitledWidget { private final ControlScrollableContent scroll; boolean isMaster; 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 aee39db1..bfbe3a34 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDescription.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageDescription.java @@ -3,6 +3,9 @@ package binnie.genetics.gui.analyst; import java.util.Objects; import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; +import binnie.core.gui.controls.core.Control; +import binnie.genetics.api.analyst.AnalystConstants; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; @@ -21,7 +24,7 @@ import binnie.core.gui.geometry.TextJustification; import binnie.core.util.I18N; @SideOnly(Side.CLIENT) -public class AnalystPageDescription extends ControlAnalystPage { +public class AnalystPageDescription extends Control implements ITitledWidget { public AnalystPageDescription(IWidget parent, IArea area, IIndividual ind) { super(parent, area); setColor(3355443); 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 21158f0e..3ed099fc 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageGenome.java @@ -2,6 +2,8 @@ package binnie.genetics.gui.analyst; import binnie.core.api.genetics.IBreedingSystem; import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; +import binnie.genetics.api.analyst.AnalystConstants; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.text.TextFormatting; @@ -26,7 +28,7 @@ import binnie.core.gui.geometry.TextJustification; import binnie.core.util.I18N; @SideOnly(Side.CLIENT) -public class AnalystPageGenome extends ControlAnalystPage { +public class AnalystPageGenome extends Control implements ITitledWidget { boolean active; public AnalystPageGenome(IWidget parent, IArea area, boolean active, IIndividual ind) { 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 a8db432b..053490ff 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageKaryogram.java @@ -2,6 +2,9 @@ package binnie.genetics.gui.analyst; import binnie.core.api.genetics.IBreedingSystem; import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; +import binnie.core.gui.controls.core.Control; +import binnie.genetics.api.analyst.AnalystConstants; import net.minecraft.util.text.TextFormatting; import forestry.api.genetics.AlleleManager; @@ -14,7 +17,7 @@ import binnie.core.api.gui.IWidget; import binnie.core.gui.controls.ControlTextCentered; import binnie.core.util.I18N; -public class AnalystPageKaryogram extends ControlAnalystPage { +public class AnalystPageKaryogram extends Control implements ITitledWidget { public AnalystPageKaryogram(IWidget parent, IArea area, IIndividual ind) { super(parent, area); setColor(10040319); 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 483ac177..51f815e9 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageMutations.java @@ -5,6 +5,8 @@ import java.util.List; import binnie.core.api.genetics.IBreedingSystem; import binnie.core.api.gui.IArea; +import binnie.core.api.gui.ITitledWidget; +import binnie.genetics.api.analyst.AnalystConstants; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; @@ -34,7 +36,7 @@ import binnie.core.gui.renderer.RenderUtil; import binnie.core.integration.extrabees.ExtraBeesIntegration; import binnie.core.util.I18N; -public class AnalystPageMutations extends ControlAnalystPage { +public class AnalystPageMutations extends Control implements ITitledWidget { public AnalystPageMutations(IWidget parent, IArea area, IIndividual ind, boolean isMaster) { super(parent, area); setColor(3355392); diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java b/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java deleted file mode 100644 index 324d23b8..00000000 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java +++ /dev/null @@ -1,115 +0,0 @@ -package binnie.genetics.gui.analyst; - -import java.util.Collection; - -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.util.NonNullList; - -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; - -import binnie.core.api.gui.IWidget; -import binnie.core.gui.controls.ControlTextCentered; -import binnie.core.gui.minecraft.control.ControlItemDisplay; -import binnie.core.util.UniqueFluidStackSet; -import binnie.core.util.UniqueItemStackSet; - -public abstract class AnalystPageProduce extends ControlAnalystPage { - public AnalystPageProduce(IWidget parent, IArea area) { - super(parent, area); - } - - protected NonNullList getAllProducts(ItemStack key) { - NonNullList products = NonNullList.create(); - for (IProducePlugin plugin : GeneticsApi.getProducePlugins()) { - plugin.getItems(key, products); - } - return products; - } - - public NonNullList getAllFluidsFromItems(Collection itemStacks) { - NonNullList allFluids = NonNullList.create(); - for (ItemStack itemStack : itemStacks) { - for (IProducePlugin producePlugin : GeneticsApi.getProducePlugins()) { - producePlugin.getFluids(itemStack, allFluids); - } - } - return FluidStackUtil.removeEqualFluids(allFluids); - } - - public NonNullList getAllFluidsFromFluids(Collection fluidStacks) { - NonNullList allFluids = NonNullList.create(); - for (FluidStack itemStack : fluidStacks) { - for (IProducePlugin producePlugin : GeneticsApi.getProducePlugins()) { - producePlugin.getFluids(itemStack, allFluids); - } - } - return FluidStackUtil.removeEqualFluids(allFluids); - } - - protected Collection getAllProductsAndFluids(Collection collection) { - Collection products = new UniqueItemStackSet(); - for (ItemStack stack : collection) { - products.addAll(getAllProducts(stack)); - } - Collection products2 = new UniqueItemStackSet(); - for (ItemStack stack2 : products) { - products2.addAll(getAllProducts(stack2)); - } - Collection products3 = new UniqueItemStackSet(); - for (ItemStack stack3 : products2) { - products3.addAll(getAllProducts(stack3)); - } - products.addAll(products2); - products.addAll(products3); - Collection allFluids = new UniqueFluidStackSet(); - allFluids.addAll(getAllFluidsFromItems(collection)); - - Collection fluids2 = new UniqueFluidStackSet(); - fluids2.addAll(getAllFluidsFromFluids(allFluids)); - - Collection fluids3 = new UniqueFluidStackSet(); - fluids3.addAll(getAllFluidsFromFluids(fluids2)); - - allFluids.addAll(fluids2); - allFluids.addAll(fluids3); - for (FluidStack fluid : allFluids) { - ItemStack container = FluidStackUtil.getContainer(fluid); - if (container != null) { - products.add(container); - } - } - return products; - } - - protected int getRefined(String string, int y, Collection products) { - new ControlTextCentered(this, y, string).setColor(getColor()); - y += 10; - int maxBiomePerLine = (getWidth() + 2 - 16) / 18; - int biomeListX = (getWidth() - (Math.min(maxBiomePerLine, products.size()) * 18 - 2)) / 2; - int dx = 0; - int dy = 0; - for (ItemStack soilStack : products) { - if (dx >= 18 * maxBiomePerLine) { - dx = 0; - dy += 18; - } - FluidStack fluid = FluidUtil.getFluidContained(soilStack); - soilStack.setCount(1); - ControlItemDisplay display = new ControlItemDisplay(this, biomeListX + dx, y + dy, soilStack, fluid == null); - if (fluid != null) { - display.addTooltip(fluid.getLocalizedName()); - } - dx += 18; - } - if (dx != 0) { - dy += 18; - } - y += dy; - return y; - } -} diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java deleted file mode 100644 index 8521549d..00000000 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlAnalystPage.java +++ /dev/null @@ -1,21 +0,0 @@ -package binnie.genetics.gui.analyst; - -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 net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public abstract class ControlAnalystPage extends Control implements ITitledWidget { - public ControlAnalystPage(IWidget parent, IArea area) { - super(parent, area); - hide(); - } - - @Override - public void onRenderBackground(int guiWidth, int guiHeight) { - } - -} 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 4a7551a2..ab00281b 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlFurtherMutation.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlFurtherMutation.java @@ -1,6 +1,8 @@ package binnie.genetics.gui.analyst; import binnie.core.api.genetics.IBreedingSystem; +import binnie.genetics.Genetics; +import binnie.genetics.api.analyst.AnalystConstants; import net.minecraft.client.renderer.GlStateManager; import net.minecraftforge.fml.relauncher.Side; @@ -13,7 +15,6 @@ import binnie.core.api.gui.IWidget; import binnie.core.gui.geometry.Point; import binnie.core.gui.renderer.RenderUtil; import binnie.core.util.I18N; -import binnie.genetics.item.ModuleItems; public class ControlFurtherMutation extends ControlMutation { private final IAlleleSpecies resolute; @@ -45,12 +46,12 @@ public class ControlFurtherMutation extends ControlMutation { RenderUtil.setColour(getMutationColour(mutation.getBaseChance()).getColor()); if (specificChance != mutation.getBaseChance()) { RenderUtil.setColour(getMutationColour(mutation.getBaseChance()).getColor()); - drawSprite(ModuleItems.iconArrow0); + drawSprite(Genetics.getIcons().getIconArrow0()); RenderUtil.setColour(getMutationColour(specificChance).getColor()); - drawSprite(ModuleItems.iconArrow1); + drawSprite(Genetics.getIcons().getIconArrow1()); } else { RenderUtil.setColour(getMutationColour(mutation.getBaseChance()).getColor()); - drawSprite(ModuleItems.iconArrow); + drawSprite(Genetics.getIcons().getIconArrow()); } } } 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 52f55151..a2afd09b 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/ControlResultantMutation.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/ControlResultantMutation.java @@ -1,6 +1,8 @@ package binnie.genetics.gui.analyst; import binnie.core.api.genetics.IBreedingSystem; +import binnie.genetics.Genetics; +import binnie.genetics.api.analyst.AnalystConstants; import net.minecraft.client.renderer.GlStateManager; import net.minecraftforge.fml.relauncher.Side; @@ -13,7 +15,6 @@ import binnie.core.api.gui.IWidget; import binnie.core.gui.geometry.Point; import binnie.core.gui.renderer.RenderUtil; import binnie.core.util.I18N; -import binnie.genetics.item.ModuleItems; public class ControlResultantMutation extends ControlMutation { @@ -45,12 +46,12 @@ public class ControlResultantMutation extends ControlMutation { GlStateManager.disableBlend(); if (specificChance != mutation.getBaseChance()) { RenderUtil.setColour(getMutationColour(mutation.getBaseChance()).getColor()); - drawSprite(ModuleItems.iconAdd0); + drawSprite(Genetics.getIcons().getIconAdd0()); RenderUtil.setColour(getMutationColour(specificChance).getColor()); - drawSprite(ModuleItems.iconAdd1); + drawSprite(Genetics.getIcons().getIconAdd1()); } else { RenderUtil.setColour(getMutationColour(mutation.getBaseChance()).getColor()); - drawSprite(ModuleItems.iconAdd); + drawSprite(Genetics.getIcons().getIconAdd()); } } } diff --git a/genetics/src/main/java/binnie/genetics/gui/analyst/GeneticsProducePlugin.java b/genetics/src/main/java/binnie/genetics/gui/analyst/GeneticsProducePlugin.java index 4881af91..2cb57576 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/GeneticsProducePlugin.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/GeneticsProducePlugin.java @@ -1,7 +1,7 @@ package binnie.genetics.gui.analyst; import binnie.core.util.ForestryRecipeUtil; -import binnie.genetics.api.IProducePlugin; +import binnie.genetics.api.analyst.IProducePlugin; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.item.crafting.IRecipe; 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 382fe204..abbceb2f 100644 --- a/genetics/src/main/java/binnie/genetics/gui/analyst/WindowAnalyst.java +++ b/genetics/src/main/java/binnie/genetics/gui/analyst/WindowAnalyst.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import binnie.core.AbstractMod; import binnie.core.Binnie; import binnie.core.api.genetics.IBreedingSystem; import binnie.core.api.gui.Alignment; @@ -29,8 +28,7 @@ import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import binnie.core.util.Log; import binnie.genetics.Genetics; -import binnie.genetics.api.GeneticsApi; -import binnie.genetics.api.IAnalystPagePlugin; +import binnie.genetics.api.analyst.IAnalystPagePlugin; import binnie.genetics.core.GeneticsGUI; import binnie.genetics.item.GeneticsItems; import binnie.genetics.machine.ModuleMachine; @@ -78,8 +76,8 @@ public class WindowAnalyst extends Window { } @Override - protected AbstractMod getMod() { - return Genetics.instance; + protected String getModId() { + return Genetics.instance.getModId(); } @Override @@ -215,13 +213,16 @@ public class WindowAnalyst extends Window { analystPages.add(new AnalystPageMutations(analystPanel, analystPageSize, current, isMaster)); } + for (ITitledWidget page : analystPages) { + page.hide(); + } } @SideOnly(Side.CLIENT) private static void createPages(T individual, IWidget parent, IArea pageSize, List analystPages) { - IAnalystPagePlugin analystPageFactory = GeneticsApi.getAnalystPagePlugin(individual); + IAnalystPagePlugin analystPageFactory = Genetics.getAnalystManager().getAnalystPagePlugin(individual); if (analystPageFactory != null) { - analystPageFactory.addAnalystPages(individual, parent, pageSize, analystPages); + analystPageFactory.addAnalystPages(individual, parent, pageSize, analystPages, Genetics.getAnalystManager()); } else { Log.error("Could not find IAnalystPagePlugin for {}", individual.getClass()); } 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 d655b12c..1f8a6ed0 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 @@ -4,18 +4,20 @@ import java.util.ArrayList; 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.genetics.Tolerance; import binnie.core.gui.controls.ControlText; 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.util.I18N; -import binnie.genetics.gui.analyst.AnalystConstants; -import binnie.genetics.gui.analyst.ControlAnalystPage; +import binnie.genetics.api.analyst.IClimatePlugin; +import binnie.genetics.api.analyst.AnalystConstants; import binnie.genetics.gui.analyst.ControlBiome; -import binnie.genetics.gui.analyst.ControlToleranceBar; +import binnie.core.gui.controls.ControlToleranceBar; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.genetics.EnumTolerance; @@ -24,15 +26,11 @@ import net.minecraft.init.Biomes; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.biome.Biome; import net.minecraftforge.fml.common.registry.ForgeRegistries; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; -public class AnalystPageClimate extends ControlAnalystPage { - public interface IClimatePlugin { - EnumTolerance getTemperatureTolerance(T individual); - - EnumTolerance getHumidityTolerance(T individual); - - boolean showHumiditySection(); - } +@SideOnly(Side.CLIENT) +public class AnalystPageClimate extends Control implements ITitledWidget { public AnalystPageClimate(IWidget parent, IArea area, T ind, IClimatePlugin plugin) { super(parent, area); diff --git a/genetics/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java b/genetics/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java index 4fd9048f..22fb17c1 100644 --- a/genetics/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java +++ b/genetics/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java @@ -10,7 +10,6 @@ import net.minecraftforge.fml.relauncher.SideOnly; import forestry.api.genetics.ISpeciesRoot; -import binnie.core.AbstractMod; import binnie.core.Binnie; import binnie.core.Constants; import binnie.core.gui.CraftGUI; @@ -41,8 +40,8 @@ public class WindowPunnettSquare extends Window { } @Override - public AbstractMod getMod() { - return Genetics.instance; + public String getModId() { + return Genetics.instance.getModId(); } @Override diff --git a/genetics/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeCategory.java b/genetics/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeCategory.java index ad5001be..d742481f 100644 --- a/genetics/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeCategory.java +++ b/genetics/src/main/java/binnie/genetics/integration/jei/database/DatabaseRecipeCategory.java @@ -22,7 +22,7 @@ public class DatabaseRecipeCategory implements IRecipeCategory ordinal() == 0 || type == FluidContainerType.CYLINDER) diff --git a/genetics/src/main/java/binnie/genetics/item/ModuleItems.java b/genetics/src/main/java/binnie/genetics/item/ModuleItems.java index b54157b5..f80313d5 100644 --- a/genetics/src/main/java/binnie/genetics/item/ModuleItems.java +++ b/genetics/src/main/java/binnie/genetics/item/ModuleItems.java @@ -14,35 +14,18 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import forestry.api.recipes.RecipeManagers; import binnie.core.Binnie; -import binnie.core.BinnieCore; import binnie.core.Constants; import binnie.core.IInitializable; import binnie.core.Mods; 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.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import binnie.genetics.recipes.RegistryRecipe; public class ModuleItems implements IInitializable { - public static BinnieSprite iconNight; - public static BinnieSprite iconDaytime; - public static BinnieSprite iconAllDay; - public static BinnieSprite iconRain; - public static BinnieSprite iconNoRain; - public static BinnieSprite iconSky; - public static BinnieSprite iconNoSky; - public static BinnieSprite iconFire; - public static BinnieSprite iconNoFire; - public static BinnieSprite iconAdd; - public static BinnieSprite iconArrow; - public static BinnieSprite iconAdd0; - public static BinnieSprite iconArrow0; - public static BinnieSprite iconAdd1; - public static BinnieSprite iconArrow1; public ItemSerum itemSerum; public ItemSequence itemSequencer; public ItemDatabase database; @@ -74,22 +57,6 @@ public class ModuleItems implements IInitializable { Genetics.proxy.registerItem(itemSequencer); Binnie.LIQUID.createLiquids(GeneticLiquid.values()); - - ModuleItems.iconNight = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.night"); - ModuleItems.iconDaytime = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.day"); - ModuleItems.iconAllDay = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.allday"); - ModuleItems.iconRain = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.rain"); - ModuleItems.iconNoRain = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.norain"); - ModuleItems.iconSky = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.sky"); - ModuleItems.iconNoSky = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.nosky"); - ModuleItems.iconFire = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.fire"); - ModuleItems.iconNoFire = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.nofire"); - ModuleItems.iconAdd = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.add"); - ModuleItems.iconArrow = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.arrow"); - ModuleItems.iconAdd0 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.add.0"); - ModuleItems.iconArrow0 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.arrow.0"); - ModuleItems.iconAdd1 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.add.1"); - ModuleItems.iconArrow1 = Binnie.RESOURCE.getItemSprite(BinnieCore.getInstance(), "gui/analyst.arrow.1"); } public Item getItemGenetics() { diff --git a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java index 6297e06d..7c06e7de 100644 --- a/genetics/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java +++ b/genetics/src/main/java/binnie/genetics/machine/acclimatiser/WindowAcclimatiser.java @@ -6,7 +6,6 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.AbstractMod; import binnie.core.api.gui.Alignment; import binnie.core.gui.minecraft.control.ControlEnergyBar; import binnie.core.gui.minecraft.control.ControlErrorState; @@ -53,8 +52,8 @@ public class WindowAcclimatiser extends WindowMachine { } @Override - protected AbstractMod getMod() { - return Genetics.instance; + protected String getModId() { + return Genetics.instance.getModId(); } @Override diff --git a/genetics/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java b/genetics/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java index d7d1a511..07080efa 100644 --- a/genetics/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java +++ b/genetics/src/main/java/binnie/genetics/machine/analyser/WindowAnalyser.java @@ -6,7 +6,6 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.AbstractMod; import binnie.core.api.gui.Alignment; import binnie.core.gui.minecraft.GUIIcon; import binnie.core.gui.minecraft.MinecraftGUI; @@ -67,8 +66,8 @@ public class WindowAnalyser extends WindowMachine { } @Override - protected AbstractMod getMod() { - return Genetics.instance; + protected String getModId() { + return Genetics.instance.getModId(); } @Override 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 cc9ab83f..8a64822e 100644 --- a/genetics/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java +++ b/genetics/src/main/java/binnie/genetics/machine/craftgui/WindowGeneBank.java @@ -22,7 +22,6 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import binnie.core.Binnie; -import binnie.core.AbstractMod; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; import binnie.core.gui.Tooltip; @@ -165,8 +164,8 @@ public class WindowGeneBank extends WindowMachine { } @Override - protected AbstractMod getMod() { - return Genetics.instance; + protected String getModId() { + return Genetics.instance.getModId(); } @Override diff --git a/genetics/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java b/genetics/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java index 44dba84d..bd4249c8 100644 --- a/genetics/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java +++ b/genetics/src/main/java/binnie/genetics/machine/genepool/WindowGenepool.java @@ -6,7 +6,6 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.AbstractMod; import binnie.core.api.gui.Alignment; import binnie.core.gui.minecraft.GUIIcon; import binnie.core.gui.minecraft.control.ControlEnergyBar; @@ -63,8 +62,8 @@ public class WindowGenepool extends WindowMachine { } @Override - protected AbstractMod getMod() { - return Genetics.instance; + protected String getModId() { + return Genetics.instance.getModId(); } @Override diff --git a/genetics/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java b/genetics/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java index 2e3e0a4f..99681501 100644 --- a/genetics/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java +++ b/genetics/src/main/java/binnie/genetics/machine/incubator/WindowIncubator.java @@ -6,7 +6,6 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.AbstractMod; import binnie.core.api.gui.Alignment; import binnie.core.gui.minecraft.GUIIcon; import binnie.core.gui.minecraft.control.ControlEnergyBar; @@ -64,8 +63,8 @@ public class WindowIncubator extends WindowMachine { } @Override - protected AbstractMod getMod() { - return Genetics.instance; + protected String getModId() { + return Genetics.instance.getModId(); } @Override diff --git a/genetics/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java b/genetics/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java index 953ae503..9a3df9fd 100644 --- a/genetics/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java +++ b/genetics/src/main/java/binnie/genetics/machine/inoculator/WindowInoculator.java @@ -6,7 +6,6 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.AbstractMod; import binnie.core.gui.geometry.CraftGUIUtil; import binnie.core.api.gui.Alignment; import binnie.core.gui.geometry.TextJustification; @@ -69,8 +68,8 @@ public class WindowInoculator extends WindowMachine { } @Override - protected AbstractMod getMod() { - return Genetics.instance; + protected String getModId() { + return Genetics.instance.getModId(); } @Override diff --git a/genetics/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java b/genetics/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java index 1188e2b4..47c68718 100644 --- a/genetics/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java +++ b/genetics/src/main/java/binnie/genetics/machine/isolator/WindowIsolator.java @@ -6,7 +6,6 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.AbstractMod; import binnie.core.api.gui.Alignment; import binnie.core.gui.minecraft.GUIIcon; import binnie.core.gui.minecraft.control.ControlEnergyBar; @@ -69,8 +68,8 @@ public class WindowIsolator extends WindowMachine { } @Override - protected AbstractMod getMod() { - return Genetics.instance; + protected String getModId() { + return Genetics.instance.getModId(); } @Override diff --git a/genetics/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java b/genetics/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java index 5f557309..1f1d01af 100644 --- a/genetics/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java +++ b/genetics/src/main/java/binnie/genetics/machine/polymeriser/WindowPolymeriser.java @@ -6,7 +6,6 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.AbstractMod; import binnie.core.api.gui.Alignment; import binnie.core.gui.minecraft.GUIIcon; import binnie.core.gui.minecraft.control.ControlEnergyBar; @@ -62,8 +61,8 @@ public class WindowPolymeriser extends WindowMachine { } @Override - protected AbstractMod getMod() { - return Genetics.instance; + protected String getModId() { + return Genetics.instance.getModId(); } @Override diff --git a/genetics/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java b/genetics/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java index 7ccae3d1..246e6676 100644 --- a/genetics/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java +++ b/genetics/src/main/java/binnie/genetics/machine/sequencer/WindowSequencer.java @@ -8,7 +8,6 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.AbstractMod; import binnie.core.gui.controls.ControlText; import binnie.core.gui.geometry.Area; import binnie.core.gui.geometry.CraftGUIUtil; @@ -81,8 +80,8 @@ public class WindowSequencer extends WindowMachine { } @Override - protected AbstractMod getMod() { - return Genetics.instance; + protected String getModId() { + return Genetics.instance.getModId(); } @Override diff --git a/genetics/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java b/genetics/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java index 6ccb9bef..ab977eba 100644 --- a/genetics/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java +++ b/genetics/src/main/java/binnie/genetics/machine/splicer/WindowSplicer.java @@ -6,7 +6,6 @@ import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import binnie.core.AbstractMod; import binnie.core.gui.geometry.CraftGUIUtil; import binnie.core.api.gui.Alignment; import binnie.core.gui.geometry.TextJustification; @@ -65,8 +64,8 @@ public class WindowSplicer extends WindowMachine { } @Override - protected AbstractMod getMod() { - return Genetics.instance; + protected String getModId() { + return Genetics.instance.getModId(); } @Override