zhdev/griefus
1
0
Fork 0
Code Issues Pull requests Activity

Added logging for wolf variants and cat sit states

Browse source
This commit is contained in:
Intelli 2025-03-21 16:49:50 -06:00
parent 6ff24ad347
commit 16b7d35fac
5 changed files with 76 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/net/coreprotect/bukkit/BukkitAdapter.java
View file

@ -108,6 +108,16 @@ public class BukkitAdapter implements BukkitInterface {
return false;
}
@Override
public void getWolfVariant(org.bukkit.entity.Wolf wolf, List<Object> info) {
// Base implementation does nothing - Wolf variants only exist in 1.21+
}
@Override
public void setWolfVariant(org.bukkit.entity.Wolf wolf, Object value) {
// Base implementation does nothing - Wolf variants only exist in 1.21+
}
@Override
public EntityType getEntityType(Material material) {
switch (material) {

22
src/main/java/net/coreprotect/bukkit/BukkitInterface.java
View file

@ -241,6 +241,28 @@ public interface BukkitInterface {
*/
boolean setEntityMeta(Entity entity, Object value, int count);
/**
* Gets the wolf variant and adds it to the info list.
* Only implemented in Minecraft 1.21+.
*
* @param wolf
* The wolf entity
* @param info
* The list to add the variant information to
*/
void getWolfVariant(org.bukkit.entity.Wolf wolf, List<Object> info);
/**
* Sets the wolf variant from the provided value.
* Only implemented in Minecraft 1.21+.
*
* @param wolf
* The wolf entity
* @param value
* The variant value to set
*/
void setWolfVariant(org.bukkit.entity.Wolf wolf, Object value);
/**
* Gets the frame type for an entity.
*

37
src/main/java/net/coreprotect/bukkit/Bukkit_v1_21.java
View file

@ -1,7 +1,6 @@
package net.coreprotect.bukkit;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.bukkit.Bukkit;
@ -126,4 +125,38 @@ public class Bukkit_v1_21 extends Bukkit_v1_20 implements BukkitInterface {
// return RegistryAccess.registryAccess().getRegistry(RegistryKey.CAT_VARIANT).get((NamespacedKey)value);
return Bukkit.getRegistry((Class) tClass).get(namespacedKey);
}
/**
* Gets the wolf variant and adds it to the info list.
* This functionality is specific to Minecraft 1.21+.
*
* @param wolf
* The wolf entity
* @param info
* The list to add the variant information to
*/
@Override
public void getWolfVariant(org.bukkit.entity.Wolf wolf, List<Object> info) {
// Add the variant to the info list
info.add(getRegistryKey(wolf.getVariant()));
}
/**
* Sets the wolf variant from the provided value.
* This functionality is specific to Minecraft 1.21+.
*
* @param wolf
* The wolf entity
* @param value
* The variant value to set
*/
@Override
public void setWolfVariant(org.bukkit.entity.Wolf wolf, Object value) {
if (value instanceof String) {
value = getRegistryValue((String) value, org.bukkit.entity.Wolf.Variant.class);
}
org.bukkit.entity.Wolf.Variant variant = (org.bukkit.entity.Wolf.Variant) value;
wolf.setVariant(variant);
}
}

2
src/main/java/net/coreprotect/listener/entity/EntityDeathListener.java
View file

@ -332,6 +332,7 @@ public final class EntityDeathListener extends Queue implements Listener {
Cat cat = (Cat) entity;
info.add(BukkitAdapter.ADAPTER.getRegistryKey(cat.getCatType()));
info.add(cat.getCollarColor());
info.add(cat.isSitting());
}
else if (entity instanceof Fox) {
Fox fox = (Fox) entity;
@ -437,6 +438,7 @@ public final class EntityDeathListener extends Queue implements Listener {
Wolf wolf = (Wolf) entity;
info.add(wolf.isSitting());
info.add(wolf.getCollarColor());
BukkitAdapter.ADAPTER.getWolfVariant(wolf, info);
}
else if (entity instanceof ZombieVillager) {
ZombieVillager zombieVillager = (ZombieVillager) entity;

7
src/main/java/net/coreprotect/utility/entity/EntityUtil.java
View file

@ -249,6 +249,10 @@ public class EntityUtil {
DyeColor set = (DyeColor) value;
cat.setCollarColor(set);
}
else if (count == 2) {
boolean set = (Boolean) value;
cat.setSitting(set);
}
}
else if (entity instanceof Fox) {
Fox fox = (Fox) entity;
@ -436,6 +440,9 @@ public class EntityUtil {
DyeColor set = (DyeColor) value;
wolf.setCollarColor(set);
}
else if (count == 2) {
BukkitAdapter.ADAPTER.setWolfVariant(wolf, value);
}
}
else if (entity instanceof ZombieVillager) {
ZombieVillager zombieVillager = (ZombieVillager) entity;