From d7cc3cbd4c4e75c01a4a88de7b5b4653bb3a35c0 Mon Sep 17 00:00:00 2001 From: bdew Date: Tue, 12 Aug 2014 12:43:10 +0300 Subject: [PATCH] Added creative tabs, moved stuff around --- build.gradle | 4 +- resources/assets/gendustry/lang/en_US.lang | 4 ++ src/net/bdew/gendustry/Gendustry.scala | 30 ++++++++------ src/net/bdew/gendustry/config/Blocks.scala | 3 +- src/net/bdew/gendustry/config/Fluids.scala | 2 + src/net/bdew/gendustry/config/Items.scala | 3 +- src/net/bdew/gendustry/config/Machines.scala | 3 +- src/net/bdew/gendustry/items/GeneSample.scala | 17 +++++++- .../bdew/gendustry/items/GeneTemplate.scala | 41 ++++++++++++++----- .../{ => misc}/CommandDumpAlleles.scala | 8 ++-- .../{ => misc}/CommandGiveSample.scala | 11 ++--- .../{ => misc}/CommandGiveTemplate.scala | 9 ++-- .../misc/GendustryCreativeTabs.scala | 21 ++++++++++ .../GeneticsCache.scala} | 6 +-- .../{ => misc}/ResourceListener.scala | 12 +++--- .../bdew/gendustry/nei/MutatronHandler.scala | 5 ++- .../gendustry/nei/NEIGendustryConfig.scala | 4 +- .../bdew/gendustry/nei/SamplerHandler.scala | 9 ++-- 18 files changed, 134 insertions(+), 58 deletions(-) rename src/net/bdew/gendustry/{ => misc}/CommandDumpAlleles.scala (92%) rename src/net/bdew/gendustry/{ => misc}/CommandGiveSample.scala (94%) rename src/net/bdew/gendustry/{ => misc}/CommandGiveTemplate.scala (87%) create mode 100644 src/net/bdew/gendustry/misc/GendustryCreativeTabs.scala rename src/net/bdew/gendustry/{nei/NEICache.scala => misc/GeneticsCache.scala} (98%) rename src/net/bdew/gendustry/{ => misc}/ResourceListener.scala (88%) diff --git a/build.gradle b/build.gradle index b084521..2c3c47a 100644 --- a/build.gradle +++ b/build.gradle @@ -68,9 +68,9 @@ dependencies { compile "codechicken:NotEnoughItems:1.7.10-1.0.2.15:dev" compile "codechicken:CodeChickenLib:1.7.10-1.1.1.88:dev" compile "com.mod-buildcraft:buildcraft:6.0.17:dev" - compile "net.industrial-craft:industrialcraft-2:2.2.509-experimental:api" + compile "net.industrial-craft:industrialcraft-2:2.2.541-experimental:api" compile "net.sengir.forestry:forestry_1.7.10:2.4.2.30:api" - compile("mcp.mobius.waila:Waila:1.5.3_1.7.10") + compile "mcp.mobius.waila:Waila:1.5.3_1.7.10" compile "net.bdew.thirdparty:CoFHLib:R1.0.1:api" } diff --git a/resources/assets/gendustry/lang/en_US.lang b/resources/assets/gendustry/lang/en_US.lang index 7357d2b..2a217c6 100644 --- a/resources/assets/gendustry/lang/en_US.lang +++ b/resources/assets/gendustry/lang/en_US.lang @@ -241,5 +241,9 @@ gendustry.honeydrop.magenta.name=Magenta Colored Honey Drop gendustry.honeydrop.orange.name=Orange Colored Honey Drop gendustry.honeydrop.white.name=White Colored Honey Drop +itemGroup.bdew.gendustry=Gendustry +itemGroup.bdew.templates=Genetic Templates +itemGroup.bdew.samples=Genetic Samples + #this will be moved to bdlib at some point bdlib.label.empty=Empty diff --git a/src/net/bdew/gendustry/Gendustry.scala b/src/net/bdew/gendustry/Gendustry.scala index bc174f1..60de8b0 100644 --- a/src/net/bdew/gendustry/Gendustry.scala +++ b/src/net/bdew/gendustry/Gendustry.scala @@ -9,26 +9,28 @@ package net.bdew.gendustry -import net.bdew.gendustry.config._ +import java.io.File + import cpw.mods.fml.common.Mod import cpw.mods.fml.common.Mod.EventHandler import cpw.mods.fml.common.event._ import cpw.mods.fml.common.network.NetworkRegistry -import java.io.File -import net.bdew.gendustry.machines.apiary.upgrades.Upgrades -import net.bdew.gendustry.compat.PowerProxy import cpw.mods.fml.relauncher.Side -import net.bdew.gendustry.gui.HintIcons -import net.bdew.gendustry.compat.triggers.TriggerProvider -import net.minecraft.command.CommandHandler -import net.bdew.gendustry.custom.CustomContent -import net.bdew.gendustry.config.loader.TuningLoader -import org.apache.logging.log4j.Logger -import net.minecraftforge.oredict.RecipeSorter -import net.bdew.gendustry.forestry.GeneRecipe import net.bdew.gendustry.api.GendustryAPI import net.bdew.gendustry.apiimpl.{BlockApiImpl, ItemApiImpl} +import net.bdew.gendustry.compat.PowerProxy import net.bdew.gendustry.compat.itempush.ItemPush +import net.bdew.gendustry.compat.triggers.TriggerProvider +import net.bdew.gendustry.config._ +import net.bdew.gendustry.config.loader.TuningLoader +import net.bdew.gendustry.custom.CustomContent +import net.bdew.gendustry.forestry.GeneRecipe +import net.bdew.gendustry.gui.HintIcons +import net.bdew.gendustry.machines.apiary.upgrades.Upgrades +import net.bdew.gendustry.misc._ +import net.minecraft.command.CommandHandler +import net.minecraftforge.oredict.RecipeSorter +import org.apache.logging.log4j.Logger @Mod(modid = Gendustry.modId, version = "GENDUSTRY_VER", name = "Gendustry", dependencies = "required-after:Forestry@[2.4.0.0,);after:BuildCraft|energy;after:BuildCraft|Silicon;after:IC2;after:CoFHCore;after:BinnieCore;after:ExtraBees;after:ExtraTrees;after:MineFactoryReloaded;required-after:bdlib@[BDLIB_VER,)", modLanguage = "scala") object Gendustry { @@ -83,6 +85,10 @@ object Gendustry { def postInit(event: FMLPostInitializationEvent) { CustomContent.registerTemplates() CustomContent.registerMuations() + if (event.getSide == Side.CLIENT) { + GeneticsCache.load() + GendustryCreativeTabs.init() + } } @EventHandler diff --git a/src/net/bdew/gendustry/config/Blocks.scala b/src/net/bdew/gendustry/config/Blocks.scala index 3fe5fcd..ef64700 100644 --- a/src/net/bdew/gendustry/config/Blocks.scala +++ b/src/net/bdew/gendustry/config/Blocks.scala @@ -9,9 +9,10 @@ package net.bdew.gendustry.config +import net.bdew.gendustry.misc.GendustryCreativeTabs import net.bdew.lib.config.BlockManager import net.bdew.gendustry.Gendustry -object Blocks extends BlockManager { +object Blocks extends BlockManager(GendustryCreativeTabs.main) { Gendustry.logInfo("Blocks loaded") } \ No newline at end of file diff --git a/src/net/bdew/gendustry/config/Fluids.scala b/src/net/bdew/gendustry/config/Fluids.scala index 63f3295..a7448fb 100644 --- a/src/net/bdew/gendustry/config/Fluids.scala +++ b/src/net/bdew/gendustry/config/Fluids.scala @@ -9,6 +9,7 @@ package net.bdew.gendustry.config +import net.bdew.gendustry.misc.GendustryCreativeTabs import net.bdew.lib.config.FluidManager import net.bdew.gendustry.fluids.{ItemFluidCan, ItemFluidBucket, BlockFluid} import net.bdew.gendustry.Gendustry @@ -47,6 +48,7 @@ object Fluids extends FluidManager { if (fluid.getBlock == null) { val block = new BlockFluid(fluid, ownFluid) GameRegistry.registerBlock(block, "fluid." + id) + block.setCreativeTab(GendustryCreativeTabs.main) fluid.setBlock(block) } if (FluidContainerRegistry.fillFluidContainer(new FluidStack(fluid, 1000), emptyBucket) == null) { diff --git a/src/net/bdew/gendustry/config/Items.scala b/src/net/bdew/gendustry/config/Items.scala index e04db7d..9953b84 100644 --- a/src/net/bdew/gendustry/config/Items.scala +++ b/src/net/bdew/gendustry/config/Items.scala @@ -11,11 +11,12 @@ package net.bdew.gendustry.config import net.bdew.gendustry.items._ import net.bdew.gendustry.machines.apiary.upgrades.ItemApiaryUpgrade +import net.bdew.gendustry.misc.GendustryCreativeTabs import net.bdew.lib.config.ItemManager import net.bdew.gendustry.Gendustry import net.bdew.gendustry.custom.{CustomHoneyDrop, CustomHoneyComb} -object Items extends ItemManager { +object Items extends ItemManager(GendustryCreativeTabs.main) { val labware = regSimpleItem("Labware") val waste = regSimpleItem("Waste") val geneSampleBlank = regSimpleItem("GeneSampleBlank") diff --git a/src/net/bdew/gendustry/config/Machines.scala b/src/net/bdew/gendustry/config/Machines.scala index bc97e0d..56508be 100644 --- a/src/net/bdew/gendustry/config/Machines.scala +++ b/src/net/bdew/gendustry/config/Machines.scala @@ -14,6 +14,7 @@ import net.bdew.gendustry.machines.mutatron.MachineMutatron import net.bdew.gendustry.machines.apiary.MachineApiary import net.bdew.gendustry.machines.imprinter.MachineImprinter import net.bdew.gendustry.machines.sampler.MachineSampler +import net.bdew.gendustry.misc.GendustryCreativeTabs import net.bdew.lib.config.MachineManager import net.bdew.gendustry.Gendustry import net.bdew.gendustry.machines.advmutatron.MachineMutatronAdv @@ -22,7 +23,7 @@ import net.bdew.gendustry.machines.extractor.MachineExtractor import net.bdew.gendustry.machines.transposer.MachineTransposer import net.bdew.gendustry.machines.replicator.MachineReplicator -object Machines extends MachineManager(Tuning.getSection("Machines"), Config.guiHandler) { +object Machines extends MachineManager(Tuning.getSection("Machines"), Config.guiHandler, GendustryCreativeTabs.main) { registerMachine(MachineMutagenProducer) registerMachine(MachineMutatron) registerMachine(MachineApiary) diff --git a/src/net/bdew/gendustry/items/GeneSample.scala b/src/net/bdew/gendustry/items/GeneSample.scala index ba9f477..f7e7a53 100644 --- a/src/net/bdew/gendustry/items/GeneSample.scala +++ b/src/net/bdew/gendustry/items/GeneSample.scala @@ -9,7 +9,9 @@ package net.bdew.gendustry.items -import net.minecraft.item.ItemStack +import net.bdew.gendustry.misc.{GeneticsCache, GendustryCreativeTabs} +import net.minecraft.creativetab.CreativeTabs +import net.minecraft.item.{Item, ItemStack} import net.minecraft.nbt.NBTTagCompound import net.minecraft.entity.player.EntityPlayer import java.util @@ -23,6 +25,19 @@ object GeneSample extends SimpleItem("GeneSample") { setMaxStackSize(1) setContainerItem(Items.geneSampleBlank) + override def getCreativeTabs = Array(GendustryCreativeTabs.main, GendustryCreativeTabs.samples) + + override def getSubItems(item: Item, tab: CreativeTabs, list: util.List[_]) { + import scala.collection.JavaConversions._ + val l = list.asInstanceOf[util.List[ItemStack]] + tab match { + case GendustryCreativeTabs.main => l.add(new ItemStack(this)) + case GendustryCreativeTabs.samples => + l.addAll(GeneticsCache.geneSamples map newStack) + case _ => + } + } + def newStack(info: GeneSampleInfo): ItemStack = { val stack = new ItemStack(this) val tag = new NBTTagCompound() diff --git a/src/net/bdew/gendustry/items/GeneTemplate.scala b/src/net/bdew/gendustry/items/GeneTemplate.scala index 053363d..23d7c64 100644 --- a/src/net/bdew/gendustry/items/GeneTemplate.scala +++ b/src/net/bdew/gendustry/items/GeneTemplate.scala @@ -9,20 +9,23 @@ package net.bdew.gendustry.items -import net.minecraft.item.ItemStack -import net.bdew.gendustry.forestry.{GeneRecipe, GeneSampleInfo} -import net.bdew.lib.{Client, Misc} -import net.minecraft.nbt.{NBTTagList, NBTTagCompound} -import net.minecraft.entity.player.EntityPlayer import java.util + import cpw.mods.fml.common.registry.GameRegistry -import forestry.api.genetics.{ISpeciesRoot, AlleleManager} -import net.bdew.lib.items.SimpleItem -import forestry.api.apiculture.{IBeeRoot, EnumBeeChromosome} -import forestry.api.arboriculture.{ITreeRoot, EnumTreeChromosome} -import forestry.api.lepidopterology.{IButterflyRoot, EnumButterflyChromosome} -import net.minecraft.util.EnumChatFormatting +import forestry.api.apiculture.{EnumBeeChromosome, IBeeRoot} +import forestry.api.arboriculture.{EnumTreeChromosome, ITreeRoot} +import forestry.api.genetics.{AlleleManager, IAlleleSpecies, ISpeciesRoot} +import forestry.api.lepidopterology.{EnumButterflyChromosome, IButterflyRoot} import net.bdew.gendustry.Gendustry +import net.bdew.gendustry.forestry.{GeneRecipe, GeneSampleInfo, GeneticsHelper} +import net.bdew.gendustry.misc.GendustryCreativeTabs +import net.bdew.lib.items.SimpleItem +import net.bdew.lib.{Client, Misc} +import net.minecraft.creativetab.CreativeTabs +import net.minecraft.entity.player.EntityPlayer +import net.minecraft.item.{Item, ItemStack} +import net.minecraft.nbt.{NBTTagCompound, NBTTagList} +import net.minecraft.util.EnumChatFormatting object GeneTemplate extends SimpleItem("GeneTemplate") { setMaxStackSize(1) @@ -32,6 +35,22 @@ object GeneTemplate extends SimpleItem("GeneTemplate") { GameRegistry.addRecipe(new GeneRecipe) + override def getCreativeTabs = Array(GendustryCreativeTabs.main, GendustryCreativeTabs.templates) + + override def getSubItems(item: Item, tab: CreativeTabs, list: util.List[_]) { + import scala.collection.JavaConversions._ + val l = list.asInstanceOf[util.List[ItemStack]] + tab match { + case GendustryCreativeTabs.main => l.add(new ItemStack(this)) + case GendustryCreativeTabs.templates => + l.addAll( + Misc.filterType(AlleleManager.alleleRegistry.getRegisteredAlleles.values(), classOf[IAlleleSpecies]) + .toList.sortBy(_.getUID) + .map(sp => GeneticsHelper.templateFromSpeciesUID(sp.getUID))) + case _ => + } + } + def getRequiredChromosomes(sp: ISpeciesRoot) = sp match { case x: IBeeRoot => EnumBeeChromosome.values().filterNot(unusedBeeChromosomes.contains).map(_.ordinal()) diff --git a/src/net/bdew/gendustry/CommandDumpAlleles.scala b/src/net/bdew/gendustry/misc/CommandDumpAlleles.scala similarity index 92% rename from src/net/bdew/gendustry/CommandDumpAlleles.scala rename to src/net/bdew/gendustry/misc/CommandDumpAlleles.scala index 132ea30..daf2f99 100644 --- a/src/net/bdew/gendustry/CommandDumpAlleles.scala +++ b/src/net/bdew/gendustry/misc/CommandDumpAlleles.scala @@ -7,12 +7,14 @@ * https://raw.github.com/bdew/gendustry/master/MMPL-1.0.txt */ -package net.bdew.gendustry +package net.bdew.gendustry.misc + +import java.io.{BufferedWriter, File, FileWriter} import _root_.forestry.api.genetics.AlleleManager -import net.minecraft.command.{CommandBase, ICommandSender} import cpw.mods.fml.relauncher.FMLInjectionData -import java.io.{FileWriter, BufferedWriter, File} +import net.bdew.gendustry.Gendustry +import net.minecraft.command.{CommandBase, ICommandSender} class CommandDumpAlleles extends CommandBase { def getCommandName = "dumpalleles" diff --git a/src/net/bdew/gendustry/CommandGiveSample.scala b/src/net/bdew/gendustry/misc/CommandGiveSample.scala similarity index 94% rename from src/net/bdew/gendustry/CommandGiveSample.scala rename to src/net/bdew/gendustry/misc/CommandGiveSample.scala index b4d4d27..cc00380 100644 --- a/src/net/bdew/gendustry/CommandGiveSample.scala +++ b/src/net/bdew/gendustry/misc/CommandGiveSample.scala @@ -7,16 +7,17 @@ * https://raw.github.com/bdew/gendustry/master/MMPL-1.0.txt */ -package net.bdew.gendustry +package net.bdew.gendustry.misc + +import java.util.List import _root_.forestry.api.apiculture.{EnumBeeChromosome, IBeeRoot} -import _root_.forestry.api.arboriculture.{ITreeRoot, EnumTreeChromosome} -import _root_.forestry.api.genetics.{IAllele, ISpeciesRoot, AlleleManager} +import _root_.forestry.api.arboriculture.{EnumTreeChromosome, ITreeRoot} +import _root_.forestry.api.genetics.{AlleleManager, IAllele, ISpeciesRoot} import _root_.forestry.api.lepidopterology.{EnumButterflyChromosome, IButterflyRoot} -import net.minecraft.command.{CommandException, CommandBase, ICommandSender, WrongUsageException} -import java.util.List import net.bdew.gendustry.forestry.GeneSampleInfo import net.bdew.gendustry.items.GeneSample +import net.minecraft.command.{CommandBase, CommandException, ICommandSender, WrongUsageException} class CommandGiveSample extends CommandBase { def getCommandName = "givesample" diff --git a/src/net/bdew/gendustry/CommandGiveTemplate.scala b/src/net/bdew/gendustry/misc/CommandGiveTemplate.scala similarity index 87% rename from src/net/bdew/gendustry/CommandGiveTemplate.scala rename to src/net/bdew/gendustry/misc/CommandGiveTemplate.scala index 68075b6..fb1a76c 100644 --- a/src/net/bdew/gendustry/CommandGiveTemplate.scala +++ b/src/net/bdew/gendustry/misc/CommandGiveTemplate.scala @@ -7,14 +7,13 @@ * https://raw.github.com/bdew/gendustry/master/MMPL-1.0.txt */ -package net.bdew.gendustry +package net.bdew.gendustry.misc -import _root_.forestry.api.genetics.{IAlleleSpecies, AlleleManager} -import net.minecraft.command.CommandBase -import net.minecraft.command.ICommandSender -import net.minecraft.command.WrongUsageException import java.util.List + +import _root_.forestry.api.genetics.{AlleleManager, IAlleleSpecies} import net.bdew.gendustry.forestry.GeneticsHelper +import net.minecraft.command.{CommandBase, ICommandSender, WrongUsageException} class CommandGiveTemplate extends CommandBase { def getCommandName = "givetemplate" diff --git a/src/net/bdew/gendustry/misc/GendustryCreativeTabs.scala b/src/net/bdew/gendustry/misc/GendustryCreativeTabs.scala new file mode 100644 index 0000000..983ad9c --- /dev/null +++ b/src/net/bdew/gendustry/misc/GendustryCreativeTabs.scala @@ -0,0 +1,21 @@ +/* + * Copyright (c) bdew, 2013 - 2014 + * https://github.com/bdew/gendustry + * + * This mod is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * https://raw.github.com/bdew/gendustry/master/MMPL-1.0.txt + */ + +package net.bdew.gendustry.misc + +import net.bdew.gendustry.items.{GeneSample, GeneTemplate} +import net.bdew.gendustry.machines.apiary.BlockApiary +import net.bdew.lib.CreativeTabContainer +import net.minecraft.item.Item + +object GendustryCreativeTabs extends CreativeTabContainer { + val main = new Tab("bdew.gendustry", Item.getItemFromBlock(BlockApiary)) + val samples = new Tab("bdew.samples", GeneSample) + val templates = new Tab("bdew.templates", GeneTemplate) +} diff --git a/src/net/bdew/gendustry/nei/NEICache.scala b/src/net/bdew/gendustry/misc/GeneticsCache.scala similarity index 98% rename from src/net/bdew/gendustry/nei/NEICache.scala rename to src/net/bdew/gendustry/misc/GeneticsCache.scala index c29d0c5..6a9d661 100644 --- a/src/net/bdew/gendustry/nei/NEICache.scala +++ b/src/net/bdew/gendustry/misc/GeneticsCache.scala @@ -7,14 +7,14 @@ * https://raw.github.com/bdew/gendustry/master/MMPL-1.0.txt */ -package net.bdew.gendustry.nei +package net.bdew.gendustry.misc import forestry.api.genetics._ -import net.bdew.lib.Misc import net.bdew.gendustry.Gendustry import net.bdew.gendustry.forestry.GeneSampleInfo +import net.bdew.lib.Misc -object NEICache { +object GeneticsCache { implicit object MutationOrdering extends Ordering[IMutation] { def compare(x: IMutation, y: IMutation): Int = diff --git a/src/net/bdew/gendustry/ResourceListener.scala b/src/net/bdew/gendustry/misc/ResourceListener.scala similarity index 88% rename from src/net/bdew/gendustry/ResourceListener.scala rename to src/net/bdew/gendustry/misc/ResourceListener.scala index 2b6fdf2..677b852 100644 --- a/src/net/bdew/gendustry/ResourceListener.scala +++ b/src/net/bdew/gendustry/misc/ResourceListener.scala @@ -7,13 +7,15 @@ * https://raw.github.com/bdew/gendustry/master/MMPL-1.0.txt */ -package net.bdew.gendustry +package net.bdew.gendustry.misc -import net.bdew.lib.Client -import cpw.mods.fml.client.FMLClientHandler -import net.minecraft.util.StringTranslate import java.io.{File, FileInputStream} -import net.minecraft.client.resources.{IResourceManager, IResourceManagerReloadListener, IReloadableResourceManager} + +import cpw.mods.fml.client.FMLClientHandler +import net.bdew.gendustry.Gendustry +import net.bdew.lib.Client +import net.minecraft.client.resources.{IReloadableResourceManager, IResourceManager, IResourceManagerReloadListener} +import net.minecraft.util.StringTranslate object ResourceListener extends IResourceManagerReloadListener { def init() { diff --git a/src/net/bdew/gendustry/nei/MutatronHandler.scala b/src/net/bdew/gendustry/nei/MutatronHandler.scala index 77234b6..9c5efb5 100644 --- a/src/net/bdew/gendustry/nei/MutatronHandler.scala +++ b/src/net/bdew/gendustry/nei/MutatronHandler.scala @@ -9,6 +9,7 @@ package net.bdew.gendustry.nei +import net.bdew.gendustry.misc.GeneticsCache import net.bdew.lib.gui.Rect import net.bdew.gendustry.config.{Fluids, Items} import net.minecraftforge.fluids.FluidStack @@ -81,7 +82,7 @@ class MutatronHandler extends BaseRecipeHandler(5, 13) { case ("item", Seq(x: ItemStack)) => val individual = AlleleManager.alleleRegistry.getIndividual(x) if (individual != null) { - for (mutation <- NEICache.speciesUsedMutations(individual.getGenome.getPrimary)) + for (mutation <- GeneticsCache.speciesUsedMutations(individual.getGenome.getPrimary)) arecipes.add(new MutatronRecipe(mutation)) } case ("Mutatron", _) => addAllRecipes() @@ -93,7 +94,7 @@ class MutatronHandler extends BaseRecipeHandler(5, 13) { case ("item", Seq(x: ItemStack)) => val individual = AlleleManager.alleleRegistry.getIndividual(x) if (individual != null) { - for (mutation <- NEICache.speciesResultMutations(individual.getGenome.getPrimary)) + for (mutation <- GeneticsCache.speciesResultMutations(individual.getGenome.getPrimary)) arecipes.add(new MutatronRecipe(mutation)) } case ("Mutatron", _) => addAllRecipes() diff --git a/src/net/bdew/gendustry/nei/NEIGendustryConfig.scala b/src/net/bdew/gendustry/nei/NEIGendustryConfig.scala index 30610d4..b78433f 100644 --- a/src/net/bdew/gendustry/nei/NEIGendustryConfig.scala +++ b/src/net/bdew/gendustry/nei/NEIGendustryConfig.scala @@ -24,6 +24,7 @@ import net.bdew.gendustry.machines.liquifier.MachineLiquifier import net.bdew.gendustry.machines.replicator.MachineReplicator import net.bdew.gendustry.machines.transposer.MachineTransposer import codechicken.nei.guihook.GuiContainerManager +import net.bdew.gendustry.misc.GeneticsCache class NEIGendustryConfig extends IConfigureNEI { def getName: String = "Gendustry" @@ -35,9 +36,8 @@ class NEIGendustryConfig extends IConfigureNEI { } def loadConfig() { - NEICache.load() if (Config.neiAddSamples) - NEICache.geneSamples.foreach(x => API.addItemListEntry(GeneSample.newStack(x))) // TODO: is this right? + GeneticsCache.geneSamples.foreach(x => API.addItemListEntry(GeneSample.newStack(x))) // TODO: is this right? addRecipeHandler(new TemplateCraftingHandler) diff --git a/src/net/bdew/gendustry/nei/SamplerHandler.scala b/src/net/bdew/gendustry/nei/SamplerHandler.scala index 249539e..ec7e7ac 100644 --- a/src/net/bdew/gendustry/nei/SamplerHandler.scala +++ b/src/net/bdew/gendustry/nei/SamplerHandler.scala @@ -9,6 +9,7 @@ package net.bdew.gendustry.nei +import net.bdew.gendustry.misc.GeneticsCache import net.bdew.lib.gui.Rect import net.bdew.gendustry.config.Items import net.bdew.gendustry.nei.helpers.PowerComponent @@ -32,7 +33,7 @@ class SamplerHandler extends BaseRecipeHandler(5, 13) { val mjRect = new Rect(8, 19, 16, 58) import scala.collection.JavaConversions._ - import NEICache.SampleOrdering + import GeneticsCache.SampleOrdering class SamplerRecipe(sample: GeneSampleInfo, input: ItemStack) extends CachedRecipeWithComponents { val getResult = position(GeneSample.newStack(sample), 137, 49) @@ -63,11 +64,11 @@ class SamplerHandler extends BaseRecipeHandler(5, 13) { } def addAllRecipes() { - for (info <- NEICache.geneSamples; species <- NEICache.speciesChromosomes(info)) { + for (info <- GeneticsCache.geneSamples; species <- GeneticsCache.speciesChromosomes(info)) { arecipes.add(new SamplerRecipe(info, getRecipeStack(species))) } if (MachineSampler.convertEBSerums && ExtraBeesProxy.ebLoaded) { - for (sample <- NEICache.geneSamples if sample.root.isInstanceOf[IBeeRoot]) { + for (sample <- GeneticsCache.geneSamples if sample.root.isInstanceOf[IBeeRoot]) { val serum = ExtraBeesProxy.makeSerumFromSample(sample) if (serum != null) arecipes.add(new SamplerRecipe(sample, serum)) } @@ -106,7 +107,7 @@ class SamplerHandler extends BaseRecipeHandler(5, 13) { if (info == null) { addAllRecipes() } else { - for (species <- NEICache.speciesChromosomes(info)) { + for (species <- GeneticsCache.speciesChromosomes(info)) { arecipes.add(new SamplerRecipe(info, getRecipeStack(species))) } if (MachineSampler.convertEBSerums && ExtraBeesProxy.ebLoaded) {