Added "ponify guardians" to the cluster

This commit is contained in:
Sollace 2018-05-11 20:54:31 +02:00
parent 362f17ea49
commit e13a5c326d
4 changed files with 18 additions and 5 deletions

View file

@ -137,6 +137,7 @@ public class PonyRenderManager {
if (config.guardians) { if (config.guardians) {
pushNewRenderer(manager, EntityGuardian.class, new RenderPonyGuardian(manager)); pushNewRenderer(manager, EntityGuardian.class, new RenderPonyGuardian(manager));
pushNewRenderer(manager, EntityElderGuardian.class, new RenderPonyGuardian.Elder(manager)); pushNewRenderer(manager, EntityElderGuardian.class, new RenderPonyGuardian.Elder(manager));
MineLittlePony.logger.info("Guardians are now ponies.");
} else { } else {
restoreRenderer(EntityGuardian.class); restoreRenderer(EntityGuardian.class);
restoreRenderer(EntityElderGuardian.class); restoreRenderer(EntityElderGuardian.class);

View file

@ -11,6 +11,8 @@ import java.io.IOException;
/** /**
* In-Game options menu. * In-Game options menu.
*
* TODO: What a mess
*/ */
public class PonySettingPanel extends GuiScreen { public class PonySettingPanel extends GuiScreen {
@ -34,6 +36,7 @@ public class PonySettingPanel extends GuiScreen {
private static final String ZOMBIE_PIGMEN = MOB_PREFIX + "zombiepigmen"; private static final String ZOMBIE_PIGMEN = MOB_PREFIX + "zombiepigmen";
private static final String SKELETONS = MOB_PREFIX + "skeletons"; private static final String SKELETONS = MOB_PREFIX + "skeletons";
private static final String ILLAGERS = MOB_PREFIX + "illagers"; private static final String ILLAGERS = MOB_PREFIX + "illagers";
private static final String GUARDIANS = MOB_PREFIX + "guardians";
private static final int PONY_ID = 0; private static final int PONY_ID = 0;
private static final int HUMAN_ID = 1; private static final int HUMAN_ID = 1;
@ -48,6 +51,7 @@ public class PonySettingPanel extends GuiScreen {
private static final int ZOMBIE_PIGMEN_ID = 9; private static final int ZOMBIE_PIGMEN_ID = 9;
private static final int SKELETONS_ID = 10; private static final int SKELETONS_ID = 10;
private static final int ILLAGER_ID = 11; private static final int ILLAGER_ID = 11;
private static final int GUARDIAN_ID = 12;
private PonyConfig config; private PonyConfig config;
@ -63,15 +67,15 @@ public class PonySettingPanel extends GuiScreen {
@Override @Override
public void initGui() { public void initGui() {
final int LEFT = width / 10 + 16; final int LEFT = width / 10 + 16;
GuiCheckbox pony, human, both, hd, sizes, snuzzles, showscale, villager, zombie, pigmen, skeleton, illager; GuiCheckbox pony, human, both, hd, sizes, snuzzles, showscale, villager, zombie, pigmen, skeleton, illager, guardian;
int row = 32; int row = 32;
buttonList.add(pony = ponies = new GuiCheckbox(PONY_ID, LEFT, row += 15, I18n.format(PONY))); buttonList.add(pony = ponies = new GuiCheckbox(PONY_ID, LEFT, row += 15, I18n.format(PONY)));
buttonList.add(human = humans = new GuiCheckbox(HUMAN_ID, LEFT, row += 15, I18n.format(HUMAN))); buttonList.add(human = humans = new GuiCheckbox(HUMAN_ID, LEFT, row += 15, I18n.format(HUMAN)));
buttonList.add(both = this.both = new GuiCheckbox(BOTH_ID, LEFT, row += 15, I18n.format(BOTH))); buttonList.add(both = this.both = new GuiCheckbox(BOTH_ID, LEFT, row += 15, I18n.format(BOTH)));
row += 15; row += 15;
buttonList.add(hd = new GuiCheckbox(HD_ID, LEFT, row += 15, I18n.format(HD))); buttonList.add(hd = new GuiCheckbox(HD_ID, LEFT, row += 15, I18n.format(HD)));
buttonList.add(sizes = new GuiCheckbox(SIZES_ID, LEFT, row += 15, I18n.format(SIZES)));
buttonList.add(snuzzles = new GuiCheckbox(SNUZZLES_ID, LEFT, row += 15, I18n.format(SNUZZLES))); buttonList.add(snuzzles = new GuiCheckbox(SNUZZLES_ID, LEFT, row += 15, I18n.format(SNUZZLES)));
buttonList.add(sizes = new GuiCheckbox(SIZES_ID, LEFT, row += 15, I18n.format(SIZES)));
buttonList.add(showscale = new GuiCheckbox(SHOW_SCALE_ID, LEFT, row += 15, I18n.format(SHOW_SCALE))); buttonList.add(showscale = new GuiCheckbox(SHOW_SCALE_ID, LEFT, row += 15, I18n.format(SHOW_SCALE)));
final int RIGHT = width - width / 3; final int RIGHT = width - width / 3;
@ -81,6 +85,7 @@ public class PonySettingPanel extends GuiScreen {
buttonList.add(pigmen = new GuiCheckbox(ZOMBIE_PIGMEN_ID, RIGHT, row += 15, I18n.format(ZOMBIE_PIGMEN))); buttonList.add(pigmen = new GuiCheckbox(ZOMBIE_PIGMEN_ID, RIGHT, row += 15, I18n.format(ZOMBIE_PIGMEN)));
buttonList.add(skeleton = new GuiCheckbox(SKELETONS_ID, RIGHT, row += 15, I18n.format(SKELETONS))); buttonList.add(skeleton = new GuiCheckbox(SKELETONS_ID, RIGHT, row += 15, I18n.format(SKELETONS)));
buttonList.add(illager = new GuiCheckbox(ILLAGER_ID, RIGHT, row += 15, I18n.format(ILLAGERS))); buttonList.add(illager = new GuiCheckbox(ILLAGER_ID, RIGHT, row += 15, I18n.format(ILLAGERS)));
buttonList.add(guardian = new GuiCheckbox(GUARDIAN_ID, RIGHT, row += 15, I18n.format(GUARDIANS)));
switch (config.getPonyLevel()) { switch (config.getPonyLevel()) {
default: default:
@ -103,6 +108,7 @@ public class PonySettingPanel extends GuiScreen {
pigmen.checked = config.pigzombies; pigmen.checked = config.pigzombies;
skeleton.checked = config.skeletons; skeleton.checked = config.skeletons;
illager.checked = config.illagers; illager.checked = config.illagers;
guardian.checked = config.guardians;
} }
@Override @Override
@ -171,6 +177,9 @@ public class PonySettingPanel extends GuiScreen {
case ILLAGER_ID: case ILLAGER_ID:
config.illagers = checked; config.illagers = checked;
break; break;
case GUARDIAN_ID:
config.guardians = checked;
break;
} }
} }
} }

View file

@ -15,3 +15,4 @@ minelp.mobs.zombies=Ponify zombies
minelp.mobs.zombiepigmen=Ponify zombie pigmen minelp.mobs.zombiepigmen=Ponify zombie pigmen
minelp.mobs.skeletons=Ponify skeletons minelp.mobs.skeletons=Ponify skeletons
minelp.mobs.illagers=Ponify illagers minelp.mobs.illagers=Ponify illagers
minelp.mobs.guardians=Ponify guardians

View file

@ -10,10 +10,12 @@ minelp.options.hd=Activer MineLP serveur de skin
minelp.options.sizes=Autoriser tous les différentes tailles de poney minelp.options.sizes=Autoriser tous les différentes tailles de poney
minelp.options.ponyarmor=Utiliser armure compatible de MineLP minelp.options.ponyarmor=Utiliser armure compatible de MineLP
minelp.options.snuzzles=Afficher museau sur les poneys minelp.options.snuzzles=Afficher museau sur les poneys
minelp.options.showscale=Utiliser échelle fidèle à MLP minelp.options.showscale=Utiliser echelle fidele a MLP
minelp.mobs.title=Options de mobs minelp.mobs.title=Options de mobs
minelp.mobs.villagers=Ponifier villageois minelp.mobs.villagers=Ponifier villageois
minelp.mobs.zombies=Ponifier zombies minelp.mobs.zombies=Ponifier zombies
minelp.mobs.zombiepigmen=Ponifier zombie pigmen minelp.mobs.zombiepigmen=Ponifier cochon-zombie
minelp.mobs.skeletons=Ponifier squelettes minelp.mobs.skeletons=Ponifier squelettes
minelp.mobs.illagers=Ponifier illagers
minelp.mobs.guardians=Ponifier gardien