PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-22 12:37:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update to 1.12.1

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

21
build.gradle
View file

@ -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'
]
}

4
build.number
View file

@ -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

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

@ -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",

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

@ -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<AbstractClientPlayer> implements IRenderPony {
@ -243,14 +240,10 @@ public abstract class MixinRenderPlayer extends RenderLivingBase<AbstractClientP
this.playerModel.apply(thePony.getMetadata());
}
/**
* @author killjoy
* @reason Support for background ponies and default pony skin
*/
@Overwrite
@Override
@Nonnull
public ResourceLocation getEntityTexture(AbstractClientPlayer player) {
@Redirect(
method = "getEntityTexture(Lnet/minecraft/client/entity/AbstractClientPlayer;)Lnet/minecraft/util/ResourceLocation;",
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/AbstractClientPlayer;getLocationSkin()Lnet/minecraft/util/ResourceLocation;"))
private ResourceLocation redirectEntityTexture(AbstractClientPlayer player) {
Pony thePony = MineLittlePony.getInstance().getManager().getPony(player);
return thePony.getTexture();
}

4
src/main/resources/litemod.json
View file

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

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

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