diff --git a/build.gradle b/build.gradle index 3a1ac70b..c5764261 100644 --- a/build.gradle +++ b/build.gradle @@ -7,12 +7,12 @@ buildscript { } maven { name = 'sponge' - url = 'http://repo.spongepowered.org/maven' + url = 'https://repo.spongepowered.org/maven' } } dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' - classpath 'org.spongepowered:mixingradle:0.4-SNAPSHOT' + classpath 'org.spongepowered:mixingradle:0.5-SNAPSHOT' } } @@ -20,15 +20,15 @@ apply plugin: 'net.minecraftforge.gradle.liteloader' apply plugin: 'org.spongepowered.mixin' group = 'com.minelittlepony' -version = '1.12.0.2' +version = '1.12.1.0' description = 'Mine Little Pony' targetCompatibility = 1.8 sourceCompatibility = 1.8 minecraft { - version = "1.12" - mappings = 'snapshot_20170627' + version = "1.12.1" + mappings = 'snapshot_20170805' runDir = 'run' replace '@VERSION@', project.version } @@ -36,17 +36,14 @@ minecraft { sourceSets { hdskins { compileClasspath += main.compileClasspath + ext.refMap = 'hdskins.mixin.refmap.json' } main { compileClasspath += hdskins.output + ext.refMap = 'minelp.mixin.refmap.json' } } -mixin { - add sourceSets.main, 'mixin.minelp.refmap.json' - add sourceSets.hdskins, 'mixin.hdskins.refmap.json' -} - litemod.json { author = 'Verdana, Rene_Z, Mumfrey, Killjoy1221' description = 'Mine Little Pony turns players and mobs into ponies' @@ -58,8 +55,8 @@ litemod.json { Access via button on the main menu.'''.stripIndent() mixinConfigs += [ - 'mixin.minelp.json', - 'mixin.hdskins.json' + 'minelp.mixin.json', + 'hdskins.mixin.json' ] } diff --git a/build.number b/build.number index cb65a971..50ba844f 100644 --- a/build.number +++ b/build.number @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Sat Jul 29 00:02:32 EDT 2017 -build.number=419 +#Tue Aug 08 16:28:41 EDT 2017 +build.number=468 diff --git a/src/hdskins/resources/mixin.hdskins.json b/src/hdskins/resources/hdskins.mixin.json similarity index 84% rename from src/hdskins/resources/mixin.hdskins.json rename to src/hdskins/resources/hdskins.mixin.json index 24b9f738..415b0371 100644 --- a/src/hdskins/resources/mixin.hdskins.json +++ b/src/hdskins/resources/hdskins.mixin.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.7", "package": "com.voxelmodpack.hdskins.mixin", - "refmap": "mixin.hdskins.refmap.json", + "refmap": "hdskins.mixin.refmap.json", "mixins": [ "MixinGuiMainMenu", "MixinImageBufferDownload", diff --git a/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java b/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java index 9bb3123e..7f5d519e 100644 --- a/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java +++ b/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java @@ -27,7 +27,6 @@ import net.minecraft.util.ResourceLocation; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At.Shift; @@ -35,8 +34,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import javax.annotation.Nonnull; - @Mixin(RenderPlayer.class) public abstract class MixinRenderPlayer extends RenderLivingBase implements IRenderPony { @@ -243,14 +240,10 @@ public abstract class MixinRenderPlayer extends RenderLivingBase