From 20a6038711f3ffe432db0118defc73d868a658cc Mon Sep 17 00:00:00 2001 From: Maoyue <95519633+MagicTeaMC@users.noreply.github.com> Date: Thu, 8 Jun 2023 18:26:39 +0800 Subject: [PATCH 01/11] 1.20 support(maybe --- .../java/com/github/nutt1101/HeadDrop.java | 1 + .../com/github/nutt1101/event/HitEvent.java | 1 + .../com/github/nutt1101/event/SkullClick.java | 1 + Main/src/main/resources/plugin.yml | 2 +- pom.xml | 3 +- .../java/com/github/nutt1101/NBT_v1_20.java | 37 +++++++++++++++++++ 6 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 v1_20/src/main/java/com/github/nutt1101/NBT_v1_20.java diff --git a/Main/src/main/java/com/github/nutt1101/HeadDrop.java b/Main/src/main/java/com/github/nutt1101/HeadDrop.java index 1537299..e97b1f3 100644 --- a/Main/src/main/java/com/github/nutt1101/HeadDrop.java +++ b/Main/src/main/java/com/github/nutt1101/HeadDrop.java @@ -71,6 +71,7 @@ public ItemStack getEntityHead(Entity hitEntity , Player player) { } switch (CatchBall.getRealServerVersion()) { + case "v1_20" -> headMeta = NBT_v1_20.saveEntityNBT(plugin, hitEntity, headMeta); case "v1_19" -> headMeta = NBT_v1_19.saveEntityNBT(plugin, hitEntity, headMeta); case "v1_18" -> headMeta = NBT_v1_18.saveEntityNBT(plugin, hitEntity, headMeta); case "v1_17" -> headMeta = NBT_v1_17.saveEntityNBT(plugin, hitEntity, headMeta); diff --git a/Main/src/main/java/com/github/nutt1101/event/HitEvent.java b/Main/src/main/java/com/github/nutt1101/event/HitEvent.java index 2672ff6..59193d0 100644 --- a/Main/src/main/java/com/github/nutt1101/event/HitEvent.java +++ b/Main/src/main/java/com/github/nutt1101/event/HitEvent.java @@ -258,6 +258,7 @@ public String getIsCustomEntity(Entity hitEntity) { String checkCustom = null; switch (CatchBall.getRealServerVersion()) { + case "v1_20" -> checkCustom = NBT_v1_20.isCustomEntity(hitEntity); case "v1_19" -> checkCustom = NBT_v1_19.isCustomEntity(hitEntity); case "v1_18" -> checkCustom = NBT_v1_18.isCustomEntity(hitEntity); case "v1_17" -> checkCustom = NBT_v1_17.isCustomEntity(hitEntity); diff --git a/Main/src/main/java/com/github/nutt1101/event/SkullClick.java b/Main/src/main/java/com/github/nutt1101/event/SkullClick.java index 597ca4e..f5aa99b 100644 --- a/Main/src/main/java/com/github/nutt1101/event/SkullClick.java +++ b/Main/src/main/java/com/github/nutt1101/event/SkullClick.java @@ -72,6 +72,7 @@ public void skullClick(PlayerInteractEvent event) { Entity entity = player.getWorld().spawnEntity(clickLocation, entityType); switch (CatchBall.getRealServerVersion()) { + case "v1_20" -> NBT_v1_20.loadEntityNBT(plugin, entity, data); case "v1_19" -> NBT_v1_19.loadEntityNBT(plugin, entity, data); case "v1_18" -> NBT_v1_18.loadEntityNBT(plugin, entity, data); case "v1_17" -> NBT_v1_17.loadEntityNBT(plugin, entity, data); diff --git a/Main/src/main/resources/plugin.yml b/Main/src/main/resources/plugin.yml index 5096fc3..aefe7fb 100644 --- a/Main/src/main/resources/plugin.yml +++ b/Main/src/main/resources/plugin.yml @@ -2,7 +2,7 @@ name: CatchBall main: com.github.nutt1101.CatchBall author: NUTT1101 description: "§bA plugin that make entity to be catchable.\n§dContact Me: https://discord.gg/zxN2tXb59v" -version: "1.1.7" +version: "1.1.8" api-version: 1.13 softdepend: [Residence, MythicMobs, GriefPrevention] permissions: diff --git a/pom.xml b/pom.xml index 67e9dee..5ca8ac7 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,14 @@ com.github.nutt1101 CatchBall - 1.1.7 + 1.1.8 v1_16 v1_17 v1_18 v1_19 + v1_20 Main diff --git a/v1_20/src/main/java/com/github/nutt1101/NBT_v1_20.java b/v1_20/src/main/java/com/github/nutt1101/NBT_v1_20.java new file mode 100644 index 0000000..7265775 --- /dev/null +++ b/v1_20/src/main/java/com/github/nutt1101/NBT_v1_20.java @@ -0,0 +1,37 @@ +package com.github.nutt1101; + +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.TagParser; +import org.bukkit.NamespacedKey; +import org.bukkit.craftbukkit.v1_20_R0.entity.CraftEntity; +import org.bukkit.entity.Entity; +import org.bukkit.inventory.meta.ItemMeta; +import org.bukkit.persistence.PersistentDataContainer; +import org.bukkit.persistence.PersistentDataType; +import org.bukkit.plugin.Plugin; + + +public class NBT_v1_20 { + + public static ItemMeta saveEntityNBT(Plugin plugin, Entity hitEntity, ItemMeta headMeta) { + net.minecraft.world.entity.Entity nmsEntity = ((CraftEntity) hitEntity).getHandle(); + headMeta.getPersistentDataContainer().set(new NamespacedKey(plugin, "entity"), PersistentDataType.STRING, nmsEntity.saveWithoutId(new CompoundTag()).toString()); + headMeta.getPersistentDataContainer().set(new NamespacedKey(plugin, "entityType"), PersistentDataType.STRING, hitEntity.getType().toString()); + return headMeta; + } + + public static void loadEntityNBT(Plugin plugin, Entity entity, PersistentDataContainer data) { + net.minecraft.world.entity.Entity nmsEntity = ((CraftEntity) entity).getHandle(); + try { + CompoundTag nbt = TagParser.parseTag(data.get(new NamespacedKey(plugin, "entity"), PersistentDataType.STRING)); + nmsEntity.load(nbt); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static String isCustomEntity(Entity hitEntity) { + net.minecraft.world.entity.Entity nmsEntity = ((CraftEntity) hitEntity).getHandle(); + return nmsEntity.saveWithoutId(new CompoundTag()).getString("Paper.SpawnReason"); + } +} From c11521e3e1c8316d47fda5bba0e79b765da0e5ea Mon Sep 17 00:00:00 2001 From: Maoyue <95519633+MagicTeaMC@users.noreply.github.com> Date: Thu, 8 Jun 2023 18:57:36 +0800 Subject: [PATCH 02/11] maybe done --- Main/pom.xml | 25 +- Main/src/main/resources/v1_20/entity.yml | 240 ++++++++++++++++++ v1_19/pom.xml | 2 +- .../java/com/github/nutt1101/NBT_v1_20.java | 2 +- 4 files changed, 262 insertions(+), 7 deletions(-) create mode 100644 Main/src/main/resources/v1_20/entity.yml diff --git a/Main/pom.xml b/Main/pom.xml index 91ecb7a..30266eb 100644 --- a/Main/pom.xml +++ b/Main/pom.xml @@ -5,7 +5,7 @@ CatchBall com.github.nutt1101 - 1.1.7 + 1.1.8 4.0.0 @@ -40,7 +40,7 @@ org.spigotmc spigot-api - 1.19-R0.1-SNAPSHOT + 1.20-R0.1-SNAPSHOT provided @@ -55,9 +55,9 @@ res Residence - 5.1.0.0 + 5.1.1.3 system - ${project.basedir}/libs/Residence5.1.0.0.jar + ${project.basedir}/libs/Residence5.1.1.3.jar @@ -115,11 +115,26 @@ com.github.nutt1101 v1_19 - 1.1.7 + 1.1.8 jar compile true + + + com.github.nutt1101 + v1_20 + 1.1.8 + jar + compile + true + + + com.github.nutt1101 + v1_20 + 1.1.8 + compile + diff --git a/Main/src/main/resources/v1_20/entity.yml b/Main/src/main/resources/v1_20/entity.yml new file mode 100644 index 0000000..a471360 --- /dev/null +++ b/Main/src/main/resources/v1_20/entity.yml @@ -0,0 +1,240 @@ +EntityList: + ALLAY: + DisplayName: "ALLAY" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYmVlYTg0NWNjMGI1OGZmNzYzZGVjZmZlMTFjZDFjODQ1YzVkMDljM2IwNGZlODBiMDY2M2RhNWM3YzY5OWViMyJ9fX0=" + AXOLOTL: + DisplayName : "AXOLOTL" + Skull : "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZThhOGEyZDdjY2YwYzM3NDZlMjNhYjU0OTEwNzBlMDkyM2YwNWIyMzVmOWEyZjVkNTNkMzg0MzUzODUzYmRkYyJ9fX0=" + BAT: + DisplayName: "BAT" + Skull : "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWU5OWRlZWY5MTlkYjY2YWMyYmQyOGQ2MzAyNzU2Y2NkNTdjN2Y4YjEyYjlkY2E4ZjQxYzNlMGEwNGFjMWNjIn19fQ==" + BEE: + DisplayName: "BEE" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZmEyY2I3NGMxMzI0NWQzY2U5YmFjYzhiMTYwMGFmMDJmZDdjOTFmNTAxZmVhZjk3MzY0ZTFmOGI2ZjA0ZjQ3ZiJ9fX0=" + BLAZE: + DisplayName: "BLAZE" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjc4ZWYyZTRjZjJjNDFhMmQxNGJmZGU5Y2FmZjEwMjE5ZjViMWJmNWIzNWE0OWViNTFjNjQ2Nzg4MmNiNWYwIn19fQ==" + CAT: + DisplayName: "CAT" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTZlN2M1NzRiZTk3NzdjY2VlMWE5NzYwMWNlY2M1YmVkZDVlYTZkNjY3NjViNjQyNGQ2YjJlYmJmZTY2MjViMSJ9fX0=" + CAVE_SPIDER: + DisplayName: "CAVE_SPIDER" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDE2NDVkZmQ3N2QwOTkyMzEwN2IzNDk2ZTk0ZWViNWMzMDMyOWY5N2VmYzk2ZWQ3NmUyMjZlOTgyMjQifX19" + MINECART_CHEST: + DisplayName: "MINECART_CHEST" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGNlZDM0MjExZmVkNDAxMGE4Yzg1NzI0YTI3ZmE1ZmIyMDVkNjc2ODRiM2RhNTE3YjY4MjEyNzljNmI2NWQzZiJ9fX0=" + CHICKEN: + DisplayName: "CHICKEN" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTYzODQ2OWE1OTljZWVmNzIwNzUzNzYwMzI0OGE5YWIxMWZmNTkxZmQzNzhiZWE0NzM1YjM0NmE3ZmFlODkzIn19fQ==" + COD: + DisplayName: "COD" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzg5MmQ3ZGQ2YWFkZjM1Zjg2ZGEyN2ZiNjNkYTRlZGRhMjExZGY5NmQyODI5ZjY5MTQ2MmE0ZmIxY2FiMCJ9fX0=" + COW: + DisplayName: "COW" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNWQ2YzZlZGE5NDJmN2Y1ZjcxYzMxNjFjNzMwNmY0YWVkMzA3ZDgyODk1ZjlkMmIwN2FiNDUyNTcxOGVkYzUifX19" + CREEPER: + DisplayName: "CREEPER" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjQyNTQ4MzhjMzNlYTIyN2ZmY2EyMjNkZGRhYWJmZTBiMDIxNWY3MGRhNjQ5ZTk0NDQ3N2Y0NDM3MGNhNjk1MiJ9fX0=" + DOLPHIN: + DisplayName: "DOLPHIN" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGU5Njg4Yjk1MGQ4ODBiNTViN2FhMmNmY2Q3NmU1YTBmYTk0YWFjNmQxNmY3OGU4MzNmNzQ0M2VhMjlmZWQzIn19fQ==" + DONKEY: + DisplayName: "DONKEY" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMzk5YmI1MGQxYTIxNGMzOTQ5MTdlMjViYjNmMmUyMDY5OGJmOThjYTcwM2U0Y2MwOGI0MjQ2MmRmMzA5ZDZlNiJ9fX0=" + DROWNED: + DisplayName: "DROWNED" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzg0ZGY3OWM0OTEwNGIxOThjZGFkNmQ5OWZkMGQwYmNmMTUzMWM5MmQ0YWI2MjY5ZTQwYjdkM2NiYmI4ZTk4YyJ9fX0=" + ELDER_GUARDIAN: + DisplayName: "ELDER_GUARDIAN" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMWM3OTc0ODJhMTRiZmNiODc3MjU3Y2IyY2ZmMWI2ZTZhOGI4NDEzMzM2ZmZiNGMyOWE2MTM5Mjc4YjQzNmIifX19" + ENDER_CRYSTAL: + DisplayName: "ENDER_CRYSTAL" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjMyZjBhNjM4NjI0NjE0YzcxOWU1Y2EyZGU0YTM2MjVhZmFlMTU3MmE1MDQzZGUyZWE2NGFiZWQ0MzkifX19" + ENDERMAN: + DisplayName: "ENDERMAN" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2E1OWJiMGE3YTMyOTY1YjNkOTBkOGVhZmE4OTlkMTgzNWY0MjQ1MDllYWRkNGU2YjcwOWFkYTUwYjljZiJ9fX0=" + ENDERMITE: + DisplayName: "ENDERMITE" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNWJjN2I5ZDM2ZmI5MmI2YmYyOTJiZTczZDMyYzZjNWIwZWNjMjViNDQzMjNhNTQxZmFlMWYxZTY3ZTM5M2EzZSJ9fX0=" + EVOKER: + DisplayName: "EVOKER" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDk1NDEzNWRjODIyMTM5NzhkYjQ3ODc3OGFlMTIxMzU5MWI5M2QyMjhkMzZkZDU0ZjFlYTFkYTQ4ZTdjYmE2In19fQ==" + FOX: + DisplayName: "FOX" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDg5NTRhNDJlNjllMDg4MWFlNmQyNGQ0MjgxNDU5YzE0NGEwZDVhOTY4YWVkMzVkNmQzZDczYTNjNjVkMjZhIn19fQ==" + FROG: + DisplayName: "FROG" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjdiNzI5N2I2ZWNhMGIxNWU0NmE2MjViYTYyZGQwYmExZTJlNDMwZDRiYmIzMThiYjg4MDFhZjE4MDU2NzBiYiJ9fX0=" + MINECART_FURNACE: + DisplayName: "MINECART_FURNACE" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTA3OWFiYmFmYjk4MWM3OTVhOWEyZjgyYmFiM2ZiZDlmMTY2YjhjMGRiZjlhMTc1MWQ3NjliZWFjNjY3YjYifX19" + GHAST: + DisplayName: "GHAST" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2E4YjcxNGQzMmQ3ZjZjZjhiMzdlMjIxYjc1OGI5YzU5OWZmNzY2NjdjN2NkNDViYmM0OWM1ZWYxOTg1ODY0NiJ9fX0=" + GLOW_SQUID: + DisplayName: "GLOW_SQUID" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMmVjZDBiNWViNmIzODRkYjA3NmQ4NDQ2MDY1MjAyOTU5ZGRkZmYwMTYxZTBkNzIzYjNkZjBjYzU4NmQxNmJiZCJ9fX0=" + GOAT: + DisplayName: "GOAT" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYTY2MjMzNmQ4YWUwOTI0MDdlNThmN2NjODBkMjBmMjBlNzY1MDM1N2E0NTRjZTE2ZTMzMDc2MTlhMDExMDY0OCJ9fX0=" + GUARDIAN: + DisplayName: "GUARDIAN" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTMyYzI0NTI0YzgyYWIzYjNlNTdjMjA1MmM1MzNmMTNkZDhjMGJlYjhiZGQwNjM2OWJiMjU1NGRhODZjMTIzIn19fQ==" + HOGLIN: + DisplayName: "HOGLIN" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWJiOWJjMGYwMWRiZDc2MmEwOGQ5ZTc3YzA4MDY5ZWQ3Yzk1MzY0YWEzMGNhMTA3MjIwODU2MWI3MzBlOGQ3NSJ9fX0=" + MINECART_HOPPER: + DisplayName: "MINECART_HOPPER" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGViODFlZjg5MDIzNzk2NTBiYTc5ZjQ1NzIzZDZiOWM4ODgzODhhMDBmYzRlMTkyZjM0NTRmZTE5Mzg4MmVlMSJ9fX0=" + HORSE: + DisplayName: "HORSE" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDUwZjk5MjU5OWE1NWE4MzExMzczYTU0MTI3MTZiYjdmOTFjZjM5YWZhZGVhMjUxN2Y0MTVkNzI4NzlhMiJ9fX0=" + HUSK: + DisplayName: "HUSK" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDY3NGM2M2M4ZGI1ZjRjYTYyOGQ2OWEzYjFmOGEzNmUyOWQ4ZmQ3NzVlMWE2YmRiNmNhYmI0YmU0ZGIxMjEifX19" + IRON_GOLEM: + DisplayName: "IRON_GOLEM" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjJiY2FjZWViNDE2MmY0MDBkNDQ3NDMzMTU5MzJhYzgyMGQzMTE5YWM4OTg2YTAxNjFhNzI2MTYxY2NjOTNmYyJ9fX0=" + LLAMA: + DisplayName: "LLAMA" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2YyNGU1NmZkOWZmZDcxMzNkYTZkMWYzZTJmNDU1OTUyYjFkYTQ2MjY4NmY3NTNjNTk3ZWU4MjI5OWEifX19" + MAGMA_CUBE: + DisplayName: "MAGMA_CUBE" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYTFjOTdhMDZlZmRlMDRkMDAyODdiZjIwNDE2NDA0YWIyMTAzZTEwZjA4NjIzMDg3ZTFiMGMxMjY0YTFjMGYwYyJ9fX0=" + MINECART: + DisplayName: "MINECART" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzQyMDcwYWNjODE0YmM5NDZlNTk4NzllYzdkYTQ1ZGU5ODRkM2VlOWExNTkzOTNkZWZiNTk4NTNhYmUzYjYifX19" + MUSHROOM_COW: + DisplayName: "MUSHROOM_COW" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMmI1Mjg0MWYyZmQ1ODllMGJjODRjYmFiZjllMWMyN2NiNzBjYWM5OGY4ZDZiM2RkMDY1ZTU1YTRkY2I3MGQ3NyJ9fX0=" + MULE: + DisplayName: "MULE" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYTA0ODZhNzQyZTdkZGEwYmFlNjFjZTJmNTVmYTEzNTI3ZjFjM2IzMzRjNTdjMDM0YmI0Y2YxMzJmYjVmNWYifX19" + OCELOT: + DisplayName: "OCELOT" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTY1N2NkNWMyOTg5ZmY5NzU3MGZlYzRkZGNkYzY5MjZhNjhhMzM5MzI1MGMxYmUxZjBiMTE0YTFkYjEifX19" + PANDA: + DisplayName: "PANDA" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZGYwMDg1ODkyNmNkOGNkZjNmMWNmNzFlMjEwY2RlNWRhZjg3MDgzMjA1NDdiZDZkZjU3OTU4NTljNjhkOWIzZiJ9fX0=" + PARROT: + DisplayName: "PARROT" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzA3ZGFiMmNiZWJlYTUzOWI2NGQ1YWQyNDZmOWNjYzFmY2RhN2FhOTRiODhlNTlmYzI4Mjk4NTJmNDYwNzEifX19" + PHANTOM: + DisplayName: "PHANTOM" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2U5NTE1M2VjMjMyODRiMjgzZjAwZDE5ZDI5NzU2ZjI0NDMxM2EwNjFiNzBhYzAzYjk3ZDIzNmVlNTdiZDk4MiJ9fX0=" + PIG: + DisplayName: "PIG" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjIxNjY4ZWY3Y2I3OWRkOWMyMmNlM2QxZjNmNGNiNmUyNTU5ODkzYjZkZjRhNDY5NTE0ZTY2N2MxNmFhNCJ9fX0=" + PIGLIN: + DisplayName: "PIGLIN" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWYxODEwN2QyNzVmMWNiM2E5Zjk3M2U1OTI4ZDU4NzlmYTQwMzI4ZmYzMjU4MDU0ZGI2ZGQzZTdjMGNhNjMzMCJ9fX0=" + PIGLIN_BRUTE: + DisplayName: "PIGLIN_BRUTE" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvM2UzMDBlOTAyNzM0OWM0OTA3NDk3NDM4YmFjMjllM2E0Yzg3YTg0OGM1MGIzNGMyMTI0MjcyN2I1N2Y0ZTFjZiJ9fX0=" + PILLAGER: + DisplayName: "PILLAGER" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGFlZTZiYjM3Y2JmYzkyYjBkODZkYjVhZGE0NzkwYzY0ZmY0NDY4ZDY4Yjg0OTQyZmRlMDQ0MDVlOGVmNTMzMyJ9fX0=" + POLAR_BEAR: + DisplayName: "POLAR_BEAR" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDQ2ZDIzZjA0ODQ2MzY5ZmEyYTM3MDJjMTBmNzU5MTAxYWY3YmZlODQxOTk2NjQyOTUzM2NkODFhMTFkMmIifX19" + PUFFERFISH: + DisplayName: "PUFFERFISH" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTcxNTI4NzZiYzNhOTZkZDJhMjI5OTI0NWVkYjNiZWVmNjQ3YzhhNTZhYzg4NTNhNjg3YzNlN2I1ZDhiYiJ9fX0=" + RABBIT: + DisplayName: "RABBIT" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjRkY2ZlZDY4OTdhMThhN2FiOTk1YTY2MTM0ZDQxYTFjYTgyMWI2OWJjYjdkMTRjZjI2OWI0YTk4ZGY0OWE4In19fQ==" + RAVAGER: + DisplayName: "RAVAGER" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2QyMGJmNTJlYzM5MGEwNzk5Mjk5MTg0ZmM2NzhiZjg0Y2Y3MzJiYjFiZDc4ZmQxYzRiNDQxODU4ZjAyMzVhOCJ9fX0=" + SALMON: + DisplayName: "SALMON" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOGFlYjIxYTI1ZTQ2ODA2Y2U4NTM3ZmJkNjY2ODI4MWNmMTc2Y2VhZmU5NWFmOTBlOTRhNWZkODQ5MjQ4NzgifX19" + SHEEP: + DisplayName: "SHEEP" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZjMxZjljY2M2YjNlMzJlY2YxM2I4YTExYWMyOWNkMzNkMThjOTVmYzczZGI4YTY2YzVkNjU3Y2NiOGJlNzAifX19" + SHULKER: + DisplayName: "SHULKER" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZmViZjAwM2NmZjA4OGU0ZDU4OTllNDcyYTRlNzlkYTFhNWM1MjdhYWQ1NTExMGJjZDcyNDBjMjU0NDkxMGMyMSJ9fX0=" + SILVERFISH: + DisplayName: "SILVERFISH" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZGE5MWRhYjgzOTFhZjVmZGE1NGFjZDJjMGIxOGZiZDgxOWI4NjVlMWE4ZjFkNjIzODEzZmE3NjFlOTI0NTQwIn19fQ==" + SKELETON: + DisplayName: "SKELETON" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZmNhNDQ1NzQ5MjUxYmRkODk4ZmI4M2Y2Njc4NDRlMzhhMWRmZjc5YTE1MjlmNzlhNDI0NDdhMDU5OTMxMGVhNCJ9fX0=" + SKELETON_HORSE: + DisplayName: "SKELETON_HORSE" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDdlZmZjZTM1MTMyYzg2ZmY3MmJjYWU3N2RmYmIxZDIyNTg3ZTk0ZGYzY2JjMjU3MGVkMTdjZjg5NzNhIn19fQ==" + SLIME: + DisplayName: "SLIME" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYTIwZTg0ZDMyZDFlOWM5MTlkM2ZkYmI1M2YyYjM3YmEyNzRjMTIxYzU3YjI4MTBlNWE0NzJmNDBkYWNmMDA0ZiJ9fX0=" + SNOWMAN: + DisplayName: "SNOWMAN" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMWZkZmQxZjc1MzhjMDQwMjU4YmU3YTkxNDQ2ZGE4OWVkODQ1Y2M1ZWY3MjhlYjVlNjkwNTQzMzc4ZmNmNCJ9fX0=" + SPIDER: + DisplayName: "SPIDER" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOWVjZWRmNDJhNjFlMTQyMzEzMTE3NzI4YTEwMTMzMjljZjlmNjcxN2Q2YWNjYzVhNzVmYzA0NDI1ODA0NSJ9fX0=" + SQUID: + DisplayName: "SQUID" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMDE0MzNiZTI0MjM2NmFmMTI2ZGE0MzRiODczNWRmMWViNWIzY2IyY2VkZTM5MTQ1OTc0ZTljNDgzNjA3YmFjIn19fQ==" + STRAY: + DisplayName: "STRAY" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMmM1MDk3OTE2YmMwNTY1ZDMwNjAxYzBlZWJmZWIyODcyNzdhMzRlODY3YjRlYTQzYzYzODE5ZDUzZTg5ZWRlNyJ9fX0=" + STRIDER: + DisplayName: "STRIDER" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMThhOWFkZjc4MGVjN2RkNDYyNWM5YzA3NzkwNTJlNmExNWE0NTE4NjY2MjM1MTFlNGM4MmU5NjU1NzE0YjNjMSJ9fX0=" + TADPOLE: + DisplayName: "TADPOLE" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjIzZWJmMjZiN2E0NDFlMTBhODZmYjVjMmE1ZjNiNTE5MjU4YTVjNWRkZGQ2YTFhNzU1NDlmNTE3MzMyODE1YiJ9fX0=" + TRADER_LLAMA: + DisplayName: "TRADER_LLAMA" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODQyNDc4MGIzYzVjNTM1MWNmNDlmYjViZjQxZmNiMjg5NDkxZGY2YzQzMDY4M2M4NGQ3ODQ2MTg4ZGI0Zjg0ZCJ9fX0=" + TROPICAL_FISH: + DisplayName: "TROPICAL_FISH" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZDZkZDVlNmFkZGI1NmFjYmM2OTRlYTRiYTU5MjNiMWIyNTY4ODE3OGZlZmZhNzIyOTAyOTllMjUwNWM5NzI4MSJ9fX0=" + TURTLE: + DisplayName: "TURTLE" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMGE0MDUwZTdhYWNjNDUzOTIwMjY1OGZkYzMzOWRkMTgyZDdlMzIyZjlmYmNjNGQ1Zjk5YjU3MThhIn19fQ==" + VEX: + DisplayName: "VEX" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzJlYzVhNTE2NjE3ZmYxNTczY2QyZjlkNWYzOTY5ZjU2ZDU1NzVjNGZmNGVmZWZhYmQyYTE4ZGM3YWI5OGNkIn19fQ==" + VILLAGER: + DisplayName: "VILLAGER" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDFiODMwZWI0MDgyYWNlYzgzNmJjODM1ZTQwYTExMjgyYmI1MTE5MzMxNWY5MTE4NDMzN2U4ZDM1NTU1ODMifX19" + VINDICATOR: + DisplayName: "VINDICATOR" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNmRlYWVjMzQ0YWIwOTViNDhjZWFkNzUyN2Y3ZGVlNjFiMDYzZmY3OTFmNzZhOGZhNzY2NDJjODY3NmUyMTczIn19fQ==" + WARDEN: + DisplayName: "WARDEN" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMzk1OWFlMDJlMzVjYmM0NzQzZTZlNzAyZmRhNjk4MGJhZDJlOTgwNDk0MDNjMTY5OTYyODZlYjQxMmY5NDY4OSJ9fX0=" + WANDERING_TRADER: + DisplayName: "WANDERING_TRADER" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNWYxMzc5YTgyMjkwZDdhYmUxZWZhYWJiYzcwNzEwZmYyZWMwMmRkMzRhZGUzODZiYzAwYzkzMGM0NjFjZjkzMiJ9fX0=" + WITCH: + DisplayName: "WITCH" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMjBlMTNkMTg0NzRmYzk0ZWQ1NWFlYjcwNjk1NjZlNDY4N2Q3NzNkYWMxNmY0YzNmODcyMmZjOTViZjlmMmRmYSJ9fX0=" + WITHER: + DisplayName: "WITHER" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvY2RmNzRlMzIzZWQ0MTQzNjk2NWY1YzU3ZGRmMjgxNWQ1MzMyZmU5OTllNjhmYmI5ZDZjZjVjOGJkNDEzOWYifX19" + WITHER_SKELETON: + DisplayName: "WITHER_SKELETON" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzk1M2I2YzY4NDQ4ZTdlNmI2YmY4ZmIyNzNkNzIwM2FjZDhlMWJlMTllODE0ODFlYWQ1MWY0NWRlNTlhOCJ9fX0=" + WOLF: + DisplayName: "WOLF" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMWQ4MzczMWQ3N2Y1NGY1ZDRmOTNkZGQ5OWI5NDc2ZTRmMWZlNWI3ZTEzMThmMWUxNjI2ZjdkM2ZhM2FhODQ3In19fQ==" + ZOGLIN: + DisplayName: "ZOGLIN" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTY3ZTE4NjAyZTAzMDM1YWQ2ODk2N2NlMDkwMjM1ZDg5OTY2NjNmYjllYTQ3NTc4ZDNhN2ViYmM0MmE1Y2NmOSJ9fX0=" + ZOMBIE: + DisplayName: "ZOMBIE" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNTZmYzg1NGJiODRjZjRiNzY5NzI5Nzk3M2UwMmI3OWJjMTA2OTg0NjBiNTFhNjM5YzYwZTVlNDE3NzM0ZTExIn19fQ==" + ZOMBIE_HORSE: + DisplayName: "ZOMBIE_HORSE" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTcxY2U0NjljYmE0NDI2YzgxMWY2OWJlNWQ5NThhMDliZmI5YjFiMmJiNjQ5ZDM1NzdhMGMyMTYxYWQyZjUyNCJ9fX0=" + ZOMBIE_VILLAGER: + DisplayName: "ZOMBIE_VILLAGER" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTVlMDhhODc3NmMxNzY0YzNmZTZhNmRkZDQxMmRmY2I4N2Y0MTMzMWRhZDQ3OWFjOTZjMjFkZjRiZjNhYzg5YyJ9fX0=" + ZOMBIFIED_PIGLIN: + DisplayName: "ZOMBIFIED_PIGLIN" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2VhYmFlY2M1ZmFlNWE4YTQ5Yzg4NjNmZjQ4MzFhYWEyODQxOThmMWEyMzk4ODkwYzc2NWUwYThkZTE4ZGE4YyJ9fX0=" +CatchableEntity: +- SHEEP \ No newline at end of file diff --git a/v1_19/pom.xml b/v1_19/pom.xml index 319438b..56279f1 100644 --- a/v1_19/pom.xml +++ b/v1_19/pom.xml @@ -5,7 +5,7 @@ CatchBall com.github.nutt1101 - 1.1.7 + 1.1.8 4.0.0 diff --git a/v1_20/src/main/java/com/github/nutt1101/NBT_v1_20.java b/v1_20/src/main/java/com/github/nutt1101/NBT_v1_20.java index 7265775..cb1f4e3 100644 --- a/v1_20/src/main/java/com/github/nutt1101/NBT_v1_20.java +++ b/v1_20/src/main/java/com/github/nutt1101/NBT_v1_20.java @@ -3,7 +3,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.TagParser; import org.bukkit.NamespacedKey; -import org.bukkit.craftbukkit.v1_20_R0.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_20_R1.entity.CraftEntity; import org.bukkit.entity.Entity; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.persistence.PersistentDataContainer; From 0688aa9c891f609e4faba2f43998321dd5c65d06 Mon Sep 17 00:00:00 2001 From: Maoyue <95519633+MagicTeaMC@users.noreply.github.com> Date: Thu, 8 Jun 2023 19:04:28 +0800 Subject: [PATCH 03/11] why api version use 1.13? --- Main/src/main/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Main/src/main/resources/plugin.yml b/Main/src/main/resources/plugin.yml index aefe7fb..75daaaf 100644 --- a/Main/src/main/resources/plugin.yml +++ b/Main/src/main/resources/plugin.yml @@ -3,7 +3,7 @@ main: com.github.nutt1101.CatchBall author: NUTT1101 description: "§bA plugin that make entity to be catchable.\n§dContact Me: https://discord.gg/zxN2tXb59v" version: "1.1.8" -api-version: 1.13 +api-version: 1.16 softdepend: [Residence, MythicMobs, GriefPrevention] permissions: catchball.op: From cde71bf379c1ad714e7beff289b527dc3f31b33f Mon Sep 17 00:00:00 2001 From: Maoyue <95519633+MagicTeaMC@users.noreply.github.com> Date: Thu, 8 Jun 2023 19:05:32 +0800 Subject: [PATCH 04/11] [ci skip] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e42e72a..5f6748a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ## Version: -- [1,19, 1.18, 1.17, 1.16](https://github.com/NUTT1101/CatchBall/releases) +- [1.20, 1.19, 1.18, 1.17, 1.16](https://github.com/NUTT1101/CatchBall/releases) ## Language: - English(Default) From 765a29418d991f299cae7084a0d48c580308c129 Mon Sep 17 00:00:00 2001 From: Maoyue <95519633+MagicTeaMC@users.noreply.github.com> Date: Thu, 8 Jun 2023 19:40:56 +0800 Subject: [PATCH 05/11] just test --- Main/pom.xml | 6 +++++ v1_16/pom.xml | 2 +- v1_17/pom.xml | 2 +- v1_18/pom.xml | 2 +- v1_20/pom.xml | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 v1_20/pom.xml diff --git a/Main/pom.xml b/Main/pom.xml index 30266eb..bb81691 100644 --- a/Main/pom.xml +++ b/Main/pom.xml @@ -135,6 +135,12 @@ 1.1.8 compile + + com.github.nutt1101 + v1_18 + 1.1.8 + compile + diff --git a/v1_16/pom.xml b/v1_16/pom.xml index 31ec883..42928b2 100644 --- a/v1_16/pom.xml +++ b/v1_16/pom.xml @@ -5,7 +5,7 @@ CatchBall com.github.nutt1101 - 1.1.4 + 1.1.8 4.0.0 diff --git a/v1_17/pom.xml b/v1_17/pom.xml index 9647d89..84c0244 100644 --- a/v1_17/pom.xml +++ b/v1_17/pom.xml @@ -5,7 +5,7 @@ CatchBall com.github.nutt1101 - 1.1.4 + 1.1.8 4.0.0 diff --git a/v1_18/pom.xml b/v1_18/pom.xml index c98a048..7101ae4 100644 --- a/v1_18/pom.xml +++ b/v1_18/pom.xml @@ -5,7 +5,7 @@ CatchBall com.github.nutt1101 - 1.1.4 + 1.1.8 4.0.0 diff --git a/v1_20/pom.xml b/v1_20/pom.xml new file mode 100644 index 0000000..2547203 --- /dev/null +++ b/v1_20/pom.xml @@ -0,0 +1,67 @@ + + + + CatchBall + com.github.nutt1101 + 1.1.8 + + 4.0.0 + + v1_20 + + + 16 + 16 + + + + + org.spigotmc + spigot + 1.20-R0.1-SNAPSHOT + remapped-mojang + provided + + + + + + + net.md-5 + specialsource-maven-plugin + 1.2.2 + + + package + + remap + + remap-obf + + org.spigotmc:minecraft-server:1.20-R0.1-SNAPSHOT:txt:maps-mojang + true + org.spigotmc:spigot:1.20-R0.1-SNAPSHOT:jar:remapped-mojang + true + remapped-obf + + + + package + + remap + + remap-spigot + + ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar + org.spigotmc:minecraft-server:1.20-R0.1-SNAPSHOT:csrg:maps-spigot + org.spigotmc:spigot:1.20-R0.1-SNAPSHOT:jar:remapped-obf + + + + + + + + \ No newline at end of file From 552ba841437ad8dd843425e1399bc1963bf57d13 Mon Sep 17 00:00:00 2001 From: Maoyue <95519633+MagicTeaMC@users.noreply.github.com> Date: Thu, 8 Jun 2023 20:33:40 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E9=80=99=E6=AC=A1=E7=9C=9F=E7=9A=84?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Main/pom.xml | 12 +++++++++--- v1_19/pom.xml | 8 ++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Main/pom.xml b/Main/pom.xml index bb81691..0a51d72 100644 --- a/Main/pom.xml +++ b/Main/pom.xml @@ -88,7 +88,7 @@ com.github.nutt1101 v1_16 - 1.1.4 + 1.1.8 jar compile true @@ -97,7 +97,7 @@ com.github.nutt1101 v1_17 - 1.1.4 + 1.1.8 jar compile true @@ -106,7 +106,7 @@ com.github.nutt1101 v1_18 - 1.1.4 + 1.1.8 jar compile true @@ -141,6 +141,12 @@ 1.1.8 compile + + com.github.nutt1101 + v1_17 + 1.1.8 + compile + diff --git a/v1_19/pom.xml b/v1_19/pom.xml index 56279f1..6bfbd03 100644 --- a/v1_19/pom.xml +++ b/v1_19/pom.xml @@ -40,9 +40,9 @@ remap-obf - org.spigotmc:minecraft-server:1.19-R0.1-SNAPSHOT:txt:maps-mojang + org.spigotmc:minecraft-server:1.19.4-R0.1-SNAPSHOT:txt:maps-mojang true - org.spigotmc:spigot:1.19-R0.1-SNAPSHOT:jar:remapped-mojang + org.spigotmc:spigot:1.19.4-R0.1-SNAPSHOT:jar:remapped-mojang true remapped-obf @@ -55,8 +55,8 @@ remap-spigot ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - org.spigotmc:minecraft-server:1.19-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:1.19-R0.1-SNAPSHOT:jar:remapped-obf + org.spigotmc:minecraft-server:1.19.4-R0.1-SNAPSHOT:csrg:maps-spigot + org.spigotmc:spigot:1.19.4-R0.1-SNAPSHOT:jar:remapped-obf From ac752d79d4afa072facdfe51b418a8c29dced6cf Mon Sep 17 00:00:00 2001 From: Maoyue <95519633+MagicTeaMC@users.noreply.github.com> Date: Thu, 8 Jun 2023 20:56:11 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=88=AA=E9=99=A4=E9=87=8D=E8=A4=87?= =?UTF-8?q?=E7=9A=84=E6=9D=B1=E8=A5=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Main/pom.xml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/Main/pom.xml b/Main/pom.xml index 0a51d72..e160d6a 100644 --- a/Main/pom.xml +++ b/Main/pom.xml @@ -129,24 +129,6 @@ compile true - - com.github.nutt1101 - v1_20 - 1.1.8 - compile - - - com.github.nutt1101 - v1_18 - 1.1.8 - compile - - - com.github.nutt1101 - v1_17 - 1.1.8 - compile - From a4cfdd38f0421d6d0902ffed1342b7cb54fe4423 Mon Sep 17 00:00:00 2001 From: Maoyue <95519633+MagicTeaMC@users.noreply.github.com> Date: Thu, 8 Jun 2023 22:20:16 +0800 Subject: [PATCH 08/11] add 1.20 things to entity.yml --- Main/src/main/resources/v1_20/entity.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Main/src/main/resources/v1_20/entity.yml b/Main/src/main/resources/v1_20/entity.yml index a471360..2a099ed 100644 --- a/Main/src/main/resources/v1_20/entity.yml +++ b/Main/src/main/resources/v1_20/entity.yml @@ -236,5 +236,11 @@ EntityList: ZOMBIFIED_PIGLIN: DisplayName: "ZOMBIFIED_PIGLIN" Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2VhYmFlY2M1ZmFlNWE4YTQ5Yzg4NjNmZjQ4MzFhYWEyODQxOThmMWEyMzk4ODkwYzc2NWUwYThkZTE4ZGE4YyJ9fX0=" + SNIFFER: + DisplayName: "SNIFFER" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODdhZDkyMGE2NmUzOGNjMzQyNmE1YmZmMDg0NjY3ZTg3NzIxMTY5MTVlMjk4MDk4NTY3YzEzOWYyMjJlMmM0MiJ9fX0=" + CAMEL: + DisplayName: "CAMEL" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYTEwOTFjZTZlNTU5YzI2YmU3N2VlNjA0NTZiNjIxMjI5OTBmOTUxOWY1MTRiMTFkZjM1NjQxNDljMjcyOWQwNSJ9fX0=" CatchableEntity: - SHEEP \ No newline at end of file From 59900b85b529ba74fd31f0373e1fccf62259cee4 Mon Sep 17 00:00:00 2001 From: Maoyue <95519633+MagicTeaMC@users.noreply.github.com> Date: Fri, 9 Jun 2023 06:14:52 +0800 Subject: [PATCH 09/11] update bstats --- Main/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Main/pom.xml b/Main/pom.xml index e160d6a..6f0d25e 100644 --- a/Main/pom.xml +++ b/Main/pom.xml @@ -80,7 +80,7 @@ org.bstats bstats-bukkit - 2.2.1 + 3.0.1 compile From a2b90ce1d36ec95f1ab413f959a0263f3c7db4ed Mon Sep 17 00:00:00 2001 From: Maoyue <95519633+MagicTeaMC@users.noreply.github.com> Date: Fri, 9 Jun 2023 06:29:14 +0800 Subject: [PATCH 10/11] update somethings... --- Main/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Main/pom.xml b/Main/pom.xml index 6f0d25e..693d158 100644 --- a/Main/pom.xml +++ b/Main/pom.xml @@ -62,9 +62,9 @@ - io.lumine.xikage - MythicMobs - 4.11.0 + io.lumine + Mythic-Dist + 5.2.5 provided @@ -72,7 +72,7 @@ com.github.TechFortress GriefPrevention - 16.17.1 + 16.18.1 provided From bf098da4639e44f24e0ab3dafb92e43b9d201a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sat-Ba=CC=8Dk-H=C3=AE?= Date: Fri, 9 Jun 2023 16:44:48 +0800 Subject: [PATCH 11/11] Update entity.yml --- Main/src/main/resources/v1_20/entity.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Main/src/main/resources/v1_20/entity.yml b/Main/src/main/resources/v1_20/entity.yml index 2a099ed..e2abb13 100644 --- a/Main/src/main/resources/v1_20/entity.yml +++ b/Main/src/main/resources/v1_20/entity.yml @@ -17,6 +17,9 @@ EntityList: CAT: DisplayName: "CAT" Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTZlN2M1NzRiZTk3NzdjY2VlMWE5NzYwMWNlY2M1YmVkZDVlYTZkNjY3NjViNjQyNGQ2YjJlYmJmZTY2MjViMSJ9fX0=" + CAMEL: + DisplayName: "CAMEL" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYTEwOTFjZTZlNTU5YzI2YmU3N2VlNjA0NTZiNjIxMjI5OTBmOTUxOWY1MTRiMTFkZjM1NjQxNDljMjcyOWQwNSJ9fX0=" CAVE_SPIDER: DisplayName: "CAVE_SPIDER" Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNDE2NDVkZmQ3N2QwOTkyMzEwN2IzNDk2ZTk0ZWViNWMzMDMyOWY5N2VmYzk2ZWQ3NmUyMjZlOTgyMjQifX19" @@ -167,6 +170,9 @@ EntityList: SLIME: DisplayName: "SLIME" Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYTIwZTg0ZDMyZDFlOWM5MTlkM2ZkYmI1M2YyYjM3YmEyNzRjMTIxYzU3YjI4MTBlNWE0NzJmNDBkYWNmMDA0ZiJ9fX0=" + SNIFFER: + DisplayName: "SNIFFER" + Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODdhZDkyMGE2NmUzOGNjMzQyNmE1YmZmMDg0NjY3ZTg3NzIxMTY5MTVlMjk4MDk4NTY3YzEzOWYyMjJlMmM0MiJ9fX0=" SNOWMAN: DisplayName: "SNOWMAN" Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMWZkZmQxZjc1MzhjMDQwMjU4YmU3YTkxNDQ2ZGE4OWVkODQ1Y2M1ZWY3MjhlYjVlNjkwNTQzMzc4ZmNmNCJ9fX0=" @@ -236,11 +242,5 @@ EntityList: ZOMBIFIED_PIGLIN: DisplayName: "ZOMBIFIED_PIGLIN" Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvN2VhYmFlY2M1ZmFlNWE4YTQ5Yzg4NjNmZjQ4MzFhYWEyODQxOThmMWEyMzk4ODkwYzc2NWUwYThkZTE4ZGE4YyJ9fX0=" - SNIFFER: - DisplayName: "SNIFFER" - Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvODdhZDkyMGE2NmUzOGNjMzQyNmE1YmZmMDg0NjY3ZTg3NzIxMTY5MTVlMjk4MDk4NTY3YzEzOWYyMjJlMmM0MiJ9fX0=" - CAMEL: - DisplayName: "CAMEL" - Skull: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYTEwOTFjZTZlNTU5YzI2YmU3N2VlNjA0NTZiNjIxMjI5OTBmOTUxOWY1MTRiMTFkZjM1NjQxNDljMjcyOWQwNSJ9fX0=" CatchableEntity: -- SHEEP \ No newline at end of file +- SHEEP