From c68c67d74f39c3eb075ac29e88936a1976ef089b Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Wed, 20 Jan 2016 16:38:33 +1000 Subject: Removing shit from Binnies packages. --- src/Java/binnie/Binnie.java | 11 +- src/Java/binnie/core/BinnieCore.java | 43 +- .../binnie/core/genetics/BeeBreedingSystem.java | 125 --- .../binnie/core/genetics/BeeModifierLogic.java | 47 - src/Java/binnie/core/genetics/BreedingSystem.java | 558 ---------- .../core/genetics/EnumBeeBooleanModifier.java | 8 - src/Java/binnie/core/genetics/EnumBeeModifier.java | 17 - .../binnie/core/genetics/FlowerBreedingSystem.java | 129 --- src/Java/binnie/core/genetics/ForestryAllele.java | 211 ---- src/Java/binnie/core/genetics/Gene.java | 128 --- src/Java/binnie/core/genetics/IAlleleProvider.java | 8 - .../binnie/core/genetics/IBreedingMessage.java | 124 --- .../core/genetics/IItemStackRepresentitive.java | 8 - src/Java/binnie/core/genetics/ManagerGenetics.java | 298 ----- .../binnie/core/genetics/MothBreedingSystem.java | 138 --- src/Java/binnie/core/genetics/Tolerance.java | 48 - .../binnie/core/genetics/TreeBreedingSystem.java | 303 ------ .../binnie/core/genetics/VirtualBeeHousing.java | 111 -- src/Java/binnie/core/genetics/VirtualHousing.java | 98 -- .../binnie/core/genetics/VirtualMothHousing.java | 33 - src/Java/binnie/core/item/ModuleItems.java | 75 -- src/Java/binnie/core/liquid/BinnieFluid.java | 32 - src/Java/binnie/core/liquid/FluidContainer.java | 95 -- src/Java/binnie/core/liquid/IFluidType.java | 28 - src/Java/binnie/core/liquid/ILiquidType.java | 7 - .../binnie/core/liquid/ItemFluidContainer.java | 179 --- src/Java/binnie/core/liquid/ManagerLiquid.java | 80 -- src/Java/binnie/core/machines/BlockMachine.java | 13 +- src/Java/binnie/core/machines/Machine.java | 34 +- .../binnie/core/machines/TileEntityMachine.java | 7 +- .../binnie/core/machines/base/DefaultPower.java | 13 +- .../core/machines/base/TileEntityMachineBase.java | 22 +- .../machines/inventory/ComponentChargedSlots.java | 12 +- .../inventory/ComponentInventoryTransfer.java | 21 +- .../core/machines/inventory/SlotValidator.java | 8 +- .../core/machines/inventory/TankValidator.java | 33 - .../machines/power/ComponentPowerReceptor.java | 36 +- .../machines/power/ComponentProcessIndefinate.java | 5 +- .../binnie/core/machines/power/ErrorState.java | 20 +- .../core/machines/power/IPoweredMachine.java | 4 +- .../binnie/core/machines/storage/Compartment.java | 9 +- .../machines/storage/ComponentBinnieCoreGUI.java | 7 +- .../storage/ComponentCompartmentInventory.java | 10 +- .../craftgui/botany/ControlColourDisplay.java | 47 - .../craftgui/botany/ControlColourMixBox.java | 31 - .../craftgui/botany/ControlColourMixItem.java | 37 - .../craftgui/botany/ControlColourMixSymbol.java | 58 - .../craftgui/botany/ControlColourOption.java | 38 - src/Java/binnie/craftgui/botany/PageColourMix.java | 40 - .../craftgui/botany/PageColourMixResultant.java | 40 - .../craftgui/botany/PageSpeciesFlowerGenome.java | 137 --- .../craftgui/botany/WindowBotanistDatabase.java | 103 -- .../dictionary/ControlBlockIconDisplay.java | 25 - .../dictionary/ControlBreweryProgress.java | 115 -- .../dictionary/ControlDistilleryProgress.java | 104 -- .../dictionary/ControlFruitPressProgress.java | 90 -- .../dictionary/ControlLumbermillProgress.java | 96 -- .../extratrees/dictionary/ControlRecipeSlot.java | 42 - .../extratrees/dictionary/ControlTileSelect.java | 197 ---- .../extratrees/dictionary/DialogBreweryRecipe.java | 17 - .../craftgui/extratrees/dictionary/PageFruit.java | 47 - .../extratrees/dictionary/PagePlanksOverview.java | 103 -- .../extratrees/dictionary/PagePlanksTrees.java | 40 - .../extratrees/dictionary/PageSpeciesImage.java | 31 - .../dictionary/PageSpeciesTreeGenome.java | 175 --- .../craftgui/extratrees/dictionary/PageWood.java | 40 - .../dictionary/WindowArboristDatabase.java | 133 --- .../extratrees/dictionary/WindowBrewery.java | 61 -- .../extratrees/dictionary/WindowDistillery.java | 59 - .../dictionary/WindowLepidopteristDatabase.java | 57 - .../extratrees/dictionary/WindowLumbermill.java | 56 - .../extratrees/dictionary/WindowPress.java | 77 -- .../extratrees/dictionary/WindowSetSquare.java | 35 - .../extratrees/dictionary/WindowWoodworker.java | 110 -- .../extratrees/kitchen/ControlDropDownMenu.java | 18 - .../extratrees/kitchen/ControlDropdownButton.java | 36 - .../extratrees/kitchen/ControlFluidDisplay.java | 103 -- .../extratrees/kitchen/ControlSlotFluid.java | 77 -- .../extratrees/kitchen/ControlSlotGlassware.java | 35 - .../extratrees/kitchen/ControlTankSlot.java | 49 - .../extratrees/kitchen/WindowBottleRack.java | 48 - .../craftgui/genetics/machine/ControlGene.java | 101 -- .../genetics/machine/ControlGeneScroll.java | 97 -- .../genetics/machine/ControlProcessTemporary.java | 27 - .../genetics/machine/ControlSequencerProgress.java | 64 -- .../genetics/machine/ControlSplicerProgress.java | 60 -- .../genetics/machine/WindowAcclimatiser.java | 80 -- .../craftgui/genetics/machine/WindowAnalyser.java | 110 -- .../craftgui/genetics/machine/WindowGeneBank.java | 256 ----- .../genetics/machine/WindowGeneBankNEI.java | 14 - .../genetics/machine/WindowGeneProject.java | 32 - .../craftgui/genetics/machine/WindowGenepool.java | 96 -- .../genetics/machine/WindowGenomeAssembler.java | 37 - .../craftgui/genetics/machine/WindowIncubator.java | 99 -- .../genetics/machine/WindowInoculator.java | 107 -- .../craftgui/genetics/machine/WindowIsolator.java | 116 -- .../craftgui/genetics/machine/WindowMachine.java | 22 - .../genetics/machine/WindowPolymeriser.java | 101 -- .../craftgui/genetics/machine/WindowSequencer.java | 116 -- .../craftgui/genetics/machine/WindowSplicer.java | 93 -- .../extrabees/genetics/ExtraBeeMutation.java | 478 -------- .../binnie/extrabees/genetics/ExtraBeesBranch.java | 313 ------ .../extrabees/genetics/ExtraBeesFlowers.java | 202 ---- .../extrabees/genetics/ExtraBeesSpecies.java | 1139 -------------------- .../binnie/extrabees/genetics/ModuleGenetics.java | 88 -- .../extrabees/genetics/effect/BlockEctoplasm.java | 42 - .../genetics/effect/EntityBeeLightning.java | 68 -- .../extrabees/genetics/effect/ExtraBeesEffect.java | 585 ---------- .../extrabees/genetics/effect/FireworkCreator.java | 83 -- .../extrabees/genetics/items/ItemDictionary.java | 73 -- .../genetics/items/ItemPunnettSquare.java | 41 - .../extrabees/gui/database/ControlBiomes.java | 75 -- .../extrabees/gui/database/ControlClimateBar.java | 153 --- .../extrabees/gui/database/ControlProductsBox.java | 92 -- .../gui/database/ControlProductsItem.java | 44 - .../extrabees/gui/database/PageSpeciesClimate.java | 36 - .../extrabees/gui/database/PageSpeciesGenome.java | 206 ---- .../gui/database/PageSpeciesProducts.java | 38 - .../gui/database/WindowApiaristDatabase.java | 83 -- .../extrabees/gui/punnett/ControlChromosome.java | 49 - .../extrabees/gui/punnett/ControlPunnett.java | 86 -- .../extrabees/gui/punnett/ExtraBeeGUITexture.java | 8 - .../extrabees/gui/punnett/WindowPunnettSquare.java | 67 -- .../binnie/extrabees/products/EnumHoneyComb.java | 109 -- .../binnie/extrabees/products/EnumHoneyDrop.java | 72 -- .../binnie/extrabees/products/EnumPropolis.java | 65 -- .../binnie/extrabees/products/ItemHoneyComb.java | 335 ------ .../extrabees/products/ItemHoneyCrystal.java | 51 - .../extrabees/products/ItemHoneyCrystalEmpty.java | 30 - .../binnie/extrabees/products/ItemHoneyDrop.java | 55 - .../binnie/extrabees/products/ItemProduct.java | 44 - .../binnie/extrabees/products/ItemPropolis.java | 35 - .../binnie/extrabees/products/ModuleProducts.java | 43 - .../extrabees/worldgen/BlockExtraBeeHive.java | 109 -- .../binnie/extrabees/worldgen/EnumHiveType.java | 14 - src/Java/binnie/extrabees/worldgen/HiveDrop.java | 65 -- .../binnie/extrabees/worldgen/ItemBeehive.java | 37 - .../binnie/extrabees/worldgen/MaterialBeehive.java | 20 - .../extrabees/worldgen/ModuleGeneration.java | 85 -- .../extrabees/worldgen/WorldGenHiveNether.java | 33 - .../extrabees/worldgen/WorldGenHiveRock.java | 27 - .../extrabees/worldgen/WorldGenHiveWater.java | 31 - 142 files changed, 114 insertions(+), 12626 deletions(-) delete mode 100644 src/Java/binnie/core/genetics/BeeBreedingSystem.java delete mode 100644 src/Java/binnie/core/genetics/BeeModifierLogic.java delete mode 100644 src/Java/binnie/core/genetics/BreedingSystem.java delete mode 100644 src/Java/binnie/core/genetics/EnumBeeBooleanModifier.java delete mode 100644 src/Java/binnie/core/genetics/EnumBeeModifier.java delete mode 100644 src/Java/binnie/core/genetics/FlowerBreedingSystem.java delete mode 100644 src/Java/binnie/core/genetics/ForestryAllele.java delete mode 100644 src/Java/binnie/core/genetics/Gene.java delete mode 100644 src/Java/binnie/core/genetics/IAlleleProvider.java delete mode 100644 src/Java/binnie/core/genetics/IBreedingMessage.java delete mode 100644 src/Java/binnie/core/genetics/IItemStackRepresentitive.java delete mode 100644 src/Java/binnie/core/genetics/ManagerGenetics.java delete mode 100644 src/Java/binnie/core/genetics/MothBreedingSystem.java delete mode 100644 src/Java/binnie/core/genetics/Tolerance.java delete mode 100644 src/Java/binnie/core/genetics/TreeBreedingSystem.java delete mode 100644 src/Java/binnie/core/genetics/VirtualBeeHousing.java delete mode 100644 src/Java/binnie/core/genetics/VirtualHousing.java delete mode 100644 src/Java/binnie/core/genetics/VirtualMothHousing.java delete mode 100644 src/Java/binnie/core/item/ModuleItems.java delete mode 100644 src/Java/binnie/core/liquid/BinnieFluid.java delete mode 100644 src/Java/binnie/core/liquid/FluidContainer.java delete mode 100644 src/Java/binnie/core/liquid/IFluidType.java delete mode 100644 src/Java/binnie/core/liquid/ILiquidType.java delete mode 100644 src/Java/binnie/core/liquid/ItemFluidContainer.java delete mode 100644 src/Java/binnie/core/liquid/ManagerLiquid.java delete mode 100644 src/Java/binnie/core/machines/inventory/TankValidator.java delete mode 100644 src/Java/binnie/craftgui/botany/ControlColourDisplay.java delete mode 100644 src/Java/binnie/craftgui/botany/ControlColourMixBox.java delete mode 100644 src/Java/binnie/craftgui/botany/ControlColourMixItem.java delete mode 100644 src/Java/binnie/craftgui/botany/ControlColourMixSymbol.java delete mode 100644 src/Java/binnie/craftgui/botany/ControlColourOption.java delete mode 100644 src/Java/binnie/craftgui/botany/PageColourMix.java delete mode 100644 src/Java/binnie/craftgui/botany/PageColourMixResultant.java delete mode 100644 src/Java/binnie/craftgui/botany/PageSpeciesFlowerGenome.java delete mode 100644 src/Java/binnie/craftgui/botany/WindowBotanistDatabase.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/ControlBlockIconDisplay.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/ControlBreweryProgress.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/ControlDistilleryProgress.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/ControlFruitPressProgress.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/ControlLumbermillProgress.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/ControlRecipeSlot.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/ControlTileSelect.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/DialogBreweryRecipe.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/PageFruit.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/PagePlanksOverview.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/PagePlanksTrees.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/PageSpeciesImage.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/PageSpeciesTreeGenome.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/PageWood.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/WindowArboristDatabase.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/WindowBrewery.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/WindowDistillery.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/WindowLepidopteristDatabase.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/WindowLumbermill.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/WindowPress.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/WindowSetSquare.java delete mode 100644 src/Java/binnie/craftgui/extratrees/dictionary/WindowWoodworker.java delete mode 100644 src/Java/binnie/craftgui/extratrees/kitchen/ControlDropDownMenu.java delete mode 100644 src/Java/binnie/craftgui/extratrees/kitchen/ControlDropdownButton.java delete mode 100644 src/Java/binnie/craftgui/extratrees/kitchen/ControlFluidDisplay.java delete mode 100644 src/Java/binnie/craftgui/extratrees/kitchen/ControlSlotFluid.java delete mode 100644 src/Java/binnie/craftgui/extratrees/kitchen/ControlSlotGlassware.java delete mode 100644 src/Java/binnie/craftgui/extratrees/kitchen/ControlTankSlot.java delete mode 100644 src/Java/binnie/craftgui/extratrees/kitchen/WindowBottleRack.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/ControlGene.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/ControlGeneScroll.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/ControlProcessTemporary.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/ControlSequencerProgress.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/ControlSplicerProgress.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/WindowAcclimatiser.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/WindowAnalyser.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/WindowGeneBank.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/WindowGeneBankNEI.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/WindowGeneProject.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/WindowGenepool.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/WindowGenomeAssembler.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/WindowIncubator.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/WindowInoculator.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/WindowIsolator.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/WindowMachine.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/WindowPolymeriser.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/WindowSequencer.java delete mode 100644 src/Java/binnie/craftgui/genetics/machine/WindowSplicer.java delete mode 100644 src/Java/binnie/extrabees/genetics/ExtraBeeMutation.java delete mode 100644 src/Java/binnie/extrabees/genetics/ExtraBeesBranch.java delete mode 100644 src/Java/binnie/extrabees/genetics/ExtraBeesFlowers.java delete mode 100644 src/Java/binnie/extrabees/genetics/ExtraBeesSpecies.java delete mode 100644 src/Java/binnie/extrabees/genetics/ModuleGenetics.java delete mode 100644 src/Java/binnie/extrabees/genetics/effect/BlockEctoplasm.java delete mode 100644 src/Java/binnie/extrabees/genetics/effect/EntityBeeLightning.java delete mode 100644 src/Java/binnie/extrabees/genetics/effect/ExtraBeesEffect.java delete mode 100644 src/Java/binnie/extrabees/genetics/effect/FireworkCreator.java delete mode 100644 src/Java/binnie/extrabees/genetics/items/ItemDictionary.java delete mode 100644 src/Java/binnie/extrabees/genetics/items/ItemPunnettSquare.java delete mode 100644 src/Java/binnie/extrabees/gui/database/ControlBiomes.java delete mode 100644 src/Java/binnie/extrabees/gui/database/ControlClimateBar.java delete mode 100644 src/Java/binnie/extrabees/gui/database/ControlProductsBox.java delete mode 100644 src/Java/binnie/extrabees/gui/database/ControlProductsItem.java delete mode 100644 src/Java/binnie/extrabees/gui/database/PageSpeciesClimate.java delete mode 100644 src/Java/binnie/extrabees/gui/database/PageSpeciesGenome.java delete mode 100644 src/Java/binnie/extrabees/gui/database/PageSpeciesProducts.java delete mode 100644 src/Java/binnie/extrabees/gui/database/WindowApiaristDatabase.java delete mode 100644 src/Java/binnie/extrabees/gui/punnett/ControlChromosome.java delete mode 100644 src/Java/binnie/extrabees/gui/punnett/ControlPunnett.java delete mode 100644 src/Java/binnie/extrabees/gui/punnett/ExtraBeeGUITexture.java delete mode 100644 src/Java/binnie/extrabees/gui/punnett/WindowPunnettSquare.java delete mode 100644 src/Java/binnie/extrabees/products/EnumHoneyComb.java delete mode 100644 src/Java/binnie/extrabees/products/EnumHoneyDrop.java delete mode 100644 src/Java/binnie/extrabees/products/EnumPropolis.java delete mode 100644 src/Java/binnie/extrabees/products/ItemHoneyComb.java delete mode 100644 src/Java/binnie/extrabees/products/ItemHoneyCrystal.java delete mode 100644 src/Java/binnie/extrabees/products/ItemHoneyCrystalEmpty.java delete mode 100644 src/Java/binnie/extrabees/products/ItemHoneyDrop.java delete mode 100644 src/Java/binnie/extrabees/products/ItemProduct.java delete mode 100644 src/Java/binnie/extrabees/products/ItemPropolis.java delete mode 100644 src/Java/binnie/extrabees/products/ModuleProducts.java delete mode 100644 src/Java/binnie/extrabees/worldgen/BlockExtraBeeHive.java delete mode 100644 src/Java/binnie/extrabees/worldgen/EnumHiveType.java delete mode 100644 src/Java/binnie/extrabees/worldgen/HiveDrop.java delete mode 100644 src/Java/binnie/extrabees/worldgen/ItemBeehive.java delete mode 100644 src/Java/binnie/extrabees/worldgen/MaterialBeehive.java delete mode 100644 src/Java/binnie/extrabees/worldgen/ModuleGeneration.java delete mode 100644 src/Java/binnie/extrabees/worldgen/WorldGenHiveNether.java delete mode 100644 src/Java/binnie/extrabees/worldgen/WorldGenHiveRock.java delete mode 100644 src/Java/binnie/extrabees/worldgen/WorldGenHiveWater.java (limited to 'src/Java/binnie') diff --git a/src/Java/binnie/Binnie.java b/src/Java/binnie/Binnie.java index a8bd664f1a..eb976368cd 100644 --- a/src/Java/binnie/Binnie.java +++ b/src/Java/binnie/Binnie.java @@ -1,23 +1,22 @@ package binnie; +import java.util.ArrayList; +import java.util.List; + import binnie.core.ManagerBase; -import binnie.core.genetics.ManagerGenetics; import binnie.core.item.ManagerItem; import binnie.core.language.ManagerLanguage; -import binnie.core.liquid.ManagerLiquid; import binnie.core.machines.ManagerMachine; import binnie.core.mod.config.ManagerConfig; import binnie.core.resource.ManagerResource; -import java.util.ArrayList; -import java.util.List; public final class Binnie { public static final List Managers = new ArrayList(); public static final ManagerLanguage Language = new ManagerLanguage(); - public static final ManagerGenetics Genetics = new ManagerGenetics(); + //public static final ManagerGenetics Genetics = new ManagerGenetics(); public static final ManagerConfig Configuration = new ManagerConfig(); - public static final ManagerLiquid Liquid = new ManagerLiquid(); + //public static final ManagerLiquid Liquid = new ManagerLiquid(); public static final ManagerMachine Machine = new ManagerMachine(); public static final ManagerItem Item = new ManagerItem(); public static final ManagerResource Resource = new ManagerResource(); diff --git a/src/Java/binnie/core/BinnieCore.java b/src/Java/binnie/core/BinnieCore.java index 6f1ce219ef..e2dbc502e3 100644 --- a/src/Java/binnie/core/BinnieCore.java +++ b/src/Java/binnie/core/BinnieCore.java @@ -1,5 +1,12 @@ package binnie.core; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraftforge.client.event.TextureStitchEvent; import binnie.Binnie; import binnie.core.block.MultipassBlockRenderer; import binnie.core.block.TileEntityMetadata; @@ -8,15 +15,10 @@ import binnie.core.gui.BinnieGUIHandler; import binnie.core.gui.IBinnieGUID; import binnie.core.item.ItemFieldKit; import binnie.core.item.ItemGenesis; -import binnie.core.item.ModuleItems; -import binnie.core.liquid.FluidContainer; -import binnie.core.liquid.ItemFluidContainer; -import binnie.core.liquid.ManagerLiquid; import binnie.core.machines.MachineGroup; import binnie.core.machines.storage.ModuleStorage; import binnie.core.mod.config.ConfigurationMain; import binnie.core.mod.config.ConfigurationMods; -import binnie.core.mod.config.ManagerConfig; import binnie.core.mod.parser.FieldParser; import binnie.core.mod.parser.ItemParser; import binnie.core.network.BinnieCorePacketID; @@ -24,15 +26,11 @@ import binnie.core.network.BinniePacketHandler; import binnie.core.network.IPacketID; import binnie.core.proxy.BinnieProxy; import binnie.core.proxy.IBinnieProxy; -import binnie.core.resource.ManagerResource; import binnie.core.triggers.ModuleTrigger; import binnie.craftgui.minecraft.ModuleCraftGUI; -import com.mojang.authlib.GameProfile; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; @@ -42,20 +40,8 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.core.ForestryEvent.SpeciesDiscovered; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IBreedingTracker; -import forestry.plugins.PluginManager.Module; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.management.ServerConfigurationManager; -import net.minecraftforge.client.event.TextureStitchEvent.Pre; +import forestry.api.core.ForestryEvent; +import forestry.plugins.PluginManager; @Mod(modid="BinnieCore", name="Binnie Core", useMetadata=true) public final class BinnieCore @@ -76,7 +62,7 @@ public final class BinnieCore } addModule(new ModuleCraftGUI()); addModule(new ModuleStorage()); - addModule(new ModuleItems()); + //addModule(new ModuleItems()); if (Loader.isModLoaded("BuildCraft|Silicon")) { addModule(new ModuleTrigger()); } @@ -103,11 +89,6 @@ public final class BinnieCore public void preInit() { instance = this; - for (FluidContainer container : FluidContainer.values()) - { - Item item = new ItemFluidContainer(container); - GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5)); - } FieldParser.parsers.add(new ItemParser()); super.preInit(); @@ -228,7 +209,7 @@ public final class BinnieCore public void handleTextureRemap(TextureStitchEvent.Pre event) { if (event.map.getTextureType() == 0) { - Binnie.Liquid.reloadIcons(event.map); + //Binnie.Liquid.reloadIcons(event.map); } Binnie.Resource.registerIcons(event.map, event.map.getTextureType()); } @@ -248,7 +229,7 @@ public final class BinnieCore { public PacketHandler() { - super(); + super(instance); } } diff --git a/src/Java/binnie/core/genetics/BeeBreedingSystem.java b/src/Java/binnie/core/genetics/BeeBreedingSystem.java deleted file mode 100644 index 2c3947b5a0..0000000000 --- a/src/Java/binnie/core/genetics/BeeBreedingSystem.java +++ /dev/null @@ -1,125 +0,0 @@ -package binnie.core.genetics; - -import binnie.Binnie; -import binnie.core.BinnieCore; -import binnie.core.language.ManagerLanguage; -import binnie.core.resource.ManagerResource; -import binnie.extrabees.ExtraBees; -import forestry.api.apiculture.EnumBeeChromosome; -import forestry.api.apiculture.EnumBeeType; -import forestry.api.apiculture.IApiaristTracker; -import forestry.api.apiculture.IBeeMutation; -import forestry.api.apiculture.IBeeRoot; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IMutation; -import forestry.api.genetics.ISpeciesRoot; -import java.util.TreeSet; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -class BeeBreedingSystem - extends BreedingSystem -{ - public BeeBreedingSystem() - { - this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee"); - this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/discoveredBee"); - } - - public float getChance(IMutation mutation, EntityPlayer player, IAllele species1, IAllele species2) - { - return ((IBeeMutation)mutation).getChance(new VirtualBeeHousing(player), species1, species2, getSpeciesRoot().templateAsGenome(getSpeciesRoot().getTemplate(species1.getUID())), getSpeciesRoot().templateAsGenome(getSpeciesRoot().getTemplate(species2.getUID()))); - } - - public ISpeciesRoot getSpeciesRoot() - { - return Binnie.Genetics.getBeeRoot(); - } - - public int getColour() - { - return 16767232; - } - - public Class getTrackerClass() - { - return IApiaristTracker.class; - } - - public String getAlleleName(IChromosomeType chromosome, IAllele allele) - { - if (chromosome == EnumBeeChromosome.FERTILITY) - { - if (allele.getUID().contains("Low")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.low"); - } - if (allele.getUID().contains("Normal")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.normal"); - } - if (allele.getUID().contains("High")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.high"); - } - if (allele.getUID().contains("Maximum")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.maximum"); - } - } - return super.getAlleleName(chromosome, allele); - } - - public boolean isDNAManipulable(ItemStack member) - { - return ((IBeeRoot)getSpeciesRoot()).getType(member) == EnumBeeType.LARVAE; - } - - public int[] getActiveTypes() - { - return new int[] { EnumBeeType.DRONE.ordinal(), EnumBeeType.PRINCESS.ordinal(), EnumBeeType.QUEEN.ordinal(), EnumBeeType.LARVAE.ordinal() }; - } - - public void addExtraAlleles(IChromosomeType chromosome, TreeSet alleles) - { - switch (1.$SwitchMap$forestry$api$apiculture$EnumBeeChromosome[((EnumBeeChromosome)chromosome).ordinal()]) - { - case 1: - for (ForestryAllele.Fertility a : ForestryAllele.Fertility.values()) { - alleles.add(a.getAllele()); - } - break; - case 2: - for (ForestryAllele.Flowering a : ForestryAllele.Flowering.values()) { - alleles.add(a.getAllele()); - } - break; - case 3: - case 4: - for (Tolerance a : Tolerance.values()) { - alleles.add(a.getAllele()); - } - break; - case 5: - for (ForestryAllele.Lifespan a : ForestryAllele.Lifespan.values()) { - alleles.add(a.getAllele()); - } - break; - case 6: - for (ForestryAllele.Speed a : ForestryAllele.Speed.values()) { - alleles.add(a.getAllele()); - } - break; - case 7: - for (ForestryAllele.Territory a : ForestryAllele.Territory.values()) { - alleles.add(a.getAllele()); - } - break; - case 8: - case 9: - case 10: - for (ForestryAllele.Bool a : ForestryAllele.Bool.values()) { - alleles.add(a.getAllele()); - } - break; - } - } -} diff --git a/src/Java/binnie/core/genetics/BeeModifierLogic.java b/src/Java/binnie/core/genetics/BeeModifierLogic.java deleted file mode 100644 index 65a2ab3103..0000000000 --- a/src/Java/binnie/core/genetics/BeeModifierLogic.java +++ /dev/null @@ -1,47 +0,0 @@ -package binnie.core.genetics; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class BeeModifierLogic -{ - private Map modifiers = new HashMap(); - private List booleanModifiers = new ArrayList(); - - public float getModifier(EnumBeeModifier modifier, float currentModifier) - { - if (!this.modifiers.containsKey(modifier)) { - return 1.0F; - } - float mult = ((Float[])this.modifiers.get(modifier))[0].floatValue(); - float max = ((Float[])this.modifiers.get(modifier))[1].floatValue(); - if (max >= 1.0F) - { - if (max <= currentModifier) { - return 1.0F; - } - return Math.min(max / currentModifier, mult); - } - if (max >= currentModifier) { - return 1.0F; - } - return Math.max(max / currentModifier, mult); - } - - public boolean getModifier(EnumBeeBooleanModifier modifier) - { - return this.booleanModifiers.contains(modifier); - } - - public void setModifier(EnumBeeBooleanModifier modifier) - { - this.booleanModifiers.add(modifier); - } - - public void setModifier(EnumBeeModifier modifier, float mult, float max) - { - this.modifiers.put(modifier, new Float[] { Float.valueOf(mult), Float.valueOf(max) }); - } -} diff --git a/src/Java/binnie/core/genetics/BreedingSystem.java b/src/Java/binnie/core/genetics/BreedingSystem.java deleted file mode 100644 index 1bdd5d6376..0000000000 --- a/src/Java/binnie/core/genetics/BreedingSystem.java +++ /dev/null @@ -1,558 +0,0 @@ -package binnie.core.genetics; - -import binnie.Binnie; -import binnie.core.BinnieCore; -import binnie.core.language.ManagerLanguage; -import binnie.core.proxy.BinnieProxy; -import binnie.core.resource.BinnieIcon; -import binnie.extrabees.genetics.ExtraBeeMutation; -import com.mojang.authlib.GameProfile; -import cpw.mods.fml.common.eventhandler.EventBus; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import forestry.api.core.ForestryEvent.SyncedBreedingTracker; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleBoolean; -import forestry.api.genetics.IAlleleRegistry; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IClassification; -import forestry.api.genetics.IGenome; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.IMutation; -import forestry.api.genetics.ISpeciesRoot; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; - -public abstract class BreedingSystem - implements IItemStackRepresentitive -{ - protected BinnieIcon iconUndiscovered; - protected BinnieIcon iconDiscovered; - - public BreedingSystem() - { - Binnie.Genetics.registerBreedingSystem(this); - MinecraftForge.EVENT_BUS.register(this); - } - - public String getChromosomeName(IChromosomeType chromo) - { - return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".chromosome." + chromo.getName()); - } - - public String getChromosomeShortName(IChromosomeType chromo) - { - return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".chromosome." + chromo.getName() + ".short"); - } - - public final String getEpitome(float discoveredPercentage) - { - int i = 0; - if (discoveredPercentage == 1.0F) { - i = 6; - } else if (discoveredPercentage < 0.1F) { - i = 0; - } else if (discoveredPercentage < 0.3F) { - i = 1; - } else if (discoveredPercentage < 0.5F) { - i = 2; - } else if (discoveredPercentage < 0.7F) { - i = 3; - } else if (discoveredPercentage < 0.9F) { - i = 4; - } else if (discoveredPercentage < 1.0F) { - i = 5; - } - return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".epitome." + i); - } - - private List allBranches = new ArrayList(); - List allActiveSpecies = new ArrayList(); - private List allSpecies = new ArrayList(); - private List allMutations = new ArrayList(); - private Map> resultantMutations = new HashMap(); - private Map> furtherMutations = new HashMap(); - private Map> allResultantMutations = new HashMap(); - private Map> allFurtherMutations = new HashMap(); - public float discoveredSpeciesPercentage; - public int totalSpeciesCount; - public int discoveredSpeciesCount; - public int totalSecretCount; - public int discoveredSecretCount; - public float discoveredBranchPercentage; - public int totalBranchCount; - public int discoveredBranchCount; - private int totalSecretBranchCount; - private int discoveredSecretBranchCount; - String currentEpithet; - - public abstract ISpeciesRoot getSpeciesRoot(); - - public final List getAllBranches() - { - return this.allBranches; - } - - public final Collection getAllSpecies() - { - return this.allActiveSpecies; - } - - public final Collection getAllMutations() - { - return this.allMutations; - } - - public void calculateArrays() - { - Collection allAlleles = AlleleManager.alleleRegistry.getRegisteredAlleles().values(); - - - this.resultantMutations = new HashMap(); - this.furtherMutations = new HashMap(); - this.allResultantMutations = new HashMap(); - this.allFurtherMutations = new HashMap(); - - this.allActiveSpecies = new ArrayList(); - this.allSpecies = new ArrayList(); - for (IAllele species : allAlleles) { - if (getSpeciesRoot().getTemplate(species.getUID()) != null) - { - this.resultantMutations.put((IAlleleSpecies)species, new ArrayList()); - - this.furtherMutations.put((IAlleleSpecies)species, new ArrayList()); - - this.allResultantMutations.put((IAlleleSpecies)species, new ArrayList()); - - this.allFurtherMutations.put((IAlleleSpecies)species, new ArrayList()); - - this.allSpecies.add((IAlleleSpecies)species); - if ((!isBlacklisted(species)) && (!species.getUID().contains("speciesBotAlfheim"))) { - this.allActiveSpecies.add((IAlleleSpecies)species); - } - } - } - this.allMutations = new ArrayList(); - - Collection allRegBranches = AlleleManager.alleleRegistry.getRegisteredClassifications().values(); - - - this.allBranches = new ArrayList(); - for (IClassification branch : allRegBranches) { - if ((branch.getMemberSpecies().length > 0) && - (getSpeciesRoot().getTemplate(branch.getMemberSpecies()[0].getUID()) != null)) - { - boolean possible = false; - for (IAlleleSpecies species : branch.getMemberSpecies()) { - if (this.allActiveSpecies.contains(species)) { - possible = true; - } - } - if (possible) { - this.allBranches.add(branch); - } - } - } - if (getSpeciesRoot().getMutations(false) != null) - { - Set mutations = new LinkedHashSet(); - mutations.addAll(getSpeciesRoot().getMutations(false)); - if (this == Binnie.Genetics.beeBreedingSystem) { - mutations.addAll(ExtraBeeMutation.mutations); - } - for (IMutation mutation : mutations) - { - this.allMutations.add(mutation); - - Set participatingSpecies = new LinkedHashSet(); - if ((mutation.getAllele0() instanceof IAlleleSpecies)) { - participatingSpecies.add((IAlleleSpecies)mutation.getAllele0()); - } - if ((mutation.getAllele1() instanceof IAlleleSpecies)) { - participatingSpecies.add((IAlleleSpecies)mutation.getAllele1()); - } - for (IAlleleSpecies species : participatingSpecies) - { - ((List)this.allFurtherMutations.get(species)).add(mutation); - if (this.allActiveSpecies.contains(species)) { - ((List)this.furtherMutations.get(species)).add(mutation); - } - } - if (this.resultantMutations.containsKey(mutation.getTemplate()[0])) - { - ((List)this.allResultantMutations.get(mutation.getTemplate()[0])).add(mutation); - ((List)this.resultantMutations.get(mutation.getTemplate()[0])).add(mutation); - } - } - } - } - - public final boolean isBlacklisted(IAllele allele) - { - return AlleleManager.alleleRegistry.isBlacklisted(allele.getUID()); - } - - public final List getResultantMutations(IAlleleSpecies species, boolean includeInactive) - { - if (this.resultantMutations.isEmpty()) { - calculateArrays(); - } - return includeInactive ? (List)this.allResultantMutations.get(species) : (List)this.resultantMutations.get(species); - } - - public final List getResultantMutations(IAlleleSpecies species) - { - if (this.resultantMutations.isEmpty()) { - calculateArrays(); - } - return (List)this.resultantMutations.get(species); - } - - public final List getFurtherMutations(IAlleleSpecies species, boolean includeInactive) - { - if (this.furtherMutations.isEmpty()) { - calculateArrays(); - } - return includeInactive ? (List)this.allFurtherMutations.get(species) : (List)this.furtherMutations.get(species); - } - - public final List getFurtherMutations(IAlleleSpecies species) - { - if (this.furtherMutations.isEmpty()) { - calculateArrays(); - } - return (List)this.furtherMutations.get(species); - } - - public final boolean isMutationDiscovered(IMutation mutation, World world, GameProfile name) - { - return isMutationDiscovered(mutation, getSpeciesRoot().getBreedingTracker(world, name)); - } - - public final boolean isMutationDiscovered(IMutation mutation, IBreedingTracker tracker) - { - if (tracker == null) { - return true; - } - return tracker.isDiscovered(mutation); - } - - public final boolean isSpeciesDiscovered(IAlleleSpecies species, World world, GameProfile name) - { - return isSpeciesDiscovered(species, getSpeciesRoot().getBreedingTracker(world, name)); - } - - public final boolean isSpeciesDiscovered(IAlleleSpecies species, IBreedingTracker tracker) - { - if (tracker == null) { - return true; - } - return tracker.isDiscovered(species); - } - - public final boolean isSecret(IAlleleSpecies species) - { - return !species.isCounted(); - } - - public final boolean isSecret(IClassification branch) - { - for (IAlleleSpecies species : branch.getMemberSpecies()) { - if (!isSecret(species)) { - return false; - } - } - return true; - } - - public final Collection getDiscoveredBranches(World world, GameProfile player) - { - List branches = new ArrayList(); - for (IClassification branch : getAllBranches()) - { - boolean discovered = false; - for (IAlleleSpecies species : branch.getMemberSpecies()) { - if (isSpeciesDiscovered(species, world, player)) { - discovered = true; - } - } - if (discovered) { - branches.add(branch); - } - } - return branches; - } - - public final Collection getDiscoveredBranches(IBreedingTracker tracker) - { - List branches = new ArrayList(); - for (IClassification branch : getAllBranches()) - { - boolean discovered = false; - for (IAlleleSpecies species : branch.getMemberSpecies()) { - if (isSpeciesDiscovered(species, tracker)) { - discovered = true; - } - } - if (discovered) { - branches.add(branch); - } - } - return branches; - } - - public final Collection getDiscoveredSpecies(World world, GameProfile player) - { - List speciesList = new ArrayList(); - for (IAlleleSpecies species : getAllSpecies()) { - if (isSpeciesDiscovered(species, world, player)) { - speciesList.add(species); - } - } - return speciesList; - } - - public final Collection getDiscoveredSpecies(IBreedingTracker tracker) - { - List speciesList = new ArrayList(); - for (IAlleleSpecies species : getAllSpecies()) { - if (isSpeciesDiscovered(species, tracker)) { - speciesList.add(species); - } - } - return speciesList; - } - - public final List getDiscoveredMutations(World world, GameProfile player) - { - List speciesList = new ArrayList(); - for (IMutation species : getAllMutations()) { - if (isMutationDiscovered(species, world, player)) { - speciesList.add(species); - } - } - return speciesList; - } - - public final List getDiscoveredMutations(IBreedingTracker tracker) - { - List speciesList = new ArrayList(); - for (IMutation species : getAllMutations()) { - if (isMutationDiscovered(species, tracker)) { - speciesList.add(species); - } - } - return speciesList; - } - - public final int getDiscoveredBranchMembers(IClassification branch, IBreedingTracker tracker) - { - int discoveredSpecies = 0; - for (IAlleleSpecies species : branch.getMemberSpecies()) { - if (isSpeciesDiscovered(species, tracker)) { - discoveredSpecies++; - } - } - return discoveredSpecies; - } - - public IIcon getUndiscoveredIcon() - { - return this.iconUndiscovered.getIcon(); - } - - public IIcon getDiscoveredIcon() - { - return this.iconDiscovered.getIcon(); - } - - public abstract float getChance(IMutation paramIMutation, EntityPlayer paramEntityPlayer, IAllele paramIAllele1, IAllele paramIAllele2); - - public abstract Class getTrackerClass(); - - @SubscribeEvent - public final void onSyncBreedingTracker(ForestryEvent.SyncedBreedingTracker event) - { - IBreedingTracker tracker = event.tracker; - if (!getTrackerClass().isInstance(tracker)) { - return; - } - syncTracker(tracker); - } - - public final void syncTracker(IBreedingTracker tracker) - { - this.discoveredSpeciesPercentage = 0.0F; - - this.totalSpeciesCount = 0; - this.discoveredSpeciesCount = 0; - - this.totalSecretCount = 0; - this.discoveredSecretCount = 0; - - Collection discoveredSpecies = getDiscoveredSpecies(tracker); - Collection allSpecies = getAllSpecies(); - for (IAlleleSpecies species : allSpecies) { - if (!isSecret(species)) - { - this.totalSpeciesCount += 1; - if (isSpeciesDiscovered(species, tracker)) { - this.discoveredSpeciesCount += 1; - } - } - else - { - this.totalSecretCount += 1; - if (isSpeciesDiscovered(species, tracker)) { - this.discoveredSecretCount += 1; - } - } - } - this.discoveredBranchPercentage = 0.0F; - - this.totalBranchCount = 0; - this.discoveredBranchCount = 0; - - Collection discoveredBranches = getDiscoveredBranches(tracker); - Collection allBranches = getAllBranches(); - for (IClassification branch : allBranches) { - if (!isSecret(branch)) - { - this.totalBranchCount += 1; - if (discoveredBranches.contains(branch)) { - this.discoveredBranchCount += 1; - } - } - else - { - this.totalSecretBranchCount += 1; - if (discoveredBranches.contains(branch)) { - this.discoveredSecretBranchCount += 1; - } - } - } - this.discoveredSpeciesPercentage = (this.discoveredSpeciesCount / this.totalSpeciesCount); - - this.discoveredBranchPercentage = (this.discoveredBranchCount / this.totalBranchCount); - - - String epithet = getEpitome(); - - onSyncBreedingTracker(tracker); - } - - public void onSyncBreedingTracker(IBreedingTracker tracker) {} - - public String getEpitome() - { - return getEpitome(this.discoveredSpeciesPercentage); - } - - public final String getDescriptor() - { - return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".descriptor"); - } - - public final String getIdent() - { - return getSpeciesRoot().getUID(); - } - - public final IChromosomeType getChromosome(int i) - { - for (IChromosomeType chromosome : getSpeciesRoot().getKaryotype()) { - if (i == chromosome.ordinal()) { - return chromosome; - } - } - return null; - } - - public abstract int getColour(); - - public String getAlleleName(IChromosomeType chromosome, IAllele allele) - { - if ((allele instanceof IAlleleBoolean)) { - return ((IAlleleBoolean)allele).getValue() ? Binnie.Language.localise(BinnieCore.instance, "allele.true") : Binnie.Language.localise(BinnieCore.instance, "allele.false"); - } - if (allele.getName() == "for.gui.maximum") { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.maximum"); - } - return allele.getName(); - } - - public String getName() - { - return BinnieCore.proxy.localise(getSpeciesRoot().getUID() + ".shortName"); - } - - public ItemStack getItemStackRepresentitive() - { - IIndividual first = (IIndividual)getSpeciesRoot().getIndividualTemplates().get(0); - return getSpeciesRoot().getMemberStack(first, getDefaultType()); - } - - public String toString() - { - return getName(); - } - - public abstract boolean isDNAManipulable(ItemStack paramItemStack); - - public IIndividual getConversion(ItemStack stack) - { - return null; - } - - public final IIndividual getDefaultIndividual() - { - return getSpeciesRoot().templateAsIndividual(getSpeciesRoot().getDefaultTemplate()); - } - - public final int getDefaultType() - { - return getActiveTypes()[0]; - } - - public abstract int[] getActiveTypes(); - - public abstract void addExtraAlleles(IChromosomeType paramIChromosomeType, TreeSet paramTreeSet); - - public ItemStack getConversionStack(ItemStack stack) - { - return getSpeciesRoot().getMemberStack(getConversion(stack), getDefaultType()); - } - - public final Collection getActiveKaryotype() - { - return Binnie.Genetics.getActiveChromosomes(getSpeciesRoot()); - } - - public ItemStack getDefaultMember(String uid) - { - return getSpeciesRoot().getMemberStack(getIndividual(uid), getDefaultType()); - } - - public IIndividual getIndividual(String uid) - { - return getSpeciesRoot().templateAsIndividual(getSpeciesRoot().getTemplate(uid)); - } - - public IGenome getGenome(String uid) - { - return getSpeciesRoot().templateAsGenome(getSpeciesRoot().getTemplate(uid)); - } -} diff --git a/src/Java/binnie/core/genetics/EnumBeeBooleanModifier.java b/src/Java/binnie/core/genetics/EnumBeeBooleanModifier.java deleted file mode 100644 index 58eae12e79..0000000000 --- a/src/Java/binnie/core/genetics/EnumBeeBooleanModifier.java +++ /dev/null @@ -1,8 +0,0 @@ -package binnie.core.genetics; - -public enum EnumBeeBooleanModifier -{ - Sealed, SelfLighted, SunlightStimulated, Hellish; - - private EnumBeeBooleanModifier() {} -} diff --git a/src/Java/binnie/core/genetics/EnumBeeModifier.java b/src/Java/binnie/core/genetics/EnumBeeModifier.java deleted file mode 100644 index 92fc30bda0..0000000000 --- a/src/Java/binnie/core/genetics/EnumBeeModifier.java +++ /dev/null @@ -1,17 +0,0 @@ -package binnie.core.genetics; - -import binnie.Binnie; -import binnie.core.BinnieCore; -import binnie.core.language.ManagerLanguage; - -public enum EnumBeeModifier -{ - Territory, Mutation, Lifespan, Production, Flowering, GeneticDecay; - - private EnumBeeModifier() {} - - public String getName() - { - return Binnie.Language.localise(BinnieCore.instance, "beemodifier." + name().toLowerCase()); - } -} diff --git a/src/Java/binnie/core/genetics/FlowerBreedingSystem.java b/src/Java/binnie/core/genetics/FlowerBreedingSystem.java deleted file mode 100644 index bc706976c8..0000000000 --- a/src/Java/binnie/core/genetics/FlowerBreedingSystem.java +++ /dev/null @@ -1,129 +0,0 @@ -package binnie.core.genetics; - -import binnie.Binnie; -import binnie.botany.api.EnumFlowerChromosome; -import binnie.botany.api.EnumFlowerStage; -import binnie.botany.api.IBotanistTracker; -import binnie.botany.api.IFlowerMutation; -import binnie.botany.api.IFlowerRoot; -import binnie.botany.core.BotanyCore; -import binnie.botany.genetics.EnumFlowerColor; -import binnie.core.BinnieCore; -import binnie.core.language.ManagerLanguage; -import binnie.core.resource.ManagerResource; -import binnie.extrabees.ExtraBees; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IBreedingTracker; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IIndividual; -import forestry.api.genetics.IMutation; -import forestry.api.genetics.ISpeciesRoot; -import java.util.TreeSet; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -class FlowerBreedingSystem - extends BreedingSystem -{ - public FlowerBreedingSystem() - { - this.iconUndiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/undiscoveredBee"); - this.iconDiscovered = Binnie.Resource.getItemIcon(ExtraBees.instance, "icon/discoveredBee"); - } - - public float getChance(IMutation mutation, EntityPlayer player, IAllele species1, IAllele species2) - { - return ((IFlowerMutation)mutation).getBaseChance(); - } - - public ISpeciesRoot getSpeciesRoot() - { - return Binnie.Genetics.getFlowerRoot(); - } - - public int getColour() - { - return 14563127; - } - - public Class getTrackerClass() - { - return IBotanistTracker.class; - } - - public String getAlleleName(IChromosomeType chromosome, IAllele allele) - { - if (chromosome == EnumFlowerChromosome.FERTILITY) - { - if (allele.getUID().contains("Low")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.low"); - } - if (allele.getUID().contains("Normal")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.normal"); - } - if (allele.getUID().contains("High")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.high"); - } - if (allele.getUID().contains("Maximum")) { - return Binnie.Language.localise(BinnieCore.instance, "allele.fertility.maximum"); - } - } - return super.getAlleleName(chromosome, allele); - } - - public boolean isDNAManipulable(ItemStack member) - { - return ((IFlowerRoot)getSpeciesRoot()).getType(member) == EnumFlowerStage.POLLEN; - } - - public IIndividual getConversion(ItemStack stack) - { - return BotanyCore.getFlowerRoot().getConversion(stack); - } - - public int[] getActiveTypes() - { - return new int[] { EnumFlowerStage.FLOWER.ordinal(), EnumFlowerStage.POLLEN.ordinal(), EnumFlowerStage.SEED.ordinal() }; - } - - public void addExtraAlleles(IChromosomeType chromosome, TreeSet alleles) - { - switch (1.$SwitchMap$binnie$botany$api$EnumFlowerChromosome[((EnumFlowerChromosome)chromosome).ordinal()]) - { - case 1: - for (ForestryAllele.Fertility a : ForestryAllele.Fertility.values()) { - alleles.add(a.getAllele()); - } - break; - case 2: - for (ForestryAllele.Lifespan a : ForestryAllele.Lifespan.values()) { - alleles.add(a.getAllele()); - } - break; - case 3: - case 4: - case 5: - for (Tolerance a : Tolerance.values()) { - alleles.add(a.getAllele()); - } - break; - case 6: - case 7: - case 8: - for (EnumFlowerColor a : EnumFlowerColor.values()) { - alleles.add(a.getAllele()); - } - break; - case 9: - for (ForestryAllele.Sappiness a : ForestryAllele.Sappiness.values()) { - alleles.add(a.getAllele()); - } - break; - case 10: - for (ForestryAllele.Territory a : ForestryAllele.Territory.values()) { - alleles.add(a.getAllele()); - } - break; - } - } -} diff --git a/src/Java/binnie/core/genetics/ForestryAllele.java b/src/Java/binnie/core/genetics/ForestryAllele.java deleted file mode 100644 index 19a3ad8b6f..0000000000 --- a/src/Java/binnie/core/genetics/ForestryAllele.java +++ /dev/null @@ -1,211 +0,0 @@ -package binnie.core.genetics; - -import binnie.Binnie; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IBeeRoot; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleRegistry; - -public class ForestryAllele -{ - public static enum Lifespan - { - Shortest, Shorter, Short, Shortened, Normal, Elongated, Long, Longer, Longest; - - private Lifespan() {} - - public IAllele getAllele() - { - return AlleleManager.alleleRegistry.getAllele("forestry.lifespan" + toString()); - } - } - - public static enum Speed - { - Slowest, Slower, Slow, Norm, Fast, Faster, Fastest; - - private Speed() {} - - public IAllele getAllele() - { - return AlleleManager.alleleRegistry.getAllele("forestry.speed" + toString()); - } - } - - public static enum Fertility - { - Low, Normal, High, Maximum; - - private Fertility() {} - - public IAllele getAllele() - { - return AlleleManager.alleleRegistry.getAllele("forestry.fertility" + toString()); - } - } - - public static enum Flowering - { - Slowest, Slower, Slow, Average, Fast, Faster, Fastest, Maximum; - - private Flowering() {} - - public IAllele getAllele() - { - return AlleleManager.alleleRegistry.getAllele("forestry.flowering" + toString()); - } - } - - public static enum Territory - { - Default, Large, Larger, Largest; - - private Territory() {} - - public IAllele getAllele() - { - return AlleleManager.alleleRegistry.getAllele("forestry.territory" + toString()); - } - } - - public static enum Sappiness - { - Lowest, Lower, Low, Average, High, Higher, Highest; - - private Sappiness() {} - - public IAllele getAllele() - { - return AlleleManager.alleleRegistry.getAllele("forestry.sappiness" + toString()); - } - } - - public static enum TreeHeight - { - Smallest, Smaller, Small, Average, Large, Larger, Largest, Gigantic; - - private TreeHeight() {} - - public IAllele getAllele() - { - return AlleleManager.alleleRegistry.getAllele("forestry.height" + (this == Average ? "Max10" : toString())); - } - } - - public static enum Size - { - Smallest, Smaller, Small, Average, Large, Larger, Largest; - - private Size() {} - - public IAllele getAllele() - { - return AlleleManager.alleleRegistry.getAllele("forestry.size" + toString()); - } - } - - public static enum Saplings - { - Lowest, Lower, Low, Average, High, Higher, Highest; - - private Saplings() {} - - public IAllele getAllele() - { - String s = toString(); - if (this == Average) { - s = "Default"; - } - if (this == High) { - s = "Double"; - } - if (this == Higher) { - s = "Triple"; - } - return AlleleManager.alleleRegistry.getAllele("forestry.saplings" + s); - } - } - - public static enum Yield - { - Lowest, Lower, Low, Average, High, Higher, Highest; - - private Yield() {} - - public IAllele getAllele() - { - return AlleleManager.alleleRegistry.getAllele("forestry.yield" + (this == Average ? "Default" : toString())); - } - } - - public static enum Maturation - { - Slowest, Slower, Slow, Average, Fast, Faster, Fastest; - - private Maturation() {} - - public IAllele getAllele() - { - return AlleleManager.alleleRegistry.getAllele("forestry.maturation" + toString()); - } - } - - public static enum Bool - { - True, False; - - private Bool() {} - - public IAllele getAllele() - { - return AlleleManager.alleleRegistry.getAllele("forestry.bool" + toString()); - } - - public static IAllele get(boolean bool) - { - return (bool ? True : False).getAllele(); - } - } - - public static enum Growth - { - Tropical; - - private Growth() {} - - public IAllele getAllele() - { - return AlleleManager.alleleRegistry.getAllele("forestry.growth" + toString()); - } - } - - public static enum Int - { - Int1, Int2, Int3, Int4, Int5, Int6, Int7, Int8, Int9, Int10; - - private Int() {} - - public IAllele getAllele() - { - return AlleleManager.alleleRegistry.getAllele("forestry.i" + (ordinal() + 1) + "d"); - } - } - - public static enum BeeSpecies - { - Modest, Noble, Forest, Rural, Marshy, Sinister, Tropical, Wintry, Merry, Austere, Imperial, Ended, Meadows, Common, Frugal, Unweary, Diligent, Majestic, Cultivated, Industrious, Valiant, Secluded, Hermitic, Spectral, Exotic, Fiendish, Monastic, Steadfast, Miry, Farmerly, Boggy, Demonic; - - private BeeSpecies() {} - - public IAlleleBeeSpecies getAllele() - { - return (IAlleleBeeSpecies)AlleleManager.alleleRegistry.getAllele("forestry.species" + toString()); - } - - public IAllele[] getTemplate() - { - return Binnie.Genetics.getBeeRoot().getTemplate(getAllele().getUID()); - } - } -} diff --git a/src/Java/binnie/core/genetics/Gene.java b/src/Java/binnie/core/genetics/Gene.java deleted file mode 100644 index 3d071cc1ab..0000000000 --- a/src/Java/binnie/core/genetics/Gene.java +++ /dev/null @@ -1,128 +0,0 @@ -package binnie.core.genetics; - -import binnie.Binnie; -import binnie.genetics.api.IGene; -import forestry.api.core.INBTTagable; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAllele; -import forestry.api.genetics.IAlleleRegistry; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.ISpeciesRoot; -import net.minecraft.nbt.NBTTagCompound; - -public class Gene - implements INBTTagable, IGene -{ - private IAllele allele; - private IChromosomeType chromosome; - private ISpeciesRoot root; - - public ISpeciesRoot getSpeciesRoot() - { - return this.root; - } - - public String toString() - { - return getAlleleName(); - } - - public Gene(IAllele allele, IChromosomeType chromosome, ISpeciesRoot root) - { - this.allele = allele; - this.chromosome = chromosome; - this.root = root; - } - - public Gene(NBTTagCompound nbt) - { - readFromNBT(nbt); - } - - public void readFromNBT(NBTTagCompound nbt) - { - this.allele = AlleleManager.alleleRegistry.getAllele(nbt.getString("allele")); - - this.root = AlleleManager.alleleRegistry.getSpeciesRoot(nbt.getString("root")); - - int chromoID = nbt.getByte("chromo"); - if ((this.root != null) && (chromoID >= 0) && (chromoID < this.root.getKaryotype().length)) { - this.chromosome = this.root.getKaryotype()[chromoID]; - } - } - - public void writeToNBT(NBTTagCompound nbt) - { - nbt.setString("allele", this.allele.getUID()); - nbt.setString("root", this.root.getUID()); - nbt.setByte("chromo", (byte)this.chromosome.ordinal()); - } - - public boolean isCorrupted() - { - return (this.allele == null) || (this.chromosome == null) || (this.root == null); - } - - public static Gene create(NBTTagCompound nbt) - { - Gene gene = new Gene(nbt); - return gene.isCorrupted() ? null : gene; - } - - public static Gene create(IAllele allele, IChromosomeType chromosome, ISpeciesRoot root) - { - Gene gene = new Gene(allele, chromosome, root); - return gene.isCorrupted() ? null : gene; - } - - public NBTTagCompound getNBTTagCompound() - { - NBTTagCompound nbt = new NBTTagCompound(); - writeToNBT(nbt); - return nbt; - } - - public String getName() - { - return Binnie.Genetics.getSystem(this.root).getAlleleName(this.chromosome, this.allele); - } - - public BreedingSystem getSystem() - { - return Binnie.Genetics.getSystem(this.root); - } - - public IChromosomeType getChromosome() - { - return this.chromosome; - } - - public IAllele getAllele() - { - return this.allele; - } - - public boolean equals(Object obj) - { - if (!(obj instanceof Gene)) { - return false; - } - Gene g = (Gene)obj; - return (this.allele == g.allele) && (this.chromosome.ordinal() == g.chromosome.ordinal()) && (this.root == g.root); - } - - public String getAlleleName() - { - return getSystem().getAlleleName(this.chromosome, this.allele); - } - - public String getChromosomeName() - { - return getSystem().getChromosomeName(this.chromosome); - } - - public String getShortChromosomeName() - { - return getSystem().getChromosomeShortName(this.chromosome); - } -} diff --git a/src/Java/binnie/core/genetics/IAlleleProvider.java b/src/Java/binnie/core/genetics/IAlleleProvider.java deleted file mode 100644 index 30dc8992e4..0000000000 --- a/src/Java/binnie/core/genetics/IAlleleProvider.java +++ /dev/null @@ -1,8 +0,0 @@ -package binnie.core.genetics; - -import forestry.api.genetics.IAllele; - -public abstract interface IAlleleProvider -{ - public abstract IAllele getAllele(); -} diff --git a/src/Java/binnie/core/genetics/IBreedingMessage.java b/src/Java/binnie/core/genetics/IBreedingMessage.java deleted file mode 100644 index fdd815c122..0000000000 --- a/src/Java/binnie/core/genetics/IBreedingMessage.java +++ /dev/null @@ -1,124 +0,0 @@ -package binnie.core.genetics; - -import binnie.Binnie; -import binnie.core.BinnieCore; -import binnie.core.language.ManagerLanguage; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IAlleleRegistry; -import forestry.api.genetics.IAlleleSpecies; -import forestry.api.genetics.IChromosomeType; -import forestry.api.genetics.IClassification; -import forestry.api.genetics.ISpeciesRoot; -import java.util.Map; -import net.minecraft.item.ItemStack; - -abstract interface IBreedingMessage -{ - public abstract String getTitle(); - - public abstract String getBody(); - - public abstract ItemStack getIcon(); - - public static class MessageSpeciesDiscovered - implements IBreedingMessage - { - IAlleleSpecies species; - ItemStack stack; - - public MessageSpeciesDiscovered(IAlleleSpecies species) - { - this.species = species; - ISpeciesRoot root = null; - for (ISpeciesRoot sRoot : AlleleManager.alleleRegistry.getSpeciesRoot().values()) { - if (sRoot.getKaryotype()[0].getAlleleClass().isInstance(species)) { - root = sRoot; - }