From b12d19c9eac9a49f8f21b341e20b2bfd81923231 Mon Sep 17 00:00:00 2001 From: Elec332 Date: Fri, 12 May 2017 16:02:25 +0200 Subject: [PATCH] More work on splitting ExtraBees --- .../binnie/core/item/IItemMiscProvider.java | 2 +- src/main/java/binnie/extrabees/ExtraBees.java | 44 ++++++++--- .../binnie/extrabees/apiary/ModuleApiary.java | 1 + .../BlockExtraBeeHive.java | 29 +------ .../type}/EnumHiveType.java | 4 +- .../config/ConfigurationMachines.java | 19 ----- .../extrabees/config/ConfigurationMain.java | 26 ------ .../binnie/extrabees/config/package-info.java | 9 --- .../extrabees/genetics/ExtraBeesSpecies.java | 6 +- .../extrabees/genetics/ModuleGenetics.java | 59 -------------- .../genetics/items/package-info.java | 9 --- .../binnie/extrabees/init/BlockRegister.java | 53 +++++++++++++ .../binnie/extrabees/init/ItemRegister.java | 12 ++- .../binnie/extrabees/init/RecipeRegister.java | 19 +++-- .../{worldgen => items}/ItemBeehive.java | 5 +- .../{genetics => }/items/ItemDictionary.java | 2 +- .../{apiary => items}/ItemHiveFrame.java | 3 +- .../{products => items}/ItemHoneyComb.java | 5 +- .../{products => items}/ItemHoneyCrystal.java | 2 +- .../ItemHoneyCrystalEmpty.java | 2 +- .../{products => items}/ItemHoneyDrop.java | 3 +- .../ItemIndustrialFrame.java | 3 +- .../{products => items}/ItemProduct.java | 4 +- .../{products => items}/ItemPropolis.java | 3 +- .../items/ItemPunnettSquare.java | 2 +- .../types}/EnumHiveFrame.java | 13 +-- .../types}/EnumHoneyComb.java | 7 +- .../types}/EnumHoneyDrop.java | 3 +- .../types}/EnumPropolis.java | 9 +-- .../{utils => items/types}/IEBEnumItem.java | 2 +- .../types}/IndustrialFrame.java | 2 +- .../java/binnie/extrabees/package-info.java | 9 --- .../extrabees/products/package-info.java | 9 --- .../extrabees/proxy/ExtraBeesProxyClient.java | 1 + .../extrabees/utils/BeeModifierLogic.java | 6 +- .../{worldgen => utils}/HiveDrop.java | 14 ++-- .../{worldgen => utils}/MaterialBeehive.java | 4 +- .../extrabees/utils/config/ConfigHandler.java | 45 +++++++++++ .../utils/config/ConfigurationMain.java | 33 ++++++++ .../worldgen/ExtraBeesWorldGenerator.java | 42 ++++++++++ .../extrabees/worldgen/ModuleGeneration.java | 79 ------------------- .../worldgen/WorldGenHiveNether.java | 18 ++++- .../extrabees/worldgen/WorldGenHiveRock.java | 14 ++-- .../extrabees/worldgen/WorldGenHiveWater.java | 6 +- 44 files changed, 327 insertions(+), 315 deletions(-) rename src/main/java/binnie/extrabees/{worldgen => blocks}/BlockExtraBeeHive.java (74%) rename src/main/java/binnie/extrabees/{worldgen => blocks/type}/EnumHiveType.java (90%) delete mode 100644 src/main/java/binnie/extrabees/config/ConfigurationMachines.java delete mode 100644 src/main/java/binnie/extrabees/config/ConfigurationMain.java delete mode 100644 src/main/java/binnie/extrabees/config/package-info.java delete mode 100644 src/main/java/binnie/extrabees/genetics/ModuleGenetics.java delete mode 100644 src/main/java/binnie/extrabees/genetics/items/package-info.java create mode 100644 src/main/java/binnie/extrabees/init/BlockRegister.java rename src/main/java/binnie/extrabees/{worldgen => items}/ItemBeehive.java (91%) rename src/main/java/binnie/extrabees/{genetics => }/items/ItemDictionary.java (98%) rename src/main/java/binnie/extrabees/{apiary => items}/ItemHiveFrame.java (97%) rename src/main/java/binnie/extrabees/{products => items}/ItemHoneyComb.java (98%) rename src/main/java/binnie/extrabees/{products => items}/ItemHoneyCrystal.java (95%) rename src/main/java/binnie/extrabees/{products => items}/ItemHoneyCrystalEmpty.java (92%) rename src/main/java/binnie/extrabees/{products => items}/ItemHoneyDrop.java (87%) rename src/main/java/binnie/extrabees/{apiary => items}/ItemIndustrialFrame.java (95%) rename src/main/java/binnie/extrabees/{products => items}/ItemProduct.java (94%) rename src/main/java/binnie/extrabees/{products => items}/ItemPropolis.java (87%) rename src/main/java/binnie/extrabees/{genetics => }/items/ItemPunnettSquare.java (96%) rename src/main/java/binnie/extrabees/{apiary => items/types}/EnumHiveFrame.java (98%) rename src/main/java/binnie/extrabees/{products => items/types}/EnumHoneyComb.java (97%) rename src/main/java/binnie/extrabees/{products => items/types}/EnumHoneyDrop.java (97%) rename src/main/java/binnie/extrabees/{products => items/types}/EnumPropolis.java (92%) rename src/main/java/binnie/extrabees/{utils => items/types}/IEBEnumItem.java (86%) rename src/main/java/binnie/extrabees/{apiary => items/types}/IndustrialFrame.java (98%) delete mode 100644 src/main/java/binnie/extrabees/package-info.java delete mode 100644 src/main/java/binnie/extrabees/products/package-info.java rename src/main/java/binnie/extrabees/{worldgen => utils}/HiveDrop.java (83%) rename src/main/java/binnie/extrabees/{worldgen => utils}/MaterialBeehive.java (90%) create mode 100644 src/main/java/binnie/extrabees/utils/config/ConfigHandler.java create mode 100644 src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java create mode 100644 src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java delete mode 100644 src/main/java/binnie/extrabees/worldgen/ModuleGeneration.java diff --git a/src/main/java/binnie/core/item/IItemMiscProvider.java b/src/main/java/binnie/core/item/IItemMiscProvider.java index 2093eef5..61a40540 100644 --- a/src/main/java/binnie/core/item/IItemMiscProvider.java +++ b/src/main/java/binnie/core/item/IItemMiscProvider.java @@ -1,6 +1,6 @@ package binnie.core.item; -import binnie.extrabees.utils.IEBEnumItem; +import binnie.extrabees.items.types.IEBEnumItem; import java.util.List; diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/src/main/java/binnie/extrabees/ExtraBees.java index 6307fff1..f2729810 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/src/main/java/binnie/extrabees/ExtraBees.java @@ -7,16 +7,24 @@ import binnie.core.gui.IBinnieGUID; import binnie.core.network.BinniePacketHandler; import binnie.core.proxy.IProxyCore; import binnie.extrabees.apiary.ModuleApiary; -import binnie.extrabees.config.ConfigurationMachines; -import binnie.extrabees.config.ConfigurationMain; import binnie.extrabees.core.ExtraBeeGUID; import binnie.extrabees.core.ModuleCore; -import binnie.extrabees.genetics.ModuleGenetics; +import binnie.extrabees.genetics.ExtraBeeMutation; +import binnie.extrabees.genetics.ExtraBeesBranch; +import binnie.extrabees.genetics.ExtraBeesFlowers; +import binnie.extrabees.genetics.ExtraBeesSpecies; +import binnie.extrabees.genetics.effect.ExtraBeesEffect; +import binnie.extrabees.init.BlockRegister; import binnie.extrabees.init.ItemRegister; import binnie.extrabees.init.RecipeRegister; +import binnie.extrabees.items.ItemHoneyComb; import binnie.extrabees.liquids.ModuleLiquids; -import binnie.extrabees.products.ItemHoneyComb; import binnie.extrabees.proxy.ExtraBeesProxy; +import binnie.extrabees.utils.MaterialBeehive; +import binnie.extrabees.utils.config.ConfigHandler; +import binnie.extrabees.utils.config.ConfigurationMain; +import binnie.extrabees.worldgen.ExtraBeesWorldGenerator; +import forestry.api.genetics.AlleleManager; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.Item; @@ -25,6 +33,7 @@ import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.registry.GameRegistry; @Mod(modid = Constants.EXTRA_BEES_MOD_ID, name = "Binnie's Extra Bees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID) public class ExtraBees extends AbstractMod { @@ -36,13 +45,11 @@ public class ExtraBees extends AbstractMod { @SuppressWarnings("NullableProblems") @SidedProxy(clientSide = "binnie.extrabees.proxy.ExtraBeesProxyClient", serverSide = "binnie.extrabees.proxy.ExtraBeesProxyServer") public static ExtraBeesProxy proxy; + public static ConfigHandler configHandler; public static Block hive; public static Material materialBeehive; public static Block ectoplasm; - public static Block apiaristMachine; - public static Block geneticMachine; - public static Block advGeneticMachine; public static Item comb; public static Item propolis; public static Item honeyDrop; @@ -52,28 +59,43 @@ public class ExtraBees extends AbstractMod { public static Item itemMisc; @Mod.EventHandler - public void preInit(final FMLPreInitializationEvent evt) { + public void preInit(final FMLPreInitializationEvent event) { this.preInit(); + materialBeehive = new MaterialBeehive(); + configHandler = new ConfigHandler(event.getModConfigurationDirectory()); + configHandler.addConfigurable(new ConfigurationMain()); + BlockRegister.preInitBlocks(); ItemRegister.preInitItems(); + + ExtraBeesBranch.setSpeciesBranches(); + // Register species + for (final ExtraBeesSpecies species : ExtraBeesSpecies.values()) { + AlleleManager.alleleRegistry.registerAllele(species); + } } @Mod.EventHandler public void init(final FMLInitializationEvent evt) { this.init(); + configHandler.reload(true); ItemHoneyComb.addSubtypes(); + GameRegistry.registerWorldGenerator(new ExtraBeesWorldGenerator(), 0); + ExtraBeesEffect.doInit(); + ExtraBeesFlowers.doInit(); + ExtraBeesSpecies.doInit(); + ExtraBeeMutation.doInit(); } @Mod.EventHandler public void postInit(final FMLPostInitializationEvent evt) { this.postInit(); + BlockRegister.postInitBlocks(); RecipeRegister.postInitRecipes(); } @Override protected void registerModules() { this.addModule(new ModuleCore()); - this.addModule(new ModuleGenetics()); - //this.addModule(new ModuleGeneration()); this.addModule(new ModuleLiquids()); this.addModule(new ModuleApiary()); } @@ -85,7 +107,7 @@ public class ExtraBees extends AbstractMod { @Override public Class[] getConfigs() { - return new Class[]{ConfigurationMain.class, ConfigurationMachines.class}; + return new Class[0]; } @Override diff --git a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java index da81e1ed..b367be98 100644 --- a/src/main/java/binnie/extrabees/apiary/ModuleApiary.java +++ b/src/main/java/binnie/extrabees/apiary/ModuleApiary.java @@ -7,6 +7,7 @@ import binnie.extrabees.ExtraBees; import binnie.extrabees.apiary.machine.AlvearyMachine; import binnie.extrabees.apiary.machine.AlvearyMutator; import binnie.extrabees.apiary.machine.AlvearyStimulator; +import binnie.extrabees.items.types.EnumHiveFrame; import binnie.extrabees.utils.BinnieCircuitLayout; import binnie.extrabees.utils.BinnieCircuitSocketType; import binnie.extrabees.utils.Utils; diff --git a/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java b/src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java similarity index 74% rename from src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java rename to src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java index d5dd09cd..26101523 100644 --- a/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java +++ b/src/main/java/binnie/extrabees/blocks/BlockExtraBeeHive.java @@ -1,6 +1,7 @@ -package binnie.extrabees.worldgen; +package binnie.extrabees.blocks; import binnie.extrabees.ExtraBees; +import binnie.extrabees.blocks.type.EnumHiveType; import forestry.api.apiculture.IHiveDrop; import forestry.api.core.Tabs; import net.minecraft.block.Block; @@ -18,8 +19,6 @@ import java.util.Collections; import java.util.List; public class BlockExtraBeeHive extends Block { - // IIcon[][] icons; - public static final PropertyEnum hiveType = PropertyEnum.create("hive_type", EnumHiveType.class); public BlockExtraBeeHive() { super(ExtraBees.materialBeehive); @@ -30,6 +29,8 @@ public class BlockExtraBeeHive extends Block { this.setCreativeTab(Tabs.tabApiculture); } + public static final PropertyEnum hiveType = PropertyEnum.create("hive_type", EnumHiveType.class); + public String getUnlocalizedName(final ItemStack itemStack) { return "extrabees.block.hive." + itemStack.getItemDamage(); } @@ -41,28 +42,6 @@ public class BlockExtraBeeHive extends Block { } } -// @Override -// public IIcon getIcon(final int side, final int metadata) { -// if (metadata >= EnumHiveType.values().length) { -// return null; -// } -// if (side < 2) { -// return this.icons[metadata][1]; -// } -// return this.icons[metadata][0]; -// } -// -// @Override -// @SideOnly(Side.CLIENT) -// public void registerBlockIcons(final IIconRegister register) { -// this.icons = new IIcon[EnumHiveType.values().length][2]; -// for (final EnumHiveType hive : EnumHiveType.values()) { -// this.icons[hive.ordinal()][0] = ExtraBees.proxy.getIcon(register, "hive/" + hive.toString().toLowerCase() + ".0"); -// this.icons[hive.ordinal()][1] = ExtraBees.proxy.getIcon(register, "hive/" + hive.toString().toLowerCase() + ".1"); -// } -// } - - @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { final ArrayList ret = new ArrayList<>(); diff --git a/src/main/java/binnie/extrabees/worldgen/EnumHiveType.java b/src/main/java/binnie/extrabees/blocks/type/EnumHiveType.java similarity index 90% rename from src/main/java/binnie/extrabees/worldgen/EnumHiveType.java rename to src/main/java/binnie/extrabees/blocks/type/EnumHiveType.java index 7be62d7e..c0b8e5c3 100644 --- a/src/main/java/binnie/extrabees/worldgen/EnumHiveType.java +++ b/src/main/java/binnie/extrabees/blocks/type/EnumHiveType.java @@ -1,4 +1,4 @@ -package binnie.extrabees.worldgen; +package binnie.extrabees.blocks.type; import forestry.api.apiculture.IHiveDrop; import net.minecraft.util.IStringSerializable; @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.List; public enum EnumHiveType implements IStringSerializable { + Water, Rock, Nether, @@ -22,4 +23,5 @@ public enum EnumHiveType implements IStringSerializable { public String getName() { return this.name().toLowerCase(); } + } diff --git a/src/main/java/binnie/extrabees/config/ConfigurationMachines.java b/src/main/java/binnie/extrabees/config/ConfigurationMachines.java deleted file mode 100644 index d7d8388c..00000000 --- a/src/main/java/binnie/extrabees/config/ConfigurationMachines.java +++ /dev/null @@ -1,19 +0,0 @@ -package binnie.extrabees.config; - -import binnie.core.mod.config.ConfigFile; -import binnie.core.mod.config.ConfigProperty; -import binnie.core.mod.config.PropDouble; -import binnie.core.mod.config.PropPercentage; - -@ConfigFile(filename = "/config/forestry/extrabees/machines.conf") -public class ConfigurationMachines { - - @ConfigProperty(key = "isolatorConsumptionChance", comment = {"Percentage chance of Isolator consuming bee, in x%."}) - @PropPercentage - public static int isolatorConsumptionChance = 30; - - @ConfigProperty(key = "geneticErrorModifier", comment = {"Modifier that changes how severe splicer/inoculator erros are.", "0 would result in no errors, even for awful serums.", "2.0 would result in twice as severe errors"}) - @PropDouble - public static double geneticErrorModifier = 1.0; - -} diff --git a/src/main/java/binnie/extrabees/config/ConfigurationMain.java b/src/main/java/binnie/extrabees/config/ConfigurationMain.java deleted file mode 100644 index 761344c8..00000000 --- a/src/main/java/binnie/extrabees/config/ConfigurationMain.java +++ /dev/null @@ -1,26 +0,0 @@ -package binnie.extrabees.config; - -import binnie.core.mod.config.ConfigFile; -import binnie.core.mod.config.ConfigProperty; -import binnie.core.mod.config.PropBoolean; -import binnie.core.mod.config.PropInteger; - -@ConfigFile(filename = "/config/forestry/extrabees/main.conf") -public class ConfigurationMain { - @ConfigProperty(key = "canQuarryMineHives") - @PropBoolean - public static boolean canQuarryMineHives = true; - @ConfigProperty(key = "waterHiveRate") - @PropInteger - public static int waterHiveRate = 1; - @ConfigProperty(key = "rockHiveRate") - @PropInteger - public static int rockHiveRate = 2; - @ConfigProperty(key = "netherHiveRate") - @PropInteger - public static int netherHiveRate = 2; - @ConfigProperty(key = "marbleHiveRate") - @PropInteger - public static int marbleHiveRate = 2; - -} diff --git a/src/main/java/binnie/extrabees/config/package-info.java b/src/main/java/binnie/extrabees/config/package-info.java deleted file mode 100644 index 9a10b512..00000000 --- a/src/main/java/binnie/extrabees/config/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.extrabees.config; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java index 8045a861..9e514626 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java @@ -5,9 +5,9 @@ import binnie.core.genetics.Tolerance; import binnie.extrabees.ExtraBees; import binnie.extrabees.core.BeeModelProvider; import binnie.extrabees.genetics.effect.ExtraBeesEffect; -import binnie.extrabees.products.EnumHoneyComb; -import binnie.extrabees.products.ItemHoneyComb; -import binnie.extrabees.utils.IEBEnumItem; +import binnie.extrabees.items.ItemHoneyComb; +import binnie.extrabees.items.types.EnumHoneyComb; +import binnie.extrabees.items.types.IEBEnumItem; import binnie.extrabees.utils.Utils; import com.google.common.base.Preconditions; import com.mojang.authlib.GameProfile; diff --git a/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java b/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java deleted file mode 100644 index 884b8c56..00000000 --- a/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java +++ /dev/null @@ -1,59 +0,0 @@ -package binnie.extrabees.genetics; - -import binnie.Binnie; -import binnie.core.IInitializable; -import binnie.extrabees.ExtraBees; -import binnie.extrabees.genetics.effect.BlockEctoplasm; -import binnie.extrabees.genetics.effect.ExtraBeesEffect; -import binnie.extrabees.genetics.items.ItemDictionary; -import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.genetics.AlleleManager; -import forestry.api.genetics.IGenome; -import forestry.api.recipes.RecipeManagers; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; - -public class ModuleGenetics implements IInitializable { - - @Override - @SuppressWarnings("all") - public void preInit() { - ExtraBeesBranch.setSpeciesBranches(); - for (final ExtraBeesSpecies species : ExtraBeesSpecies.values()) { - AlleleManager.alleleRegistry.registerAllele(species); - } - ExtraBees.dictionary = new ItemDictionary(); - ExtraBees.proxy.registerItem(ExtraBees.dictionary); - GameRegistry.register(ExtraBees.ectoplasm = new BlockEctoplasm()); - GameRegistry.register(new ItemBlock(ExtraBees.ectoplasm).setRegistryName(ExtraBees.ectoplasm.getRegistryName())); - } - - @Override - public void init() { - ExtraBeesEffect.doInit(); - ExtraBeesFlowers.doInit(); - ExtraBeesSpecies.doInit(); - ExtraBeeMutation.doInit(); - } - - @Override - public void postInit() { - /*int ebSpeciesCount = 0; TODO: Find out what this was for - int ebTotalSpeciesCount = 0; - for (final ExtraBeesSpecies species : ExtraBeesSpecies.values()) { - ++ebTotalSpeciesCount; - if (!AlleleManager.alleleRegistry.isBlacklisted(species.getUID())) { - ++ebSpeciesCount; - } - }*/ - RecipeManagers.carpenterManager.addRecipe(100, Binnie.LIQUID.getFluidStack("water", 2000), ItemStack.EMPTY, new ItemStack(ExtraBees.dictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); - } - - public static IGenome getGenome(final IAlleleBeeSpecies allele0) { - return Binnie.GENETICS.getBeeRoot().templateAsGenome(Binnie.GENETICS.getBeeRoot().getTemplate(allele0)); - } - -} diff --git a/src/main/java/binnie/extrabees/genetics/items/package-info.java b/src/main/java/binnie/extrabees/genetics/items/package-info.java deleted file mode 100644 index e4ad22a3..00000000 --- a/src/main/java/binnie/extrabees/genetics/items/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.extrabees.genetics.items; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/init/BlockRegister.java b/src/main/java/binnie/extrabees/init/BlockRegister.java new file mode 100644 index 00000000..75cb85aa --- /dev/null +++ b/src/main/java/binnie/extrabees/init/BlockRegister.java @@ -0,0 +1,53 @@ +package binnie.extrabees.init; + +import binnie.core.genetics.ForestryAllele; +import binnie.extrabees.ExtraBees; +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.config.ConfigurationMain; +import net.minecraftforge.fml.common.registry.GameRegistry; + +/** + * Created by Elec332 on 12-5-2017. + */ +public final class BlockRegister { + + public static void preInitBlocks(){ + registerHives(); + registerMisc(); + } + + public static void postInitBlocks(){ + registerHiveDrops(); + } + + private static void registerMisc(){ + GameRegistry.register(ExtraBees.ectoplasm = new BlockEctoplasm()); + } + + private static void registerHives(){ + GameRegistry.register(ExtraBees.hive = new BlockExtraBeeHive()); + GameRegistry.register(new ItemBeehive(ExtraBees.hive).setRegistryName("hive")); + } + + private static void registerHiveDrops(){ + EnumHiveType.Water.drops.add(new HiveDrop(ExtraBeesSpecies.WATER, 80)); + EnumHiveType.Water.drops.add(new HiveDrop(ForestryAllele.BeeSpecies.Valiant.getAllele(), 3)); + EnumHiveType.Rock.drops.add(new HiveDrop(ExtraBeesSpecies.ROCK, 80)); + EnumHiveType.Rock.drops.add(new HiveDrop(ForestryAllele.BeeSpecies.Valiant.getAllele(), 3)); + EnumHiveType.Nether.drops.add(new HiveDrop(ExtraBeesSpecies.BASALT, 80)); + EnumHiveType.Nether.drops.add(new HiveDrop(ForestryAllele.BeeSpecies.Valiant.getAllele(), 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)); + ExtraBees.hive.setHarvestLevel("scoop", 0, ExtraBees.hive.getDefaultState().withProperty(BlockExtraBeeHive.hiveType, EnumHiveType.Marble)); + if (!ConfigurationMain.canQuarryMineHives) { + //BuildCraftAPI.softBlocks.add(ExtraBees.hive); + } + } + +} diff --git a/src/main/java/binnie/extrabees/init/ItemRegister.java b/src/main/java/binnie/extrabees/init/ItemRegister.java index d49920cc..52f017cc 100644 --- a/src/main/java/binnie/extrabees/init/ItemRegister.java +++ b/src/main/java/binnie/extrabees/init/ItemRegister.java @@ -1,8 +1,11 @@ package binnie.extrabees.init; import binnie.extrabees.ExtraBees; -import binnie.extrabees.products.*; +import binnie.extrabees.items.*; +import binnie.extrabees.items.types.EnumHoneyComb; import net.minecraft.init.Items; +import net.minecraft.item.ItemBlock; +import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; /** @@ -12,6 +15,13 @@ public final class ItemRegister { public static void preInitItems(){ registerProducts(); + registerMisc(); + } + + @SuppressWarnings("all") + private static void registerMisc(){ + ExtraBees.proxy.registerItem(ExtraBees.dictionary = new ItemDictionary()); + GameRegistry.register(new ItemBlock(ExtraBees.ectoplasm).setRegistryName(ExtraBees.ectoplasm.getRegistryName())); } private static void registerProducts(){ diff --git a/src/main/java/binnie/extrabees/init/RecipeRegister.java b/src/main/java/binnie/extrabees/init/RecipeRegister.java index dee06224..6fdd1fd6 100644 --- a/src/main/java/binnie/extrabees/init/RecipeRegister.java +++ b/src/main/java/binnie/extrabees/init/RecipeRegister.java @@ -1,10 +1,14 @@ package binnie.extrabees.init; -import binnie.core.Mods; import binnie.extrabees.ExtraBees; -import binnie.extrabees.products.EnumHoneyComb; -import binnie.extrabees.products.EnumHoneyDrop; -import binnie.extrabees.products.EnumPropolis; +import binnie.extrabees.items.types.EnumHoneyComb; +import binnie.extrabees.items.types.EnumHoneyDrop; +import binnie.extrabees.items.types.EnumPropolis; +import binnie.extrabees.utils.Utils; +import forestry.api.recipes.RecipeManagers; +import forestry.apiculture.PluginApiculture; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -14,7 +18,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; public final class RecipeRegister { public static void postInitRecipes(){ - GameRegistry.addRecipe(new ItemStack(ExtraBees.honeyCrystalEmpty), "#@#", "@#@", "#@#", '@', Mods.Forestry.stack("honey_drop"), '#', EnumHoneyDrop.ENERGY.get(1)); + GameRegistry.addRecipe(new ItemStack(ExtraBees.honeyCrystalEmpty), "#@#", "@#@", "#@#", '@', PluginApiculture.getItems().honeyDrop, '#', EnumHoneyDrop.ENERGY.get(1)); for (final EnumHoneyComb info : EnumHoneyComb.values()) { info.addRecipe(); } @@ -24,6 +28,11 @@ public final class RecipeRegister { for (final EnumPropolis info3 : EnumPropolis.values()) { info3.addRecipe(); } + addForestryRecipes(); + } + + private static void addForestryRecipes(){ + RecipeManagers.carpenterManager.addRecipe(100, Utils.getFluidFromName("water", 2000), ItemStack.EMPTY, new ItemStack(ExtraBees.dictionary), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD); } } diff --git a/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java b/src/main/java/binnie/extrabees/items/ItemBeehive.java similarity index 91% rename from src/main/java/binnie/extrabees/worldgen/ItemBeehive.java rename to src/main/java/binnie/extrabees/items/ItemBeehive.java index ef6bbdae..b59c4d77 100644 --- a/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java +++ b/src/main/java/binnie/extrabees/items/ItemBeehive.java @@ -1,5 +1,6 @@ -package binnie.extrabees.worldgen; +package binnie.extrabees.items; +import binnie.extrabees.blocks.type.EnumHiveType; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -8,6 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; public class ItemBeehive extends ItemBlock { + public ItemBeehive(final Block block) { super(block); this.setMaxDamage(0); @@ -31,4 +33,5 @@ public class ItemBeehive extends ItemBlock { public String getItemStackDisplayName(final ItemStack itemStack) { return EnumHiveType.values()[itemStack.getItemDamage()].toString() + " Hive"; } + } diff --git a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java b/src/main/java/binnie/extrabees/items/ItemDictionary.java similarity index 98% rename from src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java rename to src/main/java/binnie/extrabees/items/ItemDictionary.java index bbbf71f9..ece1002b 100644 --- a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java +++ b/src/main/java/binnie/extrabees/items/ItemDictionary.java @@ -1,4 +1,4 @@ -package binnie.extrabees.genetics.items; +package binnie.extrabees.items; import binnie.extrabees.ExtraBees; import binnie.extrabees.core.ExtraBeeGUID; diff --git a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java b/src/main/java/binnie/extrabees/items/ItemHiveFrame.java similarity index 97% rename from src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java rename to src/main/java/binnie/extrabees/items/ItemHiveFrame.java index fe40437a..457a8a1d 100644 --- a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java +++ b/src/main/java/binnie/extrabees/items/ItemHiveFrame.java @@ -1,5 +1,6 @@ -package binnie.extrabees.apiary; +package binnie.extrabees.items; +import binnie.extrabees.items.types.EnumHiveFrame; import forestry.api.apiculture.*; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java b/src/main/java/binnie/extrabees/items/ItemHoneyComb.java similarity index 98% rename from src/main/java/binnie/extrabees/products/ItemHoneyComb.java rename to src/main/java/binnie/extrabees/items/ItemHoneyComb.java index 6b4a8e75..babec51a 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/items/ItemHoneyComb.java @@ -1,7 +1,10 @@ -package binnie.extrabees.products; +package binnie.extrabees.items; import binnie.extrabees.ExtraBees; import binnie.extrabees.core.ExtraBeeItems; +import binnie.extrabees.items.types.EnumHoneyComb; +import binnie.extrabees.items.types.EnumHoneyDrop; +import binnie.extrabees.items.types.EnumPropolis; import binnie.extrabees.utils.Utils; import forestry.api.core.Tabs; import forestry.apiculture.PluginApiculture; diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyCrystal.java b/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java similarity index 95% rename from src/main/java/binnie/extrabees/products/ItemHoneyCrystal.java rename to src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java index 47e60a12..a1c3217a 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyCrystal.java +++ b/src/main/java/binnie/extrabees/items/ItemHoneyCrystal.java @@ -1,4 +1,4 @@ -package binnie.extrabees.products; +package binnie.extrabees.items; import binnie.extrabees.ExtraBees; import forestry.api.core.Tabs; diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyCrystalEmpty.java b/src/main/java/binnie/extrabees/items/ItemHoneyCrystalEmpty.java similarity index 92% rename from src/main/java/binnie/extrabees/products/ItemHoneyCrystalEmpty.java rename to src/main/java/binnie/extrabees/items/ItemHoneyCrystalEmpty.java index 0ec4247e..2fc6ecbf 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyCrystalEmpty.java +++ b/src/main/java/binnie/extrabees/items/ItemHoneyCrystalEmpty.java @@ -1,4 +1,4 @@ -package binnie.extrabees.products; +package binnie.extrabees.items; import binnie.extrabees.ExtraBees; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java b/src/main/java/binnie/extrabees/items/ItemHoneyDrop.java similarity index 87% rename from src/main/java/binnie/extrabees/products/ItemHoneyDrop.java rename to src/main/java/binnie/extrabees/items/ItemHoneyDrop.java index 42796f4b..04bd96b6 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java +++ b/src/main/java/binnie/extrabees/items/ItemHoneyDrop.java @@ -1,5 +1,6 @@ -package binnie.extrabees.products; +package binnie.extrabees.items; +import binnie.extrabees.items.types.EnumHoneyDrop; import forestry.api.core.Tabs; import forestry.core.items.IColoredItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java b/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java similarity index 95% rename from src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java rename to src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java index f7f47834..e12d68eb 100644 --- a/src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java +++ b/src/main/java/binnie/extrabees/items/ItemIndustrialFrame.java @@ -1,5 +1,6 @@ -package binnie.extrabees.apiary; +package binnie.extrabees.items; +import binnie.extrabees.items.types.IndustrialFrame; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/main/java/binnie/extrabees/products/ItemProduct.java b/src/main/java/binnie/extrabees/items/ItemProduct.java similarity index 94% rename from src/main/java/binnie/extrabees/products/ItemProduct.java rename to src/main/java/binnie/extrabees/items/ItemProduct.java index 2b35a307..ca63d177 100644 --- a/src/main/java/binnie/extrabees/products/ItemProduct.java +++ b/src/main/java/binnie/extrabees/items/ItemProduct.java @@ -1,6 +1,6 @@ -package binnie.extrabees.products; +package binnie.extrabees.items; -import binnie.extrabees.utils.IEBEnumItem; +import binnie.extrabees.items.types.IEBEnumItem; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/binnie/extrabees/products/ItemPropolis.java b/src/main/java/binnie/extrabees/items/ItemPropolis.java similarity index 87% rename from src/main/java/binnie/extrabees/products/ItemPropolis.java rename to src/main/java/binnie/extrabees/items/ItemPropolis.java index 7ef1dbac..23469ff5 100644 --- a/src/main/java/binnie/extrabees/products/ItemPropolis.java +++ b/src/main/java/binnie/extrabees/items/ItemPropolis.java @@ -1,5 +1,6 @@ -package binnie.extrabees.products; +package binnie.extrabees.items; +import binnie.extrabees.items.types.EnumPropolis; import forestry.api.core.Tabs; import forestry.core.items.IColoredItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extrabees/genetics/items/ItemPunnettSquare.java b/src/main/java/binnie/extrabees/items/ItemPunnettSquare.java similarity index 96% rename from src/main/java/binnie/extrabees/genetics/items/ItemPunnettSquare.java rename to src/main/java/binnie/extrabees/items/ItemPunnettSquare.java index c19a4a94..9efc408e 100644 --- a/src/main/java/binnie/extrabees/genetics/items/ItemPunnettSquare.java +++ b/src/main/java/binnie/extrabees/items/ItemPunnettSquare.java @@ -1,4 +1,4 @@ -package binnie.extrabees.genetics.items; +package binnie.extrabees.items; import binnie.extrabees.ExtraBees; import binnie.extrabees.core.ExtraBeeGUID; diff --git a/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java b/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java similarity index 98% rename from src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java rename to src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java index 66cc57e7..00ba4f93 100644 --- a/src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java +++ b/src/main/java/binnie/extrabees/items/types/EnumHiveFrame.java @@ -1,6 +1,7 @@ -package binnie.extrabees.apiary; +package binnie.extrabees.items.types; import binnie.extrabees.ExtraBees; +import binnie.extrabees.items.ItemHiveFrame; import binnie.extrabees.utils.BeeModifierLogic; import binnie.extrabees.utils.EnumBeeBooleanModifier; import binnie.extrabees.utils.EnumBeeModifier; @@ -19,6 +20,7 @@ import javax.annotation.Nullable; import java.util.List; public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { + Cocoa, Cage, Soul(80), @@ -45,10 +47,6 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { GameRegistry.addRecipe(new ItemStack(EnumHiveFrame.Clay.item), " c ", "cFc", " c ", 'F', impregnatedFrame, 'c', Items.CLAY_BALL); } - private final Item item; - private final int maxDamage; - private final BeeModifierLogic logic; - EnumHiveFrame() { this(240); } @@ -59,6 +57,10 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { this.item = new ItemHiveFrame(this).setRegistryName("hive_frame." + name().toLowerCase()); } + private final Item item; + private final int maxDamage; + private final BeeModifierLogic logic; + public int getIconIndex() { return 55 + this.ordinal(); } @@ -143,4 +145,5 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier { public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { this.logic.addInformation(stack, playerIn, tooltip, advanced); } + } diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java b/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java similarity index 97% rename from src/main/java/binnie/extrabees/products/EnumHoneyComb.java rename to src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java index 9008be9d..8cd986f4 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java +++ b/src/main/java/binnie/extrabees/items/types/EnumHoneyComb.java @@ -1,7 +1,6 @@ -package binnie.extrabees.products; +package binnie.extrabees.items.types; import binnie.extrabees.ExtraBees; -import binnie.extrabees.utils.IEBEnumItem; import com.google.common.base.Objects; import forestry.api.recipes.RecipeManagers; import net.minecraft.init.Blocks; @@ -116,9 +115,9 @@ public enum EnumHoneyComb implements IEBEnumItem { this.colour = new int[]{colour, colour2}; } - int[] colour; + public int[] colour; public Map products; - boolean active; + public boolean active; public boolean deprecated; public void addRecipe() { diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java b/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java similarity index 97% rename from src/main/java/binnie/extrabees/products/EnumHoneyDrop.java rename to src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java index af1f69be..5aef2ae1 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java +++ b/src/main/java/binnie/extrabees/items/types/EnumHoneyDrop.java @@ -1,7 +1,6 @@ -package binnie.extrabees.products; +package binnie.extrabees.items.types; import binnie.extrabees.ExtraBees; -import binnie.extrabees.utils.IEBEnumItem; import binnie.extrabees.utils.Utils; import forestry.api.recipes.RecipeManagers; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extrabees/products/EnumPropolis.java b/src/main/java/binnie/extrabees/items/types/EnumPropolis.java similarity index 92% rename from src/main/java/binnie/extrabees/products/EnumPropolis.java rename to src/main/java/binnie/extrabees/items/types/EnumPropolis.java index 6d002f48..6accc012 100644 --- a/src/main/java/binnie/extrabees/products/EnumPropolis.java +++ b/src/main/java/binnie/extrabees/items/types/EnumPropolis.java @@ -1,7 +1,6 @@ -package binnie.extrabees.products; +package binnie.extrabees.items.types; import binnie.extrabees.ExtraBees; -import binnie.extrabees.utils.IEBEnumItem; import binnie.extrabees.utils.Utils; import forestry.api.recipes.RecipeManagers; import net.minecraft.item.ItemStack; @@ -31,9 +30,9 @@ public enum EnumPropolis implements IEBEnumItem { this.liquidName = liquid; } - int[] colour; - String liquidName; - boolean active; + public int[] colour; + public String liquidName; + public boolean active; public void addRecipe() { final FluidStack liquid = Utils.getFluidFromName(this.liquidName, 500); diff --git a/src/main/java/binnie/extrabees/utils/IEBEnumItem.java b/src/main/java/binnie/extrabees/items/types/IEBEnumItem.java similarity index 86% rename from src/main/java/binnie/extrabees/utils/IEBEnumItem.java rename to src/main/java/binnie/extrabees/items/types/IEBEnumItem.java index 1611434c..ea014ea6 100644 --- a/src/main/java/binnie/extrabees/utils/IEBEnumItem.java +++ b/src/main/java/binnie/extrabees/items/types/IEBEnumItem.java @@ -1,4 +1,4 @@ -package binnie.extrabees.utils; +package binnie.extrabees.items.types; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/extrabees/apiary/IndustrialFrame.java b/src/main/java/binnie/extrabees/items/types/IndustrialFrame.java similarity index 98% rename from src/main/java/binnie/extrabees/apiary/IndustrialFrame.java rename to src/main/java/binnie/extrabees/items/types/IndustrialFrame.java index 87047f46..595faabd 100644 --- a/src/main/java/binnie/extrabees/apiary/IndustrialFrame.java +++ b/src/main/java/binnie/extrabees/items/types/IndustrialFrame.java @@ -1,4 +1,4 @@ -package binnie.extrabees.apiary; +package binnie.extrabees.items.types; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeModifier; diff --git a/src/main/java/binnie/extrabees/package-info.java b/src/main/java/binnie/extrabees/package-info.java deleted file mode 100644 index 96033967..00000000 --- a/src/main/java/binnie/extrabees/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.extrabees; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/products/package-info.java b/src/main/java/binnie/extrabees/products/package-info.java deleted file mode 100644 index 45ee1975..00000000 --- a/src/main/java/binnie/extrabees/products/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package binnie.extrabees.products; - -import binnie.core.util.FieldsAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java b/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java index 548bfdeb..0d5fcf78 100644 --- a/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java +++ b/src/main/java/binnie/extrabees/proxy/ExtraBeesProxyClient.java @@ -14,6 +14,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ExtraBeesProxyClient extends ExtraBeesProxy { + public static ModelManager modelManager = new ModelManager(Constants.EXTRA_BEES_MOD_ID); @Override diff --git a/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java b/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java index 646bb1c8..fd356a2c 100644 --- a/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java +++ b/src/main/java/binnie/extrabees/utils/BeeModifierLogic.java @@ -12,14 +12,15 @@ import java.util.List; import java.util.Map; public class BeeModifierLogic { - private Map modifiers; - private List booleanModifiers; public BeeModifierLogic() { this.modifiers = new HashMap<>(); this.booleanModifiers = new ArrayList<>(); } + private Map modifiers; + private List booleanModifiers; + public float getModifier(final EnumBeeModifier modifier, final float currentModifier) { if (!this.modifiers.containsKey(modifier)) { return 1.0f; @@ -70,4 +71,5 @@ public class BeeModifierLogic { tooltip.add(modifierName + ": " + valueString); } } + } diff --git a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java b/src/main/java/binnie/extrabees/utils/HiveDrop.java similarity index 83% rename from src/main/java/binnie/extrabees/worldgen/HiveDrop.java rename to src/main/java/binnie/extrabees/utils/HiveDrop.java index 0460c40c..805632ab 100644 --- a/src/main/java/binnie/extrabees/worldgen/HiveDrop.java +++ b/src/main/java/binnie/extrabees/utils/HiveDrop.java @@ -1,6 +1,5 @@ -package binnie.extrabees.worldgen; +package binnie.extrabees.utils; -import binnie.Binnie; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IHiveDrop; @@ -11,12 +10,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; public class HiveDrop implements IHiveDrop { - private IAllele[] template; - private NonNullList extra; - private int chance; public HiveDrop(final IAlleleBeeSpecies species, final int chance) { - this(Binnie.GENETICS.getBeeRoot().getTemplate(species), NonNullList.create(), chance); + this(Utils.getBeeRoot().getTemplate(species), NonNullList.create(), chance); } public HiveDrop(IAllele[] template, final NonNullList extra, final int chance) { @@ -25,6 +21,10 @@ public class HiveDrop implements IHiveDrop { this.chance = chance; } + private IAllele[] template; + private NonNullList extra; + private int chance; + @Override public NonNullList getExtraItems(IBlockAccess world, BlockPos pos, int fortune) { final NonNullList ret = NonNullList.create(); @@ -46,7 +46,7 @@ public class HiveDrop implements IHiveDrop { @Override public IBee getBeeType(IBlockAccess world, BlockPos pos) { - return Binnie.GENETICS.getBeeRoot().getBee(Binnie.GENETICS.getBeeRoot().templateAsGenome(this.template)); + return Utils.getBeeRoot().getBee(Utils.getBeeRoot().templateAsGenome(this.template)); } } diff --git a/src/main/java/binnie/extrabees/worldgen/MaterialBeehive.java b/src/main/java/binnie/extrabees/utils/MaterialBeehive.java similarity index 90% rename from src/main/java/binnie/extrabees/worldgen/MaterialBeehive.java rename to src/main/java/binnie/extrabees/utils/MaterialBeehive.java index 76bfc92c..961aeb43 100644 --- a/src/main/java/binnie/extrabees/worldgen/MaterialBeehive.java +++ b/src/main/java/binnie/extrabees/utils/MaterialBeehive.java @@ -1,9 +1,10 @@ -package binnie.extrabees.worldgen; +package binnie.extrabees.utils; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; public class MaterialBeehive extends Material { + public MaterialBeehive() { super(MapColor.STONE); this.setRequiresTool(); @@ -14,4 +15,5 @@ public class MaterialBeehive extends Material { public boolean isOpaque() { return true; } + } diff --git a/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java b/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java new file mode 100644 index 00000000..f256295f --- /dev/null +++ b/src/main/java/binnie/extrabees/utils/config/ConfigHandler.java @@ -0,0 +1,45 @@ +package binnie.extrabees.utils.config; + +import com.google.common.base.Preconditions; +import com.google.common.collect.Sets; +import net.minecraftforge.common.config.Configuration; + +import java.io.File; +import java.util.Set; + +/** + * Created by Elec332 on 12-5-2017. + */ +public class ConfigHandler { + + public ConfigHandler(File location){ + config = new Configuration(location); + configurables = Sets.newHashSet(); + } + + public boolean addConfigurable(IConfigurable configurable){ + return configurables.add(Preconditions.checkNotNull(configurable)); + } + + public void reload(boolean load){ + if (load){ + config.load(); + } + for (IConfigurable configurable : configurables){ + configurable.configure(config); + } + if (config.hasChanged()){ + config.save(); + } + } + + 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 new file mode 100644 index 00000000..70cf699c --- /dev/null +++ b/src/main/java/binnie/extrabees/utils/config/ConfigurationMain.java @@ -0,0 +1,33 @@ +package binnie.extrabees.utils.config; + +import net.minecraftforge.common.config.Configuration; + +/** + * Created by Elec332 on 12-5-2017. + */ +public class ConfigurationMain implements ConfigHandler.IConfigurable { + + public static boolean canQuarryMineHives = true; + + public static int waterHiveRate = 1; + + public static int rockHiveRate = 2; + + public static int netherHiveRate = 2; + + public static int marbleHiveRate = 2; + + @Override + public void configure(Configuration config) { + canQuarryMineHives = config.getBoolean("canQuarryMineHives", Configuration.CATEGORY_GENERAL, true, "Sets whether a quarry will be able to mine hives or not."); + + config.addCustomCategoryComment(WORLDGEN, "WorldGen settings for ExtraBees"); + waterHiveRate = config.getInt("waterHiveRate", WORLDGEN, 2, 0, 10, "Sets the worldgen spawn chance for water hives."); + rockHiveRate = config.getInt("rockHiveRate", WORLDGEN, 2, 0, 10, "Sets the worldgen spawn chance for rock hives."); + netherHiveRate = config.getInt("netherHiveRate", WORLDGEN, 2, 0, 10, "Sets the worldgen spawn chance for nether hives."); + marbleHiveRate = config.getInt("marbleHiveRate", WORLDGEN, 2, 0, 10, "Sets the worldgen spawn chance for marble hives."); + } + + private static final String WORLDGEN = "World-Gen"; + +} diff --git a/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java b/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java new file mode 100644 index 00000000..64f8fa34 --- /dev/null +++ b/src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java @@ -0,0 +1,42 @@ +package binnie.extrabees.worldgen; + +import binnie.extrabees.utils.config.ConfigurationMain; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.chunk.IChunkGenerator; +import net.minecraft.world.chunk.IChunkProvider; +import net.minecraftforge.fml.common.IWorldGenerator; + +import java.util.Random; + +/** + * Created by Elec332 on 12-5-2017. + */ +public class ExtraBeesWorldGenerator implements IWorldGenerator { + + @Override + public void generate(final Random rand, int chunkX, int chunkZ, final World world, final IChunkGenerator chunkGenerator, final IChunkProvider chunkProvider) { + chunkX <<= 4; + chunkZ <<= 4; + for (int i = 0; i < ConfigurationMain.waterHiveRate; ++i) { + final int randPosX = chunkX + rand.nextInt(16); + final int randPosY = rand.nextInt(50) + 20; + final int randPosZ = chunkZ + rand.nextInt(16); + new WorldGenHiveWater().generate(world, rand, new BlockPos(randPosX, randPosY, randPosZ)); + } + for (int i = 0; i < ConfigurationMain.rockHiveRate; ++i) { + final int randPosX = chunkX + rand.nextInt(16); + final int randPosY = rand.nextInt(50) + 20; + final int randPosZ = chunkZ + rand.nextInt(16); + new WorldGenHiveRock().generate(world, rand, new BlockPos(randPosX, randPosY, randPosZ)); + } + for (int i = 0; i < ConfigurationMain.netherHiveRate; ++i) { + final int randPosX = chunkX + rand.nextInt(16); + final int randPosY = rand.nextInt(50) + 20; + final int randPosZ = chunkZ + rand.nextInt(16); + new WorldGenHiveNether().generate(world, rand, new BlockPos(randPosX, randPosY, randPosZ)); + } + + } + +} diff --git a/src/main/java/binnie/extrabees/worldgen/ModuleGeneration.java b/src/main/java/binnie/extrabees/worldgen/ModuleGeneration.java deleted file mode 100644 index aefeb971..00000000 --- a/src/main/java/binnie/extrabees/worldgen/ModuleGeneration.java +++ /dev/null @@ -1,79 +0,0 @@ -package binnie.extrabees.worldgen; - -import binnie.core.IInitializable; -import binnie.core.genetics.ForestryAllele; -import binnie.extrabees.ExtraBees; -import binnie.extrabees.config.ConfigurationMain; -import binnie.extrabees.genetics.ExtraBeesSpecies; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkGenerator; -import net.minecraft.world.chunk.IChunkProvider; -import net.minecraftforge.fml.common.IWorldGenerator; -import net.minecraftforge.fml.common.registry.GameRegistry; - -import java.util.Random; - -public class ModuleGeneration implements IWorldGenerator, IInitializable { - static int waterRate = 2; - static int rockRate = 2; - static int netherRate = 2; - static int marbleRate = 2; - - @Override - public void preInit() { - ExtraBees.materialBeehive = new MaterialBeehive(); - GameRegistry.register(ExtraBees.hive = new BlockExtraBeeHive()); - GameRegistry.register(new ItemBeehive(ExtraBees.hive).setRegistryName("hive")); - } - - @Override - public void init() { - ModuleGeneration.waterRate = ConfigurationMain.waterHiveRate; - ModuleGeneration.rockRate = ConfigurationMain.rockHiveRate; - ModuleGeneration.netherRate = ConfigurationMain.netherHiveRate; - GameRegistry.registerWorldGenerator(new ModuleGeneration(), 0); - if (!ConfigurationMain.canQuarryMineHives) { - //BuildCraftAPI.softBlocks.add(ExtraBees.hive); - } - } - - @Override - public void postInit() { - EnumHiveType.Water.drops.add(new HiveDrop(ExtraBeesSpecies.WATER, 80)); - EnumHiveType.Water.drops.add(new HiveDrop(ForestryAllele.BeeSpecies.Valiant.getAllele(), 3)); - EnumHiveType.Rock.drops.add(new HiveDrop(ExtraBeesSpecies.ROCK, 80)); - EnumHiveType.Rock.drops.add(new HiveDrop(ForestryAllele.BeeSpecies.Valiant.getAllele(), 3)); - EnumHiveType.Nether.drops.add(new HiveDrop(ExtraBeesSpecies.BASALT, 80)); - EnumHiveType.Nether.drops.add(new HiveDrop(ForestryAllele.BeeSpecies.Valiant.getAllele(), 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)); - ExtraBees.hive.setHarvestLevel("scoop", 0, ExtraBees.hive.getDefaultState().withProperty(BlockExtraBeeHive.hiveType, EnumHiveType.Marble)); - } - - @Override - public void generate(final Random rand, int chunkX, int chunkZ, final World world, final IChunkGenerator chunkGenerator, final IChunkProvider chunkProvider) { - chunkX <<= 4; - chunkZ <<= 4; - for (int i = 0; i < ModuleGeneration.waterRate; ++i) { - final int randPosX = chunkX + rand.nextInt(16); - final int randPosY = rand.nextInt(50) + 20; - final int randPosZ = chunkZ + rand.nextInt(16); - new WorldGenHiveWater().generate(world, rand, new BlockPos(randPosX, randPosY, randPosZ)); - } - for (int i = 0; i < ModuleGeneration.rockRate; ++i) { - final int randPosX = chunkX + rand.nextInt(16); - final int randPosY = rand.nextInt(50) + 20; - final int randPosZ = chunkZ + rand.nextInt(16); - new WorldGenHiveRock().generate(world, rand, new BlockPos(randPosX, randPosY, randPosZ)); - } - for (int i = 0; i < ModuleGeneration.netherRate; ++i) { - final int randPosX = chunkX + rand.nextInt(16); - final int randPosY = rand.nextInt(50) + 20; - final int randPosZ = chunkZ + rand.nextInt(16); - new WorldGenHiveNether().generate(world, rand, new BlockPos(randPosX, randPosY, randPosZ)); - } - } - -} diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java index e41db3e9..fe1c8fa1 100644 --- a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java +++ b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java @@ -1,8 +1,11 @@ package binnie.extrabees.worldgen; import binnie.extrabees.ExtraBees; +import binnie.extrabees.blocks.BlockExtraBeeHive; +import binnie.extrabees.blocks.type.EnumHiveType; import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; @@ -12,6 +15,7 @@ import net.minecraftforge.common.BiomeDictionary; import java.util.Random; public class WorldGenHiveNether extends WorldGenerator { + @Override public boolean generate(final World world, final Random random, final BlockPos pos) { final Biome biome = world.getBiome(pos); @@ -25,6 +29,18 @@ public class WorldGenHiveNether extends WorldGenerator { } public boolean embedInWall(final World world, final Block blockID, final BlockPos pos) { - return world.getBlockState(pos).getBlock() == blockID && world.getBlockState(pos.up()).getBlock() == blockID && world.getBlockState(pos.down()).getBlock() == blockID && (world.isAirBlock(pos.add(1, 0, 0)) || world.isAirBlock(pos.add(-1, 0, 0)) || world.isAirBlock(pos.add(0, 0, 1)) || world.isAirBlock(pos.add(0, 0, -1))); + if (world.getBlockState(pos).getBlock() != blockID){ + return false; + } + for (EnumFacing facing : EnumFacing.VALUES){ + if (facing.getAxis() == EnumFacing.Axis.Y && world.getBlockState(pos.up()).getBlock() != blockID){ + return false; + } + if (world.isAirBlock(pos.offset(facing))){ + return true; + } + } + return false; } + } diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java index 6442fb92..604e02f8 100644 --- a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java +++ b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveRock.java @@ -2,27 +2,29 @@ package binnie.extrabees.worldgen; import binnie.extrabees.ExtraBees; -import net.minecraft.block.Block; +import binnie.extrabees.blocks.BlockExtraBeeHive; +import binnie.extrabees.blocks.type.EnumHiveType; +import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.feature.WorldGenerator; import java.util.Random; public class WorldGenHiveRock extends WorldGenerator { + @Override public boolean generate(final World world, final Random random, final BlockPos pos) { - final Biome biome = world.getBiome(pos); - final Block block = world.getBlockState(pos).getBlock(); - if (block == null) { + final IBlockState block = world.getBlockState(pos); + if (!block.getBlock().isAir(block, world, pos)) { return true; } - if (block.isReplaceableOreGen(world.getBlockState(pos), world, pos, BlockStateMatcher.forBlock(Blocks.STONE))) { + if (block.getBlock().isReplaceableOreGen(block, world, pos, BlockStateMatcher.forBlock(Blocks.STONE))) { world.setBlockState(pos, ExtraBees.hive.getDefaultState().withProperty(BlockExtraBeeHive.hiveType, EnumHiveType.Rock)); } return true; } + } diff --git a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java index 8e9719c0..71140927 100644 --- a/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java +++ b/src/main/java/binnie/extrabees/worldgen/WorldGenHiveWater.java @@ -1,19 +1,20 @@ package binnie.extrabees.worldgen; import binnie.extrabees.ExtraBees; +import binnie.extrabees.blocks.BlockExtraBeeHive; +import binnie.extrabees.blocks.type.EnumHiveType; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.feature.WorldGenerator; import java.util.Random; public class WorldGenHiveWater extends WorldGenerator { + @Override public boolean generate(final World world, final Random random, final BlockPos pos) { - final Biome biome = world.getBiome(pos); final int i2 = pos.getX() + random.nextInt(8) - random.nextInt(8); final int j2 = pos.getY() + random.nextInt(4) - random.nextInt(4); final int k2 = pos.getZ() + random.nextInt(8) - random.nextInt(8); @@ -26,4 +27,5 @@ public class WorldGenHiveWater extends WorldGenerator { } return true; } + }