From 0b7eb7a57841b719e78d7194ee68deae891484e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Tue, 14 Oct 2014 15:13:25 +0200
Subject: [PATCH] Using the loading plugin (used for class transformer) as core
 mod instead of the dummy one. Also fixed typo in the url in the mod info...
 how long has that been there?

---
 src/main/resources/mcmod.info                 |  2 +-
 .../scala/li/cil/oc/OpenComputersCore.scala   |  8 -------
 .../oc/common/launch/TransformerLoader.scala  | 23 ++++++++++++++++---
 3 files changed, 21 insertions(+), 12 deletions(-)
 delete mode 100644 src/main/scala/li/cil/oc/OpenComputersCore.scala

diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index bb1d5910f..886e5dd24 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -4,7 +4,7 @@
   "description": "This mod adds modular computers and robots that can be programmed in Lua.",
   "version": "${version}",
   "mcversion": "${mcversion}",
-  "url": "http://oc.ci.li/",
+  "url": "http://oc.cil.li/",
   "authorList": ["Florian 'Sangar' Nuecke", "Johannes 'Lord Joda' Lohrer", "Everyone who contributed to the mod on Github - thank you!"],
   "credits" : "Inspired by a couple of other mods, most notably ComputerCraft.",
   "logoFile" : "assets/opencomputers/textures/gui/logo.png",
diff --git a/src/main/scala/li/cil/oc/OpenComputersCore.scala b/src/main/scala/li/cil/oc/OpenComputersCore.scala
deleted file mode 100644
index 0ade59b0a..000000000
--- a/src/main/scala/li/cil/oc/OpenComputersCore.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-package li.cil.oc
-
-import cpw.mods.fml.common.Mod
-
-// This empty mod is used to avoid cyclic dependencies with mods we depend on
-// for optional interfaces, for example, but that also depend on our API.
-@Mod(modid = "OpenComputers|Core", name = "OpenComputers (Core)", version = "1.0.0", modLanguage = "scala")
-object OpenComputersCore
diff --git a/src/main/scala/li/cil/oc/common/launch/TransformerLoader.scala b/src/main/scala/li/cil/oc/common/launch/TransformerLoader.scala
index 78383dcce..cec9eca0a 100644
--- a/src/main/scala/li/cil/oc/common/launch/TransformerLoader.scala
+++ b/src/main/scala/li/cil/oc/common/launch/TransformerLoader.scala
@@ -2,6 +2,10 @@ package li.cil.oc.common.launch
 
 import java.util
 
+import com.google.common.eventbus.EventBus
+import cpw.mods.fml.common.DummyModContainer
+import cpw.mods.fml.common.LoadController
+import cpw.mods.fml.common.ModMetadata
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions
@@ -9,12 +13,25 @@ import li.cil.oc.common.asm.ClassTransformer
 
 @TransformerExclusions(Array("li.cil.oc.common.asm"))
 @MCVersion("1.7.10")
-class TransformerLoader extends IFMLLoadingPlugin {
-  override def getAccessTransformerClass = null
+class TransformerLoader extends DummyModContainer({
+  val md = new ModMetadata()
+  md.authorList.add("Sangar")
+  md.modId = "OpenComputers|Core"
+  md.version = "1.0.0"
+  md.name = "OpenComputers (Core)"
+  md.url = "http://oc.cil.li/"
+  md.description = "OC core mod used for class transformer and as API owner to avoid cyclic dependencies."
+  md
+}) with IFMLLoadingPlugin {
+  val instance = this
+
+  override def getModContainerClass = getClass.getName
+
+  override def registerBus(bus: EventBus, controller: LoadController) = true
 
   override def getASMTransformerClass = Array(classOf[ClassTransformer].getName)
 
-  override def getModContainerClass = null
+  override def getAccessTransformerClass = null
 
   override def getSetupClass = null