Merge branch 'master-MC1.11.2' of https://github.com/ForestryMC/Binnie into master-MC1.11.2

# Conflicts:
#	src/main/java/binnie/extrabees/worldgen/ExtraBeesWorldGenerator.java
#	src/main/java/binnie/extrabees/worldgen/WorldGenHiveNether.java
This commit is contained in:
marcin212 committed 2017-06-16 12:49:49 +02:00
commit 2a873e8bfb
835 files changed
+5922 -4280

No files matched your search

+50 -31
View File
@@ -1,5 +1,35 @@
package binnie.extrabees;
import com.google.common.collect.Lists;
import java.lang.reflect.Method;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
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.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.GameRegistry;
import forestry.api.apiculture.BeeManager;
import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.AlleleSpeciesRegisterEvent;
import forestry.core.gui.GuiIdRegistry;
import forestry.core.gui.GuiType;
import forestry.core.proxy.Proxies;
import binnie.Constants;
import binnie.extrabees.alveary.TileEntityExtraBeesAlvearyPart;
import binnie.extrabees.genetics.ExtraBeeMutation;
@@ -11,6 +41,8 @@ import binnie.extrabees.init.BlockRegister;
import binnie.extrabees.init.ItemRegister;
import binnie.extrabees.init.RecipeRegister;
import binnie.extrabees.items.ItemHoneyComb;
import binnie.extrabees.items.ItemHoneyCrystal;
import binnie.extrabees.items.ItemMiscProduct;
import binnie.extrabees.proxy.ExtraBeesCommonProxy;
import binnie.extrabees.utils.AlvearyMutationHandler;
import binnie.extrabees.utils.MaterialBeehive;
@@ -18,27 +50,6 @@ import binnie.extrabees.utils.Utils;
import binnie.extrabees.utils.config.ConfigHandler;
import binnie.extrabees.utils.config.ConfigurationMain;
import binnie.extrabees.worldgen.ExtraBeesWorldGenerator;
import com.google.common.collect.Lists;
import forestry.api.genetics.AlleleManager;
import forestry.core.gui.GuiIdRegistry;
import forestry.core.gui.GuiType;
import forestry.core.proxy.Proxies;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
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;
import java.lang.reflect.Method;
import java.util.List;
@Mod(modid = ExtraBees.MODID, name = "Binnie's Extra Bees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID)
public class ExtraBees {
@@ -50,6 +61,11 @@ public class ExtraBees {
@SidedProxy(clientSide = "binnie.extrabees.proxy.ExtraBeesClientProxy", serverSide = "binnie.extrabees.proxy.ExtraBeesCommonProxy")
public static ExtraBeesCommonProxy proxy;
public ExtraBees(){
MinecraftForge.EVENT_BUS.register(this);
}
public static ConfigHandler configHandler;
public static Material materialBeehive;
@@ -59,26 +75,18 @@ public class ExtraBees {
public static Item comb;
public static Item propolis;
public static Item honeyDrop;
public static Item honeyCrystal;
public static Item honeyCrystalEmpty;
public static ItemHoneyCrystal honeyCrystal;
public static Item dictionary;
public static Item itemMisc;
public static ItemMiscProduct itemMisc;
@Mod.EventHandler
@SuppressWarnings("all")
public void preInit(final FMLPreInitializationEvent event) {
materialBeehive = new MaterialBeehive();
configHandler = new ConfigHandler(event.getSuggestedConfigurationFile());
configHandler.addConfigurable(new ConfigurationMain());
BlockRegister.preInitBlocks();
ItemRegister.preInitItems();
MinecraftForge.EVENT_BUS.register(proxy);
ExtraBeesBranch.setSpeciesBranches();
// Register species
for (final ExtraBeesSpecies species : ExtraBeesSpecies.values()) {
AlleleManager.alleleRegistry.registerAllele(species);
}
try {
Method m = GuiIdRegistry.class.getDeclaredMethod("registerGuiHandlers", GuiType.class, List.class);
m.setAccessible(true);
@@ -118,4 +126,15 @@ public class ExtraBees {
AlvearyMutationHandler.addMutationItem(new ItemStack(Items.ENDER_PEARL), 2.0f);
AlvearyMutationHandler.addMutationItem(new ItemStack(Items.ENDER_EYE), 4.0f);
}
@SubscribeEvent
public void onRegisterSpecies(AlleleSpeciesRegisterEvent<IAlleleBeeSpecies> event){
if(event.getRoot() != BeeManager.beeRoot){
return;
}
ExtraBeesBranch.setSpeciesBranches();
for (final ExtraBeesSpecies species : ExtraBeesSpecies.values()) {
AlleleManager.alleleRegistry.registerAllele(species);
}
}
}