From 7d1772236ab1b8e353aaeb78c5385b8e46f3dbc7 Mon Sep 17 00:00:00 2001 From: D3v1s0m Date: Wed, 13 Sep 2023 01:02:15 +0530 Subject: [PATCH] Added polar_bear_standing property --- .../znpcsplus/entity/EntityPropertyRegistryImpl.java | 12 +++++++++--- .../lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java b/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java index 5ac4796..0bdd01d 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java @@ -99,9 +99,6 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry { // Rabbit registerType("rabbit_type", 0); // TODO: Figure this out - // Polar Bear - registerType("polar_bear_standing", false); // TODO - // Sheep registerType("sheep_color", DyeColor.WHITE); // TODO: Figure this out registerType("sheep_sheared", false); // TODO @@ -339,6 +336,15 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry { else pigIndex = 16; register(new BooleanProperty("pig_saddled", pigIndex, false, legacyBooleans)); + if (!ver.isNewerThanOrEquals(ServerVersion.V_1_10)) return; + // Polar Bear + int polarBearIndex; + if (ver.isNewerThanOrEquals(ServerVersion.V_1_17)) polarBearIndex = 17; + else if (ver.isNewerThanOrEquals(ServerVersion.V_1_15)) polarBearIndex = 16; + else if (ver.isNewerThanOrEquals(ServerVersion.V_1_14)) polarBearIndex = 15; + else polarBearIndex = 13; + register(new BooleanProperty("polar_bear_standing", polarBearIndex, false, false)); + if (!ver.isNewerThanOrEquals(ServerVersion.V_1_11)) return; // Spellcaster Illager int spellIndex = 12; diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java index afac796..00307b6 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java @@ -175,7 +175,8 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry { if (!version.isNewerThanOrEquals(ServerVersion.V_1_10)) return; register(builder(p, "polar_bear", EntityTypes.POLAR_BEAR) - .setHologramOffset(-0.575)); + .setHologramOffset(-0.575) + .addProperties("polar_bear_standing")); if (!version.isNewerThanOrEquals(ServerVersion.V_1_11)) return;