From 72e45ad08b631ea2dabf84fa18c857d0be2579a4 Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Wed, 12 Aug 2015 17:42:21 -0400 Subject: [PATCH] Remove 32 version of human --- .../java/com/minelittlepony/minelp/Pony.java | 4 ++-- .../minelittlepony/minelp/model/PMAPI.java | 9 ++----- .../minelp/renderer/RenderPonyVillager.java | 2 +- .../hdskins/ImageBufferDownloadHD.java | 22 ++++++++++-------- .../assets/hdskins/textures/mob/noskin.png | Bin 1489 -> 1870 bytes 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/minelittlepony/minelp/Pony.java b/src/main/java/com/minelittlepony/minelp/Pony.java index 8e9e4197..736f67fa 100644 --- a/src/main/java/com/minelittlepony/minelp/Pony.java +++ b/src/main/java/com/minelittlepony/minelp/Pony.java @@ -418,9 +418,9 @@ public class Pony { PlayerModel model; if (is_a_pony) { - model = newSkinSize ? PMAPI.newPonyAdv_64 : PMAPI.newPonyAdv; + model = newSkinSize ? PMAPI.newPonyAdv : PMAPI.newPonyAdv_32; } else { - model = newSkinSize ? PMAPI.human_64 : PMAPI.human; + model = PMAPI.human; } return model; } diff --git a/src/main/java/com/minelittlepony/minelp/model/PMAPI.java b/src/main/java/com/minelittlepony/minelp/model/PMAPI.java index 5475e980..cd156f4c 100644 --- a/src/main/java/com/minelittlepony/minelp/model/PMAPI.java +++ b/src/main/java/com/minelittlepony/minelp/model/PMAPI.java @@ -13,12 +13,12 @@ import com.minelittlepony.minelp.model.pony.armor.pma_zombiePony; public final class PMAPI { - public static PlayerModel newPonyAdv = new PlayerModel("newPonyAdv", new pm_newPonyAdv("/mob/char.png"), 0) + public static PlayerModel newPonyAdv_32 = new PlayerModel("newPonyAdv", new pm_newPonyAdv("/mob/char.png"), 0) .setTextureHeight(32) .setArmor(new pma_newPony("minelittlepony:textures/models/armor/")) .setURL("http://skins.minecraft.net/MinecraftSkins/%NAME%.png") .setScale(0.9375F); - public static PlayerModel newPonyAdv_64 = new PlayerModel("newPonyAdv", new pm_newPonyAdv("/mob/char.png"), 0) + public static PlayerModel newPonyAdv = new PlayerModel("newPonyAdv", new pm_newPonyAdv("/mob/char.png"), 0) .setArmor(new pma_newPony("minelittlepony:textures/models/armor/")) .setURL("http://skins.minecraft.net/MinecraftSkins/%NAME%.png") .setScale(0.9375F); @@ -33,11 +33,6 @@ public final class PMAPI { .setURL("http://skins.minecraft.net/MinecraftSkins/%NAME%.png") .setScale(0.9375F); public static PlayerModel human = new PlayerModel("Human", new pm_Human("/mob/char.png"), 1) - .setTextureHeight(32) - .setArmor(new pma_Human("minecraft:textures/models/armor/")) - .setURL("http://skins.minecraft.net/MinecraftSkins/%NAME%.png") - .setScale(0.9375F); - public static PlayerModel human_64 = new PlayerModel("Human", new pm_Human("/mob/char.png"), 1) .setArmor(new pma_Human("minecraft:textures/models/armor/")) .setURL("http://skins.minecraft.net/MinecraftSkins/%NAME%.png") .setScale(0.9375F); diff --git a/src/main/java/com/minelittlepony/minelp/renderer/RenderPonyVillager.java b/src/main/java/com/minelittlepony/minelp/renderer/RenderPonyVillager.java index 77ab6a03..a6f03d8a 100644 --- a/src/main/java/com/minelittlepony/minelp/renderer/RenderPonyVillager.java +++ b/src/main/java/com/minelittlepony/minelp/renderer/RenderPonyVillager.java @@ -13,7 +13,7 @@ import net.minecraft.util.ResourceLocation; public class RenderPonyVillager extends RenderPonyMob { public RenderPonyVillager(RenderManager rm) { - super(rm, PMAPI.newPonyAdv); + super(rm, PMAPI.newPonyAdv_32); } @Override diff --git a/src/main/java/com/voxelmodpack/hdskins/ImageBufferDownloadHD.java b/src/main/java/com/voxelmodpack/hdskins/ImageBufferDownloadHD.java index 53f10f13..7e266d9c 100644 --- a/src/main/java/com/voxelmodpack/hdskins/ImageBufferDownloadHD.java +++ b/src/main/java/com/voxelmodpack/hdskins/ImageBufferDownloadHD.java @@ -28,16 +28,18 @@ public class ImageBufferDownloadHD implements IImageBuffer { graphics.drawImage(downloadedImage, 0, 0, (ImageObserver) null); // copy layers - drawImage(24, 48, 20, 52, 4, 16, 8, 20); - drawImage(28, 48, 24, 52, 8, 16, 12, 20); - drawImage(20, 52, 16, 64, 8, 20, 12, 32); - drawImage(24, 52, 20, 64, 4, 20, 8, 32); - drawImage(28, 52, 24, 64, 0, 20, 4, 32); - drawImage(32, 52, 28, 64, 12, 20, 16, 32); - drawImage(40, 48, 36, 52, 44, 16, 48, 20); - drawImage(44, 48, 40, 52, 48, 16, 52, 20); - drawImage(36, 52, 32, 64, 48, 20, 52, 32); - drawImage(40, 52, 36, 64, 44, 20, 48, 32); + // leg + drawImage(24, 48, 20, 52, 4, 16, 8, 20); // top + drawImage(28, 48, 24, 52, 8, 16, 12, 20); // bottom + drawImage(20, 52, 16, 64, 8, 20, 12, 32); // inside + drawImage(24, 52, 20, 64, 4, 20, 8, 32); // front + drawImage(28, 52, 24, 64, 0, 20, 4, 32); // outside + drawImage(32, 52, 28, 64, 12, 20, 16, 32); // back + // arm + drawImage(40, 48, 36, 52, 44, 16, 48, 20); // top + drawImage(44, 48, 40, 52, 48, 16, 52, 20); // bottom + drawImage(36, 52, 32, 64, 48, 20, 52, 32); // + drawImage(40, 52, 36, 64, 44, 20, 48, 32); // drawImage(44, 52, 40, 64, 40, 20, 44, 32); drawImage(48, 52, 44, 64, 52, 20, 56, 32); diff --git a/src/main/resources/assets/hdskins/textures/mob/noskin.png b/src/main/resources/assets/hdskins/textures/mob/noskin.png index bb1ffcd2bdf83ce9f6ca2909192cd4fcb40e1cb3..8c928d96fdfd1745a45650e4fcd8c429bf70555f 100644 GIT binary patch delta 1848 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