From 40d8ba6704277bab856fe758aeaadeb75c0a3be9 Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Sun, 29 May 2016 23:59:43 -0400 Subject: [PATCH] Fix arrows with humans. --- build.gradle | 20 ++++++++++--------- .../model/AbstractPonyModel.java | 1 - .../model/pony/ModelPlayerPony.java | 1 + 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 7e389ef9..9c889fd3 100644 --- a/build.gradle +++ b/build.gradle @@ -21,14 +21,14 @@ buildscript { } } -ext.revision = 218 +ext.revision = 219 apply plugin: 'net.minecraftforge.gradle.liteloader' apply plugin: 'org.spongepowered.mixin' apply plugin: 'mnm.gradle.ap-ide' group = 'com.brohoof.minelp' -version = '1.9.4.0' +version = '1.9.4.1' description = 'Mine Little Pony' minecraft { @@ -79,14 +79,16 @@ processResources { exclude 'litemod.json' } } - -dependencies { - factory 'org.spongepowered:mixin:0.5.5-SNAPSHOT' +afterEvaluate { + dependencies { + def liteloader = project.plugins['net.minecraftforge.gradle.liteloader'] + def artifact = liteloader.artifact.libraries.collect{it.name}.find{it.contains 'mixin'} + factory artifact + } + processor { + options.reobfSrgFile = mixin.reobfSrgFile + } } -processor { - options.reobfSrgFile = project.tasks.genSrgs.mcpToSrg.path -} - jar { from sourceSets.findAll { it.name != 'api' }*.output } diff --git a/src/main/java/com/brohoof/minelittlepony/model/AbstractPonyModel.java b/src/main/java/com/brohoof/minelittlepony/model/AbstractPonyModel.java index 605370e8..84f54219 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/AbstractPonyModel.java +++ b/src/main/java/com/brohoof/minelittlepony/model/AbstractPonyModel.java @@ -50,7 +50,6 @@ public abstract class AbstractPonyModel extends ModelPlayer { } public final void init(float yOffset, float stretch) { - this.boxList.clear(); this.initTextures(); this.initPositions(yOffset, stretch); for (IPonyPart part : modelParts) { diff --git a/src/main/java/com/brohoof/minelittlepony/model/pony/ModelPlayerPony.java b/src/main/java/com/brohoof/minelittlepony/model/pony/ModelPlayerPony.java index 74ff396e..8938e569 100644 --- a/src/main/java/com/brohoof/minelittlepony/model/pony/ModelPlayerPony.java +++ b/src/main/java/com/brohoof/minelittlepony/model/pony/ModelPlayerPony.java @@ -627,6 +627,7 @@ public class ModelPlayerPony extends AbstractPonyModel implements PonyModelConst @Override protected void initTextures() { + this.boxList.clear(); this.Tail = new PlaneRenderer[21]; this.Bodypiece = new PlaneRenderer[14];