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

implement potion_color and potion_ambient

Browse source
This commit is contained in:
Pyrbu 2023-08-07 20:11:44 +02:00
parent 8ad3cb73fd
commit 0f6a953a5e
2 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,8 +58,7 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
registerEnumSerializer(VillagerLevel.class); registerEnumSerializer(VillagerLevel.class);
/* /*
registerType("using_item", false); // TODO: fix it for 1.8 and add new property to use offhand item and riptide animation registerType("using_item", false); // TODO: fix it for 1.8 and add new property to use offhand item and riptide animation
registerType("potion_color", Color.BLACK);
registerType("potion_ambient", false);
registerType("shaking", false); registerType("shaking", false);
registerType("baby", false); // TODO registerType("baby", false); // TODO
registerType("pose", NpcPose.STANDING); registerType("pose", NpcPose.STANDING);
@ -215,7 +214,6 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
register(new DinnerboneProperty(legacyName, optionalComponent)); register(new DinnerboneProperty(legacyName, optionalComponent));
register(new DummyProperty<>("look", false)); register(new DummyProperty<>("look", false));
register(new DummyProperty<>("skin", SkinDescriptor.class, false));
register(new GlowProperty(packetFactory)); register(new GlowProperty(packetFactory));
register(new BitsetProperty("fire", 0, 0x01)); register(new BitsetProperty("fire", 0, 0x01));
@ -224,6 +222,16 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
linkProperties("glow", "fire", "invisible"); linkProperties("glow", "fire", "invisible");
register(new BooleanProperty("silent", 4, false, legacyBooleans)); register(new BooleanProperty("silent", 4, false, legacyBooleans));
int potionIndex;
if (ver.isNewerThanOrEquals(ServerVersion.V_1_17)) potionIndex = 10;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_14)) potionIndex = 9;
else if (ver.isNewerThanOrEquals(ServerVersion.V_1_10)) potionIndex = 8;
else potionIndex = 7;
register(new ColorProperty("potion_color", potionIndex++, null));
register(new BooleanProperty("potion_ambient", potionIndex, false, legacyBooleans));
// Player
register(new DummyProperty<>("skin", SkinDescriptor.class, false));
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;
@ -273,6 +281,8 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
register(new BooleanProperty("has_left_horn", 18, true, legacyBooleans)); register(new BooleanProperty("has_left_horn", 18, true, legacyBooleans));
register(new BooleanProperty("has_right_horn", 19, true, legacyBooleans)); register(new BooleanProperty("has_right_horn", 19, true, legacyBooleans));
} }
} }
private void registerSerializer(PropertySerializer<?> serializer) { private void registerSerializer(PropertySerializer<?> serializer) {

26
plugin/src/main/java/lol/pyr/znpcsplus/entity/properties/ColorProperty.java Normal file
View file

@ -0,0 +1,26 @@
package lol.pyr.znpcsplus.entity.properties;
import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes;
import lol.pyr.znpcsplus.entity.EntityPropertyImpl;
import lol.pyr.znpcsplus.entity.PacketEntity;
import org.bukkit.Color;
import org.bukkit.entity.Player;
import java.util.Map;
public class ColorProperty extends EntityPropertyImpl<Color> {
private final int index;
public ColorProperty(String name, int index, Color def) {
super(name, def, Color.class);
this.index = index;
}
@Override
public void apply(Player player, PacketEntity entity, boolean isSpawned, Map<Integer, EntityData> properties) {
Color color = entity.getProperty(this);
if (color == null) return;
properties.put(index, newEntityData(index, EntityDataTypes.INT, color.asRGB()));
}
}