diff --git a/src/main/scala/resonantinduction/archaic/Archaic.scala b/src/main/scala/resonantinduction/archaic/Archaic.scala index 2e8272742..0fa7cae78 100644 --- a/src/main/scala/resonantinduction/archaic/Archaic.scala +++ b/src/main/scala/resonantinduction/archaic/Archaic.scala @@ -4,7 +4,7 @@ import cpw.mods.fml.common.Mod.EventHandler import cpw.mods.fml.common.event.{FMLInitializationEvent, FMLPostInitializationEvent, FMLPreInitializationEvent} import cpw.mods.fml.common.network.NetworkRegistry import cpw.mods.fml.common.registry.GameRegistry -import cpw.mods.fml.common.{Mod, ModMetadata, SidedProxy} +import cpw.mods.fml.common.{Mod, SidedProxy} import net.minecraft.init.{Blocks, Items} import net.minecraft.item.ItemStack import net.minecraftforge.oredict.{OreDictionary, ShapedOreRecipe} @@ -20,7 +20,7 @@ import resonantinduction.archaic.fluid.tank.TileTank import resonantinduction.archaic.process.{TileCastingMold, TileMillstone} import resonantinduction.core.{Reference, ResonantTab, Settings} import resonantinduction.mechanical.gear.ItemHandCrank -@Mod( modid = Archaic.ID, name = Archaic.NAME, version = Reference.version, dependencies = "required-after:" + Reference.coreID, modLanguage = "scala" ) +@Mod( modid = Archaic.ID, name = Archaic.NAME, version = Reference.version, modLanguage = "scala" , dependencies = "required-after:" + Reference.coreID) object Archaic { final val ID = "ResonantInduction|Archaic" @@ -34,9 +34,6 @@ object Archaic { @SidedProxy( clientSide = "resonantinduction.archaic.ClientProxy", serverSide = "resonantinduction.archaic.CommonProxy" ) var proxy : CommonProxy = _ - @Mod.Metadata( ID ) - var metadata : ModMetadata = _ - @EventHandler def preInit( evt : FMLPreInitializationEvent ) { NetworkRegistry.INSTANCE.registerGuiHandler( this, proxy ) diff --git a/src/main/scala/resonantinduction/core/Reference.scala b/src/main/scala/resonantinduction/core/Reference.scala index 928ed3e4d..9a36f912c 100644 --- a/src/main/scala/resonantinduction/core/Reference.scala +++ b/src/main/scala/resonantinduction/core/Reference.scala @@ -10,7 +10,7 @@ import java.util.logging.Logger final object Reference { final val idPrefix = "ResonantInduction" - final val coreID = idPrefix + ":Core" + final val coreID = idPrefix + "Core" /** The official name of the mod */ final val name = "Resonant Induction" diff --git a/src/main/scala/resonantinduction/core/ResonantInduction.scala b/src/main/scala/resonantinduction/core/ResonantInduction.scala index 2ec99d7fb..325cbaa8e 100644 --- a/src/main/scala/resonantinduction/core/ResonantInduction.scala +++ b/src/main/scala/resonantinduction/core/ResonantInduction.scala @@ -3,17 +3,20 @@ package resonantinduction.core import cpw.mods.fml.common.Mod.EventHandler import cpw.mods.fml.common.event.{FMLInitializationEvent, FMLPostInitializationEvent, FMLPreInitializationEvent} import cpw.mods.fml.common.network.NetworkRegistry -import cpw.mods.fml.common.{Mod, SidedProxy} +import cpw.mods.fml.common.{Mod, ModMetadata, SidedProxy} import net.minecraft.item.ItemStack import net.minecraftforge.common.MinecraftForge import net.minecraftforge.common.config.Configuration import org.modstats.{ModstatInfo, Modstats} +import resonant.engine.References import resonant.lib.config.ConfigHandler import resonant.lib.loadable.LoadableHandler import resonant.lib.network.netty.PacketManager import resonantinduction.core.handler.TextureHookHandler import resonantinduction.core.resource.ResourceGenerator +import scala.collection.convert.wrapAll._ + /** The core module of Resonant Induction * * @author Calclavia */ @@ -28,6 +31,9 @@ object ResonantInduction @SidedProxy(clientSide = "resonantinduction.core.ClientProxy", serverSide = "resonantinduction.core.CommonProxy") var proxy: CommonProxy = _ + @Mod.Metadata(References.ID) + var metadata: ModMetadata = null + @EventHandler def preInit(evt: FMLPreInitializationEvent) { @@ -55,6 +61,14 @@ object ResonantInduction @EventHandler def init(evt: FMLInitializationEvent) { + metadata.modId = Reference.name + metadata.name = Reference.name + metadata.description = Reference.name + " is a mod... TODO add description" + metadata.url = "http://calclavia.com/resonant-induction/" + metadata.version = Reference.version + Reference.build + metadata.authorList = List[String]("Calclavia", "DarkCow", "tgame14", "Maxwolf") + metadata.autogenerated = false + ResourceGenerator.generateOreResources() proxy.init() } diff --git a/src/main/scala/resonantinduction/core/ResonantTab.scala b/src/main/scala/resonantinduction/core/ResonantTab.scala index 1eeb7f0c2..28a5fb57a 100644 --- a/src/main/scala/resonantinduction/core/ResonantTab.scala +++ b/src/main/scala/resonantinduction/core/ResonantTab.scala @@ -19,7 +19,7 @@ object ResonantTab extends CreativeTabs(CreativeTabs.getNextID, "ResonantInducti { if(itemStack != null ) return itemStack.getItem - else + else return Items.iron_ingot } diff --git a/src/main/scala/resonantinduction/mechanical/Mechanical.java b/src/main/scala/resonantinduction/mechanical/Mechanical.java index bd7991852..51d51ffe5 100644 --- a/src/main/scala/resonantinduction/mechanical/Mechanical.java +++ b/src/main/scala/resonantinduction/mechanical/Mechanical.java @@ -49,7 +49,7 @@ import java.sql.Ref; * * @author DarkCow, Calclavia */ -@Mod(modid = Mechanical.ID, name = "Resonant Induction Mechanical", version = "", dependencies = "before:ThermalExpansion;required-after:ResonantInduction:Core;after:ResonantInduction|Archaic", modLanguage = "scala") +@Mod(modid = Mechanical.ID, name = "Resonant Induction Mechanical", version = "", dependencies = "before:ThermalExpansion;required-after:ResonantInductionCore;after:ResonantInduction|Archaic", modLanguage = "scala") public class Mechanical { /** Mod Information */