From fcbbd06c635d6524a09567b5659f5386b363d872 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sun, 30 Jul 2017 19:17:54 +0200 Subject: [PATCH] Fix Mod Support and Fix #208 Added Tech Reborn Support --- .../genetics/ExtraBeeDefinition.java | 91 ++++++++++++++++--- .../extrabees/genetics/ExtraBeeSpecies.java | 62 +++++++++++++ .../binnie/extrabees/items/ItemHoneyComb.java | 59 ++++++------ .../extrabees/items/types/EnumHoneyComb.java | 17 ++-- .../assets/extrabees/lang/en_US.lang | 5 + 5 files changed, 187 insertions(+), 47 deletions(-) create mode 100644 src/main/java/binnie/extrabees/genetics/ExtraBeeSpecies.java diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java index 738d7ce3..84d0a090 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java @@ -426,11 +426,66 @@ public enum ExtraBeeDefinition implements IBeeDefinition { registerMutation(BeeDefinition.IMPERIAL, MINERAL, 5); } }, - //SODALITE, - //PYRITE, - //BAUXITE, - //CINNABAR, - //SPHALERITE, + SODALITE(ExtraBeeBranchDefinition.MINERAL, "soda", false, new Color(0x154fed), new Color(0x999999)){ + @Override + protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20F) + .addSpecialty(EnumHoneyComb.SODALITE.get(1), 0.04F); + } + + @Override + protected void registerMutations() { + registerMutation(LAPIS, BeeDefinition.DILIGENT, 5); + } + }, + PYRITE(ExtraBeeBranchDefinition.MINERAL, "pyrus", false, new Color(0xe3a739), new Color(0x999999)){ + @Override + protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20F) + .addSpecialty(EnumHoneyComb.PYRITE.get(1), 0.05F); + } + + @Override + protected void registerMutations() { + registerMutation(IRON, BeeDefinition.SINISTER, 5); + } + }, + BAUXITE(ExtraBeeBranchDefinition.MINERAL, "bauxus", false, new Color(0x9c6500), new Color(0x999999)){ + @Override + protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20F) + .addSpecialty(EnumHoneyComb.BAUXITE.get(1), 0.04F); + } + + @Override + protected void registerMutations() { + registerMutation(MINERAL, BeeDefinition.DILIGENT, 5); + } + }, + CINNABAR(ExtraBeeBranchDefinition.MINERAL, "cinna", false, new Color(0x47320b), new Color(0x999999)){ + @Override + protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20F) + .addSpecialty(EnumHoneyComb.CINNABAR.get(1), 0.04F); + } + + @Override + protected void registerMutations() { + registerMutation(MINERAL, BeeDefinition.SINISTER, 5); + } + }, + SPHALERITE(ExtraBeeBranchDefinition.MINERAL, "spahleri", false, new Color(0xdbd51d), new Color(0x999999)){ + @Override + protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { + beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20F) + .addSpecialty(EnumHoneyComb.SPHALERITE.get(1), 0.04F); + } + + @Override + protected void registerMutations() { + registerMutation(TIN, BeeDefinition.SINISTER, 5); + } + }, /* GEMSTONE BRANCH */ EMERALD(ExtraBeeBranchDefinition.GEMSTONE, "emerala", true, new Color(0x1cff03), new Color(0x999999)) { @@ -1052,9 +1107,9 @@ public enum ExtraBeeDefinition implements IBeeDefinition { registerMutation(BeeDefinition.BOGGY, FUNGAL, 8); } }, - + /* CLASSICAL BRANCH */ - MARBLE(ExtraBeeBranchDefinition.CLASSICAL, "marbla", true, new Color(0xd6c9cf), new Color(0xffdc16)){ + MARBLE(ExtraBeeBranchDefinition.CLASSICAL, "marbla", true, new Color(0xd6c9cf), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f); @@ -1065,7 +1120,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { return false; } }, - ROMAN(ExtraBeeBranchDefinition.CLASSICAL, "roman", true, new Color(0xad8bb0), new Color(0xffdc16)){ + ROMAN(ExtraBeeBranchDefinition.CLASSICAL, "roman", true, new Color(0xad8bb0), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f); @@ -1076,7 +1131,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { registerMutation(ExtraBeeDefinition.MARBLE, BeeDefinition.HEROIC, 10); } }, - GREEK(ExtraBeeBranchDefinition.CLASSICAL, "greco", false, new Color(0x854c8a), new Color(0xffdc16)){ + GREEK(ExtraBeeBranchDefinition.CLASSICAL, "greco", false, new Color(0x854c8a), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f); @@ -1087,7 +1142,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { registerMutation(ExtraBeeDefinition.ROMAN, ExtraBeeDefinition.MARBLE, 8); } }, - CLASSICAL(ExtraBeeBranchDefinition.CLASSICAL, "classica", false, new Color(0x831d8c), new Color(0xffdc16)){ + CLASSICAL(ExtraBeeBranchDefinition.CLASSICAL, "classica", false, new Color(0x831d8c), new Color(0xffdc16)) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesBuilder beeSpecies) { beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f) @@ -1818,8 +1873,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition { }; private final IBranchDefinition branch; - private final IAlleleBeeSpeciesBuilder speciesBuilder; - + private final ExtraBeeSpecies speciesBuilder; + private IAlleleBeeSpecies species; private IAllele[] template; private IBeeGenome genome; @@ -1832,7 +1887,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition { this.branch = branch; if (branch != null) { - this.speciesBuilder = BeeManager.beeFactory.createSpecies(uid, dominant, "Binnie", name, description, branch.getBranch(), binomial, primary.getRGB(), secondary.getRGB()); + this.speciesBuilder = new ExtraBeeSpecies(uid, name, "Binnie", description, dominant, branch.getBranch(), binomial, primary.getRGB(), secondary.getRGB()); } else { this.speciesBuilder = null; } @@ -1912,13 +1967,16 @@ public enum ExtraBeeDefinition implements IBeeDefinition { } protected boolean isSecret() { - return true; + return false; } public static void doPreInit() { } private void init() { + if(speciesBuilder == null){ + return; + } if(isSecret()){ speciesBuilder.setIsSecret(); } @@ -1930,7 +1988,9 @@ public enum ExtraBeeDefinition implements IBeeDefinition { setAlleles(template); genome = BeeManager.beeRoot.templateAsGenome(template); - BeeManager.beeRoot.registerTemplate(template); + if(speciesBuilder.isActive()){ + BeeManager.beeRoot.registerTemplate(template); + } } public IBeeMutationBuilder registerMutation(IBeeDefinition allele0, IBeeDefinition allele1, int chance) { @@ -1968,4 +2028,5 @@ public enum ExtraBeeDefinition implements IBeeDefinition { IBee bee = getIndividual(); return BeeManager.beeRoot.getMemberStack(bee, beeType); } + } diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeSpecies.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeSpecies.java new file mode 100644 index 00000000..401bea01 --- /dev/null +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeSpecies.java @@ -0,0 +1,62 @@ +package binnie.extrabees.genetics; + +import net.minecraft.item.ItemStack; + +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.api.apiculture.IAlleleBeeSpeciesBuilder; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IClassification; +import forestry.apiculture.genetics.alleles.AlleleBeeSpecies; + +import binnie.extrabees.items.ItemHoneyComb; + +public class ExtraBeeSpecies extends AlleleBeeSpecies { + private State state; + + public ExtraBeeSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, int primaryColor, int secondaryColor) { + super(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial, primaryColor, secondaryColor); + this.state = State.ACTIVE; + } + + @Override + public IAlleleBeeSpeciesBuilder addProduct(ItemStack product, Float chance) { + if(product.isEmpty() || ItemHoneyComb.isInvalidComb(product)){ + if(state == State.ACTIVE){ + state = State.INACTIVE; + return this; + } + } + return super.addProduct(product, chance); + } + + @Override + public IAlleleBeeSpeciesBuilder addSpecialty(ItemStack specialty, Float chance) { + if(specialty.isEmpty() || ItemHoneyComb.isInvalidComb(specialty)){ + if(state == State.ACTIVE){ + state = State.INACTIVE; + return this; + } + } + return super.addSpecialty(specialty, chance); + } + + @Override + public IAlleleBeeSpecies build() { + if(state == State.INACTIVE){ + if (this.state != State.ACTIVE) { + AlleleManager.alleleRegistry.blacklistAllele(this.getUID()); + } + } + return super.build(); + } + + public boolean isActive(){ + return state == State.ACTIVE; + } + + public enum State { + ACTIVE, + INACTIVE, + DEPRECATED, + } +} diff --git a/src/main/java/binnie/extrabees/items/ItemHoneyComb.java b/src/main/java/binnie/extrabees/items/ItemHoneyComb.java index 7d3640c7..80706cbb 100644 --- a/src/main/java/binnie/extrabees/items/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/items/ItemHoneyComb.java @@ -64,11 +64,7 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem { EnumHoneyComb.CREOSOTE.addProduct(honeyDrop, 0.50f); EnumHoneyComb.LATEX.addProduct(honeyDrop, 0.50f); EnumHoneyComb.LATEX.addProduct(beeswax, 0.85f); - if (!OreDictionary.getOres("itemRubber").isEmpty()) { - EnumHoneyComb.LATEX.tryAddProduct(OreDictionary.getOres("itemRubber").get(0), 1.00f); - } else { - EnumHoneyComb.LATEX.active = false; - } + EnumHoneyComb.LATEX.tryAddProduct("itemRubber", 1.00f); EnumHoneyComb.REDSTONE.addProduct(beeswax, 0.80f); EnumHoneyComb.REDSTONE.addProduct(new ItemStack(Items.REDSTONE, 1, 0), 1.00f); EnumHoneyComb.REDSTONE.addProduct(honeyDrop, 0.50f); @@ -91,9 +87,7 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem { EnumHoneyComb.SILVER.copyProducts(EnumHoneyComb.STONE); EnumHoneyComb.SILVER.tryAddProduct(ExtraBeeItems.SilverDust, 1.00f); EnumHoneyComb.URANIUM.copyProducts(EnumHoneyComb.STONE); - if (!OreDictionary.getOres("crushedUranium").isEmpty()) { - EnumHoneyComb.URANIUM.tryAddProduct(OreDictionary.getOres("crushedUranium").get(0), 0.50f); - } + EnumHoneyComb.URANIUM.tryAddProduct("crushedUranium", 0.50f); EnumHoneyComb.CLAY.addProduct(beeswax, 0.25f); EnumHoneyComb.CLAY.addProduct(honeyDrop, 0.80f); EnumHoneyComb.CLAY.addProduct(new ItemStack(Items.CLAY_BALL), 0.80f); @@ -104,9 +98,7 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem { EnumHoneyComb.FUNGAL.addProduct(new ItemStack(Blocks.RED_MUSHROOM_BLOCK, 1, 0), 0.75f); EnumHoneyComb.ACIDIC.addProduct(beeswax, 0.80f); EnumHoneyComb.ACIDIC.tryAddProduct(EnumHoneyDrop.ACID, 0.50f); - if (!OreDictionary.getOres("dustSulfur").isEmpty()) { - EnumHoneyComb.ACIDIC.addProduct(OreDictionary.getOres("dustSulfur").get(0), 0.75f); - } + EnumHoneyComb.ACIDIC.tryAddProduct("dustSulfur", 0.75f); EnumHoneyComb.VENOMOUS.addProduct(beeswax, 0.80f); EnumHoneyComb.VENOMOUS.tryAddProduct(EnumHoneyDrop.POISON, 0.80f); EnumHoneyComb.SLIME.addProduct(beeswax, 1.00f); @@ -120,11 +112,7 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem { EnumHoneyComb.GLACIAL.tryAddProduct(EnumHoneyDrop.ICE, 0.80f); EnumHoneyComb.GLACIAL.addProduct(honeyDrop, 0.75f); EnumHoneyComb.SHADOW.addProduct(honeyDrop, 0.50f); - if (!OreDictionary.getOres("dustObsidian").isEmpty()) { - EnumHoneyComb.SHADOW.tryAddProduct(OreDictionary.getOres("dustObsidian").get(0), 0.75f); - } else { - EnumHoneyComb.SHADOW.active = false; - } + EnumHoneyComb.SHADOW.tryAddProduct("dustObsidian", 0.75f); EnumHoneyComb.LEAD.copyProducts(EnumHoneyComb.STONE); EnumHoneyComb.LEAD.tryAddProduct(ExtraBeeItems.LeadDust, 1.00f); EnumHoneyComb.ZINC.copyProducts(EnumHoneyComb.STONE); @@ -137,6 +125,22 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem { EnumHoneyComb.PLATINUM.tryAddProduct(ExtraBeeItems.PlatinumDust, 1.00f); EnumHoneyComb.LAPIS.copyProducts(EnumHoneyComb.STONE); EnumHoneyComb.LAPIS.addProduct(new ItemStack(Items.DYE, 6, 4), 1.00f); + /* Tech Reborn */ + EnumHoneyComb.SODALITE.tryAddProduct("dustSmallSodalite", 1.00f); + EnumHoneyComb.SODALITE.tryAddProduct("dustSmallAluminum", 1.00f); + EnumHoneyComb.SODALITE.copyProducts(EnumHoneyComb.STONE); + EnumHoneyComb.PYRITE.tryAddProduct("dustSmallPyrite", 1.00f); + EnumHoneyComb.PYRITE.tryAddProduct("dustSmallIron", 1.00f); + EnumHoneyComb.PYRITE.copyProducts(EnumHoneyComb.STONE); + EnumHoneyComb.BAUXITE.tryAddProduct("dustSmallBauxite", 1.00f); + EnumHoneyComb.BAUXITE.tryAddProduct("dustSmallAluminum", 1.00f); + EnumHoneyComb.BAUXITE.copyProducts(EnumHoneyComb.STONE); + EnumHoneyComb.CINNABAR.tryAddProduct("dustSmallCinnabar", 1.00f); + EnumHoneyComb.CINNABAR.addProduct(new ItemStack(Items.REDSTONE), 0.05f); + EnumHoneyComb.CINNABAR.copyProducts(EnumHoneyComb.STONE); + EnumHoneyComb.SPHALERITE.tryAddProduct("dustSmallSphalerite", 1.00f); + EnumHoneyComb.SPHALERITE.tryAddProduct("dustSmallZinc", 1.00f); + EnumHoneyComb.SPHALERITE.copyProducts(EnumHoneyComb.STONE); EnumHoneyComb.EMERALD.copyProducts(EnumHoneyComb.STONE); EnumHoneyComb.EMERALD.tryAddProduct(ExtraBeeItems.EmeraldShard, 1.00f); EnumHoneyComb.RUBY.copyProducts(EnumHoneyComb.STONE); @@ -154,20 +158,15 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem { EnumHoneyComb.COMPOST.addProduct(honeyDrop, 0.25f); EnumHoneyComb.COMPOST.tryAddProduct(PluginCore.getItems().fertilizerBio.getItemStack(), 1.00f); EnumHoneyComb.SAWDUST.addProduct(honeyDrop, 0.25f); - if (!OreDictionary.getOres("dustSawdust").isEmpty()) { - EnumHoneyComb.SAWDUST.tryAddProduct(OreDictionary.getOres("dustSawdust").get(0), 1.00f); - } else if (!OreDictionary.getOres("sawdust").isEmpty()) { - EnumHoneyComb.SAWDUST.tryAddProduct(OreDictionary.getOres("sawdust").get(0), 1.00f); + EnumHoneyComb.SAWDUST.tryAddProduct("dustSawdust", 1.00f); + if(!EnumHoneyComb.SAWDUST.isActive()) { + EnumHoneyComb.SAWDUST.tryAddProduct("sawdust", 1.00f); } EnumHoneyComb.CERTUS.addProduct(honeyDrop, 0.25f); EnumHoneyComb.CERTUS.addProduct(new ItemStack(Items.QUARTZ), 0.25f); - if (!OreDictionary.getOres("dustCertusQuartz").isEmpty()) { - EnumHoneyComb.CERTUS.tryAddProduct(OreDictionary.getOres("dustCertusQuartz").get(0), 0.20f); - } + EnumHoneyComb.CERTUS.tryAddProduct("dustCertusQuartz", 0.20f); EnumHoneyComb.ENDERPEARL.addProduct(honeyDrop, 0.25f); - if (!OreDictionary.getOres("dustEnderPearl").isEmpty()) { - EnumHoneyComb.ENDERPEARL.tryAddProduct(OreDictionary.getOres("dustEnderPearl").get(0), 0.25f); - } + EnumHoneyComb.ENDERPEARL.tryAddProduct("dustEnderPearl", 0.25f); EnumHoneyComb.YELLORIUM.copyProducts(EnumHoneyComb.STONE); EnumHoneyComb.CYANITE.copyProducts(EnumHoneyComb.STONE); EnumHoneyComb.BLUTONIUM.copyProducts(EnumHoneyComb.STONE); @@ -239,6 +238,14 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem { return honeyComb.colour[1]; } + public static boolean isInvalidComb(ItemStack stack){ + if(stack.isEmpty() || stack.getItem() != ExtraBees.comb){ + return true; + } + EnumHoneyComb honeyComb = EnumHoneyComb.get(stack); + return !honeyComb.isActive(); + } + public enum VanillaComb { HONEY, COCOA, diff --git a/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java b/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java index d3bec725..2b9ba414 100644 --- a/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java +++ b/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java @@ -66,16 +66,19 @@ public enum EnumHoneyComb implements IEBEnumItem { IRIDIUM, PLATINUM(3552564, 10125468), LAPIS(3552564, 4009179), - SODALITE, - PYRITE, - BAUXITE, - CINNABAR, - SPHALERITE, + /* Tech Reborn*/ + SODALITE(3552564, 1396717), + PYRITE(3552564, 14919481), + BAUXITE(3552564, 10249472), + CINNABAR(3552564, 4665867), + SPHALERITE(3552564, 14406941), + /* Gems */ EMERALD(3552564, 1900291), RUBY(3552564, 14024704), SAPPHIRE(3552564, 673791), OLIVINE, DIAMOND(3552564, 8371706), + /* Dyes */ RED(13388876, 16711680), YELLOW(15066419, 16768256), BLUE(10072818, 8959), @@ -134,7 +137,9 @@ public enum EnumHoneyComb implements IEBEnumItem { } public void addRecipe() { - RecipeManagers.centrifugeManager.addRecipe(20, this.get(1), this.products); + if(isActive()) { + RecipeManagers.centrifugeManager.addRecipe(20, this.get(1), this.products); + } } @Override diff --git a/src/main/resources/assets/extrabees/lang/en_US.lang b/src/main/resources/assets/extrabees/lang/en_US.lang index 1874f148..916c3238 100644 --- a/src/main/resources/assets/extrabees/lang/en_US.lang +++ b/src/main/resources/assets/extrabees/lang/en_US.lang @@ -73,6 +73,11 @@ extrabees.item.comb.enderpearl=Shimmering Comb extrabees.item.comb.yellorium=Yellorium Comb extrabees.item.comb.cyanite=Cyanite Comb extrabees.item.comb.blutonium=Blutonium Comb +extrabees.item.comb.sodalite=Sodalite Comb +extrabees.item.comb.pyrite=Pyrite Comb +extrabees.item.comb.bauxite=Bauxite Comb +extrabees.item.comb.cinnabar=Cinnabar Comb +extrabees.item.comb.sphalerite=Sphalerite Comb extrabees.item.honeydrop.energy=Energy Drop extrabees.item.honeydrop.acid=Acidic Drop