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

added is_retracting_spikes property for version>=1.11 also, lol

Browse Source
This commit is contained in:
D3v1s0m 2023-10-28 10:01:00 +05:30
parent 5ee37d5436
commit 4a89f3c21c
No known key found for this signature in database
GPG Key ID: FA1F770C7B1D40C1
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java
View File

@ -274,6 +274,13 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
register(new BitsetProperty("is_retracting_spikes", guardianIndex++, 0x02, false, legacyBooleans)); register(new BitsetProperty("is_retracting_spikes", guardianIndex++, 0x02, false, legacyBooleans));
linkProperties("is_elder", "is_retracting_spikes"); linkProperties("is_elder", "is_retracting_spikes");
// TODO: add guardian beam target // TODO: add guardian beam target
} else {
int guardianIndex;
if (ver.isNewerThanOrEquals(ServerVersion.V_1_17)) guardianIndex = 16;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_15)) guardianIndex = 15;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_14)) guardianIndex = 14;
else guardianIndex = 12;
register(new BooleanProperty("is_retracting_spikes", guardianIndex, false, false));
} }
// Horse // Horse

3
plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeImpl.java
View File

@ -161,6 +161,9 @@ public class NpcTypeImpl implements NpcType {
if (EntityTypes.isTypeInstanceOf(type, EntityTypes.ABSTRACT_TAMEABLE_ANIMAL)) { if (EntityTypes.isTypeInstanceOf(type, EntityTypes.ABSTRACT_TAMEABLE_ANIMAL)) {
addProperties("tamed", "sitting"); addProperties("tamed", "sitting");
} }
if (EntityTypes.isTypeInstanceOf(type, EntityTypes.GUARDIAN)) {
addProperties("is_retracting_spikes");
}
return new NpcTypeImpl(name, type, hologramOffset, new HashSet<>(allowedProperties), defaultProperties); return new NpcTypeImpl(name, type, hologramOffset, new HashSet<>(allowedProperties), defaultProperties);
} }
} }

2
plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java
View File

@ -97,7 +97,7 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
register(builder(p, "guardian", EntityTypes.GUARDIAN) register(builder(p, "guardian", EntityTypes.GUARDIAN)
.setHologramOffset(-1.125) .setHologramOffset(-1.125)
.addProperties("is_elder", "is_retracting_spikes")); .addProperties("is_elder"));
register(builder(p, "horse", EntityTypes.HORSE) register(builder(p, "horse", EntityTypes.HORSE)
.setHologramOffset(-0.375) .setHologramOffset(-0.375)