Fixed textures, split the alveary stuff, onlt GUI left to do!

This commit is contained in:
Elec332 committed 2017-05-13 17:10:55 +02:00
1 parent a5e27bfd47
commit 34a9a90ab3
35 files changed
+1453 -586

No files matched your search

+37 -15
View File
@@ -1,5 +1,6 @@
package binnie.extrabees;
import binnie.extrabees.alveary.TileEntityExtraBeesAlvearyPart;
import binnie.extrabees.client.GuiHack;
import binnie.extrabees.genetics.ExtraBeeMutation;
import binnie.extrabees.genetics.ExtraBeesBranch;
@@ -11,22 +12,34 @@ import binnie.extrabees.init.ItemRegister;
import binnie.extrabees.init.RecipeRegister;
import binnie.extrabees.items.ItemHoneyComb;
import binnie.extrabees.proxy.ExtraBeesCommonProxy;
import binnie.extrabees.utils.AlvearyMutationHandler;
import binnie.extrabees.utils.MaterialBeehive;
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.network.simpleimpl.SimpleNetworkWrapper;
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)
public class ExtraBees {
@@ -38,10 +51,10 @@ public class ExtraBees {
@SidedProxy(clientSide = "binnie.extrabees.proxy.ExtraBeesClientProxy", serverSide = "binnie.extrabees.proxy.ExtraBeesCommonProxy")
public static ExtraBeesCommonProxy proxy;
public static ConfigHandler configHandler;
public static NetworkHandler networkHandler;
public static Block hive;
public static Material materialBeehive;
public static Block hive;
public static Block alveary;
public static Block ectoplasm;
public static Item comb;
public static Item propolis;
@@ -52,21 +65,29 @@ public class ExtraBees {
public static Item itemMisc;
@Mod.EventHandler
@SuppressWarnings("all")
public void preInit(final FMLPreInitializationEvent event) {
GuiHack.INSTANCE.preInit();
networkHandler = new NetworkHandler(MODID);
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);
m.invoke(null, new Object[]{GuiType.Tile, Lists.newArrayList(TileEntityExtraBeesAlvearyPart.class)});
} catch (Exception e){
throw new RuntimeException(e);
}
Proxies.render.registerModels();
}
@Mod.EventHandler
@@ -88,16 +109,17 @@ public class ExtraBees {
BlockRegister.postInitBlocks();
RecipeRegister.postInitRecipes();
}
private static class NetworkHandler {
private NetworkHandler(String channel){
this.networkWrapper = new SimpleNetworkWrapper(channel);
}
private final SimpleNetworkWrapper networkWrapper;
//Register mutations
AlvearyMutationHandler.addMutationItem(new ItemStack(Blocks.SOUL_SAND), 1.5f);
AlvearyMutationHandler.addMutationItem(Utils.getIC2Item("UranFuel"), 4.0f);
AlvearyMutationHandler.addMutationItem(Utils.getIC2Item("MOXFuel"), 10.0f);
AlvearyMutationHandler.addMutationItem(Utils.getIC2Item("Plutonium"), 8.0f);
AlvearyMutationHandler.addMutationItem(Utils.getIC2Item("smallPlutonium"), 5.0f);
AlvearyMutationHandler.addMutationItem(Utils.getIC2Item("Uran235"), 4.0f);
AlvearyMutationHandler.addMutationItem(Utils.getIC2Item("smallUran235"), 2.5f);
AlvearyMutationHandler.addMutationItem(Utils.getIC2Item("Uran238"), 2.0f);
AlvearyMutationHandler.addMutationItem(new ItemStack(Items.ENDER_PEARL), 2.0f);
AlvearyMutationHandler.addMutationItem(new ItemStack(Items.ENDER_EYE), 4.0f);
}
}