From 9e951f5aa791c3dde8ddaa28fd222f268644137b Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Thu, 1 Dec 2016 02:21:35 -0500 Subject: [PATCH] Add the vex textures and add the illagers to the options. --- .../minelittlepony/gui/PonySettingPanel.java | 12 ++++++++---- .../model/pony/ModelBreezie.java | 3 +-- .../assets/minelittlepony/lang/en_us.lang | 1 + .../entity/illager/vex_charging_pony.png | Bin 1207 -> 1486 bytes .../textures/entity/illager/vex_pony.png | Bin 1207 -> 1493 bytes 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/minelittlepony/gui/PonySettingPanel.java b/src/main/java/com/minelittlepony/gui/PonySettingPanel.java index 8c2ccf7d..f6414038 100644 --- a/src/main/java/com/minelittlepony/gui/PonySettingPanel.java +++ b/src/main/java/com/minelittlepony/gui/PonySettingPanel.java @@ -27,13 +27,12 @@ public class PonySettingPanel extends GuiScreen { private static final String MOB_PREFIX = "minelp.mobs."; - private static final String RESTART = "minelp.restart"; - private static final String MOB_TITLE = MOB_PREFIX + "title"; private static final String VILLAGERS = MOB_PREFIX + "villagers"; private static final String ZOMBIES = MOB_PREFIX + "zombies"; private static final String ZOMBIE_PIGMEN = MOB_PREFIX + "zombiepigmen"; private static final String SKELETONS = MOB_PREFIX + "skeletons"; + private static final String ILLAGERS = MOB_PREFIX + "illagers"; private static final int PONY_ID = 0; private static final int HUMAN_ID = 1; @@ -47,6 +46,7 @@ public class PonySettingPanel extends GuiScreen { private static final int ZOMBIES_ID = 8; private static final int ZOMBIE_PIGMEN_ID = 9; private static final int SKELETONS_ID = 10; + private static final int ILLAGER_ID = 11; private PonyConfig config; @@ -62,7 +62,7 @@ public class PonySettingPanel extends GuiScreen { @Override public void initGui() { final int LEFT = width / 10 + 16; - GuiCheckbox pony, human, both, hd, sizes, snuzzles, showscale, villager, zombie, pigmen, skeleton; + GuiCheckbox pony, human, both, hd, sizes, snuzzles, showscale, villager, zombie, pigmen, skeleton, illager; int row = 32; this.buttonList.add(pony = ponies = new GuiCheckbox(PONY_ID, LEFT, row += 15, I18n.format(PONY))); this.buttonList.add(human = humans = new GuiCheckbox(HUMAN_ID, LEFT, row += 15, I18n.format(HUMAN))); @@ -79,6 +79,7 @@ public class PonySettingPanel extends GuiScreen { this.buttonList.add(zombie = new GuiCheckbox(ZOMBIES_ID, RIGHT, row += 15, I18n.format(ZOMBIES))); this.buttonList.add(pigmen = new GuiCheckbox(ZOMBIE_PIGMEN_ID, RIGHT, row += 15, I18n.format(ZOMBIE_PIGMEN))); this.buttonList.add(skeleton = new GuiCheckbox(SKELETONS_ID, RIGHT, row += 15, I18n.format(SKELETONS))); + this.buttonList.add(illager = new GuiCheckbox(ILLAGER_ID, RIGHT, row += 15, I18n.format(ILLAGERS))); switch (config.getPonyLevel()) { default: @@ -100,6 +101,7 @@ public class PonySettingPanel extends GuiScreen { zombie.checked = config.zombies; pigmen.checked = config.pigzombies; skeleton.checked = config.skeletons; + illager.checked = config.illagers; } @Override @@ -111,7 +113,6 @@ public class PonySettingPanel extends GuiScreen { this.drawString(mc.fontRendererObj, I18n.format(MOB_TITLE), width - width / 3 - 16, 32, -1); this.drawString(mc.fontRendererObj, I18n.format(PONY_LEVEL), width / 10, 32, -1); this.drawString(mc.fontRendererObj, I18n.format(OPTIONS), width / 10, 94, -1); - this.mc.fontRendererObj.drawSplitString(I18n.format(RESTART), width - width / 3, 120, width / 3, 0xFF5555); super.drawScreen(mouseX, mouseY, partialTicks); } @@ -166,6 +167,9 @@ public class PonySettingPanel extends GuiScreen { case SKELETONS_ID: config.skeletons = checked; break; + case ILLAGER_ID: + config.illagers = checked; + break; } } } diff --git a/src/main/java/com/minelittlepony/model/pony/ModelBreezie.java b/src/main/java/com/minelittlepony/model/pony/ModelBreezie.java index 4fbdde44..7ec7991e 100644 --- a/src/main/java/com/minelittlepony/model/pony/ModelBreezie.java +++ b/src/main/java/com/minelittlepony/model/pony/ModelBreezie.java @@ -67,10 +67,9 @@ public class ModelBreezie extends ModelBiped { setRotation(leftWing, 0F, -0.6981317F, 0F); rightWing = new ModelRenderer(this, 0, 40); - rightWing.addBox(-24F, -12F, 0F, 24, 24, 0); + rightWing.addBox(-24F, -12F, 0F, 24, 24, 0, true); rightWing.setRotationPoint(-2F, 3F, 1F); rightWing.setTextureSize(64, 32); - rightWing.mirror = true; setRotation(rightWing, 0F, 0.6981317F, 0F); } diff --git a/src/main/resources/assets/minelittlepony/lang/en_us.lang b/src/main/resources/assets/minelittlepony/lang/en_us.lang index c61001a7..b5c540e4 100644 --- a/src/main/resources/assets/minelittlepony/lang/en_us.lang +++ b/src/main/resources/assets/minelittlepony/lang/en_us.lang @@ -16,3 +16,4 @@ minelp.mobs.villagers=Ponify villagers minelp.mobs.zombies=Ponify zombies minelp.mobs.zombiepigmen=Ponify zombie pigmen minelp.mobs.skeletons=Ponify skeletons +minelp.mobs.illagers=Ponify illagers diff --git a/src/main/resources/assets/minelittlepony/textures/entity/illager/vex_charging_pony.png b/src/main/resources/assets/minelittlepony/textures/entity/illager/vex_charging_pony.png index 044492118d0dedb1ad0700a3050faf7e2bdfe61b..c17665e2427362695bcaf1e0cd586da8671d4f66 100644 GIT binary patch delta 1449 zcmV;a1y=gE3C;_UBo78+OGiWiLjZ#SnT)U(-;q8Se*gz`Nliru;0yr=4-h!KA!q;q z1zSl(K~#9!?OIJ}8%GrWb|VPV+6tv51RDxT+$e$kDBwWj95&#@ihU5?a~l;?9}Fq< zVsdjrtV1BZbzLAJfe`onId(Hw)*P`RKLSjQ1P%#Bq$Lpd0 zb}*0K{NJp+e-8xwk2GdOJFP*Dgsg|n(OLhLoa8R zcFooz0|30)2lp1v0XgYYBiKbT$Bc)ElD~ApA&lP?J z0Qh}i0wKd7M9*6~CS(|Af6pGMn+1;^X&?k;$Lgwv$B#9%w`-08V9nZK~Q z`Y+Bs8Am#zkd>(g;oOsP%yeDG^749Bv8<*MQ&UDq4;=!|pBM4`xrY7wHN1T*Is-uG zg*~LRhYr&5X@*-^x)I2)jGR+?@VblD0q!Brg1kbVMP6SX{`B7=@2U-;Q&3=N&ty zVQ2_=^-9C|xI+LWGd(2r@SPBd-9S2`5Hr=M5vN;ZZlnYXofC+~g=#wmA>|sJ&1#Tk zU}Z&gjsc(iJ&D%Q>%hxre+b0lLhI;tkWqa?>g6-jqKI{z2aHXlY9e^#hzM2H(BH2? zRUHz+AKJngqB}v?WngLn0PsP_8sQyJM)+v!H3MtBSXL6jix)LaPm8#HTf^zo4r@Rl z78lO^?-->!8`+XmMyk`oiKc`Onmtu}@Ic=NgF(@G5ez*%3}A_Ie^x5nA=oGzqHd86 zTiq=GRo0BwX^t&C3+zUnHCfhh{J72nCq7bp=$2*HR~jN2ofar4>4-vDy4#KT{rg4{ zY;OmS9@WP;Z#v9?)oV8Z94>R7-OuT7Ih3NGjwmDC+5NFhAsYpMRayG6U*xN{5$#Nt9aq7WKg8f|}6LJs;hv+|dg z%XX{3Eh~b&qbv~qs8rN|WJa;o`EAQxfOWLg6Xd~zq*K1UGu)1#m?j~mG-X4P1x#w} z6b4lMD$F)QRw8Jn4JF%#Uxm$8UNQX?R!beQ741I(HQ}kO4-VOD00000NkvXXu0mjf DyQQRj delta 1187 zcmV;U1YG;h3%3c7B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pJOi4sRRCr$PnqNp1K^(__vlLPm)UnAohA_y;b(wgQR7W1$Fu$$Y~K>(u-1&k$)v2B+jpy+ga~+yghGs z?{2f*4>vcnGqW?h-Gpe>#!NRWv zXsT-xF@^cpdq6<}0h%?2Fl=*auzs(J$3+74kbSZzqBs*1F&4S(s48-{pQr5KA*42Nmn^6bK1 zmvF~I1R_i{W;@sg{|V;|W!ui3B50(cp$0BpItcUgzm1hNGyq(@2(Y*)A~bgI2H3X` zpt@Q_Y!Q?i_Cm*{*5ss8-=MSe=|+W9Dc;-wp^%8ssHy^3SO92}CWlPx@s^9Qi#Y54 z8S8&D(|>%WXhEk`%m#4uaj&7hyk7riHh{zP`UQpNxE; z)%r?|<8?r(_6%;}d@UX!U}ewHn=yh8>MQZkDcefW>Yl+ZN+Q5k-ZOZ9FW?Ixe9z(w zAbii_3m|;Y;tL>r&yroEi#>r=^fkMTzJ|9-c7M$;Q=aYfdZ8m-U38|u-*P42)p1Ox zf57DAXT$N?TKqRceLcX+3P4W}D66YQl^s*pkiY8qI6yL~fyj$;h>9V}J1R<4+p~Cz=u9%o&A@j2K_^zyW~6hZVB4 zM6tFOV0AV31gKb?89{>pr%pYr zw?40PRe(^4vYrRPhrs>&BC^6%Q~=oszI&&TKmee%m4A0>r~5m{Ai$e9mr1E-fPY-L z5zKWTK2Y4dS0OK7auM8_37G1e&jR*m08U{ec*@LqHXJ&@t(WB<+ zh1ue>fZMn(03Z9j^=D_@u>lnoV0f5fu1lpTj*e<+w{L5HrKzX@7cM9y*EKc*ynhdH z@+8HR;hm=;%R&Vgzs5=0UU(ySv)QPz+X7DGox)2;!*$r002ovPDHLkV1lv1 BIB);} diff --git a/src/main/resources/assets/minelittlepony/textures/entity/illager/vex_pony.png b/src/main/resources/assets/minelittlepony/textures/entity/illager/vex_pony.png index 044492118d0dedb1ad0700a3050faf7e2bdfe61b..7c7be5a685a9909d5ba956f8ee3f63bc2c2b67b7 100644 GIT binary patch delta 1456 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 BIClU5