PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-18 02:24:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update for mixins 0.7. Fixes #35

Browse source
This commit is contained in:
Matthew Messinger 2017-07-28 14:25:26 -04:00
parent e5c0cc1609
commit 4fe2035f81
5 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -20,7 +20,7 @@ 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.1' version = '1.12.0.2'
description = 'Mine Little Pony' description = 'Mine Little Pony'
targetCompatibility = 1.8 targetCompatibility = 1.8
@ -28,7 +28,7 @@ sourceCompatibility = 1.8
minecraft { minecraft {
version = "1.12" version = "1.12"
mappings = 'snapshot_20170615' mappings = 'snapshot_20170627'
runDir = 'run' runDir = 'run'
replace '@VERSION@', project.version replace '@VERSION@', project.version
} }

4
build.number
View file

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit! #Build Number for ANT. Do not edit!
#Thu Jun 22 00:35:21 EDT 2017 #Fri Jul 28 14:25:09 EDT 2017
build.number=382 build.number=417

2
src/hdskins/resources/mixin.hdskins.json
View file

@ -1,6 +1,6 @@
{ {
"required": true, "required": true,
"minVersion": "0.6", "minVersion": "0.7",
"package": "com.voxelmodpack.hdskins.mixin", "package": "com.voxelmodpack.hdskins.mixin",
"refmap": "mixin.hdskins.refmap.json", "refmap": "mixin.hdskins.refmap.json",
"mixins": [ "mixins": [

8
src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java
View file

@ -27,6 +27,7 @@ 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;
@ -34,6 +35,8 @@ 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 {
@ -240,7 +243,12 @@ public abstract class MixinRenderPlayer extends RenderLivingBase<AbstractClientP
this.playerModel.apply(thePony.getMetadata()); this.playerModel.apply(thePony.getMetadata());
} }
/**
* @author killjoy
*/
@Overwrite
@Override @Override
@Nonnull
public ResourceLocation getEntityTexture(AbstractClientPlayer player) { 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();

2
src/main/resources/mixin.minelp.json
View file

@ -1,6 +1,6 @@
{ {
"required": true, "required": true,
"minVersion": "0.6", "minVersion": "0.7",
"package": "com.minelittlepony.mixin", "package": "com.minelittlepony.mixin",
"refmap": "mixin.minelp.refmap.json", "refmap": "mixin.minelp.refmap.json",
"compatibilityLevel": "JAVA_8", "compatibilityLevel": "JAVA_8",