From 6842c24d1ab62e2e4a29022bbb2795d5d001bbd6 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Thu, 20 May 2021 16:55:48 +0000 Subject: [PATCH 1/3] Add zoglin/hoglin/strider, expand bee/dolphin/turtle variables Signed-off-by: Byron Marohn --- .../bukkit/nbteditor/nbt/EntityNBT.java | 42 +++++++++++++++---- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java b/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java index 1df832a..5e77c8f 100644 --- a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java +++ b/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java @@ -125,9 +125,12 @@ public class EntityNBT extends EntityNBTBase { cCreeper.add("Ignited", new BooleanVariable("ignited")); NBTUnboundVariableContainer cDolphin = new NBTUnboundVariableContainer("Dolphin", cMob); + cDolphin.add("CanFindTreasure", new BooleanVariable("CanFindTreasure")); cDolphin.add("GotFish", new BooleanVariable("GotFish")); cDolphin.add("Moistness", new IntegerVariable("Moistness")); - // TODO: add missing variables + cDolphin.add("TreasurePosX", new IntegerVariable("TreasurePosX")); + cDolphin.add("TreasurePosY", new IntegerVariable("TreasurePosY")); + cDolphin.add("TreasurePosZ", new IntegerVariable("TreasurePosZ")); NBTUnboundVariableContainer cEnderDragon = new NBTUnboundVariableContainer("EnderDragon", cMob); cEnderDragon.add("DragonPhase", new IntegerVariable("DragonPhase", 0, 10)); @@ -159,7 +162,12 @@ public class EntityNBT extends EntityNBTBase { NBTUnboundVariableContainer cTurtle = new NBTUnboundVariableContainer("Turtle", cBreed); cTurtle.add("HasEgg", new BooleanVariable("HasEgg")); - // TODO: add missing variables + cTurtle.add("HomePosX", new IntegerVariable("HomePosX")); + cTurtle.add("HomePosY", new IntegerVariable("HomePosY")); + cTurtle.add("HomePosZ", new IntegerVariable("HomePosZ")); + cTurtle.add("TravelPosX", new IntegerVariable("TravelPosX")); + cTurtle.add("TravelPosY", new IntegerVariable("TravelPosY")); + cTurtle.add("TravelPosZ", new IntegerVariable("TravelPosZ")); NBTUnboundVariableContainer cVillagerGolem = new NBTUnboundVariableContainer("VillagerGolem", cMob); cVillagerGolem.add("PlayerCreated", new BooleanVariable("PlayerCreated")); @@ -180,6 +188,9 @@ public class EntityNBT extends EntityNBTBase { NBTUnboundVariableContainer cZombiePigman = new NBTUnboundVariableContainer("ZombiePigman", cZombie); cZombiePigman.add("Anger", new ShortVariable("Anger")); + NBTUnboundVariableContainer cZoglin = new NBTUnboundVariableContainer("Zoglin", cMob); + cZoglin.add("IsBaby", new BooleanVariable("IsBaby")); + NBTUnboundVariableContainer cPiglin = new NBTUnboundVariableContainer("Piglin", cMob); cPiglin.add("IsBaby", new BooleanVariable("IsBaby")); cPiglin.add("IsImmuneToZombification", new BooleanVariable("IsImmuneToZombification")); @@ -195,8 +206,10 @@ public class EntityNBT extends EntityNBTBase { cZombieVillager.add("ConversionTime", new IntegerVariable("ConversionTime", -1)); NBTUnboundVariableContainer cPhantom = new NBTUnboundVariableContainer("Phantom", cMob); + cPhantom.add("AX", new IntegerVariable("AX")); + cPhantom.add("AY", new IntegerVariable("AY")); + cPhantom.add("AZ", new IntegerVariable("AZ")); cPhantom.add("Size", new IntegerVariable("Size")); - // TODO: add missing variables // Breed SubTypes @@ -247,6 +260,20 @@ public class EntityNBT extends EntityNBTBase { cFox.add("Sitting", new BooleanVariable("Sitting")); cFox.add("Crouching", new BooleanVariable("Crouching")); + NBTUnboundVariableContainer cBee = new NBTUnboundVariableContainer("Bee", cBreed); + cBee.add("AngerTime", new IntegerVariable("AngerTime")); + cBee.add("CannotEnterHiveTicks", new IntegerVariable("CannotEnterHiveTicks")); + cBee.add("CropsGrownSincePollination", new IntegerVariable("CropsGrownSincePollination")); + cBee.add("TicksSincePollination", new IntegerVariable("TicksSincePollination")); + cBee.add("HasNectar", new BooleanVariable("HasNectar")); + cBee.add("HasStung", new BooleanVariable("HasStung")); + // TODO: add FlowerPos / HivePos + + NBTUnboundVariableContainer cHoglin = new NBTUnboundVariableContainer("Hoglin", cBreed); + cHoglin.add("IsImmuneToZombification", new BooleanVariable("IsImmuneToZombification")); + cHoglin.add("CannotBeHunted", new BooleanVariable("CannotBeHunted")); + cHoglin.add("TimeInOverworld", new IntegerVariable("TimeInOverworld")); + // Tameable SubTypes NBTUnboundVariableContainer cOcelot = new NBTUnboundVariableContainer("Ocelot", cTameable); @@ -256,7 +283,7 @@ public class EntityNBT extends EntityNBTBase { cParrot.add("Variant", new IntegerVariable("Variant", 0, 4)); NBTUnboundVariableContainer cWolf = new NBTUnboundVariableContainer("Wolf", cTameable); - cWolf.add("Angry", new BooleanVariable("Angry")); + cWolf.add("AngerTime", new IntegerVariable("AngerTime")); cWolf.add("CollarColor", new ByteVariable("CollarColor", (byte) 0, (byte) 15)); NBTUnboundVariableContainer cCat = new NBTUnboundVariableContainer("Cat", cTameable); @@ -345,15 +372,16 @@ public class EntityNBT extends EntityNBTBase { } if (BukkitVersion.isVersion(15)) { - // TODO: add variables for 1.15 mobs - ENTITY_VARIABLES.put("minecraft:bee", cMob); + ENTITY_VARIABLES.put("minecraft:bee", cBee); } if (BukkitVersion.isVersion(16)) { - // TODO: add variables for 1.16 mobs ENTITY_VARIABLES.put("minecraft:piglin", cPiglin); ENTITY_VARIABLES.put("minecraft:piglin_brute", cMob); ENTITY_VARIABLES.put("minecraft:zombified_piglin", cZombifiedPiglin); + ENTITY_VARIABLES.put("minecraft:zoglin", cZoglin); + ENTITY_VARIABLES.put("minecraft:hoglin", cHoglin); + ENTITY_VARIABLES.put("minecraft:strider", cPig); } // Projectile Entities From 4f1d0bc1ddae234cd095f0af537cbd8395e69e60 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Thu, 20 May 2021 17:08:49 +0000 Subject: [PATCH 2/3] Add CustomModelData field to items Signed-off-by: Byron Marohn --- src/main/java/com/goncalomb/bukkit/nbteditor/nbt/ItemNBT.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/ItemNBT.java b/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/ItemNBT.java index bf4cb65..15d97c0 100644 --- a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/ItemNBT.java +++ b/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/ItemNBT.java @@ -25,6 +25,7 @@ public class ItemNBT extends BaseNBT { cItem.add("Lore", new RawJsonListVariable("display/Lore")); cItem.add("Damage", new IntegerVariable("Damage")); cItem.add("Unbreakable", new BooleanVariable("Unbreakable")); + cItem.add("CustomModelData", new IntegerVariable("CustomModelData")); cItem.add("CanDestroy", new MaterialListVariable("CanDestroy")); cItem.add("CanPlaceOn", new MaterialListVariable("CanPlaceOn")); cItem.add("HideFlags", new IntegerVariable("HideFlags")); From e7661f94d42ea674dcbcb3996fb9981d60a0fd30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20G=C3=BCttinger?= Date: Mon, 13 Dec 2021 16:35:02 +0100 Subject: [PATCH 3/3] Fixed UUIDs being parsed incorrectly --- src/main/java/com/goncalomb/bukkit/mylib/utils/UtilsMc.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/goncalomb/bukkit/mylib/utils/UtilsMc.java b/src/main/java/com/goncalomb/bukkit/mylib/utils/UtilsMc.java index 1807444..82e13fe 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/utils/UtilsMc.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/utils/UtilsMc.java @@ -157,7 +157,7 @@ public static Permission getRootPermission(Plugin plugin) { } public static UUID convertFromUUIDInts(int[] uuidData) { - return new UUID(uuidData[0] << 32 | uuidData[1], uuidData[2] << 32 | uuidData[3]); + return new UUID(((long) uuidData[0] << 32) | uuidData[1], ((long) uuidData[2] << 32) | uuidData[3]); } public static int[] convertToUUIDInts(UUID uuid) {