Remove 32 version of human

This commit is contained in:
Matthew Messinger 2015-08-12 17:42:21 -04:00
parent 07246e2d16
commit 72e45ad08b
5 changed files with 17 additions and 20 deletions

View file

@ -418,9 +418,9 @@ public class Pony {
PlayerModel model; PlayerModel model;
if (is_a_pony) { if (is_a_pony) {
model = newSkinSize ? PMAPI.newPonyAdv_64 : PMAPI.newPonyAdv; model = newSkinSize ? PMAPI.newPonyAdv : PMAPI.newPonyAdv_32;
} else { } else {
model = newSkinSize ? PMAPI.human_64 : PMAPI.human; model = PMAPI.human;
} }
return model; return model;
} }

View file

@ -13,12 +13,12 @@ import com.minelittlepony.minelp.model.pony.armor.pma_zombiePony;
public final class PMAPI { 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) .setTextureHeight(32)
.setArmor(new pma_newPony("minelittlepony:textures/models/armor/")) .setArmor(new pma_newPony("minelittlepony:textures/models/armor/"))
.setURL("http://skins.minecraft.net/MinecraftSkins/%NAME%.png") .setURL("http://skins.minecraft.net/MinecraftSkins/%NAME%.png")
.setScale(0.9375F); .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/")) .setArmor(new pma_newPony("minelittlepony:textures/models/armor/"))
.setURL("http://skins.minecraft.net/MinecraftSkins/%NAME%.png") .setURL("http://skins.minecraft.net/MinecraftSkins/%NAME%.png")
.setScale(0.9375F); .setScale(0.9375F);
@ -33,11 +33,6 @@ public final class PMAPI {
.setURL("http://skins.minecraft.net/MinecraftSkins/%NAME%.png") .setURL("http://skins.minecraft.net/MinecraftSkins/%NAME%.png")
.setScale(0.9375F); .setScale(0.9375F);
public static PlayerModel human = new PlayerModel("Human", new pm_Human("/mob/char.png"), 1) 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/")) .setArmor(new pma_Human("minecraft:textures/models/armor/"))
.setURL("http://skins.minecraft.net/MinecraftSkins/%NAME%.png") .setURL("http://skins.minecraft.net/MinecraftSkins/%NAME%.png")
.setScale(0.9375F); .setScale(0.9375F);

View file

@ -13,7 +13,7 @@ import net.minecraft.util.ResourceLocation;
public class RenderPonyVillager extends RenderPonyMob<EntityVillager> { public class RenderPonyVillager extends RenderPonyMob<EntityVillager> {
public RenderPonyVillager(RenderManager rm) { public RenderPonyVillager(RenderManager rm) {
super(rm, PMAPI.newPonyAdv); super(rm, PMAPI.newPonyAdv_32);
} }
@Override @Override

View file

@ -28,16 +28,18 @@ public class ImageBufferDownloadHD implements IImageBuffer {
graphics.drawImage(downloadedImage, 0, 0, (ImageObserver) null); graphics.drawImage(downloadedImage, 0, 0, (ImageObserver) null);
// copy layers // copy layers
drawImage(24, 48, 20, 52, 4, 16, 8, 20); // leg
drawImage(28, 48, 24, 52, 8, 16, 12, 20); drawImage(24, 48, 20, 52, 4, 16, 8, 20); // top
drawImage(20, 52, 16, 64, 8, 20, 12, 32); drawImage(28, 48, 24, 52, 8, 16, 12, 20); // bottom
drawImage(24, 52, 20, 64, 4, 20, 8, 32); drawImage(20, 52, 16, 64, 8, 20, 12, 32); // inside
drawImage(28, 52, 24, 64, 0, 20, 4, 32); drawImage(24, 52, 20, 64, 4, 20, 8, 32); // front
drawImage(32, 52, 28, 64, 12, 20, 16, 32); drawImage(28, 52, 24, 64, 0, 20, 4, 32); // outside
drawImage(40, 48, 36, 52, 44, 16, 48, 20); drawImage(32, 52, 28, 64, 12, 20, 16, 32); // back
drawImage(44, 48, 40, 52, 48, 16, 52, 20); // arm
drawImage(36, 52, 32, 64, 48, 20, 52, 32); drawImage(40, 48, 36, 52, 44, 16, 48, 20); // top
drawImage(40, 52, 36, 64, 44, 20, 48, 32); 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(44, 52, 40, 64, 40, 20, 44, 32);
drawImage(48, 52, 44, 64, 52, 20, 56, 32); drawImage(48, 52, 44, 64, 52, 20, 56, 32);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB