Update to 1.12.1

This commit is contained in:
Matthew Messinger 2017-08-08 16:33:33 -04:00
parent 93f4418a83
commit 6e1689cc66
6 changed files with 19 additions and 29 deletions

View file

@ -7,12 +7,12 @@ buildscript {
} }
maven { maven {
name = 'sponge' name = 'sponge'
url = 'http://repo.spongepowered.org/maven' url = 'https://repo.spongepowered.org/maven'
} }
} }
dependencies { dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' 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' apply plugin: 'org.spongepowered.mixin'
group = 'com.minelittlepony' group = 'com.minelittlepony'
version = '1.12.0.2' version = '1.12.1.0'
description = 'Mine Little Pony' description = 'Mine Little Pony'
targetCompatibility = 1.8 targetCompatibility = 1.8
sourceCompatibility = 1.8 sourceCompatibility = 1.8
minecraft { minecraft {
version = "1.12" version = "1.12.1"
mappings = 'snapshot_20170627' mappings = 'snapshot_20170805'
runDir = 'run' runDir = 'run'
replace '@VERSION@', project.version replace '@VERSION@', project.version
} }
@ -36,17 +36,14 @@ minecraft {
sourceSets { sourceSets {
hdskins { hdskins {
compileClasspath += main.compileClasspath compileClasspath += main.compileClasspath
ext.refMap = 'hdskins.mixin.refmap.json'
} }
main { main {
compileClasspath += hdskins.output 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 { litemod.json {
author = 'Verdana, Rene_Z, Mumfrey, Killjoy1221' author = 'Verdana, Rene_Z, Mumfrey, Killjoy1221'
description = 'Mine Little Pony turns players and mobs into ponies' description = 'Mine Little Pony turns players and mobs into ponies'
@ -58,8 +55,8 @@ litemod.json {
Access via button on the main menu.'''.stripIndent() Access via button on the main menu.'''.stripIndent()
mixinConfigs += [ mixinConfigs += [
'mixin.minelp.json', 'minelp.mixin.json',
'mixin.hdskins.json' 'hdskins.mixin.json'
] ]
} }

View file

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit! #Build Number for ANT. Do not edit!
#Sat Jul 29 00:02:32 EDT 2017 #Tue Aug 08 16:28:41 EDT 2017
build.number=419 build.number=468

View file

@ -2,7 +2,7 @@
"required": true, "required": true,
"minVersion": "0.7", "minVersion": "0.7",
"package": "com.voxelmodpack.hdskins.mixin", "package": "com.voxelmodpack.hdskins.mixin",
"refmap": "mixin.hdskins.refmap.json", "refmap": "hdskins.mixin.refmap.json",
"mixins": [ "mixins": [
"MixinGuiMainMenu", "MixinGuiMainMenu",
"MixinImageBufferDownload", "MixinImageBufferDownload",

View file

@ -27,7 +27,6 @@ import net.minecraft.util.ResourceLocation;
import org.objectweb.asm.Opcodes; import org.objectweb.asm.Opcodes;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.At.Shift; 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.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import javax.annotation.Nonnull;
@Mixin(RenderPlayer.class) @Mixin(RenderPlayer.class)
public abstract class MixinRenderPlayer extends RenderLivingBase<AbstractClientPlayer> implements IRenderPony { public abstract class MixinRenderPlayer extends RenderLivingBase<AbstractClientPlayer> implements IRenderPony {
@ -243,14 +240,10 @@ public abstract class MixinRenderPlayer extends RenderLivingBase<AbstractClientP
this.playerModel.apply(thePony.getMetadata()); this.playerModel.apply(thePony.getMetadata());
} }
/** @Redirect(
* @author killjoy method = "getEntityTexture(Lnet/minecraft/client/entity/AbstractClientPlayer;)Lnet/minecraft/util/ResourceLocation;",
* @reason Support for background ponies and default pony skin at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/AbstractClientPlayer;getLocationSkin()Lnet/minecraft/util/ResourceLocation;"))
*/ private ResourceLocation redirectEntityTexture(AbstractClientPlayer player) {
@Overwrite
@Override
@Nonnull
public ResourceLocation getEntityTexture(AbstractClientPlayer player) {
Pony thePony = MineLittlePony.getInstance().getManager().getPony(player); Pony thePony = MineLittlePony.getInstance().getManager().getPony(player);
return thePony.getTexture(); return thePony.getTexture();
} }

View file

@ -5,7 +5,7 @@
"revision": "${revision}", "revision": "${revision}",
"description": "Mine Little Pony turns players and mobs into ponies", "description": "Mine Little Pony turns players and mobs into ponies",
"mixinConfigs": [ "mixinConfigs": [
"mixin.minelp.json", "minelp.mixin.json",
"mixin.hdskins.json" "hdskins.mixin.json"
] ]
} }

View file

@ -2,7 +2,7 @@
"required": true, "required": true,
"minVersion": "0.7", "minVersion": "0.7",
"package": "com.minelittlepony.mixin", "package": "com.minelittlepony.mixin",
"refmap": "mixin.minelp.refmap.json", "refmap": "minelp.mixin.refmap.json",
"compatibilityLevel": "JAVA_8", "compatibilityLevel": "JAVA_8",
"mixins": [ "mixins": [
"MixinRenderPlayer", "MixinRenderPlayer",