Brush pony

This commit is contained in:
Matthew Messinger 2015-08-14 23:25:40 -04:00
parent 3405dc2843
commit cfb94ae950

View file

@ -21,7 +21,7 @@ import net.minecraft.world.World;
public class Pony { public class Pony {
public static PonyManager ponyManager = PonyManager.getInstance(); public static PonyManager ponyManager = PonyManager.getInstance();
public Pony.PonyRace race; public PonyRace race = PonyRace.EARTH;
public boolean advancedTexturing; public boolean advancedTexturing;
public ResourceLocation textureResourceLocation; public ResourceLocation textureResourceLocation;
public boolean isSpPlayer; public boolean isSpPlayer;
@ -31,77 +31,32 @@ public class Pony {
public boolean isUnicorn; public boolean isUnicorn;
public boolean isFlying; public boolean isFlying;
public boolean isGlow; public boolean isGlow;
public int glowColor; public int glowColor = -12303190;
public boolean isMale; public boolean isMale;
public int size; public int size = 1;
public int wantTail; public int wantTail;
public boolean isVillager; public boolean isVillager;
public int villagerProfession; public int villagerProfession = 1;
public float defaultYOffset; public float defaultYOffset = 1.62F;
boolean pegasusFlying; boolean pegasusFlying;
@SuppressWarnings("unused") @SuppressWarnings("unused")
private final int dangerzone; private final int dangerzone = 2;
private float previousFallDistance; private float previousFallDistance;
private static int ponyCount = 0; private static int ponyCount = 0;
private final int ponyId; private final int ponyId = ponyCount++;
private int skinCheckCount; private int skinCheckCount;
private boolean skinChecked; private boolean skinChecked;
private boolean newSkinSize; private boolean newSkinSize;
public Pony(AbstractClientPlayer player) { public Pony(AbstractClientPlayer player) {
this.race = Pony.PonyRace.EARTH;
this.isSpPlayer = false;
this.isPony = false;
this.isPonySkin = false;
this.isPegasus = false;
this.isUnicorn = false;
this.isFlying = false;
this.isGlow = false;
this.glowColor = -12303190;
this.isMale = false;
this.size = 1;
this.wantTail = 0;
this.isVillager = false;
this.villagerProfession = 1;
this.defaultYOffset = 1.62F;
this.pegasusFlying = false;
this.dangerzone = 2;
this.previousFallDistance = 0.0F;
this.skinCheckCount = 0;
this.skinChecked = false;
this.ponyId = ++ponyCount;
this.textureResourceLocation = player.getLocationSkin(); this.textureResourceLocation = player.getLocationSkin();
MineLPLogger.debug("+ Initialising new pony #%d for player %s (%s) with resource location %s.", this.ponyId, MineLPLogger.debug("+ Initialising new pony #%d for player %s (%s) with resource location %s.", this.ponyId, player.getCommandSenderName(), player.getUniqueID(), this.textureResourceLocation);
player.getCommandSenderName(), player.getUniqueID(), this.textureResourceLocation);
this.checkSkin(this.textureResourceLocation); this.checkSkin(this.textureResourceLocation);
} }
public Pony(ResourceLocation aTextureResourceLocation) { public Pony(ResourceLocation aTextureResourceLocation) {
this.race = Pony.PonyRace.EARTH;
this.isSpPlayer = false;
this.isPony = false;
this.isPonySkin = false;
this.isPegasus = false;
this.isUnicorn = false;
this.isFlying = false;
this.isGlow = false;
this.glowColor = -12303190;
this.isMale = false;
this.size = 1;
this.wantTail = 0;
this.isVillager = false;
this.villagerProfession = 1;
this.defaultYOffset = 1.62F;
this.pegasusFlying = false;
this.dangerzone = 2;
this.previousFallDistance = 0.0F;
this.skinCheckCount = 0;
this.skinChecked = false;
this.ponyId = ++ponyCount;
this.textureResourceLocation = aTextureResourceLocation; this.textureResourceLocation = aTextureResourceLocation;
MineLPLogger.debug("+ Initialising new pony #%d with resource location %s.", this.ponyId, this.textureResourceLocation);
MineLPLogger.debug("+ Initialising new pony #%d with resource location %s.", this.ponyId,
this.textureResourceLocation);
this.checkSkin(this.textureResourceLocation); this.checkSkin(this.textureResourceLocation);
} }
@ -129,8 +84,7 @@ public class Pony {
BufferedImage skinImage = null; BufferedImage skinImage = null;
try { try {
skinImage = ImageIO.read(Minecraft.getMinecraft().getResourceManager().getResource(textureResourceLocation) skinImage = ImageIO.read(Minecraft.getMinecraft().getResourceManager().getResource(textureResourceLocation).getInputStream());
.getInputStream());
MineLPLogger.debug("Obtained skin from resource location %s", textureResourceLocation); MineLPLogger.debug("Obtained skin from resource location %s", textureResourceLocation);
this.checkSkin(skinImage); this.checkSkin(skinImage);
} catch (Exception var6) { } catch (Exception var6) {