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 04449211..c17665e2 100644 Binary files a/src/main/resources/assets/minelittlepony/textures/entity/illager/vex_charging_pony.png and b/src/main/resources/assets/minelittlepony/textures/entity/illager/vex_charging_pony.png differ 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 04449211..7c7be5a6 100644 Binary files a/src/main/resources/assets/minelittlepony/textures/entity/illager/vex_pony.png and b/src/main/resources/assets/minelittlepony/textures/entity/illager/vex_pony.png differ