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

goat horn properties

Browse source
This commit is contained in:
Pyrbu 2023-08-07 15:36:03 +02:00
parent 83b654fd76
commit a3a0c409e6
4 changed files with 24 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -228,17 +228,6 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
register(new SimpleBooleanProperty("silent", 4, false, legacyBooleans)); register(new SimpleBooleanProperty("silent", 4, false, legacyBooleans));
final int armorStandIndex;
if (ver.isNewerThanOrEquals(ServerVersion.V_1_17)) armorStandIndex = 15;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_15)) armorStandIndex = 14;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_14)) armorStandIndex = 13;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_10)) armorStandIndex = 11;
else armorStandIndex = 10;
register(new SimpleBitsetProperty("small", armorStandIndex, 0x01));
register(new SimpleBitsetProperty("arms", armorStandIndex, 0x04));
register(new SimpleBitsetProperty("base_plate", armorStandIndex, 0x08, true));
linkProperties("small", "arms", "base_plate");
final int skinLayersIndex; final int skinLayersIndex;
if (ver.isNewerThanOrEquals(ServerVersion.V_1_17)) skinLayersIndex = 17; if (ver.isNewerThanOrEquals(ServerVersion.V_1_17)) skinLayersIndex = 17;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_16)) skinLayersIndex = 16; else if (ver.isNewerThanOrEquals(ServerVersion.V_1_16)) skinLayersIndex = 16;
@ -256,19 +245,25 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
linkProperties("skin_cape", "skin_jacket", "skin_left_sleeve", "skin_right_sleeve", "skin_left_leg", "skin_right_leg", "skin_hat"); linkProperties("skin_cape", "skin_jacket", "skin_left_sleeve", "skin_right_sleeve", "skin_left_leg", "skin_right_leg", "skin_hat");
int armorStandRotationIndex; // Armor Stand
if (ver.isNewerThanOrEquals(ServerVersion.V_1_17)) armorStandRotationIndex = 16; int armorStandIndex;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_15)) armorStandRotationIndex = 15; if (ver.isNewerThanOrEquals(ServerVersion.V_1_17)) armorStandIndex = 15;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_14)) armorStandRotationIndex = 14; else if (ver.isNewerThanOrEquals(ServerVersion.V_1_15)) armorStandIndex = 14;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_10)) armorStandRotationIndex = 12; else if (ver.isNewerThanOrEquals(ServerVersion.V_1_14)) armorStandIndex = 13;
else armorStandRotationIndex = 11; else if (ver.isNewerThanOrEquals(ServerVersion.V_1_10)) armorStandIndex = 11;
register(new RotationProperty("head_rotation", armorStandRotationIndex++, Vector3f.zero())); else armorStandIndex = 10;
register(new RotationProperty("body_rotation", armorStandRotationIndex++, Vector3f.zero())); register(new SimpleBitsetProperty("small", armorStandIndex, 0x01));
register(new RotationProperty("left_arm_rotation", armorStandRotationIndex++, new Vector3f(-10, 0, -10))); register(new SimpleBitsetProperty("arms", armorStandIndex, 0x04));
register(new RotationProperty("right_arm_rotation", armorStandRotationIndex++, new Vector3f(-15, 0, 10))); register(new SimpleBitsetProperty("base_plate", armorStandIndex++, 0x08, true));
register(new RotationProperty("left_leg_rotation", armorStandRotationIndex++, new Vector3f(-1, 0, -1))); register(new RotationProperty("head_rotation", armorStandIndex++, Vector3f.zero()));
register(new RotationProperty("right_leg_rotation", armorStandRotationIndex, new Vector3f(1, 0, 1))); register(new RotationProperty("body_rotation", armorStandIndex++, Vector3f.zero()));
register(new RotationProperty("left_arm_rotation", armorStandIndex++, new Vector3f(-10, 0, -10)));
register(new RotationProperty("right_arm_rotation", armorStandIndex++, new Vector3f(-15, 0, 10)));
register(new RotationProperty("left_leg_rotation", armorStandIndex++, new Vector3f(-1, 0, -1)));
register(new RotationProperty("right_leg_rotation", armorStandIndex, new Vector3f(1, 0, 1)));
linkProperties("small", "arms", "base_plate");
// Ghast
final int ghastAttackingIndex; final int ghastAttackingIndex;
if (ver.isNewerThanOrEquals(ServerVersion.V_1_17)) ghastAttackingIndex = 16; if (ver.isNewerThanOrEquals(ServerVersion.V_1_17)) ghastAttackingIndex = 16;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_15)) ghastAttackingIndex = 15; else if (ver.isNewerThanOrEquals(ServerVersion.V_1_15)) ghastAttackingIndex = 15;
@ -277,6 +272,12 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_9)) ghastAttackingIndex = 11; else if (ver.isNewerThanOrEquals(ServerVersion.V_1_9)) ghastAttackingIndex = 11;
else ghastAttackingIndex = 16; else ghastAttackingIndex = 16;
register(new SimpleBooleanProperty("attacking", ghastAttackingIndex, false, legacyBooleans)); register(new SimpleBooleanProperty("attacking", ghastAttackingIndex, false, legacyBooleans));
// Goat
if (ver.isNewerThanOrEquals(ServerVersion.V_1_17)) {
register(new SimpleBooleanProperty("has_left_horn", 18, true, legacyBooleans));
register(new SimpleBooleanProperty("has_right_horn", 19, true, legacyBooleans));
}
} }
private void registerSerializer(PropertySerializer<?> serializer) { private void registerSerializer(PropertySerializer<?> serializer) {

4
plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java
View file

@ -73,10 +73,6 @@ public interface MetadataFactory {
// Frog // Frog
EntityData frogVariant(int variant); EntityData frogVariant(int variant);
// Goat
EntityData goatHasLeftHorn(boolean hasLeftHorn);
EntityData goatHasRightHorn(boolean hasRightHorn);
// Hoglin // Hoglin
EntityData hoglinImmuneToZombification(boolean immuneToZombification); EntityData hoglinImmuneToZombification(boolean immuneToZombification);

10
plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java
View file

@ -131,16 +131,6 @@ public class V1_17MetadataFactory extends V1_16MetadataFactory {
return newEntityData(18, EntityDataTypes.BYTE, (byte) ((sitting ? 0x01 : 0) | (crouching ? 0x04 : 0) | (sleeping ? 0x20 : 0) | (facePlanted ? 0x40 : 0))); return newEntityData(18, EntityDataTypes.BYTE, (byte) ((sitting ? 0x01 : 0) | (crouching ? 0x04 : 0) | (sleeping ? 0x20 : 0) | (facePlanted ? 0x40 : 0)));
} }
@Override
public EntityData goatHasLeftHorn(boolean hasLeftHorn) {
return newEntityData(18, EntityDataTypes.BOOLEAN, hasLeftHorn);
}
@Override
public EntityData goatHasRightHorn(boolean hasRightHorn) {
return newEntityData(19, EntityDataTypes.BOOLEAN, hasRightHorn);
}
@Override @Override
public EntityData hoglinImmuneToZombification(boolean immuneToZombification) { public EntityData hoglinImmuneToZombification(boolean immuneToZombification) {
return newEntityData(17, EntityDataTypes.BOOLEAN, immuneToZombification); return newEntityData(17, EntityDataTypes.BOOLEAN, immuneToZombification);

10
plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java
View file

@ -145,16 +145,6 @@ public class V1_8MetadataFactory implements MetadataFactory {
throw new UnsupportedOperationException("The frog variant entity data isn't supported on this version"); throw new UnsupportedOperationException("The frog variant entity data isn't supported on this version");
} }
@Override
public EntityData goatHasLeftHorn(boolean hasLeftHorn) {
throw new UnsupportedOperationException("The goat horn entity data isn't supported on this version");
}
@Override
public EntityData goatHasRightHorn(boolean hasRightHorn) {
throw new UnsupportedOperationException("The goat horn entity data isn't supported on this version");
}
@Override @Override
public EntityData hoglinImmuneToZombification(boolean immuneToZombification) { public EntityData hoglinImmuneToZombification(boolean immuneToZombification) {
throw new UnsupportedOperationException("The hoglin zombification entity data isn't supported on this version"); throw new UnsupportedOperationException("The hoglin zombification entity data isn't supported on this version");