Update all the skin resources to new format. No more 64x32 mob texures.
|
@ -28,7 +28,6 @@ public class Pony {
|
|||
|
||||
private int skinCheckCount;
|
||||
private boolean skinChecked;
|
||||
private boolean newSkinSize;
|
||||
|
||||
public Pony(AbstractClientPlayer player) {
|
||||
this.textureResourceLocation = player.getLocationSkin();
|
||||
|
@ -70,7 +69,7 @@ public class Pony {
|
|||
skinImage = ImageIO.read(Minecraft.getMinecraft().getResourceManager().getResource(textureResourceLocation)
|
||||
.getInputStream());
|
||||
MineLPLogger.debug("Obtained skin from resource location %s", textureResourceLocation);
|
||||
this.checkSkin(skinImage);
|
||||
// this.checkSkin(skinImage);
|
||||
} catch (Exception var6) {
|
||||
Exception e = var6;
|
||||
|
||||
|
@ -80,7 +79,7 @@ public class Pony {
|
|||
skinImage = PrivateFields.downloadedImage.get((ThreadDownloadImageData) e2);
|
||||
if (skinImage != null) {
|
||||
MineLPLogger.debug(e, "Successfully reflected downloadedImage from texture object");
|
||||
this.checkSkin(skinImage);
|
||||
// this.checkSkin(skinImage);
|
||||
}
|
||||
}
|
||||
} catch (Exception var5) {
|
||||
|
@ -94,8 +93,6 @@ public class Pony {
|
|||
public void checkSkin(BufferedImage bufferedimage) {
|
||||
MineLPLogger.debug("\tStart skin check #%d for pony #%d with image %s.", ++this.skinCheckCount, this.ponyId);
|
||||
metadata = PonyData.parse(bufferedimage);
|
||||
|
||||
this.newSkinSize = bufferedimage.getWidth() == bufferedimage.getHeight();
|
||||
this.skinChecked = true;
|
||||
}
|
||||
|
||||
|
@ -103,10 +100,9 @@ public class Pony {
|
|||
if (this.metadata.getRace() == null || !this.metadata.getRace().hasWings()) {
|
||||
return false;
|
||||
}
|
||||
return player.capabilities.isFlying ||!(player.onGround || player.isOnLadder() || player.isInWater());
|
||||
|
||||
|
||||
//@formatter:off
|
||||
return player.capabilities.isFlying || !(player.onGround || player.isOnLadder() || player.isInWater());
|
||||
|
||||
//@formatter:off
|
||||
// boolean falling = player.fallDistance > 0;
|
||||
// boolean levitating = player.fallDistance == this.previousFallDistance;
|
||||
// boolean standingOnAir;
|
||||
|
@ -174,7 +170,7 @@ public class Pony {
|
|||
|
||||
PlayerModel model;
|
||||
if (is_a_pony) {
|
||||
model = newSkinSize ? PMAPI.newPonyAdv : PMAPI.newPonyAdv_32;
|
||||
model = PMAPI.pony;
|
||||
} else {
|
||||
model = PMAPI.human;
|
||||
}
|
||||
|
|
|
@ -13,19 +13,10 @@ import com.brohoof.minelittlepony.model.pony.armor.pma_zombiePony;
|
|||
|
||||
public final class PMAPI {
|
||||
|
||||
public static PlayerModel newPonyAdv_32 = new PlayerModel(new pm_newPonyAdv())
|
||||
.setTextureHeight(32)
|
||||
.setArmor(new pma_newPony());
|
||||
public static PlayerModel newPonyAdv = new PlayerModel(new pm_newPonyAdv())
|
||||
.setArmor(new pma_newPony());
|
||||
public static PlayerModel zombiePony = new PlayerModel(new pm_zombiePony())
|
||||
.setTextureHeight(32)
|
||||
.setArmor(new pma_zombiePony());
|
||||
public static PlayerModel skeletonPony = new PlayerModel(new pm_skeletonPony())
|
||||
.setTextureHeight(32)
|
||||
.setArmor(new pma_skeletonPony());
|
||||
public static PlayerModel human = new PlayerModel(new pm_Human())
|
||||
.setArmor(new pma_Human());
|
||||
public static final PlayerModel pony = new PlayerModel(new pm_newPonyAdv()).setArmor(new pma_newPony());
|
||||
public static final PlayerModel zombie = new PlayerModel(new pm_zombiePony()).setArmor(new pma_zombiePony());
|
||||
public static final PlayerModel skeleton = new PlayerModel(new pm_skeletonPony()).setArmor(new pma_skeletonPony());
|
||||
public static final PlayerModel human = new PlayerModel(new pm_Human()).setArmor(new pma_Human());
|
||||
|
||||
public static void init() {
|
||||
for (Field field : PMAPI.class.getFields()) {
|
||||
|
|
|
@ -39,7 +39,7 @@ public abstract class RenderPony extends RendererLivingEntity implements IRender
|
|||
|
||||
@AppendInsns("<init>")
|
||||
private void init(RenderManager renderManager, boolean useSmallArms) {
|
||||
this.playerModel = PMAPI.newPonyAdv;
|
||||
this.playerModel = PMAPI.pony;
|
||||
this.mainModel = this.playerModel.getModel();
|
||||
this.shadowSize = this.playerModel.getShadowsize();
|
||||
this.layerRenderers.clear();
|
||||
|
|
|
@ -13,12 +13,12 @@ import net.minecraft.util.ResourceLocation;
|
|||
|
||||
public class RenderPonySkeleton extends RenderPonyMob<EntitySkeleton> {
|
||||
public RenderPonySkeleton(RenderManager rm) {
|
||||
super(rm, PMAPI.skeletonPony);
|
||||
super(rm, PMAPI.skeleton);
|
||||
addLayer(new LayerBipedArmor(this) {
|
||||
@Override
|
||||
protected void initArmor() {
|
||||
this.field_177189_c = PMAPI.skeletonPony.getModel();
|
||||
this.field_177186_d = PMAPI.skeletonPony.getModel();
|
||||
this.field_177189_c = PMAPI.skeleton.getModel();
|
||||
this.field_177186_d = PMAPI.skeleton.getModel();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
@ -13,7 +13,7 @@ import net.minecraft.util.ResourceLocation;
|
|||
public class RenderPonyVillager extends RenderPonyMob<EntityVillager> {
|
||||
|
||||
public RenderPonyVillager(RenderManager rm) {
|
||||
super(rm, PMAPI.newPonyAdv_32);
|
||||
super(rm, PMAPI.pony);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -11,7 +11,7 @@ import net.minecraft.util.ResourceLocation;
|
|||
public class RenderPonyZombie extends RenderPonyMob<EntityZombie> {
|
||||
|
||||
public RenderPonyZombie(RenderManager rendermanager) {
|
||||
super(rendermanager, PMAPI.zombiePony);
|
||||
super(rendermanager, PMAPI.zombie);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 823 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 773 B |
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 656 B |
Before Width: | Height: | Size: 941 B After Width: | Height: | Size: 618 B |
Before Width: | Height: | Size: 859 B After Width: | Height: | Size: 592 B |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 786 B |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 933 B |
Before Width: | Height: | Size: 4 KiB After Width: | Height: | Size: 979 B |
Before Width: | Height: | Size: 859 B After Width: | Height: | Size: 564 B |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 685 B |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 670 B After Width: | Height: | Size: 466 B |
Before Width: | Height: | Size: 1,019 B After Width: | Height: | Size: 697 B |
Before Width: | Height: | Size: 986 B After Width: | Height: | Size: 631 B |
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 809 B |
Before Width: | Height: | Size: 1,019 B After Width: | Height: | Size: 650 B |
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 705 B |
Before Width: | Height: | Size: 908 B After Width: | Height: | Size: 603 B |
Before Width: | Height: | Size: 1,002 B After Width: | Height: | Size: 655 B |
Before Width: | Height: | Size: 885 B After Width: | Height: | Size: 585 B |
Before Width: | Height: | Size: 928 B After Width: | Height: | Size: 718 B |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 533 B |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 496 B |
Before Width: | Height: | Size: 972 B After Width: | Height: | Size: 728 B |
Before Width: | Height: | Size: 663 B After Width: | Height: | Size: 476 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 956 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 876 B |
Before Width: | Height: | Size: 872 B After Width: | Height: | Size: 606 B |
Before Width: | Height: | Size: 734 B After Width: | Height: | Size: 499 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 773 B |
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 695 B |
Before Width: | Height: | Size: 905 B After Width: | Height: | Size: 629 B |
Before Width: | Height: | Size: 855 B After Width: | Height: | Size: 577 B |
Before Width: | Height: | Size: 951 B After Width: | Height: | Size: 643 B |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 958 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 820 B |
Before Width: | Height: | Size: 692 B After Width: | Height: | Size: 480 B |
Before Width: | Height: | Size: 666 B After Width: | Height: | Size: 458 B |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 637 B After Width: | Height: | Size: 482 B |
Before Width: | Height: | Size: 865 B After Width: | Height: | Size: 600 B |
Before Width: | Height: | Size: 916 B After Width: | Height: | Size: 598 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 823 B |
Before Width: | Height: | Size: 961 B After Width: | Height: | Size: 649 B |
Before Width: | Height: | Size: 852 B After Width: | Height: | Size: 577 B |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 600 B |
Before Width: | Height: | Size: 825 B After Width: | Height: | Size: 549 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 635 B |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 743 B |
Before Width: | Height: | Size: 830 B After Width: | Height: | Size: 553 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 757 B |
Before Width: | Height: | Size: 926 B After Width: | Height: | Size: 627 B |
Before Width: | Height: | Size: 661 B After Width: | Height: | Size: 471 B |
Before Width: | Height: | Size: 816 B After Width: | Height: | Size: 555 B |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 741 B |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 602 B |
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 709 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 725 B |
Before Width: | Height: | Size: 781 B After Width: | Height: | Size: 540 B |
Before Width: | Height: | Size: 723 B After Width: | Height: | Size: 503 B |
Before Width: | Height: | Size: 713 B After Width: | Height: | Size: 495 B |
Before Width: | Height: | Size: 784 B After Width: | Height: | Size: 534 B |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 635 B |
Before Width: | Height: | Size: 823 B After Width: | Height: | Size: 556 B |
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 663 B |
Before Width: | Height: | Size: 1,023 B After Width: | Height: | Size: 663 B |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 766 B |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 564 B |
Before Width: | Height: | Size: 690 B After Width: | Height: | Size: 495 B |
Before Width: | Height: | Size: 1,008 B After Width: | Height: | Size: 647 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 775 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 615 B |
Before Width: | Height: | Size: 897 B After Width: | Height: | Size: 603 B |
Before Width: | Height: | Size: 770 B After Width: | Height: | Size: 521 B |
Before Width: | Height: | Size: 952 B After Width: | Height: | Size: 631 B |
Before Width: | Height: | Size: 711 B After Width: | Height: | Size: 500 B |
Before Width: | Height: | Size: 836 B After Width: | Height: | Size: 564 B |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 760 B |
Before Width: | Height: | Size: 894 B After Width: | Height: | Size: 595 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 730 B |
Before Width: | Height: | Size: 803 B After Width: | Height: | Size: 564 B |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 936 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 720 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 735 B |
Before Width: | Height: | Size: 955 B After Width: | Height: | Size: 656 B |
Before Width: | Height: | Size: 899 B After Width: | Height: | Size: 628 B |
Before Width: | Height: | Size: 843 B After Width: | Height: | Size: 565 B |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 619 B |
Before Width: | Height: | Size: 954 B After Width: | Height: | Size: 662 B |
Before Width: | Height: | Size: 835 B After Width: | Height: | Size: 563 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 951 B |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 764 B |
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 674 B |