diff --git a/build.gradle b/build.gradle index adc0444..e58975c 100644 --- a/build.gradle +++ b/build.gradle @@ -17,9 +17,9 @@ plugins { apply plugin: 'net.minecraftforge.gradle.forge' -version = "1.2" +version = "1.2.1" group= "ljfa.tntutils" -archivesBaseName = "tnt_utilities-mc1.9.4" +archivesBaseName = "tnt_utilities-mc1.10" sourceCompatibility = '1.7' targetCompatibility = '1.7' @@ -37,11 +37,13 @@ curseforge { id = '227449' changelog = '' releaseType = 'alpha' + addGameVersion '1.10' + addGameVersion '1.10.2' } } minecraft { - version = "1.9.4-12.17.0.1954" + version = "1.10.2-12.18.0.2004-1.10.0" runDir = "run" // the mappings can be changed at any time, and must be in the following format. @@ -49,7 +51,7 @@ minecraft { // stable_# stables are built at the discretion of the MCP team. // Use non-default mappings at your own risk. they may not allways work. // simply re-run your setup task after changing the mappings to update your workspace. - mappings = "snapshot_20160605" + mappings = "snapshot_20160518" makeObfSourceJar = false coreMod 'ljfa.tntutils.asm.TntuPlugin' diff --git a/src/main/java/ljfa/tntutils/TNTUtils.java b/src/main/java/ljfa/tntutils/TNTUtils.java index ff752cf..cd8dc4d 100644 --- a/src/main/java/ljfa/tntutils/TNTUtils.java +++ b/src/main/java/ljfa/tntutils/TNTUtils.java @@ -15,7 +15,7 @@ @Mod(modid = Reference.MODID, name = Reference.MODNAME, version = Reference.VERSION, acceptableRemoteVersions = "*", guiFactory = Reference.GUI_FACTORY_CLASS, dependencies = "required-after:tnt_utilities_core", - acceptedMinecraftVersions = "[1.9.4,1.10)", updateJSON = Reference.UPDATE_JSON) + acceptedMinecraftVersions = "[1.10,1.11)", updateJSON = Reference.UPDATE_JSON) public class TNTUtils { @Mod.Instance(Reference.MODID) public static TNTUtils instance; diff --git a/src/main/java/ljfa/tntutils/asm/ExplosionTransformer.java b/src/main/java/ljfa/tntutils/asm/ExplosionTransformer.java index be0944a..53692ee 100644 --- a/src/main/java/ljfa/tntutils/asm/ExplosionTransformer.java +++ b/src/main/java/ljfa/tntutils/asm/ExplosionTransformer.java @@ -29,7 +29,7 @@ public byte[] transform(String name, String transformedName, byte[] basicClass) if(name.equals("net.minecraft.world.Explosion")) { coreLogger.info("About to patch class %s", name); return patchClassExplosion(name, basicClass, false); - } else if(name.equals("ahp")) { + } else if(name.equals("ahy")) { coreLogger.info("About to patch obfuscated class %s", name); return patchClassExplosion(name, basicClass, true); } else diff --git a/src/main/java/ljfa/tntutils/asm/TntuPlugin.java b/src/main/java/ljfa/tntutils/asm/TntuPlugin.java index f984399..3c53b97 100644 --- a/src/main/java/ljfa/tntutils/asm/TntuPlugin.java +++ b/src/main/java/ljfa/tntutils/asm/TntuPlugin.java @@ -3,13 +3,11 @@ import java.util.Map; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; -import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.MCVersion; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.Name; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.SortingIndex; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions; @Name("TNTUtilities Core") -@MCVersion("1.9.4") @SortingIndex(1100) @TransformerExclusions("ljfa.tntutils") public class TntuPlugin implements IFMLLoadingPlugin {