Bug fixes and additions. Closes #39, #40, #41, #43 and #44
This commit is contained in:
John Yorke committed 2017-07-21 01:00:33 -03:00
1 parent 6b2ceddd86
commit cc77874e71
74 files changed
+1696 -1296

No files matched your search

@@ -1,24 +1,19 @@
package taintedmagic.common;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.common.util.EnumHelper;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import taintedmagic.api.IBloodlust;
import taintedmagic.common.handler.ConfigHandler;
import taintedmagic.common.handler.TaintedMagicEventHandler;
import taintedmagic.common.handler.UpdateHandler;
import taintedmagic.common.lib.LibCreativeTab;
import taintedmagic.common.lib.LibStrings;
import taintedmagic.common.lib.LibInfo;
import taintedmagic.common.network.PacketHandler;
import taintedmagic.common.registry.BlockRegistry;
import taintedmagic.common.registry.ItemRegistry;
@@ -26,8 +21,6 @@ import taintedmagic.common.registry.ModEntityRegistry;
import taintedmagic.common.registry.OreDictionaryRegistry;
import taintedmagic.common.registry.RecipeRegistry;
import taintedmagic.common.registry.ResearchRegistry;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
@@ -36,7 +29,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
@Mod (modid = LibStrings.MODID, name = LibStrings.NAME, version = LibStrings.VERSION, dependencies = LibStrings.DEPENDENCIES)
@Mod (modid = LibInfo.MODID, name = LibInfo.NAME, version = LibInfo.VERSION, dependencies = LibInfo.DEPENDENCIES)
public class TaintedMagic
{
@Mod.Instance ("TaintedMagic")
@@ -47,7 +40,7 @@ public class TaintedMagic
public static CommonProxy proxy;
public static TaintedMagicEventHandler taintedMagicEvents;
public static CreativeTabs tabTaintedMagic = new LibCreativeTab();
public static CreativeTabs tabTaintedMagic = new TaintedMagicCreativeTab();
public static ConfigHandler configHandler;
public static final Logger log = LogManager.getLogger("TAINTEDMAGIC");
public static EnumRarity rarityCreation = EnumHelper.addRarity("CREATION", EnumChatFormatting.GOLD, "Creation");
@@ -67,6 +60,7 @@ public class TaintedMagic
PacketHandler.init();
ItemRegistry.init();
BlockRegistry.init();
BlockRegistry.initTiles();
ModEntityRegistry.init();
RecipeRegistry.init();