From d5034d19305157798b2e5be682e2032c8264fe58 Mon Sep 17 00:00:00 2001 From: Sollace Date: Fri, 23 Aug 2019 11:19:22 +0200 Subject: [PATCH] Separate pillagers into their own setting (closes #131) --- .../client/render/entities/MobRenderers.java | 14 ++++++++------ .../assets/minelittlepony/lang/de_de.json | 1 + .../assets/minelittlepony/lang/en_pt.json | 1 + .../assets/minelittlepony/lang/en_us.json | 1 + .../assets/minelittlepony/lang/fr_fr.json | 1 + 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/minelittlepony/client/render/entities/MobRenderers.java b/src/main/java/com/minelittlepony/client/render/entities/MobRenderers.java index 0beb3796..33505630 100644 --- a/src/main/java/com/minelittlepony/client/render/entities/MobRenderers.java +++ b/src/main/java/com/minelittlepony/client/render/entities/MobRenderers.java @@ -20,8 +20,16 @@ public enum MobRenderers { pony.switchRenderer(state, WitchEntity.class, RenderPonyWitch::new); pony.switchRenderer(state, ZombieVillagerEntity.class, RenderPonyZombieVillager::new); pony.switchRenderer(state, WanderingTraderEntity.class, RenderPonyTrader::new); + }), + PILLAGERS((state, pony) -> { pony.switchRenderer(state, PillagerEntity.class, RenderPonyPillager::new); }), + ILLAGERS((state, pony) -> { + pony.switchRenderer(state, VexEntity.class, RenderPonyVex::new); + pony.switchRenderer(state, EvokerEntity.class, RenderPonyIllager.Evoker::new); + pony.switchRenderer(state, VindicatorEntity.class, RenderPonyIllager.Vindicator::new); + pony.switchRenderer(state, IllusionerEntity.class, RenderPonyIllager.Illusionist::new); + }), ZOMBIES((state, pony) -> { pony.switchRenderer(state, ZombieEntity.class, RenderPonyZombie::new); pony.switchRenderer(state, HuskEntity.class, RenderPonyZombie.Husk::new); @@ -36,12 +44,6 @@ public enum MobRenderers { pony.switchRenderer(state, StrayEntity.class, RenderPonySkeleton.Stray::new); pony.switchRenderer(state, WitherSkeletonEntity.class, RenderPonySkeleton.Wither::new); }), - ILLAGERS((state, pony) -> { - pony.switchRenderer(state, VexEntity.class, RenderPonyVex::new); - pony.switchRenderer(state, EvokerEntity.class, RenderPonyIllager.Evoker::new); - pony.switchRenderer(state, VindicatorEntity.class, RenderPonyIllager.Vindicator::new); - pony.switchRenderer(state, IllusionerEntity.class, RenderPonyIllager.Illusionist::new); - }), GUARDIANS((state, pony) -> { pony.switchRenderer(state, GuardianEntity.class, RenderPonyGuardian::new); pony.switchRenderer(state, ElderGuardianEntity.class, RenderPonyGuardian.Elder::new); diff --git a/src/main/resources/assets/minelittlepony/lang/de_de.json b/src/main/resources/assets/minelittlepony/lang/de_de.json index 137b35ca..987c5efa 100644 --- a/src/main/resources/assets/minelittlepony/lang/de_de.json +++ b/src/main/resources/assets/minelittlepony/lang/de_de.json @@ -17,6 +17,7 @@ "minelp.mobs.pigzombies": "Ponifizirte Pigmen", "minelp.mobs.skeletons": "Ponifizirte Skelette", "minelp.mobs.illagers": "Ponifizirte Illager", + "minelp.mobs.pillagers": "Ponifizirte Pillager", "minelp.mobs.guardians": "Ponifizirte Guardian", "minelp.mobs.endermen": "Ponifizirte Endermänner", "minelp.mode.dry": "Pony", diff --git a/src/main/resources/assets/minelittlepony/lang/en_pt.json b/src/main/resources/assets/minelittlepony/lang/en_pt.json index c9430438..458a6df5 100644 --- a/src/main/resources/assets/minelittlepony/lang/en_pt.json +++ b/src/main/resources/assets/minelittlepony/lang/en_pt.json @@ -20,6 +20,7 @@ "minelp.mobs.pigzombies": "Plunder zombie pigmen", "minelp.mobs.skeletons": "Plunder skeletons", "minelp.mobs.illagers": "Plunder illagers", + "minelp.mobs.pillagers": "Plunder pillagers", "minelp.mobs.guardians": "Plunder guardians", "minelp.mobs.endermen": "Plunder endermen", "minelp.mode.dry": "Land Lubber", diff --git a/src/main/resources/assets/minelittlepony/lang/en_us.json b/src/main/resources/assets/minelittlepony/lang/en_us.json index 0ffc9cdc..da24fb55 100644 --- a/src/main/resources/assets/minelittlepony/lang/en_us.json +++ b/src/main/resources/assets/minelittlepony/lang/en_us.json @@ -20,6 +20,7 @@ "minelp.mobs.pigzombies": "Ponify zombie pigmen", "minelp.mobs.skeletons": "Ponify skeletons", "minelp.mobs.illagers": "Ponify illagers", + "minelp.mobs.pillagers": "Ponify pillagers", "minelp.mobs.guardians": "Ponify guardians", "minelp.mobs.endermen": "Ponify endermen", "minelp.mode.dry": "Land pony", diff --git a/src/main/resources/assets/minelittlepony/lang/fr_fr.json b/src/main/resources/assets/minelittlepony/lang/fr_fr.json index a6cb3d44..d53d72eb 100644 --- a/src/main/resources/assets/minelittlepony/lang/fr_fr.json +++ b/src/main/resources/assets/minelittlepony/lang/fr_fr.json @@ -16,6 +16,7 @@ "minelp.mobs.pigzombies": "Ponifier cochon-zombie", "minelp.mobs.skeletons": "Ponifier squelettes", "minelp.mobs.illagers": "Ponifier illagers", + "minelp.mobs.pillagers": "Ponifier pillagers", "minelp.mobs.guardians": "Ponifier gardien", "minelp.mobs.endermen": "Ponifier endermen", "minelp.mode.dry": "Poney terrestre",