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

seperate shaking into a seperate function in the metadata factory to avoid creating unnessecary lists

Browse source
This commit is contained in:
Pyrbu 2023-06-22 23:29:08 +02:00
parent 8093e709dd
commit 81204688e5
7 changed files with 23 additions and 19 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

@ -21,9 +21,10 @@ import java.util.Collection;
*/ */
public interface MetadataFactory { public interface MetadataFactory {
EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat); EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat);
Collection<EntityData> effects(boolean onFire, boolean glowing, boolean invisible, boolean usingElytra, boolean shaking); EntityData effects(boolean onFire, boolean glowing, boolean invisible, boolean usingElytra);
EntityData silent(boolean enabled); EntityData silent(boolean enabled);
Collection<EntityData> name(Component name); Collection<EntityData> name(Component name);
EntityData noGravity(); EntityData noGravity();
EntityData pose(EntityPose pose); EntityData pose(EntityPose pose);
EntityData shaking();
} }

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

@ -3,8 +3,6 @@ package lol.pyr.znpcsplus.metadata;
import com.github.retrooper.packetevents.protocol.entity.data.EntityData; 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;
import java.util.Collection;
public class V1_17MetadataFactory extends V1_16MetadataFactory { public class V1_17MetadataFactory extends V1_16MetadataFactory {
@Override @Override
public EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat) { public EntityData skinLayers(boolean cape, boolean jacket, boolean leftSleeve, boolean rightSleeve, boolean leftLeg, boolean rightLeg, boolean hat) {
@ -12,10 +10,12 @@ public class V1_17MetadataFactory extends V1_16MetadataFactory {
} }
@Override @Override
public Collection<EntityData> effects(boolean onFire, boolean glowing, boolean invisible, boolean usingElytra, boolean shaking) { public EntityData effects(boolean onFire, boolean glowing, boolean invisible, boolean usingElytra) {
return list( return newEntityData(0, EntityDataTypes.BYTE, (byte) ((onFire ? 0x01 : 0) | (invisible ? 0x20 : 0) | (glowing ? 0x40 : 0) | (usingElytra ? 0x80 : 0)));
newEntityData(0, EntityDataTypes.BYTE, (byte) ((onFire ? 0x01 : 0) | (invisible ? 0x20 : 0) | (glowing ? 0x40 : 0) | (usingElytra ? 0x80 : 0))), }
newEntityData(7, EntityDataTypes.INT, shaking ? 140 : 0)
); @Override
public EntityData shaking() {
return newEntityData(7, EntityDataTypes.INT, 140);
} }
} }

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

@ -18,8 +18,8 @@ public class V1_8MetadataFactory implements MetadataFactory {
} }
@Override @Override
public Collection<EntityData> effects(boolean onFire, boolean glowing, boolean invisible, boolean usingElytra, boolean shaking) { public EntityData effects(boolean onFire, boolean glowing, boolean invisible, boolean usingElytra) {
return list(newEntityData(0, EntityDataTypes.BYTE, (byte) ((onFire ? 0x01 : 0) | (invisible ? 0x20 : 0)))); return newEntityData(0, EntityDataTypes.BYTE, (byte) ((onFire ? 0x01 : 0) | (invisible ? 0x20 : 0)));
} }
@Override @Override
@ -40,6 +40,11 @@ public class V1_8MetadataFactory implements MetadataFactory {
throw new UnsupportedOperationException("The pose entity data isn't supported on this version"); throw new UnsupportedOperationException("The pose entity data isn't supported on this version");
} }
@Override
public EntityData shaking() {
throw new UnsupportedOperationException("The shaking entity data isn't supported on this version");
}
@Override @Override
public EntityData silent(boolean enabled) { public EntityData silent(boolean enabled) {
return newEntityData(4, EntityDataTypes.BYTE, (byte) (enabled ? 1 : 0)); return newEntityData(4, EntityDataTypes.BYTE, (byte) (enabled ? 1 : 0));

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

@ -14,8 +14,8 @@ public class V1_9MetadataFactory extends V1_8MetadataFactory {
} }
@Override @Override
public Collection<EntityData> effects(boolean onFire, boolean glowing, boolean invisible, boolean usingElytra, boolean shaking) { public EntityData effects(boolean onFire, boolean glowing, boolean invisible, boolean usingElytra) {
return list(newEntityData(0, EntityDataTypes.BYTE, (byte) ((onFire ? 0x01 : 0) | (invisible ? 0x20 : 0) | (glowing ? 0x40 : 0) | (usingElytra ? 0x80 : 0)))); return newEntityData(0, EntityDataTypes.BYTE, (byte) ((onFire ? 0x01 : 0) | (invisible ? 0x20 : 0) | (glowing ? 0x40 : 0) | (usingElytra ? 0x80 : 0)));
} }
@Override @Override

6
plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_17PacketFactory.java
View file

@ -20,11 +20,11 @@ public class V1_17PacketFactory extends V1_16PacketFactory {
@Override @Override
public Map<Integer, EntityData> generateMetadata(Player player, PacketEntity entity, PropertyHolder properties) { public Map<Integer, EntityData> generateMetadata(Player player, PacketEntity entity, PropertyHolder properties) {
Map<Integer, EntityData> data = super.generateMetadata(player, entity, properties); Map<Integer, EntityData> data = super.generateMetadata(player, entity, properties);
addAll(data, metadataFactory.effects(properties.getProperty(propertyRegistry.getByName("fire", Boolean.class)), add(data, metadataFactory.effects(properties.getProperty(propertyRegistry.getByName("fire", Boolean.class)),
properties.hasProperty(propertyRegistry.getByName("glow", Boolean.class)), properties.hasProperty(propertyRegistry.getByName("glow", Boolean.class)),
properties.getProperty(propertyRegistry.getByName("invisible", Boolean.class)), properties.getProperty(propertyRegistry.getByName("invisible", Boolean.class)),
false, false));
properties.getProperty(propertyRegistry.getByName("shaking", Boolean.class)))); if (properties.getProperty(propertyRegistry.getByName("shaking", Boolean.class))) add(data, metadataFactory.shaking());
return data; return data;
} }
} }

3
plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_8PacketFactory.java
View file

@ -135,11 +135,10 @@ public class V1_8PacketFactory implements PacketFactory {
properties.getProperty(propertyRegistry.getByName("skin_right_leg", Boolean.class)), properties.getProperty(propertyRegistry.getByName("skin_right_leg", Boolean.class)),
properties.getProperty(propertyRegistry.getByName("skin_hat", Boolean.class)) properties.getProperty(propertyRegistry.getByName("skin_hat", Boolean.class))
)); ));
addAll(data, metadataFactory.effects( add(data, metadataFactory.effects(
properties.getProperty(propertyRegistry.getByName("fire", Boolean.class)), properties.getProperty(propertyRegistry.getByName("fire", Boolean.class)),
false, false,
properties.getProperty(propertyRegistry.getByName("invisible", Boolean.class)), properties.getProperty(propertyRegistry.getByName("invisible", Boolean.class)),
false,
false) false)
); );
add(data, metadataFactory.silent(properties.getProperty(propertyRegistry.getByName("silent", Boolean.class)))); add(data, metadataFactory.silent(properties.getProperty(propertyRegistry.getByName("silent", Boolean.class))));

3
plugin/src/main/java/lol/pyr/znpcsplus/packets/V1_9PacketFactory.java
View file

@ -20,10 +20,9 @@ public class V1_9PacketFactory extends V1_8PacketFactory {
@Override @Override
public Map<Integer, EntityData> generateMetadata(Player player, PacketEntity entity, PropertyHolder properties) { public Map<Integer, EntityData> generateMetadata(Player player, PacketEntity entity, PropertyHolder properties) {
Map<Integer, EntityData> data = super.generateMetadata(player, entity, properties); Map<Integer, EntityData> data = super.generateMetadata(player, entity, properties);
addAll(data, metadataFactory.effects(properties.getProperty(propertyRegistry.getByName("fire", Boolean.class)), add(data, metadataFactory.effects(properties.getProperty(propertyRegistry.getByName("fire", Boolean.class)),
properties.hasProperty(propertyRegistry.getByName("glow", Boolean.class)), properties.hasProperty(propertyRegistry.getByName("glow", Boolean.class)),
properties.getProperty(propertyRegistry.getByName("invisible", Boolean.class)), properties.getProperty(propertyRegistry.getByName("invisible", Boolean.class)),
false,
false)); false));
return data; return data;
} }