From 4c2e661d9927c1287fdb31bc1312146b02ae1a0c Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Tue, 17 May 2016 15:26:03 -0400 Subject: [PATCH] Quick update to 1.9.4 --- build.gradle | 6 ++--- .../voxelmodpack/hdskins/gui/GuiSkins.java | 2 +- .../hdskins/mod/LiteModHDSkinsMod.java | 3 --- .../minelittlepony/LiteModMineLittlePony.java | 3 ++- .../minelittlepony/launch/MineLPTweaker.java | 27 ------------------- 5 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 src/main/java/com/brohoof/minelittlepony/launch/MineLPTweaker.java diff --git a/build.gradle b/build.gradle index 2c806f76..0b2ebe9f 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' classpath 'org.spongepowered:mixingradle:0.4-SNAPSHOT' classpath 'gradle.plugin.mnm.mods.kappa:ap-ide:1.0.5' } @@ -32,8 +32,8 @@ version = '1.9.0.0-beta' description = 'Mine Little Pony' minecraft { - version = "1.9" - mappings = 'snapshot_20160411' + version = "1.9.4" + mappings = 'snapshot_20160517' runDir = 'run' replace '@VERSION@',project.version } diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java index 9f894837..89771990 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java @@ -125,7 +125,7 @@ public class GuiSkins extends GuiScreen implements IUploadCompleteCallback, IOpe RenderManager rm = Minecraft.getMinecraft().getRenderManager(); rm.renderEngine = minecraft.getTextureManager(); rm.options = minecraft.gameSettings; - rm.livingPlayer = this.localPlayer; + rm.renderViewEntity = this.localPlayer; this.reloadRemoteSkin(); this.fetchingSkin = true; this.panoramaRenderer = LiteModHDSkinsMod.getPanoramaRenderer(this); diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mod/LiteModHDSkinsMod.java b/src/hdskins/java/com/voxelmodpack/hdskins/mod/LiteModHDSkinsMod.java index 89f9f188..ceea1e4f 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/mod/LiteModHDSkinsMod.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/mod/LiteModHDSkinsMod.java @@ -55,9 +55,6 @@ public class LiteModHDSkinsMod implements HDSkinsMod { ModUtilities.addRenderer(EntityPlayerModel.class, new RenderPlayerModel(minecraft.getRenderManager())); } - @Override - public void onTick(Minecraft minecraft, float partialTicks, boolean inGame, boolean clock) {} - public static IPanoramaRenderer getPanoramaRenderer(IPanoramaRenderer fallbackRenderer) { try { Class ex = Class.forName("com.thevoxelbox.voxelmenu.VoxelMenuModCore"); diff --git a/src/main/java/com/brohoof/minelittlepony/LiteModMineLittlePony.java b/src/main/java/com/brohoof/minelittlepony/LiteModMineLittlePony.java index eb7ee080..1a18c290 100644 --- a/src/main/java/com/brohoof/minelittlepony/LiteModMineLittlePony.java +++ b/src/main/java/com/brohoof/minelittlepony/LiteModMineLittlePony.java @@ -3,11 +3,12 @@ package com.brohoof.minelittlepony; import java.io.File; import com.mumfrey.liteloader.InitCompleteListener; +import com.mumfrey.liteloader.Tickable; import com.mumfrey.liteloader.core.LiteLoader; import net.minecraft.client.Minecraft; -public class LiteModMineLittlePony implements InitCompleteListener { +public class LiteModMineLittlePony implements Tickable, InitCompleteListener { private MineLittlePony mlp; diff --git a/src/main/java/com/brohoof/minelittlepony/launch/MineLPTweaker.java b/src/main/java/com/brohoof/minelittlepony/launch/MineLPTweaker.java deleted file mode 100644 index 42ecfeb2..00000000 --- a/src/main/java/com/brohoof/minelittlepony/launch/MineLPTweaker.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.brohoof.minelittlepony.launch; - -import java.io.File; -import java.util.List; - -import org.spongepowered.asm.mixin.MixinEnvironment; - -import net.minecraft.launchwrapper.ITweaker; -import net.minecraft.launchwrapper.LaunchClassLoader; - -public class MineLPTweaker implements ITweaker { - - private static final String CONFIGS[] = { "mixin.hdskins.json", "mixin.minelp.json" }; - - @Override - public void injectIntoClassLoader(LaunchClassLoader classLoader) { - for (String config : CONFIGS) { - MixinEnvironment.getDefaultEnvironment().addConfiguration(config); - } - } - - //@formatter:off - @Override public void acceptOptions(List args, File gameDir, final File assetsDir, String profile) {} - @Override public String getLaunchTarget() { return null; } - @Override public String[] getLaunchArguments() { return new String[0]; } - //@formatter:on -}