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

Implemented Bat properties

Browse Source
This commit is contained in:
D3v1s0m 2023-06-28 17:32:18 +05:30
parent dd3c88efce
commit 2dceea6fe7
No known key found for this signature in database
GPG Key ID: 3B6EC35367B8D82E
9 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugin/src/main/java/lol/pyr/znpcsplus/metadata/MetadataFactory.java
View File

@ -43,4 +43,7 @@ public interface MetadataFactory {
// Axolotl
EntityData axolotlVariant(int variant);
EntityData playingDead(boolean playingDead);
// Bat
EntityData batHanging(boolean hanging);
}

5
plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_10MetadataFactory.java
View File

@ -59,4 +59,9 @@ public class V1_10MetadataFactory extends V1_9MetadataFactory {
public EntityData armorStandRightLegRotation(Vector3f rightLegRotation) {
return createRotations(17, rightLegRotation);
}
@Override
public EntityData batHanging(boolean hanging) {
return newEntityData(12, EntityDataTypes.BYTE, (byte) (hanging ? 0x01 : 0));
}
}

5
plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_14MetadataFactory.java
View File

@ -65,4 +65,9 @@ public class V1_14MetadataFactory extends V1_13MetadataFactory {
public EntityData armorStandRightLegRotation(Vector3f rightLegRotation) {
return createRotations(19, rightLegRotation);
}
@Override
public EntityData batHanging(boolean hanging) {
return newEntityData(14, EntityDataTypes.BYTE, (byte) (hanging ? 0x01 : 0));
}
}

5
plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_15MetadataFactory.java
View File

@ -39,4 +39,9 @@ public class V1_15MetadataFactory extends V1_14MetadataFactory {
public EntityData armorStandRightLegRotation(Vector3f rightLegRotation) {
return createRotations(20, rightLegRotation);
}
@Override
public EntityData batHanging(boolean hanging) {
return newEntityData(15, EntityDataTypes.BYTE, (byte) (hanging ? 0x01 : 0));
}
}

5
plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_17MetadataFactory.java
View File

@ -79,4 +79,9 @@ public class V1_17MetadataFactory extends V1_16MetadataFactory {
public EntityData playingDead(boolean playingDead) {
return newEntityData(18, EntityDataTypes.BOOLEAN, playingDead);
}
@Override
public EntityData batHanging(boolean hanging) {
return newEntityData(16, EntityDataTypes.BYTE, (byte) (hanging ? 0x01 : 0));
}
}

5
plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_8MetadataFactory.java
View File

@ -104,6 +104,11 @@ public class V1_8MetadataFactory implements MetadataFactory {
throw new UnsupportedOperationException("The playing dead entity data isn't supported on this version");
}
@Override
public EntityData batHanging(boolean hanging) {
return newEntityData(16, EntityDataTypes.BYTE, (byte) (hanging ? 1 : 0));
}
@Override
public EntityData silent(boolean enabled) {
return newEntityData(4, EntityDataTypes.BYTE, (byte) (enabled ? 1 : 0));

5
plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_9MetadataFactory.java
View File

@ -27,6 +27,11 @@ public class V1_9MetadataFactory extends V1_8MetadataFactory {
return newEntityData(8, EntityDataTypes.BOOLEAN, ambient);
}
@Override
public EntityData batHanging(boolean hanging) {
return newEntityData(11, EntityDataTypes.BYTE, (byte) (hanging ? 0x01 : 0));
}
@Override
public EntityData name(Component name) {
return newEntityData(2, EntityDataTypes.STRING, AdventureSerializer.getGsonSerializer().serialize(name));

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

@ -46,7 +46,8 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
.addProperties("small", "arms", "base_plate", "head_rotation", "body_rotation", "left_arm_rotation", "right_arm_rotation", "left_leg_rotation", "right_leg_rotation"));
register(builder(p, "bat", EntityTypes.BAT)
.setHologramOffset(-1.075));
.setHologramOffset(-1.075)
.addProperties("hanging"));
register(builder(p, "blaze", EntityTypes.BLAZE)
.setHologramOffset(-0.175));

6
plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8PacketFactory.java
View File

@ -163,10 +163,14 @@ public class V1_8PacketFactory implements PacketFactory {
add(data, metadataFactory.armorStandRightArmRotation(properties.getProperty(propertyRegistry.getByName("right_arm_rotation", Vector3f.class))));
add(data, metadataFactory.armorStandLeftLegRotation(properties.getProperty(propertyRegistry.getByName("left_leg_rotation", Vector3f.class))));
add(data, metadataFactory.armorStandRightLegRotation(properties.getProperty(propertyRegistry.getByName("right_leg_rotation", Vector3f.class))));
} else if (entity.getType().equals(EntityTypes.AXOLOTL)) {
}
else if (entity.getType().equals(EntityTypes.AXOLOTL)) {
add(data, metadataFactory.axolotlVariant(properties.getProperty(propertyRegistry.getByName("axolotl_variant", Integer.class))));
add(data, metadataFactory.playingDead(properties.getProperty(propertyRegistry.getByName("playing_dead", Boolean.class))));
}
else if (entity.getType().equals(EntityTypes.BAT)) {
add(data, metadataFactory.batHanging(properties.getProperty(propertyRegistry.getByName("hanging", Boolean.class))));
}
if (properties.hasProperty(propertyRegistry.getByName("name"))) {
add(data, metadataFactory.name(PapiUtil.set(textSerializer, player, properties.getProperty(propertyRegistry.getByName("name", Component.class)))));
add(data, metadataFactory.nameShown());