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

This commit is contained in:
Nedelosk committed 2016-10-25 18:14:30 +02:00
commit f993d0571d
40 files changed
+239 -271

No files matched your search

+7 -7
View File
@@ -25,7 +25,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@Mod(modid = Constants.GENETICS_MOD_ID, name = "Binnie's Genetics", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID)
public class Genetics extends AbstractMod {
public static ItemSerumArray itemSerumArray = null;
@Mod.Instance(Constants.GENETICS_MOD_ID)
public static Genetics instance;
@SidedProxy(clientSide = "binnie.genetics.proxy.ProxyClient", serverSide = "binnie.genetics.proxy.ProxyServer")
@@ -41,19 +41,16 @@ public class Genetics extends AbstractMod {
public static ItemAnalyst analyst;
public static Item registry;
public static Item masterRegistry;
public static ItemSerumArray itemSerumArray = null;
@Mod.EventHandler
public void preInit(final FMLPreInitializationEvent evt) {
this.addModule(new ModuleItem());
this.addModule(new ModuleMachine());
this.preInit();
proxy.registerModels();
}
@Mod.EventHandler
public void init(final FMLInitializationEvent evt) {
this.init();
proxy.registerItemAndBlockColors();
}
@Mod.EventHandler
@@ -61,8 +58,10 @@ public class Genetics extends AbstractMod {
this.postInit();
}
public Genetics() {
Genetics.instance = this;
@Override
protected void registerModules() {
this.addModule(new ModuleItem());
this.addModule(new ModuleMachine());
}
@Override
@@ -105,4 +104,5 @@ public class Genetics extends AbstractMod {
super(Genetics.instance);
}
}
}
@@ -3,11 +3,7 @@ package binnie.genetics.integration.jei;
import binnie.genetics.integration.jei.incubator.IncubatorRecipeCategory;
import binnie.genetics.integration.jei.incubator.IncubatorRecipeHandler;
import binnie.genetics.machine.Incubator;
import mezz.jei.api.BlankModPlugin;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
import mezz.jei.api.IModRegistry;
import mezz.jei.api.JEIPlugin;
import mezz.jei.api.*;
@JEIPlugin
public class GeneticsJeiPlugin extends BlankModPlugin {
@@ -1,21 +1,21 @@
package binnie.genetics.integration.jei.incubator;
import javax.annotation.Nonnull;
import binnie.genetics.integration.jei.GeneticsJeiPlugin;
import binnie.genetics.integration.jei.RecipeUids;
import binnie.genetics.machine.Incubator;
import mezz.jei.api.gui.IDrawable;
import mezz.jei.api.gui.IDrawableAnimated;
import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.gui.IDrawableAnimated.StartDirection;
import mezz.jei.api.gui.IDrawableStatic;
import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.BlankRecipeCategory;
import mezz.jei.api.recipe.IRecipeWrapper;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
import javax.annotation.Nonnull;
public class IncubatorRecipeCategory extends BlankRecipeCategory {
@Nonnull
@@ -14,6 +14,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
public class ItemSerumArray extends ItemGene implements IItemSerum {