Netherite-Public/ZNPCsPlus
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Added pig_saddled property

Browse source
This commit is contained in:
D3v1s0m 2023-09-12 23:49:08 +05:30
parent bfbd883f03
commit b1f87d12bd
No known key found for this signature in database
GPG key ID: FA1F770C7B1D40C1
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java
View file

@ -97,9 +97,6 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
// Sniffer // Sniffer
registerType("sniffer_state", null); // TODO: Nothing on wiki.vg, look in mc source registerType("sniffer_state", null); // TODO: Nothing on wiki.vg, look in mc source
// Pig
registerType("pig_saddle", false); // TODO
// Rabbit // Rabbit
registerType("rabbit_type", 0); // TODO: Figure this out registerType("rabbit_type", 0); // TODO: Figure this out
@ -118,9 +115,6 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
registerType("wolf_collar_color", DyeColor.RED); // TODO registerType("wolf_collar_color", DyeColor.RED); // TODO
registerType("wolf_angry", false); // TODO registerType("wolf_angry", false); // TODO
// Parrot
registerType("parrot_variant", 0); // TODO
// Villager // Villager
registerType("villager_type", VillagerType.PLAINS); registerType("villager_type", VillagerType.PLAINS);
registerType("villager_profession", VillagerProfession.NONE); registerType("villager_profession", VillagerProfession.NONE);
@ -283,12 +277,11 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_9)) horseIndex = 12; else if (ver.isNewerThanOrEquals(ServerVersion.V_1_9)) horseIndex = 12;
else horseIndex = 16; else horseIndex = 16;
int horseEating = ver.isNewerThanOrEquals(ServerVersion.V_1_12) ? 0x10 : 0x20; int horseEating = ver.isNewerThanOrEquals(ServerVersion.V_1_12) ? 0x10 : 0x20;
boolean v1_8 = ver.isOlderThan(ServerVersion.V_1_9); register(new BitsetProperty("is_tame", horseIndex, 0x02, false, legacyBooleans));
register(new BitsetProperty("is_tame", horseIndex, 0x02, false, v1_8)); register(new BitsetProperty("is_saddled", horseIndex, 0x04, false, legacyBooleans));
register(new BitsetProperty("is_saddled", horseIndex, 0x04, false, v1_8)); register(new BitsetProperty("is_eating", horseIndex, horseEating, false, legacyBooleans));
register(new BitsetProperty("is_eating", horseIndex, horseEating, false, v1_8)); register(new BitsetProperty("is_rearing", horseIndex, horseEating << 1, false, legacyBooleans));
register(new BitsetProperty("is_rearing", horseIndex, horseEating << 1, false, v1_8)); register(new BitsetProperty("has_mouth_open", horseIndex, horseEating << 2, false, legacyBooleans));
register(new BitsetProperty("has_mouth_open", horseIndex, horseEating << 2, false, v1_8));
// Horse // Horse
if (ver.isNewerThanOrEquals(ServerVersion.V_1_8) && ver.isOlderThan(ServerVersion.V_1_9)) { if (ver.isNewerThanOrEquals(ServerVersion.V_1_8) && ver.isOlderThan(ServerVersion.V_1_9)) {
@ -317,7 +310,7 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
// Chested Horse // Chested Horse
if (ver.isOlderThan(ServerVersion.V_1_11)) { if (ver.isOlderThan(ServerVersion.V_1_11)) {
register(new BitsetProperty("has_chest", horseIndex, 0x08, false, v1_8)); register(new BitsetProperty("has_chest", horseIndex, 0x08, false, legacyBooleans));
linkProperties("is_saddled", "has_chest", "is_eating", "is_rearing", "has_mouth_open"); linkProperties("is_saddled", "has_chest", "is_eating", "is_rearing", "has_mouth_open");
} else { } else {
register(new BooleanProperty("has_chest", horseVariantIndex, false, legacyBooleans)); register(new BooleanProperty("has_chest", horseVariantIndex, false, legacyBooleans));
@ -332,7 +325,7 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_10)) sizeIndex = 12; else if (ver.isNewerThanOrEquals(ServerVersion.V_1_10)) sizeIndex = 12;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_9)) sizeIndex = 11; else if (ver.isNewerThanOrEquals(ServerVersion.V_1_9)) sizeIndex = 11;
else sizeIndex = 16; else sizeIndex = 16;
register(new IntegerProperty("size", sizeIndex, 1, v1_8)); register(new IntegerProperty("size", sizeIndex, 1, legacyBooleans));
// Ocelot // Ocelot
if (ver.isOlderThan(ServerVersion.V_1_14)) { if (ver.isOlderThan(ServerVersion.V_1_14)) {
@ -340,10 +333,20 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
if (ver.isNewerThanOrEquals(ServerVersion.V_1_10)) ocelotIndex = 15; if (ver.isNewerThanOrEquals(ServerVersion.V_1_10)) ocelotIndex = 15;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_9)) ocelotIndex = 14; else if (ver.isNewerThanOrEquals(ServerVersion.V_1_9)) ocelotIndex = 14;
else ocelotIndex = 18; else ocelotIndex = 18;
if (v1_8) register(new EncodedByteProperty<>("ocelot_type", OcelotType.OCELOT, ocelotIndex, obj -> (byte) obj.ordinal())); if (legacyBooleans) register(new EncodedByteProperty<>("ocelot_type", OcelotType.OCELOT, ocelotIndex, obj -> (byte) obj.ordinal()));
else register(new EncodedIntegerProperty<>("ocelot_type", OcelotType.OCELOT, ocelotIndex, Enum::ordinal)); else register(new EncodedIntegerProperty<>("ocelot_type", OcelotType.OCELOT, ocelotIndex, Enum::ordinal));
} }
// Pig
int pigIndex;
if (ver.isNewerThanOrEquals(ServerVersion.V_1_17)) pigIndex = 17;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_15)) pigIndex = 16;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_14)) pigIndex = 15;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_10)) pigIndex = 13;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_9)) pigIndex = 12;
else pigIndex = 16;
register(new BooleanProperty("pig_saddled", pigIndex, false, legacyBooleans));
if (!ver.isNewerThanOrEquals(ServerVersion.V_1_11)) return; if (!ver.isNewerThanOrEquals(ServerVersion.V_1_11)) return;
// Spellcaster Illager // Spellcaster Illager
int spellIndex = 12; int spellIndex = 12;

3
plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java
View file

@ -111,7 +111,8 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
.setHologramOffset(-1.275)); .setHologramOffset(-1.275));
register(builder(p, "pig", EntityTypes.PIG) register(builder(p, "pig", EntityTypes.PIG)
.setHologramOffset(-1.075)); .setHologramOffset(-1.075)
.addProperties("pig_saddled"));
register(builder(p, "rabbit", EntityTypes.RABBIT) register(builder(p, "rabbit", EntityTypes.RABBIT)
.setHologramOffset(-1.475)); .setHologramOffset(-1.475));