diff --git a/build.gradle.kts b/build.gradle.kts index fb18f1f..8145cdb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,7 +15,7 @@ java { } dependencies { - paperweight.paperDevBundle("1.20.2-R0.1-SNAPSHOT") + paperweight.paperDevBundle("1.20.4-R0.1-SNAPSHOT") // paperweight.foliaDevBundle("1.20.1-R0.1-SNAPSHOT") // paperweight.devBundle("com.example.paperfork", "1.20.1-R0.1-SNAPSHOT") @@ -31,9 +31,6 @@ dependencies { implementation ("me.lucko:commodore:2.2") implementation ("me.lucko:commodore-file:1.0") - //protocol-lib - compileOnly ("com.comphenix.protocol:ProtocolLib:5.1.0") - //goldman player data compileOnly ("lee.code.playerdata:playerdata:1.0.0") } diff --git a/src/main/java/lee/code/pets/Pets.java b/src/main/java/lee/code/pets/Pets.java index 155647a..271c588 100644 --- a/src/main/java/lee/code/pets/Pets.java +++ b/src/main/java/lee/code/pets/Pets.java @@ -1,7 +1,5 @@ package lee.code.pets; -import com.comphenix.protocol.ProtocolLibrary; -import com.comphenix.protocol.ProtocolManager; import com.mojang.brigadier.tree.LiteralCommandNode; import lee.code.pets.commands.PetCMD; import lee.code.pets.commands.TabCompletion; @@ -24,7 +22,6 @@ public class Pets extends JavaPlugin { @Getter private PetManager petManager; - @Getter private ProtocolManager protocolManager; @Getter private CacheManager cacheManager; @Getter private MenuManager menuManager; @Getter private DelayManager delayManager; @@ -36,7 +33,6 @@ public void onEnable() { this.databaseManager = new DatabaseManager(this); this.cacheManager = new CacheManager(this, databaseManager); this.menuManager = new MenuManager(); - this.protocolManager = ProtocolLibrary.getProtocolManager(); this.petManager = new PetManager(this); this.delayManager = new DelayManager(this); this.renameManager = new RenameManager(this); diff --git a/src/main/java/lee/code/pets/utils/PetEffects.java b/src/main/java/lee/code/pets/enums/PetEffects.java similarity index 98% rename from src/main/java/lee/code/pets/utils/PetEffects.java rename to src/main/java/lee/code/pets/enums/PetEffects.java index 441a33f..7a2ca3b 100644 --- a/src/main/java/lee/code/pets/utils/PetEffects.java +++ b/src/main/java/lee/code/pets/enums/PetEffects.java @@ -1,4 +1,4 @@ -package lee.code.pets.utils; +package lee.code.pets.enums; import lombok.AllArgsConstructor; import lombok.Getter; @@ -86,7 +86,8 @@ public enum PetEffects { ZOMBIE_VILLAGER(EntityType.ZOMBIE_VILLAGER, new PotionEffect(PotionEffectType.REGENERATION, 20 * 20, 0), PotionType.REGEN), ENDER_DRAGON(EntityType.ENDER_DRAGON, new PotionEffect(PotionEffectType.HEALTH_BOOST, 20 * 20, 5), PotionType.INSTANT_HEAL), ZOMBIE_HORSE(EntityType.ZOMBIE_HORSE, new PotionEffect(PotionEffectType.HEALTH_BOOST, 20 * 20, 1), PotionType.INSTANT_HEAL), - BEE(EntityType.BEE, new PotionEffect(PotionEffectType.SPEED, 20 * 20, 1), PotionType.SPEED) + BEE(EntityType.BEE, new PotionEffect(PotionEffectType.SPEED, 20 * 20, 1), PotionType.SPEED), + BREEZE(EntityType.BREEZE, new PotionEffect(PotionEffectType.INCREASE_DAMAGE, 20 * 20, 1), PotionType.INSTANT_DAMAGE) ; @Getter private final EntityType entityType; diff --git a/src/main/java/lee/code/pets/menus/menu/menudata/MenuItem.java b/src/main/java/lee/code/pets/menus/menu/menudata/MenuItem.java index 400308a..bc71d04 100644 --- a/src/main/java/lee/code/pets/menus/menu/menudata/MenuItem.java +++ b/src/main/java/lee/code/pets/menus/menu/menudata/MenuItem.java @@ -3,7 +3,7 @@ import lee.code.pets.lang.Lang; import lee.code.pets.utils.CoreUtil; import lee.code.pets.utils.ItemUtil; -import lee.code.pets.utils.PetEffects; +import lee.code.pets.enums.PetEffects; import lombok.AllArgsConstructor; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; @@ -61,6 +61,6 @@ public ItemStack createPetEffectItem(EntityType entityType, boolean effect) { private String createPetEffectLore(EntityType entityType, boolean effect) { final String effectColor = effect ? "&2" : "&c"; final PotionEffect potionEffect = PetEffects.valueOf(entityType.name()).getPotionEffect(); - return Lang.MENU_PET_EFFECT_LORE.getString(new String[]{CoreUtil.capitalize(potionEffect.getType().getName()), String.valueOf(potionEffect.getAmplifier()), effectColor + CoreUtil.capitalize(String.valueOf(effect))}); + return Lang.MENU_PET_EFFECT_LORE.getString(new String[]{CoreUtil.capitalize(potionEffect.getType().getKey().asString()), String.valueOf(potionEffect.getAmplifier()), effectColor + CoreUtil.capitalize(String.valueOf(effect))}); } } diff --git a/src/main/java/lee/code/pets/pets/PetManager.java b/src/main/java/lee/code/pets/pets/PetManager.java index 6d73f7f..53e1ecd 100644 --- a/src/main/java/lee/code/pets/pets/PetManager.java +++ b/src/main/java/lee/code/pets/pets/PetManager.java @@ -9,13 +9,13 @@ import lee.code.pets.pets.pet.monster.*; import lee.code.pets.utils.CoreUtil; import lee.code.pets.utils.PetDataUtil; -import lee.code.pets.utils.PetEffects; +import lee.code.pets.enums.PetEffects; import lee.code.playerdata.PlayerDataAPI; import lombok.Getter; import net.minecraft.world.entity.Entity; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.event.entity.CreatureSpawnEvent; @@ -114,6 +114,7 @@ private void loadSupportedPets() { supportedPets.add(EntityType.EVOKER); supportedPets.add(EntityType.ILLUSIONER); supportedPets.add(EntityType.TRADER_LLAMA); + supportedPets.add(EntityType.BREEZE); } public void spawn(Player player, Location location, int id, EntityType entityType, String[] data) { @@ -194,6 +195,7 @@ public void spawn(Player player, Location location, int id, EntityType entityTyp case EVOKER -> spawn(player, location, id, new EvokerPet(player, data)); case ILLUSIONER -> spawn(player, location, id, new IllusionerPet(player, data)); case TRADER_LLAMA -> spawn(player, location, id, new TraderLlamaPet(player, data)); + case BREEZE -> spawn(player, location, id, new BreezePet(player, data)); } } diff --git a/src/main/java/lee/code/pets/pets/pet/animal/AllayPet.java b/src/main/java/lee/code/pets/pets/pet/animal/AllayPet.java index 4d6bf8e..46a2199 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/AllayPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/AllayPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.allay.Allay; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/BatPet.java b/src/main/java/lee/code/pets/pets/pet/animal/BatPet.java index 8724e44..98ae075 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/BatPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/BatPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.ambient.Bat; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/BeePet.java b/src/main/java/lee/code/pets/pets/pet/animal/BeePet.java index cbc4a15..96ba8b2 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/BeePet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/BeePet.java @@ -18,8 +18,8 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.NeutralMob; import net.minecraft.world.entity.animal.Animal; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/CamelPet.java b/src/main/java/lee/code/pets/pets/pet/animal/CamelPet.java index fe1045e..d7bb76e 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/CamelPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/CamelPet.java @@ -11,9 +11,9 @@ import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.animal.camel.Camel; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/CatPet.java b/src/main/java/lee/code/pets/pets/pet/animal/CatPet.java index 5be384b..1d767fe 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/CatPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/CatPet.java @@ -10,8 +10,8 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.Cat; import net.minecraft.world.item.DyeColor; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/ChickenPet.java b/src/main/java/lee/code/pets/pets/pet/animal/ChickenPet.java index 66ede4a..ba6fe9e 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/ChickenPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/ChickenPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.Chicken; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/CowPet.java b/src/main/java/lee/code/pets/pets/pet/animal/CowPet.java index a70af05..c4bc873 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/CowPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/CowPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.Cow; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/DonkeyPet.java b/src/main/java/lee/code/pets/pets/pet/animal/DonkeyPet.java index 82af925..b183ba3 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/DonkeyPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/DonkeyPet.java @@ -12,9 +12,9 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.horse.Donkey; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/FoxPet.java b/src/main/java/lee/code/pets/pets/pet/animal/FoxPet.java index ebfaa77..c9224a9 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/FoxPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/FoxPet.java @@ -15,8 +15,8 @@ import net.minecraft.world.entity.*; import net.minecraft.world.entity.animal.Animal; import net.minecraft.world.entity.animal.Fox; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/GoatPet.java b/src/main/java/lee/code/pets/pets/pet/animal/GoatPet.java index 085da17..7d65bc1 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/GoatPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/GoatPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.goat.Goat; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/HoglinPet.java b/src/main/java/lee/code/pets/pets/pet/animal/HoglinPet.java index 5a5e791..17b19cf 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/HoglinPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/HoglinPet.java @@ -12,8 +12,8 @@ import net.minecraft.world.entity.AgeableMob; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.hoglin.Hoglin; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/HorsePet.java b/src/main/java/lee/code/pets/pets/pet/animal/HorsePet.java index 52163c2..e354efe 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/HorsePet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/HorsePet.java @@ -12,9 +12,9 @@ import net.minecraft.world.entity.animal.horse.Markings; import net.minecraft.world.entity.animal.horse.Variant; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/IronGolemPet.java b/src/main/java/lee/code/pets/pets/pet/animal/IronGolemPet.java index 81ea57c..6c2430e 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/IronGolemPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/IronGolemPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.IronGolem; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/LlamaPet.java b/src/main/java/lee/code/pets/pets/pet/animal/LlamaPet.java index 55736f5..3e7ecbf 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/LlamaPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/LlamaPet.java @@ -9,9 +9,9 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.horse.Llama; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/MushroomCowPet.java b/src/main/java/lee/code/pets/pets/pet/animal/MushroomCowPet.java index e7998d6..881dae0 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/MushroomCowPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/MushroomCowPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.MushroomCow; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/OcelotPet.java b/src/main/java/lee/code/pets/pets/pet/animal/OcelotPet.java index 73731fc..9bc0626 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/OcelotPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/OcelotPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.Ocelot; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/PandaPet.java b/src/main/java/lee/code/pets/pets/pet/animal/PandaPet.java index 2b23df0..e8c5f3f 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/PandaPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/PandaPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.Panda; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/ParrotPet.java b/src/main/java/lee/code/pets/pets/pet/animal/ParrotPet.java index e4d70b9..c2277f9 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/ParrotPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/ParrotPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.Parrot; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/PigPet.java b/src/main/java/lee/code/pets/pets/pet/animal/PigPet.java index e82b931..469b4c8 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/PigPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/PigPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.Pig; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/PolarBearPet.java b/src/main/java/lee/code/pets/pets/pet/animal/PolarBearPet.java index 7c51bdd..a5f9670 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/PolarBearPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/PolarBearPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.PolarBear; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/RabbitPet.java b/src/main/java/lee/code/pets/pets/pet/animal/RabbitPet.java index c6da19d..d30126f 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/RabbitPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/RabbitPet.java @@ -19,8 +19,8 @@ import net.minecraft.world.entity.animal.Rabbit; import net.minecraft.world.level.pathfinder.Path; import net.minecraft.world.phys.Vec3; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/SheepPet.java b/src/main/java/lee/code/pets/pets/pet/animal/SheepPet.java index 0250211..6e34403 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/SheepPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/SheepPet.java @@ -9,8 +9,8 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.Sheep; import net.minecraft.world.item.DyeColor; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/SkeletonHorsePet.java b/src/main/java/lee/code/pets/pets/pet/animal/SkeletonHorsePet.java index e38ef5b..40f4ebf 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/SkeletonHorsePet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/SkeletonHorsePet.java @@ -10,9 +10,9 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.horse.SkeletonHorse; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/SnifferPet.java b/src/main/java/lee/code/pets/pets/pet/animal/SnifferPet.java index faeff8e..8ba1ab0 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/SnifferPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/SnifferPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.sniffer.Sniffer; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/SnowGolemPet.java b/src/main/java/lee/code/pets/pets/pet/animal/SnowGolemPet.java index 8dfa6d7..dca9a07 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/SnowGolemPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/SnowGolemPet.java @@ -13,8 +13,8 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/StriderPet.java b/src/main/java/lee/code/pets/pets/pet/animal/StriderPet.java index d383ee0..a9adc7c 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/StriderPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/StriderPet.java @@ -10,9 +10,9 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.Strider; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/TraderLlamaPet.java b/src/main/java/lee/code/pets/pets/pet/animal/TraderLlamaPet.java index c9416b2..a27eadb 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/TraderLlamaPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/TraderLlamaPet.java @@ -9,9 +9,9 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.horse.TraderLlama; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/VillagerPet.java b/src/main/java/lee/code/pets/pets/pet/animal/VillagerPet.java index c9d852e..982a519 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/VillagerPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/VillagerPet.java @@ -10,8 +10,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.npc.Villager; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/WanderingTraderPet.java b/src/main/java/lee/code/pets/pets/pet/animal/WanderingTraderPet.java index bd0c3a2..451b24c 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/WanderingTraderPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/WanderingTraderPet.java @@ -10,8 +10,8 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/WolfPet.java b/src/main/java/lee/code/pets/pets/pet/animal/WolfPet.java index 48432a7..2b42ee4 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/WolfPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/WolfPet.java @@ -9,8 +9,8 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.Wolf; import net.minecraft.world.item.DyeColor; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/ZoglinPet.java b/src/main/java/lee/code/pets/pets/pet/animal/ZoglinPet.java index 1ca9b7f..43dec2b 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/ZoglinPet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/ZoglinPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.Zoglin; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/animal/ZombieHorsePet.java b/src/main/java/lee/code/pets/pets/pet/animal/ZombieHorsePet.java index d3520d8..c24e188 100644 --- a/src/main/java/lee/code/pets/pets/pet/animal/ZombieHorsePet.java +++ b/src/main/java/lee/code/pets/pets/pet/animal/ZombieHorsePet.java @@ -10,9 +10,9 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.horse.ZombieHorse; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; -import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/lee/code/pets/pets/pet/fish/AxolotlPet.java b/src/main/java/lee/code/pets/pets/pet/fish/AxolotlPet.java index 8bb84c0..69fe59b 100644 --- a/src/main/java/lee/code/pets/pets/pet/fish/AxolotlPet.java +++ b/src/main/java/lee/code/pets/pets/pet/fish/AxolotlPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.axolotl.Axolotl; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/fish/CodPet.java b/src/main/java/lee/code/pets/pets/pet/fish/CodPet.java index 974f59e..edc2d27 100644 --- a/src/main/java/lee/code/pets/pets/pet/fish/CodPet.java +++ b/src/main/java/lee/code/pets/pets/pet/fish/CodPet.java @@ -9,8 +9,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.Cod; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/fish/DolphinPet.java b/src/main/java/lee/code/pets/pets/pet/fish/DolphinPet.java index c213c84..b535cb2 100644 --- a/src/main/java/lee/code/pets/pets/pet/fish/DolphinPet.java +++ b/src/main/java/lee/code/pets/pets/pet/fish/DolphinPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.Dolphin; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/fish/ElderGuardianPet.java b/src/main/java/lee/code/pets/pets/pet/fish/ElderGuardianPet.java index 29a1466..03ca126 100644 --- a/src/main/java/lee/code/pets/pets/pet/fish/ElderGuardianPet.java +++ b/src/main/java/lee/code/pets/pets/pet/fish/ElderGuardianPet.java @@ -10,8 +10,8 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.Monster; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/fish/FrogPet.java b/src/main/java/lee/code/pets/pets/pet/fish/FrogPet.java index b36f4aa..ca1671b 100644 --- a/src/main/java/lee/code/pets/pets/pet/fish/FrogPet.java +++ b/src/main/java/lee/code/pets/pets/pet/fish/FrogPet.java @@ -10,8 +10,8 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.ai.goal.LookAtPlayerGoal; import net.minecraft.world.entity.animal.frog.Frog; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/fish/GlowSquidPet.java b/src/main/java/lee/code/pets/pets/pet/fish/GlowSquidPet.java index 1cadf24..6ce11f5 100644 --- a/src/main/java/lee/code/pets/pets/pet/fish/GlowSquidPet.java +++ b/src/main/java/lee/code/pets/pets/pet/fish/GlowSquidPet.java @@ -7,8 +7,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.GlowSquid; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/fish/GuardianPet.java b/src/main/java/lee/code/pets/pets/pet/fish/GuardianPet.java index 06d1be6..204f760 100644 --- a/src/main/java/lee/code/pets/pets/pet/fish/GuardianPet.java +++ b/src/main/java/lee/code/pets/pets/pet/fish/GuardianPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.Guardian; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/fish/PufferFishPet.java b/src/main/java/lee/code/pets/pets/pet/fish/PufferFishPet.java index 4a54504..2a4192f 100644 --- a/src/main/java/lee/code/pets/pets/pet/fish/PufferFishPet.java +++ b/src/main/java/lee/code/pets/pets/pet/fish/PufferFishPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.Pufferfish; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/fish/SalmonPet.java b/src/main/java/lee/code/pets/pets/pet/fish/SalmonPet.java index 827a065..3594393 100644 --- a/src/main/java/lee/code/pets/pets/pet/fish/SalmonPet.java +++ b/src/main/java/lee/code/pets/pets/pet/fish/SalmonPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.Salmon; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/fish/SquidPet.java b/src/main/java/lee/code/pets/pets/pet/fish/SquidPet.java index 2f7b2c9..019da4f 100644 --- a/src/main/java/lee/code/pets/pets/pet/fish/SquidPet.java +++ b/src/main/java/lee/code/pets/pets/pet/fish/SquidPet.java @@ -7,8 +7,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.Squid; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/fish/TadpolePet.java b/src/main/java/lee/code/pets/pets/pet/fish/TadpolePet.java index 003d38d..5bd7406 100644 --- a/src/main/java/lee/code/pets/pets/pet/fish/TadpolePet.java +++ b/src/main/java/lee/code/pets/pets/pet/fish/TadpolePet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.frog.Tadpole; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/fish/TropicalFishPet.java b/src/main/java/lee/code/pets/pets/pet/fish/TropicalFishPet.java index a9a00f2..4bfc52d 100644 --- a/src/main/java/lee/code/pets/pets/pet/fish/TropicalFishPet.java +++ b/src/main/java/lee/code/pets/pets/pet/fish/TropicalFishPet.java @@ -9,8 +9,8 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.TropicalFish; import net.minecraft.world.item.DyeColor; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/fish/TurtlePet.java b/src/main/java/lee/code/pets/pets/pet/fish/TurtlePet.java index 53f4692..963f770 100644 --- a/src/main/java/lee/code/pets/pets/pet/fish/TurtlePet.java +++ b/src/main/java/lee/code/pets/pets/pet/fish/TurtlePet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.animal.Turtle; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/BlazePet.java b/src/main/java/lee/code/pets/pets/pet/monster/BlazePet.java index 1d83fe9..99f5f71 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/BlazePet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/BlazePet.java @@ -13,8 +13,8 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.Monster; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/BreezePet.java b/src/main/java/lee/code/pets/pets/pet/monster/BreezePet.java new file mode 100644 index 0000000..eb31a52 --- /dev/null +++ b/src/main/java/lee/code/pets/pets/pet/monster/BreezePet.java @@ -0,0 +1,48 @@ +package lee.code.pets.pets.pet.monster; + +import lee.code.pets.pets.controllers.ControllerWASD; +import lee.code.pets.pets.goals.FollowOwnerGoal; +import lee.code.pets.pets.goals.LookAtOwnerGoal; +import lee.code.pets.utils.CoreUtil; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.monster.breeze.Breeze; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; +import org.bukkit.entity.Player; +import org.bukkit.event.entity.EntityTargetEvent; + +public class BreezePet extends Breeze { + + public BreezePet(Player player, String[] data) { + super(EntityType.BREEZE, ((CraftWorld) player.getLocation().getWorld()).getHandle()); + setPos(player.getLocation().getX(), player.getLocation().getY(), player.getLocation().getZ()); + setInvulnerable(true); + setCustomNameVisible(true); + setPersistenceRequired(true); + setCanPickUpLoot(false); + setMaxUpStep(1.0F); + collides = false; + setCustomName(Component.Serializer.fromJson(CoreUtil.serializeColorComponentJson(data[1]))); + setTarget(((CraftPlayer) player).getHandle(), EntityTargetEvent.TargetReason.CUSTOM, false); + moveControl = new ControllerWASD(this, player.getUniqueId(), 0.4F); + targetSelector.getAvailableGoals().clear(); + getBrain().removeAllBehaviors(); + } + + @Override + protected void registerGoals() { + goalSelector.addGoal(0, new FollowOwnerGoal(this, 2)); + goalSelector.addGoal(1, new LookAtOwnerGoal(this)); + } + + @Override + public void load(CompoundTag compoundTag) { + } + + @Override + public boolean save(CompoundTag compoundTag) { + return false; + } +} diff --git a/src/main/java/lee/code/pets/pets/pet/monster/CaveSpiderPet.java b/src/main/java/lee/code/pets/pets/pet/monster/CaveSpiderPet.java index 8c4ddb4..c94e295 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/CaveSpiderPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/CaveSpiderPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.CaveSpider; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/CreeperPet.java b/src/main/java/lee/code/pets/pets/pet/monster/CreeperPet.java index 228b686..a96c0d1 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/CreeperPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/CreeperPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.Creeper; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/DrownedPet.java b/src/main/java/lee/code/pets/pets/pet/monster/DrownedPet.java index 140762b..b4af4c8 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/DrownedPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/DrownedPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.Drowned; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/EnderDragonPet.java b/src/main/java/lee/code/pets/pets/pet/monster/EnderDragonPet.java index 5650bd2..003a40b 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/EnderDragonPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/EnderDragonPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/EndermanPet.java b/src/main/java/lee/code/pets/pets/pet/monster/EndermanPet.java index 987c582..883f85c 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/EndermanPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/EndermanPet.java @@ -10,8 +10,8 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/EndermitePet.java b/src/main/java/lee/code/pets/pets/pet/monster/EndermitePet.java index d58119d..f43d55b 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/EndermitePet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/EndermitePet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.Endermite; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/EvokerPet.java b/src/main/java/lee/code/pets/pets/pet/monster/EvokerPet.java index 9c9db8d..508fdad 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/EvokerPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/EvokerPet.java @@ -10,8 +10,8 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/GhastPet.java b/src/main/java/lee/code/pets/pets/pet/monster/GhastPet.java index 23abb64..aaae7e1 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/GhastPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/GhastPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.Ghast; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/HuskPet.java b/src/main/java/lee/code/pets/pets/pet/monster/HuskPet.java index 418c7c1..39b944d 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/HuskPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/HuskPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.Husk; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/IllusionerPet.java b/src/main/java/lee/code/pets/pets/pet/monster/IllusionerPet.java index 6954f07..7acca27 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/IllusionerPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/IllusionerPet.java @@ -10,8 +10,8 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/MagmaCubePet.java b/src/main/java/lee/code/pets/pets/pet/monster/MagmaCubePet.java index e327446..ca435cd 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/MagmaCubePet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/MagmaCubePet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.MagmaCube; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/PhantomPet.java b/src/main/java/lee/code/pets/pets/pet/monster/PhantomPet.java index bb7f4a0..ad16beb 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/PhantomPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/PhantomPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.Phantom; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; @@ -35,7 +35,6 @@ public PhantomPet(Player player, String[] data) { @Override protected void registerGoals() { goalSelector.addGoal(0, new FollowOwnerFlyingGoal(this, 0.3, 5, 20)); - goalSelector.addGoal(1, new LookAtOwnerGoal(this)); } @Override diff --git a/src/main/java/lee/code/pets/pets/pet/monster/PiglinBrutePet.java b/src/main/java/lee/code/pets/pets/pet/monster/PiglinBrutePet.java index b00d83b..408a141 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/PiglinBrutePet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/PiglinBrutePet.java @@ -9,8 +9,8 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.monster.piglin.PiglinBrute; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/PiglinPet.java b/src/main/java/lee/code/pets/pets/pet/monster/PiglinPet.java index d0710a3..5b515f0 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/PiglinPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/PiglinPet.java @@ -9,8 +9,8 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.monster.piglin.Piglin; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/PillagerPet.java b/src/main/java/lee/code/pets/pets/pet/monster/PillagerPet.java index 9cebb06..dddba65 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/PillagerPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/PillagerPet.java @@ -10,8 +10,8 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/RavagerPet.java b/src/main/java/lee/code/pets/pets/pet/monster/RavagerPet.java index e98d795..82f5a09 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/RavagerPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/RavagerPet.java @@ -10,8 +10,8 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/ShulkerPet.java b/src/main/java/lee/code/pets/pets/pet/monster/ShulkerPet.java index b8ee1f6..ef6805b 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/ShulkerPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/ShulkerPet.java @@ -8,8 +8,8 @@ import net.minecraft.world.entity.ai.goal.Goal; import net.minecraft.world.entity.monster.Shulker; import net.minecraft.world.item.DyeColor; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/SilverfishPet.java b/src/main/java/lee/code/pets/pets/pet/monster/SilverfishPet.java index 58d0e0c..082823f 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/SilverfishPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/SilverfishPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.Silverfish; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/SkeletonPet.java b/src/main/java/lee/code/pets/pets/pet/monster/SkeletonPet.java index 84062d7..5ff17e6 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/SkeletonPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/SkeletonPet.java @@ -10,8 +10,8 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/SlimePet.java b/src/main/java/lee/code/pets/pets/pet/monster/SlimePet.java index 0f5fc9d..efb142b 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/SlimePet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/SlimePet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.Slime; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/SpiderPet.java b/src/main/java/lee/code/pets/pets/pet/monster/SpiderPet.java index 55779df..34c0ee5 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/SpiderPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/SpiderPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.Spider; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/StrayPet.java b/src/main/java/lee/code/pets/pets/pet/monster/StrayPet.java index 30598b6..964e121 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/StrayPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/StrayPet.java @@ -10,8 +10,8 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/VexPet.java b/src/main/java/lee/code/pets/pets/pet/monster/VexPet.java index a07accb..74fde87 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/VexPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/VexPet.java @@ -13,8 +13,8 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/VindicatorPet.java b/src/main/java/lee/code/pets/pets/pet/monster/VindicatorPet.java index 7f08555..2f01489 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/VindicatorPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/VindicatorPet.java @@ -10,8 +10,8 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/WardenPet.java b/src/main/java/lee/code/pets/pets/pet/monster/WardenPet.java index f867928..900815d 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/WardenPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/WardenPet.java @@ -10,8 +10,8 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/WitchPet.java b/src/main/java/lee/code/pets/pets/pet/monster/WitchPet.java index 477da91..7af78dd 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/WitchPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/WitchPet.java @@ -10,8 +10,8 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/WitherPet.java b/src/main/java/lee/code/pets/pets/pet/monster/WitherPet.java index a4ca794..62baf09 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/WitherPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/WitherPet.java @@ -11,8 +11,8 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.monster.Monster; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/WitherSkeletonPet.java b/src/main/java/lee/code/pets/pets/pet/monster/WitherSkeletonPet.java index 7c14646..93809e7 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/WitherSkeletonPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/WitherSkeletonPet.java @@ -10,8 +10,8 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.Mob; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/ZombiePet.java b/src/main/java/lee/code/pets/pets/pet/monster/ZombiePet.java index f5f65be..8a78689 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/ZombiePet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/ZombiePet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.Zombie; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/ZombieVillagerPet.java b/src/main/java/lee/code/pets/pets/pet/monster/ZombieVillagerPet.java index 822469e..08e2534 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/ZombieVillagerPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/ZombieVillagerPet.java @@ -10,8 +10,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.ZombieVillager; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/monster/ZombifiedPiglinPet.java b/src/main/java/lee/code/pets/pets/pet/monster/ZombifiedPiglinPet.java index 17fa40b..778a73e 100644 --- a/src/main/java/lee/code/pets/pets/pet/monster/ZombifiedPiglinPet.java +++ b/src/main/java/lee/code/pets/pets/pet/monster/ZombifiedPiglinPet.java @@ -8,8 +8,8 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.monster.ZombifiedPiglin; -import org.bukkit.craftbukkit.v1_20_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftPlayer; +import org.bukkit.craftbukkit.v1_20_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityTargetEvent; diff --git a/src/main/java/lee/code/pets/pets/pet/util/HorseMarkingUtil.java b/src/main/java/lee/code/pets/pets/pet/util/HorseMarkingUtil.java index 934b609..76b1436 100644 --- a/src/main/java/lee/code/pets/pets/pet/util/HorseMarkingUtil.java +++ b/src/main/java/lee/code/pets/pets/pet/util/HorseMarkingUtil.java @@ -4,7 +4,7 @@ import lombok.Getter; import net.minecraft.world.entity.animal.horse.Horse; import net.minecraft.world.entity.animal.horse.Markings; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.entity.Entity; @AllArgsConstructor diff --git a/src/main/java/lee/code/pets/pets/pet/util/HorseVariantUtil.java b/src/main/java/lee/code/pets/pets/pet/util/HorseVariantUtil.java index 0f20019..c6b4ecf 100644 --- a/src/main/java/lee/code/pets/pets/pet/util/HorseVariantUtil.java +++ b/src/main/java/lee/code/pets/pets/pet/util/HorseVariantUtil.java @@ -4,7 +4,7 @@ import lombok.Getter; import net.minecraft.world.entity.animal.horse.Horse; import net.minecraft.world.entity.animal.horse.Variant; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.entity.Entity; @AllArgsConstructor diff --git a/src/main/java/lee/code/pets/pets/pet/util/ParrotVariantUtil.java b/src/main/java/lee/code/pets/pets/pet/util/ParrotVariantUtil.java index 5c2d040..b1d398a 100644 --- a/src/main/java/lee/code/pets/pets/pet/util/ParrotVariantUtil.java +++ b/src/main/java/lee/code/pets/pets/pet/util/ParrotVariantUtil.java @@ -3,7 +3,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import net.minecraft.world.entity.animal.Parrot; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.entity.Entity; @AllArgsConstructor diff --git a/src/main/java/lee/code/pets/pets/pet/util/RabbitVariantUtil.java b/src/main/java/lee/code/pets/pets/pet/util/RabbitVariantUtil.java index c339dd4..21252b3 100644 --- a/src/main/java/lee/code/pets/pets/pet/util/RabbitVariantUtil.java +++ b/src/main/java/lee/code/pets/pets/pet/util/RabbitVariantUtil.java @@ -3,7 +3,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import net.minecraft.world.entity.animal.Rabbit; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.entity.Entity; @AllArgsConstructor diff --git a/src/main/java/lee/code/pets/pets/pet/util/VillagerProfessionUtil.java b/src/main/java/lee/code/pets/pets/pet/util/VillagerProfessionUtil.java index 50ccd7b..31ba13b 100644 --- a/src/main/java/lee/code/pets/pets/pet/util/VillagerProfessionUtil.java +++ b/src/main/java/lee/code/pets/pets/pet/util/VillagerProfessionUtil.java @@ -4,7 +4,7 @@ import lombok.Getter; import net.minecraft.world.entity.npc.Villager; import net.minecraft.world.entity.npc.VillagerProfession; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.entity.Entity; @AllArgsConstructor diff --git a/src/main/java/lee/code/pets/pets/pet/util/VillagerTypeUtil.java b/src/main/java/lee/code/pets/pets/pet/util/VillagerTypeUtil.java index 96551ff..620245d 100644 --- a/src/main/java/lee/code/pets/pets/pet/util/VillagerTypeUtil.java +++ b/src/main/java/lee/code/pets/pets/pet/util/VillagerTypeUtil.java @@ -4,7 +4,7 @@ import lombok.Getter; import net.minecraft.world.entity.npc.Villager; import net.minecraft.world.entity.npc.VillagerType; -import org.bukkit.craftbukkit.v1_20_R2.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity; import org.bukkit.entity.Entity; @AllArgsConstructor diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 4c889cc..de44e3d 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -4,7 +4,7 @@ main: lee.code.pets.Pets description: $description author: Lee api-version: "$apiVersion" -depend: [ProtocolLib, GoldmanPlayerData] +depend: [GoldmanPlayerData] commands: pets: description: Main pets command.