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

seperate all the skin layer parts out into different properties

Browse Source
This commit is contained in:
Pyrbu 2023-06-13 22:51:04 +02:00
parent f6f861a652
commit 7a3bf0deb0
10 changed files with 39 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,14 +24,20 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
registerSerializer(new ItemStackPropertySerializer()); registerSerializer(new ItemStackPropertySerializer());
registerType("glow", NamedTextColor.class); registerType("glow", NamedTextColor.class);
registerType("skin_layers", true);
registerType("fire", false); registerType("fire", false);
registerType("invisible", false); registerType("invisible", false);
registerType("silent", false); registerType("silent", false);
registerType("skin", SkinDescriptor.class); registerType("skin", SkinDescriptor.class);
registerType("name", Component.class); registerType("name", Component.class);
registerType("look", false); registerType("look", false);
registerType("cape", true);
registerType("skin_cape", true);
registerType("skin_jacket", true);
registerType("skin_left_sleeve", true);
registerType("skin_right_sleeve", true);
registerType("skin_left_leg", true);
registerType("skin_right_leg", true);
registerType("skin_hat", true);
registerType("helmet", ItemStack.class); registerType("helmet", ItemStack.class);
registerType("chestplate", ItemStack.class); registerType("chestplate", ItemStack.class);

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

@ -19,8 +19,7 @@ import java.util.Collection;
* 1.18-1.19 <a href="https://wiki.vg/index.php?title=Entity_metadata">...</a> * 1.18-1.19 <a href="https://wiki.vg/index.php?title=Entity_metadata">...</a>
*/ */
public interface MetadataFactory { public interface MetadataFactory {
EntityData skinLayers(boolean enabled); EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat);
EntityData cape(boolean enabled);
EntityData effects(boolean onFire, boolean glowing, boolean invisible); EntityData effects(boolean onFire, boolean glowing, boolean invisible);
EntityData silent(boolean enabled); EntityData silent(boolean enabled);
Collection<EntityData> name(Component name); Collection<EntityData> name(Component name);

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

@ -4,11 +4,6 @@ import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes; import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes;
public class V1_10MetadataFactory extends V1_9MetadataFactory { public class V1_10MetadataFactory extends V1_9MetadataFactory {
@Override
public EntityData cape(boolean enabled) {
return createCape(13, enabled);
}
@Override @Override
public EntityData noGravity() { public EntityData noGravity() {
return newEntityData(5, EntityDataTypes.BOOLEAN, true); return newEntityData(5, EntityDataTypes.BOOLEAN, true);

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

@ -4,12 +4,7 @@ import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
public class V1_14MetadataFactory extends V1_13MetadataFactory { public class V1_14MetadataFactory extends V1_13MetadataFactory {
@Override @Override
public EntityData skinLayers(boolean enabled) { public EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat) {
return createSkinLayers(15, enabled); return createSkinLayers(15, cape, jacket, leftSleeve, rightSleeve, leftLeg, rightLeg, hat);
}
@Override
public EntityData cape(boolean enabled) {
return createCape(15, enabled);
} }
} }

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

@ -1,10 +0,0 @@
package lol.pyr.znpcsplus.metadata;
import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
public class V1_15MetadataFactory extends V1_14MetadataFactory {
@Override
public EntityData cape(boolean enabled) {
return createCape(16, enabled);
}
}

6
plugin/src/main/java/lol/pyr/znpcsplus/metadata/V1_16MetadataFactory.java
View File

@ -2,9 +2,9 @@ package lol.pyr.znpcsplus.metadata;
import com.github.retrooper.packetevents.protocol.entity.data.EntityData; import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
public class V1_16MetadataFactory extends V1_15MetadataFactory { public class V1_16MetadataFactory extends V1_14MetadataFactory {
@Override @Override
public EntityData skinLayers(boolean enabled) { public EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat) {
return createSkinLayers(16, enabled); return createSkinLayers(16, cape, jacket, leftSleeve, rightSleeve, leftLeg, rightLeg, hat);
} }
} }

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

@ -4,12 +4,7 @@ import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
public class V1_17MetadataFactory extends V1_16MetadataFactory { public class V1_17MetadataFactory extends V1_16MetadataFactory {
@Override @Override
public EntityData skinLayers(boolean enabled) { public EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat) {
return createSkinLayers(17, enabled); return createSkinLayers(17, cape, jacket, leftSleeve, rightSleeve, leftLeg, rightLeg, hat);
}
@Override
public EntityData cape(boolean enabled) {
return createCape(17, enabled);
} }
} }

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

@ -11,13 +11,8 @@ import java.util.Collection;
public class V1_8MetadataFactory implements MetadataFactory { public class V1_8MetadataFactory implements MetadataFactory {
@Override @Override
public EntityData skinLayers(boolean enabled) { public EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat) {
return createSkinLayers(12, enabled); return createSkinLayers(12, cape, jacket, leftSleeve, rightSleeve, leftLeg, rightLeg, hat);
}
@Override
public EntityData cape(boolean enabled) {
return createCape(10, enabled);
} }
@Override @Override
@ -43,12 +38,16 @@ public class V1_8MetadataFactory implements MetadataFactory {
return newEntityData(4, EntityDataTypes.BYTE, (byte) (enabled ? 1 : 0)); return newEntityData(4, EntityDataTypes.BYTE, (byte) (enabled ? 1 : 0));
} }
protected EntityData createSkinLayers(int index, boolean enabled) { protected EntityData createSkinLayers(int index, boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat) {
return newEntityData(index, EntityDataTypes.BYTE, enabled ? Byte.MAX_VALUE : (byte) 0); return newEntityData(index, EntityDataTypes.BYTE, (byte) (
} (cape ? 0x01 : 0) |
(jacket ? 0x02 : 0) |
protected EntityData createCape(int index, boolean enabled) { (leftSleeve ? 0x04 : 0) |
return newEntityData(index, EntityDataTypes.BYTE, (byte) (enabled ? 1 : 0)); (rightSleeve ? 0x08 : 0) |
(leftLeg ? 0x10 : 0) |
(rightLeg ? 0x20 : 0) |
(hat ? 0x40 : 0))
);
} }
protected <T> EntityData newEntityData(int index, EntityDataType<T> type, T value) { protected <T> EntityData newEntityData(int index, EntityDataType<T> type, T value) {

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

@ -10,13 +10,8 @@ import java.util.Collection;
public class V1_9MetadataFactory extends V1_8MetadataFactory { public class V1_9MetadataFactory extends V1_8MetadataFactory {
@Override @Override
public EntityData skinLayers(boolean enabled) { public EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat) {
return createSkinLayers(13, enabled); return createSkinLayers(13, cape, jacket, leftSleeve, rightSleeve, leftLeg, rightLeg, hat);
}
@Override
public EntityData cape(boolean enabled) {
return createCape(12, enabled);
} }
@Override @Override

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

@ -126,10 +126,15 @@ public class V1_8PacketFactory implements PacketFactory {
@Override @Override
public Map<Integer, EntityData> generateMetadata(Player player, PacketEntity entity, PropertyHolder properties) { public Map<Integer, EntityData> generateMetadata(Player player, PacketEntity entity, PropertyHolder properties) {
HashMap<Integer, EntityData> data = new HashMap<>(); HashMap<Integer, EntityData> data = new HashMap<>();
if (entity.getType() == EntityTypes.PLAYER) { if (entity.getType() == EntityTypes.PLAYER) add(data, metadataFactory.skinLayers(
add(data, metadataFactory.skinLayers(properties.getProperty(propertyRegistry.getByName("skin_layers", Boolean.class)))); properties.getProperty(propertyRegistry.getByName("skin_cape", Boolean.class)),
add(data, metadataFactory.cape(properties.getProperty(propertyRegistry.getByName("cape", Boolean.class)))); properties.getProperty(propertyRegistry.getByName("skin_jacket", Boolean.class)),
} properties.getProperty(propertyRegistry.getByName("skin_left_sleeve", Boolean.class)),
properties.getProperty(propertyRegistry.getByName("skin_right_sleeve", Boolean.class)),
properties.getProperty(propertyRegistry.getByName("skin_left_leg", Boolean.class)),
properties.getProperty(propertyRegistry.getByName("skin_right_leg", Boolean.class)),
properties.getProperty(propertyRegistry.getByName("skin_hat", Boolean.class))
));
add(data, metadataFactory.effects(properties.getProperty(propertyRegistry.getByName("fire", Boolean.class)), false, properties.getProperty(propertyRegistry.getByName("fire", Boolean.class)))); add(data, metadataFactory.effects(properties.getProperty(propertyRegistry.getByName("fire", Boolean.class)), false, properties.getProperty(propertyRegistry.getByName("fire", Boolean.class))));
add(data, metadataFactory.silent(properties.getProperty(propertyRegistry.getByName("silent", Boolean.class)))); add(data, metadataFactory.silent(properties.getProperty(propertyRegistry.getByName("silent", Boolean.class))));
if (properties.hasProperty(propertyRegistry.getByName("name"))) addAll(data, metadataFactory.name(properties.getProperty(propertyRegistry.getByName("name", Component.class)))); if (properties.hasProperty(propertyRegistry.getByName("name"))) addAll(data, metadataFactory.name(properties.getProperty(propertyRegistry.getByName("name", Component.class))));