From 81d80d82cb9e424c121093d565111a46e54f8d0e Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Thu, 8 Oct 2020 05:48:20 +0000 Subject: [PATCH 01/27] Basic upgrade to 1.16 Signed-off-by: Byron Marohn --- pom.xml | 6 +-- .../mylib/namemaps/EnchantmentsMap.java | 1 + .../bukkit/mylib/namemaps/EntityTypeMap.java | 2 +- .../bukkit/mylib/namemaps/SpawnEggMap.java | 2 +- .../bukkit/mylib/reflect/NBTUtils.java | 16 +++++--- .../bukkit/nbteditor/nbt/EntityNBT.java | 38 +++++++++++++++---- 6 files changed, 47 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 6f44d591..ea6d0fbe 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 2013 - 1.15-R0.1-SNAPSHOT + 1.16.3-R0.1-SNAPSHOT UTF-8 ${maven.build.timestamp} yyyy-MM-dd'T'HH:mm:ss'Z' @@ -38,8 +38,8 @@ test - org.bukkit - bukkit + org.spigotmc + spigot-api ${bukkit.version} provided diff --git a/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EnchantmentsMap.java b/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EnchantmentsMap.java index d4d3a5f4..9a330c08 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EnchantmentsMap.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EnchantmentsMap.java @@ -70,6 +70,7 @@ public final class EnchantmentsMap { _enchantments.put("Multishot", Enchantment.MULTISHOT); _enchantments.put("Piercing", Enchantment.PIERCING); _enchantments.put("QuickCharge", Enchantment.QUICK_CHARGE); + _enchantments.put("SoulSpeed", Enchantment.SOUL_SPEED); List enchantmentNames = new ArrayList(_enchantments.names()); Collections.sort(enchantmentNames, String.CASE_INSENSITIVE_ORDER); diff --git a/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EntityTypeMap.java b/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EntityTypeMap.java index c808eeae..78bbf881 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EntityTypeMap.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EntityTypeMap.java @@ -71,7 +71,7 @@ public final class EntityTypeMap { _legacyNames.put("Zombie".toLowerCase(), EntityType.ZOMBIE); _legacyNames.put("Slime".toLowerCase(), EntityType.SLIME); _legacyNames.put("Ghast".toLowerCase(), EntityType.GHAST); - _legacyNames.put("PigZombie".toLowerCase(), EntityType.PIG_ZOMBIE); + _legacyNames.put("PigZombie".toLowerCase(), EntityType.ZOMBIFIED_PIGLIN); _legacyNames.put("Enderman".toLowerCase(), EntityType.ENDERMAN); _legacyNames.put("CaveSpider".toLowerCase(), EntityType.CAVE_SPIDER); _legacyNames.put("Silverfish".toLowerCase(), EntityType.SILVERFISH); diff --git a/src/main/java/com/goncalomb/bukkit/mylib/namemaps/SpawnEggMap.java b/src/main/java/com/goncalomb/bukkit/mylib/namemaps/SpawnEggMap.java index 9c919c08..4ecca3e8 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/namemaps/SpawnEggMap.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/namemaps/SpawnEggMap.java @@ -15,7 +15,7 @@ public class SpawnEggMap { if (entityName.equals("MOOSHROOM")) { _spawnEggs.put(EntityTypeMap.getName(EntityType.MUSHROOM_COW), mat); } else if (entityName.equals("ZOMBIE_PIGMAN")) { - _spawnEggs.put(EntityTypeMap.getName(EntityType.PIG_ZOMBIE), mat); + _spawnEggs.put(EntityTypeMap.getName(EntityType.ZOMBIFIED_PIGLIN), mat); } else { EntityType entityType = EntityType.valueOf(entityName); if (entityType != null) { diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java index 921fa21d..e984f55d 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java @@ -94,12 +94,18 @@ static void prepareReflection() throws SecurityException, NoSuchMethodException, Class minecraftTileEntityClass = BukkitReflect.getMinecraftClass("TileEntity"); _TileEntity_save = minecraftTileEntityClass.getMethod("save", nbtTagCompoundClass); try { - // Bukkit 1.12.1+ + // Bukkit 1.12.1-1.15.2 _TileEntity_load = minecraftTileEntityClass.getMethod("load", nbtTagCompoundClass); } catch (NoSuchMethodException e) { - // Bukkit 1.12 - // XXX: remove fallback on next version - _TileEntity_load = minecraftTileEntityClass.getMethod("a", nbtTagCompoundClass); + try { + // Bukkit 1.16+ + Class minecraftIBlockDataClass = BukkitReflect.getMinecraftClass("IBlockData"); + _TileEntity_load = minecraftTileEntityClass.getMethod("load", minecraftIBlockDataClass, nbtTagCompoundClass); + } catch (NoSuchMethodException ex) { + // Bukkit 1.12 + // XXX: remove fallback on next version + _TileEntity_load = minecraftTileEntityClass.getMethod("a", nbtTagCompoundClass); + } } Class craftWorldClass = BukkitReflect.getCraftBukkitClass("CraftWorld"); @@ -197,7 +203,7 @@ public static void setTileEntityNBTData(Block block, NBTTagCompound data) { NBTBase.prepareReflection(); Object tileEntity = getTileEntity(block); if (tileEntity != null) { - BukkitReflect.invokeMethod(tileEntity, _TileEntity_load, data._handle); + BukkitReflect.invokeMethod(tileEntity, _TileEntity_load, null, data._handle); } } 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 f2b08f0e..4829d7c5 100644 --- a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java +++ b/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java @@ -176,9 +176,20 @@ public class EntityNBT extends EntityNBTBase { cZombie.add("InWaterTime", new IntegerVariable("InWaterTime")); cZombie.add("DrownedConversionTime", new IntegerVariable("DrownedConversionTime")); + // 1.15 and below NBTUnboundVariableContainer cZombiePigman = new NBTUnboundVariableContainer("ZombiePigman", cZombie); cZombiePigman.add("Anger", new ShortVariable("Anger")); + NBTUnboundVariableContainer cPiglin = new NBTUnboundVariableContainer("Piglin", cMob); + cPiglin.add("IsBaby", new BooleanVariable("IsBaby")); + cPiglin.add("IsImmuneToZombification", new BooleanVariable("IsImmuneToZombification")); + cPiglin.add("CannotHunt", new BooleanVariable("CannotHunt")); + cPiglin.add("TimeInOverworld", new IntegerVariable("TimeInOverworld")); + // TODO: add villager inventory + + NBTUnboundVariableContainer cZombifiedPiglin = new NBTUnboundVariableContainer("ZombifiedPilgin", cZombie); + cZombifiedPiglin.add("AngerTime", new IntegerVariable("AngerTime")); + NBTUnboundVariableContainer cZombieVillager = new NBTUnboundVariableContainer("ZombieVillager", cZombie); cZombieVillager.add("Profession", new IntegerVariable("Profession", 0, 5)); cZombieVillager.add("ConversionTime", new IntegerVariable("ConversionTime", -1)); @@ -313,7 +324,9 @@ public class EntityNBT extends EntityNBTBase { ENTITY_VARIABLES.put("minecraft:wolf", cWolf); ENTITY_VARIABLES.put("minecraft:zombie", cZombie); ENTITY_VARIABLES.put("minecraft:zombie_horse", cHorse); - ENTITY_VARIABLES.put("minecraft:zombie_pigman", cZombiePigman); + if (!BukkitVersion.isVersion(16)) { + ENTITY_VARIABLES.put("minecraft:zombie_pigman", cZombiePigman); + } ENTITY_VARIABLES.put("minecraft:zombie_villager", cZombieVillager); ENTITY_VARIABLES.put("minecraft:cod", cFish); ENTITY_VARIABLES.put("minecraft:salmon", cFish); @@ -321,19 +334,28 @@ public class EntityNBT extends EntityNBTBase { ENTITY_VARIABLES.put("minecraft:tropical_fish", cTropicalFish); // TODO: add variables for 1.14 mobs - ENTITY_VARIABLES.put("minecraft:pillager", cMob); - ENTITY_VARIABLES.put("minecraft:panda", cMob); - ENTITY_VARIABLES.put("minecraft:wandering_trader", cMob); - ENTITY_VARIABLES.put("minecraft:trader_llama", cMob); - ENTITY_VARIABLES.put("minecraft:fox", cFox); - ENTITY_VARIABLES.put("minecraft:cat", cCat); - ENTITY_VARIABLES.put("minecraft:ravager", cMob); + if (BukkitVersion.isVersion(14)) { + ENTITY_VARIABLES.put("minecraft:pillager", cMob); + ENTITY_VARIABLES.put("minecraft:panda", cMob); + ENTITY_VARIABLES.put("minecraft:wandering_trader", cMob); + ENTITY_VARIABLES.put("minecraft:trader_llama", cMob); + ENTITY_VARIABLES.put("minecraft:fox", cFox); + ENTITY_VARIABLES.put("minecraft:cat", cCat); + ENTITY_VARIABLES.put("minecraft:ravager", cMob); + } if (BukkitVersion.isVersion(15)) { // TODO: add variables for 1.15 mobs ENTITY_VARIABLES.put("minecraft:bee", cMob); } + 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); + } + // Projectile Entities NBTUnboundVariableContainer cArrow = new NBTUnboundVariableContainer("Arrow", cEntity); From c59fa04b8e2b66d19e86ad3af0d41e00d809b9a4 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Sat, 24 Oct 2020 22:17:50 +0000 Subject: [PATCH 02/27] Change UUID storage format for 1.16 Signed-off-by: Byron Marohn --- .../bukkit/mylib/reflect/NBTTagCompound.java | 34 +++++++++++++++++++ .../bukkit/mylib/reflect/NBTTypes.java | 4 +++ .../goncalomb/bukkit/mylib/utils/UtilsMc.java | 13 +++++++ .../bukkit/nbteditor/nbt/EntityNBTBase.java | 1 + .../nbt/attributes/ItemModifier.java | 3 +- .../nbteditor/nbt/attributes/Modifier.java | 6 ++-- 6 files changed, 57 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java index fad4e051..2e19ccba 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java @@ -38,6 +38,9 @@ public final class NBTTagCompound extends NBTBase { private static Method _getFloat; private static Method _getDouble; private static Method _getString; + private static Method _getByteArray; + private static Method _getIntArray; + private static Method _getLongArray; private static Field _mapField; private static Method _tagSerializeStream; @@ -52,6 +55,9 @@ static void prepareReflectionz() throws SecurityException, NoSuchMethodException _getFloat = _nbtTagCompoundClass.getMethod("getFloat", String.class); _getDouble = _nbtTagCompoundClass.getMethod("getDouble", String.class); _getString = _nbtTagCompoundClass.getMethod("getString", String.class); + _getByteArray = _nbtTagCompoundClass.getMethod("getByteArray", String.class); + _getIntArray = _nbtTagCompoundClass.getMethod("getIntArray", String.class); + _getLongArray = _nbtTagCompoundClass.getMethod("getLongArray", String.class); _mapField = _nbtTagCompoundClass.getDeclaredField("map"); _mapField.setAccessible(true); @@ -103,6 +109,20 @@ public String getString(String key) { return (String) invokeMethod(_getString, key); } + public byte[] getByteArray(String key) { + return (byte[]) invokeMethod(_getByteArray, key); + } + + public int[] getIntArray(String key) { + return (int[]) invokeMethod(_getIntArray, key); + } + + // TagLongArray's internal field name is 'b' for some absurd reason. + // Since it isn't used, don't bother working around this +// public long[] getLongArray(String key) { +// return (long[]) invokeMethod(_getLongArray, key); +// } + public NBTTagCompound getCompound(String key) { Object obj = _map.get(key); if (obj != null && _nbtTagCompoundClass.isInstance(obj)) { @@ -164,6 +184,20 @@ public void setList(String key, Object... objects) { set(key, new NBTTagList(objects)); } + public void setByteArray(String key, byte[] value) { + set(key, value); + } + + public void setIntArray(String key, int[] value) { + set(key, value); + } + + // TagLongArray's internal field name is 'b' for some absurd reason. + // Since it isn't used, don't bother working around this +// public void setLongArray(String key, long[] value) { +// set(key, value); +// } + private void set(String key, Object value) { _map.put(key, NBTTypes.toInternal(value)); } diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java index 582cc024..e42df86f 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java @@ -43,6 +43,10 @@ public static void prepareReflection() throws SecurityException, NoSuchMethodExc registerNew("NBTTagFloat"); registerNew("NBTTagDouble"); registerNew("NBTTagString"); + registerNew("NBTTagByteArray"); + registerNew("NBTTagIntArray"); + // TagLongArray's internal field name is 'b' for some absurd reason. + // Since it isn't used, don't bother working around this } private static void registerNew(String tagClassName) throws SecurityException, NoSuchMethodException, NoSuchFieldException { 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 1fe36abf..18074447 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/utils/UtilsMc.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/utils/UtilsMc.java @@ -22,6 +22,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; +import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.ChatColor; @@ -155,4 +156,16 @@ public static Permission getRootPermission(Plugin plugin) { return perm; } + public static UUID convertFromUUIDInts(int[] uuidData) { + return new UUID(uuidData[0] << 32 | uuidData[1], uuidData[2] << 32 | uuidData[3]); + } + + public static int[] convertToUUIDInts(UUID uuid) { + return new int[] { + (int)((uuid.getMostSignificantBits() >> 32) & 0xFFFFFFFF), + (int)(uuid.getMostSignificantBits() & 0xFFFFFFFF), + (int)((uuid.getLeastSignificantBits() >> 32) & 0xFFFFFFFF), + (int)(uuid.getLeastSignificantBits() & 0xFFFFFFFF) + }; + } } diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBTBase.java b/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBTBase.java index 62603bc7..ebf03083 100644 --- a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBTBase.java +++ b/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBTBase.java @@ -129,6 +129,7 @@ public static EntityNBT fromEntity(Entity entity) { // When cloning, remove the UUID to force all entities to have a unique one. entityNbt._data.remove("UUIDMost"); entityNbt._data.remove("UUIDLeast"); + entityNbt._data.remove("UUID"); return entityNbt; } diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/ItemModifier.java b/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/ItemModifier.java index 39da3263..d5b0187d 100644 --- a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/ItemModifier.java +++ b/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/ItemModifier.java @@ -28,6 +28,7 @@ import com.goncalomb.bukkit.mylib.reflect.NBTTagCompound; import com.goncalomb.bukkit.mylib.reflect.NBTTagList; import com.goncalomb.bukkit.mylib.reflect.NBTUtils; +import com.goncalomb.bukkit.mylib.utils.UtilsMc; public final class ItemModifier extends Modifier { @@ -41,7 +42,7 @@ public static ItemModifier fromNBT(NBTTagCompound data) { data.getDouble("Amount"), data.getInt("Operation"), (data.hasKey("Slot") ? data.getString("Slot") : null), - new UUID(data.getLong("UUIDMost"), data.getLong("UUIDLeast"))); + UtilsMc.convertFromUUIDInts(data.getIntArray("UUID"))); } public static List getItemStackModifiers(ItemStack item) { diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/Modifier.java b/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/Modifier.java index b689c0f9..e800223e 100644 --- a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/Modifier.java +++ b/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/Modifier.java @@ -22,6 +22,7 @@ import java.util.UUID; import com.goncalomb.bukkit.mylib.reflect.NBTTagCompound; +import com.goncalomb.bukkit.mylib.utils.UtilsMc; public class Modifier { @@ -31,7 +32,7 @@ public class Modifier { private UUID _uuid; public static Modifier fromNBT(NBTTagCompound data) { - return new Modifier(data.getString("Name"), data.getDouble("Amount"), data.getInt("Operation"), new UUID(data.getLong("UUIDMost"), data.getLong("UUIDLeast"))); + return new Modifier(data.getString("Name"), data.getDouble("Amount"), data.getInt("Operation"), UtilsMc.convertFromUUIDInts(data.getIntArray("UUID"))); } public Modifier(String name, double amount, int operation) { @@ -66,8 +67,7 @@ public NBTTagCompound toNBT() { data.setString("Name", _name); data.setDouble("Amount", _amount); data.setInt("Operation", _operation); - data.setLong("UUIDMost", _uuid.getMostSignificantBits()); - data.setLong("UUIDLeast", _uuid.getLeastSignificantBits()); + data.setIntArray("UUID", UtilsMc.convertToUUIDInts(_uuid)); return data; } From 7a5283813bdb079314dc7ddf541aa750207b31cd Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Sat, 24 Oct 2020 22:22:40 +0000 Subject: [PATCH 03/27] Rename the attribute modifiers for 1.16 Signed-off-by: Byron Marohn --- .../nbt/attributes/AttributeType.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeType.java b/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeType.java index 76fdb3af..d4a44cd2 100644 --- a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeType.java +++ b/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeType.java @@ -23,22 +23,22 @@ public enum AttributeType { // Mobs - MAX_HEALTH("MaxHealth", "generic.maxHealth", 0.0, Double.MAX_VALUE), - FOLLOW_RANGE("FollowRange", "generic.followRange", 0.0, 2048), - KNOCKBACK_RESISTANCE("KnockbackResistance", "generic.knockbackResistance", 0.0, 1.0), - MOVEMENT_SPEED("MovementSpeed", "generic.movementSpeed", 0.0, Double.MAX_VALUE), - ATTACK_DAMAGE("AttackDamage", "generic.attackDamage", 0.0, Double.MAX_VALUE), - ATTACK_KNOCKBACK("AttackKnockback", "generic.attackKnockback", 0.0, 5.0), + MAX_HEALTH("MaxHealth", "generic.max_health", 0.0, Double.MAX_VALUE), + FOLLOW_RANGE("FollowRange", "generic.follow_range", 0.0, 2048), + KNOCKBACK_RESISTANCE("KnockbackResistance", "generic.knockback_resistance", 0.0, 1.0), + MOVEMENT_SPEED("MovementSpeed", "generic.movement_speed", 0.0, Double.MAX_VALUE), + ATTACK_DAMAGE("AttackDamage", "generic.attack_damage", 0.0, Double.MAX_VALUE), + ATTACK_KNOCKBACK("AttackKnockback", "generic.attack_knockback", 0.0, 5.0), ARMOR("Armor", "generic.armor", 0.0, 30.0), - ARMOR_TOUGHNESS("ArmorToughness", "generic.armorToughness", 0.0, 20.0), - FLYING_SPEED("FlyingSpeed", "generic.flyingSpeed", 0.0, 1024.0), + ARMOR_TOUGHNESS("ArmorToughness", "generic.armor_toughness", 0.0, 20.0), + FLYING_SPEED("FlyingSpeed", "generic.flying_speed", 0.0, 1024.0), // Player - ATTACK_SPEED("AttackSpeed", "generic.attackSpeed", 0.0, 1024.0), + ATTACK_SPEED("AttackSpeed", "generic.attack_speed", 0.0, 1024.0), LUCK("Luck", "generic.luck", -1024.0, 1024.0), // Horses - JUMP_STRENGTH("JumpStrength", "horse.jumpStrength", 0.0, 2), + JUMP_STRENGTH("JumpStrength", "horse.jump_strength", 0.0, 2), // Zombies - SPAWN_REINFORCEMENTS("SpawnReinforcements", "zombie.spawnReinforcements", 0.0, 1.0); + SPAWN_REINFORCEMENTS("SpawnReinforcements", "zombie.spawn_reinforcements", 0.0, 1.0); private static final HashMap _attributes = new HashMap(); private static final HashMap _attributesInternal = new HashMap(); From bb62fda2195f4631d5abbb33c75b78fab860209b Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Sun, 25 Oct 2020 00:43:49 +0000 Subject: [PATCH 04/27] Fix summoning stacked mobs with a BoS Signed-off-by: Byron Marohn --- .../bukkit/mylib/reflect/NBTUtils.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java index e984f55d..0d9d1aae 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java @@ -22,7 +22,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; -import java.util.Optional; +import java.util.function.Function; import org.bukkit.Location; import org.bukkit.block.Block; @@ -62,7 +62,7 @@ public final class NBTUtils { // Minecraft's World private static Method _World_getTileEntity; - private static Method _World_addEntity; + private static Method _WorldServer_addAllEntitiesSafely; // Minecraft's EntityTypes Class private static Method _EntityTypes_a; // Spawn an entity from a NBTCompound. @@ -116,10 +116,12 @@ static void prepareReflection() throws SecurityException, NoSuchMethodException, Class minecraftWorldClass = BukkitReflect.getMinecraftClass("World"); _World_getTileEntity = minecraftWorldClass.getMethod("getTileEntity", minecraftBlockPositionClass); - _World_addEntity = minecraftWorldClass.getMethod("addEntity", minecraftEntityClass); + + Class minecraftWorldServerClass = BukkitReflect.getMinecraftClass("WorldServer"); + _WorldServer_addAllEntitiesSafely = minecraftWorldServerClass.getMethod("addAllEntitiesSafely", minecraftEntityClass); Class minecraftEntityTypesClass = BukkitReflect.getMinecraftClass("EntityTypes"); - _EntityTypes_a = minecraftEntityTypesClass.getMethod("a", nbtTagCompoundClass, minecraftWorldClass); + _EntityTypes_a = minecraftEntityTypesClass.getMethod("a", nbtTagCompoundClass, minecraftWorldClass, Function.class); } private NBTUtils() { } @@ -138,13 +140,17 @@ public static NBTTagCompound itemStackToNBTData(ItemStack stack) { @SuppressWarnings("unchecked") public static Entity spawnEntity(NBTTagCompound data, Location location) { Object worldHandle = BukkitReflect.invokeMethod(location.getWorld(), _CraftWorld_getHandle); - Optional entityHandleOp = (Optional) BukkitReflect.invokeMethod(null, _EntityTypes_a, data._handle, worldHandle); - if (!entityHandleOp.isPresent()) { + // This function will be applied to each summoned entity (including passengers) to set their location + Function entityFunction = (Object entity) -> { + BukkitReflect.invokeMethod(entity, _Entity_setPosition, location.getX(), location.getY(), location.getZ()); + return entity; + }; + // Summon the entity, and for each entity summoned (including passengers) run the above function + Object entityHandle = BukkitReflect.invokeMethod(null, _EntityTypes_a, data._handle, worldHandle, entityFunction); + if (entityHandle == null) { return null; } - Object entityHandle = entityHandleOp.get(); - BukkitReflect.invokeMethod(entityHandle, _Entity_setPosition, location.getX(), location.getY(), location.getZ()); - BukkitReflect.invokeMethod(worldHandle, _World_addEntity, entityHandle); + BukkitReflect.invokeMethod(worldHandle, _WorldServer_addAllEntitiesSafely, entityHandle); return (Entity) BukkitReflect.invokeMethod(entityHandle, _Entity_getBukkitEntity); } From c0d7575595c1ac2936605d8aa7656abd046b3c5c Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Sun, 25 Oct 2020 01:05:56 +0000 Subject: [PATCH 05/27] Prevent right click with BoS summoning mob in 1.15+ Signed-off-by: Byron Marohn --- .../customitems/api/CustomItemListener.java | 8 ++++++- .../goncalomb/bukkit/mylib/utils/Utils.java | 22 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemListener.java b/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemListener.java index 00b85700..80a8cf99 100644 --- a/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemListener.java +++ b/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemListener.java @@ -22,6 +22,9 @@ import java.util.Arrays; import java.util.HashSet; +import com.goncalomb.bukkit.mylib.utils.Utils; +import com.goncalomb.bukkit.nbteditor.NBTEditor; + import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.World; @@ -73,7 +76,10 @@ private static boolean verifyCustomItem(CustomItem customItem, Player player, bo @EventHandler private void playerInteract(PlayerInteractEvent event) { Action action = event.getAction(); - if (action != Action.PHYSICAL) { + + // Only check the first interaction each tick per player + // This is needed because 1.15+ generate an extra left click event when right clicking with a book + if (action != Action.PHYSICAL && Utils.checkOnceThisTick(NBTEditor.getInstance(), event.getPlayer(), "NBTEditorInteractEvent")) { if (action == Action.RIGHT_CLICK_BLOCK && _interationMaterials.contains(event.getClickedBlock().getType())) { return; } diff --git a/src/main/java/com/goncalomb/bukkit/mylib/utils/Utils.java b/src/main/java/com/goncalomb/bukkit/mylib/utils/Utils.java index fe5ce90e..ed4d9938 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/utils/Utils.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/utils/Utils.java @@ -26,6 +26,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.bukkit.entity.Entity; +import org.bukkit.metadata.FixedMetadataValue; +import org.bukkit.plugin.Plugin; import org.bukkit.util.StringUtil; public final class Utils { @@ -109,4 +112,23 @@ public static List getElementsWithPrefixGeneric(Collection values, St return Collections.unmodifiableList(result); } + /* This method can be used to wrap code that should only execute once per tick + * for a given metadata object (block, entity, etc.). + * + * If this function returns true, the program should proceed - this is the + * first time it has been invoked on this particular tick + * + * If this function returns false, then it has been called already this tick + * for this entity / metakey pair. When returning false, the code should not + * be executed. + */ + public static boolean checkOnceThisTick(Plugin plugin, Entity entity, String metakey) { + if (entity.hasMetadata(metakey) + && entity.getMetadata(metakey).get(0).asInt() == entity.getTicksLived()) { + return false; + } + + entity.setMetadata(metakey, new FixedMetadataValue(plugin, entity.getTicksLived())); + return true; + } } From 94e4e09d9328e3abaec55e7059d3c9e61bd62dfb Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Sun, 25 Oct 2020 21:05:40 +0000 Subject: [PATCH 06/27] Rename 'Potion' -> 'Item' for 1.16 Signed-off-by: Byron Marohn --- src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java | 2 +- src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java index 0d9d1aae..343cc157 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java @@ -179,7 +179,7 @@ public static NBTTagList potionToNBTEffectsList(ItemStack potion) { public static ItemStack potionFromNBTEffectsList(NBTTagList effects) { NBTTagCompound tag = new NBTTagCompound(); tag.setList("CustomPotionEffects", effects.clone()); - tag.setString("Potion", "minecraft:empty"); + tag.setString("Potion", "minecraft:mundane"); NBTTagCompound data = new NBTTagCompound(); data.setString("id", "minecraft:potion"); data.setByte("Count", (byte) 1); 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 4829d7c5..1df832ab 100644 --- a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java +++ b/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java @@ -384,7 +384,7 @@ public class EntityNBT extends EntityNBTBase { cEnderPearl.add("Owner", new StringVariable("ownerName")); NBTUnboundVariableContainer cPotion = new NBTUnboundVariableContainer("Potion", cEntity); - cPotion.add("Potion", new PotionVariable("Potion")); + cPotion.add("Item", new PotionVariable("Item")); NBTUnboundVariableContainer cTrident = new NBTUnboundVariableContainer("Trident", cArrow); cTrident.add("Trident", new SingleItemVariable("Trident")); From 9985415478005c358c9bc47211cb1dafd1cca2c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A7alo=20Baltazar?= Date: Sun, 1 Nov 2020 23:39:17 +0000 Subject: [PATCH 07/27] Update version to 3.3-SNAPSHOT for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ae06328a..aa1c5390 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.goncalomb.bukkit nbteditor - 3.2-SNAPSHOT + 3.3-SNAPSHOT jar NBTEditor From b490d19fac6119bf0d53c454dfc93ca824b787e5 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Thu, 12 Nov 2020 23:26:03 +0000 Subject: [PATCH 08/27] Fix namespace on mob attributes Signed-off-by: Byron Marohn --- .../nbt/attributes/AttributeType.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeType.java b/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeType.java index d4a44cd2..030cdb13 100644 --- a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeType.java +++ b/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeType.java @@ -23,22 +23,22 @@ public enum AttributeType { // Mobs - MAX_HEALTH("MaxHealth", "generic.max_health", 0.0, Double.MAX_VALUE), - FOLLOW_RANGE("FollowRange", "generic.follow_range", 0.0, 2048), - KNOCKBACK_RESISTANCE("KnockbackResistance", "generic.knockback_resistance", 0.0, 1.0), - MOVEMENT_SPEED("MovementSpeed", "generic.movement_speed", 0.0, Double.MAX_VALUE), - ATTACK_DAMAGE("AttackDamage", "generic.attack_damage", 0.0, Double.MAX_VALUE), - ATTACK_KNOCKBACK("AttackKnockback", "generic.attack_knockback", 0.0, 5.0), - ARMOR("Armor", "generic.armor", 0.0, 30.0), - ARMOR_TOUGHNESS("ArmorToughness", "generic.armor_toughness", 0.0, 20.0), - FLYING_SPEED("FlyingSpeed", "generic.flying_speed", 0.0, 1024.0), + MAX_HEALTH("MaxHealth", "minecraft:generic.max_health", 0.0, Double.MAX_VALUE), + FOLLOW_RANGE("FollowRange", "minecraft:generic.follow_range", 0.0, 2048), + KNOCKBACK_RESISTANCE("KnockbackResistance", "minecraft:generic.knockback_resistance", 0.0, 1.0), + MOVEMENT_SPEED("MovementSpeed", "minecraft:generic.movement_speed", 0.0, Double.MAX_VALUE), + ATTACK_DAMAGE("AttackDamage", "minecraft:generic.attack_damage", 0.0, Double.MAX_VALUE), + ATTACK_KNOCKBACK("AttackKnockback", "minecraft:generic.attack_knockback", 0.0, 5.0), + ARMOR("Armor", "minecraft:generic.armor", 0.0, 30.0), + ARMOR_TOUGHNESS("ArmorToughness", "minecraft:generic.armor_toughness", 0.0, 20.0), + FLYING_SPEED("FlyingSpeed", "minecraft:generic.flying_speed", 0.0, 1024.0), // Player - ATTACK_SPEED("AttackSpeed", "generic.attack_speed", 0.0, 1024.0), - LUCK("Luck", "generic.luck", -1024.0, 1024.0), + ATTACK_SPEED("AttackSpeed", "minecraft:generic.attack_speed", 0.0, 1024.0), + LUCK("Luck", "minecraft:generic.luck", -1024.0, 1024.0), // Horses - JUMP_STRENGTH("JumpStrength", "horse.jump_strength", 0.0, 2), + JUMP_STRENGTH("JumpStrength", "minecraft:horse.jump_strength", 0.0, 2), // Zombies - SPAWN_REINFORCEMENTS("SpawnReinforcements", "zombie.spawn_reinforcements", 0.0, 1.0); + SPAWN_REINFORCEMENTS("SpawnReinforcements", "minecraft:zombie.spawn_reinforcements", 0.0, 1.0); private static final HashMap _attributes = new HashMap(); private static final HashMap _attributesInternal = new HashMap(); From 6842c24d1ab62e2e4a29022bbb2795d5d001bbd6 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Thu, 20 May 2021 16:55:48 +0000 Subject: [PATCH 09/27] 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 1df832ab..5e77c8f1 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 10/27] 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 bf4cb65e..15d97c09 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 11/27] 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 18074447..82e13fe5 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) { From 214386664be8d4112d61b61863d8e2bebc2cc616 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Sun, 5 Dec 2021 08:07:27 +0000 Subject: [PATCH 12/27] Now works on 1.17, not backwards compatible Signed-off-by: Byron Marohn --- .../bukkit/mylib/reflect/BukkitReflect.java | 10 +++---- .../bukkit/mylib/reflect/BukkitVersion.java | 2 +- .../bukkit/mylib/reflect/NBTBase.java | 8 +++--- .../bukkit/mylib/reflect/NBTTagCompound.java | 6 ++-- .../bukkit/mylib/reflect/NBTTagList.java | 4 +-- .../bukkit/mylib/reflect/NBTTypes.java | 28 +++++++++---------- .../bukkit/mylib/reflect/NBTUtils.java | 18 ++++++------ 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java b/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java index 6ca1e4b3..d0556a97 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java @@ -47,7 +47,7 @@ public Class getClass(String className) { try { clazz = this.getClass().getClassLoader().loadClass(_packageName + "." + className); } catch (ClassNotFoundException e) { - throw new RuntimeException("Cannot find class " + _packageName + "." + className + ".", e); + throw new RuntimeException("Cannot find class " + _packageName + "." + className + ":", e); } _cache.put(className, clazz); } @@ -72,7 +72,7 @@ public static void prepareReflection() { _craftBukkitPackage = new CachedPackage(craftServerClass.getPackage().getName()); try { Method getHandle = craftServerClass.getMethod("getHandle"); - _minecraftPackage = new CachedPackage(getHandle.getReturnType().getPackage().getName()); + _minecraftPackage = new CachedPackage(getHandle.getReturnType().getPackage().getName().replace(".server.dedicated", "")); _getCommandMap = craftServerClass.getMethod("getCommandMap"); } catch (NoSuchMethodException e) { throw new RuntimeException("Cannot find the required methods on the server class.", e); @@ -81,11 +81,11 @@ public static void prepareReflection() { _isPrepared = true; try { - Class iChatBaseComponentClass = getMinecraftClass("IChatBaseComponent"); - Class chatSerializerClass = getMinecraftClass("IChatBaseComponent$ChatSerializer"); + Class iChatBaseComponentClass = getMinecraftClass("network.chat.IChatBaseComponent"); + Class chatSerializerClass = getMinecraftClass("network.chat.IChatBaseComponent$ChatSerializer"); _ChatSerializer_a_serialize = chatSerializerClass.getMethod("a", iChatBaseComponentClass); _ChatSerializer_a_unserialize = chatSerializerClass.getMethod("a", String.class); - Class chatComponentTextClass = getMinecraftClass("ChatComponentText"); + Class chatComponentTextClass = getMinecraftClass("network.chat.ChatComponentText"); _ChatComponentTextClass_contructor = chatComponentTextClass.getConstructor(String.class); } catch (NoSuchMethodException e) { throw new RuntimeException("Error while preparing ChatSerializer.", e); diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java b/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java index bc6d3cf0..254d7995 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java @@ -21,7 +21,7 @@ private static void getVersion() { } try { Object mcServer = BukkitReflect.invokeMethod(server, BukkitReflect.getCraftBukkitClass("CraftServer").getDeclaredMethod("getServer")); - String version = (String) BukkitReflect.invokeMethod(mcServer, BukkitReflect.getMinecraftClass("MinecraftServer").getDeclaredMethod("getVersion")); + String version = (String) BukkitReflect.invokeMethod(mcServer, BukkitReflect.getMinecraftClass("server.MinecraftServer").getDeclaredMethod("getVersion")); Matcher matcher = Pattern.compile("^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+))?)?$").matcher(version); if (matcher.find()) { _minecraftVersionMajor = Integer.parseInt(matcher.group(1)); diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java index 661e054e..e9748b7b 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java @@ -37,10 +37,10 @@ public class NBTBase { public static final void prepareReflection() { if (!_isPrepared) { - _nbtBaseClass = BukkitReflect.getMinecraftClass("NBTBase"); - _nbtTagCompoundClass = BukkitReflect.getMinecraftClass("NBTTagCompound"); - _nbtTagListClass = BukkitReflect.getMinecraftClass("NBTTagList"); - _nbtTagStringClass = BukkitReflect.getMinecraftClass("NBTTagString"); + _nbtBaseClass = BukkitReflect.getMinecraftClass("nbt.NBTBase"); + _nbtTagCompoundClass = BukkitReflect.getMinecraftClass("nbt.NBTTagCompound"); + _nbtTagListClass = BukkitReflect.getMinecraftClass("nbt.NBTTagList"); + _nbtTagStringClass = BukkitReflect.getMinecraftClass("nbt.NBTTagString"); try { _getTypeId = _nbtBaseClass.getMethod("getTypeId"); _clone = _nbtBaseClass.getMethod("clone"); diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java index 2e19ccba..a47c2611 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java @@ -58,13 +58,13 @@ static void prepareReflectionz() throws SecurityException, NoSuchMethodException _getByteArray = _nbtTagCompoundClass.getMethod("getByteArray", String.class); _getIntArray = _nbtTagCompoundClass.getMethod("getIntArray", String.class); _getLongArray = _nbtTagCompoundClass.getMethod("getLongArray", String.class); - _mapField = _nbtTagCompoundClass.getDeclaredField("map"); + _mapField = _nbtTagCompoundClass.getDeclaredField("x"); _mapField.setAccessible(true); - Class_mojangsonParserClass = BukkitReflect.getMinecraftClass("MojangsonParser"); + Class_mojangsonParserClass = BukkitReflect.getMinecraftClass("nbt.MojangsonParser"); _parseMojangson = _mojangsonParserClass.getMethod("parse", String.class); - Class nbtCompressedStreamToolsClass = BukkitReflect.getMinecraftClass("NBTCompressedStreamTools"); + Class nbtCompressedStreamToolsClass = BukkitReflect.getMinecraftClass("nbt.NBTCompressedStreamTools"); _tagSerializeStream = nbtCompressedStreamToolsClass.getMethod("a", _nbtTagCompoundClass, OutputStream.class); _tagUnserializeStream = nbtCompressedStreamToolsClass.getMethod("a", InputStream.class); } diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java index 865fe0c7..368a2178 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java @@ -29,9 +29,9 @@ public final class NBTTagList extends NBTBase { List _list; static void prepareReflectionz() throws SecurityException, NoSuchMethodException, NoSuchFieldException { - _typeField = _nbtTagListClass.getDeclaredField("type"); + _typeField = _nbtTagListClass.getDeclaredField("w"); _typeField.setAccessible(true); - _listField = _nbtTagListClass.getDeclaredField("list"); + _listField = _nbtTagListClass.getDeclaredField("c"); _listField.setAccessible(true); } diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java index e42df86f..22d189ff 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java @@ -36,21 +36,21 @@ final class NBTTypes { private Class _dataType; public static void prepareReflection() throws SecurityException, NoSuchMethodException, NoSuchFieldException { - registerNew("NBTTagByte"); - registerNew("NBTTagShort"); - registerNew("NBTTagInt"); - registerNew("NBTTagLong"); - registerNew("NBTTagFloat"); - registerNew("NBTTagDouble"); - registerNew("NBTTagString"); - registerNew("NBTTagByteArray"); - registerNew("NBTTagIntArray"); + registerNew("NBTTagByte", "x"); + registerNew("NBTTagShort", "c"); + registerNew("NBTTagInt", "c"); + registerNew("NBTTagLong", "c"); + registerNew("NBTTagFloat", "w"); + registerNew("NBTTagDouble", "w"); + registerNew("NBTTagString", "A"); + registerNew("NBTTagByteArray", "c"); + registerNew("NBTTagIntArray", "c"); // TagLongArray's internal field name is 'b' for some absurd reason. // Since it isn't used, don't bother working around this } - private static void registerNew(String tagClassName) throws SecurityException, NoSuchMethodException, NoSuchFieldException { - NBTTypes handler = new NBTTypes(tagClassName); + private static void registerNew(String tagClassName, String fieldName) throws SecurityException, NoSuchMethodException, NoSuchFieldException { + NBTTypes handler = new NBTTypes(tagClassName, fieldName); _innerTypeMap.put((handler._dataType.isPrimitive() ? ClassUtils.primitiveToWrapper(handler._dataType) : handler._dataType), handler); _outerTypeMap.put(handler._class, handler); } @@ -82,9 +82,9 @@ public static Object fromInternal(Object object) { } } - private NBTTypes(String tagClassName) throws SecurityException, NoSuchMethodException, NoSuchFieldException { - _class = BukkitReflect.getMinecraftClass(tagClassName); - _data = _class.getDeclaredField("data"); + private NBTTypes(String tagClassName, String fieldName) throws SecurityException, NoSuchMethodException, NoSuchFieldException { + _class = BukkitReflect.getMinecraftClass("nbt." + tagClassName); + _data = _class.getDeclaredField(fieldName); _data.setAccessible(true); _dataType = _data.getType(); _constructor = _class.getDeclaredConstructor(_dataType); diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java index 343cc157..5f6e31ea 100644 --- a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java +++ b/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java @@ -68,9 +68,9 @@ public final class NBTUtils { private static Method _EntityTypes_a; // Spawn an entity from a NBTCompound. static void prepareReflection() throws SecurityException, NoSuchMethodException, NoSuchFieldException { - Class nbtTagCompoundClass = BukkitReflect.getMinecraftClass("NBTTagCompound"); + Class nbtTagCompoundClass = BukkitReflect.getMinecraftClass("nbt.NBTTagCompound"); - Class minecraftItemStackClass = BukkitReflect.getMinecraftClass("ItemStack"); + Class minecraftItemStackClass = BukkitReflect.getMinecraftClass("world.item.ItemStack"); _ItemStack_nbtConstructor = minecraftItemStackClass.getDeclaredConstructor(nbtTagCompoundClass); _ItemStack_nbtConstructor.setAccessible(true); _ItemStack_save = minecraftItemStackClass.getMethod("save", nbtTagCompoundClass); @@ -83,7 +83,7 @@ static void prepareReflection() throws SecurityException, NoSuchMethodException, _CraftItemStack_handle = craftItemStackClass.getDeclaredField("handle"); _CraftItemStack_handle.setAccessible(true); - Class minecraftEntityClass = BukkitReflect.getMinecraftClass("Entity"); + Class minecraftEntityClass = BukkitReflect.getMinecraftClass("world.entity.Entity"); _Entity_save = minecraftEntityClass.getMethod("save", nbtTagCompoundClass); _Entity_getBukkitEntity = minecraftEntityClass.getMethod("getBukkitEntity"); _Entity_setPosition = minecraftEntityClass.getMethod("setPosition", double.class, double.class, double.class); @@ -91,7 +91,7 @@ static void prepareReflection() throws SecurityException, NoSuchMethodException, Class craftEntityClass = BukkitReflect.getCraftBukkitClass("entity.CraftEntity"); _CraftEntity_getHandle = craftEntityClass.getMethod("getHandle"); - Class minecraftTileEntityClass = BukkitReflect.getMinecraftClass("TileEntity"); + Class minecraftTileEntityClass = BukkitReflect.getMinecraftClass("world.level.block.entity.TileEntity"); _TileEntity_save = minecraftTileEntityClass.getMethod("save", nbtTagCompoundClass); try { // Bukkit 1.12.1-1.15.2 @@ -99,7 +99,7 @@ static void prepareReflection() throws SecurityException, NoSuchMethodException, } catch (NoSuchMethodException e) { try { // Bukkit 1.16+ - Class minecraftIBlockDataClass = BukkitReflect.getMinecraftClass("IBlockData"); + Class minecraftIBlockDataClass = BukkitReflect.getMinecraftClass("world.level.block.state"); _TileEntity_load = minecraftTileEntityClass.getMethod("load", minecraftIBlockDataClass, nbtTagCompoundClass); } catch (NoSuchMethodException ex) { // Bukkit 1.12 @@ -111,16 +111,16 @@ static void prepareReflection() throws SecurityException, NoSuchMethodException, Class craftWorldClass = BukkitReflect.getCraftBukkitClass("CraftWorld"); _CraftWorld_getHandle = craftWorldClass.getMethod("getHandle"); - Class minecraftBlockPositionClass = BukkitReflect.getMinecraftClass("BlockPosition"); + Class minecraftBlockPositionClass = BukkitReflect.getMinecraftClass("core.BlockPosition"); _BlockPosition_constructor = minecraftBlockPositionClass.getConstructor(int.class, int.class, int.class); - Class minecraftWorldClass = BukkitReflect.getMinecraftClass("World"); + Class minecraftWorldClass = BukkitReflect.getMinecraftClass("world.level.World"); _World_getTileEntity = minecraftWorldClass.getMethod("getTileEntity", minecraftBlockPositionClass); - Class minecraftWorldServerClass = BukkitReflect.getMinecraftClass("WorldServer"); + Class minecraftWorldServerClass = BukkitReflect.getMinecraftClass("server.level.WorldServer"); _WorldServer_addAllEntitiesSafely = minecraftWorldServerClass.getMethod("addAllEntitiesSafely", minecraftEntityClass); - Class minecraftEntityTypesClass = BukkitReflect.getMinecraftClass("EntityTypes"); + Class minecraftEntityTypesClass = BukkitReflect.getMinecraftClass("world.entity.EntityTypes"); _EntityTypes_a = minecraftEntityTypesClass.getMethod("a", nbtTagCompoundClass, minecraftWorldClass, Function.class); } From 8ee319386f65a9f987c891bc96826c38867ee853 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Sat, 16 Apr 2022 20:04:06 +0000 Subject: [PATCH 13/27] Migrate build from maven to gradle, move src -> plugin/src Signed-off-by: Byron Marohn --- .gitignore | 143 ++++++++++- build.gradle.kts | 2 + buildSrc/build.gradle.kts | 9 + ...ncalomb.bukkit.java-conventions.gradle.kts | 27 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 234 ++++++++++++++++++ gradlew.bat | 89 +++++++ plugin/build.gradle.kts | 26 ++ {src => plugin/src}/main/assembly/default.xml | 0 .../bukkit/customitems/api/CustomBow.java | 0 .../customitems/api/CustomFirework.java | 0 .../bukkit/customitems/api/CustomItem.java | 0 .../customitems/api/CustomItemConfig.java | 0 .../customitems/api/CustomItemContainer.java | 0 .../customitems/api/CustomItemListener.java | 0 .../customitems/api/CustomItemManager.java | 0 .../customitems/api/DelayedPlayerDetails.java | 0 .../customitems/api/DispenserDetails.java | 0 .../api/FireworkPlayerDetails.java | 0 .../customitems/api/IConsumableDetails.java | 0 .../bukkit/customitems/api/ItemDetails.java | 0 .../bukkit/customitems/api/PlayerDetails.java | 0 .../commands/CommandCustomItems.java | 0 .../customitems/items/AntiMatterBomb.java | 0 .../bukkit/customitems/items/BatBomb.java | 0 .../bukkit/customitems/items/EnderBow.java | 0 .../bukkit/customitems/items/EscapePlan.java | 0 .../bukkit/customitems/items/FireBomb.java | 0 .../bukkit/customitems/items/GenericBomb.java | 0 .../customitems/items/GenericSuperAxe.java | 0 .../customitems/items/GravitationalAxe.java | 0 .../bukkit/customitems/items/KingsCrown.java | 0 .../customitems/items/LightningRod.java | 0 .../bukkit/customitems/items/MoonStick.java | 0 .../bukkit/customitems/items/RadiusBomb.java | 0 .../customitems/items/RepulsionBomb.java | 0 .../bukkit/customitems/items/SimpleMine.java | 0 .../bukkit/customitems/items/SunStick.java | 0 .../customitems/items/TimeFirework.java | 0 .../bukkit/customitems/items/TorchBow.java | 0 .../customitems/items/TreeVaporizer.java | 0 .../bukkit/customitems/items/WitherBow.java | 0 .../bukkit/mylib/command/InternalCommand.java | 0 .../bukkit/mylib/command/MyCommand.java | 0 .../mylib/command/MyCommandException.java | 0 .../mylib/command/MyCommandManager.java | 0 .../bukkit/mylib/command/MySubCommand.java | 0 .../mylib/namemaps/EnchantmentsMap.java | 0 .../bukkit/mylib/namemaps/EntityTypeMap.java | 0 .../bukkit/mylib/namemaps/MaterialMap.java | 0 .../bukkit/mylib/namemaps/NamingMap.java | 0 .../mylib/namemaps/PotionEffectsMap.java | 0 .../bukkit/mylib/namemaps/SpawnEggMap.java | 0 .../bukkit/mylib/reflect/BukkitReflect.java | 0 .../bukkit/mylib/reflect/BukkitVersion.java | 0 .../bukkit/mylib/reflect/NBTBase.java | 0 .../bukkit/mylib/reflect/NBTTagCompound.java | 0 .../bukkit/mylib/reflect/NBTTagList.java | 0 .../bukkit/mylib/reflect/NBTTypes.java | 0 .../bukkit/mylib/reflect/NBTUtils.java | 0 .../bukkit/mylib/utils/BookSerialize.java | 0 .../bukkit/mylib/utils/CustomInventory.java | 0 .../goncalomb/bukkit/mylib/utils/Utils.java | 0 .../goncalomb/bukkit/mylib/utils/UtilsMc.java | 0 .../bukkit/nbteditor/ItemStorage.java | 0 .../goncalomb/bukkit/nbteditor/NBTEditor.java | 0 .../bukkit/nbteditor/bos/BookOfSouls.java | 0 .../bukkit/nbteditor/bos/BookOfSoulsCI.java | 0 .../nbteditor/bos/BookOfSoulsEmptyCI.java | 0 .../commands/AbstractNBTCommand.java | 0 .../bukkit/nbteditor/commands/CommandBOS.java | 0 .../commands/CommandItemStorage.java | 0 .../nbteditor/commands/CommandNBTEnchant.java | 0 .../nbteditor/commands/CommandNBTItem.java | 0 .../nbteditor/commands/CommandNBTPotion.java | 0 .../nbteditor/commands/CommandNBTSpawner.java | 0 .../nbteditor/commands/CommandNBTTile.java | 0 .../nbteditor/commands/HandItemWrapper.java | 0 .../commands/InventoryForItemStorage.java | 0 .../commands/InventoryForSpawnerEntities.java | 0 .../bukkit/nbteditor/commands/ItemUtils.java | 0 .../inventories/InventoryForContainer.java | 0 .../inventories/InventoryForItems.java | 0 .../inventories/InventoryForPassengers.java | 0 .../inventories/InventoryForSingleItem.java | 0 .../InventoryForSpecialVariable.java | 0 .../InventoryForVillagerOffers.java | 0 .../bukkit/nbteditor/nbt/BaseNBT.java | 0 .../bukkit/nbteditor/nbt/EntityNBT.java | 0 .../bukkit/nbteditor/nbt/EntityNBTBase.java | 0 .../bukkit/nbteditor/nbt/FallingBlockNBT.java | 0 .../bukkit/nbteditor/nbt/ItemNBT.java | 0 .../nbteditor/nbt/ItemStackNBTWrapper.java | 0 .../nbteditor/nbt/MinecartSpawnerNBT.java | 0 .../bukkit/nbteditor/nbt/MobNBT.java | 0 .../nbteditor/nbt/SpawnerNBTWrapper.java | 0 .../bukkit/nbteditor/nbt/TileNBT.java | 0 .../bukkit/nbteditor/nbt/TileNBTWrapper.java | 0 .../nbteditor/nbt/attributes/Attribute.java | 0 .../nbt/attributes/AttributeContainer.java | 0 .../nbt/attributes/AttributeType.java | 0 .../nbt/attributes/ItemModifier.java | 0 .../nbteditor/nbt/attributes/Modifier.java | 0 .../nbt/variables/BlockStateVariable.java | 0 .../nbt/variables/BooleanVariable.java | 0 .../nbteditor/nbt/variables/ByteVariable.java | 0 .../nbt/variables/ColorVariable.java | 0 .../nbt/variables/ContainerVariable.java | 0 .../nbt/variables/DoubleVariable.java | 0 .../nbt/variables/EffectsVariable.java | 0 .../nbt/variables/FireworksItemVariable.java | 0 .../nbt/variables/FloatArrayVariable.java | 0 .../nbt/variables/FloatVariable.java | 0 .../nbt/variables/HorseVariantVariable.java | 0 .../nbt/variables/IntegerVariable.java | 0 .../variables/IntergerPositionVariable.java | 0 .../nbt/variables/ItemsVariable.java | 0 .../nbteditor/nbt/variables/ListVariable.java | 0 .../nbteditor/nbt/variables/LongVariable.java | 0 .../nbt/variables/MaterialListVariable.java | 0 .../NBTUnboundVariableContainer.java | 0 .../nbteditor/nbt/variables/NBTVariable.java | 0 .../nbt/variables/NBTVariableContainer.java | 0 .../nbt/variables/NBTVariableDouble.java | 0 .../nbt/variables/NumericVariable.java | 0 .../nbt/variables/ParticleVariable.java | 0 .../nbt/variables/PassengersVariable.java | 0 .../nbt/variables/PotionVariable.java | 0 .../nbt/variables/RawJsonListVariable.java | 0 .../nbt/variables/RawJsonVariable.java | 0 .../nbt/variables/RotationVariable.java | 0 .../nbt/variables/ShortVariable.java | 0 .../nbt/variables/SingleItemVariable.java | 0 .../nbt/variables/SpecialVariable.java | 0 .../nbt/variables/StringListVariable.java | 0 .../nbt/variables/StringVariable.java | 0 .../nbt/variables/VectorVariable.java | 0 .../nbt/variables/VillagerCareerVariable.java | 0 .../nbt/variables/VillagerOffersVariable.java | 0 .../nbteditor/tools/EntityInspectorTool.java | 0 .../nbteditor/tools/EntityRemoverTool.java | 0 .../bukkit/nbteditor/tools/SuperLeadTool.java | 0 .../tools/TropicalGeneratorTool.java | 0 .../src}/main/java/net/iharder/Base64.java | 0 {src => plugin/src}/main/resources/README.txt | 0 {src => plugin/src}/main/resources/config.yml | 0 {src => plugin/src}/main/resources/plugin.yml | 0 .../goncalomb/bukkit/mylib/TestNameMaps.java | 0 .../bukkit/nbteditor/TestBosEntities.java | 0 pom.xml | 215 ---------------- settings.gradle.kts | 10 + 152 files changed, 542 insertions(+), 218 deletions(-) create mode 100644 build.gradle.kts create mode 100644 buildSrc/build.gradle.kts create mode 100644 buildSrc/src/main/kotlin/com.goncalomb.bukkit.java-conventions.gradle.kts create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 plugin/build.gradle.kts rename {src => plugin/src}/main/assembly/default.xml (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/api/CustomBow.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/api/CustomFirework.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/api/CustomItem.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/api/CustomItemConfig.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/api/CustomItemContainer.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/api/CustomItemListener.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/api/CustomItemManager.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/api/DelayedPlayerDetails.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/api/DispenserDetails.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/api/FireworkPlayerDetails.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/api/IConsumableDetails.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/api/ItemDetails.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/api/PlayerDetails.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/commands/CommandCustomItems.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/AntiMatterBomb.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/BatBomb.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/EnderBow.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/EscapePlan.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/FireBomb.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/GenericBomb.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/GenericSuperAxe.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/GravitationalAxe.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/KingsCrown.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/LightningRod.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/MoonStick.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/RadiusBomb.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/RepulsionBomb.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/SimpleMine.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/SunStick.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/TimeFirework.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/TorchBow.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/TreeVaporizer.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/customitems/items/WitherBow.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/command/InternalCommand.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/command/MyCommand.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/command/MyCommandException.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/command/MyCommandManager.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/command/MySubCommand.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/namemaps/EnchantmentsMap.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/namemaps/EntityTypeMap.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/namemaps/MaterialMap.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/namemaps/NamingMap.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/namemaps/PotionEffectsMap.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/namemaps/SpawnEggMap.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/utils/BookSerialize.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/utils/CustomInventory.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/utils/Utils.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/mylib/utils/UtilsMc.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/ItemStorage.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/bos/BookOfSouls.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/bos/BookOfSoulsCI.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/bos/BookOfSoulsEmptyCI.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/AbstractNBTCommand.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandBOS.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandItemStorage.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTEnchant.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTItem.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTPotion.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTSpawner.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTTile.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/HandItemWrapper.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/InventoryForItemStorage.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/InventoryForSpawnerEntities.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/ItemUtils.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForContainer.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForItems.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForPassengers.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForSingleItem.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForSpecialVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForVillagerOffers.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/BaseNBT.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBTBase.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/FallingBlockNBT.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/ItemNBT.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/ItemStackNBTWrapper.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/MinecartSpawnerNBT.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/MobNBT.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapper.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/TileNBT.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/TileNBTWrapper.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/Attribute.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeContainer.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeType.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/ItemModifier.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/Modifier.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/BlockStateVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/BooleanVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ByteVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ColorVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ContainerVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/DoubleVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/EffectsVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/FireworksItemVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/FloatArrayVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/FloatVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/HorseVariantVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/IntegerVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/IntergerPositionVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ItemsVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ListVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/LongVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/MaterialListVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTUnboundVariableContainer.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTVariableContainer.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTVariableDouble.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NumericVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ParticleVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/PassengersVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/PotionVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/RawJsonListVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/RawJsonVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/RotationVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ShortVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/SingleItemVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/SpecialVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/StringListVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/StringVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/VectorVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/VillagerCareerVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/VillagerOffersVariable.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/tools/EntityInspectorTool.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/tools/EntityRemoverTool.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/tools/SuperLeadTool.java (100%) rename {src => plugin/src}/main/java/com/goncalomb/bukkit/nbteditor/tools/TropicalGeneratorTool.java (100%) rename {src => plugin/src}/main/java/net/iharder/Base64.java (100%) rename {src => plugin/src}/main/resources/README.txt (100%) rename {src => plugin/src}/main/resources/config.yml (100%) rename {src => plugin/src}/main/resources/plugin.yml (100%) rename {src => plugin/src}/test/java/com/goncalomb/bukkit/mylib/TestNameMaps.java (100%) rename {src => plugin/src}/test/java/com/goncalomb/bukkit/nbteditor/TestBosEntities.java (100%) delete mode 100644 pom.xml create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore index 01adc143..a7a5ee51 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,146 @@ +# Maven +target/ +dependency-reduced-pom.xml +pom.xml.releaseBackup +pom.xml.versionsBackup +release.properties + +# Vim +*.swp +*.swo + +# IntelliJ IDEA +.idea/ +*.iml +*.ipr +*.iws + # Eclipse +.settings/ +.classpath .project +/bin/ +*/bin/ + +# User-specific stuff +.idea/ + +*.iml +*.ipr +*.iws + +# IntelliJ +out/ + +# Eclipse .classpath +.project .settings/ -bin/ +plugin/bin/ +api/bin/ -# Maven -/target +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Package Files # +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +target/ + +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next + +release.properties dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +.mvn/wrapper/maven-wrapper.jar +.flattened-pom.xml + +# Common working directory +run/ +build +.gradle +/*.jar diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..ae50b9b8 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,2 @@ +version = "3.3-SNAPSHOT" +description = "NBTEditor" diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 00000000..50cec874 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,9 @@ +plugins { + // Support convention plugins written in Kotlin. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. + `kotlin-dsl` +} + +repositories { + // Use the plugin portal to apply community plugins in convention plugins. + gradlePluginPortal() +} diff --git a/buildSrc/src/main/kotlin/com.goncalomb.bukkit.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.goncalomb.bukkit.java-conventions.gradle.kts new file mode 100644 index 00000000..9ea8eb80 --- /dev/null +++ b/buildSrc/src/main/kotlin/com.goncalomb.bukkit.java-conventions.gradle.kts @@ -0,0 +1,27 @@ +plugins { + `java-library` + `maven-publish` +} + +repositories { + mavenLocal() + maven { + url = uri("https://hub.spigotmc.org/nexus/content/groups/public/") + } + + maven { + url = uri("https://repo.codemc.org/repository/maven-public") + } + + maven { + url = uri("https://repo.maven.apache.org/maven2/") + } +} + +group = "com.goncalomb.bukkit" +java.sourceCompatibility = JavaVersion.VERSION_1_8 +java.targetCompatibility = JavaVersion.VERSION_1_8 + +tasks.withType() { + options.encoding = "UTF-8" +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7454180f2ae8848c63b8b4dea2cb829da983f2fa GIT binary patch literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..2e6e5897 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..1b6c7873 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..ac1b06f9 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts new file mode 100644 index 00000000..3d72aab1 --- /dev/null +++ b/plugin/build.gradle.kts @@ -0,0 +1,26 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + +plugins { + id("com.github.johnrengelman.shadow") version "7.1.2" + id("com.goncalomb.bukkit.java-conventions") + id("java") +} + +dependencies { + implementation("org.bstats:bstats-bukkit:1.5") + compileOnly("org.spigotmc:spigot-api:1.16.3-R0.1-SNAPSHOT") + + testImplementation("junit:junit:4.13.1") + testImplementation("org.spigotmc:spigot-api:1.16.3-R0.1-SNAPSHOT") +} + +group = "com.goncalomb.bukkit" +description = "NBTEditor" +version = rootProject.version + +// Relocation / shading +tasks { + shadowJar { + relocate("org.bstats", "com.goncalomb.bukkit.bstats") + } +} diff --git a/src/main/assembly/default.xml b/plugin/src/main/assembly/default.xml similarity index 100% rename from src/main/assembly/default.xml rename to plugin/src/main/assembly/default.xml diff --git a/src/main/java/com/goncalomb/bukkit/customitems/api/CustomBow.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/api/CustomBow.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/api/CustomBow.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/api/CustomBow.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/api/CustomFirework.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/api/CustomFirework.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/api/CustomFirework.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/api/CustomFirework.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItem.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItem.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/api/CustomItem.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItem.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemConfig.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemConfig.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemConfig.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemConfig.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemContainer.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemContainer.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemContainer.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemContainer.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemListener.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemListener.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemListener.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemListener.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemManager.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemManager.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemManager.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/api/CustomItemManager.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/api/DelayedPlayerDetails.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/api/DelayedPlayerDetails.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/api/DelayedPlayerDetails.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/api/DelayedPlayerDetails.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/api/DispenserDetails.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/api/DispenserDetails.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/api/DispenserDetails.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/api/DispenserDetails.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/api/FireworkPlayerDetails.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/api/FireworkPlayerDetails.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/api/FireworkPlayerDetails.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/api/FireworkPlayerDetails.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/api/IConsumableDetails.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/api/IConsumableDetails.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/api/IConsumableDetails.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/api/IConsumableDetails.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/api/ItemDetails.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/api/ItemDetails.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/api/ItemDetails.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/api/ItemDetails.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/api/PlayerDetails.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/api/PlayerDetails.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/api/PlayerDetails.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/api/PlayerDetails.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/commands/CommandCustomItems.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/commands/CommandCustomItems.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/commands/CommandCustomItems.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/commands/CommandCustomItems.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/AntiMatterBomb.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/AntiMatterBomb.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/AntiMatterBomb.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/AntiMatterBomb.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/BatBomb.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/BatBomb.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/BatBomb.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/BatBomb.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/EnderBow.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/EnderBow.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/EnderBow.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/EnderBow.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/EscapePlan.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/EscapePlan.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/EscapePlan.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/EscapePlan.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/FireBomb.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/FireBomb.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/FireBomb.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/FireBomb.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/GenericBomb.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/GenericBomb.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/GenericBomb.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/GenericBomb.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/GenericSuperAxe.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/GenericSuperAxe.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/GenericSuperAxe.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/GenericSuperAxe.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/GravitationalAxe.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/GravitationalAxe.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/GravitationalAxe.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/GravitationalAxe.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/KingsCrown.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/KingsCrown.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/KingsCrown.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/KingsCrown.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/LightningRod.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/LightningRod.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/LightningRod.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/LightningRod.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/MoonStick.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/MoonStick.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/MoonStick.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/MoonStick.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/RadiusBomb.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/RadiusBomb.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/RadiusBomb.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/RadiusBomb.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/RepulsionBomb.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/RepulsionBomb.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/RepulsionBomb.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/RepulsionBomb.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/SimpleMine.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/SimpleMine.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/SimpleMine.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/SimpleMine.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/SunStick.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/SunStick.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/SunStick.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/SunStick.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/TimeFirework.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/TimeFirework.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/TimeFirework.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/TimeFirework.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/TorchBow.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/TorchBow.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/TorchBow.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/TorchBow.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/TreeVaporizer.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/TreeVaporizer.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/TreeVaporizer.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/TreeVaporizer.java diff --git a/src/main/java/com/goncalomb/bukkit/customitems/items/WitherBow.java b/plugin/src/main/java/com/goncalomb/bukkit/customitems/items/WitherBow.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/customitems/items/WitherBow.java rename to plugin/src/main/java/com/goncalomb/bukkit/customitems/items/WitherBow.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/command/InternalCommand.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/command/InternalCommand.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/command/InternalCommand.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/command/InternalCommand.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/command/MyCommand.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/command/MyCommand.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/command/MyCommand.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/command/MyCommand.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/command/MyCommandException.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/command/MyCommandException.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/command/MyCommandException.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/command/MyCommandException.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/command/MyCommandManager.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/command/MyCommandManager.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/command/MyCommandManager.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/command/MyCommandManager.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/command/MySubCommand.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/command/MySubCommand.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/command/MySubCommand.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/command/MySubCommand.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EnchantmentsMap.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EnchantmentsMap.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/namemaps/EnchantmentsMap.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EnchantmentsMap.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EntityTypeMap.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EntityTypeMap.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/namemaps/EntityTypeMap.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EntityTypeMap.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/namemaps/MaterialMap.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/MaterialMap.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/namemaps/MaterialMap.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/MaterialMap.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/namemaps/NamingMap.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/NamingMap.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/namemaps/NamingMap.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/NamingMap.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/namemaps/PotionEffectsMap.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/PotionEffectsMap.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/namemaps/PotionEffectsMap.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/PotionEffectsMap.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/namemaps/SpawnEggMap.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/SpawnEggMap.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/namemaps/SpawnEggMap.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/SpawnEggMap.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/utils/BookSerialize.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/utils/BookSerialize.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/utils/BookSerialize.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/utils/BookSerialize.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/utils/CustomInventory.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/utils/CustomInventory.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/utils/CustomInventory.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/utils/CustomInventory.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/utils/Utils.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/utils/Utils.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/utils/Utils.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/utils/Utils.java diff --git a/src/main/java/com/goncalomb/bukkit/mylib/utils/UtilsMc.java b/plugin/src/main/java/com/goncalomb/bukkit/mylib/utils/UtilsMc.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/mylib/utils/UtilsMc.java rename to plugin/src/main/java/com/goncalomb/bukkit/mylib/utils/UtilsMc.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/ItemStorage.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/ItemStorage.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/ItemStorage.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/ItemStorage.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/bos/BookOfSouls.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/bos/BookOfSouls.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/bos/BookOfSouls.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/bos/BookOfSouls.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/bos/BookOfSoulsCI.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/bos/BookOfSoulsCI.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/bos/BookOfSoulsCI.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/bos/BookOfSoulsCI.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/bos/BookOfSoulsEmptyCI.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/bos/BookOfSoulsEmptyCI.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/bos/BookOfSoulsEmptyCI.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/bos/BookOfSoulsEmptyCI.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/AbstractNBTCommand.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/AbstractNBTCommand.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/AbstractNBTCommand.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/AbstractNBTCommand.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandBOS.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandBOS.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandBOS.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandBOS.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandItemStorage.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandItemStorage.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandItemStorage.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandItemStorage.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTEnchant.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTEnchant.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTEnchant.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTEnchant.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTItem.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTItem.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTItem.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTItem.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTPotion.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTPotion.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTPotion.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTPotion.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTSpawner.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTSpawner.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTSpawner.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTSpawner.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTTile.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTTile.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTTile.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTTile.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/HandItemWrapper.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/HandItemWrapper.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/HandItemWrapper.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/HandItemWrapper.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/InventoryForItemStorage.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/InventoryForItemStorage.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/InventoryForItemStorage.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/InventoryForItemStorage.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/InventoryForSpawnerEntities.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/InventoryForSpawnerEntities.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/InventoryForSpawnerEntities.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/InventoryForSpawnerEntities.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/ItemUtils.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/ItemUtils.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/ItemUtils.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/ItemUtils.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForContainer.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForContainer.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForContainer.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForContainer.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForItems.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForItems.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForItems.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForItems.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForPassengers.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForPassengers.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForPassengers.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForPassengers.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForSingleItem.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForSingleItem.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForSingleItem.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForSingleItem.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForSpecialVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForSpecialVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForSpecialVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForSpecialVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForVillagerOffers.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForVillagerOffers.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForVillagerOffers.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/inventories/InventoryForVillagerOffers.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/BaseNBT.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/BaseNBT.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/BaseNBT.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/BaseNBT.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBTBase.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBTBase.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBTBase.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBTBase.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/FallingBlockNBT.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/FallingBlockNBT.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/FallingBlockNBT.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/FallingBlockNBT.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/ItemNBT.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/ItemNBT.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/ItemNBT.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/ItemNBT.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/ItemStackNBTWrapper.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/ItemStackNBTWrapper.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/ItemStackNBTWrapper.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/ItemStackNBTWrapper.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/MinecartSpawnerNBT.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/MinecartSpawnerNBT.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/MinecartSpawnerNBT.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/MinecartSpawnerNBT.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/MobNBT.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/MobNBT.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/MobNBT.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/MobNBT.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapper.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapper.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapper.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapper.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/TileNBT.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/TileNBT.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/TileNBT.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/TileNBT.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/TileNBTWrapper.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/TileNBTWrapper.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/TileNBTWrapper.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/TileNBTWrapper.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/Attribute.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/Attribute.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/Attribute.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/Attribute.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeContainer.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeContainer.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeContainer.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeContainer.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeType.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeType.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeType.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/AttributeType.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/ItemModifier.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/ItemModifier.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/ItemModifier.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/ItemModifier.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/Modifier.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/Modifier.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/Modifier.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/attributes/Modifier.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/BlockStateVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/BlockStateVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/BlockStateVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/BlockStateVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/BooleanVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/BooleanVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/BooleanVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/BooleanVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ByteVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ByteVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ByteVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ByteVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ColorVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ColorVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ColorVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ColorVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ContainerVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ContainerVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ContainerVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ContainerVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/DoubleVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/DoubleVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/DoubleVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/DoubleVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/EffectsVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/EffectsVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/EffectsVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/EffectsVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/FireworksItemVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/FireworksItemVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/FireworksItemVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/FireworksItemVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/FloatArrayVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/FloatArrayVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/FloatArrayVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/FloatArrayVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/FloatVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/FloatVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/FloatVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/FloatVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/HorseVariantVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/HorseVariantVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/HorseVariantVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/HorseVariantVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/IntegerVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/IntegerVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/IntegerVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/IntegerVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/IntergerPositionVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/IntergerPositionVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/IntergerPositionVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/IntergerPositionVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ItemsVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ItemsVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ItemsVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ItemsVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ListVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ListVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ListVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ListVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/LongVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/LongVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/LongVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/LongVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/MaterialListVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/MaterialListVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/MaterialListVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/MaterialListVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTUnboundVariableContainer.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTUnboundVariableContainer.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTUnboundVariableContainer.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTUnboundVariableContainer.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTVariableContainer.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTVariableContainer.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTVariableContainer.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTVariableContainer.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTVariableDouble.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTVariableDouble.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTVariableDouble.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NBTVariableDouble.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NumericVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NumericVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NumericVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/NumericVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ParticleVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ParticleVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ParticleVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ParticleVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/PassengersVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/PassengersVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/PassengersVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/PassengersVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/PotionVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/PotionVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/PotionVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/PotionVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/RawJsonListVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/RawJsonListVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/RawJsonListVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/RawJsonListVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/RawJsonVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/RawJsonVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/RawJsonVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/RawJsonVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/RotationVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/RotationVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/RotationVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/RotationVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ShortVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ShortVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ShortVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/ShortVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/SingleItemVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/SingleItemVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/SingleItemVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/SingleItemVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/SpecialVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/SpecialVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/SpecialVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/SpecialVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/StringListVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/StringListVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/StringListVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/StringListVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/StringVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/StringVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/StringVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/StringVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/VectorVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/VectorVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/VectorVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/VectorVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/VillagerCareerVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/VillagerCareerVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/VillagerCareerVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/VillagerCareerVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/VillagerOffersVariable.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/VillagerOffersVariable.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/VillagerOffersVariable.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/variables/VillagerOffersVariable.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/tools/EntityInspectorTool.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/tools/EntityInspectorTool.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/tools/EntityInspectorTool.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/tools/EntityInspectorTool.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/tools/EntityRemoverTool.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/tools/EntityRemoverTool.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/tools/EntityRemoverTool.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/tools/EntityRemoverTool.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/tools/SuperLeadTool.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/tools/SuperLeadTool.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/tools/SuperLeadTool.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/tools/SuperLeadTool.java diff --git a/src/main/java/com/goncalomb/bukkit/nbteditor/tools/TropicalGeneratorTool.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/tools/TropicalGeneratorTool.java similarity index 100% rename from src/main/java/com/goncalomb/bukkit/nbteditor/tools/TropicalGeneratorTool.java rename to plugin/src/main/java/com/goncalomb/bukkit/nbteditor/tools/TropicalGeneratorTool.java diff --git a/src/main/java/net/iharder/Base64.java b/plugin/src/main/java/net/iharder/Base64.java similarity index 100% rename from src/main/java/net/iharder/Base64.java rename to plugin/src/main/java/net/iharder/Base64.java diff --git a/src/main/resources/README.txt b/plugin/src/main/resources/README.txt similarity index 100% rename from src/main/resources/README.txt rename to plugin/src/main/resources/README.txt diff --git a/src/main/resources/config.yml b/plugin/src/main/resources/config.yml similarity index 100% rename from src/main/resources/config.yml rename to plugin/src/main/resources/config.yml diff --git a/src/main/resources/plugin.yml b/plugin/src/main/resources/plugin.yml similarity index 100% rename from src/main/resources/plugin.yml rename to plugin/src/main/resources/plugin.yml diff --git a/src/test/java/com/goncalomb/bukkit/mylib/TestNameMaps.java b/plugin/src/test/java/com/goncalomb/bukkit/mylib/TestNameMaps.java similarity index 100% rename from src/test/java/com/goncalomb/bukkit/mylib/TestNameMaps.java rename to plugin/src/test/java/com/goncalomb/bukkit/mylib/TestNameMaps.java diff --git a/src/test/java/com/goncalomb/bukkit/nbteditor/TestBosEntities.java b/plugin/src/test/java/com/goncalomb/bukkit/nbteditor/TestBosEntities.java similarity index 100% rename from src/test/java/com/goncalomb/bukkit/nbteditor/TestBosEntities.java rename to plugin/src/test/java/com/goncalomb/bukkit/nbteditor/TestBosEntities.java diff --git a/pom.xml b/pom.xml deleted file mode 100644 index aa1c5390..00000000 --- a/pom.xml +++ /dev/null @@ -1,215 +0,0 @@ - - - 4.0.0 - - com.goncalomb.bukkit - nbteditor - 3.3-SNAPSHOT - jar - - NBTEditor - http://dev.bukkit.org/bukkit-plugins/nbteditor/ - 2013 - - - 1.16.3-R0.1-SNAPSHOT - UTF-8 - ${maven.build.timestamp} - yyyy-MM-dd'T'HH:mm:ss'Z' - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/groups/public/ - - - bstats-repo - https://repo.codemc.org/repository/maven-public - - - - - - junit - junit - 4.13.1 - test - - - org.spigotmc - spigot-api - ${bukkit.version} - provided - - - org.bstats - bstats-bukkit - 1.5 - - - - - - nexus-releases - https://nexus.goncalomb.com/repository/maven-releases - - - nexus-snapshots - https://nexus.goncalomb.com/repository/maven-snapshots - - - - - clean package - - - - ${project.basedir}/src/main/resources - true - - - ${project.basedir} - - LICENSE.txt - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M2 - - - enforce-maven - - enforce - - - - - 3.0 - - - - - - - - - org.apache.maven.plugins - maven-clean-plugin - 2.6.1 - - - - ${project.basedir} - - dependency-reduced-pom.xml - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.7 - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.18.1 - - - - org.apache.maven.plugins - maven-jar-plugin - 2.6 - - - - ${project.name} - ${project.version} - goncalomb - ${project.build.timestamp} - ${bukkit.version} - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.4.1 - - - - org.bstats:* - - - - - org.bstats.bukkit - com.goncalomb.bukkit.bstats - - - - - - package - - shade - - - - - - - maven-assembly-plugin - 2.5.5 - - - package - - single - - - false - src/main/assembly/default.xml - - - - - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..fa773a08 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,10 @@ +rootProject.name = "nbteditor" +include(":NBTEditor") +project(":NBTEditor").projectDir = file("plugin") + +pluginManagement { + repositories { + gradlePluginPortal() + maven("https://papermc.io/repo/repository/maven-public/") + } +} From b83faf7916da05fc3ad8e1965e924b604219a662 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Sat, 16 Apr 2022 20:41:44 +0000 Subject: [PATCH 14/27] Move plugin.yml generation into gradle build Signed-off-by: Byron Marohn --- plugin/build.gradle.kts | 13 +++++++++++++ plugin/src/main/resources/plugin.yml | 5 ----- 2 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 plugin/src/main/resources/plugin.yml diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 3d72aab1..9874e083 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -1,7 +1,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import net.minecrell.pluginyml.bukkit.BukkitPluginDescription plugins { id("com.github.johnrengelman.shadow") version "7.1.2" + id("net.minecrell.plugin-yml.bukkit") version "0.5.1" // Generates plugin.yml id("com.goncalomb.bukkit.java-conventions") id("java") } @@ -18,6 +20,17 @@ group = "com.goncalomb.bukkit" description = "NBTEditor" version = rootProject.version +// Configure plugin.yml generation +bukkit { + load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD + main = "com.goncalomb.bukkit.nbteditor.NBTEditor" + apiVersion = "1.13" + name = "NBTEditor" + authors = listOf("goncalomb", "Combustible") + depend = listOf() + softDepend = listOf() +} + // Relocation / shading tasks { shadowJar { diff --git a/plugin/src/main/resources/plugin.yml b/plugin/src/main/resources/plugin.yml deleted file mode 100644 index b1c7c314..00000000 --- a/plugin/src/main/resources/plugin.yml +++ /dev/null @@ -1,5 +0,0 @@ -name: NBTEditor -main: com.goncalomb.bukkit.nbteditor.NBTEditor -version: ${project.version} -author: goncalomb -api-version: 1.13 From 5cd15da90ffddf0bc0cabc7ea94dd5c55419c2c1 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Sat, 16 Apr 2022 22:43:47 +0000 Subject: [PATCH 15/27] WIP: Add version adapter scaffolding; revert to 1.16 Signed-off-by: Byron Marohn --- adapter_api/.gitignore | 2 + adapter_api/build.gradle.kts | 10 ++ .../bukkit/mylib/reflect/BukkitReflect.java | 18 +- .../bukkit/mylib/reflect/BukkitVersion.java | 2 +- .../bukkit/mylib/reflect/NBTBase.java | 13 +- .../bukkit/mylib/reflect/NBTTagCompound.java | 6 +- .../bukkit/mylib/reflect/NBTTagList.java | 4 +- .../bukkit/mylib/reflect/NBTTypes.java | 28 +-- .../bukkit/mylib/reflect/NBTUtils.java | 118 +++++++++++++ .../bukkit/mylib/reflect/NBTUtilsAdapter.java | 49 ++++++ adapter_v1_16_R3/.gitignore | 2 + adapter_v1_16_R3/build.gradle.kts | 11 ++ .../reflect/NBTUtilsAdapter_v1_16_R3.java | 102 +++++------ plugin/build.gradle.kts | 160 ++++++++++++++++++ .../goncalomb/bukkit/nbteditor/NBTEditor.java | 4 +- settings.gradle.kts | 2 + 16 files changed, 432 insertions(+), 99 deletions(-) create mode 100644 adapter_api/.gitignore create mode 100644 adapter_api/build.gradle.kts rename {plugin => adapter_api}/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java (91%) rename {plugin => adapter_api}/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java (94%) rename {plugin => adapter_api}/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java (86%) rename {plugin => adapter_api}/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java (98%) rename {plugin => adapter_api}/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java (95%) rename {plugin => adapter_api}/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java (79%) create mode 100644 adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java create mode 100644 adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter.java create mode 100644 adapter_v1_16_R3/.gitignore create mode 100644 adapter_v1_16_R3/build.gradle.kts rename plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java => adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_16_R3.java (71%) diff --git a/adapter_api/.gitignore b/adapter_api/.gitignore new file mode 100644 index 00000000..4f035375 --- /dev/null +++ b/adapter_api/.gitignore @@ -0,0 +1,2 @@ +upload*.sh +.factorypath diff --git a/adapter_api/build.gradle.kts b/adapter_api/build.gradle.kts new file mode 100644 index 00000000..36c1645e --- /dev/null +++ b/adapter_api/build.gradle.kts @@ -0,0 +1,10 @@ +plugins { + id("com.goncalomb.bukkit.java-conventions") +} + +dependencies { + compileOnly("org.spigotmc:spigot-api:1.16.3-R0.1-SNAPSHOT") +} + +description = "adapter_api" +version = rootProject.version diff --git a/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java similarity index 91% rename from plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java rename to adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java index d0556a97..acf2e6c4 100644 --- a/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java @@ -24,6 +24,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.HashMap; +import java.util.logging.Logger; import org.bukkit.Bukkit; import org.bukkit.command.SimpleCommandMap; @@ -47,7 +48,7 @@ public Class getClass(String className) { try { clazz = this.getClass().getClassLoader().loadClass(_packageName + "." + className); } catch (ClassNotFoundException e) { - throw new RuntimeException("Cannot find class " + _packageName + "." + className + ":", e); + throw new RuntimeException("Cannot find class " + _packageName + "." + className + ".", e); } _cache.put(className, clazz); } @@ -66,13 +67,13 @@ public Class getClass(String className) { private static Method _ChatSerializer_a_unserialize; private static Constructor _ChatComponentTextClass_contructor; - public static void prepareReflection() { + public static void prepareReflection(Class serverClass, Logger logger) { if (!_isPrepared) { Class craftServerClass = Bukkit.getServer().getClass(); _craftBukkitPackage = new CachedPackage(craftServerClass.getPackage().getName()); try { Method getHandle = craftServerClass.getMethod("getHandle"); - _minecraftPackage = new CachedPackage(getHandle.getReturnType().getPackage().getName().replace(".server.dedicated", "")); + _minecraftPackage = new CachedPackage(getHandle.getReturnType().getPackage().getName()); _getCommandMap = craftServerClass.getMethod("getCommandMap"); } catch (NoSuchMethodException e) { throw new RuntimeException("Cannot find the required methods on the server class.", e); @@ -81,11 +82,11 @@ public static void prepareReflection() { _isPrepared = true; try { - Class iChatBaseComponentClass = getMinecraftClass("network.chat.IChatBaseComponent"); - Class chatSerializerClass = getMinecraftClass("network.chat.IChatBaseComponent$ChatSerializer"); + Class iChatBaseComponentClass = getMinecraftClass("IChatBaseComponent"); + Class chatSerializerClass = getMinecraftClass("IChatBaseComponent$ChatSerializer"); _ChatSerializer_a_serialize = chatSerializerClass.getMethod("a", iChatBaseComponentClass); _ChatSerializer_a_unserialize = chatSerializerClass.getMethod("a", String.class); - Class chatComponentTextClass = getMinecraftClass("network.chat.ChatComponentText"); + Class chatComponentTextClass = getMinecraftClass("ChatComponentText"); _ChatComponentTextClass_contructor = chatComponentTextClass.getConstructor(String.class); } catch (NoSuchMethodException e) { throw new RuntimeException("Error while preparing ChatSerializer.", e); @@ -96,22 +97,18 @@ public static void prepareReflection() { private BukkitReflect() { } public static Class getCraftBukkitClass(String className) { - prepareReflection(); return _craftBukkitPackage.getClass(className); } public static Class getMinecraftClass(String className) { - prepareReflection(); return _minecraftPackage.getClass(className); } public static SimpleCommandMap getCommandMap() { - prepareReflection(); return (SimpleCommandMap) invokeMethod(Bukkit.getServer(), _getCommandMap); } public static boolean isValidRawJSON(String text) { - prepareReflection(); try { _ChatSerializer_a_unserialize.invoke(null, text); return true; @@ -126,7 +123,6 @@ public static boolean isValidRawJSON(String text) { } public static String textToRawJSON(String text) { - prepareReflection(); try { return (String) _ChatSerializer_a_serialize.invoke(null, _ChatComponentTextClass_contructor.newInstance(text)); } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException diff --git a/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java similarity index 94% rename from plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java rename to adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java index 254d7995..bc6d3cf0 100644 --- a/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java @@ -21,7 +21,7 @@ private static void getVersion() { } try { Object mcServer = BukkitReflect.invokeMethod(server, BukkitReflect.getCraftBukkitClass("CraftServer").getDeclaredMethod("getServer")); - String version = (String) BukkitReflect.invokeMethod(mcServer, BukkitReflect.getMinecraftClass("server.MinecraftServer").getDeclaredMethod("getVersion")); + String version = (String) BukkitReflect.invokeMethod(mcServer, BukkitReflect.getMinecraftClass("MinecraftServer").getDeclaredMethod("getVersion")); Matcher matcher = Pattern.compile("^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+))?)?$").matcher(version); if (matcher.find()) { _minecraftVersionMajor = Integer.parseInt(matcher.group(1)); diff --git a/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java similarity index 86% rename from plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java rename to adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java index e9748b7b..35f1ef3a 100644 --- a/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java @@ -20,6 +20,7 @@ package com.goncalomb.bukkit.mylib.reflect; import java.lang.reflect.Method; +import java.util.logging.Logger; public class NBTBase { @@ -35,19 +36,19 @@ public class NBTBase { final Object _handle; // The wrapped Minecraft NBTBase instance. - public static final void prepareReflection() { + public static final void prepareReflection(Class serverClass, Logger logger) { if (!_isPrepared) { - _nbtBaseClass = BukkitReflect.getMinecraftClass("nbt.NBTBase"); - _nbtTagCompoundClass = BukkitReflect.getMinecraftClass("nbt.NBTTagCompound"); - _nbtTagListClass = BukkitReflect.getMinecraftClass("nbt.NBTTagList"); - _nbtTagStringClass = BukkitReflect.getMinecraftClass("nbt.NBTTagString"); + _nbtBaseClass = BukkitReflect.getMinecraftClass("NBTBase"); + _nbtTagCompoundClass = BukkitReflect.getMinecraftClass("NBTTagCompound"); + _nbtTagListClass = BukkitReflect.getMinecraftClass("NBTTagList"); + _nbtTagStringClass = BukkitReflect.getMinecraftClass("NBTTagString"); try { _getTypeId = _nbtBaseClass.getMethod("getTypeId"); _clone = _nbtBaseClass.getMethod("clone"); NBTTagCompound.prepareReflectionz(); NBTTagList.prepareReflectionz(); NBTTypes.prepareReflection(); - NBTUtils.prepareReflection(); + NBTUtils.prepareReflection(serverClass, logger); } catch (Exception e) { throw new RuntimeException("Error while preparing NBT wrapper classes.", e); } diff --git a/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java similarity index 98% rename from plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java rename to adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java index a47c2611..2e19ccba 100644 --- a/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java @@ -58,13 +58,13 @@ static void prepareReflectionz() throws SecurityException, NoSuchMethodException _getByteArray = _nbtTagCompoundClass.getMethod("getByteArray", String.class); _getIntArray = _nbtTagCompoundClass.getMethod("getIntArray", String.class); _getLongArray = _nbtTagCompoundClass.getMethod("getLongArray", String.class); - _mapField = _nbtTagCompoundClass.getDeclaredField("x"); + _mapField = _nbtTagCompoundClass.getDeclaredField("map"); _mapField.setAccessible(true); - Class_mojangsonParserClass = BukkitReflect.getMinecraftClass("nbt.MojangsonParser"); + Class_mojangsonParserClass = BukkitReflect.getMinecraftClass("MojangsonParser"); _parseMojangson = _mojangsonParserClass.getMethod("parse", String.class); - Class nbtCompressedStreamToolsClass = BukkitReflect.getMinecraftClass("nbt.NBTCompressedStreamTools"); + Class nbtCompressedStreamToolsClass = BukkitReflect.getMinecraftClass("NBTCompressedStreamTools"); _tagSerializeStream = nbtCompressedStreamToolsClass.getMethod("a", _nbtTagCompoundClass, OutputStream.class); _tagUnserializeStream = nbtCompressedStreamToolsClass.getMethod("a", InputStream.class); } diff --git a/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java similarity index 95% rename from plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java rename to adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java index 368a2178..865fe0c7 100644 --- a/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java @@ -29,9 +29,9 @@ public final class NBTTagList extends NBTBase { List _list; static void prepareReflectionz() throws SecurityException, NoSuchMethodException, NoSuchFieldException { - _typeField = _nbtTagListClass.getDeclaredField("w"); + _typeField = _nbtTagListClass.getDeclaredField("type"); _typeField.setAccessible(true); - _listField = _nbtTagListClass.getDeclaredField("c"); + _listField = _nbtTagListClass.getDeclaredField("list"); _listField.setAccessible(true); } diff --git a/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java similarity index 79% rename from plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java rename to adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java index 22d189ff..e42df86f 100644 --- a/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java @@ -36,21 +36,21 @@ final class NBTTypes { private Class _dataType; public static void prepareReflection() throws SecurityException, NoSuchMethodException, NoSuchFieldException { - registerNew("NBTTagByte", "x"); - registerNew("NBTTagShort", "c"); - registerNew("NBTTagInt", "c"); - registerNew("NBTTagLong", "c"); - registerNew("NBTTagFloat", "w"); - registerNew("NBTTagDouble", "w"); - registerNew("NBTTagString", "A"); - registerNew("NBTTagByteArray", "c"); - registerNew("NBTTagIntArray", "c"); + registerNew("NBTTagByte"); + registerNew("NBTTagShort"); + registerNew("NBTTagInt"); + registerNew("NBTTagLong"); + registerNew("NBTTagFloat"); + registerNew("NBTTagDouble"); + registerNew("NBTTagString"); + registerNew("NBTTagByteArray"); + registerNew("NBTTagIntArray"); // TagLongArray's internal field name is 'b' for some absurd reason. // Since it isn't used, don't bother working around this } - private static void registerNew(String tagClassName, String fieldName) throws SecurityException, NoSuchMethodException, NoSuchFieldException { - NBTTypes handler = new NBTTypes(tagClassName, fieldName); + private static void registerNew(String tagClassName) throws SecurityException, NoSuchMethodException, NoSuchFieldException { + NBTTypes handler = new NBTTypes(tagClassName); _innerTypeMap.put((handler._dataType.isPrimitive() ? ClassUtils.primitiveToWrapper(handler._dataType) : handler._dataType), handler); _outerTypeMap.put(handler._class, handler); } @@ -82,9 +82,9 @@ public static Object fromInternal(Object object) { } } - private NBTTypes(String tagClassName, String fieldName) throws SecurityException, NoSuchMethodException, NoSuchFieldException { - _class = BukkitReflect.getMinecraftClass("nbt." + tagClassName); - _data = _class.getDeclaredField(fieldName); + private NBTTypes(String tagClassName) throws SecurityException, NoSuchMethodException, NoSuchFieldException { + _class = BukkitReflect.getMinecraftClass(tagClassName); + _data = _class.getDeclaredField("data"); _data.setAccessible(true); _dataType = _data.getType(); _constructor = _class.getDeclaredConstructor(_dataType); diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java new file mode 100644 index 00000000..7bde5363 --- /dev/null +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import java.util.logging.Logger; + +import org.bukkit.Location; +import org.bukkit.block.Block; +import org.bukkit.entity.Entity; +import org.bukkit.inventory.ItemStack; + +public final class NBTUtils { + + private static NBTUtilsAdapter adapter = null; + + static void prepareReflection(Class serverClass, Logger logger) throws Exception { + String packageName = serverClass.getPackage().getName(); + String version = packageName.substring(packageName.lastIndexOf('.') + 1); + + Class clazz = Class.forName("com.goncalomb.bukkit.mylib.reflect.NBTUtilsAdapter_" + version); + adapter = (NBTUtilsAdapter) clazz.getConstructor().newInstance(); + logger.info("Loaded NBTUtils adapter for " + version); + } + + public static ItemStack itemStackFromNBTData(NBTTagCompound data) { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } + return adapter.itemStackFromNBTData(data); + } + + public static NBTTagCompound itemStackToNBTData(ItemStack stack) { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } + return adapter.itemStackToNBTData(stack); + } + + public static Entity spawnEntity(NBTTagCompound data, Location location) { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } + return adapter.spawnEntity(data, location); + } + + public static NBTTagCompound getEntityNBTData(Entity entity) { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } + return adapter.getEntityNBTData(entity); + } + + public static NBTTagList potionToNBTEffectsList(ItemStack potion) { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } + return adapter.potionToNBTEffectsList(potion); + } + + public static ItemStack potionFromNBTEffectsList(NBTTagList effects) { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } + return adapter.potionFromNBTEffectsList(effects); + } + + public static NBTTagCompound getTileEntityNBTData(Block block) { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } + return adapter.getTileEntityNBTData(block); + } + + public static void setTileEntityNBTData(Block block, NBTTagCompound data) { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } + adapter.setTileEntityNBTData(block, data); + } + + public static NBTTagCompound getItemStackTag(ItemStack item) { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } + return adapter.getItemStackTag(item); + } + + public static void setItemStackTag(ItemStack item, NBTTagCompound tag) { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } + adapter.setItemStackTag(item, tag); + } + + public static ItemStack itemStackToCraftItemStack(ItemStack item) { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } + return adapter.itemStackToCraftItemStack(item); + } +} diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter.java new file mode 100644 index 00000000..68ff135b --- /dev/null +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import org.bukkit.Location; +import org.bukkit.block.Block; +import org.bukkit.entity.Entity; +import org.bukkit.inventory.ItemStack; + +public interface NBTUtilsAdapter { + ItemStack itemStackFromNBTData(NBTTagCompound data); + + NBTTagCompound itemStackToNBTData(ItemStack stack); + + Entity spawnEntity(NBTTagCompound data, Location location); + + NBTTagCompound getEntityNBTData(Entity entity); + + NBTTagList potionToNBTEffectsList(ItemStack potion); + + ItemStack potionFromNBTEffectsList(NBTTagList effects); + + NBTTagCompound getTileEntityNBTData(Block block); + + void setTileEntityNBTData(Block block, NBTTagCompound data); + + NBTTagCompound getItemStackTag(ItemStack item); + + void setItemStackTag(ItemStack item, NBTTagCompound tag); + + ItemStack itemStackToCraftItemStack(ItemStack item); +} diff --git a/adapter_v1_16_R3/.gitignore b/adapter_v1_16_R3/.gitignore new file mode 100644 index 00000000..4f035375 --- /dev/null +++ b/adapter_v1_16_R3/.gitignore @@ -0,0 +1,2 @@ +upload*.sh +.factorypath diff --git a/adapter_v1_16_R3/build.gradle.kts b/adapter_v1_16_R3/build.gradle.kts new file mode 100644 index 00000000..1d457847 --- /dev/null +++ b/adapter_v1_16_R3/build.gradle.kts @@ -0,0 +1,11 @@ +plugins { + id("com.goncalomb.bukkit.java-conventions") +} + +dependencies { + implementation(project(":adapter_api")) + compileOnly("com.destroystokyo.paper:paper:1.16.5-R0.1-SNAPSHOT") +} + +description = "adapter_v1_16_R3" +version = rootProject.version diff --git a/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_16_R3.java similarity index 71% rename from plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java rename to adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_16_R3.java index 5f6e31ea..811c8264 100644 --- a/plugin/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java +++ b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_16_R3.java @@ -29,48 +29,48 @@ import org.bukkit.entity.Entity; import org.bukkit.inventory.ItemStack; -public final class NBTUtils { +public final class NBTUtilsAdapter_v1_16_R3 implements NBTUtilsAdapter { // Minecraft's ItemStack Class; - private static Constructor _ItemStack_nbtConstructor; - private static Method _ItemStack_save; - private static Method _ItemStack_getTag; - private static Method _ItemStack_setTag; + private Constructor _ItemStack_nbtConstructor; + private Method _ItemStack_save; + private Method _ItemStack_getTag; + private Method _ItemStack_setTag; // CraftItemStack Class; - private static Method _CraftItemStack_asCraftMirror; - private static Method _CraftItemStack_asCraftCopy; - private static Field _CraftItemStack_handle; + private Method _CraftItemStack_asCraftMirror; + private Method _CraftItemStack_asCraftCopy; + private Field _CraftItemStack_handle; // Minecraft's Entity Class; - private static Method _Entity_save; - private static Method _Entity_getBukkitEntity; - private static Method _Entity_setPosition; + private Method _Entity_save; + private Method _Entity_getBukkitEntity; + private Method _Entity_setPosition; // CraftEntity Class - private static Method _CraftEntity_getHandle; + private Method _CraftEntity_getHandle; // Minecraft's TileEntity - private static Method _TileEntity_load; // Load data from NBTTagCompound. - private static Method _TileEntity_save; // Save data to NBTTagCompound. + private Method _TileEntity_load; // Load data from NBTTagCompound. + private Method _TileEntity_save; // Save data to NBTTagCompound. // CraftWorld - private static Method _CraftWorld_getHandle; + private Method _CraftWorld_getHandle; // Minecraft's BlockPosition - private static Constructor _BlockPosition_constructor; + private Constructor _BlockPosition_constructor; // Minecraft's World - private static Method _World_getTileEntity; - private static Method _WorldServer_addAllEntitiesSafely; + private Method _World_getTileEntity; + private Method _WorldServer_addAllEntitiesSafely; // Minecraft's EntityTypes Class - private static Method _EntityTypes_a; // Spawn an entity from a NBTCompound. + private Method _EntityTypes_a; // Spawn an entity from a NBTCompound. - static void prepareReflection() throws SecurityException, NoSuchMethodException, NoSuchFieldException { - Class nbtTagCompoundClass = BukkitReflect.getMinecraftClass("nbt.NBTTagCompound"); + public NBTUtilsAdapter_v1_16_R3() throws SecurityException, NoSuchMethodException, NoSuchFieldException { + Class nbtTagCompoundClass = BukkitReflect.getMinecraftClass("NBTTagCompound"); - Class minecraftItemStackClass = BukkitReflect.getMinecraftClass("world.item.ItemStack"); + Class minecraftItemStackClass = BukkitReflect.getMinecraftClass("ItemStack"); _ItemStack_nbtConstructor = minecraftItemStackClass.getDeclaredConstructor(nbtTagCompoundClass); _ItemStack_nbtConstructor.setAccessible(true); _ItemStack_save = minecraftItemStackClass.getMethod("save", nbtTagCompoundClass); @@ -83,7 +83,7 @@ static void prepareReflection() throws SecurityException, NoSuchMethodException, _CraftItemStack_handle = craftItemStackClass.getDeclaredField("handle"); _CraftItemStack_handle.setAccessible(true); - Class minecraftEntityClass = BukkitReflect.getMinecraftClass("world.entity.Entity"); + Class minecraftEntityClass = BukkitReflect.getMinecraftClass("Entity"); _Entity_save = minecraftEntityClass.getMethod("save", nbtTagCompoundClass); _Entity_getBukkitEntity = minecraftEntityClass.getMethod("getBukkitEntity"); _Entity_setPosition = minecraftEntityClass.getMethod("setPosition", double.class, double.class, double.class); @@ -91,54 +91,39 @@ static void prepareReflection() throws SecurityException, NoSuchMethodException, Class craftEntityClass = BukkitReflect.getCraftBukkitClass("entity.CraftEntity"); _CraftEntity_getHandle = craftEntityClass.getMethod("getHandle"); - Class minecraftTileEntityClass = BukkitReflect.getMinecraftClass("world.level.block.entity.TileEntity"); + Class minecraftTileEntityClass = BukkitReflect.getMinecraftClass("TileEntity"); _TileEntity_save = minecraftTileEntityClass.getMethod("save", nbtTagCompoundClass); - try { - // Bukkit 1.12.1-1.15.2 - _TileEntity_load = minecraftTileEntityClass.getMethod("load", nbtTagCompoundClass); - } catch (NoSuchMethodException e) { - try { - // Bukkit 1.16+ - Class minecraftIBlockDataClass = BukkitReflect.getMinecraftClass("world.level.block.state"); - _TileEntity_load = minecraftTileEntityClass.getMethod("load", minecraftIBlockDataClass, nbtTagCompoundClass); - } catch (NoSuchMethodException ex) { - // Bukkit 1.12 - // XXX: remove fallback on next version - _TileEntity_load = minecraftTileEntityClass.getMethod("a", nbtTagCompoundClass); - } - } + Class minecraftIBlockDataClass = BukkitReflect.getMinecraftClass("IBlockData"); + _TileEntity_load = minecraftTileEntityClass.getMethod("load", minecraftIBlockDataClass, nbtTagCompoundClass); Class craftWorldClass = BukkitReflect.getCraftBukkitClass("CraftWorld"); _CraftWorld_getHandle = craftWorldClass.getMethod("getHandle"); - Class minecraftBlockPositionClass = BukkitReflect.getMinecraftClass("core.BlockPosition"); + Class minecraftBlockPositionClass = BukkitReflect.getMinecraftClass("BlockPosition"); _BlockPosition_constructor = minecraftBlockPositionClass.getConstructor(int.class, int.class, int.class); - Class minecraftWorldClass = BukkitReflect.getMinecraftClass("world.level.World"); + Class minecraftWorldClass = BukkitReflect.getMinecraftClass("World"); _World_getTileEntity = minecraftWorldClass.getMethod("getTileEntity", minecraftBlockPositionClass); - Class minecraftWorldServerClass = BukkitReflect.getMinecraftClass("server.level.WorldServer"); + Class minecraftWorldServerClass = BukkitReflect.getMinecraftClass("WorldServer"); _WorldServer_addAllEntitiesSafely = minecraftWorldServerClass.getMethod("addAllEntitiesSafely", minecraftEntityClass); - Class minecraftEntityTypesClass = BukkitReflect.getMinecraftClass("world.entity.EntityTypes"); + Class minecraftEntityTypesClass = BukkitReflect.getMinecraftClass("EntityTypes"); _EntityTypes_a = minecraftEntityTypesClass.getMethod("a", nbtTagCompoundClass, minecraftWorldClass, Function.class); } - private NBTUtils() { } - - public static ItemStack itemStackFromNBTData(NBTTagCompound data) { + public ItemStack itemStackFromNBTData(NBTTagCompound data) { return (ItemStack) BukkitReflect.invokeMethod(null, _CraftItemStack_asCraftMirror, BukkitReflect.invokeConstuctor(_ItemStack_nbtConstructor, data._handle)); } - public static NBTTagCompound itemStackToNBTData(ItemStack stack) { + public NBTTagCompound itemStackToNBTData(ItemStack stack) { NBTTagCompound data = new NBTTagCompound(); Object handle = BukkitReflect.getFieldValue(stack, _CraftItemStack_handle); BukkitReflect.invokeMethod(handle, _ItemStack_save, data._handle); return data; } - @SuppressWarnings("unchecked") - public static Entity spawnEntity(NBTTagCompound data, Location location) { + public Entity spawnEntity(NBTTagCompound data, Location location) { Object worldHandle = BukkitReflect.invokeMethod(location.getWorld(), _CraftWorld_getHandle); // This function will be applied to each summoned entity (including passengers) to set their location Function entityFunction = (Object entity) -> { @@ -154,14 +139,14 @@ public static Entity spawnEntity(NBTTagCompound data, Location location) { return (Entity) BukkitReflect.invokeMethod(entityHandle, _Entity_getBukkitEntity); } - public static NBTTagCompound getEntityNBTData(Entity entity) { + public NBTTagCompound getEntityNBTData(Entity entity) { Object entityHandle = BukkitReflect.invokeMethod(entity, _CraftEntity_getHandle); NBTTagCompound data = new NBTTagCompound(); BukkitReflect.invokeMethod(entityHandle, _Entity_save, data._handle); return data; } - public static NBTTagList potionToNBTEffectsList(ItemStack potion) { + public NBTTagList potionToNBTEffectsList(ItemStack potion) { NBTTagCompound tag = getItemStackTag(potion); if (tag.hasKey("CustomPotionEffects")) { return tag.getList("CustomPotionEffects").clone(); @@ -176,7 +161,7 @@ public static NBTTagList potionToNBTEffectsList(ItemStack potion) { return new NBTTagList(); } - public static ItemStack potionFromNBTEffectsList(NBTTagList effects) { + public ItemStack potionFromNBTEffectsList(NBTTagList effects) { NBTTagCompound tag = new NBTTagCompound(); tag.setList("CustomPotionEffects", effects.clone()); tag.setString("Potion", "minecraft:mundane"); @@ -188,14 +173,13 @@ public static ItemStack potionFromNBTEffectsList(NBTTagList effects) { return itemStackFromNBTData(data); } - private static Object getTileEntity(Block block) { + private Object getTileEntity(Block block) { Object worldHandle = BukkitReflect.invokeMethod(block.getWorld(), _CraftWorld_getHandle); Object pos = BukkitReflect.invokeConstuctor(_BlockPosition_constructor, block.getX(), block.getY(), block.getZ()); return BukkitReflect.invokeMethod(worldHandle, _World_getTileEntity, pos); } - public static NBTTagCompound getTileEntityNBTData(Block block) { - NBTBase.prepareReflection(); + public NBTTagCompound getTileEntityNBTData(Block block) { Object tileEntity = getTileEntity(block); if (tileEntity != null) { NBTTagCompound data = new NBTTagCompound(); @@ -205,30 +189,28 @@ public static NBTTagCompound getTileEntityNBTData(Block block) { return null; } - public static void setTileEntityNBTData(Block block, NBTTagCompound data) { - NBTBase.prepareReflection(); + public void setTileEntityNBTData(Block block, NBTTagCompound data) { Object tileEntity = getTileEntity(block); if (tileEntity != null) { BukkitReflect.invokeMethod(tileEntity, _TileEntity_load, null, data._handle); } } - public static NBTTagCompound getItemStackTag(ItemStack item) { + public NBTTagCompound getItemStackTag(ItemStack item) { Object handle = BukkitReflect.getFieldValue(item, _CraftItemStack_handle); Object tag = BukkitReflect.invokeMethod(handle, _ItemStack_getTag); return (tag == null ? new NBTTagCompound() : new NBTTagCompound(tag)); } - public static void setItemStackTag(ItemStack item, NBTTagCompound tag) { + public void setItemStackTag(ItemStack item, NBTTagCompound tag) { Object handle = BukkitReflect.getFieldValue(item, _CraftItemStack_handle); BukkitReflect.invokeMethod(handle, _ItemStack_setTag, tag._handle); } - public static ItemStack itemStackToCraftItemStack(ItemStack item) { + public ItemStack itemStackToCraftItemStack(ItemStack item) { if (!_CraftItemStack_asCraftCopy.getClass().isInstance(item)) { return (ItemStack) BukkitReflect.invokeMethod(null, _CraftItemStack_asCraftCopy, item); } return item; } - } diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 9874e083..b320d652 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -1,14 +1,21 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import net.minecrell.pluginyml.bukkit.BukkitPluginDescription +import org.hidetake.groovy.ssh.core.Remote +import org.hidetake.groovy.ssh.core.RunHandler +import org.hidetake.groovy.ssh.core.Service +import org.hidetake.groovy.ssh.session.SessionHandler plugins { id("com.github.johnrengelman.shadow") version "7.1.2" id("net.minecrell.plugin-yml.bukkit") version "0.5.1" // Generates plugin.yml + id("org.hidetake.ssh") version "2.10.1" id("com.goncalomb.bukkit.java-conventions") id("java") } dependencies { + implementation(project(":adapter_api")) + implementation(project(":adapter_v1_16_R3")) implementation("org.bstats:bstats-bukkit:1.5") compileOnly("org.spigotmc:spigot-api:1.16.3-R0.1-SNAPSHOT") @@ -31,9 +38,162 @@ bukkit { softDepend = listOf() } +tasks.withType().configureEach { + options.compilerArgs.add("-Xmaxwarns") + options.compilerArgs.add("10000") + options.compilerArgs.add("-Xlint:deprecation") +} + +val basicssh = remotes.create("basicssh") { + host = "admin-eu.playmonumenta.com" + port = 8822 + user = "epic" + knownHosts = allowAnyHosts + agent = System.getenv("IDENTITY_FILE") == null + identity = if (System.getenv("IDENTITY_FILE") == null) null else file(System.getenv("IDENTITY_FILE")) +} + +val adminssh = remotes.create("adminssh") { + host = "admin-eu.playmonumenta.com" + port = 9922 + user = "epic" + knownHosts = allowAnyHosts + agent = System.getenv("IDENTITY_FILE") == null + identity = if (System.getenv("IDENTITY_FILE") == null) null else file(System.getenv("IDENTITY_FILE")) +} + // Relocation / shading tasks { shadowJar { relocate("org.bstats", "com.goncalomb.bukkit.bstats") } } + +tasks.create("dev1-deploy") { + val shadowJar by tasks.named("shadowJar") + dependsOn(shadowJar) + doLast { + ssh.runSessions { + session(basicssh) { + execute("cd /home/epic/dev1_shard_plugins && rm -f nbteditor*.jar") + put(shadowJar.archiveFile.get().getAsFile(), "/home/epic/dev1_shard_plugins") + } + } + } +} + +tasks.create("dev2-deploy") { + val shadowJar by tasks.named("shadowJar") + dependsOn(shadowJar) + doLast { + ssh.runSessions { + session(basicssh) { + execute("cd /home/epic/dev2_shard_plugins && rm -f nbteditor*.jar") + put(shadowJar.archiveFile.get().getAsFile(), "/home/epic/dev2_shard_plugins") + } + } + } +} + +tasks.create("dev3-deploy") { + val shadowJar by tasks.named("shadowJar") + dependsOn(shadowJar) + doLast { + ssh.runSessions { + session(basicssh) { + execute("cd /home/epic/dev3_shard_plugins && rm -f nbteditor*.jar") + put(shadowJar.archiveFile.get().getAsFile(), "/home/epic/dev3_shard_plugins") + } + } + } +} + +tasks.create("dev4-deploy") { + val shadowJar by tasks.named("shadowJar") + dependsOn(shadowJar) + doLast { + ssh.runSessions { + session(basicssh) { + execute("cd /home/epic/dev4_shard_plugins && rm -f nbteditor*.jar") + put(shadowJar.archiveFile.get().getAsFile(), "/home/epic/dev4_shard_plugins") + } + } + } +} + +tasks.create("futurama-deploy") { + val shadowJar by tasks.named("shadowJar") + dependsOn(shadowJar) + doLast { + ssh.runSessions { + session(basicssh) { + execute("cd /home/epic/futurama_shard_plugins && rm -f nbteditor*.jar") + put(shadowJar.archiveFile.get().getAsFile(), "/home/epic/futurama_shard_plugins") + } + } + } +} + +tasks.create("mobs-deploy") { + val shadowJar by tasks.named("shadowJar") + dependsOn(shadowJar) + doLast { + ssh.runSessions { + session(basicssh) { + execute("cd /home/epic/mob_shard_plugins && rm -f nbteditor*.jar") + put(shadowJar.archiveFile.get().getAsFile(), "/home/epic/mob_shard_plugins") + } + } + } +} + +tasks.create("stage-deploy") { + val shadowJar by tasks.named("shadowJar") + dependsOn(shadowJar) + doLast { + ssh.runSessions { + session(basicssh) { + put(shadowJar.archiveFile.get().getAsFile(), "/home/epic/stage/m12/server_config/plugins") + execute("cd /home/epic/stage/m12/server_config/plugins && rm -f nbteditor.jar && ln -s " + shadowJar.archiveFileName.get() + " nbteditor.jar") + } + } + } +} + +tasks.create("build-deploy") { + val shadowJar by tasks.named("shadowJar") + dependsOn(shadowJar) + doLast { + ssh.runSessions { + session(adminssh) { + put(shadowJar.archiveFile.get().getAsFile(), "/home/epic/project_epic/server_config/plugins") + execute("cd /home/epic/project_epic/server_config/plugins && rm -f nbteditor.jar && ln -s " + shadowJar.archiveFileName.get() + " nbteditor.jar") + execute("cd /home/epic/project_epic/mobs/plugins && rm -f nbteditor.jar && ln -s ../../server_config/plugins/nbteditor.jar") + } + } + } +} + +tasks.create("play-deploy") { + val shadowJar by tasks.named("shadowJar") + dependsOn(shadowJar) + doLast { + ssh.runSessions { + session(adminssh) { + put(shadowJar.archiveFile.get().getAsFile(), "/home/epic/play/m8/server_config/plugins") + put(shadowJar.archiveFile.get().getAsFile(), "/home/epic/play/m11/server_config/plugins") + execute("cd /home/epic/play/m8/server_config/plugins && rm -f nbteditor.jar && ln -s " + shadowJar.archiveFileName.get() + " nbteditor.jar") + execute("cd /home/epic/play/m11/server_config/plugins && rm -f nbteditor.jar && ln -s " + shadowJar.archiveFileName.get() + " nbteditor.jar") + } + } + } +} + +fun Service.runSessions(action: RunHandler.() -> Unit) = + run(delegateClosureOf(action)) + +fun RunHandler.session(vararg remotes: Remote, action: SessionHandler.() -> Unit) = + session(*remotes, delegateClosureOf(action)) + +fun SessionHandler.put(from: Any, into: Any) = + put(hashMapOf("from" to from, "into" to into)) diff --git a/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java index f3a314eb..6eca3d73 100644 --- a/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java +++ b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java @@ -66,8 +66,8 @@ public final class NBTEditor extends JavaPlugin { @Override public void onEnable() { try { - BukkitReflect.prepareReflection(); - NBTBase.prepareReflection(); + BukkitReflect.prepareReflection(this.getServer().getClass(), getLogger()); + NBTBase.prepareReflection(this.getServer().getClass(), getLogger()); } catch (Throwable e) { getLogger().log(Level.SEVERE, "Error preparing reflection objects", e); getLogger().severe("This version of NBTEditor is not compatible with this version of Bukkit"); diff --git a/settings.gradle.kts b/settings.gradle.kts index fa773a08..9226e9d5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,6 @@ rootProject.name = "nbteditor" +include(":adapter_api") +include(":adapter_v1_16_R3") include(":NBTEditor") project(":NBTEditor").projectDir = file("plugin") From 8224d7647734fa346e520a9d8c6b610196dcac0b Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Sat, 16 Apr 2022 23:35:36 +0000 Subject: [PATCH 16/27] Initial 1.18 adapter with untested NBTUtils implementation Signed-off-by: Byron Marohn --- .../bukkit/mylib/reflect/NBTUtils.java | 27 +++-- .../bukkit/mylib/reflect/NBTUtilsAdapter.java | 4 - .../reflect/NBTUtilsAdapter_v1_16_R3.java | 27 ----- adapter_v1_18_R1/.gitignore | 2 + adapter_v1_18_R1/build.gradle.kts | 33 +++++++ adapter_v1_18_R1/settings.gradle.kts | 5 + .../reflect/NBTUtilsAdapter_v1_18_R1.java | 98 +++++++++++++++++++ plugin/build.gradle.kts | 1 + settings.gradle.kts | 1 + 9 files changed, 160 insertions(+), 38 deletions(-) create mode 100644 adapter_v1_18_R1/.gitignore create mode 100644 adapter_v1_18_R1/build.gradle.kts create mode 100644 adapter_v1_18_R1/settings.gradle.kts create mode 100644 adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R1.java diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java index 7bde5363..4722b8fa 100644 --- a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java @@ -68,17 +68,30 @@ public static NBTTagCompound getEntityNBTData(Entity entity) { } public static NBTTagList potionToNBTEffectsList(ItemStack potion) { - if (adapter == null) { - throw new RuntimeException("Version adapter is not loaded"); + NBTTagCompound tag = getItemStackTag(potion); + if (tag.hasKey("CustomPotionEffects")) { + return tag.getList("CustomPotionEffects").clone(); } - return adapter.potionToNBTEffectsList(potion); + // Fallback to default potion effect. + + // XXX: implement fallback + + // Finding the default potion effect is not trivial on 1.9. + // Wait until org.bukkit.craftbukkit.potion.CraftPotionUtil is available upstream. + // For now, display some alert messages on InventoryForMobs and InventoryForThrownPotion. + return new NBTTagList(); } public static ItemStack potionFromNBTEffectsList(NBTTagList effects) { - if (adapter == null) { - throw new RuntimeException("Version adapter is not loaded"); - } - return adapter.potionFromNBTEffectsList(effects); + NBTTagCompound tag = new NBTTagCompound(); + tag.setList("CustomPotionEffects", effects.clone()); + tag.setString("Potion", "minecraft:mundane"); + NBTTagCompound data = new NBTTagCompound(); + data.setString("id", "minecraft:potion"); + data.setByte("Count", (byte) 1); + data.setShort("Damage", (short) 0); + data.setCompound("tag", tag); + return itemStackFromNBTData(data); } public static NBTTagCompound getTileEntityNBTData(Block block) { diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter.java index 68ff135b..b50fbb91 100644 --- a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter.java @@ -33,10 +33,6 @@ public interface NBTUtilsAdapter { NBTTagCompound getEntityNBTData(Entity entity); - NBTTagList potionToNBTEffectsList(ItemStack potion); - - ItemStack potionFromNBTEffectsList(NBTTagList effects); - NBTTagCompound getTileEntityNBTData(Block block); void setTileEntityNBTData(Block block, NBTTagCompound data); diff --git a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_16_R3.java b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_16_R3.java index 811c8264..d8851627 100644 --- a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_16_R3.java +++ b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_16_R3.java @@ -146,33 +146,6 @@ public NBTTagCompound getEntityNBTData(Entity entity) { return data; } - public NBTTagList potionToNBTEffectsList(ItemStack potion) { - NBTTagCompound tag = getItemStackTag(potion); - if (tag.hasKey("CustomPotionEffects")) { - return tag.getList("CustomPotionEffects").clone(); - } - // Fallback to default potion effect. - - // XXX: implement fallback - - // Finding the default potion effect is not trivial on 1.9. - // Wait until org.bukkit.craftbukkit.potion.CraftPotionUtil is available upstream. - // For now, display some alert messages on InventoryForMobs and InventoryForThrownPotion. - return new NBTTagList(); - } - - public ItemStack potionFromNBTEffectsList(NBTTagList effects) { - NBTTagCompound tag = new NBTTagCompound(); - tag.setList("CustomPotionEffects", effects.clone()); - tag.setString("Potion", "minecraft:mundane"); - NBTTagCompound data = new NBTTagCompound(); - data.setString("id", "minecraft:potion"); - data.setByte("Count", (byte) 1); - data.setShort("Damage", (short) 0); - data.setCompound("tag", tag); - return itemStackFromNBTData(data); - } - private Object getTileEntity(Block block) { Object worldHandle = BukkitReflect.invokeMethod(block.getWorld(), _CraftWorld_getHandle); Object pos = BukkitReflect.invokeConstuctor(_BlockPosition_constructor, block.getX(), block.getY(), block.getZ()); diff --git a/adapter_v1_18_R1/.gitignore b/adapter_v1_18_R1/.gitignore new file mode 100644 index 00000000..4f035375 --- /dev/null +++ b/adapter_v1_18_R1/.gitignore @@ -0,0 +1,2 @@ +upload*.sh +.factorypath diff --git a/adapter_v1_18_R1/build.gradle.kts b/adapter_v1_18_R1/build.gradle.kts new file mode 100644 index 00000000..91db0d42 --- /dev/null +++ b/adapter_v1_18_R1/build.gradle.kts @@ -0,0 +1,33 @@ +plugins { + id("com.goncalomb.bukkit.java-conventions") + id("io.papermc.paperweight.userdev") version "1.3.3" +} + +dependencies { + implementation(project(":adapter_api")) + paperDevBundle("1.18.1-R0.1-SNAPSHOT") +} + +description = "adapter_v1_18_R1" +version = rootProject.version + +tasks { + // Configure reobfJar to run when invoking the build task + assemble { + dependsOn(reobfJar) + } + + compileJava { + options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything + + // Set the release flag. This configures what version bytecode the compiler will emit, as well as what JDK APIs are usable. + // See https://openjdk.java.net/jeps/247 for more information. + options.release.set(17) + } + javadoc { + options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything + } + processResources { + filteringCharset = Charsets.UTF_8.name() // We want UTF-8 for everything + } +} diff --git a/adapter_v1_18_R1/settings.gradle.kts b/adapter_v1_18_R1/settings.gradle.kts new file mode 100644 index 00000000..211d7e16 --- /dev/null +++ b/adapter_v1_18_R1/settings.gradle.kts @@ -0,0 +1,5 @@ +pluginManagement { + repositories { + maven("https://papermc.io/repo/repository/maven-public/") + } +} diff --git a/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R1.java b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R1.java new file mode 100644 index 00000000..aa4b52e4 --- /dev/null +++ b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R1.java @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import org.bukkit.Location; +import org.bukkit.block.Block; +import org.bukkit.craftbukkit.v1_18_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_18_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack; +import org.bukkit.entity.Entity; +import org.bukkit.inventory.ItemStack; + +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.level.block.entity.BlockEntity; + +public final class NBTUtilsAdapter_v1_18_R1 implements NBTUtilsAdapter { + public ItemStack itemStackFromNBTData(NBTTagCompound data) { + return net.minecraft.world.item.ItemStack.of((CompoundTag) data._handle).asBukkitMirror(); + } + + public NBTTagCompound itemStackToNBTData(ItemStack stack) { + NBTTagCompound data = new NBTTagCompound(); + ((CraftItemStack) stack).handle.save((CompoundTag) (data._handle)); + return data; + } + + public Entity spawnEntity(NBTTagCompound data, Location location) { + ServerLevel world = ((CraftWorld) location.getWorld()).getHandle(); + + net.minecraft.world.entity.Entity entity = EntityType.loadEntityRecursive((CompoundTag) (data._handle), world, (spawnedEntity) -> { + spawnedEntity.setPos(location.getX(), location.getY(), location.getZ()); + return spawnedEntity; + }); + world.addFreshEntity(entity); + return entity.getBukkitEntity(); + }; + + public NBTTagCompound getEntityNBTData(Entity entity) { + NBTTagCompound data = new NBTTagCompound(); + ((CraftEntity) entity).getHandle().save((CompoundTag) (data._handle)); + return data; + } + + private BlockEntity getTileEntity(Block block) { + return ((CraftWorld) block.getWorld()).getHandle().getBlockEntity(new BlockPos(block.getX(), block.getY(), block.getZ())); + } + + public NBTTagCompound getTileEntityNBTData(Block block) { + BlockEntity tileEntity = getTileEntity(block); + if (tileEntity != null) { + return new NBTTagCompound(tileEntity.saveWithoutMetadata()); + } + return null; + } + + public void setTileEntityNBTData(Block block, NBTTagCompound data) { + BlockEntity tileEntity = getTileEntity(block); + if (tileEntity != null) { + tileEntity.load((CompoundTag) data._handle); + } + } + + public NBTTagCompound getItemStackTag(ItemStack item) { + Object tag = ((CraftItemStack) item).handle.getTag(); + return (tag == null ? new NBTTagCompound() : new NBTTagCompound(tag)); + } + + public void setItemStackTag(ItemStack item, NBTTagCompound tag) { + ((CraftItemStack) item).handle.setTag((CompoundTag) (tag._handle)); + } + + public ItemStack itemStackToCraftItemStack(ItemStack item) { + if (!CraftItemStack.class.isInstance(item)) { + return CraftItemStack.asCraftCopy(item); + } + return item; + } +} diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index b320d652..d63ce072 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -16,6 +16,7 @@ plugins { dependencies { implementation(project(":adapter_api")) implementation(project(":adapter_v1_16_R3")) + implementation(project(":adapter_v1_18_R1")) implementation("org.bstats:bstats-bukkit:1.5") compileOnly("org.spigotmc:spigot-api:1.16.3-R0.1-SNAPSHOT") diff --git a/settings.gradle.kts b/settings.gradle.kts index 9226e9d5..57679e46 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,7 @@ rootProject.name = "nbteditor" include(":adapter_api") include(":adapter_v1_16_R3") +include(":adapter_v1_18_R1") include(":NBTEditor") project(":NBTEditor").projectDir = file("plugin") From aaaab234de20fefef29ff04cc7ba293325fa577e Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Sun, 17 Apr 2022 00:55:49 +0000 Subject: [PATCH 17/27] Port NBTBase to adapters Signed-off-by: Byron Marohn --- .../bukkit/mylib/reflect/BukkitReflect.java | 2 +- .../bukkit/mylib/reflect/NBTBase.java | 69 +++++++------------ .../bukkit/mylib/reflect/NBTBaseAdapter.java | 32 +++++++++ .../bukkit/mylib/reflect/NBTTagCompound.java | 11 ++- .../bukkit/mylib/reflect/NBTTagList.java | 5 +- .../bukkit/mylib/reflect/NBTTypes.java | 5 +- .../bukkit/mylib/reflect/NBTUtils.java | 2 +- .../reflect/NBTBaseAdapter_v1_16_R3.java | 69 +++++++++++++++++++ .../reflect/NBTBaseAdapter_v1_18_R1.java | 53 ++++++++++++++ .../reflect/NBTUtilsAdapter_v1_18_R1.java | 4 ++ .../goncalomb/bukkit/nbteditor/NBTEditor.java | 8 +++ 11 files changed, 208 insertions(+), 52 deletions(-) create mode 100644 adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter.java create mode 100644 adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter_v1_16_R3.java create mode 100644 adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter_v1_18_R1.java diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java index acf2e6c4..2fcc22c0 100644 --- a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java @@ -67,7 +67,7 @@ public Class getClass(String className) { private static Method _ChatSerializer_a_unserialize; private static Constructor _ChatComponentTextClass_contructor; - public static void prepareReflection(Class serverClass, Logger logger) { + public static void prepareReflection(Class serverClass, Logger logger) throws Exception { if (!_isPrepared) { Class craftServerClass = Bukkit.getServer().getClass(); _craftBukkitPackage = new CachedPackage(craftServerClass.getPackage().getName()); diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java index 35f1ef3a..3c82344b 100644 --- a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java @@ -19,77 +19,54 @@ package com.goncalomb.bukkit.mylib.reflect; -import java.lang.reflect.Method; import java.util.logging.Logger; public class NBTBase { - private static boolean _isPrepared = false; + private static NBTBaseAdapter adapter = null; - protected static Class _nbtBaseClass; - protected static Class _nbtTagCompoundClass; - protected static Class _nbtTagListClass; - protected static Class _nbtTagStringClass; + public static void prepareReflection(Class serverClass, Logger logger) throws Exception { + String packageName = serverClass.getPackage().getName(); + String version = packageName.substring(packageName.lastIndexOf('.') + 1); - private static Method _getTypeId; - private static Method _clone; + Class clazz = Class.forName("com.goncalomb.bukkit.mylib.reflect.NBTBaseAdapter_" + version); + adapter = (NBTBaseAdapter) clazz.getConstructor().newInstance(); + logger.info("Loaded NBTBase adapter for " + version); + } final Object _handle; // The wrapped Minecraft NBTBase instance. - public static final void prepareReflection(Class serverClass, Logger logger) { - if (!_isPrepared) { - _nbtBaseClass = BukkitReflect.getMinecraftClass("NBTBase"); - _nbtTagCompoundClass = BukkitReflect.getMinecraftClass("NBTTagCompound"); - _nbtTagListClass = BukkitReflect.getMinecraftClass("NBTTagList"); - _nbtTagStringClass = BukkitReflect.getMinecraftClass("NBTTagString"); - try { - _getTypeId = _nbtBaseClass.getMethod("getTypeId"); - _clone = _nbtBaseClass.getMethod("clone"); - NBTTagCompound.prepareReflectionz(); - NBTTagList.prepareReflectionz(); - NBTTypes.prepareReflection(); - NBTUtils.prepareReflection(serverClass, logger); - } catch (Exception e) { - throw new RuntimeException("Error while preparing NBT wrapper classes.", e); - } - _isPrepared = true; - } - } - // Wraps any Minecraft tags in MyLib tags. // Primitives and strings are wrapped with NBTBase. protected static final NBTBase wrap(Object object) { - if (_nbtTagCompoundClass.isInstance(object)) { - return new NBTTagCompound(object); - } else if (_nbtTagListClass.isInstance(object)) { - return new NBTTagList(object); - } else if (_nbtBaseClass.isInstance(object)) { - return new NBTBase(object); - } else { - throw new RuntimeException(object.getClass() + " is not a valid NBT tag type."); + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); } + return adapter.wrap(object); } // Helper method for NBTTagCompoundWrapper.merge(). // Clones any internal Minecraft tags. protected static final Object clone(Object nbtBaseObject) { - return BukkitReflect.invokeMethod(nbtBaseObject, _clone); - } - - protected NBTBase(Object handle) { - _handle = handle; + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } + return adapter.clone(nbtBaseObject); } - protected final Object invokeMethod(Method method, Object... args) { - return BukkitReflect.invokeMethod(_handle, method, args); + static byte getTypeId(Object handle) { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } + return adapter.getTypeId(handle); } - static byte getTypeId(Object handle) { - return (Byte) BukkitReflect.invokeMethod(handle, _getTypeId); + protected NBTBase(Object handle) { + _handle = handle; } public NBTBase clone() { - return wrap(invokeMethod(_clone)); + return wrap(clone(_handle)); } @Override diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter.java new file mode 100644 index 00000000..086fa63b --- /dev/null +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter.java @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +public interface NBTBaseAdapter { + // Wraps any Minecraft tags in MyLib tags. + // Primitives and strings are wrapped with NBTBase. + NBTBase wrap(Object object); + + // Helper method for NBTTagCompoundWrapper.merge(). + // Clones any internal Minecraft tags. + Object clone(Object nbtBaseObject); + + byte getTypeId(Object handle); +} diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java index 2e19ccba..4c854462 100644 --- a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java @@ -28,9 +28,12 @@ import java.lang.reflect.Method; import java.util.Map; import java.util.Map.Entry; +import java.util.logging.Logger; public final class NBTTagCompound extends NBTBase { + protected static Class _nbtTagListClass; + protected static Class _nbtTagCompoundClass; private static Method _getByte; private static Method _getShort; private static Method _getInt; @@ -47,7 +50,9 @@ public final class NBTTagCompound extends NBTBase { private static Method _tagUnserializeStream; private static Method _parseMojangson; - static void prepareReflectionz() throws SecurityException, NoSuchMethodException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException { + public static void prepareReflection(Class serverClass, Logger logger) throws Exception { + _nbtTagCompoundClass = BukkitReflect.getMinecraftClass("NBTTagCompound"); + _nbtTagListClass = BukkitReflect.getMinecraftClass("NBTTagList"); _getByte = _nbtTagCompoundClass.getMethod("getByte", String.class); _getShort = _nbtTagCompoundClass.getMethod("getShort", String.class); _getInt = _nbtTagCompoundClass.getMethod("getInt", String.class); @@ -263,4 +268,8 @@ public NBTTagCompound clone() { public static NBTTagCompound fromString(String mojangson) { return new NBTTagCompound(BukkitReflect.invokeMethod(null, _parseMojangson, mojangson)); } + + protected final Object invokeMethod(Method method, Object... args) { + return BukkitReflect.invokeMethod(_handle, method, args); + } } diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java index 865fe0c7..75d68643 100644 --- a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java @@ -21,14 +21,17 @@ import java.lang.reflect.Field; import java.util.List; +import java.util.logging.Logger; public final class NBTTagList extends NBTBase { private static Field _typeField; private static Field _listField; + protected static Class _nbtTagListClass; List _list; - static void prepareReflectionz() throws SecurityException, NoSuchMethodException, NoSuchFieldException { + public static void prepareReflection(Class serverClass, Logger logger) throws Exception { + _nbtTagListClass = BukkitReflect.getMinecraftClass("NBTTagList"); _typeField = _nbtTagListClass.getDeclaredField("type"); _typeField.setAccessible(true); _listField = _nbtTagListClass.getDeclaredField("list"); diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java index e42df86f..22ebd7cd 100644 --- a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java @@ -22,10 +22,11 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.util.HashMap; +import java.util.logging.Logger; import org.apache.commons.lang.ClassUtils; -final class NBTTypes { +public final class NBTTypes { private static HashMap, NBTTypes> _innerTypeMap = new HashMap, NBTTypes>();; private static HashMap, NBTTypes> _outerTypeMap = new HashMap, NBTTypes>();; @@ -35,7 +36,7 @@ final class NBTTypes { private Field _data; private Class _dataType; - public static void prepareReflection() throws SecurityException, NoSuchMethodException, NoSuchFieldException { + public static void prepareReflection(Class serverClass, Logger logger) throws Exception { registerNew("NBTTagByte"); registerNew("NBTTagShort"); registerNew("NBTTagInt"); diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java index 4722b8fa..e7072c92 100644 --- a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtils.java @@ -30,7 +30,7 @@ public final class NBTUtils { private static NBTUtilsAdapter adapter = null; - static void prepareReflection(Class serverClass, Logger logger) throws Exception { + public static void prepareReflection(Class serverClass, Logger logger) throws Exception { String packageName = serverClass.getPackage().getName(); String version = packageName.substring(packageName.lastIndexOf('.') + 1); diff --git a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter_v1_16_R3.java b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter_v1_16_R3.java new file mode 100644 index 00000000..347b1f76 --- /dev/null +++ b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter_v1_16_R3.java @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import java.lang.reflect.Method; + +public class NBTBaseAdapter_v1_16_R3 implements NBTBaseAdapter { + + protected static Class _nbtBaseClass; + protected static Class _nbtTagCompoundClass; + protected static Class _nbtTagListClass; + protected static Class _nbtTagStringClass; + + private static Method _getTypeId; + private static Method _clone; + + public NBTBaseAdapter_v1_16_R3() { + _nbtBaseClass = BukkitReflect.getMinecraftClass("NBTBase"); + _nbtTagCompoundClass = BukkitReflect.getMinecraftClass("NBTTagCompound"); + _nbtTagListClass = BukkitReflect.getMinecraftClass("NBTTagList"); + _nbtTagStringClass = BukkitReflect.getMinecraftClass("NBTTagString"); + try { + _getTypeId = _nbtBaseClass.getMethod("getTypeId"); + _clone = _nbtBaseClass.getMethod("clone"); + } catch (Exception e) { + throw new RuntimeException("Error while preparing NBT wrapper classes.", e); + } + } + + @Override + public NBTBase wrap(Object object) { + if (_nbtTagCompoundClass.isInstance(object)) { + return new NBTTagCompound(object); + } else if (_nbtTagListClass.isInstance(object)) { + return new NBTTagList(object); + } else if (_nbtBaseClass.isInstance(object)) { + return new NBTBase(object); + } else { + throw new RuntimeException(object.getClass() + " is not a valid NBT tag type."); + } + } + + @Override + public Object clone(Object nbtBaseObject) { + return BukkitReflect.invokeMethod(nbtBaseObject, _clone); + } + + @Override + public byte getTypeId(Object handle) { + return (Byte) BukkitReflect.invokeMethod(handle, _getTypeId); + } +} diff --git a/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter_v1_18_R1.java b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter_v1_18_R1.java new file mode 100644 index 00000000..63373d4f --- /dev/null +++ b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter_v1_18_R1.java @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.Tag; + +public class NBTBaseAdapter_v1_18_R1 implements NBTBaseAdapter { + public NBTBaseAdapter_v1_18_R1() { + // No setup needed but this constructor must exist + } + + @Override + public NBTBase wrap(Object object) { + if (object instanceof CompoundTag) { + return new NBTTagCompound(object); + } else if (object instanceof ListTag) { + return new NBTTagList(object); + } else if (object instanceof Tag) { + return new NBTBase(object); + } else { + throw new RuntimeException(object.getClass() + " is not a valid NBT tag type."); + } + } + + @Override + public Object clone(Object nbtBaseObject) { + return ((Tag) nbtBaseObject).copy(); + } + + @Override + public byte getTypeId(Object handle) { + return ((Tag) handle).getId(); + } +} diff --git a/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R1.java b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R1.java index aa4b52e4..14910d33 100644 --- a/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R1.java +++ b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R1.java @@ -34,6 +34,10 @@ import net.minecraft.world.level.block.entity.BlockEntity; public final class NBTUtilsAdapter_v1_18_R1 implements NBTUtilsAdapter { + public NBTUtilsAdapter_v1_18_R1() { + // No setup needed but this constructor must exist + } + public ItemStack itemStackFromNBTData(NBTTagCompound data) { return net.minecraft.world.item.ItemStack.of((CompoundTag) data._handle).asBukkitMirror(); } diff --git a/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java index 6eca3d73..4fec391a 100644 --- a/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java +++ b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java @@ -46,6 +46,10 @@ import com.goncalomb.bukkit.mylib.command.MyCommandManager; import com.goncalomb.bukkit.mylib.reflect.BukkitReflect; import com.goncalomb.bukkit.mylib.reflect.NBTBase; +import com.goncalomb.bukkit.mylib.reflect.NBTTagCompound; +import com.goncalomb.bukkit.mylib.reflect.NBTTagList; +import com.goncalomb.bukkit.mylib.reflect.NBTUtils; +import com.goncalomb.bukkit.mylib.reflect.NBTTypes; import com.goncalomb.bukkit.nbteditor.bos.BookOfSouls; import com.goncalomb.bukkit.nbteditor.commands.CommandBOS; import com.goncalomb.bukkit.nbteditor.commands.CommandItemStorage; @@ -68,6 +72,10 @@ public void onEnable() { try { BukkitReflect.prepareReflection(this.getServer().getClass(), getLogger()); NBTBase.prepareReflection(this.getServer().getClass(), getLogger()); + NBTTagCompound.prepareReflection(this.getServer().getClass(), getLogger()); + NBTTagList.prepareReflection(this.getServer().getClass(), getLogger()); + NBTTypes.prepareReflection(this.getServer().getClass(), getLogger()); + NBTUtils.prepareReflection(this.getServer().getClass(), getLogger()); } catch (Throwable e) { getLogger().log(Level.SEVERE, "Error preparing reflection objects", e); getLogger().severe("This version of NBTEditor is not compatible with this version of Bukkit"); From 9b6099b622533ee1a096d9904e5e4ff1063402d5 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Sun, 17 Apr 2022 05:52:21 +0000 Subject: [PATCH 18/27] Port NBTTagCompound to adapters Signed-off-by: Byron Marohn --- .../bukkit/mylib/reflect/NBTTagCompound.java | 161 +++++++----------- .../mylib/reflect/NBTTagCompoundAdapter.java | 63 +++++++ .../NBTTagCompoundAdapter_v1_16_R3.java | 153 +++++++++++++++++ .../NBTTagCompoundAdapter_v1_18_R1.java | 118 +++++++++++++ 4 files changed, 399 insertions(+), 96 deletions(-) create mode 100644 adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter.java create mode 100644 adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_16_R3.java create mode 100644 adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_18_R1.java diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java index 4c854462..384c7d16 100644 --- a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompound.java @@ -24,124 +24,91 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.lang.reflect.Field; -import java.lang.reflect.Method; import java.util.Map; import java.util.Map.Entry; import java.util.logging.Logger; public final class NBTTagCompound extends NBTBase { - protected static Class _nbtTagListClass; - protected static Class _nbtTagCompoundClass; - private static Method _getByte; - private static Method _getShort; - private static Method _getInt; - private static Method _getLong; - private static Method _getFloat; - private static Method _getDouble; - private static Method _getString; - private static Method _getByteArray; - private static Method _getIntArray; - private static Method _getLongArray; - private static Field _mapField; - - private static Method _tagSerializeStream; - private static Method _tagUnserializeStream; - private static Method _parseMojangson; + private static NBTTagCompoundAdapter adapter = null; public static void prepareReflection(Class serverClass, Logger logger) throws Exception { - _nbtTagCompoundClass = BukkitReflect.getMinecraftClass("NBTTagCompound"); - _nbtTagListClass = BukkitReflect.getMinecraftClass("NBTTagList"); - _getByte = _nbtTagCompoundClass.getMethod("getByte", String.class); - _getShort = _nbtTagCompoundClass.getMethod("getShort", String.class); - _getInt = _nbtTagCompoundClass.getMethod("getInt", String.class); - _getLong = _nbtTagCompoundClass.getMethod("getLong", String.class); - _getFloat = _nbtTagCompoundClass.getMethod("getFloat", String.class); - _getDouble = _nbtTagCompoundClass.getMethod("getDouble", String.class); - _getString = _nbtTagCompoundClass.getMethod("getString", String.class); - _getByteArray = _nbtTagCompoundClass.getMethod("getByteArray", String.class); - _getIntArray = _nbtTagCompoundClass.getMethod("getIntArray", String.class); - _getLongArray = _nbtTagCompoundClass.getMethod("getLongArray", String.class); - _mapField = _nbtTagCompoundClass.getDeclaredField("map"); - _mapField.setAccessible(true); - - Class_mojangsonParserClass = BukkitReflect.getMinecraftClass("MojangsonParser"); - _parseMojangson = _mojangsonParserClass.getMethod("parse", String.class); - - Class nbtCompressedStreamToolsClass = BukkitReflect.getMinecraftClass("NBTCompressedStreamTools"); - _tagSerializeStream = nbtCompressedStreamToolsClass.getMethod("a", _nbtTagCompoundClass, OutputStream.class); - _tagUnserializeStream = nbtCompressedStreamToolsClass.getMethod("a", InputStream.class); - } - - Map _map; + String packageName = serverClass.getPackage().getName(); + String version = packageName.substring(packageName.lastIndexOf('.') + 1); + + Class clazz = Class.forName("com.goncalomb.bukkit.mylib.reflect.NBTTagCompoundAdapter_" + version); + adapter = (NBTTagCompoundAdapter) clazz.getConstructor().newInstance(); + logger.info("Loaded NBTTagCompound adapter for " + version); + } + + private final Map _map; public NBTTagCompound() { - this(BukkitReflect.newInstance(_nbtTagCompoundClass)); + this(adapter.newInternalInstance()); } - @SuppressWarnings("unchecked") - NBTTagCompound(Object handle) { + public NBTTagCompound(Object handle) { super(handle); - _map = (Map) BukkitReflect.getFieldValue(handle, _mapField); + _map = adapter.getMap(handle); } public byte getByte(String key) { - return (Byte) invokeMethod(_getByte, key); + return adapter.getByte(_handle, key); } public short getShort(String key) { - return (Short) invokeMethod(_getShort, key); + ensureAdapter(adapter); + return adapter.getShort(_handle, key); } public int getInt(String key) { - return (Integer) invokeMethod(_getInt, key); + ensureAdapter(adapter); + return adapter.getInt(_handle, key); } public long getLong(String key) { - return (Long) invokeMethod(_getLong, key); + ensureAdapter(adapter); + return adapter.getLong(_handle, key); } public float getFloat(String key) { - return (Float) invokeMethod(_getFloat, key); + ensureAdapter(adapter); + return adapter.getFloat(_handle, key); } public Double getDouble(String key) { - return (Double) invokeMethod(_getDouble, key); + ensureAdapter(adapter); + return adapter.getDouble(_handle, key); } public String getString(String key) { - return (String) invokeMethod(_getString, key); + ensureAdapter(adapter); + return adapter.getString(_handle, key); } public byte[] getByteArray(String key) { - return (byte[]) invokeMethod(_getByteArray, key); + ensureAdapter(adapter); + return adapter.getByteArray(_handle, key); } public int[] getIntArray(String key) { - return (int[]) invokeMethod(_getIntArray, key); + ensureAdapter(adapter); + return adapter.getIntArray(_handle, key); } - // TagLongArray's internal field name is 'b' for some absurd reason. - // Since it isn't used, don't bother working around this -// public long[] getLongArray(String key) { -// return (long[]) invokeMethod(_getLongArray, key); -// } + public long[] getLongArray(String key) { + ensureAdapter(adapter); + return adapter.getLongArray(_handle, key); + } public NBTTagCompound getCompound(String key) { - Object obj = _map.get(key); - if (obj != null && _nbtTagCompoundClass.isInstance(obj)) { - return new NBTTagCompound(obj); - } - return null; + ensureAdapter(adapter); + return adapter.getCompound(_handle, key); } public NBTTagList getList(String key) { - Object obj = _map.get(key); - if (obj != null && _nbtTagListClass.isInstance(obj)) { - return new NBTTagList(obj); - } - return null; + ensureAdapter(adapter); + return adapter.getList(_handle, key); } public Object[] getListAsArray(String key) { @@ -197,14 +164,13 @@ public void setIntArray(String key, int[] value) { set(key, value); } - // TagLongArray's internal field name is 'b' for some absurd reason. - // Since it isn't used, don't bother working around this -// public void setLongArray(String key, long[] value) { -// set(key, value); -// } + public void setLongArray(String key, long[] value) { + set(key, value); + } private void set(String key, Object value) { - _map.put(key, NBTTypes.toInternal(value)); + ensureAdapter(adapter); + adapter.set(_handle, key, value); } public boolean hasKey(String key) { @@ -227,27 +193,27 @@ public void clear() { _map.clear(); } - public byte[] serialize() { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - serialize(out); - return out.toByteArray(); + public byte[] serialize() throws IOException { + try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { + serialize(out); + return out.toByteArray(); + } } - public void serialize(OutputStream outputStream) { - BukkitReflect.invokeMethod(null, _tagSerializeStream, _handle, outputStream); + public void serialize(OutputStream outputStream) throws IOException { + ensureAdapter(adapter); + adapter.serialize(_handle, outputStream); } - public static NBTTagCompound unserialize(byte[] data) { - ByteArrayInputStream in = new ByteArrayInputStream(data); - NBTTagCompound tag = unserialize(in); - try { - in.close(); - } catch (IOException e) { } - return tag; + public static NBTTagCompound unserialize(byte[] data) throws IOException { + try (ByteArrayInputStream in = new ByteArrayInputStream(data)) { + return unserialize(in); + } } - public static NBTTagCompound unserialize(InputStream inputStream) { - return new NBTTagCompound(BukkitReflect.invokeMethod(null, _tagUnserializeStream, inputStream)); + public static NBTTagCompound unserialize(InputStream inputStream) throws IOException { + ensureAdapter(adapter); + return adapter.unserialize(inputStream); } public void merge(NBTTagCompound other) { @@ -265,11 +231,14 @@ public NBTTagCompound clone() { * Converts a string-ified "mojangson" tag back into an NBTTagCompound * This is the opposite of toString() */ - public static NBTTagCompound fromString(String mojangson) { - return new NBTTagCompound(BukkitReflect.invokeMethod(null, _parseMojangson, mojangson)); + public static NBTTagCompound fromString(String mojangson) throws Exception { + ensureAdapter(adapter); + return adapter.fromString(mojangson); } - protected final Object invokeMethod(Method method, Object... args) { - return BukkitReflect.invokeMethod(_handle, method, args); + private static void ensureAdapter(Object adapter) throws RuntimeException { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } } } diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter.java new file mode 100644 index 00000000..fd4b8672 --- /dev/null +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter.java @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Map; + +public interface NBTTagCompoundAdapter { + Object newInternalInstance(); + + Map getMap(Object handle); + + byte getByte(Object handle, String key); + + short getShort(Object handle, String key); + + int getInt(Object handle, String key); + + long getLong(Object handle, String key); + + float getFloat(Object handle, String key); + + Double getDouble(Object handle, String key); + + String getString(Object handle, String key); + + byte[] getByteArray(Object handle, String key); + + int[] getIntArray(Object handle, String key); + + long[] getLongArray(Object handle, String key); + + NBTTagCompound getCompound(Object handle, String key); + + NBTTagList getList(Object handle, String key); + + void set(Object handle, String key, Object value); + + void serialize(Object handle, OutputStream outputStream) throws IOException; + + NBTTagCompound unserialize(InputStream inputStream) throws IOException; + + NBTTagCompound fromString(String mojangson) throws Exception; +} diff --git a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_16_R3.java b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_16_R3.java new file mode 100644 index 00000000..9a35e205 --- /dev/null +++ b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_16_R3.java @@ -0,0 +1,153 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.Map; + +public final class NBTTagCompoundAdapter_v1_16_R3 implements NBTTagCompoundAdapter { + + protected static Class _nbtTagListClass; + protected static Class _nbtTagCompoundClass; + private static Method _getByte; + private static Method _getShort; + private static Method _getInt; + private static Method _getLong; + private static Method _getFloat; + private static Method _getDouble; + private static Method _getString; + private static Method _getByteArray; + private static Method _getIntArray; + private static Method _getLongArray; + private static Field _mapField; + + private static Method _tagSerializeStream; + private static Method _tagUnserializeStream; + private static Method _parseMojangson; + + public NBTTagCompoundAdapter_v1_16_R3() throws Exception { + _nbtTagCompoundClass = BukkitReflect.getMinecraftClass("NBTTagCompound"); + _nbtTagListClass = BukkitReflect.getMinecraftClass("NBTTagList"); + _getByte = _nbtTagCompoundClass.getMethod("getByte", String.class); + _getShort = _nbtTagCompoundClass.getMethod("getShort", String.class); + _getInt = _nbtTagCompoundClass.getMethod("getInt", String.class); + _getLong = _nbtTagCompoundClass.getMethod("getLong", String.class); + _getFloat = _nbtTagCompoundClass.getMethod("getFloat", String.class); + _getDouble = _nbtTagCompoundClass.getMethod("getDouble", String.class); + _getString = _nbtTagCompoundClass.getMethod("getString", String.class); + _getByteArray = _nbtTagCompoundClass.getMethod("getByteArray", String.class); + _getIntArray = _nbtTagCompoundClass.getMethod("getIntArray", String.class); + _getLongArray = _nbtTagCompoundClass.getMethod("getLongArray", String.class); + _mapField = _nbtTagCompoundClass.getDeclaredField("map"); + _mapField.setAccessible(true); + + Class_mojangsonParserClass = BukkitReflect.getMinecraftClass("MojangsonParser"); + _parseMojangson = _mojangsonParserClass.getMethod("parse", String.class); + + Class nbtCompressedStreamToolsClass = BukkitReflect.getMinecraftClass("NBTCompressedStreamTools"); + _tagSerializeStream = nbtCompressedStreamToolsClass.getMethod("a", _nbtTagCompoundClass, OutputStream.class); + _tagUnserializeStream = nbtCompressedStreamToolsClass.getMethod("a", InputStream.class); + } + + public Object newInternalInstance() { + return BukkitReflect.newInstance(_nbtTagCompoundClass); + } + + @SuppressWarnings("unchecked") + public Map getMap(Object handle) { + return (Map) BukkitReflect.getFieldValue(handle, _mapField); + } + + public byte getByte(Object handle, String key) { + return (Byte) BukkitReflect.invokeMethod(handle, _getByte, key); + } + + public short getShort(Object handle, String key) { + return (Short) BukkitReflect.invokeMethod(handle, _getShort, key); + } + + public int getInt(Object handle, String key) { + return (Integer) BukkitReflect.invokeMethod(handle, _getInt, key); + } + + public long getLong(Object handle, String key) { + return (Long) BukkitReflect.invokeMethod(handle, _getLong, key); + } + + public float getFloat(Object handle, String key) { + return (Float) BukkitReflect.invokeMethod(handle, _getFloat, key); + } + + public Double getDouble(Object handle, String key) { + return (Double) BukkitReflect.invokeMethod(handle, _getDouble, key); + } + + public String getString(Object handle, String key) { + return (String) BukkitReflect.invokeMethod(handle, _getString, key); + } + + public byte[] getByteArray(Object handle, String key) { + return (byte[]) BukkitReflect.invokeMethod(handle, _getByteArray, key); + } + + public int[] getIntArray(Object handle, String key) { + return (int[]) BukkitReflect.invokeMethod(handle, _getIntArray, key); + } + + public long[] getLongArray(Object handle, String key) { + return (long[]) BukkitReflect.invokeMethod(handle, _getLongArray, key); + } + + public NBTTagCompound getCompound(Object handle, String key) { + Object obj = getMap(handle).get(key); + if (obj != null && _nbtTagCompoundClass.isInstance(obj)) { + return new NBTTagCompound(obj); + } + return null; + } + + public NBTTagList getList(Object handle, String key) { + Object obj = getMap(handle).get(key); + if (obj != null && _nbtTagListClass.isInstance(obj)) { + return new NBTTagList(obj); + } + return null; + } + + public void set(Object handle, String key, Object value) { + getMap(handle).put(key, NBTTypes.toInternal(value)); + } + + public void serialize(Object handle, OutputStream outputStream) throws IOException { + BukkitReflect.invokeMethod(null, _tagSerializeStream, handle, outputStream); + } + + public NBTTagCompound unserialize(InputStream inputStream) throws IOException { + return new NBTTagCompound(BukkitReflect.invokeMethod(null, _tagUnserializeStream, inputStream)); + } + + public NBTTagCompound fromString(String mojangson) throws Exception { + return new NBTTagCompound(BukkitReflect.invokeMethod(null, _parseMojangson, mojangson)); + } +} diff --git a/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_18_R1.java b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_18_R1.java new file mode 100644 index 00000000..3a8d6883 --- /dev/null +++ b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_18_R1.java @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Map; + +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.NbtIo; +import net.minecraft.nbt.TagParser; + +public final class NBTTagCompoundAdapter_v1_18_R1 implements NBTTagCompoundAdapter { + public NBTTagCompoundAdapter_v1_18_R1() { + // No setup needed but this constructor must exist + } + + public Object newInternalInstance() { + return new CompoundTag(); + } + + @SuppressWarnings("unchecked") + public Map getMap(Object handle) { + return (Map) ((Object)((CompoundTag) handle).tags); + } + + public byte getByte(Object handle, String key) { + return ((CompoundTag) handle).getByte(key); + } + + public short getShort(Object handle, String key) { + return ((CompoundTag) handle).getShort(key); + } + + public int getInt(Object handle, String key) { + return ((CompoundTag) handle).getInt(key); + } + + public long getLong(Object handle, String key) { + return ((CompoundTag) handle).getLong(key); + } + + public float getFloat(Object handle, String key) { + return ((CompoundTag) handle).getFloat(key); + } + + public Double getDouble(Object handle, String key) { + return ((CompoundTag) handle).getDouble(key); + } + + public String getString(Object handle, String key) { + return ((CompoundTag) handle).getString(key); + } + + public byte[] getByteArray(Object handle, String key) { + return ((CompoundTag) handle).getByteArray(key); + } + + public int[] getIntArray(Object handle, String key) { + return ((CompoundTag) handle).getIntArray(key); + } + + public long[] getLongArray(Object handle, String key) { + return ((CompoundTag) handle).getLongArray(key); + } + + public NBTTagCompound getCompound(Object handle, String key) { + CompoundTag obj = ((CompoundTag) handle).getCompound(key); + if (obj != null) { + return new NBTTagCompound(obj); + } + return null; + } + + public NBTTagList getList(Object handle, String key) { + Object obj = getMap(handle).get(key); + if (obj != null && obj instanceof ListTag) { + return new NBTTagList(obj); + } + return null; + } + + public void set(Object handle, String key, Object value) { + getMap(handle).put(key, NBTTypes.toInternal(value)); + } + + public void serialize(Object handle, OutputStream outputStream) throws IOException { + NbtIo.writeCompressed((CompoundTag) handle, outputStream); + } + + public NBTTagCompound unserialize(InputStream inputStream) throws IOException { + return new NBTTagCompound(NbtIo.readCompressed(inputStream)); + } + + public NBTTagCompound fromString(String mojangson) throws Exception { + return new NBTTagCompound(TagParser.parseTag(mojangson)); + } +} + From e733f2373f1a29faf6a0170c96a6e1fbd9f77aa8 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Sun, 17 Apr 2022 07:16:15 +0000 Subject: [PATCH 19/27] Port NBTTagList to adapters Signed-off-by: Byron Marohn --- .../bukkit/mylib/reflect/NBTTagList.java | 36 +++++++------ .../mylib/reflect/NBTTagListAdapter.java | 30 +++++++++++ .../reflect/NBTTagListAdapter_v1_16_R3.java | 53 +++++++++++++++++++ .../reflect/NBTTagListAdapter_v1_18_R1.java | 52 ++++++++++++++++++ 4 files changed, 154 insertions(+), 17 deletions(-) create mode 100644 adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter.java create mode 100644 adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_16_R3.java create mode 100644 adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_18_R1.java diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java index 75d68643..7d61874c 100644 --- a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagList.java @@ -19,37 +19,35 @@ package com.goncalomb.bukkit.mylib.reflect; -import java.lang.reflect.Field; import java.util.List; import java.util.logging.Logger; public final class NBTTagList extends NBTBase { - private static Field _typeField; - private static Field _listField; - protected static Class _nbtTagListClass; - List _list; + private static NBTTagListAdapter adapter = null; public static void prepareReflection(Class serverClass, Logger logger) throws Exception { - _nbtTagListClass = BukkitReflect.getMinecraftClass("NBTTagList"); - _typeField = _nbtTagListClass.getDeclaredField("type"); - _typeField.setAccessible(true); - _listField = _nbtTagListClass.getDeclaredField("list"); - _listField.setAccessible(true); + String packageName = serverClass.getPackage().getName(); + String version = packageName.substring(packageName.lastIndexOf('.') + 1); + + Class clazz = Class.forName("com.goncalomb.bukkit.mylib.reflect.NBTTagListAdapter_" + version); + adapter = (NBTTagListAdapter) clazz.getConstructor().newInstance(); + logger.info("Loaded NBTTagList adapter for " + version); } + private final List _list; + public NBTTagList() { - this(BukkitReflect.newInstance(_nbtTagListClass)); + this(adapter.newInternalInstance()); } - @SuppressWarnings("unchecked") NBTTagList(Object handle) { super(handle); - _list = (List) BukkitReflect.getFieldValue(handle, _listField); + _list = adapter.getList(handle); } public NBTTagList(Object... values) { - this(BukkitReflect.newInstance(_nbtTagListClass)); + this(adapter.newInternalInstance()); for (Object value : values) { add(value); } @@ -60,9 +58,8 @@ public Object get(int index) { } public void add(Object value) { - Object handle = NBTTypes.toInternal(value); - BukkitReflect.setFieldValue(_handle, _typeField, NBTBase.getTypeId(handle)); - _list.add(handle); + ensureAdapter(adapter); + adapter.add(_handle, value); } public Object remove(int index) { @@ -87,4 +84,9 @@ public NBTTagList clone() { return (NBTTagList) super.clone(); } + private static void ensureAdapter(Object adapter) throws RuntimeException { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } + } } diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter.java new file mode 100644 index 00000000..6e980229 --- /dev/null +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import java.util.List; + +public interface NBTTagListAdapter { + Object newInternalInstance(); + + List getList(Object handle); + + void add(Object handle, Object value); +} diff --git a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_16_R3.java b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_16_R3.java new file mode 100644 index 00000000..4683cf91 --- /dev/null +++ b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_16_R3.java @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import java.lang.reflect.Field; +import java.util.List; + +public final class NBTTagListAdapter_v1_16_R3 implements NBTTagListAdapter { + + private static Field _typeField; + private static Field _listField; + protected static Class _nbtTagListClass; + + public NBTTagListAdapter_v1_16_R3() throws Exception { + _nbtTagListClass = BukkitReflect.getMinecraftClass("NBTTagList"); + _typeField = _nbtTagListClass.getDeclaredField("type"); + _typeField.setAccessible(true); + _listField = _nbtTagListClass.getDeclaredField("list"); + _listField.setAccessible(true); + } + + public Object newInternalInstance() { + return BukkitReflect.newInstance(_nbtTagListClass); + } + + @SuppressWarnings("unchecked") + public List getList(Object handle) { + return (List) BukkitReflect.getFieldValue(handle, _listField); + } + + public void add(Object handle, Object value) { + Object addHandle = NBTTypes.toInternal(value); + BukkitReflect.setFieldValue(handle, _typeField, NBTBase.getTypeId(addHandle)); + getList(handle).add(addHandle); + } +} diff --git a/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_18_R1.java b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_18_R1.java new file mode 100644 index 00000000..e468e3fd --- /dev/null +++ b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_18_R1.java @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import java.lang.reflect.Field; +import java.util.List; + +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.Tag; + +public final class NBTTagListAdapter_v1_18_R1 implements NBTTagListAdapter { + private static Field _listField; + protected static Class _nbtTagListClass; + + public NBTTagListAdapter_v1_18_R1() throws Exception { + _nbtTagListClass = BukkitReflect.getMinecraftClass("nbt.ListTag"); + _listField = _nbtTagListClass.getDeclaredField("list"); + _listField.setAccessible(true); + } + + public Object newInternalInstance() { + return new ListTag(); + } + + @SuppressWarnings("unchecked") + public List getList(Object handle) { + return (List) BukkitReflect.getFieldValue(handle, _listField); + } + + public void add(Object handle, Object value) { + Tag addHandle = (Tag) NBTTypes.toInternal(value); + ListTag list = ((ListTag) handle); + list.add(addHandle); + } +} From 16223792a0d94e8b2a865f920841982a8982719b Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Sun, 17 Apr 2022 20:57:43 +0000 Subject: [PATCH 20/27] Port BukkitVersion to adapters Signed-off-by: Byron Marohn --- .../bukkit/mylib/reflect/BukkitVersion.java | 51 ++++++----------- .../mylib/reflect/BukkitVersionAdapter.java | 24 ++++++++ .../BukkitVersionAdapter_v1_16_R3.java | 57 +++++++++++++++++++ .../BukkitVersionAdapter_v1_18_R1.java | 54 ++++++++++++++++++ .../goncalomb/bukkit/nbteditor/NBTEditor.java | 2 + 5 files changed, 154 insertions(+), 34 deletions(-) create mode 100644 adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter.java create mode 100644 adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter_v1_16_R3.java create mode 100644 adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter_v1_18_R1.java diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java index bc6d3cf0..13b36329 100644 --- a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java @@ -1,49 +1,32 @@ package com.goncalomb.bukkit.mylib.reflect; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.bukkit.Bukkit; +import java.util.logging.Logger; public final class BukkitVersion { - private static int _minecraftVersionMajor; - private static int _minecraftVersionMinor; - - private static void getVersion() { - if (_minecraftVersionMajor == 0) { - Object server = Bukkit.getServer(); - if (server == null) { - // test environment, CraftBukkit / Minecraft not available - _minecraftVersionMajor = Integer.MAX_VALUE; - _minecraftVersionMinor = Integer.MAX_VALUE; - return; - } - try { - Object mcServer = BukkitReflect.invokeMethod(server, BukkitReflect.getCraftBukkitClass("CraftServer").getDeclaredMethod("getServer")); - String version = (String) BukkitReflect.invokeMethod(mcServer, BukkitReflect.getMinecraftClass("MinecraftServer").getDeclaredMethod("getVersion")); - Matcher matcher = Pattern.compile("^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+))?)?$").matcher(version); - if (matcher.find()) { - _minecraftVersionMajor = Integer.parseInt(matcher.group(1)); - _minecraftVersionMinor = Integer.parseInt(matcher.group(2)); - } else { - throw new RuntimeException("Invalid Minecraft version."); - } - } catch (Exception e) { - throw new RuntimeException("Error finding Minecraft version.", e); - } - } - } + private static BukkitVersionAdapter adapter = null; - private BukkitVersion() { } + public static void prepareReflection(Class serverClass, Logger logger) throws Exception { + String packageName = serverClass.getPackage().getName(); + String version = packageName.substring(packageName.lastIndexOf('.') + 1); + + Class clazz = Class.forName("com.goncalomb.bukkit.mylib.reflect.BukkitVersionAdapter_" + version); + adapter = (BukkitVersionAdapter) clazz.getConstructor().newInstance(); + logger.info("Loaded BukkitVersion adapter for " + version); + } public static boolean isVersion(int minor) { return isVersion(minor, 1); } public static boolean isVersion(int minor, int major) { - getVersion(); - return _minecraftVersionMajor > major || (_minecraftVersionMajor == major && _minecraftVersionMinor >= minor); + ensureAdapter(adapter); + return adapter.isVersion(minor, major); } + private static void ensureAdapter(Object adapter) throws RuntimeException { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } + } } diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter.java new file mode 100644 index 00000000..597f73de --- /dev/null +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter.java @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +public interface BukkitVersionAdapter { + boolean isVersion(int minor, int major); +} diff --git a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter_v1_16_R3.java b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter_v1_16_R3.java new file mode 100644 index 00000000..db5a75da --- /dev/null +++ b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter_v1_16_R3.java @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.bukkit.Bukkit; + +public class BukkitVersionAdapter_v1_16_R3 implements BukkitVersionAdapter { + private final int _minecraftVersionMajor; + private final int _minecraftVersionMinor; + + public BukkitVersionAdapter_v1_16_R3() throws Exception { + Object server = Bukkit.getServer(); + if (server == null) { + // test environment, CraftBukkit / Minecraft not available + _minecraftVersionMajor = Integer.MAX_VALUE; + _minecraftVersionMinor = Integer.MAX_VALUE; + return; + } + try { + Object mcServer = BukkitReflect.invokeMethod(server, BukkitReflect.getCraftBukkitClass("CraftServer").getDeclaredMethod("getServer")); + String version = (String) BukkitReflect.invokeMethod(mcServer, BukkitReflect.getMinecraftClass("MinecraftServer").getDeclaredMethod("getVersion")); + Matcher matcher = Pattern.compile("^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+))?)?$").matcher(version); + if (matcher.find()) { + _minecraftVersionMajor = Integer.parseInt(matcher.group(1)); + _minecraftVersionMinor = Integer.parseInt(matcher.group(2)); + } else { + throw new RuntimeException("Invalid Minecraft version: " + version); + } + } catch (Exception e) { + throw new RuntimeException("Error finding Minecraft version.", e); + } + } + + public boolean isVersion(int minor, int major) { + return _minecraftVersionMajor > major || (_minecraftVersionMajor == major && _minecraftVersionMinor >= minor); + } +} diff --git a/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter_v1_18_R1.java b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter_v1_18_R1.java new file mode 100644 index 00000000..75ca8c19 --- /dev/null +++ b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter_v1_18_R1.java @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.bukkit.Bukkit; + +import net.minecraft.SharedConstants; + +public class BukkitVersionAdapter_v1_18_R1 implements BukkitVersionAdapter { + private final int _minecraftVersionMajor; + private final int _minecraftVersionMinor; + + public BukkitVersionAdapter_v1_18_R1() throws Exception { + if (Bukkit.getServer() == null) { + // test environment, CraftBukkit / Minecraft not available + _minecraftVersionMajor = Integer.MAX_VALUE; + _minecraftVersionMinor = Integer.MAX_VALUE; + return; + } + + String version = SharedConstants.VERSION_STRING; + Matcher matcher = Pattern.compile("^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+))?)?$").matcher(version); + if (matcher.find()) { + _minecraftVersionMajor = Integer.parseInt(matcher.group(1)); + _minecraftVersionMinor = Integer.parseInt(matcher.group(2)); + } else { + throw new RuntimeException("Invalid Minecraft version: " + version); + } + } + + public boolean isVersion(int minor, int major) { + return _minecraftVersionMajor > major || (_minecraftVersionMajor == major && _minecraftVersionMinor >= minor); + } +} diff --git a/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java index 4fec391a..2f53a4b8 100644 --- a/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java +++ b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java @@ -45,6 +45,7 @@ import com.goncalomb.bukkit.customitems.items.WitherBow; import com.goncalomb.bukkit.mylib.command.MyCommandManager; import com.goncalomb.bukkit.mylib.reflect.BukkitReflect; +import com.goncalomb.bukkit.mylib.reflect.BukkitVersion; import com.goncalomb.bukkit.mylib.reflect.NBTBase; import com.goncalomb.bukkit.mylib.reflect.NBTTagCompound; import com.goncalomb.bukkit.mylib.reflect.NBTTagList; @@ -71,6 +72,7 @@ public final class NBTEditor extends JavaPlugin { public void onEnable() { try { BukkitReflect.prepareReflection(this.getServer().getClass(), getLogger()); + BukkitVersion.prepareReflection(this.getServer().getClass(), getLogger()); NBTBase.prepareReflection(this.getServer().getClass(), getLogger()); NBTTagCompound.prepareReflection(this.getServer().getClass(), getLogger()); NBTTagList.prepareReflection(this.getServer().getClass(), getLogger()); From 68cab3708b0d2a894ce12d269cfb4de1ec2d8d52 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Sun, 17 Apr 2022 21:50:57 +0000 Subject: [PATCH 21/27] Port NBTTypes to adapters Signed-off-by: Byron Marohn --- .../bukkit/mylib/reflect/NBTTypes.java | 79 +++---------- .../bukkit/mylib/reflect/NBTTypesAdapter.java | 28 +++++ .../reflect/NBTTypesAdapter_v1_16_R3.java | 103 +++++++++++++++++ .../reflect/NBTTypesAdapter_v1_18_R1.java | 106 ++++++++++++++++++ 4 files changed, 251 insertions(+), 65 deletions(-) create mode 100644 adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter.java create mode 100644 adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter_v1_16_R3.java create mode 100644 adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter_v1_18_R1.java diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java index 22ebd7cd..ebafef93 100644 --- a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypes.java @@ -19,87 +19,36 @@ package com.goncalomb.bukkit.mylib.reflect; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.util.HashMap; import java.util.logging.Logger; -import org.apache.commons.lang.ClassUtils; - public final class NBTTypes { - private static HashMap, NBTTypes> _innerTypeMap = new HashMap, NBTTypes>();; - private static HashMap, NBTTypes> _outerTypeMap = new HashMap, NBTTypes>();; - - private Class _class; - private Constructor _constructor; - private Field _data; - private Class _dataType; + private static NBTTypesAdapter adapter = null; public static void prepareReflection(Class serverClass, Logger logger) throws Exception { - registerNew("NBTTagByte"); - registerNew("NBTTagShort"); - registerNew("NBTTagInt"); - registerNew("NBTTagLong"); - registerNew("NBTTagFloat"); - registerNew("NBTTagDouble"); - registerNew("NBTTagString"); - registerNew("NBTTagByteArray"); - registerNew("NBTTagIntArray"); - // TagLongArray's internal field name is 'b' for some absurd reason. - // Since it isn't used, don't bother working around this - } + String packageName = serverClass.getPackage().getName(); + String version = packageName.substring(packageName.lastIndexOf('.') + 1); - private static void registerNew(String tagClassName) throws SecurityException, NoSuchMethodException, NoSuchFieldException { - NBTTypes handler = new NBTTypes(tagClassName); - _innerTypeMap.put((handler._dataType.isPrimitive() ? ClassUtils.primitiveToWrapper(handler._dataType) : handler._dataType), handler); - _outerTypeMap.put(handler._class, handler); + Class clazz = Class.forName("com.goncalomb.bukkit.mylib.reflect.NBTTypesAdapter_" + version); + adapter = (NBTTypesAdapter) clazz.getConstructor().newInstance(); + logger.info("Loaded NBTTypes adapter for " + version); } // Converts from MyLib tags, primitives and strings to internal Minecraft tags. public static Object toInternal(Object object) { - if (object instanceof NBTBase) { - return ((NBTBase) object)._handle; - } else { - NBTTypes handler = _innerTypeMap.get(object.getClass()); - if (handler != null) { - return handler.wrap(object); - } else { - throw new RuntimeException(object.getClass() + " is not a valid NBTTag type."); - } - } + ensureAdapter(adapter); + return adapter.toInternal(object); } // Converts internal Minecraft tags to MyLib tags, primitives and strings. public static Object fromInternal(Object object) { - if (object == null) { - return null; - } - NBTTypes handler = _outerTypeMap.get(object.getClass()); - if (handler != null) { - return handler.unwrap(object); - } else { - return NBTBase.wrap(object); - } + ensureAdapter(adapter); + return adapter.fromInternal(object); } - private NBTTypes(String tagClassName) throws SecurityException, NoSuchMethodException, NoSuchFieldException { - _class = BukkitReflect.getMinecraftClass(tagClassName); - _data = _class.getDeclaredField("data"); - _data.setAccessible(true); - _dataType = _data.getType(); - _constructor = _class.getDeclaredConstructor(_dataType); - _constructor.setAccessible(true); - } - - // Wraps primitives and strings with Minecraft tags. - private Object wrap(Object innerObject) { - return BukkitReflect.newInstance(_constructor, innerObject); - } - - // Unwraps primitives and strings from Minecraft tags. - private Object unwrap(Object tagObject) { - return BukkitReflect.getFieldValue(tagObject, _data); + private static void ensureAdapter(Object adapter) throws RuntimeException { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } } - } diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter.java new file mode 100644 index 00000000..c86ac1ec --- /dev/null +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +public interface NBTTypesAdapter { + // Converts from MyLib tags, primitives and strings to internal Minecraft tags. + public Object toInternal(Object object); + + // Converts internal Minecraft tags to MyLib tags, primitives and strings. + public Object fromInternal(Object object); +} diff --git a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter_v1_16_R3.java b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter_v1_16_R3.java new file mode 100644 index 00000000..90ee470e --- /dev/null +++ b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter_v1_16_R3.java @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.util.HashMap; + +import org.apache.commons.lang.ClassUtils; + +public final class NBTTypesAdapter_v1_16_R3 implements NBTTypesAdapter { + + private static final class NBTTypes { + private Class _class; + private Constructor _constructor; + private Field _data; + private Class _dataType; + + private NBTTypes(String tagClassName) throws SecurityException, NoSuchMethodException, NoSuchFieldException { + _class = BukkitReflect.getMinecraftClass(tagClassName); + _data = _class.getDeclaredField("data"); + _data.setAccessible(true); + _dataType = _data.getType(); + _constructor = _class.getDeclaredConstructor(_dataType); + _constructor.setAccessible(true); + } + + // Wraps primitives and strings with Minecraft tags. + private Object wrap(Object innerObject) { + return BukkitReflect.newInstance(_constructor, innerObject); + } + + // Unwraps primitives and strings from Minecraft tags. + private Object unwrap(Object tagObject) { + return BukkitReflect.getFieldValue(tagObject, _data); + } + } + + private HashMap, NBTTypes> _innerTypeMap = new HashMap, NBTTypes>();; + private HashMap, NBTTypes> _outerTypeMap = new HashMap, NBTTypes>();; + + public NBTTypesAdapter_v1_16_R3() throws Exception { + registerNew("NBTTagByte"); + registerNew("NBTTagShort"); + registerNew("NBTTagInt"); + registerNew("NBTTagLong"); + registerNew("NBTTagFloat"); + registerNew("NBTTagDouble"); + registerNew("NBTTagString"); + registerNew("NBTTagByteArray"); + registerNew("NBTTagIntArray"); + // TagLongArray's internal field name is 'b' instead of 'data' for some absurd reason. + // Since it isn't used, don't bother working around this + } + + private void registerNew(String tagClassName) throws SecurityException, NoSuchMethodException, NoSuchFieldException { + NBTTypes handler = new NBTTypes(tagClassName); + _innerTypeMap.put((handler._dataType.isPrimitive() ? ClassUtils.primitiveToWrapper(handler._dataType) : handler._dataType), handler); + _outerTypeMap.put(handler._class, handler); + } + + public Object toInternal(Object object) { + if (object instanceof NBTBase) { + return ((NBTBase) object)._handle; + } else { + NBTTypes handler = _innerTypeMap.get(object.getClass()); + if (handler != null) { + return handler.wrap(object); + } else { + throw new RuntimeException(object.getClass() + " is not a valid NBTTag type."); + } + } + } + + public Object fromInternal(Object object) { + if (object == null) { + return null; + } + NBTTypes handler = _outerTypeMap.get(object.getClass()); + if (handler != null) { + return handler.unwrap(object); + } else { + return NBTBase.wrap(object); + } + } +} diff --git a/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter_v1_18_R1.java b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter_v1_18_R1.java new file mode 100644 index 00000000..62ff3ade --- /dev/null +++ b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter_v1_18_R1.java @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import java.util.HashMap; +import java.util.function.Function; + +import org.apache.commons.lang.ClassUtils; + +import net.minecraft.nbt.ByteArrayTag; +import net.minecraft.nbt.ByteTag; +import net.minecraft.nbt.DoubleTag; +import net.minecraft.nbt.FloatTag; +import net.minecraft.nbt.IntArrayTag; +import net.minecraft.nbt.IntTag; +import net.minecraft.nbt.LongArrayTag; +import net.minecraft.nbt.LongTag; +import net.minecraft.nbt.ShortTag; +import net.minecraft.nbt.StringTag; + +public final class NBTTypesAdapter_v1_18_R1 implements NBTTypesAdapter { + + private static final class NBTTypes { + private final Function wrapFunc; + private final Function unwrapFunc; + + private NBTTypes(Function wrapFunc, Function unwrapFunc) { + this.wrapFunc = wrapFunc; + this.unwrapFunc = unwrapFunc; + } + + // Wraps primitives and strings with Minecraft tags. + private Object wrap(Object innerObject) { + return wrapFunc.apply(innerObject); + } + + // Unwraps primitives and strings from Minecraft tags. + private Object unwrap(Object tagObject) { + return unwrapFunc.apply(tagObject); + } + } + + private HashMap, NBTTypes> _innerTypeMap = new HashMap, NBTTypes>();; + private HashMap, NBTTypes> _outerTypeMap = new HashMap, NBTTypes>();; + + public NBTTypesAdapter_v1_18_R1() throws Exception { + registerNew(byte.class, ByteTag.class, (toWrap) -> ByteTag.valueOf((Byte) toWrap), (toUnwrap) -> ((ByteTag) toUnwrap).getAsByte()); + registerNew(short.class, ShortTag.class, (toWrap) -> ShortTag.valueOf((Short) toWrap), (toUnwrap) -> ((ShortTag) toUnwrap).getAsShort()); + registerNew(int.class, IntTag.class, (toWrap) -> IntTag.valueOf((Integer) toWrap), (toUnwrap) -> ((IntTag) toUnwrap).getAsInt()); + registerNew(long.class, LongTag.class, (toWrap) -> LongTag.valueOf((Long) toWrap), (toUnwrap) -> ((LongTag) toUnwrap).getAsLong()); + registerNew(float.class, FloatTag.class, (toWrap) -> FloatTag.valueOf((Float) toWrap), (toUnwrap) -> ((FloatTag) toUnwrap).getAsFloat()); + registerNew(double.class, DoubleTag.class, (toWrap) -> DoubleTag.valueOf((Double) toWrap), (toUnwrap) -> ((DoubleTag) toUnwrap).getAsDouble()); + registerNew(String.class, StringTag.class, (toWrap) -> StringTag.valueOf((String) toWrap), (toUnwrap) -> ((StringTag) toUnwrap).getAsString()); + registerNew(byte[].class, ByteArrayTag.class, (toWrap) -> new ByteArrayTag((byte[]) toWrap), (toUnwrap) -> ((ByteArrayTag) toUnwrap).getAsByteArray()); + registerNew(int[].class, IntArrayTag.class, (toWrap) -> new IntArrayTag((int[]) toWrap), (toUnwrap) -> ((IntArrayTag) toUnwrap).getAsIntArray()); + registerNew(long[].class, LongArrayTag.class, (toWrap) -> new LongArrayTag((long[]) toWrap), (toUnwrap) -> ((LongArrayTag) toUnwrap).getAsLongArray()); + } + + private void registerNew(Class innerClass, Class wrapperClass, Function wrapFunc, Function unwrapFunc) { + NBTTypes handler = new NBTTypes(wrapFunc, unwrapFunc); + _innerTypeMap.put((innerClass.isPrimitive() ? ClassUtils.primitiveToWrapper(innerClass) : innerClass), handler); + _outerTypeMap.put(wrapperClass, handler); + } + + public Object toInternal(Object object) { + if (object instanceof NBTBase) { + return ((NBTBase) object)._handle; + } else { + NBTTypes handler = _innerTypeMap.get(object.getClass()); + if (handler != null) { + return handler.wrap(object); + } else { + throw new RuntimeException(object.getClass() + " is not a valid NBTTag type."); + } + } + } + + public Object fromInternal(Object object) { + if (object == null) { + return null; + } + NBTTypes handler = _outerTypeMap.get(object.getClass()); + if (handler != null) { + return handler.unwrap(object); + } else { + return NBTBase.wrap(object); + } + } +} From 0bf14b7ee0c1cea076fcc52553fd4b7c2fd14903 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Sun, 17 Apr 2022 22:25:14 +0000 Subject: [PATCH 22/27] Port BukkitReflect to adapters Signed-off-by: Byron Marohn --- .../bukkit/mylib/reflect/BukkitReflect.java | 154 ++------------- .../mylib/reflect/BukkitReflectAdapter.java | 30 +++ .../bukkit/mylib/reflect/NBTBase.java | 17 +- .../BukkitReflectAdapter_v1_16_R3.java | 180 ++++++++++++++++++ .../BukkitVersionAdapter_v1_16_R3.java | 4 +- .../reflect/NBTBaseAdapter_v1_16_R3.java | 12 +- .../NBTTagCompoundAdapter_v1_16_R3.java | 38 ++-- .../reflect/NBTTagListAdapter_v1_16_R3.java | 8 +- .../reflect/NBTTypesAdapter_v1_16_R3.java | 6 +- .../reflect/NBTUtilsAdapter_v1_16_R3.java | 64 +++---- .../BukkitReflectAdapter_v1_18_R1.java | 52 +++++ .../reflect/NBTTagListAdapter_v1_18_R1.java | 10 +- 12 files changed, 358 insertions(+), 217 deletions(-) create mode 100644 adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflectAdapter.java create mode 100644 adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflectAdapter_v1_16_R3.java create mode 100644 adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflectAdapter_v1_18_R1.java diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java index 2fcc22c0..463d11dc 100644 --- a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java @@ -19,166 +19,42 @@ package com.goncalomb.bukkit.mylib.reflect; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.HashMap; import java.util.logging.Logger; -import org.bukkit.Bukkit; import org.bukkit.command.SimpleCommandMap; -import com.google.gson.JsonParseException; - public final class BukkitReflect { - private final static class CachedPackage { - - private String _packageName; - private HashMap> _cache = new HashMap>(); - - public CachedPackage(String packageName) { - _packageName = packageName; - } - - public Class getClass(String className) { - Class clazz = _cache.get(className); - if (clazz == null) { - try { - clazz = this.getClass().getClassLoader().loadClass(_packageName + "." + className); - } catch (ClassNotFoundException e) { - throw new RuntimeException("Cannot find class " + _packageName + "." + className + ".", e); - } - _cache.put(className, clazz); - } - return clazz; - } - - } - - private static boolean _isPrepared = false; - - private static CachedPackage _craftBukkitPackage; - private static CachedPackage _minecraftPackage; - - private static Method _getCommandMap; - private static Method _ChatSerializer_a_serialize; - private static Method _ChatSerializer_a_unserialize; - private static Constructor _ChatComponentTextClass_contructor; + private static BukkitReflectAdapter adapter = null; public static void prepareReflection(Class serverClass, Logger logger) throws Exception { - if (!_isPrepared) { - Class craftServerClass = Bukkit.getServer().getClass(); - _craftBukkitPackage = new CachedPackage(craftServerClass.getPackage().getName()); - try { - Method getHandle = craftServerClass.getMethod("getHandle"); - _minecraftPackage = new CachedPackage(getHandle.getReturnType().getPackage().getName()); - _getCommandMap = craftServerClass.getMethod("getCommandMap"); - } catch (NoSuchMethodException e) { - throw new RuntimeException("Cannot find the required methods on the server class.", e); - } - - _isPrepared = true; + String packageName = serverClass.getPackage().getName(); + String version = packageName.substring(packageName.lastIndexOf('.') + 1); - try { - Class iChatBaseComponentClass = getMinecraftClass("IChatBaseComponent"); - Class chatSerializerClass = getMinecraftClass("IChatBaseComponent$ChatSerializer"); - _ChatSerializer_a_serialize = chatSerializerClass.getMethod("a", iChatBaseComponentClass); - _ChatSerializer_a_unserialize = chatSerializerClass.getMethod("a", String.class); - Class chatComponentTextClass = getMinecraftClass("ChatComponentText"); - _ChatComponentTextClass_contructor = chatComponentTextClass.getConstructor(String.class); - } catch (NoSuchMethodException e) { - throw new RuntimeException("Error while preparing ChatSerializer.", e); - } - } + Class clazz = Class.forName("com.goncalomb.bukkit.mylib.reflect.BukkitReflectAdapter_" + version); + adapter = (BukkitReflectAdapter) clazz.getConstructor().newInstance(); + logger.info("Loaded BukkitReflect adapter for " + version); } - private BukkitReflect() { } - - public static Class getCraftBukkitClass(String className) { - return _craftBukkitPackage.getClass(className); - } - - public static Class getMinecraftClass(String className) { - return _minecraftPackage.getClass(className); - } public static SimpleCommandMap getCommandMap() { - return (SimpleCommandMap) invokeMethod(Bukkit.getServer(), _getCommandMap); + ensureAdapter(adapter); + return adapter.getCommandMap(); } public static boolean isValidRawJSON(String text) { - try { - _ChatSerializer_a_unserialize.invoke(null, text); - return true; - } catch (InvocationTargetException e) { - if (e.getTargetException() instanceof JsonParseException) { - return false; - } - throw new RuntimeException(e); - } catch (IllegalAccessException | IllegalArgumentException e) { - throw new RuntimeException(e); - } + ensureAdapter(adapter); + return adapter.isValidRawJSON(text); } public static String textToRawJSON(String text) { - try { - return (String) _ChatSerializer_a_serialize.invoke(null, _ChatComponentTextClass_contructor.newInstance(text)); - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException - | InstantiationException e) { - throw new RuntimeException(e); - } - } - - // Other helper methods... - - static Object invokeConstuctor(Constructor constuctor, Object... args) { - try { - return constuctor.newInstance(args); - } catch (Exception e) { - throw new RuntimeException("Error while invoking " + constuctor.getName() + ".", e); - } - } - - static Object invokeMethod(Object object, Method method, Object... args) { - try { - return method.invoke(object, args); - } catch (Exception e) { - throw new RuntimeException("Error while invoking " + method.getName() + ".", e); - } - } - - static Object getFieldValue(Object object, Field field) { - try { - return field.get(object); - } catch (Exception e) { - throw new RuntimeException("Error while getting field value " + field.getName() + " of class " + field.getDeclaringClass().getName() + ".", e); - } - } - - static void setFieldValue(Object object, Field field, Object value) { - try { - field.set(object, value); - } catch (Exception e) { - throw new RuntimeException("Error while setting field value " + field.getName() + " of class " + field.getDeclaringClass().getName() + ".", e); - } + ensureAdapter(adapter); + return adapter.textToRawJSON(text); } - static Object newInstance(Class clazz) { - try { - return clazz.newInstance(); - } catch (Exception e) { - throw new RuntimeException("Error creating instance of " + clazz.getName() + ".", e); + private static void ensureAdapter(Object adapter) throws RuntimeException { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); } } - - static Object newInstance(Constructor contructor, Object... initargs) { - try { - return contructor.newInstance(initargs); - } catch (Exception e) { - throw new RuntimeException("Error creating instance of " + contructor.getDeclaringClass().getName() + ".", e); - } - } - } diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflectAdapter.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflectAdapter.java new file mode 100644 index 00000000..952d41d4 --- /dev/null +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflectAdapter.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import org.bukkit.command.SimpleCommandMap; + +public interface BukkitReflectAdapter { + SimpleCommandMap getCommandMap(); + + boolean isValidRawJSON(String text); + + String textToRawJSON(String text); +} diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java index 3c82344b..7bebb824 100644 --- a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBase.java @@ -39,25 +39,19 @@ public static void prepareReflection(Class serverClass, Logger logger) throws // Wraps any Minecraft tags in MyLib tags. // Primitives and strings are wrapped with NBTBase. protected static final NBTBase wrap(Object object) { - if (adapter == null) { - throw new RuntimeException("Version adapter is not loaded"); - } + ensureAdapter(adapter); return adapter.wrap(object); } // Helper method for NBTTagCompoundWrapper.merge(). // Clones any internal Minecraft tags. protected static final Object clone(Object nbtBaseObject) { - if (adapter == null) { - throw new RuntimeException("Version adapter is not loaded"); - } + ensureAdapter(adapter); return adapter.clone(nbtBaseObject); } static byte getTypeId(Object handle) { - if (adapter == null) { - throw new RuntimeException("Version adapter is not loaded"); - } + ensureAdapter(adapter); return adapter.getTypeId(handle); } @@ -74,4 +68,9 @@ public String toString() { return _handle.toString(); } + private static void ensureAdapter(Object adapter) throws RuntimeException { + if (adapter == null) { + throw new RuntimeException("Version adapter is not loaded"); + } + } } diff --git a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflectAdapter_v1_16_R3.java b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflectAdapter_v1_16_R3.java new file mode 100644 index 00000000..a5137765 --- /dev/null +++ b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflectAdapter_v1_16_R3.java @@ -0,0 +1,180 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.HashMap; + +import com.google.gson.JsonParseException; + +import org.bukkit.Bukkit; +import org.bukkit.command.SimpleCommandMap; + +public final class BukkitReflectAdapter_v1_16_R3 implements BukkitReflectAdapter { + + private final static class CachedPackage { + + private String _packageName; + private HashMap> _cache = new HashMap>(); + + public CachedPackage(String packageName) { + _packageName = packageName; + } + + public Class getClass(String className) { + Class clazz = _cache.get(className); + if (clazz == null) { + try { + clazz = this.getClass().getClassLoader().loadClass(_packageName + "." + className); + } catch (ClassNotFoundException e) { + throw new RuntimeException("Cannot find class " + _packageName + "." + className + ".", e); + } + _cache.put(className, clazz); + } + return clazz; + } + } + + private static boolean _isPrepared = false; + + private static CachedPackage _craftBukkitPackage; + private static CachedPackage _minecraftPackage; + + private static Method _getCommandMap; + private static Method _ChatSerializer_a_serialize; + private static Method _ChatSerializer_a_unserialize; + private static Constructor _ChatComponentTextClass_contructor; + + public BukkitReflectAdapter_v1_16_R3() throws Exception { + if (!_isPrepared) { + Class craftServerClass = Bukkit.getServer().getClass(); + _craftBukkitPackage = new CachedPackage(craftServerClass.getPackage().getName()); + try { + Method getHandle = craftServerClass.getMethod("getHandle"); + _minecraftPackage = new CachedPackage(getHandle.getReturnType().getPackage().getName()); + _getCommandMap = craftServerClass.getMethod("getCommandMap"); + } catch (NoSuchMethodException e) { + throw new RuntimeException("Cannot find the required methods on the server class.", e); + } + + _isPrepared = true; + + try { + Class iChatBaseComponentClass = getMinecraftClass("IChatBaseComponent"); + Class chatSerializerClass = getMinecraftClass("IChatBaseComponent$ChatSerializer"); + _ChatSerializer_a_serialize = chatSerializerClass.getMethod("a", iChatBaseComponentClass); + _ChatSerializer_a_unserialize = chatSerializerClass.getMethod("a", String.class); + Class chatComponentTextClass = getMinecraftClass("ChatComponentText"); + _ChatComponentTextClass_contructor = chatComponentTextClass.getConstructor(String.class); + } catch (NoSuchMethodException e) { + throw new RuntimeException("Error while preparing ChatSerializer.", e); + } + } + } + + public static Class getCraftBukkitClass(String className) { + return _craftBukkitPackage.getClass(className); + } + + public static Class getMinecraftClass(String className) { + return _minecraftPackage.getClass(className); + } + + public SimpleCommandMap getCommandMap() { + return (SimpleCommandMap) invokeMethod(Bukkit.getServer(), _getCommandMap); + } + + public boolean isValidRawJSON(String text) { + try { + _ChatSerializer_a_unserialize.invoke(null, text); + return true; + } catch (InvocationTargetException e) { + if (e.getTargetException() instanceof JsonParseException) { + return false; + } + throw new RuntimeException(e); + } catch (IllegalAccessException | IllegalArgumentException e) { + throw new RuntimeException(e); + } + } + + public String textToRawJSON(String text) { + try { + return (String) _ChatSerializer_a_serialize.invoke(null, _ChatComponentTextClass_contructor.newInstance(text)); + } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException + | InstantiationException e) { + throw new RuntimeException(e); + } + } + + // Other helper methods... + + static Object invokeConstuctor(Constructor constuctor, Object... args) { + try { + return constuctor.newInstance(args); + } catch (Exception e) { + throw new RuntimeException("Error while invoking " + constuctor.getName() + ".", e); + } + } + + static Object invokeMethod(Object object, Method method, Object... args) { + try { + return method.invoke(object, args); + } catch (Exception e) { + throw new RuntimeException("Error while invoking " + method.getName() + ".", e); + } + } + + static Object getFieldValue(Object object, Field field) { + try { + return field.get(object); + } catch (Exception e) { + throw new RuntimeException("Error while getting field value " + field.getName() + " of class " + field.getDeclaringClass().getName() + ".", e); + } + } + + static void setFieldValue(Object object, Field field, Object value) { + try { + field.set(object, value); + } catch (Exception e) { + throw new RuntimeException("Error while setting field value " + field.getName() + " of class " + field.getDeclaringClass().getName() + ".", e); + } + } + + static Object newInstance(Class clazz) { + try { + return clazz.newInstance(); + } catch (Exception e) { + throw new RuntimeException("Error creating instance of " + clazz.getName() + ".", e); + } + } + + static Object newInstance(Constructor contructor, Object... initargs) { + try { + return contructor.newInstance(initargs); + } catch (Exception e) { + throw new RuntimeException("Error creating instance of " + contructor.getDeclaringClass().getName() + ".", e); + } + } + +} diff --git a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter_v1_16_R3.java b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter_v1_16_R3.java index db5a75da..3682dd2c 100644 --- a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter_v1_16_R3.java +++ b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter_v1_16_R3.java @@ -37,8 +37,8 @@ public BukkitVersionAdapter_v1_16_R3() throws Exception { return; } try { - Object mcServer = BukkitReflect.invokeMethod(server, BukkitReflect.getCraftBukkitClass("CraftServer").getDeclaredMethod("getServer")); - String version = (String) BukkitReflect.invokeMethod(mcServer, BukkitReflect.getMinecraftClass("MinecraftServer").getDeclaredMethod("getVersion")); + Object mcServer = BukkitReflectAdapter_v1_16_R3.invokeMethod(server, BukkitReflectAdapter_v1_16_R3.getCraftBukkitClass("CraftServer").getDeclaredMethod("getServer")); + String version = (String) BukkitReflectAdapter_v1_16_R3.invokeMethod(mcServer, BukkitReflectAdapter_v1_16_R3.getMinecraftClass("MinecraftServer").getDeclaredMethod("getVersion")); Matcher matcher = Pattern.compile("^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+))?)?$").matcher(version); if (matcher.find()) { _minecraftVersionMajor = Integer.parseInt(matcher.group(1)); diff --git a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter_v1_16_R3.java b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter_v1_16_R3.java index 347b1f76..08aab3f4 100644 --- a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter_v1_16_R3.java +++ b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter_v1_16_R3.java @@ -32,10 +32,10 @@ public class NBTBaseAdapter_v1_16_R3 implements NBTBaseAdapter { private static Method _clone; public NBTBaseAdapter_v1_16_R3() { - _nbtBaseClass = BukkitReflect.getMinecraftClass("NBTBase"); - _nbtTagCompoundClass = BukkitReflect.getMinecraftClass("NBTTagCompound"); - _nbtTagListClass = BukkitReflect.getMinecraftClass("NBTTagList"); - _nbtTagStringClass = BukkitReflect.getMinecraftClass("NBTTagString"); + _nbtBaseClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("NBTBase"); + _nbtTagCompoundClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("NBTTagCompound"); + _nbtTagListClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("NBTTagList"); + _nbtTagStringClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("NBTTagString"); try { _getTypeId = _nbtBaseClass.getMethod("getTypeId"); _clone = _nbtBaseClass.getMethod("clone"); @@ -59,11 +59,11 @@ public NBTBase wrap(Object object) { @Override public Object clone(Object nbtBaseObject) { - return BukkitReflect.invokeMethod(nbtBaseObject, _clone); + return BukkitReflectAdapter_v1_16_R3.invokeMethod(nbtBaseObject, _clone); } @Override public byte getTypeId(Object handle) { - return (Byte) BukkitReflect.invokeMethod(handle, _getTypeId); + return (Byte) BukkitReflectAdapter_v1_16_R3.invokeMethod(handle, _getTypeId); } } diff --git a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_16_R3.java b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_16_R3.java index 9a35e205..e6584a62 100644 --- a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_16_R3.java +++ b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_16_R3.java @@ -47,8 +47,8 @@ public final class NBTTagCompoundAdapter_v1_16_R3 implements NBTTagCompoundAdapt private static Method _parseMojangson; public NBTTagCompoundAdapter_v1_16_R3() throws Exception { - _nbtTagCompoundClass = BukkitReflect.getMinecraftClass("NBTTagCompound"); - _nbtTagListClass = BukkitReflect.getMinecraftClass("NBTTagList"); + _nbtTagCompoundClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("NBTTagCompound"); + _nbtTagListClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("NBTTagList"); _getByte = _nbtTagCompoundClass.getMethod("getByte", String.class); _getShort = _nbtTagCompoundClass.getMethod("getShort", String.class); _getInt = _nbtTagCompoundClass.getMethod("getInt", String.class); @@ -62,61 +62,61 @@ public NBTTagCompoundAdapter_v1_16_R3() throws Exception { _mapField = _nbtTagCompoundClass.getDeclaredField("map"); _mapField.setAccessible(true); - Class_mojangsonParserClass = BukkitReflect.getMinecraftClass("MojangsonParser"); + Class_mojangsonParserClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("MojangsonParser"); _parseMojangson = _mojangsonParserClass.getMethod("parse", String.class); - Class nbtCompressedStreamToolsClass = BukkitReflect.getMinecraftClass("NBTCompressedStreamTools"); + Class nbtCompressedStreamToolsClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("NBTCompressedStreamTools"); _tagSerializeStream = nbtCompressedStreamToolsClass.getMethod("a", _nbtTagCompoundClass, OutputStream.class); _tagUnserializeStream = nbtCompressedStreamToolsClass.getMethod("a", InputStream.class); } public Object newInternalInstance() { - return BukkitReflect.newInstance(_nbtTagCompoundClass); + return BukkitReflectAdapter_v1_16_R3.newInstance(_nbtTagCompoundClass); } @SuppressWarnings("unchecked") public Map getMap(Object handle) { - return (Map) BukkitReflect.getFieldValue(handle, _mapField); + return (Map) BukkitReflectAdapter_v1_16_R3.getFieldValue(handle, _mapField); } public byte getByte(Object handle, String key) { - return (Byte) BukkitReflect.invokeMethod(handle, _getByte, key); + return (Byte) BukkitReflectAdapter_v1_16_R3.invokeMethod(handle, _getByte, key); } public short getShort(Object handle, String key) { - return (Short) BukkitReflect.invokeMethod(handle, _getShort, key); + return (Short) BukkitReflectAdapter_v1_16_R3.invokeMethod(handle, _getShort, key); } public int getInt(Object handle, String key) { - return (Integer) BukkitReflect.invokeMethod(handle, _getInt, key); + return (Integer) BukkitReflectAdapter_v1_16_R3.invokeMethod(handle, _getInt, key); } public long getLong(Object handle, String key) { - return (Long) BukkitReflect.invokeMethod(handle, _getLong, key); + return (Long) BukkitReflectAdapter_v1_16_R3.invokeMethod(handle, _getLong, key); } public float getFloat(Object handle, String key) { - return (Float) BukkitReflect.invokeMethod(handle, _getFloat, key); + return (Float) BukkitReflectAdapter_v1_16_R3.invokeMethod(handle, _getFloat, key); } public Double getDouble(Object handle, String key) { - return (Double) BukkitReflect.invokeMethod(handle, _getDouble, key); + return (Double) BukkitReflectAdapter_v1_16_R3.invokeMethod(handle, _getDouble, key); } public String getString(Object handle, String key) { - return (String) BukkitReflect.invokeMethod(handle, _getString, key); + return (String) BukkitReflectAdapter_v1_16_R3.invokeMethod(handle, _getString, key); } public byte[] getByteArray(Object handle, String key) { - return (byte[]) BukkitReflect.invokeMethod(handle, _getByteArray, key); + return (byte[]) BukkitReflectAdapter_v1_16_R3.invokeMethod(handle, _getByteArray, key); } public int[] getIntArray(Object handle, String key) { - return (int[]) BukkitReflect.invokeMethod(handle, _getIntArray, key); + return (int[]) BukkitReflectAdapter_v1_16_R3.invokeMethod(handle, _getIntArray, key); } public long[] getLongArray(Object handle, String key) { - return (long[]) BukkitReflect.invokeMethod(handle, _getLongArray, key); + return (long[]) BukkitReflectAdapter_v1_16_R3.invokeMethod(handle, _getLongArray, key); } public NBTTagCompound getCompound(Object handle, String key) { @@ -140,14 +140,14 @@ public void set(Object handle, String key, Object value) { } public void serialize(Object handle, OutputStream outputStream) throws IOException { - BukkitReflect.invokeMethod(null, _tagSerializeStream, handle, outputStream); + BukkitReflectAdapter_v1_16_R3.invokeMethod(null, _tagSerializeStream, handle, outputStream); } public NBTTagCompound unserialize(InputStream inputStream) throws IOException { - return new NBTTagCompound(BukkitReflect.invokeMethod(null, _tagUnserializeStream, inputStream)); + return new NBTTagCompound(BukkitReflectAdapter_v1_16_R3.invokeMethod(null, _tagUnserializeStream, inputStream)); } public NBTTagCompound fromString(String mojangson) throws Exception { - return new NBTTagCompound(BukkitReflect.invokeMethod(null, _parseMojangson, mojangson)); + return new NBTTagCompound(BukkitReflectAdapter_v1_16_R3.invokeMethod(null, _parseMojangson, mojangson)); } } diff --git a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_16_R3.java b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_16_R3.java index 4683cf91..de0bfa44 100644 --- a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_16_R3.java +++ b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_16_R3.java @@ -29,7 +29,7 @@ public final class NBTTagListAdapter_v1_16_R3 implements NBTTagListAdapter { protected static Class _nbtTagListClass; public NBTTagListAdapter_v1_16_R3() throws Exception { - _nbtTagListClass = BukkitReflect.getMinecraftClass("NBTTagList"); + _nbtTagListClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("NBTTagList"); _typeField = _nbtTagListClass.getDeclaredField("type"); _typeField.setAccessible(true); _listField = _nbtTagListClass.getDeclaredField("list"); @@ -37,17 +37,17 @@ public NBTTagListAdapter_v1_16_R3() throws Exception { } public Object newInternalInstance() { - return BukkitReflect.newInstance(_nbtTagListClass); + return BukkitReflectAdapter_v1_16_R3.newInstance(_nbtTagListClass); } @SuppressWarnings("unchecked") public List getList(Object handle) { - return (List) BukkitReflect.getFieldValue(handle, _listField); + return (List) BukkitReflectAdapter_v1_16_R3.getFieldValue(handle, _listField); } public void add(Object handle, Object value) { Object addHandle = NBTTypes.toInternal(value); - BukkitReflect.setFieldValue(handle, _typeField, NBTBase.getTypeId(addHandle)); + BukkitReflectAdapter_v1_16_R3.setFieldValue(handle, _typeField, NBTBase.getTypeId(addHandle)); getList(handle).add(addHandle); } } diff --git a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter_v1_16_R3.java b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter_v1_16_R3.java index 90ee470e..38cb90a7 100644 --- a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter_v1_16_R3.java +++ b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter_v1_16_R3.java @@ -34,7 +34,7 @@ private static final class NBTTypes { private Class _dataType; private NBTTypes(String tagClassName) throws SecurityException, NoSuchMethodException, NoSuchFieldException { - _class = BukkitReflect.getMinecraftClass(tagClassName); + _class = BukkitReflectAdapter_v1_16_R3.getMinecraftClass(tagClassName); _data = _class.getDeclaredField("data"); _data.setAccessible(true); _dataType = _data.getType(); @@ -44,12 +44,12 @@ private NBTTypes(String tagClassName) throws SecurityException, NoSuchMethodExce // Wraps primitives and strings with Minecraft tags. private Object wrap(Object innerObject) { - return BukkitReflect.newInstance(_constructor, innerObject); + return BukkitReflectAdapter_v1_16_R3.newInstance(_constructor, innerObject); } // Unwraps primitives and strings from Minecraft tags. private Object unwrap(Object tagObject) { - return BukkitReflect.getFieldValue(tagObject, _data); + return BukkitReflectAdapter_v1_16_R3.getFieldValue(tagObject, _data); } } diff --git a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_16_R3.java b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_16_R3.java index d8851627..b0e13169 100644 --- a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_16_R3.java +++ b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_16_R3.java @@ -68,95 +68,95 @@ public final class NBTUtilsAdapter_v1_16_R3 implements NBTUtilsAdapter { private Method _EntityTypes_a; // Spawn an entity from a NBTCompound. public NBTUtilsAdapter_v1_16_R3() throws SecurityException, NoSuchMethodException, NoSuchFieldException { - Class nbtTagCompoundClass = BukkitReflect.getMinecraftClass("NBTTagCompound"); + Class nbtTagCompoundClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("NBTTagCompound"); - Class minecraftItemStackClass = BukkitReflect.getMinecraftClass("ItemStack"); + Class minecraftItemStackClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("ItemStack"); _ItemStack_nbtConstructor = minecraftItemStackClass.getDeclaredConstructor(nbtTagCompoundClass); _ItemStack_nbtConstructor.setAccessible(true); _ItemStack_save = minecraftItemStackClass.getMethod("save", nbtTagCompoundClass); _ItemStack_getTag = minecraftItemStackClass.getMethod("getTag"); _ItemStack_setTag = minecraftItemStackClass.getMethod("setTag", nbtTagCompoundClass); - Class craftItemStackClass = BukkitReflect.getCraftBukkitClass("inventory.CraftItemStack"); + Class craftItemStackClass = BukkitReflectAdapter_v1_16_R3.getCraftBukkitClass("inventory.CraftItemStack"); _CraftItemStack_asCraftMirror = craftItemStackClass.getMethod("asCraftMirror", minecraftItemStackClass); _CraftItemStack_asCraftCopy = craftItemStackClass.getMethod("asCraftCopy", ItemStack.class); _CraftItemStack_handle = craftItemStackClass.getDeclaredField("handle"); _CraftItemStack_handle.setAccessible(true); - Class minecraftEntityClass = BukkitReflect.getMinecraftClass("Entity"); + Class minecraftEntityClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("Entity"); _Entity_save = minecraftEntityClass.getMethod("save", nbtTagCompoundClass); _Entity_getBukkitEntity = minecraftEntityClass.getMethod("getBukkitEntity"); _Entity_setPosition = minecraftEntityClass.getMethod("setPosition", double.class, double.class, double.class); - Class craftEntityClass = BukkitReflect.getCraftBukkitClass("entity.CraftEntity"); + Class craftEntityClass = BukkitReflectAdapter_v1_16_R3.getCraftBukkitClass("entity.CraftEntity"); _CraftEntity_getHandle = craftEntityClass.getMethod("getHandle"); - Class minecraftTileEntityClass = BukkitReflect.getMinecraftClass("TileEntity"); + Class minecraftTileEntityClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("TileEntity"); _TileEntity_save = minecraftTileEntityClass.getMethod("save", nbtTagCompoundClass); - Class minecraftIBlockDataClass = BukkitReflect.getMinecraftClass("IBlockData"); + Class minecraftIBlockDataClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("IBlockData"); _TileEntity_load = minecraftTileEntityClass.getMethod("load", minecraftIBlockDataClass, nbtTagCompoundClass); - Class craftWorldClass = BukkitReflect.getCraftBukkitClass("CraftWorld"); + Class craftWorldClass = BukkitReflectAdapter_v1_16_R3.getCraftBukkitClass("CraftWorld"); _CraftWorld_getHandle = craftWorldClass.getMethod("getHandle"); - Class minecraftBlockPositionClass = BukkitReflect.getMinecraftClass("BlockPosition"); + Class minecraftBlockPositionClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("BlockPosition"); _BlockPosition_constructor = minecraftBlockPositionClass.getConstructor(int.class, int.class, int.class); - Class minecraftWorldClass = BukkitReflect.getMinecraftClass("World"); + Class minecraftWorldClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("World"); _World_getTileEntity = minecraftWorldClass.getMethod("getTileEntity", minecraftBlockPositionClass); - Class minecraftWorldServerClass = BukkitReflect.getMinecraftClass("WorldServer"); + Class minecraftWorldServerClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("WorldServer"); _WorldServer_addAllEntitiesSafely = minecraftWorldServerClass.getMethod("addAllEntitiesSafely", minecraftEntityClass); - Class minecraftEntityTypesClass = BukkitReflect.getMinecraftClass("EntityTypes"); + Class minecraftEntityTypesClass = BukkitReflectAdapter_v1_16_R3.getMinecraftClass("EntityTypes"); _EntityTypes_a = minecraftEntityTypesClass.getMethod("a", nbtTagCompoundClass, minecraftWorldClass, Function.class); } public ItemStack itemStackFromNBTData(NBTTagCompound data) { - return (ItemStack) BukkitReflect.invokeMethod(null, _CraftItemStack_asCraftMirror, BukkitReflect.invokeConstuctor(_ItemStack_nbtConstructor, data._handle)); + return (ItemStack) BukkitReflectAdapter_v1_16_R3.invokeMethod(null, _CraftItemStack_asCraftMirror, BukkitReflectAdapter_v1_16_R3.invokeConstuctor(_ItemStack_nbtConstructor, data._handle)); } public NBTTagCompound itemStackToNBTData(ItemStack stack) { NBTTagCompound data = new NBTTagCompound(); - Object handle = BukkitReflect.getFieldValue(stack, _CraftItemStack_handle); - BukkitReflect.invokeMethod(handle, _ItemStack_save, data._handle); + Object handle = BukkitReflectAdapter_v1_16_R3.getFieldValue(stack, _CraftItemStack_handle); + BukkitReflectAdapter_v1_16_R3.invokeMethod(handle, _ItemStack_save, data._handle); return data; } public Entity spawnEntity(NBTTagCompound data, Location location) { - Object worldHandle = BukkitReflect.invokeMethod(location.getWorld(), _CraftWorld_getHandle); + Object worldHandle = BukkitReflectAdapter_v1_16_R3.invokeMethod(location.getWorld(), _CraftWorld_getHandle); // This function will be applied to each summoned entity (including passengers) to set their location Function entityFunction = (Object entity) -> { - BukkitReflect.invokeMethod(entity, _Entity_setPosition, location.getX(), location.getY(), location.getZ()); + BukkitReflectAdapter_v1_16_R3.invokeMethod(entity, _Entity_setPosition, location.getX(), location.getY(), location.getZ()); return entity; }; // Summon the entity, and for each entity summoned (including passengers) run the above function - Object entityHandle = BukkitReflect.invokeMethod(null, _EntityTypes_a, data._handle, worldHandle, entityFunction); + Object entityHandle = BukkitReflectAdapter_v1_16_R3.invokeMethod(null, _EntityTypes_a, data._handle, worldHandle, entityFunction); if (entityHandle == null) { return null; } - BukkitReflect.invokeMethod(worldHandle, _WorldServer_addAllEntitiesSafely, entityHandle); - return (Entity) BukkitReflect.invokeMethod(entityHandle, _Entity_getBukkitEntity); + BukkitReflectAdapter_v1_16_R3.invokeMethod(worldHandle, _WorldServer_addAllEntitiesSafely, entityHandle); + return (Entity) BukkitReflectAdapter_v1_16_R3.invokeMethod(entityHandle, _Entity_getBukkitEntity); } public NBTTagCompound getEntityNBTData(Entity entity) { - Object entityHandle = BukkitReflect.invokeMethod(entity, _CraftEntity_getHandle); + Object entityHandle = BukkitReflectAdapter_v1_16_R3.invokeMethod(entity, _CraftEntity_getHandle); NBTTagCompound data = new NBTTagCompound(); - BukkitReflect.invokeMethod(entityHandle, _Entity_save, data._handle); + BukkitReflectAdapter_v1_16_R3.invokeMethod(entityHandle, _Entity_save, data._handle); return data; } private Object getTileEntity(Block block) { - Object worldHandle = BukkitReflect.invokeMethod(block.getWorld(), _CraftWorld_getHandle); - Object pos = BukkitReflect.invokeConstuctor(_BlockPosition_constructor, block.getX(), block.getY(), block.getZ()); - return BukkitReflect.invokeMethod(worldHandle, _World_getTileEntity, pos); + Object worldHandle = BukkitReflectAdapter_v1_16_R3.invokeMethod(block.getWorld(), _CraftWorld_getHandle); + Object pos = BukkitReflectAdapter_v1_16_R3.invokeConstuctor(_BlockPosition_constructor, block.getX(), block.getY(), block.getZ()); + return BukkitReflectAdapter_v1_16_R3.invokeMethod(worldHandle, _World_getTileEntity, pos); } public NBTTagCompound getTileEntityNBTData(Block block) { Object tileEntity = getTileEntity(block); if (tileEntity != null) { NBTTagCompound data = new NBTTagCompound(); - BukkitReflect.invokeMethod(tileEntity, _TileEntity_save, data._handle); + BukkitReflectAdapter_v1_16_R3.invokeMethod(tileEntity, _TileEntity_save, data._handle); return data; } return null; @@ -165,24 +165,24 @@ public NBTTagCompound getTileEntityNBTData(Block block) { public void setTileEntityNBTData(Block block, NBTTagCompound data) { Object tileEntity = getTileEntity(block); if (tileEntity != null) { - BukkitReflect.invokeMethod(tileEntity, _TileEntity_load, null, data._handle); + BukkitReflectAdapter_v1_16_R3.invokeMethod(tileEntity, _TileEntity_load, null, data._handle); } } public NBTTagCompound getItemStackTag(ItemStack item) { - Object handle = BukkitReflect.getFieldValue(item, _CraftItemStack_handle); - Object tag = BukkitReflect.invokeMethod(handle, _ItemStack_getTag); + Object handle = BukkitReflectAdapter_v1_16_R3.getFieldValue(item, _CraftItemStack_handle); + Object tag = BukkitReflectAdapter_v1_16_R3.invokeMethod(handle, _ItemStack_getTag); return (tag == null ? new NBTTagCompound() : new NBTTagCompound(tag)); } public void setItemStackTag(ItemStack item, NBTTagCompound tag) { - Object handle = BukkitReflect.getFieldValue(item, _CraftItemStack_handle); - BukkitReflect.invokeMethod(handle, _ItemStack_setTag, tag._handle); + Object handle = BukkitReflectAdapter_v1_16_R3.getFieldValue(item, _CraftItemStack_handle); + BukkitReflectAdapter_v1_16_R3.invokeMethod(handle, _ItemStack_setTag, tag._handle); } public ItemStack itemStackToCraftItemStack(ItemStack item) { if (!_CraftItemStack_asCraftCopy.getClass().isInstance(item)) { - return (ItemStack) BukkitReflect.invokeMethod(null, _CraftItemStack_asCraftCopy, item); + return (ItemStack) BukkitReflectAdapter_v1_16_R3.invokeMethod(null, _CraftItemStack_asCraftCopy, item); } return item; } diff --git a/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflectAdapter_v1_18_R1.java b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflectAdapter_v1_18_R1.java new file mode 100644 index 00000000..e0a91794 --- /dev/null +++ b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflectAdapter_v1_18_R1.java @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import org.bukkit.Bukkit; +import org.bukkit.command.SimpleCommandMap; +import org.bukkit.craftbukkit.v1_18_R1.CraftServer; + +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TextComponent; + +public final class BukkitReflectAdapter_v1_18_R1 implements BukkitReflectAdapter { + public BukkitReflectAdapter_v1_18_R1() { + // No setup needed but this constructor must exist + } + + public SimpleCommandMap getCommandMap() { + return ((CraftServer) Bukkit.getServer()).getCommandMap(); + } + + public boolean isValidRawJSON(String text) { + try { + if (Component.Serializer.fromJson(text) != null) { + return true; + } + } catch (Exception ex) { + // Invalid, fallthrough to return false + } + return false; + } + + public String textToRawJSON(String text) { + return Component.Serializer.toJson(new TextComponent(text)); + } +} diff --git a/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_18_R1.java b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_18_R1.java index e468e3fd..86512f22 100644 --- a/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_18_R1.java +++ b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_18_R1.java @@ -30,8 +30,8 @@ public final class NBTTagListAdapter_v1_18_R1 implements NBTTagListAdapter { protected static Class _nbtTagListClass; public NBTTagListAdapter_v1_18_R1() throws Exception { - _nbtTagListClass = BukkitReflect.getMinecraftClass("nbt.ListTag"); - _listField = _nbtTagListClass.getDeclaredField("list"); + _nbtTagListClass = Class.forName("net.minecraft.nbt.NBTTagList"); + _listField = _nbtTagListClass.getDeclaredField("c"); _listField.setAccessible(true); } @@ -41,7 +41,11 @@ public Object newInternalInstance() { @SuppressWarnings("unchecked") public List getList(Object handle) { - return (List) BukkitReflect.getFieldValue(handle, _listField); + try { + return (List) _listField.get(handle); + } catch (Exception e) { + throw new RuntimeException("Error while getting field value " + _listField.getName() + " of class " + _listField.getDeclaringClass().getName() + ".", e); + } } public void add(Object handle, Object value) { From dc0472c34bdf076b623177c16e122311f8ab1679 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Mon, 18 Apr 2022 00:02:22 +0000 Subject: [PATCH 23/27] Move namemaps to adapter_api Signed-off-by: Byron Marohn --- .../java/com/goncalomb/bukkit/mylib/namemaps/EnchantmentsMap.java | 0 .../java/com/goncalomb/bukkit/mylib/namemaps/EntityTypeMap.java | 0 .../java/com/goncalomb/bukkit/mylib/namemaps/MaterialMap.java | 0 .../main/java/com/goncalomb/bukkit/mylib/namemaps/NamingMap.java | 0 .../com/goncalomb/bukkit/mylib/namemaps/PotionEffectsMap.java | 0 .../java/com/goncalomb/bukkit/mylib/namemaps/SpawnEggMap.java | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename {plugin => adapter_api}/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EnchantmentsMap.java (100%) rename {plugin => adapter_api}/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EntityTypeMap.java (100%) rename {plugin => adapter_api}/src/main/java/com/goncalomb/bukkit/mylib/namemaps/MaterialMap.java (100%) rename {plugin => adapter_api}/src/main/java/com/goncalomb/bukkit/mylib/namemaps/NamingMap.java (100%) rename {plugin => adapter_api}/src/main/java/com/goncalomb/bukkit/mylib/namemaps/PotionEffectsMap.java (100%) rename {plugin => adapter_api}/src/main/java/com/goncalomb/bukkit/mylib/namemaps/SpawnEggMap.java (100%) diff --git a/plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EnchantmentsMap.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EnchantmentsMap.java similarity index 100% rename from plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EnchantmentsMap.java rename to adapter_api/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EnchantmentsMap.java diff --git a/plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EntityTypeMap.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EntityTypeMap.java similarity index 100% rename from plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EntityTypeMap.java rename to adapter_api/src/main/java/com/goncalomb/bukkit/mylib/namemaps/EntityTypeMap.java diff --git a/plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/MaterialMap.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/namemaps/MaterialMap.java similarity index 100% rename from plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/MaterialMap.java rename to adapter_api/src/main/java/com/goncalomb/bukkit/mylib/namemaps/MaterialMap.java diff --git a/plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/NamingMap.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/namemaps/NamingMap.java similarity index 100% rename from plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/NamingMap.java rename to adapter_api/src/main/java/com/goncalomb/bukkit/mylib/namemaps/NamingMap.java diff --git a/plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/PotionEffectsMap.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/namemaps/PotionEffectsMap.java similarity index 100% rename from plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/PotionEffectsMap.java rename to adapter_api/src/main/java/com/goncalomb/bukkit/mylib/namemaps/PotionEffectsMap.java diff --git a/plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/SpawnEggMap.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/namemaps/SpawnEggMap.java similarity index 100% rename from plugin/src/main/java/com/goncalomb/bukkit/mylib/namemaps/SpawnEggMap.java rename to adapter_api/src/main/java/com/goncalomb/bukkit/mylib/namemaps/SpawnEggMap.java From 7b0b28f0f9852f65d4c92f9b83c51297d23b6c52 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Sun, 24 Apr 2022 05:51:40 +0000 Subject: [PATCH 24/27] Move spawners to wrapped version adapter Signed-off-by: Byron Marohn --- .../bukkit/mylib/reflect/BukkitReflect.java | 2 +- .../nbt/SpawnerNBTWrapperAdapter.java | 46 +++++++++ .../SpawnerNBTWrapperAdapter_v1_16_R3.java | 86 +++++++++++++++++ .../reflect/NBTUtilsAdapter_v1_18_R1.java | 2 +- .../SpawnerNBTWrapperAdapter_v1_18_R1.java | 93 +++++++++++++++++++ .../goncalomb/bukkit/nbteditor/NBTEditor.java | 2 + .../nbteditor/commands/CommandNBTTile.java | 1 + .../nbteditor/nbt/SpawnerNBTWrapper.java | 77 +++++++-------- 8 files changed, 264 insertions(+), 45 deletions(-) create mode 100644 adapter_api/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapperAdapter.java create mode 100644 adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapperAdapter_v1_16_R3.java create mode 100644 adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapperAdapter_v1_18_R1.java diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java index 463d11dc..7449d1ab 100644 --- a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflect.java @@ -52,7 +52,7 @@ public static String textToRawJSON(String text) { return adapter.textToRawJSON(text); } - private static void ensureAdapter(Object adapter) throws RuntimeException { + public static void ensureAdapter(Object adapter) throws RuntimeException { if (adapter == null) { throw new RuntimeException("Version adapter is not loaded"); } diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapperAdapter.java b/adapter_api/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapperAdapter.java new file mode 100644 index 00000000..ca1a04cb --- /dev/null +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapperAdapter.java @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.nbteditor.nbt; + +import java.util.List; + +import com.goncalomb.bukkit.mylib.reflect.NBTTagCompound; + +import org.bukkit.entity.EntityType; + +public interface SpawnerNBTWrapperAdapter { + public static class SpawnerAdapterWrappedEntity { + public NBTTagCompound data; + public int weight; + + public SpawnerAdapterWrappedEntity(NBTTagCompound data, int weight) { + this.data = data; + this.weight = weight; + } + } + + void addEntity(NBTTagCompound handle, SpawnerAdapterWrappedEntity entity); + + List getEntities(NBTTagCompound handle); + + void setEntities(NBTTagCompound handle, List entities); + + EntityType getCurrentEntity(NBTTagCompound handle); +} diff --git a/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapperAdapter_v1_16_R3.java b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapperAdapter_v1_16_R3.java new file mode 100644 index 00000000..9f38ed87 --- /dev/null +++ b/adapter_v1_16_R3/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapperAdapter_v1_16_R3.java @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.nbteditor.nbt; + +import java.util.ArrayList; +import java.util.List; + +import com.goncalomb.bukkit.mylib.namemaps.EntityTypeMap; +import com.goncalomb.bukkit.mylib.reflect.NBTTagCompound; +import com.goncalomb.bukkit.mylib.reflect.NBTTagList; + +import org.bukkit.entity.EntityType; + +// minecraft:spawner{Delay:462s,MaxNearbyEntities:6s,MaxSpawnDelay:600s,MinSpawnDelay:400s,RequiredPlayerRange:16s,SpawnCount:4s,SpawnData:{ArmorItems:[{Count:1b,id:"minecraft:leather_boots",tag:{display:{color:1908001}}},{Count:1b,id:"minecraft:leather_leggings",tag:{display:{color:7567221}}},{Count:1b,id:"minecraft:leather_chestplate",tag:{display:{color:7567221}}},{Count:1b,id:"minecraft:leather_helmet",tag:{display:{Name:'{"text":"§c§lSacrifice\'s Scalp"}',color:9468004},plain:{display:{Name:"Sacrifice's Scalp"}}}}],Attributes:[{Base:30.0d,Name:"minecraft:generic.max_health"}],CustomName:'{"text":"Desiccated Husk"}',HandItems:[{Count:1b,id:"minecraft:yellow_glazed_terracotta",tag:{AttributeModifiers:[{Amount:7.0d,AttributeName:"minecraft:generic.attack_damage",Name:"Modifier",Operation:0,Slot:"mainhand",UUID:[I;1255868359,-901623816,-1585118361,1237496632]},{Amount:0.12d,AttributeName:"minecraft:generic.movement_speed",Name:"Modifier",Operation:1,Slot:"mainhand",UUID:[I;-1540949385,586696667,-1422368804,222333757]}]}},{}],Health:30.0f,Profession:3,id:"minecraft:zombie_villager",plain:{CustomName:"Desiccated Husk"}},SpawnPotentials:[{Entity:{ArmorItems:[{Count:1b,id:"minecraft:leather_boots",tag:{display:{color:1908001}}},{Count:1b,id:"minecraft:leather_leggings",tag:{display:{color:7567221}}},{Count:1b,id:"minecraft:leather_chestplate",tag:{display:{color:7567221}}},{Count:1b,id:"minecraft:leather_helmet",tag:{display:{Name:'{"text":"§c§lSacrifice\'s Scalp"}',color:9468004},plain:{display:{Name:"Sacrifice's Scalp"}}}}],Attributes:[{Base:30.0d,Name:"minecraft:generic.max_health"}],CustomName:'{"text":"Desiccated Husk"}',HandItems:[{Count:1b,id:"minecraft:yellow_glazed_terracotta",tag:{AttributeModifiers:[{Amount:7.0d,AttributeName:"minecraft:generic.attack_damage",Name:"Modifier",Operation:0,Slot:"mainhand",UUID:[I;1255868359,-901623816,-1585118361,1237496632]},{Amount:0.12d,AttributeName:"minecraft:generic.movement_speed",Name:"Modifier",Operation:1,Slot:"mainhand",UUID:[I;-1540949385,586696667,-1422368804,222333757]}]}},{}],Health:30.0f,Profession:3,id:"minecraft:zombie_villager",plain:{CustomName:"Desiccated Husk"}},Weight:1}],SpawnRange:4s,id:"minecraft:mob_spawner",x:-699,y:16,z:-215} + +public class SpawnerNBTWrapperAdapter_v1_16_R3 implements SpawnerNBTWrapperAdapter { + public SpawnerNBTWrapperAdapter_v1_16_R3() { + // No setup needed but this constructor must exist + } + + public void addEntity(NBTTagCompound data, SpawnerAdapterWrappedEntity entity) { + List entities = getEntities(data); + entities.add(entity); + data.setCompound("SpawnData", entity.data); + setEntities(data, entities); + } + + public List getEntities(NBTTagCompound data) { + ArrayList entities = new ArrayList(); + if (data.hasKey("SpawnPotentials")) { + NBTTagList spawnPotentials = data.getList("SpawnPotentials"); + int l = spawnPotentials.size(); + for (int i = 0; i < l; ++i) { + NBTTagCompound potential = (NBTTagCompound) spawnPotentials.get(i); + NBTTagCompound entityNbt = potential.getCompound("Entity"); + if (entityNbt != null) { + entities.add(new SpawnerAdapterWrappedEntity(entityNbt, potential.getInt("Weight"))); + } + } + } + return entities; + } + + public void setEntities(NBTTagCompound data, List entities) { + if (entities != null && entities.size() > 0) { + NBTTagList spawnPotentials = new NBTTagList(); + for (SpawnerAdapterWrappedEntity entity : entities) { + NBTTagCompound newEntry = new NBTTagCompound(); + newEntry.setInt("Weight", entity.weight); + newEntry.setCompound("Entity", entity.data); + spawnPotentials.add(newEntry); + } + data.setList("SpawnPotentials", spawnPotentials); + } else { + NBTTagCompound simplePig = new NBTTagCompound(); + + data.setCompound("SpawnData", simplePig); + data.remove("SpawnPotentials"); + } + } + + public EntityType getCurrentEntity(NBTTagCompound data) { + NBTTagCompound spawnData = data.getCompound("SpawnData"); + if (spawnData != null) { + return EntityTypeMap.getByName(spawnData.getString("id")); + } + return null; + } +} diff --git a/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R1.java b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R1.java index 14910d33..abc16860 100644 --- a/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R1.java +++ b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R1.java @@ -72,7 +72,7 @@ private BlockEntity getTileEntity(Block block) { public NBTTagCompound getTileEntityNBTData(Block block) { BlockEntity tileEntity = getTileEntity(block); if (tileEntity != null) { - return new NBTTagCompound(tileEntity.saveWithoutMetadata()); + return new NBTTagCompound(tileEntity.saveWithId()); } return null; } diff --git a/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapperAdapter_v1_18_R1.java b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapperAdapter_v1_18_R1.java new file mode 100644 index 00000000..ce7efec7 --- /dev/null +++ b/adapter_v1_18_R1/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapperAdapter_v1_18_R1.java @@ -0,0 +1,93 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.nbteditor.nbt; + +import java.util.ArrayList; +import java.util.List; + +import com.goncalomb.bukkit.mylib.namemaps.EntityTypeMap; +import com.goncalomb.bukkit.mylib.reflect.NBTTagCompound; +import com.goncalomb.bukkit.mylib.reflect.NBTTagList; + +import org.bukkit.entity.EntityType; + +// minecraft:spawner{Delay:0s,MaxNearbyEntities:6s,MaxSpawnDelay:600s,MinSpawnDelay:400s,RequiredPlayerRange:10s,SpawnCount:4s,SpawnData:{entity:{ArmorItems:[{Count:1b,id:"minecraft:leather_boots",tag:{display:{color:1908001}}},{Count:1b,id:"minecraft:leather_leggings",tag:{display:{color:7567221}}},{Count:1b,id:"minecraft:leather_chestplate",tag:{display:{color:7567221}}},{Count:1b,id:"minecraft:leather_helmet",tag:{display:{Name:'{"text":"clSacrifice\'s Scalp"}',color:9468004},plain:{display:{Name:"Sacrifice's Scalp"}}}}],Attributes:[{Base:30.0d,Name:"minecraft:generic.max_health"}],CustomName:'{"text":"Desiccated Husk"}',HandItems:[{Count:1b,id:"minecraft:yellow_glazed_terracotta",tag:{AttributeModifiers:[{Amount:7.0d,AttributeName:"minecraft:generic.attack_damage",Name:"Modifier",Operation:0,Slot:"mainhand",UUID:[I;1255868359,-901623816,-1585118361,1237496632]},{Amount:0.12d,AttributeName:"minecraft:generic.movement_speed",Name:"Modifier",Operation:1,Slot:"mainhand",UUID:[I;-1540949385,586696667,-1422368804,222333757]}]}},{}],Health:30.0f,Profession:3,id:"minecraft:zombie_villager",plain:{CustomName:"Desiccated Husk"}}},SpawnPotentials:[{data:{entity:{ArmorItems:[{Count:1b,id:"minecraft:leather_boots",tag:{display:{color:1908001}}},{Count:1b,id:"minecraft:leather_leggings",tag:{display:{color:7567221}}},{Count:1b,id:"minecraft:leather_chestplate",tag:{display:{color:7567221}}},{Count:1b,id:"minecraft:leather_helmet",tag:{display:{Name:'{"text":"clSacrifice\'s Scalp"}',color:9468004},plain:{display:{Name:"Sacrifice's Scalp"}}}}],Attributes:[{Base:30.0d,Name:"minecraft:generic.max_health"}],CustomName:'{"text":"Desiccated Husk"}',HandItems:[{Count:1b,id:"minecraft:yellow_glazed_terracotta",tag:{AttributeModifiers:[{Amount:7.0d,AttributeName:"minecraft:generic.attack_damage",Name:"Modifier",Operation:0,Slot:"mainhand",UUID:[I;1255868359,-901623816,-1585118361,1237496632]},{Amount:0.12d,AttributeName:"minecraft:generic.movement_speed",Name:"Modifier",Operation:1,Slot:"mainhand",UUID:[I;-1540949385,586696667,-1422368804,222333757]}]}},{}],Health:30.0f,Profession:3,id:"minecraft:zombie_villager",plain:{CustomName:"Desiccated Husk"}}},weight:1}],SpawnRange:4s} +public class SpawnerNBTWrapperAdapter_v1_18_R1 implements SpawnerNBTWrapperAdapter { + public SpawnerNBTWrapperAdapter_v1_18_R1() { + // No setup needed but this constructor must exist + } + + public void addEntity(NBTTagCompound data, SpawnerAdapterWrappedEntity entity) { + List entities = getEntities(data); + entities.add(entity); + NBTTagCompound spawnData = new NBTTagCompound(); + spawnData.setCompound("entity", entity.data); + data.setCompound("SpawnData", spawnData); + setEntities(data, entities); + } + + public List getEntities(NBTTagCompound data) { + ArrayList entities = new ArrayList(); + if (data.hasKey("SpawnPotentials")) { + NBTTagList spawnPotentials = data.getList("SpawnPotentials"); + int l = spawnPotentials.size(); + for (int i = 0; i < l; ++i) { + NBTTagCompound potential = (NBTTagCompound) spawnPotentials.get(i); + NBTTagCompound dataTag = potential.getCompound("data"); + if (dataTag != null) { + NBTTagCompound entityNbt = dataTag.getCompound("entity"); + if (entityNbt != null) { + entities.add(new SpawnerAdapterWrappedEntity(entityNbt, potential.getInt("weight"))); + } + } + } + } + return entities; + } + + public void setEntities(NBTTagCompound data, List entities) { + if (entities != null && entities.size() > 0) { + NBTTagList spawnPotentials = new NBTTagList(); + for (SpawnerAdapterWrappedEntity entity : entities) { + NBTTagCompound newEntry = new NBTTagCompound(); + newEntry.setInt("weight", entity.weight); + NBTTagCompound newEntryData = new NBTTagCompound(); + newEntryData.setCompound("entity", entity.data); + newEntry.setCompound("data", newEntryData); + spawnPotentials.add(newEntry); + } + data.setList("SpawnPotentials", spawnPotentials); + } else { + NBTTagCompound simplePigData = new NBTTagCompound(); + simplePigData.setCompound("entity", new NBTTagCompound()); + + data.setCompound("SpawnData", simplePigData); + data.remove("SpawnPotentials"); + } + } + + public EntityType getCurrentEntity(NBTTagCompound data) { + NBTTagCompound spawnData = data.getCompound("SpawnData"); + if (spawnData != null && spawnData.hasKey("entity")) { + return EntityTypeMap.getByName(spawnData.getCompound("entity").getString("id")); + } + return null; + } +} diff --git a/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java index 2f53a4b8..461279f5 100644 --- a/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java +++ b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/NBTEditor.java @@ -59,6 +59,7 @@ import com.goncalomb.bukkit.nbteditor.commands.CommandNBTPotion; import com.goncalomb.bukkit.nbteditor.commands.CommandNBTSpawner; import com.goncalomb.bukkit.nbteditor.commands.CommandNBTTile; +import com.goncalomb.bukkit.nbteditor.nbt.SpawnerNBTWrapper; import com.goncalomb.bukkit.nbteditor.tools.EntityInspectorTool; import com.goncalomb.bukkit.nbteditor.tools.EntityRemoverTool; import com.goncalomb.bukkit.nbteditor.tools.SuperLeadTool; @@ -78,6 +79,7 @@ public void onEnable() { NBTTagList.prepareReflection(this.getServer().getClass(), getLogger()); NBTTypes.prepareReflection(this.getServer().getClass(), getLogger()); NBTUtils.prepareReflection(this.getServer().getClass(), getLogger()); + SpawnerNBTWrapper.prepareReflection(this.getServer().getClass(), getLogger()); } catch (Throwable e) { getLogger().log(Level.SEVERE, "Error preparing reflection objects", e); getLogger().severe("This version of NBTEditor is not compatible with this version of Bukkit"); diff --git a/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTTile.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTTile.java index 28f16a88..79b72258 100644 --- a/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTTile.java +++ b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/commands/CommandNBTTile.java @@ -59,6 +59,7 @@ protected TileNBTWrapper getWrapper(Player player) throws MyCommandException { } return new TileNBTWrapper(block); } catch (RuntimeException e) { + e.printStackTrace(); throw new MyCommandException("§cCannot edit that tile!"); } } diff --git a/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapper.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapper.java index 0fde8acf..c157245a 100644 --- a/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapper.java +++ b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapper.java @@ -21,16 +21,28 @@ import java.util.ArrayList; import java.util.List; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +import com.goncalomb.bukkit.mylib.reflect.BukkitReflect; +import com.goncalomb.bukkit.nbteditor.nbt.SpawnerNBTWrapperAdapter.SpawnerAdapterWrappedEntity; import org.bukkit.block.Block; import org.bukkit.entity.EntityType; -import com.goncalomb.bukkit.mylib.namemaps.EntityTypeMap; -import com.goncalomb.bukkit.mylib.reflect.NBTTagCompound; -import com.goncalomb.bukkit.mylib.reflect.NBTTagList; - public final class SpawnerNBTWrapper extends TileNBTWrapper { + private static SpawnerNBTWrapperAdapter adapter = null; + + public static void prepareReflection(Class serverClass, Logger logger) throws Exception { + String packageName = serverClass.getPackage().getName(); + String version = packageName.substring(packageName.lastIndexOf('.') + 1); + + Class clazz = Class.forName("com.goncalomb.bukkit.nbteditor.nbt.SpawnerNBTWrapperAdapter_" + version); + adapter = (SpawnerNBTWrapperAdapter) clazz.getConstructor().newInstance(); + logger.info("Loaded SpawnerNBTWrapper adapter for " + version); + } + public static class SpawnerEntity { public final EntityNBT entityNBT; @@ -45,13 +57,13 @@ public SpawnerEntity(EntityType entityType, int weight) { this(EntityNBT.fromEntityType(entityType), weight); } - NBTTagCompound getCompound() { - NBTTagCompound data = new NBTTagCompound(); - data.setInt("Weight", weight); - data.setCompound("Entity", entityNBT._data); - return data; + private SpawnerAdapterWrappedEntity wrapForAdapter() { + return new SpawnerAdapterWrappedEntity(entityNBT._data, weight); } + private static SpawnerEntity fromAdapterWrapped(SpawnerAdapterWrappedEntity wrapped) { + return new SpawnerEntity(EntityNBT.fromEntityData(wrapped.data), wrapped.weight); + } } public SpawnerNBTWrapper(Block block) { @@ -59,43 +71,26 @@ public SpawnerNBTWrapper(Block block) { } public void addEntity(SpawnerEntity entity) { - List entities = getEntities(); - entities.add(entity); - _data.setCompound("SpawnData", entity.entityNBT._data); - setEntities(entities); + BukkitReflect.ensureAdapter(adapter); + adapter.addEntity(_data, entity.wrapForAdapter()); } public List getEntities() { - ArrayList entities = new ArrayList(); - if (_data.hasKey("SpawnPotentials")) { - NBTTagList spawnPotentials = _data.getList("SpawnPotentials"); - int l = spawnPotentials.size(); - for (int i = 0; i < l; ++i) { - NBTTagCompound potential = (NBTTagCompound) spawnPotentials.get(i); - EntityNBT entityNbt = EntityNBT.fromEntityData(potential.getCompound("Entity")); - if (entityNbt != null) { - entities.add(new SpawnerEntity(entityNbt, potential.getInt("Weight"))); - } - } - _data.remove("SpawnPotentials"); + BukkitReflect.ensureAdapter(adapter); + List entities = adapter.getEntities(_data); + if (entities == null) { + return null; } - return entities; + return new ArrayList<>(entities.stream().map((entity) -> SpawnerEntity.fromAdapterWrapped(entity)).collect(Collectors.toList())); } public void setEntities(List entities) { - if (entities != null && entities.size() > 0) { - NBTTagList spawnPotentials = new NBTTagList(); - for (SpawnerEntity entity : entities) { - spawnPotentials.add(entity.getCompound()); - } - _data.setList("SpawnPotentials", spawnPotentials); + BukkitReflect.ensureAdapter(adapter); + if (entities == null) { + adapter.setEntities(_data, null); } else { - NBTTagCompound simplePig = new NBTTagCompound(); - - _data.setCompound("SpawnData", simplePig); - _data.remove("SpawnPotentials"); + adapter.setEntities(_data, entities.stream().map((entity) -> entity.wrapForAdapter()).collect(Collectors.toList())); } - } public void clearEntities() { @@ -103,11 +98,7 @@ public void clearEntities() { } public EntityType getCurrentEntity() { - NBTTagCompound spawnData = _data.getCompound("SpawnData"); - if (spawnData != null) { - return EntityTypeMap.getByName(spawnData.getString("id")); - } - return null; + BukkitReflect.ensureAdapter(adapter); + return adapter.getCurrentEntity(_data); } - } From 8053ea364cb17a80dc5f355c3afbf9e46005986b Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Mon, 15 Aug 2022 01:51:42 +0000 Subject: [PATCH 25/27] Add support for 1.18.2 Signed-off-by: Byron Marohn --- adapter_v1_18_R2/.gitignore | 2 + adapter_v1_18_R2/build.gradle.kts | 33 +++++ adapter_v1_18_R2/settings.gradle.kts | 5 + .../BukkitReflectAdapter_v1_18_R2.java | 52 ++++++++ .../BukkitVersionAdapter_v1_18_R2.java | 54 ++++++++ .../reflect/NBTBaseAdapter_v1_18_R2.java | 53 ++++++++ .../NBTTagCompoundAdapter_v1_18_R2.java | 118 ++++++++++++++++++ .../reflect/NBTTagListAdapter_v1_18_R2.java | 56 +++++++++ .../reflect/NBTTypesAdapter_v1_18_R2.java | 106 ++++++++++++++++ .../reflect/NBTUtilsAdapter_v1_18_R2.java | 102 +++++++++++++++ .../SpawnerNBTWrapperAdapter_v1_18_R2.java | 93 ++++++++++++++ plugin/build.gradle.kts | 1 + settings.gradle.kts | 1 + 13 files changed, 676 insertions(+) create mode 100644 adapter_v1_18_R2/.gitignore create mode 100644 adapter_v1_18_R2/build.gradle.kts create mode 100644 adapter_v1_18_R2/settings.gradle.kts create mode 100644 adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflectAdapter_v1_18_R2.java create mode 100644 adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter_v1_18_R2.java create mode 100644 adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter_v1_18_R2.java create mode 100644 adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_18_R2.java create mode 100644 adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_18_R2.java create mode 100644 adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter_v1_18_R2.java create mode 100644 adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R2.java create mode 100644 adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapperAdapter_v1_18_R2.java diff --git a/adapter_v1_18_R2/.gitignore b/adapter_v1_18_R2/.gitignore new file mode 100644 index 00000000..4f035375 --- /dev/null +++ b/adapter_v1_18_R2/.gitignore @@ -0,0 +1,2 @@ +upload*.sh +.factorypath diff --git a/adapter_v1_18_R2/build.gradle.kts b/adapter_v1_18_R2/build.gradle.kts new file mode 100644 index 00000000..72a53cba --- /dev/null +++ b/adapter_v1_18_R2/build.gradle.kts @@ -0,0 +1,33 @@ +plugins { + id("com.goncalomb.bukkit.java-conventions") + id("io.papermc.paperweight.userdev") version "1.3.3" +} + +dependencies { + implementation(project(":adapter_api")) + paperDevBundle("1.18.2-R0.1-SNAPSHOT") +} + +description = "adapter_v1_18_R2" +version = rootProject.version + +tasks { + // Configure reobfJar to run when invoking the build task + assemble { + dependsOn(reobfJar) + } + + compileJava { + options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything + + // Set the release flag. This configures what version bytecode the compiler will emit, as well as what JDK APIs are usable. + // See https://openjdk.java.net/jeps/247 for more information. + options.release.set(17) + } + javadoc { + options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything + } + processResources { + filteringCharset = Charsets.UTF_8.name() // We want UTF-8 for everything + } +} diff --git a/adapter_v1_18_R2/settings.gradle.kts b/adapter_v1_18_R2/settings.gradle.kts new file mode 100644 index 00000000..211d7e16 --- /dev/null +++ b/adapter_v1_18_R2/settings.gradle.kts @@ -0,0 +1,5 @@ +pluginManagement { + repositories { + maven("https://papermc.io/repo/repository/maven-public/") + } +} diff --git a/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflectAdapter_v1_18_R2.java b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflectAdapter_v1_18_R2.java new file mode 100644 index 00000000..283865f5 --- /dev/null +++ b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitReflectAdapter_v1_18_R2.java @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import org.bukkit.Bukkit; +import org.bukkit.command.SimpleCommandMap; +import org.bukkit.craftbukkit.v1_18_R2.CraftServer; + +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TextComponent; + +public final class BukkitReflectAdapter_v1_18_R2 implements BukkitReflectAdapter { + public BukkitReflectAdapter_v1_18_R2() { + // No setup needed but this constructor must exist + } + + public SimpleCommandMap getCommandMap() { + return ((CraftServer) Bukkit.getServer()).getCommandMap(); + } + + public boolean isValidRawJSON(String text) { + try { + if (Component.Serializer.fromJson(text) != null) { + return true; + } + } catch (Exception ex) { + // Invalid, fallthrough to return false + } + return false; + } + + public String textToRawJSON(String text) { + return Component.Serializer.toJson(new TextComponent(text)); + } +} diff --git a/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter_v1_18_R2.java b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter_v1_18_R2.java new file mode 100644 index 00000000..c5f6968a --- /dev/null +++ b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersionAdapter_v1_18_R2.java @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.bukkit.Bukkit; + +import net.minecraft.SharedConstants; + +public class BukkitVersionAdapter_v1_18_R2 implements BukkitVersionAdapter { + private final int _minecraftVersionMajor; + private final int _minecraftVersionMinor; + + public BukkitVersionAdapter_v1_18_R2() throws Exception { + if (Bukkit.getServer() == null) { + // test environment, CraftBukkit / Minecraft not available + _minecraftVersionMajor = Integer.MAX_VALUE; + _minecraftVersionMinor = Integer.MAX_VALUE; + return; + } + + String version = SharedConstants.VERSION_STRING; + Matcher matcher = Pattern.compile("^(\\d+)(?:\\.(\\d+)(?:\\.(\\d+))?)?$").matcher(version); + if (matcher.find()) { + _minecraftVersionMajor = Integer.parseInt(matcher.group(1)); + _minecraftVersionMinor = Integer.parseInt(matcher.group(2)); + } else { + throw new RuntimeException("Invalid Minecraft version: " + version); + } + } + + public boolean isVersion(int minor, int major) { + return _minecraftVersionMajor > major || (_minecraftVersionMajor == major && _minecraftVersionMinor >= minor); + } +} diff --git a/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter_v1_18_R2.java b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter_v1_18_R2.java new file mode 100644 index 00000000..3fcddd13 --- /dev/null +++ b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTBaseAdapter_v1_18_R2.java @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.Tag; + +public class NBTBaseAdapter_v1_18_R2 implements NBTBaseAdapter { + public NBTBaseAdapter_v1_18_R2() { + // No setup needed but this constructor must exist + } + + @Override + public NBTBase wrap(Object object) { + if (object instanceof CompoundTag) { + return new NBTTagCompound(object); + } else if (object instanceof ListTag) { + return new NBTTagList(object); + } else if (object instanceof Tag) { + return new NBTBase(object); + } else { + throw new RuntimeException(object.getClass() + " is not a valid NBT tag type."); + } + } + + @Override + public Object clone(Object nbtBaseObject) { + return ((Tag) nbtBaseObject).copy(); + } + + @Override + public byte getTypeId(Object handle) { + return ((Tag) handle).getId(); + } +} diff --git a/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_18_R2.java b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_18_R2.java new file mode 100644 index 00000000..ebf0ad0f --- /dev/null +++ b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_18_R2.java @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Map; + +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.NbtIo; +import net.minecraft.nbt.TagParser; + +public final class NBTTagCompoundAdapter_v1_18_R2 implements NBTTagCompoundAdapter { + public NBTTagCompoundAdapter_v1_18_R2() { + // No setup needed but this constructor must exist + } + + public Object newInternalInstance() { + return new CompoundTag(); + } + + @SuppressWarnings("unchecked") + public Map getMap(Object handle) { + return (Map) ((Object)((CompoundTag) handle).tags); + } + + public byte getByte(Object handle, String key) { + return ((CompoundTag) handle).getByte(key); + } + + public short getShort(Object handle, String key) { + return ((CompoundTag) handle).getShort(key); + } + + public int getInt(Object handle, String key) { + return ((CompoundTag) handle).getInt(key); + } + + public long getLong(Object handle, String key) { + return ((CompoundTag) handle).getLong(key); + } + + public float getFloat(Object handle, String key) { + return ((CompoundTag) handle).getFloat(key); + } + + public Double getDouble(Object handle, String key) { + return ((CompoundTag) handle).getDouble(key); + } + + public String getString(Object handle, String key) { + return ((CompoundTag) handle).getString(key); + } + + public byte[] getByteArray(Object handle, String key) { + return ((CompoundTag) handle).getByteArray(key); + } + + public int[] getIntArray(Object handle, String key) { + return ((CompoundTag) handle).getIntArray(key); + } + + public long[] getLongArray(Object handle, String key) { + return ((CompoundTag) handle).getLongArray(key); + } + + public NBTTagCompound getCompound(Object handle, String key) { + CompoundTag obj = ((CompoundTag) handle).getCompound(key); + if (obj != null) { + return new NBTTagCompound(obj); + } + return null; + } + + public NBTTagList getList(Object handle, String key) { + Object obj = getMap(handle).get(key); + if (obj != null && obj instanceof ListTag) { + return new NBTTagList(obj); + } + return null; + } + + public void set(Object handle, String key, Object value) { + getMap(handle).put(key, NBTTypes.toInternal(value)); + } + + public void serialize(Object handle, OutputStream outputStream) throws IOException { + NbtIo.writeCompressed((CompoundTag) handle, outputStream); + } + + public NBTTagCompound unserialize(InputStream inputStream) throws IOException { + return new NBTTagCompound(NbtIo.readCompressed(inputStream)); + } + + public NBTTagCompound fromString(String mojangson) throws Exception { + return new NBTTagCompound(TagParser.parseTag(mojangson)); + } +} + diff --git a/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_18_R2.java b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_18_R2.java new file mode 100644 index 00000000..5c69b6ab --- /dev/null +++ b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagListAdapter_v1_18_R2.java @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import java.lang.reflect.Field; +import java.util.List; + +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.Tag; + +public final class NBTTagListAdapter_v1_18_R2 implements NBTTagListAdapter { + private static Field _listField; + protected static Class _nbtTagListClass; + + public NBTTagListAdapter_v1_18_R2() throws Exception { + _nbtTagListClass = Class.forName("net.minecraft.nbt.NBTTagList"); + _listField = _nbtTagListClass.getDeclaredField("c"); + _listField.setAccessible(true); + } + + public Object newInternalInstance() { + return new ListTag(); + } + + @SuppressWarnings("unchecked") + public List getList(Object handle) { + try { + return (List) _listField.get(handle); + } catch (Exception e) { + throw new RuntimeException("Error while getting field value " + _listField.getName() + " of class " + _listField.getDeclaringClass().getName() + ".", e); + } + } + + public void add(Object handle, Object value) { + Tag addHandle = (Tag) NBTTypes.toInternal(value); + ListTag list = ((ListTag) handle); + list.add(addHandle); + } +} diff --git a/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter_v1_18_R2.java b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter_v1_18_R2.java new file mode 100644 index 00000000..7fdd3234 --- /dev/null +++ b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTypesAdapter_v1_18_R2.java @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import java.util.HashMap; +import java.util.function.Function; + +import org.apache.commons.lang.ClassUtils; + +import net.minecraft.nbt.ByteArrayTag; +import net.minecraft.nbt.ByteTag; +import net.minecraft.nbt.DoubleTag; +import net.minecraft.nbt.FloatTag; +import net.minecraft.nbt.IntArrayTag; +import net.minecraft.nbt.IntTag; +import net.minecraft.nbt.LongArrayTag; +import net.minecraft.nbt.LongTag; +import net.minecraft.nbt.ShortTag; +import net.minecraft.nbt.StringTag; + +public final class NBTTypesAdapter_v1_18_R2 implements NBTTypesAdapter { + + private static final class NBTTypes { + private final Function wrapFunc; + private final Function unwrapFunc; + + private NBTTypes(Function wrapFunc, Function unwrapFunc) { + this.wrapFunc = wrapFunc; + this.unwrapFunc = unwrapFunc; + } + + // Wraps primitives and strings with Minecraft tags. + private Object wrap(Object innerObject) { + return wrapFunc.apply(innerObject); + } + + // Unwraps primitives and strings from Minecraft tags. + private Object unwrap(Object tagObject) { + return unwrapFunc.apply(tagObject); + } + } + + private HashMap, NBTTypes> _innerTypeMap = new HashMap, NBTTypes>();; + private HashMap, NBTTypes> _outerTypeMap = new HashMap, NBTTypes>();; + + public NBTTypesAdapter_v1_18_R2() throws Exception { + registerNew(byte.class, ByteTag.class, (toWrap) -> ByteTag.valueOf((Byte) toWrap), (toUnwrap) -> ((ByteTag) toUnwrap).getAsByte()); + registerNew(short.class, ShortTag.class, (toWrap) -> ShortTag.valueOf((Short) toWrap), (toUnwrap) -> ((ShortTag) toUnwrap).getAsShort()); + registerNew(int.class, IntTag.class, (toWrap) -> IntTag.valueOf((Integer) toWrap), (toUnwrap) -> ((IntTag) toUnwrap).getAsInt()); + registerNew(long.class, LongTag.class, (toWrap) -> LongTag.valueOf((Long) toWrap), (toUnwrap) -> ((LongTag) toUnwrap).getAsLong()); + registerNew(float.class, FloatTag.class, (toWrap) -> FloatTag.valueOf((Float) toWrap), (toUnwrap) -> ((FloatTag) toUnwrap).getAsFloat()); + registerNew(double.class, DoubleTag.class, (toWrap) -> DoubleTag.valueOf((Double) toWrap), (toUnwrap) -> ((DoubleTag) toUnwrap).getAsDouble()); + registerNew(String.class, StringTag.class, (toWrap) -> StringTag.valueOf((String) toWrap), (toUnwrap) -> ((StringTag) toUnwrap).getAsString()); + registerNew(byte[].class, ByteArrayTag.class, (toWrap) -> new ByteArrayTag((byte[]) toWrap), (toUnwrap) -> ((ByteArrayTag) toUnwrap).getAsByteArray()); + registerNew(int[].class, IntArrayTag.class, (toWrap) -> new IntArrayTag((int[]) toWrap), (toUnwrap) -> ((IntArrayTag) toUnwrap).getAsIntArray()); + registerNew(long[].class, LongArrayTag.class, (toWrap) -> new LongArrayTag((long[]) toWrap), (toUnwrap) -> ((LongArrayTag) toUnwrap).getAsLongArray()); + } + + private void registerNew(Class innerClass, Class wrapperClass, Function wrapFunc, Function unwrapFunc) { + NBTTypes handler = new NBTTypes(wrapFunc, unwrapFunc); + _innerTypeMap.put((innerClass.isPrimitive() ? ClassUtils.primitiveToWrapper(innerClass) : innerClass), handler); + _outerTypeMap.put(wrapperClass, handler); + } + + public Object toInternal(Object object) { + if (object instanceof NBTBase) { + return ((NBTBase) object)._handle; + } else { + NBTTypes handler = _innerTypeMap.get(object.getClass()); + if (handler != null) { + return handler.wrap(object); + } else { + throw new RuntimeException(object.getClass() + " is not a valid NBTTag type."); + } + } + } + + public Object fromInternal(Object object) { + if (object == null) { + return null; + } + NBTTypes handler = _outerTypeMap.get(object.getClass()); + if (handler != null) { + return handler.unwrap(object); + } else { + return NBTBase.wrap(object); + } + } +} diff --git a/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R2.java b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R2.java new file mode 100644 index 00000000..4fd41707 --- /dev/null +++ b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R2.java @@ -0,0 +1,102 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.mylib.reflect; + +import org.bukkit.Location; +import org.bukkit.block.Block; +import org.bukkit.craftbukkit.v1_18_R2.CraftWorld; +import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack; +import org.bukkit.entity.Entity; +import org.bukkit.inventory.ItemStack; + +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.level.block.entity.BlockEntity; + +public final class NBTUtilsAdapter_v1_18_R2 implements NBTUtilsAdapter { + public NBTUtilsAdapter_v1_18_R2() { + // No setup needed but this constructor must exist + } + + public ItemStack itemStackFromNBTData(NBTTagCompound data) { + return net.minecraft.world.item.ItemStack.of((CompoundTag) data._handle).asBukkitMirror(); + } + + public NBTTagCompound itemStackToNBTData(ItemStack stack) { + NBTTagCompound data = new NBTTagCompound(); + ((CraftItemStack) stack).handle.save((CompoundTag) (data._handle)); + return data; + } + + public Entity spawnEntity(NBTTagCompound data, Location location) { + ServerLevel world = ((CraftWorld) location.getWorld()).getHandle(); + + net.minecraft.world.entity.Entity entity = EntityType.loadEntityRecursive((CompoundTag) (data._handle), world, (spawnedEntity) -> { + spawnedEntity.setPos(location.getX(), location.getY(), location.getZ()); + return spawnedEntity; + }); + world.addFreshEntity(entity); + return entity.getBukkitEntity(); + }; + + public NBTTagCompound getEntityNBTData(Entity entity) { + NBTTagCompound data = new NBTTagCompound(); + ((CraftEntity) entity).getHandle().save((CompoundTag) (data._handle)); + return data; + } + + private BlockEntity getTileEntity(Block block) { + return ((CraftWorld) block.getWorld()).getHandle().getBlockEntity(new BlockPos(block.getX(), block.getY(), block.getZ())); + } + + public NBTTagCompound getTileEntityNBTData(Block block) { + BlockEntity tileEntity = getTileEntity(block); + if (tileEntity != null) { + return new NBTTagCompound(tileEntity.saveWithId()); + } + return null; + } + + public void setTileEntityNBTData(Block block, NBTTagCompound data) { + BlockEntity tileEntity = getTileEntity(block); + if (tileEntity != null) { + tileEntity.load((CompoundTag) data._handle); + } + } + + public NBTTagCompound getItemStackTag(ItemStack item) { + Object tag = ((CraftItemStack) item).handle.getTag(); + return (tag == null ? new NBTTagCompound() : new NBTTagCompound(tag)); + } + + public void setItemStackTag(ItemStack item, NBTTagCompound tag) { + ((CraftItemStack) item).handle.setTag((CompoundTag) (tag._handle)); + } + + public ItemStack itemStackToCraftItemStack(ItemStack item) { + if (!CraftItemStack.class.isInstance(item)) { + return CraftItemStack.asCraftCopy(item); + } + return item; + } +} diff --git a/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapperAdapter_v1_18_R2.java b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapperAdapter_v1_18_R2.java new file mode 100644 index 00000000..fb18e510 --- /dev/null +++ b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/SpawnerNBTWrapperAdapter_v1_18_R2.java @@ -0,0 +1,93 @@ +/* + * Copyright (C) 2013-2018 Gonçalo Baltazar + * + * This file is part of NBTEditor. + * + * NBTEditor is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * NBTEditor is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with NBTEditor. If not, see . + */ + +package com.goncalomb.bukkit.nbteditor.nbt; + +import java.util.ArrayList; +import java.util.List; + +import com.goncalomb.bukkit.mylib.namemaps.EntityTypeMap; +import com.goncalomb.bukkit.mylib.reflect.NBTTagCompound; +import com.goncalomb.bukkit.mylib.reflect.NBTTagList; + +import org.bukkit.entity.EntityType; + +// minecraft:spawner{Delay:0s,MaxNearbyEntities:6s,MaxSpawnDelay:600s,MinSpawnDelay:400s,RequiredPlayerRange:10s,SpawnCount:4s,SpawnData:{entity:{ArmorItems:[{Count:1b,id:"minecraft:leather_boots",tag:{display:{color:1908001}}},{Count:1b,id:"minecraft:leather_leggings",tag:{display:{color:7567221}}},{Count:1b,id:"minecraft:leather_chestplate",tag:{display:{color:7567221}}},{Count:1b,id:"minecraft:leather_helmet",tag:{display:{Name:'{"text":"clSacrifice\'s Scalp"}',color:9468004},plain:{display:{Name:"Sacrifice's Scalp"}}}}],Attributes:[{Base:30.0d,Name:"minecraft:generic.max_health"}],CustomName:'{"text":"Desiccated Husk"}',HandItems:[{Count:1b,id:"minecraft:yellow_glazed_terracotta",tag:{AttributeModifiers:[{Amount:7.0d,AttributeName:"minecraft:generic.attack_damage",Name:"Modifier",Operation:0,Slot:"mainhand",UUID:[I;1255868359,-901623816,-1585118361,1237496632]},{Amount:0.12d,AttributeName:"minecraft:generic.movement_speed",Name:"Modifier",Operation:1,Slot:"mainhand",UUID:[I;-1540949385,586696667,-1422368804,222333757]}]}},{}],Health:30.0f,Profession:3,id:"minecraft:zombie_villager",plain:{CustomName:"Desiccated Husk"}}},SpawnPotentials:[{data:{entity:{ArmorItems:[{Count:1b,id:"minecraft:leather_boots",tag:{display:{color:1908001}}},{Count:1b,id:"minecraft:leather_leggings",tag:{display:{color:7567221}}},{Count:1b,id:"minecraft:leather_chestplate",tag:{display:{color:7567221}}},{Count:1b,id:"minecraft:leather_helmet",tag:{display:{Name:'{"text":"clSacrifice\'s Scalp"}',color:9468004},plain:{display:{Name:"Sacrifice's Scalp"}}}}],Attributes:[{Base:30.0d,Name:"minecraft:generic.max_health"}],CustomName:'{"text":"Desiccated Husk"}',HandItems:[{Count:1b,id:"minecraft:yellow_glazed_terracotta",tag:{AttributeModifiers:[{Amount:7.0d,AttributeName:"minecraft:generic.attack_damage",Name:"Modifier",Operation:0,Slot:"mainhand",UUID:[I;1255868359,-901623816,-1585118361,1237496632]},{Amount:0.12d,AttributeName:"minecraft:generic.movement_speed",Name:"Modifier",Operation:1,Slot:"mainhand",UUID:[I;-1540949385,586696667,-1422368804,222333757]}]}},{}],Health:30.0f,Profession:3,id:"minecraft:zombie_villager",plain:{CustomName:"Desiccated Husk"}}},weight:1}],SpawnRange:4s} +public class SpawnerNBTWrapperAdapter_v1_18_R2 implements SpawnerNBTWrapperAdapter { + public SpawnerNBTWrapperAdapter_v1_18_R2() { + // No setup needed but this constructor must exist + } + + public void addEntity(NBTTagCompound data, SpawnerAdapterWrappedEntity entity) { + List entities = getEntities(data); + entities.add(entity); + NBTTagCompound spawnData = new NBTTagCompound(); + spawnData.setCompound("entity", entity.data); + data.setCompound("SpawnData", spawnData); + setEntities(data, entities); + } + + public List getEntities(NBTTagCompound data) { + ArrayList entities = new ArrayList(); + if (data.hasKey("SpawnPotentials")) { + NBTTagList spawnPotentials = data.getList("SpawnPotentials"); + int l = spawnPotentials.size(); + for (int i = 0; i < l; ++i) { + NBTTagCompound potential = (NBTTagCompound) spawnPotentials.get(i); + NBTTagCompound dataTag = potential.getCompound("data"); + if (dataTag != null) { + NBTTagCompound entityNbt = dataTag.getCompound("entity"); + if (entityNbt != null) { + entities.add(new SpawnerAdapterWrappedEntity(entityNbt, potential.getInt("weight"))); + } + } + } + } + return entities; + } + + public void setEntities(NBTTagCompound data, List entities) { + if (entities != null && entities.size() > 0) { + NBTTagList spawnPotentials = new NBTTagList(); + for (SpawnerAdapterWrappedEntity entity : entities) { + NBTTagCompound newEntry = new NBTTagCompound(); + newEntry.setInt("weight", entity.weight); + NBTTagCompound newEntryData = new NBTTagCompound(); + newEntryData.setCompound("entity", entity.data); + newEntry.setCompound("data", newEntryData); + spawnPotentials.add(newEntry); + } + data.setList("SpawnPotentials", spawnPotentials); + } else { + NBTTagCompound simplePigData = new NBTTagCompound(); + simplePigData.setCompound("entity", new NBTTagCompound()); + + data.setCompound("SpawnData", simplePigData); + data.remove("SpawnPotentials"); + } + } + + public EntityType getCurrentEntity(NBTTagCompound data) { + NBTTagCompound spawnData = data.getCompound("SpawnData"); + if (spawnData != null && spawnData.hasKey("entity")) { + return EntityTypeMap.getByName(spawnData.getCompound("entity").getString("id")); + } + return null; + } +} diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index d63ce072..c00357c7 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -17,6 +17,7 @@ dependencies { implementation(project(":adapter_api")) implementation(project(":adapter_v1_16_R3")) implementation(project(":adapter_v1_18_R1")) + implementation(project(":adapter_v1_18_R2")) implementation("org.bstats:bstats-bukkit:1.5") compileOnly("org.spigotmc:spigot-api:1.16.3-R0.1-SNAPSHOT") diff --git a/settings.gradle.kts b/settings.gradle.kts index 57679e46..98c008a3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,6 +2,7 @@ rootProject.name = "nbteditor" include(":adapter_api") include(":adapter_v1_16_R3") include(":adapter_v1_18_R1") +include(":adapter_v1_18_R2") include(":NBTEditor") project(":NBTEditor").projectDir = file("plugin") From 4f07c05364078c91ee87542d6ca43944e819c80c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20G=C3=BCttinger?= Date: Fri, 2 Sep 2022 21:57:15 +0200 Subject: [PATCH 26/27] Fixed passengers not being added to the world properly --- .../goncalomb/bukkit/mylib/reflect/BukkitVersion.java | 5 +++++ .../bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R2.java | 2 +- .../com/goncalomb/bukkit/nbteditor/TestBosEntities.java | 9 ++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java index 13b36329..2c03d15c 100644 --- a/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java +++ b/adapter_api/src/main/java/com/goncalomb/bukkit/mylib/reflect/BukkitVersion.java @@ -15,6 +15,11 @@ public static void prepareReflection(Class serverClass, Logger logger) throws logger.info("Loaded BukkitVersion adapter for " + version); } + public static void prepareForTest() throws Exception { + Class clazz = Class.forName("com.goncalomb.bukkit.mylib.reflect.BukkitVersionAdapter_v1_18_R2"); + adapter = (BukkitVersionAdapter) clazz.getConstructor().newInstance(); + } + public static boolean isVersion(int minor) { return isVersion(minor, 1); } diff --git a/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R2.java b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R2.java index 4fd41707..1cd4f4a6 100644 --- a/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R2.java +++ b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTUtilsAdapter_v1_18_R2.java @@ -55,7 +55,7 @@ public Entity spawnEntity(NBTTagCompound data, Location location) { spawnedEntity.setPos(location.getX(), location.getY(), location.getZ()); return spawnedEntity; }); - world.addFreshEntity(entity); + entity.getSelfAndPassengers().forEach((e) -> world.addFreshEntity(e)); return entity.getBukkitEntity(); }; diff --git a/plugin/src/test/java/com/goncalomb/bukkit/nbteditor/TestBosEntities.java b/plugin/src/test/java/com/goncalomb/bukkit/nbteditor/TestBosEntities.java index 87e286c2..a6185b1e 100644 --- a/plugin/src/test/java/com/goncalomb/bukkit/nbteditor/TestBosEntities.java +++ b/plugin/src/test/java/com/goncalomb/bukkit/nbteditor/TestBosEntities.java @@ -19,10 +19,13 @@ package com.goncalomb.bukkit.nbteditor; +import com.goncalomb.bukkit.mylib.reflect.BukkitVersion; import java.util.Arrays; import java.util.HashSet; +import java.util.logging.Logger; import org.apache.commons.lang.StringUtils; +import org.bukkit.Server; import org.bukkit.entity.EntityType; import org.junit.Test; @@ -32,9 +35,9 @@ public class TestBosEntities { @Test - public void testBosEntities() { - HashSet entityTypes = new HashSet(); - entityTypes.addAll(Arrays.asList(EntityType.values())); + public void testBosEntities() throws Exception { + BukkitVersion.prepareForTest(); + HashSet entityTypes = new HashSet<>(Arrays.asList(EntityType.values())); for (String name : EntityNBT.getValidTypeNames()) { entityTypes.remove(EntityTypeMap.getByName(name)); } From 420d9c3aa2905159044c8e996eba1b2a4f740986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20G=C3=BCttinger?= Date: Fri, 23 Sep 2022 04:01:39 +0200 Subject: [PATCH 27/27] Added 1.17 mobs and fixed 1.18 NBT calls (#3) --- .../NBTTagCompoundAdapter_v1_18_R2.java | 16 +++++++++- .../bukkit/nbteditor/nbt/EntityNBT.java | 29 ++++++++++++++----- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_18_R2.java b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_18_R2.java index ebf0ad0f..098f7479 100644 --- a/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_18_R2.java +++ b/adapter_v1_18_R2/src/main/java/com/goncalomb/bukkit/mylib/reflect/NBTTagCompoundAdapter_v1_18_R2.java @@ -23,7 +23,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Map; - import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.NbtIo; @@ -68,22 +67,37 @@ public Double getDouble(Object handle, String key) { } public String getString(Object handle, String key) { + if (!((CompoundTag) handle).contains(key)) { + return null; + } return ((CompoundTag) handle).getString(key); } public byte[] getByteArray(Object handle, String key) { + if (!((CompoundTag) handle).contains(key)) { + return null; + } return ((CompoundTag) handle).getByteArray(key); } public int[] getIntArray(Object handle, String key) { + if (!((CompoundTag) handle).contains(key)) { + return null; + } return ((CompoundTag) handle).getIntArray(key); } public long[] getLongArray(Object handle, String key) { + if (!((CompoundTag) handle).contains(key)) { + return null; + } return ((CompoundTag) handle).getLongArray(key); } public NBTTagCompound getCompound(Object handle, String key) { + if (!((CompoundTag) handle).contains(key)) { + return null; + } CompoundTag obj = ((CompoundTag) handle).getCompound(key); if (obj != null) { return new NBTTagCompound(obj); diff --git a/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java index 5e77c8f1..f5a72005 100644 --- a/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java +++ b/plugin/src/main/java/com/goncalomb/bukkit/nbteditor/nbt/EntityNBT.java @@ -19,13 +19,6 @@ package com.goncalomb.bukkit.nbteditor.nbt; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; - -import org.bukkit.entity.EntityType; - import com.goncalomb.bukkit.mylib.namemaps.EntityTypeMap; import com.goncalomb.bukkit.mylib.reflect.BukkitVersion; import com.goncalomb.bukkit.mylib.reflect.NBTTagCompound; @@ -57,6 +50,11 @@ import com.goncalomb.bukkit.nbteditor.nbt.variables.VectorVariable; import com.goncalomb.bukkit.nbteditor.nbt.variables.VillagerCareerVariable; import com.goncalomb.bukkit.nbteditor.nbt.variables.VillagerOffersVariable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import org.bukkit.entity.EntityType; public class EntityNBT extends EntityNBTBase { @@ -274,6 +272,17 @@ public class EntityNBT extends EntityNBTBase { cHoglin.add("CannotBeHunted", new BooleanVariable("CannotBeHunted")); cHoglin.add("TimeInOverworld", new IntegerVariable("TimeInOverworld")); + NBTUnboundVariableContainer cAxolotl = new NBTUnboundVariableContainer("Axolotl", cBreed); + cAxolotl.add("FromBucket", new BooleanVariable("FromBucket")); + cAxolotl.add("Variant", new IntegerVariable("Variant", 0, 4)); + + NBTUnboundVariableContainer cGoat = new NBTUnboundVariableContainer("Goat", cBreed); + cGoat.add("IsScreamingGoat", new BooleanVariable("IsScreamingGoat")); + if (BukkitVersion.isVersion(19)) { + cGoat.add("HasLeftHorn", new BooleanVariable("HasLeftHorn")); + cGoat.add("HasRightHorn", new BooleanVariable("HasRightHorn")); + } + // Tameable SubTypes NBTUnboundVariableContainer cOcelot = new NBTUnboundVariableContainer("Ocelot", cTameable); @@ -384,6 +393,12 @@ public class EntityNBT extends EntityNBTBase { ENTITY_VARIABLES.put("minecraft:strider", cPig); } + if (BukkitVersion.isVersion(17)) { + ENTITY_VARIABLES.put("minecraft:axolotl", cAxolotl); + ENTITY_VARIABLES.put("minecraft:goat", cGoat); + ENTITY_VARIABLES.put("minecraft:glow_squid", cMob); + } + // Projectile Entities NBTUnboundVariableContainer cArrow = new NBTUnboundVariableContainer("Arrow", cEntity);