diff --git a/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java b/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java index fd60a130..74c70a00 100644 --- a/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java +++ b/src/main/java/binnie/core/machines/inventory/ValidatorSprite.java @@ -8,8 +8,6 @@ import java.util.ArrayList; import java.util.List; public class ValidatorSprite { - private List spritesInput; - private List spritesOutput; public ValidatorSprite(final AbstractMod mod, final String pathInput, final String pathOutput) { this.spritesInput = new ArrayList<>(); @@ -18,7 +16,11 @@ public class ValidatorSprite { this.spritesOutput.add(Binnie.RESOURCE.getItemSprite(mod, pathOutput)); } + private List spritesInput; + private List spritesOutput; + public BinnieSprite getSprite(final boolean input) { return input ? this.spritesInput.get(0) : this.spritesOutput.get(0); } + } diff --git a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java index b367be98..95e4e1cd 100644 --- a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java +++ b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java @@ -71,7 +71,7 @@ public class ModuleApiary implements IInitializable { @Override public void init() { - this.stimulatorLayout = new BinnieCircuitLayout(ExtraBees.instance, "Stimulator", BinnieCircuitSocketType.STIMULATOR); + this.stimulatorLayout = new BinnieCircuitLayout("Stimulator", BinnieCircuitSocketType.STIMULATOR); ModuleApiary.spriteMutator = new ValidatorSprite(ExtraBees.instance, "validator/mutator.0", "validator/mutator.1"); } } diff --git a/src/main/java/binnie/extrabees/genetics/effect/BlockEctoplasm.java b/src/main/java/binnie/extrabees/blocks/BlockEctoplasm.java similarity index 93% rename from src/main/java/binnie/extrabees/genetics/effect/BlockEctoplasm.java rename to src/main/java/binnie/extrabees/blocks/BlockEctoplasm.java index 696cf63c..96ba4273 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/BlockEctoplasm.java +++ b/src/main/java/binnie/extrabees/blocks/BlockEctoplasm.java @@ -1,4 +1,4 @@ -package binnie.extrabees.genetics.effect; +package binnie.extrabees.blocks; import net.minecraft.block.BlockWeb; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java index dbe8b1d3..845e3844 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeeMutation.java @@ -1,6 +1,5 @@ package binnie.extrabees.genetics; -import binnie.core.genetics.ForestryAllele; import com.google.common.base.Preconditions; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IAlleleBeeSpecies; @@ -10,54 +9,57 @@ import forestry.api.climate.IClimateProvider; import forestry.api.genetics.IAllele; import forestry.api.genetics.IGenome; import forestry.api.genetics.IMutationCondition; +import forestry.apiculture.genetics.BeeDefinition; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.BiomeDictionary; +import static forestry.apiculture.genetics.BeeDefinition.*; + public class ExtraBeeMutation { public static void doInit() { - registerMutation(ForestryAllele.BeeSpecies.Meadows.getAllele(), ForestryAllele.BeeSpecies.Frugal.getAllele(), ExtraBeesSpecies.ARID, 10); - registerMutation(ForestryAllele.BeeSpecies.Forest.getAllele(), ForestryAllele.BeeSpecies.Frugal.getAllele(), ExtraBeesSpecies.ARID, 10); - registerMutation(ExtraBeesSpecies.ARID, ForestryAllele.BeeSpecies.Common.getAllele(), ExtraBeesSpecies.BARREN, 8); + registerMutation(MEADOWS, FRUGAL, ExtraBeesSpecies.ARID, 10); + registerMutation(FOREST, FRUGAL, ExtraBeesSpecies.ARID, 10); + registerMutation(ExtraBeesSpecies.ARID, COMMON, ExtraBeesSpecies.BARREN, 8); registerMutation(ExtraBeesSpecies.ARID, ExtraBeesSpecies.BARREN, ExtraBeesSpecies.DESOLATE, 8); - registerMutation(ExtraBeesSpecies.BARREN, ForestryAllele.BeeSpecies.Forest.getAllele(), ExtraBeesSpecies.GNAWING, 15); - registerMutation(ExtraBeesSpecies.DESOLATE, ForestryAllele.BeeSpecies.Meadows.getAllele(), ExtraBeesSpecies.ROTTEN, 15); - registerMutation(ExtraBeesSpecies.DESOLATE, ForestryAllele.BeeSpecies.Forest.getAllele(), ExtraBeesSpecies.BONE, 15); - registerMutation(ExtraBeesSpecies.DESOLATE, ForestryAllele.BeeSpecies.Modest.getAllele(), ExtraBeesSpecies.CREEPER, 15); - registerMutation(ExtraBeesSpecies.BARREN, ForestryAllele.BeeSpecies.Marshy.getAllele(), ExtraBeesSpecies.DECOMPOSING, 15); - registerMutation(ExtraBeesSpecies.ROCK, ForestryAllele.BeeSpecies.Diligent.getAllele(), ExtraBeesSpecies.STONE, 12); - registerMutation(ExtraBeesSpecies.STONE, ForestryAllele.BeeSpecies.Unweary.getAllele(), ExtraBeesSpecies.GRANITE, 10); - registerMutation(ExtraBeesSpecies.GRANITE, ForestryAllele.BeeSpecies.Industrious.getAllele(), ExtraBeesSpecies.MINERAL, 6); - registerMutation(ExtraBeesSpecies.MINERAL, ForestryAllele.BeeSpecies.Meadows.getAllele(), ExtraBeesSpecies.IRON, 5); - registerMutation(ExtraBeesSpecies.MINERAL, ForestryAllele.BeeSpecies.Forest.getAllele(), ExtraBeesSpecies.IRON, 5); - registerMutation(ExtraBeesSpecies.MINERAL, ForestryAllele.BeeSpecies.Wintry.getAllele(), ExtraBeesSpecies.COPPER, 5); - registerMutation(ExtraBeesSpecies.MINERAL, ForestryAllele.BeeSpecies.Modest.getAllele(), ExtraBeesSpecies.COPPER, 5); - registerMutation(ExtraBeesSpecies.MINERAL, ForestryAllele.BeeSpecies.Marshy.getAllele(), ExtraBeesSpecies.TIN, 5); - registerMutation(ExtraBeesSpecies.MINERAL, ForestryAllele.BeeSpecies.Tropical.getAllele(), ExtraBeesSpecies.TIN, 5); - registerMutation(ExtraBeesSpecies.MINERAL, ForestryAllele.BeeSpecies.Meadows.getAllele(), ExtraBeesSpecies.LEAD, 5); - registerMutation(ExtraBeesSpecies.MINERAL, ForestryAllele.BeeSpecies.Modest.getAllele(), ExtraBeesSpecies.LEAD, 5); - registerMutation(ExtraBeesSpecies.MINERAL, ForestryAllele.BeeSpecies.Wintry.getAllele(), ExtraBeesSpecies.ZINC, 5); - registerMutation(ExtraBeesSpecies.MINERAL, ForestryAllele.BeeSpecies.Tropical.getAllele(), ExtraBeesSpecies.ZINC, 5); - registerMutation(ExtraBeesSpecies.MINERAL, ForestryAllele.BeeSpecies.Forest.getAllele(), ExtraBeesSpecies.NICKEL, 5); - registerMutation(ExtraBeesSpecies.MINERAL, ForestryAllele.BeeSpecies.Marshy.getAllele(), ExtraBeesSpecies.NICKEL, 5); - registerMutation(ExtraBeesSpecies.MINERAL, ForestryAllele.BeeSpecies.Cultivated.getAllele(), ExtraBeesSpecies.TITANIUM, 3); - registerMutation(ExtraBeesSpecies.MINERAL, ForestryAllele.BeeSpecies.Common.getAllele(), ExtraBeesSpecies.TUNGSTATE, 3); - registerMutation(ExtraBeesSpecies.ZINC, ForestryAllele.BeeSpecies.Majestic.getAllele(), ExtraBeesSpecies.SILVER, 2); - registerMutation(ExtraBeesSpecies.TIN, ForestryAllele.BeeSpecies.Majestic.getAllele(), ExtraBeesSpecies.SILVER, 2); - registerMutation(ExtraBeesSpecies.LEAD, ForestryAllele.BeeSpecies.Majestic.getAllele(), ExtraBeesSpecies.SILVER, 2); - registerMutation(ExtraBeesSpecies.TITANIUM, ForestryAllele.BeeSpecies.Majestic.getAllele(), ExtraBeesSpecies.SILVER, 3); - registerMutation(ExtraBeesSpecies.IRON, ForestryAllele.BeeSpecies.Majestic.getAllele(), ExtraBeesSpecies.GOLD, 2); - registerMutation(ExtraBeesSpecies.COPPER, ForestryAllele.BeeSpecies.Majestic.getAllele(), ExtraBeesSpecies.GOLD, 2); - registerMutation(ExtraBeesSpecies.NICKEL, ForestryAllele.BeeSpecies.Majestic.getAllele(), ExtraBeesSpecies.GOLD, 2); - registerMutation(ExtraBeesSpecies.TUNGSTATE, ForestryAllele.BeeSpecies.Majestic.getAllele(), ExtraBeesSpecies.GOLD, 3); + registerMutation(ExtraBeesSpecies.BARREN, FOREST, ExtraBeesSpecies.GNAWING, 15); + registerMutation(ExtraBeesSpecies.DESOLATE, MEADOWS, ExtraBeesSpecies.ROTTEN, 15); + registerMutation(ExtraBeesSpecies.DESOLATE, FOREST, ExtraBeesSpecies.BONE, 15); + registerMutation(ExtraBeesSpecies.DESOLATE, MODEST, ExtraBeesSpecies.CREEPER, 15); + registerMutation(ExtraBeesSpecies.BARREN, MARSHY, ExtraBeesSpecies.DECOMPOSING, 15); + registerMutation(ExtraBeesSpecies.ROCK, DILIGENT, ExtraBeesSpecies.STONE, 12); + registerMutation(ExtraBeesSpecies.STONE, UNWEARY, ExtraBeesSpecies.GRANITE, 10); + registerMutation(ExtraBeesSpecies.GRANITE, INDUSTRIOUS, ExtraBeesSpecies.MINERAL, 6); + registerMutation(ExtraBeesSpecies.MINERAL, MEADOWS, ExtraBeesSpecies.IRON, 5); + registerMutation(ExtraBeesSpecies.MINERAL, FOREST, ExtraBeesSpecies.IRON, 5); + registerMutation(ExtraBeesSpecies.MINERAL, WINTRY, ExtraBeesSpecies.COPPER, 5); + registerMutation(ExtraBeesSpecies.MINERAL, MODEST, ExtraBeesSpecies.COPPER, 5); + registerMutation(ExtraBeesSpecies.MINERAL, MARSHY, ExtraBeesSpecies.TIN, 5); + registerMutation(ExtraBeesSpecies.MINERAL, TROPICAL, ExtraBeesSpecies.TIN, 5); + registerMutation(ExtraBeesSpecies.MINERAL, MEADOWS, ExtraBeesSpecies.LEAD, 5); + registerMutation(ExtraBeesSpecies.MINERAL, MODEST, ExtraBeesSpecies.LEAD, 5); + registerMutation(ExtraBeesSpecies.MINERAL, WINTRY, ExtraBeesSpecies.ZINC, 5); + registerMutation(ExtraBeesSpecies.MINERAL, TROPICAL, ExtraBeesSpecies.ZINC, 5); + registerMutation(ExtraBeesSpecies.MINERAL, FOREST, ExtraBeesSpecies.NICKEL, 5); + registerMutation(ExtraBeesSpecies.MINERAL, MARSHY, ExtraBeesSpecies.NICKEL, 5); + registerMutation(ExtraBeesSpecies.MINERAL, CULTIVATED, ExtraBeesSpecies.TITANIUM, 3); + registerMutation(ExtraBeesSpecies.MINERAL, COMMON, ExtraBeesSpecies.TUNGSTATE, 3); + registerMutation(ExtraBeesSpecies.ZINC, MAJESTIC, ExtraBeesSpecies.SILVER, 2); + registerMutation(ExtraBeesSpecies.TIN, MAJESTIC, ExtraBeesSpecies.SILVER, 2); + registerMutation(ExtraBeesSpecies.LEAD, MAJESTIC, ExtraBeesSpecies.SILVER, 2); + registerMutation(ExtraBeesSpecies.TITANIUM, MAJESTIC, ExtraBeesSpecies.SILVER, 3); + registerMutation(ExtraBeesSpecies.IRON, MAJESTIC, ExtraBeesSpecies.GOLD, 2); + registerMutation(ExtraBeesSpecies.COPPER, MAJESTIC, ExtraBeesSpecies.GOLD, 2); + registerMutation(ExtraBeesSpecies.NICKEL, MAJESTIC, ExtraBeesSpecies.GOLD, 2); + registerMutation(ExtraBeesSpecies.TUNGSTATE, MAJESTIC, ExtraBeesSpecies.GOLD, 3); registerMutation(ExtraBeesSpecies.GOLD, ExtraBeesSpecies.SILVER, ExtraBeesSpecies.PLATINUM, 2); - registerMutation(ExtraBeesSpecies.MINERAL, ForestryAllele.BeeSpecies.Imperial.getAllele(), ExtraBeesSpecies.LAPIS, 5); - registerMutation(ExtraBeesSpecies.LAPIS, ForestryAllele.BeeSpecies.Forest.getAllele(), ExtraBeesSpecies.EMERALD, 5); - registerMutation(ExtraBeesSpecies.LAPIS, ForestryAllele.BeeSpecies.Modest.getAllele(), ExtraBeesSpecies.RUBY, 5); + registerMutation(ExtraBeesSpecies.MINERAL, IMPERIAL, ExtraBeesSpecies.LAPIS, 5); + registerMutation(ExtraBeesSpecies.LAPIS, FOREST, ExtraBeesSpecies.EMERALD, 5); + registerMutation(ExtraBeesSpecies.LAPIS, MODEST, ExtraBeesSpecies.RUBY, 5); registerMutation(ExtraBeesSpecies.LAPIS, ExtraBeesSpecies.WATER, ExtraBeesSpecies.SAPPHIRE, 5); - registerMutation(ExtraBeesSpecies.LAPIS, ForestryAllele.BeeSpecies.Cultivated.getAllele(), ExtraBeesSpecies.DIAMOND, 5); + registerMutation(ExtraBeesSpecies.LAPIS, CULTIVATED, ExtraBeesSpecies.DIAMOND, 5); registerMutation(ExtraBeesSpecies.PREHISTORIC, ExtraBeesSpecies.MINERAL, ExtraBeesSpecies.UNSTABLE, 5); registerMutation(ExtraBeesSpecies.UNSTABLE, ExtraBeesSpecies.IRON, ExtraBeesSpecies.NUCLEAR, 5); registerMutation(ExtraBeesSpecies.UNSTABLE, ExtraBeesSpecies.COPPER, ExtraBeesSpecies.NUCLEAR, 5); @@ -67,92 +69,92 @@ public class ExtraBeeMutation { registerMutation(ExtraBeesSpecies.UNSTABLE, ExtraBeesSpecies.LEAD, ExtraBeesSpecies.NUCLEAR, 5); registerMutation(ExtraBeesSpecies.NUCLEAR, ExtraBeesSpecies.GOLD, ExtraBeesSpecies.RADIOACTIVE, 5); registerMutation(ExtraBeesSpecies.NUCLEAR, ExtraBeesSpecies.SILVER, ExtraBeesSpecies.RADIOACTIVE, 5); - registerMutation(ExtraBeesSpecies.NUCLEAR, ForestryAllele.BeeSpecies.Frugal.getAllele(), ExtraBeesSpecies.YELLORIUM, 5); + registerMutation(ExtraBeesSpecies.NUCLEAR, FRUGAL, ExtraBeesSpecies.YELLORIUM, 5); registerMutation(ExtraBeesSpecies.NUCLEAR, ExtraBeesSpecies.YELLORIUM, ExtraBeesSpecies.CYANITE, 5); registerMutation(ExtraBeesSpecies.YELLORIUM, ExtraBeesSpecies.CYANITE, ExtraBeesSpecies.BLUTONIUM, 5); - registerMutation(ForestryAllele.BeeSpecies.Noble.getAllele(), ForestryAllele.BeeSpecies.Diligent.getAllele(), ExtraBeesSpecies.ANCIENT, 10); - registerMutation(ExtraBeesSpecies.ANCIENT, ForestryAllele.BeeSpecies.Secluded.getAllele(), ExtraBeesSpecies.PRIMEVAL, 8); + registerMutation(NOBLE, DILIGENT, ExtraBeesSpecies.ANCIENT, 10); + registerMutation(ExtraBeesSpecies.ANCIENT, SECLUDED, ExtraBeesSpecies.PRIMEVAL, 8); registerMutation(ExtraBeesSpecies.PRIMEVAL, ExtraBeesSpecies.ANCIENT, ExtraBeesSpecies.PREHISTORIC, 8); - registerMutation(ExtraBeesSpecies.PREHISTORIC, ForestryAllele.BeeSpecies.Imperial.getAllele(), ExtraBeesSpecies.RELIC, 8); + registerMutation(ExtraBeesSpecies.PREHISTORIC, IMPERIAL, ExtraBeesSpecies.RELIC, 8); registerMutation(ExtraBeesSpecies.PRIMEVAL, ExtraBeesSpecies.GROWING, ExtraBeesSpecies.COAL, 8); - registerMutation(ExtraBeesSpecies.PRIMEVAL, ForestryAllele.BeeSpecies.Rural.getAllele(), ExtraBeesSpecies.COAL, 8); - registerMutation(ExtraBeesSpecies.PRIMEVAL, ForestryAllele.BeeSpecies.Miry.getAllele(), ExtraBeesSpecies.RESIN, 8); + registerMutation(ExtraBeesSpecies.PRIMEVAL, RURAL, ExtraBeesSpecies.COAL, 8); + registerMutation(ExtraBeesSpecies.PRIMEVAL, MIRY, ExtraBeesSpecies.RESIN, 8); registerMutation(ExtraBeesSpecies.PRIMEVAL, ExtraBeesSpecies.OCEAN, ExtraBeesSpecies.OIL, 8); - registerMutation(ExtraBeesSpecies.PRIMEVAL, ForestryAllele.BeeSpecies.Frugal.getAllele(), ExtraBeesSpecies.OIL, 8); - registerMutation(ExtraBeesSpecies.OIL, ForestryAllele.BeeSpecies.Industrious.getAllele(), ExtraBeesSpecies.DISTILLED, 8); + registerMutation(ExtraBeesSpecies.PRIMEVAL, FRUGAL, ExtraBeesSpecies.OIL, 8); + registerMutation(ExtraBeesSpecies.OIL, INDUSTRIOUS, ExtraBeesSpecies.DISTILLED, 8); registerMutation(ExtraBeesSpecies.DISTILLED, ExtraBeesSpecies.OIL, ExtraBeesSpecies.FUEL, 8); registerMutation(ExtraBeesSpecies.DISTILLED, ExtraBeesSpecies.COAL, ExtraBeesSpecies.CREOSOTE, 8); registerMutation(ExtraBeesSpecies.DISTILLED, ExtraBeesSpecies.RESIN, ExtraBeesSpecies.LATEX, 8); - registerMutation(ExtraBeesSpecies.WATER, ForestryAllele.BeeSpecies.Diligent.getAllele(), ExtraBeesSpecies.RIVER, 10).restrictBiomeType(BiomeDictionary.Type.RIVER); - registerMutation(ExtraBeesSpecies.WATER, ForestryAllele.BeeSpecies.Diligent.getAllele(), ExtraBeesSpecies.OCEAN, 10).restrictBiomeType(BiomeDictionary.Type.OCEAN); + registerMutation(ExtraBeesSpecies.WATER, DILIGENT, ExtraBeesSpecies.RIVER, 10).restrictBiomeType(BiomeDictionary.Type.RIVER); + registerMutation(ExtraBeesSpecies.WATER, DILIGENT, ExtraBeesSpecies.OCEAN, 10).restrictBiomeType(BiomeDictionary.Type.OCEAN); registerMutation(ExtraBeesSpecies.BLACK, ExtraBeesSpecies.OCEAN, ExtraBeesSpecies.INK, 8); - registerMutation(ForestryAllele.BeeSpecies.Forest.getAllele(), ForestryAllele.BeeSpecies.Diligent.getAllele(), ExtraBeesSpecies.GROWING, 10); - registerMutation(ExtraBeesSpecies.GROWING, ForestryAllele.BeeSpecies.Unweary.getAllele(), ExtraBeesSpecies.THRIVING, 10); - registerMutation(ExtraBeesSpecies.THRIVING, ForestryAllele.BeeSpecies.Industrious.getAllele(), ExtraBeesSpecies.BLOOMING, 8); - registerMutation(ForestryAllele.BeeSpecies.Valiant.getAllele(), ForestryAllele.BeeSpecies.Diligent.getAllele(), ExtraBeesSpecies.SWEET, 15); - registerMutation(ExtraBeesSpecies.SWEET, ForestryAllele.BeeSpecies.Rural.getAllele(), ExtraBeesSpecies.SUGAR, 15); + registerMutation(FOREST, DILIGENT, ExtraBeesSpecies.GROWING, 10); + registerMutation(ExtraBeesSpecies.GROWING, UNWEARY, ExtraBeesSpecies.THRIVING, 10); + registerMutation(ExtraBeesSpecies.THRIVING, INDUSTRIOUS, ExtraBeesSpecies.BLOOMING, 8); + registerMutation(VALIANT, DILIGENT, ExtraBeesSpecies.SWEET, 15); + registerMutation(ExtraBeesSpecies.SWEET, RURAL, ExtraBeesSpecies.SUGAR, 15); registerMutation(ExtraBeesSpecies.SWEET, ExtraBeesSpecies.GROWING, ExtraBeesSpecies.RIPENING, 5); registerMutation(ExtraBeesSpecies.SWEET, ExtraBeesSpecies.THRIVING, ExtraBeesSpecies.FRUIT, 5); - registerMutation(ForestryAllele.BeeSpecies.Farmerly.getAllele(), ForestryAllele.BeeSpecies.Meadows.getAllele(), ExtraBeesSpecies.ALCOHOL, 10); - registerMutation(ForestryAllele.BeeSpecies.Farmerly.getAllele(), ForestryAllele.BeeSpecies.Meadows.getAllele(), ExtraBeesSpecies.FARM, 10); - registerMutation(ForestryAllele.BeeSpecies.Farmerly.getAllele(), ExtraBeesSpecies.WATER, ExtraBeesSpecies.MILK, 10); - registerMutation(ForestryAllele.BeeSpecies.Farmerly.getAllele(), ForestryAllele.BeeSpecies.Tropical.getAllele(), ExtraBeesSpecies.COFFEE, 10); - registerMutation(ExtraBeesSpecies.WATER, ForestryAllele.BeeSpecies.Miry.getAllele(), ExtraBeesSpecies.SWAMP, 10); - registerMutation(ExtraBeesSpecies.SWAMP, ForestryAllele.BeeSpecies.Boggy.getAllele(), ExtraBeesSpecies.BOGGY, 8); + registerMutation(FARMERLY, MEADOWS, ExtraBeesSpecies.ALCOHOL, 10); + registerMutation(FARMERLY, MEADOWS, ExtraBeesSpecies.FARM, 10); + registerMutation(ExtraBeesSpecies.WATER, FARMERLY, ExtraBeesSpecies.MILK, 10); + registerMutation(FARMERLY, TROPICAL, ExtraBeesSpecies.COFFEE, 10); + registerMutation(ExtraBeesSpecies.WATER, MIRY, ExtraBeesSpecies.SWAMP, 10); + registerMutation(ExtraBeesSpecies.SWAMP, BOGGY, ExtraBeesSpecies.BOGGY, 8); registerMutation(ExtraBeesSpecies.BOGGY, ExtraBeesSpecies.SWAMP, ExtraBeesSpecies.FUNGAL, 8); - registerMutation(ForestryAllele.BeeSpecies.Boggy.getAllele(), ForestryAllele.BeeSpecies.Miry.getAllele(), ExtraBeesSpecies.FUNGAL, 8); - registerMutation(ExtraBeesSpecies.WATER, ForestryAllele.BeeSpecies.Forest.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.WATER, ForestryAllele.BeeSpecies.Meadows.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.WATER, ForestryAllele.BeeSpecies.Modest.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.WATER, ForestryAllele.BeeSpecies.Tropical.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.WATER, ForestryAllele.BeeSpecies.Marshy.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.WATER, ForestryAllele.BeeSpecies.Wintry.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.WATER, ExtraBeesSpecies.ROCK, ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.WATER, ExtraBeesSpecies.BASALT, ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.ROCK, ForestryAllele.BeeSpecies.Forest.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.ROCK, ForestryAllele.BeeSpecies.Meadows.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.ROCK, ForestryAllele.BeeSpecies.Modest.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.ROCK, ForestryAllele.BeeSpecies.Tropical.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.ROCK, ForestryAllele.BeeSpecies.Marshy.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.ROCK, ForestryAllele.BeeSpecies.Wintry.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.ROCK, ExtraBeesSpecies.BASALT, ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.BASALT, ForestryAllele.BeeSpecies.Forest.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.BASALT, ForestryAllele.BeeSpecies.Meadows.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.BASALT, ForestryAllele.BeeSpecies.Modest.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.BASALT, ForestryAllele.BeeSpecies.Tropical.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.BASALT, ForestryAllele.BeeSpecies.Marshy.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.BASALT, ForestryAllele.BeeSpecies.Wintry.getAllele(), ForestryAllele.BeeSpecies.Common.getTemplate(), 15); - registerMutation(ExtraBeesSpecies.WATER, ForestryAllele.BeeSpecies.Common.getAllele(), ForestryAllele.BeeSpecies.Cultivated.getTemplate(), 12); - registerMutation(ExtraBeesSpecies.ROCK, ForestryAllele.BeeSpecies.Common.getAllele(), ForestryAllele.BeeSpecies.Cultivated.getTemplate(), 12); - registerMutation(ExtraBeesSpecies.BASALT, ForestryAllele.BeeSpecies.Common.getAllele(), ForestryAllele.BeeSpecies.Cultivated.getTemplate(), 12); - registerMutation(ExtraBeesSpecies.BASALT, ForestryAllele.BeeSpecies.Fiendish.getAllele(), ExtraBeesSpecies.TEMPERED, 30).restrictBiomeType(BiomeDictionary.Type.NETHER); - registerMutation(ExtraBeesSpecies.TEMPERED, ForestryAllele.BeeSpecies.Demonic.getAllele(), ExtraBeesSpecies.VOLCANIC, 20).restrictBiomeType(BiomeDictionary.Type.NETHER); - registerMutation(ExtraBeesSpecies.BASALT, ForestryAllele.BeeSpecies.Cultivated.getAllele(), ForestryAllele.BeeSpecies.Sinister.getTemplate(), 60).restrictBiomeType(BiomeDictionary.Type.NETHER); - registerMutation(ExtraBeesSpecies.BASALT, ForestryAllele.BeeSpecies.Sinister.getAllele(), ForestryAllele.BeeSpecies.Fiendish.getTemplate(), 40).restrictBiomeType(BiomeDictionary.Type.NETHER); - registerMutation(ForestryAllele.BeeSpecies.Sinister.getAllele(), ForestryAllele.BeeSpecies.Tropical.getAllele(), ExtraBeesSpecies.MALICIOUS, 10); - registerMutation(ExtraBeesSpecies.MALICIOUS, ForestryAllele.BeeSpecies.Tropical.getAllele(), ExtraBeesSpecies.INFECTIOUS, 8); + registerMutation(BOGGY, MIRY, ExtraBeesSpecies.FUNGAL, 8); + registerMutation(ExtraBeesSpecies.WATER, FOREST, COMMON, 15); + registerMutation(ExtraBeesSpecies.WATER, MEADOWS, COMMON, 15); + registerMutation(ExtraBeesSpecies.WATER, MODEST, COMMON, 15); + registerMutation(ExtraBeesSpecies.WATER, TROPICAL, COMMON, 15); + registerMutation(ExtraBeesSpecies.WATER, MARSHY, COMMON, 15); + registerMutation(ExtraBeesSpecies.WATER, WINTRY, COMMON, 15); + registerMutation(ExtraBeesSpecies.WATER, ExtraBeesSpecies.ROCK, COMMON.getTemplate(), 15); + registerMutation(ExtraBeesSpecies.WATER, ExtraBeesSpecies.BASALT, COMMON.getTemplate(), 15); + registerMutation(ExtraBeesSpecies.ROCK, FOREST, COMMON, 15); + registerMutation(ExtraBeesSpecies.ROCK, MEADOWS, COMMON, 15); + registerMutation(ExtraBeesSpecies.ROCK, MODEST, COMMON, 15); + registerMutation(ExtraBeesSpecies.ROCK, TROPICAL, COMMON, 15); + registerMutation(ExtraBeesSpecies.ROCK, MARSHY, COMMON, 15); + registerMutation(ExtraBeesSpecies.ROCK, WINTRY, COMMON, 15); + registerMutation(ExtraBeesSpecies.ROCK, ExtraBeesSpecies.BASALT, COMMON.getTemplate(), 15); + registerMutation(ExtraBeesSpecies.BASALT, FOREST, COMMON, 15); + registerMutation(ExtraBeesSpecies.BASALT, MEADOWS, COMMON, 15); + registerMutation(ExtraBeesSpecies.BASALT, MODEST, COMMON, 15); + registerMutation(ExtraBeesSpecies.BASALT, TROPICAL, COMMON, 15); + registerMutation(ExtraBeesSpecies.BASALT, MARSHY, COMMON, 15); + registerMutation(ExtraBeesSpecies.BASALT, WINTRY, COMMON, 15); + registerMutation(ExtraBeesSpecies.WATER, COMMON, CULTIVATED, 12); + registerMutation(ExtraBeesSpecies.ROCK, COMMON, CULTIVATED, 12); + registerMutation(ExtraBeesSpecies.BASALT, COMMON, CULTIVATED, 12); + registerMutation(ExtraBeesSpecies.BASALT, FIENDISH, ExtraBeesSpecies.TEMPERED, 30).restrictBiomeType(BiomeDictionary.Type.NETHER); + registerMutation(ExtraBeesSpecies.TEMPERED, DEMONIC, ExtraBeesSpecies.VOLCANIC, 20).restrictBiomeType(BiomeDictionary.Type.NETHER); + registerMutation(ExtraBeesSpecies.BASALT, CULTIVATED, SINISTER, 60).restrictBiomeType(BiomeDictionary.Type.NETHER); + registerMutation(ExtraBeesSpecies.BASALT, SINISTER, FIENDISH, 40).restrictBiomeType(BiomeDictionary.Type.NETHER); + registerMutation(SINISTER, TROPICAL, ExtraBeesSpecies.MALICIOUS, 10); + registerMutation(ExtraBeesSpecies.MALICIOUS, TROPICAL, ExtraBeesSpecies.INFECTIOUS, 8); registerMutation(ExtraBeesSpecies.MALICIOUS, ExtraBeesSpecies.INFECTIOUS, ExtraBeesSpecies.VIRULENT, 8); - registerMutation(ExtraBeesSpecies.WATER, ForestryAllele.BeeSpecies.Exotic.getAllele(), ExtraBeesSpecies.VISCOUS, 10); - registerMutation(ExtraBeesSpecies.VISCOUS, ForestryAllele.BeeSpecies.Exotic.getAllele(), ExtraBeesSpecies.GLUTINOUS, 8); + registerMutation(ExtraBeesSpecies.WATER, EXOTIC, ExtraBeesSpecies.VISCOUS, 10); + registerMutation(ExtraBeesSpecies.VISCOUS, EXOTIC, ExtraBeesSpecies.GLUTINOUS, 8); registerMutation(ExtraBeesSpecies.VISCOUS, ExtraBeesSpecies.GLUTINOUS, ExtraBeesSpecies.STICKY, 8); registerMutation(ExtraBeesSpecies.MALICIOUS, ExtraBeesSpecies.VISCOUS, ExtraBeesSpecies.CORROSIVE, 10); - registerMutation(ExtraBeesSpecies.CORROSIVE, ForestryAllele.BeeSpecies.Fiendish.getAllele(), ExtraBeesSpecies.CAUSTIC, 8); + registerMutation(ExtraBeesSpecies.CORROSIVE, FIENDISH, ExtraBeesSpecies.CAUSTIC, 8); registerMutation(ExtraBeesSpecies.CORROSIVE, ExtraBeesSpecies.CAUSTIC, ExtraBeesSpecies.ACIDIC, 4); - registerMutation(ForestryAllele.BeeSpecies.Cultivated.getAllele(), ForestryAllele.BeeSpecies.Valiant.getAllele(), ExtraBeesSpecies.EXCITED, 10); - registerMutation(ExtraBeesSpecies.EXCITED, ForestryAllele.BeeSpecies.Diligent.getAllele(), ExtraBeesSpecies.ENERGETIC, 8); + registerMutation(CULTIVATED, VALIANT, ExtraBeesSpecies.EXCITED, 10); + registerMutation(ExtraBeesSpecies.EXCITED, DILIGENT, ExtraBeesSpecies.ENERGETIC, 8); registerMutation(ExtraBeesSpecies.EXCITED, ExtraBeesSpecies.ENERGETIC, ExtraBeesSpecies.ECSTATIC, 8); - registerMutation(ForestryAllele.BeeSpecies.Wintry.getAllele(), ForestryAllele.BeeSpecies.Diligent.getAllele(), ExtraBeesSpecies.ARTIC, 10); + registerMutation(WINTRY, DILIGENT, ExtraBeesSpecies.ARTIC, 10); registerMutation(ExtraBeesSpecies.OCEAN, ExtraBeesSpecies.ARTIC, ExtraBeesSpecies.FREEZING, 10); - registerMutation(ExtraBeesSpecies.ROCK, ForestryAllele.BeeSpecies.Sinister.getAllele(), ExtraBeesSpecies.SHADOW, 10); + registerMutation(ExtraBeesSpecies.ROCK, SINISTER, ExtraBeesSpecies.SHADOW, 10); registerMutation(ExtraBeesSpecies.SHADOW, ExtraBeesSpecies.ROCK, ExtraBeesSpecies.DARKENED, 8); registerMutation(ExtraBeesSpecies.SHADOW, ExtraBeesSpecies.DARKENED, ExtraBeesSpecies.ABYSS, 8); - registerMutation(ForestryAllele.BeeSpecies.Forest.getAllele(), ForestryAllele.BeeSpecies.Valiant.getAllele(), ExtraBeesSpecies.RED, 5); - registerMutation(ForestryAllele.BeeSpecies.Meadows.getAllele(), ForestryAllele.BeeSpecies.Valiant.getAllele(), ExtraBeesSpecies.YELLOW, 5); - registerMutation(ExtraBeesSpecies.WATER, ForestryAllele.BeeSpecies.Valiant.getAllele(), ExtraBeesSpecies.BLUE, 5); - registerMutation(ForestryAllele.BeeSpecies.Tropical.getAllele(), ForestryAllele.BeeSpecies.Valiant.getAllele(), ExtraBeesSpecies.GREEN, 5); - registerMutation(ExtraBeesSpecies.ROCK, ForestryAllele.BeeSpecies.Valiant.getAllele(), ExtraBeesSpecies.BLACK, 5); - registerMutation(ForestryAllele.BeeSpecies.Wintry.getAllele(), ForestryAllele.BeeSpecies.Valiant.getAllele(), ExtraBeesSpecies.WHITE, 5); - registerMutation(ForestryAllele.BeeSpecies.Marshy.getAllele(), ForestryAllele.BeeSpecies.Valiant.getAllele(), ExtraBeesSpecies.BROWN, 5); + registerMutation(FOREST, VALIANT, ExtraBeesSpecies.RED, 5); + registerMutation(MEADOWS, VALIANT, ExtraBeesSpecies.YELLOW, 5); + registerMutation(ExtraBeesSpecies.WATER, VALIANT, ExtraBeesSpecies.BLUE, 5); + registerMutation(TROPICAL, VALIANT, ExtraBeesSpecies.GREEN, 5); + registerMutation(ExtraBeesSpecies.ROCK, VALIANT, ExtraBeesSpecies.BLACK, 5); + registerMutation(WINTRY, VALIANT, ExtraBeesSpecies.WHITE, 5); + registerMutation(MARSHY, VALIANT, ExtraBeesSpecies.BROWN, 5); registerMutation(ExtraBeesSpecies.RED, ExtraBeesSpecies.YELLOW, ExtraBeesSpecies.ORANGE, 5); registerMutation(ExtraBeesSpecies.GREEN, ExtraBeesSpecies.BLUE, ExtraBeesSpecies.CYAN, 5); registerMutation(ExtraBeesSpecies.RED, ExtraBeesSpecies.BLUE, ExtraBeesSpecies.PURPLE, 5); @@ -163,13 +165,25 @@ public class ExtraBeeMutation { registerMutation(ExtraBeesSpecies.PURPLE, ExtraBeesSpecies.PINK, ExtraBeesSpecies.MAGENTA, 5); registerMutation(ExtraBeesSpecies.GRAY, ExtraBeesSpecies.WHITE, ExtraBeesSpecies.LIGHTGRAY, 5); registerMutation(ExtraBeesSpecies.TEMPERED, ExtraBeesSpecies.EXCITED, ExtraBeesSpecies.GLOWSTONE, 5); - registerMutation(ForestryAllele.BeeSpecies.Austere.getAllele(), ExtraBeesSpecies.DESOLATE, ExtraBeesSpecies.HAZARDOUS, 5); - registerMutation(ForestryAllele.BeeSpecies.Ended.getAllele(), ExtraBeesSpecies.RELIC, ExtraBeesSpecies.JADED, 2).addMutationCondition(new ConditionPerson("jadedcat")); - registerMutation(ForestryAllele.BeeSpecies.Austere.getAllele(), ExtraBeesSpecies.EXCITED, ExtraBeesSpecies.CELEBRATORY, 5); - registerMutation(ForestryAllele.BeeSpecies.Secluded.getAllele(), ForestryAllele.BeeSpecies.Ended.getAllele(), ExtraBeesSpecies.UNUSUAL, 5); - registerMutation(ExtraBeesSpecies.UNUSUAL, ForestryAllele.BeeSpecies.Hermitic.getAllele(), ExtraBeesSpecies.SPATIAL, 5); - registerMutation(ExtraBeesSpecies.SPATIAL, ForestryAllele.BeeSpecies.Spectral.getAllele(), ExtraBeesSpecies.QUANTUM, 5); - registerMutation(ForestryAllele.BeeSpecies.Noble.getAllele(), ForestryAllele.BeeSpecies.Monastic.getAllele(), ExtraBeesSpecies.MYSTICAL, 5); + registerMutation(ExtraBeesSpecies.DESOLATE, AUSTERE, ExtraBeesSpecies.HAZARDOUS, 5); + registerMutation(ExtraBeesSpecies.RELIC, ENDED, ExtraBeesSpecies.JADED, 2).addMutationCondition(new ConditionPerson("jadedcat")); + registerMutation(ExtraBeesSpecies.EXCITED, AUSTERE, ExtraBeesSpecies.CELEBRATORY, 5); + registerMutation(SECLUDED, ENDED, ExtraBeesSpecies.UNUSUAL, 5); + registerMutation(ExtraBeesSpecies.UNUSUAL, HERMITIC, ExtraBeesSpecies.SPATIAL, 5); + registerMutation(ExtraBeesSpecies.SPATIAL, SPECTRAL, ExtraBeesSpecies.QUANTUM, 5); + registerMutation(NOBLE, MONASTIC, ExtraBeesSpecies.MYSTICAL, 5); + } + + public static IBeeMutationBuilder registerMutation(BeeDefinition allele0, BeeDefinition allele1, ExtraBeesSpecies mutation, int chance) { + return registerMutation(allele0.getGenome().getPrimary(), allele1.getGenome().getPrimary(), mutation, chance); + } + + public static IBeeMutationBuilder registerMutation(IAlleleBeeSpecies allele0, BeeDefinition allele1, BeeDefinition mutation, int chance) { + return registerMutation(allele0, allele1.getGenome().getPrimary(), mutation.getTemplate(), chance); + } + + public static IBeeMutationBuilder registerMutation(IAlleleBeeSpecies allele0, BeeDefinition allele1, ExtraBeesSpecies mutation, int chance) { + return registerMutation(allele0, allele1.getGenome().getPrimary(), mutation, chance); } public static IBeeMutationBuilder registerMutation(IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1, ExtraBeesSpecies mutation, int chance) { diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java index 9e514626..e2bec94a 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java @@ -1,7 +1,5 @@ package binnie.extrabees.genetics; -import binnie.core.genetics.ForestryAllele; -import binnie.core.genetics.Tolerance; import binnie.extrabees.ExtraBees; import binnie.extrabees.core.BeeModelProvider; import binnie.extrabees.genetics.effect.ExtraBeesEffect; @@ -17,6 +15,9 @@ import forestry.api.core.EnumTemperature; import forestry.api.core.IModelManager; import forestry.api.genetics.*; import forestry.apiculture.PluginApiculture; +import forestry.apiculture.genetics.BeeDefinition; +import forestry.core.genetics.alleles.AlleleHelper; +import forestry.core.genetics.alleles.EnumAllele; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -344,7 +345,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { return this.template; } - public void importTemplate(final ForestryAllele.BeeSpecies species) { + public void importTemplate(final BeeDefinition species) { this.importTemplate(species.getTemplate()); } @@ -386,15 +387,15 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { species.importTemplate(getDefaultTemplate()); } - ExtraBeesSpecies.ARID.importTemplate(ForestryAllele.BeeSpecies.Modest); + ExtraBeesSpecies.ARID.importTemplate(BeeDefinition.MODEST); ExtraBeesSpecies.ARID.addProduct(EnumHoneyComb.BARREN, 0.30f); ExtraBeesSpecies.ARID.setHumidity(EnumHumidity.ARID); ExtraBeesSpecies.ARID.setFlowerProvider(ExtraBeesFlowers.DEAD.getUID()); - ExtraBeesSpecies.ARID.setTemperatureTolerance(Tolerance.Up1); + ExtraBeesSpecies.ARID.setTemperatureTolerance(EnumAllele.Tolerance.UP_1); ExtraBeesSpecies.ARID.setSecondaryColor(aridBody); ExtraBeesSpecies.BARREN.importTemplate(ExtraBeesSpecies.ARID); - ExtraBeesSpecies.BARREN.setFertility(ForestryAllele.Fertility.Low); + ExtraBeesSpecies.BARREN.setFertility(EnumAllele.Fertility.LOW); ExtraBeesSpecies.BARREN.addProduct(EnumHoneyComb.BARREN, 0.30f); ExtraBeesSpecies.DESOLATE.importTemplate(ExtraBeesSpecies.BARREN); @@ -437,11 +438,11 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.ROCK.setAllDay(); ExtraBeesSpecies.ROCK.setCaveDwelling(); ExtraBeesSpecies.ROCK.setTolerantFlyer(); - ExtraBeesSpecies.ROCK.setTemperatureTolerance(Tolerance.Both1); - ExtraBeesSpecies.ROCK.setHumidityTolerance(Tolerance.Both1); + ExtraBeesSpecies.ROCK.setTemperatureTolerance(EnumAllele.Tolerance.BOTH_1); + ExtraBeesSpecies.ROCK.setHumidityTolerance(EnumAllele.Tolerance.BOTH_1); ExtraBeesSpecies.ROCK.setFlowerProvider(ExtraBeesFlowers.ROCK.getUID()); - ExtraBeesSpecies.ROCK.setFertility(ForestryAllele.Fertility.Low); - ExtraBeesSpecies.ROCK.setLifespan(ForestryAllele.Lifespan.Short); + ExtraBeesSpecies.ROCK.setFertility(EnumAllele.Fertility.LOW); + ExtraBeesSpecies.ROCK.setLifespan(EnumAllele.Lifespan.SHORT); ExtraBeesSpecies.ROCK.setSecondaryColor(rockBody); ExtraBeesSpecies.STONE.importTemplate(ExtraBeesSpecies.ROCK); @@ -451,8 +452,8 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.GRANITE.importTemplate(ExtraBeesSpecies.STONE); ExtraBeesSpecies.GRANITE.addProduct(EnumHoneyComb.STONE, 0.30f); - ExtraBeesSpecies.GRANITE.setTemperatureTolerance(Tolerance.Both2); - ExtraBeesSpecies.GRANITE.setHumidityTolerance(Tolerance.Both2); + ExtraBeesSpecies.GRANITE.setTemperatureTolerance(EnumAllele.Tolerance.BOTH_2); + ExtraBeesSpecies.GRANITE.setHumidityTolerance(EnumAllele.Tolerance.BOTH_2); ExtraBeesSpecies.GRANITE.setSecondaryColor(rockBody); ExtraBeesSpecies.MINERAL.importTemplate(ExtraBeesSpecies.GRANITE); @@ -545,8 +546,8 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.UNSTABLE.importTemplate(ExtraBeesSpecies.MINERAL); ExtraBeesSpecies.UNSTABLE.addProduct(EnumHoneyComb.BARREN, 0.20f); ExtraBeesSpecies.UNSTABLE.setEffect(ExtraBeesEffect.RADIOACTIVE.getUID()); - ExtraBeesSpecies.UNSTABLE.setFertility(ForestryAllele.Fertility.Low); - ExtraBeesSpecies.UNSTABLE.setLifespan(ForestryAllele.Lifespan.Shortest); + ExtraBeesSpecies.UNSTABLE.setFertility(EnumAllele.Fertility.LOW); + ExtraBeesSpecies.UNSTABLE.setLifespan(EnumAllele.Lifespan.SHORTEST); ExtraBeesSpecies.UNSTABLE.setRecessive(); ExtraBeesSpecies.NUCLEAR.importTemplate(ExtraBeesSpecies.UNSTABLE); @@ -559,27 +560,27 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.RADIOACTIVE.setHasEffect(); ExtraBeesSpecies.RADIOACTIVE.setRecessive(); - ExtraBeesSpecies.ANCIENT.importTemplate(ForestryAllele.BeeSpecies.Noble); + ExtraBeesSpecies.ANCIENT.importTemplate(BeeDefinition.NOBLE); ExtraBeesSpecies.ANCIENT.addProduct(EnumHoneyComb.OLD, 0.30f); - ExtraBeesSpecies.ANCIENT.setLifespan(ForestryAllele.Lifespan.Elongated); + ExtraBeesSpecies.ANCIENT.setLifespan(EnumAllele.Lifespan.ELONGATED); ExtraBeesSpecies.PRIMEVAL.importTemplate(ExtraBeesSpecies.ANCIENT); ExtraBeesSpecies.PRIMEVAL.addProduct(EnumHoneyComb.OLD, 0.30f); - ExtraBeesSpecies.PRIMEVAL.setLifespan(ForestryAllele.Lifespan.Long); + ExtraBeesSpecies.PRIMEVAL.setLifespan(EnumAllele.Lifespan.LONG); ExtraBeesSpecies.PREHISTORIC.importTemplate(ExtraBeesSpecies.ANCIENT); ExtraBeesSpecies.PREHISTORIC.addProduct(EnumHoneyComb.OLD, 0.30f); - ExtraBeesSpecies.PREHISTORIC.setLifespan(ForestryAllele.Lifespan.Longer); - ExtraBeesSpecies.PREHISTORIC.setFertility(ForestryAllele.Fertility.Low); + ExtraBeesSpecies.PREHISTORIC.setLifespan(EnumAllele.Lifespan.LONGER); + ExtraBeesSpecies.PREHISTORIC.setFertility(EnumAllele.Fertility.LOW); ExtraBeesSpecies.PREHISTORIC.setRecessive(); ExtraBeesSpecies.RELIC.importTemplate(ExtraBeesSpecies.ANCIENT); ExtraBeesSpecies.RELIC.addProduct(EnumHoneyComb.OLD, 0.30f); ExtraBeesSpecies.RELIC.setHasEffect(); - ExtraBeesSpecies.RELIC.setLifespan(ForestryAllele.Lifespan.Longest); + ExtraBeesSpecies.RELIC.setLifespan(EnumAllele.Lifespan.LONGEST); ExtraBeesSpecies.COAL.importTemplate(ExtraBeesSpecies.ANCIENT); - ExtraBeesSpecies.COAL.setLifespan(ForestryAllele.Lifespan.Normal); + ExtraBeesSpecies.COAL.setLifespan(EnumAllele.Lifespan.NORMAL); ExtraBeesSpecies.COAL.addProduct(EnumHoneyComb.OLD, 0.20f); ExtraBeesSpecies.COAL.addSpecialty(EnumHoneyComb.COAL, 0.08f); @@ -614,9 +615,9 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.WATER.addProduct(EnumHoneyComb.WATER, 0.30f); ExtraBeesSpecies.WATER.setIsSecret(false); ExtraBeesSpecies.WATER.setTolerantFlyer(); - ExtraBeesSpecies.WATER.setHumidityTolerance(Tolerance.Both1); + ExtraBeesSpecies.WATER.setHumidityTolerance(EnumAllele.Tolerance.BOTH_1); ExtraBeesSpecies.WATER.setFlowerProvider(ExtraBeesFlowers.WATER.getUID()); - ExtraBeesSpecies.WATER.setFlowering(ForestryAllele.Flowering.Slow); + ExtraBeesSpecies.WATER.setFlowering(EnumAllele.Flowering.SLOW); ExtraBeesSpecies.WATER.setEffect(ExtraBeesEffect.WATER.getUID()); ExtraBeesSpecies.WATER.setHumidity(EnumHumidity.DAMP); @@ -633,22 +634,22 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.INK.addProduct(EnumHoneyComb.WATER, 0.30f); ExtraBeesSpecies.INK.addSpecialty(new ItemStack(Items.DYE, 1, 0), 0.10f); - ExtraBeesSpecies.GROWING.importTemplate(ForestryAllele.BeeSpecies.Forest); + ExtraBeesSpecies.GROWING.importTemplate(BeeDefinition.FOREST); ExtraBeesSpecies.GROWING.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f); - ExtraBeesSpecies.GROWING.setFlowering(ForestryAllele.Flowering.Average); + ExtraBeesSpecies.GROWING.setFlowering(EnumAllele.Flowering.AVERAGE); ExtraBeesSpecies.GROWING.setFlowerProvider(ExtraBeesFlowers.LEAVES.getUID()); ExtraBeesSpecies.THRIVING.importTemplate(ExtraBeesSpecies.GROWING); ExtraBeesSpecies.THRIVING.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f); - ExtraBeesSpecies.THRIVING.setFlowering(ForestryAllele.Flowering.Fast); + ExtraBeesSpecies.THRIVING.setFlowering(EnumAllele.Flowering.FAST); ExtraBeesSpecies.BLOOMING.importTemplate(ExtraBeesSpecies.THRIVING); - ExtraBeesSpecies.BLOOMING.setFlowering(ForestryAllele.Flowering.Fastest); + ExtraBeesSpecies.BLOOMING.setFlowering(EnumAllele.Flowering.FASTEST); ExtraBeesSpecies.BLOOMING.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f); ExtraBeesSpecies.BLOOMING.setFlowerProvider(ExtraBeesFlowers.Sapling.getUID()); ExtraBeesSpecies.BLOOMING.setEffect(ExtraBeesEffect.BonemealSapling.getUID()); - ExtraBeesSpecies.SWEET.importTemplate(ForestryAllele.BeeSpecies.Rural); + ExtraBeesSpecies.SWEET.importTemplate(BeeDefinition.RURAL); ExtraBeesSpecies.SWEET.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.40f); ExtraBeesSpecies.SWEET.addProduct(new ItemStack(Items.SUGAR, 1, 0), 0.10f); ExtraBeesSpecies.SWEET.setFlowerProvider(ExtraBeesFlowers.SUGAR.getUID()); @@ -676,19 +677,19 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.ALCOHOL.setEffect("forestry.effectDrunkard"); ExtraBeesSpecies.ALCOHOL.setRecessive(); - ExtraBeesSpecies.FARM.importTemplate(ForestryAllele.BeeSpecies.Rural); + ExtraBeesSpecies.FARM.importTemplate(BeeDefinition.RURAL); ExtraBeesSpecies.FARM.addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f); ExtraBeesSpecies.FARM.addSpecialty(EnumHoneyComb.SEED, 0.10f); - ExtraBeesSpecies.MILK.importTemplate(ForestryAllele.BeeSpecies.Rural); + ExtraBeesSpecies.MILK.importTemplate(BeeDefinition.RURAL); ExtraBeesSpecies.MILK.addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f); ExtraBeesSpecies.MILK.addSpecialty(EnumHoneyComb.MILK, 0.10f); - ExtraBeesSpecies.COFFEE.importTemplate(ForestryAllele.BeeSpecies.Rural); + ExtraBeesSpecies.COFFEE.importTemplate(BeeDefinition.RURAL); ExtraBeesSpecies.COFFEE.addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f); ExtraBeesSpecies.COFFEE.addSpecialty(EnumHoneyComb.COFFEE, 0.08f); - ExtraBeesSpecies.SWAMP.importTemplate(ForestryAllele.BeeSpecies.Marshy); + ExtraBeesSpecies.SWAMP.importTemplate(BeeDefinition.MARSHY); ExtraBeesSpecies.SWAMP.addProduct(ItemHoneyComb.VanillaComb.MOSSY.get(), 0.30f); ExtraBeesSpecies.SWAMP.setHumidity(EnumHumidity.DAMP); ExtraBeesSpecies.SWAMP.setEffect(ExtraBeesEffect.SLOW.getUID()); @@ -705,7 +706,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.FUNGAL.setEffect(ExtraBeesEffect.BonemealMushroom.getUID()); ExtraBeesSpecies.FUNGAL.setHasEffect(); - ExtraBeesSpecies.BASALT.importTemplate(ForestryAllele.BeeSpecies.Sinister); + ExtraBeesSpecies.BASALT.importTemplate(BeeDefinition.SINISTER); ExtraBeesSpecies.BASALT.addProduct(ItemHoneyComb.VanillaComb.SIMMERING.get(), 0.25f); ExtraBeesSpecies.BASALT.setEffect("forestry.effectAggressive"); ExtraBeesSpecies.BASALT.setSecondaryColor(10101539); @@ -724,7 +725,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.VOLCANIC.setHasEffect(); ExtraBeesSpecies.VOLCANIC.setSecondaryColor(10101539); - ExtraBeesSpecies.MALICIOUS.importTemplate(ForestryAllele.BeeSpecies.Tropical); + ExtraBeesSpecies.MALICIOUS.importTemplate(BeeDefinition.TROPICAL); ExtraBeesSpecies.MALICIOUS.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f); ExtraBeesSpecies.MALICIOUS.setSecondaryColor(431972); ExtraBeesSpecies.MALICIOUS.setHumidity(EnumHumidity.DAMP); @@ -732,34 +733,34 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.INFECTIOUS.importTemplate(ExtraBeesSpecies.MALICIOUS); ExtraBeesSpecies.INFECTIOUS.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f); - ExtraBeesSpecies.INFECTIOUS.setFlowering(ForestryAllele.Flowering.Slow); + ExtraBeesSpecies.INFECTIOUS.setFlowering(EnumAllele.Flowering.SLOW); ExtraBeesSpecies.INFECTIOUS.setSecondaryColor(431972); ExtraBeesSpecies.VIRULENT.importTemplate(ExtraBeesSpecies.INFECTIOUS); ExtraBeesSpecies.VIRULENT.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f); ExtraBeesSpecies.VIRULENT.addSpecialty(EnumHoneyComb.VENOMOUS, 0.12f); - ExtraBeesSpecies.VIRULENT.setFlowering(ForestryAllele.Flowering.Average); + ExtraBeesSpecies.VIRULENT.setFlowering(EnumAllele.Flowering.AVERAGE); ExtraBeesSpecies.VIRULENT.setRecessive(); ExtraBeesSpecies.VIRULENT.setHasEffect(); ExtraBeesSpecies.VIRULENT.setSecondaryColor(431972); - ExtraBeesSpecies.VISCOUS.importTemplate(ForestryAllele.BeeSpecies.Tropical); + ExtraBeesSpecies.VISCOUS.importTemplate(BeeDefinition.TROPICAL); ExtraBeesSpecies.VISCOUS.setEffect(ExtraBeesEffect.ECTOPLASM.getUID()); ExtraBeesSpecies.VISCOUS.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f); ExtraBeesSpecies.VISCOUS.setSecondaryColor(431972); ExtraBeesSpecies.VISCOUS.setHumidity(EnumHumidity.DAMP); - ExtraBeesSpecies.VISCOUS.setSpeed(ForestryAllele.Speed.Slow); + ExtraBeesSpecies.VISCOUS.setSpeed(EnumAllele.Speed.SLOW); ExtraBeesSpecies.VISCOUS.setTemperature(EnumTemperature.WARM); ExtraBeesSpecies.GLUTINOUS.importTemplate(ExtraBeesSpecies.VISCOUS); ExtraBeesSpecies.GLUTINOUS.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f); - ExtraBeesSpecies.GLUTINOUS.setSpeed(ForestryAllele.Speed.Normal); + ExtraBeesSpecies.GLUTINOUS.setSpeed(EnumAllele.Speed.NORMAL); ExtraBeesSpecies.GLUTINOUS.setSecondaryColor(431972); ExtraBeesSpecies.STICKY.importTemplate(ExtraBeesSpecies.GLUTINOUS); ExtraBeesSpecies.STICKY.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f); ExtraBeesSpecies.STICKY.addSpecialty(EnumHoneyComb.SLIME, 0.12f); - ExtraBeesSpecies.STICKY.setSpeed(ForestryAllele.Speed.Fast); + ExtraBeesSpecies.STICKY.setSpeed(EnumAllele.Speed.FAST); ExtraBeesSpecies.STICKY.setHasEffect(); ExtraBeesSpecies.STICKY.setSecondaryColor(431972); @@ -767,7 +768,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.CORROSIVE.setHumidity(EnumHumidity.DAMP); ExtraBeesSpecies.CORROSIVE.setTemperature(EnumTemperature.WARM); ExtraBeesSpecies.CORROSIVE.setEffect(ExtraBeesEffect.ACID.getUID()); - ExtraBeesSpecies.CORROSIVE.setFlowering(ForestryAllele.Flowering.Average); + ExtraBeesSpecies.CORROSIVE.setFlowering(EnumAllele.Flowering.AVERAGE); ExtraBeesSpecies.CORROSIVE.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 20f); ExtraBeesSpecies.CORROSIVE.setRecessive(); ExtraBeesSpecies.CORROSIVE.setSecondaryColor(431972); @@ -799,7 +800,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.ECSTATIC.addSpecialty(EnumHoneyComb.IC2ENERGY, 0.08f); ExtraBeesSpecies.ECSTATIC.setHasEffect(); - ExtraBeesSpecies.ARTIC.importTemplate(ForestryAllele.BeeSpecies.Wintry); + ExtraBeesSpecies.ARTIC.importTemplate(BeeDefinition.WINTRY); ExtraBeesSpecies.ARTIC.addProduct(ItemHoneyComb.VanillaComb.FROZEN.get(), 0.25f); ExtraBeesSpecies.ARTIC.setTemperature(EnumTemperature.ICY); ExtraBeesSpecies.ARTIC.setSecondaryColor(14349811); @@ -829,20 +830,20 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.ABYSS.setHasEffect(); ExtraBeesSpecies.ABYSS.setSecondaryColor(3355443); - ExtraBeesSpecies.CELEBRATORY.importTemplate(ForestryAllele.BeeSpecies.Merry); + ExtraBeesSpecies.CELEBRATORY.importTemplate(BeeDefinition.MERRY); ExtraBeesSpecies.CELEBRATORY.setEffect(ExtraBeesEffect.FIREWORKS.getUID()); ExtraBeesSpecies.GLOWSTONE.importTemplate(ExtraBeesSpecies.BASALT); ExtraBeesSpecies.GLOWSTONE.addProduct(EnumHoneyComb.GLOWSTONE, 0.15f); ExtraBeesSpecies.GLOWSTONE.setSecondaryColor(10101539); - ExtraBeesSpecies.HAZARDOUS.importTemplate(ForestryAllele.BeeSpecies.Austere); + ExtraBeesSpecies.HAZARDOUS.importTemplate(BeeDefinition.AUSTERE); ExtraBeesSpecies.HAZARDOUS.addProduct(EnumHoneyComb.SALTPETER, 0.12f); - ExtraBeesSpecies.JADED.importTemplate(ForestryAllele.BeeSpecies.Imperial); - ExtraBeesSpecies.JADED.setFertility(ForestryAllele.Fertility.Maximum); - ExtraBeesSpecies.JADED.setFlowering(ForestryAllele.Flowering.Maximum); - ExtraBeesSpecies.JADED.setTerritory(ForestryAllele.Territory.Largest); + ExtraBeesSpecies.JADED.importTemplate(BeeDefinition.IMPERIAL); + ExtraBeesSpecies.JADED.setFertility(EnumAllele.Fertility.MAXIMUM); + ExtraBeesSpecies.JADED.setFlowering(EnumAllele.Flowering.MAXIMUM); + ExtraBeesSpecies.JADED.setTerritory(EnumAllele.Territory.LARGEST); ExtraBeesSpecies.JADED.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f); ExtraBeesSpecies.JADED.addSpecialty(new ItemStack(PluginApiculture.getItems().pollenCluster), 0.20f); ExtraBeesSpecies.JADED.setHasEffect(); @@ -850,7 +851,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.JADED.addSpecialty(EnumHoneyComb.PURPLE, 0.15f); ExtraBeesSpecies.JADED.isCounted = false; - ExtraBeesSpecies.UNUSUAL.importTemplate(ForestryAllele.BeeSpecies.Ended); + ExtraBeesSpecies.UNUSUAL.importTemplate(BeeDefinition.ENDED); ExtraBeesSpecies.UNUSUAL.setEffect(ExtraBeesEffect.GRAVITY.getUID()); ExtraBeesSpecies.UNUSUAL.setSecondaryColor(12231403); ExtraBeesSpecies.UNUSUAL.addProduct(ItemHoneyComb.VanillaComb.QUARTZ.get(), 0.25f); @@ -871,8 +872,8 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.YELLORIUM.addProduct(EnumHoneyComb.BARREN, 0.20f); ExtraBeesSpecies.YELLORIUM.addSpecialty(EnumHoneyComb.YELLORIUM, 0.02f); ExtraBeesSpecies.YELLORIUM.setEffect(ExtraBeesEffect.RADIOACTIVE.getUID()); - ExtraBeesSpecies.YELLORIUM.setFertility(ForestryAllele.Fertility.Low); - ExtraBeesSpecies.YELLORIUM.setLifespan(ForestryAllele.Lifespan.Shortest); + ExtraBeesSpecies.YELLORIUM.setFertility(EnumAllele.Fertility.LOW); + ExtraBeesSpecies.YELLORIUM.setLifespan(EnumAllele.Lifespan.SHORTEST); ExtraBeesSpecies.CYANITE.importTemplate(ExtraBeesSpecies.YELLORIUM); ExtraBeesSpecies.CYANITE.addProduct(EnumHoneyComb.BARREN, 0.20f); @@ -882,8 +883,8 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { ExtraBeesSpecies.BLUTONIUM.addProduct(EnumHoneyComb.BARREN, 0.20f); ExtraBeesSpecies.BLUTONIUM.addSpecialty(EnumHoneyComb.BLUTONIUM, 0.01f); - ExtraBeesSpecies.MYSTICAL.importTemplate(ForestryAllele.BeeSpecies.Noble); - for (final Map.Entry entry : ForestryAllele.BeeSpecies.Noble.getAllele().getProductChances().entrySet()) { + ExtraBeesSpecies.MYSTICAL.importTemplate(BeeDefinition.NOBLE); + for (final Map.Entry entry : Utils.getSpecies(BeeDefinition.NOBLE).getProductChances().entrySet()) { ExtraBeesSpecies.MYSTICAL.addProduct(entry.getKey(), entry.getValue()); } ExtraBeesSpecies.MYSTICAL.setFlowerProvider(ExtraBeesFlowers.Mystical.getUID()); @@ -1022,32 +1023,32 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies { } } - private void setFertility(final ForestryAllele.Fertility fert) { - this.getTemplate()[EnumBeeChromosome.FERTILITY.ordinal()] = fert.getAllele(); + private void setFertility(final EnumAllele.Fertility fert) { + AlleleHelper.getInstance().set(this.getTemplate(), EnumBeeChromosome.FERTILITY, fert); } - private void setLifespan(final ForestryAllele.Lifespan fert) { - this.getTemplate()[EnumBeeChromosome.LIFESPAN.ordinal()] = fert.getAllele(); + private void setLifespan(final EnumAllele.Lifespan fert) { + AlleleHelper.getInstance().set(this.getTemplate(), EnumBeeChromosome.LIFESPAN, fert); } - private void setSpeed(final ForestryAllele.Speed fert) { - this.getTemplate()[EnumBeeChromosome.SPEED.ordinal()] = fert.getAllele(); + private void setSpeed(final EnumAllele.Speed fert) { + AlleleHelper.getInstance().set(this.getTemplate(), EnumBeeChromosome.SPEED, fert); } - private void setTerritory(final ForestryAllele.Territory fert) { - this.getTemplate()[EnumBeeChromosome.TERRITORY.ordinal()] = fert.getAllele(); + private void setTerritory(final EnumAllele.Territory fert) { + AlleleHelper.getInstance().set(this.getTemplate(), EnumBeeChromosome.TERRITORY, fert); } - private void setFlowering(final ForestryAllele.Flowering fert) { - this.getTemplate()[EnumBeeChromosome.FLOWERING.ordinal()] = fert.getAllele(); + private void setFlowering(final EnumAllele.Flowering fert) { + AlleleHelper.getInstance().set(this.getTemplate(), EnumBeeChromosome.FLOWERING, fert); } - private void setHumidityTolerance(final Tolerance fert) { - this.getTemplate()[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = fert.getAllele(); + private void setHumidityTolerance(final EnumAllele.Tolerance fert) { + AlleleHelper.getInstance().set(this.getTemplate(), EnumBeeChromosome.HUMIDITY_TOLERANCE, fert); } - private void setTemperatureTolerance(final Tolerance both1) { - this.getTemplate()[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = both1.getAllele(); + private void setTemperatureTolerance(final EnumAllele.Tolerance both1) { + AlleleHelper.getInstance().set(this.getTemplate(), EnumBeeChromosome.TEMPERATURE_TOLERANCE, both1); } @Override diff --git a/src/main/java/binnie/extrabees/init/BlockRegister.java b/src/main/java/binnie/extrabees/init/BlockRegister.java index 75cb85aa..1b5d271f 100644 --- a/src/main/java/binnie/extrabees/init/BlockRegister.java +++ b/src/main/java/binnie/extrabees/init/BlockRegister.java @@ -1,14 +1,16 @@ package binnie.extrabees.init; -import binnie.core.genetics.ForestryAllele; import binnie.extrabees.ExtraBees; +import binnie.extrabees.blocks.BlockEctoplasm; import binnie.extrabees.blocks.BlockExtraBeeHive; import binnie.extrabees.blocks.type.EnumHiveType; import binnie.extrabees.genetics.ExtraBeesSpecies; -import binnie.extrabees.genetics.effect.BlockEctoplasm; import binnie.extrabees.items.ItemBeehive; import binnie.extrabees.utils.HiveDrop; +import binnie.extrabees.utils.Utils; import binnie.extrabees.utils.config.ConfigurationMain; +import forestry.api.apiculture.IAlleleBeeSpecies; +import forestry.apiculture.genetics.BeeDefinition; import net.minecraftforge.fml.common.registry.GameRegistry; /** @@ -35,12 +37,13 @@ public final class BlockRegister { } private static void registerHiveDrops(){ + IAlleleBeeSpecies valiantSpecies = Utils.getSpecies(BeeDefinition.VALIANT); EnumHiveType.Water.drops.add(new HiveDrop(ExtraBeesSpecies.WATER, 80)); - EnumHiveType.Water.drops.add(new HiveDrop(ForestryAllele.BeeSpecies.Valiant.getAllele(), 3)); + EnumHiveType.Water.drops.add(new HiveDrop(valiantSpecies, 3)); EnumHiveType.Rock.drops.add(new HiveDrop(ExtraBeesSpecies.ROCK, 80)); - EnumHiveType.Rock.drops.add(new HiveDrop(ForestryAllele.BeeSpecies.Valiant.getAllele(), 3)); + EnumHiveType.Rock.drops.add(new HiveDrop(valiantSpecies, 3)); EnumHiveType.Nether.drops.add(new HiveDrop(ExtraBeesSpecies.BASALT, 80)); - EnumHiveType.Nether.drops.add(new HiveDrop(ForestryAllele.BeeSpecies.Valiant.getAllele(), 3)); + EnumHiveType.Nether.drops.add(new HiveDrop(valiantSpecies, 3)); ExtraBees.hive.setHarvestLevel("scoop", 0, ExtraBees.hive.getDefaultState().withProperty(BlockExtraBeeHive.hiveType, EnumHiveType.Water)); ExtraBees.hive.setHarvestLevel("scoop", 0, ExtraBees.hive.getDefaultState().withProperty(BlockExtraBeeHive.hiveType, EnumHiveType.Rock)); ExtraBees.hive.setHarvestLevel("scoop", 0, ExtraBees.hive.getDefaultState().withProperty(BlockExtraBeeHive.hiveType, EnumHiveType.Nether)); diff --git a/src/main/java/binnie/extrabees/items/ItemHiveFrame.java b/src/main/java/binnie/extrabees/items/ItemHiveFrame.java index 457a8a1d..1e1a8c8e 100644 --- a/src/main/java/binnie/extrabees/items/ItemHiveFrame.java +++ b/src/main/java/binnie/extrabees/items/ItemHiveFrame.java @@ -16,12 +16,6 @@ import javax.annotation.Nullable; import java.util.List; public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IItemModelRegister { - private final EnumHiveFrame frame; - - @Override - public String getItemStackDisplayName(final ItemStack itemStack) { - return this.frame.getName(); - } public ItemHiveFrame(final EnumHiveFrame frame) { this.frame = frame; @@ -31,6 +25,13 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IIt this.setUnlocalizedName("hive_frame"); } + private final EnumHiveFrame frame; + + @Override + public String getItemStackDisplayName(final ItemStack itemStack) { + return this.frame.getName(); + } + @Override @SideOnly(Side.CLIENT) @SuppressWarnings("all") @@ -111,4 +112,5 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IIt public IBeeModifier getBeeModifier() { return this; } + } diff --git a/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java b/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java index e12d68eb..6e88c372 100644 --- a/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java +++ b/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java @@ -59,4 +59,5 @@ public class ItemIndustrialFrame extends Item { } return IndustrialFrame.values()[tagCompound.getInteger("frame")]; } + } diff --git a/src/main/java/binnie/extrabees/utils/BinnieCircuitLayout.java b/src/main/java/binnie/extrabees/utils/BinnieCircuitLayout.java index 617489c8..c63e8ed2 100644 --- a/src/main/java/binnie/extrabees/utils/BinnieCircuitLayout.java +++ b/src/main/java/binnie/extrabees/utils/BinnieCircuitLayout.java @@ -1,23 +1,21 @@ package binnie.extrabees.utils; -import binnie.Binnie; -import binnie.core.AbstractMod; import forestry.api.circuits.ChipsetManager; import forestry.api.circuits.ICircuitLayout; import forestry.api.circuits.ICircuitSocketType; +import net.minecraft.util.text.translation.I18n; public class BinnieCircuitLayout implements ICircuitLayout { - private final String uid; - private final AbstractMod mod; - private final ICircuitSocketType socketType; - public BinnieCircuitLayout(final AbstractMod mod, final String uid, final ICircuitSocketType socketType) { + public BinnieCircuitLayout(final String uid, final ICircuitSocketType socketType) { this.uid = uid; - this.mod = mod; this.socketType = socketType; ChipsetManager.circuitRegistry.registerLayout(this); } + private final String uid; + private final ICircuitSocketType socketType; + @Override public String getUID() { return "binnie.circuitLayout" + this.uid; @@ -25,16 +23,17 @@ public class BinnieCircuitLayout implements ICircuitLayout { @Override public String getName() { - return Binnie.LANGUAGE.localise(this.mod, "circuit.layout." + this.uid.toLowerCase()); + return I18n.translateToLocal("circuit.layout." + this.uid.toLowerCase()); } @Override public String getUsage() { - return Binnie.LANGUAGE.localise(this.mod, "circuit.layout." + this.uid.toLowerCase() + ".usage"); + return I18n.translateToLocal("circuit.layout." + this.uid.toLowerCase() + ".usage"); } @Override public ICircuitSocketType getSocketType() { return this.socketType; } + } diff --git a/src/main/java/binnie/extrabees/utils/BinnieCircuitSocketType.java b/src/main/java/binnie/extrabees/utils/BinnieCircuitSocketType.java index 48c4a9c2..13ed3361 100644 --- a/src/main/java/binnie/extrabees/utils/BinnieCircuitSocketType.java +++ b/src/main/java/binnie/extrabees/utils/BinnieCircuitSocketType.java @@ -3,6 +3,7 @@ package binnie.extrabees.utils; import forestry.api.circuits.ICircuitSocketType; public enum BinnieCircuitSocketType implements ICircuitSocketType { + STIMULATOR("binnie.extrabees.stimulator"); private final String uid; @@ -20,4 +21,5 @@ public enum BinnieCircuitSocketType implements ICircuitSocketType { public boolean equals(ICircuitSocketType socketType) { return uid.equals(socketType.getUid()); } + } diff --git a/src/main/java/binnie/extrabees/utils/EnumBeeBooleanModifier.java b/src/main/java/binnie/extrabees/utils/EnumBeeBooleanModifier.java index 56a9a5f7..62e4833e 100644 --- a/src/main/java/binnie/extrabees/utils/EnumBeeBooleanModifier.java +++ b/src/main/java/binnie/extrabees/utils/EnumBeeBooleanModifier.java @@ -1,8 +1,10 @@ package binnie.extrabees.utils; public enum EnumBeeBooleanModifier { + Sealed, SelfLighted, SunlightStimulated, Hellish; + } diff --git a/src/main/java/binnie/extrabees/utils/EnumBeeModifier.java b/src/main/java/binnie/extrabees/utils/EnumBeeModifier.java index fb2af442..900cc1e8 100644 --- a/src/main/java/binnie/extrabees/utils/EnumBeeModifier.java +++ b/src/main/java/binnie/extrabees/utils/EnumBeeModifier.java @@ -1,7 +1,6 @@ package binnie.extrabees.utils; -import binnie.Binnie; -import binnie.core.BinnieCore; +import net.minecraft.util.text.translation.I18n; public enum EnumBeeModifier { Territory, @@ -12,6 +11,7 @@ public enum EnumBeeModifier { GeneticDecay; public String getName() { - return Binnie.LANGUAGE.localise(BinnieCore.getInstance(), "beemodifier." + this.name().toLowerCase()); + return I18n.translateToLocal("beemodifier." + this.name().toLowerCase()); } + } diff --git a/src/main/java/binnie/extrabees/utils/Utils.java b/src/main/java/binnie/extrabees/utils/Utils.java index 49ef7fcb..1b12fa2c 100644 --- a/src/main/java/binnie/extrabees/utils/Utils.java +++ b/src/main/java/binnie/extrabees/utils/Utils.java @@ -1,7 +1,9 @@ package binnie.extrabees.utils; import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeRoot; +import forestry.apiculture.genetics.BeeDefinition; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; @@ -26,6 +28,10 @@ public class Utils { return BeeManager.beeRoot; } + public static IAlleleBeeSpecies getSpecies(BeeDefinition species){ + return species.getGenome().getPrimary(); + } + @Nullable public static Item getIC2Item(String name){ return getModItem("ic2", name); diff --git a/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java b/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java index f256295f..333f363f 100644 --- a/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java +++ b/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java @@ -36,10 +36,4 @@ public class ConfigHandler { private final Configuration config; private final Set configurables; - public interface IConfigurable { - - public void configure(Configuration config); - - } - } diff --git a/src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java b/src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java index 70cf699c..386b425a 100644 --- a/src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java +++ b/src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java @@ -5,7 +5,7 @@ import net.minecraftforge.common.config.Configuration; /** * Created by Elec332 on 12-5-2017. */ -public class ConfigurationMain implements ConfigHandler.IConfigurable { +public class ConfigurationMain implements IConfigurable { public static boolean canQuarryMineHives = true; diff --git a/src/main/java/binnie/extrabees/utils/config/IConfigurable.java b/src/main/java/binnie/extrabees/utils/config/IConfigurable.java new file mode 100644 index 00000000..c1c2fb1f --- /dev/null +++ b/src/main/java/binnie/extrabees/utils/config/IConfigurable.java @@ -0,0 +1,12 @@ +package binnie.extrabees.utils.config; + +import net.minecraftforge.common.config.Configuration; + +/** + * Created by Elec332 on 12-5-2017. + */ +public interface IConfigurable { + + public void configure(Configuration config); + +}