diff --git a/gradle.properties b/gradle.properties index 9635aaa..75cbe36 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -mod_version = 1.2.0 +mod_version = 1.3.0 group = net.shadowfacts archivesBaseName = Forgelin diff --git a/src/main/java/net/shadowfacts/forgelin/ForgelinPlugin.java b/src/main/java/net/shadowfacts/forgelin/ForgelinPlugin.java deleted file mode 100644 index 4cd7d53..0000000 --- a/src/main/java/net/shadowfacts/forgelin/ForgelinPlugin.java +++ /dev/null @@ -1,37 +0,0 @@ -package net.shadowfacts.forgelin; - -import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; - -import java.util.Map; - -/** - * @author shadowfacts - */ -public class ForgelinPlugin implements IFMLLoadingPlugin { - - @Override - public String[] getASMTransformerClass() { - return new String[0]; - } - - @Override - public String getModContainerClass() { - return null; - } - - @Override - public String getSetupClass() { - return "net.shadowfacts.forgelin.ForgelinSetup"; - } - - @Override - public void injectData(Map data) { - - } - - @Override - public String getAccessTransformerClass() { - return null; - } - -} diff --git a/src/main/java/net/shadowfacts/forgelin/ForgelinSetup.java b/src/main/java/net/shadowfacts/forgelin/ForgelinSetup.java deleted file mode 100644 index 7cf8fa9..0000000 --- a/src/main/java/net/shadowfacts/forgelin/ForgelinSetup.java +++ /dev/null @@ -1,27 +0,0 @@ -package net.shadowfacts.forgelin; - -import net.minecraftforge.fml.relauncher.IFMLCallHook; - -import java.util.Map; - -/** - * @author shadowfacts - */ -public class ForgelinSetup implements IFMLCallHook { - - @Override - public void injectData(Map data) { - ClassLoader loader = (ClassLoader)data.get("classLoader"); - try { - loader.loadClass("net.shadowfacts.forgelin.KotlinAdapter"); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } - } - - @Override - public Void call() throws Exception { - return null; - } - -} diff --git a/src/main/kotlin/net/shadowfacts/forgelin/Forgelin.kt b/src/main/kotlin/net/shadowfacts/forgelin/Forgelin.kt new file mode 100644 index 0000000..0bd4973 --- /dev/null +++ b/src/main/kotlin/net/shadowfacts/forgelin/Forgelin.kt @@ -0,0 +1,15 @@ +package net.shadowfacts.forgelin + +import net.minecraftforge.fml.common.Mod + +/** + * @author shadowfacts + */ +@Mod(modid = Forgelin.MOD_ID, name = Forgelin.NAME, version = Forgelin.VERSION, acceptableRemoteVersions = "*", acceptedMinecraftVersions = "*", modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter") +object Forgelin { + + const val MOD_ID = "forgelin" + const val NAME = "Forgelin" + const val VERSION = "1.3.0" + +} \ No newline at end of file diff --git a/src/test/kotlin/Test.kt b/src/test/kotlin/Test.kt deleted file mode 100644 index 52c9324..0000000 --- a/src/test/kotlin/Test.kt +++ /dev/null @@ -1,35 +0,0 @@ -import net.minecraftforge.fml.common.FMLLog -import net.minecraftforge.fml.common.Mod -import net.minecraftforge.fml.common.SidedProxy -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent - -/** - * @author shadowfacts - */ -@Mod(modid = "test", modLanguageAdapter = "net.shadowfacts.forgelin.KotlinAdapter") -object Test { - - @SidedProxy(clientSide = "ClientProxy", serverSide = "CommonProxy") - lateinit var proxy: CommonProxy - private set - - @Mod.EventHandler - fun preInit(event: FMLPreInitializationEvent) { - FMLLog.bigWarning("Hello from Kotlin!") - proxy.someMethod() - } - -} - -open class CommonProxy { - open fun someMethod() { - FMLLog.bigWarning("CommonProxy.someMethod") - } -} - -class ClientProxy: CommonProxy() { - override fun someMethod() { - super.someMethod() - FMLLog.bigWarning("ClientProxy.someMethod") - } -} \ No newline at end of file