diff --git a/addon.gradle b/addon.gradle deleted file mode 100644 index 43e9bd7..0000000 --- a/addon.gradle +++ /dev/null @@ -1,6 +0,0 @@ -jar { - manifest { - attributes 'FMLCorePlugin': 'mrtjp.relocation.asm.RelocationPlugin' - attributes 'FMLCorePluginContainsFMLMod': true - } -} diff --git a/dependencies.gradle b/dependencies.gradle index 840dfa4..3728a2d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,3 +1,3 @@ dependencies { - api 'com.github.GTNewHorizons:MrTJPCore:1.3.0:dev' + api 'com.github.GTNewHorizons:MrTJPCore:1.3.1:dev' } diff --git a/gradle.properties b/gradle.properties index 5f97988..2235eb3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -102,7 +102,7 @@ mixinsPackage = # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! # This parameter is for legacy compatibility only # Example value: (coreModClass = asm.FMLPlugin) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.asm.FMLPlugin -coreModClass = +coreModClass = asm.RelocationPlugin # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class # that is annotated with @Mod) you want this to be true. When in doubt: leave it on false! @@ -151,7 +151,7 @@ modrinthProjectId = # type can be one of [project, version], # and the name is the Modrinth project or version slug/id of the other mod. # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech -# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true +# Note: UniMixins is automatically set as a required dependency if usesMixins = true. modrinthRelations = # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens. diff --git a/settings.gradle b/settings.gradle index ff436f2..7622cde 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.41' } diff --git a/src/main/resources/dependancies.info b/src/main/resources/dependancies.info deleted file mode 100644 index 5fd01c0..0000000 --- a/src/main/resources/dependancies.info +++ /dev/null @@ -1,6 +0,0 @@ -[{ - "repo": "https://github.com/GTNewHorizons/MrTJPCore/releases/download/1.1.1/", - "file": "MrTJPCore-1.7.10-1.1.1.jar", - "dev": "MrTJPCore-1.7.10-1.1.1-dev.jar", - "class": "mrtjp.core.handler.MrTJPCoreMod" -}] \ No newline at end of file diff --git a/src/main/scala/mrtjp/relocation/asm/RelocationPlugin.scala b/src/main/scala/mrtjp/relocation/asm/RelocationPlugin.scala new file mode 100644 index 0000000..4dbcac5 --- /dev/null +++ b/src/main/scala/mrtjp/relocation/asm/RelocationPlugin.scala @@ -0,0 +1,19 @@ +package mrtjp.relocation.asm + +import java.util.{Map => JMap} +import cpw.mods.fml.relauncher.IFMLLoadingPlugin + +@IFMLLoadingPlugin.MCVersion("1.7.10") +@IFMLLoadingPlugin.TransformerExclusions(value = + Array("mrtjp.relocation.asm.*", "scala") +) +class RelocationPlugin extends IFMLLoadingPlugin { + + override def getASMTransformerClass = Array( + "mrtjp.relocation.asm.Transformer" + ) + override def getSetupClass = null + override def getModContainerClass = null + override def getAccessTransformerClass = null + override def injectData(data: JMap[String, AnyRef]): Unit = {} +} diff --git a/src/main/scala/mrtjp/relocation/asm/Transformer.scala b/src/main/scala/mrtjp/relocation/asm/Transformer.scala index d7ea2f6..5f99c66 100644 --- a/src/main/scala/mrtjp/relocation/asm/Transformer.scala +++ b/src/main/scala/mrtjp/relocation/asm/Transformer.scala @@ -5,12 +5,9 @@ */ package mrtjp.relocation.asm -import java.util.{Map => JMap} - import cpw.mods.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper.{ INSTANCE => mapper } -import cpw.mods.fml.relauncher.{IFMLCallHook, IFMLLoadingPlugin} import mrtjp.relocation.handler.RelocationMod import net.minecraft.launchwrapper.{IClassTransformer, Launch} import org.objectweb.asm.Opcodes._ @@ -19,24 +16,6 @@ import org.objectweb.asm.{ClassReader, ClassWriter} import scala.collection.JavaConversions._ -/** Add "Dfml.coreMods.load=mrtjp.relocation.asm.RelocationPlugin" to launch - * configs to enable in a development workspace. - */ -@IFMLLoadingPlugin.MCVersion("1.7.10") -@IFMLLoadingPlugin.TransformerExclusions(value = - Array("mrtjp.relocation.asm.*", "scala") -) -class RelocationPlugin extends IFMLLoadingPlugin with IFMLCallHook { - override def getASMTransformerClass = Array( - "mrtjp.relocation.asm.Transformer" - ) - override def getSetupClass = "mrtjp.relocation.asm.RelocationPlugin" - override def getModContainerClass = null - override def getAccessTransformerClass = null - override def injectData(data: JMap[String, AnyRef]): Unit = {} - override def call(): Void = null -} - class Transformer extends IClassTransformer { type MethodChecker = (String, MethodNode) => Boolean type InsTransformer = MethodNode => Unit