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 bb1ffcd2..8c928d96 100644 Binary files a/src/main/resources/assets/hdskins/textures/mob/noskin.png and b/src/main/resources/assets/hdskins/textures/mob/noskin.png differ