From fd21c45663f58ba0866f52eaa82bd855e726fcb5 Mon Sep 17 00:00:00 2001 From: pxav Date: Sat, 10 Apr 2021 11:44:21 +0200 Subject: [PATCH 001/325] Fix bug that wrong method in setMaxFireTicks(int) of KelpEntity was called --- core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java index 58ea851d..db0fe416 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java @@ -358,7 +358,7 @@ public int getMaxFireTicks() { * @param maxFireTicks The amount of maximum fire ticks to set. */ public KelpEntity setMaxFireTicks(int maxFireTicks) { - entityVersionTemplate.setFireTicks(toBukkitEntity(), maxFireTicks); + entityVersionTemplate.setMaxFireTicks(toBukkitEntity(), maxFireTicks); return this; } From 591b849eff05b6fcbba617e3829902d50d7d7678 Mon Sep 17 00:00:00 2001 From: pxav Date: Sat, 10 Apr 2021 12:12:57 +0200 Subject: [PATCH 002/325] Rename to-methods to get to clarify that no new instance is created --- .../de/pxav/kelp/core/entity/KelpEntity.java | 66 +++++++++---------- .../kelp/core/entity/LivingKelpEntity.java | 2 +- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java index db0fe416..220c3b7a 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java @@ -104,7 +104,7 @@ public KelpEntity spawn() { * * @return The bukkit entity of the current KelpEntity. */ - public Entity toBukkitEntity() { + public Entity getBukkitEntity() { return entityVersionTemplate.toBukkitEntity(this.minecraftEntity); } @@ -114,7 +114,7 @@ public Entity toBukkitEntity() { * @return The current location of the current entity. */ public KelpLocation getLocation() { - return entityVersionTemplate.getLocation(toBukkitEntity()); + return entityVersionTemplate.getLocation(getBukkitEntity()); } /** @@ -124,7 +124,7 @@ public KelpLocation getLocation() { * @see Vector */ public KelpEntity setVelocity(Vector vector) { - entityVersionTemplate.setVelocity(toBukkitEntity(), vector); + entityVersionTemplate.setVelocity(getBukkitEntity(), vector); return this; } @@ -135,7 +135,7 @@ public KelpEntity setVelocity(Vector vector) { * @see Vector */ public Vector getVelocity() { - return entityVersionTemplate.getVelocity(toBukkitEntity()); + return entityVersionTemplate.getVelocity(getBukkitEntity()); } /** @@ -145,7 +145,7 @@ public Vector getVelocity() { * @return The height of the given entity. */ public double getEntityHeight() { - return entityVersionTemplate.getHeight(toBukkitEntity()); + return entityVersionTemplate.getHeight(getBukkitEntity()); } /** @@ -154,7 +154,7 @@ public double getEntityHeight() { * @return The entity's width. */ public double getEntityWidth() { - return entityVersionTemplate.getWidth(toBukkitEntity()); + return entityVersionTemplate.getWidth(getBukkitEntity()); } /** @@ -163,7 +163,7 @@ public double getEntityWidth() { * @return {@code true} if the entity is currently on ground. */ public boolean isOnGround() { - return entityVersionTemplate.isOnGround(toBukkitEntity()); + return entityVersionTemplate.isOnGround(getBukkitEntity()); } /** @@ -183,7 +183,7 @@ public KelpWorld getWorld() { * @param pitch The pitch value of the desired rotation. */ public KelpEntity setRotation(float yaw, float pitch) { - entityVersionTemplate.setRotation(toBukkitEntity(), yaw, pitch); + entityVersionTemplate.setRotation(getBukkitEntity(), yaw, pitch); return this; } @@ -193,7 +193,7 @@ public KelpEntity setRotation(float yaw, float pitch) { * @param to The location you want the entity to be teleported to. */ public KelpEntity teleport(KelpLocation to) { - entityVersionTemplate.teleport(toBukkitEntity(), to, PlayerTeleportEvent.TeleportCause.PLUGIN); + entityVersionTemplate.teleport(getBukkitEntity(), to, PlayerTeleportEvent.TeleportCause.PLUGIN); return this; } @@ -309,7 +309,7 @@ public KelpEntity teleport(String worldName, double x, double y, double z) { * @return the entity's id provided by bukkit. */ public int getEntityIdBukkit() { - return entityVersionTemplate.getEntityId(toBukkitEntity()); + return entityVersionTemplate.getEntityId(getBukkitEntity()); } /** @@ -324,7 +324,7 @@ public int getEntityIdBukkit() { * @return The amount of fire ticks. */ public int getFireTicks() { - return entityVersionTemplate.getFireTicks(toBukkitEntity()); + return entityVersionTemplate.getFireTicks(getBukkitEntity()); } /** @@ -339,7 +339,7 @@ public int getFireTicks() { * @param fireTicks The amount of fire ticks you want to set. */ public KelpEntity setFireTicks(int fireTicks) { - entityVersionTemplate.setFireTicks(toBukkitEntity(), fireTicks); + entityVersionTemplate.setFireTicks(getBukkitEntity(), fireTicks); return this; } @@ -349,7 +349,7 @@ public KelpEntity setFireTicks(int fireTicks) { * @return The amount of maximum fire ticks of the given entity. */ public int getMaxFireTicks() { - return entityVersionTemplate.getMaxFireTicks(toBukkitEntity()); + return entityVersionTemplate.getMaxFireTicks(getBukkitEntity()); } /** @@ -358,7 +358,7 @@ public int getMaxFireTicks() { * @param maxFireTicks The amount of maximum fire ticks to set. */ public KelpEntity setMaxFireTicks(int maxFireTicks) { - entityVersionTemplate.setMaxFireTicks(toBukkitEntity(), maxFireTicks); + entityVersionTemplate.setMaxFireTicks(getBukkitEntity(), maxFireTicks); return this; } @@ -366,7 +366,7 @@ public KelpEntity setMaxFireTicks(int maxFireTicks) { * Removes the entity from the world. */ public KelpEntity remove() { - entityVersionTemplate.remove(toBukkitEntity()); + entityVersionTemplate.remove(getBukkitEntity()); return this; } @@ -376,7 +376,7 @@ public KelpEntity remove() { * @return {@code true} if the entity is dead. */ public boolean isDead() { - return entityVersionTemplate.isDead(toBukkitEntity()); + return entityVersionTemplate.isDead(getBukkitEntity()); } /** @@ -388,7 +388,7 @@ public boolean isDead() { * @return {@code true} if the entity is 'valid'. */ public boolean isValid() { - return entityVersionTemplate.isValid(toBukkitEntity()); + return entityVersionTemplate.isValid(getBukkitEntity()); } /** @@ -397,7 +397,7 @@ public boolean isValid() { * @return The server instance. */ public Server getServer() { - return entityVersionTemplate.getServer(toBukkitEntity()); + return entityVersionTemplate.getServer(getBukkitEntity()); } /** @@ -415,7 +415,7 @@ public Server getServer() { * @return The first or only passenger of the entity. {@code null} if there is no passenger. */ public Entity getPassenger() { - List passengers = entityVersionTemplate.getPassengers(toBukkitEntity()); + List passengers = entityVersionTemplate.getPassengers(getBukkitEntity()); if (passengers != null && !passengers.isEmpty()) { return passengers.get(0); } @@ -435,7 +435,7 @@ public Entity getPassenger() { * {@code null} if there are no passengers. */ public List getPassengers() { - return entityVersionTemplate.getPassengers(toBukkitEntity()); + return entityVersionTemplate.getPassengers(getBukkitEntity()); } /** @@ -449,7 +449,7 @@ public List getPassengers() { * @return {@code true} if the action was successful. */ public KelpEntity addPassenger(Entity passenger) { - entityVersionTemplate.addPassenger(toBukkitEntity(), passenger); + entityVersionTemplate.addPassenger(getBukkitEntity(), passenger); return this; } @@ -474,7 +474,7 @@ public KelpEntity addPassenger(List passengers) { * @param toRemove The passenger you want to remove. */ public KelpEntity removePassenger(Entity toRemove) { - entityVersionTemplate.removePassenger(toBukkitEntity(), toRemove); + entityVersionTemplate.removePassenger(getBukkitEntity(), toRemove); return this; } @@ -485,7 +485,7 @@ public KelpEntity removePassenger(Entity toRemove) { * @return {@code true} if the entity is empty. */ public boolean isEmpty() { - return entityVersionTemplate.isEmpty(toBukkitEntity()); + return entityVersionTemplate.isEmpty(getBukkitEntity()); } /** @@ -494,7 +494,7 @@ public boolean isEmpty() { * @return {@code true} if there are any passengers. */ public boolean hasAnyPassengers() { - return !entityVersionTemplate.isEmpty(toBukkitEntity()); + return !entityVersionTemplate.isEmpty(getBukkitEntity()); } /** @@ -502,7 +502,7 @@ public boolean hasAnyPassengers() { * given entity. */ public KelpEntity ejectPassengers() { - entityVersionTemplate.eject(toBukkitEntity()); + entityVersionTemplate.eject(getBukkitEntity()); return this; } @@ -517,7 +517,7 @@ public KelpEntity ejectPassengers() { * @param fallDistance The new fall distance you want to set. */ public KelpEntity setFallDistance(float fallDistance) { - entityVersionTemplate.setFallDistance(toBukkitEntity(), fallDistance); + entityVersionTemplate.setFallDistance(getBukkitEntity(), fallDistance); return this; } @@ -532,7 +532,7 @@ public KelpEntity setFallDistance(float fallDistance) { * @return The current fall distance of the entity. */ public float getFallDistance() { - return entityVersionTemplate.getFallDistance(toBukkitEntity()); + return entityVersionTemplate.getFallDistance(getBukkitEntity()); } /** @@ -543,7 +543,7 @@ public float getFallDistance() { * @return The UUID of the given entity. */ public UUID getUUID() { - return entityVersionTemplate.getUniqueId(toBukkitEntity()); + return entityVersionTemplate.getUniqueId(getBukkitEntity()); } /** @@ -553,7 +553,7 @@ public UUID getUUID() { * @return The age of the entity. */ public int getTicksLived() { - return entityVersionTemplate.getTicksLived(toBukkitEntity()); + return entityVersionTemplate.getTicksLived(getBukkitEntity()); } /** @@ -564,7 +564,7 @@ public int getTicksLived() { * May not be less than one tick. */ public KelpEntity setTicksLived(int ticksLived) { - entityVersionTemplate.setTicksLived(toBukkitEntity(), ticksLived); + entityVersionTemplate.setTicksLived(getBukkitEntity(), ticksLived); return this; } @@ -574,14 +574,14 @@ public KelpEntity setTicksLived(int ticksLived) { * @return {@code true} if the entity is inside a vehicle. */ public boolean isInsideVehicle() { - return entityVersionTemplate.isInsideVehicle(toBukkitEntity()); + return entityVersionTemplate.isInsideVehicle(getBukkitEntity()); } /** * Makes the entity leave its current vehicle. */ public KelpEntity leaveVehicle() { - entityVersionTemplate.leaveVehicle(toBukkitEntity()); + entityVersionTemplate.leaveVehicle(getBukkitEntity()); return this; } @@ -592,7 +592,7 @@ public KelpEntity leaveVehicle() { * has no vehicle, null will be returned. */ public Entity getVehicle() { - return entityVersionTemplate.getVehicle(toBukkitEntity()); + return entityVersionTemplate.getVehicle(getBukkitEntity()); } } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java index 7dab04a2..70695204 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java @@ -40,7 +40,7 @@ public LivingKelpEntity livingEntityVersionTemplate(LivingEntityVersionTemplate return this; } - public LivingEntity toBukkitLivingEntity() { + public LivingEntity getBukkitLivingEntity() { return bukkitLivingEntity; } From 312a07dcd6e02e9d4db71f64a8799526e2280fb1 Mon Sep 17 00:00:00 2001 From: pxav Date: Sat, 10 Apr 2021 18:53:44 +0200 Subject: [PATCH 003/325] Refactor: move ItemDropType to general entity type package --- .../pxav/kelp/core/entity/type/{ => general}/ItemDropType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename core/src/main/java/de/pxav/kelp/core/entity/type/{ => general}/ItemDropType.java (93%) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ItemDropType.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/ItemDropType.java similarity index 93% rename from core/src/main/java/de/pxav/kelp/core/entity/type/ItemDropType.java rename to core/src/main/java/de/pxav/kelp/core/entity/type/general/ItemDropType.java index b79bd5ff..3778c054 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ItemDropType.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/ItemDropType.java @@ -1,4 +1,4 @@ -package de.pxav.kelp.core.entity.type; +package de.pxav.kelp.core.entity.type.general; /** * This enum expresses how an item should be dropped. From d292828c76a2348353b3cc019e79eafcf9b9adaa Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 13:08:35 +0200 Subject: [PATCH 004/325] Replace KelpPlayer abstract class with an interface --- .../de/pxav/kelp/core/player/KelpPlayer.java | 866 ++++++------------ 1 file changed, 296 insertions(+), 570 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java index 985c25fc..5f863d8b 100644 --- a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java +++ b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java @@ -2,10 +2,9 @@ import com.google.common.base.Preconditions; import de.pxav.kelp.core.KelpPlugin; -import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.LivingKelpEntity; -import de.pxav.kelp.core.entity.version.EntityVersionTemplate; -import de.pxav.kelp.core.entity.version.LivingEntityVersionTemplate; +import de.pxav.kelp.core.entity.type.general.HumanEntity; +import de.pxav.kelp.core.entity.type.general.ProjectileLauncher; import de.pxav.kelp.core.event.kelpevent.sidebar.KelpSidebarRemoveEvent; import de.pxav.kelp.core.inventory.KelpInventoryRepository; import de.pxav.kelp.core.inventory.type.KelpInventory; @@ -22,12 +21,10 @@ import de.pxav.kelp.core.player.prompt.chat.SimpleChatPrompt; import de.pxav.kelp.core.player.prompt.sign.SignPrompt; import de.pxav.kelp.core.player.prompt.sign.SignPromptVersionTemplate; -import de.pxav.kelp.core.sidebar.SidebarRepository; import de.pxav.kelp.core.sidebar.type.KelpSidebar; import de.pxav.kelp.core.sound.KelpSound; import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.Bukkit; -import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.scoreboard.DisplaySlot; import org.bukkit.scoreboard.Scoreboard; @@ -60,69 +57,14 @@ * @see KelpPlayerRepository * @author pxav */ -public class KelpPlayer extends LivingKelpEntity { - - private PlayerVersionTemplate playerVersionTemplate; - private SidebarRepository sidebarRepository; - private KelpInventoryRepository inventoryRepository; - private ParticleVersionTemplate particleVersionTemplate; - private SignPromptVersionTemplate signPromptVersionTemplate; - private AnvilPromptVersionTemplate anvilPromptVersionTemplate; - private ChatPromptVersionTemplate chatPromptVersionTemplate; - - private Player bukkitPlayer; - - // caches the view distance configured in the player's video settings - private int clientViewDistance; - - // caches the language of the player's client - private String clientLanguage; - - // caches the chat visibility configured by the player in the chat settings tab - private PlayerChatVisibility playerChatVisibility; - - private boolean playerChatColorEnabled; - - private String tabListHeader; - private String tabListFooter; - - private KelpSidebar kelpSidebar; - - public KelpPlayer(Player bukkitPlayer, - PlayerVersionTemplate playerVersionTemplate, - KelpInventoryRepository inventoryRepository, - KelpPlayerRepository kelpPlayerRepository, - ParticleVersionTemplate particleVersionTemplate, - SignPromptVersionTemplate signPromptVersionTemplate, - AnvilPromptVersionTemplate anvilPromptVersionTemplate, - ChatPromptVersionTemplate chatPromptVersionTemplate, - EntityVersionTemplate entityVersionTemplate, - LivingEntityVersionTemplate livingEntityVersionTemplate, - UUID uuid, - Location location, - int entityId) { - super(kelpPlayerRepository.getMinecraftEntity(uuid), - KelpEntityType.PLAYER, - location, - entityId, - entityVersionTemplate, - livingEntityVersionTemplate, - bukkitPlayer); - this.bukkitPlayer = bukkitPlayer; - this.playerVersionTemplate = playerVersionTemplate; - this.inventoryRepository = inventoryRepository; - this.particleVersionTemplate = particleVersionTemplate; - this.signPromptVersionTemplate = signPromptVersionTemplate; - this.chatPromptVersionTemplate = chatPromptVersionTemplate; - this.anvilPromptVersionTemplate = anvilPromptVersionTemplate; - } +public interface KelpPlayer extends HumanEntity, ProjectileLauncher { - public static KelpPlayer from(UUID player) { + static KelpPlayer from(UUID player) { KelpPlayerRepository repository = KelpPlugin.getInjector().getInstance(KelpPlayerRepository.class); return repository.getKelpPlayer(player); } - public static KelpPlayer from(String name) { + static KelpPlayer from(String name) { Player player = Bukkit.getPlayer(name); if (player == null) { return null; @@ -130,24 +72,24 @@ public static KelpPlayer from(String name) { return KelpPlayer.from(player); } - public static KelpPlayer from(Player player) { + static KelpPlayer from(Player player) { return KelpPlayer.from(player.getUniqueId()); } - public SignPrompt openSignPrompt() { - return new SignPrompt(this.getBukkitPlayer(), this.signPromptVersionTemplate); + default PlayerInventory getInventory() { + return PlayerInventory.of(this); } - public AnvilPrompt openAnvilPrompt() { - return new AnvilPrompt(this.getBukkitPlayer(), this.anvilPromptVersionTemplate); + default SignPrompt openSignPrompt() { + return new SignPrompt(this.getBukkitPlayer(), Dependencies.getSignPromptVersionTemplate()); } - public SimpleChatPrompt openSimpleChatPrompt() { - return new SimpleChatPrompt(this.getBukkitPlayer(), this.chatPromptVersionTemplate); + default AnvilPrompt openAnvilPrompt() { + return new AnvilPrompt(this.getBukkitPlayer(), Dependencies.getAnvilPromptVersionTemplate()); } - public PlayerInventory getInventory() { - return PlayerInventory.of(this); + default SimpleChatPrompt openSimpleChatPrompt() { + return new SimpleChatPrompt(this.getBukkitPlayer(), Dependencies.getChatPromptVersionTemplate()); } /** @@ -156,8 +98,8 @@ public PlayerInventory getInventory() { * * @return {@code true} if the player has a scoreboard with an objective. */ - public boolean hasScoreboard() { - Scoreboard scoreboard = bukkitPlayer.getScoreboard(); + default boolean hasScoreboard() { + Scoreboard scoreboard = getBukkitPlayer().getScoreboard(); return scoreboard.getObjective(DisplaySlot.SIDEBAR) != null || scoreboard.getObjective(DisplaySlot.BELOW_NAME) != null || scoreboard.getObjective(DisplaySlot.PLAYER_LIST) != null; @@ -169,33 +111,40 @@ public boolean hasScoreboard() { * to it (such as title animation). This method does not effect other parts * of the scoreboard such as the tab list. */ - public void removeSidebar() { + default KelpPlayer removeSidebar() { setSidebarInternally(null); Bukkit.getPluginManager().callEvent(new KelpSidebarRemoveEvent(this)); - playerVersionTemplate.removeSidebar(bukkitPlayer); + removeScoreboard(); } /** - * Caches the sidebar object of the player locally. This does not - * render nor update the given sidebar. It simply changes the internal - * sidebar object which can then be retrieved to update it for - * example using {@link #getCurrentSidebar()}. + * Removes the player's bukkit scoreboard no matter if this is a {@link KelpSidebar} + * or a simple {@link org.bukkit.scoreboard.Scoreboard}. This can be used universally. + * + * But if the sidebar is a kelp sidebar, this method won't call the corresponding + * {@link KelpSidebarRemoveEvent} unlike the {@link #removeSidebar()} method. * - * @param sidebar The current sidebar of the player. + * @return */ - public void setSidebarInternally(KelpSidebar sidebar) { - this.kelpSidebar = sidebar; - } + KelpPlayer removeScoreboard(); /** - * Gets the sidebar the player is currently seeing. - * Will return {@code null} of the player has no sidebar. + * Sets the internal sidebar instance for the current player. + * This won't actually update the sidebar content itself nor call + * the {@link de.pxav.kelp.core.event.kelpevent.sidebar.KelpSidebarRenderEvent} + * or {@link de.pxav.kelp.core.event.kelpevent.sidebar.KelpSidebarUpdateEvent}. * - * @return The current sidebar of the player. + * @param sidebar The new sidebar instance to set internally. */ - public KelpSidebar getCurrentSidebar() { - return kelpSidebar; - } + void setSidebarInternally(KelpSidebar sidebar); + + /** + * Gets the sidebar that is currently rendered to the player. + * + * @return The sidebar that is currently rendered to the player. + * {@code null} if the player has no sidebar. + */ + KelpSidebar getCurrentSidebar(); /** * Opens a {@link KelpInventory} to the player. This @@ -205,8 +154,8 @@ public KelpSidebar getCurrentSidebar() { * @param inventory The inventory you want to show to the player * @return the current instance of the player */ - public KelpPlayer openInventory(KelpInventory inventory) { - this.inventoryRepository.openInventory(inventory, this); + default KelpPlayer openInventory(KelpInventory inventory) { + Dependencies.getInventoryRepository().openInventory(inventory, this); return this; } @@ -219,8 +168,22 @@ public KelpPlayer openInventory(KelpInventory inventory) { * * @return the current instance of the player. */ - public KelpPlayer updateKelpInventory() { - this.inventoryRepository.updateInventory(this); + default KelpPlayer updateKelpInventory() { + Dependencies.getInventoryRepository().updateInventory(this); + return this; + } + + /** + * Updates the title of the player's {@link de.pxav.kelp.core.inventory.type.SimpleInventory}. + * This inventory takes its title as {@link com.google.common.base.Supplier} and the + * content is therefore updatable. If the player has an animated inventory, the updating process + * is handled by the {@link de.pxav.kelp.core.inventory.type.AnimatedInventory} class and + * executing this method will have no effect. + * + * @return An instance of the the current player. + */ + default KelpPlayer updateKelpInventoryTitle() { + Dependencies.getInventoryRepository().updateInventoryTitle(this); return this; } @@ -232,8 +195,8 @@ public KelpPlayer updateKelpInventory() { * * @return the current instance of the player. */ - public KelpPlayer closeInventory() { - this.inventoryRepository.closeInventory(this); + default KelpPlayer closeInventory() { + Dependencies.getInventoryRepository().closeInventory(this); return this; } @@ -247,667 +210,400 @@ public KelpPlayer closeInventory() { * * @return the current instance of the player */ - public KelpPlayer forceInventoryClose() { - bukkitPlayer.closeInventory(); - return this; - } + KelpPlayer forceInventoryClose(); - /** - * Checks whether the current player has a {@link KelpInventory} open. - * Having opened a normal {@link PlayerInventory} using the {@code E} key - * on the keyboard does not count for this method. It will only return - * true if the player really has an external kelp inventory (GUI) opened. - * - * @return {@code true} if the player has opened a {@link KelpInventory}. - */ - public boolean hasKelpInventory() { - return this.inventoryRepository.hasInventory(this); + default boolean hasKelpInventory() { + return Dependencies.getInventoryRepository().hasInventory(this); } - /** - * Updates the title of the player's {@link de.pxav.kelp.core.inventory.type.SimpleInventory}. - * This inventory takes its title as {@link com.google.common.base.Supplier} and the - * content is therefore updatable. If the player has an animated inventory, the updating process - * is handled by the {@link de.pxav.kelp.core.inventory.type.AnimatedInventory} class and - * executing this method will have no effect. - * - * @return An instance of the the current player. - */ - public KelpPlayer updateKelpInventoryTitle() { - if (!hasKelpInventory()) { - return this; - } - - inventoryRepository.updateInventoryTitle(this); + default KelpPlayer playSound(KelpSound sound) { + playSound(sound, getLocation(), 2, 0); return this; } - public KelpPlayer playSound(KelpSound sound) { - playerVersionTemplate.playSound(bukkitPlayer, sound, getLocation(), 3, 0); + default KelpPlayer playSound(KelpSound sound, KelpLocation location) { + playSound(sound, location, 2, 0); return this; } - public KelpPlayer playSound(KelpSound sound, KelpLocation location) { - playerVersionTemplate.playSound(bukkitPlayer, sound, location, 3, 0); + default KelpPlayer playSound(KelpSound sound, float volume) { + playSound(sound, getLocation(), volume, 0); return this; } - public KelpPlayer playSound(KelpSound sound, float volume) { - playerVersionTemplate.playSound(bukkitPlayer, sound, getLocation(), volume, 0); + default KelpPlayer playSound(KelpSound sound, float volume, float pitch) { + playSound(sound, volume, pitch); return this; } - public KelpPlayer playSound(KelpSound sound, float volume, float pitch) { - playerVersionTemplate.playSound(bukkitPlayer, sound, getLocation(), volume, pitch); - return this; - } + KelpPlayer playSound(KelpSound sound, KelpLocation from, float volume, float pitch); - public KelpPlayer playSound(KelpSound sound, KelpLocation location, float volume, float pitch) { - playerVersionTemplate.playSound(bukkitPlayer, sound, location, volume, pitch); - return this; - } + KelpPlayer sendActionbar(String message); - public KelpPlayer sendTitle(String title, String subTitle) { - playerVersionTemplate.sendTitle(bukkitPlayer, title, subTitle, 20, 60, 20); - return this; - } + KelpPlayer sendTitle(String title, String subTitle, int fadeIn, int stay, int fadeOut); - public KelpPlayer sendTitle(String title, String subTitle, int fadeIn, int stay, int fadeOut) { - playerVersionTemplate.sendTitle(bukkitPlayer, title, subTitle, fadeIn, stay, fadeOut); + default KelpPlayer sendTitle(String title, String subTitle) { + sendTitle(title, subTitle, 20, 60, 20); return this; } - public KelpPlayer sendActionbar(String message) { - playerVersionTemplate.sendActionBar(bukkitPlayer, message); + default KelpPlayer sendSuddenTitle(String title, String subTitle) { + sendTitle(title, subTitle, 0, 60, 0); return this; } - public KelpPlayer spawnParticle(ParticleType particleType, boolean longDistance, float offsetX, float offsetY, float offsetZ, int count) { - particleVersionTemplate.spawnParticle(this, - particleType, - longDistance, - getLocation().getX(), - getLocation().getY(), - getLocation().getZ(), - offsetX, offsetY, - offsetZ, - 0, - count, - null); - return this; - } + KelpPlayer spawnParticle(ParticleType particleType, + double x, + double y, + double z, + float offsetX, + float offsetY, + float offsetZ, + int count, + float particleData, + Object generalData); - public KelpPlayer spawnParticle(ParticleType particleType, float offsetX, float offsetY, float offsetZ) { - particleVersionTemplate.spawnParticle(this, + default KelpPlayer spawnParticle(ParticleType particleType, KelpLocation location) { + spawnParticle( particleType, - false, - getLocation().getX(), - getLocation().getY(), - getLocation().getZ(), - offsetX, offsetY, - offsetZ, + location.getX(), + location.getY(), + location.getZ(), + 0, + 0, 0, 1, + 0, null); return this; } - public KelpPlayer spawnParticle(ParticleType particleType, boolean longDistance, float offsetX, float offsetY, float offsetZ, int count, float particleData, Object generalData) { - particleVersionTemplate.spawnParticle(this, - particleType, - longDistance, - getLocation().getX(), - getLocation().getY(), - getLocation().getZ(), - offsetX, offsetY, - offsetZ, - particleData, - count, - generalData); - return this; - } - - public KelpPlayer spawnParticle(ParticleType particleType, boolean longDistance, KelpLocation location, float offsetX, float offsetY, float offsetZ, int count, float particleData, Object generalData) { - particleVersionTemplate.spawnParticle(this, + default KelpPlayer spawnParticle(ParticleType particleType, KelpLocation location, int count, float offset) { + spawnParticle( particleType, - longDistance, location.getX(), location.getY(), location.getZ(), - offsetX, offsetY, - offsetZ, - particleData, + offset, + offset, + offset, count, - generalData); + 0, + null); return this; } - public KelpPlayer spawnParticle(ParticleType particleType, boolean longDistance, double x, double y, double z, float offsetX, float offsetY, float offsetZ, int count, float particleData, Object generalData) { - particleVersionTemplate.spawnParticle(this, + default KelpPlayer spawnParticle(ParticleType particleType, + KelpLocation location, + int count, + float offsetX, + float offsetY, + float offsetZ) { + spawnParticle( particleType, - longDistance, - x, - y, - z, - offsetX, offsetY, + location.getX(), + location.getY(), + location.getZ(), + offsetX, + offsetY, offsetZ, - particleData, count, - generalData); + 0, + null); return this; } - public UUID getUUID() { - return playerVersionTemplate.getUniqueId(bukkitPlayer); - } + UUID getUUID(); - public String getName() { - return bukkitPlayer.getName(); - } + String getName(); - public KelpPlayer setHealth(int health) { - playerVersionTemplate.setHealth(bukkitPlayer, health); - return this; - } + KelpPlayer setHealth(int health); - public boolean isInWater() { - return playerVersionTemplate.isInWater(bukkitPlayer); - } + boolean isInCobweb(); - public boolean isInCobweb() { - return playerVersionTemplate.isInCobweb(bukkitPlayer); - } + boolean isInWater(); - public KelpPlayer chat(String message) { - playerVersionTemplate.chat(bukkitPlayer, message); - return this; - } + KelpPlayer chat(String message); - public KelpPlayer clearChat() { + default KelpPlayer clearChat() { for (int i = 0; i < 103; i++) { sendMessage(" "); } return this; } - public boolean mayFly() { - return playerVersionTemplate.getAllowFlight(bukkitPlayer); - } - - public String getDisplayName() { - return playerVersionTemplate.getDisplayName(bukkitPlayer); - } + boolean mayFly(); - public KelpPlayer setDisplayName(String displayName) { - playerVersionTemplate.setDisplayName(bukkitPlayer, displayName); - return this; - } + String getDisplayName(); - public String getTabListName() { - return playerVersionTemplate.getPlayerTabListName(bukkitPlayer); - } + KelpPlayer setDisplayName(); - public KelpPlayer setTabListName(String tabListName) { - playerVersionTemplate.setPlayerTabListName(bukkitPlayer, tabListName); - return this; - } + String getTabListName(); - // TODO make tablist name hideable + KelpPlayer setTabListName(); - // TODO TAB LIST HEADER AND FOOTER + KelpPlayer setCompassTarget(KelpLocation target); - public KelpPlayer setCompassTarget(KelpLocation target) { - playerVersionTemplate.setCompassTarget(bukkitPlayer, target); - return this; - } + KelpPlayer kickPlayer(String kickMessage); - public KelpPlayer kickPlayer(String kickMessage) { - playerVersionTemplate.kickPlayer(bukkitPlayer, kickMessage); - return this; - } + boolean isSneaking(); - public boolean isSneaking() { - return playerVersionTemplate.isSneaking(bukkitPlayer); - } + KelpPlayer setSneaking(boolean sneaking); - public KelpPlayer sneak() { - playerVersionTemplate.setSneaking(bukkitPlayer, true); + default KelpPlayer toggleSneak() { + setSneaking(!isSneaking()); return this; } - public KelpPlayer unSneak() { - playerVersionTemplate.setSneaking(bukkitPlayer, false); + default KelpPlayer sneak() { + setSneaking(true); return this; } - public KelpPlayer toggleSneak() { - if (this.isSneaking()) { - this.unSneak(); - } else { - this.sneak(); - } + default KelpPlayer unSneak() { + setSneaking(false); return this; } - public KelpPlayer setSneaking(boolean sneaking) { - playerVersionTemplate.setSneaking(bukkitPlayer, sneaking); - return this; - } + boolean isSprinting(); - public boolean isSprinting() { - return playerVersionTemplate.isSprinting(bukkitPlayer); - } + KelpPlayer setSprinting(boolean sneaking); - public KelpPlayer sprint() { - playerVersionTemplate.setSprinting(bukkitPlayer, true); + default KelpPlayer toggleSprinting() { + setSneaking(!isSneaking()); return this; } - public KelpPlayer stopSprinting() { - playerVersionTemplate.setSprinting(bukkitPlayer, false); + default KelpPlayer sprint() { + setSprinting(true); return this; } - public KelpPlayer toggleSprint() { - if (this.isSprinting()) { - this.stopSprinting(); - } else { - this.sprint(); - } + default KelpPlayer unSprint() { + setSprinting(false); return this; } - public KelpPlayer setSprinting(boolean sprinting) { - playerVersionTemplate.setSprinting(bukkitPlayer, sprinting); - return this; - } + boolean isSleepingIgnored(); - public boolean isSleepingIgnored() { - return playerVersionTemplate.isSprinting(bukkitPlayer); - } - - public KelpPlayer ignoreSleeping() { - playerVersionTemplate.setSleepingIgnored(bukkitPlayer, true); + default KelpPlayer ignoreSleeping() { + setSleepingIgnored(true); return this; } - public KelpPlayer unignoreSleeping() { - playerVersionTemplate.setSleepingIgnored(bukkitPlayer, false); + default KelpPlayer unIgnoreSleeping() { + setSleepingIgnored(false); return this; } - public KelpPlayer toggleIgnoreSleeping() { - if (this.isSleepingIgnored()) { - this.unignoreSleeping(); - } else { - this.ignoreSleeping(); - } + default KelpPlayer toggleIgnoreSleeping() { + setSleepingIgnored(!isSleepingIgnored()); return this; } - public KelpPlayer setSleepingIgnored(boolean sleepingIgnored) { - playerVersionTemplate.setSleepingIgnored(bukkitPlayer, sleepingIgnored); - return this; - } + KelpPlayer setSleepingIgnored(boolean sleepingIgnored); - public KelpPlayer setRelativePlayerTime(long time) { - playerVersionTemplate.setPlayerTime(bukkitPlayer, time, true); - return this; - } + KelpPlayer setRelativePlayerTime(long time); - public KelpPlayer setPlayerTime(long time) { - playerVersionTemplate.setPlayerTime(bukkitPlayer, time, false); - return this; - } + KelpPlayer setPlayerTime(long time); - public long getPlayerTime() { - return playerVersionTemplate.getPlayerTime(bukkitPlayer); - } + long getPlayerTime(); - public long getPlayerTimeOffset() { - return playerVersionTemplate.getPlayerTimeOffset(bukkitPlayer); - } + long getPlayerTimeOffset(); - public boolean isPlayerTimeRelative() { - return playerVersionTemplate.isPlayerTimeRelative(bukkitPlayer); - } + boolean isPlayerTimeRelative(); - public KelpPlayer resetPlayerTime() { - playerVersionTemplate.resetPlayerTime(bukkitPlayer); - return this; - } + KelpPlayer resetPlayerTime(); - public KelpPlayer giveExperience(int amount) { - playerVersionTemplate.giveExperience(bukkitPlayer, amount); + default KelpPlayer giveExperience(int amount) { + setExperience(getExperience() + amount); return this; } - public KelpPlayer giveExperienceLevels(int amount) { - playerVersionTemplate.giveExperienceLevels(bukkitPlayer, amount); + default KelpPlayer giveExperienceLevels(int amount) { + setLevel(getLevel() + amount); return this; } - public float getExperience() { - return playerVersionTemplate.getExperience(bukkitPlayer); - } + float getExperience(); - public KelpPlayer setExperience(float experience) { - playerVersionTemplate.setExperience(bukkitPlayer, experience); - return this; - } + KelpPlayer setExperience(float experience); - public KelpPlayer setLevel(int level) { - playerVersionTemplate.setLevel(bukkitPlayer, level); - return this; - } + KelpPlayer setLevel(int level); - public int getLevel() { - return playerVersionTemplate.getLevel(bukkitPlayer); - } + int getLevel(); - public int getTotalExperience() { - return playerVersionTemplate.getTotalExperience(bukkitPlayer); - } + int getTotalExperience(); - public KelpPlayer setTotalExperience(int experience) { - playerVersionTemplate.setTotalExperience(bukkitPlayer, experience); - return this; - } + KelpPlayer setTotalExperience(int experience); - public float getExhaustionLevel() { - return playerVersionTemplate.getExhaustion(bukkitPlayer); - } + float getExhaustionLevel(); - public KelpPlayer setExhaustionLevel(float exhaustionLevel) { - playerVersionTemplate.setExhaustion(bukkitPlayer, exhaustionLevel); - return this; - } + KelpPlayer setExhaustionLevel(float exhaustionLevel); - public KelpPlayer setSaturationLevel(float saturationLevel) { - playerVersionTemplate.setSaturation(bukkitPlayer, saturationLevel); - return this; - } + KelpPlayer setSaturationLevel(float saturationLevel); - public float getSaturationLevel() { - return playerVersionTemplate.getSaturation(bukkitPlayer); - } + float getSaturationLevel(); - public int getFoodLevel() { - return playerVersionTemplate.getFoodLevel(bukkitPlayer); - } + int getFoodLevel(); - public KelpPlayer setFoodLevel(int foodLevel) { - playerVersionTemplate.setFoodLevel(bukkitPlayer, foodLevel); - return this; - } + KelpPlayer setFoodLevel(int foodLevel); - public KelpPlayer setAllowFlight(boolean allowed) { - playerVersionTemplate.setAllowFlight(bukkitPlayer, allowed); - return this; - } + KelpPlayer setAllowFlight(boolean allowed); - public KelpPlayer allowFlying() { - playerVersionTemplate.setAllowFlight(bukkitPlayer, true); - return this; - } + KelpPlayer allowFlying(); - public KelpPlayer disallowFlying() { - playerVersionTemplate.setAllowFlight(bukkitPlayer, false); - return this; - } + KelpPlayer disallowFlying(); - public KelpPlayer hidePlayer(KelpPlayer toHide) { - playerVersionTemplate.hidePlayer(bukkitPlayer, toHide.getBukkitPlayer()); - return this; - } + KelpPlayer hidePlayer(KelpPlayer toHide); - public KelpPlayer showPlayer(KelpPlayer toShow) { - playerVersionTemplate.showPlayer(bukkitPlayer, toShow.getBukkitPlayer()); - return this; - } + KelpPlayer showPlayer(KelpPlayer toShow); - public boolean canSee(KelpPlayer toCheck) { - return playerVersionTemplate.canSee(bukkitPlayer, toCheck.getBukkitPlayer()); - } + boolean canSee(KelpPlayer toCheck); - public boolean isFlying() { - return playerVersionTemplate.isFlying(bukkitPlayer); - } + boolean isFlying(); - public KelpPlayer makeFlying() { - playerVersionTemplate.setFlying(bukkitPlayer, true); + default KelpPlayer makeFlying() { + setFlying(true); return this; } - public KelpPlayer stopFlying() { - playerVersionTemplate.setFlying(bukkitPlayer, false); + default KelpPlayer stopFlying() { + setFlying(false); return this; } - public KelpPlayer toggleFlying() { - if (this.isFlying()) { - this.stopFlying(); - } else { - this.makeFlying(); - } + default KelpPlayer toggleFlying() { + setFlying(!isFlying()); return this; } - public KelpPlayer setFlying(boolean flying) { - playerVersionTemplate.setFlying(bukkitPlayer, flying); - return this; - } + KelpPlayer setFlying(boolean flying); - public KelpPlayer setFlySpeed(float flySpeed) { - playerVersionTemplate.setFlySpeed(bukkitPlayer, flySpeed); - return this; - } + KelpPlayer setFlySpeed(float flySpeed); - public float getFlySpeed() { - return playerVersionTemplate.getFlySpeed(bukkitPlayer); - } + float getFlySpeed(); - public float getWalkSpeed() { - return playerVersionTemplate.getWalkSpeed(bukkitPlayer); - } + float getWalkSpeed(); - public KelpPlayer setResourcePack(String url) { - playerVersionTemplate.setResourcePack(bukkitPlayer, url); - return this; - } + KelpPlayer setResourcePack(String url); - public KelpPlayer setResourcePack(String url, byte[] hash) { - playerVersionTemplate.setResourcePack(bukkitPlayer, url, hash); - return this; - } + KelpPlayer setResourcePack(String url, byte[] hash); - public boolean isHealthScaled() { - return playerVersionTemplate.isHealthScaled(bukkitPlayer); - } + boolean isHealthScaled(); - public KelpPlayer setHealthScale(double healthScale) { - playerVersionTemplate.setHealthScale(bukkitPlayer, healthScale); - return this; - } + KelpPlayer setHealthScale(double healthScale) ; - public double getHealthScale() { - return playerVersionTemplate.getHealthScale(bukkitPlayer); - } + double getHealthScale(); - public KelpPlayer resetTitle() { - playerVersionTemplate.resetTitle(bukkitPlayer); - return this; - } + KelpPlayer resetTitle(); - public KelpPlayer setClientViewDistanceInternally(int clientViewDistance) { - this.clientViewDistance = clientViewDistance; - return this; - } + KelpPlayer setClientViewDistanceInternally(int clientViewDistance); - public int getClientViewDistance() { - return this.clientViewDistance; - } + int getClientViewDistance(); - public KelpPlayer setClientLanguageInternally(String clientLanguage) { - this.clientLanguage = clientLanguage; - return this; - } + KelpPlayer setClientLanguageInternally(String clientLanguage); - public String getClientLanguage() { - return clientLanguage; - } + String getClientLanguage(); - public KelpPlayer setPlayerChatVisibilityInternally(PlayerChatVisibility playerChatVisibility) { - this.playerChatVisibility = playerChatVisibility; - return this; - } + KelpPlayer setPlayerChatVisibilityInternally(PlayerChatVisibility playerChatVisibility); - public PlayerChatVisibility getPlayerChatVisibility() { - return playerChatVisibility; - } + PlayerChatVisibility getPlayerChatVisibility(); - public KelpPlayer setPlayerChatColorEnabledInternally(boolean playerChatColorEnabled) { - this.playerChatColorEnabled = playerChatColorEnabled; - return this; - } + KelpPlayer setPlayerChatColorEnabledInternally(boolean playerChatColorEnabled); - public boolean isPlayerChatColorEnabled() { - return this.playerChatColorEnabled; - } + boolean isPlayerChatColorEnabled(); - public KelpPlayer setTabListHeader(String header) { - playerVersionTemplate.setPlayerListHeader(bukkitPlayer, header); - this.tabListHeader = header; - return this; - } + KelpPlayer setTabListHeader(String header); - public KelpPlayer setTabListFooter(String footer) { - playerVersionTemplate.setPlayerListHeader(bukkitPlayer, footer); - this.tabListFooter = footer; - return this; - } + KelpPlayer setTabListFooter(String footer); - public KelpPlayer setTabListHeaderAndFooter(String header, String footer) { + default KelpPlayer setTabListHeaderAndFooter(String header, String footer) { setTabListHeader(header).setTabListFooter(footer); return this; } - public String getTabListFooter() { - return tabListFooter; - } + String getTabListFooter(); - public String getTabListHeader() { - return tabListHeader; - } + String getTabListHeader(); - public boolean isOperator() { - return playerVersionTemplate.isOperator(bukkitPlayer); - } + boolean isOperator(); - public KelpPlayer makeOperator() { - playerVersionTemplate.setOperator(bukkitPlayer, true); + default KelpPlayer makeOperator() { + setOperator(true); return this; } - public KelpPlayer removeOperator() { - playerVersionTemplate.setOperator(bukkitPlayer, false); + default KelpPlayer removeOperator() { + setOperator(false); return this; } - public KelpPlayer toggleOperator() { - if (this.isOperator()) { - this.removeOperator(); - } else { - this.makeOperator(); - } + default KelpPlayer toggleOperator() { + setOperator(!isOperator()); return this; } - public KelpPlayer setOperator(boolean operator) { - playerVersionTemplate.setOperator(bukkitPlayer, operator); - return this; - } + KelpPlayer setOperator(boolean operator); - public KelpPlayer grantPermission(String permissionName) { - playerVersionTemplate.givePermission(bukkitPlayer, permissionName); - return this; - } + KelpPlayer grantPermission(String permissionName); - public KelpPlayer removePermission(String permissionName) { - playerVersionTemplate.removePermission(bukkitPlayer, permissionName); - return this; - } + KelpPlayer removePermission(String permissionName); - public boolean hasPermission(String permissionName) { - return playerVersionTemplate.hasPermission(bukkitPlayer, permissionName); - } + boolean hasPermission(String permissionName); - public boolean isBannedByBukkit() { - return playerVersionTemplate.isBannedByBukkit(bukkitPlayer); - } + boolean isBannedByBukkit(); - public boolean isWhitelisted() { - return playerVersionTemplate.isWhitelisted(bukkitPlayer); - } + boolean isWhitelisted(); - public KelpPlayer whitelist() { - playerVersionTemplate.setOperator(bukkitPlayer, true); + default KelpPlayer whitelist() { + setWhitelisted(true); return this; } - public KelpPlayer removeFromWhitelist() { - playerVersionTemplate.setOperator(bukkitPlayer, false); + default KelpPlayer removeFromWhitelist() { + setWhitelisted(false); return this; } - public KelpPlayer toggleWhitelist() { - if (this.isOperator()) { - this.removeOperator(); - } else { - this.makeOperator(); - } + default KelpPlayer toggleWhitelist() { + setWhitelisted(!isWhitelisted()); return this; } - public KelpPlayer setWhitelisted(boolean whitelisted) { - playerVersionTemplate.setWhitelisted(bukkitPlayer, whitelisted); - return this; - } + KelpPlayer setWhitelisted(boolean whitelisted); - public KelpPlayer sendMessage(String message) { - playerVersionTemplate.sendMessage(bukkitPlayer, message); - return this; - } + KelpPlayer sendMessage(String message); - public KelpPlayer sendMessages(String... messages) { + default KelpPlayer sendMessages(String... messages) { for (String message : messages) { - playerVersionTemplate.sendMessage(bukkitPlayer, message); + sendMessage(message); } return this; } - public KelpPlayer sendMessages(Collection messages) { + default KelpPlayer sendMessages(Collection messages) { for (String message : messages) { - playerVersionTemplate.sendMessage(bukkitPlayer, message); + sendMessage(message); } return this; } - public KelpPlayer sendPrefixedMessages(String prefix, String... messages) { + default KelpPlayer sendPrefixedMessages(String prefix, String... messages) { for (String message : messages) { sendMessage(prefix + message); } return this; } - public KelpPlayer sendPrefixedMessages(String prefix, Collection messages) { + default KelpPlayer sendPrefixedMessages(String prefix, Collection messages) { for (String message : messages) { sendMessage(prefix + message); } return this; } - public void sendCenteredMessage(String message) { + default KelpPlayer sendCenteredMessage(String message) { Preconditions.checkNotNull(message); if(message.equals("")) { this.sendMessage(""); @@ -944,21 +640,24 @@ public void sendCenteredMessage(String message) { compensated += spaceLength; } this.sendMessage(sb.toString() + message); + return this; } - public void sendCenteredMessages(String... messages) { + default KelpPlayer sendCenteredMessages(String... messages) { for (String s : messages) { this.sendCenteredMessage(s); } + return this; } - public void sendCenteredMessages(Collection messages) { + default KelpPlayer sendCenteredMessages(Collection messages) { for (String s : messages) { this.sendCenteredMessage(s); } + return this; } - public void sendCenteredMessages(String header, String footer, String... messages) { + default KelpPlayer sendCenteredMessages(String header, String footer, String... messages) { if (header != null) { this.sendMessage(header); } @@ -968,9 +667,10 @@ public void sendCenteredMessages(String header, String footer, String... message if (footer != null) { this.sendMessage(footer); } + return this; } - public void sendCenteredMessages(String header, Collection messages, String footer) { + default KelpPlayer sendCenteredMessages(String header, Collection messages, String footer) { if (header != null) { this.sendMessage(header); } @@ -980,6 +680,7 @@ public void sendCenteredMessages(String header, Collection messages, Str if (footer != null) { this.sendMessage(footer); } + return this; } /** @@ -998,9 +699,7 @@ public void sendCenteredMessages(String header, Collection messages, Str * style, no exception will be thrown, but {@code SOLID} is chosen * automatically. */ - public void sendBossBar(String message, float health, BossBarColor barColor, BossBarStyle barStyle) { - playerVersionTemplate.sendBossBar(bukkitPlayer, message, health, barColor, barStyle); - } + KelpPlayer sendBossBar(String message, float health, BossBarColor barColor, BossBarStyle barStyle); /** * Sends a boss bar to the player by spawning a boss entity near it. @@ -1010,8 +709,8 @@ public void sendBossBar(String message, float health, BossBarColor barColor, Bos * * @param message The message you want to be displayed above the boss bar. */ - public void sendBossBar(String message) { - playerVersionTemplate.sendBossBar(bukkitPlayer, message, 300f, BossBarColor.PURPLE, BossBarStyle.SOLID); + default KelpPlayer sendBossBar(String message) { + return sendBossBar(message, 300f, BossBarColor.PURPLE, BossBarStyle.SOLID); } /** @@ -1023,9 +722,7 @@ public void sendBossBar(String message) { * * @param health The health of the boss bar entity. */ - public void setBossBarProgressHealth(float health) { - playerVersionTemplate.setBossBarProgress(bukkitPlayer, health); - } + KelpPlayer setBossBarProgressHealth(float health); /** * Sets the progress of the player's boss bar, where 1 means @@ -1034,9 +731,10 @@ public void setBossBarProgressHealth(float health) { * * @param percentage The percentage value of the progress between 0 and 1. */ - public void setBossBarProgress(double percentage) { + default KelpPlayer setBossBarProgress(double percentage) { float health = 300f * (float) percentage; setBossBarProgressHealth(health); + return this; } /** @@ -1050,9 +748,10 @@ public void setBossBarProgress(double percentage) { * @param current The current state of reaching the maximum in absolute numbers. * @param max The maximum value that is reachable for parameter {@code current}. */ - public void setBossBarProgress(int current, int max) { + default KelpPlayer setBossBarProgress(int current, int max) { double percentage = (double) current / (double) max; setBossBarProgress(percentage); + return this; } /** @@ -1066,17 +765,16 @@ public void setBossBarProgress(int current, int max) { * @param current The current state of reaching the maximum in absolute numbers. * @param max The maximum value that is reachable for parameter {@code current}. */ - public void setBossBarProgress(double current, double max) { + default KelpPlayer setBossBarProgress(double current, double max) { double percentage = current / max; setBossBarProgress(percentage); + return this; } /** * Makes the boss bar disappear for the player. */ - public void removeBossBar() { - playerVersionTemplate.removeBossBar(bukkitPlayer); - } + KelpPlayer removeBossBar(); /** * Sends an interactive message to the player. An interactive message is a message @@ -1087,18 +785,46 @@ public void removeBossBar() { * * @param interactiveMessage The interactive message you want to send to the player. */ - public void sendInteractiveMessage(InteractiveMessage interactiveMessage) { - playerVersionTemplate.sendInteractiveMessage(bukkitPlayer, interactiveMessage); - } + KelpPlayer sendInteractiveMessage(InteractiveMessage interactiveMessage); /** - * Gets the bukkit instance of the current {@link Player}. Be aware that - * by using this, you might lose version independence. + * Gets the bukkit instance of this player. + * This can be used to access bukkit methods if you cannot + * find the appropriate kelp equivalent in this class. * - * @return The current bukkit player instance. + * @return The instance of the bukkit player equivalent to this kelp player. */ - public Player getBukkitPlayer() { - return bukkitPlayer; + Player getBukkitPlayer(); + + /** + * This class allows for hidden access for dependencies used in the + * {@link KelpPlayer} class. Instead of creating interface methods + * that should not be publicly available, they are wrapped into this + * class as private interface methods are only compatible with Java + * 1.9 upwards. + * + * This should give the incentive to developers to avoid using + * one of those methods as version templates are not safe and might change + * over time. + * + * @author pxav + */ + final class Dependencies { + private static SignPromptVersionTemplate getSignPromptVersionTemplate() { + return KelpPlugin.getInjector().getInstance(SignPromptVersionTemplate.class); + } + private static KelpInventoryRepository getInventoryRepository() { + return KelpPlugin.getInjector().getInstance(KelpInventoryRepository.class); + } + private static ParticleVersionTemplate getParticleVersionTemplate() { + return KelpPlugin.getInjector().getInstance(ParticleVersionTemplate.class); + } + private static AnvilPromptVersionTemplate getAnvilPromptVersionTemplate() { + return KelpPlugin.getInjector().getInstance(AnvilPromptVersionTemplate.class); + } + private static ChatPromptVersionTemplate getChatPromptVersionTemplate() { + return KelpPlugin.getInjector().getInstance(ChatPromptVersionTemplate.class); + } } } From f34340c0ac435482df9e43b66aaddbfbd77f9db1 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:12:50 +0200 Subject: [PATCH 005/325] You now pass percentage values using comma values, where 1 means 100% instead of using int*100 --- .../de/pxav/kelp/core/common/MathUtils.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/common/MathUtils.java b/core/src/main/java/de/pxav/kelp/core/common/MathUtils.java index 64b03a37..f1399871 100644 --- a/core/src/main/java/de/pxav/kelp/core/common/MathUtils.java +++ b/core/src/main/java/de/pxav/kelp/core/common/MathUtils.java @@ -10,7 +10,7 @@ */ public class MathUtils { - private static final int[] values = { 1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1 }; + private static final int[] values = { 1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1 }; private static final String[] romanLiterals = { "M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I" }; /** @@ -37,23 +37,27 @@ public static boolean isOdd(int number) { /** * Randomly calculates whether a certain chance has been - * fulfilled. If your {@code chance} is set to {@code 50}, + * fulfilled. If your {@code chance} is set to {@code 0.5}, * there will be a 50% chance that this method will return - * {@code true}. If it is {@code 5}, then there will be a + * {@code true}. If it is {@code 0.05}, then there will be a * {@code 5} per cent chance that this method will return * {@code true}. * * @param chance The chance to use for random calculation. + * This number may range from 0.0 (always false, 0% change) + * and 1.0 (always true, 100% chance), where 0.01 is equal to + * 1%. * @return Either true or false depending on your luck and the provided chance. */ - public static boolean perCentChance(int chance) { - if (chance == 100) { + public static boolean perCentChance(double chance) { + if (chance >= 1.0d) { return true; } - if (chance == 0) { + if (chance <= 0.0d) { return false; } - return ThreadLocalRandom.current().nextInt(0, 101) < chance; + + return Math.random() < chance; } public static String getRomanNumber(int number) { From e25845017fe56fc8f08b1bda59206b5069d184b4 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:13:37 +0200 Subject: [PATCH 006/325] Add custom painting/art enum to entity library --- .../kelp/core/entity/util/PaintingType.java | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/PaintingType.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/PaintingType.java b/core/src/main/java/de/pxav/kelp/core/entity/util/PaintingType.java new file mode 100644 index 00000000..7c1bc182 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/PaintingType.java @@ -0,0 +1,64 @@ +package de.pxav.kelp.core.entity.util; + +import java.util.concurrent.ThreadLocalRandom; + +public enum PaintingType { + + KEBAB(1, 1), + AZTEC(1, 1), + ALBANIAN( 1, 1), + AZTEC2( 1, 1), + BOMB( 1, 1), + PLANT( 1, 1), + WASTELAND( 1, 1), + POOL(2, 1), + COURBET( 2, 1), + SEA(2, 1), + SUNSET(2, 1), + CREEBET(2, 1), + WANDERER(1, 2), + GRAHAM(1, 2), + MATCH(2, 2), + BUST(2, 2), + STAGE(2, 2), + VOID(2, 2), + SKULL_AND_ROSES(2, 2), + WITHER(2, 2), + FIGHTERS(4, 2), + POINTER(4, 4), + PIGSCENE(4, 4), + BURNING_SKULL( 4, 4), + SKELETON(4, 3), + DONKEY_KONG(4, 3) + + ; + + private int width; + private int height; + + PaintingType(int width, int height) { + this.width = width; + this.height = height; + } + + public int getWidth() { + return width; + } + + public int getHeight() { + return height; + } + + public static PaintingType random() { + return values()[ThreadLocalRandom.current().nextInt(values().length)]; + } + + public static PaintingType random(int width, int height) { + PaintingType output = random(); + while (output.width != width || output.height != height) { + output = random(); + } + return output; + } + +} From a52c0b6a4b86c63ccb3908316e4bd11a2ac4ee02 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:14:04 +0200 Subject: [PATCH 007/325] Art types can now be converted across different versions --- .../EntitySpecificVersionTemplate.java | 17 +++ .../entity/VersionedSpecificEntity.java | 133 ++++++++++++++++++ 2 files changed, 150 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/version/EntitySpecificVersionTemplate.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedSpecificEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/version/EntitySpecificVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/entity/version/EntitySpecificVersionTemplate.java new file mode 100644 index 00000000..e6348e65 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/version/EntitySpecificVersionTemplate.java @@ -0,0 +1,17 @@ +package de.pxav.kelp.core.entity.version; + +import de.pxav.kelp.core.application.KelpVersionTemplate; +import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.entity.util.PaintingType; +import org.bukkit.Art; + +@KelpVersionTemplate +public abstract class EntitySpecificVersionTemplate { + + public abstract PaintingType getPaintingType(Art art); + + public abstract Art getBukkitPaintingType(PaintingType paintingType); + + public abstract > T launchProjectile(); + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedSpecificEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedSpecificEntity.java new file mode 100644 index 00000000..3bd86406 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedSpecificEntity.java @@ -0,0 +1,133 @@ +package de.pxav.kelp.implementation1_8.entity; + +import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.entity.util.PaintingType; +import de.pxav.kelp.core.entity.version.EntitySpecificVersionTemplate; +import de.pxav.kelp.core.version.Versioned; +import org.bukkit.Art; + +@Versioned +public class VersionedSpecificEntity extends EntitySpecificVersionTemplate { + + @Override + public PaintingType getPaintingType(Art art) { + if (art == Art.KEBAB) { + return PaintingType.KEBAB; + } else if (art == Art.AZTEC) { + return PaintingType.AZTEC; + } else if (art == Art.ALBAN) { + return PaintingType.ALBANIAN; + } else if (art == Art.AZTEC2) { + return PaintingType.AZTEC2; + } else if (art == Art.BOMB) { + return PaintingType.BOMB; + } else if (art == Art.PLANT) { + return PaintingType.PLANT; + } else if (art == Art.WASTELAND) { + return PaintingType.WASTELAND; + } else if (art == Art.POOL) { + return PaintingType.POOL; + } else if (art == Art.COURBET) { + return PaintingType.COURBET; + } else if (art == Art.SEA) { + return PaintingType.SEA; + } else if (art == Art.SUNSET) { + return PaintingType.SUNSET; + } else if (art == Art.CREEBET) { + return PaintingType.CREEBET; + } else if (art == Art.WANDERER) { + return PaintingType.WANDERER; + } else if (art == Art.GRAHAM) { + return PaintingType.GRAHAM; + } else if (art == Art.MATCH) { + return PaintingType.MATCH; + } else if (art == Art.BUST) { + return PaintingType.BUST; + } else if (art == Art.STAGE) { + return PaintingType.STAGE; + } else if (art == Art.VOID) { + return PaintingType.VOID; + } else if (art == Art.SKULL_AND_ROSES) { + return PaintingType.SKULL_AND_ROSES; + } else if (art == Art.WITHER) { + return PaintingType.WITHER; + } else if (art == Art.FIGHTERS) { + return PaintingType.FIGHTERS; + } else if (art == Art.POINTER) { + return PaintingType.POINTER; + } else if (art == Art.PIGSCENE) { + return PaintingType.PIGSCENE; + } else if (art == Art.BURNINGSKULL) { + return PaintingType.BURNING_SKULL; + } else if (art == Art.SKELETON) { + return PaintingType.SKELETON; + } else if (art == Art.DONKEYKONG) { + return PaintingType.DONKEY_KONG; + } + return PaintingType.ALBANIAN; + } + + @Override + public Art getBukkitPaintingType(PaintingType paintingType) { + if (paintingType == PaintingType.KEBAB) { + return Art.KEBAB; + } else if (paintingType == PaintingType.AZTEC) { + return Art.AZTEC; + } else if (paintingType == PaintingType.ALBANIAN) { + return Art.ALBAN; + } else if (paintingType == PaintingType.AZTEC2) { + return Art.AZTEC2; + } else if (paintingType == PaintingType.BOMB) { + return Art.BOMB; + } else if (paintingType == PaintingType.PLANT) { + return Art.PLANT; + } else if (paintingType == PaintingType.WASTELAND) { + return Art.WASTELAND; + } else if (paintingType == PaintingType.POOL) { + return Art.POOL; + } else if (paintingType == PaintingType.COURBET) { + return Art.COURBET; + } else if (paintingType == PaintingType.SEA) { + return Art.SEA; + } else if (paintingType == PaintingType.SUNSET) { + return Art.SUNSET; + } else if (paintingType == PaintingType.CREEBET) { + return Art.CREEBET; + } else if (paintingType == PaintingType.WANDERER) { + return Art.WANDERER; + } else if (paintingType == PaintingType.GRAHAM) { + return Art.GRAHAM; + } else if (paintingType == PaintingType.MATCH) { + return Art.MATCH; + } else if (paintingType == PaintingType.BUST) { + return Art.BUST; + } else if (paintingType == PaintingType.STAGE) { + return Art.STAGE; + } else if (paintingType == PaintingType.VOID) { + return Art.VOID; + } else if (paintingType == PaintingType.SKULL_AND_ROSES) { + return Art.SKULL_AND_ROSES; + } else if (paintingType == PaintingType.WITHER) { + return Art.WITHER; + } else if (paintingType == PaintingType.FIGHTERS) { + return Art.FIGHTERS; + } else if (paintingType == PaintingType.POINTER) { + return Art.POINTER; + } else if (paintingType == PaintingType.PIGSCENE) { + return Art.PIGSCENE; + } else if (paintingType == PaintingType.BURNING_SKULL) { + return Art.BURNINGSKULL; + } else if (paintingType == PaintingType.SKELETON) { + return Art.SKELETON; + } else if (paintingType == PaintingType.DONKEY_KONG) { + return Art.DONKEYKONG; + } + return Art.ALBAN; + } + + @Override + public > T launchProjectile() { + return null; + } + +} From 756f872134c7f42a976a8b122259357ce138cf27 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:14:33 +0200 Subject: [PATCH 008/325] Add custom potion effect class replacing PotionEffectType as well as PotionData --- .../entity/util/potion/KelpPotionEffect.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java new file mode 100644 index 00000000..6db59568 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java @@ -0,0 +1,31 @@ +package de.pxav.kelp.core.entity.util.potion; + +import de.pxav.kelp.core.KelpServer; +import de.pxav.kelp.core.entity.util.potion.minecraft.AbsorptionPotionEffect; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.player.KelpPlayer; +import de.pxav.kelp.core.version.KelpVersion; + +public abstract class KelpPotionEffect { + + public static Class ABSORPTION = AbsorptionPotionEffect.class; + + public abstract String getName(); + + public abstract boolean isInstant(); + + public abstract Color getColor(); + + public abstract int getDurationForLevel(int level); + + public void onConsume(KelpPlayer player) {} + + public final boolean isBukkitEffect() { + return isBukkitEffectUnsafe(KelpServer.getVersion()); + } + + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return false; + } + +} From bd2345c79397b327f1379417885fe0bd397b823b Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:14:46 +0200 Subject: [PATCH 009/325] Implement default minecraft potion: AbsorptionPotionEffect --- .../minecraft/AbsorptionPotionEffect.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/AbsorptionPotionEffect.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/AbsorptionPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/AbsorptionPotionEffect.java new file mode 100644 index 00000000..4b8672bf --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/AbsorptionPotionEffect.java @@ -0,0 +1,28 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.inventory.metadata.Color; + +public class AbsorptionPotionEffect extends KelpPotionEffect { + + @Override + public String getName() { + return null; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return null; + } + + @Override + public int getDurationForLevel(int level) { + return 0; + } + +} From e647de62848248fa22bed560121913a10bfc47c2 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:16:21 +0200 Subject: [PATCH 010/325] Add version template for potion effects --- .../util/potion/PotionVersionTemplate.java | 13 ++++++++ .../entity/VersionedPotion.java | 31 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionVersionTemplate.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedPotion.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionVersionTemplate.java new file mode 100644 index 00000000..1359e37f --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionVersionTemplate.java @@ -0,0 +1,13 @@ +package de.pxav.kelp.core.entity.util.potion; + +import de.pxav.kelp.core.application.KelpVersionTemplate; +import org.bukkit.potion.PotionEffectType; + +@KelpVersionTemplate +public abstract class PotionVersionTemplate { + + public abstract PotionEffectType getBukkitPotion(Class effect); + + public abstract Class getKelpPotion(PotionEffectType effectType); + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedPotion.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedPotion.java new file mode 100644 index 00000000..13cd00db --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedPotion.java @@ -0,0 +1,31 @@ +package de.pxav.kelp.implementation1_8.entity; + +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.entity.util.potion.PotionVersionTemplate; +import de.pxav.kelp.core.version.Versioned; +import org.bukkit.potion.PotionEffectType; + +@Versioned +public class VersionedPotion extends PotionVersionTemplate { + + @Override + public PotionEffectType getBukkitPotion(Class effectClass) { + return getPotionMappings().get(effectClass); + } + + @Override + public Class getKelpPotion(PotionEffectType effectType) { + return getPotionMappings().inverse().get(effectType); + } + + private BiMap, PotionEffectType> getPotionMappings() { + BiMap, PotionEffectType> output = HashBiMap.create(); + + output.put(KelpPotionEffect.ABSORPTION, PotionEffectType.ABSORPTION); + + return output; + } + +} From 257e8d9248d653ae921d4dad144058b642c9e379 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:18:27 +0200 Subject: [PATCH 011/325] KelpEntity now is an interface independent from a separate version template --- .../de/pxav/kelp/core/entity/KelpEntity.java | 493 +++++++----------- 1 file changed, 191 insertions(+), 302 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java index 220c3b7a..1a8a0ac3 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java @@ -1,132 +1,47 @@ package de.pxav.kelp.core.entity; -import de.pxav.kelp.core.entity.version.EntityVersionTemplate; import de.pxav.kelp.core.world.KelpLocation; import de.pxav.kelp.core.world.KelpWorld; -import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.entity.Entity; -import org.bukkit.event.player.PlayerTeleportEvent; +import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.util.Vector; import java.util.List; import java.util.UUID; -/** - * A class description goes here. - * - * @author pxav - */ -public class KelpEntity { - - private Object minecraftEntity; - private KelpEntityType entityType; - private Location initialLocation; - private int entityId; - private EntityVersionTemplate entityVersionTemplate; - - public KelpEntity(Object minecraftEntity, - KelpEntityType entityType, - Location initialLocation, - int entityId, - EntityVersionTemplate entityVersionTemplate) { - this.minecraftEntity = minecraftEntity; - this.entityType = entityType; - this.initialLocation = initialLocation; - this.entityId = entityId; - this.entityVersionTemplate = entityVersionTemplate; - } - - public KelpEntity(EntityVersionTemplate entityVersionTemplate) { - this.entityVersionTemplate = entityVersionTemplate; - } - - public KelpEntity() {} - - public Object getMinecraftEntity() { - return minecraftEntity; - } - - public KelpEntity minecraftEntity(Object minecraftEntity) { - this.minecraftEntity = minecraftEntity; - return this; - } - - public KelpEntityType getEntityType() { - return entityType; - } - - public KelpEntity entityType(KelpEntityType entityType) { - this.entityType = entityType; - return this; - } - - public Location getInitialBukkitLocation() { - return initialLocation; - } - - public KelpLocation getInitialLocation() { - return KelpLocation.from(initialLocation); - } - - public KelpEntity initialLocation(KelpLocation currentLocation) { - this.initialLocation = currentLocation.getBukkitLocation(); - return this; - } - - public KelpEntity initialLocation(Location location) { - this.initialLocation = location; - return this; - } - - public int getEntityId() { - return entityId; - } - - public KelpEntity entityId(int entityId) { - this.entityId = entityId; - return this; - } - - public KelpEntity versionTemplate(EntityVersionTemplate entityVersionTemplate) { - this.entityVersionTemplate = entityVersionTemplate; - return this; - } - - public KelpEntity spawn() { - entityVersionTemplate.spawnEntity(this); - return this; - } +public interface KelpEntity> { /** - * Converts the current {@code KelpEntity} to a normal - * bukkit entity. + * Gets the unique id of this entity in its world. * - * @return The bukkit entity of the current KelpEntity. + * Every entity is assigned an id when spawned to a world, + * which can be used to identify this entity when sending packets + * for example. + * + * Entity ids are not incremental but random in a range + * from 0 to 2000, which usually is the maximum id used + * by bukkit. + * + * @return The id of this entity. */ - public Entity getBukkitEntity() { - return entityVersionTemplate.toBukkitEntity(this.minecraftEntity); - } + int getEntityId(); /** - * Gets the current entity's location in the world. + * Spawns the entity to the given initial location and makes it visible + * for all players on the world. * - * @return The current location of the current entity. + * @return An instance of the entity for fluent builder design. */ - public KelpLocation getLocation() { - return entityVersionTemplate.getLocation(getBukkitEntity()); - } + T spawn(); /** * Sets the entity's velocity to the given vector. * - * @param vector The vector of the velocity you want to set. + * @param velocity The vector of the velocity you want to set. * @see Vector */ - public KelpEntity setVelocity(Vector vector) { - entityVersionTemplate.setVelocity(getBukkitEntity(), vector); - return this; - } + T setVelocity(Vector velocity); /** * Gets the velocity of the desired entity. @@ -134,131 +49,105 @@ public KelpEntity setVelocity(Vector vector) { * @return The velocity of the given entity. * @see Vector */ - public Vector getVelocity() { - return entityVersionTemplate.getVelocity(getBukkitEntity()); - } + Vector getVelocity(); /** - * Gets the height of an entity. In older versions + * Gets the height of an entity's model. In older versions * this property was called 'length' of an entity. * * @return The height of the given entity. */ - public double getEntityHeight() { - return entityVersionTemplate.getHeight(getBukkitEntity()); - } + double getEntityHeight(); /** - * Gets the width of the given entity. + * Gets the width of the given entity's model. * * @return The entity's width. */ - public double getEntityWidth() { - return entityVersionTemplate.getWidth(getBukkitEntity()); - } + double getEntityWidth(); /** - * Checks if the entity is currently on the ground. + * Gets the exact {@link KelpEntityType type} of this entity such as ZOMBIE, SHEEP, CREEPER, etc. * - * @return {@code true} if the entity is currently on ground. + * @return The type of this entity. */ - public boolean isOnGround() { - return entityVersionTemplate.isOnGround(getBukkitEntity()); - } + KelpEntityType getType(); /** - * Gets the current world of the entity. + * Gets the current entity's location in the world. * - * @return The world where the entity is currently located. + * @return The current location of the current entity. */ - public KelpWorld getWorld() { - return KelpWorld.from(getLocation().getWorldName()); - } + KelpLocation getLocation(); /** - * Sets the rotation of the given entity. This does not - * affect the location x, y and z axes. + * Converts the current {@code KelpEntity} to a normal + * bukkit entity. * - * @param yaw The yaw value of the desired rotation. - * @param pitch The pitch value of the desired rotation. + * @return The bukkit entity of the current KelpEntity. */ - public KelpEntity setRotation(float yaw, float pitch) { - entityVersionTemplate.setRotation(getBukkitEntity(), yaw, pitch); - return this; - } + Entity getBukkitEntity(); /** - * Teleports the entity to the given location. + * Checks if the entity is currently on the ground. * - * @param to The location you want the entity to be teleported to. + * @return {@code true} if the entity is currently on ground. */ - public KelpEntity teleport(KelpLocation to) { - entityVersionTemplate.teleport(getBukkitEntity(), to, PlayerTeleportEvent.TeleportCause.PLUGIN); - return this; - } + boolean isOnGround(); /** - * Teleports the entity to the location at the given - * coordinates. As there is no world passed, this method - * will use the current world of the entity. + * Teleports the entity to the ground level of the + * current coordinates. This is useful when the entity + * is suspected to be stuck in an underground block. * - * @param x The exact value of the location's x axis. - * @param y The exact value of the location's y axis. - * @param z The exact value of the location's z axis. + * This method will then search for the highest non-passable block + * at the entities x and z coordinates and teleport it there. + * + * @return An instance of the current entity for fluent builder design. */ - public KelpEntity teleport(double x, double y, double z) { - KelpLocation to = KelpLocation.from(getWorld(), x, y, z); - teleport(to); - return this; - } + T setOnGround(); /** - * Teleports the entity to the location at the given - * coordinates. As there is no world passed, this method - * will use the current world of the entity. + * Gets the current world of the entity. * - * @param x The exact value of the location's x axis. - * @param y The exact value of the location's y axis. - * @param z The exact value of the location's z axis. - * @param yaw The yaw rotation of the entity. - * @param pitch The location's pitch + * @return The world where the entity is currently located. */ - public KelpEntity teleport(double x, double y, double z, float yaw, float pitch) { - KelpLocation to = KelpLocation.from(getWorld(), x, y, z, yaw, pitch); - teleport(to); - return this; - } + KelpWorld getWorld(); /** - * Teleports the entity to the location at the given - * coordinates. + * Sets the rotation of the given entity. This does not + * affect the location x, y and z axes. * - * @param world The world where the entity should be teleported to. - * @param x The exact value of the location's x axis. - * @param y The exact value of the location's y axis. - * @param z The exact value of the location's z axis. - * @param yaw The yaw rotation of the entity. - * @param pitch The location's pitch + * @param yaw The yaw value of the desired rotation. + * @param pitch The pitch value of the desired rotation. + * @return An instance of the current entity for fluent builder design. */ - public KelpEntity teleport(KelpWorld world, double x, double y, double z, float yaw, float pitch) { - KelpLocation to = KelpLocation.from(world, x, y, z, yaw, pitch); - teleport(to); - return this; - } + T setRotation(float yaw, float pitch); /** - * Teleports the entity to the location at the given - * coordinates. + * Makes the entity look to the given location. So it + * rotates its head to the given target location. * - * @param world The world where the entity should be teleported to. - * @param x The exact value of the location's x axis. - * @param y The exact value of the location's y axis. - * @param z The exact value of the location's z axis. + * @param target The location where the entity should look to. + * @return An instance of the current entity object for fluent builder design. */ - public KelpEntity teleport(KelpWorld world, double x, double y, double z) { - KelpLocation to = KelpLocation.from(world, x, y, z); - teleport(to); - return this; + default T lookTo(KelpLocation target) { + KelpLocation location = getLocation(); + double xDiff = target.getX() - location.getX(); + double yDiff = target.getY() - location.getY(); + double zDiff = target.getZ() - location.getZ(); + + double distanceXZ = Math.sqrt(xDiff * xDiff + zDiff * zDiff); + double distanceY = Math.sqrt(distanceXZ * distanceXZ + yDiff * yDiff); + + double yaw = Math.toDegrees(Math.acos(xDiff / distanceXZ)); + double pitch = Math.toDegrees(Math.acos(yDiff / distanceY)) - 90.0D; + if (zDiff < 0.0D) { + yaw += Math.abs(180.0D - yaw) * 2.0D; + } + + setRotation((float) yaw - 90.0F, (float) pitch); + return (T) this; } /** @@ -272,44 +161,46 @@ public KelpEntity teleport(KelpWorld world, double x, double y, double z) { * @param yaw The yaw rotation of the entity. * @param pitch The location's pitch */ - public KelpEntity teleport(String worldName, double x, double y, double z, float yaw, float pitch) { - KelpLocation to = KelpLocation.from(worldName, x, y, z, yaw, pitch); - teleport(to); - return this; + T teleport(String worldName, double x, double y, double z, float yaw, float pitch); + + /** + * Teleports the entity to the given location. + * + * @param to The location you want the entity to be teleported to. + */ + default T teleport(KelpLocation to) { + teleport(to.getWorldName(), to.getX(), to.getY(), to.getZ(), to.getYaw(), to.getPitch()); + return (T) this; } /** * Teleports the entity to the location at the given - * coordinates. + * coordinates. As there is no world passed, this method + * will use the current world of the entity. * - * @param worldName The name of the world where the entity should be teleported to. - * @param x The exact value of the location's x axis. - * @param y The exact value of the location's y axis. - * @param z The exact value of the location's z axis. + * @param x The exact value of the location's x axis. + * @param y The exact value of the location's y axis. + * @param z The exact value of the location's z axis. */ - public KelpEntity teleport(String worldName, double x, double y, double z) { - KelpLocation to = KelpLocation.from(worldName, x, y, z); - teleport(to); - return this; + default T teleport(double x, double y, double z) { + teleport(getWorld().getName(), x, y, z, 0, 0); + return (T) this; } /** - * Gets the id of the given entity. - * - * The entity id is a unique integer id, which is given - * to each entity when it is created by the server. It is - * used to identify entities during the server runtime. - * - * In contrast to the other {@code #getEntityId} method, - * this method uses the method provided by bukkit and not - * the Kelp-internal id. However, in most server versions these - * ids should be the same as an entity id is immutable - * for the same entity. + * Teleports the entity to the location at the given + * coordinates. As there is no world passed, this method + * will use the current world of the entity. * - * @return the entity's id provided by bukkit. + * @param x The exact value of the location's x axis. + * @param y The exact value of the location's y axis. + * @param z The exact value of the location's z axis. + * @param yaw The yaw rotation of the entity. + * @param pitch The location's pitch */ - public int getEntityIdBukkit() { - return entityVersionTemplate.getEntityId(getBukkitEntity()); + default T teleport(double x, double y, double z, float yaw, float pitch) { + teleport(getWorld().getName(), x, y, z, yaw, pitch); + return (T) this; } /** @@ -323,9 +214,7 @@ public int getEntityIdBukkit() { * * @return The amount of fire ticks. */ - public int getFireTicks() { - return entityVersionTemplate.getFireTicks(getBukkitEntity()); - } + int getFireTicks(); /** * Sets the current amount of fire ticks for the given @@ -338,46 +227,33 @@ public int getFireTicks() { * * @param fireTicks The amount of fire ticks you want to set. */ - public KelpEntity setFireTicks(int fireTicks) { - entityVersionTemplate.setFireTicks(getBukkitEntity(), fireTicks); - return this; - } + T setFireTicks(int fireTicks); /** - * Gets the amount of the maximum fire ticks of the given entity. + * Sets the amount of the maximum fire ticks of the given entity. * - * @return The amount of maximum fire ticks of the given entity. + * @param maxFireTicks The amount of maximum fire ticks to set. */ - public int getMaxFireTicks() { - return entityVersionTemplate.getMaxFireTicks(getBukkitEntity()); - } + T setMaxFireTicks(int maxFireTicks); /** - * Sets the amount of the maximum fire ticks of the given entity. + * Gets the amount of the maximum fire ticks of the given entity. * - * @param maxFireTicks The amount of maximum fire ticks to set. + * @return The amount of maximum fire ticks of the given entity. */ - public KelpEntity setMaxFireTicks(int maxFireTicks) { - entityVersionTemplate.setMaxFireTicks(getBukkitEntity(), maxFireTicks); - return this; - } + int getMaxFireTicks(); /** * Removes the entity from the world. */ - public KelpEntity remove() { - entityVersionTemplate.remove(getBukkitEntity()); - return this; - } + T remove(); /** * Checks if the given entity is dead. * * @return {@code true} if the entity is dead. */ - public boolean isDead() { - return entityVersionTemplate.isDead(getBukkitEntity()); - } + boolean isDead(); /** * Checks if the entity is valid. @@ -387,18 +263,14 @@ public boolean isDead() { * * @return {@code true} if the entity is 'valid'. */ - public boolean isValid() { - return entityVersionTemplate.isValid(getBukkitEntity()); - } + boolean isValid(); /** * Gets the current server containing the entity. * * @return The server instance. */ - public Server getServer() { - return entityVersionTemplate.getServer(getBukkitEntity()); - } + Server getServer(); /** * Gets the passenger of the current entity. @@ -414,13 +286,7 @@ public Server getServer() { * * @return The first or only passenger of the entity. {@code null} if there is no passenger. */ - public Entity getPassenger() { - List passengers = entityVersionTemplate.getPassengers(getBukkitEntity()); - if (passengers != null && !passengers.isEmpty()) { - return passengers.get(0); - } - return null; - } + KelpEntity getPassenger(); /** * Returns a list of all passengers currently riding @@ -434,9 +300,7 @@ public Entity getPassenger() { * @return A list of all passengers of the given entity. * {@code null} if there are no passengers. */ - public List getPassengers() { - return entityVersionTemplate.getPassengers(getBukkitEntity()); - } + List> getPassengers(); /** * Adds a new passenger to the given entity. @@ -448,10 +312,7 @@ public List getPassengers() { * @param passenger The passenger you want to add. * @return {@code true} if the action was successful. */ - public KelpEntity addPassenger(Entity passenger) { - entityVersionTemplate.addPassenger(getBukkitEntity(), passenger); - return this; - } + T addPassenger(KelpEntity passenger); /** * Adds multiple passengers to the given entity. @@ -463,20 +324,14 @@ public KelpEntity addPassenger(Entity passenger) { * @param passengers The passengers you want to add. * @return {@code true} if the action was successful. */ - public KelpEntity addPassenger(List passengers) { - passengers.forEach(this::addPassenger); - return this; - } + T addPassenger(List> passengers); /** * Removes a passenger from the given entity. * - * @param toRemove The passenger you want to remove. + * @param passenger The passenger you want to remove. */ - public KelpEntity removePassenger(Entity toRemove) { - entityVersionTemplate.removePassenger(getBukkitEntity(), toRemove); - return this; - } + T removePassenger(KelpEntity passenger); /** * Checks if the current entity is empty. An empty @@ -484,27 +339,22 @@ public KelpEntity removePassenger(Entity toRemove) { * * @return {@code true} if the entity is empty. */ - public boolean isEmpty() { - return entityVersionTemplate.isEmpty(getBukkitEntity()); - } + boolean isEmpty(); /** * Checks if the current entity has any passengers. * * @return {@code true} if there are any passengers. */ - public boolean hasAnyPassengers() { - return !entityVersionTemplate.isEmpty(getBukkitEntity()); + default boolean hasAnyPassengers() { + return !isEmpty(); } /** * Ejects any passenger currently riding on the * given entity. */ - public KelpEntity ejectPassengers() { - entityVersionTemplate.eject(getBukkitEntity()); - return this; - } + T ejectPassengers(); /** * Sets the current fall distance of the current entity. @@ -516,10 +366,7 @@ public KelpEntity ejectPassengers() { * * @param fallDistance The new fall distance you want to set. */ - public KelpEntity setFallDistance(float fallDistance) { - entityVersionTemplate.setFallDistance(getBukkitEntity(), fallDistance); - return this; - } + T setFallDistance(float fallDistance); /** * Gets the current fall distance of the current entity. @@ -531,9 +378,7 @@ public KelpEntity setFallDistance(float fallDistance) { * * @return The current fall distance of the entity. */ - public float getFallDistance() { - return entityVersionTemplate.getFallDistance(getBukkitEntity()); - } + float getFallDistance(); /** * Returns a unique as well as persistent id for @@ -542,9 +387,7 @@ public float getFallDistance() { * * @return The UUID of the given entity. */ - public UUID getUUID() { - return entityVersionTemplate.getUniqueId(getBukkitEntity()); - } + UUID getUUID(); /** * Gets the amount of ticks the entity has been alive. @@ -552,9 +395,7 @@ public UUID getUUID() { * * @return The age of the entity. */ - public int getTicksLived() { - return entityVersionTemplate.getTicksLived(getBukkitEntity()); - } + int getTicksLived(); /** * Gets the amount of ticks the entity has been alive. @@ -563,27 +404,19 @@ public int getTicksLived() { * @param ticksLived The amount of ticks you want to set. * May not be less than one tick. */ - public KelpEntity setTicksLived(int ticksLived) { - entityVersionTemplate.setTicksLived(getBukkitEntity(), ticksLived); - return this; - } + T setTicksLived(int ticksLived); /** * Returns true if the entity is currently inside a vehicle. * * @return {@code true} if the entity is inside a vehicle. */ - public boolean isInsideVehicle() { - return entityVersionTemplate.isInsideVehicle(getBukkitEntity()); - } + boolean isInsideVehicle(); /** * Makes the entity leave its current vehicle. */ - public KelpEntity leaveVehicle() { - entityVersionTemplate.leaveVehicle(getBukkitEntity()); - return this; - } + T leaveVehicle(); /** * Gets the current vehicle of the given entity. @@ -591,8 +424,64 @@ public KelpEntity leaveVehicle() { * @return The vehicle of the entity. If the entity * has no vehicle, null will be returned. */ - public Entity getVehicle() { - return entityVersionTemplate.getVehicle(getBukkitEntity()); + KelpEntity getVehicle(); + + boolean isGlowing(); + + T setGlowing(boolean glowing); + + /** + * Sets the custom name of an entity visible or invisible + * for the clients. + * + * @param visible {@code true} if it should be visible + * {@code false} if it should not be visible. + */ + T customNameVisible(boolean visible); + + T customName(String customName); + + /** + * Checks if the custom name of the given entity is + * currently visible. + * + * @return {@code true} if the custom name is visible. + */ + boolean isCustomNameVisible(); + + /** + * Gets the last damage cause. If the entity has not been damaged + * so far, it will return null. + * + * @return The last damage event instance containing the last + * damage cause. + */ + EntityDamageEvent getLastDamageCause(); + + /** + * Sets the last damage cause the entity has suffered. + * + * @param damageCause The instance of the last entity damage event containing + * the last damage cause. + */ + void setLastDamageCause(EntityDamageEvent damageCause); + + /** + * Gets all entities within the given radius centered around + * the given entity. + * + * @param radiusX the radius for the x axis + * (1/2 the size of the box along x axis) + * @param radiusY the radius for the y axis + * (1/2 the size of the box along y axis) + * @param radiusZ the radius for the z axis + * (1/2 the size of the box along z axis) + * @return A list of all nearby entities within the given radius. + */ + List> getNearbyEntities(double radiusX, double radiusY, double radiusZ); + + default List> getNearbyEntities(double radius) { + return getNearbyEntities(radius, radius, radius); } } From e4006364d739964d1248be102c16b3c4c12059ab Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:19:31 +0200 Subject: [PATCH 012/325] LivingKelpEntity now is an independent interface is well --- .../kelp/core/entity/LivingKelpEntity.java | 57 ++++--------------- 1 file changed, 12 insertions(+), 45 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java index 70695204..5f4f4111 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java @@ -1,51 +1,18 @@ package de.pxav.kelp.core.entity; -import de.pxav.kelp.core.entity.version.EntityVersionTemplate; -import de.pxav.kelp.core.entity.version.LivingEntityVersionTemplate; +import de.pxav.kelp.core.entity.type.general.DamageableEntity; import de.pxav.kelp.core.world.KelpLocation; -import org.bukkit.Location; -import org.bukkit.entity.LivingEntity; -/** - * A class description goes here. - * - * @author pxav - */ -public class LivingKelpEntity extends KelpEntity { - - protected LivingEntityVersionTemplate livingEntityVersionTemplate; - protected LivingEntity bukkitLivingEntity; - - public LivingKelpEntity(Object minecraftEntity, - KelpEntityType entityType, - Location initialLocation, - int entityId, - EntityVersionTemplate entityVersionTemplate, - LivingEntityVersionTemplate livingEntityVersionTemplate, - LivingEntity bukkitLivingEntity) { - super(minecraftEntity, entityType, initialLocation, entityId, entityVersionTemplate); - this.livingEntityVersionTemplate = livingEntityVersionTemplate; - this.bukkitLivingEntity = bukkitLivingEntity; - } - - public LivingKelpEntity() {} - - public LivingKelpEntity bukkitLivingEntity(LivingEntity bukkitLivingEntity) { - this.bukkitLivingEntity = bukkitLivingEntity; - return this; - } - - public LivingKelpEntity livingEntityVersionTemplate(LivingEntityVersionTemplate livingEntityVersionTemplate) { - this.livingEntityVersionTemplate = livingEntityVersionTemplate; - return this; - } - - public LivingEntity getBukkitLivingEntity() { - return bukkitLivingEntity; - } - - public KelpLocation getEyeLocation() { - return this.livingEntityVersionTemplate.getEyeLocation(bukkitLivingEntity); - } +public interface LivingKelpEntity> extends KelpEntity, DamageableEntity { + + /** + * Gets the location of the entity's eyes. When you get + * the normal location of a player for example, the feet location + * will be returned. This method gets the eye location depending + * on the current entity type. + * + * @return The location of the entity's eyes. + */ + KelpLocation getEyeLocation(); } From 34291f79660401085d44c726230a9fd8cdc84c36 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:20:22 +0200 Subject: [PATCH 013/325] Add superinterface for Mobs (mobile entities) --- .../core/entity/type/general/MobileEntity.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/MobileEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/MobileEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/MobileEntity.java new file mode 100644 index 00000000..0bb697b0 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/MobileEntity.java @@ -0,0 +1,15 @@ +package de.pxav.kelp.core.entity.type.general; + +import de.pxav.kelp.core.entity.LivingKelpEntity; + +public interface MobileEntity> extends LivingKelpEntity { + + T setTarget(LivingKelpEntity target); + + LivingKelpEntity getTarget(); + + boolean isAware(); + + boolean setAware(boolean aware); + +} From f61a7a495e0d9fde6834a31ba2d348bce4749cd6 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:21:08 +0200 Subject: [PATCH 014/325] Add superinterface for ageable entities (such as animals or some monsters) --- .../entity/type/general/AgeableEntity.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/AgeableEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/AgeableEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AgeableEntity.java new file mode 100644 index 00000000..3e0e9e7f --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AgeableEntity.java @@ -0,0 +1,28 @@ +package de.pxav.kelp.core.entity.type.general; + +public interface AgeableEntity> { + + T makeBaby(); + + T setBaby(boolean baby); + + T setAdult(boolean adult); + + T makeAdult(); + + boolean isAdult(); + + boolean isBaby(); + + T setAge(int age); + + default T toggleMaxAge() { + if (isBaby()) { + makeAdult(); + } else { + makeBaby(); + } + return (T) this; + } + +} From 9db863d7ea9517a02a6ccde848453322f51ecbd9 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:21:17 +0200 Subject: [PATCH 015/325] Add superinterface for all animal entities --- .../de/pxav/kelp/core/entity/type/general/AnimalEntity.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/AnimalEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/AnimalEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AnimalEntity.java new file mode 100644 index 00000000..823816b2 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AnimalEntity.java @@ -0,0 +1,5 @@ +package de.pxav.kelp.core.entity.type.general; + +public interface AnimalEntity> extends MobileEntity { + +} From 66ad96f90faf1eb68e815164a3c140995e85d536 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:21:37 +0200 Subject: [PATCH 016/325] Add superinterface for all breedable entities (such as villagers or most animals) --- .../kelp/core/entity/type/general/BreedableEntity.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/BreedableEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/BreedableEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/BreedableEntity.java new file mode 100644 index 00000000..8a8220a7 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/BreedableEntity.java @@ -0,0 +1,9 @@ +package de.pxav.kelp.core.entity.type.general; + +public interface BreedableEntity> extends MobileEntity { + + boolean canBreed(); + + T setBreedable(boolean breedable); + +} From 3cc221ecda16f161f496b36060e91ff83ed59daf Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:22:50 +0200 Subject: [PATCH 017/325] Add superinterface for all damageable entities --- .../entity/type/general/DamageableEntity.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/DamageableEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/DamageableEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/DamageableEntity.java new file mode 100644 index 00000000..4b9cd924 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/DamageableEntity.java @@ -0,0 +1,21 @@ +package de.pxav.kelp.core.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntity; + +public interface DamageableEntity> extends KelpEntity { + + T damage(double damage); + + T damage(double damage, KelpEntity source); + + double getAbsorptionAmount(); + + T setAbsorptionAmount(int absorptionAmount); + + int getHealth(); + + int getMaxHealth(); + + T setHealth(int health); + +} From 6d032e893c0f3bc5141867f8b7d964a0e1ecc9db Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:23:05 +0200 Subject: [PATCH 018/325] Add superinterface for all vehicle entities such as minecarts or boats --- .../kelp/core/entity/type/general/VehicleEntity.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/VehicleEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/VehicleEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/VehicleEntity.java new file mode 100644 index 00000000..48c57710 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/VehicleEntity.java @@ -0,0 +1,12 @@ +package de.pxav.kelp.core.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntity; +import org.bukkit.util.Vector; + +public interface VehicleEntity> extends KelpEntity { + + Vector getVehicleVelocity(); + + T setVehicleVelocity(Vector vehicleVelocity); + +} From 9d41b6e08895bb1b3325257a77953034ec3c54ee Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:23:22 +0200 Subject: [PATCH 019/325] Add superinterface for all projectile entities such as arrows or thrown potions, etc. --- .../kelp/core/entity/type/general/ProjectileLauncher.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/ProjectileLauncher.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/ProjectileLauncher.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/ProjectileLauncher.java new file mode 100644 index 00000000..e30d7f84 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/ProjectileLauncher.java @@ -0,0 +1,7 @@ +package de.pxav.kelp.core.entity.type.general; + +public interface ProjectileLauncher> { + + > E launchProjectile(Class> projectileType); + +} From dd559554c21340f4b88912e9dbbb300ed741dc97 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:23:33 +0200 Subject: [PATCH 020/325] Add superinterface for all hostile mobs including monsters --- .../entity/type/general/MonsterEntity.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/MonsterEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/MonsterEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/MonsterEntity.java new file mode 100644 index 00000000..2cb7178a --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/MonsterEntity.java @@ -0,0 +1,25 @@ +package de.pxav.kelp.core.entity.type.general; + +import org.bukkit.Bukkit; +import org.bukkit.Difficulty; +import org.bukkit.World; + +public interface MonsterEntity> extends MobileEntity { + + int getMaximumSpawnLightLevel(); + + default boolean canSpawnInLightLevel(int lightLevel) { + return getMaximumSpawnLightLevel() >= lightLevel; + } + + int getAttackDamage(Difficulty difficulty); + + default int getAttackDamage() { + World world = Bukkit.getWorld(getLocation().getWorldName()); + if (world == null) { + return 0; + } + return getAttackDamage(world.getDifficulty()); + } + +} From 36055c780fd3960959acf609e8df58119d59c8f2 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:23:47 +0200 Subject: [PATCH 021/325] Add superinterface for all projectiles --- .../kelp/core/entity/type/general/KelpProjectile.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/KelpProjectile.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/KelpProjectile.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/KelpProjectile.java new file mode 100644 index 00000000..3eedc948 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/KelpProjectile.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntity; + +public interface KelpProjectile> extends KelpEntity { + + T setLauncher(ProjectileLauncher launcher); + + ProjectileLauncher getLauncher(); + +} From d7ec7ad21ea16c53b01f8f09e78576bc59603b29 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:24:26 +0200 Subject: [PATCH 022/325] Add superinterface for all human entities (players & villages) --- .../core/entity/type/general/HumanEntity.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/HumanEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/HumanEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/HumanEntity.java new file mode 100644 index 00000000..9c2485b3 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/HumanEntity.java @@ -0,0 +1,26 @@ +package de.pxav.kelp.core.entity.type.general; + +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.GameMode; + +public interface HumanEntity> extends MobileEntity { + + // TODO: INVENTORIES + + GameMode getGameMode(); + + T setGameMode(); + + // location of bed the player is currently sleeping in null if not sleeping + KelpLocation getCurrentBedLocation(); + + int getExpToLevel(); + + // not set spawn loc + T wakeUp(); + + T wakeUpAndSetSpawnLocation(); + + T sleep(KelpLocation bedLocation); + +} From 2c59865b9cc66e5fa63d9ab8c61ee95a452665ed Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:24:42 +0200 Subject: [PATCH 023/325] Add superinterface for all hanging entities such as paintings or item frames --- .../core/entity/type/general/HangingEntity.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/HangingEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/HangingEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/HangingEntity.java new file mode 100644 index 00000000..73aa3d54 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/HangingEntity.java @@ -0,0 +1,15 @@ +package de.pxav.kelp.core.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.world.KelpBlock; +import de.pxav.kelp.core.world.util.KelpBlockFace; + +public interface HangingEntity> extends KelpEntity { + + KelpBlockFace getAttachedFace(); + + KelpBlock getAttachedBlock(); + + T setFacingDirection(KelpBlockFace blockFace); + +} From 3ff2c57b594e3b3f55e1b0cf6c917a0ea739ea40 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:25:39 +0200 Subject: [PATCH 024/325] Add superinterface for all explosive entities such as creepers or fireballs --- .../entity/type/general/ExplosiveEntity.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/ExplosiveEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/ExplosiveEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/ExplosiveEntity.java new file mode 100644 index 00000000..bea2ac0b --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/ExplosiveEntity.java @@ -0,0 +1,31 @@ +package de.pxav.kelp.core.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.world.util.ExplosionPower; + +public interface ExplosiveEntity> extends KelpEntity { + + ExplosionPower getExplosionPower(); + + T setExplosionPower(ExplosionPower power); + + boolean createsFire(); + + T canCreateFire(boolean create); + + default T enableFire() { + canCreateFire(true); + return (T) this; + } + + default T disableFire() { + canCreateFire(false); + return (T) this; + } + + default T disableExplosion() { + setExplosionPower(ExplosionPower.NO_EXPLOSION); + return (T) this; + } + +} From 10662edcb414f86ca362d2cecf71f23345e30d6b Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:26:17 +0200 Subject: [PATCH 025/325] Apply new interface-based entity structure to ZombieEntity --- .../kelp/core/entity/type/ZombieEntity.java | 47 ++++++++++--------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieEntity.java index 55f4c2f9..f4546f10 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieEntity.java @@ -1,34 +1,37 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntityFactory; import de.pxav.kelp.core.entity.KelpEntityType; -import de.pxav.kelp.core.entity.LivingKelpEntity; -import de.pxav.kelp.core.entity.version.EntityVersionTemplate; -import de.pxav.kelp.core.entity.version.LivingEntityVersionTemplate; -import org.bukkit.Location; -import org.bukkit.entity.LivingEntity; +import de.pxav.kelp.core.entity.type.general.AgeableEntity; +import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.Difficulty; -/** - * A class description goes here. - * - * @author pxav - */ -public class ZombieEntity extends LivingKelpEntity { +public interface ZombieEntity extends AgeableEntity, MonsterEntity { - private boolean isBaby = false; - - public ZombieEntity() {} - - public ZombieEntity(EntityVersionTemplate entityVersionTemplate, LivingEntityVersionTemplate livingEntityVersionTemplate, LivingEntity livingEntity, Object entity, int entityId, Location location, boolean isBaby) { - super(entity, KelpEntityType.ZOMBIE, location, entityId, entityVersionTemplate, livingEntityVersionTemplate, livingEntity); - this.isBaby = isBaby; + static ZombieEntity create(KelpLocation location) { + return (ZombieEntity) KelpPlugin.getInjector().getInstance(KelpEntityFactory.class) + .newKelpEntity(KelpEntityType.ZOMBIE, location.getBukkitLocation()); } - public boolean isBaby() { - return isBaby; + @Override + default int getAttackDamage(Difficulty difficulty) { + if (difficulty == Difficulty.EASY) { + return 4; + } + if (difficulty == Difficulty.NORMAL) { + return 6; + } + if (difficulty == Difficulty.HARD) { + return 8; + } + return 0; } - public void setBaby(boolean baby) { - isBaby = baby; + @Override + default int getMaximumSpawnLightLevel() { + return 7; } } From b53a54bbf4e29cd73fdd4052c575cb15a638ccc1 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:26:55 +0200 Subject: [PATCH 026/325] KelpPlayer is now an interface and a subclass of HumanEntity --- .../de/pxav/kelp/core/player/KelpPlayer.java | 580 +++++++++++++++++- 1 file changed, 568 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java index 5f863d8b..8bbb7844 100644 --- a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java +++ b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java @@ -2,7 +2,6 @@ import com.google.common.base.Preconditions; import de.pxav.kelp.core.KelpPlugin; -import de.pxav.kelp.core.entity.LivingKelpEntity; import de.pxav.kelp.core.entity.type.general.HumanEntity; import de.pxav.kelp.core.entity.type.general.ProjectileLauncher; import de.pxav.kelp.core.event.kelpevent.sidebar.KelpSidebarRemoveEvent; @@ -29,6 +28,7 @@ import org.bukkit.scoreboard.DisplaySlot; import org.bukkit.scoreboard.Scoreboard; +import java.net.InetSocketAddress; import java.util.Collection; import java.util.UUID; @@ -238,8 +238,25 @@ default KelpPlayer playSound(KelpSound sound, float volume, float pitch) { KelpPlayer playSound(KelpSound sound, KelpLocation from, float volume, float pitch); + /** + * Sends an action bar message to the player. + * The action bar is a line of text, which is displayed + * above the player's hotbar. + * + * @param message The message you want to send. + */ KelpPlayer sendActionbar(String message); + /** + * Sends a title to a player. A title is a big text displayed + * right in the middle of the player's screen. + * + * @param title The upper title text (will be displayed slightly bigger than the sub title). + * @param subTitle The lower title text (will be displayed slightly smaller than the main title). + * @param fadeIn How long should it take to fade the title in? (in ticks) + * @param stay How long should the title stay in 100% opacity? (in ticks) + * @param fadeOut How long should it take to fade the title out? (in ticks) + */ KelpPlayer sendTitle(String title, String subTitle, int fadeIn, int stay, int fadeOut); default KelpPlayer sendTitle(String title, String subTitle) { @@ -317,12 +334,39 @@ default KelpPlayer spawnParticle(ParticleType particleType, String getName(); + /** + * Sets the player's health. + * + * @param player The player whose health you want to change. + * @param health How many health points the player should have. + * 2 health points equal 1 heart. + * So 20 health points equal the full 10 hearts. + */ KelpPlayer setHealth(int health); + /** + * Checks if the player is currently stuck in a cobweb. + * + * @return {@code true} if the player is currently stuck in a cobweb. + */ boolean isInCobweb(); + /** + * Checks if the player is currently located in water. + * + * @return {@code true} if the player is currently in water. + */ boolean isInWater(); + /** + * Sends a chat message from the given player. + * This means you can send a message as if the player itself + * typed in this message. This also works with commands, if + * you add a slash in front of the message. + * + * @param player The player from whom the message should be sent. + * @param message The message you want to send. + */ KelpPlayer chat(String message); default KelpPlayer clearChat() { @@ -332,22 +376,101 @@ default KelpPlayer clearChat() { return this; } + /** + * Gets the socket address of a specific player. + * + * @return The {@code InetSocketAddress} object of the player's address. + */ + InetSocketAddress getSocketAddress(); + + /** + * Determines if the Player is allowed to fly via + * jump key double-tap like in creative mode. + * + * If a player flies without permission, they will get kicked + * by the server automatically. + * + * @return {@code true} if the player is allowed to fly. + */ boolean mayFly(); + /** + * Gets the display name of a player. + * The display name is a name which - unlike the normal name - + * can be modified during the server runtime. You can use this + * to include custom prefixes, ... + * + * @return The display name. + */ String getDisplayName(); - KelpPlayer setDisplayName(); + /** + * Sets the display name of a player + * The display name is a name which - unlike the normal name - + * can be modified during the server runtime. You can use this + * to include custom prefixes, ... + * + * @param displayName The display name you want to set. + */ + KelpPlayer setDisplayName(String displayName); + /** + * Gets the tab-list name of the player. + * The tab-list name is the name which is used to represent + * the player in the tab-list of online players. + * + * @return The tab-list name. + */ String getTabListName(); - KelpPlayer setTabListName(); + /** + * Sets the tab-list name of the player. + * The tab-list name is the name which is used to represent + * the player in the tab-list of online players. + * + * @param tabListName The tab-list name you want to set. + */ + KelpPlayer setTabListName(String tabListName); + /** + * Sets the compass target of the player. + * The compass target is the location, where the compass needle + * points to. By default this is the spawn location of the world, + * but you could set this to specific player locations as well. + * + * @param target The location, where the compass should point to. + */ KelpPlayer setCompassTarget(KelpLocation target); + /** + * Gets the compass target of the player. + * The compass target is the location, where the compass needle + * points to. By default this is the spawn location of the world. + * + * @return The target location of the player's compass. + */ + KelpPlayer getCompassTarget(); + + /** + * Kicks the given player from the server. + * + * @param kickMessage The message, which should be received by the player. + * Could also be named kick reason. + */ KelpPlayer kickPlayer(String kickMessage); + /** + * Checks if the player is currently sneaking/crouching. + * @return {@code true} if the player is sneaking. + */ boolean isSneaking(); + /** + * Modifies the sneak state of the player. + * + * @param sneaking {@code true} if you want to make the player sneak. + * {@code false}, if not. + */ KelpPlayer setSneaking(boolean sneaking); default KelpPlayer toggleSneak() { @@ -365,9 +488,25 @@ default KelpPlayer unSneak() { return this; } + /** + * Checks if the player is currently sprinting. + * Sprinting is active when the player has double-pressed the + * walking key or pressed the walking and sprinting key at + * once. + * + * @return {@code true} if the player is currently sprinting. + */ boolean isSprinting(); - KelpPlayer setSprinting(boolean sneaking); + /** + * Changes the sprinting state of a player. + * Sprinting is active when the player has double-pressed the + * walking key or pressed the walking and sprinting key at + * once. + * + * @param sprinting {@code true} if the player should be sprinting. + */ + KelpPlayer setSprinting(boolean sprinting); default KelpPlayer toggleSprinting() { setSneaking(!isSneaking()); @@ -384,6 +523,19 @@ default KelpPlayer unSprint() { return this; } + /** + * Checks if the player is ignored when the server checks who is sleeping. + * + * When it is night, normally all players have to sleep so that the + * time can jump to morning. If you don't want all players to sleep, + * you can give specific players this flag and they don't have to sleep + * anymore. + * + * If you give this flag to all players, nothing will happen at night. + * So there has to be at least one player sleeping at night. + * + * @return {@code true} if the player has the ignore flag. + */ boolean isSleepingIgnored(); default KelpPlayer ignoreSleeping() { @@ -401,66 +553,271 @@ default KelpPlayer toggleIgnoreSleeping() { return this; } + /** + * Sets the player ignored when the server checks who is sleeping. + * + * When it is night, normally all players have to sleep so that the + * time can jump to morning. If you don't want all players to sleep, + * you can give specific players this flag and they don't have to sleep + * anymore. + * + * If you give this flag to all players, nothing will happen at night. + * So there has to be at least one player sleeping at night. + * + * @param sleepingIgnored {@code true} if the player should be ignored when sleeping. + */ KelpPlayer setSleepingIgnored(boolean sleepingIgnored); KelpPlayer setRelativePlayerTime(long time); + /** + * Sets the player time. Each player can have an individual time + * - even if they are in the same world. + * + * @param time If {@code relative} is set to {@code true}, this is the + * time offset to the server time in ticks. If {@code relative} + * is set to {@code false} it is the absolute day time ticks. + */ KelpPlayer setPlayerTime(long time); + /** + * Gets the current player time. Each player can have an + * individual time - even if they are in the same world. + * + * @return The current time of the player in ticks. + */ long getPlayerTime(); + /** + * If the player time was set with {@code relative} to {@code true}, + * then it will get the offset of the player time to the current server + * time. If {@code relative} was set to {@code false}, it will simply + * return the current player time. + * + * @return The player's time (offset). + */ long getPlayerTimeOffset(); + /** + * Checks if the player time set for the player is relative + * to the server time. More information can be found + * at {@code #setPlayerTime(player, time, relative)} + * + * @return {@code true} if player time is relative to server time. + */ boolean isPlayerTimeRelative(); + /** + * Resets the player time back to the current server + * time. So the times of both are synchronized again. + * + */ KelpPlayer resetPlayerTime(); + /** + * Gives the player the given amount of experience. + * This method simply adds the given amount to the player's + * current exp count and does not overwrite anything. + * + * @param amount The amount of experience to give. + */ default KelpPlayer giveExperience(int amount) { setExperience(getExperience() + amount); return this; } + /** + * Gives or takes the player the given amount of experience. + * Negative amounts express that levels should be taken + * away from the player, positive amounts will be added. + * + * @param amount The amount of levels to give or take. + */ default KelpPlayer giveExperienceLevels(int amount) { setLevel(getLevel() + amount); return this; } + /** + * Gets the current experience of the given player. + * + * Experience is a percentage value (ranging from 0 to 1) + * indicating the progress to the next full level. + * 0 means he has just reached a new level and has made no + * progress since then, wile 1 says the player is just about + * to reach a new level. + * + * Inside Minecraft, the experience is represented by the + * green bar above the hotbar. + * + * @return The current experience progress (from 0 to 1). + */ float getExperience(); + /** + * Sets the current experience of the given player. + * + * Experience is a percentage value (ranging from 0 to 1) + * indicating the progress to the next full level. + * 0 means he has just reached a new level and has made no + * progress since then, wile 1 says the player is just about + * to reach a new level. + * + * Inside Minecraft, the experience is represented by the + * green bar above the hotbar. + * + * @param experience The experience value you want to set. + * May range from 0 to 1. + */ KelpPlayer setExperience(float experience); + /** + * Sets the current amount of the player's levels. + * + * Levels are reached when the experience count reaches 1. + * The amount of levels is represented by the small green + * number above the level bar. + * + * @param level The new level count to set. + */ KelpPlayer setLevel(int level); + /** + * Gets the current amount of the player's levels. + * + * Levels are reached when the experience count reaches 1. + * The amount of levels is represented by the small green + * number above the level bar. + * + * @return The current amount of levels. + */ int getLevel(); + /** + * Gets the players total experience points. + * + * This refers to the total amount of experience + * the player has collected over time and is not currently + * displayed to the client. + * + * @return The total experience points amount. + */ int getTotalExperience(); + /** + * Sets the players total experience points. + * + * This refers to the total amount of experience + * the player has collected over time and is not currently + * displayed to the client. + * + * @param experience The new amount of total experience. + */ KelpPlayer setTotalExperience(int experience); + /** + * Gets the player's current exhaustion level. + * Exhaustion controls how fast the food level drops. + * While you have a certain amount of exhaustion, + * your saturation will drop to zero, and then your + * food will drop to zero. + * + * @return The exhaustion level of the current player. + */ float getExhaustionLevel(); + /** + * Sets the player's current exhaustion level. + * Exhaustion controls how fast the food level drops. + * While you have a certain amount of exhaustion, + * your saturation will drop to zero, and then your + * food will drop to zero. + * + * @param exhaustionLevel The exhaustion level you want to set. + */ KelpPlayer setExhaustionLevel(float exhaustionLevel); + /** + * Sets the saturation level of a player. + * Saturation is a buffer for food level. + * Your food level will not drop if you are saturated > 0. + * + * @param saturationLevel The saturation level you want to set. + */ KelpPlayer setSaturationLevel(float saturationLevel); + /** + * Gets the saturation level of a player. + * Saturation is a buffer for food level. + * Your food level will not drop if you are saturated > 0. + * + * @return The saturation of the player. + */ float getSaturationLevel(); + /** + * Gets the current food level of the player. The + * food level indicates how full the food bar is. + * 20 means a full food bar, 0 an empty food bar. + * + * @return The food level of the player. + */ int getFoodLevel(); + /** + * Sets the food level of a player. + * The food level indicates how full the food bar is. + * 20 means a full food bar, 0 an empty food bar. + * + * @param foodLevel The absolute food level you want to set. + */ KelpPlayer setFoodLevel(int foodLevel); + /** + * Sets if the player is allowed to fly as if he was in creative + * mode + * + * @param allowed {@code true} if you want to allow, {@code false} + * if not. + */ KelpPlayer setAllowFlight(boolean allowed); KelpPlayer allowFlying(); KelpPlayer disallowFlying(); + /** + * Hides a player from another player, so they become invisible + * for the other player. + * + * @param toHide The player you want to hide. + */ KelpPlayer hidePlayer(KelpPlayer toHide); + /** + * Shows a player to another player again, so they become visible + * for the other player. + * + * @param toShow The player you want to show. + */ KelpPlayer showPlayer(KelpPlayer toShow); + /** + * Checks if the given player can see the targeted player. + * This does not check if the player currently really sees + * the given target player, but if the player is not hidden. + * + * @param toCheck The player to check if he is visible for the + * other player. + * @return {@code true} if {@code player} can see {@code toCheck}. + */ boolean canSee(KelpPlayer toCheck); + /** + * Checks if the player is currently flying. + * + * @return {@code true} if the player is flying. + */ boolean isFlying(); default KelpPlayer makeFlying() { @@ -478,24 +835,141 @@ default KelpPlayer toggleFlying() { return this; } + /** + * Changes the flying state of the player. + * + * @param flying {@code true} if you want to make the player fly. + * {@code false} if you don't want to make the player fly. + */ KelpPlayer setFlying(boolean flying); + /** + * Sets the current fly speed of a player. The higher + * the value the higher the speed. Negative values + * indicate reverse directions. + * + * @param flySpeed The desired fly speed. The value may + * range from -1 to 1. + */ KelpPlayer setFlySpeed(float flySpeed); + /** + * Gets the current speed a player can fly. The higher + * the value the higher the speed. Negative values + * indicate reverse directions. + * + * @return The current fly speed of a player. + * Value can range from -1 to 1 + */ float getFlySpeed(); + /** + * Gets the current speed a player can walk. The higher + * the value the higher the speed. Negative values + * indicate reverse directions. + * + * @return The current walk speed of a player. + * Value can range from -1 to 1 + */ float getWalkSpeed(); + /** + * Sets the current walk speed of a player. The higher + * the value the higher the speed. Negative values + * indicate reverse directions. + * + * @param walkSpeed The desired walk speed. The value may + * range from -1 to 1. + */ + KelpPlayer setWalkSpeed(float walkSpeed); + + KelpPlayer resetWalkSpeed(); + + /** + * Request that the player's client download and switch resource packs. + * + * The player's client will download the new resource pack asynchronously + * in the background, if the request was accepted, and will automatically switch to it once the download + * is complete. If the client has downloaded and cached a resource pack + * with the same hash in the past it will not download but directly apply + * the cached pack. When this request is sent for the very first time + * from a given server, the client will first display a confirmation GUI + * to the player before proceeding with the download. + * + * @param player The player who should download the Resource pack. + * @param url The URL from which the client will download the resource pack. + * The string must contain only US-ASCII characters + * and should be encoded as per RFC 1738. + */ KelpPlayer setResourcePack(String url); + /** + * Request that the player's client download and switch resource packs. + * + * The player's client will download the new resource pack asynchronously + * in the background, if the request was accepted, and will automatically switch to it once the download + * is complete. If the client has downloaded and cached a resource pack + * with the same hash in the past it will not download but directly apply + * the cached pack. When this request is sent for the very first time + * from a given server, the client will first display a confirmation GUI + * to the player before proceeding with the download. + * + * @param url The URL from which the client will download the resource pack. + * The string must contain only US-ASCII characters + * and should be encoded as per RFC 1738. + * @param hash The sha1 hash sum of the resource pack file + * which is used to apply a cached version of the pack + * directly without downloading if it is available. + * Has to be 20 bytes long! + */ KelpPlayer setResourcePack(String url, byte[] hash); + /** + * Sets if the player is shown the scaled health bar. + * If you modify your health scale with {@code setHealthScale}, + * you have to say the server to send this new scaled health + * to the player. + * + * @param scaled {@code true} whether the health should be scaled. + */ + KelpPlayer setHealthScaled(boolean scaled); + + /** + * Checks if the player has received the scaled health bar + * from the server. + * + * @return {@code true} if the player's health bar scale is up to date. + */ boolean isHealthScaled(); + /** + * Sets the health scale of the given player. The health + * scale is the maximum amount of hearts displayed to the + * client. + * 2 means one heart is displayed. If you choose values + * above 20, the player will get additional hearts. + * Consider changing the max health as well. + * + * This method will automatically set {@code setHealthScaled} to + * {@code true}. + * + * @param healthScale The amount of scaled health you want to set. + */ KelpPlayer setHealthScale(double healthScale) ; + /** + * Gets the number of scaled health points, + * which are currently displayed to the client. + * + * @return The number of scaled health if health + * scaling was set to {@code true} earlier. + */ double getHealthScale(); + /** + * Cancels the title animation for a player. The current + * title is removed immediately. + */ KelpPlayer resetTitle(); KelpPlayer setClientViewDistanceInternally(int clientViewDistance); @@ -514,19 +988,51 @@ default KelpPlayer toggleFlying() { boolean isPlayerChatColorEnabled(); - KelpPlayer setTabListHeader(String header); - - KelpPlayer setTabListFooter(String footer); + default KelpPlayer setTabListHeader(String header) { + setTabListHeaderAndFooter(header, getTabListFooter()); + return this; + } - default KelpPlayer setTabListHeaderAndFooter(String header, String footer) { - setTabListHeader(header).setTabListFooter(footer); + default KelpPlayer setTabListFooter(String footer) { + setTabListHeaderAndFooter(getTabListHeader(), footer); return this; } + /** + * Sets the tab header and footer of player. The tab header is + * a text displayed above the player list in the tab, while + * the tab footer is a message displayed below the player list. + * + * The messages may contain '\n' to create new lines inside the + * message. + * + * @param header The header message you want to send. + * @param footer The footer message you want to send. + */ + KelpPlayer setTabListHeaderAndFooter(String header, String footer); + String getTabListFooter(); String getTabListHeader(); + /** + * Gets the version number of the client's protocol. You + * can convert this information to the release name with the + * help of this list: https://wiki.vg/Protocol_version_numbers + * Please note that you should use the versions after the Netty + * rewrite. + * + * @return The protocol version number. + */ + int getProtocolVersion(); + + /** + * Checks if the given player is a server operator. A server operator + * is a player, who has all permissions and can execute every + * command. + * + * @return {@code true} if the player is a server operator. + */ boolean isOperator(); default KelpPlayer makeOperator() { @@ -544,16 +1050,53 @@ default KelpPlayer toggleOperator() { return this; } + /** + * Sets the player to a server operator. A server operator + * is a player, who has all permissions and can execute every + * command. + * + * @param operator {@code true} If you want to make the player an operator. + */ KelpPlayer setOperator(boolean operator); - KelpPlayer grantPermission(String permissionName); + /** + * Gives the player the desired permission. + * + * @param permission The name of the permission you want to give the player. + */ + KelpPlayer grantPermission(String permission); - KelpPlayer removePermission(String permissionName); + /** + * Removes the specified permission from the given player. + * + * @param permission The name of the permission you want to remove. + */ + KelpPlayer removePermission(String permission); - boolean hasPermission(String permissionName); + /** + * Checks if the given player has the desired permission. + * + * @param permission The permission you want to check for. + * @return {@code true} if the player has the permission. + */ + boolean hasPermission(String permission); + /** + * Checks if the given player is currently banned from the server. + * This does only check if the player was banned by the + * bukkit server using the normal {@code /ban} command. If another + * plugin has banned the player, this is ignored. + * + * @return {@code true} if the player has been banned by the bukkit server. + */ boolean isBannedByBukkit(); + /** + * Checks if the player is on the bukkit whitelist. + * + * @param player The player you want to check. + * @return {@code true} if the player is whitelisted. + */ boolean isWhitelisted(); default KelpPlayer whitelist() { @@ -571,8 +1114,21 @@ default KelpPlayer toggleWhitelist() { return this; } + /** + * Sets the player whitelisted or not whitelisted to the server. + * + * The whitelist determines which players are allowed to join the server + * and which are not. It has to be enabled manually by the server owner. + * + * @param whitelisted {@code true} if the player should be whitelisted. + */ KelpPlayer setWhitelisted(boolean whitelisted); + /** + * Sends the given player a message into their chat. + * + * @param message The message itself. May contain color codes. + */ KelpPlayer sendMessage(String message); default KelpPlayer sendMessages(String... messages) { From 27d36e2ccc63b1336b9a699f8a374d67cef1c32b Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:30:30 +0200 Subject: [PATCH 027/325] Fix imports for NPC library --- core/src/main/java/de/pxav/kelp/core/npc/KelpNpc.java | 1 - .../main/java/de/pxav/kelp/core/npc/KelpNpcRepository.java | 4 ---- .../de/pxav/kelp/core/npc/activity/AutoSpawnActivity.java | 1 - 3 files changed, 6 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/npc/KelpNpc.java b/core/src/main/java/de/pxav/kelp/core/npc/KelpNpc.java index db99a6e4..c59fe183 100644 --- a/core/src/main/java/de/pxav/kelp/core/npc/KelpNpc.java +++ b/core/src/main/java/de/pxav/kelp/core/npc/KelpNpc.java @@ -14,7 +14,6 @@ import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.Bukkit; -import org.bukkit.Location; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/de/pxav/kelp/core/npc/KelpNpcRepository.java b/core/src/main/java/de/pxav/kelp/core/npc/KelpNpcRepository.java index 7b0f5cd9..9c2e7ba7 100644 --- a/core/src/main/java/de/pxav/kelp/core/npc/KelpNpcRepository.java +++ b/core/src/main/java/de/pxav/kelp/core/npc/KelpNpcRepository.java @@ -7,16 +7,12 @@ import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.player.KelpPlayerRepository; import de.pxav.kelp.core.scheduler.type.RepeatingScheduler; -import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerQuitEvent; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; /** * This repository class administrates the player NPCs. diff --git a/core/src/main/java/de/pxav/kelp/core/npc/activity/AutoSpawnActivity.java b/core/src/main/java/de/pxav/kelp/core/npc/activity/AutoSpawnActivity.java index cba43e30..8df6b302 100644 --- a/core/src/main/java/de/pxav/kelp/core/npc/activity/AutoSpawnActivity.java +++ b/core/src/main/java/de/pxav/kelp/core/npc/activity/AutoSpawnActivity.java @@ -3,7 +3,6 @@ import de.pxav.kelp.core.npc.KelpNpc; import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.world.KelpLocation; -import org.bukkit.Location; public class AutoSpawnActivity extends NpcActivity { From 5aee86140c76fe92a53abccace28eaa39d147684 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:33:09 +0200 Subject: [PATCH 028/325] Fix imports for KelpConsoleSender --- .../main/java/de/pxav/kelp/core/command/KelpConsoleSender.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/command/KelpConsoleSender.java b/core/src/main/java/de/pxav/kelp/core/command/KelpConsoleSender.java index 3d2c4be9..de3ef549 100644 --- a/core/src/main/java/de/pxav/kelp/core/command/KelpConsoleSender.java +++ b/core/src/main/java/de/pxav/kelp/core/command/KelpConsoleSender.java @@ -2,7 +2,6 @@ import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.command.version.KelpConsoleSenderVersionTemplate; -import de.pxav.kelp.core.player.KelpPlayer; import org.bukkit.command.CommandSender; /** From 7dac2e4487ba56a3155ec7c9abc37844efa86fb3 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:42:33 +0200 Subject: [PATCH 029/325] Fix imports for region events --- .../kelp/core/event/kelpevent/region/PlayerLeaveRegionEvent.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/event/kelpevent/region/PlayerLeaveRegionEvent.java b/core/src/main/java/de/pxav/kelp/core/event/kelpevent/region/PlayerLeaveRegionEvent.java index a9341101..2f8bcf39 100644 --- a/core/src/main/java/de/pxav/kelp/core/event/kelpevent/region/PlayerLeaveRegionEvent.java +++ b/core/src/main/java/de/pxav/kelp/core/event/kelpevent/region/PlayerLeaveRegionEvent.java @@ -1,6 +1,5 @@ package de.pxav.kelp.core.event.kelpevent.region; -import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.world.region.KelpRegion; import org.bukkit.event.HandlerList; From 8bb3d27e3cc52949b0ac0685043ebfbd24908990 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:43:45 +0200 Subject: [PATCH 030/325] Fix imports for general kelp events --- .../pxav/kelp/core/event/kelpevent/KelpInventoryCloseEvent.java | 2 -- .../pxav/kelp/core/event/kelpevent/KelpInventoryOpenEvent.java | 2 -- .../kelp/core/event/kelpevent/KelpInventoryUpdateEvent.java | 2 -- .../de/pxav/kelp/core/event/kelpevent/KelpPlayerLoginEvent.java | 1 - .../core/event/kelpevent/KelpPlayerUpdateSettingsEvent.java | 1 - 5 files changed, 8 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpInventoryCloseEvent.java b/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpInventoryCloseEvent.java index 6fbff405..21758395 100644 --- a/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpInventoryCloseEvent.java +++ b/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpInventoryCloseEvent.java @@ -2,9 +2,7 @@ import de.pxav.kelp.core.inventory.type.KelpInventory; import de.pxav.kelp.core.player.KelpPlayer; -import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; /** * This event is called when a player closes their {@link KelpInventory} diff --git a/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpInventoryOpenEvent.java b/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpInventoryOpenEvent.java index 2bb254bb..2cc1021d 100644 --- a/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpInventoryOpenEvent.java +++ b/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpInventoryOpenEvent.java @@ -2,9 +2,7 @@ import de.pxav.kelp.core.inventory.type.KelpInventory; import de.pxav.kelp.core.player.KelpPlayer; -import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; /** * This event is triggered when a player opens a {@link KelpInventory} or diff --git a/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpInventoryUpdateEvent.java b/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpInventoryUpdateEvent.java index eeb5dd7e..82a7e514 100644 --- a/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpInventoryUpdateEvent.java +++ b/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpInventoryUpdateEvent.java @@ -2,9 +2,7 @@ import de.pxav.kelp.core.inventory.type.KelpInventory; import de.pxav.kelp.core.player.KelpPlayer; -import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; /** * This event is called when a {@link KelpInventory} is updated. This does not diff --git a/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpPlayerLoginEvent.java b/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpPlayerLoginEvent.java index 3945bc52..9f40e403 100644 --- a/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpPlayerLoginEvent.java +++ b/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpPlayerLoginEvent.java @@ -3,7 +3,6 @@ import de.pxav.kelp.core.player.KelpPlayer; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; import org.bukkit.event.player.PlayerLoginEvent; /** diff --git a/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpPlayerUpdateSettingsEvent.java b/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpPlayerUpdateSettingsEvent.java index 8a741d9d..156db418 100644 --- a/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpPlayerUpdateSettingsEvent.java +++ b/core/src/main/java/de/pxav/kelp/core/event/kelpevent/KelpPlayerUpdateSettingsEvent.java @@ -3,7 +3,6 @@ import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.player.PlayerChatVisibility; import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; /** * This event is triggered when the client settings of a player change. From afced3915613dde30532308c8e32c071095b865c Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:44:27 +0200 Subject: [PATCH 031/325] Fix imports for world lib --- core/src/main/java/de/pxav/kelp/core/world/KelpWorld.java | 3 +-- .../main/java/de/pxav/kelp/core/world/util/ExplosionPower.java | 2 ++ .../de/pxav/kelp/core/world/version/WorldVersionTemplate.java | 2 +- .../de/pxav/kelp/implementation1_8/world/VersionedChunk.java | 1 - .../de/pxav/kelp/implementation1_8/world/VersionedWorld.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/world/KelpWorld.java b/core/src/main/java/de/pxav/kelp/core/world/KelpWorld.java index 2925f564..67c101af 100644 --- a/core/src/main/java/de/pxav/kelp/core/world/KelpWorld.java +++ b/core/src/main/java/de/pxav/kelp/core/world/KelpWorld.java @@ -2,7 +2,7 @@ import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.type.DroppedItemEntity; -import de.pxav.kelp.core.entity.type.ItemDropType; +import de.pxav.kelp.core.entity.type.general.ItemDropType; import de.pxav.kelp.core.inventory.item.KelpItem; import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.world.util.ExplosionPower; @@ -11,7 +11,6 @@ import org.bukkit.Bukkit; import org.bukkit.Difficulty; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_16_R3.CraftWorld; import java.util.Collection; import java.util.UUID; diff --git a/core/src/main/java/de/pxav/kelp/core/world/util/ExplosionPower.java b/core/src/main/java/de/pxav/kelp/core/world/util/ExplosionPower.java index 55c03534..3bc91a5e 100644 --- a/core/src/main/java/de/pxav/kelp/core/world/util/ExplosionPower.java +++ b/core/src/main/java/de/pxav/kelp/core/world/util/ExplosionPower.java @@ -40,6 +40,8 @@ public class ExplosionPower { public static final ExplosionPower RESPAWN_ANCHOR = new ExplosionPower(5F); public static final ExplosionPower GHAST_FIREBALL = new ExplosionPower(1F); + public static final ExplosionPower NO_EXPLOSION = new ExplosionPower(0F); + /** * Allows you to create an explosion with a custom power, which is not * provided by the default list by minecraft. diff --git a/core/src/main/java/de/pxav/kelp/core/world/version/WorldVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/world/version/WorldVersionTemplate.java index c8e2bb2e..14a8a5c1 100644 --- a/core/src/main/java/de/pxav/kelp/core/world/version/WorldVersionTemplate.java +++ b/core/src/main/java/de/pxav/kelp/core/world/version/WorldVersionTemplate.java @@ -2,7 +2,7 @@ import de.pxav.kelp.core.application.KelpVersionTemplate; import de.pxav.kelp.core.entity.type.DroppedItemEntity; -import de.pxav.kelp.core.entity.type.ItemDropType; +import de.pxav.kelp.core.entity.type.general.ItemDropType; import de.pxav.kelp.core.inventory.item.KelpItem; import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.world.*; diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedChunk.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedChunk.java index e387bb23..fa0b1cd1 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedChunk.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedChunk.java @@ -2,7 +2,6 @@ import com.google.common.collect.Lists; import de.pxav.kelp.core.application.KelpApplication; -import de.pxav.kelp.core.inventory.material.KelpMaterial; import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.version.Versioned; import de.pxav.kelp.core.world.*; diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedWorld.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedWorld.java index 1cfce2e2..19cac6a5 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedWorld.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedWorld.java @@ -2,7 +2,7 @@ import com.google.common.collect.Lists; import de.pxav.kelp.core.entity.type.DroppedItemEntity; -import de.pxav.kelp.core.entity.type.ItemDropType; +import de.pxav.kelp.core.entity.type.general.ItemDropType; import de.pxav.kelp.core.inventory.item.KelpItem; import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.version.Versioned; From 16ff564814b2dcd6d61d434365cf3491cf4486d2 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:44:48 +0200 Subject: [PATCH 032/325] Fix imports for sidebar lib --- .../kelp/core/sidebar/version/SidebarVersionTemplate.java | 5 ----- .../kelp/implementation1_8/sidebar/VersionedSidebar.java | 1 - 2 files changed, 6 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/sidebar/version/SidebarVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/sidebar/version/SidebarVersionTemplate.java index 152e8a7b..27d60347 100755 --- a/core/src/main/java/de/pxav/kelp/core/sidebar/version/SidebarVersionTemplate.java +++ b/core/src/main/java/de/pxav/kelp/core/sidebar/version/SidebarVersionTemplate.java @@ -2,12 +2,7 @@ import de.pxav.kelp.core.application.KelpVersionTemplate; import de.pxav.kelp.core.player.KelpPlayer; -import de.pxav.kelp.core.sidebar.component.SidebarComponent; -import de.pxav.kelp.core.sidebar.type.AnimatedSidebar; import de.pxav.kelp.core.sidebar.type.KelpSidebar; -import org.bukkit.entity.Player; -import org.bukkit.scoreboard.Objective; -import org.bukkit.scoreboard.Scoreboard; /** * diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/sidebar/VersionedSidebar.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/sidebar/VersionedSidebar.java index fbcbdd50..166d01ea 100755 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/sidebar/VersionedSidebar.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/sidebar/VersionedSidebar.java @@ -1,6 +1,5 @@ package de.pxav.kelp.implementation1_8.sidebar; -import com.google.common.base.Preconditions; import de.pxav.kelp.core.event.kelpevent.sidebar.KelpSidebarRenderEvent; import de.pxav.kelp.core.event.kelpevent.sidebar.KelpSidebarUpdateEvent; import de.pxav.kelp.core.logger.KelpLogger; From 7b367c03000a52f4a4b3d1719b420d5dfe466d8d Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:45:11 +0200 Subject: [PATCH 033/325] Fix imports for player prompt classes --- .../player/prompt/anvil/AnvilPromptVersionTemplate.java | 1 - .../core/player/prompt/chat/ChatPromptVersionTemplate.java | 6 ------ .../core/player/prompt/sign/SignPromptVersionTemplate.java | 1 - .../kelp/implementation1_8/player/VersionedAnvilPrompt.java | 4 ---- .../kelp/implementation1_8/player/VersionedChatPrompt.java | 2 -- 5 files changed, 14 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/player/prompt/anvil/AnvilPromptVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/player/prompt/anvil/AnvilPromptVersionTemplate.java index 5709af28..bac88f42 100644 --- a/core/src/main/java/de/pxav/kelp/core/player/prompt/anvil/AnvilPromptVersionTemplate.java +++ b/core/src/main/java/de/pxav/kelp/core/player/prompt/anvil/AnvilPromptVersionTemplate.java @@ -2,7 +2,6 @@ import de.pxav.kelp.core.application.KelpVersionTemplate; import de.pxav.kelp.core.inventory.material.KelpMaterial; -import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.player.prompt.PromptTimeout; import de.pxav.kelp.core.player.prompt.SimplePromptResponseHandler; import org.bukkit.entity.Player; diff --git a/core/src/main/java/de/pxav/kelp/core/player/prompt/chat/ChatPromptVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/player/prompt/chat/ChatPromptVersionTemplate.java index 0089deb2..b82daa63 100644 --- a/core/src/main/java/de/pxav/kelp/core/player/prompt/chat/ChatPromptVersionTemplate.java +++ b/core/src/main/java/de/pxav/kelp/core/player/prompt/chat/ChatPromptVersionTemplate.java @@ -1,12 +1,6 @@ package de.pxav.kelp.core.player.prompt.chat; import de.pxav.kelp.core.application.KelpVersionTemplate; -import de.pxav.kelp.core.player.KelpPlayer; -import de.pxav.kelp.core.player.prompt.PromptTimeout; -import de.pxav.kelp.core.player.prompt.SimplePromptResponseHandler; -import org.bukkit.entity.Player; - -import java.util.Collection; /** * This version template is used for handling the simple chat prompt for players. diff --git a/core/src/main/java/de/pxav/kelp/core/player/prompt/sign/SignPromptVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/player/prompt/sign/SignPromptVersionTemplate.java index dc690941..be11cb34 100644 --- a/core/src/main/java/de/pxav/kelp/core/player/prompt/sign/SignPromptVersionTemplate.java +++ b/core/src/main/java/de/pxav/kelp/core/player/prompt/sign/SignPromptVersionTemplate.java @@ -1,7 +1,6 @@ package de.pxav.kelp.core.player.prompt.sign; import de.pxav.kelp.core.application.KelpVersionTemplate; -import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.player.prompt.PromptTimeout; import org.bukkit.entity.Player; diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedAnvilPrompt.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedAnvilPrompt.java index 4cd9f24e..5b4e3691 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedAnvilPrompt.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedAnvilPrompt.java @@ -7,8 +7,6 @@ import de.pxav.kelp.core.inventory.material.KelpMaterial; import de.pxav.kelp.core.inventory.material.MaterialContainer; import de.pxav.kelp.core.inventory.material.MaterialRepository; -import de.pxav.kelp.core.player.KelpPlayer; -import de.pxav.kelp.core.player.KelpPlayerRepository; import de.pxav.kelp.core.player.prompt.PromptResponseType; import de.pxav.kelp.core.player.prompt.PromptTimeout; import de.pxav.kelp.core.player.prompt.SimplePromptResponseHandler; @@ -17,10 +15,8 @@ import de.pxav.kelp.core.scheduler.synchronize.ServerMainThread; import de.pxav.kelp.core.scheduler.type.SchedulerFactory; import de.pxav.kelp.core.version.Versioned; -import io.netty.util.internal.ConcurrentSet; import net.minecraft.server.v1_8_R3.*; import org.bukkit.Bukkit; -import org.bukkit.Material; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedChatPrompt.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedChatPrompt.java index c49e3001..a81d3e2d 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedChatPrompt.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedChatPrompt.java @@ -3,10 +3,8 @@ import com.google.common.collect.Maps; import com.google.inject.Inject; import com.google.inject.Singleton; -import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.player.prompt.PromptResponseType; import de.pxav.kelp.core.player.prompt.PromptTimeout; -import de.pxav.kelp.core.player.prompt.SimplePromptResponseHandler; import de.pxav.kelp.core.player.prompt.chat.ChatPromptVersionTemplate; import de.pxav.kelp.core.player.prompt.chat.SimpleChatPrompt; import de.pxav.kelp.core.scheduler.KelpSchedulerRepository; From baddb5a9515377f0641555be2406da28ce614410 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:48:15 +0200 Subject: [PATCH 034/325] Apply new player particle syntax to ParticleLineEffect --- .../de/pxav/kelp/core/particle/effect/ParticleLineEffect.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/particle/effect/ParticleLineEffect.java b/core/src/main/java/de/pxav/kelp/core/particle/effect/ParticleLineEffect.java index bf476c74..ff8c1af9 100644 --- a/core/src/main/java/de/pxav/kelp/core/particle/effect/ParticleLineEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/particle/effect/ParticleLineEffect.java @@ -3,7 +3,6 @@ import de.pxav.kelp.core.particle.type.ParticleType; import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.world.KelpLocation; -import org.bukkit.Location; import org.bukkit.util.Vector; import java.util.Collection; @@ -65,7 +64,7 @@ protected void playAnimationOnce(Collection player) { firstPointBackup.add(x * d, y * d, z * d); for (KelpPlayer kelpPlayer : player) { - kelpPlayer.spawnParticle(particleType, true, firstPointBackup, 0, 0, 0, 1, 0, null); + kelpPlayer.spawnParticle(particleType, firstPointBackup, 1, 0); } firstPointBackup.subtract(x * d, y * d, z * d); From 2fd288630be2b783b879a759721f0c6eb6720dbe Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:48:37 +0200 Subject: [PATCH 035/325] Fix imports in region lib --- .../src/main/java/de/pxav/kelp/core/world/region/KelpRegion.java | 1 - .../de/pxav/kelp/core/world/region/KelpRegionRepository.java | 1 - 2 files changed, 2 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/world/region/KelpRegion.java b/core/src/main/java/de/pxav/kelp/core/world/region/KelpRegion.java index 6282653a..294945e3 100644 --- a/core/src/main/java/de/pxav/kelp/core/world/region/KelpRegion.java +++ b/core/src/main/java/de/pxav/kelp/core/world/region/KelpRegion.java @@ -2,7 +2,6 @@ import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.event.kelpevent.region.PlayerEnterRegionEvent; -import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.world.KelpBlock; import de.pxav.kelp.core.world.KelpChunk; import de.pxav.kelp.core.world.KelpLocation; diff --git a/core/src/main/java/de/pxav/kelp/core/world/region/KelpRegionRepository.java b/core/src/main/java/de/pxav/kelp/core/world/region/KelpRegionRepository.java index 7802d00a..6b012dfb 100644 --- a/core/src/main/java/de/pxav/kelp/core/world/region/KelpRegionRepository.java +++ b/core/src/main/java/de/pxav/kelp/core/world/region/KelpRegionRepository.java @@ -4,7 +4,6 @@ import de.pxav.kelp.core.common.ConcurrentSetMultimap; import de.pxav.kelp.core.event.kelpevent.region.PlayerEnterRegionEvent; import de.pxav.kelp.core.event.kelpevent.region.PlayerLeaveRegionEvent; -import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.scheduler.KelpSchedulerRepository; import de.pxav.kelp.core.scheduler.type.RepeatingScheduler; import de.pxav.kelp.core.world.util.ApproximateLocation; From baeb81df589ce0514802fcb3a0165a5ecc6cff61 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:48:56 +0200 Subject: [PATCH 036/325] Add implementation for KelpEntity --- .../entity/VersionedEntity.java | 715 ++++++------------ 1 file changed, 218 insertions(+), 497 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntity.java index dbd8732c..ccbc370f 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntity.java @@ -2,26 +2,17 @@ import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityType; -import de.pxav.kelp.core.entity.type.DroppedItemEntity; -import de.pxav.kelp.core.entity.type.ItemDropType; -import de.pxav.kelp.core.entity.version.EntityVersionTemplate; -import de.pxav.kelp.core.version.KelpVersion; -import de.pxav.kelp.core.version.SinceKelpVersion; -import de.pxav.kelp.core.version.Versioned; import de.pxav.kelp.core.world.KelpLocation; import de.pxav.kelp.core.world.KelpWorld; -import net.minecraft.server.v1_8_R3.Entity; import org.bukkit.Location; import org.bukkit.Server; -import org.bukkit.World; import org.bukkit.craftbukkit.v1_8_R3.CraftWorld; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity; +import org.bukkit.entity.Entity; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.util.Vector; -import java.util.Collections; import java.util.List; import java.util.UUID; @@ -30,542 +21,272 @@ * * @author pxav */ -@Versioned -public class VersionedEntity extends EntityVersionTemplate { - - /** - * Spawns the entity at the given location. As - * creating the entity only registers it and returns - * the entity instance, this method is necessary to - * finally add your entity to the world. - * - * It is recommended to execute this method with a - * small delay if you use it on a player join as - * some versions will not spawn it correctly if you - * do not do so. - * - * @param entity The entity you want to spawn. - */ - @Override - public void spawnEntity(KelpEntity entity) { - CraftWorld craftWorld = (CraftWorld) entity.getInitialBukkitLocation().getWorld(); - - if (entity.getEntityType() == KelpEntityType.DROPPED_ITEM) { - DroppedItemEntity kelpEntity = (DroppedItemEntity) entity; - if (kelpEntity.getItemDropType() == ItemDropType.NATURAL) { - craftWorld.dropItemNaturally(entity.getInitialBukkitLocation(), kelpEntity.getItem().getItemStack()); - } else { - craftWorld.dropItem(entity.getInitialBukkitLocation(), kelpEntity.getItem().getItemStack()); - } - return; +public class VersionedEntity> implements KelpEntity { + + protected net.minecraft.server.v1_8_R3.Entity entityHandle; + private final Location location; + private final KelpEntityType entityType; + + public VersionedEntity(net.minecraft.server.v1_8_R3.Entity entityHandle, + KelpEntityType entityType, + Location initialLocation) { + this.entityHandle = entityHandle; + this.entityType = entityType; + this.location = initialLocation; + } + + @Override + public int getEntityId() { + return entityHandle.getId(); + } + + @Override + public T spawn() { + CraftWorld craftWorld = (CraftWorld) craftEntity().getWorld(); + + if (getType() == KelpEntityType.DROPPED_ITEM) { +// DroppedItemEntity kelpEntity = (DroppedItemEntity) this; +// if (kelpEntity.getItemDropType() == ItemDropType.NATURAL) { +// craftWorld.dropItemNaturally(location, kelpEntity.getItem().getItemStack()); +// } else { +// craftWorld.dropItem(location, kelpEntity.getItem().getItemStack()); +// } +// return (T) this; } - Entity minecraftEntity = (Entity) entity.getMinecraftEntity(); - ((Entity) entity.getMinecraftEntity()).setPositionRotation(entity.getInitialBukkitLocation().getX(), entity.getInitialBukkitLocation().getY(), entity.getInitialBukkitLocation().getZ(), entity.getInitialBukkitLocation().getYaw(), entity.getInitialBukkitLocation().getPitch()); + entityHandle.setPositionRotation( + entityHandle.locX, + entityHandle.locY, + entityHandle.locZ, + entityHandle.yaw, + entityHandle.pitch + ); - craftWorld.addEntity(minecraftEntity, CreatureSpawnEvent.SpawnReason.CUSTOM); + craftWorld.addEntity(entityHandle, CreatureSpawnEvent.SpawnReason.CUSTOM); + return (T) this; } @Override - public org.bukkit.entity.Entity toBukkitEntity(Object minecraftEntity) { - return ((Entity) minecraftEntity).getBukkitEntity(); + public T setVelocity(Vector velocity) { + return null; } - /** - * Gets the current entity's location in the world. - * - * @param entity The entity whose location you want to get. - * @return The location of the given entity. - */ @Override - public KelpLocation getLocation(org.bukkit.entity.Entity entity) { - return KelpLocation.from(entity.getLocation()); + public Vector getVelocity() { + return null; } - /** - * Sets the entity's velocity to the given vector. - * - * @param entity The entity whose velocity you want to manipulate. - * @param vector The vector of the velocity you want to set. - */ @Override - public void setVelocity(org.bukkit.entity.Entity entity, Vector vector) { - entity.setVelocity(vector); + public double getEntityHeight() { + return entityHandle.width; } - /** - * Gets the velocity of the desired entity. - * - * @param entity The entity whose velocity you want to get. - * @return The velocity of the given entity. - */ @Override - public Vector getVelocity(org.bukkit.entity.Entity entity) { - return entity.getVelocity(); + public double getEntityWidth() { + return entityHandle.getHeadHeight(); } - /** - * Gets the height of an entity. In older versions - * this property was called 'length' of an entity. - * - * @param entity The entity whose height you want to get. - * @return The height of the given entity. - */ @Override - public double getHeight(org.bukkit.entity.Entity entity) { - return ((CraftEntity)entity).getHandle().length; + public KelpEntityType getType() { + return KelpEntityType.UNKNOWN; } - /** - * Gets the width of the given entity. - * - * @param entity The entity whose width you want to get. - * @return The entity's width. - */ @Override - public double getWidth(org.bukkit.entity.Entity entity) { - return ((CraftEntity)entity).getHandle().width; + public KelpLocation getLocation() { + return KelpLocation.from(entityHandle.world.getWorld().getName(), + entityHandle.locX, + entityHandle.locY, + entityHandle.locZ, + entityHandle.yaw, + entityHandle.pitch); } - /** - * Checks if the entity is currently on the ground. - * - * @param entity The entity you want to check. - * @return {@code true} if the entity is currently on ground. - */ @Override - public boolean isOnGround(org.bukkit.entity.Entity entity) { - return entity.isOnGround(); + public Entity getBukkitEntity() { + return null; } - /** - * Sets the rotation of the given entity. This does not - * affect the location x, y and z axes. - * - * @param entity The entity whose rotation you want to modify. - * @param yaw The yaw value of the desired rotation. - * @param pitch The pitch value of the desired rotation. - */ @Override - public void setRotation(org.bukkit.entity.Entity entity, float yaw, float pitch) { - ((CraftEntity)entity).getHandle().setPositionRotation( - entity.getLocation().getX(), - entity.getLocation().getY(), - entity.getLocation().getZ(), - yaw, - pitch - ); + public boolean isOnGround() { + return false; + } + + @Override + public T setOnGround() { + return null; + } + + @Override + public KelpWorld getWorld() { + return null; + } + + @Override + public T setRotation(float yaw, float pitch) { + return null; + } + + @Override + public T teleport(String worldName, double x, double y, double z, float yaw, float pitch) { + return null; + } + + @Override + public int getFireTicks() { + return 0; } - /** - * Teleports the entity to the given location. - * - * @param entity The entity you want to teleport. - * @param location The location you want the entity to teleport to. - * @param teleportCause The cause for the teleportation. - * @return {@code true} if the teleport action was successful. - */ - @Override - public boolean teleport(org.bukkit.entity.Entity entity, KelpLocation location, PlayerTeleportEvent.TeleportCause teleportCause) { - return entity.teleport(location.getBukkitLocation(), teleportCause); - } - - /** - * Gets all entities within the given radius centered around - * the given entity. - * - * @param entity The entity where the center should be set. - * @param x the radius for the x axis - * (1/2 the size of the box along x axis) - * @param y the radius for the y axis - * (1/2 the size of the box along y axis) - * @param z the radius for the z axis - * (1/2 the size of the box along z axis) - * @return A list of all nearby entities within the given radius. - */ - @Override - public List getNearbyEntities(org.bukkit.entity.Entity entity, double x, double y, double z) { - return entity.getNearbyEntities(x, y, z); - } - - /** - * Gets the id of the given entity. - * - * @param entity The entity whose id you want to get. - * @return the entity id - */ - @Override - public int getEntityId(org.bukkit.entity.Entity entity) { - return entity.getEntityId(); - } - - /** - * Gets the current amount of fire ticks for the given - * entity. - * - * Fire ticks are the duration before the entity stops - * being on fire in ticks. So 60 for example would mean - * the entity will stop burning after 3 seconds once - * it ran into fire. - * - * @param entity The entity whose fire ticks you want to get. - * @return The amount of fire ticks. - */ - @Override - public int getFireTicks(org.bukkit.entity.Entity entity) { - return entity.getFireTicks(); - } - - /** - * Gets the amount of the maximum fire ticks of the given entity. - * - * @param entity The entity whose maximum fire ticks you want to get. - * @return The amount of maximum fire ticks of the given entity. - */ - @Override - public int getMaxFireTicks(org.bukkit.entity.Entity entity) { - return entity.getMaxFireTicks(); - } - - /** - * Sets the amount of the maximum fire ticks of the given entity. - * - * @param entity The entity whose maximum fire ticks you want to modify. - * @param maxFireTicks The amount of maximum fire ticks to set. - */ - @Override - public void setMaxFireTicks(org.bukkit.entity.Entity entity, int maxFireTicks) { - ((CraftEntity)entity).getHandle().maxFireTicks = maxFireTicks; - } - - /** - * Sets the current amount of fire ticks for the given - * entity. - * - * Fire ticks are the duration before the entity stops - * being on fire in ticks. So 60 for example would mean - * the entity will stop burning after 3 seconds once - * it ran into fire. - * - * @param entity The entity whose fire ticks you want to set. - * @param fireTicks The amount of fire ticks you want to set. - */ - @Override - public void setFireTicks(org.bukkit.entity.Entity entity, int fireTicks) { - entity.setFireTicks(fireTicks); - } - - /** - * Removes the entity from the world. - * - * @param entity The entity you want to remove. - */ - @Override - public void remove(org.bukkit.entity.Entity entity) { - entity.remove(); - } - - /** - * Checks if the given entity is dead. - * - * @param entity The entity you want to check. - * @return {@code true} if the entity is dead. - */ - @Override - public boolean isDead(org.bukkit.entity.Entity entity) { - return entity.isDead(); - } - - /** - * Checks if the entity is valid. - * - * Valid means the entity has to be alive and currently - * spawned in a world. - * - * @param entity The entity whose validity you want to check. - * @return {@code true} if the entity is 'valid'. - */ - @Override - public boolean isValid(org.bukkit.entity.Entity entity) { - return entity.isValid(); - } - - /** - * Gets the current server containing the entity. - * - * @param entity The entity whose server you want to get. - * @return The server instance. - */ - @Override - public Server getServer(org.bukkit.entity.Entity entity) { - return entity.getServer(); - } - - /** - * Returns a list of all passengers currently riding - * on the entity. - * - * Note that most entities are only able to hold only - * one passenger and the list will likely contain only - * one element. Boats from newer versions can contain - * up to two passengers for example. - * - * @param entity The entity whose passengers you want to get. - * @return A list of all passengers of the given entity. - */ - @Override - public List getPassengers(org.bukkit.entity.Entity entity) { - return Collections.singletonList(entity.getPassenger()); - } - - /** - * Adds a new passenger to the given entity. - * - * Note that most entities can only hold one passenger. - * In this case the old entity will be removed in order - * to hold the new passenger provided in this method. - * - * @param entity The entity you want to add the passenger to. - * @param passenger The passenger you want to add. - * @return {@code true} if the action was successful. - */ - @Override - public boolean addPassenger(org.bukkit.entity.Entity entity, org.bukkit.entity.Entity passenger) { - return entity.setPassenger(passenger); - } - - /** - * Removes a passenger from the given entity. - * - * @param entity The entity you want to remove the passenger from. - * @param passenger The passenger you want to remove. - * @return {@code true} if the action succeeded. - */ - @Override - public boolean removePassenger(org.bukkit.entity.Entity entity, org.bukkit.entity.Entity passenger) { - return entity.eject(); - } - - /** - * Checks if the given entity has no passengers. - * - * @param entity The entity you want to check. - * @return {@code true} if the entity has no passengers at all. - */ - @Override - public boolean isEmpty(org.bukkit.entity.Entity entity) { - return entity.isEmpty(); - } - - /** - * Ejects any passenger currently riding on the - * given entity. - * - * @param entity The entity you want to eject all - * passengers of. - * @return {@code true} if there were any passengers to eject. - */ - @Override - public boolean eject(org.bukkit.entity.Entity entity) { - return entity.eject(); - } - - /** - * Gets the current fall distance of the current entity. - * - * The fall distance is the distance of blocks in the y-axis - * the player is falling down. The higher the fall distance - * the higher the fall damage. If the player is currently on - * ground, the fall distance will be 0. - * - * @param entity The entity whose fall distance you want to get. - * @return The current fall distance of the entity. - */ - @Override - public float getFallDistance(org.bukkit.entity.Entity entity) { - return entity.getFallDistance(); - } - - /** - * Sets the current fall distance of the current entity. - * - * The fall distance is the distance of blocks in the y-axis - * the player is falling down. The higher the fall distance - * the higher the fall damage. If the player is currently on - * ground, the fall distance will be 0. - * - * @param entity The entity whose fall distance you want to set. - * @param fallDistance The new fall distance you want to set. - */ - @Override - public void setFallDistance(org.bukkit.entity.Entity entity, float fallDistance) { - entity.setFallDistance(fallDistance); - } - - /** - * Sets the last damage cause the entity has suffered. - * - * @param entity The entity whose damage cause you want to set. - * @param event The instance of the last entity damage event containing - * the last damage cause. - */ - @Override - public void setLastDamageCause(org.bukkit.entity.Entity entity, EntityDamageEvent event) { - entity.setLastDamageCause(event); - } - - /** - * Gets the last damage cause. If the entity has not been damaged - * so far, it will return null. - * - * @param entity The entity whose last damage cause you want to get. - * @return The last damage event instance containing the last - * damage cause. - */ - @Override - public EntityDamageEvent getLastDamageCause(org.bukkit.entity.Entity entity) { - return entity.getLastDamageCause(); - } - - /** - * Returns a unique as well as persistent id for - * the given entity. For players, the player UUID will - * be returned. - * - * @param entity The entity whose unique id you want to get. - * @return The UUID of the given entity. - */ - @Override - public UUID getUniqueId(org.bukkit.entity.Entity entity) { - return entity.getUniqueId(); - } - - /** - * Gets the amount of ticks the entity has been alive. - * This number is equivalent to the 'age' property in entities. - * - * @param entity The entity whose lifetime you want to get. - * @return The age of the entity. - */ - @Override - public int getTicksLived(org.bukkit.entity.Entity entity) { - return entity.getTicksLived(); - } - - /** - * Gets the amount of ticks the entity has been alive. - * This number is equivalent to the 'age' property in entities. - * - * @param entity The entity whose lifetime you want to get. - * @param ticksLived The amount of ticks you want to set. - * May not be less than one tick. - */ - @Override - public void setTicksLived(org.bukkit.entity.Entity entity, int ticksLived) { - entity.setTicksLived(ticksLived); - } - - /** - * Returns true if the entity is currently inside a vehicle. - * - * @param entity The entity you want to check. - * @return {@code true} if the entity is inside a vehicle. - */ - @Override - public boolean isInsideVehicle(org.bukkit.entity.Entity entity) { - return entity.isInsideVehicle(); - } - - /** - * Makes the entity leave its current vehicle. - * - * @param entity The entity you want to kick from its - * vehicle. - * @return {@code true} if the entity was actually removed - * and has been sitting in a vehicle before. - */ - @Override - public boolean leaveVehicle(org.bukkit.entity.Entity entity) { - return entity.leaveVehicle(); - } - - /** - * Gets the current vehicle of the given entity. - * - * @param entity The entity whose vehicle you want to check. - * @return The vehicle of the entity. If the entity - * has no vehicle, null will be returned. - */ @Override - public org.bukkit.entity.Entity getVehicle(org.bukkit.entity.Entity entity) { - return entity.getVehicle(); - } + public T setFireTicks(int fireTicks) { + return null; + } - /** - * Sets the custom name of an entity visible or invisible - * for the clients. - * - * @param entity The entity whose nametag you want to hide/show. - * @param visible {@code true} if it should be visible - * {@code false} if it should not be visible. - */ @Override - public void setCustomNameVisible(org.bukkit.entity.Entity entity, boolean visible) { - entity.setCustomNameVisible(visible); + public T setMaxFireTicks(int maxFireTicks) { + return null; } - - /** - * Checks if the custom name of the given entity is - * currently visible. - * - * @param entity The entity whose nametag visibility you want to check. - * @return {@code true} if the custom name is visible. - */ + + @Override + public int getMaxFireTicks() { + return 0; + } + + @Override + public T remove() { + return null; + } + + @Override + public boolean isDead() { + return false; + } + @Override - public boolean isCustomNameVisible(org.bukkit.entity.Entity entity) { + public boolean isValid() { return false; } - @SinceKelpVersion(KelpVersion.MC_1_9_0) @Override - public void setGlowing(org.bukkit.entity.Entity entity, boolean glowing) { - throw new UnsupportedOperationException("Glowing entities are not supported in MC1.8"); + public Server getServer() { + return null; } - @SinceKelpVersion(KelpVersion.MC_1_9_0) @Override - public boolean isGlowing(org.bukkit.entity.Entity entity) { - throw new UnsupportedOperationException("Glowing entities are not supported in MC1.8"); + public KelpEntity getPassenger() { + return null; } - /** - * Checks whether the entity is currently silent. - * - * If the silent flag is set, the entity will not - * produce any sounds. - * - * @param entity The entity you want to check. - * @return {@code true} if the entity is silent - */ @Override - public boolean isSilent(org.bukkit.entity.Entity entity) { + public List> getPassengers() { + return null; + } + + @Override + public T addPassenger(KelpEntity passenger) { + return null; + } + + @Override + public T addPassenger(List> passengers) { + return null; + } + + @Override + public T removePassenger(KelpEntity passenger) { + return null; + } + + @Override + public boolean isEmpty() { return false; } - /** - * Makes the entity silent or unsilent. - * - * If the silent flag is set, the entity will not - * produce any sounds. - * - * @param entity The entity you want to make silent/unsilent. - * @param silent {@code true} if you want to make the - * entity silent, - * {@code false} if not. - */ @Override - public void setSilent(org.bukkit.entity.Entity entity, boolean silent) { + public T ejectPassengers() { + return null; + } + @Override + public T setFallDistance(float fallDistance) { + return null; + } + + @Override + public float getFallDistance() { + return 0; + } + + @Override + public UUID getUUID() { + return null; + } + + @Override + public int getTicksLived() { + return 0; + } + + @Override + public T setTicksLived(int ticksLived) { + return null; } + @Override + public boolean isInsideVehicle() { + return false; + } + + @Override + public T leaveVehicle() { + return null; + } + + @Override + public KelpEntity getVehicle() { + return null; + } + + @Override + public boolean isGlowing() { + return false; + } + + @Override + public T setGlowing(boolean glowing) { + return null; + } + + @Override + public T customNameVisible(boolean visible) { + return null; + } + + @Override + public T customName(String customName) { + return null; + } + + @Override + public boolean isCustomNameVisible() { + return false; + } + + @Override + public EntityDamageEvent getLastDamageCause() { + return null; + } + + @Override + public void setLastDamageCause(EntityDamageEvent damageCause) { + + } + + @Override + public List> getNearbyEntities(double radiusX, double radiusY, double radiusZ) { + return null; + } + + protected CraftEntity craftEntity() { + return entityHandle.getBukkitEntity(); + } } From e824e8ecce79cf7d1c5410e314d32d0da374e734 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:49:06 +0200 Subject: [PATCH 037/325] Add implementation for LivingKelpEntity --- .../entity/VersionedLivingEntity.java | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java index c2652e0d..8595b673 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java @@ -1,22 +1,34 @@ package de.pxav.kelp.implementation1_8.entity; -import de.pxav.kelp.core.entity.version.LivingEntityVersionTemplate; -import de.pxav.kelp.core.version.Versioned; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.LivingKelpEntity; import de.pxav.kelp.core.world.KelpLocation; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedDamageable; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityLiving; import org.bukkit.Location; -import org.bukkit.entity.LivingEntity; /** * A class description goes here. * * @author pxav */ -@Versioned -public class VersionedLivingEntity extends LivingEntityVersionTemplate { +public class VersionedLivingEntity> + extends VersionedDamageable + implements LivingKelpEntity { + + private EntityLiving entityHandle; + + public VersionedLivingEntity(Entity entityHandle, + KelpEntityType entityType, + Location initialLocation) { + super(entityHandle, entityType, initialLocation); + this.entityHandle = (EntityLiving) entityHandle; + } @Override - public KelpLocation getEyeLocation(LivingEntity livingEntity) { - return KelpLocation.from(livingEntity.getEyeLocation()); + public KelpLocation getEyeLocation() { + return null; } } From fd7e3e0294e9e59fd73a20a39ab1f884b8bbe245 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 20:50:00 +0200 Subject: [PATCH 038/325] Add implementation for all entity superinterfaces --- .../type/general/VersionedAnimalEntity.java | 30 +++++++++++ .../type/general/VersionedDamageable.java | 53 +++++++++++++++++++ .../general/VersionedExplosiveEntity.java | 37 +++++++++++++ .../type/general/VersionedHangingEntity.java | 34 ++++++++++++ .../type/general/VersionedHumanEntity.java | 52 ++++++++++++++++++ .../type/general/VersionedMobileEntity.java | 46 ++++++++++++++++ .../type/general/VersionedProjectile.java | 28 ++++++++++ 7 files changed, 280 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAnimalEntity.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedDamageable.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedExplosiveEntity.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHangingEntity.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHumanEntity.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedMobileEntity.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedProjectile.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAnimalEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAnimalEntity.java new file mode 100644 index 00000000..77601c8d --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAnimalEntity.java @@ -0,0 +1,30 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.AnimalEntity; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedAnimalEntity> + extends VersionedMobileEntity implements AnimalEntity { + + public VersionedAnimalEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation) { + super(entityHandle, entityType, initialLocation); + } + + @Override + public boolean isLoveMode() { + return false; + } + + @Override + public int getLoveModeTicks() { + return 0; + } + + @Override + public T setLoveModeTicks() { + return null; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedDamageable.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedDamageable.java new file mode 100644 index 00000000..526b28dc --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedDamageable.java @@ -0,0 +1,53 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.DamageableEntity; +import de.pxav.kelp.implementation1_8.entity.VersionedEntity; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedDamageable> + extends VersionedEntity + implements DamageableEntity { + + public VersionedDamageable(Entity entityHandle, KelpEntityType entityType, Location initialLocation) { + super(entityHandle, entityType, initialLocation); + } + + @Override + public T damage(double damage) { + return null; + } + + @Override + public T damage(double damage, KelpEntity source) { + return null; + } + + @Override + public double getAbsorptionAmount() { + return 0; + } + + @Override + public T setAbsorptionAmount(int absorptionAmount) { + return null; + } + + @Override + public int getHealth() { + return 0; + } + + @Override + public int getMaxHealth() { + return 0; + } + + @Override + public T setHealth(int health) { + return null; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedExplosiveEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedExplosiveEntity.java new file mode 100644 index 00000000..88997003 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedExplosiveEntity.java @@ -0,0 +1,37 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.ExplosiveEntity; +import de.pxav.kelp.core.world.util.ExplosionPower; +import de.pxav.kelp.implementation1_8.entity.VersionedEntity; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedExplosiveEntity> + extends VersionedEntity + implements ExplosiveEntity { + + public VersionedExplosiveEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation) { + super(entityHandle, entityType, initialLocation); + } + + @Override + public ExplosionPower getExplosionPower() { + return null; + } + + @Override + public T setExplosionPower(ExplosionPower power) { + return null; + } + + @Override + public boolean createsFire() { + return false; + } + + @Override + public T canCreateFire(boolean create) { + return null; + } +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHangingEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHangingEntity.java new file mode 100644 index 00000000..53cdf689 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHangingEntity.java @@ -0,0 +1,34 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.HangingEntity; +import de.pxav.kelp.core.world.KelpBlock; +import de.pxav.kelp.core.world.util.KelpBlockFace; +import de.pxav.kelp.implementation1_8.entity.VersionedEntity; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedHangingEntity> + extends VersionedEntity + implements HangingEntity { + + public VersionedHangingEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation) { + super(entityHandle, entityType, initialLocation); + } + + @Override + public KelpBlockFace getAttachedFace() { + return null; + } + + @Override + public KelpBlock getAttachedBlock() { + return null; + } + + @Override + public T setFacingDirection(KelpBlockFace blockFace) { + return null; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHumanEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHumanEntity.java new file mode 100644 index 00000000..53c9f3f2 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHumanEntity.java @@ -0,0 +1,52 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.HumanEntity; +import de.pxav.kelp.core.world.KelpLocation; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.GameMode; +import org.bukkit.Location; + +public class VersionedHumanEntity> + extends VersionedMobileEntity + implements HumanEntity { + + public VersionedHumanEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation) { + super(entityHandle, entityType, initialLocation); + } + + @Override + public GameMode getGameMode() { + return null; + } + + @Override + public T setGameMode() { + return null; + } + + @Override + public KelpLocation getCurrentBedLocation() { + return null; + } + + @Override + public int getExpToLevel() { + return 0; + } + + @Override + public T wakeUp() { + return null; + } + + @Override + public T wakeUpAndSetSpawnLocation() { + return null; + } + + @Override + public T sleep(KelpLocation bedLocation) { + return null; + } +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedMobileEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedMobileEntity.java new file mode 100644 index 00000000..47fbdbe9 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedMobileEntity.java @@ -0,0 +1,46 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.LivingKelpEntity; +import de.pxav.kelp.core.entity.type.general.MobileEntity; +import de.pxav.kelp.core.world.KelpLocation; +import de.pxav.kelp.implementation1_8.entity.VersionedLivingEntity; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedMobileEntity> + extends VersionedLivingEntity + implements MobileEntity { + + public VersionedMobileEntity(Entity entityHandle, + KelpEntityType entityType, + Location initialLocation) { + super(entityHandle, entityType, initialLocation); + } + + @Override + public T setTarget(LivingKelpEntity target) { + return null; + } + + @Override + public LivingKelpEntity getTarget() { + return null; + } + + @Override + public boolean isAware() { + return false; + } + + @Override + public boolean setAware(boolean aware) { + return false; + } + + @Override + public KelpLocation getEyeLocation() { + return null; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedProjectile.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedProjectile.java new file mode 100644 index 00000000..46827b83 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedProjectile.java @@ -0,0 +1,28 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.entity.type.general.ProjectileLauncher; +import de.pxav.kelp.implementation1_8.entity.VersionedEntity; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedProjectile> + extends VersionedEntity + implements KelpProjectile { + + public VersionedProjectile(Entity entityHandle, KelpEntityType entityType, Location initialLocation) { + super(entityHandle, entityType, initialLocation); + } + + @Override + public T setLauncher(ProjectileLauncher launcher) { + return null; + } + + @Override + public ProjectileLauncher getLauncher() { + return null; + } + +} From 8cdcbf8cfed94ce3ead242534b3634e7b66b0650 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 15 Apr 2021 21:05:04 +0200 Subject: [PATCH 039/325] refactor: move ItemDropType to entity util package --- .../kelp/core/entity/{type/general => util}/ItemDropType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename core/src/main/java/de/pxav/kelp/core/entity/{type/general => util}/ItemDropType.java (93%) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/ItemDropType.java b/core/src/main/java/de/pxav/kelp/core/entity/util/ItemDropType.java similarity index 93% rename from core/src/main/java/de/pxav/kelp/core/entity/type/general/ItemDropType.java rename to core/src/main/java/de/pxav/kelp/core/entity/util/ItemDropType.java index 3778c054..059b13f8 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/general/ItemDropType.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/ItemDropType.java @@ -1,4 +1,4 @@ -package de.pxav.kelp.core.entity.type.general; +package de.pxav.kelp.core.entity.util; /** * This enum expresses how an item should be dropped. From 1ebcc6f03c6960739fd55e2d8d7924a512955408 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 16 Apr 2021 14:59:36 +0200 Subject: [PATCH 040/325] Fix imports of inventory event listeners --- .../de/pxav/kelp/core/inventory/listener/KelpClickEvent.java | 1 - .../core/inventory/listener/PlayerInventoryStateListener.java | 1 - 2 files changed, 2 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/listener/KelpClickEvent.java b/core/src/main/java/de/pxav/kelp/core/inventory/listener/KelpClickEvent.java index c660a621..da21e9f9 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/listener/KelpClickEvent.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/listener/KelpClickEvent.java @@ -1,7 +1,6 @@ package de.pxav.kelp.core.inventory.listener; import de.pxav.kelp.core.inventory.item.KelpItem; -import de.pxav.kelp.core.inventory.type.KelpInventory; import de.pxav.kelp.core.player.KelpPlayer; import java.util.function.Consumer; diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/listener/PlayerInventoryStateListener.java b/core/src/main/java/de/pxav/kelp/core/inventory/listener/PlayerInventoryStateListener.java index 0aaa3988..427d3ed2 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/listener/PlayerInventoryStateListener.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/listener/PlayerInventoryStateListener.java @@ -3,7 +3,6 @@ import com.google.inject.Inject; import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.player.KelpPlayerRepository; -import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.inventory.InventoryCloseEvent; From 64618322ffd74f22c81c5ccf71d81cbc5aa45f75 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 16 Apr 2021 14:59:53 +0200 Subject: [PATCH 041/325] Fix imports of SlotArea --- .../main/java/de/pxav/kelp/core/inventory/util/SlotArea.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/util/SlotArea.java b/core/src/main/java/de/pxav/kelp/core/inventory/util/SlotArea.java index 86215a20..b0ba5d1a 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/util/SlotArea.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/util/SlotArea.java @@ -1,6 +1,7 @@ package de.pxav.kelp.core.inventory.util; import com.google.common.collect.Sets; +import de.pxav.kelp.core.inventory.widget.SimplePagination; import java.util.HashSet; import java.util.Set; @@ -9,11 +10,11 @@ * This class is used to easily represent a collection of slots * inside a {@link de.pxav.kelp.core.inventory.type.KelpInventory}. * - * If you want to create a {@link de.pxav.kelp.core.inventory.widget.Pagination pagination} + * If you want to create a {@link SimplePagination pagination} * for example, where you want to use the entire inventory space as pagination area, it would be a pain * to pass all slots individually. It would be more convenient to just calculate * a rectangular area and pass all slots of this area in the - * {@link de.pxav.kelp.core.inventory.widget.Pagination#contentSlots(int...)} method, + * {@link SimplePagination#contentSlots(int...)} method, * which can be achieved using {@link #rectangle(int, int)}. * * Other use cases would be if you want to create a line separator inside a GUI. From 20c922dc946d04a991a0d487492618fbca553d96 Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 18 Apr 2021 10:01:48 +0200 Subject: [PATCH 042/325] Add item metadata class for fireworks --- .../inventory/metadata/FireworkMetadata.java | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/inventory/metadata/FireworkMetadata.java diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/metadata/FireworkMetadata.java b/core/src/main/java/de/pxav/kelp/core/inventory/metadata/FireworkMetadata.java new file mode 100644 index 00000000..b30cbf8a --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/inventory/metadata/FireworkMetadata.java @@ -0,0 +1,50 @@ +package de.pxav.kelp.core.inventory.metadata; + +import com.google.common.collect.Lists; +import org.bukkit.FireworkEffect; + +import java.util.Arrays; +import java.util.Collection; + +public class FireworkMetadata { + + private int height = 20; + private Collection effects = Lists.newArrayList(); + + public static FireworkMetadata create() { + return new FireworkMetadata(); + } + + public Collection getEffects() { + return effects; + } + + public int getHeight() { + return height; + } + + public boolean hasAnyEffects() { + return !effects.isEmpty(); + } + + public FireworkMetadata height(int height) { + this.height = height; + return this; + } + + public FireworkMetadata addEffect(FireworkEffect... effectsToAdd) { + effects.addAll(Arrays.asList(effectsToAdd)); + return this; + } + + public FireworkMetadata removeEffect(FireworkEffect toRemove) { + effects.remove(toRemove); + return this; + } + + public FireworkMetadata clearEffects() { + this.effects.clear(); + return this; + } + +} From 6ce3299f667ed2c04c9d2a7283b0f6f993cf7b7d Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 18 Apr 2021 10:02:16 +0200 Subject: [PATCH 043/325] Implement new firework item metadata --- .../inventory/VersionedItemMetadata.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedItemMetadata.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedItemMetadata.java index f6c8cb06..b8e22709 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedItemMetadata.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedItemMetadata.java @@ -4,7 +4,9 @@ import com.mojang.authlib.properties.Property; import de.pxav.kelp.core.inventory.metadata.*; import de.pxav.kelp.core.version.Versioned; +import org.bukkit.FireworkEffect; import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.FireworkMeta; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.LeatherArmorMeta; import org.bukkit.inventory.meta.SkullMeta; @@ -53,6 +55,15 @@ public ItemStack applyMetadata(ItemStack itemStack, ItemMetadata metadata) { return itemStack; } + if (metadata instanceof FireworkMetadata) { + FireworkMetadata kelpMeta = (FireworkMetadata) metadata; + FireworkMeta fireworkMeta = (FireworkMeta) itemStack.getItemMeta(); + fireworkMeta.addEffects(kelpMeta.getEffects()); + fireworkMeta.setPower(kelpMeta.getHeight()); + itemStack.setItemMeta(fireworkMeta); + return itemStack; + } + return itemStack; } @@ -71,12 +82,17 @@ public ItemMetadata getMetadata(ItemStack itemStack) { SkullMeta skullMeta = (SkullMeta) itemMeta; SkullMetadata kelpMeta = SkullMetadata.create(); - - kelpMeta.setSkullOwner(skullMeta.getOwner()); return kelpMeta; } + if (itemMeta instanceof FireworkMeta) { + FireworkMeta fireworkMeta = (FireworkMeta) itemMeta; + FireworkMetadata kelpMeta = FireworkMetadata.create(); + kelpMeta.height(fireworkMeta.getPower()); + kelpMeta.addEffect(fireworkMeta.getEffects().toArray(new FireworkEffect[fireworkMeta.getEffectsSize()])); + } + return null; } From 23fdd7501ea780d085230364cf05362e542ab41a Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 12:00:29 +0200 Subject: [PATCH 044/325] EntityTypeVersionTemplate is now passed to every entity implementation --- .../entity/VersionedEntity.java | 8 +- .../entity/VersionedEntityType.java | 146 +++++++++--------- .../entity/VersionedLivingEntity.java | 5 +- 3 files changed, 79 insertions(+), 80 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntity.java index ccbc370f..89a38c5c 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntity.java @@ -2,6 +2,7 @@ import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.world.KelpLocation; import de.pxav.kelp.core.world.KelpWorld; import org.bukkit.Location; @@ -24,15 +25,18 @@ public class VersionedEntity> implements KelpEntity { protected net.minecraft.server.v1_8_R3.Entity entityHandle; + protected EntityTypeVersionTemplate entityTypeVersionTemplate; private final Location location; private final KelpEntityType entityType; public VersionedEntity(net.minecraft.server.v1_8_R3.Entity entityHandle, - KelpEntityType entityType, - Location initialLocation) { + KelpEntityType entityType, + Location initialLocation, + EntityTypeVersionTemplate entityTypeVersionTemplate) { this.entityHandle = entityHandle; this.entityType = entityType; this.location = initialLocation; + this.entityTypeVersionTemplate = entityTypeVersionTemplate; } @Override diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java index 5039e86a..b40b9e43 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java @@ -2,27 +2,16 @@ import com.google.inject.Inject; import de.pxav.kelp.core.entity.KelpEntity; -import de.pxav.kelp.core.entity.LivingKelpEntity; -import de.pxav.kelp.core.entity.type.DroppedItemEntity; -import de.pxav.kelp.core.entity.type.ElderGuardianEntity; -import de.pxav.kelp.core.entity.type.GuardianEntity; -import de.pxav.kelp.core.entity.type.ZombieEntity; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.version.EntityVersionTemplate; import de.pxav.kelp.core.entity.version.LivingEntityVersionTemplate; -import de.pxav.kelp.core.inventory.item.KelpItem; import de.pxav.kelp.core.version.Versioned; +import de.pxav.kelp.implementation1_8.entity.type.VersionedSheep; import net.minecraft.server.v1_8_R3.Entity; -import net.minecraft.server.v1_8_R3.EntityGuardian; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_8_R3.CraftWorld; -import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_8_R3.entity.CraftLivingEntity; -import org.bukkit.entity.Guardian; -import org.bukkit.entity.Item; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Zombie; +import org.bukkit.entity.Sheep; /** * A class description goes here. @@ -42,82 +31,87 @@ public VersionedEntityType(EntityVersionTemplate entityVersionTemplate, LivingEn } @Override - public KelpEntity newKelpEntity(KelpEntityType entityType, Location location) { - KelpEntity output = new KelpEntity(this.entityVersionTemplate); + public KelpEntity newKelpEntity(KelpEntityType entityType, Location location) { + KelpEntity output = null; + Entity entity = null; // net.minecraft entity, not a bukkit one CraftWorld craftWorld = (CraftWorld) location.getWorld(); - Entity entity = null; - output.minecraftEntity(null); switch (entityType) { - case GUARDIAN: - entity = craftWorld.createEntity(location, Guardian.class); - output = new GuardianEntity(); - break; - case ELDER_GUARDIAN: - entity = craftWorld.createEntity(location, Guardian.class); - ((EntityGuardian) entity).setElder(true); - output = new ElderGuardianEntity(); - break; - case ZOMBIE: - entity = craftWorld.createEntity(location, Zombie.class); - output = new ZombieEntity(); - break; - case DROPPED_ITEM: - entity = null; - output = new DroppedItemEntity(entityVersionTemplate, null, 0, location, null); - break; +// case GUARDIAN: +// entity = craftWorld.createEntity(location, Guardian.class); +// output = new VersionedGuardian(entity, KelpEntityType.GUARDIAN, location, entity.getId(), entityVersionTemplate, livingEntityVersionTemplate); +// break; +// case ELDER_GUARDIAN: +// entity = craftWorld.createEntity(location, Guardian.class); +// CraftGuardian guardian = (CraftGuardian) entity.getBukkitEntity(); +// guardian.setElder(true); +// output = new VersionedElderGuardian(entity, KelpEntityType.ELDER_GUARDIAN, location, entity.getId(), entityVersionTemplate, livingEntityVersionTemplate); +// break; +// case ZOMBIE: +// entity = craftWorld.createEntity(location, Zombie.class); +// output = new VersionedZombie(entity, entityType, location, entity.getId(), entityVersionTemplate, livingEntityVersionTemplate); +// break; +// case DROPPED_ITEM: +// entity = null; +// break; + case SHEEP: + entity = craftWorld.createEntity(location, Sheep.class); + output = new VersionedSheep(entity, KelpEntityType.SHEEP, location, this); } - if (entityType != KelpEntityType.DROPPED_ITEM) { - output.entityId(entity.getId()); - output.entityType(entityType); - output.minecraftEntity(entity); - output.initialLocation(location); - output.versionTemplate(this.entityVersionTemplate); - } +// if (entityType != KelpEntityType.DROPPED_ITEM) { +// output.entityId(entity.getId()); +// output.entityType(entityType); +// output.minecraftEntity(entity); +// output.initialLocation(location); +// output.versionTemplate(this.entityVersionTemplate); +// } - if (KelpEntityType.isLivingEntity(entityType)) { - LivingEntity livingEntity = (CraftLivingEntity) entity.getBukkitEntity(); - ((LivingKelpEntity)output).bukkitLivingEntity(livingEntity); - ((LivingKelpEntity)output).livingEntityVersionTemplate(livingEntityVersionTemplate); - } + +// if (KelpEntityType.isLivingEntity(entityType)) { +// LivingEntity livingEntity = (CraftLivingEntity) entity.getBukkitEntity(); +// ((LivingKelpEntity)output).bukkitLivingEntity(livingEntity); +// ((LivingKelpEntity)output).livingEntityVersionTemplate(livingEntityVersionTemplate); +// } return output; } @Override - public KelpEntity getKelpEntity(org.bukkit.entity.Entity bukkitEntity) { - - if (bukkitEntity instanceof Item) { - Item item = (Item) bukkitEntity; - KelpItem kelpItem = KelpItem.from(item.getItemStack()); - return new DroppedItemEntity(this.entityVersionTemplate, - ((CraftEntity)item).getHandle(), - item.getEntityId(), - item.getLocation(), - kelpItem); - } + public KelpEntity getKelpEntity(org.bukkit.entity.Entity bukkitEntity) { + +// if (bukkitEntity instanceof Item) { +// Item item = (Item) bukkitEntity; +// KelpItem kelpItem = KelpItem.from(item.getItemStack()); +// return new DroppedItemEntity(this.entityVersionTemplate, +// ((CraftEntity)item).getHandle(), +// item.getEntityId(), +// item.getLocation(), +// kelpItem); +// } +// +// if (bukkitEntity instanceof Zombie) { +// Zombie zombie = (Zombie) bukkitEntity; +// LivingEntity livingEntity = (LivingEntity) bukkitEntity; +// return new ZombieEntity(this.entityVersionTemplate, +// this.livingEntityVersionTemplate, +// livingEntity, +// ((CraftEntity)zombie).getHandle(), +// zombie.getEntityId(), +// zombie.getLocation(), +// zombie.isBaby()); +// } +// +// if (bukkitEntity instanceof Guardian) { +// Guardian guardian = (Guardian) bukkitEntity; +// if (guardian.isElder()) { +// return new ElderGuardianEntity(this.entityVersionTemplate, ((CraftEntity)guardian).getHandle(), guardian.getEntityId(), guardian.getLocation()); +// } else { +// return new GuardianEntity(this.entityVersionTemplate, ((CraftEntity)guardian).getHandle(), guardian.getEntityId(), guardian.getLocation()); +// } +// } - if (bukkitEntity instanceof Zombie) { - Zombie zombie = (Zombie) bukkitEntity; - LivingEntity livingEntity = (LivingEntity) bukkitEntity; - return new ZombieEntity(this.entityVersionTemplate, - this.livingEntityVersionTemplate, - livingEntity, - ((CraftEntity)zombie).getHandle(), - zombie.getEntityId(), - zombie.getLocation(), - zombie.isBaby()); - } - if (bukkitEntity instanceof Guardian) { - Guardian guardian = (Guardian) bukkitEntity; - if (guardian.isElder()) { - return new ElderGuardianEntity(this.entityVersionTemplate, ((CraftEntity)guardian).getHandle(), guardian.getEntityId(), guardian.getLocation()); - } else { - return new GuardianEntity(this.entityVersionTemplate, ((CraftEntity)guardian).getHandle(), guardian.getEntityId(), guardian.getLocation()); - } - } return null; } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java index 8595b673..2bc708c6 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java @@ -2,6 +2,7 @@ import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.LivingKelpEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.world.KelpLocation; import de.pxav.kelp.implementation1_8.entity.type.general.VersionedDamageable; import net.minecraft.server.v1_8_R3.Entity; @@ -21,8 +22,8 @@ public class VersionedLivingEntity> public VersionedLivingEntity(Entity entityHandle, KelpEntityType entityType, - Location initialLocation) { - super(entityHandle, entityType, initialLocation); + Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); this.entityHandle = (EntityLiving) entityHandle; } From 7d173e431c05fe4afa9f84e39422a9436e393bf6 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 12:44:25 +0200 Subject: [PATCH 045/325] Move methods from VersionedDamageable to VersionedLivingEntity as there is no dedicated abstraction for damageable entities in craftbukkit --- .../entity/VersionedLivingEntity.java | 45 ++++++++++++++++++- .../type/general/VersionedDamageable.java | 43 +++--------------- 2 files changed, 49 insertions(+), 39 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java index 2bc708c6..67f7920a 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java @@ -1,5 +1,6 @@ package de.pxav.kelp.implementation1_8.entity; +import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.LivingKelpEntity; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; @@ -8,6 +9,7 @@ import net.minecraft.server.v1_8_R3.Entity; import net.minecraft.server.v1_8_R3.EntityLiving; import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftLivingEntity; /** * A class description goes here. @@ -19,17 +21,58 @@ public class VersionedLivingEntity> implements LivingKelpEntity { private EntityLiving entityHandle; + private CraftLivingEntity craftLivingEntity; public VersionedLivingEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); this.entityHandle = (EntityLiving) entityHandle; + this.craftLivingEntity = (CraftLivingEntity) entityHandle.getBukkitEntity(); } @Override public KelpLocation getEyeLocation() { - return null; + return KelpLocation.from(craftLivingEntity.getEyeLocation()); + } + + @Override + public T damage(double damage) { + craftLivingEntity.damage(damage); + return (T) this; + } + + @Override + public T damage(double damage, KelpEntity source) { + craftLivingEntity.damage(damage, source.getBukkitEntity()); + return (T) this; + } + + @Override + public double getAbsorptionAmount() { + return entityHandle.getAbsorptionHearts(); + } + + @Override + public T setAbsorptionAmount(double absorptionAmount) { + entityHandle.setAbsorptionHearts((float) absorptionAmount); + return (T) this; + } + + @Override + public double getHealth() { + return entityHandle.getHealth(); + } + + @Override + public double getMaxHealth() { + return entityHandle.getMaxHealth(); + } + + @Override + public T setHealth(double health) { + entityHandle.setHealth((float) health); + return (T) this; } } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedDamageable.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedDamageable.java index 526b28dc..6773d289 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedDamageable.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedDamageable.java @@ -3,51 +3,18 @@ import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.DamageableEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.implementation1_8.entity.VersionedEntity; import net.minecraft.server.v1_8_R3.Entity; import org.bukkit.Location; +import org.bukkit.entity.Damageable; -public class VersionedDamageable> +public abstract class VersionedDamageable> extends VersionedEntity implements DamageableEntity { - public VersionedDamageable(Entity entityHandle, KelpEntityType entityType, Location initialLocation) { - super(entityHandle, entityType, initialLocation); - } - - @Override - public T damage(double damage) { - return null; - } - - @Override - public T damage(double damage, KelpEntity source) { - return null; - } - - @Override - public double getAbsorptionAmount() { - return 0; - } - - @Override - public T setAbsorptionAmount(int absorptionAmount) { - return null; - } - - @Override - public int getHealth() { - return 0; - } - - @Override - public int getMaxHealth() { - return 0; - } - - @Override - public T setHealth(int health) { - return null; + public VersionedDamageable(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); } } From c825daeed92342e977c482d7a47ee3318b6e1bff Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 12:45:37 +0200 Subject: [PATCH 046/325] Implement Vehicle Entity --- .../entity/type/general/VersionedVehicle.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedVehicle.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedVehicle.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedVehicle.java new file mode 100644 index 00000000..bcbe40ef --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedVehicle.java @@ -0,0 +1,27 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.VehicleEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.VersionedEntity; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.util.Vector; + +public class VersionedVehicle> extends VersionedEntity implements VehicleEntity { + + public VersionedVehicle(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + + @Override + public Vector getVehicleVelocity() { + return getVelocity(); + } + + @Override + public T setVehicleVelocity(Vector vehicleVelocity) { + return setVelocity(vehicleVelocity); + } + +} From 4903e04b599f5dfbb5a3ca4e8ae1290bcbd71e77 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 12:45:55 +0200 Subject: [PATCH 047/325] Implement tameable animals (exluding breeding) --- .../type/general/VersionedTameableAnimal.java | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedTameableAnimal.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedTameableAnimal.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedTameableAnimal.java new file mode 100644 index 00000000..f143147e --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedTameableAnimal.java @@ -0,0 +1,43 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.TameableAnimal; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityTameableAnimal; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftTameableAnimal; + +public class VersionedTameableAnimal> extends VersionedAnimalEntity implements TameableAnimal { + + private EntityTameableAnimal tameableHandle; + + public VersionedTameableAnimal(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.tameableHandle = (EntityTameableAnimal) entityHandle; + } + + @Override + public T setTamed(boolean tamed) { + tameableHandle.setTamed(tamed); + return (T) this; + } + + @Override + public boolean isTamed() { + return tameableHandle.isTamed(); + } + + @Override + public KelpEntity getOwner() { + return entityTypeVersionTemplate.getKelpEntity(tameableHandle.getOwner().getBukkitEntity()); + } + + @Override + public T setOwner(KelpEntity owner) { + tameableHandle.setOwnerUUID(owner.getUUID().toString()); + return (T) this; + } + +} From 0ba000dcc514a17c0ff1a7bdc2c298302054ef71 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 12:46:22 +0200 Subject: [PATCH 048/325] Add abstract implementation of breedable entities as there is no abstraction in craftbukkit --- .../type/general/VersionedBreedableAnimal.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedBreedableAnimal.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedBreedableAnimal.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedBreedableAnimal.java new file mode 100644 index 00000000..6b432f0e --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedBreedableAnimal.java @@ -0,0 +1,17 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public abstract class VersionedBreedableAnimal> + extends VersionedAnimalEntity + implements BreedableAnimalEntity { + + public VersionedBreedableAnimal(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} From 73f7db73ec36bd937f2b4f8465892c8c1988c22a Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 12:47:07 +0200 Subject: [PATCH 049/325] Add implementation for villager types and professions in VersionedEntityConstants --- ...ity.java => VersionedEntityConstants.java} | 48 ++++++++++++++++++- 1 file changed, 46 insertions(+), 2 deletions(-) rename v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/{VersionedSpecificEntity.java => VersionedEntityConstants.java} (73%) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedSpecificEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityConstants.java similarity index 73% rename from v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedSpecificEntity.java rename to v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityConstants.java index 3bd86406..2291b81b 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedSpecificEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityConstants.java @@ -2,12 +2,16 @@ import de.pxav.kelp.core.entity.type.general.KelpProjectile; import de.pxav.kelp.core.entity.util.PaintingType; -import de.pxav.kelp.core.entity.version.EntitySpecificVersionTemplate; +import de.pxav.kelp.core.entity.util.VillagerProfession; +import de.pxav.kelp.core.entity.util.VillagerType; +import de.pxav.kelp.core.entity.version.EntityConstantsVersionTemplate; import de.pxav.kelp.core.version.Versioned; import org.bukkit.Art; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Villager; @Versioned -public class VersionedSpecificEntity extends EntitySpecificVersionTemplate { +public class VersionedEntityConstants extends EntityConstantsVersionTemplate { @Override public PaintingType getPaintingType(Art art) { @@ -125,6 +129,46 @@ public Art getBukkitPaintingType(PaintingType paintingType) { return Art.ALBAN; } + @Override + public VillagerProfession getVillagerProfession(String bukkitProfession) { + if (bukkitProfession.equalsIgnoreCase("FARMER")) { + return VillagerProfession.FARMER; + } else if (bukkitProfession.equalsIgnoreCase("LIBRARIAN")) { + return VillagerProfession.LIBRARIAN; + } if (bukkitProfession.equalsIgnoreCase("PRIEST")) { + return VillagerProfession.CLERIC; + } if (bukkitProfession.equalsIgnoreCase("BLACKSMITH")) { + return VillagerProfession.TOOL_SMITH; + } if (bukkitProfession.equalsIgnoreCase("BUTCHER")) { + return VillagerProfession.BUTCHER; + } + return VillagerProfession.NONE; + } + + @Override + public String getVillagerProfession(VillagerProfession villagerProfession) { + if (villagerProfession == VillagerProfession.BUTCHER) { + return "BUTCHER"; + } else if (villagerProfession == VillagerProfession.CLERIC) { + return "PRIEST"; + } else if (villagerProfession == VillagerProfession.FARMER) { + return "FARMER"; + } else if (villagerProfession == VillagerProfession.LIBRARIAN) { + return "LIBRARIAN"; + } + return "BLACKSMITH"; + } + + @Override + public VillagerType getVillagerType(String bukkitType) { + return VillagerType.NONE; + } + + @Override + public String getVillagerType(VillagerType villagerType) { + return "NONE"; + } + @Override public > T launchProjectile() { return null; From 3df8dee7e18b620a1ee8074d55308e3fae314599 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 12:47:47 +0200 Subject: [PATCH 050/325] Remove entity specific version template as this is now handled by individual classes for each entity. --- .../version/EntitySpecificVersionTemplate.java | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 core/src/main/java/de/pxav/kelp/core/entity/version/EntitySpecificVersionTemplate.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/version/EntitySpecificVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/entity/version/EntitySpecificVersionTemplate.java deleted file mode 100644 index e6348e65..00000000 --- a/core/src/main/java/de/pxav/kelp/core/entity/version/EntitySpecificVersionTemplate.java +++ /dev/null @@ -1,17 +0,0 @@ -package de.pxav.kelp.core.entity.version; - -import de.pxav.kelp.core.application.KelpVersionTemplate; -import de.pxav.kelp.core.entity.type.general.KelpProjectile; -import de.pxav.kelp.core.entity.util.PaintingType; -import org.bukkit.Art; - -@KelpVersionTemplate -public abstract class EntitySpecificVersionTemplate { - - public abstract PaintingType getPaintingType(Art art); - - public abstract Art getBukkitPaintingType(PaintingType paintingType); - - public abstract > T launchProjectile(); - -} From 6b7c8c60bfb03869761cfc979ed4440f41097efd Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 12:48:15 +0200 Subject: [PATCH 051/325] Add new version template for entity constants such as villager professions, horse types, painting types, etc. --- .../EntityConstantsVersionTemplate.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/version/EntityConstantsVersionTemplate.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/version/EntityConstantsVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/entity/version/EntityConstantsVersionTemplate.java new file mode 100644 index 00000000..bd16e993 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/version/EntityConstantsVersionTemplate.java @@ -0,0 +1,28 @@ +package de.pxav.kelp.core.entity.version; + +import de.pxav.kelp.core.application.KelpVersionTemplate; +import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.entity.util.PaintingType; +import de.pxav.kelp.core.entity.util.VillagerProfession; +import de.pxav.kelp.core.entity.util.VillagerType; +import org.bukkit.Art; +import org.bukkit.entity.Villager; + +@KelpVersionTemplate +public abstract class EntityConstantsVersionTemplate { + + public abstract PaintingType getPaintingType(Art art); + + public abstract Art getBukkitPaintingType(PaintingType paintingType); + + public abstract VillagerProfession getVillagerProfession(String bukkitProfession); + + public abstract String getVillagerProfession(VillagerProfession villagerType); + + public abstract VillagerType getVillagerType(String bukkitType); + + public abstract String getVillagerType(VillagerType villagerType); + + public abstract > T launchProjectile(); + +} From ee7c08c0744ec85d68e239127749a7bbd646ac4d Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 12:56:20 +0200 Subject: [PATCH 052/325] Add method to get block relative to a KelpBlockFace --- .../de/pxav/kelp/core/world/KelpBlock.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/world/KelpBlock.java b/core/src/main/java/de/pxav/kelp/core/world/KelpBlock.java index 9f72e83a..75109a87 100644 --- a/core/src/main/java/de/pxav/kelp/core/world/KelpBlock.java +++ b/core/src/main/java/de/pxav/kelp/core/world/KelpBlock.java @@ -196,6 +196,45 @@ public KelpBlock getRelative(CardinalDirection direction) { return null; } + /** + * Gets the block that is directly attached to this block + * to the given face. If you pass {@link KelpBlockFace#UP} for example, then + * the block above this block will be returned, and so on. + * This is similar to {@link #getRelative(CardinalDirection)} with the main + * difference that you can get the block above and below the current block + * as you are independent from cardinal directions. + * + * @param face The face of the block you want to get. + * @return The block relative to this block in the given direction. + */ + public KelpBlock getRelative(KelpBlockFace face) { + switch (face) { + case NORTH: + return getNorthernBlock(); + case NORTH_EAST: + return getNorthEasternBlock(); + case EAST: + return getEasternBlock(); + case SOUTH_EAST: + return getSouthEasternBlock(); + case SOUTH: + return getSouthernBlock(); + case SOUTH_WEST: + return getSouthWesternBlock(); + case WEST: + return getWesternBlock(); + case NORTH_WEST: + return getNorthWesternBlock(); + case UP: + return getBlockAbove(); + case DOWN: + return getBlockBelow(); + case SELF: + return this; + } + return null; + } + /** * Gets the block in front of this block relative to the given direction. * From a836530dd2d0d1765fea35240e6b40e3357c5625 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 13:12:33 +0200 Subject: [PATCH 053/325] Make VersionedExplosiveEntity abstract as there is no nms implementation for it yet. --- .../general/VersionedExplosiveEntity.java | 27 ++++--------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedExplosiveEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedExplosiveEntity.java index 88997003..1df4ebb0 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedExplosiveEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedExplosiveEntity.java @@ -2,36 +2,19 @@ import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.ExplosiveEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.world.util.ExplosionPower; import de.pxav.kelp.implementation1_8.entity.VersionedEntity; import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityTNTPrimed; import org.bukkit.Location; -public class VersionedExplosiveEntity> +public abstract class VersionedExplosiveEntity> extends VersionedEntity implements ExplosiveEntity { - public VersionedExplosiveEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation) { - super(entityHandle, entityType, initialLocation); + public VersionedExplosiveEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); } - @Override - public ExplosionPower getExplosionPower() { - return null; - } - - @Override - public T setExplosionPower(ExplosionPower power) { - return null; - } - - @Override - public boolean createsFire() { - return false; - } - - @Override - public T canCreateFire(boolean create) { - return null; - } } From 44317b61f24c503124ef7f51135b8601dc3674a8 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 13:52:50 +0200 Subject: [PATCH 054/325] Implement animal breeding mechanics --- .../type/general/VersionedAnimalEntity.java | 50 ++++++++++++++++--- 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAnimalEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAnimalEntity.java index 77601c8d..2607682a 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAnimalEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAnimalEntity.java @@ -1,30 +1,64 @@ package de.pxav.kelp.implementation1_8.entity.type.general; +import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AnimalEntity; -import net.minecraft.server.v1_8_R3.Entity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.reflect.ReflectionUtil; +import javassist.tools.reflect.CannotInvokeException; +import net.minecraft.server.v1_8_R3.*; import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPig; public class VersionedAnimalEntity> extends VersionedMobileEntity implements AnimalEntity { - public VersionedAnimalEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation) { - super(entityHandle, entityType, initialLocation); + private EntityAnimal animalHandle; + private ReflectionUtil reflectionUtil; + + public VersionedAnimalEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, ReflectionUtil reflectionUtil) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.reflectionUtil = reflectionUtil; + this.animalHandle = (EntityAnimal) entityHandle; + } + + @Override + public boolean isInLove() { + return animalHandle.isInLove(); + } + + @Override + public T setInLove(boolean inLove) { + if (inLove) { + setLoveModeTicks(600); + } else { + setLoveModeTicks(0); + } + return (T) this; + } + + @Override + public KelpEntity getBreeder() { + return entityTypeVersionTemplate.getKelpEntity(animalHandle.cq().getBukkitEntity()); } @Override - public boolean isLoveMode() { - return false; + public T setBreeder(KelpEntity breeder) { + EntityHuman nmsHuman = ((CraftHumanEntity) breeder.getBukkitEntity()).getHandle(); + reflectionUtil.setValue(animalHandle, "bo", nmsHuman); + return (T) this; } @Override public int getLoveModeTicks() { - return 0; + return (int) reflectionUtil.getValue(animalHandle, "bm"); } @Override - public T setLoveModeTicks() { - return null; + public T setLoveModeTicks(int loveModeTicks) { + reflectionUtil.setValue(animalHandle, "bm", loveModeTicks); + return (T) this; } } From 7e78de87f8aa165f5226f7803d5f2de8c2f2b270 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 14:14:02 +0200 Subject: [PATCH 055/325] Add default values for the properties in MonsterEntity --- .../core/entity/type/general/MonsterEntity.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/MonsterEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/MonsterEntity.java index 2cb7178a..5aea7540 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/general/MonsterEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/MonsterEntity.java @@ -3,21 +3,27 @@ import org.bukkit.Bukkit; import org.bukkit.Difficulty; import org.bukkit.World; +import org.bukkit.craftbukkit.v1_16_R3.entity.CraftCreature; +import org.bukkit.craftbukkit.v1_16_R3.entity.CraftMob; public interface MonsterEntity> extends MobileEntity { - int getMaximumSpawnLightLevel(); + default int getMaximumSpawnLightLevel() { + return 0; + } default boolean canSpawnInLightLevel(int lightLevel) { return getMaximumSpawnLightLevel() >= lightLevel; } - int getAttackDamage(Difficulty difficulty); + default double getAttackDamage(Difficulty difficulty) { + return 0; + } - default int getAttackDamage() { + default double getAttackDamage() { World world = Bukkit.getWorld(getLocation().getWorldName()); if (world == null) { - return 0; + return 0.0d; } return getAttackDamage(world.getDifficulty()); } From 232f5874d5748b98f672806bcc8ba114ca1e59b1 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 14:45:50 +0200 Subject: [PATCH 056/325] Implement cat types in entity constants --- .../EntityConstantsVersionTemplate.java | 5 ++++ .../entity/VersionedEntityConstants.java | 25 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/version/EntityConstantsVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/entity/version/EntityConstantsVersionTemplate.java index bd16e993..66ac2e2d 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/version/EntityConstantsVersionTemplate.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/version/EntityConstantsVersionTemplate.java @@ -2,6 +2,7 @@ import de.pxav.kelp.core.application.KelpVersionTemplate; import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.entity.util.CatType; import de.pxav.kelp.core.entity.util.PaintingType; import de.pxav.kelp.core.entity.util.VillagerProfession; import de.pxav.kelp.core.entity.util.VillagerType; @@ -23,6 +24,10 @@ public abstract class EntityConstantsVersionTemplate { public abstract String getVillagerType(VillagerType villagerType); + public abstract CatType getCatType(String bukkitCatType); + + public abstract String getCatType(CatType catType); + public abstract > T launchProjectile(); } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityConstants.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityConstants.java index 2291b81b..0eea45b2 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityConstants.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityConstants.java @@ -1,6 +1,7 @@ package de.pxav.kelp.implementation1_8.entity; import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.entity.util.CatType; import de.pxav.kelp.core.entity.util.PaintingType; import de.pxav.kelp.core.entity.util.VillagerProfession; import de.pxav.kelp.core.entity.util.VillagerType; @@ -169,6 +170,30 @@ public String getVillagerType(VillagerType villagerType) { return "NONE"; } + @Override + public CatType getCatType(String bukkitCatType) { + if (bukkitCatType.equalsIgnoreCase("BLACK_CAT")) { + return CatType.ALL_BLACK; + } else if (bukkitCatType.equalsIgnoreCase("RED_CAT")) { + return CatType.RED; + } else if (bukkitCatType.equalsIgnoreCase("SIAMESE_CAT")) { + return CatType.SIAMESE; + } + return CatType.ALL_BLACK; + } + + @Override + public String getCatType(CatType catType) { + if (catType == CatType.ALL_BLACK) { + return "BLACK_CAT"; + } else if (catType == CatType.RED) { + return "RED_CAT"; + } else if (catType == CatType.SIAMESE) { + return "SIAMESE_CAT"; + } + return null; + } + @Override public > T launchProjectile() { return null; From 66c71cb295a5679736c9db2a00cb090575b0895a Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:31:05 +0200 Subject: [PATCH 057/325] PlayerInventory is now an interface --- .../core/inventory/type/PlayerInventory.java | 281 ++---------------- 1 file changed, 21 insertions(+), 260 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/type/PlayerInventory.java b/core/src/main/java/de/pxav/kelp/core/inventory/type/PlayerInventory.java index 49d7f174..878b2736 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/type/PlayerInventory.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/type/PlayerInventory.java @@ -3,8 +3,9 @@ import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.common.ConcurrentSetMultimap; import de.pxav.kelp.core.inventory.item.KelpItem; -import de.pxav.kelp.core.inventory.version.PlayerInventoryVersionTemplate; +import de.pxav.kelp.core.inventory.version.StorageInventoryVersionTemplate; import de.pxav.kelp.core.inventory.widget.GroupedWidget; +import de.pxav.kelp.core.inventory.widget.SimplePagination; import de.pxav.kelp.core.inventory.widget.SimpleWidget; import de.pxav.kelp.core.player.KelpPlayer; @@ -24,38 +25,7 @@ * * @author pxav */ -public class PlayerInventory { - - // the version template used for player inventory manipulation - private PlayerInventoryVersionTemplate versionTemplate; - - // the owner of this inventory - private KelpPlayer player; - - // all widgets currently stored by all players on the server. - // the uuid represents the player uuid who owns the widget. - private static ConcurrentSetMultimap simpleWidgets = ConcurrentSetMultimap.create(); - private static ConcurrentSetMultimap groupedWidgets = ConcurrentSetMultimap.create(); - - /** - * Gets the inventory of a specific {@link KelpPlayer}. - * Alternatively, you can use {@link KelpPlayer#getInventory()} to get - * the inventory directly from the kelp player class. - * - * @param player The player you want to get the inventory of. - * @return The {@link PlayerInventory} of the given player. - */ - public static PlayerInventory of(KelpPlayer player) { - return new PlayerInventory( - player, - KelpPlugin.getInjector().getInstance(PlayerInventoryVersionTemplate.class) - ); - } - - private PlayerInventory(KelpPlayer player, PlayerInventoryVersionTemplate versionTemplate) { - this.player = player; - this.versionTemplate = versionTemplate; - } +public interface PlayerInventory extends StorageInventory { /** * Gets all items stored in this player inventory. This includes @@ -63,9 +33,7 @@ private PlayerInventory(KelpPlayer player, PlayerInventoryVersionTemplate versio * * @return A set of all items that are currently in the player's inventory. */ - public Set getItems() { - return versionTemplate.getItems(player.getBukkitPlayer()); - } + Set getItems(); /** * Gets an item at a specific slot. The slot count starts at the @@ -77,9 +45,7 @@ public Set getItems() { * @param slot The slot of the item you want to get. * @return The item stored at the given slot in the player inventory. */ - public KelpItem getItemAt(int slot) { - return versionTemplate.getItemAt(player.getBukkitPlayer(), slot); - } + KelpItem getItemAt(int slot); /** * Gets all items stored in the player's hotbar. The hotbar @@ -88,9 +54,7 @@ public KelpItem getItemAt(int slot) { * * @return A set of all items stored in the player's hotbar. */ - public Set getHotBarItems() { - return versionTemplate.getHotBarItems(player.getBukkitPlayer()); - } + Set getHotBarItems(); /** * Sets the helmet the player is wearing to the given item. @@ -102,10 +66,7 @@ public Set getHotBarItems() { * a normal armor helmet or any banner, head or even some blocks. * @return An instance of the current inventory for fluent builder design. */ - public PlayerInventory setHelmet(KelpItem helmet) { - versionTemplate.setHelmet(player.getBukkitPlayer(), helmet); - return this; - } + PlayerInventory setHelmet(KelpItem helmet); /** * Sets the chest plate of the player owning this inventory. @@ -115,10 +76,7 @@ public PlayerInventory setHelmet(KelpItem helmet) { * @param chestPlate The chest plate item you want to set. * @return An instance of the current inventory for fluent builder design. */ - public PlayerInventory setChestPlate(KelpItem chestPlate) { - versionTemplate.setChestPlate(player.getBukkitPlayer(), chestPlate); - return this; - } + PlayerInventory setChestPlate(KelpItem chestPlate); /** * Sets the leggings of the player owning this inventory. @@ -128,10 +86,7 @@ public PlayerInventory setChestPlate(KelpItem chestPlate) { * @param leggings The leggings item you want to set. * @return An instance of the current inventory for fluent builder design. */ - public PlayerInventory setLeggings(KelpItem leggings) { - versionTemplate.setLeggings(player.getBukkitPlayer(), leggings); - return this; - } + PlayerInventory setLeggings(KelpItem leggings); /** * Sets the boots of the player owning this inventory. @@ -141,10 +96,7 @@ public PlayerInventory setLeggings(KelpItem leggings) { * @param boots The chest plate item you want to set. * @return An instance of the current inventory for fluent builder design. */ - public PlayerInventory setBoots(KelpItem boots) { - versionTemplate.setBoots(player.getBukkitPlayer(), boots); - return this; - } + PlayerInventory setBoots(KelpItem boots); /** * Gets the helmet the player is currently wearing. @@ -156,9 +108,7 @@ public PlayerInventory setBoots(KelpItem boots) { * * @return The item representing the player's helmet. */ - public KelpItem getHelmet() { - return versionTemplate.getHelmet(player.getBukkitPlayer()); - } + KelpItem getHelmet(); /** * Gets the chest plate the player is currently wearing. @@ -167,9 +117,7 @@ public KelpItem getHelmet() { * * @return The item representing the player's chest plate. */ - public KelpItem getChestPlate() { - return versionTemplate.getChestPlate(player.getBukkitPlayer()); - } + KelpItem getChestPlate(); /** * Gets the leggings the player is currently wearing. @@ -178,9 +126,7 @@ public KelpItem getChestPlate() { * * @return The item representing the player's chest plate. */ - public KelpItem getLeggings() { - return versionTemplate.getLeggings(player.getBukkitPlayer()); - } + KelpItem getLeggings(); /** * Gets the boots the player is currently wearing. @@ -189,9 +135,7 @@ public KelpItem getLeggings() { * * @return The item representing the player's chest plate. */ - public KelpItem getBoots() { - return versionTemplate.getBoots(player.getBukkitPlayer()); - } + KelpItem getBoots(); /** * Stores an item in the player inventory at the given slot location. @@ -203,10 +147,7 @@ public KelpItem getBoots() { * @param item The item to store at the given slot. * @return An instance of the current inventory for fluent builder design. */ - public PlayerInventory setItem(int slot, KelpItem item) { - versionTemplate.setItem(player.getBukkitPlayer(), slot, item); - return this; - } + PlayerInventory setItem(int slot, KelpItem item); /** * Adds a new item to the player's inventory. @@ -219,10 +160,7 @@ public PlayerInventory setItem(int slot, KelpItem item) { * @param item The item to add. * @return An instance of the current inventory for fluent builder design. */ - public PlayerInventory addItem(KelpItem item) { - versionTemplate.addItem(player.getBukkitPlayer(), item); - return this; - } + PlayerInventory addItem(KelpItem item); /** * Gets the item that is currently stored in the player's @@ -232,9 +170,7 @@ public PlayerInventory addItem(KelpItem item) { * * @return The item the player is holding right now. */ - public KelpItem getItemInHand() { - return versionTemplate.getItemInHand(player.getBukkitPlayer()); - } + KelpItem getItemInHand(); /** * Sets the item in the player's main hand (the player's right hand). @@ -244,10 +180,7 @@ public KelpItem getItemInHand() { * @param item The item to set in the player's main hand. * @return An instance of the current inventory for fluent builder design. */ - public PlayerInventory setItemInHand(KelpItem item) { - versionTemplate.setItemInHand(player.getBukkitPlayer(), item); - return this; - } + PlayerInventory setItemInHand(KelpItem item); /** * Gets the item that is currently in the player's off hand @@ -261,9 +194,7 @@ public PlayerInventory setItemInHand(KelpItem item) { * * @return The item that is stored in the player's off hand right now. */ - public KelpItem getItemInOffHand() { - return versionTemplate.getItemInOffHand(player.getBukkitPlayer()); - } + KelpItem getItemInOffHand(); /** * Sets the item in the player's off hand (the player's left hand). @@ -275,183 +206,13 @@ public KelpItem getItemInOffHand() { * @param item The item to set in the player's off hand. * @return An instance of the current inventory for fluent builder design. */ - public PlayerInventory setItemInOffHand(KelpItem item) { - versionTemplate.setItemInOffHand(player.getBukkitPlayer(), item); - return this; - } - - /** - * Adds a new {@link SimpleWidget} to the player's inventory. - * This method does not immediately render the widget, but only - * adds it to the cache. To make the widget appear, call - * {@link #updateWidgets()} first. - * - * @param simpleWidget The simple widget you want to add to the inventory. - * @return An instance of the current inventory for fluent builder design. - */ - public PlayerInventory addWidget(SimpleWidget simpleWidget) { - simpleWidgets.put(player.getUUID(), simpleWidget); - return this; - } - - /** - * Adds a new {@link GroupedWidget} to the player's inventory. - * This method does not immediately render the widget, but only - * adds it to the cache. To make the widget appear, call - * {@link #updateWidgets()} first. - * - * @param groupedWidget The grouped widget you want to add to the inventory. - * @return An instance of the current inventory for fluent builder design. - */ - public PlayerInventory addWidget(GroupedWidget groupedWidget) { - groupedWidgets.put(player.getUUID(), groupedWidget); - return this; - } - - /** - * Removes all {@link SimpleWidget simple widgets} of a certain type. - * This method removes the widget from the cache as well as the inventory, - * so that no items are there anymore. - * - * @param widgetClass The class of the widget type you want to remove. - * If you pass {@code ToggleableWidget.class} here, - * all {@link de.pxav.kelp.core.inventory.widget.ToggleableWidget ToggleableWidgets} - * will be removed from the inventory. - * @return An instance of the current inventory for fluent builder design. - */ - public PlayerInventory removeSimpleWidget(Class widgetClass) { - simpleWidgets.get(player.getUUID()).forEach(widget -> { - if (widgetClass.getName().equalsIgnoreCase(widget.getClass().getName())) { - removeWidget(widget); - } - }); - return this; - } - - /** - * Removes all {@link GroupedWidget grouped widgets} of a certain type. - * This method removes the widget from the cache as well as the inventory, - * so that no items are there anymore. - * - * @param widgetClass The class of the widget type you want to remove. - * If you pass {@code Pagination.class} here, - * all {@link de.pxav.kelp.core.inventory.widget.Pagination Paginations} - * will be removed from the inventory. - * @return An instance of the current inventory for fluent builder design. - */ - public PlayerInventory removeGroupedWidget(Class widgetClass) { - groupedWidgets.get(player.getUUID()).forEach(widget -> { - if (widgetClass.getName().equalsIgnoreCase(widget.getClass().getName())) { - removeWidget(widget); - } - }); - return this; - } - - /** - * Removes a specific {@link SimpleWidget} from the inventory. - * This method removes the widget from the cache as well as - * the inventory itself, so there won't be any items rendered by - * this widget anymore. - * - * @param widget The object of the widget you want to remove. - * @return An instance of the current inventory for fluent builder design. - */ - public PlayerInventory removeWidget(SimpleWidget widget) { - player.getBukkitPlayer().getInventory().clear(widget.getCoveredSlot()); - widget.onRemove(); - simpleWidgets.remove(player.getUUID(), widget); - return this; - } - - /** - * Removes a specific {@link GroupedWidget} from the inventory. - * This method removes the widget from the cache as well as - * the inventory itself, so there won't be any items rendered by - * this widget anymore. - * - * @param widget The object of the widget you want to remove. - * @return An instance of the current inventory for fluent builder design. - */ - public PlayerInventory removeWidget(GroupedWidget widget) { - widget.getCoveredSlots().forEach(slot -> player.getBukkitPlayer().getInventory().clear(slot)); - widget.onRemove(); - groupedWidgets.remove(player.getUUID(), widget); - return this; - } - - /** - * Removes all widgets from the player's inventory. - * This will not only remove them from the cache, but also from - * the visible inventory itself. - * - * @return An instance of the current inventory for fluent builder design. - */ - public PlayerInventory removeAllWidgets() { - simpleWidgets.getOrEmpty(player.getUUID()).forEach(this::removeWidget); - groupedWidgets.getOrEmpty(player.getUUID()).forEach(this::removeWidget); - return this; - } - - /** - * Updates all widgets inside this player inventory. - * - * This is also equivalent to the {@link KelpInventory#render(KelpPlayer) render method} you - * already know from KelpInventories, so call this method even if you - * have just put widgets into the inventory for the first time. - * - * @return An instance of the current inventory for fluent builder design. - */ - public PlayerInventory updateWidgets() { - for (SimpleWidget current : simpleWidgets.getOrEmpty(player.getUUID())) { - if (!current.isStateful()) { - continue; - } - - player.getBukkitPlayer().getInventory().clear(current.getCoveredSlot()); - - KelpItem item = current.render(); - - // if items are not explicitly stated as interactable - // cancel interactions by default - if (!item.hasTagKey("interactionAllowed")) { - item.cancelInteractions(); - } - - setItem(item.getSlot(), item); - } - - for (GroupedWidget current : groupedWidgets.getOrEmpty(player.getUUID())) { - if (!current.isStateful()) { - continue; - } - - for (Integer slot : current.getCoveredSlots()) { - player.getBukkitPlayer().getInventory().clear(slot); - } - - current.render(player).forEach(item -> { - - // if items are not explicitly stated as interactable - // cancel interactions by default - if (!item.hasTagKey("interactionAllowed")) { - item.cancelInteractions(); - } - - setItem(item.getSlot(), item); - }); - } - - return this; - } + PlayerInventory setItemInOffHand(KelpItem item); /** * Gets the player owning this inventory. * * @return The player owning this inventory. */ - public KelpPlayer getPlayer() { - return player; - } + KelpPlayer getPlayer(); } From e095c96f9c189aed1a82c31ad3678c3ae725712c Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:41:05 +0200 Subject: [PATCH 058/325] Add abstraction for all arrow types (normal, tipped and spectral) --- .../type/general/AbstractArrowEntity.java | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractArrowEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractArrowEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractArrowEntity.java new file mode 100644 index 00000000..42382128 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractArrowEntity.java @@ -0,0 +1,66 @@ +package de.pxav.kelp.core.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.util.ArrowPickupStatus; +import de.pxav.kelp.core.player.KelpPlayer; +import de.pxav.kelp.core.world.KelpBlock; +import org.bukkit.GameMode; + +public interface AbstractArrowEntity> extends KelpProjectile { + + KelpBlock getAttachedBlock(); + + double getBaseDamage(); + + // equivalent to knockback enchantment level + int getKnockbackLevel(); + + ArrowPickupStatus getPickupStatus(); + + default boolean canPickup(KelpEntity entity) { + if (!(entity instanceof KelpPlayer)) { + return false; + } + + if (getPickupStatus() == ArrowPickupStatus.ALWAYS_FORBIDDEN) { + return false; + } + + if (getPickupStatus() == ArrowPickupStatus.CREATIVE_ONLY) { + KelpPlayer player = KelpPlayer.from(entity.getUUID()); + return player.getGameMode() == GameMode.CREATIVE; + } + + return true; + } + + int getPierceLevel(); + + boolean isCritical(); + + boolean isInBlock(); + + boolean isShotFromCrossbow(); + + default boolean isShotFromNormalBow() { + return !isShotFromCrossbow(); + } + + T setPickupStatus(ArrowPickupStatus pickupStatus); + + T setCritical(boolean critical); + + T setDamage(double damage); + + T setKnockbackLevel(int knockbackLevel); + + T setPierceLevel(int pierceLevel); + + T setShotFromCrossbow(boolean fromCrossbow); + + default T setShowFromNormalBow(boolean fromNormalBow) { + setShotFromCrossbow(!fromNormalBow); + return (T) this; + } + +} From bed5d0c54c36185bd86304e23de27e314a7fe9b1 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:41:22 +0200 Subject: [PATCH 059/325] Add abstraction for all fish entities (for 1.13 and above) --- .../kelp/core/entity/type/general/AbstractFishEntity.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractFishEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractFishEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractFishEntity.java new file mode 100644 index 00000000..3909960e --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractFishEntity.java @@ -0,0 +1,4 @@ +package de.pxav.kelp.core.entity.type.general; + +public interface AbstractFishEntity> extends WaterEntity { +} From 36c4a73ebbbab84ab5d19ffa719e4846913911a4 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:41:52 +0200 Subject: [PATCH 060/325] Add abstraction for all horse-like entities such as llamas, donkeys, and normal horses --- .../type/general/AbstractHorseEntity.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractHorseEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractHorseEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractHorseEntity.java new file mode 100644 index 00000000..08253408 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractHorseEntity.java @@ -0,0 +1,21 @@ +package de.pxav.kelp.core.entity.type.general; + +import de.pxav.kelp.core.inventory.type.AbstractHorseInventory; + +public interface AbstractHorseEntity> extends TameableAnimal { + + int getDomestication(); + + AbstractHorseInventory getInventory(); + + double getJumpStrength(); + + int getMaximumDomestication(); + + T setDomestication(int domesticationLevel); + + T setJumpStrength(double jumpStrength); + + T setMaximumDomestication(int maximumDomestication); + +} From 4e1bf42bf944bd0bd4a4b694b0a99538dce1c6a5 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:42:01 +0200 Subject: [PATCH 061/325] Add abstraction for all piglin types --- .../entity/type/general/AbstractPiglin.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractPiglin.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractPiglin.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractPiglin.java new file mode 100644 index 00000000..2afaa24b --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractPiglin.java @@ -0,0 +1,17 @@ +package de.pxav.kelp.core.entity.type.general; + +import org.bukkit.entity.PiglinAbstract; + +public interface AbstractPiglin> extends AgeableEntity, MonsterEntity { + + boolean isImmuneToZombification(); + + void setImmuneToZombification(boolean immuneToZombification); + + int getConversionTime(); + + void setConversionTime(int conversionTime); + + boolean isConverting(); + +} From d0c30a1b638aee4ba6b17176fd53a97b5e27a408 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:42:14 +0200 Subject: [PATCH 062/325] Add abstraction for all villager-like entities (villagers and wandering traders) --- .../kelp/core/entity/type/general/AbstractVillager.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractVillager.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractVillager.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractVillager.java new file mode 100644 index 00000000..bdce3017 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AbstractVillager.java @@ -0,0 +1,9 @@ +package de.pxav.kelp.core.entity.type.general; + +import de.pxav.kelp.core.inventory.type.StorageInventory; + +public interface AbstractVillager> extends HumanEntity { + + StorageInventory getStorageInventory(); + +} From 95d1ac4013f036c6866044fa096ccfd431b8a975 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:42:51 +0200 Subject: [PATCH 063/325] Add abstraction for all horse-like entities that carry a chest --- .../pxav/kelp/core/entity/type/general/ChestedHorse.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/ChestedHorse.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/ChestedHorse.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/ChestedHorse.java new file mode 100644 index 00000000..8ae2a8de --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/ChestedHorse.java @@ -0,0 +1,9 @@ +package de.pxav.kelp.core.entity.type.general; + +public interface ChestedHorse> extends AbstractHorseEntity { + + boolean isCarryingChest(); + + T setCarryingChest(boolean carryingChest); + +} From b1bb1ee9c1803b4994814d9a0085ba9fb92304f1 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:43:04 +0200 Subject: [PATCH 064/325] Add abstraction for all entities representing any golem --- .../de/pxav/kelp/core/entity/type/general/GolemEntity.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/GolemEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/GolemEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/GolemEntity.java new file mode 100644 index 00000000..e1bc5a1b --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/GolemEntity.java @@ -0,0 +1,5 @@ +package de.pxav.kelp.core.entity.type.general; + +public interface GolemEntity> extends MobileEntity { + +} From 723ff2c7227940888edec4a90277b7288a14754f Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:43:14 +0200 Subject: [PATCH 065/325] Add abstraction for all minecart types --- .../entity/type/general/MinecartEntity.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/MinecartEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/MinecartEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/MinecartEntity.java new file mode 100644 index 00000000..170f7171 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/MinecartEntity.java @@ -0,0 +1,36 @@ +package de.pxav.kelp.core.entity.type.general; + +import de.pxav.kelp.core.inventory.material.KelpMaterial; +import org.bukkit.util.Vector; + +public interface MinecartEntity> extends VehicleEntity { + + T setDamage(double damage); + + double getDamage(); + + double getMaxSpeed(); + + T setMaxSpeed(double maxSpeed); + + boolean isSlowWhenEmpty(); + + T setSlowWhenEmpty(boolean slowWhenEmpty); + + Vector getFlyingVelocityModifier(); + + T setFlyingVelocityModifier(Vector flyingVelocityModifier); + + Vector getDerailedVelocityModifier(); + + T setDerailedVelocityModifier(Vector derailedVelocityModifier); + + T setDisplayBlock(KelpMaterial material); + + KelpMaterial getDisplayBlock(); + + T setDisplayBlockOffset(int displayBlockOffset); + + int getDisplayBlockOffset(); + +} From 3a3990ce60a022238c9eeacc725a70445f2c6612 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:43:28 +0200 Subject: [PATCH 066/325] Add abstraction for an entity that participates in a raid --- .../entity/type/general/RaidingEntity.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/RaidingEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/RaidingEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/RaidingEntity.java new file mode 100644 index 00000000..d59015b7 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/RaidingEntity.java @@ -0,0 +1,19 @@ +package de.pxav.kelp.core.entity.type.general; + +import de.pxav.kelp.core.world.KelpBlock; + +public interface RaidingEntity> extends MonsterEntity { + + KelpBlock getPatrolTarget(); + + T setPatrolTarget(KelpBlock patrolTarget); + + boolean canJoinRaid(); + + boolean isPatrolLeader(); + + T setCanJoinRaid(boolean canJoinRaid); + + T setPatrolLeader(boolean patrolLeader); + +} From 915a77ef5ef2f426ef13e1157e9fb49eadf89aa7 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:43:39 +0200 Subject: [PATCH 067/325] Add abstraction for entities that can cast spells --- .../core/entity/type/general/SpellcastingEntity.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/SpellcastingEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/SpellcastingEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/SpellcastingEntity.java new file mode 100644 index 00000000..7c2b39ad --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/SpellcastingEntity.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.type.general; + +import de.pxav.kelp.core.entity.util.SpellType; + +public interface SpellcastingEntity> extends IllagerEntity { + + T setSpellType(SpellType spellType); + + SpellType getSpellType(); + +} From e694e53d7b9b26f5546d85ffff6c9f9e031b5978 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:43:47 +0200 Subject: [PATCH 068/325] Add abstraction for entities that can be tamed --- .../core/entity/type/general/TameableAnimal.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/TameableAnimal.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/TameableAnimal.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/TameableAnimal.java new file mode 100644 index 00000000..25524641 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/TameableAnimal.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.core.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.LivingKelpEntity; + +public interface TameableAnimal> extends AnimalEntity { + + T setTamed(boolean tamed); + + boolean isTamed(); + + KelpEntity getOwner(); + + T setOwner(KelpEntity owner); + +} From 872b5b2f83fce3a9996b6f330d883e5b1b9cd30d Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:44:05 +0200 Subject: [PATCH 069/325] Add abstraction for entities that live in water (fish, squids) --- .../de/pxav/kelp/core/entity/type/general/WaterEntity.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/WaterEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/WaterEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/WaterEntity.java new file mode 100644 index 00000000..d8655a1e --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/WaterEntity.java @@ -0,0 +1,5 @@ +package de.pxav.kelp.core.entity.type.general; + +public interface WaterEntity> extends MobileEntity { + +} From 74c8db69c0e76828e9eea1340e0b8d5efa427222 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:44:47 +0200 Subject: [PATCH 070/325] Add abstraction for all illager-like entities --- .../de/pxav/kelp/core/entity/type/general/IllagerEntity.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/general/IllagerEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/IllagerEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/IllagerEntity.java new file mode 100644 index 00000000..d5d9bee1 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/IllagerEntity.java @@ -0,0 +1,4 @@ +package de.pxav.kelp.core.entity.type.general; + +public interface IllagerEntity> extends RaidingEntity { +} From c03b501f98df061bea499ed8e44c886d2c1c966b Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:45:32 +0200 Subject: [PATCH 071/325] Add interface for zombie villagers --- .../entity/type/ZombieVillagerEntity.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ZombieVillagerEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieVillagerEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieVillagerEntity.java new file mode 100644 index 00000000..506642c0 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieVillagerEntity.java @@ -0,0 +1,21 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.util.VillagerProfession; +import de.pxav.kelp.core.entity.util.VillagerType; + +// sub type of zombie +public interface ZombieVillagerEntity extends ZombieEntity { + + ZombieVillagerEntity setConversionTime(int conversionTime); + + ZombieVillagerEntity setVillagerType(VillagerType villagerType); + + ZombieVillagerEntity setVillagerProfession(VillagerProfession villagerProfession); + + int getConversionTime(); + + VillagerType getVillagerType(); + + VillagerProfession getVillagerProfession(); + +} From 76b639982fd6c300a2aface58f7f9af9d0792bec Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:46:07 +0200 Subject: [PATCH 072/325] Add interface for zombie horses --- .../java/de/pxav/kelp/core/entity/type/ZombieHorse.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ZombieHorse.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieHorse.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieHorse.java new file mode 100644 index 00000000..a66c08c7 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieHorse.java @@ -0,0 +1,7 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AbstractHorseEntity; + +public interface ZombieHorse extends AbstractHorseEntity { + +} From 31220518606bdf97dcd4c75f8c098e22eab931a5 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:46:13 +0200 Subject: [PATCH 073/325] Add interface for zombie giant --- .../java/de/pxav/kelp/core/entity/type/ZombieGiant.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ZombieGiant.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieGiant.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieGiant.java new file mode 100644 index 00000000..5c854d20 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieGiant.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MonsterEntity; + +public interface ZombieGiant extends MonsterEntity { +} From af991a23fe68f4a2582bcef4d2a07fe1de1450fb Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:46:23 +0200 Subject: [PATCH 074/325] Add interface for zoglins --- .../java/de/pxav/kelp/core/entity/type/ZoglinEntity.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ZoglinEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ZoglinEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ZoglinEntity.java new file mode 100644 index 00000000..1150346f --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ZoglinEntity.java @@ -0,0 +1,7 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MonsterEntity; + +public interface ZoglinEntity extends MonsterEntity { + +} From 6d3e9877009ab86d73b0c025d6fde6be928d5c96 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:46:30 +0200 Subject: [PATCH 075/325] Add interface for wolves --- .../pxav/kelp/core/entity/type/WolfEntity.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/WolfEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/WolfEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/WolfEntity.java new file mode 100644 index 00000000..b929b1a4 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/WolfEntity.java @@ -0,0 +1,17 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AnimalEntity; +import de.pxav.kelp.core.entity.type.general.TameableAnimal; +import de.pxav.kelp.core.inventory.metadata.Color; + +public interface WolfEntity extends AnimalEntity, TameableAnimal { + + boolean isAngry(); + + WolfEntity setAngry(boolean angry); + + Color getCollarDyeColor(); + + WolfEntity setCollarDyeColor(); + +} From 547489283bcae207773a1c2e15fea2c1d90c3591 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:46:43 +0200 Subject: [PATCH 076/325] Add interface for wither skeletons --- .../de/pxav/kelp/core/entity/type/WitherSkeletonEntity.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/WitherSkeletonEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/WitherSkeletonEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/WitherSkeletonEntity.java new file mode 100644 index 00000000..ffa18358 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/WitherSkeletonEntity.java @@ -0,0 +1,5 @@ +package de.pxav.kelp.core.entity.type; + +public interface WitherSkeletonEntity extends SkeletonEntity { + +} From 838b2d6420dd3c35acbc62fd5c9d90a8109ed11c Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:46:59 +0200 Subject: [PATCH 077/325] Add interface for wither entity --- .../java/de/pxav/kelp/core/entity/type/WitherEntity.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/WitherEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/WitherEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/WitherEntity.java new file mode 100644 index 00000000..7fa8697b --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/WitherEntity.java @@ -0,0 +1,9 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MonsterEntity; + +public interface WitherEntity extends MonsterEntity { + + + +} From b266587b4669ca2a28f0118a2661aefcedcf2b9c Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:47:15 +0200 Subject: [PATCH 078/325] Add interface for witches --- .../java/de/pxav/kelp/core/entity/type/WitchEntity.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/WitchEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/WitchEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/WitchEntity.java new file mode 100644 index 00000000..1e286bab --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/WitchEntity.java @@ -0,0 +1,7 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MonsterEntity; + +public interface WitchEntity extends MonsterEntity { + +} From 8a376d67a63b7f1a8fcde25a50cfad4f13388802 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:47:34 +0200 Subject: [PATCH 079/325] Add interface for wandering traders --- .../kelp/core/entity/type/WanderingTraderEntity.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/WanderingTraderEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/WanderingTraderEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/WanderingTraderEntity.java new file mode 100644 index 00000000..6b241734 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/WanderingTraderEntity.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AbstractVillager; + +public interface WanderingTraderEntity extends AbstractVillager { + + int getDespawnDelay(); + + WanderingTraderEntity setDespawnDelay(int despawnDelay); + +} From d31888c2ab88dfe3f82fabcfcd0e7a1eb2505d33 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:47:47 +0200 Subject: [PATCH 080/325] Add interface for vindicators --- .../de/pxav/kelp/core/entity/type/VindicatorEntity.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/VindicatorEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/VindicatorEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/VindicatorEntity.java new file mode 100644 index 00000000..7ebd8832 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/VindicatorEntity.java @@ -0,0 +1,7 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.IllagerEntity; + +public interface VindicatorEntity extends IllagerEntity { + +} From de8d48039dcc0a0431c2a6ff797ff134b774d70d Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:48:19 +0200 Subject: [PATCH 081/325] Make ZombieEntity a valid entity interface instead of abstract class --- .../java/de/pxav/kelp/core/entity/type/ZombieEntity.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieEntity.java index f4546f10..c74af773 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieEntity.java @@ -16,7 +16,12 @@ static ZombieEntity create(KelpLocation location) { } @Override - default int getAttackDamage(Difficulty difficulty) { + default KelpEntityType getType() { + return KelpEntityType.ZOMBIE; + } + + @Override + default double getAttackDamage(Difficulty difficulty) { if (difficulty == Difficulty.EASY) { return 4; } From 961be6e5dcd82e579244f94f5df643539ce44b24 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:48:52 +0200 Subject: [PATCH 082/325] Add concrete interface for normal villagers --- .../kelp/core/entity/type/VillagerEntity.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/VillagerEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/VillagerEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/VillagerEntity.java new file mode 100644 index 00000000..0e1931bd --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/VillagerEntity.java @@ -0,0 +1,25 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AbstractVillager; +import de.pxav.kelp.core.entity.util.VillagerProfession; +import de.pxav.kelp.core.entity.util.VillagerType; + +public interface VillagerEntity extends AbstractVillager { + + VillagerProfession getProfession(); + + VillagerEntity setProfession(VillagerProfession profession); + + VillagerType getVillagerType(); + + VillagerEntity setVillagerType(VillagerType villagerType); + + int getVillagerExperience(); + + int getVillagerLevel(); + + VillagerEntity setVillagerLevel(int villagerLevel); + + VillagerEntity setVillagerExperience(); + +} From d968ad38cf937bcde2e961c0b221b0623a53ed33 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:49:03 +0200 Subject: [PATCH 083/325] Add interface for vexes --- .../java/de/pxav/kelp/core/entity/type/VexEntity.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/VexEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/VexEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/VexEntity.java new file mode 100644 index 00000000..4d16b3af --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/VexEntity.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MonsterEntity; + +public interface VexEntity extends MonsterEntity { + + boolean isCharging(); + + VexEntity setCharging(boolean charging); + +} From e09ae24d865fe7be0f822c790bf09381421e30e0 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:49:10 +0200 Subject: [PATCH 084/325] Add interface for turtles --- .../java/de/pxav/kelp/core/entity/type/TurtleEntity.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/TurtleEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/TurtleEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/TurtleEntity.java new file mode 100644 index 00000000..ee9d84bf --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/TurtleEntity.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AnimalEntity; + +public interface TurtleEntity extends AnimalEntity { +} From 9cbcdc36b7e7f044f0a5e8f8c1db9b2491bc2e74 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:49:19 +0200 Subject: [PATCH 085/325] Add interface for tropical fish --- .../core/entity/type/TropicalFishEntity.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/TropicalFishEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/TropicalFishEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/TropicalFishEntity.java new file mode 100644 index 00000000..60876f17 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/TropicalFishEntity.java @@ -0,0 +1,18 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AbstractFishEntity; +import de.pxav.kelp.core.inventory.metadata.Color; + +public interface TropicalFishEntity extends AbstractFishEntity { + + // TODO: Add patterns! + + Color getBodyDyeColor(); + + Color getPatternDyeColor(); + + TropicalFishEntity setPatternDyeColor(); + + TropicalFishEntity setBodyDyeColor(); + +} From a6f8af3ba7889498dbe952934d27dc9777766625 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:49:44 +0200 Subject: [PATCH 086/325] Add interface for the llama of a trader --- .../de/pxav/kelp/core/entity/type/TraderLlamaEntity.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/TraderLlamaEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/TraderLlamaEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/TraderLlamaEntity.java new file mode 100644 index 00000000..e6960f55 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/TraderLlamaEntity.java @@ -0,0 +1,5 @@ +package de.pxav.kelp.core.entity.type; + +public interface TraderLlamaEntity extends LlamaEntity { + +} From 2e32ffb37cabf4a568b0522feda341344557f6f8 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:50:35 +0200 Subject: [PATCH 087/325] Add interface for the skull thrown by withers --- .../kelp/core/entity/type/ThrownWitherSkullEntity.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ThrownWitherSkullEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownWitherSkullEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownWitherSkullEntity.java new file mode 100644 index 00000000..72c79fff --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownWitherSkullEntity.java @@ -0,0 +1,9 @@ +package de.pxav.kelp.core.entity.type; + +public interface ThrownWitherSkullEntity extends ThrownFireballEntity { + + boolean isCharged(); + + ThrownWitherSkullEntity setCharged(boolean charged); + +} From 052c956cc5c7c48a984319ab727f5b37542d6222 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:50:42 +0200 Subject: [PATCH 088/325] Add interface for thrown tridents --- .../de/pxav/kelp/core/entity/type/ThrownTridentEntity.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ThrownTridentEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownTridentEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownTridentEntity.java new file mode 100644 index 00000000..f828f910 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownTridentEntity.java @@ -0,0 +1,7 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AbstractArrowEntity; + +public interface ThrownTridentEntity extends AbstractArrowEntity { + +} From 8b54f43176f9200c5df7369eb9aab151414c22c5 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:50:55 +0200 Subject: [PATCH 089/325] Add interface for thrown snowballs --- .../pxav/kelp/core/entity/type/ThrownSnowballEntity.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ThrownSnowballEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownSnowballEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownSnowballEntity.java new file mode 100644 index 00000000..54bef011 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownSnowballEntity.java @@ -0,0 +1,7 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.KelpProjectile; + +public interface ThrownSnowballEntity extends KelpProjectile { + +} From 0fe96a0888f5bd6a60fc2432c0095c4012b03cb2 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:51:08 +0200 Subject: [PATCH 090/325] Add interface for thrown potions (splash and lingering) --- .../core/entity/type/ThrownPotionEntity.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ThrownPotionEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownPotionEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownPotionEntity.java new file mode 100644 index 00000000..d1ea7d32 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownPotionEntity.java @@ -0,0 +1,17 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.inventory.item.KelpItem; + +import java.util.Collection; + +public interface ThrownPotionEntity extends KelpProjectile { + + Collection> getPotionEffects(); + + KelpItem getItem(); + + ThrownPotionEntity setItem(KelpItem item); + +} From 93368d0eb5d56edead12ca2a979a257dc4bcdb8e Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:51:18 +0200 Subject: [PATCH 091/325] Add interface for thrown fireballs in general --- .../kelp/core/entity/type/ThrownFireballEntity.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ThrownFireballEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownFireballEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownFireballEntity.java new file mode 100644 index 00000000..7efc9691 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownFireballEntity.java @@ -0,0 +1,12 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.ExplosiveEntity; +import org.bukkit.util.Vector; + +public interface ThrownFireballEntity extends ExplosiveEntity { + + Vector getDirection(); + + ThrownFireballEntity setDirection(Vector vector); + +} From 3d2fb6989c103a5bd1dc481a1ce9950d42770904 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:51:50 +0200 Subject: [PATCH 092/325] Add interface for AreaEffectCloudEntity --- .../entity/type/AreaEffectCloudEntity.java | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/AreaEffectCloudEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/AreaEffectCloudEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/AreaEffectCloudEntity.java new file mode 100644 index 00000000..e660ecbf --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/AreaEffectCloudEntity.java @@ -0,0 +1,75 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.ProjectileLauncher; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.particle.type.ParticleType; + +import java.util.List; + +public interface AreaEffectCloudEntity extends KelpEntity { + + @Override + default KelpEntityType getType() { + return KelpEntityType.AREA_EFFECT_CLOUD; + } + + int getDuration(); + + void setDuration(int var1); + + int getWaitTime(); + + void setWaitTime(int var1); + + int getReapplicationDelay(); + + void setReapplicationDelay(int var1); + + int getDurationOnUse(); + + void setDurationOnUse(int var1); + + float getRadius(); + + void setRadius(float var1); + + float getRadiusOnUse(); + + void setRadiusOnUse(float var1); + + float getRadiusPerTick(); + + void setRadiusPerTick(float var1); + + ParticleType getParticle(); + + void setParticle(ParticleType particleType); + + void setBasePotionEffect(Class potionEffect); + + Class getBasePotionEffect(); + + boolean hasCustomEffects(); + + List> getCustomEffects(); + + boolean addCustomEffect(Class effect, boolean var2); + + boolean removeCustomEffect(Class effect); + + boolean hasCustomEffect(Class effect); + + void clearCustomEffects(); + + Color getColor(); + + void setColor(Color color); + + ProjectileLauncher getSource(); + + void setSource(ProjectileLauncher source); + +} From 2f98f3894ce012cb216c1037b25b2a4c8daf20bf Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:51:57 +0200 Subject: [PATCH 093/325] Add interface for Armor stands --- .../core/entity/type/ArmorStandEntity.java | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ArmorStandEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ArmorStandEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ArmorStandEntity.java new file mode 100644 index 00000000..185a6b3d --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ArmorStandEntity.java @@ -0,0 +1,90 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.KelpEntity; +import org.bukkit.entity.ArmorStand; +import org.bukkit.inventory.EquipmentSlot; +import org.bukkit.inventory.ItemStack; +import org.bukkit.util.EulerAngle; + +public interface ArmorStandEntity extends KelpEntity { + + ItemStack getItemInHand(); + + void setItemInHand(ItemStack var1); + + ItemStack getBoots(); + + void setBoots(ItemStack var1); + + ItemStack getLeggings(); + + void setLeggings(ItemStack var1); + + ItemStack getChestplate(); + + void setChestplate( ItemStack var1); + + ItemStack getHelmet(); + + void setHelmet(ItemStack var1); + + EulerAngle getBodyPose(); + + void setBodyPose(EulerAngle var1); + + EulerAngle getLeftArmPose(); + + void setLeftArmPose(EulerAngle var1); + + EulerAngle getRightArmPose(); + + void setRightArmPose(EulerAngle var1); + + EulerAngle getLeftLegPose(); + + void setLeftLegPose(EulerAngle var1); + + EulerAngle getRightLegPose(); + + void setRightLegPose(EulerAngle var1); + + EulerAngle getHeadPose(); + + void setHeadPose(EulerAngle var1); + + boolean hasBasePlate(); + + void setBasePlate(boolean var1); + + boolean isVisible(); + + void setVisible(boolean var1); + + boolean hasArms(); + + void setArms(boolean var1); + + boolean isSmall(); + + void setSmall(boolean var1); + + boolean isMarker(); + + void setMarker(boolean var1); + + void addEquipmentLock(EquipmentSlot var1, ArmorStand.LockType var2); + + void removeEquipmentLock(EquipmentSlot var1, ArmorStand.LockType var2); + + boolean hasEquipmentLock(EquipmentSlot var1, ArmorStand.LockType var2); + + enum LockType { + ADDING_OR_CHANGING, + REMOVING_OR_CHANGING, + ADDING; + + LockType() { + } + } + +} From dbd24383a8fcc706e09f13f13e3e5bd176ef1f2d Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:52:47 +0200 Subject: [PATCH 094/325] Add interface for normal arrows (including tipped) --- .../kelp/core/entity/type/ArrowEntity.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ArrowEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ArrowEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ArrowEntity.java new file mode 100644 index 00000000..3bd872bb --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ArrowEntity.java @@ -0,0 +1,27 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AbstractArrowEntity; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.inventory.metadata.Color; + +import java.util.List; + +public interface ArrowEntity extends AbstractArrowEntity { + + ArrowEntity addCustomEffect(Class effect, int tier); + + boolean hasCustomEffect(Class effect); + + ArrowEntity removeCustomEffect(Class effect); + + ArrowEntity setColor(Color color); + + Color getColor(); + + List> getCustomEffects(); + + boolean hasCustomEffects(); + + int getCustomEffectTier(Class effect); + +} From 7a20cfe031c78833534643a217b72c76c2a0aa4a Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:52:58 +0200 Subject: [PATCH 095/325] Add interface for ambient bats --- .../java/de/pxav/kelp/core/entity/type/BatEntity.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/BatEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/BatEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/BatEntity.java new file mode 100644 index 00000000..37632428 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/BatEntity.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MobileEntity; + +public interface BatEntity extends MobileEntity { + + boolean isAwake(); + + BatEntity setAwake(boolean awake); + +} From 447488a2e5dc6cc056461c01ef8fd407ef3f6fc0 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:53:05 +0200 Subject: [PATCH 096/325] Add interface for bees --- .../pxav/kelp/core/entity/type/BeeEntity.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/BeeEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/BeeEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/BeeEntity.java new file mode 100644 index 00000000..1265a5d7 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/BeeEntity.java @@ -0,0 +1,33 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.Location; + +public interface BeeEntity extends BreedableAnimalEntity { + + KelpLocation getHive(); + + void setHive(KelpLocation hive); + + KelpLocation getFlower(); + + void setFlower(KelpLocation flower); + + boolean hasNectar(); + + void setHasNectar(boolean hasNectar); + + boolean hasStung(); + + void setHasStung(boolean hasStung); + + int getAnger(); + + void setAnger(int anger); + + int getCannotEnterHiveTicks(); + + void setCannotEnterHiveTicks(int cannotEnterHiveTicks); + +} From 1ccd2e19901241ac3b6e8cbec1e677a79bebc746 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:53:10 +0200 Subject: [PATCH 097/325] Add interface for blazes --- .../kelp/core/entity/type/BlazeEntity.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/BlazeEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/BlazeEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/BlazeEntity.java new file mode 100644 index 00000000..25882150 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/BlazeEntity.java @@ -0,0 +1,25 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import org.bukkit.Difficulty; + +public interface BlazeEntity extends MonsterEntity { + + @Override + default int getMaximumSpawnLightLevel() { + return -1; + } + + @Override + default double getAttackDamage(Difficulty difficulty) { + if (difficulty == Difficulty.EASY) { + return 4; + } else if (difficulty == Difficulty.NORMAL) { + return 5; + } if (difficulty == Difficulty.HARD) { + return 9; + } + return 0; + } + +} From 31c53b7e5d925b86c9e2609a3afbb598f3cfc9df Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:53:15 +0200 Subject: [PATCH 098/325] Add interface for boats --- .../de/pxav/kelp/core/entity/type/BoatEntity.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/BoatEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/BoatEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/BoatEntity.java new file mode 100644 index 00000000..b2307535 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/BoatEntity.java @@ -0,0 +1,12 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.VehicleEntity; +import de.pxav.kelp.core.inventory.material.KelpMaterial; + +public interface BoatEntity extends VehicleEntity { + + KelpMaterial getBoatType(); + + BoatEntity setBoatType(KelpMaterial boatType); + +} From b16fa0abafa445fa42839b638adf08180a40a567 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:53:19 +0200 Subject: [PATCH 099/325] Add interface for cats --- .../pxav/kelp/core/entity/type/CatEntity.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/CatEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/CatEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/CatEntity.java new file mode 100644 index 00000000..6d3ed84d --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/CatEntity.java @@ -0,0 +1,17 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AnimalEntity; +import de.pxav.kelp.core.entity.util.CatType; +import de.pxav.kelp.core.inventory.metadata.Color; + +public interface CatEntity extends AnimalEntity { + + Color getCollarDyeColor(); + + CatEntity setCollarDyeColor(Color color); + + CatType getCatType(); + + CatEntity setCatType(CatType catType); + +} From 7e74e56811b394eef2346e137a25ab7a2eeefaa3 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:53:26 +0200 Subject: [PATCH 100/325] Add interface for cave spiders --- .../core/entity/type/CaveSpiderEntity.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/CaveSpiderEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/CaveSpiderEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/CaveSpiderEntity.java new file mode 100644 index 00000000..04a170d2 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/CaveSpiderEntity.java @@ -0,0 +1,24 @@ +package de.pxav.kelp.core.entity.type; + +import org.bukkit.Difficulty; + +public interface CaveSpiderEntity extends SpiderEntity { + + @Override + default int getMaximumSpawnLightLevel() { + return 7; + } + + @Override + default double getAttackDamage(Difficulty difficulty) { + if (difficulty == Difficulty.EASY) { + return 2; + } else if (difficulty == Difficulty.NORMAL) { + return 2; + } if (difficulty == Difficulty.HARD) { + return 3; + } + return 0; + } + +} From d1b1084cf135fca44450d515df229fcd90dfe7fd Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:53:32 +0200 Subject: [PATCH 101/325] Add interface for chicken --- .../java/de/pxav/kelp/core/entity/type/ChickenEntity.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ChickenEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ChickenEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ChickenEntity.java new file mode 100644 index 00000000..770c176c --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ChickenEntity.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; + +public interface ChickenEntity extends BreedableAnimalEntity { +} From 3d7653a17ca437022978e49a77fcc6471e5cce21 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:53:42 +0200 Subject: [PATCH 102/325] Add interface for cod (fish) --- .../java/de/pxav/kelp/core/entity/type/CodEntity.java | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/CodEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/CodEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/CodEntity.java new file mode 100644 index 00000000..72919f4b --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/CodEntity.java @@ -0,0 +1,8 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AbstractFishEntity; +import org.bukkit.entity.Cod; + +public interface CodEntity extends AbstractFishEntity { + +} From bb35f13f8049fad1ad5f43a5ef14ef0143d65f8d Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:54:01 +0200 Subject: [PATCH 103/325] Add interface for command minecarts --- .../kelp/core/entity/type/CommandMinecartEntity.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/CommandMinecartEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/CommandMinecartEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/CommandMinecartEntity.java new file mode 100644 index 00000000..4c101164 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/CommandMinecartEntity.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MinecartEntity; + +public interface CommandMinecartEntity extends MinecartEntity { + + String getCommand(); + + CommandMinecartEntity setCommand(String command); + +} From 2836893e4beb50b8d9a75480cd843d45e7cb0cdb Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:54:12 +0200 Subject: [PATCH 104/325] Add interface for normal cows --- .../main/java/de/pxav/kelp/core/entity/type/CowEntity.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/CowEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/CowEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/CowEntity.java new file mode 100644 index 00000000..24595b6f --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/CowEntity.java @@ -0,0 +1,7 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AnimalEntity; +import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; + +public interface CowEntity extends AnimalEntity, BreedableAnimalEntity { +} From 8a2a6481a9619c608ce4a9f462904f0857cd6e93 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:54:19 +0200 Subject: [PATCH 105/325] Add interface for creepers --- .../kelp/core/entity/type/CreeperEntity.java | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/CreeperEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/CreeperEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/CreeperEntity.java new file mode 100644 index 00000000..a95175f6 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/CreeperEntity.java @@ -0,0 +1,54 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import org.bukkit.Difficulty; + +public interface CreeperEntity extends MonsterEntity { + + boolean isCharged(); + + void setCharged(boolean charged); + + void setMaxFuseTicks(int maxFuseTicks); + + int getMaxFuseTicks(); + + void setFuseTicks(int fuseTicks); + + int getFuseTicks(); + + void setExplosionRadius(int explosionRadius); + + int getExplosionRadius(); + + void explode(); + + void ignite(); + + @Override + default int getMaximumSpawnLightLevel() { + return 7; + } + + @Override + default double getAttackDamage(Difficulty difficulty) { + if (difficulty == Difficulty.EASY) { + if (isCharged()) { + return 43.5; + } + return 22.5; + } else if (difficulty == Difficulty.NORMAL) { + if (isCharged()) { + return 85; + } + return 43; + } if (difficulty == Difficulty.HARD) { + if (isCharged()) { + return 127.5; + } + return 64.5; + } + return 0; + } + +} From 52c8012b77529c8582c5a8568ae67aa5504abf3b Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:54:27 +0200 Subject: [PATCH 106/325] Add interface for dolphins --- .../java/de/pxav/kelp/core/entity/type/DolphinEntity.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/DolphinEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/DolphinEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/DolphinEntity.java new file mode 100644 index 00000000..fcb5bedd --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/DolphinEntity.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.WaterEntity; + +public interface DolphinEntity extends WaterEntity { +} From 51309666a19fead9c25a6e0279d8d9dc9994b072 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:54:35 +0200 Subject: [PATCH 107/325] Add interface for donkeys --- .../java/de/pxav/kelp/core/entity/type/DonkeyEntity.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/DonkeyEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/DonkeyEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/DonkeyEntity.java new file mode 100644 index 00000000..6819d889 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/DonkeyEntity.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.ChestedHorse; + +public interface DonkeyEntity extends ChestedHorse { +} From c8c0ce2b096af390c36b03db7c44c981df2302ff Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:55:02 +0200 Subject: [PATCH 108/325] Add interface for fireballs thrown by the ender dragon --- .../de/pxav/kelp/core/entity/type/DragonFireballEntity.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/DragonFireballEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/DragonFireballEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/DragonFireballEntity.java new file mode 100644 index 00000000..7715ede4 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/DragonFireballEntity.java @@ -0,0 +1,5 @@ +package de.pxav.kelp.core.entity.type; + +public interface DragonFireballEntity extends ThrownFireballEntity { + +} From 87c3f3d106316ae50e601245b87e4b00f3880bcd Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:55:09 +0200 Subject: [PATCH 109/325] Add interface for drowned zombies --- .../kelp/core/entity/type/DrownedEntity.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/DrownedEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/DrownedEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/DrownedEntity.java new file mode 100644 index 00000000..e1278b77 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/DrownedEntity.java @@ -0,0 +1,24 @@ +package de.pxav.kelp.core.entity.type; + +import org.bukkit.Difficulty; + +public interface DrownedEntity extends ZombieEntity { + + @Override + default int getMaximumSpawnLightLevel() { + return 7; + } + + @Override + default double getAttackDamage(Difficulty difficulty) { + if (difficulty == Difficulty.EASY) { + return 2.5; + } else if (difficulty == Difficulty.NORMAL) { + return 3; + } if (difficulty == Difficulty.HARD) { + return 4.5; + } + return 0; + } + +} From a95e7260464e8270844d9b22672e3cb1807c5ac7 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:55:22 +0200 Subject: [PATCH 110/325] Add interface for ender crystals --- .../core/entity/type/EnderCrystalEntity.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/EnderCrystalEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/EnderCrystalEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/EnderCrystalEntity.java new file mode 100644 index 00000000..6c9166c7 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/EnderCrystalEntity.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.world.KelpLocation; + +public interface EnderCrystalEntity extends KelpEntity { + + boolean isShowingBottom(); + + void setShowingBottom(boolean showingBottom); + + KelpLocation getBeamTarget(); + + void setBeamTarget(KelpLocation beamTarget); + +} From ad1c66f8341d236af63c701867b8dc5008d6bc3a Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:55:31 +0200 Subject: [PATCH 111/325] Add interface for ender dragons --- .../pxav/kelp/core/entity/type/EnderDragonEntity.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/EnderDragonEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/EnderDragonEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/EnderDragonEntity.java new file mode 100644 index 00000000..88fd31de --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/EnderDragonEntity.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.LivingKelpEntity; + +public interface EnderDragonEntity extends LivingKelpEntity { + + int getDeathAnimationInTicks(); + + // TODO implement other ender dragon specific things + +} From 581124f9c841436ff988c0b13db629ab5dc31f91 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:55:40 +0200 Subject: [PATCH 112/325] Add interface for a thrown fish hook --- .../kelp/core/entity/type/FishHookEntity.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/FishHookEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/FishHookEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/FishHookEntity.java new file mode 100644 index 00000000..ccf77c55 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/FishHookEntity.java @@ -0,0 +1,31 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.entity.util.FishHookState; + +public interface FishHookEntity extends KelpProjectile { + + int getMinWaitTime(); + + void setMinWaitTime(int minWaitTime); + + int getMaxWaitTime(); + + void setMaxWaitTime(int maxWaitTime); + + boolean getApplyLure(); + + void setApplyLure(boolean var1); + + boolean isInOpenWater(); + + KelpEntity getHookedEntity(); + + void setHookedEntity(KelpEntity hookedEntity); + + boolean pullHookedEntity(); + + FishHookState getFishHookState(); + +} From 1ad304411ddcc397bed586d2d8bee3e28543a95c Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:55:47 +0200 Subject: [PATCH 113/325] Add interface for fireworks --- .../kelp/core/entity/type/FireworkEntity.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/FireworkEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/FireworkEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/FireworkEntity.java new file mode 100644 index 00000000..dad09ba6 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/FireworkEntity.java @@ -0,0 +1,19 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.inventory.metadata.FireworkMetadata; +import org.bukkit.entity.Firework; + +public interface FireworkEntity extends KelpProjectile { + + FireworkEntity detonate(); + + FireworkMetadata getFireworkMetadata(); + + FireworkEntity setFireworkMetadata(FireworkMetadata fireworkMetadata); + + boolean isShotAtAngle(); + + boolean setShotAtAngle(boolean shotAtAngle); + +} From dfb7d05a2c473df8162c8515827b9bd77fb3a431 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:55:53 +0200 Subject: [PATCH 114/325] Add interface for falling blocks --- .../core/entity/type/FallingBlockEntity.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/FallingBlockEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/FallingBlockEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/FallingBlockEntity.java new file mode 100644 index 00000000..b64e041a --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/FallingBlockEntity.java @@ -0,0 +1,18 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.inventory.material.KelpMaterial; + +public interface FallingBlockEntity extends KelpEntity { + + boolean canHurtEntities(); + + boolean willDropItem(); + + FallingBlockEntity dropsItem(boolean dropsItem); + + FallingBlockEntity hurtEntities(boolean hurtEntities); + + KelpMaterial getMaterial(); + +} From a8e9ecfcecd54b64a1c5a71dd5939d7c1360b3a7 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:56:02 +0200 Subject: [PATCH 115/325] Add interface for TNT minecarts --- .../de/pxav/kelp/core/entity/type/ExplosiveMinecart.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ExplosiveMinecart.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ExplosiveMinecart.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ExplosiveMinecart.java new file mode 100644 index 00000000..20247aea --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ExplosiveMinecart.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MinecartEntity; + +public interface ExplosiveMinecart extends MinecartEntity { +} From bb6e6d56965d46bfd82a2790a390abfa6e0995ea Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:56:10 +0200 Subject: [PATCH 116/325] Add interface for experience orbs --- .../core/entity/type/ExperienceOrbEntity.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ExperienceOrbEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ExperienceOrbEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ExperienceOrbEntity.java new file mode 100644 index 00000000..846d3c42 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ExperienceOrbEntity.java @@ -0,0 +1,23 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.entity.version.EntityVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.Location; +import org.bukkit.entity.ExperienceOrb; + +public interface ExperienceOrbEntity extends KelpEntity { + + static ExperienceOrbEntity from(ExperienceOrb experienceOrb) { + return (ExperienceOrbEntity) KelpPlugin.getInjector() + .getInstance(EntityTypeVersionTemplate.class).getKelpEntity(experienceOrb); + } + + int getExperience(); + + ExperienceOrbEntity setExperience(int experience); + +} From 73a032c46b02e70583a92a13029da761a4c4f23e Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:56:14 +0200 Subject: [PATCH 117/325] Add interface for evokers --- .../pxav/kelp/core/entity/type/EvokerFangEntity.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/EvokerFangEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/EvokerFangEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/EvokerFangEntity.java new file mode 100644 index 00000000..a6d3639e --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/EvokerFangEntity.java @@ -0,0 +1,12 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.LivingKelpEntity; + +public interface EvokerFangEntity extends KelpEntity { + + LivingKelpEntity getFangOwner(); + + EvokerFangEntity setFangOwner(LivingKelpEntity fangOwner); + +} From abb828cdb78b365048764d37a3ce5c7a97e88c1b Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:56:19 +0200 Subject: [PATCH 118/325] Add interface for evokers --- .../java/de/pxav/kelp/core/entity/type/EvokerEntity.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/EvokerEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/EvokerEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/EvokerEntity.java new file mode 100644 index 00000000..20a506f9 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/EvokerEntity.java @@ -0,0 +1,7 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.SpellcastingEntity; + +public interface EvokerEntity extends SpellcastingEntity { + +} From fc0a90372caa79b277936bd12b39d4b38ebde38f Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:56:25 +0200 Subject: [PATCH 119/325] Add interface for ghasts --- .../java/de/pxav/kelp/core/entity/type/GhastEntity.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/GhastEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/GhastEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/GhastEntity.java new file mode 100644 index 00000000..245d86c4 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/GhastEntity.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MobileEntity; + +public interface GhastEntity extends MobileEntity { +} From 2744d342c3ea3953b8d22491db0af446260b6824 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:56:30 +0200 Subject: [PATCH 120/325] Add interface for foxes --- .../pxav/kelp/core/entity/type/FoxEntity.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/FoxEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/FoxEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/FoxEntity.java new file mode 100644 index 00000000..1ebbcb22 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/FoxEntity.java @@ -0,0 +1,27 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.type.general.AnimalEntity; +import de.pxav.kelp.core.entity.util.FoxType; + +public interface FoxEntity extends AnimalEntity { + + FoxType getFoxType(); + + void setFoxType(FoxType foxType); + + boolean isCrouching(); + + void setCrouching(boolean crouching); + + void setSleeping(boolean sleeping); + + KelpEntity getFirstTrustedEntity(); + + void setFirstTrustedEntity(KelpEntity trusted); + + KelpEntity getSecondTrustedEntity(); + + void setSecondTrustedEntity(KelpEntity trusted); + +} From 5a7ce4a8727a4a0290d5c663a9815f28912d580f Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:56:35 +0200 Subject: [PATCH 121/325] Add interface for hoglins --- .../kelp/core/entity/type/HoglinEntity.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/HoglinEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/HoglinEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/HoglinEntity.java new file mode 100644 index 00000000..d33e5363 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/HoglinEntity.java @@ -0,0 +1,21 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; + +public interface HoglinEntity extends BreedableAnimalEntity { + + boolean isImmuneToZombification(); + + void setImmuneToZombification(boolean immuneToZombification); + + boolean isHuntable(); + + void setHuntable(boolean huntable); + + int getConversionTime(); + + void setConversionTime(int conversionTime); + + boolean isConverting(); + +} From beabb09ad6620752c9db7a1c874570fa8a0e214f Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:56:44 +0200 Subject: [PATCH 122/325] Add interface for hopper minecarts --- .../de/pxav/kelp/core/entity/type/HopperMinecart.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/HopperMinecart.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/HopperMinecart.java b/core/src/main/java/de/pxav/kelp/core/entity/type/HopperMinecart.java new file mode 100644 index 00000000..7b078f8d --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/HopperMinecart.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MinecartEntity; + +public interface HopperMinecart extends MinecartEntity { + + boolean isHopperEnabled(); + + HopperMinecart setHopperEnabled(); + +} From 9d57cd697739a4d846ba872b51efa19d6fce6d57 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:57:13 +0200 Subject: [PATCH 123/325] Add interface for husks --- .../de/pxav/kelp/core/entity/type/HuskEntity.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/HuskEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/HuskEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/HuskEntity.java new file mode 100644 index 00000000..f6ce476c --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/HuskEntity.java @@ -0,0 +1,13 @@ +package de.pxav.kelp.core.entity.type; + +import org.bukkit.entity.Husk; + +public interface HuskEntity extends ZombieEntity { + + boolean isConverting(); + + int getConversionTime(); + + void setConversionTime(int conversionTime); + +} From b6384661028daef86e3d40c500701e9199d452c5 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:57:19 +0200 Subject: [PATCH 124/325] Add interface for normal horses --- .../kelp/core/entity/type/HorseEntity.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/HorseEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/HorseEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/HorseEntity.java new file mode 100644 index 00000000..ce372c92 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/HorseEntity.java @@ -0,0 +1,20 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AbstractHorseEntity; +import de.pxav.kelp.core.entity.util.HorseColor; +import de.pxav.kelp.core.entity.util.HorseStyle; +import de.pxav.kelp.core.inventory.type.HorseInventory; + +public interface HorseEntity extends AbstractHorseEntity { + + HorseInventory getInventory(); + + HorseColor getHorseColor(); + + HorseStyle getHorseStyle(); + + HorseEntity setHorseColor(HorseColor color); + + HorseEntity setHorseStyle(HorseStyle style); + +} From 2df9dd20f1af1cb91b74f87c559e735185c82e91 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:57:27 +0200 Subject: [PATCH 125/325] Add interface for ender signals --- .../core/entity/type/EnderSignalEntity.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/EnderSignalEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/EnderSignalEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/EnderSignalEntity.java new file mode 100644 index 00000000..11b75006 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/EnderSignalEntity.java @@ -0,0 +1,25 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.inventory.item.KelpItem; +import de.pxav.kelp.core.world.KelpLocation; + +public interface EnderSignalEntity extends KelpEntity { + + KelpLocation getTargetLocation(); + + void setTargetLocation(KelpLocation var1); + + boolean getDropItem(); + + void setDropItem(boolean dropItem); + + KelpItem getItem(); + + void setItem(KelpItem item); + + int getDespawnTimer(); + + void setDespawnTimer(int despawnTimer); + +} From a391efe90abeb0df9e22a14a600042262190077f Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:57:38 +0200 Subject: [PATCH 126/325] Add interface for normal llamas --- .../kelp/core/entity/type/LlamaEntity.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/LlamaEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/LlamaEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/LlamaEntity.java new file mode 100644 index 00000000..1d6d09a9 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/LlamaEntity.java @@ -0,0 +1,19 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AbstractHorseEntity; +import de.pxav.kelp.core.entity.util.LlamaColor; +import de.pxav.kelp.core.inventory.type.LlamaInventory; + +public interface LlamaEntity extends AbstractHorseEntity { + + LlamaInventory getInventory(); + + int getLlamaStrength(); + + LlamaEntity setLlamaStrength(int llamaStrength); + + LlamaColor getBodyColor(); + + LlamaEntity setBodyColor(LlamaColor llamaColor); + +} From e31a0684e9eb98fd132a3ea869e63ba14ff1f5ea Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:58:03 +0200 Subject: [PATCH 127/325] Fix imports for VersionedWorld --- .../de/pxav/kelp/implementation1_8/world/VersionedWorld.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedWorld.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedWorld.java index 19cac6a5..be0793fb 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedWorld.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedWorld.java @@ -2,7 +2,7 @@ import com.google.common.collect.Lists; import de.pxav.kelp.core.entity.type.DroppedItemEntity; -import de.pxav.kelp.core.entity.type.general.ItemDropType; +import de.pxav.kelp.core.entity.util.ItemDropType; import de.pxav.kelp.core.inventory.item.KelpItem; import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.version.Versioned; From 61b690bfeb0472d6713f924759e549a3677c5f25 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:58:26 +0200 Subject: [PATCH 128/325] Fix generic return type in MobileEntity --- .../de/pxav/kelp/core/entity/type/general/MobileEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/MobileEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/MobileEntity.java index 0bb697b0..1bbcf7bb 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/general/MobileEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/MobileEntity.java @@ -10,6 +10,6 @@ public interface MobileEntity> extends LivingKelpEntit boolean isAware(); - boolean setAware(boolean aware); + T setAware(boolean aware); } From fa4035015cd154b5c19ac23762c65ac0760a83c5 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:58:40 +0200 Subject: [PATCH 129/325] Fix gamemode parameter in HumanEntity --- .../de/pxav/kelp/core/entity/type/general/HumanEntity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/HumanEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/HumanEntity.java index 9c2485b3..93964287 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/general/HumanEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/HumanEntity.java @@ -2,6 +2,8 @@ import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.GameMode; +import org.bukkit.craftbukkit.v1_16_R3.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v1_16_R3.entity.CraftVehicle; public interface HumanEntity> extends MobileEntity { @@ -9,7 +11,7 @@ public interface HumanEntity> extends MobileEntity { GameMode getGameMode(); - T setGameMode(); + T setGameMode(GameMode gameMode); // location of bed the player is currently sleeping in null if not sleeping KelpLocation getCurrentBedLocation(); From 59f3e2a651f983a51e78529dde8c5c24aac54020 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:58:57 +0200 Subject: [PATCH 130/325] Fix damage data types in DamageableEntity to doubles --- .../kelp/core/entity/type/general/DamageableEntity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/DamageableEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/DamageableEntity.java index 4b9cd924..f0cd1004 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/general/DamageableEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/DamageableEntity.java @@ -10,12 +10,12 @@ public interface DamageableEntity> extends KelpEnt double getAbsorptionAmount(); - T setAbsorptionAmount(int absorptionAmount); + T setAbsorptionAmount(double absorptionAmount); - int getHealth(); + double getHealth(); - int getMaxHealth(); + double getMaxHealth(); - T setHealth(int health); + T setHealth(double health); } From 231b6595127c62b2d18ad39417687865b7c756bd Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:59:28 +0200 Subject: [PATCH 131/325] Rename Breedable interface to BreedableAnimalEntity to represent only animals. Villagers are represented separately --- .../{BreedableEntity.java => BreedableAnimalEntity.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename core/src/main/java/de/pxav/kelp/core/entity/type/general/{BreedableEntity.java => BreedableAnimalEntity.java} (52%) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/BreedableEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/BreedableAnimalEntity.java similarity index 52% rename from core/src/main/java/de/pxav/kelp/core/entity/type/general/BreedableEntity.java rename to core/src/main/java/de/pxav/kelp/core/entity/type/general/BreedableAnimalEntity.java index 8a8220a7..61869211 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/general/BreedableEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/BreedableAnimalEntity.java @@ -1,6 +1,6 @@ package de.pxav.kelp.core.entity.type.general; -public interface BreedableEntity> extends MobileEntity { +public interface BreedableAnimalEntity> extends AnimalEntity { boolean canBreed(); From 4fedf6a4b0ffb815b8ad69a021061f5e9ba7c918 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 19:59:55 +0200 Subject: [PATCH 132/325] Add specific methods to AnimalEntity as there is now reverse-engineered data for those values --- .../core/entity/type/general/AnimalEntity.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/AnimalEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AnimalEntity.java index 823816b2..351cb1db 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/general/AnimalEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AnimalEntity.java @@ -1,5 +1,19 @@ package de.pxav.kelp.core.entity.type.general; +import de.pxav.kelp.core.entity.KelpEntity; + public interface AnimalEntity> extends MobileEntity { + boolean isInLove(); + + T setInLove(boolean inLove); + + KelpEntity getBreeder(); + + T setBreeder(KelpEntity breeder); + + int getLoveModeTicks(); + + T setLoveModeTicks(int loveModeTicks); + } From daba874f891f4c68e9912ce005545174da837e8f Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 20:00:14 +0200 Subject: [PATCH 133/325] Add some default methods for AgeableEntity --- .../entity/type/general/AgeableEntity.java | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/AgeableEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AgeableEntity.java index 3e0e9e7f..e49a99b5 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/general/AgeableEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/AgeableEntity.java @@ -1,16 +1,31 @@ package de.pxav.kelp.core.entity.type.general; -public interface AgeableEntity> { +public interface AgeableEntity> extends MobileEntity { - T makeBaby(); + boolean isAgeLocked(); + + T setAgeLocked(boolean ageLocked); + + default T makeBaby() { + setBaby(true); + return (T) this; + } T setBaby(boolean baby); - T setAdult(boolean adult); + default T setAdult(boolean adult) { + setBaby(!adult); + return (T) this; + } - T makeAdult(); + default T makeAdult() { + setAdult(true); + return (T) this; + } - boolean isAdult(); + default boolean isAdult() { + return !isBaby(); + } boolean isBaby(); From b3bf60f4a6bc2c764de0db9763488f0247d9506f Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 20:00:52 +0200 Subject: [PATCH 134/325] Implement projectile entities --- .../type/general/VersionedProjectile.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedProjectile.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedProjectile.java index 46827b83..f690b8ad 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedProjectile.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedProjectile.java @@ -1,27 +1,44 @@ package de.pxav.kelp.implementation1_8.entity.type.general; +import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.KelpProjectile; import de.pxav.kelp.core.entity.type.general.ProjectileLauncher; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.implementation1_8.entity.VersionedEntity; import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityProjectile; import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftProjectile; +import org.bukkit.projectiles.ProjectileSource; public class VersionedProjectile> extends VersionedEntity implements KelpProjectile { - public VersionedProjectile(Entity entityHandle, KelpEntityType entityType, Location initialLocation) { - super(entityHandle, entityType, initialLocation); + private EntityProjectile projectileHandle; + + public VersionedProjectile(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.projectileHandle = (EntityProjectile) entityHandle; } + //TODO: implement block sources such as dispensers, etc. @Override public T setLauncher(ProjectileLauncher launcher) { + if (launcher instanceof KelpEntity) { + KelpEntity entity = (KelpEntity) launcher; + projectileHandle.projectileSource = (ProjectileSource) entity.getBukkitEntity(); + } return null; } @Override public ProjectileLauncher getLauncher() { + ProjectileSource source = projectileHandle.projectileSource; + if (source instanceof org.bukkit.entity.Entity) { + return (ProjectileLauncher) entityTypeVersionTemplate.getKelpEntity((org.bukkit.entity.Entity) source); + } return null; } From 2583a836e5c239a6c464cdd597a6197d11bbf86d Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 20:01:18 +0200 Subject: [PATCH 135/325] Implement AI methods to Mobile entity --- .../type/general/VersionedMobileEntity.java | 39 ++++++++++++------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedMobileEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedMobileEntity.java index 47fbdbe9..550e5750 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedMobileEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedMobileEntity.java @@ -3,44 +3,57 @@ import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.LivingKelpEntity; import de.pxav.kelp.core.entity.type.general.MobileEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.world.KelpLocation; import de.pxav.kelp.implementation1_8.entity.VersionedLivingEntity; import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityCreature; import org.bukkit.Location; - +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftCreature; +import org.bukkit.entity.Creature; +import org.bukkit.entity.LivingEntity; + +/** + * There is currently no implementation of a {@code Mob} in craftbukkit, so + * this mob implementation uses the {@code Creature} implementation provided + * by bukkit and NMS. + * + * @param + */ public class VersionedMobileEntity> extends VersionedLivingEntity implements MobileEntity { + private EntityCreature creatureHandle; + private CraftCreature craftCreature; + public VersionedMobileEntity(Entity entityHandle, KelpEntityType entityType, - Location initialLocation) { - super(entityHandle, entityType, initialLocation); + Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.craftCreature = (CraftCreature) entityHandle.getBukkitEntity(); + this.creatureHandle = (EntityCreature) entityHandle; } @Override public T setTarget(LivingKelpEntity target) { - return null; + craftCreature.setTarget((LivingEntity) target.getBukkitEntity()); + return (T) this; } @Override public LivingKelpEntity getTarget() { - return null; + return (LivingKelpEntity) entityTypeVersionTemplate.getKelpEntity(craftCreature.getTarget()); } @Override public boolean isAware() { - return false; - } - - @Override - public boolean setAware(boolean aware) { - return false; + return craftCreature.getTarget() != null; } @Override - public KelpLocation getEyeLocation() { - return null; + public T setAware(boolean aware) { + return (T) this; } } From 00c4f0cac71062fe64e1978acd7a25a0d9fa8251 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 20:01:33 +0200 Subject: [PATCH 136/325] Implement HumanEntity interface --- .../type/general/VersionedHumanEntity.java | 56 +++++++++++++++---- 1 file changed, 45 insertions(+), 11 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHumanEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHumanEntity.java index 53c9f3f2..ca2590f0 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHumanEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHumanEntity.java @@ -2,51 +2,85 @@ import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.HumanEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.reflect.ReflectionUtil; import de.pxav.kelp.core.world.KelpLocation; -import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.*; +import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; +import org.bukkit.entity.Player; public class VersionedHumanEntity> extends VersionedMobileEntity implements HumanEntity { - public VersionedHumanEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation) { - super(entityHandle, entityType, initialLocation); + private EntityHuman humanHandle; + private CraftHumanEntity craftHumanEntity; + private ReflectionUtil reflectionUtil; + + public VersionedHumanEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, ReflectionUtil reflectionUtil) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.humanHandle = (EntityHuman) entityHandle; + this.craftHumanEntity = (CraftHumanEntity) entityHandle.getBukkitEntity(); + this.reflectionUtil = reflectionUtil; } @Override public GameMode getGameMode() { - return null; + return humanHandle.getBukkitEntity().getGameMode(); } @Override - public T setGameMode() { - return null; + public T setGameMode(GameMode gameMode) { + humanHandle.getBukkitEntity().setGameMode(gameMode); + return (T) this; } @Override public KelpLocation getCurrentBedLocation() { - return null; + return KelpLocation.from( + humanHandle.getWorld().getWorldData().getName(), + humanHandle.getBed().getX(), + humanHandle.getBed().getY(), + humanHandle.getBed().getZ()); } @Override public int getExpToLevel() { - return 0; + return craftHumanEntity.getExpToLevel(); } @Override public T wakeUp() { - return null; + humanHandle.sleepTicks = 0; + return (T) this; } @Override public T wakeUpAndSetSpawnLocation() { - return null; + humanHandle.world.everyoneSleeping(); + humanHandle.sleepTicks = 0; + return (T) this; } @Override public T sleep(KelpLocation bedLocation) { - return null; + BlockPosition bedPosition = new BlockPosition( + bedLocation.getX(), + bedLocation.getY(), + bedLocation.getZ()); + + PacketPlayOutBed bedPacket = new PacketPlayOutBed(); + reflectionUtil.setValue(bedPacket, "a", getEntityId()); + reflectionUtil.setValue(bedPacket, "b", bedPosition); + + for (Player player : Bukkit.getOnlinePlayers()) { + ((CraftPlayer)player).getHandle().playerConnection.sendPacket(bedPacket); + } + return (T) this; } + } From 57f75e4f3cc0c489e7b333412121839d0aedaa22 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 20:01:42 +0200 Subject: [PATCH 137/325] Implement hanging entity --- .../type/general/VersionedHangingEntity.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHangingEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHangingEntity.java index 53cdf689..123f70ef 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHangingEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHangingEntity.java @@ -2,33 +2,41 @@ import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.HangingEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.world.KelpBlock; import de.pxav.kelp.core.world.util.KelpBlockFace; import de.pxav.kelp.implementation1_8.entity.VersionedEntity; import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityHanging; import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftHanging; +import org.bukkit.material.Attachable; public class VersionedHangingEntity> extends VersionedEntity implements HangingEntity { - public VersionedHangingEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation) { - super(entityHandle, entityType, initialLocation); + private CraftHanging craftHanging; + + public VersionedHangingEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.craftHanging = (CraftHanging) entityHandle.getBukkitEntity(); } @Override public KelpBlockFace getAttachedFace() { - return null; + return KelpBlockFace.from(craftHanging.getAttachedFace()); } @Override public KelpBlock getAttachedBlock() { - return null; + return getLocation().getBlock().getRelative(getAttachedFace()); } @Override public T setFacingDirection(KelpBlockFace blockFace) { - return null; + craftHanging.setFacingDirection(blockFace.getBukkitFace(), true); + return (T) this; } } From 69979a6a81fa87c85930c9f7b01721bf20d135e7 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 20:02:16 +0200 Subject: [PATCH 138/325] Implement breedable entities directly as there are currently no corresponding server-side methods --- .../general/VersionedBreedableAnimal.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedBreedableAnimal.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedBreedableAnimal.java index 6b432f0e..24810d68 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedBreedableAnimal.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedBreedableAnimal.java @@ -3,15 +3,28 @@ import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.reflect.ReflectionUtil; import net.minecraft.server.v1_8_R3.Entity; import org.bukkit.Location; -public abstract class VersionedBreedableAnimal> +public class VersionedBreedableAnimal> extends VersionedAnimalEntity implements BreedableAnimalEntity { - public VersionedBreedableAnimal(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { - super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + public VersionedBreedableAnimal(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, ReflectionUtil reflectionUtil) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, reflectionUtil); + } + + //TODO cannot be implemented. Lack of server-side methods. + + @Override + public boolean canBreed() { + return false; + } + + @Override + public T setBreedable(boolean breedable) { + return null; } } From 6956abbdfc990e890e99d8de01a33e5a3604f60a Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 20:02:27 +0200 Subject: [PATCH 139/325] Implement monster interface --- .../entity/type/general/VersionedMonster.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedMonster.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedMonster.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedMonster.java new file mode 100644 index 00000000..96a35777 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedMonster.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.MobileEntity; +import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedMonster> extends VersionedMobileEntity implements MobileEntity { + + public VersionedMonster(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} From 93ca2679808d1304bd2f9f5b034eb377f9ac066c Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 20:02:41 +0200 Subject: [PATCH 140/325] Implement methods for ageable entities --- .../entity/type/general/VersionedAgeable.java | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAgeable.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAgeable.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAgeable.java new file mode 100644 index 00000000..c2bd8724 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAgeable.java @@ -0,0 +1,55 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.AgeableEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityAgeable; +import org.bukkit.Location; + +public class VersionedAgeable> extends VersionedMobileEntity implements AgeableEntity { + + private EntityAgeable ageableHandle; + + public VersionedAgeable(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.ageableHandle = (EntityAgeable) entityHandle; + } + + @Override + public boolean isAgeLocked() { + return ageableHandle.ageLocked; + } + + @Override + public T setAgeLocked(boolean ageLocked) { + ageableHandle.ageLocked = ageLocked; + return (T) this; + } + + @Override + public T setBaby(boolean baby) { + if (baby) { + if (this.isAdult()) { + this.setAge(-24000); + } + } else { + if (!this.isAdult()) { + this.setAge(0); + } + } + return (T) this; + } + + @Override + public boolean isBaby() { + return ageableHandle.isBaby(); + } + + @Override + public T setAge(int age) { + ageableHandle.setAge(age); + return (T) this; + } + +} From d1e0de806af7e54173bc788b7e7df585e32d6bc3 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 20:02:55 +0200 Subject: [PATCH 141/325] Implement arrow abstraction interface --- .../type/general/VersionedAbstractArrow.java | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractArrow.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractArrow.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractArrow.java new file mode 100644 index 00000000..e537ccdf --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractArrow.java @@ -0,0 +1,116 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.AbstractArrowEntity; +import de.pxav.kelp.core.entity.util.ArrowPickupStatus; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpBlock; +import net.minecraft.server.v1_8_R3.BlockPosition; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftArrow; + +public class VersionedAbstractArrow> extends VersionedProjectile implements AbstractArrowEntity { + + private CraftArrow craftArrow; + + public VersionedAbstractArrow(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.craftArrow = (CraftArrow) entityHandle.getBukkitEntity(); + } + + @Override + public KelpBlock getAttachedBlock() { + if (!isInBlock()) { + return null; + } + BlockPosition blockPosition = craftArrow.getHandle().getChunkCoordinates(); + return KelpBlock.from(craftArrow.getWorld().getBlockAt( + blockPosition.getX(), + blockPosition.getY(), + blockPosition.getZ())); + } + + @Override + public double getBaseDamage() { + return craftArrow.getHandle().j(); + } + + @Override + public int getKnockbackLevel() { + return craftArrow.getKnockbackStrength(); + } + + @Override + public ArrowPickupStatus getPickupStatus() { + int pickupStatusId = craftArrow.getHandle().fromPlayer; + if (pickupStatusId == 1) { + return ArrowPickupStatus.ALWAYS_ALLOWED; + } else if (pickupStatusId == 2) { + return ArrowPickupStatus.CREATIVE_ONLY; + } else { + return ArrowPickupStatus.ALWAYS_FORBIDDEN; + } + } + + @Override + public int getPierceLevel() { + return 1; + } + + @Override + public boolean isCritical() { + return craftArrow.isCritical(); + } + + @Override + public boolean isInBlock() { + return craftArrow.getHandle().onGround; + } + + @Override + public boolean isShotFromCrossbow() { + return false; + } + + @Override + public T setPickupStatus(ArrowPickupStatus pickupStatus) { + if (pickupStatus == ArrowPickupStatus.ALWAYS_ALLOWED) { + craftArrow.getHandle().fromPlayer = 1; + } else if (pickupStatus == ArrowPickupStatus.CREATIVE_ONLY) { + craftArrow.getHandle().fromPlayer = 2; + } else { + craftArrow.getHandle().fromPlayer = 0; + } + return (T) this; + } + + @Override + public T setCritical(boolean critical) { + craftArrow.setCritical(critical); + return (T) this; + } + + @Override + public T setDamage(double damage) { + craftArrow.getHandle().b(damage); + return (T) this; + } + + @Override + public T setKnockbackLevel(int knockbackLevel) { + craftArrow.setKnockbackStrength(knockbackLevel); + return (T) this; + } + + @Override + public T setPierceLevel(int pierceLevel) { + return (T) this; + } + + @Override + public T setShotFromCrossbow(boolean fromCrossbow) { + return (T) this; + } + +} From 8d8c9e31d334a824be6c47ffe20bf545a7c83947 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 20:03:09 +0200 Subject: [PATCH 142/325] Implement abstract water entities --- .../entity/type/general/VersionedWaterEntity.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedWaterEntity.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedWaterEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedWaterEntity.java new file mode 100644 index 00000000..c9409bb4 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedWaterEntity.java @@ -0,0 +1,15 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.WaterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedWaterEntity> extends VersionedMobileEntity implements WaterEntity { + + public VersionedWaterEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} From 766e39fcabc19104fad3efc696000f69712f6ec1 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 20:03:18 +0200 Subject: [PATCH 143/325] Implement abstract villagers --- .../general/VersionedAbstractVillager.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractVillager.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractVillager.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractVillager.java new file mode 100644 index 00000000..0d2853ca --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractVillager.java @@ -0,0 +1,34 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.AbstractVillager; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.type.StorageInventory; +import de.pxav.kelp.core.inventory.version.InventoryVersionTemplate; +import de.pxav.kelp.core.reflect.ReflectionUtil; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftVillager; + +public class VersionedAbstractVillager> extends VersionedHumanEntity implements AbstractVillager { + + private InventoryVersionTemplate inventoryVersionTemplate; + private CraftVillager craftVillager; + + public VersionedAbstractVillager(Entity entityHandle, + KelpEntityType entityType, + Location initialLocation, + EntityTypeVersionTemplate entityTypeVersionTemplate, + InventoryVersionTemplate inventoryVersionTemplate, + ReflectionUtil reflectionUtil) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, reflectionUtil); + this.inventoryVersionTemplate = inventoryVersionTemplate; + this.craftVillager = (CraftVillager) entityHandle.getBukkitEntity(); + } + + @Override + public StorageInventory getStorageInventory() { + return inventoryVersionTemplate.getStorageInventory(craftVillager.getInventory()); + } + +} From 76ded1ab9782f85c1077aa4a97483ca3a7eb1055 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 20:03:34 +0200 Subject: [PATCH 144/325] Implement general minecart (no specific types) --- .../general/VersionedAbstractMinecart.java | 101 ++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractMinecart.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractMinecart.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractMinecart.java new file mode 100644 index 00000000..526389ed --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractMinecart.java @@ -0,0 +1,101 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.MinecartEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.material.KelpMaterial; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftMinecart; +import org.bukkit.material.MaterialData; +import org.bukkit.util.Vector; + +public class VersionedAbstractMinecart> extends VersionedVehicle implements MinecartEntity { + + private CraftMinecart craftMinecart; + + public VersionedAbstractMinecart(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.craftMinecart = (CraftMinecart) entityHandle.getBukkitEntity(); + } + + @Override + public T setDamage(double damage) { + craftMinecart.setDamage(damage); + return (T) this; + } + + @Override + public double getDamage() { + return craftMinecart.getDamage(); + } + + @Override + public double getMaxSpeed() { + return craftMinecart.getMaxSpeed(); + } + + @Override + public T setMaxSpeed(double maxSpeed) { + craftMinecart.setMaxSpeed(maxSpeed); + return (T) this; + } + + @Override + public boolean isSlowWhenEmpty() { + return craftMinecart.isSlowWhenEmpty(); + } + + @Override + public T setSlowWhenEmpty(boolean slowWhenEmpty) { + craftMinecart.setSlowWhenEmpty(slowWhenEmpty); + return (T) this; + } + + @Override + public Vector getFlyingVelocityModifier() { + return craftMinecart.getFlyingVelocityMod(); + } + + @Override + public T setFlyingVelocityModifier(Vector flyingVelocityModifier) { + craftMinecart.setFlyingVelocityMod(flyingVelocityModifier); + return (T) this; + } + + @Override + public Vector getDerailedVelocityModifier() { + return craftMinecart.getDerailedVelocityMod(); + } + + @Override + public T setDerailedVelocityModifier(Vector derailedVelocityModifier) { + craftMinecart.setDerailedVelocityMod(derailedVelocityModifier); + return (T) this; + } + + @Override + public T setDisplayBlock(KelpMaterial material) { + Material bukkitMaterial = KelpMaterial.convertUnsafe(material); + craftMinecart.setDisplayBlock(new MaterialData(bukkitMaterial)); + return (T) this; + } + + @Override + public KelpMaterial getDisplayBlock() { + Material bukkitMaterial = craftMinecart.getDisplayBlock().getItemType(); + return KelpMaterial.from(bukkitMaterial); + } + + @Override + public T setDisplayBlockOffset(int displayBlockOffset) { + craftMinecart.setDisplayBlockOffset(displayBlockOffset); + return (T) this; + } + + @Override + public int getDisplayBlockOffset() { + return craftMinecart.getDisplayBlockOffset(); + } +} From ee71e2ba16884af1316b47bc53642ff83ef97b52 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 19 Apr 2021 20:03:47 +0200 Subject: [PATCH 145/325] Implement abstraction for all horse-like entities --- .../type/general/VersionedAbstractHorse.java | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractHorse.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractHorse.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractHorse.java new file mode 100644 index 00000000..48f0ada3 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractHorse.java @@ -0,0 +1,72 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.AbstractHorseEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.type.AbstractHorseInventory; +import de.pxav.kelp.core.inventory.type.HorseInventory; +import de.pxav.kelp.core.inventory.version.InventoryVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityHorse; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftHorse; + +public class VersionedAbstractHorse> + extends VersionedTameableAnimal + implements AbstractHorseEntity { + + private EntityHorse horseHandle; + private InventoryVersionTemplate inventoryVersionTemplate; + + public VersionedAbstractHorse(Entity entityHandle, + KelpEntityType entityType, + Location initialLocation, + EntityTypeVersionTemplate entityTypeVersionTemplate, + InventoryVersionTemplate inventoryVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.horseHandle = (EntityHorse) entityHandle; + this.inventoryVersionTemplate = inventoryVersionTemplate; + } + + @Override + public int getDomestication() { + return horseHandle.getTemper(); + } + + @Override + public HorseInventory getInventory() { + // in 1.8 there are no Llamas, so there is actually no need to return an abstraction + // of a horse inventory. In newer versions, an AbstractHorseInventory should be returned here. + CraftHorse craftHorse = (CraftHorse) horseHandle.getBukkitEntity(); + return (HorseInventory) inventoryVersionTemplate.getStorageInventory(craftHorse.getInventory()); + } + + @Override + public double getJumpStrength() { + return horseHandle.getJumpStrength(); + } + + @Override + public int getMaximumDomestication() { + return horseHandle.getMaxDomestication(); + } + + @Override + public T setDomestication(int domesticationLevel) { + horseHandle.setTemper(domesticationLevel); + return (T) this; + } + + @Override + public T setJumpStrength(double jumpStrength) { + horseHandle.getAttributeInstance(EntityHorse.attributeJumpStrength).setValue(jumpStrength); + return (T) this; + } + + @Override + public T setMaximumDomestication(int maximumDomestication) { + horseHandle.maxDomestication = maximumDomestication; + return (T) this; + } + +} From b1d0dbdc6f37cdd475d221086f126a3e3287251d Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:34:52 +0200 Subject: [PATCH 146/325] Add entity class for thrown exp bottles --- .../kelp/core/entity/type/ThrownExperienceBottleEntity.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ThrownExperienceBottleEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownExperienceBottleEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownExperienceBottleEntity.java new file mode 100644 index 00000000..58d2af11 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownExperienceBottleEntity.java @@ -0,0 +1,5 @@ +package de.pxav.kelp.core.entity.type; + +public interface ThrownExperienceBottleEntity { + +} From 6a653267046f73bf35ef603a03917e346b13df26 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:35:00 +0200 Subject: [PATCH 147/325] Add entity class for thrown ender pearls --- .../kelp/core/entity/type/ThrownEnderPearlEntity.java | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ThrownEnderPearlEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownEnderPearlEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownEnderPearlEntity.java new file mode 100644 index 00000000..9027eebd --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownEnderPearlEntity.java @@ -0,0 +1,8 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import org.bukkit.entity.EnderPearl; + +public interface ThrownEnderPearlEntity extends KelpProjectile { + +} From d1f9babef70ee6a307309405cd2a3c5a295cf83e Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:35:08 +0200 Subject: [PATCH 148/325] Add entity class for thrown chicken eggs --- .../entity/type/ThrownChickenEggEntity.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ThrownChickenEggEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownChickenEggEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownChickenEggEntity.java new file mode 100644 index 00000000..5602b32b --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownChickenEggEntity.java @@ -0,0 +1,22 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.common.MathUtils; +import de.pxav.kelp.core.entity.type.general.KelpProjectile; + +public interface ThrownChickenEggEntity extends KelpProjectile { + + default boolean spawnsChicken() { + return MathUtils.perCentChance(0.125); + } + + default int getSpawnedChickens() { + if (spawnsChicken()) { + if (MathUtils.perCentChance(0.03125)) { + return 4; + } + return 1; + } + return 0; + } + +} From c031144e2e4be6cbac7bca3642351580315c8792 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:35:16 +0200 Subject: [PATCH 149/325] Add entity class for striders --- .../de/pxav/kelp/core/entity/type/StriderEntity.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/StriderEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/StriderEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/StriderEntity.java new file mode 100644 index 00000000..d0643a58 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/StriderEntity.java @@ -0,0 +1,12 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AnimalEntity; +import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; + +public interface StriderEntity extends AnimalEntity, BreedableAnimalEntity { + + boolean isShivering(); + + StriderEntity setShivering(boolean shivering); + +} From a12dfb275e307c955a54e685499f62e6460df777 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:35:25 +0200 Subject: [PATCH 150/325] Add entity class for stray skeletons --- .../de/pxav/kelp/core/entity/type/StraySkeletonEntity.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/StraySkeletonEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/StraySkeletonEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/StraySkeletonEntity.java new file mode 100644 index 00000000..7702c50e --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/StraySkeletonEntity.java @@ -0,0 +1,5 @@ +package de.pxav.kelp.core.entity.type; + +public interface StraySkeletonEntity extends SkeletonEntity { + +} From 8bc1eb2f23a2fec8c04e0d730671d4aa5fe27573 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:35:32 +0200 Subject: [PATCH 151/325] Add entity class for squids --- .../java/de/pxav/kelp/core/entity/type/SquidEntity.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/SquidEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SquidEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SquidEntity.java new file mode 100644 index 00000000..1334a0c4 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SquidEntity.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.WaterEntity; + +public interface SquidEntity extends WaterEntity { +} From 31fb57c3cf346175606f45a10b92eb3a63cf4480 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:35:38 +0200 Subject: [PATCH 152/325] Add entity class for spiders --- .../java/de/pxav/kelp/core/entity/type/SpiderEntity.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/SpiderEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SpiderEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SpiderEntity.java new file mode 100644 index 00000000..797d4385 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SpiderEntity.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MonsterEntity; + +public interface SpiderEntity extends MonsterEntity { +} From 016e0f67567375619a3e813a1f0f22e980bbb480 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:35:45 +0200 Subject: [PATCH 153/325] Add entity class for spectral arrows --- .../kelp/core/entity/type/SpectralArrowEntity.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/SpectralArrowEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SpectralArrowEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SpectralArrowEntity.java new file mode 100644 index 00000000..250824d9 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SpectralArrowEntity.java @@ -0,0 +1,12 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AbstractArrowEntity; + +// subtype of abstract arrow +public interface SpectralArrowEntity extends AbstractArrowEntity { + + int getGlowingTicks(); + + SpectralArrowEntity setGlowingTicks(int durationInTicks); + +} From bffe270272300a1131854bea0cadba048cd71b62 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:35:54 +0200 Subject: [PATCH 154/325] Add entity class for snowmen --- .../de/pxav/kelp/core/entity/type/SnowmanEntity.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/SnowmanEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SnowmanEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SnowmanEntity.java new file mode 100644 index 00000000..e6c18701 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SnowmanEntity.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.GolemEntity; + +public interface SnowmanEntity extends GolemEntity { + + boolean hasPumpkin(); + + SnowmanEntity setPumpkinHead(boolean pumpkinHead); + +} From 6dd748cacd03548aadbb4b76c70b8db7f56c8361 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:35:59 +0200 Subject: [PATCH 155/325] Add entity class for slimes --- .../de/pxav/kelp/core/entity/type/SlimeEntity.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/SlimeEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SlimeEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SlimeEntity.java new file mode 100644 index 00000000..802a51bb --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SlimeEntity.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MobileEntity; + +public interface SlimeEntity extends MobileEntity { + + int getSlimeSize(); + + SlimeEntity setSlimeSize(); + +} From af5b7bb2e87e30af33cdc03c9aff8f7d41dcfcd4 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:36:06 +0200 Subject: [PATCH 156/325] Add entity class for small fireballs --- .../de/pxav/kelp/core/entity/type/SmallFireballEntity.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/SmallFireballEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SmallFireballEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SmallFireballEntity.java new file mode 100644 index 00000000..be30fa9b --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SmallFireballEntity.java @@ -0,0 +1,5 @@ +package de.pxav.kelp.core.entity.type; + +public interface SmallFireballEntity extends ThrownFireballEntity { + +} From 1a18ced88c8c7ce3779192d95f430ae7662976ee Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:36:13 +0200 Subject: [PATCH 157/325] Add entity class for skeleton horses --- .../kelp/core/entity/type/SkeletonHorseEntity.java | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/SkeletonHorseEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SkeletonHorseEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SkeletonHorseEntity.java new file mode 100644 index 00000000..a9186048 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SkeletonHorseEntity.java @@ -0,0 +1,10 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AbstractHorseEntity; +import org.bukkit.craftbukkit.v1_16_R3.entity.CraftAnimals; +import org.bukkit.craftbukkit.v1_16_R3.entity.CraftHanging; +import org.bukkit.entity.SkeletonHorse; + +public interface SkeletonHorseEntity extends AbstractHorseEntity { + +} From 186f8807588633c5ffa6fae3462bc57c78f8ecd5 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:36:19 +0200 Subject: [PATCH 158/325] Add entity class for skeletons --- .../kelp/core/entity/type/SkeletonEntity.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/SkeletonEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SkeletonEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SkeletonEntity.java new file mode 100644 index 00000000..0676c6d2 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SkeletonEntity.java @@ -0,0 +1,20 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import org.bukkit.Difficulty; + +public interface SkeletonEntity extends MonsterEntity { + + //todo maybe check how many arrows left if possible in minecraft + + @Override + default int getMaximumSpawnLightLevel() { + return 7; + } + + @Override + default double getAttackDamage(Difficulty difficulty) { + return 0; + } + +} From ad752a5ec88f1626ab7a4c0ca1cec0e5d9238600 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:36:27 +0200 Subject: [PATCH 159/325] Add entity class for silverfishes --- .../de/pxav/kelp/core/entity/type/SilverfishEntity.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/SilverfishEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SilverfishEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SilverfishEntity.java new file mode 100644 index 00000000..391c1200 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SilverfishEntity.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MonsterEntity; + +public interface SilverfishEntity extends MonsterEntity { +} From ed9b80946c5cac99cc2c3a607f122bc3a55888d9 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:36:35 +0200 Subject: [PATCH 160/325] Add entity class for shulkers --- .../de/pxav/kelp/core/entity/type/ShulkerEntity.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ShulkerEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ShulkerEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ShulkerEntity.java new file mode 100644 index 00000000..d0b81804 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ShulkerEntity.java @@ -0,0 +1,12 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.GolemEntity; +import de.pxav.kelp.core.inventory.metadata.Color; + +public interface ShulkerEntity extends GolemEntity { + + Color getDyeColor(); + + ShulkerEntity setDyeColor(); + +} From be7bae15f7e0a394b6b1da3b0fb44a5cf8d4d7f9 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:36:42 +0200 Subject: [PATCH 161/325] Add entity class for shulker bullets --- .../kelp/core/entity/type/ShulkerBulletEntity.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ShulkerBulletEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ShulkerBulletEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ShulkerBulletEntity.java new file mode 100644 index 00000000..eb838304 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ShulkerBulletEntity.java @@ -0,0 +1,13 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import org.bukkit.entity.ShulkerBullet; + +public interface ShulkerBulletEntity extends KelpProjectile { + + KelpEntity getTarget(); + + void setTarget(KelpEntity target); + +} From 238eec9132503acdc8eb7beecbadab1641986396 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:36:48 +0200 Subject: [PATCH 162/325] Add entity class for sheep --- .../kelp/core/entity/type/SheepEntity.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/SheepEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SheepEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SheepEntity.java new file mode 100644 index 00000000..e3acd29c --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SheepEntity.java @@ -0,0 +1,21 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.AnimalEntity; +import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; + +public interface SheepEntity extends AnimalEntity, BreedableAnimalEntity { + + static SheepEntity create(KelpLocation location) { + return (SheepEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(KelpEntityType.SHEEP, location.getBukkitLocation()); + } + + boolean isSheared(); + + SheepEntity setSheared(boolean sheared); + +} From 47b6cabc0660d8bc93b27ca47064abe5acc358f9 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:36:53 +0200 Subject: [PATCH 163/325] Add entity class for salmon --- .../java/de/pxav/kelp/core/entity/type/SalmonEntity.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/SalmonEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SalmonEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SalmonEntity.java new file mode 100644 index 00000000..0a062a0a --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SalmonEntity.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.WaterEntity; + +public interface SalmonEntity extends WaterEntity { +} From 30d5a3fa46dc631cb24ba49dd6c24a9e2f757848 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:36:59 +0200 Subject: [PATCH 164/325] Add entity class for ravagers --- .../java/de/pxav/kelp/core/entity/type/RavagerEntity.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/RavagerEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/RavagerEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/RavagerEntity.java new file mode 100644 index 00000000..6100be06 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/RavagerEntity.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.RaidingEntity; + +public interface RavagerEntity extends RaidingEntity { +} From fd6d58a9d40abe0d311f4c01bf8ab9536bd04353 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:37:05 +0200 Subject: [PATCH 165/325] Add entity class for rabbits --- .../de/pxav/kelp/core/entity/type/RabbitEntity.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/RabbitEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/RabbitEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/RabbitEntity.java new file mode 100644 index 00000000..8f755f75 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/RabbitEntity.java @@ -0,0 +1,13 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AnimalEntity; +import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; +import de.pxav.kelp.core.entity.util.RabbitType; + +public interface RabbitEntity extends AnimalEntity, BreedableAnimalEntity { + + RabbitType getRabbitType(); + + RabbitEntity setRabbitType(RabbitType rabbitType); + +} From 25afe4ef3f39a774640adf955375c66f265b1277 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:37:12 +0200 Subject: [PATCH 166/325] Add entity class for primed tnt --- .../kelp/core/entity/type/PrimedTntEntity.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/PrimedTntEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PrimedTntEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PrimedTntEntity.java new file mode 100644 index 00000000..a4cd10d8 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PrimedTntEntity.java @@ -0,0 +1,18 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.type.general.ExplosiveEntity; +import org.bukkit.entity.TNTPrimed; + +// explosive +public interface PrimedTntEntity extends ExplosiveEntity { + + int getFuseTicks(); + + PrimedTntEntity setFuseTicks(int fuseTicks); + + KelpEntity getSource(); + + PrimedTntEntity setSource(KelpEntity sourceEntity); + +} From 93cc3f4eb263069e655e43b2fd7fb227aa45f790 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:37:19 +0200 Subject: [PATCH 167/325] Add entity class for pufferfishes --- .../pxav/kelp/core/entity/type/PufferfishEntity.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/PufferfishEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PufferfishEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PufferfishEntity.java new file mode 100644 index 00000000..e8817414 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PufferfishEntity.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.WaterEntity; + +public interface PufferfishEntity extends WaterEntity { + + int getPuffState(); + + PufferfishEntity setPuffState(); + +} From 604a8e533962343de6cb675b26355a389edd0bdc Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:37:45 +0200 Subject: [PATCH 168/325] Add entity class for minecart subtypes --- .../pxav/kelp/core/entity/type/PoweredMinecart.java | 11 +++++++++++ .../pxav/kelp/core/entity/type/RideableMinecart.java | 6 ++++++ .../pxav/kelp/core/entity/type/StorageMinecart.java | 10 ++++++++++ 3 files changed, 27 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/PoweredMinecart.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/RideableMinecart.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/StorageMinecart.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PoweredMinecart.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PoweredMinecart.java new file mode 100644 index 00000000..6c4e491a --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PoweredMinecart.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MinecartEntity; + +public interface PoweredMinecart extends MinecartEntity { + + int getFuelTicks(); + + PoweredMinecart setFuelTicks(int fuelTicks); + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/RideableMinecart.java b/core/src/main/java/de/pxav/kelp/core/entity/type/RideableMinecart.java new file mode 100644 index 00000000..0dd8ae4e --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/RideableMinecart.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MinecartEntity; + +public interface RideableMinecart extends MinecartEntity { +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/StorageMinecart.java b/core/src/main/java/de/pxav/kelp/core/entity/type/StorageMinecart.java new file mode 100644 index 00000000..12be50ea --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/StorageMinecart.java @@ -0,0 +1,10 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MinecartEntity; +import de.pxav.kelp.core.inventory.type.StorageInventory; + +public interface StorageMinecart extends MinecartEntity { + + StorageInventory getInventory(); + +} From 7d8935ebbbf80d081da626e93b2b5fcf6af8cf3b Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:38:12 +0200 Subject: [PATCH 169/325] Add entity class for illusioners --- .../de/pxav/kelp/core/entity/type/IllusionerEntity.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/IllusionerEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/IllusionerEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/IllusionerEntity.java new file mode 100644 index 00000000..7dfd74fb --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/IllusionerEntity.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.IllagerEntity; + +public interface IllusionerEntity extends IllagerEntity { +} From 4b774b06db79d7e443f1dfb066adde1404486e1a Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:38:33 +0200 Subject: [PATCH 170/325] Add entity class for iron golems --- .../pxav/kelp/core/entity/type/IronGolemEntity.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/IronGolemEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/IronGolemEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/IronGolemEntity.java new file mode 100644 index 00000000..17d1f363 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/IronGolemEntity.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.GolemEntity; + +public interface IronGolemEntity extends GolemEntity { + + boolean isPlayerCreated(); + + IronGolemEntity setPlayerCreated(boolean playerCreated); + +} From 9a0a39f0fb75be5b519e245ca1988bf21dc77ecc Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:38:40 +0200 Subject: [PATCH 171/325] Add entity class for item frames --- .../core/entity/type/ItemFrameEntity.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ItemFrameEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ItemFrameEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ItemFrameEntity.java new file mode 100644 index 00000000..b569b48a --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ItemFrameEntity.java @@ -0,0 +1,33 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.HangingEntity; +import de.pxav.kelp.core.inventory.item.KelpItem; +import org.bukkit.Rotation; +import org.bukkit.entity.ItemFrame; + +// hanging, attachable +public interface ItemFrameEntity extends HangingEntity { + + Rotation getItemRotation(); + + ItemFrameEntity setItemRotation(Rotation rotation); + + ItemFrameEntity setFixed(boolean fixed); + + boolean isFixed(); + + ItemFrameEntity setVisible(boolean visible); + + boolean isVisible(); + + KelpItem getItem(); + + ItemFrameEntity setItem(KelpItem item); + + ItemFrameEntity setItemAndPlayPlacementSound(KelpItem item); + + double getItemDropChance(); + + ItemFrameEntity setItemDropChance(double itemDropChance); + +} From eed4ac8769633a35450b41698a6ca56354476213 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:38:48 +0200 Subject: [PATCH 172/325] Add entity class for killer bunnies --- .../java/de/pxav/kelp/core/entity/type/KillerBunnyEntity.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/KillerBunnyEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/KillerBunnyEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/KillerBunnyEntity.java new file mode 100644 index 00000000..4a1caacc --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/KillerBunnyEntity.java @@ -0,0 +1,4 @@ +package de.pxav.kelp.core.entity.type; + +public interface KillerBunnyEntity extends RabbitEntity { +} From 2c85ec63dd72f49beb4bc93fc24e4dfa44118219 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:38:56 +0200 Subject: [PATCH 173/325] Add entity class for large fireballs --- .../java/de/pxav/kelp/core/entity/type/LargeFireball.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/LargeFireball.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/LargeFireball.java b/core/src/main/java/de/pxav/kelp/core/entity/type/LargeFireball.java new file mode 100644 index 00000000..4b4b2bba --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/LargeFireball.java @@ -0,0 +1,4 @@ +package de.pxav.kelp.core.entity.type; + +public interface LargeFireball extends ThrownFireballEntity { +} From 459ad783ed281c038d5d267c3a264ce01d9a8d21 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:39:02 +0200 Subject: [PATCH 174/325] Add entity class for lightnings --- .../de/pxav/kelp/core/entity/type/LightningEntity.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/LightningEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/LightningEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/LightningEntity.java new file mode 100644 index 00000000..f834cdc2 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/LightningEntity.java @@ -0,0 +1,9 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.KelpEntity; + +public interface LightningEntity extends KelpEntity { + + boolean isEffect(); + +} From 44f9afacf70654b1d2ba60a4ce6702aca394ba67 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:39:08 +0200 Subject: [PATCH 175/325] Add entity class for magma cubes --- .../de/pxav/kelp/core/entity/type/MagmaCubeEntity.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/MagmaCubeEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/MagmaCubeEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/MagmaCubeEntity.java new file mode 100644 index 00000000..f3f6e64c --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/MagmaCubeEntity.java @@ -0,0 +1,7 @@ +package de.pxav.kelp.core.entity.type; + +public interface MagmaCubeEntity extends SlimeEntity { + + + +} From 22b7d190cb1386e88fe0944b15455d1f7a893d46 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:39:15 +0200 Subject: [PATCH 176/325] Add entity class for parrots --- .../de/pxav/kelp/core/entity/type/ParrotEntity.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/ParrotEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ParrotEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ParrotEntity.java new file mode 100644 index 00000000..fc86294a --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ParrotEntity.java @@ -0,0 +1,13 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AnimalEntity; +import de.pxav.kelp.core.entity.type.general.TameableAnimal; +import de.pxav.kelp.core.entity.util.ParrotType; + +public interface ParrotEntity extends AnimalEntity, TameableAnimal { + + ParrotEntity setParrotType(ParrotType parrotType); + + ParrotType getParrotType(); + +} From 838d495b7a664d2e1da149eab6633da4cf2866c9 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:39:31 +0200 Subject: [PATCH 177/325] Add entity class for pig entities --- .../pxav/kelp/core/entity/type/PigEntity.java | 9 +++++++++ .../pxav/kelp/core/entity/type/PigZombie.java | 19 +++++++++++++++++++ .../core/entity/type/PiglinBruteEntity.java | 6 ++++++ .../kelp/core/entity/type/PiglinEntity.java | 11 +++++++++++ 4 files changed, 45 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/PigEntity.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/PigZombie.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/PiglinBruteEntity.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/PiglinEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PigEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PigEntity.java new file mode 100644 index 00000000..29583e2f --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PigEntity.java @@ -0,0 +1,9 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AnimalEntity; +import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; +import de.pxav.kelp.core.entity.type.general.VehicleEntity; +import org.bukkit.entity.Pig; + +public interface PigEntity extends AnimalEntity, BreedableAnimalEntity, VehicleEntity { +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PigZombie.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PigZombie.java new file mode 100644 index 00000000..ac2fccfc --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PigZombie.java @@ -0,0 +1,19 @@ +package de.pxav.kelp.core.entity.type; + +public interface PigZombie extends ZombieEntity { + + int getAnger(); + + void setAnger(int anger); + + void setAngry(boolean angry); + + boolean isAngry(); + + boolean isConverting(); + + int getConversionTime(); + + void setConversionTime(int conversionTime); + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PiglinBruteEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PiglinBruteEntity.java new file mode 100644 index 00000000..98cc62d5 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PiglinBruteEntity.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AbstractPiglin; + +public interface PiglinBruteEntity extends AbstractPiglin { +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PiglinEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PiglinEntity.java new file mode 100644 index 00000000..f8c9f0bb --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PiglinEntity.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AbstractPiglin; + +public interface PiglinEntity extends AbstractPiglin { + + boolean isAbleToHunt(); + + PiglinEntity setAbleToHunt(boolean ableToHunt); + +} From 18e9e7ba0a1962521c1ec1b35fa3f07d834f56ee Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:39:41 +0200 Subject: [PATCH 178/325] Add entity class for spawner minecart --- .../java/de/pxav/kelp/core/entity/type/SpawnerMinecart.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/SpawnerMinecart.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SpawnerMinecart.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SpawnerMinecart.java new file mode 100644 index 00000000..b3a05e55 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SpawnerMinecart.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MinecartEntity; + +public interface SpawnerMinecart extends MinecartEntity { +} From 34c359635d5cb1a9ab33748ae94a28062118e059 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:40:09 +0200 Subject: [PATCH 179/325] Add entity class for ender entities --- .../pxav/kelp/core/entity/type/EndermanEntity.java | 12 ++++++++++++ .../pxav/kelp/core/entity/type/EndermiteEntity.java | 11 +++++++++++ 2 files changed, 23 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/EndermanEntity.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/EndermiteEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/EndermanEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/EndermanEntity.java new file mode 100644 index 00000000..abf50aa6 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/EndermanEntity.java @@ -0,0 +1,12 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.inventory.material.KelpMaterial; + +public interface EndermanEntity extends MonsterEntity { + + KelpMaterial getCarriedBlock(); + + EndermanEntity setCarriedBlock(KelpMaterial carriedBlock); + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/EndermiteEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/EndermiteEntity.java new file mode 100644 index 00000000..4949a665 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/EndermiteEntity.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MonsterEntity; + +public interface EndermiteEntity extends MonsterEntity { + + boolean isPlayerSpawned(); + + EndermiteEntity setPlayerSpawned(boolean playerSpawned); + +} From 25aa05fe7673b6fd07c47e9c9764ddfe17eff763 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:40:57 +0200 Subject: [PATCH 180/325] Add entity class for mushroom cows --- .../pxav/kelp/core/entity/type/MushroomCowEntity.java | 11 +++++++++++ .../pxav/kelp/core/entity/util/MushroomCowType.java | 8 ++++++++ 2 files changed, 19 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/MushroomCowEntity.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/MushroomCowType.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/MushroomCowEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/MushroomCowEntity.java new file mode 100644 index 00000000..1cc95fce --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/MushroomCowEntity.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.util.MushroomCowType; + +public interface MushroomCowEntity extends CowEntity { + + MushroomCowType getMushroomType(); + + MushroomCowEntity setMushroomType(MushroomCowType mushroomType); + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/MushroomCowType.java b/core/src/main/java/de/pxav/kelp/core/entity/util/MushroomCowType.java new file mode 100644 index 00000000..ac42212b --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/MushroomCowType.java @@ -0,0 +1,8 @@ +package de.pxav.kelp.core.entity.util; + +public enum MushroomCowType { + + BROWN_MUSHROOMS, + RED_MUSHROOMS; + +} From a92f000d713dc33d517d2f6692bfa8dab846e52a Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:41:10 +0200 Subject: [PATCH 181/325] Add entity class for polar bears --- .../main/java/de/pxav/kelp/core/entity/type/PolarBear.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/PolarBear.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PolarBear.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PolarBear.java new file mode 100644 index 00000000..3be2ed48 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PolarBear.java @@ -0,0 +1,7 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AnimalEntity; +import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; + +public interface PolarBear extends AnimalEntity, BreedableAnimalEntity { +} From 25dc4d0bd7677e96613247b2da283da80dccbb1f Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:41:17 +0200 Subject: [PATCH 182/325] Add entity class for pillagers --- .../java/de/pxav/kelp/core/entity/type/PillagerEntity.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/PillagerEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PillagerEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PillagerEntity.java new file mode 100644 index 00000000..93faa975 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PillagerEntity.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.IllagerEntity; + +public interface PillagerEntity extends IllagerEntity { +} From 141fb7c5ddcaf5bcf6ce92e79339736be945d604 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:41:22 +0200 Subject: [PATCH 183/325] Add entity class for phantoms --- .../de/pxav/kelp/core/entity/type/PhantomEntity.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/PhantomEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PhantomEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PhantomEntity.java new file mode 100644 index 00000000..b52e3ec9 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PhantomEntity.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.MobileEntity; + +public interface PhantomEntity extends MobileEntity { + + int getPhantomSize(); + + PhantomEntity setPhantomSize(int phantomSize); + +} From 44529e947b17a4115592258fb7399cba206e67d8 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:41:27 +0200 Subject: [PATCH 184/325] Add entity class for pandas --- .../kelp/core/entity/type/PandaEntity.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/PandaEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PandaEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PandaEntity.java new file mode 100644 index 00000000..7dd866c3 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PandaEntity.java @@ -0,0 +1,18 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AnimalEntity; +import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; +import de.pxav.kelp.core.entity.type.general.TameableAnimal; +import de.pxav.kelp.core.entity.util.PandaGene; + +public interface PandaEntity extends TameableAnimal, BreedableAnimalEntity { + + PandaEntity setMainGene(PandaGene prominentGene); + + PandaEntity setHiddenGene(PandaGene hiddenGene); + + PandaGene getMainGene(); + + PandaGene getHiddenGene(); + +} From dc36bdfe62264a54ac881ed0b5ea24831d231e1f Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:41:38 +0200 Subject: [PATCH 185/325] Add entity class for paintings --- .../kelp/core/entity/type/PaintingEntity.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/PaintingEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PaintingEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PaintingEntity.java new file mode 100644 index 00000000..745c6b66 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PaintingEntity.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.HangingEntity; +import de.pxav.kelp.core.entity.util.PaintingType; + +public interface PaintingEntity extends HangingEntity { + + PaintingEntity setPaintingType(PaintingType type); + + PaintingType getPaintingType(); + + default int[] getPaintingDimensions() { + return new int[] {getPaintingType().getWidth(), getPaintingType().getHeight()}; + } + +} From 85170b56e27ba0afe53d7175856f2c2193e616a7 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:41:44 +0200 Subject: [PATCH 186/325] Add entity class for ocelots --- .../java/de/pxav/kelp/core/entity/type/OcelotEntity.java | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/OcelotEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/OcelotEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/OcelotEntity.java new file mode 100644 index 00000000..0e9038bb --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/OcelotEntity.java @@ -0,0 +1,8 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.AnimalEntity; +import de.pxav.kelp.core.entity.type.general.TameableAnimal; + +public interface OcelotEntity extends AnimalEntity, TameableAnimal { + +} From b87b345e14c7a187490b1fc7dd817e4a5424983f Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:41:50 +0200 Subject: [PATCH 187/325] Add entity class for mules --- .../main/java/de/pxav/kelp/core/entity/type/MuleEntity.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/MuleEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/MuleEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/MuleEntity.java new file mode 100644 index 00000000..3ee8804e --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/MuleEntity.java @@ -0,0 +1,6 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.ChestedHorse; + +public interface MuleEntity extends ChestedHorse { +} From cdfcfacd95bccb6f964e5e195a9753c2771dd1be Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:41:58 +0200 Subject: [PATCH 188/325] Add entity class for llama spits --- .../de/pxav/kelp/core/entity/type/LlamaSpitEntity.java | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/LlamaSpitEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/LlamaSpitEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/LlamaSpitEntity.java new file mode 100644 index 00000000..38e6109c --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/LlamaSpitEntity.java @@ -0,0 +1,8 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.type.general.KelpProjectile; + +public interface LlamaSpitEntity extends KelpProjectile { + + +} From 386837f51cf2a52a7fa24065174f31ed72c978f3 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:42:05 +0200 Subject: [PATCH 189/325] Add entity class for leash hitches --- .../kelp/core/entity/type/LeashHitchEntity.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/type/LeashHitchEntity.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/LeashHitchEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/LeashHitchEntity.java new file mode 100644 index 00000000..96ca6e15 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/LeashHitchEntity.java @@ -0,0 +1,14 @@ +package de.pxav.kelp.core.entity.type; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.HangingEntity; +import de.pxav.kelp.core.entity.version.EntityVersionTemplate; +import org.bukkit.Location; +import org.bukkit.entity.Hanging; + +public interface LeashHitchEntity extends HangingEntity { + + + +} From 80ec80563b815ebc90efee8750bc0606136f9c2c Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:42:41 +0200 Subject: [PATCH 190/325] Add static factory for elder guardian and port it to the new entity syntax --- .../core/entity/type/ElderGuardianEntity.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ElderGuardianEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ElderGuardianEntity.java index 6d8dd705..d6722c9a 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ElderGuardianEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ElderGuardianEntity.java @@ -1,8 +1,12 @@ package de.pxav.kelp.core.entity.type; -import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntityFactory; import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.MonsterEntity; import de.pxav.kelp.core.entity.version.EntityVersionTemplate; +import de.pxav.kelp.core.entity.version.LivingEntityVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.Location; /** @@ -10,12 +14,11 @@ * * @author pxav */ -public class ElderGuardianEntity extends KelpEntity { +public interface ElderGuardianEntity extends MonsterEntity { - public ElderGuardianEntity() {} - - public ElderGuardianEntity(EntityVersionTemplate entityVersionTemplate, Object entity, int entityId, Location location) { - super(entity, KelpEntityType.ELDER_GUARDIAN, location, entityId, entityVersionTemplate); + static ElderGuardianEntity create(KelpLocation location) { + return (ElderGuardianEntity) KelpPlugin.getInjector().getInstance(KelpEntityFactory.class) + .newKelpEntity(KelpEntityType.ELDER_GUARDIAN, location.getBukkitLocation()); } } From 4763c26852adad6687097c347a42cbd5751cd3b9 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:42:57 +0200 Subject: [PATCH 191/325] Apply new entity syntax to droppd item --- .../core/entity/type/DroppedItemEntity.java | 34 ++++--------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/DroppedItemEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/DroppedItemEntity.java index 2b17d9d0..f25670d8 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/DroppedItemEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/DroppedItemEntity.java @@ -2,11 +2,9 @@ import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.KelpEntity; -import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.util.ItemDropType; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; -import de.pxav.kelp.core.entity.version.EntityVersionTemplate; import de.pxav.kelp.core.inventory.item.KelpItem; -import org.bukkit.Location; import org.bukkit.entity.Item; /** @@ -14,36 +12,18 @@ * * @author pxav */ -public class DroppedItemEntity extends KelpEntity { +public interface DroppedItemEntity extends KelpEntity { - private KelpItem item; - private ItemDropType itemDropType; - - public static DroppedItemEntity from(Item item) { + static DroppedItemEntity from(Item item) { return (DroppedItemEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class).getKelpEntity(item); } - public DroppedItemEntity() {} - - public DroppedItemEntity(EntityVersionTemplate entityVersionTemplate, Object entity, int entityId, Location location, KelpItem item) { - super(entity, KelpEntityType.DROPPED_ITEM, location, entityId, entityVersionTemplate); - this.item = item; - } - - public KelpItem getItem() { - return item; - } + KelpItem getItem(); - public void setItem(KelpItem item) { - this.item = item; - } + void setItem(KelpItem item); - public ItemDropType getItemDropType() { - return itemDropType; - } + ItemDropType getItemDropType(); - public void setItemDropType(ItemDropType itemDropType) { - this.itemDropType = itemDropType; - } + void setItemDropType(ItemDropType itemDropType); } From d92b01e5f4b41d3c5a4ce1a9143bdbdbfaf1d41c Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:43:10 +0200 Subject: [PATCH 192/325] Apply new entity syntax to guardian --- .../kelp/core/entity/type/GuardianEntity.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/GuardianEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/GuardianEntity.java index 65067739..80aa2daa 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/GuardianEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/GuardianEntity.java @@ -1,21 +1,21 @@ package de.pxav.kelp.core.entity.type; -import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntityFactory; import de.pxav.kelp.core.entity.KelpEntityType; -import de.pxav.kelp.core.entity.version.EntityVersionTemplate; -import org.bukkit.Location; +import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.world.KelpLocation; /** * A class description goes here. * * @author pxav */ -public class GuardianEntity extends KelpEntity { +public interface GuardianEntity extends MonsterEntity { - public GuardianEntity() {} - - public GuardianEntity(EntityVersionTemplate entityVersionTemplate, Object entity, int entityId, Location location) { - super(entity, KelpEntityType.GUARDIAN, location, entityId, entityVersionTemplate); + static ElderGuardianEntity create(KelpLocation location) { + return (ElderGuardianEntity) KelpPlugin.getInjector().getInstance(KelpEntityFactory.class) + .newKelpEntity(KelpEntityType.ELDER_GUARDIAN, location.getBukkitLocation()); } } From 2d30292595bc40d8bee076ca6ba9c474549f8629 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:43:29 +0200 Subject: [PATCH 193/325] Apply entity constants for villagers --- .../core/entity/util/VillagerProfession.java | 36 +++++++++++++++++++ .../kelp/core/entity/util/VillagerType.java | 29 +++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/VillagerProfession.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/VillagerType.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/VillagerProfession.java b/core/src/main/java/de/pxav/kelp/core/entity/util/VillagerProfession.java new file mode 100644 index 00000000..408034ca --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/VillagerProfession.java @@ -0,0 +1,36 @@ +package de.pxav.kelp.core.entity.util; + +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.version.EntityConstantsVersionTemplate; + +public enum VillagerProfession { + + NONE, + ARMORER, + BUTCHER, + CARTOGRAPHER, + CLERIC, + FARMER, + FISHERMAN, + FLETCHER, + LEATHER_WORKER, + LIBRARIAN, + MASON, + NITWIT, + SHEPHERD, + TOOL_SMITH, + WEAPON_SMITH; + + public static VillagerProfession from(String bukkitProfession) { + return KelpPlugin.getInjector().getInstance(EntityConstantsVersionTemplate.class).getVillagerProfession(bukkitProfession); + } + + public static String toBukkitProfession(VillagerProfession profession) { + return KelpPlugin.getInjector().getInstance(EntityConstantsVersionTemplate.class).getVillagerProfession(profession); + } + + public String toBukkitProfession() { + return toBukkitProfession(this); + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/VillagerType.java b/core/src/main/java/de/pxav/kelp/core/entity/util/VillagerType.java new file mode 100644 index 00000000..f44e880d --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/VillagerType.java @@ -0,0 +1,29 @@ +package de.pxav.kelp.core.entity.util; + +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.version.EntityConstantsVersionTemplate; + +public enum VillagerType { + + DESERT, + JUNGLE, + PLAINS, + SAVANNA, + SNOW, + SWAMP, + TAIGA, + NONE; + + public static VillagerType from(String bukkitType) { + return KelpPlugin.getInjector().getInstance(EntityConstantsVersionTemplate.class).getVillagerType(bukkitType); + } + + public static String toBukkitType(VillagerType type) { + return KelpPlugin.getInjector().getInstance(EntityConstantsVersionTemplate.class).getVillagerType(type); + } + + public String toBukkitType() { + return toBukkitType(this); + } + +} From 7bf6625eec3c241556e174f08524082324bd7fe9 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:43:58 +0200 Subject: [PATCH 194/325] Apply entity constants for animal variants --- .../pxav/kelp/core/entity/util/CatType.java | 43 +++++++++++++++++++ .../pxav/kelp/core/entity/util/FoxType.java | 8 ++++ .../kelp/core/entity/util/HorseColor.java | 11 +++++ .../kelp/core/entity/util/HorseStyle.java | 9 ++++ .../kelp/core/entity/util/LlamaColor.java | 10 +++++ .../kelp/core/entity/util/ParrotType.java | 11 +++++ .../kelp/core/entity/util/RabbitType.java | 12 ++++++ 7 files changed, 104 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/CatType.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/FoxType.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/HorseColor.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/HorseStyle.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/LlamaColor.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/ParrotType.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/RabbitType.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/CatType.java b/core/src/main/java/de/pxav/kelp/core/entity/util/CatType.java new file mode 100644 index 00000000..fe272fa9 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/CatType.java @@ -0,0 +1,43 @@ +package de.pxav.kelp.core.entity.util; + +import com.google.common.collect.Lists; +import de.pxav.kelp.core.KelpServer; +import de.pxav.kelp.core.version.KelpVersion; + +import java.util.Collections; +import java.util.List; + +public enum CatType { + + TABBY, + TUXEDO, + RED, + SIAMESE, + BRITISH_SHORTHAIR, + CALICO, + PERSIAN, + RAGDOLL, + WHITE, + JELLIE, + ALL_BLACK; + + public static CatType randomCatType() { + List availableTypes = Lists.newArrayList(); + availableTypes.add(CatType.ALL_BLACK); + availableTypes.add(CatType.RED); + availableTypes.add(CatType.SIAMESE); + if (KelpServer.getVersion().isHigherThanOrEqualTo(KelpVersion.MC_1_14_0)) { + availableTypes.add(CatType.TABBY); + availableTypes.add(CatType.TUXEDO); + availableTypes.add(CatType.BRITISH_SHORTHAIR); + availableTypes.add(CatType.CALICO); + availableTypes.add(CatType.PERSIAN); + availableTypes.add(CatType.RAGDOLL); + availableTypes.add(CatType.WHITE); + availableTypes.add(CatType.JELLIE); + } + Collections.shuffle(availableTypes); + return availableTypes.get(0); + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/FoxType.java b/core/src/main/java/de/pxav/kelp/core/entity/util/FoxType.java new file mode 100644 index 00000000..6bb14a4d --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/FoxType.java @@ -0,0 +1,8 @@ +package de.pxav.kelp.core.entity.util; + +public enum FoxType { + + RED, + SNOW + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/HorseColor.java b/core/src/main/java/de/pxav/kelp/core/entity/util/HorseColor.java new file mode 100644 index 00000000..a3d71635 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/HorseColor.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.util; + +public enum HorseColor { + WHITE, + CREAMY, + CHESTNUT, + BROWN, + BLACK, + GRAY, + DARK_BROWN; +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/HorseStyle.java b/core/src/main/java/de/pxav/kelp/core/entity/util/HorseStyle.java new file mode 100644 index 00000000..d732c872 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/HorseStyle.java @@ -0,0 +1,9 @@ +package de.pxav.kelp.core.entity.util; + +public enum HorseStyle { + NONE, + WHITE, + WHITEFIELD, + WHITE_DOTS, + BLACK_DOTS; +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/LlamaColor.java b/core/src/main/java/de/pxav/kelp/core/entity/util/LlamaColor.java new file mode 100644 index 00000000..926c0928 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/LlamaColor.java @@ -0,0 +1,10 @@ +package de.pxav.kelp.core.entity.util; + +public enum LlamaColor { + + BROWN, + CREAMY, + LIGHT_GRAY, + WHITE + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/ParrotType.java b/core/src/main/java/de/pxav/kelp/core/entity/util/ParrotType.java new file mode 100644 index 00000000..324be3b7 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/ParrotType.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.entity.util; + +public enum ParrotType { + + BLUE, + CYAN, + LIGHT_GRAY, + GREEN, + RED + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/RabbitType.java b/core/src/main/java/de/pxav/kelp/core/entity/util/RabbitType.java new file mode 100644 index 00000000..d695dcbc --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/RabbitType.java @@ -0,0 +1,12 @@ +package de.pxav.kelp.core.entity.util; + +public enum RabbitType { + + BLACK, + BLACK_AND_WHITE, + BROWN, + BEIGE, + SALT_AND_PEPPER, + WHITE + +} From 634f4114c011eb3adb800fe4ad8f8da5f611866f Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:44:10 +0200 Subject: [PATCH 195/325] Apply entity constants for panda genes --- .../pxav/kelp/core/entity/util/PandaGene.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/PandaGene.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/PandaGene.java b/core/src/main/java/de/pxav/kelp/core/entity/util/PandaGene.java new file mode 100644 index 00000000..61a7f0e6 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/PandaGene.java @@ -0,0 +1,27 @@ +package de.pxav.kelp.core.entity.util; + +public enum PandaGene { + + AGGRESSIVE(true), + BROWN(false), + LAZY(true), + NORMAL(true), + PLAYFUL(true), + WEAK(false), + WORRIED(true); + + private boolean isDominant; + + PandaGene(boolean isDominant) { + this.isDominant = isDominant; + } + + public boolean isDominant() { + return isDominant; + } + + public boolean isRecessive() { + return !isDominant; + } + +} From 2d03bcf74d608f80f7a6c000131e866a5faa3302 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:44:20 +0200 Subject: [PATCH 196/325] Apply entity constants for fish hook states --- .../de/pxav/kelp/core/entity/util/FishHookState.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/FishHookState.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/FishHookState.java b/core/src/main/java/de/pxav/kelp/core/entity/util/FishHookState.java new file mode 100644 index 00000000..54193628 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/FishHookState.java @@ -0,0 +1,9 @@ +package de.pxav.kelp.core.entity.util; + +public enum FishHookState { + + UNHOOKED, + HOOKED_ENTITY, + BOBBING; + +} From 27ade2edb32a192ec2912e4f37bf462a5ee335be Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:44:29 +0200 Subject: [PATCH 197/325] Apply entity constants for arrow pickup status --- .../de/pxav/kelp/core/entity/util/ArrowPickupStatus.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/ArrowPickupStatus.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/ArrowPickupStatus.java b/core/src/main/java/de/pxav/kelp/core/entity/util/ArrowPickupStatus.java new file mode 100644 index 00000000..f78df743 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/ArrowPickupStatus.java @@ -0,0 +1,9 @@ +package de.pxav.kelp.core.entity.util; + +public enum ArrowPickupStatus { + + ALWAYS_ALLOWED, + CREATIVE_ONLY, + ALWAYS_FORBIDDEN + +} From b0f327aee68e41fe2081488430fd3aa93b84ebf6 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:44:39 +0200 Subject: [PATCH 198/325] Apply entity constants for spell types of illagers --- .../de/pxav/kelp/core/entity/util/SpellType.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/SpellType.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/SpellType.java b/core/src/main/java/de/pxav/kelp/core/entity/util/SpellType.java new file mode 100644 index 00000000..4e4bc9e0 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/SpellType.java @@ -0,0 +1,12 @@ +package de.pxav.kelp.core.entity.util; + +public enum SpellType { + + BLINDNESS, + DISAPPEAR, + FANGS, + NONE, + SUMMON_VEX, + WOLOLO + +} From 5f4deae7f16d479765e1220750563e2a978856be Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:45:01 +0200 Subject: [PATCH 199/325] Apply generic model to EntityTypeVersionTemplate --- .../kelp/core/entity/version/EntityTypeVersionTemplate.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/version/EntityTypeVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/entity/version/EntityTypeVersionTemplate.java index 3c9f1512..56af60c6 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/version/EntityTypeVersionTemplate.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/version/EntityTypeVersionTemplate.java @@ -14,8 +14,8 @@ @KelpVersionTemplate public abstract class EntityTypeVersionTemplate { - public abstract KelpEntity newKelpEntity(KelpEntityType entityType, Location location); + public abstract KelpEntity newKelpEntity(KelpEntityType entityType, Location location); - public abstract KelpEntity getKelpEntity(Entity bukkitEntity); + public abstract KelpEntity getKelpEntity(Entity bukkitEntity); } From cf021b31a3327d9c0fddbfddf594f65e2f9ac2f1 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:45:34 +0200 Subject: [PATCH 200/325] Fix imports for KelpItem --- .../main/java/de/pxav/kelp/core/inventory/item/KelpItem.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/item/KelpItem.java b/core/src/main/java/de/pxav/kelp/core/inventory/item/KelpItem.java index bd690211..ed783fad 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/item/KelpItem.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/item/KelpItem.java @@ -10,12 +10,9 @@ import de.pxav.kelp.core.inventory.listener.KelpListenerRepository; import de.pxav.kelp.core.inventory.material.KelpMaterial; import de.pxav.kelp.core.inventory.metadata.ItemMetadata; -import de.pxav.kelp.core.inventory.metadata.ItemMetadataVersionTemplate; import de.pxav.kelp.core.inventory.metadata.LeatherArmorMetadata; import de.pxav.kelp.core.inventory.version.ItemVersionTemplate; -import de.pxav.kelp.core.player.KelpPlayer; import org.apache.commons.lang.builder.HashCodeBuilder; -import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; From e483b5a87d02208cb6b88483cd8e4f5cf784be45 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:46:06 +0200 Subject: [PATCH 201/325] Add inventory abstraction for inventories that store items exclusively --- .../core/inventory/type/StorageInventory.java | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/inventory/type/StorageInventory.java diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/type/StorageInventory.java b/core/src/main/java/de/pxav/kelp/core/inventory/type/StorageInventory.java new file mode 100644 index 00000000..f741b919 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/inventory/type/StorageInventory.java @@ -0,0 +1,89 @@ +package de.pxav.kelp.core.inventory.type; + +import de.pxav.kelp.core.entity.LivingKelpEntity; +import de.pxav.kelp.core.inventory.item.KelpItem; +import de.pxav.kelp.core.inventory.material.KelpMaterial; +import org.bukkit.inventory.Inventory; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Set; + +public interface StorageInventory> { + + T addItem(KelpItem... items); + + Collection allItemsWith(KelpMaterial material); + + Collection allItemsWith(KelpItem item); + + T clear(); + + T remove(int slot); + + default T remove(Set slots) { + for (Integer slot : slots) { + remove(slot); + } + return (T) this; + } + + boolean contains(KelpItem item); + + boolean contains(KelpMaterial material); + + boolean containsAtLeast(KelpMaterial material, int minimumAmount); + + boolean containsAtLeast(KelpItem item, int combinedMinimumAmount); + + int first(KelpItem item); + + int first(KelpMaterial material); + + int firstEmptySlot(); + + Collection getAllItems(); + + Collection getStorageItems(); + + InventoryOwner getInventoryOwner(); + + KelpItem getItemAt(int slot); + + int getMaxStackSize(); + + int getSize(); + + default int getRows() { + return getSize() / 9; + } + + Collection> getViewers(); + + boolean isEmpty(); + + T remove(KelpItem item); + + T remove(KelpMaterial material); + + T setAllItems(Collection items); + + default T setAllItems(KelpItem[] items) { + setAllItems(Arrays.asList(items)); + return (T) this; + } + + T setItem(KelpItem item); + + T setMaxStackSize(int maxStackSize); + + T setAllStorageItems(Collection items); + + default T setAllStorageItems(KelpItem[] items) { + setAllStorageItems(Arrays.asList(items)); + return (T) this; + } + + Inventory getBukkitInventory(); + +} From c4d9b14cc468f5d9f3e74316537f2e5cb49710ff Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:46:27 +0200 Subject: [PATCH 202/325] Adjust PlayerInventory to be a storage inventory --- .../core/inventory/type/PlayerInventory.java | 170 ------------------ 1 file changed, 170 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/type/PlayerInventory.java b/core/src/main/java/de/pxav/kelp/core/inventory/type/PlayerInventory.java index 878b2736..d9c7a1e2 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/type/PlayerInventory.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/type/PlayerInventory.java @@ -27,26 +27,6 @@ */ public interface PlayerInventory extends StorageInventory { - /** - * Gets all items stored in this player inventory. This includes - * all slots (main storage, armor and hot bar). - * - * @return A set of all items that are currently in the player's inventory. - */ - Set getItems(); - - /** - * Gets an item at a specific slot. The slot count starts at the - * first hotbar slot from 0-8 and then goes on from the uppermost - * line of the main storage. - * - * If there is no item at the given slot, {@code null} will be returned. - * - * @param slot The slot of the item you want to get. - * @return The item stored at the given slot in the player inventory. - */ - KelpItem getItemAt(int slot); - /** * Gets all items stored in the player's hotbar. The hotbar * are the first nine slots of a player's inventory (0-8) and it @@ -56,157 +36,7 @@ public interface PlayerInventory extends StorageInventory { */ Set getHotBarItems(); - /** - * Sets the helmet the player is wearing to the given item. - * Specifically for helmets, you can not only use the normal armor items - * such as leather helmet, gold helmet, etc. but also blocks, heads or banners - * to set them as a player head. - * - * @param helmet The item of the helmet you want to set. This can be - * a normal armor helmet or any banner, head or even some blocks. - * @return An instance of the current inventory for fluent builder design. - */ - PlayerInventory setHelmet(KelpItem helmet); - - /** - * Sets the chest plate of the player owning this inventory. - * Unlike in the helmet method, you cannot pass other item materials - * than chest plates here. - * - * @param chestPlate The chest plate item you want to set. - * @return An instance of the current inventory for fluent builder design. - */ - PlayerInventory setChestPlate(KelpItem chestPlate); - - /** - * Sets the leggings of the player owning this inventory. - * Unlike in the helmet method, you cannot pass other item materials - * than leggings here. - * - * @param leggings The leggings item you want to set. - * @return An instance of the current inventory for fluent builder design. - */ - PlayerInventory setLeggings(KelpItem leggings); - - /** - * Sets the boots of the player owning this inventory. - * Unlike in the helmet method, you cannot pass other item materials - * than boots here. - * - * @param boots The chest plate item you want to set. - * @return An instance of the current inventory for fluent builder design. - */ - PlayerInventory setBoots(KelpItem boots); - - /** - * Gets the helmet the player is currently wearing. - * Unlike the other armor parts, the helmet can also be of - * materials other than normal helmets, but also banners and some - * blocks. - * - * If the player has no helmet, {@code null} will be returned. - * - * @return The item representing the player's helmet. - */ - KelpItem getHelmet(); - - /** - * Gets the chest plate the player is currently wearing. - * - * If the player has no chest plate, {@code null} will be returned. - * - * @return The item representing the player's chest plate. - */ - KelpItem getChestPlate(); - - /** - * Gets the leggings the player is currently wearing. - * - * If the player has no leggings, {@code null} will be returned. - * - * @return The item representing the player's chest plate. - */ - KelpItem getLeggings(); - - /** - * Gets the boots the player is currently wearing. - * - * If the player has no boots, {@code null} will be returned. - * - * @return The item representing the player's chest plate. - */ - KelpItem getBoots(); - - /** - * Stores an item in the player inventory at the given slot location. - * If there already is an item present at the given location, this - * item will be overwritten. If you want to avoid this and rather - * search for free inventory space use {@link #addItem(KelpItem)} instead. - * - * @param slot The slot to store the item at. - * @param item The item to store at the given slot. - * @return An instance of the current inventory for fluent builder design. - */ - PlayerInventory setItem(int slot, KelpItem item); - - /** - * Adds a new item to the player's inventory. - * This method won't overwrite any existing items, but try to find free - * space in the inventory. If there is already a {@link KelpItem} with - * the same data (same display name, item description, material, tags, etc.) - * and this item has not yet exceeded its maximum stack size, it will add - * the item to an existing stack. - * - * @param item The item to add. - * @return An instance of the current inventory for fluent builder design. - */ - PlayerInventory addItem(KelpItem item); - - /** - * Gets the item that is currently stored in the player's - * main hand (the player's right hand). - * - * If the player has no item in hand, {@code null} will be returned. - * - * @return The item the player is holding right now. - */ - KelpItem getItemInHand(); - - /** - * Sets the item in the player's main hand (the player's right hand). - * - * Unlike the off hand, the main hand can be used in all server versions. - * - * @param item The item to set in the player's main hand. - * @return An instance of the current inventory for fluent builder design. - */ - PlayerInventory setItemInHand(KelpItem item); - - /** - * Gets the item that is currently in the player's off hand - * (the player's left hand). - * - * Please note that off hands were introduced in {code MC 1.9} and are - * therefore not available on 1.8 servers. But this method won't throw - * an error if you do it anyways. - * - * If the player has no item in his off hand, {@code null} will be returned. - * - * @return The item that is stored in the player's off hand right now. - */ - KelpItem getItemInOffHand(); - /** - * Sets the item in the player's off hand (the player's left hand). - * - * Please note that off hands were introduced in {code MC 1.9} and are - * therefore not available on 1.8 servers. But this method won't throw - * an error if you do it anyways. - * - * @param item The item to set in the player's off hand. - * @return An instance of the current inventory for fluent builder design. - */ - PlayerInventory setItemInOffHand(KelpItem item); /** * Gets the player owning this inventory. From 7b5b221d710b852efbfe15a57c89b159497311a4 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:46:57 +0200 Subject: [PATCH 203/325] Add storage inventory subtypes for different entity-related use cases --- .../core/inventory/type/AbstractHorseInventory.java | 11 +++++++++++ .../pxav/kelp/core/inventory/type/HorseInventory.java | 11 +++++++++++ .../pxav/kelp/core/inventory/type/LlamaInventory.java | 11 +++++++++++ 3 files changed, 33 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/inventory/type/AbstractHorseInventory.java create mode 100644 core/src/main/java/de/pxav/kelp/core/inventory/type/HorseInventory.java create mode 100644 core/src/main/java/de/pxav/kelp/core/inventory/type/LlamaInventory.java diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/type/AbstractHorseInventory.java b/core/src/main/java/de/pxav/kelp/core/inventory/type/AbstractHorseInventory.java new file mode 100644 index 00000000..18a434e4 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/inventory/type/AbstractHorseInventory.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.inventory.type; + +import de.pxav.kelp.core.inventory.item.KelpItem; + +public interface AbstractHorseInventory> extends StorageInventory { + + KelpItem getSaddle(); + + T setSaddle(KelpItem saddleItem); + +} diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/type/HorseInventory.java b/core/src/main/java/de/pxav/kelp/core/inventory/type/HorseInventory.java new file mode 100644 index 00000000..6565c4ca --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/inventory/type/HorseInventory.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.inventory.type; + +import de.pxav.kelp.core.inventory.item.KelpItem; + +public interface HorseInventory extends AbstractHorseInventory { + + KelpItem getArmor(); + + HorseInventory setArmor(KelpItem armorItem); + +} diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/type/LlamaInventory.java b/core/src/main/java/de/pxav/kelp/core/inventory/type/LlamaInventory.java new file mode 100644 index 00000000..924bd7f8 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/inventory/type/LlamaInventory.java @@ -0,0 +1,11 @@ +package de.pxav.kelp.core.inventory.type; + +import de.pxav.kelp.core.inventory.item.KelpItem; + +public interface LlamaInventory extends AbstractHorseInventory { + + KelpItem getDecoration(); + + LlamaInventory setDecoration(KelpItem decoration); + +} From 8319c7964ac3ed830199ee423452f0c2e1adda41 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:47:27 +0200 Subject: [PATCH 204/325] Add InventoryOwner interface implemented by every entity/block holding an inventory --- .../kelp/core/inventory/type/InventoryOwner.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/inventory/type/InventoryOwner.java diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/type/InventoryOwner.java b/core/src/main/java/de/pxav/kelp/core/inventory/type/InventoryOwner.java new file mode 100644 index 00000000..23175945 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/inventory/type/InventoryOwner.java @@ -0,0 +1,13 @@ +package de.pxav.kelp.core.inventory.type; + +import org.bukkit.inventory.InventoryHolder; + +public interface InventoryOwner { + + static InventoryOwner from(InventoryHolder holder) { + return null; + } + + StorageInventory getInventory(); + +} From 40039a5f631e604d88187165846977b21cf37106 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:47:44 +0200 Subject: [PATCH 205/325] Fix imports of KelpInventory --- .../java/de/pxav/kelp/core/inventory/type/KelpInventory.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/type/KelpInventory.java b/core/src/main/java/de/pxav/kelp/core/inventory/type/KelpInventory.java index d3d1b136..c3e60c1c 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/type/KelpInventory.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/type/KelpInventory.java @@ -1,19 +1,15 @@ package de.pxav.kelp.core.inventory.type; import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import de.pxav.kelp.core.inventory.item.KelpItem; import de.pxav.kelp.core.inventory.version.InventoryVersionTemplate; import de.pxav.kelp.core.inventory.widget.GroupedWidget; import de.pxav.kelp.core.inventory.widget.SimpleWidget; import de.pxav.kelp.core.inventory.widget.Widget; import de.pxav.kelp.core.player.KelpPlayer; -import org.bukkit.Material; -import org.bukkit.block.Dispenser; import org.bukkit.inventory.Inventory; import java.util.List; -import java.util.Set; /** * Represents the basis for every GUI inventory you can build From da497d38fea9679a0f87c0e3f991d35c27a3ebb8 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:48:13 +0200 Subject: [PATCH 206/325] Add class representing equipment of a human-like entity such as a player, zombie, skeleton, etc. --- .../inventory/type/SimpleEntityEquipment.java | 134 ++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleEntityEquipment.java diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleEntityEquipment.java b/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleEntityEquipment.java new file mode 100644 index 00000000..77fa5416 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleEntityEquipment.java @@ -0,0 +1,134 @@ +package de.pxav.kelp.core.inventory.type; + +import de.pxav.kelp.core.inventory.item.KelpItem; + +public interface SimpleEntityEquipment extends StorageInventory { + + /** + * Sets the helmet the player is wearing to the given item. + * Specifically for helmets, you can not only use the normal armor items + * such as leather helmet, gold helmet, etc. but also blocks, heads or banners + * to set them as a player head. + * + * @param helmet The item of the helmet you want to set. This can be + * a normal armor helmet or any banner, head or even some blocks. + * @return An instance of the current inventory for fluent builder design. + */ + PlayerInventory setHelmet(KelpItem helmet); + + /** + * Sets the chest plate of the player owning this inventory. + * Unlike in the helmet method, you cannot pass other item materials + * than chest plates here. + * + * @param chestPlate The chest plate item you want to set. + * @return An instance of the current inventory for fluent builder design. + */ + PlayerInventory setChestPlate(KelpItem chestPlate); + + /** + * Sets the leggings of the player owning this inventory. + * Unlike in the helmet method, you cannot pass other item materials + * than leggings here. + * + * @param leggings The leggings item you want to set. + * @return An instance of the current inventory for fluent builder design. + */ + PlayerInventory setLeggings(KelpItem leggings); + + /** + * Sets the boots of the player owning this inventory. + * Unlike in the helmet method, you cannot pass other item materials + * than boots here. + * + * @param boots The chest plate item you want to set. + * @return An instance of the current inventory for fluent builder design. + */ + PlayerInventory setBoots(KelpItem boots); + + /** + * Gets the helmet the player is currently wearing. + * Unlike the other armor parts, the helmet can also be of + * materials other than normal helmets, but also banners and some + * blocks. + * + * If the player has no helmet, {@code null} will be returned. + * + * @return The item representing the player's helmet. + */ + KelpItem getHelmet(); + + /** + * Gets the chest plate the player is currently wearing. + * + * If the player has no chest plate, {@code null} will be returned. + * + * @return The item representing the player's chest plate. + */ + KelpItem getChestPlate(); + + /** + * Gets the leggings the player is currently wearing. + * + * If the player has no leggings, {@code null} will be returned. + * + * @return The item representing the player's chest plate. + */ + KelpItem getLeggings(); + + /** + * Gets the boots the player is currently wearing. + * + * If the player has no boots, {@code null} will be returned. + * + * @return The item representing the player's chest plate. + */ + KelpItem getBoots(); + + /** + * Gets the item that is currently stored in the player's + * main hand (the player's right hand). + * + * If the player has no item in hand, {@code null} will be returned. + * + * @return The item the player is holding right now. + */ + KelpItem getItemInHand(); + + /** + * Sets the item in the player's main hand (the player's right hand). + * + * Unlike the off hand, the main hand can be used in all server versions. + * + * @param item The item to set in the player's main hand. + * @return An instance of the current inventory for fluent builder design. + */ + PlayerInventory setItemInHand(KelpItem item); + + /** + * Gets the item that is currently in the player's off hand + * (the player's left hand). + * + * Please note that off hands were introduced in {code MC 1.9} and are + * therefore not available on 1.8 servers. But this method won't throw + * an error if you do it anyways. + * + * If the player has no item in his off hand, {@code null} will be returned. + * + * @return The item that is stored in the player's off hand right now. + */ + KelpItem getItemInOffHand(); + + /** + * Sets the item in the player's off hand (the player's left hand). + * + * Please note that off hands were introduced in {code MC 1.9} and are + * therefore not available on 1.8 servers. But this method won't throw + * an error if you do it anyways. + * + * @param item The item to set in the player's off hand. + * @return An instance of the current inventory for fluent builder design. + */ + PlayerInventory setItemInOffHand(KelpItem item); + +} From 5aeb614110b483c8a383dcb1f324a6a07c51c2c7 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:48:30 +0200 Subject: [PATCH 207/325] Fix imports for SimpleInventory --- .../java/de/pxav/kelp/core/inventory/type/SimpleInventory.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleInventory.java b/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleInventory.java index e48335e2..438e8f63 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleInventory.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleInventory.java @@ -6,8 +6,6 @@ import de.pxav.kelp.core.inventory.version.WindowPacketTemplate; import de.pxav.kelp.core.inventory.widget.GroupedWidget; import de.pxav.kelp.core.inventory.widget.SimpleWidget; -import de.pxav.kelp.core.player.KelpPlayer; -import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; import java.util.function.Supplier; From 657c32fcef9bceb01f03212ed8faf19ed8201804 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:48:48 +0200 Subject: [PATCH 208/325] Fix imports for GroupedWidget --- .../java/de/pxav/kelp/core/inventory/widget/GroupedWidget.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/widget/GroupedWidget.java b/core/src/main/java/de/pxav/kelp/core/inventory/widget/GroupedWidget.java index 6f04d34f..a1fc931c 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/widget/GroupedWidget.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/widget/GroupedWidget.java @@ -4,7 +4,6 @@ import de.pxav.kelp.core.player.KelpPlayer; import java.util.Collection; -import java.util.List; import java.util.Set; /** From 598c726a7210a0f952735681e7a5a4ba94333e7c Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:49:15 +0200 Subject: [PATCH 209/325] Fix imports for PlaceholderWidget --- .../de/pxav/kelp/core/inventory/widget/PlaceholderWidget.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/widget/PlaceholderWidget.java b/core/src/main/java/de/pxav/kelp/core/inventory/widget/PlaceholderWidget.java index cbc5a9a9..8203d3d2 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/widget/PlaceholderWidget.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/widget/PlaceholderWidget.java @@ -4,7 +4,6 @@ import com.google.common.collect.Sets; import de.pxav.kelp.core.inventory.item.KelpItem; import de.pxav.kelp.core.inventory.material.KelpMaterial; -import de.pxav.kelp.core.player.KelpPlayer; import java.util.Arrays; import java.util.Collection; From 57f0f5ff0591f6a53d51e033838ec8b16acccaa7 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:49:50 +0200 Subject: [PATCH 210/325] Adjust KelpPlayer to new entity library --- core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java index 8bbb7844..7d33a575 100644 --- a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java +++ b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java @@ -2,6 +2,7 @@ import com.google.common.base.Preconditions; import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.LivingKelpEntity; import de.pxav.kelp.core.entity.type.general.HumanEntity; import de.pxav.kelp.core.entity.type.general.ProjectileLauncher; import de.pxav.kelp.core.event.kelpevent.sidebar.KelpSidebarRemoveEvent; From a95a24cb8c685939569c13b2dd78e29fa1c4995e Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:50:07 +0200 Subject: [PATCH 211/325] Fix imports for KelpWorld --- core/src/main/java/de/pxav/kelp/core/world/KelpWorld.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/world/KelpWorld.java b/core/src/main/java/de/pxav/kelp/core/world/KelpWorld.java index 67c101af..45046bfc 100644 --- a/core/src/main/java/de/pxav/kelp/core/world/KelpWorld.java +++ b/core/src/main/java/de/pxav/kelp/core/world/KelpWorld.java @@ -2,7 +2,7 @@ import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.type.DroppedItemEntity; -import de.pxav.kelp.core.entity.type.general.ItemDropType; +import de.pxav.kelp.core.entity.util.ItemDropType; import de.pxav.kelp.core.inventory.item.KelpItem; import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.world.util.ExplosionPower; From 45344137e422e559fc559b178bf91797e54395de Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:50:17 +0200 Subject: [PATCH 212/325] Fix imports for WorldVersionTemplate --- .../de/pxav/kelp/core/world/version/WorldVersionTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/world/version/WorldVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/world/version/WorldVersionTemplate.java index 14a8a5c1..239867c0 100644 --- a/core/src/main/java/de/pxav/kelp/core/world/version/WorldVersionTemplate.java +++ b/core/src/main/java/de/pxav/kelp/core/world/version/WorldVersionTemplate.java @@ -2,7 +2,7 @@ import de.pxav.kelp.core.application.KelpVersionTemplate; import de.pxav.kelp.core.entity.type.DroppedItemEntity; -import de.pxav.kelp.core.entity.type.general.ItemDropType; +import de.pxav.kelp.core.entity.util.ItemDropType; import de.pxav.kelp.core.inventory.item.KelpItem; import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.world.*; From df969d5d96a4916f61a6ca3d4d9b9b51d2a0e10b Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:50:52 +0200 Subject: [PATCH 213/325] Implement animal entity classes --- .../entity/type/VersionedBat.java | 31 +++++++++++ .../entity/type/VersionedCat.java | 51 +++++++++++++++++++ .../entity/type/VersionedChicken.java | 17 +++++++ .../entity/type/VersionedOcelot.java | 20 ++++++++ .../entity/type/VersionedSheep.java | 40 +++++++++++++++ 5 files changed, 159 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedBat.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCat.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedChicken.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedOcelot.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSheep.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedBat.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedBat.java new file mode 100644 index 00000000..5e64f304 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedBat.java @@ -0,0 +1,31 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.BatEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedMobileEntity; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityBat; +import org.bukkit.Location; + +public class VersionedBat extends VersionedMobileEntity implements BatEntity { + + EntityBat batHandle; + + public VersionedBat(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.batHandle = (EntityBat) entityHandle; + } + + @Override + public boolean isAwake() { + return !batHandle.isAsleep(); + } + + @Override + public BatEntity setAwake(boolean awake) { + batHandle.setAsleep(!awake); + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCat.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCat.java new file mode 100644 index 00000000..ebacf36b --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCat.java @@ -0,0 +1,51 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.CatEntity; +import de.pxav.kelp.core.entity.util.CatType; +import de.pxav.kelp.core.entity.version.EntityConstantsVersionTemplate; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.reflect.ReflectionUtil; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedAnimalEntity; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityOcelot; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftOcelot; +import org.bukkit.entity.Ocelot; + +public class VersionedCat extends VersionedAnimalEntity implements CatEntity { + + CraftOcelot craftOcelot; + EntityOcelot ocelotHandle; + private EntityConstantsVersionTemplate entityConstantsVersionTemplate; + + public VersionedCat(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, ReflectionUtil reflectionUtil, EntityConstantsVersionTemplate entityConstantsVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, reflectionUtil); + craftOcelot.setCatType(Ocelot.Type.valueOf(entityConstantsVersionTemplate.getCatType(CatType.randomCatType()))); + this.entityConstantsVersionTemplate = entityConstantsVersionTemplate; + } + + @Override + public Color getCollarDyeColor() { + return Color.DYE_RED; + } + + @Override + public CatEntity setCollarDyeColor(Color color) { + return this; + } + + @Override + public CatType getCatType() { + return entityConstantsVersionTemplate.getCatType(craftOcelot.getCatType().toString()); + } + + @Override + public CatEntity setCatType(CatType catType) { + String bukkitCatType = entityConstantsVersionTemplate.getCatType(catType); + craftOcelot.setCatType(Ocelot.Type.valueOf(bukkitCatType)); + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedChicken.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedChicken.java new file mode 100644 index 00000000..39e05184 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedChicken.java @@ -0,0 +1,17 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.ChickenEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.reflect.ReflectionUtil; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedBreedableAnimal; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedChicken extends VersionedBreedableAnimal implements ChickenEntity { + + public VersionedChicken(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, ReflectionUtil reflectionUtil) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, reflectionUtil); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedOcelot.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedOcelot.java new file mode 100644 index 00000000..e9c233c5 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedOcelot.java @@ -0,0 +1,20 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.OcelotEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedTameableAnimal; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftOcelot; +import org.bukkit.entity.Ocelot; + +public class VersionedOcelot extends VersionedTameableAnimal implements OcelotEntity { + + public VersionedOcelot(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + CraftOcelot craftOcelot = (CraftOcelot) entityHandle.getBukkitEntity(); + craftOcelot.setCatType(Ocelot.Type.WILD_OCELOT); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSheep.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSheep.java new file mode 100644 index 00000000..20fe6a6c --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSheep.java @@ -0,0 +1,40 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.SheepEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.reflect.ReflectionUtil; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedBreedableAnimal; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityAnimal; +import net.minecraft.server.v1_8_R3.EntitySheep; +import org.bukkit.Location; +import org.bukkit.entity.Animals; + +public class VersionedSheep + extends VersionedBreedableAnimal + implements SheepEntity { + + private EntitySheep sheepHandle; + + public VersionedSheep(Entity entityHandle, + KelpEntityType entityType, + Location initialLocation, + EntityTypeVersionTemplate entityTypeVersionTemplate, + ReflectionUtil reflectionUtil) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, reflectionUtil); + this.sheepHandle = (EntitySheep) entityHandle; + } + + @Override + public boolean isSheared() { + return sheepHandle.isSheared(); + } + + @Override + public SheepEntity setSheared(boolean sheared) { + sheepHandle.setSheared(sheared); + return this; + } + +} From 12e1a57f8cdd711611e15b4358dda443061a59e9 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:51:15 +0200 Subject: [PATCH 214/325] Implement non-living entities --- .../entity/type/VersionedArrow.java | 61 +++++++++++ .../entity/type/VersionedBoat.java | 28 +++++ .../type/VersionedCommandMinecartEntity.java | 31 ++++++ .../entity/type/VersionedItemFrame.java | 101 ++++++++++++++++++ 4 files changed, 221 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArrow.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedBoat.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCommandMinecartEntity.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedItemFrame.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArrow.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArrow.java new file mode 100644 index 00000000..7b93e0e4 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArrow.java @@ -0,0 +1,61 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import com.google.common.collect.ImmutableList; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.ArrowEntity; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedAbstractArrow; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +import java.util.List; + +public class VersionedArrow extends VersionedAbstractArrow implements ArrowEntity { + + public VersionedArrow(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + + @Override + public ArrowEntity addCustomEffect(Class effect, int tier) { + return this; + } + + @Override + public boolean hasCustomEffect(Class effect) { + return false; + } + + @Override + public ArrowEntity removeCustomEffect(Class effect) { + return this; + } + + @Override + public ArrowEntity setColor(Color color) { + return this; + } + + @Override + public Color getColor() { + return Color.CHAT_DARK_RED; + } + + @Override + public List> getCustomEffects() { + return ImmutableList.of(); + } + + @Override + public boolean hasCustomEffects() { + return false; + } + + @Override + public int getCustomEffectTier(Class effect) { + return 0; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedBoat.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedBoat.java new file mode 100644 index 00000000..f3671ec1 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedBoat.java @@ -0,0 +1,28 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.BoatEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.material.KelpMaterial; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedVehicle; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedBoat extends VersionedVehicle implements BoatEntity { + + public VersionedBoat(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + + // no types other than oak allowed + @Override + public KelpMaterial getBoatType() { + return KelpMaterial.OAK_BOAT; + } + + @Override + public BoatEntity setBoatType(KelpMaterial boatType) { + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCommandMinecartEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCommandMinecartEntity.java new file mode 100644 index 00000000..d7abfbd6 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCommandMinecartEntity.java @@ -0,0 +1,31 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.CommandMinecartEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedAbstractMinecart; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftMinecartCommand; + +public class VersionedCommandMinecartEntity extends VersionedAbstractMinecart implements CommandMinecartEntity { + + CraftMinecartCommand craftMinecart; + + public VersionedCommandMinecartEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.craftMinecart = (CraftMinecartCommand) entityHandle.getBukkitEntity(); + } + + @Override + public String getCommand() { + return craftMinecart.getCommand(); + } + + @Override + public CommandMinecartEntity setCommand(String command) { + craftMinecart.setCommand(command); + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedItemFrame.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedItemFrame.java new file mode 100644 index 00000000..a8ec01ad --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedItemFrame.java @@ -0,0 +1,101 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.ItemFrameEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.entity.version.EntityVersionTemplate; +import de.pxav.kelp.core.inventory.item.KelpItem; +import de.pxav.kelp.core.reflect.ReflectionUtil; +import de.pxav.kelp.implementation1_8.entity.FixedItemFrameListener; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedHangingEntity; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityItemFrame; +import org.bukkit.Location; +import org.bukkit.Rotation; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftHorse; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftItemFrame; +import org.bukkit.entity.Item; + +public class VersionedItemFrame extends VersionedHangingEntity implements ItemFrameEntity { + + private CraftItemFrame craftItemFrame; + private EntityItemFrame itemFrameHandle; + private ReflectionUtil reflectionUtil; + private FixedItemFrameListener fixedItemFrame; + + public VersionedItemFrame(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, ReflectionUtil reflectionUtil, FixedItemFrameListener fixedItemFrame) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.craftItemFrame = (CraftItemFrame) entityHandle.getBukkitEntity(); + this.itemFrameHandle = (EntityItemFrame) entityHandle; + this.reflectionUtil = reflectionUtil; + this.fixedItemFrame = fixedItemFrame; + } + + @Override + public Rotation getItemRotation() { + return craftItemFrame.getRotation(); + } + + @Override + public ItemFrameEntity setItemRotation(Rotation rotation) { + craftItemFrame.setRotation(rotation); + return this; + } + + // not natively available before 1.16 + @Override + public ItemFrameEntity setFixed(boolean fixed) { + if (fixed) { + this.fixedItemFrame.fixItemFrame(this); + } else { + this.fixedItemFrame.unfixItemFrame(this); + } + return this; + } + + @Override + public boolean isFixed() { + return this.fixedItemFrame.isItemFrameFixed(this); + } + + @Override + public ItemFrameEntity setVisible(boolean visible) { + return this; + } + + // not available before 1.16 + @Override + public boolean isVisible() { + return true; + } + + @Override + public KelpItem getItem() { + return KelpItem.from(craftItemFrame.getItem()); + } + + @Override + public ItemFrameEntity setItem(KelpItem item) { + craftItemFrame.setItem(item.getItemStack()); + return this; + } + + @Override + public ItemFrameEntity setItemAndPlayPlacementSound(KelpItem item) { + //todo placement sound not available before 1.9. + //maybe simply add a block placement sound here? + return this; + } + + @Override + public double getItemDropChance() { + return (double) ((float) reflectionUtil.getValue(itemFrameHandle, "c")) ; + } + + @Override + public ItemFrameEntity setItemDropChance(double itemDropChance) { + reflectionUtil.setValue(itemFrameHandle, "c", (float) itemDropChance); + return this; + } + +} From d5510f1572bf77873aabf02f69c75049c98b48e2 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:51:36 +0200 Subject: [PATCH 215/325] Implement monster entities --- .../entity/type/VersionedBlazeEntity.java | 16 +++++ .../entity/type/VersionedCaveSpider.java | 15 +++++ .../entity/type/VersionedElderGuardian.java | 16 +++++ .../entity/type/VersionedGuardian.java | 18 +++++ .../entity/type/VersionedSkeleton.java | 16 +++++ .../entity/type/VersionedSpider.java | 16 +++++ .../entity/type/VersionedWitherEntity.java | 8 +++ .../entity/type/VersionedZombie.java | 16 +++++ .../entity/type/VersionedZombieVillager.java | 65 +++++++++++++++++++ 9 files changed, 186 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedBlazeEntity.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCaveSpider.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedElderGuardian.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedGuardian.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSkeleton.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSpider.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWitherEntity.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombie.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieVillager.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedBlazeEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedBlazeEntity.java new file mode 100644 index 00000000..13c94f84 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedBlazeEntity.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.BlazeEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedMonster; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedBlazeEntity extends VersionedMonster implements BlazeEntity { + + public VersionedBlazeEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCaveSpider.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCaveSpider.java new file mode 100644 index 00000000..20c1c891 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCaveSpider.java @@ -0,0 +1,15 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.CaveSpiderEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedCaveSpider extends VersionedSpider implements CaveSpiderEntity { + + public VersionedCaveSpider(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedElderGuardian.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedElderGuardian.java new file mode 100644 index 00000000..5ef6ad80 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedElderGuardian.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityGuardian; +import org.bukkit.Location; + +public class VersionedElderGuardian extends VersionedGuardian { + + public VersionedElderGuardian(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + ((EntityGuardian)entityHandle).setElder(true); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedGuardian.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedGuardian.java new file mode 100644 index 00000000..7d2380bf --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedGuardian.java @@ -0,0 +1,18 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.GuardianEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.entity.version.EntityVersionTemplate; +import de.pxav.kelp.core.entity.version.LivingEntityVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedMonster; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedGuardian extends VersionedMonster implements GuardianEntity { + + public VersionedGuardian(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSkeleton.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSkeleton.java new file mode 100644 index 00000000..1cc9a9b5 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSkeleton.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.SkeletonEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedMobileEntity; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedSkeleton extends VersionedMobileEntity implements SkeletonEntity { + + public VersionedSkeleton(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSpider.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSpider.java new file mode 100644 index 00000000..2a651ff3 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSpider.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.SpiderEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedMonster; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedSpider extends VersionedMonster implements SpiderEntity { + + public VersionedSpider(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWitherEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWitherEntity.java new file mode 100644 index 00000000..66ff86a7 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWitherEntity.java @@ -0,0 +1,8 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +public class VersionedWitherEntity { + + static { + + } +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombie.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombie.java new file mode 100644 index 00000000..8d49ba9b --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombie.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.ZombieEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedAgeable; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedZombie extends VersionedAgeable implements ZombieEntity { + + public VersionedZombie(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieVillager.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieVillager.java new file mode 100644 index 00000000..019d9e4b --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieVillager.java @@ -0,0 +1,65 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.ZombieVillagerEntity; +import de.pxav.kelp.core.entity.util.VillagerProfession; +import de.pxav.kelp.core.entity.util.VillagerType; +import de.pxav.kelp.core.entity.version.EntityConstantsVersionTemplate; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.reflect.ReflectionUtil; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityZombie; +import org.bukkit.Location; + +public class VersionedZombieVillager extends VersionedZombie implements ZombieVillagerEntity { + + private EntityConstantsVersionTemplate entityConstantsVersionTemplate; + private EntityZombie zombieHandle; + private ReflectionUtil reflectionUtil; + + public VersionedZombieVillager(Entity entityHandle, + KelpEntityType entityType, + Location initialLocation, + EntityTypeVersionTemplate entityTypeVersionTemplate, + EntityConstantsVersionTemplate entityConstantsVersionTemplate, + ReflectionUtil reflectionUtil) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.entityConstantsVersionTemplate = entityConstantsVersionTemplate; + this.zombieHandle = (EntityZombie) entityHandle; + this.reflectionUtil = reflectionUtil; + zombieHandle.setVillager(true); + } + + @Override + public ZombieVillagerEntity setConversionTime(int conversionTime) { + reflectionUtil.setValue(zombieHandle, "bn", conversionTime); + return this; + } + + @Override + public ZombieVillagerEntity setVillagerType(VillagerType villagerType) { + return this; + } + + @Override + public ZombieVillagerEntity setVillagerProfession(VillagerProfession villagerProfession) { + return this; + } + + @Override + public int getConversionTime() { + return (int) reflectionUtil.getValue(zombieHandle, "bn"); + } + + @Override + public VillagerType getVillagerType() { + return VillagerType.NONE; + } + + // zombie villagers have no profession in 1.8 + @Override + public VillagerProfession getVillagerProfession() { + return VillagerProfession.NONE; + } + +} From 598f5857d1a6926c298b19b378760ae284cb1727 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:51:50 +0200 Subject: [PATCH 216/325] Implement simple storage minecart --- .../entity/type/VersionedStorageMinecart.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedStorageMinecart.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedStorageMinecart.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedStorageMinecart.java new file mode 100644 index 00000000..5c2999a2 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedStorageMinecart.java @@ -0,0 +1,33 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.StorageMinecart; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.type.StorageInventory; +import de.pxav.kelp.core.inventory.version.InventoryVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedAbstractMinecart; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftMinecartChest; + +public class VersionedStorageMinecart extends VersionedAbstractMinecart implements StorageMinecart { + + private CraftMinecartChest craftMinecart; + private InventoryVersionTemplate inventoryVersionTemplate; + + public VersionedStorageMinecart(Entity entityHandle, + KelpEntityType entityType, + Location initialLocation, + EntityTypeVersionTemplate entityTypeVersionTemplate, + InventoryVersionTemplate inventoryVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + craftMinecart = (CraftMinecartChest) entityHandle.getBukkitEntity(); + this.inventoryVersionTemplate = inventoryVersionTemplate; + } + + @Override + public StorageInventory getInventory() { + return inventoryVersionTemplate.getStorageInventory(craftMinecart.getInventory()); + } + +} From 8eca32b33bcad0e3f6605f8b91c23db22c06b04a Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:52:14 +0200 Subject: [PATCH 217/325] Add a listener class handling fixed item frames in older versions --- .../entity/FixedItemFrameListener.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/FixedItemFrameListener.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/FixedItemFrameListener.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/FixedItemFrameListener.java new file mode 100644 index 00000000..fbf26367 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/FixedItemFrameListener.java @@ -0,0 +1,40 @@ +package de.pxav.kelp.implementation1_8.entity; + +import com.google.common.collect.Sets; +import de.pxav.kelp.core.entity.type.ItemFrameEntity; +import org.bukkit.entity.ItemFrame; +import org.bukkit.event.EventHandler; +import org.bukkit.event.player.PlayerInteractEntityEvent; + +import javax.inject.Singleton; +import java.util.Collection; +import java.util.Set; + +@Singleton +public class FixedItemFrameListener { + + private Set fixedItemFrames = Sets.newHashSet(); + + @EventHandler + public void handleItemFrameInteract(PlayerInteractEntityEvent event) { + if (!(event.getRightClicked() instanceof ItemFrame)) { + return; + } + + //todo implement logic + + } + + public boolean isItemFrameFixed(ItemFrameEntity itemFrameEntity) { + return fixedItemFrames.contains(itemFrameEntity); + } + + public void fixItemFrame(ItemFrameEntity itemFrameEntity) { + this.fixedItemFrames.add(itemFrameEntity); + } + + public void unfixItemFrame(ItemFrameEntity itemFrameEntity) { + this.fixedItemFrames.remove(itemFrameEntity); + } + +} From 2b32778824547f955542429b616f3ab855a9a9ed Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:52:38 +0200 Subject: [PATCH 218/325] Implement storage inventory classes --- .../VersionedAbstractHorseInventory.java | 24 + .../inventory/VersionedHorseInventory.java | 25 + .../inventory/VersionedStorageInventory.java | 505 ++++++++++++++++++ 3 files changed, 554 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedAbstractHorseInventory.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedHorseInventory.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedStorageInventory.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedAbstractHorseInventory.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedAbstractHorseInventory.java new file mode 100644 index 00000000..ea8feab3 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedAbstractHorseInventory.java @@ -0,0 +1,24 @@ +package de.pxav.kelp.implementation1_8.inventory; + +import de.pxav.kelp.core.inventory.item.KelpItem; +import de.pxav.kelp.core.inventory.type.AbstractHorseInventory; +import org.bukkit.inventory.Inventory; + +public class VersionedAbstractHorseInventory> extends VersionedStorageInventory implements AbstractHorseInventory { + + public VersionedAbstractHorseInventory(Inventory inventory) { + super(inventory); + } + + @Override + public KelpItem getSaddle() { + return getItemAt(0); + } + + @Override + public T setSaddle(KelpItem saddleItem) { + setItem(saddleItem.slot(1)); + return (T) this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedHorseInventory.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedHorseInventory.java new file mode 100644 index 00000000..d10644e1 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedHorseInventory.java @@ -0,0 +1,25 @@ +package de.pxav.kelp.implementation1_8.inventory; + +import de.pxav.kelp.core.inventory.item.KelpItem; +import de.pxav.kelp.core.inventory.type.HorseInventory; +import org.bukkit.inventory.Inventory; + +public class VersionedHorseInventory + extends VersionedAbstractHorseInventory + implements HorseInventory { + + public VersionedHorseInventory(Inventory inventory) { + super(inventory); + } + + @Override + public KelpItem getArmor() { + return null; + } + + @Override + public HorseInventory setArmor(KelpItem armorItem) { + return null; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedStorageInventory.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedStorageInventory.java new file mode 100644 index 00000000..2c2d9cd7 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedStorageInventory.java @@ -0,0 +1,505 @@ +package de.pxav.kelp.implementation1_8.inventory; + +import com.google.common.collect.Lists; +import de.pxav.kelp.core.entity.LivingKelpEntity; +import de.pxav.kelp.core.inventory.item.KelpItem; +import de.pxav.kelp.core.inventory.material.KelpMaterial; +import de.pxav.kelp.core.inventory.material.MaterialContainer; +import de.pxav.kelp.core.inventory.type.InventoryOwner; +import de.pxav.kelp.core.inventory.type.StorageInventory; +import de.pxav.kelp.core.version.Versioned; +import net.minecraft.server.v1_8_R3.IInventory; +import net.minecraft.server.v1_8_R3.ItemStack; +import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack; +import org.bukkit.inventory.Inventory; + +import java.util.Collection; + +/** + * This class implements all version specific actions performed + * on a {@link org.bukkit.inventory.PlayerInventory}. + * + * @author pxav + */ +@Versioned +public class VersionedStorageInventory> implements StorageInventory { + + protected IInventory inventoryHandle; + private CraftInventory inventory; + + public VersionedStorageInventory(Inventory inventory) { + this.inventory = (CraftInventory) inventory; + this.inventoryHandle = ((CraftInventory)inventory).getInventory(); + } + + @Override + public T addItem(KelpItem... items) { + for (KelpItem item : items) { + inventory.addItem(item.getItemStack()); + } + return null; + } + + @Override + public Collection allItemsWith(KelpMaterial material) { + MaterialContainer container = KelpMaterial.convert(material); + Collection output = Lists.newArrayList(); + + for (ItemStack mcItem : inventoryHandle.getContents()) { + org.bukkit.inventory.ItemStack itemStack = CraftItemStack.asBukkitCopy(mcItem); + if (itemStack.getType() == container.getBukkitMaterial()) { + if (container.getSubId() != 0 && itemStack.getDurability() != container.getSubId()) { + continue; + } + output.add(KelpItem.from(itemStack)); + } + } + return output; + } + + @Override + public Collection allItemsWith(KelpItem item) { + Collection output = Lists.newArrayList(); + + for (ItemStack mcItem : inventoryHandle.getContents()) { + org.bukkit.inventory.ItemStack itemStack = CraftItemStack.asBukkitCopy(mcItem); + KelpItem currentItem = KelpItem.from(itemStack); + if (currentItem.equals(item)) { + output.add(currentItem); + } + } + return output; + } + + @Override + public T clear() { + for (int i = 0; i < inventoryHandle.getSize(); i++) { + remove(i); + } + return (T) this; + } + + @Override + public T remove(int slot) { + inventoryHandle.setItem(slot, null); + return (T) this; + } + + @Override + public boolean contains(KelpItem item) { + return getAllItems().contains(item); + } + + @Override + public boolean contains(KelpMaterial material) { + for (KelpItem item : getAllItems()) { + if (item.getMaterial() == material) { + return true; + } + } + return false; + } + + @Override + public boolean containsAtLeast(KelpMaterial material, int minimumAmount) { + int totalAmount = 0; + for (KelpItem item : getAllItems()) { + if (item.getMaterial() == material) { + if ((item.getAmount() + totalAmount) >= minimumAmount) { + return true; + } + totalAmount += item.getAmount(); + } + } + return false; + } + + @Override + public boolean containsAtLeast(KelpItem sourceItem, int combinedMinimumAmount) { + int totalAmount = 0; + for (KelpItem item : getAllItems()) { + if (item.equals(sourceItem)) { + if ((item.getAmount() + totalAmount) >= combinedMinimumAmount) { + return true; + } + totalAmount += item.getAmount(); + } + } + return false; + } + + @Override + public int first(KelpItem item) { + for (int i = 0; i < inventory.getSize(); i++) { + if (getItemAt(i).equals(item)) { + return i; + } + } + return -1; + } + + @Override + public int first(KelpMaterial material) { + for (int i = 0; i < inventory.getSize(); i++) { + if (getItemAt(i).getMaterial().equals(material)) { + return i; + } + } + return 0; + } + + @Override + public int firstEmptySlot() { + for (int i = 0; i < getSize(); i++) { + if (inventoryHandle.getItem(i) == null) { + return i; + } + } + return -1; + } + + @Override + public Collection getAllItems() { + Collection output = Lists.newArrayList(); + for (int slot = 0; slot < inventoryHandle.getSize(); slot++) { + org.bukkit.inventory.ItemStack craftItemStack = CraftItemStack.asBukkitCopy(inventoryHandle.getItem(slot)); + output.add(KelpItem.from(craftItemStack).slot(slot)); + } + return output; + } + + @Override + public Collection getStorageItems() { + return null; + } + + @Override + public InventoryOwner getInventoryOwner() { + return InventoryOwner.from(inventoryHandle.getOwner()); + } + + @Override + public KelpItem getItemAt(int slot) { + org.bukkit.inventory.ItemStack itemStack = CraftItemStack.asBukkitCopy(inventoryHandle.getItem(slot)); + return KelpItem.from(itemStack); + } + + @Override + public int getMaxStackSize() { + return inventory.getMaxStackSize(); + } + + @Override + public int getSize() { + return inventory.getSize(); + } + + @Override + public Collection> getViewers() { + return null; + } + + @Override + public boolean isEmpty() { + return inventoryHandle.getContents().length == 0; + } + + @Override + public T remove(KelpItem item) { + return null; + } + + @Override + public T remove(KelpMaterial material) { + return null; + } + + @Override + public T setAllItems(Collection items) { + return null; + } + + @Override + public T setItem(KelpItem item) { + ItemStack itemStack = CraftItemStack.asNMSCopy(item.getItemStack()); + inventoryHandle.setItem(item.getSlot(), itemStack); + return null; + } + + @Override + public T setMaxStackSize(int maxStackSize) { + inventoryHandle.setMaxStackSize(maxStackSize); + return null; + } + + @Override + public T setAllStorageItems(Collection items) { + return null; + } + + @Override + public Inventory getBukkitInventory() { + return inventory; + } + + // /** +// * Gets all items stored in this player inventory. This includes +// * all slots (main storage, armor and hot bar). +// * +// * @param player The player to get the items of. +// * @return A set of all items that are currently in the player's inventory. +// */ +// @Override +// public Set getItems(Player player) { +// Set result = Sets.newHashSet(); +// for (int i = 0; i < 41; i++) { +// ItemStack itemStack = player.getInventory().getItem(i); +// if (itemStack != null) { +// result.add(KelpItem.from(itemStack).slot(i)); +// } +// } +// return result; +// } +// +// /** +// * Gets all items stored in the player's hotbar. The hotbar +// * are the first nine slots of a player's inventory (0-8) and it +// * is always visible at the screen, although the inventory is closed. +// * +// * @param player The player to get the hotbar items of +// * @return A set of all items stored in the player's hotbar. +// */ +// @Override +// public Set getHotBarItems(Player player) { +// Set result = Sets.newHashSet(); +// for (int i = 0; i < 9; i++) { +// ItemStack item = player.getInventory().getItem(i); +// if (item != null) { +// result.add(KelpItem.from(item).slot(i)); +// } +// } +// return result; +// } +// +// /** +// * Gets an item at a specific slot. The slot count starts at the +// * first hotbar slot from 0-8 and then goes on from the uppermost +// * line of the main storage. +// * +// * If there is no item at the given slot, {@code null} will be returned. +// * +// * @param player The player to get the item of. +// * @param slot The slot of the item you want to get. +// * @return The item stored at the given slot in the player inventory. +// */ +// @Override +// public KelpItem getItemAt(Player player, int slot) { +// ItemStack itemStack = player.getInventory().getItem(slot); +// return itemStack == null ? null : KelpItem.from(itemStack); +// } +// +// /** +// * Gets the helmet the player is currently wearing. +// * Unlike the other armor parts, the helmet can also be of +// * materials other than normal helmets, but also banners and some +// * blocks. +// * +// * If the player has no helmet, {@code null} will be returned. +// * +// * @param player The player to get the helmet of. +// * @return The item representing the player's helmet. +// */ +// @Override +// public KelpItem getHelmet(Player player) { +// ItemStack itemStack = player.getInventory().getHelmet(); +// return itemStack == null ? null : KelpItem.from(itemStack); +// } +// +// /** +// * Gets the chest plate the player is currently wearing. +// * +// * If the player has no chest plate, {@code null} will be returned. +// * +// * @param player The player to get the chest plate of. +// * @return The item representing the player's chest plate. +// */ +// @Override +// public KelpItem getChestPlate(Player player) { +// ItemStack itemStack = player.getInventory().getChestplate(); +// return itemStack == null ? null : KelpItem.from(itemStack); +// } +// +// /** +// * Gets the leggings the player is currently wearing. +// * +// * If the player has no leggings, {@code null} will be returned. +// * +// * @param player The player to get the leggings of. +// * @return The item representing the player's chest plate. +// */ +// @Override +// public KelpItem getLeggings(Player player) { +// ItemStack itemStack = player.getInventory().getLeggings(); +// return itemStack == null ? null : KelpItem.from(itemStack); +// } +// +// /** +// * Gets the boots the player is currently wearing. +// * +// * If the player has no boots, {@code null} will be returned. +// * +// * @param player The player to get the boots of. +// * @return The item representing the player's chest plate. +// */ +// @Override +// public KelpItem getBoots(Player player) { +// ItemStack itemStack = player.getInventory().getBoots(); +// return itemStack == null ? null : KelpItem.from(itemStack); +// } +// +// /** +// * Sets the helmet the player is wearing to the given item. +// * Specifically for helmets, you can not only use the normal armor items +// * such as leather helmet, gold helmet, etc. but also blocks, heads or banners +// * to set them as a player head. +// * +// * @param player The player to set the helmet of. +// * @param item The item of the helmet you want to set. This can be +// * a normal armor helmet or any banner, head or even some blocks. +// */ +// @Override +// public void setHelmet(Player player, KelpItem item) { +// player.getInventory().setHelmet(item.getItemStack()); +// } +// +// /** +// * Sets the chest plate of the player owning this inventory. +// * Unlike in the helmet method, you cannot pass other item materials +// * than chest plates here. +// * +// * @param player The player to set the chest plate of. +// * @param item The chest plate item you want to set. +// */ +// @Override +// public void setChestPlate(Player player, KelpItem item) { +// player.getInventory().setChestplate(item.getItemStack()); +// } +// +// /** +// * Sets the leggings of the player owning this inventory. +// * Unlike in the helmet method, you cannot pass other item materials +// * than leggings here. +// * +// * @param player The player to set the leggings of. +// * @param item The leggings item you want to set. +// */ +// @Override +// public void setLeggings(Player player, KelpItem item) { +// player.getInventory().setLeggings(item.getItemStack()); +// } +// +// /** +// * Sets the boots of the player owning this inventory. +// * Unlike in the helmet method, you cannot pass other item materials +// * than boots here. +// * +// * @param player The player to set the boots of. +// * @param item The chest plate item you want to set. +// */ +// @Override +// public void setBoots(Player player, KelpItem item) { +// player.getInventory().setBoots(item.getItemStack()); +// } +// +// /** +// * Adds a new item to the player's inventory. +// * This method won't overwrite any existing items, but try to find free +// * space in the inventory. If there is already a {@link KelpItem} with +// * the same data (same display name, item description, material, tags, etc.) +// * and this item has not yet exceeded its maximum stack size, it will add +// * the item to an existing stack. +// * +// * @param player The player to add the item to. +// * @param item The item to add. +// */ +// @Override +// public void addItem(Player player, KelpItem item) { +// player.getInventory().addItem(item.getItemStack()); +// } +// +// /** +// * Stores an item in the player inventory at the given slot location. +// * If there already is an item present at the given location, this +// * item will be overwritten. If you want to avoid this and rather +// * search for free inventory space use {@link #addItem(Player, KelpItem)} instead. +// * +// * @param player The player to set the item to. +// * @param slot The slot to store the item at. +// * @param item The item to store at the given slot. +// */ +// @Override +// public void setItem(Player player, int slot, KelpItem item) { +// player.getInventory().setItem(slot, item.getItemStack()); +// } +// +// /** +// * Gets the item that is currently stored in the player's +// * main hand (the player's right hand). +// * +// * If the player has no item in hand, {@code null} will be returned. +// * +// * @param player The player to get the main hand item of. +// * @return The item the player is holding right now. +// */ +// @Override +// public KelpItem getItemInHand(Player player) { +// ItemStack itemStack = player.getInventory().getItemInHand(); +// return itemStack == null ? null : KelpItem.from(itemStack); +// } +// +// /** +// * Sets the item in the player's main hand (the player's right hand). +// * +// * Unlike the off hand, the main hand can be used in all server versions. +// * +// * @param player The player to set the main hand item of. +// * @param item The item to set in the player's main hand. +// */ +// @Override +// public void setItemInHand(Player player, KelpItem item) { +// player.setItemInHand(item.getItemStack()); +// } +// +// /** +// * Gets the item that is currently in the player's off hand +// * (the player's left hand). +// * +// * Please note that off hands were introduced in {code MC 1.9} and are +// * therefore not available on 1.8 servers. But this method won't throw +// * an error if you do it anyways. +// * +// * If the player has no item in his off hand, {@code null} will be returned. +// * +// * @param player The player to get the off hand item of. +// * @return The item that is stored in the player's off hand right now. +// */ +// @Override +// public KelpItem getItemInOffHand(Player player) { +// return null; +// } +// +// /** +// * Sets the item in the player's off hand (the player's left hand). +// * +// * Please note that off hands were introduced in {code MC 1.9} and are +// * therefore not available on 1.8 servers. But this method won't throw +// * an error if you do it anyways. +// * +// * @param player The player to set the off hand item of. +// * @param item The item to set in the player's off hand. +// */ +// @Override +// public void setItemInOffHand(Player player, KelpItem item) {} + +} From 986a6814a25e4b45092c0dc3594834b9aefec656 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:52:57 +0200 Subject: [PATCH 219/325] Implement new player inventory --- .../inventory/VersionedPlayerInventory.java | 363 +++++++----------- 1 file changed, 138 insertions(+), 225 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedPlayerInventory.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedPlayerInventory.java index 218e8aae..9d65fdec 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedPlayerInventory.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedPlayerInventory.java @@ -1,280 +1,193 @@ package de.pxav.kelp.implementation1_8.inventory; -import com.google.common.collect.Sets; +import de.pxav.kelp.core.common.ConcurrentSetMultimap; import de.pxav.kelp.core.inventory.item.KelpItem; -import de.pxav.kelp.core.inventory.version.PlayerInventoryVersionTemplate; -import de.pxav.kelp.core.version.Versioned; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; +import de.pxav.kelp.core.inventory.type.KelpInventory; +import de.pxav.kelp.core.inventory.type.PlayerInventory; +import de.pxav.kelp.core.inventory.version.StorageInventoryVersionTemplate; +import de.pxav.kelp.core.inventory.widget.GroupedWidget; +import de.pxav.kelp.core.inventory.widget.SimplePagination; +import de.pxav.kelp.core.inventory.widget.SimpleWidget; +import de.pxav.kelp.core.player.KelpPlayer; -import java.util.Set; +import java.util.UUID; -/** - * This class implements all version specific actions performed - * on a {@link org.bukkit.inventory.PlayerInventory}. - * - * @author pxav - */ -@Versioned -public class VersionedPlayerInventory extends PlayerInventoryVersionTemplate { +public class VersionedPlayerInventory extends VersionedStorageInventory implements PlayerInventory { - /** - * Gets all items stored in this player inventory. This includes - * all slots (main storage, armor and hot bar). - * - * @param player The player to get the items of. - * @return A set of all items that are currently in the player's inventory. - */ - @Override - public Set getItems(Player player) { - Set result = Sets.newHashSet(); - for (int i = 0; i < 41; i++) { - ItemStack itemStack = player.getInventory().getItem(i); - if (itemStack != null) { - result.add(KelpItem.from(itemStack).slot(i)); - } - } - return result; - } + // the version template used for player inventory manipulation + private StorageInventoryVersionTemplate versionTemplate; - /** - * Gets all items stored in the player's hotbar. The hotbar - * are the first nine slots of a player's inventory (0-8) and it - * is always visible at the screen, although the inventory is closed. - * - * @param player The player to get the hotbar items of - * @return A set of all items stored in the player's hotbar. - */ - @Override - public Set getHotBarItems(Player player) { - Set result = Sets.newHashSet(); - for (int i = 0; i < 9; i++) { - ItemStack item = player.getInventory().getItem(i); - if (item != null) { - result.add(KelpItem.from(item).slot(i)); - } - } - return result; - } + // the owner of this inventory + private KelpPlayer player; - /** - * Gets an item at a specific slot. The slot count starts at the - * first hotbar slot from 0-8 and then goes on from the uppermost - * line of the main storage. - * - * If there is no item at the given slot, {@code null} will be returned. - * - * @param player The player to get the item of. - * @param slot The slot of the item you want to get. - * @return The item stored at the given slot in the player inventory. - */ - @Override - public KelpItem getItemAt(Player player, int slot) { - ItemStack itemStack = player.getInventory().getItem(slot); - return itemStack == null ? null : KelpItem.from(itemStack); - } + // all widgets currently stored by all players on the server. + // the uuid represents the player uuid who owns the widget. + private static ConcurrentSetMultimap simpleWidgets = ConcurrentSetMultimap.create(); + private static ConcurrentSetMultimap groupedWidgets = ConcurrentSetMultimap.create(); /** - * Gets the helmet the player is currently wearing. - * Unlike the other armor parts, the helmet can also be of - * materials other than normal helmets, but also banners and some - * blocks. - * - * If the player has no helmet, {@code null} will be returned. + * Adds a new {@link SimpleWidget} to the player's inventory. + * This method does not immediately render the widget, but only + * adds it to the cache. To make the widget appear, call + * {@link #updateWidgets()} first. * - * @param player The player to get the helmet of. - * @return The item representing the player's helmet. + * @param simpleWidget The simple widget you want to add to the inventory. + * @return An instance of the current inventory for fluent builder design. */ - @Override - public KelpItem getHelmet(Player player) { - ItemStack itemStack = player.getInventory().getHelmet(); - return itemStack == null ? null : KelpItem.from(itemStack); + public PlayerInventory addWidget(SimpleWidget simpleWidget) { + simpleWidgets.put(player.getUUID(), simpleWidget); + return this; } /** - * Gets the chest plate the player is currently wearing. + * Adds a new {@link GroupedWidget} to the player's inventory. + * This method does not immediately render the widget, but only + * adds it to the cache. To make the widget appear, call + * {@link #updateWidgets()} first. * - * If the player has no chest plate, {@code null} will be returned. - * - * @param player The player to get the chest plate of. - * @return The item representing the player's chest plate. + * @param groupedWidget The grouped widget you want to add to the inventory. + * @return An instance of the current inventory for fluent builder design. */ - @Override - public KelpItem getChestPlate(Player player) { - ItemStack itemStack = player.getInventory().getChestplate(); - return itemStack == null ? null : KelpItem.from(itemStack); + public PlayerInventory addWidget(GroupedWidget groupedWidget) { + groupedWidgets.put(player.getUUID(), groupedWidget); + return this; } /** - * Gets the leggings the player is currently wearing. - * - * If the player has no leggings, {@code null} will be returned. + * Removes all {@link SimpleWidget simple widgets} of a certain type. + * This method removes the widget from the cache as well as the inventory, + * so that no items are there anymore. * - * @param player The player to get the leggings of. - * @return The item representing the player's chest plate. + * @param widgetClass The class of the widget type you want to remove. + * If you pass {@code ToggleableWidget.class} here, + * all {@link de.pxav.kelp.core.inventory.widget.ToggleableWidget ToggleableWidgets} + * will be removed from the inventory. + * @return An instance of the current inventory for fluent builder design. */ - @Override - public KelpItem getLeggings(Player player) { - ItemStack itemStack = player.getInventory().getLeggings(); - return itemStack == null ? null : KelpItem.from(itemStack); + public PlayerInventory removeSimpleWidget(Class widgetClass) { + simpleWidgets.get(player.getUUID()).forEach(widget -> { + if (widgetClass.getName().equalsIgnoreCase(widget.getClass().getName())) { + removeWidget(widget); + } + }); + return this; } /** - * Gets the boots the player is currently wearing. - * - * If the player has no boots, {@code null} will be returned. + * Removes all {@link GroupedWidget grouped widgets} of a certain type. + * This method removes the widget from the cache as well as the inventory, + * so that no items are there anymore. * - * @param player The player to get the boots of. - * @return The item representing the player's chest plate. + * @param widgetClass The class of the widget type you want to remove. + * If you pass {@code Pagination.class} here, + * all {@link SimplePagination Paginations} + * will be removed from the inventory. + * @return An instance of the current inventory for fluent builder design. */ - @Override - public KelpItem getBoots(Player player) { - ItemStack itemStack = player.getInventory().getBoots(); - return itemStack == null ? null : KelpItem.from(itemStack); + public PlayerInventory removeGroupedWidget(Class widgetClass) { + groupedWidgets.get(player.getUUID()).forEach(widget -> { + if (widgetClass.getName().equalsIgnoreCase(widget.getClass().getName())) { + removeWidget(widget); + } + }); + return this; } /** - * Sets the helmet the player is wearing to the given item. - * Specifically for helmets, you can not only use the normal armor items - * such as leather helmet, gold helmet, etc. but also blocks, heads or banners - * to set them as a player head. + * Removes a specific {@link SimpleWidget} from the inventory. + * This method removes the widget from the cache as well as + * the inventory itself, so there won't be any items rendered by + * this widget anymore. * - * @param player The player to set the helmet of. - * @param item The item of the helmet you want to set. This can be - * a normal armor helmet or any banner, head or even some blocks. + * @param widget The object of the widget you want to remove. + * @return An instance of the current inventory for fluent builder design. */ - @Override - public void setHelmet(Player player, KelpItem item) { - player.getInventory().setHelmet(item.getItemStack()); + public PlayerInventory removeWidget(SimpleWidget widget) { + player.getBukkitPlayer().getInventory().clear(widget.getCoveredSlot()); + widget.onRemove(); + simpleWidgets.remove(player.getUUID(), widget); + return this; } /** - * Sets the chest plate of the player owning this inventory. - * Unlike in the helmet method, you cannot pass other item materials - * than chest plates here. + * Removes a specific {@link GroupedWidget} from the inventory. + * This method removes the widget from the cache as well as + * the inventory itself, so there won't be any items rendered by + * this widget anymore. * - * @param player The player to set the chest plate of. - * @param item The chest plate item you want to set. + * @param widget The object of the widget you want to remove. + * @return An instance of the current inventory for fluent builder design. */ - @Override - public void setChestPlate(Player player, KelpItem item) { - player.getInventory().setChestplate(item.getItemStack()); + public PlayerInventory removeWidget(GroupedWidget widget) { + widget.getCoveredSlots().forEach(slot -> player.getBukkitPlayer().getInventory().clear(slot)); + widget.onRemove(); + groupedWidgets.remove(player.getUUID(), widget); + return this; } /** - * Sets the leggings of the player owning this inventory. - * Unlike in the helmet method, you cannot pass other item materials - * than leggings here. + * Removes all widgets from the player's inventory. + * This will not only remove them from the cache, but also from + * the visible inventory itself. * - * @param player The player to set the leggings of. - * @param item The leggings item you want to set. + * @return An instance of the current inventory for fluent builder design. */ - @Override - public void setLeggings(Player player, KelpItem item) { - player.getInventory().setLeggings(item.getItemStack()); + public PlayerInventory removeAllWidgets() { + simpleWidgets.getOrEmpty(player.getUUID()).forEach(this::removeWidget); + groupedWidgets.getOrEmpty(player.getUUID()).forEach(this::removeWidget); + return this; } /** - * Sets the boots of the player owning this inventory. - * Unlike in the helmet method, you cannot pass other item materials - * than boots here. + * Updates all widgets inside this player inventory. * - * @param player The player to set the boots of. - * @param item The chest plate item you want to set. - */ - @Override - public void setBoots(Player player, KelpItem item) { - player.getInventory().setBoots(item.getItemStack()); - } - - /** - * Adds a new item to the player's inventory. - * This method won't overwrite any existing items, but try to find free - * space in the inventory. If there is already a {@link KelpItem} with - * the same data (same display name, item description, material, tags, etc.) - * and this item has not yet exceeded its maximum stack size, it will add - * the item to an existing stack. + * This is also equivalent to the {@link KelpInventory#render(KelpPlayer) render method} you + * already know from KelpInventories, so call this method even if you + * have just put widgets into the inventory for the first time. * - * @param player The player to add the item to. - * @param item The item to add. + * @return An instance of the current inventory for fluent builder design. */ - @Override - public void addItem(Player player, KelpItem item) { - player.getInventory().addItem(item.getItemStack()); - } + public PlayerInventory updateWidgets() { + for (SimpleWidget current : simpleWidgets.getOrEmpty(player.getUUID())) { + if (!current.isStateful()) { + continue; + } - /** - * Stores an item in the player inventory at the given slot location. - * If there already is an item present at the given location, this - * item will be overwritten. If you want to avoid this and rather - * search for free inventory space use {@link #addItem(Player, KelpItem)} instead. - * - * @param player The player to set the item to. - * @param slot The slot to store the item at. - * @param item The item to store at the given slot. - */ - @Override - public void setItem(Player player, int slot, KelpItem item) { - player.getInventory().setItem(slot, item.getItemStack()); - } + remove(current.getCoveredSlot()); - /** - * Gets the item that is currently stored in the player's - * main hand (the player's right hand). - * - * If the player has no item in hand, {@code null} will be returned. - * - * @param player The player to get the main hand item of. - * @return The item the player is holding right now. - */ - @Override - public KelpItem getItemInHand(Player player) { - ItemStack itemStack = player.getInventory().getItemInHand(); - return itemStack == null ? null : KelpItem.from(itemStack); - } + KelpItem item = current.render(); - /** - * Sets the item in the player's main hand (the player's right hand). - * - * Unlike the off hand, the main hand can be used in all server versions. - * - * @param player The player to set the main hand item of. - * @param item The item to set in the player's main hand. - */ - @Override - public void setItemInHand(Player player, KelpItem item) { - player.setItemInHand(item.getItemStack()); - } + // if items are not explicitly stated as interactable + // cancel interactions by default + if (!item.hasTagKey("interactionAllowed")) { + item.cancelInteractions(); + } - /** - * Gets the item that is currently in the player's off hand - * (the player's left hand). - * - * Please note that off hands were introduced in {code MC 1.9} and are - * therefore not available on 1.8 servers. But this method won't throw - * an error if you do it anyways. - * - * If the player has no item in his off hand, {@code null} will be returned. - * - * @param player The player to get the off hand item of. - * @return The item that is stored in the player's off hand right now. - */ - @Override - public KelpItem getItemInOffHand(Player player) { - return null; - } + setItem(item); + } - /** - * Sets the item in the player's off hand (the player's left hand). - * - * Please note that off hands were introduced in {code MC 1.9} and are - * therefore not available on 1.8 servers. But this method won't throw - * an error if you do it anyways. - * - * @param player The player to set the off hand item of. - * @param item The item to set in the player's off hand. - */ - @Override - public void setItemInOffHand(Player player, KelpItem item) {} + for (GroupedWidget current : groupedWidgets.getOrEmpty(player.getUUID())) { + if (!current.isStateful()) { + continue; + } + + for (Integer slot : current.getCoveredSlots()) { + player.getBukkitPlayer().getInventory().clear(slot); + } + + current.render(player).forEach(item -> { + + // if items are not explicitly stated as interactable + // cancel interactions by default + if (!item.hasTagKey("interactionAllowed")) { + item.cancelInteractions(); + } + + setItem(item.getSlot(), item); + }); + } + + return this; + } } From 6b9d00b6551ecb82a970dd090aa93c4145801be0 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:53:16 +0200 Subject: [PATCH 220/325] Implement inventory conversion from bukkit to kelp storage inventory --- .../inventory/VersionedInventory.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedInventory.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedInventory.java index a6a250c4..71768a05 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedInventory.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedInventory.java @@ -1,8 +1,11 @@ package de.pxav.kelp.implementation1_8.inventory; +import de.pxav.kelp.core.inventory.type.StorageInventory; import de.pxav.kelp.core.inventory.version.InventoryVersionTemplate; import de.pxav.kelp.core.version.Versioned; import org.bukkit.Bukkit; +import org.bukkit.entity.Horse; +import org.bukkit.inventory.HorseInventory; import org.bukkit.inventory.Inventory; /** @@ -18,4 +21,13 @@ public Inventory createInventory(int size, String title) { return Bukkit.createInventory(null, size, title); } + @Override + public StorageInventory getStorageInventory(Inventory bukkitInventory) { + if (bukkitInventory instanceof HorseInventory) { + return new VersionedHorseInventory(bukkitInventory); + } + + return new VersionedStorageInventory<>(bukkitInventory); + } + } From 470777e9d242d376b1885d315bd28a10f9c5fbfe Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:53:41 +0200 Subject: [PATCH 221/325] Start implementing new kelp player --- .../player/VersionedKelpPlayer.java | 613 ++++++++++++++++++ .../player/VersionedPlayer.java | 103 --- 2 files changed, 613 insertions(+), 103 deletions(-) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java new file mode 100644 index 00000000..0f2608e3 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java @@ -0,0 +1,613 @@ +package de.pxav.kelp.implementation1_8.player; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.logger.LogLevel; +import de.pxav.kelp.core.particle.type.ParticleType; +import de.pxav.kelp.core.player.KelpPlayer; +import de.pxav.kelp.core.player.PlayerChatVisibility; +import de.pxav.kelp.core.player.bossbar.BossBarColor; +import de.pxav.kelp.core.player.bossbar.BossBarStyle; +import de.pxav.kelp.core.player.message.InteractiveMessage; +import de.pxav.kelp.core.player.message.MessageClickAction; +import de.pxav.kelp.core.player.message.MessageComponent; +import de.pxav.kelp.core.player.message.MessageHoverAction; +import de.pxav.kelp.core.player.prompt.sign.SignPromptVersionTemplate; +import de.pxav.kelp.core.reflect.ReflectionUtil; +import de.pxav.kelp.core.sidebar.type.KelpSidebar; +import de.pxav.kelp.core.sound.KelpSound; +import de.pxav.kelp.core.world.KelpLocation; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedHumanEntity; +import net.md_5.bungee.api.ChatColor; +import net.md_5.bungee.api.chat.ClickEvent; +import net.md_5.bungee.api.chat.ComponentBuilder; +import net.md_5.bungee.api.chat.HoverEvent; +import net.md_5.bungee.api.chat.TextComponent; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.Packet; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; +import org.bukkit.entity.Player; +import org.bukkit.projectiles.ProjectileSource; + +import java.net.InetSocketAddress; + +public class VersionedKelpPlayer + extends VersionedHumanEntity + implements KelpPlayer { + + public VersionedKelpPlayer(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, ReflectionUtil reflectionUtil) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, reflectionUtil); + } + + /** + * Appends a message to the given {@link ComponentBuilder}. Please note that every message you append + * using this method may only have one chat color and the formatting code applies for the entire message. + * + * @param componentBuilder The {@link ComponentBuilder} the message should be appended to. + * @param component The {@link MessageComponent} that produced this message. + * @param tempMessage The actual message to send. + * @param color The color of the message. + * @param bold Whether the message should be printed bold. + * @param italic Whether the message should be printed italic. + * @param underlined Whether the message should be underlined. + * @param strikethrough Whether the message should have a strikethrough. + * @param obfuscated Whether the message should be obfuscated/magic. + */ + private void appendComponentBuilder(ComponentBuilder componentBuilder, + MessageComponent component, + StringBuilder tempMessage, + ChatColor color, + boolean bold, + boolean italic, + boolean underlined, + boolean strikethrough, + boolean obfuscated) { + componentBuilder + .append(tempMessage.toString()) + .reset() + .color(color); + if (bold) { + componentBuilder.bold(true); + } else if (italic) { + componentBuilder.italic(true); + } else if (underlined) { + componentBuilder.underlined(true); + } else if (strikethrough) { + componentBuilder.strikethrough(true); + } else if (obfuscated) { + componentBuilder.obfuscated(true); + } + if (tempMessage.length() > 0) { + applyEvents(component, componentBuilder); + } + tempMessage.setLength(0); + } + + /** + * Applies the hover and click events contained in the {@link MessageComponent} to the {@link ComponentBuilder}. + * + * @param component The {@link MessageComponent} containing the events you want to apply. + * @param builder The {@link ComponentBuilder} the events should be applied to. + * @return The newly built {@link ComponentBuilder} containing the event data. + */ + private ComponentBuilder applyEvents(MessageComponent component, ComponentBuilder builder) { + if (component.getClickAction() == MessageClickAction.EXECUTE_COMMAND) { + builder.event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + component.getClickValue().toString())); + } + + if (component.getClickAction() == MessageClickAction.SEND_CHAT_MESSAGE) { + builder.event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, component.getClickValue().toString())); + } + + if (component.getClickAction() == MessageClickAction.CHANGE_PAGE) { + try { + // The click value is converted to an integer first in order to check if the given + // value really is an integer and then converted back into a string to be passed + // as a parameter. + builder.event(new ClickEvent(ClickEvent.Action.CHANGE_PAGE, String.valueOf(Integer.parseInt(component.getClickValue().toString())))); + } catch (NumberFormatException e) { + logger.log(LogLevel.ERROR, "Error converting click value to type INTEGER. If you selected click action CHANGE_PAGE, the click value has to be an integer."); + } + } + + if (component.getClickAction() == MessageClickAction.COPY_TO_CLIPBOARD) { + // In Spigot 1.8, this feature is not available. + } + + if (component.getClickAction() == MessageClickAction.OPEN_FILE) { + builder.event(new ClickEvent(ClickEvent.Action.OPEN_FILE, component.getClickValue().toString())); + } + + if (component.getClickAction() == MessageClickAction.OPEN_URL) { + builder.event(new ClickEvent(ClickEvent.Action.OPEN_URL, component.getClickValue().toString())); + } + + if (component.getClickAction() == MessageClickAction.SUGGEST_COMMAND) { + builder.event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, component.getClickValue().toString())); + } + + if (component.getHoverAction() == MessageHoverAction.SHOW_MESSAGE) { + builder.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, + TextComponent.fromLegacyText(component.getHoverValue().toString()))); + } + + return builder; + } + + /** + * Sends the given packet to the given player. + * + * @param packet The packet you want to send. + * @param player The player who should receive the packet. + */ + private void sendPacket(Packet packet, Player player) { + ((CraftPlayer)player).getHandle().playerConnection.sendPacket(packet); + } + + @Override + public > E launchProjectile(Class> projectileType) { + return null; + } + + @Override + public KelpPlayer removeScoreboard() { + return null; + } + + @Override + public void setSidebarInternally(KelpSidebar sidebar) { + + } + + @Override + public KelpSidebar getCurrentSidebar() { + return null; + } + + @Override + public KelpPlayer forceInventoryClose() { + return null; + } + + @Override + public KelpPlayer playSound(KelpSound sound, KelpLocation from, float volume, float pitch) { + return null; + } + + @Override + public KelpPlayer sendActionbar(String message) { + return null; + } + + @Override + public KelpPlayer sendTitle(String title, String subTitle, int fadeIn, int stay, int fadeOut) { + return null; + } + + @Override + public KelpPlayer spawnParticle(ParticleType particleType, double x, double y, double z, float offsetX, float offsetY, float offsetZ, int count, float particleData, Object generalData) { + return null; + } + + @Override + public String getName() { + return null; + } + + @Override + public KelpPlayer setHealth(int health) { + return null; + } + + @Override + public boolean isInCobweb() { + return false; + } + + @Override + public boolean isInWater() { + return false; + } + + @Override + public KelpPlayer chat(String message) { + return null; + } + + @Override + public InetSocketAddress getSocketAddress() { + return null; + } + + @Override + public boolean mayFly() { + return false; + } + + @Override + public String getDisplayName() { + return null; + } + + @Override + public KelpPlayer setDisplayName(String displayName) { + return null; + } + + @Override + public String getTabListName() { + return null; + } + + @Override + public KelpPlayer setTabListName(String tabListName) { + return null; + } + + @Override + public KelpPlayer setCompassTarget(KelpLocation target) { + return null; + } + + @Override + public KelpPlayer getCompassTarget() { + return null; + } + + @Override + public KelpPlayer kickPlayer(String kickMessage) { + return null; + } + + @Override + public boolean isSneaking() { + return false; + } + + @Override + public KelpPlayer setSneaking(boolean sneaking) { + return null; + } + + @Override + public boolean isSprinting() { + return false; + } + + @Override + public KelpPlayer setSprinting(boolean sprinting) { + return null; + } + + @Override + public boolean isSleepingIgnored() { + return false; + } + + @Override + public KelpPlayer setSleepingIgnored(boolean sleepingIgnored) { + return null; + } + + @Override + public KelpPlayer setRelativePlayerTime(long time) { + return null; + } + + @Override + public KelpPlayer setPlayerTime(long time) { + return null; + } + + @Override + public long getPlayerTime() { + return 0; + } + + @Override + public long getPlayerTimeOffset() { + return 0; + } + + @Override + public boolean isPlayerTimeRelative() { + return false; + } + + @Override + public KelpPlayer resetPlayerTime() { + return null; + } + + @Override + public float getExperience() { + return 0; + } + + @Override + public KelpPlayer setExperience(float experience) { + return null; + } + + @Override + public KelpPlayer setLevel(int level) { + return null; + } + + @Override + public int getLevel() { + return 0; + } + + @Override + public int getTotalExperience() { + return 0; + } + + @Override + public KelpPlayer setTotalExperience(int experience) { + return null; + } + + @Override + public float getExhaustionLevel() { + return 0; + } + + @Override + public KelpPlayer setExhaustionLevel(float exhaustionLevel) { + return null; + } + + @Override + public KelpPlayer setSaturationLevel(float saturationLevel) { + return null; + } + + @Override + public float getSaturationLevel() { + return 0; + } + + @Override + public int getFoodLevel() { + return 0; + } + + @Override + public KelpPlayer setFoodLevel(int foodLevel) { + return null; + } + + @Override + public KelpPlayer setAllowFlight(boolean allowed) { + return null; + } + + @Override + public KelpPlayer allowFlying() { + return null; + } + + @Override + public KelpPlayer disallowFlying() { + return null; + } + + @Override + public KelpPlayer hidePlayer(KelpPlayer toHide) { + return null; + } + + @Override + public KelpPlayer showPlayer(KelpPlayer toShow) { + return null; + } + + @Override + public boolean canSee(KelpPlayer toCheck) { + return false; + } + + @Override + public boolean isFlying() { + return false; + } + + @Override + public KelpPlayer setFlying(boolean flying) { + return null; + } + + @Override + public KelpPlayer setFlySpeed(float flySpeed) { + return null; + } + + @Override + public float getFlySpeed() { + return 0; + } + + @Override + public float getWalkSpeed() { + return 0; + } + + @Override + public KelpPlayer setWalkSpeed(float walkSpeed) { + return null; + } + + @Override + public KelpPlayer resetWalkSpeed() { + return null; + } + + @Override + public KelpPlayer setResourcePack(String url) { + return null; + } + + @Override + public KelpPlayer setResourcePack(String url, byte[] hash) { + return null; + } + + @Override + public KelpPlayer setHealthScaled(boolean scaled) { + return null; + } + + @Override + public boolean isHealthScaled() { + return false; + } + + @Override + public KelpPlayer setHealthScale(double healthScale) { + return null; + } + + @Override + public double getHealthScale() { + return 0; + } + + @Override + public KelpPlayer resetTitle() { + return null; + } + + @Override + public KelpPlayer setClientViewDistanceInternally(int clientViewDistance) { + return null; + } + + @Override + public int getClientViewDistance() { + return 0; + } + + @Override + public KelpPlayer setClientLanguageInternally(String clientLanguage) { + return null; + } + + @Override + public String getClientLanguage() { + return null; + } + + @Override + public KelpPlayer setPlayerChatVisibilityInternally(PlayerChatVisibility playerChatVisibility) { + return null; + } + + @Override + public PlayerChatVisibility getPlayerChatVisibility() { + return null; + } + + @Override + public KelpPlayer setPlayerChatColorEnabledInternally(boolean playerChatColorEnabled) { + return null; + } + + @Override + public boolean isPlayerChatColorEnabled() { + return false; + } + + @Override + public KelpPlayer setTabListHeaderAndFooter(String header, String footer) { + return null; + } + + @Override + public String getTabListFooter() { + return null; + } + + @Override + public String getTabListHeader() { + return null; + } + + @Override + public int getProtocolVersion() { + return 0; + } + + @Override + public boolean isOperator() { + return false; + } + + @Override + public KelpPlayer setOperator(boolean operator) { + return null; + } + + @Override + public KelpPlayer grantPermission(String permission) { + return null; + } + + @Override + public KelpPlayer removePermission(String permission) { + return null; + } + + @Override + public boolean hasPermission(String permission) { + return false; + } + + @Override + public boolean isBannedByBukkit() { + return false; + } + + @Override + public boolean isWhitelisted() { + return false; + } + + @Override + public KelpPlayer setWhitelisted(boolean whitelisted) { + return null; + } + + @Override + public KelpPlayer sendMessage(String message) { + return null; + } + + @Override + public KelpPlayer sendBossBar(String message, float health, BossBarColor barColor, BossBarStyle barStyle) { + return null; + } + + @Override + public KelpPlayer setBossBarProgressHealth(float health) { + return null; + } + + @Override + public KelpPlayer removeBossBar() { + return null; + } + + @Override + public KelpPlayer sendInteractiveMessage(InteractiveMessage interactiveMessage) { + return null; + } + + @Override + public Player getBukkitPlayer() { + return null; + } +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedPlayer.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedPlayer.java index bd3fd2e3..6996457f 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedPlayer.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedPlayer.java @@ -1336,109 +1336,6 @@ public void removeSidebar(Player player) { } - /** - * Appends a message to the given {@link ComponentBuilder}. Please note that every message you append - * using this method may only have one chat color and the formatting code applies for the entire message. - * - * @param componentBuilder The {@link ComponentBuilder} the message should be appended to. - * @param component The {@link MessageComponent} that produced this message. - * @param tempMessage The actual message to send. - * @param color The color of the message. - * @param bold Whether the message should be printed bold. - * @param italic Whether the message should be printed italic. - * @param underlined Whether the message should be underlined. - * @param strikethrough Whether the message should have a strikethrough. - * @param obfuscated Whether the message should be obfuscated/magic. - */ - private void appendComponentBuilder(ComponentBuilder componentBuilder, - MessageComponent component, - StringBuilder tempMessage, - ChatColor color, - boolean bold, - boolean italic, - boolean underlined, - boolean strikethrough, - boolean obfuscated) { - componentBuilder - .append(tempMessage.toString()) - .reset() - .color(color); - if (bold) { - componentBuilder.bold(true); - } else if (italic) { - componentBuilder.italic(true); - } else if (underlined) { - componentBuilder.underlined(true); - } else if (strikethrough) { - componentBuilder.strikethrough(true); - } else if (obfuscated) { - componentBuilder.obfuscated(true); - } - if (tempMessage.length() > 0) { - applyEvents(component, componentBuilder); - } - tempMessage.setLength(0); - } - - /** - * Applies the hover and click events contained in the {@link MessageComponent} to the {@link ComponentBuilder}. - * - * @param component The {@link MessageComponent} containing the events you want to apply. - * @param builder The {@link ComponentBuilder} the events should be applied to. - * @return The newly built {@link ComponentBuilder} containing the event data. - */ - private ComponentBuilder applyEvents(MessageComponent component, ComponentBuilder builder) { - if (component.getClickAction() == MessageClickAction.EXECUTE_COMMAND) { - builder.event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + component.getClickValue().toString())); - } - - if (component.getClickAction() == MessageClickAction.SEND_CHAT_MESSAGE) { - builder.event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, component.getClickValue().toString())); - } - - if (component.getClickAction() == MessageClickAction.CHANGE_PAGE) { - try { - // The click value is converted to an integer first in order to check if the given - // value really is an integer and then converted back into a string to be passed - // as a parameter. - builder.event(new ClickEvent(ClickEvent.Action.CHANGE_PAGE, String.valueOf(Integer.parseInt(component.getClickValue().toString())))); - } catch (NumberFormatException e) { - logger.log(LogLevel.ERROR, "Error converting click value to type INTEGER. If you selected click action CHANGE_PAGE, the click value has to be an integer."); - } - } - - if (component.getClickAction() == MessageClickAction.COPY_TO_CLIPBOARD) { - // In Spigot 1.8, this feature is not available. - } - - if (component.getClickAction() == MessageClickAction.OPEN_FILE) { - builder.event(new ClickEvent(ClickEvent.Action.OPEN_FILE, component.getClickValue().toString())); - } - - if (component.getClickAction() == MessageClickAction.OPEN_URL) { - builder.event(new ClickEvent(ClickEvent.Action.OPEN_URL, component.getClickValue().toString())); - } - - if (component.getClickAction() == MessageClickAction.SUGGEST_COMMAND) { - builder.event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, component.getClickValue().toString())); - } - if (component.getHoverAction() == MessageHoverAction.SHOW_MESSAGE) { - builder.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, - TextComponent.fromLegacyText(component.getHoverValue().toString()))); - } - - return builder; - } - - /** - * Sends the given packet to the given player. - * - * @param packet The packet you want to send. - * @param player The player who should receive the packet. - */ - private void sendPacket(Packet packet, Player player) { - ((CraftPlayer)player).getHandle().playerConnection.sendPacket(packet); - } } From 77b08c1ad4ff18a69f8f9782ad26916038282dd3 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 11:54:07 +0200 Subject: [PATCH 222/325] Fix imports for entity version template --- .../de/pxav/kelp/core/entity/version/EntityVersionTemplate.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/version/EntityVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/entity/version/EntityVersionTemplate.java index 08435e61..1709e541 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/version/EntityVersionTemplate.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/version/EntityVersionTemplate.java @@ -5,9 +5,7 @@ import de.pxav.kelp.core.version.KelpVersion; import de.pxav.kelp.core.version.SinceKelpVersion; import de.pxav.kelp.core.world.KelpLocation; -import org.bukkit.Location; import org.bukkit.Server; -import org.bukkit.World; import org.bukkit.entity.Entity; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.player.PlayerTeleportEvent; From 2128e90c284d39efa92fa5329bd03f963f1981c7 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 12:03:01 +0200 Subject: [PATCH 223/325] Attached entity classes to corresponding entity type enum --- .../pxav/kelp/core/entity/KelpEntityType.java | 214 +++++++++--------- 1 file changed, 109 insertions(+), 105 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntityType.java b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntityType.java index b125499b..d32c77af 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntityType.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntityType.java @@ -1,9 +1,8 @@ package de.pxav.kelp.core.entity; -import de.pxav.kelp.core.entity.type.DroppedItemEntity; -import de.pxav.kelp.core.entity.type.ElderGuardianEntity; -import de.pxav.kelp.core.entity.type.GuardianEntity; -import de.pxav.kelp.core.entity.type.ZombieEntity; +import de.pxav.kelp.core.entity.type.*; +import de.pxav.kelp.core.entity.type.general.MinecartEntity; +import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.version.KelpVersion; import java.util.ArrayList; @@ -17,113 +16,114 @@ public enum KelpEntityType { DROPPED_ITEM(KelpVersion.MC_1_8_0, DroppedItemEntity.class), - EXPERIENCE_ORB(KelpVersion.MC_1_8_0, null), - AREA_EFFECT_CLOUD(KelpVersion.MC_1_9_0, null), + EXPERIENCE_ORB(KelpVersion.MC_1_8_0, ExperienceOrbEntity.class), + AREA_EFFECT_CLOUD(KelpVersion.MC_1_9_0, AreaEffectCloudEntity.class), ELDER_GUARDIAN(KelpVersion.MC_1_8_0, ElderGuardianEntity.class), - WITHER_SKELETON(KelpVersion.MC_1_8_0, null), - STRAY(KelpVersion.MC_1_10_0, null), - EGG(KelpVersion.MC_1_8_0, null), - LEASH_HITCH(KelpVersion.MC_1_8_0, null), - PAINTING(KelpVersion.MC_1_8_0, null), - ARROW(KelpVersion.MC_1_8_0, null), - SNOWBALL(KelpVersion.MC_1_8_0, null), - FIREBALL(KelpVersion.MC_1_8_0, null), - SMALL_FIREBALL(KelpVersion.MC_1_8_0, null), - ENDER_PEARL(KelpVersion.MC_1_8_0, null), - ENDER_SIGNAL(KelpVersion.MC_1_8_0, null), - SPLASH_POTION(KelpVersion.MC_1_8_0, null), - THROWN_EXP_BOTTLE(KelpVersion.MC_1_8_0, null), - ITEM_FRAME(KelpVersion.MC_1_8_0, null), - WITHER_SKULL(KelpVersion.MC_1_8_0, null), - PRIMED_TNT(KelpVersion.MC_1_8_0, null), - FALLING_BLOCK(KelpVersion.MC_1_8_0, null), - FIREWORK(KelpVersion.MC_1_8_0, null), - HUSK(KelpVersion.MC_1_10_0, null), - SPECTRAL_ARROW(KelpVersion.MC_1_9_0, null), - SHULKER_BULLET(KelpVersion.MC_1_9_0, null), - DRAGON_FIREBALL(KelpVersion.MC_1_9_0, null), - ZOMBIE_VILLAGER(KelpVersion.MC_1_8_0, null), - SKELETON_HORSE(KelpVersion.MC_1_8_0, null), - ZOMBIE_HORSE(KelpVersion.MC_1_8_0, null), - ARMOR_STAND(KelpVersion.MC_1_8_0, null), - DONKEY(KelpVersion.MC_1_8_0, null), - MULE(KelpVersion.MC_1_8_0, null), - EVOKER_FANGS(KelpVersion.MC_1_11_0, null), - EVOKER(KelpVersion.MC_1_11_0, null), - VEX(KelpVersion.MC_1_11_0, null), - VINDICATOR(KelpVersion.MC_1_11_0, null), - ILLUSIONER(KelpVersion.MC_1_12_0, null), - MINECART_COMMAND(KelpVersion.MC_1_8_0, null), - BOAT(KelpVersion.MC_1_8_0, null), - MINECART(KelpVersion.MC_1_8_0, null), - MINECART_CHEST(KelpVersion.MC_1_8_0, null), - MINECART_FURNACE(KelpVersion.MC_1_8_0, null), - MINECART_TNT(KelpVersion.MC_1_8_0, null), - MINECART_HOPPER(KelpVersion.MC_1_8_0, null), - MINECART_MOB_SPAWNER(KelpVersion.MC_1_8_0, null), - CREEPER(KelpVersion.MC_1_8_0, null), - SKELETON(KelpVersion.MC_1_8_0, null), - SPIDER(KelpVersion.MC_1_8_0, null), - GIANT(KelpVersion.MC_1_8_0, null), + WITHER_SKELETON(KelpVersion.MC_1_8_0, WitherSkeletonEntity.class), + STRAY_SKELETON(KelpVersion.MC_1_10_0, StraySkeletonEntity.class), + CHICKEN_EGG(KelpVersion.MC_1_8_0, ThrownChickenEggEntity.class), + LEASH_HITCH(KelpVersion.MC_1_8_0, LeashHitchEntity.class), + PAINTING(KelpVersion.MC_1_8_0, PaintingEntity.class), + ARROW(KelpVersion.MC_1_8_0, ArrowEntity.class), + SNOWBALL(KelpVersion.MC_1_8_0, ThrownSnowballEntity.class), + FIREBALL(KelpVersion.MC_1_8_0, ThrownFireballEntity.class), + SMALL_FIREBALL(KelpVersion.MC_1_8_0, SmallFireballEntity.class), + ENDER_PEARL(KelpVersion.MC_1_8_0, ThrownEnderPearlEntity.class), + ENDER_SIGNAL(KelpVersion.MC_1_8_0, EnderSignalEntity.class), + SPLASH_POTION(KelpVersion.MC_1_8_0, ThrownPotionEntity.class), + THROWN_EXP_BOTTLE(KelpVersion.MC_1_8_0, ThrownExperienceBottleEntity.class), + ITEM_FRAME(KelpVersion.MC_1_8_0, ItemFrameEntity.class), + WITHER_SKULL(KelpVersion.MC_1_8_0, ThrownWitherSkullEntity.class), + PRIMED_TNT(KelpVersion.MC_1_8_0, PrimedTntEntity.class), + FALLING_BLOCK(KelpVersion.MC_1_8_0, FallingBlockEntity.class), + FIREWORK(KelpVersion.MC_1_8_0, FireworkEntity.class), + HUSK(KelpVersion.MC_1_10_0, HuskEntity.class), + SPECTRAL_ARROW(KelpVersion.MC_1_9_0, SpectralArrowEntity.class), + SHULKER_BULLET(KelpVersion.MC_1_9_0, ShulkerBulletEntity.class), + DRAGON_FIREBALL(KelpVersion.MC_1_9_0, DragonFireballEntity.class), + ZOMBIE_VILLAGER(KelpVersion.MC_1_8_0, ZombieVillagerEntity.class), + SKELETON_HORSE(KelpVersion.MC_1_8_0, SkeletonHorseEntity.class), + ZOMBIE_HORSE(KelpVersion.MC_1_8_0, ZombieHorse.class), + ARMOR_STAND(KelpVersion.MC_1_8_0, ArmorStandEntity.class), + DONKEY(KelpVersion.MC_1_8_0, DonkeyEntity.class), + MULE(KelpVersion.MC_1_8_0, MuleEntity.class), + EVOKER_FANGS(KelpVersion.MC_1_11_0, EvokerFangEntity.class), + EVOKER(KelpVersion.MC_1_11_0, EvokerEntity.class), + VEX(KelpVersion.MC_1_11_0, VexEntity.class), + VINDICATOR(KelpVersion.MC_1_11_0, VindicatorEntity.class), + ILLUSIONER(KelpVersion.MC_1_12_0, IllusionerEntity.class), + MINECART_COMMAND(KelpVersion.MC_1_8_0, CommandMinecartEntity.class), + BOAT(KelpVersion.MC_1_8_0, BoatEntity.class), + MINECART(KelpVersion.MC_1_8_0, RideableMinecart.class), + MINECART_CHEST(KelpVersion.MC_1_8_0, StorageMinecart.class), + MINECART_FURNACE(KelpVersion.MC_1_8_0, PoweredMinecart.class), + MINECART_TNT(KelpVersion.MC_1_8_0, ExplosiveMinecart.class), + MINECART_HOPPER(KelpVersion.MC_1_8_0, HopperMinecart.class), + MINECART_MOB_SPAWNER(KelpVersion.MC_1_8_0, SpawnerMinecart.class), + CREEPER(KelpVersion.MC_1_8_0, CreeperEntity.class), + SKELETON(KelpVersion.MC_1_8_0, SkeletonEntity.class), + SPIDER(KelpVersion.MC_1_8_0, SpiderEntity.class), + ZOMBIE_GIANT(KelpVersion.MC_1_8_0, ZombieGiant.class), ZOMBIE(KelpVersion.MC_1_8_0, ZombieEntity.class), - SLIME(KelpVersion.MC_1_8_0, null), - GHAST(KelpVersion.MC_1_8_0, null), - PIG_ZOMBIE(KelpVersion.MC_1_8_0, null), - ENDERMAN(KelpVersion.MC_1_8_0, null), - CAVE_SPIDER(KelpVersion.MC_1_8_0, null), - SILVERFISH(KelpVersion.MC_1_8_0, null), - BLAZE(KelpVersion.MC_1_8_0, null), - MAGMA_CUBE(KelpVersion.MC_1_8_0, null), - ENDER_DRAGON(KelpVersion.MC_1_8_0, null), - WITHER(KelpVersion.MC_1_8_0, null), - BAT(KelpVersion.MC_1_8_0, null), - WITCH(KelpVersion.MC_1_8_0, null), - ENDERMITE(KelpVersion.MC_1_8_0, null), + SLIME(KelpVersion.MC_1_8_0, SlimeEntity.class), + GHAST(KelpVersion.MC_1_8_0, GhastEntity.class), + PIG_ZOMBIE(KelpVersion.MC_1_8_0, PigZombie.class), + ENDERMAN(KelpVersion.MC_1_8_0, EndermanEntity.class), + CAVE_SPIDER(KelpVersion.MC_1_8_0, CaveSpiderEntity.class), + SILVERFISH(KelpVersion.MC_1_8_0, SilverfishEntity.class), + BLAZE(KelpVersion.MC_1_8_0, BlazeEntity.class), + MAGMA_CUBE(KelpVersion.MC_1_8_0, MagmaCubeEntity.class), + ENDER_DRAGON(KelpVersion.MC_1_8_0, EnderDragonEntity.class), + WITHER(KelpVersion.MC_1_8_0, WitherEntity.class), + BAT(KelpVersion.MC_1_8_0, BatEntity.class), + WITCH(KelpVersion.MC_1_8_0, WitchEntity.class), + ENDERMITE(KelpVersion.MC_1_8_0, EndermiteEntity.class), GUARDIAN(KelpVersion.MC_1_8_0, GuardianEntity.class), - SHULKER(KelpVersion.MC_1_9_0, null), - PIG(KelpVersion.MC_1_8_0, null), - SHEEP(KelpVersion.MC_1_8_0, null), - COW(KelpVersion.MC_1_8_0, null), - CHICKEN(KelpVersion.MC_1_8_0, null), - SQUID(KelpVersion.MC_1_8_0, null), - WOLF(KelpVersion.MC_1_8_0, null), - MUSHROOM_COW(KelpVersion.MC_1_8_0, null), - SNOWMAN(KelpVersion.MC_1_8_0, null), - OCELOT(KelpVersion.MC_1_8_0, null), - IRON_GOLEM(KelpVersion.MC_1_8_0, null), - HORSE(KelpVersion.MC_1_8_0, null), - RABBIT(KelpVersion.MC_1_8_0, null), - POLAR_BEAR(KelpVersion.MC_1_10_0, null), - LLAMA(KelpVersion.MC_1_11_0, null), - LLAMA_SPIT(KelpVersion.MC_1_11_0, null), - PARROT(KelpVersion.MC_1_12_0, null), - VILLAGER(KelpVersion.MC_1_8_0, null), - ENDER_CRYSTAL(KelpVersion.MC_1_8_0, null), - TURTLE(KelpVersion.MC_1_13_0, null), - PHANTOM(KelpVersion.MC_1_13_0, null), - TRIDENT(KelpVersion.MC_1_13_0, null), - COD(KelpVersion.MC_1_13_0, null), - SALMON(KelpVersion.MC_1_13_0, null), - PUFFERFISH(KelpVersion.MC_1_13_0, null), - TROPICAL_FISH(KelpVersion.MC_1_13_0, null), - DROWNED(KelpVersion.MC_1_13_0, null), - DOLPHIN(KelpVersion.MC_1_13_0, null), - CAT(KelpVersion.MC_1_8_0, null), - PANDA(KelpVersion.MC_1_14_0, null), - PILLAGER(KelpVersion.MC_1_14_0, null), - RAVAGER(KelpVersion.MC_1_14_0, null), - TRADER_LLAMA(KelpVersion.MC_1_14_0, null), - WANDERING_TRADER(KelpVersion.MC_1_14_0, null), - FOX(KelpVersion.MC_1_14_0, null), - FISHING_HOOK(KelpVersion.MC_1_8_0, null), - LIGHTNING(KelpVersion.MC_1_8_0, null), - PLAYER(KelpVersion.MC_1_8_0, null), + SHULKER(KelpVersion.MC_1_9_0, ShulkerEntity.class), + PIG(KelpVersion.MC_1_8_0, PigEntity.class), + SHEEP(KelpVersion.MC_1_8_0, SheepEntity.class), + COW(KelpVersion.MC_1_8_0, CowEntity.class), + CHICKEN(KelpVersion.MC_1_8_0, ChickenEntity.class), + SQUID(KelpVersion.MC_1_8_0, SquidEntity.class), + WOLF(KelpVersion.MC_1_8_0, WolfEntity.class), + MUSHROOM_COW(KelpVersion.MC_1_8_0, MushroomCowEntity.class), + SNOWMAN(KelpVersion.MC_1_8_0, SnowmanEntity.class), + OCELOT(KelpVersion.MC_1_8_0, OcelotEntity.class), + IRON_GOLEM(KelpVersion.MC_1_8_0, IronGolemEntity.class), + HORSE(KelpVersion.MC_1_8_0, HorseEntity.class), + RABBIT(KelpVersion.MC_1_8_0, RabbitEntity.class), + POLAR_BEAR(KelpVersion.MC_1_10_0, PolarBear.class), + LLAMA(KelpVersion.MC_1_11_0, LlamaEntity.class), + LLAMA_SPIT(KelpVersion.MC_1_11_0, LlamaSpitEntity.class), + PARROT(KelpVersion.MC_1_12_0, ParrotEntity.class), + VILLAGER(KelpVersion.MC_1_8_0, VillagerEntity.class), + ENDER_CRYSTAL(KelpVersion.MC_1_8_0, EnderCrystalEntity.class), + TURTLE(KelpVersion.MC_1_13_0, TurtleEntity.class), + PHANTOM(KelpVersion.MC_1_13_0, PhantomEntity.class), + TRIDENT(KelpVersion.MC_1_13_0, ThrownTridentEntity.class), + COD(KelpVersion.MC_1_13_0, CodEntity.class), + SALMON(KelpVersion.MC_1_13_0, SalmonEntity.class), + PUFFERFISH(KelpVersion.MC_1_13_0, PufferfishEntity.class), + TROPICAL_FISH(KelpVersion.MC_1_13_0, TropicalFishEntity.class), + DROWNED(KelpVersion.MC_1_13_0, DrownedEntity.class), + DOLPHIN(KelpVersion.MC_1_13_0, DolphinEntity.class), + CAT(KelpVersion.MC_1_8_0, CatEntity.class), + PANDA(KelpVersion.MC_1_14_0, PandaEntity.class), + PILLAGER(KelpVersion.MC_1_14_0, PillagerEntity.class), + RAVAGER(KelpVersion.MC_1_14_0, RavagerEntity.class), + TRADER_LLAMA(KelpVersion.MC_1_14_0, TraderLlamaEntity.class), + WANDERING_TRADER(KelpVersion.MC_1_14_0, WanderingTraderEntity.class), + FOX(KelpVersion.MC_1_14_0, FoxEntity.class), + FISHING_HOOK(KelpVersion.MC_1_8_0, FishHookEntity.class), + LIGHTNING(KelpVersion.MC_1_8_0, LightningEntity.class), + PLAYER(KelpVersion.MC_1_8_0, KelpPlayer.class), UNKNOWN(KelpVersion.MC_1_8_0, null); private KelpVersion since; - private Class entityClass; + //private Class entityClass; + private Class> entityClass; - KelpEntityType(KelpVersion since, Class entityClass) { + KelpEntityType(KelpVersion since, Class> entityClass) { this.since = since; this.entityClass = entityClass; } @@ -132,7 +132,11 @@ public KelpVersion since() { return since; } - public Class getEntityClass() { +// public Class getEntityClass() { +// return entityClass; +// } + + public Class getEntityClass() { return entityClass; } From 51b0658c95f8769ec23410373e205f2d44d9848d Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 12:03:23 +0200 Subject: [PATCH 224/325] refactor: rename PlayerInventoryVersionTemplate to StorageInventoryVersionTemplate --- ...sionTemplate.java => StorageInventoryVersionTemplate.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename core/src/main/java/de/pxav/kelp/core/inventory/version/{PlayerInventoryVersionTemplate.java => StorageInventoryVersionTemplate.java} (98%) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/version/PlayerInventoryVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/inventory/version/StorageInventoryVersionTemplate.java similarity index 98% rename from core/src/main/java/de/pxav/kelp/core/inventory/version/PlayerInventoryVersionTemplate.java rename to core/src/main/java/de/pxav/kelp/core/inventory/version/StorageInventoryVersionTemplate.java index 67477320..41552ca5 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/version/PlayerInventoryVersionTemplate.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/version/StorageInventoryVersionTemplate.java @@ -14,10 +14,10 @@ * @author pxav */ @KelpVersionTemplate -public abstract class PlayerInventoryVersionTemplate { +public abstract class StorageInventoryVersionTemplate { /** - * Gets all items stored in this player inventory. This includes + * Gets all items stored in this inventory. This includes * all slots (main storage, armor and hot bar). * * @param player The player to get the items of. From 14d3d94e6c388b5e669aecda18440fdeb68303e2 Mon Sep 17 00:00:00 2001 From: pxav Date: Wed, 21 Apr 2021 12:03:45 +0200 Subject: [PATCH 225/325] Add version template method to convert a bukkit inventory to a kelp storage inventory --- .../kelp/core/inventory/version/InventoryVersionTemplate.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/version/InventoryVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/inventory/version/InventoryVersionTemplate.java index da979907..22049c05 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/version/InventoryVersionTemplate.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/version/InventoryVersionTemplate.java @@ -1,6 +1,7 @@ package de.pxav.kelp.core.inventory.version; import de.pxav.kelp.core.application.KelpVersionTemplate; +import de.pxav.kelp.core.inventory.type.StorageInventory; import org.bukkit.inventory.Inventory; /** @@ -22,4 +23,6 @@ public abstract class InventoryVersionTemplate { */ public abstract Inventory createInventory(int size, String title); + public abstract StorageInventory getStorageInventory(Inventory bukkitInventory); + } From 7718f80e288a990878962ef008aa25c684a909c5 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 09:12:18 +0200 Subject: [PATCH 226/325] Use plugin.yml instead of plugin annotation, partly fixes #63 --- core/src/main/java/de/pxav/kelp/core/KelpPlugin.java | 3 --- v1_8_implementation/src/main/resources/plugin.yml | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 v1_8_implementation/src/main/resources/plugin.yml diff --git a/core/src/main/java/de/pxav/kelp/core/KelpPlugin.java b/core/src/main/java/de/pxav/kelp/core/KelpPlugin.java index 28ddf818..614d83f7 100644 --- a/core/src/main/java/de/pxav/kelp/core/KelpPlugin.java +++ b/core/src/main/java/de/pxav/kelp/core/KelpPlugin.java @@ -36,9 +36,6 @@ * * @author pxav */ -@Plugin(name = "Kelp", version = "0.3.3") -@Author("pxav") -@Description("A cross version spigot framework.") @Singleton public class KelpPlugin extends JavaPlugin { diff --git a/v1_8_implementation/src/main/resources/plugin.yml b/v1_8_implementation/src/main/resources/plugin.yml new file mode 100644 index 00000000..69f170c8 --- /dev/null +++ b/v1_8_implementation/src/main/resources/plugin.yml @@ -0,0 +1,6 @@ +name: Kelp +version: ${project.version} +main: de.pxav.kelp.core.KelpPlugin +author: pxav +description: A cross version spigot framework. +api-version: 1.13 \ No newline at end of file From 9efd5a742da223a7183d76acd71cd198c84d098e Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 09:16:43 +0200 Subject: [PATCH 227/325] refactor: move plugin.yml from implementation to core module --- {v1_8_implementation => core}/src/main/resources/plugin.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {v1_8_implementation => core}/src/main/resources/plugin.yml (100%) diff --git a/v1_8_implementation/src/main/resources/plugin.yml b/core/src/main/resources/plugin.yml similarity index 100% rename from v1_8_implementation/src/main/resources/plugin.yml rename to core/src/main/resources/plugin.yml From af5b3bdd22b0cc4cfa70c983d50fd8eaeed0dd98 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 09:46:01 +0200 Subject: [PATCH 228/325] Implement simple entity equipment --- .../inventory/type/SimpleEntityEquipment.java | 14 ++-- .../VersionedSimpleEntityEquipment.java | 80 +++++++++++++++++++ 2 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedSimpleEntityEquipment.java diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleEntityEquipment.java b/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleEntityEquipment.java index 77fa5416..9275ff3c 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleEntityEquipment.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleEntityEquipment.java @@ -2,7 +2,7 @@ import de.pxav.kelp.core.inventory.item.KelpItem; -public interface SimpleEntityEquipment extends StorageInventory { +public interface SimpleEntityEquipment { /** * Sets the helmet the player is wearing to the given item. @@ -14,7 +14,7 @@ public interface SimpleEntityEquipment extends StorageInventory Date: Fri, 23 Apr 2021 09:46:48 +0200 Subject: [PATCH 229/325] An entity's equipment can now be retrieved via the LivingKelpEntity class directly --- .../de/pxav/kelp/core/entity/LivingKelpEntity.java | 3 +++ .../entity/VersionedLivingEntity.java | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java index 5f4f4111..0a338d3b 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java @@ -1,6 +1,7 @@ package de.pxav.kelp.core.entity; import de.pxav.kelp.core.entity.type.general.DamageableEntity; +import de.pxav.kelp.core.inventory.type.SimpleEntityEquipment; import de.pxav.kelp.core.world.KelpLocation; public interface LivingKelpEntity> extends KelpEntity, DamageableEntity { @@ -15,4 +16,6 @@ public interface LivingKelpEntity> extends KelpEnt */ KelpLocation getEyeLocation(); + SimpleEntityEquipment getEquipment(); + } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java index 67f7920a..2f582e6e 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java @@ -4,12 +4,14 @@ import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.LivingKelpEntity; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.type.SimpleEntityEquipment; import de.pxav.kelp.core.world.KelpLocation; import de.pxav.kelp.implementation1_8.entity.type.general.VersionedDamageable; import net.minecraft.server.v1_8_R3.Entity; import net.minecraft.server.v1_8_R3.EntityLiving; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftLivingEntity; +import org.bukkit.entity.LivingEntity; /** * A class description goes here. @@ -36,6 +38,11 @@ public KelpLocation getEyeLocation() { return KelpLocation.from(craftLivingEntity.getEyeLocation()); } + @Override + public SimpleEntityEquipment getEquipment() { + return new VersionedSimpleEntityEquipment(getBukkitEntity()); + } + @Override public T damage(double damage) { craftLivingEntity.damage(damage); @@ -75,4 +82,9 @@ public T setHealth(double health) { return (T) this; } + @Override + public org.bukkit.entity.LivingEntity getBukkitEntity() { + return (LivingEntity) super.getBukkitEntity(); + } + } From 540b4de7906bfcf1b319232a6005d384d44bd1e0 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 09:47:47 +0200 Subject: [PATCH 230/325] Implement all PlayerInventory features - add a method to retrieve a player's inventory --- .../core/inventory/type/PlayerInventory.java | 19 ++++++--- .../de/pxav/kelp/core/player/KelpPlayer.java | 3 +- .../inventory/VersionedPlayerInventory.java | 41 ++++++++++++++++--- .../player/VersionedKelpPlayer.java | 11 +++++ 4 files changed, 62 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/type/PlayerInventory.java b/core/src/main/java/de/pxav/kelp/core/inventory/type/PlayerInventory.java index d9c7a1e2..679ced27 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/type/PlayerInventory.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/type/PlayerInventory.java @@ -1,16 +1,11 @@ package de.pxav.kelp.core.inventory.type; -import de.pxav.kelp.core.KelpPlugin; -import de.pxav.kelp.core.common.ConcurrentSetMultimap; import de.pxav.kelp.core.inventory.item.KelpItem; -import de.pxav.kelp.core.inventory.version.StorageInventoryVersionTemplate; import de.pxav.kelp.core.inventory.widget.GroupedWidget; -import de.pxav.kelp.core.inventory.widget.SimplePagination; import de.pxav.kelp.core.inventory.widget.SimpleWidget; import de.pxav.kelp.core.player.KelpPlayer; import java.util.Set; -import java.util.UUID; /** * Represents the personal inventory of a {@link KelpPlayer} which @@ -36,7 +31,21 @@ public interface PlayerInventory extends StorageInventory { */ Set getHotBarItems(); + PlayerInventory addWidget(SimpleWidget simpleWidget); + PlayerInventory addWidget(GroupedWidget groupedWidget); + + PlayerInventory removeSimpleWidget(Class widgetClass); + + PlayerInventory removeGroupedWidget(Class widgetClass); + + PlayerInventory removeWidget(SimpleWidget simpleWidget); + + PlayerInventory removeWidget(GroupedWidget groupedWidget); + + PlayerInventory removeAllWidgets(); + + PlayerInventory updateWidgets(); /** * Gets the player owning this inventory. diff --git a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java index 7d33a575..e2a4c116 100644 --- a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java +++ b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java @@ -7,6 +7,7 @@ import de.pxav.kelp.core.entity.type.general.ProjectileLauncher; import de.pxav.kelp.core.event.kelpevent.sidebar.KelpSidebarRemoveEvent; import de.pxav.kelp.core.inventory.KelpInventoryRepository; +import de.pxav.kelp.core.inventory.type.InventoryOwner; import de.pxav.kelp.core.inventory.type.KelpInventory; import de.pxav.kelp.core.inventory.type.PlayerInventory; import de.pxav.kelp.core.particle.type.ParticleType; @@ -58,7 +59,7 @@ * @see KelpPlayerRepository * @author pxav */ -public interface KelpPlayer extends HumanEntity, ProjectileLauncher { +public interface KelpPlayer extends HumanEntity, ProjectileLauncher, InventoryOwner { static KelpPlayer from(UUID player) { KelpPlayerRepository repository = KelpPlugin.getInjector().getInstance(KelpPlayerRepository.class); diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedPlayerInventory.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedPlayerInventory.java index 9d65fdec..c018e95d 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedPlayerInventory.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedPlayerInventory.java @@ -1,22 +1,20 @@ package de.pxav.kelp.implementation1_8.inventory; +import com.google.common.collect.Sets; import de.pxav.kelp.core.common.ConcurrentSetMultimap; import de.pxav.kelp.core.inventory.item.KelpItem; import de.pxav.kelp.core.inventory.type.KelpInventory; import de.pxav.kelp.core.inventory.type.PlayerInventory; -import de.pxav.kelp.core.inventory.version.StorageInventoryVersionTemplate; import de.pxav.kelp.core.inventory.widget.GroupedWidget; -import de.pxav.kelp.core.inventory.widget.SimplePagination; import de.pxav.kelp.core.inventory.widget.SimpleWidget; import de.pxav.kelp.core.player.KelpPlayer; +import org.bukkit.inventory.Inventory; +import java.util.Set; import java.util.UUID; public class VersionedPlayerInventory extends VersionedStorageInventory implements PlayerInventory { - // the version template used for player inventory manipulation - private StorageInventoryVersionTemplate versionTemplate; - // the owner of this inventory private KelpPlayer player; @@ -25,6 +23,24 @@ public class VersionedPlayerInventory extends VersionedStorageInventory simpleWidgets = ConcurrentSetMultimap.create(); private static ConcurrentSetMultimap groupedWidgets = ConcurrentSetMultimap.create(); + public VersionedPlayerInventory(Inventory inventory, KelpPlayer player) { + super(inventory); + this.player = player; + } + + @Override + public Set getHotBarItems() { + Set output = Sets.newHashSet(); + for (int i = 0; i < 9; i++) { + KelpItem currentItem = getItemAt(i); + if (currentItem == null) { + continue; + } + output.add(currentItem); + } + return output; + } + /** * Adds a new {@link SimpleWidget} to the player's inventory. * This method does not immediately render the widget, but only @@ -34,6 +50,7 @@ public class VersionedPlayerInventory extends VersionedStorageInventory widgetClass) { simpleWidgets.get(player.getUUID()).forEach(widget -> { if (widgetClass.getName().equalsIgnoreCase(widget.getClass().getName())) { @@ -84,6 +103,7 @@ public PlayerInventory removeSimpleWidget(Class widgetCl * will be removed from the inventory. * @return An instance of the current inventory for fluent builder design. */ + @Override public PlayerInventory removeGroupedWidget(Class widgetClass) { groupedWidgets.get(player.getUUID()).forEach(widget -> { if (widgetClass.getName().equalsIgnoreCase(widget.getClass().getName())) { @@ -102,6 +122,7 @@ public PlayerInventory removeGroupedWidget(Class widget * @param widget The object of the widget you want to remove. * @return An instance of the current inventory for fluent builder design. */ + @Override public PlayerInventory removeWidget(SimpleWidget widget) { player.getBukkitPlayer().getInventory().clear(widget.getCoveredSlot()); widget.onRemove(); @@ -118,6 +139,7 @@ public PlayerInventory removeWidget(SimpleWidget widget) { * @param widget The object of the widget you want to remove. * @return An instance of the current inventory for fluent builder design. */ + @Override public PlayerInventory removeWidget(GroupedWidget widget) { widget.getCoveredSlots().forEach(slot -> player.getBukkitPlayer().getInventory().clear(slot)); widget.onRemove(); @@ -132,6 +154,7 @@ public PlayerInventory removeWidget(GroupedWidget widget) { * * @return An instance of the current inventory for fluent builder design. */ + @Override public PlayerInventory removeAllWidgets() { simpleWidgets.getOrEmpty(player.getUUID()).forEach(this::removeWidget); groupedWidgets.getOrEmpty(player.getUUID()).forEach(this::removeWidget); @@ -147,6 +170,7 @@ public PlayerInventory removeAllWidgets() { * * @return An instance of the current inventory for fluent builder design. */ + @Override public PlayerInventory updateWidgets() { for (SimpleWidget current : simpleWidgets.getOrEmpty(player.getUUID())) { if (!current.isStateful()) { @@ -183,11 +207,16 @@ public PlayerInventory updateWidgets() { item.cancelInteractions(); } - setItem(item.getSlot(), item); + setItem(item); }); } return this; } + @Override + public KelpPlayer getPlayer() { + return player; + } + } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java index 0f2608e3..04259db8 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java @@ -3,6 +3,7 @@ import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.KelpProjectile; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.type.PlayerInventory; import de.pxav.kelp.core.logger.LogLevel; import de.pxav.kelp.core.particle.type.ParticleType; import de.pxav.kelp.core.player.KelpPlayer; @@ -19,12 +20,14 @@ import de.pxav.kelp.core.sound.KelpSound; import de.pxav.kelp.core.world.KelpLocation; import de.pxav.kelp.implementation1_8.entity.type.general.VersionedHumanEntity; +import de.pxav.kelp.implementation1_8.inventory.VersionedPlayerInventory; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TextComponent; import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityPlayer; import net.minecraft.server.v1_8_R3.Packet; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; @@ -37,10 +40,18 @@ public class VersionedKelpPlayer extends VersionedHumanEntity implements KelpPlayer { + EntityPlayer playerHandle; + CraftPlayer craftPlayer; + public VersionedKelpPlayer(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, ReflectionUtil reflectionUtil) { super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, reflectionUtil); } + @Override + public PlayerInventory getInventory() { + return new VersionedPlayerInventory(craftPlayer.getInventory(), this); + } + /** * Appends a message to the given {@link ComponentBuilder}. Please note that every message you append * using this method may only have one chat color and the formatting code applies for the entire message. From d8a6abe809f43ad0e36b38b6ba071d2acba533af Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 11:21:02 +0200 Subject: [PATCH 231/325] Exp bottle entity is now a sub type of kelp projectile --- .../kelp/core/entity/type/ThrownExperienceBottleEntity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownExperienceBottleEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownExperienceBottleEntity.java index 58d2af11..047c0bec 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownExperienceBottleEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownExperienceBottleEntity.java @@ -1,5 +1,7 @@ package de.pxav.kelp.core.entity.type; -public interface ThrownExperienceBottleEntity { +import de.pxav.kelp.core.entity.type.general.KelpProjectile; + +public interface ThrownExperienceBottleEntity extends KelpProjectile { } From 8c0da504e8dfd6666d7b42257ee70741c45246cd Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 11:21:13 +0200 Subject: [PATCH 232/325] Fix imports of SimpleInventory --- .../java/de/pxav/kelp/core/inventory/type/SimpleInventory.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleInventory.java b/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleInventory.java index 438e8f63..309e267e 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleInventory.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleInventory.java @@ -6,6 +6,7 @@ import de.pxav.kelp.core.inventory.version.WindowPacketTemplate; import de.pxav.kelp.core.inventory.widget.GroupedWidget; import de.pxav.kelp.core.inventory.widget.SimpleWidget; +import de.pxav.kelp.core.player.KelpPlayer; import org.bukkit.inventory.Inventory; import java.util.function.Supplier; From 13dd44712005f537cf9a265b9c9bd840cd53ef9c Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 11:21:54 +0200 Subject: [PATCH 233/325] Fix compile errors of KelpPlayer - fix documentation parameters - add missing return statements --- .../main/java/de/pxav/kelp/core/player/KelpPlayer.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java index e2a4c116..276dd0cf 100644 --- a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java +++ b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java @@ -78,10 +78,6 @@ static KelpPlayer from(Player player) { return KelpPlayer.from(player.getUniqueId()); } - default PlayerInventory getInventory() { - return PlayerInventory.of(this); - } - default SignPrompt openSignPrompt() { return new SignPrompt(this.getBukkitPlayer(), Dependencies.getSignPromptVersionTemplate()); } @@ -117,6 +113,7 @@ default KelpPlayer removeSidebar() { setSidebarInternally(null); Bukkit.getPluginManager().callEvent(new KelpSidebarRemoveEvent(this)); removeScoreboard(); + return this; } /** @@ -339,7 +336,6 @@ default KelpPlayer spawnParticle(ParticleType particleType, /** * Sets the player's health. * - * @param player The player whose health you want to change. * @param health How many health points the player should have. * 2 health points equal 1 heart. * So 20 health points equal the full 10 hearts. @@ -366,7 +362,6 @@ default KelpPlayer spawnParticle(ParticleType particleType, * typed in this message. This also works with commands, if * you add a slash in front of the message. * - * @param player The player from whom the message should be sent. * @param message The message you want to send. */ KelpPlayer chat(String message); @@ -898,7 +893,6 @@ default KelpPlayer toggleFlying() { * from a given server, the client will first display a confirmation GUI * to the player before proceeding with the download. * - * @param player The player who should download the Resource pack. * @param url The URL from which the client will download the resource pack. * The string must contain only US-ASCII characters * and should be encoded as per RFC 1738. @@ -1096,7 +1090,6 @@ default KelpPlayer toggleOperator() { /** * Checks if the player is on the bukkit whitelist. * - * @param player The player you want to check. * @return {@code true} if the player is whitelisted. */ boolean isWhitelisted(); From 117b3dc0a063728123ff02200584dbc3f646ea02 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 11:46:52 +0200 Subject: [PATCH 234/325] Make methods of StringUtils static --- .../de/pxav/kelp/core/common/StringUtils.java | 57 +++++++++---------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/common/StringUtils.java b/core/src/main/java/de/pxav/kelp/core/common/StringUtils.java index 1949a8f3..0071ecbb 100644 --- a/core/src/main/java/de/pxav/kelp/core/common/StringUtils.java +++ b/core/src/main/java/de/pxav/kelp/core/common/StringUtils.java @@ -14,17 +14,16 @@ * * @author pxav */ -@Singleton public class StringUtils { // an array containing all color codes in alphabetical order. - private char[] colorCodes = new char[] { + private static char[] colorCodes = new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; // an array containing all style codes in alphabetical order. - private char[] styleCodes = new char[] { + private static char[] styleCodes = new char[] { 'k', 'l', 'm', 'n', 'o', 'r' }; @@ -34,7 +33,7 @@ public class StringUtils { * @param text The text you want to remove the char of. * @return The given text without the last char. */ - public String removeLastChar(String text) { + public static String removeLastChar(String text) { // build a substring excluding the last char. return text.substring(0, text.length() - 1); } @@ -47,7 +46,7 @@ public String removeLastChar(String text) { * @param text The text you want to remove the color codes of. * @return The final string without color codes. */ - public String removeFormattingCodes(String text) { + public static String removeFormattingCodes(String text) { List codes = extractFormattingCodes(text); for (String current : codes) { text = text.replace(current, ""); @@ -62,10 +61,10 @@ public String removeFormattingCodes(String text) { * @param text The text you want to get the color codes of. * @return The color codes in chronological order. */ - public List extractColorCodes(String text) { + public static List extractColorCodes(String text) { List output = Lists.newArrayList(); for (int i = 0; i < text.length(); i++) { - if (text.charAt(i) == '§' && this.isColorCode(text.charAt(i + 1))) { + if (text.charAt(i) == '§' && isColorCode(text.charAt(i + 1))) { output.add("§" + text.charAt(i + 1)); } } @@ -79,10 +78,10 @@ public List extractColorCodes(String text) { * @param text The text you want to get the style codes of. * @return The style codes in chronological order. */ - public List extractStyleCodes(String text) { + public static List extractStyleCodes(String text) { List output = Lists.newArrayList(); for (int i = 0; i < text.length(); i++) { - if (text.charAt(i) == '§' && this.isStyleCode(text.charAt(i + 1))) { + if (text.charAt(i) == '§' && isStyleCode(text.charAt(i + 1))) { output.add("§" + text.charAt(i + 1)); } } @@ -96,7 +95,7 @@ public List extractStyleCodes(String text) { * @param text The text you want to get the codes of. * @return The formatting codes in chronological order. */ - public List extractFormattingCodes(String text) { + public static List extractFormattingCodes(String text) { List output = Lists.newArrayList(); for (int i = 0; i < text.length(); i++) { if (text.charAt(i) != '§') { @@ -107,8 +106,8 @@ public List extractFormattingCodes(String text) { break; } - if (this.isStyleCode(text.charAt(i + 1)) - || this.isColorCode(text.charAt(i + 1))) { + if (isStyleCode(text.charAt(i + 1)) + || isColorCode(text.charAt(i + 1))) { output.add("§" + text.charAt(i + 1)); } } @@ -136,7 +135,7 @@ public List extractFormattingCodes(String text) { * @param text The text you want to check. * @return The last color and style codes. */ - public String lastFormattingCodesOf(String text) { + public static String lastFormattingCodesOf(String text) { // get all formatting codes of the text and reverse their order. List reversed = extractFormattingCodes(text); Collections.reverse(reversed); @@ -193,13 +192,13 @@ public String lastFormattingCodesOf(String text) { * @param text The text you want to check. * @return The last color and style codes. */ - public String lastFullFormattingCodesOf(String text) { + public static String lastFullFormattingCodesOf(String text) { // check if the color codes have a single '§' at the end. // this has to be removed as we only want to have full // color codes. - if (this.lastFormattingCodesOf(text).endsWith("§")) { - String colorCodes = this.lastFormattingCodesOf(text); - return this.removeLastChar(colorCodes); + if (lastFormattingCodesOf(text).endsWith("§")) { + String colorCodes = lastFormattingCodesOf(text); + return removeLastChar(colorCodes); } return lastFormattingCodesOf(text); } @@ -215,7 +214,7 @@ public String lastFullFormattingCodesOf(String text) { * e. g. '1' for dark blue * @return {@code true} if the given indicator is */ - public boolean isColorCode(char indicator) { + public static boolean isColorCode(char indicator) { for (char current : colorCodes) { if (current == indicator) { return true; @@ -234,7 +233,7 @@ public boolean isColorCode(char indicator) { * e. g. 'l' for bold * @return {@code true} if the given indicator is a style code. */ - public boolean isStyleCode(char indicator) { + public static boolean isStyleCode(char indicator) { for (char current : styleCodes) { if (current == indicator) { return true; @@ -252,7 +251,7 @@ public boolean isStyleCode(char indicator) { * @param formattingCode The formatting code to be converted. * @return The corresponding md_5 chat color. */ - public ChatColor getChatColor(char formattingCode) { + public static ChatColor getChatColor(char formattingCode) { return isFormattingCode(formattingCode) ? ChatColor.getByChar(formattingCode) : ChatColor.WHITE; @@ -267,7 +266,7 @@ public ChatColor getChatColor(char formattingCode) { * @param formattingCode The formatting code to be converted. * @return The corresponding bukkit chat color. */ - public org.bukkit.ChatColor getBukkitChatColor(char formattingCode) { + public static org.bukkit.ChatColor getBukkitChatColor(char formattingCode) { return isFormattingCode(formattingCode) ? org.bukkit.ChatColor.getByChar(formattingCode) : org.bukkit.ChatColor.WHITE; @@ -283,7 +282,7 @@ public org.bukkit.ChatColor getBukkitChatColor(char formattingCode) { * @return The final {@link ChatColor} to be returned. {@code null} if the * color was not found. */ - public ChatColor getChatColor(String formattingCode) { + public static ChatColor getChatColor(String formattingCode) { char code = formattingCode.charAt(1); return isFormattingCode(code) && formattingCode.charAt(0) == '§' ? ChatColor.getByChar(code) @@ -299,7 +298,7 @@ public ChatColor getChatColor(String formattingCode) { * @param formattingCode The formatting code to be converted. * @return The final {@link org.bukkit.ChatColor} to be returned. */ - public org.bukkit.ChatColor getBukkitChatColor(String formattingCode) { + public static org.bukkit.ChatColor getBukkitChatColor(String formattingCode) { char code = formattingCode.charAt(1); return isFormattingCode(code) && formattingCode.charAt(0) == '§' ? org.bukkit.ChatColor.getByChar(code) @@ -314,7 +313,7 @@ public org.bukkit.ChatColor getBukkitChatColor(String formattingCode) { * @return The last color code of the text. {@code null} if there * was no color code to be detected. */ - public String endsWithColorCode(String text) { + public static String endsWithColorCode(String text) { if (text.length() < 2) { return null; } @@ -335,7 +334,7 @@ public String endsWithColorCode(String text) { * @return The last formatting code of the text. {@code null} if there * was no color code to be detected. */ - public String endsWithFormattingCode(String text) { + public static String endsWithFormattingCode(String text) { // if the text is less than 2 chars long there can // be no formatting code, so return immediately. if (text.length() < 2) { @@ -356,7 +355,7 @@ public String endsWithFormattingCode(String text) { * * @return Any random bukkit color code. */ - public char randomColorCode() { + public static char randomColorCode() { return colorCodes[ThreadLocalRandom.current().nextInt(colorCodes.length - 1)]; } @@ -366,7 +365,7 @@ public char randomColorCode() { * * @return */ - public char randomStyleCode() { + public static char randomStyleCode() { return styleCodes[ThreadLocalRandom.current().nextInt(colorCodes.length - 1)]; } @@ -376,7 +375,7 @@ public char randomStyleCode() { * * @return Any random foramtting code without {@code '§'} in front. */ - public char randomFormattingCode() { + public static char randomFormattingCode() { return ThreadLocalRandom.current().nextBoolean() ? randomColorCode() : randomStyleCode(); } @@ -384,7 +383,7 @@ public char randomFormattingCode() { * @param indicator The indicator of the code you want to check. * @return {@code true} if the either a color code or a style code. */ - public boolean isFormattingCode(char indicator) { + public static boolean isFormattingCode(char indicator) { return isColorCode(indicator) || isStyleCode(indicator); } From 245528aa36393f9794b0ee771c4969c6760adf8a Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 11:48:21 +0200 Subject: [PATCH 235/325] Fix imports of some classes - SlotArea - PlaceholderWidget - KelpRegion - KelpRegionRepository - KelpItem - PlayerLeaveRegionEvent --- .../kelp/core/event/kelpevent/region/PlayerLeaveRegionEvent.java | 1 + .../src/main/java/de/pxav/kelp/core/inventory/item/KelpItem.java | 1 + .../src/main/java/de/pxav/kelp/core/inventory/util/SlotArea.java | 1 - .../de/pxav/kelp/core/inventory/widget/PlaceholderWidget.java | 1 + .../src/main/java/de/pxav/kelp/core/world/region/KelpRegion.java | 1 + .../de/pxav/kelp/core/world/region/KelpRegionRepository.java | 1 + 6 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/event/kelpevent/region/PlayerLeaveRegionEvent.java b/core/src/main/java/de/pxav/kelp/core/event/kelpevent/region/PlayerLeaveRegionEvent.java index 2f8bcf39..a9341101 100644 --- a/core/src/main/java/de/pxav/kelp/core/event/kelpevent/region/PlayerLeaveRegionEvent.java +++ b/core/src/main/java/de/pxav/kelp/core/event/kelpevent/region/PlayerLeaveRegionEvent.java @@ -1,5 +1,6 @@ package de.pxav.kelp.core.event.kelpevent.region; +import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.world.region.KelpRegion; import org.bukkit.event.HandlerList; diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/item/KelpItem.java b/core/src/main/java/de/pxav/kelp/core/inventory/item/KelpItem.java index ed783fad..d8fc7c54 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/item/KelpItem.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/item/KelpItem.java @@ -12,6 +12,7 @@ import de.pxav.kelp.core.inventory.metadata.ItemMetadata; import de.pxav.kelp.core.inventory.metadata.LeatherArmorMetadata; import de.pxav.kelp.core.inventory.version.ItemVersionTemplate; +import de.pxav.kelp.core.player.KelpPlayer; import org.apache.commons.lang.builder.HashCodeBuilder; import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/util/SlotArea.java b/core/src/main/java/de/pxav/kelp/core/inventory/util/SlotArea.java index b0ba5d1a..b1b613dd 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/util/SlotArea.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/util/SlotArea.java @@ -1,7 +1,6 @@ package de.pxav.kelp.core.inventory.util; import com.google.common.collect.Sets; -import de.pxav.kelp.core.inventory.widget.SimplePagination; import java.util.HashSet; import java.util.Set; diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/widget/PlaceholderWidget.java b/core/src/main/java/de/pxav/kelp/core/inventory/widget/PlaceholderWidget.java index 8203d3d2..cbc5a9a9 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/widget/PlaceholderWidget.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/widget/PlaceholderWidget.java @@ -4,6 +4,7 @@ import com.google.common.collect.Sets; import de.pxav.kelp.core.inventory.item.KelpItem; import de.pxav.kelp.core.inventory.material.KelpMaterial; +import de.pxav.kelp.core.player.KelpPlayer; import java.util.Arrays; import java.util.Collection; diff --git a/core/src/main/java/de/pxav/kelp/core/world/region/KelpRegion.java b/core/src/main/java/de/pxav/kelp/core/world/region/KelpRegion.java index 294945e3..6282653a 100644 --- a/core/src/main/java/de/pxav/kelp/core/world/region/KelpRegion.java +++ b/core/src/main/java/de/pxav/kelp/core/world/region/KelpRegion.java @@ -2,6 +2,7 @@ import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.event.kelpevent.region.PlayerEnterRegionEvent; +import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.world.KelpBlock; import de.pxav.kelp.core.world.KelpChunk; import de.pxav.kelp.core.world.KelpLocation; diff --git a/core/src/main/java/de/pxav/kelp/core/world/region/KelpRegionRepository.java b/core/src/main/java/de/pxav/kelp/core/world/region/KelpRegionRepository.java index 6b012dfb..7802d00a 100644 --- a/core/src/main/java/de/pxav/kelp/core/world/region/KelpRegionRepository.java +++ b/core/src/main/java/de/pxav/kelp/core/world/region/KelpRegionRepository.java @@ -4,6 +4,7 @@ import de.pxav.kelp.core.common.ConcurrentSetMultimap; import de.pxav.kelp.core.event.kelpevent.region.PlayerEnterRegionEvent; import de.pxav.kelp.core.event.kelpevent.region.PlayerLeaveRegionEvent; +import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.scheduler.KelpSchedulerRepository; import de.pxav.kelp.core.scheduler.type.RepeatingScheduler; import de.pxav.kelp.core.world.util.ApproximateLocation; From a9d43238ac0755337b79f3742ecebc61ca95cb2c Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 11:48:48 +0200 Subject: [PATCH 236/325] Adapt KelpInventoryRepository to new PlayerInventory design --- .../de/pxav/kelp/core/inventory/KelpInventoryRepository.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/KelpInventoryRepository.java b/core/src/main/java/de/pxav/kelp/core/inventory/KelpInventoryRepository.java index 295cb366..f1905499 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/KelpInventoryRepository.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/KelpInventoryRepository.java @@ -142,8 +142,7 @@ public void updateInventory(KelpPlayer player) { KelpInventory kelpInventory = playerInventories.get(player.getUUID()); if (kelpInventory == null) { - PlayerInventory playerInventory = PlayerInventory.of(player); - playerInventory.updateWidgets(); + player.getInventory().updateWidgets(); return; } From d9c2e3c9b24d121182ad0eee3992645b31f9f8a6 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 11:50:26 +0200 Subject: [PATCH 237/325] Fix animal constructors in 1.8 implementation --- .../implementation1_8/entity/VersionedEntityType.java | 9 +++++++-- .../entity/type/general/VersionedTameableAnimal.java | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java index b40b9e43..95a4739b 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java @@ -6,6 +6,7 @@ import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.version.EntityVersionTemplate; import de.pxav.kelp.core.entity.version.LivingEntityVersionTemplate; +import de.pxav.kelp.core.reflect.ReflectionUtil; import de.pxav.kelp.core.version.Versioned; import de.pxav.kelp.implementation1_8.entity.type.VersionedSheep; import net.minecraft.server.v1_8_R3.Entity; @@ -23,11 +24,15 @@ public class VersionedEntityType extends EntityTypeVersionTemplate { private EntityVersionTemplate entityVersionTemplate; private LivingEntityVersionTemplate livingEntityVersionTemplate; + private ReflectionUtil reflectionUtil; @Inject - public VersionedEntityType(EntityVersionTemplate entityVersionTemplate, LivingEntityVersionTemplate livingEntityVersionTemplate) { + public VersionedEntityType(EntityVersionTemplate entityVersionTemplate, + LivingEntityVersionTemplate livingEntityVersionTemplate, + ReflectionUtil reflectionUtil) { this.entityVersionTemplate = entityVersionTemplate; this.livingEntityVersionTemplate = livingEntityVersionTemplate; + this.reflectionUtil = reflectionUtil; } @Override @@ -56,7 +61,7 @@ public KelpEntity newKelpEntity(KelpEntityType entityType, Location location) // break; case SHEEP: entity = craftWorld.createEntity(location, Sheep.class); - output = new VersionedSheep(entity, KelpEntityType.SHEEP, location, this); + output = new VersionedSheep(entity, KelpEntityType.SHEEP, location, this, reflectionUtil); } // if (entityType != KelpEntityType.DROPPED_ITEM) { diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedTameableAnimal.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedTameableAnimal.java index f143147e..a90b88a5 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedTameableAnimal.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedTameableAnimal.java @@ -4,6 +4,7 @@ import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.TameableAnimal; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.reflect.ReflectionUtil; import net.minecraft.server.v1_8_R3.Entity; import net.minecraft.server.v1_8_R3.EntityTameableAnimal; import org.bukkit.Location; @@ -13,8 +14,12 @@ public class VersionedTameableAnimal> extends Versio private EntityTameableAnimal tameableHandle; - public VersionedTameableAnimal(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { - super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + public VersionedTameableAnimal(Entity entityHandle, + KelpEntityType entityType, + Location initialLocation, + EntityTypeVersionTemplate entityTypeVersionTemplate, + ReflectionUtil reflectionUtil) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, reflectionUtil); this.tameableHandle = (EntityTameableAnimal) entityHandle; } From 04633e21fea9cb8ec19adb11d456a738105a6263 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 11:52:35 +0200 Subject: [PATCH 238/325] Adapt new player creation procedure to player repo and version module --- .../de/pxav/kelp/core/player/KelpPlayer.java | 2 + .../core/player/KelpPlayerRepository.java | 82 ------------------- .../player/PlayerCreationListener.java | 28 ++++++- 3 files changed, 26 insertions(+), 86 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java index 276dd0cf..88e07421 100644 --- a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java +++ b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java @@ -145,6 +145,8 @@ default KelpPlayer removeSidebar() { */ KelpSidebar getCurrentSidebar(); + PlayerInventory getInventory(); + /** * Opens a {@link KelpInventory} to the player. This * is equivalent to calling the {@link KelpInventoryRepository#openInventory(KelpInventory, KelpPlayer)} diff --git a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayerRepository.java b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayerRepository.java index 4e0605f1..e3a1238f 100644 --- a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayerRepository.java +++ b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayerRepository.java @@ -148,62 +148,6 @@ public KelpPlayer getKelpPlayer(Player bukkitPlayer) { return getKelpPlayer(uuid); } - /** - * Creates a new {@code KelpPlayer} instance based on the - * player's bukkit object. - * - * Generally it is not recommended to create new KelpPlayer - * instances as an application developer, because this is handled - * by the version templates. They intercept settings packets when - * a player sends them and put this information into a map. - * - * If you always create new instances it is not guaranteed that - * this information is accessible for you, because it has never - * been set. If you try to query it, exceptions might be thrown. - * - * If you do not know what you're doing, use {@code #getKelpPlayer} - * methods instead. - * - * @param bukkitPlayer The bukkit player object of the player you - * want to create an instance of. - * @return The final {@code KelpPlayer} object. If the player is not - * online, {@code null} will be returned. - */ - public KelpPlayer newKelpPlayer(Player bukkitPlayer) { - return this.newKelpPlayerFrom(bukkitPlayer); - } - - /** - * Creates a new {@code KelpPlayer} instance based on the - * player's UUID. - * - * Generally it is not recommended to create new KelpPlayer - * instances as an application developer, because this is handled - * by the version templates. They intercept settings packets when - * a player sends them and put this information into a map. - * - * If you always create new instances it is not guaranteed that - * this information is accessible for you, because it has never - * been set. If you try to query it, exceptions might be thrown. - * - * If you do not know what you're doing, use {@code #getKelpPlayer} - * methods instead. - * - * @param uuid The UUID of the player you want to create an - * instance of. - * @return The final {@code KelpPlayer} object. If the player is not - * online, {@code null} will be returned. - */ - public KelpPlayer newKelpPlayer(UUID uuid) { - Player bukkitPlayer = Bukkit.getPlayer(uuid); - if (bukkitPlayer == null) { - logger.log(LogLevel.WARNING, "Given player UUID for getting a new KelpPlayer failed." + - "This player is not online, returning null!"); - return null; - } - return this.newKelpPlayerFrom(bukkitPlayer); - } - /** * Removes the player with the given {@link UUID} from the * cache. @@ -215,30 +159,4 @@ public void removeKelpPlayer(UUID uuid) { this.kelpPlayers.remove(uuid); } - /** - * Creates a new {@code KelpPlayer} instance and automatically - * injects all dependencies needed. - * - * @param bukkitPlayer The bukkit player object you want to create - * the {@code KelpPlayer} from. - * @return The final {@code KelpPlayer} object. - */ - private KelpPlayer newKelpPlayerFrom(Player bukkitPlayer) { - return new KelpPlayer(bukkitPlayer, - playerVersionTemplate, - //sidebarRepository, - inventoryRepository, - this, - particleVersionTemplate, - signPromptVersionTemplate, - anvilPromptVersionTemplate, - chatPromptVersionTemplate, - entityVersionTemplate, - livingEntityVersionTemplate, - playerVersionTemplate.getUniqueId(bukkitPlayer), - entityVersionTemplate.getLocation(bukkitPlayer).getBukkitLocation(), - entityVersionTemplate.getEntityId(bukkitPlayer) - ); - } - } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/PlayerCreationListener.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/PlayerCreationListener.java index e2e7fd97..a4d2c6cd 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/PlayerCreationListener.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/PlayerCreationListener.java @@ -1,6 +1,8 @@ package de.pxav.kelp.implementation1_8.player; import com.google.inject.Inject; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.event.kelpevent.KelpPlayerLoginEvent; import de.pxav.kelp.core.event.kelpevent.KelpPlayerUpdateSettingsEvent; import de.pxav.kelp.core.event.kelpevent.SettingsUpdateStage; @@ -9,9 +11,12 @@ import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.player.KelpPlayerRepository; import de.pxav.kelp.core.player.PlayerChatVisibility; +import de.pxav.kelp.core.reflect.ReflectionUtil; import de.pxav.kelp.implementation1_8.packet.GlobalPacketListener; +import net.minecraft.server.v1_8_R3.Entity; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.player.PlayerQuitEvent; @@ -31,6 +36,8 @@ public class PlayerCreationListener { private KelpPlayerRepository kelpPlayerRepository; private GlobalPacketListener globalPacketListener; + private EntityTypeVersionTemplate entityTypeVersionTemplate; + private ReflectionUtil reflectionUtil; private KelpLogger logger; @Inject @@ -53,9 +60,15 @@ public PlayerCreationListener(KelpPlayerRepository kelpPlayerRepository, */ @EventHandler public void handlePlayerLogin(PlayerLoginEvent event) { - kelpPlayerRepository.playerEntityObject(event.getPlayer().getUniqueId(), - ((CraftEntity)event.getPlayer()).getHandle()); - KelpPlayer kelpPlayer = kelpPlayerRepository.newKelpPlayer(event.getPlayer()); + Entity playerHandle = ((CraftPlayer)event.getPlayer()).getHandle(); + kelpPlayerRepository.playerEntityObject(event.getPlayer().getUniqueId(), playerHandle); + KelpPlayer kelpPlayer = new VersionedKelpPlayer( + playerHandle, + KelpEntityType.PLAYER, + event.getPlayer().getLocation(), + entityTypeVersionTemplate, + reflectionUtil, + logger); kelpPlayerRepository.addOrUpdatePlayer(kelpPlayer.getUUID(), kelpPlayer); Bukkit.getPluginManager().callEvent(new KelpPlayerLoginEvent( kelpPlayer, @@ -89,7 +102,14 @@ public void createOnStartup() { // the quit event at first. So the exception is caught and the player // is removed from the cache again. try { - KelpPlayer kelpPlayer = kelpPlayerRepository.newKelpPlayer(current); + Entity playerHandle = ((CraftPlayer)current).getHandle(); + KelpPlayer kelpPlayer = new VersionedKelpPlayer( + playerHandle, + KelpEntityType.PLAYER, + current.getLocation(), + entityTypeVersionTemplate, + reflectionUtil, + logger); kelpPlayer.setClientViewDistanceInternally(Bukkit.getViewDistance()); kelpPlayer.setClientLanguageInternally("en_US"); kelpPlayer.setPlayerChatVisibilityInternally(PlayerChatVisibility.SHOW_ALL_MESSAGES); From d43743949bf11da069f96a1f0a736ec5f5b81dcc Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 12:50:52 +0200 Subject: [PATCH 239/325] Remove VersionedPlayer.java as it is now replaced with VersionedKelpPlayer --- .../player/VersionedPlayer.java | 1341 ----------------- 1 file changed, 1341 deletions(-) delete mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedPlayer.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedPlayer.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedPlayer.java deleted file mode 100644 index 6996457f..00000000 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedPlayer.java +++ /dev/null @@ -1,1341 +0,0 @@ -package de.pxav.kelp.implementation1_8.player; - -import com.google.common.base.Preconditions; -import com.google.common.io.BaseEncoding; -import com.google.inject.Inject; -import de.pxav.kelp.core.common.StringUtils; -import de.pxav.kelp.core.logger.KelpLogger; -import de.pxav.kelp.core.logger.LogLevel; -import de.pxav.kelp.core.player.PlayerVersionTemplate; -import de.pxav.kelp.core.player.bossbar.BossBarColor; -import de.pxav.kelp.core.player.bossbar.BossBarStyle; -import de.pxav.kelp.core.player.message.InteractiveMessage; -import de.pxav.kelp.core.player.message.MessageClickAction; -import de.pxav.kelp.core.player.message.MessageComponent; -import de.pxav.kelp.core.player.message.MessageHoverAction; -import de.pxav.kelp.core.scheduler.synchronize.ServerMainThread; -import de.pxav.kelp.core.sound.KelpSound; -import de.pxav.kelp.core.sound.SoundRepository; -import de.pxav.kelp.core.version.Versioned; -import de.pxav.kelp.core.world.KelpLocation; -import net.md_5.bungee.api.ChatColor; -import net.md_5.bungee.api.chat.*; -import net.minecraft.server.v1_8_R3.*; -import org.apache.commons.lang.Validate; -import org.bukkit.*; -import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; -import org.bukkit.permissions.PermissionAttachment; -import org.bukkit.plugin.java.JavaPlugin; -import org.bukkit.scoreboard.DisplaySlot; -import org.bukkit.scoreboard.Scoreboard; -import org.bukkit.util.Vector; - -import java.lang.reflect.Field; -import java.net.InetSocketAddress; -import java.util.UUID; - -/** - * A class description goes here. - * - * @author pxav - * @author Etrayed - */ -@Versioned -public class VersionedPlayer extends PlayerVersionTemplate { - - private SoundRepository soundRepository; - private BossBarLocationUpdater bossBarLocationUpdater; - private JavaPlugin plugin; - private StringUtils stringUtils; - private KelpLogger logger; - - @Inject - public VersionedPlayer(SoundRepository soundRepository, - JavaPlugin plugin, - BossBarLocationUpdater bossBarLocationUpdater, - StringUtils stringUtils, - KelpLogger logger) { - this.soundRepository = soundRepository; - this.plugin = plugin; - this.bossBarLocationUpdater = bossBarLocationUpdater; - this.stringUtils = stringUtils; - this.logger = logger; - } - - /** - * Sends a title to a player. A title is a big text displayed - * right in the middle of the player's screen. - * - * @param player The player who should see the title. - * @param title The upper title text (will be displayed slightly bigger than the sub title). - * @param subTitle The lower title text (will be displayed slightly smaller than the main title). - * @param fadeIn How long should it take to fade the title in? (in ticks) - * @param stay How long should the title stay in 100% opacity? (in ticks) - * @param fadeOut How long should it take to fade the title out? (in ticks) - */ - @Override - public void sendTitle(Player player, String title, String subTitle, int fadeIn, int stay, int fadeOut) { - final IChatBaseComponent titleComponent = IChatBaseComponent.ChatSerializer.a("{\"text\": \"" + title + "\"}"); - final IChatBaseComponent subComponent = IChatBaseComponent.ChatSerializer.a("{\"text\": \"" + subTitle + "\"}"); - final PacketPlayOutTitle titleOut = new PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction.TIMES, titleComponent, fadeIn, stay, fadeOut); - final PacketPlayOutTitle subtitle = new PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction.TIMES, subComponent); - final PacketPlayOutTitle titlePacket = new PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction.TITLE, titleComponent); - final PacketPlayOutTitle subtitlePacket = new PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction.SUBTITLE, subComponent); - - this.sendPacket(titleOut, player); - this.sendPacket(subtitle, player); - this.sendPacket(titlePacket, player); - this.sendPacket(subtitlePacket, player); - } - - /** - * Sends an action bar message to the player. - * The action bar is a line of text, which is displayed - * above the player's hotbar. - * - * @param player The player who should receive the message. - * @param message The message you want to send. - */ - @Override - public void sendActionBar(Player player, String message) { - PacketPlayOutChat packet = - new PacketPlayOutChat( - IChatBaseComponent.ChatSerializer.a("{\"text\": \"" + message + "\"}"), (byte) 2); - sendPacket(packet, player); - } - - /** - * Sets the tab header and footer of player. The tab header is - * a text displayed above the player list in the tab, while - * the tab footer is a message displayed below the player list. - * - * The messages may contain '\n' to create new lines inside the - * message. - * - * @param player The player who should see the messages. - * @param header The header message you want to send. - * @param footer The footer message you want to send. - */ - @Override - public void sendTabHeaderAndFooter(Player player, String header, String footer) { - if (header == null) header = ""; - if (footer == null) footer = ""; - - IChatBaseComponent tabHeader = - IChatBaseComponent.ChatSerializer.a("{\"text\": \"" + header + "\"}"); - IChatBaseComponent tabFooter = - IChatBaseComponent.ChatSerializer.a("{\"text\": \"" + footer + "\"}"); - PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter(tabHeader); - - try { - Field f = packet.getClass().getDeclaredField("b"); - f.setAccessible(true); - f.set(packet, tabFooter); - } catch (NoSuchFieldException | IllegalAccessException e) { - e.printStackTrace(); - } - - sendPacket(packet, player); - } - - /** - * Plays a sound to the player. - * - * @param player The player who should hear the sound. - * @param sound The sound you want to play. - * @param location The location, where the sound should come from. - * @param volume How loud the sound should be. - * @param pitch How strong the sound should be pitched. - */ - @Override - public void playSound(Player player, KelpSound sound, KelpLocation location, float volume, float pitch) { - Sound bukkitSound = Sound.valueOf(soundRepository.getSound(sound)); - player.playSound(player.getLocation(), bukkitSound, volume, pitch); - } - - /** - * Sets the player's health. - * - * @param player The player whose health you want to change. - * @param health How many health points the player should have. - * 2 health points equal 1 heart. - * So 20 health points equal the full 10 hearts. - */ - @Override - public void setHealth(Player player, int health) { - player.setHealth(health); - } - - /** - * @param player The player whose UUID you want to get. - * @return The player's uuid. - */ - public UUID getUniqueId(Player player) { - return player.getUniqueId(); - } - - /** - * Checks if the player is currently located in water. - * - * @param player The player you want to check. - * @return {@code true} if the player is currently in water. - */ - @Override - public boolean isInWater(Player player) { - try { - Field inWaterField = Entity.class.getDeclaredField("inWater"); - - inWaterField.setAccessible(true); - - return inWaterField.getBoolean(((CraftEntity) player).getHandle()); - } catch (IllegalAccessException | NoSuchFieldException e) { - e.printStackTrace(); - } - - return false; - } - - /** - * Checks if the player is currently stuck in a cobweb. - * - * @param player The player you want to check. - * @return {@code true} if the player is currently stuck in a cobweb. - */ - @Override - public boolean isInCobweb(Player player) { - try { - Field hField = Entity.class.getDeclaredField("H"); - - hField.setAccessible(true); - - return hField.getBoolean(((CraftEntity) player).getHandle()); - } catch (IllegalAccessException | NoSuchFieldException e) { - e.printStackTrace(); - } - - return false; - } - - /** - * Sends a chat message from the given player. - * This means you can send a message as if the player itself - * typed in this message. This also works with commands, if - * you add a slash in front of the message. - * - * @param player The player from whom the message should be sent. - * @param message The message you want to send. - */ - @Override - public void chat(Player player, String message) { - player.chat(message); - } - - /** - * Gets the socket address of a specific player. - * - * @param player The player whose socket address you want to get. - * @return The {@code InetSocketAddress} object of the player's address. - */ - @Override - public InetSocketAddress getSocketAddress(Player player) { - return player.getAddress(); - } - - /** - * Determines if the Player is allowed to fly via - * jump key double-tap like in creative mode. - * - * If a player flies without permission, they will get kicked - * by the server automatically. - * - * @param player The player you want to check. - * @return {@code true} if the player is allowed to fly. - */ - @Override - public boolean getAllowFlight(Player player) { - return player.getAllowFlight(); - } - - /** - * Gets the display name of a player. - * The display name is a name which - unlike the normal name - - * can be modified during the server runtime. You can use this - * to include custom prefixes, ... - * - * @param player The player whose display name you want to get. - * @return The display name. - */ - @Override - public String getDisplayName(Player player) { - return player.getDisplayName(); - } - - /** - * Sets the display name of a player - * The display name is a name which - unlike the normal name - - * can be modified during the server runtime. You can use this - * to include custom prefixes, ... - * - * @param player The player whose display name you want to set. - * @param displayName The display name you want to set. - */ - @Override - public void setDisplayName(Player player, String displayName) { - player.setDisplayName(displayName); - } - - /** - * Gets the tab-list name of the player. - * The tab-list name is the name which is used to represent - * the player in the tab-list of online players. - * - * @param player The player whose tab-list name you want to get. - * @return The tab-list name. - */ - @Override - public String getPlayerTabListName(Player player) { - return player.getPlayerListName(); - } - - /** - * Sets the tab-list name of the player. - * The tab-list name is the name which is used to represent - * the player in the tab-list of online players. - * - * @param player The player whose tab-list name you want to set. - * @param tabListName The tab-list name you want to set. - */ - @Override - public void setPlayerTabListName(Player player, String tabListName) { - player.setPlayerListName(tabListName); - } - - /** - * Gets the tab-list header of the player. - * The tab-list header is a text displayed above the - * list of online players, which is shown when you press tab. - * - * @param player The player whose header you want to get. - * @return The tab-list header string. - */ - @Override - public String getPlayerListHeader(Player player) { - return null; - } - - /** - * Gets the tab-list footer of the player. - * The tab-list footer is a text displayed below the - * list of online players, which is shown when you press tab. - * - * @param player The player whose footer you want to get. - * @return The tab-list footer string. - */ - @Override - public String getPlayerListFooter(Player player) { - return null; - } - - @Override - public void setPlayerListHeader(Player player, String header) { - - } - - @Override - public void setPlayerListFooter(Player player, String footer) { - - } - - /** - * Sets the compass target of the player. - * The compass target is the location, where the compass needle - * points to. By default this is the spawn location of the world, - * but you could set this to specific player locations as well. - * - * @param player The player whose target location you want to update. - * @param target The location, where the compass should point to. - */ - @Override - public void setCompassTarget(Player player, KelpLocation target) { - player.setCompassTarget(target.getBukkitLocation()); - } - - /** - * Gets the compass target of the player. - * The compass target is the location, where the compass needle - * points to. By default this is the spawn location of the world. - * - * @param player The player whose compass target you want to set. - * @return The target location of the player's compass. - */ - @Override - public KelpLocation getCompassTarget(Player player) { - return KelpLocation.from(player.getCompassTarget()); - } - - /** - * Kicks the given player from the server. - * - * @param player The player who should be kicked. - * @param kickMessage The message, which should be received by the player. - * Could also be named kick reason. - */ - @Override - public void kickPlayer(Player player, String kickMessage) { - player.kickPlayer(kickMessage); - } - - /** - * Checks if the player is currently sneaking/crouching. - * @return {@code true} if the player is sneaking. - */ - @Override - public boolean isSneaking(Player player) { - return player.isSneaking(); - } - - /** - * Modifies the sneak state of the player. - * - * @param player The player whose sneak state you want to change. - * @param sneaking {@code true} if you want to make the player sneak. - * {@code false}, if not. - */ - @Override - public void setSneaking(Player player, boolean sneaking) { - player.setSneaking(sneaking); - } - - /** - * Checks if the player is currently sprinting. - * Sprinting is active when the player has double-pressed the - * walking key or pressed the walking and sprinting key at - * once. - * - * @return {@code true} if the player is currently sprinting. - */ - @Override - public boolean isSprinting(Player player) { - return player.isSprinting(); - } - - /** - * Changes the sprinting state of a player. - * Sprinting is active when the player has double-pressed the - * walking key or pressed the walking and sprinting key at - * once. - * - * @param player The player you want to change the sprinting state of. - * @param sprinting {@code true} if the player should be sprinting. - */ - @Override - public void setSprinting(Player player, boolean sprinting) { - player.setSprinting(sprinting); - } - - /** - * Sets the player ignored when the server checks who is sleeping. - * - * When it is night, normally all players have to sleep so that the - * time can jump to morning. If you don't want all players to sleep, - * you can give specific players this flag and they don't have to sleep - * anymore. - * - * If you give this flag to all players, nothing will happen at night. - * So there has to be at least one player sleeping at night. - * - * @param player The player you want to change the ignoring state of. - * @param ignored {@code true} if the player should be ignored when sleeping. - */ - @Override - public void setSleepingIgnored(Player player, boolean ignored) { - player.setSleepingIgnored(ignored); - } - - /** - * Checks if the player is ignored when the server checks who is sleeping. - * - * When it is night, normally all players have to sleep so that the - * time can jump to morning. If you don't want all players to sleep, - * you can give specific players this flag and they don't have to sleep - * anymore. - * - * If you give this flag to all players, nothing will happen at night. - * So there has to be at least one player sleeping at night. - * - * @param player The player you want to change the ignoring state of. - * @return {@code true} if the player has the ignore flag. - */ - @Override - public boolean isSleepingIgnored(Player player) { - return player.isSleepingIgnored(); - } - - /** - * Sets the player time. Each player can have an individual time - * - even if they are in the same world. - * - * @param player The player whose time you want to set. - * @param time If {@code relative} is set to {@code true}, this is the - * time offset to the server time in ticks. If {@code relative} - * is set to {@code false} it is the absolute day time ticks. - * @param relative {@code true} if the {@code time} should stay relative - * to the server time. - */ - @Override - public void setPlayerTime(Player player, long time, boolean relative) { - player.setPlayerTime(time, relative); - } - - /** - * Gets the current player time. Each player can have an - * individual time - even if they are in the same world. - * - * @param player The player whose time you want to get. - * @return The current time of the player in ticks. - */ - @Override - public long getPlayerTime(Player player) { - return player.getPlayerTime(); - } - - /** - * If the player time was set with {@code relative} to {@code true}, - * then it will get the offset of the player time to the current server - * time. If {@code relative} was set to {@code false}, it will simply - * return the current player time. - * - * @param player The player whose time (offset) you want to check. - * @return The player's time (offset). - */ - @Override - public long getPlayerTimeOffset(Player player) { - return player.getPlayerTimeOffset(); - } - - /** - * Checks if the player time set for the player is relative - * to the server time. More information can be found - * at {@code #setPlayerTime(player, time, relative)} - * - * @param player The player you want to check. - * @return {@code true} if player time is relative to server time. - */ - @Override - public boolean isPlayerTimeRelative(Player player) { - return player.isPlayerTimeRelative(); - } - - /** - * Resets the player time back to the current server - * time. So the times of both are synchronized again. - * - * @param player The player whose time you want to reset. - */ - @Override - public void resetPlayerTime(Player player) { - player.resetPlayerTime(); - } - - /** - * Gives the player the given amount of experience. - * This method simply adds the given amount to the player's - * current exp count and does not overwrite anything. - * - * @param player The player you want to give the experience to. - * @param amount The amount of experience to give. - */ - @Override - public void giveExperience(Player player, int amount) { - player.giveExp(amount); - } - - /** - * Gives or takes the player the given amount of experience. - * Negative amounts express that levels should be taken - * away from the player, positive amounts will be added. - * - * @param player The player you want to give the levels to. - * @param amount The amount of levels to give or take. - */ - @Override - public void giveExperienceLevels(Player player, int amount) { - player.giveExpLevels(amount); - } - - /** - * Gets the current experience of the given player. - * - * Experience is a percentage value (ranging from 0 to 1) - * indicating the progress to the next full level. - * 0 means he has just reached a new level and has made no - * progress since then, wile 1 says the player is just about - * to reach a new level. - * - * Inside Minecraft, the experience is represented by the - * green bar above the hotbar. - * - * @param player The player whose experience you want to get. - * @return The current experience progress (from 0 to 1). - */ - @Override - public float getExperience(Player player) { - return player.getExp(); - } - - /** - * Sets the current experience of the given player. - * - * Experience is a percentage value (ranging from 0 to 1) - * indicating the progress to the next full level. - * 0 means he has just reached a new level and has made no - * progress since then, wile 1 says the player is just about - * to reach a new level. - * - * Inside Minecraft, the experience is represented by the - * green bar above the hotbar. - * - * @param player The player whose experience you want to set. - * @param experience The experience value you want to set. - * May range from 0 to 1. - */ - @Override - public void setExperience(Player player, float experience) { - player.setExp(experience); - } - - /** - * Gets the current amount of the player's levels. - * - * Levels are reached when the experience count reaches 1. - * The amount of levels is represented by the small green - * number above the level bar. - * - * @param player The player whose levels you want to get. - * @return The current amount of levels. - */ - @Override - public int getLevel(Player player) { - return player.getLevel(); - } - - /** - * Sets the current amount of the player's levels. - * - * Levels are reached when the experience count reaches 1. - * The amount of levels is represented by the small green - * number above the level bar. - * - * @param player The player whose levels you want to set. - * @param level The new level count to set. - */ - @Override - public void setLevel(Player player, int level) { - player.setLevel(level); - } - - /** - * Gets the players total experience points. - * - * This refers to the total amount of experience - * the player has collected over time and is not currently - * displayed to the client. - * - * @param player The player whose total experience you want to get. - * @return The total experience points amount. - */ - @Override - public int getTotalExperience(Player player) { - return player.getTotalExperience(); - } - - /** - * Sets the players total experience points. - * - * This refers to the total amount of experience - * the player has collected over time and is not currently - * displayed to the client. - * - * @param player The player whose total experience you want to get. - * @param experience The new amount of total experience. - */ - @Override - public void setTotalExperience(Player player, int experience) { - player.setTotalExperience(experience); - } - - /** - * Gets the player's current exhaustion level. - * Exhaustion controls how fast the food level drops. - * While you have a certain amount of exhaustion, - * your saturation will drop to zero, and then your - * food will drop to zero. - * - * @param player The player you want to get the exhaustion level of. - * @return The exhaustion level of the current player. - */ - @Override - public float getExhaustion(Player player) { - return player.getExhaustion(); - } - - /** - * Sets the player's current exhaustion level. - * Exhaustion controls how fast the food level drops. - * While you have a certain amount of exhaustion, - * your saturation will drop to zero, and then your - * food will drop to zero. - * - * @param exhaustionLevel The exhaustion level you want to set. - */ - @Override - public void setExhaustion(Player player, float exhaustionLevel) { - player.setExhaustion(exhaustionLevel); - } - - /** - * Gets the saturation level of a player. - * Saturation is a buffer for food level. - * Your food level will not drop if you are saturated > 0. - * - * @param player The player whose saturation level you want to get. - * @return The saturation of the player. - */ - @Override - public float getSaturation(Player player) { - return player.getSaturation(); - } - - /** - * Sets the saturation level of a player. - * Saturation is a buffer for food level. - * Your food level will not drop if you are saturated > 0. - * - * @param player The player whose saturation level you want - * to set. - * @param saturation The saturation level you want to set. - */ - @Override - public void setSaturation(Player player, float saturation) { - player.setSaturation(saturation); - } - - /** - * Gets the current food level of the player. The - * food level indicates how full the food bar is. - * 20 means a full food bar, 0 an empty food bar. - * - * @param player The player whose food bar you want to change. - * @return The food level of the player. - */ - @Override - public int getFoodLevel(Player player) { - return player.getFoodLevel(); - } - - /** - * Sets the food level of a player. - * The food level indicates how full the food bar is. - * 20 means a full food bar, 0 an empty food bar. - * - * @param player The player whose food level you want to change. - * @param foodLevel The absolute food level you want to set. - */ - @Override - public void setFoodLevel(Player player, int foodLevel) { - player.setFoodLevel(foodLevel); - } - - /** - * Sets if the player is allowed to fly as if he was in creative - * mode - * - * @param player The player you want to allow/disallow flying - * for. - * @param allowFlight {@code true} if you want to allow, {@code false} - * if not. - */ - @Override - public void setAllowFlight(Player player, boolean allowFlight) { - player.setAllowFlight(allowFlight); - } - - /** - * Hides a player from another player, so they become invisible - * for the other player. - * - * @param player The player who should not see {@code toHide} - * anymore. - * @param toHide The player you want to hide. - */ - @Override - public void hidePlayer(Player player, Player toHide) { - player.hidePlayer(toHide); - } - - /** - * Shows a player to another player again, so they become visible - * for the other player. - * - * @param player The player who should see {@code toShow} - * again. - * @param toShow The player you want to show. - */ - @Override - public void showPlayer(Player player, Player toShow) { - player.showPlayer(toShow); - } - - /** - * Checks if the given player can see the targeted player. - * This does not check if the player currently really sees - * the given target player, but if the player is not hidden. - * - * @param player The player who should see the target player. - * @param toCheck The player to check if he is visible for the - * other player. - * @return {@code true} if {@code player} can see {@code toCheck}. - */ - @Override - public boolean canSee(Player player, Player toCheck) { - return player.canSee(toCheck); - } - - /** - * Checks if the player is currently flying. - * - * @return {@code true} if the player is flying. - */ - @Override - public boolean isFlying(Player player) { - return player.isFlying(); - } - - /** - * Changes the flying state of the player. - * - * @param player The player you want to change the flying state of. - * @param flying {@code true} if you want to make the player fly. - * {@code false} if you don't want to make the player fly. - */ - @Override - public void setFlying(Player player, boolean flying) { - player.setFlying(flying); - } - - /** - * Sets the current fly speed of a player. The higher - * the value the higher the speed. Negative values - * indicate reverse directions. - * - * @param player The player whose speed you want to set. - * @param flySpeed The desired fly speed. The value may - * range from -1 to 1. - */ - @Override - public void setFlySpeed(Player player, float flySpeed) { - player.setFlySpeed(flySpeed); - } - - /** - * Sets the current walk speed of a player. The higher - * the value the higher the speed. Negative values - * indicate reverse directions. - * - * @param player The player whose speed you want to set. - * @param walkSpeed The desired walk speed. The value may - * range from -1 to 1. - */ - @Override - public void setWalkSpeed(Player player, float walkSpeed) { - player.setWalkSpeed(walkSpeed); - } - - /** - * Gets the current speed a player can fly. The higher - * the value the higher the speed. Negative values - * indicate reverse directions. - * - * @return The current fly speed of a player. - * Value can range from -1 to 1 - */ - @Override - public float getFlySpeed(Player player) { - return player.getFlySpeed(); - } - - /** - * Gets the current speed a player can walk. The higher - * the value the higher the speed. Negative values - * indicate reverse directions. - * - * @return The current walk speed of a player. - * Value can range from -1 to 1 - */ - @Override - public float getWalkSpeed(Player player) { - return player.getWalkSpeed(); - } - - /** - * Request that the player's client download and switch resource packs. - * - * The player's client will download the new resource pack asynchronously - * in the background, if the request was accepted, and will automatically switch to it once the download - * is complete. If the client has downloaded and cached a resource pack - * with the same hash in the past it will not download but directly apply - * the cached pack. When this request is sent for the very first time - * from a given server, the client will first display a confirmation GUI - * to the player before proceeding with the download. - * - * @param player The player who should download the Resource pack. - * @param url The URL from which the client will download the resource pack. - * The string must contain only US-ASCII characters - * and should be encoded as per RFC 1738. - */ - @Override - public void setResourcePack(Player player, String url) { - player.setResourcePack(url); - } - - /** - * Request that the player's client download and switch resource packs. - * - * The player's client will download the new resource pack asynchronously - * in the background, if the request was accepted, and will automatically switch to it once the download - * is complete. If the client has downloaded and cached a resource pack - * with the same hash in the past it will not download but directly apply - * the cached pack. When this request is sent for the very first time - * from a given server, the client will first display a confirmation GUI - * to the player before proceeding with the download. - * - * @param player The player who should download the Resource pack. - * @param url The URL from which the client will download the resource pack. - * The string must contain only US-ASCII characters - * and should be encoded as per RFC 1738. - * @param hash The sha1 hash sum of the resource pack file - * which is used to apply a cached version of the pack - * directly without downloading if it is available. - * Has to be 20 bytes long! - */ - @Override - public void setResourcePack(Player player, String url, byte[] hash) { - Preconditions.checkNotNull(url, "Resource pack URL cannot be null"); - Preconditions.checkNotNull(hash, "Resource pack hash cannot be null"); - Validate.isTrue(hash.length == 20, "Resource pack hash should be 20 bytes long but was " + hash.length); - ((CraftPlayer)player).getHandle().setResourcePack(url, BaseEncoding.base16().lowerCase().encode(hash)); - } - - /** - * Checks if the player has received the scaled health bar - * from the server. - * - * @return {@code true} if the player's health bar scale is up to date. - */ - @Override - public boolean isHealthScaled(Player player) { - return player.isHealthScaled(); - } - - /** - * Sets if the player is shown the scaled health bar. - * If you modify your health scale with {@code setHealthScale}, - * you have to say the server to send this new scaled health - * to the player. - * - * @param player The player you want to scale the health of. - * @param scaled {@code true} whether the health should be scaled. - */ - @Override - public void setHealthScaled(Player player, boolean scaled) { - player.setHealthScaled(scaled); - } - - /** - * Sets the health scale of the given player. The health - * scale is the maximum amount of hearts displayed to the - * client. - * 2 means one heart is displayed. If you choose values - * above 20, the player will get additional hearts. - * Consider changing the max health as well. - * - * This method will automatically set {@code setHealthScaled} to - * {@code true}. - * - * @param player The player whose amount of scaled health you want - * to set. - * @param healthScale The amount of scaled health you want to set. - */ - @Override - public void setHealthScale(Player player, double healthScale) { - player.setHealthScale(healthScale); - } - - /** - * Gets the number of scaled health points, - * which are currently displayed to the client. - * - * @param player The player whose health scale you want to get. - * @return The number of scaled health if health - * scaling was set to {@code true} earlier. - */ - @Override - public double getHealthScale(Player player) { - return player.getHealthScale(); - } - - /** - * Cancels the title animation for a player. The current - * title is removed immediately. - * - * @param player The player whose title should be reset. - */ - @Override - public void resetTitle(Player player) { - player.resetTitle(); - } - - @Override - public void openBook(Player player, ItemStack book) { - - } - - @Override - public int getProtocolVersion(Player player) { - return 0; - } - - /** - * Sets the player to a server operator. A server operator - * is a player, who has all permissions and can execute every - * command. - * - * @param player The player you want to change the operator state of. - * @param value {@code true} If you want to make the player an operator. - */ - @Override - public void setOperator(Player player, boolean value) { - player.setOp(value); - } - - /** - * Checks if the given player is a server operator. A server operator - * is a player, who has all permissions and can execute every - * command. - * - * @param player The player you want to check the operator state of. - * @return {@code true} if the player is a server operator. - */ - @Override - public boolean isOperator(Player player) { - return player.isOp(); - } - - /** - * Gives the player the desired permission. - * - * @param player The player who should get the permission. - * @param permission The name of the permission you want to give the player. - */ - @Override - public void givePermission(Player player, String permission) { - PermissionAttachment attachment = player.addAttachment(this.plugin); - attachment.setPermission(permission, true); - } - - /** - * Removes the specified permission from the given player. - * - * @param player The player you want to remove the permission from. - * @param permission The name of the permission you want to remove. - */ - @Override - public void removePermission(Player player, String permission) { - PermissionAttachment attachment = player.addAttachment(this.plugin); - attachment.setPermission(permission, false); - } - - /** - * Checks if the given player has the desired permission. - * - * @param player The player you want to check. - * @param permission The permission you want to check for. - * @return {@code true} if the player has the permission. - */ - @Override - public boolean hasPermission(Player player, String permission) { - return player.hasPermission(permission); - } - - /** - * Checks if the given player is currently banned from the server. - * This does only check if the player was banned by the - * bukkit server using the normal {@code /ban} command. If another - * plugin has banned the player, this is ignored. - * - * @param player The player you want to check. - * @return {@code true} if the player has been banned by the bukkit server. - */ - @Override - public boolean isBannedByBukkit(Player player) { - return player.isBanned(); - } - - /** - * Checks if the player is on the bukkit whitelist. - * - * @param player The player you want to check. - * @return {@code true} if the player is whitelisted. - */ - @Override - public boolean isWhitelisted(Player player) { - return player.isWhitelisted(); - } - - /** - * Sets the player whitelisted or not whitelisted. - * - * @param player The player you want to whitelist/unwhitelist. - * @param whitelisted {@code true} if the player should be whitelisted. - */ - @Override - public void setWhitelisted(Player player, boolean whitelisted) { - player.setWhitelisted(whitelisted); - } - - /** - * Gets the bed spawn location of the player. - * This is the location, where the player has slept for the - * last time. A location is only returned if the player has - * already slept at least once and the location is valid. - * - * @param player The player you want to get the bed spawn location of. - * @return The spawn location, {@code null} if the player has not slept or location is invalid. - */ - @Override - public KelpLocation getBedSpawnLocation(Player player) { - return KelpLocation.from(player.getBedSpawnLocation()); - } - - @Override - public void sendMessage(Player player, String message) { - player.sendMessage(message); - } - - /** - * Sends a boss bar to the player by spawning a boss entity near it. If you use this - * method in 1.8, please keep in mind that bar colors other than {@code PURPLE} and bar styles - * other than {@code SOLID} are not supported. - * - * @param player The player you want to send the message to. - * @param message The message you want to be displayed above the boss bar. - * @param health How much the boss bar should be loaded (equivalent to how much - * health the boss entity has. 300f is a full boss bar and 0f an empty one). - * @param barColor The color of the boss bar. Please note that in 1.8 only - * {@code PURPLE} is allowed. If you use any color, no exception - * is thrown but purple will be chosen automatically. - * @param barStyle The style of the boss bar (how many segments?, ...). Note that - * in 1.8 only {@code SOLID} is supported. If you use any different - * style, no exception will be thrown, but {@code SOLID} is chosen - * automatically. - */ - @Override - public void sendBossBar(Player player, String message, float health, BossBarColor barColor, BossBarStyle barStyle) { - CraftPlayer craftPlayer = (CraftPlayer) player; - Vector direction = craftPlayer.getLocation().getDirection(); - Location location = craftPlayer.getLocation().add(direction.multiply(40)); - - if (location.getY() < 1) { - location.setY(1); - } - - EntityWither entityWither = new EntityWither(craftPlayer.getHandle().getWorld()); - entityWither.setInvisible(true); - entityWither.setCustomName((message == null ? "Custom Boss Bar Message." : message)); - entityWither.setCustomNameVisible(false); - entityWither.setLocation(location.getX(), location.getY(), location.getZ(), 0, 0); - entityWither.setHealth(health); - - PacketPlayOutSpawnEntityLiving spawnPacket = new PacketPlayOutSpawnEntityLiving(entityWither); - craftPlayer.getHandle().playerConnection.sendPacket(spawnPacket); - - bossBarLocationUpdater.remove(player.getUniqueId()); - bossBarLocationUpdater.add(player.getUniqueId(), entityWither.getId(), health, message); - - } - - /** - * Sets the progress of the player's boss bar by modifying the - * health of the boss bar entity. As withers are used for that - * purpose, the maximum value {@code 300f} represents full boss - * bar and {@code 0f} would be an empty boss bar (equivalent to - * the wither dieing.) - * - * @param health The health of the boss bar entity. - */ - @Override - public void setBossBarProgress(Player player, float health) { - bossBarLocationUpdater.setHealth(player.getUniqueId(), health); - } - - /** - * Makes the boss bar disappear for the given player. - * - * @param player The player whose boss bar you want to remove. - */ - @Override - public void removeBossBar(Player player) { - ServerMainThread.RunParallel.run(() - -> bossBarLocationUpdater.remove(player.getUniqueId())); - } - - /** - * Sends an interactive message to the player. An interactive message is a message - * the player can click on and events (execute a command, open a url, ...) are triggered. - * You can also add hover events to it. You can add as many components as you want. - * More detailed information about how to build an interactive message can be found out - * in {@link InteractiveMessage}. - * - * @param player The player who should receive this message and be able - * to interact with it. - * @param interactiveMessage The actual message you want to send to the player. - */ - @Override - public void sendInteractiveMessage(Player player, InteractiveMessage interactiveMessage) { - // create the component builder retaining no formatting code information so that - // the messages stay independent from each other. - ComponentBuilder componentBuilder = new ComponentBuilder("") - .retain(ComponentBuilder.FormatRetention.NONE); - String retainedColorCode = null; - - // iterate through all components of the message to add the individual events and - // handle the color codes correctly. - for (MessageComponent component : interactiveMessage.getComponents()) { - - String message = component.getText(); - StringBuilder tempMessage = new StringBuilder(); - ChatColor color = ChatColor.WHITE; - boolean colorCode = false, formattingCode = false; - boolean bold = false, italic = false, underlined = false, strikethrough = false, obfuscated = false; - - // check whether a color code from the last component was retained - // and eventually apply it. - if (retainedColorCode != null) { - appendComponentBuilder(componentBuilder, - component, - new StringBuilder(), - stringUtils.getChatColor(retainedColorCode), - false, - false, - false, - false, - false); - retainedColorCode = null; - } - - // if the message of the current component ends with any formatting code, - // it is saved and applied to the next component but ignored in the current iteration. - retainedColorCode = stringUtils.endsWithFormattingCode(message); - if (retainedColorCode != null) { - if (message.length() <= 2) { - continue; - } - message = message.substring(0, message.length() - 2); - } - - // iterate through each character of the current message and search for color and style codes. - // a message is basically divided every time a new color code occurs. This has to be done as the - // spigot component builder can only handle one color at once. Example (| is a point where the message is divided.) - // §8[|§aYourPlugin|§8] |§7Click ... [next component] - for (int i = 0; i < message.length() - 1; i++) { - - // if a § with a valid color code id was found, the message up to this point is - // appended to the component builder. - if (message.charAt(i) == '§' && stringUtils.isColorCode(message.charAt(i + 1))) { - if (tempMessage.length() > 0) { - appendComponentBuilder(componentBuilder, component, tempMessage, color, bold, italic, underlined, strikethrough, obfuscated); - } - colorCode = true; - color = stringUtils.getChatColor(message.charAt(i + 1)); - continue; - } - - // if a color code was detected in the last iteration, this is the - // id of the color code (such as 1, 2, 3, ..., a, b, ...) so we can skip this - // char as it was already handled. - if (colorCode) { - colorCode = false; - continue; - } - - // if a formatting code is detected, it is cached and applied to the message. - if (message.charAt(i) == '§' && stringUtils.isFormattingCode(message.charAt(i + 1))) { - formattingCode = true; - ChatColor chatColor = stringUtils.getChatColor(message.charAt(i + 1)); - switch (chatColor) { - case STRIKETHROUGH: - strikethrough = true; - break; - case MAGIC: - obfuscated = true; - break; - case UNDERLINE: - underlined = true; - break; - case ITALIC: - italic = true; - break; - case BOLD: - bold = true; - break; - } - continue; - } - - // if a formatting code has been detected in the last iteration, we can skip this char. - if (formattingCode) { - formattingCode = false; - continue; - } - - // append the current char to the string builder for the temporary message - // if this was a normal char. - tempMessage.append(message.charAt(i)); - - // if we are at the last char of the message, we can append the text to the component builder - // and jump to the next MessageComponent if there is one. - if (i + 1 == message.length() - 1) { - tempMessage.append(message.charAt(i + 1)); - appendComponentBuilder(componentBuilder, component, tempMessage, color, bold, italic, underlined, strikethrough, obfuscated); - } - } - } - - // finally send the message to the player via spigot api call. - player.spigot().sendMessage(componentBuilder.create()); - } - - /** - * If the player currently sees a sidebar, it will be hidden for the given - * player. This mostly happens by replacing it with a new, empty scoreboard. - * - * @param player The player whose sidebar you want to hide/remove. - */ - @Override - public void removeSidebar(Player player) { - Scoreboard scoreboard = player.getScoreboard(); - if (scoreboard.getObjective(DisplaySlot.SIDEBAR) == null) { - return; - } - - scoreboard.getObjective(DisplaySlot.SIDEBAR).unregister(); - player.setScoreboard(scoreboard); - - } - - - -} From 0b362852257f48a03a4b23697f6b14df3515a2de Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 12:51:45 +0200 Subject: [PATCH 240/325] refactor: move general entity methods from KelpPlayer to KelpEntity - isInCobweb() - isInWater() --- .../de/pxav/kelp/core/entity/KelpEntity.java | 4 +++ .../entity/VersionedEntity.java | 31 +++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java index 1a8a0ac3..efd4d315 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java @@ -80,6 +80,10 @@ public interface KelpEntity> { */ KelpLocation getLocation(); + boolean isInWater(); + + boolean isInCobweb(); + /** * Converts the current {@code KelpEntity} to a normal * bukkit entity. diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntity.java index 89a38c5c..d4b8ddcf 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntity.java @@ -14,6 +14,7 @@ import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.util.Vector; +import java.lang.reflect.Field; import java.util.List; import java.util.UUID; @@ -105,6 +106,36 @@ public KelpLocation getLocation() { entityHandle.pitch); } + @Override + public boolean isInWater() { + try { + Field inWaterField = net.minecraft.server.v1_8_R3.Entity.class.getDeclaredField("inWater"); + + inWaterField.setAccessible(true); + + return inWaterField.getBoolean(entityHandle); + } catch (IllegalAccessException | NoSuchFieldException e) { + e.printStackTrace(); + } + + return false; + } + + @Override + public boolean isInCobweb() { + try { + Field hField = net.minecraft.server.v1_8_R3.Entity.class.getDeclaredField("H"); + + hField.setAccessible(true); + + return hField.getBoolean(entityHandle); + } catch (IllegalAccessException | NoSuchFieldException e) { + e.printStackTrace(); + } + + return false; + } + @Override public Entity getBukkitEntity() { return null; From 3f4e96c93fe0ac0040ffdb798343929b998ad9e2 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 12:52:18 +0200 Subject: [PATCH 241/325] Implement KelpPlayer for 1.8 --- .../de/pxav/kelp/core/player/KelpPlayer.java | 28 +- .../player/PlayerCreationListener.java | 33 +- .../player/VersionedKelpPlayer.java | 706 ++++++++++++------ 3 files changed, 527 insertions(+), 240 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java index 88e07421..fefc32d3 100644 --- a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java +++ b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayer.java @@ -344,20 +344,6 @@ default KelpPlayer spawnParticle(ParticleType particleType, */ KelpPlayer setHealth(int health); - /** - * Checks if the player is currently stuck in a cobweb. - * - * @return {@code true} if the player is currently stuck in a cobweb. - */ - boolean isInCobweb(); - - /** - * Checks if the player is currently located in water. - * - * @return {@code true} if the player is currently in water. - */ - boolean isInWater(); - /** * Sends a chat message from the given player. * This means you can send a message as if the player itself @@ -448,7 +434,7 @@ default KelpPlayer clearChat() { * * @return The target location of the player's compass. */ - KelpPlayer getCompassTarget(); + KelpLocation getCompassTarget(); /** * Kicks the given player from the server. @@ -781,9 +767,15 @@ default KelpPlayer giveExperienceLevels(int amount) { */ KelpPlayer setAllowFlight(boolean allowed); - KelpPlayer allowFlying(); + default KelpPlayer allowFlying() { + setAllowFlight(true); + return this; + } - KelpPlayer disallowFlying(); + default KelpPlayer disallowFlying() { + setAllowFlight(false); + return this; + } /** * Hides a player from another player, so they become invisible @@ -1121,6 +1113,8 @@ default KelpPlayer toggleWhitelist() { */ KelpPlayer setWhitelisted(boolean whitelisted); + KelpLocation getBedSpawnLocation(); + /** * Sends the given player a message into their chat. * diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/PlayerCreationListener.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/PlayerCreationListener.java index a4d2c6cd..1c94a239 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/PlayerCreationListener.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/PlayerCreationListener.java @@ -8,10 +8,12 @@ import de.pxav.kelp.core.event.kelpevent.SettingsUpdateStage; import de.pxav.kelp.core.logger.KelpLogger; import de.pxav.kelp.core.logger.LogLevel; +import de.pxav.kelp.core.particle.version.ParticleVersionTemplate; import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.player.KelpPlayerRepository; import de.pxav.kelp.core.player.PlayerChatVisibility; import de.pxav.kelp.core.reflect.ReflectionUtil; +import de.pxav.kelp.core.sound.SoundRepository; import de.pxav.kelp.implementation1_8.packet.GlobalPacketListener; import net.minecraft.server.v1_8_R3.Entity; import org.bukkit.Bukkit; @@ -20,6 +22,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.plugin.java.JavaPlugin; import java.util.NoSuchElementException; @@ -37,16 +40,32 @@ public class PlayerCreationListener { private KelpPlayerRepository kelpPlayerRepository; private GlobalPacketListener globalPacketListener; private EntityTypeVersionTemplate entityTypeVersionTemplate; + private SoundRepository soundRepository; + private BossBarLocationUpdater bossBarLocationUpdater; + private JavaPlugin javaPlugin; private ReflectionUtil reflectionUtil; + private ParticleVersionTemplate particleVersionTemplate; private KelpLogger logger; @Inject public PlayerCreationListener(KelpPlayerRepository kelpPlayerRepository, GlobalPacketListener globalPacketListener, - KelpLogger logger) { + KelpLogger logger, + JavaPlugin javaPlugin, + SoundRepository soundRepository, + EntityTypeVersionTemplate entityTypeVersionTemplate, + ReflectionUtil reflectionUtil, + BossBarLocationUpdater bossBarLocationUpdater, + ParticleVersionTemplate particleVersionTemplate) { this.kelpPlayerRepository = kelpPlayerRepository; this.globalPacketListener = globalPacketListener; this.logger = logger; + this.javaPlugin = javaPlugin; + this.reflectionUtil = reflectionUtil; + this.particleVersionTemplate = particleVersionTemplate; + this.bossBarLocationUpdater = bossBarLocationUpdater; + this.soundRepository = soundRepository; + this.entityTypeVersionTemplate = entityTypeVersionTemplate; } /** @@ -68,7 +87,11 @@ public void handlePlayerLogin(PlayerLoginEvent event) { event.getPlayer().getLocation(), entityTypeVersionTemplate, reflectionUtil, - logger); + logger, + bossBarLocationUpdater, + soundRepository, + particleVersionTemplate, + javaPlugin); kelpPlayerRepository.addOrUpdatePlayer(kelpPlayer.getUUID(), kelpPlayer); Bukkit.getPluginManager().callEvent(new KelpPlayerLoginEvent( kelpPlayer, @@ -109,7 +132,11 @@ public void createOnStartup() { current.getLocation(), entityTypeVersionTemplate, reflectionUtil, - logger); + logger, + bossBarLocationUpdater, + soundRepository, + particleVersionTemplate, + javaPlugin); kelpPlayer.setClientViewDistanceInternally(Bukkit.getViewDistance()); kelpPlayer.setClientLanguageInternally("en_US"); kelpPlayer.setPlayerChatVisibilityInternally(PlayerChatVisibility.SHOW_ALL_MESSAGES); diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java index 04259db8..57cf3479 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java @@ -1,11 +1,15 @@ package de.pxav.kelp.implementation1_8.player; +import com.google.common.collect.Sets; +import de.pxav.kelp.core.common.StringUtils; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.KelpProjectile; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.type.PlayerInventory; +import de.pxav.kelp.core.logger.KelpLogger; import de.pxav.kelp.core.logger.LogLevel; import de.pxav.kelp.core.particle.type.ParticleType; +import de.pxav.kelp.core.particle.version.ParticleVersionTemplate; import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.player.PlayerChatVisibility; import de.pxav.kelp.core.player.bossbar.BossBarColor; @@ -16,8 +20,11 @@ import de.pxav.kelp.core.player.message.MessageHoverAction; import de.pxav.kelp.core.player.prompt.sign.SignPromptVersionTemplate; import de.pxav.kelp.core.reflect.ReflectionUtil; +import de.pxav.kelp.core.scheduler.synchronize.ServerMainThread; +import de.pxav.kelp.core.sidebar.SidebarRepository; import de.pxav.kelp.core.sidebar.type.KelpSidebar; import de.pxav.kelp.core.sound.KelpSound; +import de.pxav.kelp.core.sound.SoundRepository; import de.pxav.kelp.core.world.KelpLocation; import de.pxav.kelp.implementation1_8.entity.type.general.VersionedHumanEntity; import de.pxav.kelp.implementation1_8.inventory.VersionedPlayerInventory; @@ -26,135 +33,66 @@ import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TextComponent; -import net.minecraft.server.v1_8_R3.Entity; -import net.minecraft.server.v1_8_R3.EntityPlayer; -import net.minecraft.server.v1_8_R3.Packet; +import net.minecraft.server.v1_8_R3.*; import org.bukkit.Location; +import org.bukkit.Sound; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; import org.bukkit.entity.Player; -import org.bukkit.projectiles.ProjectileSource; - +import org.bukkit.entity.Projectile; +import org.bukkit.permissions.PermissionAttachment; +import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.scoreboard.DisplaySlot; +import org.bukkit.scoreboard.Scoreboard; +import org.bukkit.util.Vector; + +import java.lang.reflect.Field; import java.net.InetSocketAddress; public class VersionedKelpPlayer extends VersionedHumanEntity implements KelpPlayer { - EntityPlayer playerHandle; - CraftPlayer craftPlayer; - - public VersionedKelpPlayer(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, ReflectionUtil reflectionUtil) { + private EntityPlayer playerHandle; + private CraftPlayer player; + private PermissionAttachment permissionAttachment; + private KelpSidebar currentSidebar; + private String clientLanguage; + private PlayerChatVisibility playerChatVisibility; + private int clientViewDistance; + private boolean chatColorEnabled; + private String tabListHeader; + private String tabListFooter; + + private KelpLogger logger; + private BossBarLocationUpdater bossBarLocationUpdater; + private JavaPlugin javaPlugin; + private SoundRepository soundRepository; + private ParticleVersionTemplate particleVersionTemplate; + + public VersionedKelpPlayer(Entity entityHandle, + KelpEntityType entityType, + Location initialLocation, + EntityTypeVersionTemplate entityTypeVersionTemplate, + ReflectionUtil reflectionUtil, + KelpLogger logger, + BossBarLocationUpdater bossBarLocationUpdater, + SoundRepository soundRepository, + ParticleVersionTemplate particleVersionTemplate, + JavaPlugin javaPlugin) { super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, reflectionUtil); + playerHandle = (EntityPlayer) entityHandle; + player = (CraftPlayer) entityHandle.getBukkitEntity(); + this.logger = logger; + this.javaPlugin = javaPlugin; + this.bossBarLocationUpdater = bossBarLocationUpdater; + this.soundRepository = soundRepository; + this.particleVersionTemplate = particleVersionTemplate; } @Override public PlayerInventory getInventory() { - return new VersionedPlayerInventory(craftPlayer.getInventory(), this); - } - - /** - * Appends a message to the given {@link ComponentBuilder}. Please note that every message you append - * using this method may only have one chat color and the formatting code applies for the entire message. - * - * @param componentBuilder The {@link ComponentBuilder} the message should be appended to. - * @param component The {@link MessageComponent} that produced this message. - * @param tempMessage The actual message to send. - * @param color The color of the message. - * @param bold Whether the message should be printed bold. - * @param italic Whether the message should be printed italic. - * @param underlined Whether the message should be underlined. - * @param strikethrough Whether the message should have a strikethrough. - * @param obfuscated Whether the message should be obfuscated/magic. - */ - private void appendComponentBuilder(ComponentBuilder componentBuilder, - MessageComponent component, - StringBuilder tempMessage, - ChatColor color, - boolean bold, - boolean italic, - boolean underlined, - boolean strikethrough, - boolean obfuscated) { - componentBuilder - .append(tempMessage.toString()) - .reset() - .color(color); - if (bold) { - componentBuilder.bold(true); - } else if (italic) { - componentBuilder.italic(true); - } else if (underlined) { - componentBuilder.underlined(true); - } else if (strikethrough) { - componentBuilder.strikethrough(true); - } else if (obfuscated) { - componentBuilder.obfuscated(true); - } - if (tempMessage.length() > 0) { - applyEvents(component, componentBuilder); - } - tempMessage.setLength(0); - } - - /** - * Applies the hover and click events contained in the {@link MessageComponent} to the {@link ComponentBuilder}. - * - * @param component The {@link MessageComponent} containing the events you want to apply. - * @param builder The {@link ComponentBuilder} the events should be applied to. - * @return The newly built {@link ComponentBuilder} containing the event data. - */ - private ComponentBuilder applyEvents(MessageComponent component, ComponentBuilder builder) { - if (component.getClickAction() == MessageClickAction.EXECUTE_COMMAND) { - builder.event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + component.getClickValue().toString())); - } - - if (component.getClickAction() == MessageClickAction.SEND_CHAT_MESSAGE) { - builder.event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, component.getClickValue().toString())); - } - - if (component.getClickAction() == MessageClickAction.CHANGE_PAGE) { - try { - // The click value is converted to an integer first in order to check if the given - // value really is an integer and then converted back into a string to be passed - // as a parameter. - builder.event(new ClickEvent(ClickEvent.Action.CHANGE_PAGE, String.valueOf(Integer.parseInt(component.getClickValue().toString())))); - } catch (NumberFormatException e) { - logger.log(LogLevel.ERROR, "Error converting click value to type INTEGER. If you selected click action CHANGE_PAGE, the click value has to be an integer."); - } - } - - if (component.getClickAction() == MessageClickAction.COPY_TO_CLIPBOARD) { - // In Spigot 1.8, this feature is not available. - } - - if (component.getClickAction() == MessageClickAction.OPEN_FILE) { - builder.event(new ClickEvent(ClickEvent.Action.OPEN_FILE, component.getClickValue().toString())); - } - - if (component.getClickAction() == MessageClickAction.OPEN_URL) { - builder.event(new ClickEvent(ClickEvent.Action.OPEN_URL, component.getClickValue().toString())); - } - - if (component.getClickAction() == MessageClickAction.SUGGEST_COMMAND) { - builder.event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, component.getClickValue().toString())); - } - - if (component.getHoverAction() == MessageHoverAction.SHOW_MESSAGE) { - builder.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, - TextComponent.fromLegacyText(component.getHoverValue().toString()))); - } - - return builder; - } - - /** - * Sends the given packet to the given player. - * - * @param packet The packet you want to send. - * @param player The player who should receive the packet. - */ - private void sendPacket(Packet packet, Player player) { - ((CraftPlayer)player).getHandle().playerConnection.sendPacket(packet); + return new VersionedPlayerInventory(player.getInventory(), this); } @Override @@ -164,257 +102,294 @@ public > E launchProjectile(Class sidebar) { - + this.currentSidebar = sidebar; } @Override public KelpSidebar getCurrentSidebar() { - return null; + return this.currentSidebar; } @Override public KelpPlayer forceInventoryClose() { - return null; + player.closeInventory(); + return this; } @Override public KelpPlayer playSound(KelpSound sound, KelpLocation from, float volume, float pitch) { - return null; + Sound bukkitSound = Sound.valueOf(soundRepository.getSound(sound)); + player.playSound(player.getLocation(), bukkitSound, volume, pitch); + return this; } @Override public KelpPlayer sendActionbar(String message) { - return null; + PacketPlayOutChat packet = + new PacketPlayOutChat( + IChatBaseComponent.ChatSerializer.a("{\"text\": \"" + message + "\"}"), (byte) 2); + sendPacket(packet, player); + return this; } @Override public KelpPlayer sendTitle(String title, String subTitle, int fadeIn, int stay, int fadeOut) { - return null; + final IChatBaseComponent titleComponent = IChatBaseComponent.ChatSerializer.a("{\"text\": \"" + title + "\"}"); + final IChatBaseComponent subComponent = IChatBaseComponent.ChatSerializer.a("{\"text\": \"" + subTitle + "\"}"); + final PacketPlayOutTitle titleOut = new PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction.TIMES, titleComponent, fadeIn, stay, fadeOut); + final PacketPlayOutTitle subtitle = new PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction.TIMES, subComponent); + final PacketPlayOutTitle titlePacket = new PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction.TITLE, titleComponent); + final PacketPlayOutTitle subtitlePacket = new PacketPlayOutTitle(PacketPlayOutTitle.EnumTitleAction.SUBTITLE, subComponent); + + this.sendPacket(titleOut, player); + this.sendPacket(subtitle, player); + this.sendPacket(titlePacket, player); + this.sendPacket(subtitlePacket, player); + return this; } @Override public KelpPlayer spawnParticle(ParticleType particleType, double x, double y, double z, float offsetX, float offsetY, float offsetZ, int count, float particleData, Object generalData) { - return null; + particleVersionTemplate.spawnParticle(this, + particleType, + true, + x, + y, + z, + offsetX, offsetY, + offsetZ, + particleData, + count, + generalData); + return this; } @Override public String getName() { - return null; + return player.getName(); } @Override public KelpPlayer setHealth(int health) { - return null; - } - - @Override - public boolean isInCobweb() { - return false; - } - - @Override - public boolean isInWater() { - return false; + player.setHealth(health); + return this; } @Override public KelpPlayer chat(String message) { - return null; + player.chat(message); + return this; } @Override public InetSocketAddress getSocketAddress() { - return null; + return player.getAddress(); } @Override public boolean mayFly() { - return false; + return player.getAllowFlight(); } @Override public String getDisplayName() { - return null; + return player.getDisplayName(); } @Override public KelpPlayer setDisplayName(String displayName) { - return null; + player.setDisplayName(displayName); + return this; } @Override public String getTabListName() { - return null; + return player.getPlayerListName(); } @Override public KelpPlayer setTabListName(String tabListName) { - return null; + player.setPlayerListName(tabListName); + return this; } @Override public KelpPlayer setCompassTarget(KelpLocation target) { - return null; + player.setCompassTarget(target.getBukkitLocation()); + return this; } @Override - public KelpPlayer getCompassTarget() { - return null; + public KelpLocation getCompassTarget() { + return KelpLocation.from(player.getCompassTarget()); } @Override public KelpPlayer kickPlayer(String kickMessage) { - return null; + player.kickPlayer(kickMessage); + return this; } @Override public boolean isSneaking() { - return false; + return player.isSneaking(); } @Override public KelpPlayer setSneaking(boolean sneaking) { - return null; + player.setSneaking(sneaking); + return this; } @Override public boolean isSprinting() { - return false; + return player.isSprinting(); } @Override public KelpPlayer setSprinting(boolean sprinting) { - return null; + player.setSprinting(sprinting); + return this; } @Override public boolean isSleepingIgnored() { - return false; + return player.isSleepingIgnored(); } @Override public KelpPlayer setSleepingIgnored(boolean sleepingIgnored) { - return null; + player.setSleepingIgnored(sleepingIgnored); + return this; } @Override public KelpPlayer setRelativePlayerTime(long time) { - return null; + player.setPlayerTime(time, true); + return this; } @Override public KelpPlayer setPlayerTime(long time) { - return null; + player.setPlayerTime(time, false); + return this; } @Override public long getPlayerTime() { - return 0; + return player.getPlayerTime(); } @Override public long getPlayerTimeOffset() { - return 0; + return player.getPlayerTimeOffset(); } @Override public boolean isPlayerTimeRelative() { - return false; + return player.isPlayerTimeRelative(); } @Override public KelpPlayer resetPlayerTime() { - return null; + player.resetPlayerTime(); + return this; } @Override public float getExperience() { - return 0; + return player.getExp(); } @Override public KelpPlayer setExperience(float experience) { - return null; + player.setExp(experience); + return this; } @Override public KelpPlayer setLevel(int level) { - return null; + player.setLevel(level); + return this; } @Override public int getLevel() { - return 0; + return player.getLevel(); } @Override public int getTotalExperience() { - return 0; + return player.getTotalExperience(); } @Override public KelpPlayer setTotalExperience(int experience) { - return null; + player.setTotalExperience(experience); + return this; } @Override public float getExhaustionLevel() { - return 0; + return player.getExhaustion(); } @Override public KelpPlayer setExhaustionLevel(float exhaustionLevel) { - return null; + player.setExhaustion(exhaustionLevel); + return this; } @Override public KelpPlayer setSaturationLevel(float saturationLevel) { - return null; + player.setSaturation(saturationLevel); + return this; } @Override public float getSaturationLevel() { - return 0; + return player.getSaturation(); } @Override public int getFoodLevel() { - return 0; + return player.getFoodLevel(); } @Override public KelpPlayer setFoodLevel(int foodLevel) { - return null; + player.setFoodLevel(foodLevel); + return this; } @Override public KelpPlayer setAllowFlight(boolean allowed) { - return null; - } - - @Override - public KelpPlayer allowFlying() { - return null; - } - - @Override - public KelpPlayer disallowFlying() { - return null; + player.setAllowFlight(allowed); + return this; } @Override public KelpPlayer hidePlayer(KelpPlayer toHide) { - return null; + player.hidePlayer(toHide.getBukkitPlayer()); + return this; } @Override public KelpPlayer showPlayer(KelpPlayer toShow) { - return null; + player.showPlayer(toShow.getBukkitPlayer()); + return this; } @Override @@ -424,57 +399,64 @@ public boolean canSee(KelpPlayer toCheck) { @Override public boolean isFlying() { - return false; + return player.isFlying(); } @Override public KelpPlayer setFlying(boolean flying) { - return null; + player.setFlying(flying); + return this; } @Override public KelpPlayer setFlySpeed(float flySpeed) { - return null; + player.setFlySpeed(flySpeed); + return this; } @Override public float getFlySpeed() { - return 0; + return player.getFlySpeed(); } @Override public float getWalkSpeed() { - return 0; + return player.getWalkSpeed(); } @Override public KelpPlayer setWalkSpeed(float walkSpeed) { - return null; + player.setWalkSpeed(walkSpeed); + return this; } @Override public KelpPlayer resetWalkSpeed() { - return null; + player.setWalkSpeed(0.2F); + return this; } @Override public KelpPlayer setResourcePack(String url) { - return null; + player.setResourcePack(url); + return this; } @Override public KelpPlayer setResourcePack(String url, byte[] hash) { - return null; + player.setResourcePack(url); + return this; } @Override public KelpPlayer setHealthScaled(boolean scaled) { - return null; + player.setHealthScaled(scaled); + return this; } @Override public boolean isHealthScaled() { - return false; + return player.isHealthScaled(); } @Override @@ -484,141 +466,425 @@ public KelpPlayer setHealthScale(double healthScale) { @Override public double getHealthScale() { - return 0; + return player.getHealthScale(); } @Override public KelpPlayer resetTitle() { - return null; + player.resetTitle(); + return this; } @Override public KelpPlayer setClientViewDistanceInternally(int clientViewDistance) { - return null; + this.clientViewDistance = clientViewDistance; + return this; } @Override public int getClientViewDistance() { - return 0; + return clientViewDistance; } @Override public KelpPlayer setClientLanguageInternally(String clientLanguage) { - return null; + this.clientLanguage = clientLanguage; + return this; } @Override public String getClientLanguage() { - return null; + return clientLanguage; } @Override public KelpPlayer setPlayerChatVisibilityInternally(PlayerChatVisibility playerChatVisibility) { - return null; + this.playerChatVisibility = playerChatVisibility; + return this; } @Override public PlayerChatVisibility getPlayerChatVisibility() { - return null; + return this.playerChatVisibility; } @Override public KelpPlayer setPlayerChatColorEnabledInternally(boolean playerChatColorEnabled) { - return null; + this.chatColorEnabled = playerChatColorEnabled; + return this; } @Override public boolean isPlayerChatColorEnabled() { - return false; + return chatColorEnabled; } @Override public KelpPlayer setTabListHeaderAndFooter(String header, String footer) { - return null; + if (header == null) header = ""; + if (footer == null) footer = ""; + + IChatBaseComponent tabHeader = + IChatBaseComponent.ChatSerializer.a("{\"text\": \"" + header + "\"}"); + IChatBaseComponent tabFooter = + IChatBaseComponent.ChatSerializer.a("{\"text\": \"" + footer + "\"}"); + PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter(tabHeader); + + try { + Field f = packet.getClass().getDeclaredField("b"); + f.setAccessible(true); + f.set(packet, tabFooter); + } catch (NoSuchFieldException | IllegalAccessException e) { + e.printStackTrace(); + } + + this.tabListFooter = footer; + this.tabListHeader = header; + sendPacket(packet, player); + return this; } @Override public String getTabListFooter() { - return null; + return tabListFooter; } @Override public String getTabListHeader() { - return null; + return tabListHeader; } @Override public int getProtocolVersion() { + // TODO implement using ViaVersion return 0; } @Override public boolean isOperator() { - return false; + return player.isOp(); } @Override public KelpPlayer setOperator(boolean operator) { - return null; + player.setOp(operator); + return this; } @Override public KelpPlayer grantPermission(String permission) { - return null; + if (permissionAttachment == null) { + this.permissionAttachment = player.addAttachment(this.javaPlugin); + } + + permissionAttachment.setPermission(permission, true); + + return this; } @Override public KelpPlayer removePermission(String permission) { - return null; + if (permissionAttachment == null) { + return this; + } + permissionAttachment.unsetPermission(permission); + return this; } @Override public boolean hasPermission(String permission) { - return false; + return player.hasPermission(permission); } @Override public boolean isBannedByBukkit() { - return false; + return player.isBanned(); } @Override public boolean isWhitelisted() { - return false; + return player.isWhitelisted(); } @Override public KelpPlayer setWhitelisted(boolean whitelisted) { - return null; + player.setWhitelisted(whitelisted); + return this; + } + + @Override + public KelpLocation getBedSpawnLocation() { + return KelpLocation.from(player.getBedSpawnLocation()); } @Override public KelpPlayer sendMessage(String message) { - return null; + player.sendMessage(message); + return this; } @Override public KelpPlayer sendBossBar(String message, float health, BossBarColor barColor, BossBarStyle barStyle) { - return null; + Vector direction = player.getLocation().getDirection(); + Location location = player.getLocation().add(direction.multiply(40)); + + if (location.getY() < 1) { + location.setY(1); + } + + EntityWither entityWither = new EntityWither(playerHandle.getWorld()); + entityWither.setInvisible(true); + entityWither.setCustomName((message == null ? "Custom Boss Bar Message." : message)); + entityWither.setCustomNameVisible(false); + entityWither.setLocation(location.getX(), location.getY(), location.getZ(), 0, 0); + entityWither.setHealth(health); + + PacketPlayOutSpawnEntityLiving spawnPacket = new PacketPlayOutSpawnEntityLiving(entityWither); + playerHandle.playerConnection.sendPacket(spawnPacket); + + bossBarLocationUpdater.remove(player.getUniqueId()); + bossBarLocationUpdater.add(player.getUniqueId(), entityWither.getId(), health, message); + + return this; } @Override public KelpPlayer setBossBarProgressHealth(float health) { - return null; + bossBarLocationUpdater.setHealth(player.getUniqueId(), health); + return this; } @Override public KelpPlayer removeBossBar() { - return null; + ServerMainThread.RunParallel.run(() + -> bossBarLocationUpdater.remove(player.getUniqueId())); + return this; } @Override public KelpPlayer sendInteractiveMessage(InteractiveMessage interactiveMessage) { + // create the component builder retaining no formatting code information so that + // the messages stay independent from each other. + ComponentBuilder componentBuilder = new ComponentBuilder("") + .retain(ComponentBuilder.FormatRetention.NONE); + String retainedColorCode = null; + + // iterate through all components of the message to add the individual events and + // handle the color codes correctly. + for (MessageComponent component : interactiveMessage.getComponents()) { + + String message = component.getText(); + StringBuilder tempMessage = new StringBuilder(); + ChatColor color = ChatColor.WHITE; + boolean colorCode = false, formattingCode = false; + boolean bold = false, italic = false, underlined = false, strikethrough = false, obfuscated = false; + + // check whether a color code from the last component was retained + // and eventually apply it. + if (retainedColorCode != null) { + appendComponentBuilder(componentBuilder, + component, + new StringBuilder(), + StringUtils.getChatColor(retainedColorCode), + false, + false, + false, + false, + false); + retainedColorCode = null; + } + + // if the message of the current component ends with any formatting code, + // it is saved and applied to the next component but ignored in the current iteration. + retainedColorCode = StringUtils.endsWithFormattingCode(message); + if (retainedColorCode != null) { + if (message.length() <= 2) { + continue; + } + message = message.substring(0, message.length() - 2); + } + + // iterate through each character of the current message and search for color and style codes. + // a message is basically divided every time a new color code occurs. This has to be done as the + // spigot component builder can only handle one color at once. Example (| is a point where the message is divided.) + // §8[|§aYourPlugin|§8] |§7Click ... [next component] + for (int i = 0; i < message.length() - 1; i++) { + + // if a § with a valid color code id was found, the message up to this point is + // appended to the component builder. + if (message.charAt(i) == '§' && StringUtils.isColorCode(message.charAt(i + 1))) { + if (tempMessage.length() > 0) { + appendComponentBuilder(componentBuilder, component, tempMessage, color, bold, italic, underlined, strikethrough, obfuscated); + } + colorCode = true; + color = StringUtils.getChatColor(message.charAt(i + 1)); + continue; + } + + // if a color code was detected in the last iteration, this is the + // id of the color code (such as 1, 2, 3, ..., a, b, ...) so we can skip this + // char as it was already handled. + if (colorCode) { + colorCode = false; + continue; + } + + // if a formatting code is detected, it is cached and applied to the message. + if (message.charAt(i) == '§' && StringUtils.isFormattingCode(message.charAt(i + 1))) { + formattingCode = true; + ChatColor chatColor = StringUtils.getChatColor(message.charAt(i + 1)); + switch (chatColor) { + case STRIKETHROUGH: + strikethrough = true; + break; + case MAGIC: + obfuscated = true; + break; + case UNDERLINE: + underlined = true; + break; + case ITALIC: + italic = true; + break; + case BOLD: + bold = true; + break; + } + continue; + } + + // if a formatting code has been detected in the last iteration, we can skip this char. + if (formattingCode) { + formattingCode = false; + continue; + } + + // append the current char to the string builder for the temporary message + // if this was a normal char. + tempMessage.append(message.charAt(i)); + + // if we are at the last char of the message, we can append the text to the component builder + // and jump to the next MessageComponent if there is one. + if (i + 1 == message.length() - 1) { + tempMessage.append(message.charAt(i + 1)); + appendComponentBuilder(componentBuilder, component, tempMessage, color, bold, italic, underlined, strikethrough, obfuscated); + } + } + } + + // finally send the message to the player via spigot api call. + player.spigot().sendMessage(componentBuilder.create()); return null; } @Override public Player getBukkitPlayer() { - return null; + return player; } + + /** + * Appends a message to the given {@link ComponentBuilder}. Please note that every message you append + * using this method may only have one chat color and the formatting code applies for the entire message. + * + * @param componentBuilder The {@link ComponentBuilder} the message should be appended to. + * @param component The {@link MessageComponent} that produced this message. + * @param tempMessage The actual message to send. + * @param color The color of the message. + * @param bold Whether the message should be printed bold. + * @param italic Whether the message should be printed italic. + * @param underlined Whether the message should be underlined. + * @param strikethrough Whether the message should have a strikethrough. + * @param obfuscated Whether the message should be obfuscated/magic. + */ + private void appendComponentBuilder(ComponentBuilder componentBuilder, + MessageComponent component, + StringBuilder tempMessage, + ChatColor color, + boolean bold, + boolean italic, + boolean underlined, + boolean strikethrough, + boolean obfuscated) { + componentBuilder + .append(tempMessage.toString()) + .reset() + .color(color); + if (bold) { + componentBuilder.bold(true); + } else if (italic) { + componentBuilder.italic(true); + } else if (underlined) { + componentBuilder.underlined(true); + } else if (strikethrough) { + componentBuilder.strikethrough(true); + } else if (obfuscated) { + componentBuilder.obfuscated(true); + } + if (tempMessage.length() > 0) { + applyEvents(component, componentBuilder); + } + tempMessage.setLength(0); + } + + /** + * Applies the hover and click events contained in the {@link MessageComponent} to the {@link ComponentBuilder}. + * + * @param component The {@link MessageComponent} containing the events you want to apply. + * @param builder The {@link ComponentBuilder} the events should be applied to. + * @return The newly built {@link ComponentBuilder} containing the event data. + */ + private ComponentBuilder applyEvents(MessageComponent component, ComponentBuilder builder) { + if (component.getClickAction() == MessageClickAction.EXECUTE_COMMAND) { + builder.event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/" + component.getClickValue().toString())); + } + + if (component.getClickAction() == MessageClickAction.SEND_CHAT_MESSAGE) { + builder.event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, component.getClickValue().toString())); + } + + if (component.getClickAction() == MessageClickAction.CHANGE_PAGE) { + try { + // The click value is converted to an integer first in order to check if the given + // value really is an integer and then converted back into a string to be passed + // as a parameter. + builder.event(new ClickEvent(ClickEvent.Action.CHANGE_PAGE, String.valueOf(Integer.parseInt(component.getClickValue().toString())))); + } catch (NumberFormatException e) { + logger.log(LogLevel.ERROR, "Error converting click value to type INTEGER. If you selected click action CHANGE_PAGE, the click value has to be an integer."); + } + } + + if (component.getClickAction() == MessageClickAction.COPY_TO_CLIPBOARD) { + // In Spigot 1.8, this feature is not available. + } + + if (component.getClickAction() == MessageClickAction.OPEN_FILE) { + builder.event(new ClickEvent(ClickEvent.Action.OPEN_FILE, component.getClickValue().toString())); + } + + if (component.getClickAction() == MessageClickAction.OPEN_URL) { + builder.event(new ClickEvent(ClickEvent.Action.OPEN_URL, component.getClickValue().toString())); + } + + if (component.getClickAction() == MessageClickAction.SUGGEST_COMMAND) { + builder.event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, component.getClickValue().toString())); + } + + if (component.getHoverAction() == MessageHoverAction.SHOW_MESSAGE) { + builder.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, + TextComponent.fromLegacyText(component.getHoverValue().toString()))); + } + + return builder; + } + + /** + * Sends the given packet to the given player. + * + * @param packet The packet you want to send. + * @param player The player who should receive the packet. + */ + private void sendPacket(Packet packet, Player player) { + ((CraftPlayer)player).getHandle().playerConnection.sendPacket(packet); + } + } From b16435eea6dd3332fd25f1b3039e03caa79841a0 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 13:11:15 +0200 Subject: [PATCH 242/325] Make methods of ReflectionUtil static --- .../main/java/de/pxav/kelp/core/reflect/ReflectionUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/reflect/ReflectionUtil.java b/core/src/main/java/de/pxav/kelp/core/reflect/ReflectionUtil.java index c92a8e70..5e1fa4dc 100644 --- a/core/src/main/java/de/pxav/kelp/core/reflect/ReflectionUtil.java +++ b/core/src/main/java/de/pxav/kelp/core/reflect/ReflectionUtil.java @@ -9,7 +9,7 @@ */ public class ReflectionUtil { - public Object getValue(Object object, String fieldName) { + public static Object getValue(Object object, String fieldName) { try { Field field = object.getClass().getDeclaredField(fieldName); field.setAccessible(true); @@ -20,7 +20,7 @@ public Object getValue(Object object, String fieldName) { return null; } - public void setValue(Object object, String fieldName, Object value) { + public static void setValue(Object object, String fieldName, Object value) { try { Field field = object.getClass().getDeclaredField(fieldName); field.setAccessible(true); From ecb615c6e1308c25d09edfe2ac925047dc8a4745 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 13:11:58 +0200 Subject: [PATCH 243/325] Classes dependent on ReflectionUtil now access its methods statically for better style --- .../entity/VersionedEntityType.java | 7 +- .../entity/type/VersionedCat.java | 4 +- .../entity/type/VersionedChicken.java | 4 +- .../entity/type/VersionedItemFrame.java | 8 +- .../entity/type/VersionedSheep.java | 5 +- .../entity/type/VersionedZombieVillager.java | 13 ++- .../general/VersionedAbstractVillager.java | 5 +- .../type/general/VersionedAnimalEntity.java | 12 ++- .../general/VersionedBreedableAnimal.java | 4 +- .../type/general/VersionedHumanEntity.java | 12 ++- .../type/general/VersionedTameableAnimal.java | 5 +- .../implementation1_8/npc/VersionedNpc.java | 85 +++++++++---------- .../packet/GlobalPacketListener.java | 25 +++--- .../player/PlayerCreationListener.java | 5 -- .../player/VersionedKelpPlayer.java | 6 +- 15 files changed, 85 insertions(+), 115 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java index 95a4739b..731fc78c 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java @@ -24,15 +24,12 @@ public class VersionedEntityType extends EntityTypeVersionTemplate { private EntityVersionTemplate entityVersionTemplate; private LivingEntityVersionTemplate livingEntityVersionTemplate; - private ReflectionUtil reflectionUtil; @Inject public VersionedEntityType(EntityVersionTemplate entityVersionTemplate, - LivingEntityVersionTemplate livingEntityVersionTemplate, - ReflectionUtil reflectionUtil) { + LivingEntityVersionTemplate livingEntityVersionTemplate) { this.entityVersionTemplate = entityVersionTemplate; this.livingEntityVersionTemplate = livingEntityVersionTemplate; - this.reflectionUtil = reflectionUtil; } @Override @@ -61,7 +58,7 @@ public KelpEntity newKelpEntity(KelpEntityType entityType, Location location) // break; case SHEEP: entity = craftWorld.createEntity(location, Sheep.class); - output = new VersionedSheep(entity, KelpEntityType.SHEEP, location, this, reflectionUtil); + output = new VersionedSheep(entity, KelpEntityType.SHEEP, location, this); } // if (entityType != KelpEntityType.DROPPED_ITEM) { diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCat.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCat.java index ebacf36b..c7833861 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCat.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCat.java @@ -20,8 +20,8 @@ public class VersionedCat extends VersionedAnimalEntity implements Ca EntityOcelot ocelotHandle; private EntityConstantsVersionTemplate entityConstantsVersionTemplate; - public VersionedCat(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, ReflectionUtil reflectionUtil, EntityConstantsVersionTemplate entityConstantsVersionTemplate) { - super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, reflectionUtil); + public VersionedCat(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, EntityConstantsVersionTemplate entityConstantsVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); craftOcelot.setCatType(Ocelot.Type.valueOf(entityConstantsVersionTemplate.getCatType(CatType.randomCatType()))); this.entityConstantsVersionTemplate = entityConstantsVersionTemplate; } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedChicken.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedChicken.java index 39e05184..102d6552 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedChicken.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedChicken.java @@ -10,8 +10,8 @@ public class VersionedChicken extends VersionedBreedableAnimal implements ChickenEntity { - public VersionedChicken(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, ReflectionUtil reflectionUtil) { - super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, reflectionUtil); + public VersionedChicken(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); } } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedItemFrame.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedItemFrame.java index a8ec01ad..fa3b30cb 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedItemFrame.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedItemFrame.java @@ -20,14 +20,12 @@ public class VersionedItemFrame extends VersionedHangingEntity private CraftItemFrame craftItemFrame; private EntityItemFrame itemFrameHandle; - private ReflectionUtil reflectionUtil; private FixedItemFrameListener fixedItemFrame; - public VersionedItemFrame(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, ReflectionUtil reflectionUtil, FixedItemFrameListener fixedItemFrame) { + public VersionedItemFrame(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, FixedItemFrameListener fixedItemFrame) { super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); this.craftItemFrame = (CraftItemFrame) entityHandle.getBukkitEntity(); this.itemFrameHandle = (EntityItemFrame) entityHandle; - this.reflectionUtil = reflectionUtil; this.fixedItemFrame = fixedItemFrame; } @@ -89,12 +87,12 @@ public ItemFrameEntity setItemAndPlayPlacementSound(KelpItem item) { @Override public double getItemDropChance() { - return (double) ((float) reflectionUtil.getValue(itemFrameHandle, "c")) ; + return (double) ((float) ReflectionUtil.getValue(itemFrameHandle, "c")) ; } @Override public ItemFrameEntity setItemDropChance(double itemDropChance) { - reflectionUtil.setValue(itemFrameHandle, "c", (float) itemDropChance); + ReflectionUtil.setValue(itemFrameHandle, "c", (float) itemDropChance); return this; } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSheep.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSheep.java index 20fe6a6c..cf491f26 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSheep.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSheep.java @@ -20,9 +20,8 @@ public class VersionedSheep public VersionedSheep(Entity entityHandle, KelpEntityType entityType, Location initialLocation, - EntityTypeVersionTemplate entityTypeVersionTemplate, - ReflectionUtil reflectionUtil) { - super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, reflectionUtil); + EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); this.sheepHandle = (EntitySheep) entityHandle; } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieVillager.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieVillager.java index 019d9e4b..76e68815 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieVillager.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieVillager.java @@ -13,26 +13,23 @@ public class VersionedZombieVillager extends VersionedZombie implements ZombieVillagerEntity { - private EntityConstantsVersionTemplate entityConstantsVersionTemplate; - private EntityZombie zombieHandle; - private ReflectionUtil reflectionUtil; + private final EntityConstantsVersionTemplate entityConstantsVersionTemplate; + private final EntityZombie zombieHandle; public VersionedZombieVillager(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, - EntityConstantsVersionTemplate entityConstantsVersionTemplate, - ReflectionUtil reflectionUtil) { + EntityConstantsVersionTemplate entityConstantsVersionTemplate) { super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); this.entityConstantsVersionTemplate = entityConstantsVersionTemplate; this.zombieHandle = (EntityZombie) entityHandle; - this.reflectionUtil = reflectionUtil; zombieHandle.setVillager(true); } @Override public ZombieVillagerEntity setConversionTime(int conversionTime) { - reflectionUtil.setValue(zombieHandle, "bn", conversionTime); + ReflectionUtil.setValue(zombieHandle, "bn", conversionTime); return this; } @@ -48,7 +45,7 @@ public ZombieVillagerEntity setVillagerProfession(VillagerProfession villagerPro @Override public int getConversionTime() { - return (int) reflectionUtil.getValue(zombieHandle, "bn"); + return (int) ReflectionUtil.getValue(zombieHandle, "bn"); } @Override diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractVillager.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractVillager.java index 0d2853ca..d64f08b4 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractVillager.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractVillager.java @@ -19,9 +19,8 @@ public VersionedAbstractVillager(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, - InventoryVersionTemplate inventoryVersionTemplate, - ReflectionUtil reflectionUtil) { - super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, reflectionUtil); + InventoryVersionTemplate inventoryVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); this.inventoryVersionTemplate = inventoryVersionTemplate; this.craftVillager = (CraftVillager) entityHandle.getBukkitEntity(); } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAnimalEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAnimalEntity.java index 2607682a..0da85226 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAnimalEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAnimalEntity.java @@ -14,12 +14,10 @@ public class VersionedAnimalEntity> extends VersionedMobileEntity implements AnimalEntity { - private EntityAnimal animalHandle; - private ReflectionUtil reflectionUtil; + private final EntityAnimal animalHandle; - public VersionedAnimalEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, ReflectionUtil reflectionUtil) { + public VersionedAnimalEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); - this.reflectionUtil = reflectionUtil; this.animalHandle = (EntityAnimal) entityHandle; } @@ -46,18 +44,18 @@ public KelpEntity getBreeder() { @Override public T setBreeder(KelpEntity breeder) { EntityHuman nmsHuman = ((CraftHumanEntity) breeder.getBukkitEntity()).getHandle(); - reflectionUtil.setValue(animalHandle, "bo", nmsHuman); + ReflectionUtil.setValue(animalHandle, "bo", nmsHuman); return (T) this; } @Override public int getLoveModeTicks() { - return (int) reflectionUtil.getValue(animalHandle, "bm"); + return (int) ReflectionUtil.getValue(animalHandle, "bm"); } @Override public T setLoveModeTicks(int loveModeTicks) { - reflectionUtil.setValue(animalHandle, "bm", loveModeTicks); + ReflectionUtil.setValue(animalHandle, "bm", loveModeTicks); return (T) this; } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedBreedableAnimal.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedBreedableAnimal.java index 24810d68..fc8e362a 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedBreedableAnimal.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedBreedableAnimal.java @@ -11,8 +11,8 @@ public class VersionedBreedableAnimal> extends VersionedAnimalEntity implements BreedableAnimalEntity { - public VersionedBreedableAnimal(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, ReflectionUtil reflectionUtil) { - super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, reflectionUtil); + public VersionedBreedableAnimal(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); } //TODO cannot be implemented. Lack of server-side methods. diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHumanEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHumanEntity.java index ca2590f0..5cdd1038 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHumanEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHumanEntity.java @@ -17,15 +17,13 @@ public class VersionedHumanEntity> extends VersionedMobileEntity implements HumanEntity { - private EntityHuman humanHandle; - private CraftHumanEntity craftHumanEntity; - private ReflectionUtil reflectionUtil; + private final EntityHuman humanHandle; + private final CraftHumanEntity craftHumanEntity; - public VersionedHumanEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, ReflectionUtil reflectionUtil) { + public VersionedHumanEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); this.humanHandle = (EntityHuman) entityHandle; this.craftHumanEntity = (CraftHumanEntity) entityHandle.getBukkitEntity(); - this.reflectionUtil = reflectionUtil; } @Override @@ -74,8 +72,8 @@ public T sleep(KelpLocation bedLocation) { bedLocation.getZ()); PacketPlayOutBed bedPacket = new PacketPlayOutBed(); - reflectionUtil.setValue(bedPacket, "a", getEntityId()); - reflectionUtil.setValue(bedPacket, "b", bedPosition); + ReflectionUtil.setValue(bedPacket, "a", getEntityId()); + ReflectionUtil.setValue(bedPacket, "b", bedPosition); for (Player player : Bukkit.getOnlinePlayers()) { ((CraftPlayer)player).getHandle().playerConnection.sendPacket(bedPacket); diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedTameableAnimal.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedTameableAnimal.java index a90b88a5..c0f1be80 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedTameableAnimal.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedTameableAnimal.java @@ -17,9 +17,8 @@ public class VersionedTameableAnimal> extends Versio public VersionedTameableAnimal(Entity entityHandle, KelpEntityType entityType, Location initialLocation, - EntityTypeVersionTemplate entityTypeVersionTemplate, - ReflectionUtil reflectionUtil) { - super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, reflectionUtil); + EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); this.tameableHandle = (EntityTameableAnimal) entityHandle; } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/npc/VersionedNpc.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/npc/VersionedNpc.java index 0689e389..48716290 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/npc/VersionedNpc.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/npc/VersionedNpc.java @@ -38,13 +38,6 @@ @Versioned public class VersionedNpc extends NpcVersionTemplate { - private ReflectionUtil reflectionUtil; - - @Inject - public VersionedNpc(ReflectionUtil reflectionUtil) { - this.reflectionUtil = reflectionUtil; - } - @Override public KelpNpcMeta spawnNpc(KelpNpc npc, Player player) { PlayerConnection playerConnection = ((CraftPlayer)player).getHandle().playerConnection; @@ -85,22 +78,22 @@ public KelpNpcMeta spawnNpc(KelpNpc npc, Player player) { KelpNpcMeta npcMeta = new KelpNpcMeta(entityId, gameProfile, npc.getCustomName(), armorStandIds); - reflectionUtil.setValue(spawnPacket, "a", entityId); - reflectionUtil.setValue(spawnPacket, "b", gameProfile.getId()); - reflectionUtil.setValue(spawnPacket, "c", MathHelper.floor(npc.getLocation().getX() * 32.0D)); - reflectionUtil.setValue(spawnPacket, "d", MathHelper.floor(npc.getLocation().getY() * 32.0D)); - reflectionUtil.setValue(spawnPacket, "e", MathHelper.floor(npc.getLocation().getZ() * 32.0D)); - reflectionUtil.setValue(spawnPacket, "f", (byte) ((int) (npc.getLocation().getYaw() * 256.0F / 360.0F))); - reflectionUtil.setValue(spawnPacket, "g", (byte) ((int) (npc.getLocation().getPitch() * 256.0F / 360.0F))); + ReflectionUtil.setValue(spawnPacket, "a", entityId); + ReflectionUtil.setValue(spawnPacket, "b", gameProfile.getId()); + ReflectionUtil.setValue(spawnPacket, "c", MathHelper.floor(npc.getLocation().getX() * 32.0D)); + ReflectionUtil.setValue(spawnPacket, "d", MathHelper.floor(npc.getLocation().getY() * 32.0D)); + ReflectionUtil.setValue(spawnPacket, "e", MathHelper.floor(npc.getLocation().getZ() * 32.0D)); + ReflectionUtil.setValue(spawnPacket, "f", (byte) ((int) (npc.getLocation().getYaw() * 256.0F / 360.0F))); + ReflectionUtil.setValue(spawnPacket, "g", (byte) ((int) (npc.getLocation().getPitch() * 256.0F / 360.0F))); if (npc.getItemInHand() != null) { - reflectionUtil.setValue(spawnPacket, "h", npc.getItemInHand().getItemStack().getType().getId()); + ReflectionUtil.setValue(spawnPacket, "h", npc.getItemInHand().getItemStack().getType().getId()); } DataWatcher dataWatcher = new DataWatcher(null); this.applyToDataWatcher(dataWatcher, npc); - reflectionUtil.setValue(spawnPacket, "i", dataWatcher); + ReflectionUtil.setValue(spawnPacket, "i", dataWatcher); // add npc to tab if (!npc.shouldShowInTab()) { @@ -177,16 +170,16 @@ public void teleport(KelpNpc npc, KelpLocation location) { PacketPlayOutEntityTeleport teleportPacket = new PacketPlayOutEntityTeleport(); - reflectionUtil.setValue(teleportPacket, "a", npc.getEntityId()); - reflectionUtil.setValue(teleportPacket, "b", MathHelper.floor(location.getX() * 32.0D)); - reflectionUtil.setValue(teleportPacket, "c", MathHelper.floor(location.getY() * 32.0D)); - reflectionUtil.setValue(teleportPacket, "d", MathHelper.floor(location.getZ() * 32.0D)); - reflectionUtil.setValue(teleportPacket, "e", (byte) ((int) (location.getYaw() * 256.0F / 360.0F))); - reflectionUtil.setValue(teleportPacket, "f", (byte) ((int) (location.getPitch() * 256.0F / 360.0F))); + ReflectionUtil.setValue(teleportPacket, "a", npc.getEntityId()); + ReflectionUtil.setValue(teleportPacket, "b", MathHelper.floor(location.getX() * 32.0D)); + ReflectionUtil.setValue(teleportPacket, "c", MathHelper.floor(location.getY() * 32.0D)); + ReflectionUtil.setValue(teleportPacket, "d", MathHelper.floor(location.getZ() * 32.0D)); + ReflectionUtil.setValue(teleportPacket, "e", (byte) ((int) (location.getYaw() * 256.0F / 360.0F))); + ReflectionUtil.setValue(teleportPacket, "f", (byte) ((int) (location.getPitch() * 256.0F / 360.0F))); PacketPlayOutEntityHeadRotation headRotationPacket = new PacketPlayOutEntityHeadRotation(); - reflectionUtil.setValue(headRotationPacket, "a", npc.getEntityId()); - reflectionUtil.setValue(headRotationPacket, "b", (byte) ((int) (location.getYaw() * 256.0F / 360.0F))); + ReflectionUtil.setValue(headRotationPacket, "a", npc.getEntityId()); + ReflectionUtil.setValue(headRotationPacket, "b", (byte) ((int) (location.getYaw() * 256.0F / 360.0F))); playerConnection.sendPacket(teleportPacket); playerConnection.sendPacket(headRotationPacket); @@ -195,14 +188,14 @@ public void teleport(KelpNpc npc, KelpLocation location) { for (Integer entityId : npc.getNpcMeta().getArmorStandEntityIds()) { double height = npc.getTitleHeights(index); PacketPlayOutEntityTeleport teleportArmorStandPacket = new PacketPlayOutEntityTeleport(); - reflectionUtil.setValue(teleportArmorStandPacket, "a", entityId); - reflectionUtil.setValue(teleportArmorStandPacket, "b", MathHelper.floor(location.getX() * 32.0D)); + ReflectionUtil.setValue(teleportArmorStandPacket, "a", entityId); + ReflectionUtil.setValue(teleportArmorStandPacket, "b", MathHelper.floor(location.getX() * 32.0D)); - reflectionUtil.setValue(teleportArmorStandPacket, "c", MathHelper.floor((location.getY() + height) * 32.0D)); + ReflectionUtil.setValue(teleportArmorStandPacket, "c", MathHelper.floor((location.getY() + height) * 32.0D)); - reflectionUtil.setValue(teleportArmorStandPacket, "d", MathHelper.floor(location.getZ() * 32.0D)); - reflectionUtil.setValue(teleportArmorStandPacket, "e", (byte) 0); - reflectionUtil.setValue(teleportArmorStandPacket, "f", (byte) 0); + ReflectionUtil.setValue(teleportArmorStandPacket, "d", MathHelper.floor(location.getZ() * 32.0D)); + ReflectionUtil.setValue(teleportArmorStandPacket, "e", (byte) 0); + ReflectionUtil.setValue(teleportArmorStandPacket, "f", (byte) 0); playerConnection.sendPacket(teleportArmorStandPacket); index++; } @@ -273,49 +266,49 @@ public void playAnimation(KelpNpc npc, NpcAnimation animation) { PlayerConnection connection = player.getHandle().playerConnection; PacketPlayOutAnimation animationPacket = new PacketPlayOutAnimation(); - reflectionUtil.setValue(animationPacket, "a", npc.getEntityId()); + ReflectionUtil.setValue(animationPacket, "a", npc.getEntityId()); PacketPlayOutEntityStatus statusPacket = new PacketPlayOutEntityStatus(); - reflectionUtil.setValue(statusPacket, "a", npc.getEntityId()); + ReflectionUtil.setValue(statusPacket, "a", npc.getEntityId()); if (animation == NpcAnimation.TAKE_DAMAGE) { - reflectionUtil.setValue(animationPacket, "b", 1); + ReflectionUtil.setValue(animationPacket, "b", 1); connection.sendPacket(animationPacket); return; } if (animation == NpcAnimation.MAIN_HAND_SWING) { - reflectionUtil.setValue(animationPacket, "b", 0); + ReflectionUtil.setValue(animationPacket, "b", 0); connection.sendPacket(animationPacket); return; } if (animation == NpcAnimation.LEAVE_BED) { - reflectionUtil.setValue(animationPacket, "b", 2); + ReflectionUtil.setValue(animationPacket, "b", 2); connection.sendPacket(animationPacket); return; } if (animation == NpcAnimation.EAT) { - reflectionUtil.setValue(animationPacket, "b", 3); + ReflectionUtil.setValue(animationPacket, "b", 3); connection.sendPacket(animationPacket); return; } if (animation == NpcAnimation.CRITICAL_EFFECT) { - reflectionUtil.setValue(animationPacket, "b", 4); + ReflectionUtil.setValue(animationPacket, "b", 4); connection.sendPacket(animationPacket); return; } if (animation == NpcAnimation.MAGIC_CRITICAL_EFFECT) { - reflectionUtil.setValue(animationPacket, "b", 5); + ReflectionUtil.setValue(animationPacket, "b", 5); connection.sendPacket(animationPacket); return; } if (animation == NpcAnimation.ENTITY_DEATH) { - reflectionUtil.setValue(statusPacket, "b", (byte) 3); + ReflectionUtil.setValue(statusPacket, "b", (byte) 3); connection.sendPacket(statusPacket); return; } @@ -340,8 +333,8 @@ public void makeCorpse(KelpNpc npc) { player.sendBlockChange(bedLocation, Material.BED_BLOCK, (byte) 0); PacketPlayOutBed bedPacket = new PacketPlayOutBed(); - reflectionUtil.setValue(bedPacket, "a", npc.getEntityId()); - reflectionUtil.setValue(bedPacket, "b", blockPosition); + ReflectionUtil.setValue(bedPacket, "a", npc.getEntityId()); + ReflectionUtil.setValue(bedPacket, "b", blockPosition); player.getHandle().playerConnection.sendPacket(bedPacket); } @@ -356,8 +349,8 @@ public void sleep(KelpNpc npc, KelpLocation bedLocation) { bedLocation.getZ()); PacketPlayOutBed bedPacket = new PacketPlayOutBed(); - reflectionUtil.setValue(bedPacket, "a", npc.getEntityId()); - reflectionUtil.setValue(bedPacket, "b", blockPosition); + ReflectionUtil.setValue(bedPacket, "a", npc.getEntityId()); + ReflectionUtil.setValue(bedPacket, "b", blockPosition); player.getHandle().playerConnection.sendPacket(bedPacket); } @@ -436,12 +429,12 @@ public void updateTab(KelpNpc npc, @Nullable GameProfile gameProfile) { players.add(playerInfoData); if (npc.shouldShowInTab()) { - reflectionUtil.setValue(infoPacket, "a", PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER); + ReflectionUtil.setValue(infoPacket, "a", PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER); } else { - reflectionUtil.setValue(infoPacket, "a", PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER); + ReflectionUtil.setValue(infoPacket, "a", PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER); } - reflectionUtil.setValue(infoPacket, "b", players); + ReflectionUtil.setValue(infoPacket, "b", players); player.getHandle().playerConnection.sendPacket(infoPacket); } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/packet/GlobalPacketListener.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/packet/GlobalPacketListener.java index 758d2514..aad6456a 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/packet/GlobalPacketListener.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/packet/GlobalPacketListener.java @@ -37,20 +37,17 @@ */ public class GlobalPacketListener { - private KelpPlayerRepository playerRepository; - private ReflectionUtil reflectionUtil; - private VersionedSignPrompt signPrompt; - private KelpSchedulerRepository schedulerRepository; - private KelpNpcRepository npcRepository; + private final KelpPlayerRepository playerRepository; + private final VersionedSignPrompt signPrompt; + private final KelpSchedulerRepository schedulerRepository; + private final KelpNpcRepository npcRepository; @Inject public GlobalPacketListener(KelpPlayerRepository playerRepository, - ReflectionUtil reflectionUtil, VersionedSignPrompt signPrompt, KelpSchedulerRepository schedulerRepository, KelpNpcRepository npcRepository) { this.playerRepository = playerRepository; - this.reflectionUtil = reflectionUtil; this.signPrompt = signPrompt; this.schedulerRepository = schedulerRepository; this.npcRepository = npcRepository; @@ -79,11 +76,11 @@ public void channelRead(ChannelHandlerContext channelHandlerContext, Object pack if (packet instanceof PacketPlayInSettings) { PacketPlayInSettings settingsPacket = (PacketPlayInSettings) packet; - String language = String.valueOf(reflectionUtil.getValue(settingsPacket, "a")); - int viewDistance = Integer.parseInt(String.valueOf(reflectionUtil.getValue(settingsPacket, "b"))); - boolean chatColorEnabled = Boolean.parseBoolean(String.valueOf(reflectionUtil.getValue(settingsPacket, "d"))); + String language = String.valueOf(ReflectionUtil.getValue(settingsPacket, "a")); + int viewDistance = Integer.parseInt(String.valueOf(ReflectionUtil.getValue(settingsPacket, "b"))); + boolean chatColorEnabled = Boolean.parseBoolean(String.valueOf(ReflectionUtil.getValue(settingsPacket, "d"))); PlayerChatVisibility chatVisibility = PlayerChatVisibility.SHOW_ALL_MESSAGES; - switch (String.valueOf(reflectionUtil.getValue(settingsPacket, "c"))) { + switch (String.valueOf(ReflectionUtil.getValue(settingsPacket, "c"))) { case "FULL": chatVisibility = PlayerChatVisibility.SHOW_ALL_MESSAGES; break; @@ -117,7 +114,7 @@ public void channelRead(ChannelHandlerContext channelHandlerContext, Object pack if (packet instanceof PacketPlayInUpdateSign && signPrompt.isChecked(player.getUniqueId())) { PacketPlayInUpdateSign updatePacket = (PacketPlayInUpdateSign) packet; - IChatBaseComponent[] rawLines = (IChatBaseComponent[]) reflectionUtil.getValue(updatePacket, "b"); + IChatBaseComponent[] rawLines = (IChatBaseComponent[]) ReflectionUtil.getValue(updatePacket, "b"); List input = Lists.newArrayList(); for (IChatBaseComponent line : rawLines) { @@ -149,9 +146,9 @@ public void channelRead(ChannelHandlerContext channelHandlerContext, Object pack } PacketPlayInUseEntity usePacket = (PacketPlayInUseEntity) packet; - int rawEntityId = Integer.parseInt(String.valueOf(reflectionUtil.getValue(usePacket, "a"))); + int rawEntityId = Integer.parseInt(String.valueOf(ReflectionUtil.getValue(usePacket, "a"))); PacketPlayInUseEntity.EnumEntityUseAction packetAction = PacketPlayInUseEntity.EnumEntityUseAction.valueOf( - String.valueOf(reflectionUtil.getValue(usePacket, "action")) + String.valueOf(ReflectionUtil.getValue(usePacket, "action")) ); if (packetAction == PacketPlayInUseEntity.EnumEntityUseAction.INTERACT_AT) { diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/PlayerCreationListener.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/PlayerCreationListener.java index 1c94a239..9514ac84 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/PlayerCreationListener.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/PlayerCreationListener.java @@ -43,7 +43,6 @@ public class PlayerCreationListener { private SoundRepository soundRepository; private BossBarLocationUpdater bossBarLocationUpdater; private JavaPlugin javaPlugin; - private ReflectionUtil reflectionUtil; private ParticleVersionTemplate particleVersionTemplate; private KelpLogger logger; @@ -54,14 +53,12 @@ public PlayerCreationListener(KelpPlayerRepository kelpPlayerRepository, JavaPlugin javaPlugin, SoundRepository soundRepository, EntityTypeVersionTemplate entityTypeVersionTemplate, - ReflectionUtil reflectionUtil, BossBarLocationUpdater bossBarLocationUpdater, ParticleVersionTemplate particleVersionTemplate) { this.kelpPlayerRepository = kelpPlayerRepository; this.globalPacketListener = globalPacketListener; this.logger = logger; this.javaPlugin = javaPlugin; - this.reflectionUtil = reflectionUtil; this.particleVersionTemplate = particleVersionTemplate; this.bossBarLocationUpdater = bossBarLocationUpdater; this.soundRepository = soundRepository; @@ -86,7 +83,6 @@ public void handlePlayerLogin(PlayerLoginEvent event) { KelpEntityType.PLAYER, event.getPlayer().getLocation(), entityTypeVersionTemplate, - reflectionUtil, logger, bossBarLocationUpdater, soundRepository, @@ -131,7 +127,6 @@ public void createOnStartup() { KelpEntityType.PLAYER, current.getLocation(), entityTypeVersionTemplate, - reflectionUtil, logger, bossBarLocationUpdater, soundRepository, diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java index 57cf3479..e5a23465 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java @@ -74,13 +74,12 @@ public VersionedKelpPlayer(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, - ReflectionUtil reflectionUtil, KelpLogger logger, BossBarLocationUpdater bossBarLocationUpdater, SoundRepository soundRepository, ParticleVersionTemplate particleVersionTemplate, JavaPlugin javaPlugin) { - super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, reflectionUtil); + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); playerHandle = (EntityPlayer) entityHandle; player = (CraftPlayer) entityHandle.getBukkitEntity(); this.logger = logger; @@ -773,7 +772,8 @@ public KelpPlayer sendInteractiveMessage(InteractiveMessage interactiveMessage) } // finally send the message to the player via spigot api call. - player.spigot().sendMessage(componentBuilder.create()); + Player spigotPlayer = (Player) player; + spigotPlayer.spigot().sendMessage(componentBuilder.create()); return null; } From 5f34e098394f43601dd857a061b50217c87af295 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 13:51:09 +0200 Subject: [PATCH 244/325] The project now uses maven's ${revision} property to auto-handle versions in plugin.yml and pom files --- core/pom.xml | 13 ++++++++++- core/src/main/resources/plugin.yml | 2 +- pom.xml | 35 +++++++++++++++++++++++++----- testing-module/pom.xml | 4 ++-- v1_8_implementation/pom.xml | 4 ++-- 5 files changed, 47 insertions(+), 11 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 6ce0d12a..35e09117 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ com.github.pxav.kelp parent - 0.3.3 + ${revision} 4.0.0 @@ -91,6 +91,17 @@ maven-shade-plugin + + + + . + true + ${basedir}/src/main/resources/ + + * + + + diff --git a/core/src/main/resources/plugin.yml b/core/src/main/resources/plugin.yml index 69f170c8..b19d252e 100644 --- a/core/src/main/resources/plugin.yml +++ b/core/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: Kelp -version: ${project.version} +version: ${revision} main: de.pxav.kelp.core.KelpPlugin author: pxav description: A cross version spigot framework. diff --git a/pom.xml b/pom.xml index 165bc29c..b4eefdb2 100644 --- a/pom.xml +++ b/pom.xml @@ -7,12 +7,17 @@ com.github.pxav.kelp parent pom - 0.3.3 + ${revision} Kelp A cross-version spigot framework to avoid boilerplate code and make your plugin compatible with multiple spigot versions easily https://www.github.com/KelpFramework/kelp + + UTF-8 + 0.3.3 + + MIT License @@ -57,10 +62,6 @@ kelp-sql - - UTF-8 - - @@ -184,6 +185,30 @@ + + org.codehaus.mojo + flatten-maven-plugin + 1.0.0 + + true + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + org.apache.maven.plugins maven-shade-plugin diff --git a/testing-module/pom.xml b/testing-module/pom.xml index 7195e280..4c911d63 100644 --- a/testing-module/pom.xml +++ b/testing-module/pom.xml @@ -5,7 +5,7 @@ parent com.github.pxav.kelp - 0.3.3 + ${revision} 4.0.0 @@ -45,7 +45,7 @@ com.github.pxav.kelp core - 0.3.3 + ${revision} provided diff --git a/v1_8_implementation/pom.xml b/v1_8_implementation/pom.xml index 35aa9031..c77949ba 100644 --- a/v1_8_implementation/pom.xml +++ b/v1_8_implementation/pom.xml @@ -5,7 +5,7 @@ com.github.pxav.kelp parent - 0.3.3 + ${revision} 4.0.0 @@ -90,7 +90,7 @@ com.github.pxav.kelp core - 0.3.3 + ${revision} provided From 6fd271d2f8ab0e79f08e3f99408f74c69b202693 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 14:09:44 +0200 Subject: [PATCH 245/325] Remove version templates that are not needed anymore. --- .../core/entity/type/ElderGuardianEntity.java | 3 - .../core/entity/type/ExperienceOrbEntity.java | 4 - .../core/entity/type/LeashHitchEntity.java | 5 - .../entity/version/EntityVersionTemplate.java | 451 --------- .../version/LivingEntityVersionTemplate.java | 18 - .../core/player/KelpPlayerRepository.java | 21 +- .../core/player/PlayerVersionTemplate.java | 930 ------------------ .../entity/VersionedEntityType.java | 12 +- .../entity/type/VersionedGuardian.java | 2 - .../entity/type/VersionedItemFrame.java | 3 - 10 files changed, 4 insertions(+), 1445 deletions(-) delete mode 100644 core/src/main/java/de/pxav/kelp/core/entity/version/EntityVersionTemplate.java delete mode 100644 core/src/main/java/de/pxav/kelp/core/entity/version/LivingEntityVersionTemplate.java delete mode 100644 core/src/main/java/de/pxav/kelp/core/player/PlayerVersionTemplate.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ElderGuardianEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ElderGuardianEntity.java index d6722c9a..57cadbcb 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ElderGuardianEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ElderGuardianEntity.java @@ -4,10 +4,7 @@ import de.pxav.kelp.core.entity.KelpEntityFactory; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MonsterEntity; -import de.pxav.kelp.core.entity.version.EntityVersionTemplate; -import de.pxav.kelp.core.entity.version.LivingEntityVersionTemplate; import de.pxav.kelp.core.world.KelpLocation; -import org.bukkit.Location; /** * A class description goes here. diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ExperienceOrbEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ExperienceOrbEntity.java index 846d3c42..85f70d11 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ExperienceOrbEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ExperienceOrbEntity.java @@ -2,11 +2,7 @@ import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.KelpEntity; -import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; -import de.pxav.kelp.core.entity.version.EntityVersionTemplate; -import de.pxav.kelp.core.world.KelpLocation; -import org.bukkit.Location; import org.bukkit.entity.ExperienceOrb; public interface ExperienceOrbEntity extends KelpEntity { diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/LeashHitchEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/LeashHitchEntity.java index 96ca6e15..49a0dd73 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/LeashHitchEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/LeashHitchEntity.java @@ -1,11 +1,6 @@ package de.pxav.kelp.core.entity.type; -import de.pxav.kelp.core.entity.KelpEntity; -import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.HangingEntity; -import de.pxav.kelp.core.entity.version.EntityVersionTemplate; -import org.bukkit.Location; -import org.bukkit.entity.Hanging; public interface LeashHitchEntity extends HangingEntity { diff --git a/core/src/main/java/de/pxav/kelp/core/entity/version/EntityVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/entity/version/EntityVersionTemplate.java deleted file mode 100644 index 1709e541..00000000 --- a/core/src/main/java/de/pxav/kelp/core/entity/version/EntityVersionTemplate.java +++ /dev/null @@ -1,451 +0,0 @@ -package de.pxav.kelp.core.entity.version; - -import de.pxav.kelp.core.application.KelpVersionTemplate; -import de.pxav.kelp.core.entity.KelpEntity; -import de.pxav.kelp.core.version.KelpVersion; -import de.pxav.kelp.core.version.SinceKelpVersion; -import de.pxav.kelp.core.world.KelpLocation; -import org.bukkit.Server; -import org.bukkit.entity.Entity; -import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.event.player.PlayerTeleportEvent; -import org.bukkit.util.Vector; - -import java.util.List; -import java.util.UUID; - -/** - * A class description goes here. - * - * @author pxav - */ -@KelpVersionTemplate -public abstract class EntityVersionTemplate { - - /** - * Spawns the entity at the given location. As - * creating the entity only registers it and returns - * the entity instance, this method is necessary to - * finally add your entity to the world. - * - * It is recommended to execute this method with a - * small delay if you use it on a player join as - * some versions will not spawn it correctly if you - * do not do so. - * - * @param entity The entity you want to spawn. - */ - public abstract void spawnEntity(KelpEntity entity); - - public abstract Entity toBukkitEntity(Object minecraftEntity); - - /** - * Gets the current entity's location in the world. - * - * @param entity The entity whose location you want to get. - * @return The location of the given entity. - */ - public abstract KelpLocation getLocation(Entity entity); - - /** - * Sets the entity's velocity to the given vector. - * - * @param entity The entity whose velocity you want to manipulate. - * @param vector The vector of the velocity you want to set. - */ - public abstract void setVelocity(Entity entity, Vector vector); - - /** - * Gets the velocity of the desired entity. - * - * @param entity The entity whose velocity you want to get. - * @return The velocity of the given entity. - */ - public abstract Vector getVelocity(Entity entity); - - /** - * Gets the height of an entity. In older versions - * this property was called 'length' of an entity. - * - * @param entity The entity whose height you want to get. - * @return The height of the given entity. - */ - public abstract double getHeight(Entity entity); - - /** - * Gets the width of the given entity. - * - * @param entity The entity whose width you want to get. - * @return The entity's width. - */ - public abstract double getWidth(Entity entity); - -// /** -// * Get the current bounding box of the given entity. -// * A bounding box is a way to mark 3D regions in the -// * minecraft world and surrounds the entity. More -// * information can be found in the documentation of -// * {@code BoundingBox} -// * -// * @param entity The entity whose bounding box you want to get. -// * @return The entity's bounding box. -// * @see BoundingBox -// */ -// public abstract BoundingBox getBoundingBox(Entity entity); - - /** - * Checks if the entity is currently on the ground. - * - * @param entity The entity you want to check. - * @return {@code true} if the entity is currently on ground. - */ - public abstract boolean isOnGround(Entity entity); - - /** - * Sets the rotation of the given entity. This does not - * affect the location x, y and z axes. - * - * @param entity The entity whose rotation you want to modify. - * @param yaw The yaw value of the desired rotation. - * @param pitch The pitch value of the desired rotation. - */ - public abstract void setRotation(Entity entity, float yaw, float pitch); - - /** - * Teleports the entity to the given location. - * - * @param entity The entity you want to teleport. - * @param location The location you want the entity to teleport to. - * @param teleportCause The cause for the teleportation. - * @return {@code true} if the teleport action was successful. - */ - public abstract boolean teleport(Entity entity, KelpLocation location, PlayerTeleportEvent.TeleportCause teleportCause); - - /** - * Gets all entities within the given radius centered around - * the given entity. - * - * @param entity The entity where the center should be set. - * @param x the radius for the x axis - * (1/2 the size of the box along x axis) - * @param y the radius for the y axis - * (1/2 the size of the box along y axis) - * @param z the radius for the z axis - * (1/2 the size of the box along z axis) - * @return A list of all nearby entities within the given radius. - */ - public abstract List getNearbyEntities(Entity entity, double x, double y, double z); - - /** - * Gets the id of the given entity. - * - * @param entity The entity whose id you want to get. - * @return the entity id - */ - public abstract int getEntityId(Entity entity); - - /** - * Gets the current amount of fire ticks for the given - * entity. - * - * Fire ticks are the duration before the entity stops - * being on fire in ticks. So 60 for example would mean - * the entity will stop burning after 3 seconds once - * it ran into fire. - * - * @param entity The entity whose fire ticks you want to get. - * @return The amount of fire ticks. - */ - public abstract int getFireTicks(Entity entity); - - /** - * Gets the amount of the maximum fire ticks of the given entity. - * - * @param entity The entity whose maximum fire ticks you want to get. - * @return The amount of maximum fire ticks of the given entity. - */ - public abstract int getMaxFireTicks(Entity entity); - - /** - * Sets the amount of the maximum fire ticks of the given entity. - * - * @param entity The entity whose maximum fire ticks you want to modify. - * @param maxFireTicks The amount of maximum fire ticks to set. - */ - public abstract void setMaxFireTicks(Entity entity, int maxFireTicks); - - /** - * Sets the current amount of fire ticks for the given - * entity. - * - * Fire ticks are the duration before the entity stops - * being on fire in ticks. So 60 for example would mean - * the entity will stop burning after 3 seconds once - * it ran into fire. - * - * @param entity The entity whose fire ticks you want to set. - * @param fireTicks The amount of fire ticks you want to set. - */ - public abstract void setFireTicks(Entity entity, int fireTicks); - - /** - * Removes the entity from the world. - * - * @param entity The entity you want to remove. - */ - public abstract void remove(Entity entity); - - /** - * Checks if the given entity is dead. - * - * @param entity The entity you want to check. - * @return {@code true} if the entity is dead. - */ - public abstract boolean isDead(Entity entity); - - /** - * Checks if the entity is valid. - * - * Valid means the entity has to be alive and currently - * spawned in a world. - * - * @param entity The entity whose validity you want to check. - * @return {@code true} if the entity is 'valid'. - */ - public abstract boolean isValid(Entity entity); - - /** - * Gets the current server containing the entity. - * - * @param entity The entity whose server you want to get. - * @return The server instance. - */ - public abstract Server getServer(Entity entity); - - /** - * Returns a list of all passengers currently riding - * on the entity. - * - * Note that most entities are only able to hold only - * one passenger and the list will likely contain only - * one element. Boats from newer versions can contain - * up to two passengers for example. - * - * @param entity The entity whose passengers you want to get. - * @return A list of all passengers of the given entity. - */ - public abstract List getPassengers(Entity entity); - - /** - * Adds a new passenger to the given entity. - * - * Note that most entities can only hold one passenger. - * In this case the old entity will be removed in order - * to hold the new passenger provided in this method. - * - * @param entity The entity you want to add the passenger to. - * @param passenger The passenger you want to add. - * @return {@code true} if the action was successful. - */ - public abstract boolean addPassenger(Entity entity, Entity passenger); - - /** - * Removes a passenger from the given entity. - * - * @param entity The entity you want to remove the passenger from. - * @param passenger The passenger you want to remove. - * @return {@code true} if the action succeeded. - */ - public abstract boolean removePassenger(Entity entity, Entity passenger); - - /** - * Checks if the given entity has no passengers. - * - * @param entity The entity you want to check. - * @return {@code true} if the entity has no passengers at all. - */ - public abstract boolean isEmpty(Entity entity); - - /** - * Ejects any passenger currently riding on the - * given entity. - * - * @param entity The entity you want to eject all - * passengers of. - * @return {@code true} if there were any passengers to eject. - */ - public abstract boolean eject(Entity entity); - - /** - * Gets the current fall distance of the current entity. - * - * The fall distance is the distance of blocks in the y-axis - * the player is falling down. The higher the fall distance - * the higher the fall damage. If the player is currently on - * ground, the fall distance will be 0. - * - * @param entity The entity whose fall distance you want to get. - * @return The current fall distance of the entity. - */ - public abstract float getFallDistance(Entity entity); - - /** - * Sets the current fall distance of the current entity. - * - * The fall distance is the distance of blocks in the y-axis - * the player is falling down. The higher the fall distance - * the higher the fall damage. If the player is currently on - * ground, the fall distance will be 0. - * - * @param entity The entity whose fall distance you want to set. - * @param fallDistance The new fall distance you want to set. - */ - public abstract void setFallDistance(Entity entity, float fallDistance); - - /** - * Sets the last damage cause the entity has suffered. - * - * @param entity The entity whose damage cause you want to set. - * @param event The instance of the last entity damage event containing - * the last damage cause. - */ - public abstract void setLastDamageCause(Entity entity, EntityDamageEvent event); - - /** - * Gets the last damage cause. If the entity has not been damaged - * so far, it will return null. - * - * @param entity The entity whose last damage cause you want to get. - * @return The last damage event instance containing the last - * damage cause. - */ - public abstract EntityDamageEvent getLastDamageCause(Entity entity); - - /** - * Returns a unique as well as persistent id for - * the given entity. For players, the player UUID will - * be returned. - * - * @param entity The entity whose unique id you want to get. - * @return The UUID of the given entity. - */ - public abstract UUID getUniqueId(Entity entity); - - /** - * Gets the amount of ticks the entity has been alive. - * This number is equivalent to the 'age' property in entities. - * - * @param entity The entity whose lifetime you want to get. - * @return The age of the entity. - */ - public abstract int getTicksLived(Entity entity); - - /** - * Gets the amount of ticks the entity has been alive. - * This number is equivalent to the 'age' property in entities. - * - * @param entity The entity whose lifetime you want to get. - * @param ticksLived The amount of ticks you want to set. - * May not be less than one tick. - */ - public abstract void setTicksLived(Entity entity, int ticksLived); - - // TODO: play effect public abstract void playEffect(@NotNull EntityEffect var1); - - // public abstract EntityType getType(); - - /** - * Returns true if the entity is currently inside a vehicle. - * - * @param entity The entity you want to check. - * @return {@code true} if the entity is inside a vehicle. - */ - public abstract boolean isInsideVehicle(Entity entity); - - /** - * Makes the entity leave its current vehicle. - * - * @param entity The entity you want to kick from its - * vehicle. - * @return {@code true} if the entity was actually removed - * and has been sitting in a vehicle before. - */ - public abstract boolean leaveVehicle(Entity entity); - - /** - * Gets the current vehicle of the given entity. - * - * @param entity The entity whose vehicle you want to check. - * @return The vehicle of the entity. If the entity - * has no vehicle, null will be returned. - */ - public abstract Entity getVehicle(Entity entity); - - /** - * Sets the custom name of an entity visible or invisible - * for the clients. - * - * @param entity The entity whose nametag you want to hide/show. - * @param visible {@code true} if it should be visible - * {@code false} if it should not be visible. - */ - public abstract void setCustomNameVisible(Entity entity, boolean visible); - - /** - * Checks if the custom name of the given entity is - * currently visible. - * - * @param entity The entity whose nametag visibility you want to check. - * @return {@code true} if the custom name is visible. - */ - public abstract boolean isCustomNameVisible(Entity entity); - - @SinceKelpVersion(KelpVersion.MC_1_9_0) - public abstract void setGlowing(Entity entity, boolean glowing); - - @SinceKelpVersion(KelpVersion.MC_1_9_0) - public abstract boolean isGlowing(Entity entity); - - // public abstract void setInvulnerable(boolean var1); - - // public abstract boolean isInvulnerable(); - - /** - * Checks whether the entity is currently silent. - * - * If the silent flag is set, the entity will not - * produce any sounds. - * - * @param entity The entity you want to check. - * @return {@code true} if the entity is silent - */ - public abstract boolean isSilent(Entity entity); - - /** - * Makes the entity silent or unsilent. - * - * If the silent flag is set, the entity will not - * produce any sounds. - * - * @param entity The entity you want to make silent/unsilent. - * @param silent {@code true} if you want to make the - * entity silent, - * {@code false} if not. - */ - public abstract void setSilent(Entity entity, boolean silent); - - // public abstract boolean hasGravity(Entity entity); - - // public abstract void setGravity(Entity entity, boolean gravity); - - // public abstract int getPortalCooldown(); - - // public abstract void setPortalCooldown(int var1); - - // public abstract PistonMoveReaction getPistonMoveReaction(); - - // public abstract BlockFace getFacing(); - - // public abstract Pose getPose(); - -} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/version/LivingEntityVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/entity/version/LivingEntityVersionTemplate.java deleted file mode 100644 index 79427daf..00000000 --- a/core/src/main/java/de/pxav/kelp/core/entity/version/LivingEntityVersionTemplate.java +++ /dev/null @@ -1,18 +0,0 @@ -package de.pxav.kelp.core.entity.version; - -import de.pxav.kelp.core.application.KelpVersionTemplate; -import de.pxav.kelp.core.world.KelpLocation; -import org.bukkit.Location; -import org.bukkit.entity.LivingEntity; - -/** - * A class description goes here. - * - * @author pxav - */ -@KelpVersionTemplate -public abstract class LivingEntityVersionTemplate { - - public abstract KelpLocation getEyeLocation(LivingEntity livingEntity); - -} diff --git a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayerRepository.java b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayerRepository.java index e3a1238f..6f463a9e 100644 --- a/core/src/main/java/de/pxav/kelp/core/player/KelpPlayerRepository.java +++ b/core/src/main/java/de/pxav/kelp/core/player/KelpPlayerRepository.java @@ -3,22 +3,16 @@ import com.google.common.collect.Maps; import com.google.inject.Inject; import com.google.inject.Singleton; -import de.pxav.kelp.core.entity.version.EntityVersionTemplate; -import de.pxav.kelp.core.entity.version.LivingEntityVersionTemplate; import de.pxav.kelp.core.inventory.KelpInventoryRepository; import de.pxav.kelp.core.logger.KelpLogger; -import de.pxav.kelp.core.logger.LogLevel; import de.pxav.kelp.core.particle.version.ParticleVersionTemplate; import de.pxav.kelp.core.player.prompt.anvil.AnvilPromptVersionTemplate; import de.pxav.kelp.core.player.prompt.chat.ChatPromptVersionTemplate; import de.pxav.kelp.core.player.prompt.sign.SignPromptVersionTemplate; import de.pxav.kelp.core.sidebar.SidebarRepository; -import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import java.util.Map; import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; /** @@ -44,34 +38,24 @@ public class KelpPlayerRepository { // provided by this map. private ConcurrentMap playerEntities = Maps.newConcurrentMap(); - private PlayerVersionTemplate playerVersionTemplate; private SidebarRepository sidebarRepository; private KelpInventoryRepository inventoryRepository; private KelpLogger logger; - private EntityVersionTemplate entityVersionTemplate; - private LivingEntityVersionTemplate livingEntityVersionTemplate; private ParticleVersionTemplate particleVersionTemplate; private SignPromptVersionTemplate signPromptVersionTemplate; private AnvilPromptVersionTemplate anvilPromptVersionTemplate; private ChatPromptVersionTemplate chatPromptVersionTemplate; @Inject - public KelpPlayerRepository(PlayerVersionTemplate playerVersionTemplate, - //SidebarRepository sidebarRepository, - KelpInventoryRepository inventoryRepository, + public KelpPlayerRepository(KelpInventoryRepository inventoryRepository, KelpLogger logger, - EntityVersionTemplate entityVersionTemplate, - LivingEntityVersionTemplate livingEntityVersionTemplate, ParticleVersionTemplate particleVersionTemplate, SignPromptVersionTemplate signPromptVersionTemplate, AnvilPromptVersionTemplate anvilPromptVersionTemplate, ChatPromptVersionTemplate chatPromptVersionTemplate) { - this.playerVersionTemplate = playerVersionTemplate; //this.sidebarRepository = sidebarRepository; this.inventoryRepository = inventoryRepository; this.logger = logger; - this.entityVersionTemplate = entityVersionTemplate; - this.livingEntityVersionTemplate = livingEntityVersionTemplate; this.particleVersionTemplate = particleVersionTemplate; this.signPromptVersionTemplate = signPromptVersionTemplate; this.anvilPromptVersionTemplate = anvilPromptVersionTemplate; @@ -144,8 +128,7 @@ public KelpPlayer getKelpPlayer(UUID uuid) { * {@code null} will be returned. */ public KelpPlayer getKelpPlayer(Player bukkitPlayer) { - UUID uuid = playerVersionTemplate.getUniqueId(bukkitPlayer); - return getKelpPlayer(uuid); + return getKelpPlayer(bukkitPlayer.getUniqueId()); } /** diff --git a/core/src/main/java/de/pxav/kelp/core/player/PlayerVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/player/PlayerVersionTemplate.java deleted file mode 100644 index 7cb9938d..00000000 --- a/core/src/main/java/de/pxav/kelp/core/player/PlayerVersionTemplate.java +++ /dev/null @@ -1,930 +0,0 @@ -package de.pxav.kelp.core.player; - -import de.pxav.kelp.core.application.KelpVersionTemplate; -import de.pxav.kelp.core.player.bossbar.BossBarColor; -import de.pxav.kelp.core.player.bossbar.BossBarStyle; -import de.pxav.kelp.core.player.message.InteractiveMessage; -import de.pxav.kelp.core.sound.KelpSound; -import de.pxav.kelp.core.world.KelpLocation; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - -import java.net.InetSocketAddress; -import java.util.UUID; - -/** - * This is a version template for the {@code KelpPlayer}. - * It contains template methods for all version specific - * stuff a player can do. - * - * @see KelpPlayer - * @author pxav - * @author Etrayed - */ -@KelpVersionTemplate -public abstract class PlayerVersionTemplate { - - /** - * Sends a title to a player. A title is a big text displayed - * right in the middle of the player's screen. - * - * @param player The player who should see the title. - * @param title The upper title text (will be displayed slightly bigger than the sub title). - * @param subTitle The lower title text (will be displayed slightly smaller than the main title). - * @param fadeIn How long should it take to fade the title in? (in ticks) - * @param stay How long should the title stay in 100% opacity? (in ticks) - * @param fadeOut How long should it take to fade the title out? (in ticks) - */ - public abstract void sendTitle(Player player, String title, String subTitle, int fadeIn, int stay, int fadeOut); - - /** - * Sends an action bar message to the player. - * The action bar is a line of text, which is displayed - * above the player's hotbar. - * - * @param player The player who should receive the message. - * @param message The message you want to send. - */ - public abstract void sendActionBar(Player player, String message); - - /** - * Sets the tab header and footer of player. The tab header is - * a text displayed above the player list in the tab, while - * the tab footer is a message displayed below the player list. - * - * The messages may contain '\n' to create new lines inside the - * message. - * - * @param player The player who should see the messages. - * @param header The header message you want to send. - * @param footer The footer message you want to send. - */ - public abstract void sendTabHeaderAndFooter(Player player, String header, String footer); - - /** - * Plays a sound to the player. - * - * @param player The player who should hear the sound. - * @param sound The sound you want to play. - * @param location The location, where the sound should come from. - * @param volume How loud the sound should be. - * @param pitch How strong the sound should be pitched. - */ - public abstract void playSound(Player player, KelpSound sound, KelpLocation location, float volume, float pitch); - - /** - * Sets the player's health. - * - * @param player The player whose health you want to change. - * @param health How many health points the player should have. - * 2 health points equal 1 heart. - * So 20 health points equal the full 10 hearts. - */ - public abstract void setHealth(Player player, int health); - - /** - * @param player The player whose UUID you want to get. - * @return The player's uuid. - */ - public abstract UUID getUniqueId(Player player); - - /** - * Checks if the player is currently stuck in a cobweb. - * - * @param player The player you want to check. - * @return {@code true} if the player is currently stuck in a cobweb. - */ - public abstract boolean isInCobweb(Player player); - - /** - * Checks if the player is currently located in water. - * - * @param player The player you want to check. - * @return {@code true} if the player is currently in water. - */ - public abstract boolean isInWater(Player player); - - // TODO can see -> handle via kelpPlayer class - - /** - * Sends a chat message from the given player. - * This means you can send a message as if the player itself - * typed in this message. This also works with commands, if - * you add a slash in front of the message. - * - * @param player The player from whom the message should be sent. - * @param message The message you want to send. - */ - public abstract void chat(Player player, String message); - - /** - * Gets the socket address of a specific player. - * - * @param player The player whose socket address you want to get. - * @return The {@code InetSocketAddress} object of the player's address. - */ - public abstract InetSocketAddress getSocketAddress(Player player); - - // TODO advancement/achievement - - // TODO statistics and achievements - - /** - * Determines if the Player is allowed to fly via - * jump key double-tap like in creative mode. - * - * If a player flies without permission, they will get kicked - * by the server automatically. - * - * @param player The player you want to check. - * @return {@code true} if the player is allowed to fly. - */ - public abstract boolean getAllowFlight(Player player); - - // TODO client view distance - - /** - * Gets the display name of a player. - * The display name is a name which - unlike the normal name - - * can be modified during the server runtime. You can use this - * to include custom prefixes, ... - * - * @param player The player whose display name you want to get. - * @return The display name. - */ - public abstract String getDisplayName(Player player); - - /** - * Sets the display name of a player - * The display name is a name which - unlike the normal name - - * can be modified during the server runtime. You can use this - * to include custom prefixes, ... - * - * @param player The player whose display name you want to set. - * @param displayName The display name you want to set. - */ - public abstract void setDisplayName(Player player, String displayName); - - /** - * Gets the tab-list name of the player. - * The tab-list name is the name which is used to represent - * the player in the tab-list of online players. - * - * @param player The player whose tab-list name you want to get. - * @return The tab-list name. - */ - public abstract String getPlayerTabListName(Player player); - - /** - * Sets the tab-list name of the player. - * The tab-list name is the name which is used to represent - * the player in the tab-list of online players. - * - * @param player The player whose tab-list name you want to set. - * @param tabListName The tab-list name you want to set. - */ - public abstract void setPlayerTabListName(Player player, String tabListName); - - /** - * Gets the tab-list header of the player. - * The tab-list header is a text displayed above the - * list of online players, which is shown when you press tab. - * - * @param player The player whose header you want to get. - * @return The tab-list header string. - */ - public abstract String getPlayerListHeader(Player player); - - /** - * Gets the tab-list footer of the player. - * The tab-list footer is a text displayed below the - * list of online players, which is shown when you press tab. - * - * @param player The player whose footer you want to get. - * @return The tab-list footer string. - */ - public abstract String getPlayerListFooter(Player player); - - /** - * Sets the tab-list header of the player. - * The tab-list header is a text displayed above the - * list of online players, which is shown when you press tab. - * - * @param player The player whose header you want to set. - * @param header The header you want to set. You may use \n - * to create new lines within this header. - */ - public abstract void setPlayerListHeader(Player player, String header); - - /** - * Sets the tab-list footer of the player. - * The tab-list footer is a text displayed below the - * list of online players, which is shown when you press tab. - * - * @param player The player whose footer you want to set. - * @param footer The footer you want to set. You may use \n - * to create new lines within this footer. - */ - public abstract void setPlayerListFooter(Player player, String footer); - - /** - * Sets the compass target of the player. - * The compass target is the location, where the compass needle - * points to. By default this is the spawn location of the world, - * but you could set this to specific player locations as well. - * - * @param player The player whose target location you want to update. - * @param target The location, where the compass should point to. - */ - public abstract void setCompassTarget(Player player, KelpLocation target); - - /** - * Gets the compass target of the player. - * The compass target is the location, where the compass needle - * points to. By default this is the spawn location of the world. - * - * @param player The player whose compass target you want to set. - * @return The target location of the player's compass. - */ - public abstract KelpLocation getCompassTarget(Player player); - - /** - * Kicks the given player from the server. - * - * @param player The player who should be kicked. - * @param kickMessage The message, which should be received by the player. - * Could also be named kick reason. - */ - public abstract void kickPlayer(Player player, String kickMessage); - - /** - * Checks if the player is currently sneaking/crouching. - * @return {@code true} if the player is sneaking. - */ - public abstract boolean isSneaking(Player player); - - /** - * Modifies the sneak state of the player. - * - * @param player The player whose sneak state you want to change. - * @param sneaking {@code true} if you want to make the player sneak. - * {@code false}, if not. - */ - public abstract void setSneaking(Player player, boolean sneaking); - - /** - * Checks if the player is currently sprinting. - * Sprinting is active when the player has double-pressed the - * walking key or pressed the walking and sprinting key at - * once. - * - * @return {@code true} if the player is currently sprinting. - */ - public abstract boolean isSprinting(Player player); - - /** - * Changes the sprinting state of a player. - * Sprinting is active when the player has double-pressed the - * walking key or pressed the walking and sprinting key at - * once. - * - * @param player The player you want to change the sprinting state of. - * @param sprinting {@code true} if the player should be sprinting. - */ - public abstract void setSprinting(Player player, boolean sprinting); - - // void saveData(); - - // void loadData(); - - /** - * Sets the player ignored when the server checks who is sleeping. - * - * When it is night, normally all players have to sleep so that the - * time can jump to morning. If you don't want all players to sleep, - * you can give specific players this flag and they don't have to sleep - * anymore. - * - * If you give this flag to all players, nothing will happen at night. - * So there has to be at least one player sleeping at night. - * - * @param player The player you want to change the ignoring state of. - * @param ignored {@code true} if the player should be ignored when sleeping. - */ - public abstract void setSleepingIgnored(Player player, boolean ignored); - - /** - * Checks if the player is ignored when the server checks who is sleeping. - * - * When it is night, normally all players have to sleep so that the - * time can jump to morning. If you don't want all players to sleep, - * you can give specific players this flag and they don't have to sleep - * anymore. - * - * If you give this flag to all players, nothing will happen at night. - * So there has to be at least one player sleeping at night. - * - * @param player The player you want to change the ignoring state of. - * @return {@code true} if the player has the ignore flag. - */ - public abstract boolean isSleepingIgnored(Player player); - -// public abstract void playNote(Player player, Location from, Instrument instrument, Note note); -// -// public abstract void sendBlockChange(Player player, Location blockLocation, @NotNull BlockData var2); -// -// public abstract void sendSignChange(@NotNull Location var1, @Nullable String[] var2) throws IllegalArgumentException; -// -// public abstract void sendSignChange(@NotNull Location var1, @Nullable String[] var2, @NotNull DyeColor var3) throws IllegalArgumentException; -// -// public abstract void sendMap(@NotNull MapView var1); - - /** - * Sets the player time. Each player can have an individual time - * - even if they are in the same world. - * - * @param player The player whose time you want to set. - * @param time If {@code relative} is set to {@code true}, this is the - * time offset to the server time in ticks. If {@code relative} - * is set to {@code false} it is the absolute day time ticks. - * @param relative {@code true} if the {@code time} should stay relative - * to the server time. - */ - public abstract void setPlayerTime(Player player, long time, boolean relative); - - /** - * Gets the current player time. Each player can have an - * individual time - even if they are in the same world. - * - * @param player The player whose time you want to get. - * @return The current time of the player in ticks. - */ - public abstract long getPlayerTime(Player player); - - /** - * If the player time was set with {@code relative} to {@code true}, - * then it will get the offset of the player time to the current server - * time. If {@code relative} was set to {@code false}, it will simply - * return the current player time. - * - * @param player The player whose time (offset) you want to check. - * @return The player's time (offset). - */ - public abstract long getPlayerTimeOffset(Player player); - - /** - * Checks if the player time set for the player is relative - * to the server time. More information can be found - * at {@code #setPlayerTime(player, time, relative)} - * - * @param player The player you want to check. - * @return {@code true} if player time is relative to server time. - */ - public abstract boolean isPlayerTimeRelative(Player player); - - /** - * Resets the player time back to the current server - * time. So the times of both are synchronized again. - * - * @param player The player whose time you want to reset. - */ - public abstract void resetPlayerTime(Player player); - - // public abstract void setPlayerWeather(@NotNull WeatherType var1); - - // public abstract WeatherType getPlayerWeather(); - - // public abstract void resetPlayerWeather(); - - /** - * Gives the player the given amount of experience. - * This method simply adds the given amount to the player's - * current exp count and does not overwrite anything. - * - * @param player The player you want to give the experience to. - * @param amount The amount of experience to give. - */ - public abstract void giveExperience(Player player, int amount); - - /** - * Gives or takes the player the given amount of experience. - * Negative amounts express that levels should be taken - * away from the player, positive amounts will be added. - * - * @param player The player you want to give the levels to. - * @param amount The amount of levels to give or take. - */ - public abstract void giveExperienceLevels(Player player, int amount); - - /** - * Gets the current experience of the given player. - * - * Experience is a percentage value (ranging from 0 to 1) - * indicating the progress to the next full level. - * 0 means he has just reached a new level and has made no - * progress since then, wile 1 says the player is just about - * to reach a new level. - * - * Inside Minecraft, the experience is represented by the - * green bar above the hotbar. - * - * @param player The player whose experience you want to get. - * @return The current experience progress (from 0 to 1). - */ - public abstract float getExperience(Player player); - - /** - * Sets the current experience of the given player. - * - * Experience is a percentage value (ranging from 0 to 1) - * indicating the progress to the next full level. - * 0 means he has just reached a new level and has made no - * progress since then, wile 1 says the player is just about - * to reach a new level. - * - * Inside Minecraft, the experience is represented by the - * green bar above the hotbar. - * - * @param player The player whose experience you want to set. - * @param experience The experience value you want to set. - * May range from 0 to 1. - */ - public abstract void setExperience(Player player, float experience); - - /** - * Gets the current amount of the player's levels. - * - * Levels are reached when the experience count reaches 1. - * The amount of levels is represented by the small green - * number above the level bar. - * - * @param player The player whose levels you want to get. - * @return The current amount of levels. - */ - public abstract int getLevel(Player player); - - /** - * Sets the current amount of the player's levels. - * - * Levels are reached when the experience count reaches 1. - * The amount of levels is represented by the small green - * number above the level bar. - * - * @param player The player whose levels you want to set. - * @param level The new level count to set. - */ - public abstract void setLevel(Player player, int level); - - /** - * Gets the players total experience points. - * - * This refers to the total amount of experience - * the player has collected over time and is not currently - * displayed to the client. - * - * @param player The player whose total experience you want to get. - * @return The total experience points amount. - */ - public abstract int getTotalExperience(Player player); - - /** - * Sets the players total experience points. - * - * This refers to the total amount of experience - * the player has collected over time and is not currently - * displayed to the client. - * - * @param player The player whose total experience you want to get. - * @param experience The new amount of total experience. - */ - public abstract void setTotalExperience(Player player, int experience); - - /** - * Gets the player's current exhaustion level. - * Exhaustion controls how fast the food level drops. - * While you have a certain amount of exhaustion, - * your saturation will drop to zero, and then your - * food will drop to zero. - * - * @param player The player you want to get the exhaustion level of. - * @return The exhaustion level of the current player. - */ - public abstract float getExhaustion(Player player); - - /** - * Sets the player's current exhaustion level. - * Exhaustion controls how fast the food level drops. - * While you have a certain amount of exhaustion, - * your saturation will drop to zero, and then your - * food will drop to zero. - * - * @param exhaustionLevel The exhaustion level you want to set. - */ - public abstract void setExhaustion(Player player, float exhaustionLevel); - - /** - * Gets the saturation level of a player. - * Saturation is a buffer for food level. - * Your food level will not drop if you are saturated > 0. - * - * @param player The player whose saturation level you want to get. - * @return The saturation of the player. - */ - public abstract float getSaturation(Player player); - - /** - * Sets the saturation level of a player. - * Saturation is a buffer for food level. - * Your food level will not drop if you are saturated > 0. - * - * @param player The player whose saturation level you want - * to set. - * @param saturation The saturation level you want to set. - */ - public abstract void setSaturation(Player player, float saturation); - - /** - * Gets the current food level of the player. The - * food level indicates how full the food bar is. - * 20 means a full food bar, 0 an empty food bar. - * - * @param player The player whose food bar you want to change. - * @return The food level of the player. - */ - public abstract int getFoodLevel(Player player); - - /** - * Sets the food level of a player. - * The food level indicates how full the food bar is. - * 20 means a full food bar, 0 an empty food bar. - * - * @param player The player whose food level you want to change. - * @param foodLevel The absolute food level you want to set. - */ - public abstract void setFoodLevel(Player player, int foodLevel); - - /** - * Sets if the player is allowed to fly as if he was in creative - * mode - * - * @param player The player you want to allow/disallow flying - * for. - * @param allowFlight {@code true} if you want to allow, {@code false} - * if not. - */ - public abstract void setAllowFlight(Player player, boolean allowFlight); - - /** - * Hides a player from another player, so they become invisible - * for the other player. - * - * @param player The player who should not see {@code toHide} - * anymore. - * @param toHide The player you want to hide. - */ - public abstract void hidePlayer(Player player, Player toHide); - - /** - * Shows a player to another player again, so they become visible - * for the other player. - * - * @param player The player who should see {@code toShow} - * again. - * @param toShow The player you want to show. - */ - public abstract void showPlayer(Player player, Player toShow); - - /** - * Checks if the given player can see the targeted player. - * This does not check if the player currently really sees - * the given target player, but if the player is not hidden. - * - * @param player The player who should see the target player. - * @param toCheck The player to check if he is visible for the - * other player. - * @return {@code true} if {@code player} can see {@code toCheck}. - */ - public abstract boolean canSee(Player player, Player toCheck); - - /** - * Checks if the player is currently flying. - * - * @return {@code true} if the player is flying. - */ - public abstract boolean isFlying(Player player); - - /** - * Changes the flying state of the player. - * - * @param player The player you want to change the flying state of. - * @param flying {@code true} if you want to make the player fly. - * {@code false} if you don't want to make the player fly. - */ - public abstract void setFlying(Player player, boolean flying); - - /** - * Sets the current fly speed of a player. The higher - * the value the higher the speed. Negative values - * indicate reverse directions. - * - * @param player The player whose speed you want to set. - * @param flySpeed The desired fly speed. The value may - * range from -1 to 1. - */ - public abstract void setFlySpeed(Player player, float flySpeed); - - /** - * Sets the current walk speed of a player. The higher - * the value the higher the speed. Negative values - * indicate reverse directions. - * - * @param player The player whose speed you want to set. - * @param walkSpeed The desired walk speed. The value may - * range from -1 to 1. - */ - public abstract void setWalkSpeed(Player player, float walkSpeed); - - /** - * Gets the current speed a player can fly. The higher - * the value the higher the speed. Negative values - * indicate reverse directions. - * - * @return The current fly speed of a player. - * Value can range from -1 to 1 - */ - public abstract float getFlySpeed(Player player); - - /** - * Gets the current speed a player can walk. The higher - * the value the higher the speed. Negative values - * indicate reverse directions. - * - * @return The current walk speed of a player. - * Value can range from -1 to 1 - */ - public abstract float getWalkSpeed(Player player); - - /** - * Request that the player's client download and switch resource packs. - * - * The player's client will download the new resource pack asynchronously - * in the background, if the request was accepted, and will automatically switch to it once the download - * is complete. If the client has downloaded and cached a resource pack - * with the same hash in the past it will not download but directly apply - * the cached pack. When this request is sent for the very first time - * from a given server, the client will first display a confirmation GUI - * to the player before proceeding with the download. - * - * @param player The player who should download the Resource pack. - * @param url The URL from which the client will download the resource pack. - * The string must contain only US-ASCII characters - * and should be encoded as per RFC 1738. - */ - public abstract void setResourcePack(Player player, String url); - - /** - * Request that the player's client download and switch resource packs. - * - * The player's client will download the new resource pack asynchronously - * in the background, if the request was accepted, and will automatically switch to it once the download - * is complete. If the client has downloaded and cached a resource pack - * with the same hash in the past it will not download but directly apply - * the cached pack. When this request is sent for the very first time - * from a given server, the client will first display a confirmation GUI - * to the player before proceeding with the download. - * - * @param player The player who should download the Resource pack. - * @param url The URL from which the client will download the resource pack. - * The string must contain only US-ASCII characters - * and should be encoded as per RFC 1738. - * @param hash The sha1 hash sum of the resource pack file - * which is used to apply a cached version of the pack - * directly without downloading if it is available. - * Has to be 20 bytes long! - */ - public abstract void setResourcePack(Player player, String url, byte[] hash); - - /** - * Checks if the player has received the scaled health bar - * from the server. - * - * @return {@code true} if the player's health bar scale is up to date. - */ - public abstract boolean isHealthScaled(Player player); - - /** - * Sets if the player is shown the scaled health bar. - * If you modify your health scale with {@code setHealthScale}, - * you have to say the server to send this new scaled health - * to the player. - * - * @param player The player you want to scale the health of. - * @param scaled {@code true} whether the health should be scaled. - */ - public abstract void setHealthScaled(Player player, boolean scaled); - - /** - * Sets the health scale of the given player. The health - * scale is the maximum amount of hearts displayed to the - * client. - * 2 means one heart is displayed. If you choose values - * above 20, the player will get additional hearts. - * Consider changing the max health as well. - * - * This method will automatically set {@code setHealthScaled} to - * {@code true}. - * - * @param player The player whose amount of scaled health you want - * to set. - * @param healthScale The amount of scaled health you want to set. - */ - public abstract void setHealthScale(Player player, double healthScale); - - /** - * Gets the number of scaled health points, - * which are currently displayed to the client. - * - * @param player The player whose health scale you want to get. - * @return The number of scaled health if health - * scaling was set to {@code true} earlier. - */ - public abstract double getHealthScale(Player player); - -// public abstract Entity getSpectatorTarget(); -// -// public abstract void setSpectatorTarget(Player player, Entity entity); - - /** - * Cancels the title animation for a player. The current - * title is removed immediately. - * - * @param player The player whose title should be reset. - */ - public abstract void resetTitle(Player player); - - // TODO update commands - - public abstract void openBook(Player player, ItemStack book); - - /** - * Gets the version number of the client's protocol. You - * can convert this information to the release name with the - * help of this list: https://wiki.vg/Protocol_version_numbers - * Please note that you should use the versions after the Netty - * rewrite. - * - * @param player The player whose protocol version you want to get. - * @return The protocol version number. - */ - public abstract int getProtocolVersion(Player player); - - /** - * Sets the player to a server operator. A server operator - * is a player, who has all permissions and can execute every - * command. - * - * @param player The player you want to change the operator state of. - * @param value {@code true} If you want to make the player an operator. - */ - public abstract void setOperator(Player player, boolean value); - - /** - * Checks if the given player is a server operator. A server operator - * is a player, who has all permissions and can execute every - * command. - * - * @param player The player you want to check the operator state of. - * @return {@code true} if the player is a server operator. - */ - public abstract boolean isOperator(Player player); - - /** - * Gives the player the desired permission. - * - * @param player The player who should get the permission. - * @param permission The name of the permission you want to give the player. - */ - public abstract void givePermission(Player player, String permission); - - /** - * Removes the specified permission from the given player. - * - * @param player The player you want to remove the permission from. - * @param permission The name of the permission you want to remove. - */ - public abstract void removePermission(Player player, String permission); - - /** - * Checks if the given player has the desired permission. - * - * @param player The player you want to check. - * @param permission The permission you want to check for. - * @return {@code true} if the player has the permission. - */ - public abstract boolean hasPermission(Player player, String permission); - - /** - * Checks if the given player is currently banned from the server. - * This does only check if the player was banned by the - * bukkit server using the normal {@code /ban} command. If another - * plugin has banned the player, this is ignored. - * - * @param player The player you want to check. - * @return {@code true} if the player has been banned by the bukkit server. - */ - public abstract boolean isBannedByBukkit(Player player); - - /** - * Checks if the player is on the bukkit whitelist. - * - * @param player The player you want to check. - * @return {@code true} if the player is whitelisted. - */ - public abstract boolean isWhitelisted(Player player); - - /** - * Sets the player whitelisted or not whitelisted. - * - * @param player The player you want to whitelist/unwhitelist. - * @param whitelisted {@code true} if the player should be whitelisted. - */ - public abstract void setWhitelisted(Player player, boolean whitelisted); - - /** - * Gets the bed spawn location of the player. - * This is the location, where the player has slept for the - * last time. A location is only returned if the player has - * already slept at least once and the location is valid. - * - * @param player The player you want to get the bed spawn location of. - * @return The spawn location, {@code null} if the player has not slept or location is invalid. - */ - public abstract KelpLocation getBedSpawnLocation(Player player); - - /** - * Sends the given player a message into their chat. - * - * @param player The player who should receive the message. - * @param message The message itself. May contain color codes. - */ - public abstract void sendMessage(Player player, String message); - - /** - * Sends a boss bar to the player by spawning a boss entity near it. If you use this - * method in 1.8, please keep in mind that bar colors other than {@code PURPLE} and bar styles - * other than {@code SOLID} are not supported. - * - * @param player The player you want to send the message to. - * @param message The message you want to be displayed above the boss bar. - * @param health How much the boss bar should be loaded (equivalent to how much - * health the boss entity has. 300f is a full boss bar and 0f an empty one). - * @param barColor The color of the boss bar. Please note that in 1.8 only - * {@code PURPLE} is allowed. If you use any color, no exception - * is thrown but purple will be chosen automatically. - * @param barStyle The style of the boss bar (how many segments?, ...). Note that - * in 1.8 only {@code SOLID} is supported. If you use any different - * style, no exception will be thrown, but {@code SOLID} is chosen - * automatically. - */ - public abstract void sendBossBar(Player player, String message, float health, BossBarColor barColor, BossBarStyle barStyle); - - /** - * Sets the progress of the player's boss bar by modifying the - * health of the boss bar entity. As withers are used for that - * purpose, the maximum value {@code 300f} represents full boss - * bar and {@code 0f} would be an empty boss bar (equivalent to - * the wither dieing.) - * - * @param health The health of the boss bar entity. - */ - public abstract void setBossBarProgress(Player player, float health); - - /** - * Makes the boss bar disappear for the given player. - * - * @param player The player whose boss bar you want to remove. - */ - public abstract void removeBossBar(Player player); - - /** - * Sends an interactive message to the player. An interactive message is a message - * the player can click on and events (execute a command, open a url, ...) are triggered. - * You can also add hover events to it. You can add as many components as you want. - * More detailed information about how to build an interactive message can be found out - * in {@link InteractiveMessage}. - * - * @param player The player who should receive this message and be able - * to interact with it. - * @param interactiveMessage The actual message you want to send to the player. - */ - public abstract void sendInteractiveMessage(Player player, InteractiveMessage interactiveMessage); - - /** - * If the player currently sees a sidebar, it will be hidden for the given - * player. This mostly happens by replacing it with a new, empty scoreboard. - * - * @param player The player whose sidebar you want to hide/remove. - */ - public abstract void removeSidebar(Player player); - -} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java index 731fc78c..45385176 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java @@ -4,9 +4,6 @@ import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.entity.KelpEntityType; -import de.pxav.kelp.core.entity.version.EntityVersionTemplate; -import de.pxav.kelp.core.entity.version.LivingEntityVersionTemplate; -import de.pxav.kelp.core.reflect.ReflectionUtil; import de.pxav.kelp.core.version.Versioned; import de.pxav.kelp.implementation1_8.entity.type.VersionedSheep; import net.minecraft.server.v1_8_R3.Entity; @@ -22,14 +19,9 @@ @Versioned public class VersionedEntityType extends EntityTypeVersionTemplate { - private EntityVersionTemplate entityVersionTemplate; - private LivingEntityVersionTemplate livingEntityVersionTemplate; - @Inject - public VersionedEntityType(EntityVersionTemplate entityVersionTemplate, - LivingEntityVersionTemplate livingEntityVersionTemplate) { - this.entityVersionTemplate = entityVersionTemplate; - this.livingEntityVersionTemplate = livingEntityVersionTemplate; + public VersionedEntityType() { + } @Override diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedGuardian.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedGuardian.java index 7d2380bf..dc6b4350 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedGuardian.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedGuardian.java @@ -3,8 +3,6 @@ import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.GuardianEntity; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; -import de.pxav.kelp.core.entity.version.EntityVersionTemplate; -import de.pxav.kelp.core.entity.version.LivingEntityVersionTemplate; import de.pxav.kelp.implementation1_8.entity.type.general.VersionedMonster; import net.minecraft.server.v1_8_R3.Entity; import org.bukkit.Location; diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedItemFrame.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedItemFrame.java index fa3b30cb..06f73e16 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedItemFrame.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedItemFrame.java @@ -3,7 +3,6 @@ import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.ItemFrameEntity; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; -import de.pxav.kelp.core.entity.version.EntityVersionTemplate; import de.pxav.kelp.core.inventory.item.KelpItem; import de.pxav.kelp.core.reflect.ReflectionUtil; import de.pxav.kelp.implementation1_8.entity.FixedItemFrameListener; @@ -12,9 +11,7 @@ import net.minecraft.server.v1_8_R3.EntityItemFrame; import org.bukkit.Location; import org.bukkit.Rotation; -import org.bukkit.craftbukkit.v1_8_R3.entity.CraftHorse; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftItemFrame; -import org.bukkit.entity.Item; public class VersionedItemFrame extends VersionedHangingEntity implements ItemFrameEntity { From 78813518154c5a28d8b8b77d2a0016fd6f02b7fa Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 14:11:34 +0200 Subject: [PATCH 246/325] Fix bug that human entities were creatures which is not possible in minecraft --- .../de/pxav/kelp/core/entity/type/general/HumanEntity.java | 3 ++- .../entity/type/general/VersionedHumanEntity.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/HumanEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/HumanEntity.java index 93964287..2205f03d 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/general/HumanEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/HumanEntity.java @@ -1,11 +1,12 @@ package de.pxav.kelp.core.entity.type.general; +import de.pxav.kelp.core.entity.LivingKelpEntity; import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.GameMode; import org.bukkit.craftbukkit.v1_16_R3.entity.CraftHumanEntity; import org.bukkit.craftbukkit.v1_16_R3.entity.CraftVehicle; -public interface HumanEntity> extends MobileEntity { +public interface HumanEntity> extends LivingKelpEntity { // TODO: INVENTORIES diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHumanEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHumanEntity.java index 5cdd1038..b4e21cba 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHumanEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedHumanEntity.java @@ -5,6 +5,7 @@ import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.reflect.ReflectionUtil; import de.pxav.kelp.core.world.KelpLocation; +import de.pxav.kelp.implementation1_8.entity.VersionedLivingEntity; import net.minecraft.server.v1_8_R3.*; import org.bukkit.Bukkit; import org.bukkit.GameMode; @@ -14,7 +15,7 @@ import org.bukkit.entity.Player; public class VersionedHumanEntity> - extends VersionedMobileEntity + extends VersionedLivingEntity implements HumanEntity { private final EntityHuman humanHandle; From 2359509ec9eb9c83404a7c5da68ccdd6a2d9818d Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 23 Apr 2021 20:04:32 +0200 Subject: [PATCH 247/325] Fix bug that incoming packet handler prevented entities from getting damaged --- .../packet/GlobalPacketListener.java | 199 +++++++++--------- 1 file changed, 101 insertions(+), 98 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/packet/GlobalPacketListener.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/packet/GlobalPacketListener.java index aad6456a..7be4e2cf 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/packet/GlobalPacketListener.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/packet/GlobalPacketListener.java @@ -63,120 +63,123 @@ public void handlePlayerQuit(PlayerQuitEvent event) { removePacketListener(event.getPlayer()); } - /** - * Creates a new packet listener. - * - * @param player - */ - public void injectPacketListener(Player player) { - ChannelDuplexHandler channelDuplexHandler = new ChannelDuplexHandler() { + private void handleIncomingPacket(Player player, ChannelHandlerContext channelHandlerContext, Object packet) { + if (packet instanceof PacketPlayInSettings) { + + PacketPlayInSettings settingsPacket = (PacketPlayInSettings) packet; + String language = String.valueOf(ReflectionUtil.getValue(settingsPacket, "a")); + int viewDistance = Integer.parseInt(String.valueOf(ReflectionUtil.getValue(settingsPacket, "b"))); + boolean chatColorEnabled = Boolean.parseBoolean(String.valueOf(ReflectionUtil.getValue(settingsPacket, "d"))); + PlayerChatVisibility chatVisibility = PlayerChatVisibility.SHOW_ALL_MESSAGES; + switch (String.valueOf(ReflectionUtil.getValue(settingsPacket, "c"))) { + case "FULL": + chatVisibility = PlayerChatVisibility.SHOW_ALL_MESSAGES; + break; + case "SYSTEM": + chatVisibility = PlayerChatVisibility.COMMANDS_ONLY; + break; + case "HIDDEN": + chatVisibility = PlayerChatVisibility.HIDDEN; + break; + } - @Override - public void channelRead(ChannelHandlerContext channelHandlerContext, Object packet) throws Exception { - if (packet instanceof PacketPlayInSettings) { - - PacketPlayInSettings settingsPacket = (PacketPlayInSettings) packet; - String language = String.valueOf(ReflectionUtil.getValue(settingsPacket, "a")); - int viewDistance = Integer.parseInt(String.valueOf(ReflectionUtil.getValue(settingsPacket, "b"))); - boolean chatColorEnabled = Boolean.parseBoolean(String.valueOf(ReflectionUtil.getValue(settingsPacket, "d"))); - PlayerChatVisibility chatVisibility = PlayerChatVisibility.SHOW_ALL_MESSAGES; - switch (String.valueOf(ReflectionUtil.getValue(settingsPacket, "c"))) { - case "FULL": - chatVisibility = PlayerChatVisibility.SHOW_ALL_MESSAGES; - break; - case "SYSTEM": - chatVisibility = PlayerChatVisibility.COMMANDS_ONLY; - break; - case "HIDDEN": - chatVisibility = PlayerChatVisibility.HIDDEN; - break; - } - - KelpPlayer kelpPlayer = playerRepository.getKelpPlayer(player); - - Bukkit.getPluginManager().callEvent(new KelpPlayerUpdateSettingsEvent(kelpPlayer, - SettingsUpdateStage.PACKET_PLAY_IN, - language, - viewDistance, - chatVisibility, - chatColorEnabled)); - - kelpPlayer - .setClientLanguageInternally(language) - .setClientViewDistanceInternally(viewDistance) - .setPlayerChatColorEnabledInternally(chatColorEnabled) - .setPlayerChatVisibilityInternally(chatVisibility); - playerRepository.addOrUpdatePlayer(kelpPlayer.getUUID(), kelpPlayer); - - return; - } - - if (packet instanceof PacketPlayInUpdateSign && signPrompt.isChecked(player.getUniqueId())) { - - PacketPlayInUpdateSign updatePacket = (PacketPlayInUpdateSign) packet; - IChatBaseComponent[] rawLines = (IChatBaseComponent[]) ReflectionUtil.getValue(updatePacket, "b"); - List input = Lists.newArrayList(); - - for (IChatBaseComponent line : rawLines) { - input.add(line.getText()); - } - - SignPromptResponseHandler handler = signPrompt.getHandler(player.getUniqueId()); - PromptResponseType responseType = handler.accept(input); - - if (responseType == PromptResponseType.TRY_AGAIN) { - signPrompt.resetBlockAndRemove(player.getUniqueId()); - Bukkit.getScheduler().runTaskLater(KelpPlugin.getPlugin(KelpPlugin.class), () -> { - UUID taskId = signPrompt.getTimeout(player.getUniqueId()).getTaskId(); - schedulerRepository.interruptScheduler(taskId); - signPrompt.openSignPrompt(player, input, signPrompt.getTimeout(player.getUniqueId()), handler); - }, 1); - return; - } + KelpPlayer kelpPlayer = playerRepository.getKelpPlayer(player); + + Bukkit.getPluginManager().callEvent(new KelpPlayerUpdateSettingsEvent(kelpPlayer, + SettingsUpdateStage.PACKET_PLAY_IN, + language, + viewDistance, + chatVisibility, + chatColorEnabled)); + + kelpPlayer + .setClientLanguageInternally(language) + .setClientViewDistanceInternally(viewDistance) + .setPlayerChatColorEnabledInternally(chatColorEnabled) + .setPlayerChatVisibilityInternally(chatVisibility); + playerRepository.addOrUpdatePlayer(kelpPlayer.getUUID(), kelpPlayer); + + return; + } + + if (packet instanceof PacketPlayInUpdateSign && signPrompt.isChecked(player.getUniqueId())) { + + PacketPlayInUpdateSign updatePacket = (PacketPlayInUpdateSign) packet; + IChatBaseComponent[] rawLines = (IChatBaseComponent[]) ReflectionUtil.getValue(updatePacket, "b"); + List input = Lists.newArrayList(); + + for (IChatBaseComponent line : rawLines) { + input.add(line.getText()); + } + SignPromptResponseHandler handler = signPrompt.getHandler(player.getUniqueId()); + PromptResponseType responseType = handler.accept(input); + + if (responseType == PromptResponseType.TRY_AGAIN) { + signPrompt.resetBlockAndRemove(player.getUniqueId()); + Bukkit.getScheduler().runTaskLater(KelpPlugin.getPlugin(KelpPlugin.class), () -> { UUID taskId = signPrompt.getTimeout(player.getUniqueId()).getTaskId(); schedulerRepository.interruptScheduler(taskId); - signPrompt.resetBlockAndRemove(player.getUniqueId()); + signPrompt.openSignPrompt(player, input, signPrompt.getTimeout(player.getUniqueId()), handler); + }, 1); + return; + } - } + UUID taskId = signPrompt.getTimeout(player.getUniqueId()).getTaskId(); + schedulerRepository.interruptScheduler(taskId); + signPrompt.resetBlockAndRemove(player.getUniqueId()); - if (packet instanceof PacketPlayInUseEntity) { - if (!npcRepository.playerHasNpc(player.getUniqueId())) { - return; - } + } - PacketPlayInUseEntity usePacket = (PacketPlayInUseEntity) packet; - int rawEntityId = Integer.parseInt(String.valueOf(ReflectionUtil.getValue(usePacket, "a"))); - PacketPlayInUseEntity.EnumEntityUseAction packetAction = PacketPlayInUseEntity.EnumEntityUseAction.valueOf( - String.valueOf(ReflectionUtil.getValue(usePacket, "action")) - ); + if (packet instanceof PacketPlayInUseEntity) { + if (!npcRepository.playerHasNpc(player.getUniqueId())) { + return; + } - if (packetAction == PacketPlayInUseEntity.EnumEntityUseAction.INTERACT_AT) { - return; - } + PacketPlayInUseEntity usePacket = (PacketPlayInUseEntity) packet; + int rawEntityId = Integer.parseInt(String.valueOf(ReflectionUtil.getValue(usePacket, "a"))); + PacketPlayInUseEntity.EnumEntityUseAction packetAction = PacketPlayInUseEntity.EnumEntityUseAction.valueOf( + String.valueOf(ReflectionUtil.getValue(usePacket, "action")) + ); - Optional rawNpc = npcRepository.getSpawnedNpcsFor(player.getUniqueId()) - .stream() - .filter(npc -> npc.getEntityId() == rawEntityId) - .findAny(); + if (packetAction == PacketPlayInUseEntity.EnumEntityUseAction.INTERACT_AT) { + return; + } - if (!rawNpc.isPresent()) { - return; - } + Optional rawNpc = npcRepository.getSpawnedNpcsFor(player.getUniqueId()) + .stream() + .filter(npc -> npc.getEntityId() == rawEntityId) + .findAny(); - KelpNpc npc = rawNpc.get(); + if (!rawNpc.isPresent()) { + return; + } - NpcInteractAction action = packetAction == PacketPlayInUseEntity.EnumEntityUseAction.ATTACK - ? NpcInteractAction.LEFT_CLICK - : NpcInteractAction.RIGHT_CLICK; + KelpNpc npc = rawNpc.get(); - NpcInteractEvent event = new NpcInteractEvent(npc, action); - npc.triggerInteraction(event); + NpcInteractAction action = packetAction == PacketPlayInUseEntity.EnumEntityUseAction.ATTACK + ? NpcInteractAction.LEFT_CLICK + : NpcInteractAction.RIGHT_CLICK; - Bukkit.getPluginManager().callEvent(event); + NpcInteractEvent event = new NpcInteractEvent(npc, action); + npc.triggerInteraction(event); - } + Bukkit.getPluginManager().callEvent(event); + } + } + + /** + * Creates a new packet listener. + * + * @param player + */ + public void injectPacketListener(Player player) { + ChannelDuplexHandler channelDuplexHandler = new ChannelDuplexHandler() { + + @Override + public void channelRead(ChannelHandlerContext channelHandlerContext, Object packet) throws Exception { + handleIncomingPacket(player, channelHandlerContext, packet); super.channelRead(channelHandlerContext, packet); } From 4c88d90384cea35a23b79232692280b4225bfa28 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 29 Apr 2021 09:26:55 +0200 Subject: [PATCH 248/325] Add methods to invoke private methods in ReflectionUtil --- .../kelp/core/reflect/ReflectionUtil.java | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/reflect/ReflectionUtil.java b/core/src/main/java/de/pxav/kelp/core/reflect/ReflectionUtil.java index 5e1fa4dc..2d200336 100644 --- a/core/src/main/java/de/pxav/kelp/core/reflect/ReflectionUtil.java +++ b/core/src/main/java/de/pxav/kelp/core/reflect/ReflectionUtil.java @@ -1,6 +1,10 @@ package de.pxav.kelp.core.reflect; +import com.google.common.base.Preconditions; + import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; /** * A class description goes here. @@ -30,4 +34,54 @@ public static void setValue(Object object, String fieldName, Object value) { } } + // method name without "(" and ")" + public static void invokeMethod(Object holdingObject, String methodName, Object... parameters) { + Preconditions.checkNotNull(holdingObject); + Preconditions.checkNotNull(methodName); + try { + + Method method; + + if (parameters.length > 0) { + Class[] parameterTypes = new Class[parameters.length]; + for (int i = 0; i < parameters.length; i++) { + parameterTypes[i] = parameters[i].getClass(); + } + method = holdingObject.getClass().getDeclaredMethod(methodName, parameterTypes); + } else { + method = holdingObject.getClass().getDeclaredMethod(methodName); + } + + method.setAccessible(true); + method.invoke(holdingObject); + } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { + e.printStackTrace(); + } + } + + // method name without "(" and ")" + public static void invokeStaticMethod(Class holdingClass, String methodName, Object... parameters) { + Preconditions.checkNotNull(holdingClass); + Preconditions.checkNotNull(methodName); + try { + + Method method; + + if (parameters.length > 0) { + Class[] parameterTypes = new Class[parameters.length]; + for (int i = 0; i < parameters.length; i++) { + parameterTypes[i] = parameters[i].getClass(); + } + method = holdingClass.getDeclaredMethod(methodName, parameterTypes); + } else { + method = holdingClass.getDeclaredMethod(methodName); + } + + method.setAccessible(true); + method.invoke(null); + } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) { + e.printStackTrace(); + } + } + } From 23465221f9c74ae98a655ac53c7d2dbcaf7986ce Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 29 Apr 2021 12:32:46 +0200 Subject: [PATCH 249/325] Implement horse entity constants - add horse color implementation - add horse style implementation --- .../EntityConstantsVersionTemplate.java | 16 +++++++++--- .../entity/VersionedEntityConstants.java | 26 ++++++++++++++++--- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/version/EntityConstantsVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/entity/version/EntityConstantsVersionTemplate.java index 66ac2e2d..15b8bb0d 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/version/EntityConstantsVersionTemplate.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/version/EntityConstantsVersionTemplate.java @@ -1,11 +1,9 @@ package de.pxav.kelp.core.entity.version; import de.pxav.kelp.core.application.KelpVersionTemplate; +import de.pxav.kelp.core.entity.type.RabbitEntity; import de.pxav.kelp.core.entity.type.general.KelpProjectile; -import de.pxav.kelp.core.entity.util.CatType; -import de.pxav.kelp.core.entity.util.PaintingType; -import de.pxav.kelp.core.entity.util.VillagerProfession; -import de.pxav.kelp.core.entity.util.VillagerType; +import de.pxav.kelp.core.entity.util.*; import org.bukkit.Art; import org.bukkit.entity.Villager; @@ -28,6 +26,16 @@ public abstract class EntityConstantsVersionTemplate { public abstract String getCatType(CatType catType); + public abstract String getHorseColor(HorseColor horseColor); + + public abstract HorseColor getHorseColor(String horseColor); + + public abstract String getHorseStyle(HorseStyle horseStyle); + + public abstract HorseStyle getHorseStyle(String horseStyle); + + + public abstract > T launchProjectile(); } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityConstants.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityConstants.java index 0eea45b2..5503554a 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityConstants.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityConstants.java @@ -1,14 +1,12 @@ package de.pxav.kelp.implementation1_8.entity; import de.pxav.kelp.core.entity.type.general.KelpProjectile; -import de.pxav.kelp.core.entity.util.CatType; -import de.pxav.kelp.core.entity.util.PaintingType; -import de.pxav.kelp.core.entity.util.VillagerProfession; -import de.pxav.kelp.core.entity.util.VillagerType; +import de.pxav.kelp.core.entity.util.*; import de.pxav.kelp.core.entity.version.EntityConstantsVersionTemplate; import de.pxav.kelp.core.version.Versioned; import org.bukkit.Art; import org.bukkit.entity.Entity; +import org.bukkit.entity.Horse; import org.bukkit.entity.Villager; @Versioned @@ -194,6 +192,26 @@ public String getCatType(CatType catType) { return null; } + @Override + public String getHorseColor(HorseColor horseColor) { + return horseColor.toString(); + } + + @Override + public HorseColor getHorseColor(String horseColor) { + return HorseColor.valueOf(horseColor); + } + + @Override + public String getHorseStyle(HorseStyle horseStyle) { + return horseStyle.toString(); + } + + @Override + public HorseStyle getHorseStyle(String horseStyle) { + return HorseStyle.valueOf(horseStyle); + } + @Override public > T launchProjectile() { return null; From ecc04233ff5723663469ac93fcc58be2cce93f47 Mon Sep 17 00:00:00 2001 From: pxav Date: Thu, 29 Apr 2021 12:36:35 +0200 Subject: [PATCH 250/325] Implement rabbit entity constants - add rabbit type implementation --- .../EntityConstantsVersionTemplate.java | 2 ++ .../entity/VersionedEntityConstants.java | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/version/EntityConstantsVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/entity/version/EntityConstantsVersionTemplate.java index 15b8bb0d..7e099098 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/version/EntityConstantsVersionTemplate.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/version/EntityConstantsVersionTemplate.java @@ -34,7 +34,9 @@ public abstract class EntityConstantsVersionTemplate { public abstract HorseStyle getHorseStyle(String horseStyle); + public abstract String getRabbitType(RabbitType rabbitType); + public abstract RabbitType getRabbitType(String rabbitType); public abstract > T launchProjectile(); diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityConstants.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityConstants.java index 5503554a..ef4efd67 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityConstants.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityConstants.java @@ -7,6 +7,7 @@ import org.bukkit.Art; import org.bukkit.entity.Entity; import org.bukkit.entity.Horse; +import org.bukkit.entity.Rabbit; import org.bukkit.entity.Villager; @Versioned @@ -212,6 +213,33 @@ public HorseStyle getHorseStyle(String horseStyle) { return HorseStyle.valueOf(horseStyle); } + @Override + public String getRabbitType(RabbitType rabbitType) { + if (rabbitType == RabbitType.BEIGE) { + return "GOLD"; + } else if (rabbitType == RabbitType.BROWN) { + return "BROWN"; + } else if (rabbitType == RabbitType.BLACK) { + return "BLACK"; + } else if (rabbitType == RabbitType.BLACK_AND_WHITE) { + return "BLACK_AND_WHITE"; + } else if (rabbitType == RabbitType.SALT_AND_PEPPER) { + return "SALT_AND_PEPPER"; + } else if (rabbitType == RabbitType.WHITE) { + return "WHITE"; + } + return "WHITE"; + } + + @Override + public RabbitType getRabbitType(String rabbitType) { + if (rabbitType.equalsIgnoreCase("GOLD")) { + return RabbitType.BEIGE; + } + + return RabbitType.valueOf(rabbitType); + } + @Override public > T launchProjectile() { return null; From 38d72345c8354424a92592e3bbc660de6276b9fe Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 30 Apr 2021 17:13:59 +0200 Subject: [PATCH 251/325] Remove entity constants version template from ZombieVillager as there are no professions to convert in 1.8 --- .../entity/type/VersionedZombieVillager.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieVillager.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieVillager.java index 76e68815..5bce8e5c 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieVillager.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieVillager.java @@ -13,16 +13,13 @@ public class VersionedZombieVillager extends VersionedZombie implements ZombieVillagerEntity { - private final EntityConstantsVersionTemplate entityConstantsVersionTemplate; private final EntityZombie zombieHandle; public VersionedZombieVillager(Entity entityHandle, KelpEntityType entityType, Location initialLocation, - EntityTypeVersionTemplate entityTypeVersionTemplate, - EntityConstantsVersionTemplate entityConstantsVersionTemplate) { + EntityTypeVersionTemplate entityTypeVersionTemplate) { super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); - this.entityConstantsVersionTemplate = entityConstantsVersionTemplate; this.zombieHandle = (EntityZombie) entityHandle; zombieHandle.setVillager(true); } From 1999915bda75fa4e1863ca509578639d294ad544 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 30 Apr 2021 21:31:49 +0200 Subject: [PATCH 252/325] Implement new Zombie methods for 1.8 --- .../entity/type/VersionedZombie.java | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombie.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombie.java index 8d49ba9b..ab286d14 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombie.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombie.java @@ -2,15 +2,48 @@ import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.ZombieEntity; +import de.pxav.kelp.core.entity.type.general.AgeableEntity; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.implementation1_8.entity.type.general.VersionedAgeable; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedMonster; import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityZombie; import org.bukkit.Location; -public class VersionedZombie extends VersionedAgeable implements ZombieEntity { +// zombie not ageable in 1.8, so it implements the ageable interface directly. In newer versions inherit from VersionedAgeable. +public class VersionedZombie extends VersionedMonster implements ZombieEntity, AgeableEntity { + + private EntityZombie zombieHandle; public VersionedZombie(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.zombieHandle = (EntityZombie) entityHandle; + } + + @Override + public boolean isAgeLocked() { + return false; + } + + @Override + public ZombieEntity setAgeLocked(boolean ageLocked) { + return this; + } + + @Override + public ZombieEntity setBaby(boolean baby) { + zombieHandle.setBaby(baby); + return this; + } + + @Override + public boolean isBaby() { + return zombieHandle.isBaby(); + } + + @Override + public ZombieEntity setAge(int age) { + return this; } } From 0f526309baf087be047991bdece4a344e2b93005 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 30 Apr 2021 21:32:17 +0200 Subject: [PATCH 253/325] Remove minecraft ocelot dependency from cat implementation --- .../implementation1_8/entity/type/VersionedCat.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCat.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCat.java index c7833861..ef04d6fa 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCat.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCat.java @@ -16,12 +16,16 @@ public class VersionedCat extends VersionedAnimalEntity implements CatEntity { - CraftOcelot craftOcelot; - EntityOcelot ocelotHandle; + private CraftOcelot craftOcelot; private EntityConstantsVersionTemplate entityConstantsVersionTemplate; - public VersionedCat(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, EntityConstantsVersionTemplate entityConstantsVersionTemplate) { + public VersionedCat(Entity entityHandle, + KelpEntityType entityType, + Location initialLocation, + EntityTypeVersionTemplate entityTypeVersionTemplate, + EntityConstantsVersionTemplate entityConstantsVersionTemplate) { super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.craftOcelot = (CraftOcelot) entityHandle.getBukkitEntity(); craftOcelot.setCatType(Ocelot.Type.valueOf(entityConstantsVersionTemplate.getCatType(CatType.randomCatType()))); this.entityConstantsVersionTemplate = entityConstantsVersionTemplate; } From 694e95fb30f98f6b70c0bca6f2b07aee326cda48 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 30 Apr 2021 21:32:41 +0200 Subject: [PATCH 254/325] Make fields private inside VersionedBat --- .../pxav/kelp/implementation1_8/entity/type/VersionedBat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedBat.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedBat.java index 5e64f304..b418adce 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedBat.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedBat.java @@ -10,7 +10,7 @@ public class VersionedBat extends VersionedMobileEntity implements BatEntity { - EntityBat batHandle; + private EntityBat batHandle; public VersionedBat(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); From 3d537e9c18a5e7f10319c817e947123dbf78cca0 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 30 Apr 2021 21:34:00 +0200 Subject: [PATCH 255/325] Add equals() and hashcode() to explosion power --- .../kelp/core/world/util/ExplosionPower.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/world/util/ExplosionPower.java b/core/src/main/java/de/pxav/kelp/core/world/util/ExplosionPower.java index 3bc91a5e..a3d04d5b 100644 --- a/core/src/main/java/de/pxav/kelp/core/world/util/ExplosionPower.java +++ b/core/src/main/java/de/pxav/kelp/core/world/util/ExplosionPower.java @@ -1,5 +1,7 @@ package de.pxav.kelp.core.world.util; +import org.apache.commons.lang.builder.HashCodeBuilder; + /** * This class is used to determine the power of an explosion. * Depending on which type of explosion is performed, those types @@ -68,4 +70,22 @@ public float getPower() { return power; } + @Override + public int hashCode() { + return new HashCodeBuilder(17, 37) + .append("EXPLOSIONPOWER:") + .append(this.power) + .append(this.power * 4 - 2).toHashCode(); + } + + @Override + public boolean equals(Object object) { + if (!(object instanceof ExplosionPower)) { + return false; + } + + ExplosionPower compare = (ExplosionPower) object; + return compare.power == this.power; + } + } From 4ced85f395c586fd5213a78d71545b8e99eebc48 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 30 Apr 2021 21:36:59 +0200 Subject: [PATCH 256/325] Make FireworkMetadata a subtype of ItemMetadata --- .../de/pxav/kelp/core/inventory/metadata/FireworkMetadata.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/metadata/FireworkMetadata.java b/core/src/main/java/de/pxav/kelp/core/inventory/metadata/FireworkMetadata.java index b30cbf8a..d44b18b0 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/metadata/FireworkMetadata.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/metadata/FireworkMetadata.java @@ -6,7 +6,7 @@ import java.util.Arrays; import java.util.Collection; -public class FireworkMetadata { +public class FireworkMetadata implements ItemMetadata { private int height = 20; private Collection effects = Lists.newArrayList(); From 500489c72d0db6f4afcb1b977d13bc88228c43b4 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 30 Apr 2021 21:37:27 +0200 Subject: [PATCH 257/325] You can now directly translate a kelp meta to a bukkit meta without an item stack --- .../metadata/ItemMetadataVersionTemplate.java | 2 ++ .../inventory/VersionedItemMetadata.java | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/metadata/ItemMetadataVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/inventory/metadata/ItemMetadataVersionTemplate.java index db0f1307..e1796049 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/metadata/ItemMetadataVersionTemplate.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/metadata/ItemMetadataVersionTemplate.java @@ -30,6 +30,8 @@ public abstract class ItemMetadataVersionTemplate { */ public abstract ItemStack applyMetadata(ItemStack itemStack, ItemMetadata metadata); + public abstract ItemMetadata getMetadata(ItemMeta itemMeta); + /** * Retrieves the ItemMeta of the given bukkit item stack and converts * it to a kelp {@link ItemMetadata}. This is used by {@link KelpItem#from(ItemStack)} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedItemMetadata.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedItemMetadata.java index b8e22709..eb930591 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedItemMetadata.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedItemMetadata.java @@ -67,6 +67,21 @@ public ItemStack applyMetadata(ItemStack itemStack, ItemMetadata metadata) { return itemStack; } + @Override + public ItemMetadata getMetadata(ItemMeta itemMeta) { + + if (itemMeta instanceof FireworkMeta) { + FireworkMeta fireworkMeta = (FireworkMeta) itemMeta; + return FireworkMetadata.create() + .height(fireworkMeta.getPower()) + .addEffect(fireworkMeta.getEffects().toArray(new FireworkEffect[0])); + } + + //TODO add more metadatas + + return null; + } + @Override public ItemMetadata getMetadata(ItemStack itemStack) { ItemMeta itemMeta = itemStack.getItemMeta(); From 11c71f6306eb0c60da2e3f7749e44087aa4ee31d Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 30 Apr 2021 21:38:03 +0200 Subject: [PATCH 258/325] Fix bug of ghost items in StorageInventory --- .../inventory/VersionedStorageInventory.java | 269 +----------------- 1 file changed, 8 insertions(+), 261 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedStorageInventory.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedStorageInventory.java index 2c2d9cd7..bfa6fcc6 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedStorageInventory.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedStorageInventory.java @@ -10,6 +10,7 @@ import de.pxav.kelp.core.version.Versioned; import net.minecraft.server.v1_8_R3.IInventory; import net.minecraft.server.v1_8_R3.ItemStack; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack; import org.bukkit.inventory.Inventory; @@ -38,7 +39,8 @@ public T addItem(KelpItem... items) { for (KelpItem item : items) { inventory.addItem(item.getItemStack()); } - return null; + inventoryHandle.update(); + return (T) this; } @Override @@ -75,14 +77,16 @@ public Collection allItemsWith(KelpItem item) { @Override public T clear() { for (int i = 0; i < inventoryHandle.getSize(); i++) { - remove(i); + inventoryHandle.setItem(i, null); } + inventoryHandle.update(); return (T) this; } @Override public T remove(int slot) { inventoryHandle.setItem(slot, null); + inventoryHandle.update(); return (T) this; } @@ -224,12 +228,14 @@ public T setAllItems(Collection items) { public T setItem(KelpItem item) { ItemStack itemStack = CraftItemStack.asNMSCopy(item.getItemStack()); inventoryHandle.setItem(item.getSlot(), itemStack); + inventoryHandle.update(); return null; } @Override public T setMaxStackSize(int maxStackSize) { inventoryHandle.setMaxStackSize(maxStackSize); + inventoryHandle.update(); return null; } @@ -243,263 +249,4 @@ public Inventory getBukkitInventory() { return inventory; } - // /** -// * Gets all items stored in this player inventory. This includes -// * all slots (main storage, armor and hot bar). -// * -// * @param player The player to get the items of. -// * @return A set of all items that are currently in the player's inventory. -// */ -// @Override -// public Set getItems(Player player) { -// Set result = Sets.newHashSet(); -// for (int i = 0; i < 41; i++) { -// ItemStack itemStack = player.getInventory().getItem(i); -// if (itemStack != null) { -// result.add(KelpItem.from(itemStack).slot(i)); -// } -// } -// return result; -// } -// -// /** -// * Gets all items stored in the player's hotbar. The hotbar -// * are the first nine slots of a player's inventory (0-8) and it -// * is always visible at the screen, although the inventory is closed. -// * -// * @param player The player to get the hotbar items of -// * @return A set of all items stored in the player's hotbar. -// */ -// @Override -// public Set getHotBarItems(Player player) { -// Set result = Sets.newHashSet(); -// for (int i = 0; i < 9; i++) { -// ItemStack item = player.getInventory().getItem(i); -// if (item != null) { -// result.add(KelpItem.from(item).slot(i)); -// } -// } -// return result; -// } -// -// /** -// * Gets an item at a specific slot. The slot count starts at the -// * first hotbar slot from 0-8 and then goes on from the uppermost -// * line of the main storage. -// * -// * If there is no item at the given slot, {@code null} will be returned. -// * -// * @param player The player to get the item of. -// * @param slot The slot of the item you want to get. -// * @return The item stored at the given slot in the player inventory. -// */ -// @Override -// public KelpItem getItemAt(Player player, int slot) { -// ItemStack itemStack = player.getInventory().getItem(slot); -// return itemStack == null ? null : KelpItem.from(itemStack); -// } -// -// /** -// * Gets the helmet the player is currently wearing. -// * Unlike the other armor parts, the helmet can also be of -// * materials other than normal helmets, but also banners and some -// * blocks. -// * -// * If the player has no helmet, {@code null} will be returned. -// * -// * @param player The player to get the helmet of. -// * @return The item representing the player's helmet. -// */ -// @Override -// public KelpItem getHelmet(Player player) { -// ItemStack itemStack = player.getInventory().getHelmet(); -// return itemStack == null ? null : KelpItem.from(itemStack); -// } -// -// /** -// * Gets the chest plate the player is currently wearing. -// * -// * If the player has no chest plate, {@code null} will be returned. -// * -// * @param player The player to get the chest plate of. -// * @return The item representing the player's chest plate. -// */ -// @Override -// public KelpItem getChestPlate(Player player) { -// ItemStack itemStack = player.getInventory().getChestplate(); -// return itemStack == null ? null : KelpItem.from(itemStack); -// } -// -// /** -// * Gets the leggings the player is currently wearing. -// * -// * If the player has no leggings, {@code null} will be returned. -// * -// * @param player The player to get the leggings of. -// * @return The item representing the player's chest plate. -// */ -// @Override -// public KelpItem getLeggings(Player player) { -// ItemStack itemStack = player.getInventory().getLeggings(); -// return itemStack == null ? null : KelpItem.from(itemStack); -// } -// -// /** -// * Gets the boots the player is currently wearing. -// * -// * If the player has no boots, {@code null} will be returned. -// * -// * @param player The player to get the boots of. -// * @return The item representing the player's chest plate. -// */ -// @Override -// public KelpItem getBoots(Player player) { -// ItemStack itemStack = player.getInventory().getBoots(); -// return itemStack == null ? null : KelpItem.from(itemStack); -// } -// -// /** -// * Sets the helmet the player is wearing to the given item. -// * Specifically for helmets, you can not only use the normal armor items -// * such as leather helmet, gold helmet, etc. but also blocks, heads or banners -// * to set them as a player head. -// * -// * @param player The player to set the helmet of. -// * @param item The item of the helmet you want to set. This can be -// * a normal armor helmet or any banner, head or even some blocks. -// */ -// @Override -// public void setHelmet(Player player, KelpItem item) { -// player.getInventory().setHelmet(item.getItemStack()); -// } -// -// /** -// * Sets the chest plate of the player owning this inventory. -// * Unlike in the helmet method, you cannot pass other item materials -// * than chest plates here. -// * -// * @param player The player to set the chest plate of. -// * @param item The chest plate item you want to set. -// */ -// @Override -// public void setChestPlate(Player player, KelpItem item) { -// player.getInventory().setChestplate(item.getItemStack()); -// } -// -// /** -// * Sets the leggings of the player owning this inventory. -// * Unlike in the helmet method, you cannot pass other item materials -// * than leggings here. -// * -// * @param player The player to set the leggings of. -// * @param item The leggings item you want to set. -// */ -// @Override -// public void setLeggings(Player player, KelpItem item) { -// player.getInventory().setLeggings(item.getItemStack()); -// } -// -// /** -// * Sets the boots of the player owning this inventory. -// * Unlike in the helmet method, you cannot pass other item materials -// * than boots here. -// * -// * @param player The player to set the boots of. -// * @param item The chest plate item you want to set. -// */ -// @Override -// public void setBoots(Player player, KelpItem item) { -// player.getInventory().setBoots(item.getItemStack()); -// } -// -// /** -// * Adds a new item to the player's inventory. -// * This method won't overwrite any existing items, but try to find free -// * space in the inventory. If there is already a {@link KelpItem} with -// * the same data (same display name, item description, material, tags, etc.) -// * and this item has not yet exceeded its maximum stack size, it will add -// * the item to an existing stack. -// * -// * @param player The player to add the item to. -// * @param item The item to add. -// */ -// @Override -// public void addItem(Player player, KelpItem item) { -// player.getInventory().addItem(item.getItemStack()); -// } -// -// /** -// * Stores an item in the player inventory at the given slot location. -// * If there already is an item present at the given location, this -// * item will be overwritten. If you want to avoid this and rather -// * search for free inventory space use {@link #addItem(Player, KelpItem)} instead. -// * -// * @param player The player to set the item to. -// * @param slot The slot to store the item at. -// * @param item The item to store at the given slot. -// */ -// @Override -// public void setItem(Player player, int slot, KelpItem item) { -// player.getInventory().setItem(slot, item.getItemStack()); -// } -// -// /** -// * Gets the item that is currently stored in the player's -// * main hand (the player's right hand). -// * -// * If the player has no item in hand, {@code null} will be returned. -// * -// * @param player The player to get the main hand item of. -// * @return The item the player is holding right now. -// */ -// @Override -// public KelpItem getItemInHand(Player player) { -// ItemStack itemStack = player.getInventory().getItemInHand(); -// return itemStack == null ? null : KelpItem.from(itemStack); -// } -// -// /** -// * Sets the item in the player's main hand (the player's right hand). -// * -// * Unlike the off hand, the main hand can be used in all server versions. -// * -// * @param player The player to set the main hand item of. -// * @param item The item to set in the player's main hand. -// */ -// @Override -// public void setItemInHand(Player player, KelpItem item) { -// player.setItemInHand(item.getItemStack()); -// } -// -// /** -// * Gets the item that is currently in the player's off hand -// * (the player's left hand). -// * -// * Please note that off hands were introduced in {code MC 1.9} and are -// * therefore not available on 1.8 servers. But this method won't throw -// * an error if you do it anyways. -// * -// * If the player has no item in his off hand, {@code null} will be returned. -// * -// * @param player The player to get the off hand item of. -// * @return The item that is stored in the player's off hand right now. -// */ -// @Override -// public KelpItem getItemInOffHand(Player player) { -// return null; -// } -// -// /** -// * Sets the item in the player's off hand (the player's left hand). -// * -// * Please note that off hands were introduced in {code MC 1.9} and are -// * therefore not available on 1.8 servers. But this method won't throw -// * an error if you do it anyways. -// * -// * @param player The player to set the off hand item of. -// * @param item The item to set in the player's off hand. -// */ -// @Override -// public void setItemInOffHand(Player player, KelpItem item) {} - } From d93fad4df0c94c32a14dcaa09223e6018e8f713c Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 30 Apr 2021 21:39:23 +0200 Subject: [PATCH 259/325] Implement missing general entity types for 1.8 - golems - chestes horses (mules, donkeys, ...) --- .../type/general/VersionedChestedHorse.java | 32 +++++++++++++++++++ .../entity/type/general/VersionedGolem.java | 15 +++++++++ 2 files changed, 47 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedChestedHorse.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedGolem.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedChestedHorse.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedChestedHorse.java new file mode 100644 index 00000000..07f3ec66 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedChestedHorse.java @@ -0,0 +1,32 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.ChestedHorse; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.version.InventoryVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityHorse; +import org.bukkit.Location; + +public class VersionedChestedHorse> extends VersionedAbstractHorse implements ChestedHorse { + + private EntityHorse horseHandle; + + public VersionedChestedHorse(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, InventoryVersionTemplate inventoryVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, inventoryVersionTemplate); + this.horseHandle = (EntityHorse) entityHandle; + this.horseHandle.setHasChest(true); + } + + @Override + public boolean isCarryingChest() { + return horseHandle.hasChest(); + } + + @Override + public T setCarryingChest(boolean carryingChest) { + horseHandle.setHasChest(carryingChest); + return (T) this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedGolem.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedGolem.java new file mode 100644 index 00000000..bd62fa75 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedGolem.java @@ -0,0 +1,15 @@ +package de.pxav.kelp.implementation1_8.entity.type.general; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.general.GolemEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedGolem> extends VersionedMobileEntity implements GolemEntity { + + public VersionedGolem(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} From 781cdb862ad757ccaee4c93efbf72eb198db47bf Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 30 Apr 2021 21:40:10 +0200 Subject: [PATCH 260/325] Implement all missing specific entities for 1.8 - including 54 entities --- .../entity/type/VersionedArmorStand.java | 151 ++++++++++++++++++ .../entity/type/VersionedCow.java | 16 ++ .../entity/type/VersionedCreeper.java | 95 +++++++++++ .../entity/type/VersionedDonkey.java | 20 +++ .../entity/type/VersionedEnderCrystal.java | 43 +++++ .../entity/type/VersionedEnderDragon.java | 25 +++ .../entity/type/VersionedEnderMan.java | 32 ++++ .../entity/type/VersionedEnderSignal.java | 66 ++++++++ .../entity/type/VersionedEndermite.java | 32 ++++ .../entity/type/VersionedExperienceOrb.java | 31 ++++ .../type/VersionedExplosiveMinecart.java | 16 ++ .../entity/type/VersionedFallingBlock.java | 51 ++++++ .../entity/type/VersionedFirework.java | 58 +++++++ .../entity/type/VersionedFishHook.java | 149 +++++++++++++++++ .../entity/type/VersionedGhast.java | 16 ++ .../entity/type/VersionedHopperMinecart.java | 31 ++++ .../entity/type/VersionedHorse.java | 52 ++++++ .../entity/type/VersionedIronGolem.java | 31 ++++ .../entity/type/VersionedItem.java | 43 +++++ .../entity/type/VersionedKillerBunny.java | 18 +++ .../entity/type/VersionedLargeFireball.java | 15 ++ .../entity/type/VersionedLeashHitch.java | 16 ++ .../entity/type/VersionedLightning.java | 24 +++ .../entity/type/VersionedMagmaCube.java | 16 ++ .../entity/type/VersionedMule.java | 20 +++ .../entity/type/VersionedMushroomCow.java | 27 ++++ .../entity/type/VersionedPainting.java | 36 +++++ .../entity/type/VersionedPig.java | 42 +++++ .../entity/type/VersionedPigZombie.java | 58 +++++++ .../entity/type/VersionedPoweredMinecart.java | 33 ++++ .../entity/type/VersionedPrimedTnt.java | 75 +++++++++ .../entity/type/VersionedRabbit.java | 36 +++++ .../type/VersionedRideableMinecart.java | 16 ++ .../entity/type/VersionedSilverfish.java | 16 ++ .../entity/type/VersionedSkeletonHorse.java | 20 +++ .../entity/type/VersionedSlime.java | 32 ++++ .../entity/type/VersionedSmallFireball.java | 15 ++ .../entity/type/VersionedSnowman.java | 28 ++++ .../entity/type/VersionedSpawnerMinecart.java | 16 ++ .../entity/type/VersionedSquid.java | 16 ++ .../type/VersionedThrownChickenEgg.java | 16 ++ .../type/VersionedThrownEnderPearl.java | 16 ++ .../entity/type/VersionedThrownExpBottle.java | 16 ++ .../entity/type/VersionedThrownFireball.java | 55 +++++++ .../entity/type/VersionedThrownPotion.java | 49 ++++++ .../entity/type/VersionedThrownSnowball.java | 16 ++ .../type/VersionedThrownWitherSkull.java | 30 ++++ .../entity/type/VersionedVillager.java | 78 +++++++++ .../entity/type/VersionedWitch.java | 16 ++ .../entity/type/VersionedWither.java | 16 ++ .../entity/type/VersionedWitherSkeleton.java | 18 +++ .../entity/type/VersionedWolf.java | 43 +++++ .../entity/type/VersionedZombieGiant.java | 16 ++ .../entity/type/VersionedZombieHorse.java | 20 +++ 54 files changed, 1938 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArmorStand.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCow.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCreeper.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedDonkey.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEnderCrystal.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEnderDragon.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEnderMan.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEnderSignal.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEndermite.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedExperienceOrb.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedExplosiveMinecart.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedFallingBlock.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedFirework.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedFishHook.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedGhast.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedHopperMinecart.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedHorse.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedIronGolem.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedItem.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedKillerBunny.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedLargeFireball.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedLeashHitch.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedLightning.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedMagmaCube.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedMule.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedMushroomCow.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPainting.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPig.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPigZombie.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPoweredMinecart.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPrimedTnt.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedRabbit.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedRideableMinecart.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSilverfish.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSkeletonHorse.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSlime.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSmallFireball.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSnowman.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSpawnerMinecart.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSquid.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownChickenEgg.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownEnderPearl.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownExpBottle.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownFireball.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownPotion.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownSnowball.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownWitherSkull.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedVillager.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWitch.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWither.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWitherSkeleton.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWolf.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieGiant.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieHorse.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArmorStand.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArmorStand.java new file mode 100644 index 00000000..013eeb84 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArmorStand.java @@ -0,0 +1,151 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.ArmorStandEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.type.SimpleEntityEquipment; +import de.pxav.kelp.implementation1_8.entity.VersionedEntity; +import de.pxav.kelp.implementation1_8.entity.VersionedSimpleEntityEquipment; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityArmorStand; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftArmorStand; +import org.bukkit.util.EulerAngle; + +public class VersionedArmorStand extends VersionedEntity implements ArmorStandEntity { + + CraftArmorStand craftArmorStand; + EntityArmorStand armorStandHandle; + + public VersionedArmorStand(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.craftArmorStand = (CraftArmorStand) entityHandle.getBukkitEntity(); + this.armorStandHandle = (EntityArmorStand) entityHandle; + } + + @Override + public EulerAngle getBodyPose() { + return craftArmorStand.getBodyPose(); + } + + @Override + public ArmorStandEntity setBodyPose(EulerAngle bodyPose) { + craftArmorStand.setBodyPose(bodyPose); + return this; + } + + @Override + public EulerAngle getLeftArmPose() { + return craftArmorStand.getLeftArmPose(); + } + + @Override + public ArmorStandEntity setLeftArmPose(EulerAngle leftArmPose) { + craftArmorStand.setLeftArmPose(leftArmPose); + return this; + } + + @Override + public EulerAngle getRightArmPose() { + return craftArmorStand.getRightArmPose(); + } + + @Override + public ArmorStandEntity setRightArmPose(EulerAngle rightArmPose) { + craftArmorStand.setRightArmPose(rightArmPose); + return this; + } + + @Override + public EulerAngle getLeftLegPose() { + return craftArmorStand.getLeftLegPose(); + } + + @Override + public ArmorStandEntity setLeftLegPose(EulerAngle leftLegPose) { + craftArmorStand.setLeftLegPose(leftLegPose); + return this; + } + + @Override + public EulerAngle getRightLegPose() { + return craftArmorStand.getRightLegPose(); + } + + @Override + public ArmorStandEntity setRightLegPose(EulerAngle rightLegPose) { + craftArmorStand.setRightLegPose(rightLegPose); + return this; + } + + @Override + public EulerAngle getHeadPose() { + return craftArmorStand.getHeadPose(); + } + + @Override + public ArmorStandEntity setHeadPose(EulerAngle headPose) { + craftArmorStand.setHeadPose(headPose); + return this; + } + + @Override + public boolean hasBasePlate() { + return armorStandHandle.hasBasePlate(); + } + + @Override + public ArmorStandEntity setBasePlate(boolean basePlate) { + armorStandHandle.setBasePlate(basePlate); + return this; + } + + @Override + public boolean isVisible() { + return craftArmorStand.isVisible(); + } + + @Override + public ArmorStandEntity setVisible(boolean visible) { + craftArmorStand.setVisible(visible); + return this; + } + + @Override + public boolean hasArms() { + return armorStandHandle.hasArms(); + } + + @Override + public ArmorStandEntity setArms(boolean arms) { + armorStandHandle.setArms(arms); + return this; + } + + @Override + public boolean isSmall() { + return armorStandHandle.isSmall(); + } + + @Override + public ArmorStandEntity setSmall(boolean small) { + armorStandHandle.setSmall(small); + return this; + } + + @Override + public boolean isMarker() { + return craftArmorStand.isMarker(); + } + + @Override + public ArmorStandEntity setMarker(boolean marker) { + craftArmorStand.setMarker(marker); + return this; + } + + @Override + public SimpleEntityEquipment getEquipment() { + return new VersionedSimpleEntityEquipment(craftArmorStand); + } +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCow.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCow.java new file mode 100644 index 00000000..4611a9a8 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCow.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.CowEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedBreedableAnimal; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedCow extends VersionedBreedableAnimal implements CowEntity { + + public VersionedCow(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCreeper.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCreeper.java new file mode 100644 index 00000000..7f3284e6 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedCreeper.java @@ -0,0 +1,95 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.CreeperEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.reflect.ReflectionUtil; +import de.pxav.kelp.core.world.util.ExplosionPower; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedMonster; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityCreeper; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftCreeper; + +public class VersionedCreeper extends VersionedMonster implements CreeperEntity { + + private EntityCreeper creeperHandle; + + public VersionedCreeper(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.creeperHandle = (EntityCreeper) entityHandle; + } + + + @Override + public boolean isCharged() { + return creeperHandle.isPowered(); + } + + @Override + public CreeperEntity setCharged(boolean charged) { + creeperHandle.setPowered(charged); + return this; + } + + @Override + public CreeperEntity setMaxFuseTicks(int maxFuseTicks) { + ReflectionUtil.setValue(creeperHandle, "maxFuseTicks", maxFuseTicks); + return this; + } + + @Override + public int getMaxFuseTicks() { + return (int) ReflectionUtil.getValue(creeperHandle, "maxFuseTicks"); + } + + @Override + public CreeperEntity setFuseTicks(int fuseTicks) { + ReflectionUtil.setValue(creeperHandle, "fuseTicks", fuseTicks); + return this; + } + + @Override + public int getFuseTicks() { + return (int) ReflectionUtil.getValue(creeperHandle, "fuseTicks"); + } + + @Override + public CreeperEntity explode() { + ReflectionUtil.invokeMethod(creeperHandle, "cr"); + return this; + } + + @Override + public CreeperEntity ignite() { + creeperHandle.co(); + return this; + } + + @Override + public boolean isIgnited() { + return creeperHandle.cn(); + } + + @Override + public ExplosionPower getExplosionPower() { + return ExplosionPower.custom((int) ReflectionUtil.getValue(creeperHandle, "explosionRadius")); + } + + @Override + public CreeperEntity setExplosionPower(ExplosionPower power) { + ReflectionUtil.setValue(creeperHandle, "explosionRadius", (int) power.getPower()); + return this; + } + + @Override + public boolean createsFire() { + return false; + } + + @Override + public CreeperEntity canCreateFire(boolean create) { + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedDonkey.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedDonkey.java new file mode 100644 index 00000000..dc8f7798 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedDonkey.java @@ -0,0 +1,20 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.DonkeyEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.version.InventoryVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedChestedHorse; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftHorse; +import org.bukkit.entity.Horse; + +public class VersionedDonkey extends VersionedChestedHorse implements DonkeyEntity { + + public VersionedDonkey(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, InventoryVersionTemplate inventoryVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, inventoryVersionTemplate); + ((CraftHorse)entityHandle.getBukkitEntity()).setVariant(Horse.Variant.DONKEY); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEnderCrystal.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEnderCrystal.java new file mode 100644 index 00000000..030c1f09 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEnderCrystal.java @@ -0,0 +1,43 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.EnderCrystalEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import de.pxav.kelp.implementation1_8.entity.VersionedEntity; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityEnderCrystal; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEnderCrystal; + +public class VersionedEnderCrystal extends VersionedEntity implements EnderCrystalEntity { + + private CraftEnderCrystal craftEnderCrystal; + private EntityEnderCrystal crystalHandle; + + // none of the methods exists in mc 1.8. Not even in the corresponding NMS class :( + public VersionedEnderCrystal(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + + @Override + public boolean isShowingBottom() { + return true; + } + + @Override + public EnderCrystalEntity setShowingBottom(boolean showingBottom) { + return this; + } + + @Override + public KelpLocation getBeamTarget() { + return null; + } + + @Override + public EnderCrystalEntity setBeamTarget(KelpLocation beamTarget) { + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEnderDragon.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEnderDragon.java new file mode 100644 index 00000000..163eaea2 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEnderDragon.java @@ -0,0 +1,25 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.EnderDragonEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.VersionedLivingEntity; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEnderDragon; + +public class VersionedEnderDragon extends VersionedLivingEntity implements EnderDragonEntity { + + CraftEnderDragon craftEnderDragon; + + public VersionedEnderDragon(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.craftEnderDragon = (CraftEnderDragon) entityHandle.getBukkitEntity(); + } + + @Override + public int getDeathAnimationInTicks() { + return craftEnderDragon.getHandle().deathTicks; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEnderMan.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEnderMan.java new file mode 100644 index 00000000..1bf3d95f --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEnderMan.java @@ -0,0 +1,32 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.EndermanEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.material.KelpMaterial; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedMonster; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEnderman; +import org.bukkit.material.MaterialData; + +public class VersionedEnderMan extends VersionedMonster implements EndermanEntity { + + CraftEnderman craftEnderman; + + public VersionedEnderMan(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + + @Override + public KelpMaterial getCarriedBlock() { + return KelpMaterial.from(craftEnderman.getCarriedMaterial().getItemType()); + } + + @Override + public EndermanEntity setCarriedBlock(KelpMaterial carriedBlock) { + MaterialData materialData = new MaterialData(KelpMaterial.convertUnsafe(carriedBlock)); + craftEnderman.setCarriedMaterial(materialData); + return this; + } +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEnderSignal.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEnderSignal.java new file mode 100644 index 00000000..40cdc911 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEnderSignal.java @@ -0,0 +1,66 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.EnderSignalEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.item.KelpItem; +import de.pxav.kelp.core.reflect.ReflectionUtil; +import de.pxav.kelp.core.world.KelpLocation; +import de.pxav.kelp.implementation1_8.entity.VersionedEntity; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityEnderSignal; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEnderSignal; + +public class VersionedEnderSignal extends VersionedEntity implements EnderSignalEntity { + + private CraftEnderSignal craftEnderSignal; + private EntityEnderSignal signalHandle; + + public VersionedEnderSignal(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + + // todo: maybe the target location can be implemented using the a, b, and c field of EntityEnderSignal class? + // todo: check if they represent the target location + @Override + public KelpLocation getTargetLocation() { + return null; + } + + @Override + public EnderSignalEntity setTargetLocation(KelpLocation var1) { + return this; + } + + @Override + public boolean getDropItem() { + return (boolean) ReflectionUtil.getValue(signalHandle, "e"); + } + + @Override + public EnderSignalEntity setDropItem(boolean dropItem) { + ReflectionUtil.setValue(signalHandle, "e", dropItem); + return this; + } + + @Override + public KelpItem getItem() { + return null; + } + + @Override + public EnderSignalEntity setItem(KelpItem item) { + return this; + } + + @Override + public int getDespawnTimer() { + return 0; + } + + @Override + public EnderSignalEntity setDespawnTimer(int despawnTimer) { + return this; + } +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEndermite.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEndermite.java new file mode 100644 index 00000000..10525170 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedEndermite.java @@ -0,0 +1,32 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.EndermiteEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedMonster; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityEndermite; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEndermite; + +public class VersionedEndermite extends VersionedMonster implements EndermiteEntity { + + EntityEndermite endermiteHandle; + + public VersionedEndermite(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.endermiteHandle = (EntityEndermite) entityHandle; + } + + @Override + public boolean isPlayerSpawned() { + return endermiteHandle.n(); + } + + @Override + public EndermiteEntity setPlayerSpawned(boolean playerSpawned) { + endermiteHandle.a(playerSpawned); + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedExperienceOrb.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedExperienceOrb.java new file mode 100644 index 00000000..1c13394c --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedExperienceOrb.java @@ -0,0 +1,31 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.ExperienceOrbEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.VersionedEntity; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityExperienceOrb; +import org.bukkit.Location; + +public class VersionedExperienceOrb extends VersionedEntity implements ExperienceOrbEntity { + + private EntityExperienceOrb orbHandle; + + public VersionedExperienceOrb(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.orbHandle = (EntityExperienceOrb) entityHandle; + } + + @Override + public int getExperience() { + return orbHandle.value; + } + + @Override + public ExperienceOrbEntity setExperience(int experience) { + this.orbHandle.value = experience; + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedExplosiveMinecart.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedExplosiveMinecart.java new file mode 100644 index 00000000..4dff270f --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedExplosiveMinecart.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.ExplosiveMinecart; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedAbstractMinecart; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedExplosiveMinecart extends VersionedAbstractMinecart implements ExplosiveMinecart { + + public VersionedExplosiveMinecart(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedFallingBlock.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedFallingBlock.java new file mode 100644 index 00000000..bc4b0454 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedFallingBlock.java @@ -0,0 +1,51 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.FallingBlockEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.material.KelpMaterial; +import de.pxav.kelp.implementation1_8.entity.VersionedEntity; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityFallingBlock; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftFallingSand; + +public class VersionedFallingBlock extends VersionedEntity implements FallingBlockEntity { + + private EntityFallingBlock fallingHandle; + private CraftFallingSand craftFallingSand; + + public VersionedFallingBlock(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.fallingHandle = (EntityFallingBlock) entityHandle; + this.craftFallingSand = (CraftFallingSand) entityHandle.getBukkitEntity(); + } + + @Override + public boolean canHurtEntities() { + return fallingHandle.hurtEntities; + } + + @Override + public boolean willDropItem() { + return fallingHandle.dropItem; + } + + @Override + public FallingBlockEntity dropsItem(boolean dropsItem) { + fallingHandle.dropItem = dropsItem; + return this; + } + + @Override + public FallingBlockEntity hurtEntities(boolean hurtEntities) { + fallingHandle.hurtEntities = hurtEntities; + return this; + } + + @Override + public KelpMaterial getMaterial() { + return KelpMaterial.from(craftFallingSand.getMaterial()); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedFirework.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedFirework.java new file mode 100644 index 00000000..90be9f1f --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedFirework.java @@ -0,0 +1,58 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.FireworkEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.metadata.FireworkMetadata; +import de.pxav.kelp.core.inventory.metadata.ItemMetadataVersionTemplate; +import de.pxav.kelp.core.reflect.ReflectionUtil; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedProjectile; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftFirework; +import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack; + +import java.util.concurrent.ThreadLocalRandom; + +public class VersionedFirework extends VersionedProjectile implements FireworkEntity { + + CraftFirework craftFirework; + private ItemMetadataVersionTemplate itemMetadataVersionTemplate; + + public VersionedFirework(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, ItemMetadataVersionTemplate itemMetadataVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.craftFirework = (CraftFirework) entityHandle.getBukkitEntity(); + this.itemMetadataVersionTemplate = itemMetadataVersionTemplate; + } + + @Override + public FireworkEntity detonate() { + craftFirework.detonate(); + return this; + } + + @Override + public FireworkMetadata getFireworkMetadata() { + return (FireworkMetadata) itemMetadataVersionTemplate.getMetadata(craftFirework.getFireworkMeta()); + } + + @Override + public FireworkEntity setFireworkMetadata(FireworkMetadata fireworkMetadata) { + CraftItemStack itemStack = (CraftItemStack) ReflectionUtil.getValue(craftFirework, "item"); + fireworkMetadata.applyTo(itemStack); + ReflectionUtil.setValue(craftFirework, "item", itemStack); + craftFirework.getHandle().expectedLifespan = 10 * (1 + fireworkMetadata.getHeight()) + ThreadLocalRandom.current().nextInt(6) + ThreadLocalRandom.current().nextInt(7); + craftFirework.getHandle().getDataWatcher().update(8); + return null; + } + + @Override + public boolean isShotAtAngle() { + return false; + } + + @Override + public FireworkEntity setShotAtAngle(boolean shotAtAngle) { + return this; + } +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedFishHook.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedFishHook.java new file mode 100644 index 00000000..75cf7195 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedFishHook.java @@ -0,0 +1,149 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.FishHookEntity; +import de.pxav.kelp.core.entity.util.FishHookState; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.reflect.ReflectionUtil; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedProjectile; +import net.minecraft.server.v1_8_R3.*; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity; + +import java.util.List; + +public class VersionedFishHook extends VersionedProjectile implements FishHookEntity { + + private EntityFishingHook fishingHook; + + public VersionedFishHook(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.fishingHook = (EntityFishingHook) entityHandle; + } + + @Override + public KelpEntity getOwner() { + return entityTypeVersionTemplate.getKelpEntity(fishingHook.owner.getBukkitEntity()); + } + + @Override + public int getWaitTimeInTicks() { + return (int) ReflectionUtil.getValue(fishingHook, "aw"); + } + + @Override + public FishHookEntity setWaitTime(int waitTicks) { + ReflectionUtil.setValue(fishingHook, "aw", waitTicks); + return this; + } + + // cannot be changed in 1.8, hardcoded there + @Override + public int getMinWaitTime() { + return 100; + } + + // cannot be changed in 1.8, hardcoded there + @Override + public FishHookEntity setMinWaitTime(int minWaitTime) { + return this; + } + + // hardcoded by minecraft :( + @Override + public int getMaxWaitTime() { + return 900; + } + + @Override + public FishHookEntity setMaxWaitTime(int maxWaitTime) { + return this; + } + + @Override + public boolean hasLure() { + int lureLevel = EnchantmentManager.h(fishingHook.owner); + return lureLevel > 0; + } + + @Override + public FishHookEntity setApplyLure(boolean applyLure) { + ItemStack itemInHand = fishingHook.owner.bZ(); + + if (applyLure && !hasLure()) { + itemInHand.addEnchantment(Enchantment.LURE, 1); + } else if (!applyLure && hasLure()) { + NBTTagList nbttaglist = itemInHand.getTag().getList("ench", 10); + List list = (List) ReflectionUtil.getValue(nbttaglist, "list"); + for (int i = 0; i < list.size(); i++) { + NBTTagCompound compound = (NBTTagCompound) list.get(i); + if (compound.getShort("id") == (short) Enchantment.LURE.id) { + nbttaglist.a(i); + } + } + } + + return this; + } + + // not possible yet + @Override + public boolean isInOpenWater() { + return false; + } + + @Override + public KelpEntity getHookedEntity() { + return entityTypeVersionTemplate.getKelpEntity(fishingHook.hooked.getBukkitEntity()); + } + + @Override + public FishHookEntity setHookedEntity(KelpEntity hookedEntity) { + fishingHook.hooked = ((CraftEntity) (hookedEntity.getBukkitEntity())).getHandle(); + return this; + } + + @Override + public FishHookEntity pullHookedEntity() { + double deltaX = fishingHook.owner.locX - fishingHook.locX; + double deltaY = fishingHook.owner.locY - fishingHook.locY; + double deltaZ = fishingHook.owner.locZ - fishingHook.locZ; + double magnitude = MathHelper.sqrt(deltaX * deltaX + deltaY * deltaY + deltaZ * deltaZ); + double multiplier = 0.1D; + + Entity hookedEntity = fishingHook.hooked; + hookedEntity.motX += deltaX * multiplier; + hookedEntity = fishingHook.hooked; + hookedEntity.motY += deltaY * multiplier + (double)MathHelper.sqrt(magnitude) * 0.08D; + hookedEntity = fishingHook.hooked; + hookedEntity.motZ += deltaZ * multiplier; + + return this; + } + + @Override + public FishHookState getFishHookState() { + + if (fishingHook.hooked != null) { + return FishHookState.HOOKED_ENTITY; + } + + WorldServer worldServer = (WorldServer) fishingHook.world; + int ax = (int) ReflectionUtil.getValue(fishingHook, "ax"); + float ay = (float) ReflectionUtil.getValue(fishingHook, "ay"); + float f3 = ay * 0.017453292F; + float f5 = MathHelper.sin(f3); + float f4 = MathHelper.cos(f3); + double d8 = fishingHook.locX + (double)(f5 * (float)ax * 0.1F); + double d12 = (float)MathHelper.floor(fishingHook.getBoundingBox().b) + 1.0F; + double d11 = fishingHook.locZ + (double)(f4 * (float)ax * 0.1F); + Block block = worldServer.getType(new BlockPosition((int)d8, (int)d12 - 1, (int)d11)).getBlock(); + if (block == Blocks.WATER || block == Blocks.FLOWING_WATER) { + return FishHookState.BOBBING; + } + + return FishHookState.UNHOOKED; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedGhast.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedGhast.java new file mode 100644 index 00000000..87e4cb31 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedGhast.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.GhastEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedMobileEntity; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedGhast extends VersionedMobileEntity implements GhastEntity { + + public VersionedGhast(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedHopperMinecart.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedHopperMinecart.java new file mode 100644 index 00000000..cbe35100 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedHopperMinecart.java @@ -0,0 +1,31 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.HopperMinecart; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedAbstractMinecart; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityMinecartHopper; +import org.bukkit.Location; + +public class VersionedHopperMinecart extends VersionedAbstractMinecart implements HopperMinecart { + + private EntityMinecartHopper minecartHandle; + + public VersionedHopperMinecart(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.minecartHandle = (EntityMinecartHopper) entityHandle; + } + + @Override + public boolean isHopperEnabled() { + return minecartHandle.y(); + } + + @Override + public HopperMinecart setHopperEnabled(boolean enabled) { + minecartHandle.i(enabled); + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedHorse.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedHorse.java new file mode 100644 index 00000000..9ab3a92b --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedHorse.java @@ -0,0 +1,52 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.HorseEntity; +import de.pxav.kelp.core.entity.util.HorseColor; +import de.pxav.kelp.core.entity.util.HorseStyle; +import de.pxav.kelp.core.entity.version.EntityConstantsVersionTemplate; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.version.InventoryVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedAbstractHorse; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftHorse; +import org.bukkit.entity.Horse; + +public class VersionedHorse extends VersionedAbstractHorse implements HorseEntity { + + private CraftHorse craftHorse; + private EntityConstantsVersionTemplate entityConstantsVersionTemplate; + + public VersionedHorse(Entity entityHandle, KelpEntityType entityType, Location initialLocation, + EntityTypeVersionTemplate entityTypeVersionTemplate, + InventoryVersionTemplate inventoryVersionTemplate, + EntityConstantsVersionTemplate entityConstantsVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, inventoryVersionTemplate); + this.craftHorse = (CraftHorse) entityHandle.getBukkitEntity(); + this.entityConstantsVersionTemplate = entityConstantsVersionTemplate; + } + + @Override + public HorseColor getHorseColor() { + return entityConstantsVersionTemplate.getHorseColor(craftHorse.getColor().name()); + } + + @Override + public HorseStyle getHorseStyle() { + return entityConstantsVersionTemplate.getHorseStyle(craftHorse.getStyle().name()); + } + + @Override + public HorseEntity setHorseColor(HorseColor color) { + craftHorse.setColor(Horse.Color.valueOf(entityConstantsVersionTemplate.getHorseColor(color))); + return this; + } + + @Override + public HorseEntity setHorseStyle(HorseStyle style) { + craftHorse.setStyle(Horse.Style.valueOf(entityConstantsVersionTemplate.getHorseStyle(style))); + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedIronGolem.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedIronGolem.java new file mode 100644 index 00000000..142411fa --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedIronGolem.java @@ -0,0 +1,31 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.IronGolemEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedGolem; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityIronGolem; +import org.bukkit.Location; + +public class VersionedIronGolem extends VersionedGolem implements IronGolemEntity { + + private EntityIronGolem ironGolem; + + public VersionedIronGolem(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.ironGolem = (EntityIronGolem) entityHandle; + } + + @Override + public boolean isPlayerCreated() { + return ironGolem.isPlayerCreated(); + } + + @Override + public IronGolemEntity setPlayerCreated(boolean playerCreated) { + ironGolem.setPlayerCreated(playerCreated); + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedItem.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedItem.java new file mode 100644 index 00000000..6a223f57 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedItem.java @@ -0,0 +1,43 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.DroppedItemEntity; +import de.pxav.kelp.core.entity.util.ItemDropType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.item.KelpItem; +import de.pxav.kelp.implementation1_8.entity.VersionedEntity; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftItem; + +public class VersionedItem extends VersionedEntity implements DroppedItemEntity { + + private CraftItem craftItem; + private ItemDropType itemDropType; + + public VersionedItem(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.craftItem = (CraftItem) entityHandle.getBukkitEntity(); + } + + @Override + public KelpItem getItem() { + return KelpItem.from(craftItem.getItemStack()); + } + + @Override + public void setItem(KelpItem item) { + craftItem.setItemStack(item.getItemStack()); + } + + @Override + public ItemDropType getItemDropType() { + return itemDropType; + } + + @Override + public void setItemDropType(ItemDropType itemDropType) { + this.itemDropType = itemDropType; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedKillerBunny.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedKillerBunny.java new file mode 100644 index 00000000..883be573 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedKillerBunny.java @@ -0,0 +1,18 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.KillerBunnyEntity; +import de.pxav.kelp.core.entity.version.EntityConstantsVersionTemplate; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.entity.Rabbit; + +public class VersionedKillerBunny extends VersionedRabbit implements KillerBunnyEntity { + + public VersionedKillerBunny(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, EntityConstantsVersionTemplate entityConstantsVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, entityConstantsVersionTemplate); + craftRabbit.setRabbitType(Rabbit.Type.THE_KILLER_BUNNY); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedLargeFireball.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedLargeFireball.java new file mode 100644 index 00000000..ed4804b8 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedLargeFireball.java @@ -0,0 +1,15 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.LargeFireball; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedLargeFireball extends VersionedThrownFireball implements LargeFireball { + + public VersionedLargeFireball(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedLeashHitch.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedLeashHitch.java new file mode 100644 index 00000000..75df3011 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedLeashHitch.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.LeashHitchEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedHangingEntity; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedLeashHitch extends VersionedHangingEntity implements LeashHitchEntity { + + public VersionedLeashHitch(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedLightning.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedLightning.java new file mode 100644 index 00000000..a35c8adc --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedLightning.java @@ -0,0 +1,24 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.LightningEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.VersionedEntity; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityLightning; +import org.bukkit.Location; + +public class VersionedLightning extends VersionedEntity implements LightningEntity { + + private EntityLightning entityLightning; + + public VersionedLightning(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.entityLightning = (EntityLightning) entityHandle; + } + + @Override + public boolean isEffect() { + return entityLightning.isEffect; + } +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedMagmaCube.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedMagmaCube.java new file mode 100644 index 00000000..f1173025 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedMagmaCube.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.MagmaCubeEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.entity.Horse; + +public class VersionedMagmaCube extends VersionedSlime implements MagmaCubeEntity { + + public VersionedMagmaCube(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedMule.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedMule.java new file mode 100644 index 00000000..fce908c3 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedMule.java @@ -0,0 +1,20 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.MuleEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.version.InventoryVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedChestedHorse; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftHorse; +import org.bukkit.entity.Horse; + +public class VersionedMule extends VersionedChestedHorse implements MuleEntity { + + public VersionedMule(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, InventoryVersionTemplate inventoryVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, inventoryVersionTemplate); + ((CraftHorse)entityHandle.getBukkitEntity()).setVariant(Horse.Variant.MULE); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedMushroomCow.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedMushroomCow.java new file mode 100644 index 00000000..f785b91d --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedMushroomCow.java @@ -0,0 +1,27 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.MushroomCowEntity; +import de.pxav.kelp.core.entity.util.MushroomCowType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedMushroomCow extends VersionedCow implements MushroomCowEntity { + + public VersionedMushroomCow(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + + // other mushroom types than red are not available in 1.8 + @Override + public MushroomCowType getMushroomType() { + return MushroomCowType.RED_MUSHROOMS; + } + + @Override + public MushroomCowEntity setMushroomType(MushroomCowType mushroomType) { + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPainting.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPainting.java new file mode 100644 index 00000000..fc573cff --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPainting.java @@ -0,0 +1,36 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.PaintingEntity; +import de.pxav.kelp.core.entity.util.PaintingType; +import de.pxav.kelp.core.entity.version.EntityConstantsVersionTemplate; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedHangingEntity; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Art; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPainting; + +public class VersionedPainting extends VersionedHangingEntity implements PaintingEntity { + + private CraftPainting craftPainting; + private EntityConstantsVersionTemplate entityConstantsVersionTemplate; + + public VersionedPainting(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, EntityConstantsVersionTemplate entityConstantsVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.craftPainting = (CraftPainting) entityHandle.getBukkitEntity(); + this.entityConstantsVersionTemplate = entityConstantsVersionTemplate; + } + + @Override + public PaintingEntity setPaintingType(PaintingType type) { + craftPainting.setArt(entityConstantsVersionTemplate.getBukkitPaintingType(type)); + return this; + } + + @Override + public PaintingType getPaintingType() { + return entityConstantsVersionTemplate.getPaintingType(craftPainting.getArt()); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPig.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPig.java new file mode 100644 index 00000000..c8f29ac1 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPig.java @@ -0,0 +1,42 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.PigEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedBreedableAnimal; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPig; +import org.bukkit.util.Vector; + +public class VersionedPig extends VersionedBreedableAnimal implements PigEntity { + + private CraftPig craftPig; + + public VersionedPig(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + + @Override + public Vector getVehicleVelocity() { + return craftPig.getVelocity(); + } + + @Override + public PigEntity setVehicleVelocity(Vector vehicleVelocity) { + craftPig.setVelocity(vehicleVelocity); + return this; + } + + @Override + public boolean hasSaddle() { + return craftPig.hasSaddle(); + } + + @Override + public PigEntity setSaddled(boolean saddled) { + craftPig.setSaddle(saddled); + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPigZombie.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPigZombie.java new file mode 100644 index 00000000..410eddde --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPigZombie.java @@ -0,0 +1,58 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.PigZombie; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityPigZombie; +import org.bukkit.Location; + +public class VersionedPigZombie extends VersionedZombie implements PigZombie { + + private EntityPigZombie pigZombie; + + public VersionedPigZombie(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.pigZombie = (EntityPigZombie) entityHandle; + } + + @Override + public int getAnger() { + return pigZombie.angerLevel; + } + + @Override + public void setAnger(int anger) { + pigZombie.angerLevel = anger; + } + + @Override + public void setAngry(boolean angry) { + if (angry && pigZombie.angerLevel < 1) { + pigZombie.angerLevel = 1; + } else if (!angry && pigZombie.angerLevel > 0) { + pigZombie.angerLevel = 0; + } + } + + @Override + public boolean isAngry() { + return pigZombie.angerLevel > 0; + } + + @Override + public boolean isConverting() { + return false; + } + + @Override + public int getConversionTime() { + return 0; + } + + @Override + public void setConversionTime(int conversionTime) { + + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPoweredMinecart.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPoweredMinecart.java new file mode 100644 index 00000000..374ad4ec --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPoweredMinecart.java @@ -0,0 +1,33 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.PoweredMinecart; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.reflect.ReflectionUtil; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedAbstractMinecart; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityMinecartFurnace; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftMinecartFurnace; + +public class VersionedPoweredMinecart extends VersionedAbstractMinecart implements PoweredMinecart { + + private EntityMinecartFurnace furnaceMinecart; + + public VersionedPoweredMinecart(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.furnaceMinecart = (EntityMinecartFurnace) entityHandle; + } + + @Override + public int getFuelTicks() { + return (int) ReflectionUtil.getValue(furnaceMinecart, "c"); + } + + @Override + public PoweredMinecart setFuelTicks(int fuelTicks) { + ReflectionUtil.setValue(furnaceMinecart, "c", fuelTicks); + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPrimedTnt.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPrimedTnt.java new file mode 100644 index 00000000..f4c9345a --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedPrimedTnt.java @@ -0,0 +1,75 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.LivingKelpEntity; +import de.pxav.kelp.core.entity.type.PrimedTntEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.reflect.ReflectionUtil; +import de.pxav.kelp.core.world.util.ExplosionPower; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedExplosiveEntity; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityLiving; +import net.minecraft.server.v1_8_R3.EntityTNTPrimed; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftLivingEntity; + +public class VersionedPrimedTnt extends VersionedExplosiveEntity implements PrimedTntEntity { + + private EntityTNTPrimed primedTnt; + + public VersionedPrimedTnt(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.primedTnt = (EntityTNTPrimed) entityHandle; + } + + @Override + public int getFuseTicks() { + return primedTnt.fuseTicks; + } + + @Override + public PrimedTntEntity setFuseTicks(int fuseTicks) { + primedTnt.fuseTicks = fuseTicks; + return this; + } + + @Override + public KelpEntity getSource() { + return entityTypeVersionTemplate.getKelpEntity(primedTnt.getSource().getBukkitEntity()); + } + + @Override + public PrimedTntEntity setSource(KelpEntity sourceEntity) { + if (!(sourceEntity instanceof LivingKelpEntity)) { + //todo log! + return this; + } + ReflectionUtil.setValue(primedTnt, "source", (EntityLiving) ((CraftLivingEntity)(sourceEntity.getBukkitEntity())).getHandle()); + return this; + } + + @Override + public ExplosionPower getExplosionPower() { + return ExplosionPower.custom(primedTnt.yield); + } + + @Override + public PrimedTntEntity setExplosionPower(ExplosionPower power) { + primedTnt.yield = power.getPower(); + return this; + } + + @Override + public boolean createsFire() { + return primedTnt.isIncendiary; + } + + @Override + public PrimedTntEntity canCreateFire(boolean create) { + primedTnt.isIncendiary = create; + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedRabbit.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedRabbit.java new file mode 100644 index 00000000..d5370199 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedRabbit.java @@ -0,0 +1,36 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.RabbitEntity; +import de.pxav.kelp.core.entity.util.RabbitType; +import de.pxav.kelp.core.entity.version.EntityConstantsVersionTemplate; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedBreedableAnimal; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftRabbit; +import org.bukkit.entity.Rabbit; + +public class VersionedRabbit extends VersionedBreedableAnimal implements RabbitEntity { + + protected CraftRabbit craftRabbit; + private EntityConstantsVersionTemplate entityConstantsVersionTemplate; + + public VersionedRabbit(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, EntityConstantsVersionTemplate entityConstantsVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.entityConstantsVersionTemplate = entityConstantsVersionTemplate; + this.craftRabbit = (CraftRabbit) entityHandle.getBukkitEntity(); + } + + @Override + public RabbitType getRabbitType() { + return entityConstantsVersionTemplate.getRabbitType(craftRabbit.getRabbitType().name()); + } + + @Override + public RabbitEntity setRabbitType(RabbitType rabbitType) { + craftRabbit.setRabbitType(Rabbit.Type.valueOf(entityConstantsVersionTemplate.getRabbitType(rabbitType))); + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedRideableMinecart.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedRideableMinecart.java new file mode 100644 index 00000000..e43eb516 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedRideableMinecart.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.RideableMinecart; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedAbstractMinecart; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedRideableMinecart extends VersionedAbstractMinecart implements RideableMinecart { + + public VersionedRideableMinecart(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSilverfish.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSilverfish.java new file mode 100644 index 00000000..ef62a2d3 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSilverfish.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.SilverfishEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedMonster; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedSilverfish extends VersionedMonster implements SilverfishEntity { + + public VersionedSilverfish(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSkeletonHorse.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSkeletonHorse.java new file mode 100644 index 00000000..d53e758e --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSkeletonHorse.java @@ -0,0 +1,20 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.SkeletonHorseEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.version.InventoryVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedAbstractHorse; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftHorse; +import org.bukkit.entity.Horse; + +public class VersionedSkeletonHorse extends VersionedAbstractHorse implements SkeletonHorseEntity { + + public VersionedSkeletonHorse(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, InventoryVersionTemplate inventoryVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, inventoryVersionTemplate); + ((CraftHorse)entityHandle.getBukkitEntity()).setVariant(Horse.Variant.SKELETON_HORSE); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSlime.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSlime.java new file mode 100644 index 00000000..5a3ac41f --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSlime.java @@ -0,0 +1,32 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.SlimeEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedMobileEntity; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntitySlice; +import net.minecraft.server.v1_8_R3.EntitySlime; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftSlime; + +public class VersionedSlime extends VersionedMobileEntity implements SlimeEntity { + + private EntitySlime entitySlime; + + public VersionedSlime(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.entitySlime = (EntitySlime) entityHandle; + } + + @Override + public int getSlimeSize() { + return entitySlime.getSize(); + } + + @Override + public SlimeEntity setSlimeSize(int slimeSize) { + entitySlime.setSize(slimeSize); + return this; + } +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSmallFireball.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSmallFireball.java new file mode 100644 index 00000000..36e97318 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSmallFireball.java @@ -0,0 +1,15 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.SmallFireballEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedSmallFireball extends VersionedThrownFireball implements SmallFireballEntity { + + public VersionedSmallFireball(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSnowman.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSnowman.java new file mode 100644 index 00000000..78591627 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSnowman.java @@ -0,0 +1,28 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.SnowmanEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedGolem; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntitySnowman; +import org.bukkit.Location; + +public class VersionedSnowman extends VersionedGolem implements SnowmanEntity { + + public VersionedSnowman(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + + // snowmen always have a pumpkin in 1.8 + @Override + public boolean hasPumpkin() { + return true; + } + + @Override + public SnowmanEntity setPumpkinHead(boolean pumpkinHead) { + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSpawnerMinecart.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSpawnerMinecart.java new file mode 100644 index 00000000..2031799f --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSpawnerMinecart.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.SpawnerMinecart; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedAbstractMinecart; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedSpawnerMinecart extends VersionedAbstractMinecart implements SpawnerMinecart { + + public VersionedSpawnerMinecart(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSquid.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSquid.java new file mode 100644 index 00000000..cfdfa919 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedSquid.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.SquidEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedWaterEntity; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedSquid extends VersionedWaterEntity implements SquidEntity { + + public VersionedSquid(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownChickenEgg.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownChickenEgg.java new file mode 100644 index 00000000..2a17f429 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownChickenEgg.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.ThrownChickenEggEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedProjectile; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedThrownChickenEgg extends VersionedProjectile implements ThrownChickenEggEntity { + + public VersionedThrownChickenEgg(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownEnderPearl.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownEnderPearl.java new file mode 100644 index 00000000..60296fe7 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownEnderPearl.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.ThrownEnderPearlEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedProjectile; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedThrownEnderPearl extends VersionedProjectile implements ThrownEnderPearlEntity { + + public VersionedThrownEnderPearl(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownExpBottle.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownExpBottle.java new file mode 100644 index 00000000..57269261 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownExpBottle.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.ThrownExperienceBottleEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedProjectile; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedThrownExpBottle extends VersionedProjectile implements ThrownExperienceBottleEntity { + + public VersionedThrownExpBottle(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownFireball.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownFireball.java new file mode 100644 index 00000000..0856489f --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownFireball.java @@ -0,0 +1,55 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.ThrownFireballEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.util.ExplosionPower; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedExplosiveEntity; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftFireball; +import org.bukkit.util.Vector; + +public class VersionedThrownFireball extends VersionedExplosiveEntity implements ThrownFireballEntity { + + private CraftFireball craftFireball; + + public VersionedThrownFireball(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.craftFireball = (CraftFireball) entityHandle.getBukkitEntity(); + } + + @Override + public Vector getDirection() { + return craftFireball.getDirection(); + } + + @Override + public ThrownFireballEntity setDirection(Vector vector) { + craftFireball.setDirection(vector); + return this; + } + + @Override + public ExplosionPower getExplosionPower() { + return ExplosionPower.custom(craftFireball.getYield()); + } + + @Override + public ThrownFireballEntity setExplosionPower(ExplosionPower power) { + craftFireball.setYield(power.getPower()); + return this; + } + + @Override + public boolean createsFire() { + return craftFireball.isIncendiary(); + } + + @Override + public ThrownFireballEntity canCreateFire(boolean create) { + craftFireball.setIsIncendiary(create); + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownPotion.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownPotion.java new file mode 100644 index 00000000..2e29513a --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownPotion.java @@ -0,0 +1,49 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import com.google.common.collect.Lists; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.ThrownPotionEntity; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.entity.util.potion.PotionVersionTemplate; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.item.KelpItem; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedProjectile; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftThrownPotion; +import org.bukkit.potion.PotionEffect; + +import java.util.Collection; + +public class VersionedThrownPotion extends VersionedProjectile implements ThrownPotionEntity { + + private CraftThrownPotion craftPotion; + private PotionVersionTemplate potionVersionTemplate; + + public VersionedThrownPotion(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, PotionVersionTemplate potionVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.potionVersionTemplate = potionVersionTemplate; + this.craftPotion = (CraftThrownPotion) entityHandle.getBukkitEntity(); + } + + @Override + public Collection> getPotionEffects() { + Collection> output = Lists.newArrayList(); + for (PotionEffect effect : craftPotion.getEffects()) { + output.add(potionVersionTemplate.getKelpPotion(effect.getType())); + } + return output; + } + + @Override + public KelpItem getItem() { + return KelpItem.from(craftPotion.getItem()); + } + + @Override + public ThrownPotionEntity setItem(KelpItem item) { + craftPotion.setItem(item.getItemStack()); + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownSnowball.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownSnowball.java new file mode 100644 index 00000000..28c7e139 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownSnowball.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.ThrownSnowballEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedProjectile; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedThrownSnowball extends VersionedProjectile implements ThrownSnowballEntity { + + public VersionedThrownSnowball(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownWitherSkull.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownWitherSkull.java new file mode 100644 index 00000000..5702c635 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownWitherSkull.java @@ -0,0 +1,30 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.ThrownWitherSkullEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import net.minecraft.server.v1_8_R3.EntityWitherSkull; +import org.bukkit.Location; + +public class VersionedThrownWitherSkull extends VersionedThrownFireball implements ThrownWitherSkullEntity { + + private EntityWitherSkull witherSkull; + + public VersionedThrownWitherSkull(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + this.witherSkull = (EntityWitherSkull) entityHandle; + } + + @Override + public boolean isCharged() { + return witherSkull.isCharged(); + } + + @Override + public ThrownWitherSkullEntity setCharged(boolean charged) { + witherSkull.setCharged(charged); + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedVillager.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedVillager.java new file mode 100644 index 00000000..0bb1db33 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedVillager.java @@ -0,0 +1,78 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.VillagerEntity; +import de.pxav.kelp.core.entity.util.VillagerProfession; +import de.pxav.kelp.core.entity.util.VillagerType; +import de.pxav.kelp.core.entity.version.EntityConstantsVersionTemplate; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.version.InventoryVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedAbstractVillager; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftVillager; +import org.bukkit.entity.Villager; + +public class VersionedVillager extends VersionedAbstractVillager implements VillagerEntity { + + private CraftVillager craftVillager; + private EntityConstantsVersionTemplate entityConstantsVersionTemplate; + + public VersionedVillager(Entity entityHandle, + KelpEntityType entityType, + Location initialLocation, + EntityTypeVersionTemplate entityTypeVersionTemplate, + InventoryVersionTemplate inventoryVersionTemplate, + EntityConstantsVersionTemplate entityConstantsVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, inventoryVersionTemplate); + this.entityConstantsVersionTemplate = entityConstantsVersionTemplate; + this.craftVillager = (CraftVillager) entityHandle.getBukkitEntity(); + } + + @Override + public VillagerProfession getProfession() { + return entityConstantsVersionTemplate.getVillagerProfession(craftVillager.getProfession().name()); + } + + @Override + public VillagerEntity setProfession(VillagerProfession profession) { + craftVillager.setProfession(Villager.Profession.valueOf(entityConstantsVersionTemplate.getVillagerProfession(profession))); + return this; + } + + // villagers have no types in 1.8 + + @Override + public VillagerType getVillagerType() { + return VillagerType.NONE; + } + + @Override + public VillagerEntity setVillagerType(VillagerType villagerType) { + return this; + } + + + // not available in 1.8 + + @Override + public int getVillagerExperience() { + return 0; + } + + @Override + public int getVillagerLevel() { + return 0; + } + + @Override + public VillagerEntity setVillagerLevel(int villagerLevel) { + return this; + } + + @Override + public VillagerEntity setVillagerExperience() { + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWitch.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWitch.java new file mode 100644 index 00000000..e7ecec7f --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWitch.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.WitchEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedMonster; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedWitch extends VersionedMonster implements WitchEntity { + + public VersionedWitch(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWither.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWither.java new file mode 100644 index 00000000..eeea4f09 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWither.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.WitherEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedMonster; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedWither extends VersionedMonster implements WitherEntity { + + public VersionedWither(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWitherSkeleton.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWitherSkeleton.java new file mode 100644 index 00000000..40da2cc5 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWitherSkeleton.java @@ -0,0 +1,18 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.WitherSkeletonEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftSkeleton; +import org.bukkit.entity.Skeleton; + +public class VersionedWitherSkeleton extends VersionedSkeleton implements WitherSkeletonEntity { + + public VersionedWitherSkeleton(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + ((CraftSkeleton)entityHandle.getBukkitEntity()).setSkeletonType(Skeleton.SkeletonType.WITHER); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWolf.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWolf.java new file mode 100644 index 00000000..6da9ff58 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedWolf.java @@ -0,0 +1,43 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.WolfEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedTameableAnimal; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.DyeColor; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftWolf; + +public class VersionedWolf extends VersionedTameableAnimal implements WolfEntity { + + private CraftWolf craftWolf; + + public VersionedWolf(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + + @Override + public boolean isAngry() { + return craftWolf.isAngry(); + } + + @Override + public WolfEntity setAngry(boolean angry) { + craftWolf.setAngry(angry); + return this; + } + + @Override + public Color getCollarDyeColor() { + return Color.fromBukkit(craftWolf.getCollarColor().getColor()); + } + + @Override + public WolfEntity setCollarDyeColor(Color color) { + craftWolf.setCollarColor(DyeColor.getByColor(color.getBukkitColor())); + return this; + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieGiant.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieGiant.java new file mode 100644 index 00000000..7a0a10ad --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieGiant.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.ZombieGiant; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedMonster; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; + +public class VersionedZombieGiant extends VersionedMonster implements ZombieGiant { + + public VersionedZombieGiant(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); + } + +} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieHorse.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieHorse.java new file mode 100644 index 00000000..7d59728e --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedZombieHorse.java @@ -0,0 +1,20 @@ +package de.pxav.kelp.implementation1_8.entity.type; + +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.ZombieHorse; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.version.InventoryVersionTemplate; +import de.pxav.kelp.implementation1_8.entity.type.general.VersionedAbstractHorse; +import net.minecraft.server.v1_8_R3.Entity; +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftHorse; +import org.bukkit.entity.Horse; + +public class VersionedZombieHorse extends VersionedAbstractHorse implements ZombieHorse { + + public VersionedZombieHorse(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate, InventoryVersionTemplate inventoryVersionTemplate) { + super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate, inventoryVersionTemplate); + ((CraftHorse)entityHandle.getBukkitEntity()).setVariant(Horse.Variant.UNDEAD_HORSE); + } + +} From 315cb9e11c8f9e926881ade0fecd5267bf081f83 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 30 Apr 2021 21:42:56 +0200 Subject: [PATCH 261/325] Fix return types of entity template classes - change return type from void to the corresponding type --- .../core/entity/type/ArmorStandEntity.java | 62 ++++++------------- .../kelp/core/entity/type/CreeperEntity.java | 17 +++-- .../core/entity/type/EnderCrystalEntity.java | 4 +- .../core/entity/type/EnderSignalEntity.java | 8 +-- .../kelp/core/entity/type/FireworkEntity.java | 2 +- .../kelp/core/entity/type/FishHookEntity.java | 19 ++++-- 6 files changed, 46 insertions(+), 66 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ArmorStandEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ArmorStandEntity.java index 185a6b3d..6c5070f4 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ArmorStandEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ArmorStandEntity.java @@ -1,90 +1,64 @@ package de.pxav.kelp.core.entity.type; import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.inventory.type.SimpleEntityEquipment; import org.bukkit.entity.ArmorStand; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; import org.bukkit.util.EulerAngle; public interface ArmorStandEntity extends KelpEntity { - - ItemStack getItemInHand(); - - void setItemInHand(ItemStack var1); - - ItemStack getBoots(); - - void setBoots(ItemStack var1); - - ItemStack getLeggings(); - - void setLeggings(ItemStack var1); - - ItemStack getChestplate(); - - void setChestplate( ItemStack var1); - - ItemStack getHelmet(); - - void setHelmet(ItemStack var1); EulerAngle getBodyPose(); - void setBodyPose(EulerAngle var1); + ArmorStandEntity setBodyPose(EulerAngle bodyPose); EulerAngle getLeftArmPose(); - void setLeftArmPose(EulerAngle var1); + ArmorStandEntity setLeftArmPose(EulerAngle leftArmPose); EulerAngle getRightArmPose(); - void setRightArmPose(EulerAngle var1); + ArmorStandEntity setRightArmPose(EulerAngle rightArmPose); EulerAngle getLeftLegPose(); - void setLeftLegPose(EulerAngle var1); + ArmorStandEntity setLeftLegPose(EulerAngle leftLegPose); EulerAngle getRightLegPose(); - void setRightLegPose(EulerAngle var1); + ArmorStandEntity setRightLegPose(EulerAngle rightLegPose); EulerAngle getHeadPose(); - void setHeadPose(EulerAngle var1); + ArmorStandEntity setHeadPose(EulerAngle headPose); boolean hasBasePlate(); - void setBasePlate(boolean var1); + ArmorStandEntity setBasePlate(boolean basePlate); boolean isVisible(); - void setVisible(boolean var1); + ArmorStandEntity setVisible(boolean visible); boolean hasArms(); - void setArms(boolean var1); + ArmorStandEntity setArms(boolean arms); boolean isSmall(); - void setSmall(boolean var1); + ArmorStandEntity setSmall(boolean small); boolean isMarker(); - void setMarker(boolean var1); - - void addEquipmentLock(EquipmentSlot var1, ArmorStand.LockType var2); - - void removeEquipmentLock(EquipmentSlot var1, ArmorStand.LockType var2); - - boolean hasEquipmentLock(EquipmentSlot var1, ArmorStand.LockType var2); + ArmorStandEntity setMarker(boolean marker); - enum LockType { - ADDING_OR_CHANGING, - REMOVING_OR_CHANGING, - ADDING; + SimpleEntityEquipment getEquipment(); - LockType() { - } - } +// void addEquipmentLock(EquipmentSlot var1, ArmorStand.LockType var2); +// +// void removeEquipmentLock(EquipmentSlot var1, ArmorStand.LockType var2); +// +// boolean hasEquipmentLock(EquipmentSlot var1, ArmorStand.LockType var2); } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/CreeperEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/CreeperEntity.java index a95175f6..edc58c4c 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/CreeperEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/CreeperEntity.java @@ -1,29 +1,28 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.entity.type.general.ExplosiveEntity; import de.pxav.kelp.core.entity.type.general.MonsterEntity; import org.bukkit.Difficulty; -public interface CreeperEntity extends MonsterEntity { +public interface CreeperEntity extends MonsterEntity, ExplosiveEntity { boolean isCharged(); - void setCharged(boolean charged); + CreeperEntity setCharged(boolean charged); - void setMaxFuseTicks(int maxFuseTicks); + CreeperEntity setMaxFuseTicks(int maxFuseTicks); int getMaxFuseTicks(); - void setFuseTicks(int fuseTicks); + CreeperEntity setFuseTicks(int fuseTicks); int getFuseTicks(); - void setExplosionRadius(int explosionRadius); + CreeperEntity explode(); - int getExplosionRadius(); + CreeperEntity ignite(); - void explode(); - - void ignite(); + boolean isIgnited(); @Override default int getMaximumSpawnLightLevel() { diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/EnderCrystalEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/EnderCrystalEntity.java index 6c9166c7..ced1b434 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/EnderCrystalEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/EnderCrystalEntity.java @@ -7,10 +7,10 @@ public interface EnderCrystalEntity extends KelpEntity { boolean isShowingBottom(); - void setShowingBottom(boolean showingBottom); + EnderCrystalEntity setShowingBottom(boolean showingBottom); KelpLocation getBeamTarget(); - void setBeamTarget(KelpLocation beamTarget); + EnderCrystalEntity setBeamTarget(KelpLocation beamTarget); } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/EnderSignalEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/EnderSignalEntity.java index 11b75006..d4d119e2 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/EnderSignalEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/EnderSignalEntity.java @@ -8,18 +8,18 @@ public interface EnderSignalEntity extends KelpEntity { KelpLocation getTargetLocation(); - void setTargetLocation(KelpLocation var1); + EnderSignalEntity setTargetLocation(KelpLocation var1); boolean getDropItem(); - void setDropItem(boolean dropItem); + EnderSignalEntity setDropItem(boolean dropItem); KelpItem getItem(); - void setItem(KelpItem item); + EnderSignalEntity setItem(KelpItem item); int getDespawnTimer(); - void setDespawnTimer(int despawnTimer); + EnderSignalEntity setDespawnTimer(int despawnTimer); } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/FireworkEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/FireworkEntity.java index dad09ba6..dc364b7e 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/FireworkEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/FireworkEntity.java @@ -14,6 +14,6 @@ public interface FireworkEntity extends KelpProjectile { boolean isShotAtAngle(); - boolean setShotAtAngle(boolean shotAtAngle); + FireworkEntity setShotAtAngle(boolean shotAtAngle); } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/FishHookEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/FishHookEntity.java index ccf77c55..f57c300e 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/FishHookEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/FishHookEntity.java @@ -3,28 +3,35 @@ import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.type.general.KelpProjectile; import de.pxav.kelp.core.entity.util.FishHookState; +import org.bukkit.craftbukkit.v1_16_R3.entity.CraftFishHook; public interface FishHookEntity extends KelpProjectile { + KelpEntity getOwner(); + + int getWaitTimeInTicks(); + + FishHookEntity setWaitTime(int waitTicks); + int getMinWaitTime(); - void setMinWaitTime(int minWaitTime); + FishHookEntity setMinWaitTime(int minWaitTime); int getMaxWaitTime(); - void setMaxWaitTime(int maxWaitTime); + FishHookEntity setMaxWaitTime(int maxWaitTime); - boolean getApplyLure(); + boolean hasLure(); - void setApplyLure(boolean var1); + FishHookEntity setApplyLure(boolean hasLure); boolean isInOpenWater(); KelpEntity getHookedEntity(); - void setHookedEntity(KelpEntity hookedEntity); + FishHookEntity setHookedEntity(KelpEntity hookedEntity); - boolean pullHookedEntity(); + FishHookEntity pullHookedEntity(); FishHookState getFishHookState(); From 7e409d6ac9fa4712b4a311602aa1d3521ff3f6ca Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 30 Apr 2021 21:43:28 +0200 Subject: [PATCH 262/325] Fix missing parameters of entity template classes --- .../main/java/de/pxav/kelp/core/entity/type/HopperMinecart.java | 2 +- .../main/java/de/pxav/kelp/core/entity/type/SlimeEntity.java | 2 +- .../src/main/java/de/pxav/kelp/core/entity/type/WolfEntity.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/HopperMinecart.java b/core/src/main/java/de/pxav/kelp/core/entity/type/HopperMinecart.java index 7b078f8d..c1d486c5 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/HopperMinecart.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/HopperMinecart.java @@ -6,6 +6,6 @@ public interface HopperMinecart extends MinecartEntity { boolean isHopperEnabled(); - HopperMinecart setHopperEnabled(); + HopperMinecart setHopperEnabled(boolean enabled); } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SlimeEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SlimeEntity.java index 802a51bb..2b36606d 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/SlimeEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SlimeEntity.java @@ -6,6 +6,6 @@ public interface SlimeEntity extends MobileEntity { int getSlimeSize(); - SlimeEntity setSlimeSize(); + SlimeEntity setSlimeSize(int slimeSize); } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/WolfEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/WolfEntity.java index b929b1a4..ca518cfc 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/WolfEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/WolfEntity.java @@ -12,6 +12,6 @@ public interface WolfEntity extends AnimalEntity, TameableAnimal Date: Fri, 30 Apr 2021 21:43:41 +0200 Subject: [PATCH 263/325] Fix generic type of EndermanEntity --- .../main/java/de/pxav/kelp/core/entity/type/EndermanEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/EndermanEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/EndermanEntity.java index abf50aa6..9185d7e0 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/EndermanEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/EndermanEntity.java @@ -3,7 +3,7 @@ import de.pxav.kelp.core.entity.type.general.MonsterEntity; import de.pxav.kelp.core.inventory.material.KelpMaterial; -public interface EndermanEntity extends MonsterEntity { +public interface EndermanEntity extends MonsterEntity { KelpMaterial getCarriedBlock(); From b072d2b8b4e2ac9ffebd3aca379f0d1185dc3e0d Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 30 Apr 2021 21:44:00 +0200 Subject: [PATCH 264/325] Add missing methods to PigEntity --- .../main/java/de/pxav/kelp/core/entity/type/PigEntity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PigEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PigEntity.java index 29583e2f..74cda716 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/PigEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PigEntity.java @@ -6,4 +6,9 @@ import org.bukkit.entity.Pig; public interface PigEntity extends AnimalEntity, BreedableAnimalEntity, VehicleEntity { + + boolean hasSaddle(); + + PigEntity setSaddled(boolean saddled); + } From fbb36f4276e421d1d42651a9801644c4c41c2641 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 21 May 2021 11:53:27 +0200 Subject: [PATCH 265/325] Implement entity creation and conversion - create new kelp entity instances - convert nms to kelp entity --- .../entity/VersionedEntityType.java | 485 +++++++++++++++--- 1 file changed, 406 insertions(+), 79 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java index 45385176..b334e27d 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java @@ -2,14 +2,22 @@ import com.google.inject.Inject; import de.pxav.kelp.core.entity.KelpEntity; -import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.util.potion.PotionVersionTemplate; +import de.pxav.kelp.core.entity.version.EntityConstantsVersionTemplate; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.inventory.metadata.ItemMetadataVersionTemplate; +import de.pxav.kelp.core.inventory.version.InventoryVersionTemplate; import de.pxav.kelp.core.version.Versioned; -import de.pxav.kelp.implementation1_8.entity.type.VersionedSheep; +import de.pxav.kelp.implementation1_8.entity.type.*; +import net.minecraft.server.v1_8_R3.*; import net.minecraft.server.v1_8_R3.Entity; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_8_R3.CraftWorld; -import org.bukkit.entity.Sheep; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity; +import org.bukkit.entity.*; +import org.bukkit.entity.Item; +import org.bukkit.entity.minecart.*; /** * A class description goes here. @@ -19,95 +27,414 @@ @Versioned public class VersionedEntityType extends EntityTypeVersionTemplate { - @Inject - public VersionedEntityType() { + private EntityConstantsVersionTemplate entityConstantsVersionTemplate; + private InventoryVersionTemplate inventoryVersionTemplate; + private PotionVersionTemplate potionVersionTemplate; + private FixedItemFrameListener fixedItemFrameListener; + private ItemMetadataVersionTemplate itemMetadataVersionTemplate; + @Inject + public VersionedEntityType(EntityConstantsVersionTemplate entityConstantsVersionTemplate, + InventoryVersionTemplate inventoryVersionTemplate, + PotionVersionTemplate potionVersionTemplate, + FixedItemFrameListener fixedItemFrameListener, + ItemMetadataVersionTemplate itemMetadataVersionTemplate) { + this.entityConstantsVersionTemplate = entityConstantsVersionTemplate; + this.inventoryVersionTemplate = inventoryVersionTemplate; + this.potionVersionTemplate = potionVersionTemplate; + this.fixedItemFrameListener = fixedItemFrameListener; + this.itemMetadataVersionTemplate = itemMetadataVersionTemplate; } @Override public KelpEntity newKelpEntity(KelpEntityType entityType, Location location) { - KelpEntity output = null; - Entity entity = null; // net.minecraft entity, not a bukkit one - CraftWorld craftWorld = (CraftWorld) location.getWorld(); - - switch (entityType) { -// case GUARDIAN: -// entity = craftWorld.createEntity(location, Guardian.class); -// output = new VersionedGuardian(entity, KelpEntityType.GUARDIAN, location, entity.getId(), entityVersionTemplate, livingEntityVersionTemplate); -// break; -// case ELDER_GUARDIAN: -// entity = craftWorld.createEntity(location, Guardian.class); -// CraftGuardian guardian = (CraftGuardian) entity.getBukkitEntity(); -// guardian.setElder(true); -// output = new VersionedElderGuardian(entity, KelpEntityType.ELDER_GUARDIAN, location, entity.getId(), entityVersionTemplate, livingEntityVersionTemplate); -// break; -// case ZOMBIE: -// entity = craftWorld.createEntity(location, Zombie.class); -// output = new VersionedZombie(entity, entityType, location, entity.getId(), entityVersionTemplate, livingEntityVersionTemplate); -// break; -// case DROPPED_ITEM: -// entity = null; -// break; - case SHEEP: - entity = craftWorld.createEntity(location, Sheep.class); - output = new VersionedSheep(entity, KelpEntityType.SHEEP, location, this); - } - -// if (entityType != KelpEntityType.DROPPED_ITEM) { -// output.entityId(entity.getId()); -// output.entityType(entityType); -// output.minecraftEntity(entity); -// output.initialLocation(location); -// output.versionTemplate(this.entityVersionTemplate); -// } - - -// if (KelpEntityType.isLivingEntity(entityType)) { -// LivingEntity livingEntity = (CraftLivingEntity) entity.getBukkitEntity(); -// ((LivingKelpEntity)output).bukkitLivingEntity(livingEntity); -// ((LivingKelpEntity)output).livingEntityVersionTemplate(livingEntityVersionTemplate); -// } - - return output; + return getOrCreateEntity(entityType, location, null); } @Override public KelpEntity getKelpEntity(org.bukkit.entity.Entity bukkitEntity) { + Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle(); + return getOrCreateEntity(KelpEntityType.UNKNOWN, bukkitEntity.getLocation(), nmsEntity); + } + + /** + * Creates a new kelp entity instance based on either the given kelp entity type or the nms + * entity you pass. This basically allows you to convert a bukkit entity into a kelp entity + * or create a new entity without spawning it yet. + * + * @param entityType The {@link KelpEntityType kelp entity type} of the entity you want to create. + * If you don't want to create a new one, but convert an existing, pass either + * {@link KelpEntityType#UNKNOWN} or {@code null} here. + * @param location The location of the entity you want to convert/create. This may never be null! + * @param nmsEntity The NMS instance of the entity you want to convert. If you just want to create + * an entity, pass {@code null} here. + * @return The {@link KelpEntity kelp entity} instance of the newly created or converted entity. + */ + private KelpEntity getOrCreateEntity(KelpEntityType entityType, Location location, Object nmsEntity) { + + // whether a new entity should be created. If false, an existing bukkit entity + // should be converted to a kelp entity. + boolean create = false; + + if (nmsEntity == null) { + create = true; + } else if (!(nmsEntity instanceof Entity)) { + //todo log error! + } -// if (bukkitEntity instanceof Item) { -// Item item = (Item) bukkitEntity; -// KelpItem kelpItem = KelpItem.from(item.getItemStack()); -// return new DroppedItemEntity(this.entityVersionTemplate, -// ((CraftEntity)item).getHandle(), -// item.getEntityId(), -// item.getLocation(), -// kelpItem); -// } -// -// if (bukkitEntity instanceof Zombie) { -// Zombie zombie = (Zombie) bukkitEntity; -// LivingEntity livingEntity = (LivingEntity) bukkitEntity; -// return new ZombieEntity(this.entityVersionTemplate, -// this.livingEntityVersionTemplate, -// livingEntity, -// ((CraftEntity)zombie).getHandle(), -// zombie.getEntityId(), -// zombie.getLocation(), -// zombie.isBaby()); -// } -// -// if (bukkitEntity instanceof Guardian) { -// Guardian guardian = (Guardian) bukkitEntity; -// if (guardian.isElder()) { -// return new ElderGuardianEntity(this.entityVersionTemplate, ((CraftEntity)guardian).getHandle(), guardian.getEntityId(), guardian.getLocation()); -// } else { -// return new GuardianEntity(this.entityVersionTemplate, ((CraftEntity)guardian).getHandle(), guardian.getEntityId(), guardian.getLocation()); -// } -// } + // avoid null pointers when type is not passed correctly + if (entityType == null) { + entityType = KelpEntityType.UNKNOWN; + } + Entity entity = nmsEntity == null ? null : (Entity) nmsEntity; + CraftWorld craftWorld = (CraftWorld) location.getWorld(); + KelpEntity output = null; + if (entityType == KelpEntityType.DROPPED_ITEM || entity instanceof EntityItem) { + if (create) { + entity = craftWorld.createEntity(location, Item.class); + } + output = new VersionedItem(entity, entityType, location, this); + } else if (entityType == KelpEntityType.EXPERIENCE_ORB || entity instanceof EntityExperienceOrb) { + if (create) { + entity = craftWorld.createEntity(location, ExperienceOrb.class); + } + output = new VersionedExperienceOrb(entity, entityType, location, this); + } else if (entityType == KelpEntityType.ELDER_GUARDIAN || (entity instanceof EntityGuardian && ((EntityGuardian)entity).isElder())) { + if (create) { + entity = craftWorld.createEntity(location, Guardian.class); + } + output = new VersionedElderGuardian(entity, entityType, location, this); + } else if (entityType == KelpEntityType.WITHER_SKELETON || (entity instanceof EntitySkeleton && ((EntitySkeleton)entity).getSkeletonType() == 1)) { + if (create) { + entity = craftWorld.createEntity(location, Skeleton.class); + } + output = new VersionedWitherSkeleton(entity, entityType, location, this); + } else if (entityType == KelpEntityType.CHICKEN_EGG || entity instanceof EntityEgg) { + if (create) { + entity = craftWorld.createEntity(location, Egg.class); + } + output = new VersionedThrownChickenEgg(entity, entityType, location, this); + } else if (entityType == KelpEntityType.LEASH_HITCH || entity instanceof EntityLeash) { + if (create) { + entity = craftWorld.createEntity(location, LeashHitch.class); + } + output = new VersionedLeashHitch(entity, entityType, location, this); + } else if (entityType == KelpEntityType.PAINTING || entity instanceof EntityPainting) { + if (create) { + entity = craftWorld.createEntity(location, Painting.class); + } + output = new VersionedPainting(entity, entityType, location, this, entityConstantsVersionTemplate); + } else if (entityType == KelpEntityType.ARROW || entity instanceof EntityArrow) { + if (create) { + entity = craftWorld.createEntity(location, Arrow.class); + } + output = new VersionedArrow(entity, entityType, location, this); + } else if (entityType == KelpEntityType.SNOWBALL || entity instanceof EntitySnowball) { + if (create) { + entity = craftWorld.createEntity(location, Snowball.class); + } + output = new VersionedThrownSnowball(entity, entityType, location, this); + } else if (entityType == KelpEntityType.FIREBALL + || (entity instanceof EntityFireball && !(entity instanceof EntitySmallFireball) && !(entity instanceof EntityWitherSkull))) { + if (create) { + entity = craftWorld.createEntity(location, Fireball.class); + } + output = new VersionedThrownFireball(entity, entityType, location, this); + } else if (entityType == KelpEntityType.SMALL_FIREBALL || entity instanceof EntitySmallFireball) { + if (create) { + entity = craftWorld.createEntity(location, SmallFireball.class); + } + output = new VersionedSmallFireball(entity, entityType, location, this); + } else if (entityType == KelpEntityType.ENDER_PEARL || entity instanceof EntityEnderPearl) { + if (create) { + entity = craftWorld.createEntity(location, EnderPearl.class); + } + output = new VersionedThrownEnderPearl(entity, entityType, location, this); + } else if (entityType == KelpEntityType.ENDER_SIGNAL || entity instanceof EntityEnderSignal) { + if (create) { + entity = craftWorld.createEntity(location, EnderSignal.class); + } + output = new VersionedEnderSignal(entity, entityType, location, this); + } else if (entityType == KelpEntityType.SPLASH_POTION || entity instanceof EntityPotion) { + if (create) { + entity = craftWorld.createEntity(location, ThrownPotion.class); + } + output = new VersionedThrownPotion(entity, entityType, location, this, potionVersionTemplate); + } else if (entityType == KelpEntityType.THROWN_EXP_BOTTLE || entity instanceof EntityThrownExpBottle) { + if (create) { + entity = craftWorld.createEntity(location, ThrownExpBottle.class); + } + output = new VersionedThrownExpBottle(entity, entityType, location, this); + } else if (entityType == KelpEntityType.ITEM_FRAME || entity instanceof EntityItemFrame) { + if (create) { + entity = craftWorld.createEntity(location, ItemFrame.class); + } + output = new VersionedItemFrame(entity, entityType, location, this, fixedItemFrameListener); + } else if (entityType == KelpEntityType.WITHER_SKULL || entity instanceof EntityWitherSkull) { + if (create) { + entity = craftWorld.createEntity(location, WitherSkull.class); + } + output = new VersionedThrownWitherSkull(entity, entityType, location, this); + } else if (entityType == KelpEntityType.PRIMED_TNT || entity instanceof EntityTNTPrimed) { + if (create) { + entity = craftWorld.createEntity(location, TNTPrimed.class); + } + output = new VersionedPrimedTnt(entity, entityType, location, this); + } else if (entityType == KelpEntityType.FALLING_BLOCK || entity instanceof EntityFallingBlock) { + if (create) { + entity = craftWorld.createEntity(location, FallingBlock.class); + } + output = new VersionedFallingBlock(entity, entityType, location, this); + } else if (entityType == KelpEntityType.FIREWORK || entity instanceof EntityFireworks) { + if (create) { + entity = craftWorld.createEntity(location, Egg.class); + } + output = new VersionedFirework(entity, entityType, location, this, itemMetadataVersionTemplate); + } else if (entityType == KelpEntityType.ZOMBIE_VILLAGER || (entity instanceof EntityZombie && ((EntityZombie)entity).isVillager())) { + if (create) { + entity = craftWorld.createEntity(location, Zombie.class); + } + output = new VersionedZombieVillager(entity, entityType, location, this); + } else if (entityType == KelpEntityType.SKELETON_HORSE) { + entity = craftWorld.createEntity(location, Horse.class); + output = new VersionedSkeletonHorse(entity, entityType, location, this, inventoryVersionTemplate); + } else if (entityType == KelpEntityType.ZOMBIE_HORSE) { + entity = craftWorld.createEntity(location, Horse.class); + output = new VersionedZombieHorse(entity, entityType, location, this, inventoryVersionTemplate); + } else if (entityType == KelpEntityType.ARMOR_STAND || entity instanceof EntityArmorStand) { + if (create) { + entity = craftWorld.createEntity(location, ArmorStand.class); + } + output = new VersionedArmorStandEntity(entity, entityType, location, this); + } else if (entityType == KelpEntityType.MULE) { + entity = craftWorld.createEntity(location, Horse.class); + output = new VersionedMule(entity, entityType, location, this, inventoryVersionTemplate); + } else if (entityType == KelpEntityType.DONKEY) { + entity = craftWorld.createEntity(location, Horse.class); + output = new VersionedDonkey(entity, entityType, location, this, inventoryVersionTemplate); + } else if (entityType == KelpEntityType.SHEEP || entity instanceof EntitySheep) { + if (create) { + entity = craftWorld.createEntity(location, Sheep.class); + } + output = new VersionedSheep(entity, entityType, location, this); + } else if (entityType == KelpEntityType.MINECART_COMMAND || entity instanceof EntityMinecartCommandBlock) { + if (create) { + entity = craftWorld.createEntity(location, CommandMinecart.class); + } + output = new VersionedCommandMinecartEntity(entity, entityType, location, this); + } else if (entityType == KelpEntityType.BOAT || entity instanceof EntityBoat) { + if (create) { + entity = craftWorld.createEntity(location, Boat.class); + } + output = new VersionedBoat(entity, entityType, location, this); + } else if (entityType == KelpEntityType.MINECART || entity instanceof EntityMinecartRideable) { + if (create) { + entity = craftWorld.createEntity(location, RideableMinecart.class); + } + output = new VersionedRideableMinecart(entity, entityType, location, this); + } else if (entityType == KelpEntityType.MINECART_CHEST || entity instanceof EntityMinecartChest) { + if (create) { + entity = craftWorld.createEntity(location, org.bukkit.entity.minecart.StorageMinecart.class); + } + output = new VersionedStorageMinecart(entity, entityType, location, this, inventoryVersionTemplate); + } else if (entityType == KelpEntityType.MINECART_FURNACE || entity instanceof EntityMinecartFurnace) { + if (create) { + entity = craftWorld.createEntity(location, org.bukkit.entity.minecart.PoweredMinecart.class); + } + output = new VersionedPoweredMinecart(entity, entityType, location, this); + } else if (entityType == KelpEntityType.MINECART_HOPPER || entity instanceof EntityMinecartHopper) { + if (create) { + entity = craftWorld.createEntity(location, HopperMinecart.class); + } + output = new VersionedHopperMinecart(entity, entityType, location, this); + } else if (entityType == KelpEntityType.MINECART_MOB_SPAWNER || entity instanceof EntityMinecartMobSpawner) { + if (create) { + entity = craftWorld.createEntity(location, SpawnerMinecart.class); + } + output = new VersionedSpawnerMinecart(entity, entityType, location, this); + } else if (entityType == KelpEntityType.MINECART_TNT || entity instanceof EntityMinecartTNT) { + if (create) { + entity = craftWorld.createEntity(location, ExplosiveMinecart.class); + } + output = new VersionedExplosiveMinecart(entity, entityType, location, this); + } else if (entityType == KelpEntityType.CREEPER || entity instanceof EntityCreeper) { + if (create) { + entity = craftWorld.createEntity(location, Creeper.class); + } + output = new VersionedCreeper(entity, entityType, location, this); + } else if (entityType == KelpEntityType.SKELETON || entity instanceof EntitySkeleton) { + if (create) { + entity = craftWorld.createEntity(location, Skeleton.class); + } + output = new VersionedSkeleton(entity, entityType, location, this); + } else if (entityType == KelpEntityType.SPIDER || (entity instanceof EntitySpider && !(entity instanceof EntityCaveSpider))) { + if (create) { + entity = craftWorld.createEntity(location, Spider.class); + } + output = new VersionedSpider(entity, entityType, location, this); + } else if (entityType == KelpEntityType.ZOMBIE_GIANT || entity instanceof EntityGiantZombie) { + if (create) { + entity = craftWorld.createEntity(location, Giant.class); + } + output = new VersionedZombieGiant(entity, entityType, location, this); + } else if (entityType == KelpEntityType.SLIME || (entity instanceof EntitySlime && !(entity instanceof EntityMagmaCube))) { + if (create) { + entity = craftWorld.createEntity(location, Slime.class); + } + output = new VersionedSlime(entity, entityType, location, this); + } else if (entityType == KelpEntityType.GHAST || entity instanceof EntityGhast) { + if (create) { + entity = craftWorld.createEntity(location, Ghast.class); + } + output = new VersionedGhast(entity, entityType, location, this); + } else if (entityType == KelpEntityType.PIG_ZOMBIE || entity instanceof EntityPigZombie) { + if (create) { + entity = craftWorld.createEntity(location, PigZombie.class); + } + output = new VersionedPigZombie(entity, entityType, location, this); + } else if (entityType == KelpEntityType.ENDERMAN || entity instanceof EntityEnderman) { + if (create) { + entity = craftWorld.createEntity(location, Enderman.class); + } + output = new VersionedEnderMan(entity, entityType, location, this); + } else if (entityType == KelpEntityType.CAVE_SPIDER || entity instanceof EntityCaveSpider) { + if (create) { + entity = craftWorld.createEntity(location, CaveSpider.class); + } + output = new VersionedCaveSpider(entity, entityType, location, this); + } else if (entityType == KelpEntityType.SILVERFISH || entity instanceof EntitySilverfish) { + if (create) { + entity = craftWorld.createEntity(location, Silverfish.class); + } + output = new VersionedSilverfish(entity, entityType, location, this); + } else if (entityType == KelpEntityType.BLAZE || entity instanceof EntityBlaze) { + if (create) { + entity = craftWorld.createEntity(location, Blaze.class); + } + output = new VersionedBlazeEntity(entity, entityType, location, this); + } else if (entityType == KelpEntityType.MAGMA_CUBE || entity instanceof EntityMagmaCube) { + if (create) { + entity = craftWorld.createEntity(location, MagmaCube.class); + } + output = new VersionedMagmaCube(entity, entityType, location, this); + } else if (entityType == KelpEntityType.ENDER_DRAGON || entity instanceof EntityEnderDragon) { + if (create) { + entity = craftWorld.createEntity(location, EnderDragon.class); + } + output = new VersionedEnderDragon(entity, entityType, location, this); + } else if (entityType == KelpEntityType.WITHER || entity instanceof EntityWither) { + if (create) { + entity = craftWorld.createEntity(location, Wither.class); + } + output = new VersionedWither(entity, entityType, location, this); + } else if (entityType == KelpEntityType.BAT || entity instanceof EntityBat) { + if (create) { + entity = craftWorld.createEntity(location, Bat.class); + } + output = new VersionedBat(entity, entityType, location, this); + } else if (entityType == KelpEntityType.WITCH || entity instanceof EntityWitch) { + if (create) { + entity = craftWorld.createEntity(location, Witch.class); + } + output = new VersionedWitch(entity, entityType, location, this); + } else if (entityType == KelpEntityType.ENDERMITE || entity instanceof EntityEndermite) { + if (create) { + entity = craftWorld.createEntity(location, Endermite.class); + } + output = new VersionedEndermite(entity, entityType, location, this); + } else if (entityType == KelpEntityType.GUARDIAN || entity instanceof EntityGuardian) { + if (create) { + entity = craftWorld.createEntity(location, Guardian.class); + } + output = new VersionedGuardian(entity, entityType, location, this); + } else if (entityType == KelpEntityType.PIG || entity instanceof EntityPig) { + if (create) { + entity = craftWorld.createEntity(location, Pig.class); + } + output = new VersionedPig(entity, entityType, location, this); + } else if (entityType == KelpEntityType.COW || (entity instanceof EntityCow && !(entity instanceof EntityMushroomCow))) { + if (create) { + entity = craftWorld.createEntity(location, Cow.class); + } + output = new VersionedCow(entity, entityType, location, this); + } else if (entityType == KelpEntityType.CHICKEN || entity instanceof EntityChicken) { + if (create) { + entity = craftWorld.createEntity(location, Chicken.class); + } + output = new VersionedChicken(entity, entityType, location, this); + } else if (entityType == KelpEntityType.SQUID || entity instanceof EntitySquid) { + if (create) { + entity = craftWorld.createEntity(location, Squid.class); + } + output = new VersionedSquid(entity, entityType, location, this); + } else if (entityType == KelpEntityType.WOLF || entity instanceof EntityWolf) { + if (create) { + entity = craftWorld.createEntity(location, Wolf.class); + } + output = new VersionedWolf(entity, entityType, location, this); + } else if (entityType == KelpEntityType.MUSHROOM_COW || entity instanceof EntityMushroomCow) { + if (create) { + entity = craftWorld.createEntity(location, MushroomCow.class); + } + output = new VersionedMushroomCow(entity, entityType, location, this); + } else if (entityType == KelpEntityType.SNOWMAN || entity instanceof EntitySnowman) { + if (create) { + entity = craftWorld.createEntity(location, Snowman.class); + } + output = new VersionedSnowman(entity, entityType, location, this); + } else if (entityType == KelpEntityType.OCELOT || entity instanceof EntityOcelot) { + if (create) { + entity = craftWorld.createEntity(location, Ocelot.class); + } + output = new VersionedOcelot(entity, entityType, location, this); + } else if (entityType == KelpEntityType.IRON_GOLEM || entity instanceof EntityIronGolem) { + if (create) { + entity = craftWorld.createEntity(location, IronGolem.class); + } + output = new VersionedIronGolem(entity, entityType, location, this); + } else if (entityType == KelpEntityType.HORSE || entity instanceof EntityHorse) { + if (create) { + entity = craftWorld.createEntity(location, Horse.class); + } + output = new VersionedHorse(entity, entityType, location, this, inventoryVersionTemplate, entityConstantsVersionTemplate); + } else if (entityType == KelpEntityType.RABBIT || entity instanceof EntityRabbit) { + if (create) { + entity = craftWorld.createEntity(location, Rabbit.class); + } + output = new VersionedRabbit(entity, entityType, location, this, entityConstantsVersionTemplate); + } else if (entityType == KelpEntityType.VILLAGER || entity instanceof EntityVillager) { + if (create) { + entity = craftWorld.createEntity(location, Villager.class); + } + output = new VersionedVillager(entity, entityType, location, this, inventoryVersionTemplate, entityConstantsVersionTemplate); + } else if (entityType == KelpEntityType.ENDER_CRYSTAL || entity instanceof EntityEnderCrystal) { + if (create) { + entity = craftWorld.createEntity(location, EnderCrystal.class); + } + output = new VersionedEnderCrystal(entity, entityType, location, this); + } else if (entityType == KelpEntityType.CAT) { + entity = craftWorld.createEntity(location, Ocelot.class); + output = new VersionedCat(entity, entityType, location, this, entityConstantsVersionTemplate); + } else if (entityType == KelpEntityType.FISHING_HOOK || entity instanceof EntityFishingHook) { + if (create) { + entity = craftWorld.createEntity(location, FishHook.class); + } + output = new VersionedFishHook(entity, entityType, location, this); + } else if (entityType == KelpEntityType.LIGHTNING || entity instanceof EntityLightning) { + if (create) { + entity = craftWorld.createEntity(location, LightningStrike.class); + } + output = new VersionedLightning(entity, entityType, location, this); + } else if (entityType == KelpEntityType.ZOMBIE || entity instanceof EntityZombie) { + if (create) { + entity = craftWorld.createEntity(location, Zombie.class); + } + output = new VersionedZombie(entity, entityType, location, this); + } - return null; + return output; } } From 79d45c80dbdc37dd5c2aa384d587bb61a9210d06 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 21 May 2021 12:22:20 +0200 Subject: [PATCH 266/325] Tameable animals now also return the owner uuid --- .../pxav/kelp/core/entity/type/general/TameableAnimal.java | 4 ++++ .../entity/type/general/VersionedTameableAnimal.java | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/TameableAnimal.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/TameableAnimal.java index 25524641..fff49fc4 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/general/TameableAnimal.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/TameableAnimal.java @@ -3,6 +3,8 @@ import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.LivingKelpEntity; +import java.util.UUID; + public interface TameableAnimal> extends AnimalEntity { T setTamed(boolean tamed); @@ -11,6 +13,8 @@ public interface TameableAnimal> extends AnimalEntit KelpEntity getOwner(); + UUID getOwnerUUID(); + T setOwner(KelpEntity owner); } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedTameableAnimal.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedTameableAnimal.java index c0f1be80..91c94764 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedTameableAnimal.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedTameableAnimal.java @@ -10,6 +10,8 @@ import org.bukkit.Location; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftTameableAnimal; +import java.util.UUID; + public class VersionedTameableAnimal> extends VersionedAnimalEntity implements TameableAnimal { private EntityTameableAnimal tameableHandle; @@ -38,6 +40,11 @@ public KelpEntity getOwner() { return entityTypeVersionTemplate.getKelpEntity(tameableHandle.getOwner().getBukkitEntity()); } + @Override + public UUID getOwnerUUID() { + return UUID.fromString(tameableHandle.getOwnerUUID()); + } + @Override public T setOwner(KelpEntity owner) { tameableHandle.setOwnerUUID(owner.getUUID().toString()); From 3aaf194904345b09c9c85ae1e9eb0f8156769298 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 21 May 2021 12:22:47 +0200 Subject: [PATCH 267/325] Fix class cast exception when spawning a horse --- .../type/general/VersionedAbstractHorse.java | 39 ++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractHorse.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractHorse.java index 48f0ada3..e3807aca 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractHorse.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/general/VersionedAbstractHorse.java @@ -1,5 +1,6 @@ package de.pxav.kelp.implementation1_8.entity.type.general; +import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AbstractHorseEntity; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; @@ -8,11 +9,16 @@ import de.pxav.kelp.core.inventory.version.InventoryVersionTemplate; import net.minecraft.server.v1_8_R3.Entity; import net.minecraft.server.v1_8_R3.EntityHorse; +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftHorse; +import org.bukkit.entity.Horse; +import org.bukkit.entity.Player; + +import java.util.UUID; public class VersionedAbstractHorse> - extends VersionedTameableAnimal + extends VersionedAnimalEntity implements AbstractHorseEntity { private EntityHorse horseHandle; @@ -69,4 +75,35 @@ public T setMaximumDomestication(int maximumDomestication) { return (T) this; } + @Override + public T setTamed(boolean tamed) { + horseHandle.setTame(tamed); + return (T) this; + } + + @Override + public boolean isTamed() { + return horseHandle.isTame(); + } + + @Override + public KelpEntity getOwner() { + Player player = Bukkit.getPlayer(getOwnerUUID()); + if (player == null) { + return null; + } + return KelpEntity.from(player); + } + + @Override + public UUID getOwnerUUID() { + return UUID.fromString(horseHandle.getOwnerUUID()); + } + + @Override + public T setOwner(KelpEntity owner) { + horseHandle.setOwnerUUID(owner.getUUID().toString()); + return (T) this; + } + } From b578432189a3d5f02ab163e4d3d25a48dd2a3823 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 21 May 2021 12:23:05 +0200 Subject: [PATCH 268/325] Rename and fix armor stand implementation --- ...rsionedArmorStand.java => VersionedArmorStandEntity.java} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/{VersionedArmorStand.java => VersionedArmorStandEntity.java} (92%) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArmorStand.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArmorStandEntity.java similarity index 92% rename from v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArmorStand.java rename to v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArmorStandEntity.java index 013eeb84..21e4d1c0 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArmorStand.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArmorStandEntity.java @@ -12,12 +12,12 @@ import org.bukkit.craftbukkit.v1_8_R3.entity.CraftArmorStand; import org.bukkit.util.EulerAngle; -public class VersionedArmorStand extends VersionedEntity implements ArmorStandEntity { +public class VersionedArmorStandEntity extends VersionedEntity implements ArmorStandEntity { CraftArmorStand craftArmorStand; EntityArmorStand armorStandHandle; - public VersionedArmorStand(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + public VersionedArmorStandEntity(Entity entityHandle, KelpEntityType entityType, Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); this.craftArmorStand = (CraftArmorStand) entityHandle.getBukkitEntity(); this.armorStandHandle = (EntityArmorStand) entityHandle; @@ -148,4 +148,5 @@ public ArmorStandEntity setMarker(boolean marker) { public SimpleEntityEquipment getEquipment() { return new VersionedSimpleEntityEquipment(craftArmorStand); } + } From 35a7d8c1119e38eabf86683fb0c743b7a4950bb7 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 21 May 2021 12:23:21 +0200 Subject: [PATCH 269/325] Add static factories for KelpEntity --- .../java/de/pxav/kelp/core/entity/KelpEntity.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java index efd4d315..4fe7d09c 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntity.java @@ -1,5 +1,7 @@ package de.pxav.kelp.core.entity; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.world.KelpLocation; import de.pxav.kelp.core.world.KelpWorld; import org.bukkit.Server; @@ -12,6 +14,14 @@ public interface KelpEntity> { + static KelpEntity create(KelpEntityType entityType, KelpLocation location) { + return KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class).newKelpEntity(entityType, location.getBukkitLocation()); + } + + static KelpEntity from(Entity bukkitEntity) { + return KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class).getKelpEntity(bukkitEntity); + } + /** * Gets the unique id of this entity in its world. * @@ -19,7 +29,7 @@ public interface KelpEntity> { * which can be used to identify this entity when sending packets * for example. * - * Entity ids are not incremental but random in a range + * Entity ids are incremental in a range * from 0 to 2000, which usually is the maximum id used * by bukkit. * @@ -109,7 +119,7 @@ public interface KelpEntity> { * * @return An instance of the current entity for fluent builder design. */ - T setOnGround(); + T setOnGround(boolean onGround); /** * Gets the current world of the entity. From 20d481acd1881ae5afa10a5eac354a18da016d64 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 21 May 2021 12:23:46 +0200 Subject: [PATCH 270/325] Add static factories for ArmorStand and Sheep --- .../kelp/core/entity/type/ArmorStandEntity.java | 16 ++++++++++++++-- .../pxav/kelp/core/entity/type/SheepEntity.java | 7 +++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ArmorStandEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ArmorStandEntity.java index 6c5070f4..bf757a83 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ArmorStandEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ArmorStandEntity.java @@ -1,13 +1,25 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.type.SimpleEntityEquipment; +import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.entity.ArmorStand; -import org.bukkit.inventory.EquipmentSlot; -import org.bukkit.inventory.ItemStack; import org.bukkit.util.EulerAngle; public interface ArmorStandEntity extends KelpEntity { + + static ArmorStandEntity create(KelpLocation location) { + return (ArmorStandEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(KelpEntityType.ARMOR_STAND, location.getBukkitLocation()); + } + + static ArmorStandEntity from(ArmorStand armorStand) { + return (ArmorStandEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(armorStand); + } EulerAngle getBodyPose(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SheepEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SheepEntity.java index e3acd29c..a95e2520 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/SheepEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SheepEntity.java @@ -6,6 +6,8 @@ import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Sheep; public interface SheepEntity extends AnimalEntity, BreedableAnimalEntity { @@ -14,6 +16,11 @@ static SheepEntity create(KelpLocation location) { .newKelpEntity(KelpEntityType.SHEEP, location.getBukkitLocation()); } + static SheepEntity from(Entity sheep) { + return (SheepEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(sheep); + } + boolean isSheared(); SheepEntity setSheared(boolean sheared); From 045ac697f88e263aecdd2f8246114ee77fca359e Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 21 May 2021 12:24:19 +0200 Subject: [PATCH 271/325] Implement conversion of special entity types such as cats and horses --- .../entity/VersionedEntityType.java | 36 ++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java index b334e27d..8807f887 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java @@ -3,6 +3,7 @@ import com.google.inject.Inject; import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.util.CatType; import de.pxav.kelp.core.entity.util.potion.PotionVersionTemplate; import de.pxav.kelp.core.entity.version.EntityConstantsVersionTemplate; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; @@ -15,6 +16,8 @@ import org.bukkit.Location; import org.bukkit.craftbukkit.v1_8_R3.CraftWorld; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftHorse; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftOcelot; import org.bukkit.entity.*; import org.bukkit.entity.Item; import org.bukkit.entity.minecart.*; @@ -384,10 +387,8 @@ private KelpEntity getOrCreateEntity(KelpEntityType entityType, Location loca entity = craftWorld.createEntity(location, Snowman.class); } output = new VersionedSnowman(entity, entityType, location, this); - } else if (entityType == KelpEntityType.OCELOT || entity instanceof EntityOcelot) { - if (create) { - entity = craftWorld.createEntity(location, Ocelot.class); - } + } else if (entityType == KelpEntityType.OCELOT) { + entity = craftWorld.createEntity(location, Ocelot.class); output = new VersionedOcelot(entity, entityType, location, this); } else if (entityType == KelpEntityType.IRON_GOLEM || entity instanceof EntityIronGolem) { if (create) { @@ -434,6 +435,33 @@ private KelpEntity getOrCreateEntity(KelpEntityType entityType, Location loca output = new VersionedZombie(entity, entityType, location, this); } + //todo make type fetching more efficient + + if (entity instanceof EntityOcelot) { + CraftOcelot ocelot = (CraftOcelot) entity.getBukkitEntity(); + if (ocelot.getCatType() == Ocelot.Type.WILD_OCELOT) { + output = new VersionedOcelot(entity, entityType, location, this); + } else { + output = new VersionedCat(entity, entityType, location, this, entityConstantsVersionTemplate) + .setCatType(entityConstantsVersionTemplate.getCatType(ocelot.getCatType().toString())); + } + } + + if (entity instanceof EntityHorse) { + CraftHorse horse = (CraftHorse) entity.getBukkitEntity(); + if (horse.getVariant() == Horse.Variant.DONKEY) { + output = new VersionedDonkey(entity, entityType, location, this, inventoryVersionTemplate); + } else if (horse.getVariant() == Horse.Variant.MULE) { + output = new VersionedMule(entity, entityType, location, this, inventoryVersionTemplate); + } else if (horse.getVariant() == Horse.Variant.SKELETON_HORSE) { + output = new VersionedSkeletonHorse(entity, entityType, location, this, inventoryVersionTemplate); + } else if (horse.getVariant() == Horse.Variant.UNDEAD_HORSE) { + output = new VersionedZombieHorse(entity, entityType, location, this, inventoryVersionTemplate); + } else if (horse.getVariant() == Horse.Variant.HORSE) { + output = new VersionedHorse(entity, entityType, location, this, inventoryVersionTemplate, entityConstantsVersionTemplate); + } + } + return output; } From 8acf8d001f583b67537e86594ebce9955624f21e Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 21 May 2021 12:24:42 +0200 Subject: [PATCH 272/325] Implement KelpEntity functionality --- .../entity/VersionedEntity.java | 128 ++++++++++++------ 1 file changed, 84 insertions(+), 44 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntity.java index d4b8ddcf..b11b2860 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntity.java @@ -1,10 +1,12 @@ package de.pxav.kelp.implementation1_8.entity; +import com.google.common.collect.Lists; import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.world.KelpLocation; import de.pxav.kelp.core.world.KelpWorld; +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Server; import org.bukkit.craftbukkit.v1_8_R3.CraftWorld; @@ -15,8 +17,7 @@ import org.bukkit.util.Vector; import java.lang.reflect.Field; -import java.util.List; -import java.util.UUID; +import java.util.*; /** * A class description goes here. @@ -67,28 +68,29 @@ public T spawn() { entityHandle.pitch ); - craftWorld.addEntity(entityHandle, CreatureSpawnEvent.SpawnReason.CUSTOM); + craftWorld.getHandle().addEntity(entityHandle, CreatureSpawnEvent.SpawnReason.DEFAULT); return (T) this; } @Override public T setVelocity(Vector velocity) { - return null; + craftEntity().setVelocity(velocity); + return (T) this; } @Override public Vector getVelocity() { - return null; + return craftEntity().getVelocity(); } @Override public double getEntityHeight() { - return entityHandle.width; + return entityHandle.getHeadHeight(); } @Override public double getEntityWidth() { - return entityHandle.getHeadHeight(); + return entityHandle.width; } @Override @@ -138,187 +140,225 @@ public boolean isInCobweb() { @Override public Entity getBukkitEntity() { - return null; + return craftEntity(); } @Override public boolean isOnGround() { - return false; + return entityHandle.onGround; } @Override - public T setOnGround() { - return null; + public T setOnGround(boolean onGround) { + entityHandle.onGround = onGround; + return (T) this; } @Override public KelpWorld getWorld() { - return null; + return KelpWorld.from(craftEntity().getWorld()); } @Override public T setRotation(float yaw, float pitch) { - return null; + entityHandle.yaw = yaw; + entityHandle.pitch = pitch; + return (T) this; } @Override public T teleport(String worldName, double x, double y, double z, float yaw, float pitch) { - return null; + craftEntity().teleport(new Location(Bukkit.getWorld(worldName), x, y, z, yaw, pitch)); + return (T) this; } @Override public int getFireTicks() { - return 0; + return entityHandle.fireTicks; } @Override public T setFireTicks(int fireTicks) { - return null; + entityHandle.fireTicks = fireTicks; + return (T) this; } @Override public T setMaxFireTicks(int maxFireTicks) { - return null; + entityHandle.maxFireTicks = maxFireTicks; + return (T) this; } @Override public int getMaxFireTicks() { - return 0; + return entityHandle.maxFireTicks; } @Override public T remove() { - return null; + craftEntity().remove(); + return (T) this; } @Override public boolean isDead() { - return false; + return !entityHandle.isAlive(); } @Override public boolean isValid() { - return false; + return entityHandle.valid; } @Override public Server getServer() { - return null; + return craftEntity().getServer(); } @Override public KelpEntity getPassenger() { - return null; + return entityTypeVersionTemplate.getKelpEntity(craftEntity().getPassenger()); } @Override public List> getPassengers() { - return null; + // there is only one passenger in 1.8 + KelpEntity passenger = getPassenger(); + if (passenger == null) { + return null; + } + return Collections.singletonList(passenger); } @Override public T addPassenger(KelpEntity passenger) { - return null; + craftEntity().setPassenger(passenger.getBukkitEntity()); + return (T) this; } @Override public T addPassenger(List> passengers) { - return null; + if (passengers == null || passengers.isEmpty()) { + return (T) this; + } + craftEntity().setPassenger(passengers.get(0).getBukkitEntity()); + return (T) this; } + // only one passenger in 1.8 @Override public T removePassenger(KelpEntity passenger) { - return null; + craftEntity().eject(); + return (T) this; } @Override public boolean isEmpty() { - return false; + return craftEntity().isEmpty(); } @Override public T ejectPassengers() { - return null; + craftEntity().eject(); + return (T) this; } @Override public T setFallDistance(float fallDistance) { - return null; + craftEntity().setFallDistance(fallDistance); + return (T) this; } @Override public float getFallDistance() { - return 0; + return craftEntity().getFallDistance(); } @Override public UUID getUUID() { - return null; + return entityHandle.getUniqueID(); } @Override public int getTicksLived() { - return 0; + return craftEntity().getTicksLived(); } @Override public T setTicksLived(int ticksLived) { - return null; + craftEntity().setTicksLived(ticksLived); + return (T) this; } @Override public boolean isInsideVehicle() { - return false; + return craftEntity().isInsideVehicle(); } @Override public T leaveVehicle() { - return null; + craftEntity().leaveVehicle(); + return (T) this; } @Override public KelpEntity getVehicle() { - return null; + return entityTypeVersionTemplate.getKelpEntity(craftEntity().getVehicle()); } + // not available in 1.8 @Override public boolean isGlowing() { return false; } + // not in 1.8 @Override public T setGlowing(boolean glowing) { - return null; + return (T) this; } @Override public T customNameVisible(boolean visible) { - return null; + craftEntity().setCustomNameVisible(visible); + return (T) this; } @Override public T customName(String customName) { - return null; + craftEntity().setCustomName(customName); + return (T) this; } @Override public boolean isCustomNameVisible() { - return false; + return craftEntity().isCustomNameVisible(); } @Override public EntityDamageEvent getLastDamageCause() { - return null; + return craftEntity().getLastDamageCause(); } @Override public void setLastDamageCause(EntityDamageEvent damageCause) { - + craftEntity().setLastDamageCause(damageCause); } @Override public List> getNearbyEntities(double radiusX, double radiusY, double radiusZ) { - return null; + List notchEntityList = entityHandle.world.a( + entityHandle, + entityHandle.getBoundingBox().grow(radiusX, radiusY, radiusZ), + null); + + List> kelpEntityList = Lists.newArrayList(); + for (net.minecraft.server.v1_8_R3.Entity notchEntity : notchEntityList) { + KelpEntity entity = entityTypeVersionTemplate.getKelpEntity(notchEntity.getBukkitEntity()); + kelpEntityList.add(entity); + } + + return kelpEntityList; } protected CraftEntity craftEntity() { From 494fd05ecb6bde0abaefca7cdfb9f90835c6dea8 Mon Sep 17 00:00:00 2001 From: pxav Date: Fri, 21 May 2021 16:40:57 +0200 Subject: [PATCH 273/325] Add documentation for absorption potion effect --- .../minecraft/AbsorptionPotionEffect.java | 42 +++++++++++++++++-- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/AbsorptionPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/AbsorptionPotionEffect.java index 4b8672bf..813b1679 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/AbsorptionPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/AbsorptionPotionEffect.java @@ -2,12 +2,24 @@ import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; +import org.bukkit.potion.PotionEffectType; +/** + * Represents the absorption potion effect. Absorption is a status + * effect that pads the health bar with extra hearts. + * + * Absorption adds 4 additional health points per level to the player, + * displayed as yellow hearts above the normal health bar. If the player takes damage while under this effect, + * the absorption health points are depleted before the normal health points. + * + * @author pxav + */ public class AbsorptionPotionEffect extends KelpPotionEffect { @Override public String getName() { - return null; + return "Absorption"; } @Override @@ -17,12 +29,34 @@ public boolean isInstant() { @Override public Color getColor() { - return null; + return Color.fromHEX("2552A5"); } @Override - public int getDurationForLevel(int level) { - return 0; + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + + /** + * Gets the amount of extra health points (HP) for the given level. + * Two health points are equal to 1 heart. + * + * @param level The absorption level to get the HP for. + * @return The HP given by this level + */ + public int getHealthPointsForLevel(int level) { + return level * 4; + } + + /** + * Gets the amount of extra hearts a player receives when the given + * level of absorption is applied. + * + * @param level The level to get the amount of hearts for. + * @return The hearts given by this level. + */ + public int getHeartsForLevel(int level) { + return level * 2; } } From ca9accfc84da31fada595e4116dfaff90ced67d2 Mon Sep 17 00:00:00 2001 From: pxav Date: Sat, 22 May 2021 14:02:52 +0200 Subject: [PATCH 274/325] Add KelpEffectRating, which determines whether an effect is positive, negative or mixed --- .../entity/util/potion/KelpEffectRating.java | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpEffectRating.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpEffectRating.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpEffectRating.java new file mode 100644 index 00000000..cd0a62c1 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpEffectRating.java @@ -0,0 +1,45 @@ +package de.pxav.kelp.core.entity.util.potion; + +/** + * Describes whether a potion effect type is considered as positive, + * negative or mixed for the player who consumed it. This can help to + * determine which effects to get from lucky blocks for example. + * + * @author pxav + */ +public enum KelpEffectRating { + + /** + * The effect is positive for the player. Examples would be + *
    + *
  • Strength
    • + *
  • Regeneration
    • + *
  • Absorption
    • + *
  • Speed
    • + *
  • Jump Boost
    • + *
  • Instant healing
    • + *
  • ...
    • + *
+ */ + POSITIVE, + + /** + * The effect is negative for the player. Examples would be + *
    + *
  • Instant damage
    • + *
  • Levitation
    • + *
  • Poison
    • + *
  • Nausea
    • + *
  • ...
    • + *
+ */ + NEGATIVE, + + /** + * The effect is positive, but comes at the cost of also having some + * negative effects. An example would be {@code Turtle master}, which reduces + * taken damage, but also slows you down. + */ + MIXED + +} From c8426d36c2ef906a0d3b49d244f92642a6fd10a0 Mon Sep 17 00:00:00 2001 From: pxav Date: Sat, 22 May 2021 14:04:24 +0200 Subject: [PATCH 275/325] Add documentation to KelpPotionEffect --- .../entity/util/potion/KelpPotionEffect.java | 69 ++++++++++++++++++- 1 file changed, 66 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java index 6db59568..14ad841c 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java @@ -1,25 +1,88 @@ package de.pxav.kelp.core.entity.util.potion; import de.pxav.kelp.core.KelpServer; -import de.pxav.kelp.core.entity.util.potion.minecraft.AbsorptionPotionEffect; +import de.pxav.kelp.core.entity.util.potion.minecraft.*; import de.pxav.kelp.core.inventory.metadata.Color; import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.version.KelpVersion; +/** + * Represents an abstract potion effect a player can get by drinking a potion for example. + * + * Every potion effect type has to extend from this class to define the individual properties. + * But please note that it is currently not possible to add custom effects as they are hard coded + * into the minecraft client and are therefore not modifiable by the server, unlike + * {@link de.pxav.kelp.core.inventory.enchant.KelpEnchantment enchantments}. If this feature is ever added + * to minecraft, you will be able to create custom effects by extending this class as well. + * + * @author pxav + */ public abstract class KelpPotionEffect { - public static Class ABSORPTION = AbsorptionPotionEffect.class; + // default minecraft potion effects + public static KelpPotionEffect ABSORPTION = new AbsorptionPotionEffect(); + public static Class HASTE = HastePotionEffect.class; + public static Class MINING_FATIGUE = MiningFatiguePotionEffect.class; + public static Class REGENERATION = RegenerationPotionEffect.class; + public static Class SLOWNESS = SlownessPotionEffect.class; + public static Class SPEED = SpeedPotionEffect.class; + static { + + } + + /** + * Gets the default name of the effect. Please note that the actual name displayed + * to the player may vary as this is dependent on the player's client language. + * Names returned by this method are always in english. + * + * @return + */ public abstract String getName(); + /** + * Determines whether the effect is instant. An instant is an effect that applies + * instantly and does not last for several ticks. Once consumed, the player will + * have no long-term effects. An example would be the instant damage or instant healing + * potion by minecraft. + * + * @return {@code true} if the effect is instant. + */ public abstract boolean isInstant(); + /** + * Gets the color used by the particles of this effect. + * + * @return The color of the particles used by this effect. + */ public abstract Color getColor(); - public abstract int getDurationForLevel(int level); + /** + * Gets the rating of this effect. The rating gives information + * on whether getting this effect is considered positive, negative or mixed. + * Damage for example would be negative, while regeneration would be positive. + * Mixed effects would be effects that give you positive abilities at the cost + * of a slower speed for example. + * + * @return The effect rating of this potion effect. + */ + public abstract KelpEffectRating getRating(); + /** + * If custom potion effects are ever added to minecraft, this method can be used to + * define what should happen with a player when the effect is applied to them. + * + * @param player The player who consumed the potion effect and to whom the effects should be applied. + */ public void onConsume(KelpPlayer player) {} + /** + * Checks if this effect is a default potion effect offered by minecraft/bukkit. + * As of now, every effect will return {@code true} on this as custom potion effects + * are not yet possible in minecraft. + * + * @return {@code true} if the effect is a default effect. + */ public final boolean isBukkitEffect() { return isBukkitEffectUnsafe(KelpServer.getVersion()); } From 3af258212428fb3a57b19050f01638daf11fa337 Mon Sep 17 00:00:00 2001 From: pxav Date: Sat, 22 May 2021 14:59:10 +0200 Subject: [PATCH 276/325] Add equals and hashCode to KelpPotionEffect --- .../entity/util/potion/KelpPotionEffect.java | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java index 14ad841c..92f22b63 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java @@ -5,6 +5,7 @@ import de.pxav.kelp.core.inventory.metadata.Color; import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.version.KelpVersion; +import org.apache.commons.lang.builder.HashCodeBuilder; /** * Represents an abstract potion effect a player can get by drinking a potion for example. @@ -27,10 +28,6 @@ public abstract class KelpPotionEffect { public static Class SLOWNESS = SlownessPotionEffect.class; public static Class SPEED = SpeedPotionEffect.class; - static { - - } - /** * Gets the default name of the effect. Please note that the actual name displayed * to the player may vary as this is dependent on the player's client language. @@ -91,4 +88,26 @@ public boolean isBukkitEffectUnsafe(KelpVersion version) { return false; } + @Override + public boolean equals(Object other) { + if (!(other instanceof KelpPotionEffect)) { + return false; + } + + KelpPotionEffect otherEffect = (KelpPotionEffect) other; + + return otherEffect.getName().equals(getName()) + && otherEffect.isInstant() == isInstant() + && otherEffect.getColor().equals(getColor()); + } + + @Override + public int hashCode() { + return new HashCodeBuilder(37, 17) + .append(getName()) + .append(getColor()) + .append(getRating()) + .toHashCode(); + } + } From 28c1d71915e8cc0876848f1d5751491d77fb307b Mon Sep 17 00:00:00 2001 From: pxav Date: Sat, 22 May 2021 15:23:26 +0200 Subject: [PATCH 277/325] refactor: rename KelpPotionEffect to KelpPotionEffect as it does not represent an entire effect (lacks duration and particle info) --- .../util/potion/KelpPotionEffectType.java | 113 ++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java new file mode 100644 index 00000000..3e7c589f --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java @@ -0,0 +1,113 @@ +package de.pxav.kelp.core.entity.util.potion; + +import de.pxav.kelp.core.KelpServer; +import de.pxav.kelp.core.entity.util.potion.minecraft.*; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.player.KelpPlayer; +import de.pxav.kelp.core.version.KelpVersion; +import org.apache.commons.lang.builder.HashCodeBuilder; + +/** + * Represents an abstract potion effect a player can get by drinking a potion for example. + * + * Every potion effect type has to extend from this class to define the individual properties. + * But please note that it is currently not possible to add custom effects as they are hard coded + * into the minecraft client and are therefore not modifiable by the server, unlike + * {@link de.pxav.kelp.core.inventory.enchant.KelpEnchantment enchantments}. If this feature is ever added + * to minecraft, you will be able to create custom effects by extending this class as well. + * + * @author pxav + */ +public abstract class KelpPotionEffectType { + + // default minecraft potion effects + public static KelpPotionEffectType ABSORPTION = new AbsorptionPotionEffect(); + public static Class HASTE = HastePotionEffect.class; + public static Class MINING_FATIGUE = MiningFatiguePotionEffect.class; + public static Class REGENERATION = RegenerationPotionEffect.class; + public static Class SLOWNESS = SlownessPotionEffect.class; + public static Class SPEED = SpeedPotionEffect.class; + + /** + * Gets the default name of the effect. Please note that the actual name displayed + * to the player may vary as this is dependent on the player's client language. + * Names returned by this method are always in english. + * + * @return + */ + public abstract String getName(); + + /** + * Determines whether the effect is instant. An instant is an effect that applies + * instantly and does not last for several ticks. Once consumed, the player will + * have no long-term effects. An example would be the instant damage or instant healing + * potion by minecraft. + * + * @return {@code true} if the effect is instant. + */ + public abstract boolean isInstant(); + + /** + * Gets the color used by the particles of this effect. + * + * @return The color of the particles used by this effect. + */ + public abstract Color getColor(); + + /** + * Gets the rating of this effect. The rating gives information + * on whether getting this effect is considered positive, negative or mixed. + * Damage for example would be negative, while regeneration would be positive. + * Mixed effects would be effects that give you positive abilities at the cost + * of a slower speed for example. + * + * @return The effect rating of this potion effect. + */ + public abstract KelpEffectRating getRating(); + + /** + * If custom potion effects are ever added to minecraft, this method can be used to + * define what should happen with a player when the effect is applied to them. + * + * @param player The player who consumed the potion effect and to whom the effects should be applied. + */ + public void onConsume(KelpPlayer player) {} + + /** + * Checks if this effect is a default potion effect offered by minecraft/bukkit. + * As of now, every effect will return {@code true} on this as custom potion effects + * are not yet possible in minecraft. + * + * @return {@code true} if the effect is a default effect. + */ + public final boolean isBukkitEffect() { + return isBukkitEffectUnsafe(KelpServer.getVersion()); + } + + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return false; + } + + @Override + public boolean equals(Object other) { + if (!(other instanceof KelpPotionEffectType)) { + return false; + } + + KelpPotionEffectType otherEffect = (KelpPotionEffectType) other; + + return otherEffect.getName().equals(getName()) + && otherEffect.isInstant() == isInstant() + && otherEffect.getColor().equals(getColor()); + } + + @Override + public int hashCode() { + return new HashCodeBuilder(37, 17) + .append(getName()) + .append(getColor()) + .append(getRating()) + .toHashCode(); + } + +} From 5527ef03f70de26a56891752b47b6e3d15b7f2d4 Mon Sep 17 00:00:00 2001 From: pxav Date: Sat, 22 May 2021 15:23:58 +0200 Subject: [PATCH 278/325] refactor: former effect type class now represents the entire effect including duration and level of the effect --- .../entity/util/potion/KelpPotionEffect.java | 113 ++---------------- 1 file changed, 13 insertions(+), 100 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java index 92f22b63..ec568355 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java @@ -1,113 +1,26 @@ package de.pxav.kelp.core.entity.util.potion; -import de.pxav.kelp.core.KelpServer; -import de.pxav.kelp.core.entity.util.potion.minecraft.*; -import de.pxav.kelp.core.inventory.metadata.Color; -import de.pxav.kelp.core.player.KelpPlayer; -import de.pxav.kelp.core.version.KelpVersion; -import org.apache.commons.lang.builder.HashCodeBuilder; +public class KelpPotionEffect { -/** - * Represents an abstract potion effect a player can get by drinking a potion for example. - * - * Every potion effect type has to extend from this class to define the individual properties. - * But please note that it is currently not possible to add custom effects as they are hard coded - * into the minecraft client and are therefore not modifiable by the server, unlike - * {@link de.pxav.kelp.core.inventory.enchant.KelpEnchantment enchantments}. If this feature is ever added - * to minecraft, you will be able to create custom effects by extending this class as well. - * - * @author pxav - */ -public abstract class KelpPotionEffect { + private int durationInTicks; + private KelpPotionEffectType effectType; + private boolean showParticles; + private int level; - // default minecraft potion effects - public static KelpPotionEffect ABSORPTION = new AbsorptionPotionEffect(); - public static Class HASTE = HastePotionEffect.class; - public static Class MINING_FATIGUE = MiningFatiguePotionEffect.class; - public static Class REGENERATION = RegenerationPotionEffect.class; - public static Class SLOWNESS = SlownessPotionEffect.class; - public static Class SPEED = SpeedPotionEffect.class; - - /** - * Gets the default name of the effect. Please note that the actual name displayed - * to the player may vary as this is dependent on the player's client language. - * Names returned by this method are always in english. - * - * @return - */ - public abstract String getName(); - - /** - * Determines whether the effect is instant. An instant is an effect that applies - * instantly and does not last for several ticks. Once consumed, the player will - * have no long-term effects. An example would be the instant damage or instant healing - * potion by minecraft. - * - * @return {@code true} if the effect is instant. - */ - public abstract boolean isInstant(); - - /** - * Gets the color used by the particles of this effect. - * - * @return The color of the particles used by this effect. - */ - public abstract Color getColor(); - - /** - * Gets the rating of this effect. The rating gives information - * on whether getting this effect is considered positive, negative or mixed. - * Damage for example would be negative, while regeneration would be positive. - * Mixed effects would be effects that give you positive abilities at the cost - * of a slower speed for example. - * - * @return The effect rating of this potion effect. - */ - public abstract KelpEffectRating getRating(); - - /** - * If custom potion effects are ever added to minecraft, this method can be used to - * define what should happen with a player when the effect is applied to them. - * - * @param player The player who consumed the potion effect and to whom the effects should be applied. - */ - public void onConsume(KelpPlayer player) {} - - /** - * Checks if this effect is a default potion effect offered by minecraft/bukkit. - * As of now, every effect will return {@code true} on this as custom potion effects - * are not yet possible in minecraft. - * - * @return {@code true} if the effect is a default effect. - */ - public final boolean isBukkitEffect() { - return isBukkitEffectUnsafe(KelpServer.getVersion()); + public int getDurationInTicks() { + return durationInTicks; } - public boolean isBukkitEffectUnsafe(KelpVersion version) { - return false; + public KelpPotionEffectType getEffectType() { + return effectType; } - @Override - public boolean equals(Object other) { - if (!(other instanceof KelpPotionEffect)) { - return false; - } - - KelpPotionEffect otherEffect = (KelpPotionEffect) other; - - return otherEffect.getName().equals(getName()) - && otherEffect.isInstant() == isInstant() - && otherEffect.getColor().equals(getColor()); + public int getLevel() { + return level; } - @Override - public int hashCode() { - return new HashCodeBuilder(37, 17) - .append(getName()) - .append(getColor()) - .append(getRating()) - .toHashCode(); + public boolean particlesShown() { + return showParticles; } } From f472343ee25d08156c5f233d8e7853c2cbdc5b1a Mon Sep 17 00:00:00 2001 From: pxav Date: Sat, 22 May 2021 15:24:58 +0200 Subject: [PATCH 279/325] refactor: Remove default effect types from KelpPotionEffectType and add them to PotionEffects to avoid class deadlocks --- .../entity/util/potion/KelpPotionEffectType.java | 8 -------- .../core/entity/util/potion/PotionEffects.java | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionEffects.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java index 3e7c589f..eb11b763 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java @@ -20,14 +20,6 @@ */ public abstract class KelpPotionEffectType { - // default minecraft potion effects - public static KelpPotionEffectType ABSORPTION = new AbsorptionPotionEffect(); - public static Class HASTE = HastePotionEffect.class; - public static Class MINING_FATIGUE = MiningFatiguePotionEffect.class; - public static Class REGENERATION = RegenerationPotionEffect.class; - public static Class SLOWNESS = SlownessPotionEffect.class; - public static Class SPEED = SpeedPotionEffect.class; - /** * Gets the default name of the effect. Please note that the actual name displayed * to the player may vary as this is dependent on the player's client language. diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionEffects.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionEffects.java new file mode 100644 index 00000000..23a342a4 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionEffects.java @@ -0,0 +1,14 @@ +package de.pxav.kelp.core.entity.util.potion; + +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.util.potion.minecraft.AbsorptionPotionEffect; +import de.pxav.kelp.core.entity.util.potion.minecraft.HastePotionEffect; +import de.pxav.kelp.core.entity.util.potion.minecraft.LevitationEffect; + +public abstract class PotionEffects { + + public static final KelpPotionEffectType ABSORPTION = KelpPlugin.getInjector().getInstance(AbsorptionPotionEffect.class); + public static final KelpPotionEffectType LEVITATION = KelpPlugin.getInjector().getInstance(LevitationEffect.class); + public static final KelpPotionEffectType HASTE = KelpPlugin.getInjector().getInstance(HastePotionEffect.class); + +} From 5063bd56d1605993020892ea1953e3cac018a74b Mon Sep 17 00:00:00 2001 From: pxav Date: Sat, 22 May 2021 22:01:48 +0200 Subject: [PATCH 280/325] Add methods to LivingKelpEntity allowing to give/remove potion effects --- .../de/pxav/kelp/core/entity/LivingKelpEntity.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java index 0a338d3b..4892c8e7 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java @@ -1,11 +1,22 @@ package de.pxav.kelp.core.entity; import de.pxav.kelp.core.entity.type.general.DamageableEntity; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; import de.pxav.kelp.core.inventory.type.SimpleEntityEquipment; import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.LivingEntity; + +import java.util.Collection; public interface LivingKelpEntity> extends KelpEntity, DamageableEntity { + T addPotionEffect(KelpPotionEffect potionEffect); + + Collection getActivePotionEffects(); + + T removePotionEffect(KelpPotionEffectType effectType); + /** * Gets the location of the entity's eyes. When you get * the normal location of a player for example, the feet location From 8a06c3da16a49dd7bdabef49432f431fd4430dfd Mon Sep 17 00:00:00 2001 From: pxav Date: Sat, 22 May 2021 22:04:00 +0200 Subject: [PATCH 281/325] Players are now created using the methods from EntityTypeVersionTemplate as well - this allows using method injection for entity classes --- .../entity/VersionedEntityType.java | 33 ++++++++++++++++- .../player/PlayerCreationListener.java | 37 ++----------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java index 8807f887..ad90c7e6 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java @@ -3,14 +3,20 @@ import com.google.inject.Inject; import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.LivingKelpEntity; import de.pxav.kelp.core.entity.util.CatType; import de.pxav.kelp.core.entity.util.potion.PotionVersionTemplate; import de.pxav.kelp.core.entity.version.EntityConstantsVersionTemplate; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.metadata.ItemMetadataVersionTemplate; import de.pxav.kelp.core.inventory.version.InventoryVersionTemplate; +import de.pxav.kelp.core.logger.KelpLogger; +import de.pxav.kelp.core.particle.version.ParticleVersionTemplate; +import de.pxav.kelp.core.sound.SoundRepository; import de.pxav.kelp.core.version.Versioned; import de.pxav.kelp.implementation1_8.entity.type.*; +import de.pxav.kelp.implementation1_8.player.BossBarLocationUpdater; +import de.pxav.kelp.implementation1_8.player.VersionedKelpPlayer; import net.minecraft.server.v1_8_R3.*; import net.minecraft.server.v1_8_R3.Entity; import org.bukkit.Location; @@ -21,6 +27,7 @@ import org.bukkit.entity.*; import org.bukkit.entity.Item; import org.bukkit.entity.minecart.*; +import org.bukkit.plugin.java.JavaPlugin; /** * A class description goes here. @@ -35,18 +42,33 @@ public class VersionedEntityType extends EntityTypeVersionTemplate { private PotionVersionTemplate potionVersionTemplate; private FixedItemFrameListener fixedItemFrameListener; private ItemMetadataVersionTemplate itemMetadataVersionTemplate; + private BossBarLocationUpdater bossBarLocationUpdater; + private SoundRepository soundRepository; + private ParticleVersionTemplate particleVersionTemplate; + private JavaPlugin javaPlugin; + private KelpLogger logger; @Inject public VersionedEntityType(EntityConstantsVersionTemplate entityConstantsVersionTemplate, InventoryVersionTemplate inventoryVersionTemplate, PotionVersionTemplate potionVersionTemplate, FixedItemFrameListener fixedItemFrameListener, - ItemMetadataVersionTemplate itemMetadataVersionTemplate) { + ItemMetadataVersionTemplate itemMetadataVersionTemplate, + BossBarLocationUpdater bossBarLocationUpdater, + SoundRepository soundRepository, + ParticleVersionTemplate particleVersionTemplate, + JavaPlugin javaPlugin, + KelpLogger logger) { this.entityConstantsVersionTemplate = entityConstantsVersionTemplate; this.inventoryVersionTemplate = inventoryVersionTemplate; this.potionVersionTemplate = potionVersionTemplate; this.fixedItemFrameListener = fixedItemFrameListener; this.itemMetadataVersionTemplate = itemMetadataVersionTemplate; + this.bossBarLocationUpdater = bossBarLocationUpdater; + this.soundRepository = soundRepository; + this.particleVersionTemplate = particleVersionTemplate; + this.javaPlugin = javaPlugin; + this.logger = logger; } @Override @@ -94,7 +116,9 @@ private KelpEntity getOrCreateEntity(KelpEntityType entityType, Location loca CraftWorld craftWorld = (CraftWorld) location.getWorld(); KelpEntity output = null; - if (entityType == KelpEntityType.DROPPED_ITEM || entity instanceof EntityItem) { + if (entityType == KelpEntityType.PLAYER || entity instanceof EntityPlayer) { + output = new VersionedKelpPlayer(entity, entityType, location, this, logger, bossBarLocationUpdater, soundRepository, particleVersionTemplate, javaPlugin); + } else if (entityType == KelpEntityType.DROPPED_ITEM || entity instanceof EntityItem) { if (create) { entity = craftWorld.createEntity(location, Item.class); } @@ -462,6 +486,11 @@ private KelpEntity getOrCreateEntity(KelpEntityType entityType, Location loca } } + if (output instanceof VersionedLivingEntity) { + System.out.println("is living entity"); + ((VersionedLivingEntity)output).setPotionVersionTemplate(potionVersionTemplate); + } + return output; } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/PlayerCreationListener.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/PlayerCreationListener.java index 9514ac84..4818d387 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/PlayerCreationListener.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/PlayerCreationListener.java @@ -40,28 +40,16 @@ public class PlayerCreationListener { private KelpPlayerRepository kelpPlayerRepository; private GlobalPacketListener globalPacketListener; private EntityTypeVersionTemplate entityTypeVersionTemplate; - private SoundRepository soundRepository; - private BossBarLocationUpdater bossBarLocationUpdater; - private JavaPlugin javaPlugin; - private ParticleVersionTemplate particleVersionTemplate; private KelpLogger logger; @Inject public PlayerCreationListener(KelpPlayerRepository kelpPlayerRepository, GlobalPacketListener globalPacketListener, KelpLogger logger, - JavaPlugin javaPlugin, - SoundRepository soundRepository, - EntityTypeVersionTemplate entityTypeVersionTemplate, - BossBarLocationUpdater bossBarLocationUpdater, - ParticleVersionTemplate particleVersionTemplate) { + EntityTypeVersionTemplate entityTypeVersionTemplate) { this.kelpPlayerRepository = kelpPlayerRepository; this.globalPacketListener = globalPacketListener; this.logger = logger; - this.javaPlugin = javaPlugin; - this.particleVersionTemplate = particleVersionTemplate; - this.bossBarLocationUpdater = bossBarLocationUpdater; - this.soundRepository = soundRepository; this.entityTypeVersionTemplate = entityTypeVersionTemplate; } @@ -78,16 +66,8 @@ public PlayerCreationListener(KelpPlayerRepository kelpPlayerRepository, public void handlePlayerLogin(PlayerLoginEvent event) { Entity playerHandle = ((CraftPlayer)event.getPlayer()).getHandle(); kelpPlayerRepository.playerEntityObject(event.getPlayer().getUniqueId(), playerHandle); - KelpPlayer kelpPlayer = new VersionedKelpPlayer( - playerHandle, - KelpEntityType.PLAYER, - event.getPlayer().getLocation(), - entityTypeVersionTemplate, - logger, - bossBarLocationUpdater, - soundRepository, - particleVersionTemplate, - javaPlugin); + + KelpPlayer kelpPlayer = (KelpPlayer) entityTypeVersionTemplate.getKelpEntity(event.getPlayer()); kelpPlayerRepository.addOrUpdatePlayer(kelpPlayer.getUUID(), kelpPlayer); Bukkit.getPluginManager().callEvent(new KelpPlayerLoginEvent( kelpPlayer, @@ -122,16 +102,7 @@ public void createOnStartup() { // is removed from the cache again. try { Entity playerHandle = ((CraftPlayer)current).getHandle(); - KelpPlayer kelpPlayer = new VersionedKelpPlayer( - playerHandle, - KelpEntityType.PLAYER, - current.getLocation(), - entityTypeVersionTemplate, - logger, - bossBarLocationUpdater, - soundRepository, - particleVersionTemplate, - javaPlugin); + KelpPlayer kelpPlayer = (KelpPlayer) entityTypeVersionTemplate.getKelpEntity(current); kelpPlayer.setClientViewDistanceInternally(Bukkit.getViewDistance()); kelpPlayer.setClientLanguageInternally("en_US"); kelpPlayer.setPlayerChatVisibilityInternally(PlayerChatVisibility.SHOW_ALL_MESSAGES); From be7c011d4ffe75fe66a9131548229aacc81f4f49 Mon Sep 17 00:00:00 2001 From: pxav Date: Sat, 22 May 2021 22:20:57 +0200 Subject: [PATCH 282/325] Add documentation for PotionEffects --- .../kelp/core/entity/util/potion/PotionEffects.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionEffects.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionEffects.java index 23a342a4..91f20c07 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionEffects.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionEffects.java @@ -5,8 +5,20 @@ import de.pxav.kelp.core.entity.util.potion.minecraft.HastePotionEffect; import de.pxav.kelp.core.entity.util.potion.minecraft.LevitationEffect; +/** + * This class holds some constant values for quick access to some potion + * effect types needed to for example create a new {@link KelpPotionEffect} instance, + * which can then be {@link de.pxav.kelp.core.entity.LivingKelpEntity#addPotionEffect(KelpPotionEffect) applied to an entity}. + * + * Please note that this class is not an enum and its values are therefore not comparable + * using the {@code ==} operator. If you want to compare effect types, use + * {@code PotionEffects.ABSORPTION.equals(anotherPotionEffectInstance)} instead. + * + * @author pxav + */ public abstract class PotionEffects { + // default minecraft potion types. public static final KelpPotionEffectType ABSORPTION = KelpPlugin.getInjector().getInstance(AbsorptionPotionEffect.class); public static final KelpPotionEffectType LEVITATION = KelpPlugin.getInjector().getInstance(LevitationEffect.class); public static final KelpPotionEffectType HASTE = KelpPlugin.getInjector().getInstance(HastePotionEffect.class); From 03f941f98c342ac4a34b511cf238bb7ed3a38c0b Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 11:14:25 +0200 Subject: [PATCH 283/325] Add documentation to PotionVersionTemplate --- .../util/potion/PotionVersionTemplate.java | 57 ++++++++++++++++++- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionVersionTemplate.java index 1359e37f..6efe6bb6 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionVersionTemplate.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionVersionTemplate.java @@ -1,13 +1,66 @@ package de.pxav.kelp.core.entity.util.potion; import de.pxav.kelp.core.application.KelpVersionTemplate; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.LivingKelpEntity; +import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; +/** + * This class allows you to execute version-dependent operations + * on potion effects such as converting bukkit and kelp effects. + * + * This does not implement potion effects that are unavailable in + * some versions, please look at the individual potion effect classes + * in this case. + * + * @author pxav + */ @KelpVersionTemplate public abstract class PotionVersionTemplate { - public abstract PotionEffectType getBukkitPotion(Class effect); + /** + * Gets the bukkit potion effect type from a given kelp effect type. + * + * This method can obviously only return the potion types that are available + * in the bukkit version you are running, so if you request {@link PotionEffectType#LEVITATION} + * on a 1.8 server, {@code null} will be returned as there is no equivalent. + * + * @param effect The kelp effect type you want to get the bukkit equivalent of. + * @return The bukkit potion effect type equivalent to the given kelp effect type. + */ + public abstract PotionEffectType getBukkitPotion(KelpPotionEffectType effect); - public abstract Class getKelpPotion(PotionEffectType effectType); + /** + * Applies the given {@link KelpPotionEffect potion effect} to the given entity. + * Not every effect will have the same consequences for all entities. Some entities might + * be immune against certain effects or can be affected differently than expected + * (e. g. Zombies are damaged by a heal potion). + * + * If the requested potion effect type does not exist, the Kelp implementation of + * this effect will be called to emulate the effect. + * + * @param entity The entity to apply the effect to. + * @param potionEffect The {@link KelpPotionEffect potion effect} to apply to the entity + * including all information such as duration or level of the effect. + */ + public abstract void applyTo(LivingKelpEntity entity, KelpPotionEffect potionEffect); + + /** + * Converts the given bukkit potion effect to a {@link KelpPotionEffect}. + * This is useful when getting all effects of an entity for example. + * + * @param effect The bukkit effect to convert. + * @return A new instance of {@link KelpPotionEffect} containing the data equivalent to the bukkit potion effect. + */ + public abstract KelpPotionEffect fetchEffect(PotionEffect effect); + + /** + * Converts the given bukkit potion effect type to the equivalent kelp effect type. + * + * @param effectType The bukkit effect type to convert. + * @return The {@link KelpPotionEffectType} equivalent to the given bukkit effect. + */ + public abstract KelpPotionEffectType getKelpPotion(PotionEffectType effectType); } From a3e2eca527102caef31e2bae622bb70637615f61 Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 11:14:49 +0200 Subject: [PATCH 284/325] Add methods to randomly pick effects to PotionEffects class --- .../entity/util/potion/PotionEffects.java | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionEffects.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionEffects.java index 91f20c07..f87b5d06 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionEffects.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionEffects.java @@ -1,9 +1,15 @@ package de.pxav.kelp.core.entity.util.potion; +import com.google.common.collect.Lists; import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.KelpServer; import de.pxav.kelp.core.entity.util.potion.minecraft.AbsorptionPotionEffect; import de.pxav.kelp.core.entity.util.potion.minecraft.HastePotionEffect; import de.pxav.kelp.core.entity.util.potion.minecraft.LevitationEffect; +import de.pxav.kelp.core.version.KelpVersion; + +import java.util.Collections; +import java.util.List; /** * This class holds some constant values for quick access to some potion @@ -23,4 +29,66 @@ public abstract class PotionEffects { public static final KelpPotionEffectType LEVITATION = KelpPlugin.getInjector().getInstance(LevitationEffect.class); public static final KelpPotionEffectType HASTE = KelpPlugin.getInjector().getInstance(HastePotionEffect.class); + /** + * Picks a random potion effect type from all existing ones + * at the current server version. This method uses values + * returned from {@link #values()} in the background. + * + * @return A random potion effect type available at the current server version. + */ + public static KelpPotionEffectType randomEffectType() { + final List types = values(); + Collections.shuffle(types); + return types.get(0); + } + + /** + * Picks a random potion effect type from existing ones at the + * current server version. Only potion types with the given rating + * are returned, meaning that if you want to have a positive potion + * effect type, {@link KelpEffectRating#POSITIVE} has to be passed. + * + * If you don't care about the effect's rating, use {@link #randomEffectType()} + * instead. + * + * @param rating The rating of the effect. + * @return + */ + public static KelpPotionEffectType randomEffectType(KelpEffectRating rating) { + final List types = values(); + do { + Collections.shuffle(types); + } while (types.get(0).getRating() != rating); + return types.get(0); + } + + public static KelpPotionEffectType valueOf(String fieldName) { + switch (fieldName) { + case "ABSORPTION": return ABSORPTION; + case "LEVITATION": return LEVITATION; + case "HASTE": return HASTE; + } + return PotionEffects.ABSORPTION; + } + + /** + * Returns all potion effect types existing on the current server version. + * So if you call this method on a 1.8 server, {@code LEVITATION} will be excluded, + * while it is included in 1.9+. + * + * @return A list of all potion effect types available at the current server version. + */ + public static List values() { + List output = Lists.newArrayList( + ABSORPTION, + HASTE + ); + + if (KelpServer.getVersion().isHigherThanOrEqualTo(KelpVersion.MC_1_9_0)) { + output.add(LEVITATION); + } + + return output; + } + } From 7c43a1c180a1215c5ad6b793233231208e9f459a Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 11:15:36 +0200 Subject: [PATCH 285/325] refactor: Move VersionedPotion to dedicated package in 1.8 implementation and implement missing methods --- .../entity/VersionedPotion.java | 31 -------- .../entity/potion/VersionedPotion.java | 73 +++++++++++++++++++ 2 files changed, 73 insertions(+), 31 deletions(-) delete mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedPotion.java create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/potion/VersionedPotion.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedPotion.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedPotion.java deleted file mode 100644 index 13cd00db..00000000 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedPotion.java +++ /dev/null @@ -1,31 +0,0 @@ -package de.pxav.kelp.implementation1_8.entity; - -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; -import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; -import de.pxav.kelp.core.entity.util.potion.PotionVersionTemplate; -import de.pxav.kelp.core.version.Versioned; -import org.bukkit.potion.PotionEffectType; - -@Versioned -public class VersionedPotion extends PotionVersionTemplate { - - @Override - public PotionEffectType getBukkitPotion(Class effectClass) { - return getPotionMappings().get(effectClass); - } - - @Override - public Class getKelpPotion(PotionEffectType effectType) { - return getPotionMappings().inverse().get(effectType); - } - - private BiMap, PotionEffectType> getPotionMappings() { - BiMap, PotionEffectType> output = HashBiMap.create(); - - output.put(KelpPotionEffect.ABSORPTION, PotionEffectType.ABSORPTION); - - return output; - } - -} diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/potion/VersionedPotion.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/potion/VersionedPotion.java new file mode 100644 index 00000000..bb7de8a7 --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/potion/VersionedPotion.java @@ -0,0 +1,73 @@ +package de.pxav.kelp.implementation1_8.entity.potion; + +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; +import de.pxav.kelp.core.entity.LivingKelpEntity; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.entity.util.potion.PotionEffects; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.PotionVersionTemplate; +import de.pxav.kelp.core.version.Versioned; +import org.bukkit.entity.LivingEntity; +import org.bukkit.potion.PotionEffect; +import org.bukkit.potion.PotionEffectType; + +@Versioned +public class VersionedPotion extends PotionVersionTemplate { + + @Override + public PotionEffectType getBukkitPotion(KelpPotionEffectType effectClass) { + String effectName = getPotionMappings().get(effectClass); + if (effectName.startsWith("IMPL_")) { + return null; + } + return PotionEffectType.getByName(effectName); + } + + @Override + public void applyTo(LivingKelpEntity entity, KelpPotionEffect potionEffect) { + LivingEntity livingEntity = (LivingEntity) entity.getBukkitEntity(); + + // if the potion is natively available in this server version + if (potionEffect.getEffectType().isBukkitEffect()) { + PotionEffectType effectType = getBukkitPotion(potionEffect.getEffectType()); + livingEntity.addPotionEffect(new PotionEffect( + effectType, + potionEffect.getDurationInTicks(), + potionEffect.getLevel() - 1, + false, + potionEffect.particlesShown())); + return; + } + + // if the potion is emulated by Kelp + potionEffect.getEffectType().onConsume(entity, potionEffect); + + } + + @Override + public KelpPotionEffect fetchEffect(PotionEffect effect) { + return KelpPotionEffect.create() + .effectType(getKelpPotion(effect.getType())) + .level(effect.getAmplifier() + 1) + .showParticles(effect.hasParticles()) + .durationTicks(effect.getDuration()); + } + + @Override + public KelpPotionEffectType getKelpPotion(PotionEffectType effectType) { + return getPotionMappings().inverse().get(effectType.getName().toLowerCase()); + } + + private BiMap getPotionMappings() { + BiMap output = HashBiMap.create(); + + output.put(PotionEffects.ABSORPTION, PotionEffectType.ABSORPTION.getName().toLowerCase()); + output.put(PotionEffects.HASTE, PotionEffectType.FAST_DIGGING.getName().toLowerCase()); + + output.put(PotionEffects.LEVITATION, "IMPL_LEVITATION"); + + return output; + } + +} From 7037074422b79c9fac2895a7b8dce5f4f5af694c Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 11:16:53 +0200 Subject: [PATCH 286/325] Add methods to set effect details of a potion effect --- .../entity/util/potion/KelpPotionEffect.java | 57 +++++++++++++++++-- 1 file changed, 53 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java index ec568355..e9bd5262 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffect.java @@ -1,11 +1,60 @@ package de.pxav.kelp.core.entity.util.potion; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.scheduler.TimeConverter; +import org.bukkit.potion.PotionEffect; + +import java.util.concurrent.TimeUnit; + public class KelpPotionEffect { - private int durationInTicks; - private KelpPotionEffectType effectType; - private boolean showParticles; - private int level; + private int durationInTicks = 20 * 30; + private KelpPotionEffectType effectType = PotionEffects.ABSORPTION; + private boolean showParticles = true; + private int level = 1; + + public static KelpPotionEffect from(PotionEffect bukkitEffect) { + return KelpPlugin.getInjector().getInstance(PotionVersionTemplate.class).fetchEffect(bukkitEffect); + } + + public static KelpPotionEffect create() { + return new KelpPotionEffect(); + } + + public KelpPotionEffect duration(int value, TimeUnit timeUnit) { + this.durationInTicks = TimeConverter.getTicks(value, timeUnit); + return this; + } + + public KelpPotionEffect durationTicks(int ticks) { + this.durationInTicks = ticks; + return this; + } + + public KelpPotionEffect effectType(KelpPotionEffectType effectType) { + this.effectType = effectType; + return this; + } + + public KelpPotionEffect showParticles(boolean show) { + this.showParticles = show; + return this; + } + + public KelpPotionEffect hideParticles() { + this.showParticles = false; + return this; + } + + public KelpPotionEffect showParticles() { + this.showParticles = true; + return this; + } + + public KelpPotionEffect level(int level) { + this.level = level; + return this; + } public int getDurationInTicks() { return durationInTicks; From 758f7de962ae0e722cd801c6600297fa756ff49b Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 11:17:26 +0200 Subject: [PATCH 287/325] Add annotation giving information since when a potion effect type exists natively in the game --- .../core/entity/util/potion/MinecraftPotion.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/MinecraftPotion.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/MinecraftPotion.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/MinecraftPotion.java new file mode 100644 index 00000000..7034618b --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/MinecraftPotion.java @@ -0,0 +1,16 @@ +package de.pxav.kelp.core.entity.util.potion; + +import de.pxav.kelp.core.version.KelpVersion; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface MinecraftPotion { + + KelpVersion since(); + +} From 88719d5b59986ac506b0cd816c5c4fb716118f9d Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 11:17:48 +0200 Subject: [PATCH 288/325] Apply new potion annotation to AbsorptionPotionEffect and fix its rating --- .../potion/minecraft/AbsorptionPotionEffect.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/AbsorptionPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/AbsorptionPotionEffect.java index 813b1679..5d1281d3 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/AbsorptionPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/AbsorptionPotionEffect.java @@ -1,9 +1,10 @@ package de.pxav.kelp.core.entity.util.potion.minecraft; -import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; import de.pxav.kelp.core.inventory.metadata.Color; import de.pxav.kelp.core.version.KelpVersion; -import org.bukkit.potion.PotionEffectType; /** * Represents the absorption potion effect. Absorption is a status @@ -15,7 +16,8 @@ * * @author pxav */ -public class AbsorptionPotionEffect extends KelpPotionEffect { +@MinecraftPotion(since = KelpVersion.MC_1_8_0) +public class AbsorptionPotionEffect extends KelpPotionEffectType { @Override public String getName() { @@ -59,4 +61,9 @@ public int getHeartsForLevel(int level) { return level * 2; } + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + } From be7167e736ea27d64b29670ceec7acf5abe382a3 Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 11:18:31 +0200 Subject: [PATCH 289/325] Custom potion effect implementations are now mapped correctly with the template class of the core --- .../inject/VersionBinderModule.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/application/inject/VersionBinderModule.java b/core/src/main/java/de/pxav/kelp/core/application/inject/VersionBinderModule.java index 366701eb..9aafa68f 100644 --- a/core/src/main/java/de/pxav/kelp/core/application/inject/VersionBinderModule.java +++ b/core/src/main/java/de/pxav/kelp/core/application/inject/VersionBinderModule.java @@ -1,12 +1,15 @@ package de.pxav.kelp.core.application.inject; import com.google.common.base.Preconditions; +import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; +import com.google.common.collect.Multimap; import com.google.inject.AbstractModule; import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.application.KelpApplication; import de.pxav.kelp.core.application.KelpApplicationRepository; import de.pxav.kelp.core.application.KelpVersionTemplate; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; import de.pxav.kelp.core.version.KelpVersion; import de.pxav.kelp.core.version.VersionImplementation; import de.pxav.kelp.core.version.Versioned; @@ -14,6 +17,7 @@ import javassist.bytecode.AnnotationsAttribute; import javassist.bytecode.ClassFile; import javassist.bytecode.annotation.*; +import org.bukkit.Bukkit; import java.io.DataInputStream; import java.io.File; @@ -125,7 +129,9 @@ protected void configure() { * @see KelpVersionTemplate */ private Collection detectVersionTemplates(String... packages) { + KelpVersion serverVersion = KelpVersion.withBukkitVersion(Bukkit.getBukkitVersion()); Collection output = Lists.newArrayList(); + try (ScanResult scanResult = new ClassGraph() .enableAnnotationInfo() @@ -140,6 +146,27 @@ private Collection detectVersionTemplates(String... packages) { if (annotationInfo.getName().equalsIgnoreCase(KelpVersionTemplate.class.getName())) { output.add(current.loadClass()); } + + // next to normal version templates, search for potion templates that - unlike general + // version templates - don't have to be implemented in every server version. On an 1.8 + // server, the Levitation effect has to be implemented, while on an 1.14 server not. + if (annotationInfo.getName().equalsIgnoreCase(MinecraftPotion.class.getName())) { + + // the annotation only has a single parameter: The version since when it existed. + for (AnnotationParameterValue parameter : annotationInfo.getParameterValues()) { + // fetch the version since when the potion exists in the game + AnnotationEnumValue enumValue = (AnnotationEnumValue) parameter.getValue(); + KelpVersion potionVersion = KelpVersion.valueOf(enumValue.getValueName()); + + // check if the current server version is lower than the version since when the + // potion existed, because in that case it has to be implemented and therefore + // be added to the template list. + if (potionVersion.isHigherThan(serverVersion)) { + output.add(current.loadClass()); + } + } + } + } } From 1f6a56bd4353d479b746aa9872a7a6b7c7c3533b Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 11:22:51 +0200 Subject: [PATCH 290/325] Add classes representing all minecraft potion effects --- .../potion/minecraft/BadLuckPotionEffect.java | 38 +++++++++ .../potion/minecraft/BadOmenPotionEffect.java | 38 +++++++++ .../minecraft/BlindnessPotionEffect.java | 38 +++++++++ .../minecraft/ConduitPowerPotionEffect.java | 38 +++++++++ .../minecraft/DolphinsGracePotionEffect.java | 38 +++++++++ .../minecraft/FireResistancePotionEffect.java | 39 +++++++++ .../potion/minecraft/GlowingPotionEffect.java | 41 ++++++++++ .../potion/minecraft/HastePotionEffect.java | 39 +++++++++ .../minecraft/HealthBoostPotionEffect.java | 39 +++++++++ .../HeroOfTheVillagePotionEffect.java | 52 ++++++++++++ .../potion/minecraft/HungerPotionEffect.java | 40 +++++++++ .../minecraft/InstantDamagePotionEffect.java | 70 ++++++++++++++++ .../minecraft/InstantHealPotionEffect.java | 73 +++++++++++++++++ .../minecraft/InvisibilityPotionEffect.java | 45 +++++++++++ .../minecraft/JumpBoostPotionEffect.java | 49 +++++++++++ .../potion/minecraft/LevitationEffect.java | 32 ++++++++ .../potion/minecraft/LuckPotionEffect.java | 38 +++++++++ .../minecraft/MiningFatiguePotionEffect.java | 51 ++++++++++++ .../potion/minecraft/NauseaPotionEffect.java | 38 +++++++++ .../minecraft/NightVisionPotionEffect.java | 36 +++++++++ .../potion/minecraft/PoisonPotionEffect.java | 36 +++++++++ .../minecraft/RegenerationPotionEffect.java | 81 +++++++++++++++++++ .../minecraft/ResistancePotionEffect.java | 38 +++++++++ .../minecraft/SaturationPotionEffect.java | 38 +++++++++ .../minecraft/SlowFallingPotionEffect.java | 41 ++++++++++ .../minecraft/SlownessPotionEffect.java | 52 ++++++++++++ .../potion/minecraft/SpeedPotionEffect.java | 52 ++++++++++++ .../minecraft/StrengthPotionEffect.java | 63 +++++++++++++++ .../minecraft/WaterBreathingPotionEffect.java | 34 ++++++++ .../minecraft/WeaknessPotionEffect.java | 46 +++++++++++ .../potion/minecraft/WitherPotionEffect.java | 37 +++++++++ 31 files changed, 1390 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BadLuckPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BadOmenPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BlindnessPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/ConduitPowerPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/DolphinsGracePotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/FireResistancePotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/GlowingPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HastePotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HealthBoostPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HeroOfTheVillagePotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HungerPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InstantDamagePotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InstantHealPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InvisibilityPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/JumpBoostPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/LevitationEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/LuckPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/MiningFatiguePotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/NauseaPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/NightVisionPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/PoisonPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/RegenerationPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/ResistancePotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SaturationPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SlowFallingPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SlownessPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SpeedPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/StrengthPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WaterBreathingPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WeaknessPotionEffect.java create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WitherPotionEffect.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BadLuckPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BadLuckPotionEffect.java new file mode 100644 index 00000000..5eb9f7fb --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BadLuckPotionEffect.java @@ -0,0 +1,38 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; + +/** + * Bad Luck, also known as Unluck, is a status effect that decreases + * the chance of the player getting high-quality loot, contrary to Luck. + * + * @author pxav + */ +@MinecraftPotion(since = KelpVersion.MC_1_9_0) +public class BadLuckPotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Bad Luck"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("C0A44D"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.NEGATIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BadOmenPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BadOmenPotionEffect.java new file mode 100644 index 00000000..aaba23a9 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BadOmenPotionEffect.java @@ -0,0 +1,38 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; + +/** + * Bad Omen is a status effect that causes a raid to appear + * when an afflicted player enters a village. + * + * @author pxav + */ +@MinecraftPotion(since = KelpVersion.MC_1_14_0) +public class BadOmenPotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Bad Omen"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("0b6138"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.MIXED; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BlindnessPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BlindnessPotionEffect.java new file mode 100644 index 00000000..7e2e4d80 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BlindnessPotionEffect.java @@ -0,0 +1,38 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.inventory.metadata.Color; + +/** + * Blindness impairs the player's vision as if a thick black fog were surrounding them, + * with only the immediate area being visible (this means that only a few blocks directly + * around the player are visible to them). + * The effect also prevents the player from sprinting or inflicting critical hits. + * If combined with Night Vision, the screen appears completely black aside from the sun and moon. + * + * @author pxav + */ +public class BlindnessPotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Blindness"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("1F1F23"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.NEGATIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/ConduitPowerPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/ConduitPowerPotionEffect.java new file mode 100644 index 00000000..d9278261 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/ConduitPowerPotionEffect.java @@ -0,0 +1,38 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; + +/** + * Conduit Power is an area-of-effect status effect given by conduits that + * combines Water Breathing, Night Vision (only underwater), and Haste (only underwater). + * + * @author pxav + */ +@MinecraftPotion(since = KelpVersion.MC_1_13_0) +public class ConduitPowerPotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Conduit Power"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("1DC2D1"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/DolphinsGracePotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/DolphinsGracePotionEffect.java new file mode 100644 index 00000000..d178cd28 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/DolphinsGracePotionEffect.java @@ -0,0 +1,38 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; + +/** + * Dolphin's Grace is a status effect that increases the player's swimming + * speed when a dolphin is nearby and following the player. + * + * @author pxav + */ +@MinecraftPotion(since = KelpVersion.MC_1_13_0) +public class DolphinsGracePotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Dolphin's Grace"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("88A3BE"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/FireResistancePotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/FireResistancePotionEffect.java new file mode 100644 index 00000000..87ac41ae --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/FireResistancePotionEffect.java @@ -0,0 +1,39 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.inventory.metadata.Color; + +/** + * Grants immunity to damage from fire, blaze fireballs, fire charges, + * magma blocks, and lava, but not ghast fireballs and blaze touch attacks. + * Negates the fire damage from bows enchanted with Flame and swords enchanted + * with Fire Aspect, but does not affect the attacks themselves. + * The fog effect under lava is also mitigated somewhat. + * Players also see better under lava when they have the Fire Resistance effect. + * + * @author pxav + */ +public class FireResistancePotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Fire Resistance"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("E49A3A"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/GlowingPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/GlowingPotionEffect.java new file mode 100644 index 00000000..50d08397 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/GlowingPotionEffect.java @@ -0,0 +1,41 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; + +/** + * The Glowing effect causes entities to glow with an outline that can be seen through blocks and entities. + * This outline is white by default, but can be set to display other colors if the entity is part of a team. + * The outline displays around any holes in a mob's texture or model, though only when that part of the model + * can be seen all the way through. If multiple entities with glowing are near each other, + * the outlines merge to prevent overlapping. + * + * @author pxav + */ +@MinecraftPotion(since = KelpVersion.MC_1_9_0) +public class GlowingPotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Glowing"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("94A061"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.MIXED; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HastePotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HastePotionEffect.java new file mode 100644 index 00000000..134efc6e --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HastePotionEffect.java @@ -0,0 +1,39 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; + +/** + * Haste is a status effect that increases attack speed by 10% per level and + * increases mining speed by 20% per level. Negative levels decrease mining and attack speed, + * similar to Mining Fatigue. However, the attack speed increases are purely visual. + * + * @author pxav + */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) +public class HastePotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Haste"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("D9C043"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HealthBoostPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HealthBoostPotionEffect.java new file mode 100644 index 00000000..4e07d5d0 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HealthBoostPotionEffect.java @@ -0,0 +1,39 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.inventory.metadata.Color; + +/** + * Health Boost is a status effect that increases a player's (or mob's) maximum health. + * Adds 4 health points maximum health per level. Unlike Absorption, the added hearts are + * empty at first, but can be healed through the usual methods + * such as natural regeneration and the Regeneration and Instant Health effects). + * + * When the effect ends, any extra health is lost. + * + * @author pxav + */ +public class HealthBoostPotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Health Boost"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("F87D23"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HeroOfTheVillagePotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HeroOfTheVillagePotionEffect.java new file mode 100644 index 00000000..0256ede8 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HeroOfTheVillagePotionEffect.java @@ -0,0 +1,52 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; + +/** + * Players receive gifts and discounts from villager trades while under the effect. + * + * Level I Hero of the Village decreases the cost of the first item in a trade by 30%; + * each additional level decreases the price by an additional 6.25%. + * + * Hero of the Village XII gives a discount of 98.75%, decreasing all prices to 1. + * No matter how large the discount is, the final item count in the trade is + * always at least one, never zero. In other cases, the decrement is the discount + * ratio multiplied by the original count rounded down or rounded up if the decrement + * is less than 1. + * + * Example: Level III would give a 42.5% discount. For trade with 14 emeralds as the cost, + * the discount would be 5 emeralds (rounded down from 5.95 emeralds), for a final price of 9 emeralds. + * + * The formula can be written as: + * {@code Discounted price = Initial price - max[1, Initial Price × (.0625 × (Level - 1) + 0.3)]} + * + * @author pxav + */ +@MinecraftPotion(since = KelpVersion.MC_1_14_0) +public class HeroOfTheVillagePotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Hero of the Village"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("44FF44"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HungerPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HungerPotionEffect.java new file mode 100644 index 00000000..2a619be9 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HungerPotionEffect.java @@ -0,0 +1,40 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.inventory.metadata.Color; + +/** + * Hunger increases food exhaustion by {@code 0.005 * level} per game tick + * (removes 1 food saturation point every {@code 40 / level seconds}). + * It also turns the hunger bar a yellow-greenish color. + * Negative levels decrease food exhaustion, although they do not increase saturation or the hunger bar. + * + * The status effect does not decrease hunger level on Peaceful mode, + * although it does re-color the hunger bar. + * + * @author pxav + */ +public class HungerPotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Hunger"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("587653"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.NEGATIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InstantDamagePotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InstantDamagePotionEffect.java new file mode 100644 index 00000000..4e66f4f6 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InstantDamagePotionEffect.java @@ -0,0 +1,70 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.common.MathUtils; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.LivingKelpEntity; +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.inventory.metadata.Color; + +/** + * Instant Damage is an instant status effect that decreases health for living mobs and heals the undead. + * Instant Damage inflicts magic damage of {@code 3HP * 2^level}. Undead mobs (including the wither) + * are healed as if with Instant Health instead. + * When applied using a lingering potion, damage is inflicted every second. + * As this is magic damage, it can be decreased only via Resistance and Protection. + * + * An Instant Damage IV potion is powerful enough to kill a player instantly. + * + * @author pxav + */ +public class InstantDamagePotionEffect extends KelpPotionEffectType { + + /** + * Calculates the health loss made for an entity at the given effect level. + * If the entity is an undead, a negative number will be returned as those + * entities actually gain health from this effect. For the calculation of this + * number the negative value of {} + * + * @param entity The entity to calculate the damage for. + * @param level The level with which the effect is applied. + * @return The total amount of damage made to the entity in health points. + */ + public static double getHealthLoss(LivingKelpEntity entity, int level) { + // witches are 85% immune against instant damage + if (entity.getType() == KelpEntityType.WITCH) { + if (MathUtils.perCentChance(0.85)) { + return 0; + } + } + + double healthLoss = 3 * Math.pow(2, level); + + if (entity.getType().isUndead()) { + return -healthLoss; + } + + return healthLoss; + } + + @Override + public String getName() { + return "Damage"; + } + + @Override + public boolean isInstant() { + return true; + } + + @Override + public Color getColor() { + return Color.fromHEX("430A09"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.NEGATIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InstantHealPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InstantHealPotionEffect.java new file mode 100644 index 00000000..e7fc358a --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InstantHealPotionEffect.java @@ -0,0 +1,73 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.LivingKelpEntity; +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; + +/** + * Instant Health is an instant status effect that increases health + * for living mobs and damages the undead. + * Instantly heals {@code 2HP * 2^level}. + * + * Undead mobs (including the wither) are damaged as if with Instant Damage, instead. + * When applied using a lingering potion, the entity is healed every second. + * Levels 30–32 provide no healing. Levels outside the range 1–32 + * are used modulo 32, making level 33 the same as level 1, etc. + * + * Ender dragons are completely immune to this effect. + * + * @author pxav + */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) +public class InstantHealPotionEffect extends KelpPotionEffectType { + + /** + * Calculates the health gain made for an entity at the given effect level. + * If the entity is an undead, a negative number will be returned as those + * entities actually lose health from this effect. + * + * @param entity The entity to calculate the health gain for. + * @param level The level with which the effect is applied. + * @return The total amount of health gain made to the entity in health points. + */ + public static double getHealthGain(LivingKelpEntity entity, int level) { + if (level == 30 || level == 31 || level == 32) { + return 0; + } + if (level > 32) { + level = level % 32; + } + + double healthGain = 2 * Math.pow(2, level); + + if (entity.getType().isUndead()) { + return -healthGain; + } + + return healthGain; + } + + @Override + public String getName() { + return "Healing"; + } + + @Override + public boolean isInstant() { + return true; + } + + @Override + public Color getColor() { + return Color.fromHEX("F82423"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InvisibilityPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InvisibilityPotionEffect.java new file mode 100644 index 00000000..719b047c --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InvisibilityPotionEffect.java @@ -0,0 +1,45 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.player.KelpPlayer; + +/** + * Invisibility is a status effect that turns entities invisible. + * Applying higher levels does not make a difference, however the duration + * can be extended when applied as an {@link KelpPotionEffect effect}. + * + * Please note that this effect may not cause complete invisibility as + * only the entity itself is hidden. Particle effects (e. g. from a potion), + * armor or arrows are still visible for other players. To completely hide + * a player, use {@link de.pxav.kelp.core.player.KelpPlayer#hidePlayer(KelpPlayer)} + * or {@link KelpEntity#remove()} for entities. + * + * @author pxav + */ +public class InvisibilityPotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Invisibility"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("7F8392"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/JumpBoostPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/JumpBoostPotionEffect.java new file mode 100644 index 00000000..4f3f1d55 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/JumpBoostPotionEffect.java @@ -0,0 +1,49 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.inventory.metadata.Color; + +/** + * Jump Boost is a status effect that temporarily increases the jump height of the player. + * + * Jump Boost allows the player to jump higher than the normal 1.25 blocks. + * Each level adds 50% to the jump height. It also reduces fall damage by 2 health points each level. + * If the level is high enough, fall damage can be avoided completely. + * + * @author pxav + */ +public class JumpBoostPotionEffect extends KelpPotionEffectType { + + /** + * Calculates the amount of blocks a player can jump along the Y axis + * with the given level of jump boost applied. + * + * @param level The jump boost level to calculate the height for. + * @return The jump height of a player with the given jump boost level. + */ + public static double getJumpHeight(int level) { + return 1.25 * Math.pow(1.5, level); + } + + @Override + public String getName() { + return "Jump Boost"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("22FF4C"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/LevitationEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/LevitationEffect.java new file mode 100644 index 00000000..e0dd3087 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/LevitationEffect.java @@ -0,0 +1,32 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; + +@MinecraftPotion(since = KelpVersion.MC_1_9_0) +public class LevitationEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Levitation"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("CEFFFF"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.NEGATIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/LuckPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/LuckPotionEffect.java new file mode 100644 index 00000000..82c336a7 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/LuckPotionEffect.java @@ -0,0 +1,38 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; + +/** + * Luck is a status effect that makes it more likely to receive better + * loot from certain loot tables in generated structures. + * + * @author pxav + */ +@MinecraftPotion(since = KelpVersion.MC_1_9_0) +public class LuckPotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Luck"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("339900"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/MiningFatiguePotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/MiningFatiguePotionEffect.java new file mode 100644 index 00000000..19b94f9b --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/MiningFatiguePotionEffect.java @@ -0,0 +1,51 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; + +/** + * Mining Fatigue reduces mining and attack speed, opposite to the + * {@link HastePotionEffect Haste} effect. Unlike the Haste effect, + * this effect actually reduces the attack speed and not only its animation. + * + * @author pxav + */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) +public class MiningFatiguePotionEffect extends KelpPotionEffectType { + + /** + * Gets the attack speed in per cent of the player's original attack speed. + * The normal attack speed is 100% ({@code 1}), therefore {@code 0.7} would be + * a {@code 30%} decrease in attack speed. + * + * @param level The level this effect is applied with. + * @return The attack speed modifier of the player based on the given effect level. + */ + public static double getAttackSpeedModifier(int level) { + return 1 - (0.1 * level); + } + + @Override + public String getName() { + return "Mining Fatigue"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("4A4217"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.NEGATIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/NauseaPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/NauseaPotionEffect.java new file mode 100644 index 00000000..9036c131 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/NauseaPotionEffect.java @@ -0,0 +1,38 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.inventory.metadata.Color; + +/** + * Nausea causes the player's vision to warp and wobble, with the distortion ramping + * up and down at the start and end of the effect. Although Nausea can be given in the + * normal range of levels, the level has no impact - it does not increase the distortion. + * + * The intensity of this effect can be configured in the client's video settings. + * + * @author pxav + */ +public class NauseaPotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Nausea"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("551D4A"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.NEGATIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/NightVisionPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/NightVisionPotionEffect.java new file mode 100644 index 00000000..92f330cd --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/NightVisionPotionEffect.java @@ -0,0 +1,36 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.inventory.metadata.Color; + +/** + * Night vision greatly increases the brightness, so the player can easily see in a light level of 0. + * But this effect is not strong enough to look the same as light level 15. That's why the player + * can still visually distinguish between light levels when this effect is applied. + * + * @author pxav + */ +public class NightVisionPotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Night Vision"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("1F1FA1"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/PoisonPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/PoisonPotionEffect.java new file mode 100644 index 00000000..7afeb2fa --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/PoisonPotionEffect.java @@ -0,0 +1,36 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.inventory.metadata.Color; + +/** + * Poison inflicts damage over time, reducing the player's health to 1 HP, but cannot kill. + * The health bar of a player is colored yellow while this effect is applied. + * The speed with which health is lost, depends on the effect level. + * + * @author pxav + */ +public class PoisonPotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Poison"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("4E9331"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.NEGATIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/RegenerationPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/RegenerationPotionEffect.java new file mode 100644 index 00000000..e7ceeac0 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/RegenerationPotionEffect.java @@ -0,0 +1,81 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; + +/** + * Regeneration is a status effect that restores a player's (or mob's) health over time. + * + * @author pxav + */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) +public class RegenerationPotionEffect extends KelpPotionEffectType { + + /** + * Get the amounts of hearts that are regenerated every second based on the + * level of the effect. + * + * If you want to get the health points per second, simply multiply the result + * of this method by 2. + * + * If the level is invalid - so if it is negative for example, + * {@code -1} will be returned. + * + * Amplifiers outside the range 0–31 (corresponding to levels 1–32) are used modulo 32, + * making level 33 the same as level 1, etc. + * + * @param level The level to get the regenerated hearts for. + * @return The amount of regenerated hearts based on the given level. {@code -1} if the level is invalid. + */ + public static double getHeartsPerSecond(int level) { + if (level < 1) { + return -1; + } + + // if level limitation of 32 is reached, + // use numbers as modulo + if (level > 32) { + level = level % 32; + } + + if (level == 1) { + return 0.2d; + } else if (level == 2) { + return 0.4d; + } else if (level == 3) { + return 0.835d; + } else if (level == 4) { + return 1.665d; + } else if (level == 5) { + return 3.335d; + + // level six and higher + } else { + return 10d; + } + } + + @Override + public String getName() { + return "Regeneration"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("CD5CAB"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/ResistancePotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/ResistancePotionEffect.java new file mode 100644 index 00000000..e495599d --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/ResistancePotionEffect.java @@ -0,0 +1,38 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.inventory.metadata.Color; + +/** + * Resistance reduces incoming damage from all sources except starvation, + * the void, and {@code /kill} by {@code 20% * level}. + * + * Level 5 gives the player full immunity to all damage, while the exceptions + * from above persist. + * + * @author pxav + */ +public class ResistancePotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Resistance"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("99453A"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SaturationPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SaturationPotionEffect.java new file mode 100644 index 00000000..50c3012e --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SaturationPotionEffect.java @@ -0,0 +1,38 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.inventory.metadata.Color; + +/** + * Saturation is an instant status effect that reduces the need for eating. + * It also prevents death by hunger if the player has no food. + * + * The effect instantly replenishes {@code 1FP * level} and {@code 2FP * level} + * points of saturation. + * + * @author pxav + */ +public class SaturationPotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Saturation"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("F82421"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SlowFallingPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SlowFallingPotionEffect.java new file mode 100644 index 00000000..45421f9f --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SlowFallingPotionEffect.java @@ -0,0 +1,41 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; + +/** + * The affected entity falls at a much slower rate than normal, and is immune to fall damage. + * However, the entity still takes damage from using an ender pearl. + * In addition, the entity cannot turn farmland into dirt by jumping on it. + * + * Higher levels do not have an impact on this effect. + * + * @author pxav + */ +@MinecraftPotion(since = KelpVersion.MC_1_13_0) +public class SlowFallingPotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Slow Falling"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("F7F8E0"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SlownessPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SlownessPotionEffect.java new file mode 100644 index 00000000..30dd18e9 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SlownessPotionEffect.java @@ -0,0 +1,52 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.npc.MovementSpeed; +import de.pxav.kelp.core.version.KelpVersion; + +/** + * Slowness decreases walking speed by {@code 15% * level} and contracts the player's field of view accordingly. + * Negative levels of Slowness increase walking speed. However, sprinting and jumping is barely affected, + * unlike with the {@link SpeedPotionEffect}. + * + * @author pxav + */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) +public class SlownessPotionEffect extends KelpPotionEffectType { + + /** + * Gets the blocks per second a player can walk with the given + * level of slowness applied. + * + * @param level The level to get the walking speed for. + * @return The amount of blocks a player can walk each second with the given level of slowness applied. + */ + public static double getBlocksPerSecond(MovementSpeed movementSpeed, int level) { + // TODO: Add MovementSpeed.JUMPING! + return movementSpeed.getBlocksPerSecond() * 1.15 * level; + } + + @Override + public String getName() { + return "Slowness"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("5A6C81"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.NEGATIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SpeedPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SpeedPotionEffect.java new file mode 100644 index 00000000..640bef15 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SpeedPotionEffect.java @@ -0,0 +1,52 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.npc.MovementSpeed; +import de.pxav.kelp.core.version.KelpVersion; + +/** + * Speed is a status effect that increases an entity's walking speed by 20% multiplied by the effect level. + * It expands a player's field of view (FOV) accordingly. Negative levels decrease speed. + * Jumping and falling are also affected by this effect, although not every server can handle the + * jump speed coming with higher effect levels. + * + * @author pxav + */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) +public class SpeedPotionEffect extends KelpPotionEffectType { + + /** + * Gets the blocks per second a player can walk with the given + * level of speed applied. + * + * @param level The level to get the walking speed for. + * @return The amount of blocks a player can walk each second with the given level of speed applied. + */ + public static double getBlocksPerSecond(MovementSpeed movementSpeed, int level) { + return movementSpeed.getBlocksPerSecond() * 1.2 * level; + } + + @Override + public String getName() { + return "Speed"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("7CAFC6"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/StrengthPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/StrengthPotionEffect.java new file mode 100644 index 00000000..292372c9 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/StrengthPotionEffect.java @@ -0,0 +1,63 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; + +/** + * Strength is an effect which increases attack power. + * + * Increases melee damage by {@code 3HP × level}. + * Negative levels decrease melee damage, with attacks being ignored entirely + * if damage would be 0 or lower. + * + * @author pxav + */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) +public class StrengthPotionEffect extends KelpPotionEffectType { + + /** + * Calculates the increased/decreased total attack damage made by the given + * effect level and the original attack damage. + * + * @param originalAttackDamage The original attack damage in health points + * ({@code heart amount * 2}). + * @param level The level of the potion effect. + * @return The amount of damage made with the given effect level and + * original attack damage in health points. + */ + public static double getDamageIncrease(double originalAttackDamage, int level) { + if (level == 0) { + return originalAttackDamage; + } + double attackDamage = originalAttackDamage + (3 * level); + return attackDamage > 0 ? attackDamage : 0; + } + + // Todo: getDamageIncrease() method, where you can pass a KelpItem + // Todo: Kelp then automatically checks the material and enchantments to + // Todo: determine the original attack damage + + @Override + public String getName() { + return "Strength"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("932423"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WaterBreathingPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WaterBreathingPotionEffect.java new file mode 100644 index 00000000..8f55364e --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WaterBreathingPotionEffect.java @@ -0,0 +1,34 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.inventory.metadata.Color; + +/** + * Water breathing is a status effect that prevents or delays drowning. + * + * @author pxav + */ +public class WaterBreathingPotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Water Breathing"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("2E5299"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.POSITIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WeaknessPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WeaknessPotionEffect.java new file mode 100644 index 00000000..004b9c7c --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WeaknessPotionEffect.java @@ -0,0 +1,46 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.inventory.metadata.Color; + +/** + * Melee damage inflicted by the affected entity is reduced by {@code 4HP * level}. + * Negative levels increase melee damage dealt. + * + * @author pxav + */ +public class WeaknessPotionEffect extends KelpPotionEffectType { + + /** + * Calculates how much damage in health points is lost based + * on the given level of the effect. + * + * @param level The level of the weakness effect. + * @return The amount of damage the melee attack is reduced by. + */ + public static double getDamageLoss(int level) { + return 4 * level; + } + + @Override + public String getName() { + return "Weakness"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("484D48"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.NEGATIVE; + } + +} diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WitherPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WitherPotionEffect.java new file mode 100644 index 00000000..13dcbcb3 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WitherPotionEffect.java @@ -0,0 +1,37 @@ +package de.pxav.kelp.core.entity.util.potion.minecraft; + +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.inventory.metadata.Color; + +/** + * Wither is a status effect that inflicts damage over time. + * Unlike Poison, it can affect undead mobs, and can kill. + * It is usually difficult for the player to see how much health they have left, + * as it turns the player's health bar black. + * + * @author pxav + */ +public class WitherPotionEffect extends KelpPotionEffectType { + + @Override + public String getName() { + return "Wither"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("352A27"); + } + + @Override + public KelpEffectRating getRating() { + return KelpEffectRating.NEGATIVE; + } + +} From 274d1bedf6c06856f512e1ea571257414e1a0616 Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 11:35:53 +0200 Subject: [PATCH 291/325] Add other potion effects to PotionEffects constant class --- .../entity/util/potion/PotionEffects.java | 35 ++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionEffects.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionEffects.java index f87b5d06..6332a6c4 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionEffects.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionEffects.java @@ -3,9 +3,7 @@ import com.google.common.collect.Lists; import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.KelpServer; -import de.pxav.kelp.core.entity.util.potion.minecraft.AbsorptionPotionEffect; -import de.pxav.kelp.core.entity.util.potion.minecraft.HastePotionEffect; -import de.pxav.kelp.core.entity.util.potion.minecraft.LevitationEffect; +import de.pxav.kelp.core.entity.util.potion.minecraft.*; import de.pxav.kelp.core.version.KelpVersion; import java.util.Collections; @@ -26,8 +24,37 @@ public abstract class PotionEffects { // default minecraft potion types. public static final KelpPotionEffectType ABSORPTION = KelpPlugin.getInjector().getInstance(AbsorptionPotionEffect.class); - public static final KelpPotionEffectType LEVITATION = KelpPlugin.getInjector().getInstance(LevitationEffect.class); + public static final KelpPotionEffectType BAD_LUCK = KelpPlugin.getInjector().getInstance(BadLuckPotionEffect.class); + public static final KelpPotionEffectType BAD_OMEN = KelpPlugin.getInjector().getInstance(BadOmenPotionEffect.class); + public static final KelpPotionEffectType BLINDNESS = KelpPlugin.getInjector().getInstance(BlindnessPotionEffect.class); + public static final KelpPotionEffectType CONDUIT_POWER = KelpPlugin.getInjector().getInstance(ConduitPowerPotionEffect.class); + public static final KelpPotionEffectType DOLPHINS_GRACE = KelpPlugin.getInjector().getInstance(DolphinsGracePotionEffect.class); + public static final KelpPotionEffectType FIRE_RESISTANCE = KelpPlugin.getInjector().getInstance(FireResistancePotionEffect.class); + public static final KelpPotionEffectType GLOWING = KelpPlugin.getInjector().getInstance(GlowingPotionEffect.class); public static final KelpPotionEffectType HASTE = KelpPlugin.getInjector().getInstance(HastePotionEffect.class); + public static final KelpPotionEffectType HEALTH_BOOST = KelpPlugin.getInjector().getInstance(HealthBoostPotionEffect.class); + public static final KelpPotionEffectType HERO_OF_THE_VILLAGE = KelpPlugin.getInjector().getInstance(HeroOfTheVillagePotionEffect.class); + public static final KelpPotionEffectType HUNGER = KelpPlugin.getInjector().getInstance(HungerPotionEffect.class); + public static final KelpPotionEffectType INSTANT_DAMAGE = KelpPlugin.getInjector().getInstance(InstantDamagePotionEffect.class); + public static final KelpPotionEffectType INSTANT_HEAL = KelpPlugin.getInjector().getInstance(InstantHealPotionEffect.class); + public static final KelpPotionEffectType INVISIBILITY = KelpPlugin.getInjector().getInstance(InvisibilityPotionEffect.class); + public static final KelpPotionEffectType JUMP_BOOST = KelpPlugin.getInjector().getInstance(JumpBoostPotionEffect.class); + public static final KelpPotionEffectType LEVITATION = KelpPlugin.getInjector().getInstance(LevitationEffect.class); + public static final KelpPotionEffectType LUCK = KelpPlugin.getInjector().getInstance(LuckPotionEffect.class); + public static final KelpPotionEffectType MINING_FATIGUE = KelpPlugin.getInjector().getInstance(MiningFatiguePotionEffect.class); + public static final KelpPotionEffectType NAUSEA = KelpPlugin.getInjector().getInstance(NauseaPotionEffect.class); + public static final KelpPotionEffectType NIGHT_VISION = KelpPlugin.getInjector().getInstance(NightVisionPotionEffect.class); + public static final KelpPotionEffectType POISON = KelpPlugin.getInjector().getInstance(PoisonPotionEffect.class); + public static final KelpPotionEffectType REGENERATION = KelpPlugin.getInjector().getInstance(RegenerationPotionEffect.class); + public static final KelpPotionEffectType RESISTANCE = KelpPlugin.getInjector().getInstance(ResistancePotionEffect.class); + public static final KelpPotionEffectType SATURATION = KelpPlugin.getInjector().getInstance(SaturationPotionEffect.class); + public static final KelpPotionEffectType SLOW_FALLING = KelpPlugin.getInjector().getInstance(SlowFallingPotionEffect.class); + public static final KelpPotionEffectType SLOWNESS = KelpPlugin.getInjector().getInstance(SlownessPotionEffect.class); + public static final KelpPotionEffectType SPEED = KelpPlugin.getInjector().getInstance(SpeedPotionEffect.class); + public static final KelpPotionEffectType STRENGTH = KelpPlugin.getInjector().getInstance(StrengthPotionEffect.class); + public static final KelpPotionEffectType WATER_BREATHING = KelpPlugin.getInjector().getInstance(WaterBreathingPotionEffect.class); + public static final KelpPotionEffectType WEAKNESS = KelpPlugin.getInjector().getInstance(WeaknessPotionEffect.class); + public static final KelpPotionEffectType WITHER = KelpPlugin.getInjector().getInstance(WitherPotionEffect.class); /** * Picks a random potion effect type from all existing ones From c45e07d5c2a02a7b47898dcbbbeb0d0b183cc45b Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 11:36:18 +0200 Subject: [PATCH 292/325] Map existing potion effect types in VersionedPotion with bukkit types --- .../entity/potion/VersionedPotion.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/potion/VersionedPotion.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/potion/VersionedPotion.java index bb7de8a7..e232b5b0 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/potion/VersionedPotion.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/potion/VersionedPotion.java @@ -63,8 +63,37 @@ private BiMap getPotionMappings() { BiMap output = HashBiMap.create(); output.put(PotionEffects.ABSORPTION, PotionEffectType.ABSORPTION.getName().toLowerCase()); + output.put(PotionEffects.BLINDNESS, PotionEffectType.BLINDNESS.getName().toLowerCase()); + output.put(PotionEffects.FIRE_RESISTANCE, PotionEffectType.FIRE_RESISTANCE.getName().toLowerCase()); output.put(PotionEffects.HASTE, PotionEffectType.FAST_DIGGING.getName().toLowerCase()); + output.put(PotionEffects.HEALTH_BOOST, PotionEffectType.HEALTH_BOOST.getName().toLowerCase()); + output.put(PotionEffects.HUNGER, PotionEffectType.HUNGER.getName().toLowerCase()); + output.put(PotionEffects.INSTANT_DAMAGE, PotionEffectType.HARM.getName().toLowerCase()); + output.put(PotionEffects.INSTANT_HEAL, PotionEffectType.HEAL.getName().toLowerCase()); + output.put(PotionEffects.INVISIBILITY, PotionEffectType.INVISIBILITY.getName().toLowerCase()); + output.put(PotionEffects.JUMP_BOOST, PotionEffectType.JUMP.getName().toLowerCase()); + output.put(PotionEffects.MINING_FATIGUE, PotionEffectType.SLOW_DIGGING.getName().toLowerCase()); + output.put(PotionEffects.NAUSEA, PotionEffectType.CONFUSION.getName().toLowerCase()); + output.put(PotionEffects.NIGHT_VISION, PotionEffectType.NIGHT_VISION.getName().toLowerCase()); + output.put(PotionEffects.POISON, PotionEffectType.POISON.getName().toLowerCase()); + output.put(PotionEffects.REGENERATION, PotionEffectType.REGENERATION.getName().toLowerCase()); + output.put(PotionEffects.RESISTANCE, PotionEffectType.DAMAGE_RESISTANCE.getName().toLowerCase()); + output.put(PotionEffects.SATURATION, PotionEffectType.SATURATION.getName().toLowerCase()); + output.put(PotionEffects.SLOWNESS, PotionEffectType.SLOW.getName().toLowerCase()); + output.put(PotionEffects.SPEED, PotionEffectType.SPEED.getName().toLowerCase()); + output.put(PotionEffects.STRENGTH, PotionEffectType.INCREASE_DAMAGE.getName().toLowerCase()); + output.put(PotionEffects.WATER_BREATHING, PotionEffectType.WATER_BREATHING.getName().toLowerCase()); + output.put(PotionEffects.WEAKNESS, PotionEffectType.WEAKNESS.getName().toLowerCase()); + output.put(PotionEffects.WITHER, PotionEffectType.WITHER.getName().toLowerCase()); + output.put(PotionEffects.BAD_LUCK, "IMPL_BAD_LUCK"); + output.put(PotionEffects.BAD_OMEN, "IMPL_BAD_OMEN"); + output.put(PotionEffects.CONDUIT_POWER, "IMPL_CONDUIT_POWER"); + output.put(PotionEffects.HERO_OF_THE_VILLAGE, "IMPL_HERO_OF_THE_VILLAGE"); + output.put(PotionEffects.DOLPHINS_GRACE, "IMPL_DOLPHINS_GRACE"); + output.put(PotionEffects.GLOWING, "IMPL_GLOWING"); + output.put(PotionEffects.LUCK, "IMPL_LUCK"); + output.put(PotionEffects.SLOW_FALLING, "IMPL_SLOW_FALLING"); output.put(PotionEffects.LEVITATION, "IMPL_LEVITATION"); return output; From 85d12f7665b8bea1a4f3b45181ebf3c20e0a8f0d Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 11:38:24 +0200 Subject: [PATCH 293/325] Adjust custom implementation of potion effect types - change player parameters to living entity parameters - add onRemove() method called when the effect is removed by a plugin or milk --- .../util/potion/KelpPotionEffectType.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java index eb11b763..98305d74 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java @@ -1,9 +1,8 @@ package de.pxav.kelp.core.entity.util.potion; import de.pxav.kelp.core.KelpServer; -import de.pxav.kelp.core.entity.util.potion.minecraft.*; +import de.pxav.kelp.core.entity.LivingKelpEntity; import de.pxav.kelp.core.inventory.metadata.Color; -import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.version.KelpVersion; import org.apache.commons.lang.builder.HashCodeBuilder; @@ -59,11 +58,25 @@ public abstract class KelpPotionEffectType { /** * If custom potion effects are ever added to minecraft, this method can be used to - * define what should happen with a player when the effect is applied to them. + * define what should happen with an entity when the effect is applied to them. * - * @param player The player who consumed the potion effect and to whom the effects should be applied. + * @param entity The entity who consumed the potion effect and to whom the effects should be applied. + * @param effectInfo Other information about the effect such as the duration or level. This also includes if + * particles should be displayed. */ - public void onConsume(KelpPlayer player) {} + public void onConsume(LivingKelpEntity entity, KelpPotionEffect effectInfo) {} + + /** + * This method is triggered when the effect is removed from an entity. + * However, this only applies for effects that do not natively exist in the current + * server version and are therefore emulated by Kelp. This is therefore not triggered + * when the effect is removed via the official {@code /effect} command, but only + * when drinking milk or using the {@link LivingKelpEntity#removePotionEffect(KelpPotionEffectType)} + * method. + * + * @param entity The entity from which the effect has been removed. + */ + public void onRemove(LivingKelpEntity entity) {} /** * Checks if this effect is a default potion effect offered by minecraft/bukkit. From e20e96937943245908086e4a13672aa7659b4139 Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 11:51:28 +0200 Subject: [PATCH 294/325] Add isEmulated() method to effect types indicating if there is an emulation available for the current server version --- .../entity/util/potion/KelpPotionEffectType.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java index 98305d74..a095720d 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java @@ -4,6 +4,8 @@ import de.pxav.kelp.core.entity.LivingKelpEntity; import de.pxav.kelp.core.inventory.metadata.Color; import de.pxav.kelp.core.version.KelpVersion; +import net.minecraft.server.v1_16_R3.CriterionTriggerLevitation; +import net.minecraft.server.v1_16_R3.EntityShulkerBullet; import org.apache.commons.lang.builder.HashCodeBuilder; /** @@ -78,6 +80,20 @@ public void onConsume(LivingKelpEntity entity, KelpPotionEffect effectInfo) { */ public void onRemove(LivingKelpEntity entity) {} + /** + * Checks if this potion effect is emulated for the current server version. + * So all potions that exist natively for the current version, will return + * false. Only potions that can be emulated without modifying too much of + * the gameplay experience will return {@code true} on this. If this returns + * true, you can apply the potion effect even if it does not exist on your + * server version. + * + * @return {@code true} if the potion effect type is emulated by Kelp. + */ + public boolean isEmulated() { + return false; + } + /** * Checks if this effect is a default potion effect offered by minecraft/bukkit. * As of now, every effect will return {@code true} on this as custom potion effects From 0d120947513fb0ff98ad31744635edd6390a00cc Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 11:54:06 +0200 Subject: [PATCH 295/325] Make property methods in AbsorptionPotionEffect static --- .../minecraft/AbsorptionPotionEffect.java | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/AbsorptionPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/AbsorptionPotionEffect.java index 5d1281d3..4b729bb6 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/AbsorptionPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/AbsorptionPotionEffect.java @@ -19,26 +19,6 @@ @MinecraftPotion(since = KelpVersion.MC_1_8_0) public class AbsorptionPotionEffect extends KelpPotionEffectType { - @Override - public String getName() { - return "Absorption"; - } - - @Override - public boolean isInstant() { - return false; - } - - @Override - public Color getColor() { - return Color.fromHEX("2552A5"); - } - - @Override - public boolean isBukkitEffectUnsafe(KelpVersion version) { - return true; - } - /** * Gets the amount of extra health points (HP) for the given level. * Two health points are equal to 1 heart. @@ -46,7 +26,7 @@ public boolean isBukkitEffectUnsafe(KelpVersion version) { * @param level The absorption level to get the HP for. * @return The HP given by this level */ - public int getHealthPointsForLevel(int level) { + public static int getHealthPointsForLevel(int level) { return level * 4; } @@ -57,10 +37,30 @@ public int getHealthPointsForLevel(int level) { * @param level The level to get the amount of hearts for. * @return The hearts given by this level. */ - public int getHeartsForLevel(int level) { + public static int getHeartsForLevel(int level) { return level * 2; } + @Override + public String getName() { + return "Absorption"; + } + + @Override + public boolean isInstant() { + return false; + } + + @Override + public Color getColor() { + return Color.fromHEX("2552A5"); + } + + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + @Override public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; From 1cf89bdb9deed6f5e12fbd91cf0f963c03a7cdf1 Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 12:02:45 +0200 Subject: [PATCH 296/325] Adjust version notes and annotations for base potion classes --- .../util/potion/minecraft/BadLuckPotionEffect.java | 5 +++++ .../util/potion/minecraft/BadOmenPotionEffect.java | 5 +++++ .../util/potion/minecraft/BlindnessPotionEffect.java | 8 ++++++++ .../potion/minecraft/ConduitPowerPotionEffect.java | 5 +++++ .../potion/minecraft/DolphinsGracePotionEffect.java | 5 +++++ .../potion/minecraft/FireResistancePotionEffect.java | 8 ++++++++ .../util/potion/minecraft/GlowingPotionEffect.java | 5 +++++ .../util/potion/minecraft/HastePotionEffect.java | 5 +++++ .../util/potion/minecraft/HealthBoostPotionEffect.java | 8 ++++++++ .../potion/minecraft/HeroOfTheVillagePotionEffect.java | 5 +++++ .../util/potion/minecraft/HungerPotionEffect.java | 8 ++++++++ .../potion/minecraft/InstantDamagePotionEffect.java | 8 ++++++++ .../util/potion/minecraft/InstantHealPotionEffect.java | 5 +++++ .../potion/minecraft/InvisibilityPotionEffect.java | 8 ++++++++ .../util/potion/minecraft/JumpBoostPotionEffect.java | 8 ++++++++ .../entity/util/potion/minecraft/LevitationEffect.java | 10 ++++++++++ .../entity/util/potion/minecraft/LuckPotionEffect.java | 5 +++++ .../potion/minecraft/MiningFatiguePotionEffect.java | 5 +++++ .../util/potion/minecraft/NauseaPotionEffect.java | 8 ++++++++ .../util/potion/minecraft/NightVisionPotionEffect.java | 8 ++++++++ .../util/potion/minecraft/PoisonPotionEffect.java | 8 ++++++++ .../potion/minecraft/RegenerationPotionEffect.java | 5 +++++ .../util/potion/minecraft/ResistancePotionEffect.java | 8 ++++++++ .../util/potion/minecraft/SaturationPotionEffect.java | 8 ++++++++ .../util/potion/minecraft/SlowFallingPotionEffect.java | 5 +++++ .../util/potion/minecraft/SlownessPotionEffect.java | 5 +++++ .../util/potion/minecraft/SpeedPotionEffect.java | 5 +++++ .../util/potion/minecraft/StrengthPotionEffect.java | 5 +++++ .../potion/minecraft/WaterBreathingPotionEffect.java | 8 ++++++++ .../util/potion/minecraft/WeaknessPotionEffect.java | 8 ++++++++ .../util/potion/minecraft/WitherPotionEffect.java | 8 ++++++++ 31 files changed, 205 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BadLuckPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BadLuckPotionEffect.java index 5eb9f7fb..ea487bf4 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BadLuckPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BadLuckPotionEffect.java @@ -35,4 +35,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.NEGATIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return version.isHigherThanOrEqualTo(KelpVersion.MC_1_9_0); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BadOmenPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BadOmenPotionEffect.java index aaba23a9..ff592755 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BadOmenPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BadOmenPotionEffect.java @@ -35,4 +35,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.MIXED; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return version.isHigherThanOrEqualTo(KelpVersion.MC_1_14_0); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BlindnessPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BlindnessPotionEffect.java index 7e2e4d80..bb1367b1 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BlindnessPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/BlindnessPotionEffect.java @@ -2,7 +2,9 @@ import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; /** * Blindness impairs the player's vision as if a thick black fog were surrounding them, @@ -13,6 +15,7 @@ * * @author pxav */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) public class BlindnessPotionEffect extends KelpPotionEffectType { @Override @@ -35,4 +38,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.NEGATIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/ConduitPowerPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/ConduitPowerPotionEffect.java index d9278261..87acf2ac 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/ConduitPowerPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/ConduitPowerPotionEffect.java @@ -35,4 +35,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return version.isHigherThanOrEqualTo(KelpVersion.MC_1_13_0); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/DolphinsGracePotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/DolphinsGracePotionEffect.java index d178cd28..2f08b075 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/DolphinsGracePotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/DolphinsGracePotionEffect.java @@ -35,4 +35,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return version.isHigherThanOrEqualTo(KelpVersion.MC_1_13_0); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/FireResistancePotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/FireResistancePotionEffect.java index 87ac41ae..6262d984 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/FireResistancePotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/FireResistancePotionEffect.java @@ -2,7 +2,9 @@ import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; /** * Grants immunity to damage from fire, blaze fireballs, fire charges, @@ -14,6 +16,7 @@ * * @author pxav */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) public class FireResistancePotionEffect extends KelpPotionEffectType { @Override @@ -36,4 +39,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/GlowingPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/GlowingPotionEffect.java index 50d08397..dc69f970 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/GlowingPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/GlowingPotionEffect.java @@ -38,4 +38,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.MIXED; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return version.isHigherThanOrEqualTo(KelpVersion.MC_1_9_0); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HastePotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HastePotionEffect.java index 134efc6e..0fc428c0 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HastePotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HastePotionEffect.java @@ -36,4 +36,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HealthBoostPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HealthBoostPotionEffect.java index 4e07d5d0..a991d15f 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HealthBoostPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HealthBoostPotionEffect.java @@ -2,7 +2,9 @@ import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; /** * Health Boost is a status effect that increases a player's (or mob's) maximum health. @@ -14,6 +16,7 @@ * * @author pxav */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) public class HealthBoostPotionEffect extends KelpPotionEffectType { @Override @@ -36,4 +39,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HeroOfTheVillagePotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HeroOfTheVillagePotionEffect.java index 0256ede8..f22b2c50 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HeroOfTheVillagePotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HeroOfTheVillagePotionEffect.java @@ -49,4 +49,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return version.isHigherThanOrEqualTo(KelpVersion.MC_1_14_0); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HungerPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HungerPotionEffect.java index 2a619be9..a74eef7b 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HungerPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/HungerPotionEffect.java @@ -2,7 +2,9 @@ import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; /** * Hunger increases food exhaustion by {@code 0.005 * level} per game tick @@ -15,6 +17,7 @@ * * @author pxav */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) public class HungerPotionEffect extends KelpPotionEffectType { @Override @@ -37,4 +40,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.NEGATIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InstantDamagePotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InstantDamagePotionEffect.java index 4e66f4f6..97e1a75f 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InstantDamagePotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InstantDamagePotionEffect.java @@ -5,7 +5,9 @@ import de.pxav.kelp.core.entity.LivingKelpEntity; import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; /** * Instant Damage is an instant status effect that decreases health for living mobs and heals the undead. @@ -18,6 +20,7 @@ * * @author pxav */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) public class InstantDamagePotionEffect extends KelpPotionEffectType { /** @@ -67,4 +70,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.NEGATIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InstantHealPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InstantHealPotionEffect.java index e7fc358a..b890863e 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InstantHealPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InstantHealPotionEffect.java @@ -70,4 +70,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InvisibilityPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InvisibilityPotionEffect.java index 719b047c..1ef3e147 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InvisibilityPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/InvisibilityPotionEffect.java @@ -4,8 +4,10 @@ import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; import de.pxav.kelp.core.inventory.metadata.Color; import de.pxav.kelp.core.player.KelpPlayer; +import de.pxav.kelp.core.version.KelpVersion; /** * Invisibility is a status effect that turns entities invisible. @@ -20,6 +22,7 @@ * * @author pxav */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) public class InvisibilityPotionEffect extends KelpPotionEffectType { @Override @@ -42,4 +45,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/JumpBoostPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/JumpBoostPotionEffect.java index 4f3f1d55..70a91cf0 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/JumpBoostPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/JumpBoostPotionEffect.java @@ -2,7 +2,9 @@ import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; /** * Jump Boost is a status effect that temporarily increases the jump height of the player. @@ -13,6 +15,7 @@ * * @author pxav */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) public class JumpBoostPotionEffect extends KelpPotionEffectType { /** @@ -46,4 +49,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/LevitationEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/LevitationEffect.java index e0dd3087..2dbcfec9 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/LevitationEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/LevitationEffect.java @@ -29,4 +29,14 @@ public KelpEffectRating getRating() { return KelpEffectRating.NEGATIVE; } + @Override + public boolean isEmulated() { + return true; + } + + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return version.isHigherThanOrEqualTo(KelpVersion.MC_1_9_0); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/LuckPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/LuckPotionEffect.java index 82c336a7..d4f869fb 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/LuckPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/LuckPotionEffect.java @@ -35,4 +35,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return version.isHigherThanOrEqualTo(KelpVersion.MC_1_9_0); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/MiningFatiguePotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/MiningFatiguePotionEffect.java index 19b94f9b..0f9b243c 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/MiningFatiguePotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/MiningFatiguePotionEffect.java @@ -48,4 +48,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.NEGATIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/NauseaPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/NauseaPotionEffect.java index 9036c131..9220ee93 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/NauseaPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/NauseaPotionEffect.java @@ -2,7 +2,9 @@ import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; /** * Nausea causes the player's vision to warp and wobble, with the distortion ramping @@ -13,6 +15,7 @@ * * @author pxav */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) public class NauseaPotionEffect extends KelpPotionEffectType { @Override @@ -35,4 +38,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.NEGATIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/NightVisionPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/NightVisionPotionEffect.java index 92f330cd..19edb815 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/NightVisionPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/NightVisionPotionEffect.java @@ -2,7 +2,9 @@ import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; /** * Night vision greatly increases the brightness, so the player can easily see in a light level of 0. @@ -11,6 +13,7 @@ * * @author pxav */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) public class NightVisionPotionEffect extends KelpPotionEffectType { @Override @@ -33,4 +36,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/PoisonPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/PoisonPotionEffect.java index 7afeb2fa..26cc8e47 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/PoisonPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/PoisonPotionEffect.java @@ -2,7 +2,9 @@ import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; /** * Poison inflicts damage over time, reducing the player's health to 1 HP, but cannot kill. @@ -11,6 +13,7 @@ * * @author pxav */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) public class PoisonPotionEffect extends KelpPotionEffectType { @Override @@ -33,4 +36,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.NEGATIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/RegenerationPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/RegenerationPotionEffect.java index e7ceeac0..93aef807 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/RegenerationPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/RegenerationPotionEffect.java @@ -78,4 +78,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/ResistancePotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/ResistancePotionEffect.java index e495599d..5aeb5351 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/ResistancePotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/ResistancePotionEffect.java @@ -2,7 +2,9 @@ import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; /** * Resistance reduces incoming damage from all sources except starvation, @@ -13,6 +15,7 @@ * * @author pxav */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) public class ResistancePotionEffect extends KelpPotionEffectType { @Override @@ -35,4 +38,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SaturationPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SaturationPotionEffect.java index 50c3012e..46571454 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SaturationPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SaturationPotionEffect.java @@ -2,7 +2,9 @@ import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; /** * Saturation is an instant status effect that reduces the need for eating. @@ -13,6 +15,7 @@ * * @author pxav */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) public class SaturationPotionEffect extends KelpPotionEffectType { @Override @@ -35,4 +38,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SlowFallingPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SlowFallingPotionEffect.java index 45421f9f..c6fb1ad9 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SlowFallingPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SlowFallingPotionEffect.java @@ -38,4 +38,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return version.isHigherThanOrEqualTo(KelpVersion.MC_1_13_0); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SlownessPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SlownessPotionEffect.java index 30dd18e9..86d72367 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SlownessPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SlownessPotionEffect.java @@ -49,4 +49,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.NEGATIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SpeedPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SpeedPotionEffect.java index 640bef15..7484af21 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SpeedPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/SpeedPotionEffect.java @@ -49,4 +49,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/StrengthPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/StrengthPotionEffect.java index 292372c9..4633b4e4 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/StrengthPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/StrengthPotionEffect.java @@ -60,4 +60,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WaterBreathingPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WaterBreathingPotionEffect.java index 8f55364e..2591b57b 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WaterBreathingPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WaterBreathingPotionEffect.java @@ -2,13 +2,16 @@ import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; /** * Water breathing is a status effect that prevents or delays drowning. * * @author pxav */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) public class WaterBreathingPotionEffect extends KelpPotionEffectType { @Override @@ -31,4 +34,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.POSITIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WeaknessPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WeaknessPotionEffect.java index 004b9c7c..2bde608c 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WeaknessPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WeaknessPotionEffect.java @@ -2,7 +2,9 @@ import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; /** * Melee damage inflicted by the affected entity is reduced by {@code 4HP * level}. @@ -10,6 +12,7 @@ * * @author pxav */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) public class WeaknessPotionEffect extends KelpPotionEffectType { /** @@ -43,4 +46,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.NEGATIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WitherPotionEffect.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WitherPotionEffect.java index 13dcbcb3..c601216e 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WitherPotionEffect.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/minecraft/WitherPotionEffect.java @@ -2,7 +2,9 @@ import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.MinecraftPotion; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.KelpVersion; /** * Wither is a status effect that inflicts damage over time. @@ -12,6 +14,7 @@ * * @author pxav */ +@MinecraftPotion(since = KelpVersion.MC_1_8_0) public class WitherPotionEffect extends KelpPotionEffectType { @Override @@ -34,4 +37,9 @@ public KelpEffectRating getRating() { return KelpEffectRating.NEGATIVE; } + @Override + public boolean isBukkitEffectUnsafe(KelpVersion version) { + return true; + } + } From 100f31f27d01238dad84d0298c18e850bf5c330d Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 12:03:07 +0200 Subject: [PATCH 297/325] Implement levitation effect for 1.8 as an example class --- .../entity/potion/VersionedLevitation.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/potion/VersionedLevitation.java diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/potion/VersionedLevitation.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/potion/VersionedLevitation.java new file mode 100644 index 00000000..694a720f --- /dev/null +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/potion/VersionedLevitation.java @@ -0,0 +1,23 @@ +package de.pxav.kelp.implementation1_8.entity.potion; + +import de.pxav.kelp.core.entity.LivingKelpEntity; +import de.pxav.kelp.core.entity.util.potion.KelpEffectRating; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.entity.util.potion.minecraft.LevitationEffect; +import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.version.Versioned; + +@Versioned +public class VersionedLevitation extends LevitationEffect { + + @Override + public void onConsume(LivingKelpEntity entity, KelpPotionEffect effectInfo) { + System.out.println("Levitation effect is not implemented yet."); + } + + @Override + public void onRemove(LivingKelpEntity entity) { + System.out.println("Removed levitation effect."); + } + +} From 5447bc9e743b1f0f2a021fded55eea60f3b892ce Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 12:07:13 +0200 Subject: [PATCH 298/325] Apply new potion system to ArrowEntity --- .../de/pxav/kelp/core/entity/type/ArrowEntity.java | 12 ++++++------ .../entity/type/VersionedArrow.java | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ArrowEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ArrowEntity.java index 3bd872bb..d54b7604 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ArrowEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ArrowEntity.java @@ -1,27 +1,27 @@ package de.pxav.kelp.core.entity.type; import de.pxav.kelp.core.entity.type.general.AbstractArrowEntity; -import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; import de.pxav.kelp.core.inventory.metadata.Color; import java.util.List; public interface ArrowEntity extends AbstractArrowEntity { - ArrowEntity addCustomEffect(Class effect, int tier); + ArrowEntity addCustomEffect(KelpPotionEffectType effect, int tier); - boolean hasCustomEffect(Class effect); + boolean hasCustomEffect(KelpPotionEffectType effect); - ArrowEntity removeCustomEffect(Class effect); + ArrowEntity removeCustomEffect(KelpPotionEffectType effect); ArrowEntity setColor(Color color); Color getColor(); - List> getCustomEffects(); + List getCustomEffects(); boolean hasCustomEffects(); - int getCustomEffectTier(Class effect); + int getCustomEffectTier(KelpPotionEffectType effect); } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArrow.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArrow.java index 7b93e0e4..c324dce4 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArrow.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedArrow.java @@ -3,7 +3,7 @@ import com.google.common.collect.ImmutableList; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.ArrowEntity; -import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.metadata.Color; import de.pxav.kelp.implementation1_8.entity.type.general.VersionedAbstractArrow; @@ -19,17 +19,17 @@ public VersionedArrow(Entity entityHandle, KelpEntityType entityType, Location i } @Override - public ArrowEntity addCustomEffect(Class effect, int tier) { + public ArrowEntity addCustomEffect(KelpPotionEffectType effect, int tier) { return this; } @Override - public boolean hasCustomEffect(Class effect) { + public boolean hasCustomEffect(KelpPotionEffectType effect) { return false; } @Override - public ArrowEntity removeCustomEffect(Class effect) { + public ArrowEntity removeCustomEffect(KelpPotionEffectType effect) { return this; } @@ -44,7 +44,7 @@ public Color getColor() { } @Override - public List> getCustomEffects() { + public List getCustomEffects() { return ImmutableList.of(); } @@ -54,7 +54,7 @@ public boolean hasCustomEffects() { } @Override - public int getCustomEffectTier(Class effect) { + public int getCustomEffectTier(KelpPotionEffectType effect) { return 0; } From f8d925ae0019da41f119aa9a1dadd23e3da4cfb2 Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 12:07:21 +0200 Subject: [PATCH 299/325] Apply new potion system to AreaEffectCloudEntity --- .../core/entity/type/AreaEffectCloudEntity.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/AreaEffectCloudEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/AreaEffectCloudEntity.java index e660ecbf..a3b3460f 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/AreaEffectCloudEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/AreaEffectCloudEntity.java @@ -3,7 +3,7 @@ import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.ProjectileLauncher; -import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; import de.pxav.kelp.core.inventory.metadata.Color; import de.pxav.kelp.core.particle.type.ParticleType; @@ -48,19 +48,19 @@ default KelpEntityType getType() { void setParticle(ParticleType particleType); - void setBasePotionEffect(Class potionEffect); + void setBasePotionEffect(KelpPotionEffectType potionEffect); - Class getBasePotionEffect(); + KelpPotionEffectType getBasePotionEffect(); boolean hasCustomEffects(); - List> getCustomEffects(); + List getCustomEffects(); - boolean addCustomEffect(Class effect, boolean var2); + boolean addCustomEffect(KelpPotionEffectType effect, boolean var2); - boolean removeCustomEffect(Class effect); + boolean removeCustomEffect(KelpPotionEffectType effect); - boolean hasCustomEffect(Class effect); + boolean hasCustomEffect(KelpPotionEffectType effect); void clearCustomEffects(); From 52f4cb67babc31063fc8f4911d7a66db9606dba1 Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 12:07:31 +0200 Subject: [PATCH 300/325] Apply new potion system to ThrownPotionEntity --- .../de/pxav/kelp/core/entity/type/ThrownPotionEntity.java | 4 ++-- .../entity/type/VersionedThrownPotion.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownPotionEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownPotionEntity.java index d1ea7d32..474d7739 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownPotionEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownPotionEntity.java @@ -1,14 +1,14 @@ package de.pxav.kelp.core.entity.type; import de.pxav.kelp.core.entity.type.general.KelpProjectile; -import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; import de.pxav.kelp.core.inventory.item.KelpItem; import java.util.Collection; public interface ThrownPotionEntity extends KelpProjectile { - Collection> getPotionEffects(); + Collection getPotionEffects(); KelpItem getItem(); diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownPotion.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownPotion.java index 2e29513a..2d2a83e3 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownPotion.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/type/VersionedThrownPotion.java @@ -3,7 +3,7 @@ import com.google.common.collect.Lists; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.ThrownPotionEntity; -import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; import de.pxav.kelp.core.entity.util.potion.PotionVersionTemplate; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.item.KelpItem; @@ -27,8 +27,8 @@ public VersionedThrownPotion(Entity entityHandle, KelpEntityType entityType, Loc } @Override - public Collection> getPotionEffects() { - Collection> output = Lists.newArrayList(); + public Collection getPotionEffects() { + Collection output = Lists.newArrayList(); for (PotionEffect effect : craftPotion.getEffects()) { output.add(potionVersionTemplate.getKelpPotion(effect.getType())); } From c3c948b8e7305009a8c5abe7b6833dc463324d9c Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 12:07:57 +0200 Subject: [PATCH 301/325] Potion effects can now be applied to living entities --- .../entity/VersionedLivingEntity.java | 50 ++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java index 2f582e6e..a6e4936d 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java @@ -1,8 +1,12 @@ package de.pxav.kelp.implementation1_8.entity; +import de.pxav.kelp.core.common.ConcurrentListMultimap; import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.LivingKelpEntity; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; +import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.PotionVersionTemplate; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.type.SimpleEntityEquipment; import de.pxav.kelp.core.world.KelpLocation; @@ -12,6 +16,9 @@ import org.bukkit.Location; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftLivingEntity; import org.bukkit.entity.LivingEntity; +import org.bukkit.potion.PotionEffect; + +import java.util.Collection; /** * A class description goes here. @@ -22,17 +29,58 @@ public class VersionedLivingEntity> extends VersionedDamageable implements LivingKelpEntity { + // potion effects that are emulated by kelp (only those with non-bukkit effect types) + // so if you apply the levitation effect to an entity on a 1.8 server, it is saved here, + // while a strength effect is not. + private static ConcurrentListMultimap, KelpPotionEffect> potionEffects = ConcurrentListMultimap.create(); + private EntityLiving entityHandle; private CraftLivingEntity craftLivingEntity; + protected PotionVersionTemplate potionVersionTemplate; + public VersionedLivingEntity(Entity entityHandle, KelpEntityType entityType, - Location initialLocation, EntityTypeVersionTemplate entityTypeVersionTemplate) { + Location initialLocation, + EntityTypeVersionTemplate entityTypeVersionTemplate) { super(entityHandle, entityType, initialLocation, entityTypeVersionTemplate); this.entityHandle = (EntityLiving) entityHandle; this.craftLivingEntity = (CraftLivingEntity) entityHandle.getBukkitEntity(); } + public void setPotionVersionTemplate(PotionVersionTemplate potionVersionTemplate) { + this.potionVersionTemplate = potionVersionTemplate; + } + + @Override + public T addPotionEffect(KelpPotionEffect potionEffect) { + potionVersionTemplate.applyTo(this, potionEffect); + + // if the effect contains a custom effect + if (!potionEffect.getEffectType().isBukkitEffect()) { + potionEffects.put(this, potionEffect); + } + + return (T) this; + } + + @Override + public Collection getActivePotionEffects() { + Collection output = potionEffects.getOrEmpty(this); + for (PotionEffect potionEffect : craftLivingEntity.getActivePotionEffects()) { + output.add(potionVersionTemplate.fetchEffect(potionEffect)); + } + return output; + } + + @Override + public T removePotionEffect(KelpPotionEffectType effectType) { + if (effectType.isBukkitEffect()) { + //TODO implement logic! + } + return null; + } + @Override public KelpLocation getEyeLocation() { return KelpLocation.from(craftLivingEntity.getEyeLocation()); From 7427b70e096a19175c127294fc578f0d1045f433 Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 12:09:32 +0200 Subject: [PATCH 302/325] Fix horse inventory implementations --- .../inventory/VersionedAbstractHorseInventory.java | 2 +- .../inventory/VersionedHorseInventory.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedAbstractHorseInventory.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedAbstractHorseInventory.java index ea8feab3..8fb443ec 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedAbstractHorseInventory.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedAbstractHorseInventory.java @@ -17,7 +17,7 @@ public KelpItem getSaddle() { @Override public T setSaddle(KelpItem saddleItem) { - setItem(saddleItem.slot(1)); + setItem(saddleItem.slot(0)); return (T) this; } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedHorseInventory.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedHorseInventory.java index d10644e1..3b61f5b0 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedHorseInventory.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedHorseInventory.java @@ -2,6 +2,7 @@ import de.pxav.kelp.core.inventory.item.KelpItem; import de.pxav.kelp.core.inventory.type.HorseInventory; +import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftInventoryHorse; import org.bukkit.inventory.Inventory; public class VersionedHorseInventory @@ -14,12 +15,13 @@ public VersionedHorseInventory(Inventory inventory) { @Override public KelpItem getArmor() { - return null; + return getItemAt(1); } @Override public HorseInventory setArmor(KelpItem armorItem) { - return null; + setItem(armorItem.slot(1)); + return this; } } From c0d485e6675f274ff7cdfbff8d004664d43e819c Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 12:10:29 +0200 Subject: [PATCH 303/325] Add methods to identify entity groups such as undead or bosses --- .../pxav/kelp/core/entity/KelpEntityType.java | 186 ++++++++++++++---- 1 file changed, 144 insertions(+), 42 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntityType.java b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntityType.java index d32c77af..9862c0a2 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntityType.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntityType.java @@ -4,9 +4,11 @@ import de.pxav.kelp.core.entity.type.general.MinecartEntity; import de.pxav.kelp.core.player.KelpPlayer; import de.pxav.kelp.core.version.KelpVersion; +import org.bukkit.entity.EntityType; import java.util.ArrayList; import java.util.Collection; +import java.util.Set; /** * A class description goes here. @@ -18,9 +20,18 @@ public enum KelpEntityType { DROPPED_ITEM(KelpVersion.MC_1_8_0, DroppedItemEntity.class), EXPERIENCE_ORB(KelpVersion.MC_1_8_0, ExperienceOrbEntity.class), AREA_EFFECT_CLOUD(KelpVersion.MC_1_9_0, AreaEffectCloudEntity.class), - ELDER_GUARDIAN(KelpVersion.MC_1_8_0, ElderGuardianEntity.class), - WITHER_SKELETON(KelpVersion.MC_1_8_0, WitherSkeletonEntity.class), - STRAY_SKELETON(KelpVersion.MC_1_10_0, StraySkeletonEntity.class), + ELDER_GUARDIAN(KelpVersion.MC_1_8_0, ElderGuardianEntity.class) { + public boolean isHostile() { return true; } + public boolean isAquatic() { return true; } + }, + WITHER_SKELETON(KelpVersion.MC_1_8_0, WitherSkeletonEntity.class) { + public boolean isUndead() { return true; } + public boolean isHostile() { return true; } + }, + STRAY_SKELETON(KelpVersion.MC_1_10_0, StraySkeletonEntity.class) { + public boolean isUndead() { return true; } + public boolean isHostile() { return true; } + }, CHICKEN_EGG(KelpVersion.MC_1_8_0, ThrownChickenEggEntity.class), LEASH_HITCH(KelpVersion.MC_1_8_0, LeashHitchEntity.class), PAINTING(KelpVersion.MC_1_8_0, PaintingEntity.class), @@ -37,20 +48,36 @@ public enum KelpEntityType { PRIMED_TNT(KelpVersion.MC_1_8_0, PrimedTntEntity.class), FALLING_BLOCK(KelpVersion.MC_1_8_0, FallingBlockEntity.class), FIREWORK(KelpVersion.MC_1_8_0, FireworkEntity.class), - HUSK(KelpVersion.MC_1_10_0, HuskEntity.class), + HUSK(KelpVersion.MC_1_10_0, HuskEntity.class) { + public boolean isUndead() { return true; } + public boolean isHostile() { return true; } + }, SPECTRAL_ARROW(KelpVersion.MC_1_9_0, SpectralArrowEntity.class), SHULKER_BULLET(KelpVersion.MC_1_9_0, ShulkerBulletEntity.class), DRAGON_FIREBALL(KelpVersion.MC_1_9_0, DragonFireballEntity.class), - ZOMBIE_VILLAGER(KelpVersion.MC_1_8_0, ZombieVillagerEntity.class), - SKELETON_HORSE(KelpVersion.MC_1_8_0, SkeletonHorseEntity.class), - ZOMBIE_HORSE(KelpVersion.MC_1_8_0, ZombieHorse.class), + ZOMBIE_VILLAGER(KelpVersion.MC_1_8_0, ZombieVillagerEntity.class) { + public boolean isUndead() { return true; } + public boolean isHostile() { return true; } + }, + SKELETON_HORSE(KelpVersion.MC_1_8_0, SkeletonHorseEntity.class) { + public boolean isUndead() { return true; } + }, + ZOMBIE_HORSE(KelpVersion.MC_1_8_0, ZombieHorse.class) { + public boolean isUndead() { return true; } + }, ARMOR_STAND(KelpVersion.MC_1_8_0, ArmorStandEntity.class), DONKEY(KelpVersion.MC_1_8_0, DonkeyEntity.class), MULE(KelpVersion.MC_1_8_0, MuleEntity.class), EVOKER_FANGS(KelpVersion.MC_1_11_0, EvokerFangEntity.class), - EVOKER(KelpVersion.MC_1_11_0, EvokerEntity.class), - VEX(KelpVersion.MC_1_11_0, VexEntity.class), - VINDICATOR(KelpVersion.MC_1_11_0, VindicatorEntity.class), + EVOKER(KelpVersion.MC_1_11_0, EvokerEntity.class) { + public boolean isHostile() { return true; } + }, + VEX(KelpVersion.MC_1_11_0, VexEntity.class) { + public boolean isHostile() { return true; } + }, + VINDICATOR(KelpVersion.MC_1_11_0, VindicatorEntity.class) { + public boolean isHostile() { return true; } + }, ILLUSIONER(KelpVersion.MC_1_12_0, IllusionerEntity.class), MINECART_COMMAND(KelpVersion.MC_1_8_0, CommandMinecartEntity.class), BOAT(KelpVersion.MC_1_8_0, BoatEntity.class), @@ -60,31 +87,69 @@ public enum KelpEntityType { MINECART_TNT(KelpVersion.MC_1_8_0, ExplosiveMinecart.class), MINECART_HOPPER(KelpVersion.MC_1_8_0, HopperMinecart.class), MINECART_MOB_SPAWNER(KelpVersion.MC_1_8_0, SpawnerMinecart.class), - CREEPER(KelpVersion.MC_1_8_0, CreeperEntity.class), - SKELETON(KelpVersion.MC_1_8_0, SkeletonEntity.class), + CREEPER(KelpVersion.MC_1_8_0, CreeperEntity.class) { + public boolean isHostile() { return true; } + }, + SKELETON(KelpVersion.MC_1_8_0, SkeletonEntity.class) { + public boolean isUndead() { return true; } + public boolean isHostile() { return true; } + }, SPIDER(KelpVersion.MC_1_8_0, SpiderEntity.class), - ZOMBIE_GIANT(KelpVersion.MC_1_8_0, ZombieGiant.class), - ZOMBIE(KelpVersion.MC_1_8_0, ZombieEntity.class), - SLIME(KelpVersion.MC_1_8_0, SlimeEntity.class), - GHAST(KelpVersion.MC_1_8_0, GhastEntity.class), - PIG_ZOMBIE(KelpVersion.MC_1_8_0, PigZombie.class), + ZOMBIE_GIANT(KelpVersion.MC_1_8_0, ZombieGiant.class) { + public boolean isUndead() { return true; } + }, + ZOMBIE(KelpVersion.MC_1_8_0, ZombieEntity.class) { + public boolean isUndead() { return true; } + public boolean isHostile() { return true; } + }, + SLIME(KelpVersion.MC_1_8_0, SlimeEntity.class) { + public boolean isHostile() { return true; } + }, + GHAST(KelpVersion.MC_1_8_0, GhastEntity.class) { + public boolean isHostile() { return true; } + }, + PIG_ZOMBIE(KelpVersion.MC_1_8_0, PigZombie.class) { + public boolean isUndead() { return true; } + }, ENDERMAN(KelpVersion.MC_1_8_0, EndermanEntity.class), CAVE_SPIDER(KelpVersion.MC_1_8_0, CaveSpiderEntity.class), - SILVERFISH(KelpVersion.MC_1_8_0, SilverfishEntity.class), - BLAZE(KelpVersion.MC_1_8_0, BlazeEntity.class), - MAGMA_CUBE(KelpVersion.MC_1_8_0, MagmaCubeEntity.class), - ENDER_DRAGON(KelpVersion.MC_1_8_0, EnderDragonEntity.class), - WITHER(KelpVersion.MC_1_8_0, WitherEntity.class), + SILVERFISH(KelpVersion.MC_1_8_0, SilverfishEntity.class) { + public boolean isHostile() { return true; } + }, + BLAZE(KelpVersion.MC_1_8_0, BlazeEntity.class) { + public boolean isHostile() { return true; } + }, + MAGMA_CUBE(KelpVersion.MC_1_8_0, MagmaCubeEntity.class) { + public boolean isHostile() { return true; } + }, + ENDER_DRAGON(KelpVersion.MC_1_8_0, EnderDragonEntity.class) { + public boolean isBoss() { return true; } + }, + WITHER(KelpVersion.MC_1_8_0, WitherEntity.class) { + public boolean isUndead() { return true; } + public boolean isBoss() { return true; } + }, BAT(KelpVersion.MC_1_8_0, BatEntity.class), - WITCH(KelpVersion.MC_1_8_0, WitchEntity.class), - ENDERMITE(KelpVersion.MC_1_8_0, EndermiteEntity.class), - GUARDIAN(KelpVersion.MC_1_8_0, GuardianEntity.class), - SHULKER(KelpVersion.MC_1_9_0, ShulkerEntity.class), + WITCH(KelpVersion.MC_1_8_0, WitchEntity.class) { + public boolean isHostile() { return true; } + }, + ENDERMITE(KelpVersion.MC_1_8_0, EndermiteEntity.class) { + public boolean isHostile() { return true; } + }, + GUARDIAN(KelpVersion.MC_1_8_0, GuardianEntity.class) { + public boolean isHostile() { return true; } + public boolean isAquatic() { return true; } + }, + SHULKER(KelpVersion.MC_1_9_0, ShulkerEntity.class) { + public boolean isHostile() { return true; } + }, PIG(KelpVersion.MC_1_8_0, PigEntity.class), SHEEP(KelpVersion.MC_1_8_0, SheepEntity.class), COW(KelpVersion.MC_1_8_0, CowEntity.class), CHICKEN(KelpVersion.MC_1_8_0, ChickenEntity.class), - SQUID(KelpVersion.MC_1_8_0, SquidEntity.class), + SQUID(KelpVersion.MC_1_8_0, SquidEntity.class) { + public boolean isAquatic() { return true; } + }, WOLF(KelpVersion.MC_1_8_0, WolfEntity.class), MUSHROOM_COW(KelpVersion.MC_1_8_0, MushroomCowEntity.class), SNOWMAN(KelpVersion.MC_1_8_0, SnowmanEntity.class), @@ -98,19 +163,40 @@ public enum KelpEntityType { PARROT(KelpVersion.MC_1_12_0, ParrotEntity.class), VILLAGER(KelpVersion.MC_1_8_0, VillagerEntity.class), ENDER_CRYSTAL(KelpVersion.MC_1_8_0, EnderCrystalEntity.class), - TURTLE(KelpVersion.MC_1_13_0, TurtleEntity.class), - PHANTOM(KelpVersion.MC_1_13_0, PhantomEntity.class), + TURTLE(KelpVersion.MC_1_13_0, TurtleEntity.class) { + public boolean isAquatic() { return true; } + }, + PHANTOM(KelpVersion.MC_1_13_0, PhantomEntity.class) { + public boolean isHostile() { return true; } + }, TRIDENT(KelpVersion.MC_1_13_0, ThrownTridentEntity.class), - COD(KelpVersion.MC_1_13_0, CodEntity.class), - SALMON(KelpVersion.MC_1_13_0, SalmonEntity.class), - PUFFERFISH(KelpVersion.MC_1_13_0, PufferfishEntity.class), - TROPICAL_FISH(KelpVersion.MC_1_13_0, TropicalFishEntity.class), - DROWNED(KelpVersion.MC_1_13_0, DrownedEntity.class), - DOLPHIN(KelpVersion.MC_1_13_0, DolphinEntity.class), + COD(KelpVersion.MC_1_13_0, CodEntity.class) { + public boolean isAquatic() { return true; } + }, + SALMON(KelpVersion.MC_1_13_0, SalmonEntity.class) { + public boolean isAquatic() { return true; } + }, + PUFFERFISH(KelpVersion.MC_1_13_0, PufferfishEntity.class) { + public boolean isAquatic() { return true; } + }, + TROPICAL_FISH(KelpVersion.MC_1_13_0, TropicalFishEntity.class) { + public boolean isAquatic() { return true; } + }, + DROWNED(KelpVersion.MC_1_13_0, DrownedEntity.class) { + public boolean isUndead() { return true; } + public boolean isHostile() { return true; } + }, + DOLPHIN(KelpVersion.MC_1_13_0, DolphinEntity.class) { + public boolean isAquatic() { return true; } + }, CAT(KelpVersion.MC_1_8_0, CatEntity.class), PANDA(KelpVersion.MC_1_14_0, PandaEntity.class), - PILLAGER(KelpVersion.MC_1_14_0, PillagerEntity.class), - RAVAGER(KelpVersion.MC_1_14_0, RavagerEntity.class), + PILLAGER(KelpVersion.MC_1_14_0, PillagerEntity.class) { + public boolean isHostile() { return true; } + }, + RAVAGER(KelpVersion.MC_1_14_0, RavagerEntity.class) { + public boolean isHostile() { return true; } + }, TRADER_LLAMA(KelpVersion.MC_1_14_0, TraderLlamaEntity.class), WANDERING_TRADER(KelpVersion.MC_1_14_0, WanderingTraderEntity.class), FOX(KelpVersion.MC_1_14_0, FoxEntity.class), @@ -120,7 +206,6 @@ public enum KelpEntityType { UNKNOWN(KelpVersion.MC_1_8_0, null); private KelpVersion since; - //private Class entityClass; private Class> entityClass; KelpEntityType(KelpVersion since, Class> entityClass) { @@ -132,10 +217,6 @@ public KelpVersion since() { return since; } -// public Class getEntityClass() { -// return entityClass; -// } - public Class getEntityClass() { return entityClass; } @@ -144,6 +225,27 @@ public static boolean isLivingEntity(KelpEntityType entityType) { return entityType == KelpEntityType.ZOMBIE; } + public boolean isUndead() { + return false; + } + + public boolean isAquatic() { + return false; + } + + // TODO IMPLEMENT!!!! + public boolean isArthropod() { + return false; + } + + public boolean isBoss() { + return false; + } + + public boolean isHostile() { + return false; + } + public static Collection aboveVersion(KelpVersion version) { Collection output = new ArrayList<>(); From 58d993937eb076d67c1b0316efd04105f1e07b0a Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 13:15:21 +0200 Subject: [PATCH 304/325] Fix concurrent modification exception in VersionedPlayerInventory --- .../implementation1_8/inventory/VersionedPlayerInventory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedPlayerInventory.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedPlayerInventory.java index c018e95d..66d63bed 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedPlayerInventory.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedPlayerInventory.java @@ -156,8 +156,8 @@ public PlayerInventory removeWidget(GroupedWidget widget) { */ @Override public PlayerInventory removeAllWidgets() { - simpleWidgets.getOrEmpty(player.getUUID()).forEach(this::removeWidget); - groupedWidgets.getOrEmpty(player.getUUID()).forEach(this::removeWidget); + ConcurrentSetMultimap.create(simpleWidgets).getOrEmpty(player.getUUID()).forEach(this::removeWidget); + ConcurrentSetMultimap.create(groupedWidgets).getOrEmpty(player.getUUID()).forEach(this::removeWidget); return this; } From d5e2248fec0ccd5e59b8ba5119efe2518e0e473a Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 13:57:20 +0200 Subject: [PATCH 305/325] Implement missing methods for StorageInventory --- .../inventory/VersionedStorageInventory.java | 74 ++++++++++++++++--- 1 file changed, 65 insertions(+), 9 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedStorageInventory.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedStorageInventory.java index bfa6fcc6..d95491bb 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedStorageInventory.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedStorageInventory.java @@ -1,7 +1,9 @@ package de.pxav.kelp.implementation1_8.inventory; import com.google.common.collect.Lists; +import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.LivingKelpEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.item.KelpItem; import de.pxav.kelp.core.inventory.material.KelpMaterial; import de.pxav.kelp.core.inventory.material.MaterialContainer; @@ -10,9 +12,12 @@ import de.pxav.kelp.core.version.Versioned; import net.minecraft.server.v1_8_R3.IInventory; import net.minecraft.server.v1_8_R3.ItemStack; +import net.minecraft.server.v1_8_R3.Items; +import org.bukkit.Material; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftInventory; import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack; +import org.bukkit.entity.HumanEntity; import org.bukkit.inventory.Inventory; import java.util.Collection; @@ -28,10 +33,12 @@ public class VersionedStorageInventory> implements protected IInventory inventoryHandle; private CraftInventory inventory; + private EntityTypeVersionTemplate entityTypeVersionTemplate; public VersionedStorageInventory(Inventory inventory) { this.inventory = (CraftInventory) inventory; this.inventoryHandle = ((CraftInventory)inventory).getInventory(); + this.entityTypeVersionTemplate = KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class); } @Override @@ -201,7 +208,11 @@ public int getSize() { @Override public Collection> getViewers() { - return null; + Collection> output = Lists.newArrayList(); + for (HumanEntity viewer : inventoryHandle.getViewers()) { + output.add((LivingKelpEntity) entityTypeVersionTemplate.getKelpEntity(viewer)); + } + return output; } @Override @@ -211,37 +222,82 @@ public boolean isEmpty() { @Override public T remove(KelpItem item) { - return null; + MaterialContainer material = KelpMaterial.convert(item.getMaterial()); + for (int slot = 0; inventoryHandle.getSize() > slot; slot++) { + if (inventoryHandle.getItem(slot) == null) { + continue; + } + org.bukkit.inventory.ItemStack itemStack = CraftItemStack.asBukkitCopy(inventoryHandle.getItem(slot)); + + if (itemStack.getType() != material.getBukkitMaterial()) { + continue; + } + + if (material.getBukkitMaterial().getMaxDurability() != itemStack.getType().getMaxDurability() + || material.getSubId() != itemStack.getDurability()) { + continue; + } + + if (!item.getDisplayName().equalsIgnoreCase(itemStack.getItemMeta().getDisplayName())) { + continue; + } + + if (!item.getItemDescription().equals(itemStack.getItemMeta().getLore())) { + continue; + } + + remove(slot); + + } + inventoryHandle.update(); + return (T) this; } @Override public T remove(KelpMaterial material) { - return null; + MaterialContainer container = KelpMaterial.convert(material); + for (int slot = 0; inventoryHandle.getSize() > slot; slot++) { + if (inventoryHandle.getItem(slot) == null) { + continue; + } + + org.bukkit.inventory.ItemStack itemStack = CraftItemStack.asBukkitCopy(inventoryHandle.getItem(slot)); + + if (container.getBukkitMaterial() == itemStack.getType()) { + if (material.getMaxDurability() == 0 && itemStack.getDurability() == container.getSubId()) { + remove(slot); + continue; + } + if (container.getSubId() != 0) { + remove(slot); + } + } + } + inventoryHandle.update(); + return (T) this; } @Override public T setAllItems(Collection items) { - return null; + + return (T) this; } @Override public T setItem(KelpItem item) { - ItemStack itemStack = CraftItemStack.asNMSCopy(item.getItemStack()); - inventoryHandle.setItem(item.getSlot(), itemStack); - inventoryHandle.update(); + getBukkitInventory().setItem(item.getSlot(), item.getItemStack()); return null; } @Override public T setMaxStackSize(int maxStackSize) { inventoryHandle.setMaxStackSize(maxStackSize); - inventoryHandle.update(); return null; } @Override public T setAllStorageItems(Collection items) { - return null; + return (T) this; } @Override From 6c929a6f49f848054aacd2bc8b5e209df76b91dd Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 13:57:58 +0200 Subject: [PATCH 306/325] Fix widget rendering process in player inventory --- .../inventory/VersionedPlayerInventory.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedPlayerInventory.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedPlayerInventory.java index 66d63bed..dabd4328 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedPlayerInventory.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/inventory/VersionedPlayerInventory.java @@ -2,6 +2,7 @@ import com.google.common.collect.Sets; import de.pxav.kelp.core.common.ConcurrentSetMultimap; +import de.pxav.kelp.core.inventory.InventoryConstants; import de.pxav.kelp.core.inventory.item.KelpItem; import de.pxav.kelp.core.inventory.type.KelpInventory; import de.pxav.kelp.core.inventory.type.PlayerInventory; @@ -173,11 +174,16 @@ public PlayerInventory removeAllWidgets() { @Override public PlayerInventory updateWidgets() { for (SimpleWidget current : simpleWidgets.getOrEmpty(player.getUUID())) { - if (!current.isStateful()) { + + // render stateless widgets only once. + if (!current.isStateful() && current.getCoveredSlot() == InventoryConstants.NOT_RENDERED_SIMPLE_WIDGET) { + setItem(current.render()); continue; } - remove(current.getCoveredSlot()); + if (current.getCoveredSlot() != -1) { + remove(current.getCoveredSlot()); + } KelpItem item = current.render(); @@ -191,7 +197,17 @@ public PlayerInventory updateWidgets() { } for (GroupedWidget current : groupedWidgets.getOrEmpty(player.getUUID())) { - if (!current.isStateful()) { + if (!current.isStateful() && InventoryConstants.NOT_RENDERED_GROUPED_WIDGET.test(current)) { + current.render(player).forEach(item -> { + + // if items are not explicitly stated as interactable + // cancel interactions by default + if (!item.hasTagKey("interactionAllowed")) { + item.cancelInteractions(); + } + + setItem(item); + }); continue; } From 1a9cd265532811d22e0acfd9f9356140ce693e00 Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 13:58:17 +0200 Subject: [PATCH 307/325] Fix widget rendering process in player inventory and move it to superclass --- .../inventory/type/AnimatedInventory.java | 17 +----- .../core/inventory/type/KelpInventory.java | 61 +++++++++++++++++++ .../core/inventory/type/SimpleInventory.java | 17 +----- 3 files changed, 63 insertions(+), 32 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/type/AnimatedInventory.java b/core/src/main/java/de/pxav/kelp/core/inventory/type/AnimatedInventory.java index f6808055..c6a47f31 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/type/AnimatedInventory.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/type/AnimatedInventory.java @@ -99,22 +99,7 @@ public Inventory render(KelpPlayer player) { Inventory inventory = inventoryVersionTemplate.createInventory(this.size, title.states().get(0)); - for (SimpleWidget current : simpleWidgets) { - KelpItem item = current.render(); - if (!item.hasTagKey("interactionAllowed")) { - item.cancelInteractions(); - } - inventory.setItem(item.getSlot(), item.getItemStack()); - } - - for (GroupedWidget current : groupedWidgets) { - current.render(player).forEach(item -> { - if (!item.hasTagKey("interactionAllowed")) { - item.cancelInteractions(); - } - inventory.setItem(item.getSlot(), item.getItemStack()); - }); - } + widgetsToInventory(inventory, player); return inventory; } diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/type/KelpInventory.java b/core/src/main/java/de/pxav/kelp/core/inventory/type/KelpInventory.java index c3e60c1c..e080c70c 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/type/KelpInventory.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/type/KelpInventory.java @@ -1,6 +1,7 @@ package de.pxav.kelp.core.inventory.type; import com.google.common.collect.Lists; +import de.pxav.kelp.core.inventory.InventoryConstants; import de.pxav.kelp.core.inventory.item.KelpItem; import de.pxav.kelp.core.inventory.version.InventoryVersionTemplate; import de.pxav.kelp.core.inventory.widget.GroupedWidget; @@ -109,6 +110,66 @@ public T addWidget(GroupedWidget widget) { */ public abstract Inventory render(KelpPlayer player); + protected void widgetsToInventory(Inventory inventory, KelpPlayer player) { + for (SimpleWidget current : simpleWidgets) { + + // render stateless widgets only once. + if (!current.isStateful() && current.getCoveredSlot() == InventoryConstants.NOT_RENDERED_SIMPLE_WIDGET) { + KelpItem item = current.render(); + if (!item.hasTagKey("interactionAllowed")) { + item.cancelInteractions(); + } + inventory.setItem(item.getSlot(), item.getItemStack()); + continue; + } + + if (current.getCoveredSlot() != -1) { + inventory.clear(current.getCoveredSlot()); + } + + KelpItem item = current.render(); + + // if items are not explicitly stated as interactable + // cancel interactions by default + if (!item.hasTagKey("interactionAllowed")) { + item.cancelInteractions(); + } + + inventory.setItem(item.getSlot(), item.getItemStack()); + } + + for (GroupedWidget current : groupedWidgets) { + if (!current.isStateful() && InventoryConstants.NOT_RENDERED_GROUPED_WIDGET.test(current)) { + current.render(player).forEach(item -> { + + // if items are not explicitly stated as interactable + // cancel interactions by default + if (!item.hasTagKey("interactionAllowed")) { + item.cancelInteractions(); + } + + inventory.setItem(item.getSlot(), item.getItemStack()); + }); + continue; + } + + for (Integer slot : current.getCoveredSlots()) { + inventory.clear(slot); + } + + current.render(player).forEach(item -> { + + // if items are not explicitly stated as interactable + // cancel interactions by default + if (!item.hasTagKey("interactionAllowed")) { + item.cancelInteractions(); + } + + inventory.setItem(item.getSlot(), item.getItemStack()); + }); + } + } + /** * Updates all widgets contained by this inventory by clearing * all contents and then adding them back widget by widget. diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleInventory.java b/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleInventory.java index 309e267e..0b516571 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleInventory.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/type/SimpleInventory.java @@ -85,22 +85,7 @@ public void updateTitleOnly(KelpPlayer player) { public Inventory render(KelpPlayer player) { Inventory inventory = inventoryVersionTemplate.createInventory(this.size, title.get()); - for (SimpleWidget current : simpleWidgets) { - KelpItem item = current.render(); - if (!item.hasTagKey("interactionAllowed")) { - item.cancelInteractions(); - } - inventory.setItem(item.getSlot(), item.getItemStack()); - } - - for (GroupedWidget current : groupedWidgets) { - current.render(player).forEach(item -> { - if (!item.hasTagKey("interactionAllowed")) { - item.cancelInteractions(); - } - inventory.setItem(item.getSlot(), item.getItemStack()); - }); - } + widgetsToInventory(inventory, player); return inventory; } From cd8d1c7dbbb4e23a1992a203864d3bf7f1bae644 Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 13:58:43 +0200 Subject: [PATCH 308/325] Add inventory constants class avoiding magic values in the code --- .../kelp/core/inventory/InventoryConstants.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/inventory/InventoryConstants.java diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/InventoryConstants.java b/core/src/main/java/de/pxav/kelp/core/inventory/InventoryConstants.java new file mode 100644 index 00000000..8fdabe15 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/inventory/InventoryConstants.java @@ -0,0 +1,14 @@ +package de.pxav.kelp.core.inventory; + +import de.pxav.kelp.core.inventory.widget.GroupedWidget; + +import java.util.function.Predicate; + +public class InventoryConstants { + + public static final int NOT_RENDERED_SIMPLE_WIDGET = -1; + + public static final Predicate NOT_RENDERED_GROUPED_WIDGET = + groupedWidget -> groupedWidget.getCoveredSlots().isEmpty() || groupedWidget.getCoveredSlots() == null; + +} From b580a8719d4690ae7f7a8cb8b43d8954b35e6f50 Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 13:59:17 +0200 Subject: [PATCH 309/325] Fix widget communication with rendering algorithm --- .../pxav/kelp/core/inventory/widget/GroupedWidget.java | 2 ++ .../de/pxav/kelp/core/inventory/widget/Pagination.java | 8 ++++++++ .../pxav/kelp/core/inventory/widget/SimpleWidget.java | 2 ++ .../kelp/core/inventory/widget/StatefulItemWidget.java | 9 ++++----- .../core/inventory/widget/StatelessItemWidget.java | 10 ++++------ .../kelp/core/inventory/widget/ToggleableWidget.java | 4 +++- 6 files changed, 23 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/widget/GroupedWidget.java b/core/src/main/java/de/pxav/kelp/core/inventory/widget/GroupedWidget.java index a1fc931c..c4f51827 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/widget/GroupedWidget.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/widget/GroupedWidget.java @@ -34,6 +34,8 @@ public interface GroupedWidget extends Widget { /** * Gets all slots covered by this widget in the * target inventory. + * IMPORTANT: If your widget has not been rendered at least + * once, this must return either {@code null} or an empty set. * * @return A set of all slots covered by this widget in the target inventory. */ diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/widget/Pagination.java b/core/src/main/java/de/pxav/kelp/core/inventory/widget/Pagination.java index 0ec801cf..928b05aa 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/widget/Pagination.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/widget/Pagination.java @@ -34,6 +34,9 @@ public class Pagination extends AbstractWidget implements GroupedWid // that would be returned by the supplier right now. private List currentContentWidgets = ImmutableList.of(); + // if the widget has at least been rendered once. + private boolean rendered = false; + // navigation buttons private KelpItem nextButton; private KelpItem previousButton; @@ -215,6 +218,8 @@ public Collection render(KelpPlayer player) { output.add(previousButton); } + rendered = true; + return output; } @@ -225,6 +230,9 @@ public void onRemove() { @Override public Set getCoveredSlots() { + if (!rendered) { + return Sets.newHashSet(); + } Set output = Sets.newHashSet(contentSlots); output.add(nextButton.getSlot()); output.add(previousButton.getSlot()); diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/widget/SimpleWidget.java b/core/src/main/java/de/pxav/kelp/core/inventory/widget/SimpleWidget.java index 92cb3f9c..43cd8411 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/widget/SimpleWidget.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/widget/SimpleWidget.java @@ -31,6 +31,8 @@ public interface SimpleWidget extends Widget { /** * Gets the slot covered by this widget in the target inventory. + * IMPORTANT: This number has to be {@link de.pxav.kelp.core.inventory.InventoryConstants#NOT_RENDERED_SIMPLE_WIDGET} + * if the widget has not been rendered yet. * * @return The slot covered in the target inventory. */ diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/widget/StatefulItemWidget.java b/core/src/main/java/de/pxav/kelp/core/inventory/widget/StatefulItemWidget.java index 54918ca1..86213943 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/widget/StatefulItemWidget.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/widget/StatefulItemWidget.java @@ -1,16 +1,14 @@ package de.pxav.kelp.core.inventory.widget; -import com.google.common.collect.Sets; +import de.pxav.kelp.core.inventory.InventoryConstants; import de.pxav.kelp.core.inventory.item.KelpItem; -import de.pxav.kelp.core.inventory.listener.KelpClickEvent; -import java.util.Set; -import java.util.function.Consumer; import java.util.function.Supplier; public class StatefulItemWidget extends AbstractWidget implements SimpleWidget { private Supplier itemSupplier; + private int slot = InventoryConstants.NOT_RENDERED_SIMPLE_WIDGET; public static StatefulItemWidget create() { return new StatefulItemWidget(); @@ -29,12 +27,13 @@ public boolean isStateful() { @Override public KelpItem render() { KelpItem item = itemSupplier.get(); + slot = item.getSlot(); return item; } @Override public int getCoveredSlot() { - return itemSupplier.get().getSlot(); + return slot; } } diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/widget/StatelessItemWidget.java b/core/src/main/java/de/pxav/kelp/core/inventory/widget/StatelessItemWidget.java index 515b24f1..7061b9f3 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/widget/StatelessItemWidget.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/widget/StatelessItemWidget.java @@ -1,11 +1,7 @@ package de.pxav.kelp.core.inventory.widget; -import com.google.common.collect.Sets; +import de.pxav.kelp.core.inventory.InventoryConstants; import de.pxav.kelp.core.inventory.item.KelpItem; -import de.pxav.kelp.core.inventory.listener.KelpClickEvent; - -import java.util.Set; -import java.util.function.Consumer; /** * This widget is used to create single items and put them into @@ -18,6 +14,7 @@ public class StatelessItemWidget extends AbstractWidget imp // the item to be set into the inventory. private KelpItem item; + private int slot = InventoryConstants.NOT_RENDERED_SIMPLE_WIDGET; public static StatelessItemWidget create() { return new StatelessItemWidget(); @@ -48,12 +45,13 @@ public boolean isStateful() { */ @Override public KelpItem render() { + slot = item.getSlot(); return item; } @Override public int getCoveredSlot() { - return item.getSlot(); + return slot; } } diff --git a/core/src/main/java/de/pxav/kelp/core/inventory/widget/ToggleableWidget.java b/core/src/main/java/de/pxav/kelp/core/inventory/widget/ToggleableWidget.java index 618c6a36..8709095f 100644 --- a/core/src/main/java/de/pxav/kelp/core/inventory/widget/ToggleableWidget.java +++ b/core/src/main/java/de/pxav/kelp/core/inventory/widget/ToggleableWidget.java @@ -1,6 +1,7 @@ package de.pxav.kelp.core.inventory.widget; import com.google.common.base.Preconditions; +import de.pxav.kelp.core.inventory.InventoryConstants; import de.pxav.kelp.core.inventory.item.KelpItem; import java.util.function.Supplier; @@ -36,7 +37,7 @@ public class ToggleableWidget extends AbstractWidget implement // The item which is displayed when the condition is false. private KelpItem whenFalse; - private int slot; + private int slot = InventoryConstants.NOT_RENDERED_SIMPLE_WIDGET; ToggleableWidget() {} @@ -167,4 +168,5 @@ public KelpItem render() { public int getCoveredSlot() { return slot; } + } From 35d3058e6b0774d0472717ac372b9bfad7429218 Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 14:31:56 +0200 Subject: [PATCH 310/325] You can now properly remove potion effects from an entity --- .../entity/VersionedLivingEntity.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java index a6e4936d..c4da3846 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedLivingEntity.java @@ -6,6 +6,7 @@ import de.pxav.kelp.core.entity.LivingKelpEntity; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.util.potion.PotionEffects; import de.pxav.kelp.core.entity.util.potion.PotionVersionTemplate; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.type.SimpleEntityEquipment; @@ -17,6 +18,7 @@ import org.bukkit.craftbukkit.v1_8_R3.entity.CraftLivingEntity; import org.bukkit.entity.LivingEntity; import org.bukkit.potion.PotionEffect; +import org.bukkit.potion.PotionEffectType; import java.util.Collection; @@ -76,9 +78,16 @@ public Collection getActivePotionEffects() { @Override public T removePotionEffect(KelpPotionEffectType effectType) { if (effectType.isBukkitEffect()) { - //TODO implement logic! + PotionEffectType bukkitEffect = potionVersionTemplate.getBukkitPotion(effectType); + craftLivingEntity.removePotionEffect(bukkitEffect); + } else { + for (KelpPotionEffect effect : potionEffects.getOrEmpty(this)) { + if (effect.getEffectType().equals(effectType)) { + effectType.onRemove(this); + } + } } - return null; + return (T) this; } @Override From ce921aec74d0d6d31921c34a753a0b441fe92140 Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 14:32:14 +0200 Subject: [PATCH 311/325] You can now get all effect types applied to an entity --- .../de/pxav/kelp/core/entity/LivingKelpEntity.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java index 4892c8e7..57b0a98f 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/LivingKelpEntity.java @@ -1,5 +1,7 @@ package de.pxav.kelp.core.entity; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import de.pxav.kelp.core.entity.type.general.DamageableEntity; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffect; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; @@ -8,6 +10,7 @@ import org.bukkit.entity.LivingEntity; import java.util.Collection; +import java.util.Set; public interface LivingKelpEntity> extends KelpEntity, DamageableEntity { @@ -15,6 +18,14 @@ public interface LivingKelpEntity> extends KelpEnt Collection getActivePotionEffects(); + default Collection getActivePotionEffectTypes() { + Set output = Sets.newHashSet(); + for (KelpPotionEffect effect : getActivePotionEffects()) { + output.add(effect.getEffectType()); + } + return output; + } + T removePotionEffect(KelpPotionEffectType effectType); /** From 7c6a076bc0b1e588b8d8946ea1153845368595fc Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 14:37:36 +0200 Subject: [PATCH 312/325] Add method checking if an effect can be removed with milk --- .../core/entity/util/potion/KelpPotionEffectType.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java index a095720d..2caf44a5 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/KelpPotionEffectType.java @@ -94,6 +94,16 @@ public boolean isEmulated() { return false; } + /** + * Checks if the effect type can be removed from a player when + * they consume a bucket of milk. + * + * @return {@code true} if the effect can be removed with a bucket of milk. + */ + public boolean isRemovableWithMilk() { + return true; + } + /** * Checks if this effect is a default potion effect offered by minecraft/bukkit. * As of now, every effect will return {@code true} on this as custom potion effects From 662d54805f5cf89456be1db064da6245583ae101 Mon Sep 17 00:00:00 2001 From: pxav Date: Sun, 23 May 2021 14:37:58 +0200 Subject: [PATCH 313/325] Add listener that automatically removes non-bukkit potion effects if the player uses milk --- .../entity/util/potion/PotionListener.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionListener.java diff --git a/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionListener.java b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionListener.java new file mode 100644 index 00000000..58acfd42 --- /dev/null +++ b/core/src/main/java/de/pxav/kelp/core/entity/util/potion/PotionListener.java @@ -0,0 +1,27 @@ +package de.pxav.kelp.core.entity.util.potion; + +import de.pxav.kelp.core.player.KelpPlayer; +import org.bukkit.Material; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.player.PlayerItemConsumeEvent; + +public class PotionListener { + + @EventHandler(priority = EventPriority.HIGHEST) + public void handleMilkConsume(PlayerItemConsumeEvent event) { + if (event.getItem().getType() != Material.MILK_BUCKET || event.isCancelled()) { + return; + } + + KelpPlayer player = KelpPlayer.from(event.getPlayer()); + + for (KelpPotionEffectType effectType : player.getActivePotionEffectTypes()) { + if (!effectType.isBukkitEffect() && effectType.isRemovableWithMilk()) { + player.removePotionEffect(effectType); + } + } + + } + +} From a8f7bd20924c1a0ba3da15d6b6df084363b2932d Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 24 May 2021 11:31:53 +0200 Subject: [PATCH 314/325] Adjust bone meal application chances in VersionedBlock to match the new MathUtils syntax --- .../de/pxav/kelp/implementation1_8/world/VersionedBlock.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedBlock.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedBlock.java index 13acd87d..4e2297f8 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedBlock.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedBlock.java @@ -212,7 +212,7 @@ public void applyBoneMeal(KelpBlock kBlock, KelpBlockFace blockFace) { // a real tree will grow if (kBlock.getBukkitBlock().getType() == Material.SAPLING) { byte data = kBlock.getBukkitBlock().getData(); - boolean grow = MathUtils.perCentChance(45); + boolean grow = MathUtils.perCentChance(0.45); if (!grow) { return; @@ -246,7 +246,7 @@ public void applyBoneMeal(KelpBlock kBlock, KelpBlockFace blockFace) { break; case 8: block.setType(Material.AIR); - TreeType type = MathUtils.perCentChance(10) ? TreeType.BIG_TREE : TreeType.TREE; + TreeType type = MathUtils.perCentChance(0.10) ? TreeType.BIG_TREE : TreeType.TREE; spawned = kBlock.getBukkitBlock().getWorld().generateTree(kBlock.getBukkitBlock().getLocation(), type); break; case 9: From f957108bcc703267b255fd2afa03160d02772517 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 24 May 2021 12:12:49 +0200 Subject: [PATCH 315/325] Add killer bunny as own entity type --- .../java/de/pxav/kelp/core/entity/KelpEntityType.java | 1 + .../implementation1_8/entity/VersionedEntityType.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntityType.java b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntityType.java index 9862c0a2..23dd86ac 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntityType.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntityType.java @@ -157,6 +157,7 @@ public enum KelpEntityType { IRON_GOLEM(KelpVersion.MC_1_8_0, IronGolemEntity.class), HORSE(KelpVersion.MC_1_8_0, HorseEntity.class), RABBIT(KelpVersion.MC_1_8_0, RabbitEntity.class), + KILLER_BUNNY(KelpVersion.MC_1_8_0, KillerBunnyEntity.class), POLAR_BEAR(KelpVersion.MC_1_10_0, PolarBear.class), LLAMA(KelpVersion.MC_1_11_0, LlamaEntity.class), LLAMA_SPIT(KelpVersion.MC_1_11_0, LlamaSpitEntity.class), diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java index ad90c7e6..cb01bdc5 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/entity/VersionedEntityType.java @@ -24,6 +24,7 @@ import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftHorse; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftOcelot; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftRabbit; import org.bukkit.entity.*; import org.bukkit.entity.Item; import org.bukkit.entity.minecart.*; @@ -424,11 +425,17 @@ private KelpEntity getOrCreateEntity(KelpEntityType entityType, Location loca entity = craftWorld.createEntity(location, Horse.class); } output = new VersionedHorse(entity, entityType, location, this, inventoryVersionTemplate, entityConstantsVersionTemplate); - } else if (entityType == KelpEntityType.RABBIT || entity instanceof EntityRabbit) { + } else if (entityType == KelpEntityType.RABBIT + || (entity instanceof EntityRabbit && (((CraftRabbit) entity.getBukkitEntity()).getRabbitType() != Rabbit.Type.THE_KILLER_BUNNY))) { if (create) { entity = craftWorld.createEntity(location, Rabbit.class); } output = new VersionedRabbit(entity, entityType, location, this, entityConstantsVersionTemplate); + } else if (entityType == KelpEntityType.KILLER_BUNNY || entity instanceof EntityRabbit) { + if (create) { + entity = craftWorld.createEntity(location, Rabbit.class); + } + output = new VersionedKillerBunny(entity, entityType, location, this, entityConstantsVersionTemplate); } else if (entityType == KelpEntityType.VILLAGER || entity instanceof EntityVillager) { if (create) { entity = craftWorld.createEntity(location, Villager.class); @@ -459,7 +466,7 @@ private KelpEntity getOrCreateEntity(KelpEntityType entityType, Location loca output = new VersionedZombie(entity, entityType, location, this); } - //todo make type fetching more efficient + //todo make type fetching more efficient, summarize if statements if (entity instanceof EntityOcelot) { CraftOcelot ocelot = (CraftOcelot) entity.getBukkitEntity(); From 58e2db1fa23706cdcf8d23eccc436cda2f6efa88 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 24 May 2021 12:13:25 +0200 Subject: [PATCH 316/325] Implement projectile launch method for KelpPlayer --- .../type/general/ProjectileLauncher.java | 2 +- .../player/VersionedKelpPlayer.java | 32 +++++++++++++------ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/general/ProjectileLauncher.java b/core/src/main/java/de/pxav/kelp/core/entity/type/general/ProjectileLauncher.java index e30d7f84..1bd8ca57 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/general/ProjectileLauncher.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/general/ProjectileLauncher.java @@ -2,6 +2,6 @@ public interface ProjectileLauncher> { - > E launchProjectile(Class> projectileType); + T launchProjectile(KelpProjectile projectileType); } diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java index e5a23465..2404f10a 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/player/VersionedKelpPlayer.java @@ -1,9 +1,10 @@ package de.pxav.kelp.implementation1_8.player; -import com.google.common.collect.Sets; import de.pxav.kelp.core.common.StringUtils; import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.type.*; import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.entity.type.general.ProjectileLauncher; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.type.PlayerInventory; import de.pxav.kelp.core.logger.KelpLogger; @@ -18,10 +19,7 @@ import de.pxav.kelp.core.player.message.MessageClickAction; import de.pxav.kelp.core.player.message.MessageComponent; import de.pxav.kelp.core.player.message.MessageHoverAction; -import de.pxav.kelp.core.player.prompt.sign.SignPromptVersionTemplate; -import de.pxav.kelp.core.reflect.ReflectionUtil; import de.pxav.kelp.core.scheduler.synchronize.ServerMainThread; -import de.pxav.kelp.core.sidebar.SidebarRepository; import de.pxav.kelp.core.sidebar.type.KelpSidebar; import de.pxav.kelp.core.sound.KelpSound; import de.pxav.kelp.core.sound.SoundRepository; @@ -34,12 +32,11 @@ import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TextComponent; import net.minecraft.server.v1_8_R3.*; +import net.minecraft.server.v1_8_R3.Entity; import org.bukkit.Location; import org.bukkit.Sound; -import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; -import org.bukkit.entity.Player; -import org.bukkit.entity.Projectile; +import org.bukkit.entity.*; import org.bukkit.permissions.PermissionAttachment; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scoreboard.DisplaySlot; @@ -95,8 +92,25 @@ public PlayerInventory getInventory() { } @Override - public > E launchProjectile(Class> projectileType) { - return null; + public KelpPlayer launchProjectile(KelpProjectile projectile) { + + if (projectile instanceof ArrowEntity) { + // in 1.8, an arrow cannot have special data, so we can simply launch + // a normal arrow here (ignoring metadata such as potion effects) + // in newer versions, this should launch an arrow with the given + // metadata + player.launchProjectile(Arrow.class); + } else if (projectile instanceof ThrownPotionEntity) { + // todo: interpret potion metadata here and write custom launch algorithm + player.launchProjectile(ThrownPotion.class); + } else { + Projectile bukkitProjectile = (Projectile) projectile.getBukkitEntity(); + Class projectileClass = bukkitProjectile.getClass(); + + player.launchProjectile(projectileClass); + } + + return this; } @Override From 859de05a37d34d9464813cb546365685af377e74 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 24 May 2021 13:15:13 +0200 Subject: [PATCH 317/325] Add missing 1.15 and 1.16 entity types --- .../java/de/pxav/kelp/core/entity/KelpEntityType.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntityType.java b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntityType.java index 23dd86ac..7fc12fff 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/KelpEntityType.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/KelpEntityType.java @@ -204,6 +204,15 @@ public enum KelpEntityType { FISHING_HOOK(KelpVersion.MC_1_8_0, FishHookEntity.class), LIGHTNING(KelpVersion.MC_1_8_0, LightningEntity.class), PLAYER(KelpVersion.MC_1_8_0, KelpPlayer.class), + + BEE(KelpVersion.MC_1_15_0, BeeEntity.class), + ZOGLIN(KelpVersion.MC_1_16_0, ZoglinEntity.class), + PIGLIN(KelpVersion.MC_1_16_0, PiglinEntity.class), + PIGLIN_BRUTE(KelpVersion.MC_1_16_0, PiglinBruteEntity.class), + LARGE_FIREBALL(KelpVersion.MC_1_8_0, LargeFireball.class), + HOGLIN(KelpVersion.MC_1_8_0, HoglinEntity.class), + STRIDER(KelpVersion.MC_1_16_0, StriderEntity.class), + UNKNOWN(KelpVersion.MC_1_8_0, null); private KelpVersion since; From 21b89a64da0e9c2e296142b87cfe5d4a5fd1657d Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 24 May 2021 13:15:28 +0200 Subject: [PATCH 318/325] Add 1.16 versions to KelpVersion enum --- .../java/de/pxav/kelp/core/version/KelpVersion.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/version/KelpVersion.java b/core/src/main/java/de/pxav/kelp/core/version/KelpVersion.java index 6b121608..1d9c400e 100644 --- a/core/src/main/java/de/pxav/kelp/core/version/KelpVersion.java +++ b/core/src/main/java/de/pxav/kelp/core/version/KelpVersion.java @@ -53,7 +53,15 @@ public enum KelpVersion { public boolean isFullVersion() { return true; } }, MC_1_15_1(34, "1.15.1-R0.1-SNAPSHOT"), - MC_1_15_2(35, "1.15.2-R0.1-SNAPSHOT") + MC_1_15_2(35, "1.15.2-R0.1-SNAPSHOT"), + MC_1_16_0(36, "1.16-R0.1-SNAPSHOT") { + public boolean isFullVersion() { return true; } + }, + MC_1_16_1(37, "1.16.1-R0.1-SNAPSHOT"), + MC_1_16_2(38, "1.16.2-R0.1-SNAPSHOT"), + MC_1_16_3(39, "1.16.3-R0.1-SNAPSHOT"), + MC_1_16_4(40, "1.16.4-R0.1-SNAPSHOT"), + MC_1_16_5(41, "1.16.5-R0.1-SNAPSHOT"), ; private int id; From bae1b96bdf3e1ede1346c9644b16eb75c7615b95 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 24 May 2021 13:17:28 +0200 Subject: [PATCH 319/325] Add static factories to entity type classes --- .../entity/type/AreaEffectCloudEntity.java | 47 +++++++++++++++- .../core/entity/type/ArmorStandEntity.java | 43 +++++++++++++-- .../kelp/core/entity/type/ArrowEntity.java | 52 ++++++++++++++++++ .../pxav/kelp/core/entity/type/BatEntity.java | 52 ++++++++++++++++++ .../pxav/kelp/core/entity/type/BeeEntity.java | 51 ++++++++++++++++++ .../kelp/core/entity/type/BlazeEntity.java | 53 ++++++++++++++++++ .../kelp/core/entity/type/BoatEntity.java | 52 ++++++++++++++++++ .../pxav/kelp/core/entity/type/CatEntity.java | 53 ++++++++++++++++++ .../core/entity/type/CaveSpiderEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/ChickenEntity.java | 53 ++++++++++++++++++ .../pxav/kelp/core/entity/type/CodEntity.java | 52 ++++++++++++++++++ .../entity/type/CommandMinecartEntity.java | 52 ++++++++++++++++++ .../pxav/kelp/core/entity/type/CowEntity.java | 54 +++++++++++++++++++ .../kelp/core/entity/type/CreeperEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/DolphinEntity.java | 53 ++++++++++++++++++ .../kelp/core/entity/type/DonkeyEntity.java | 53 ++++++++++++++++++ .../entity/type/DragonFireballEntity.java | 53 ++++++++++++++++++ .../core/entity/type/DroppedItemEntity.java | 49 ++++++++++++++++- .../kelp/core/entity/type/DrownedEntity.java | 52 ++++++++++++++++++ .../core/entity/type/ElderGuardianEntity.java | 48 ++++++++++++++++- .../core/entity/type/EnderCrystalEntity.java | 50 +++++++++++++++++ .../core/entity/type/EnderDragonEntity.java | 52 ++++++++++++++++++ .../core/entity/type/EnderSignalEntity.java | 50 +++++++++++++++++ .../kelp/core/entity/type/EndermanEntity.java | 53 ++++++++++++++++++ .../core/entity/type/EndermiteEntity.java | 53 ++++++++++++++++++ .../kelp/core/entity/type/EvokerEntity.java | 52 ++++++++++++++++++ .../core/entity/type/EvokerFangEntity.java | 51 ++++++++++++++++++ .../core/entity/type/ExperienceOrbEntity.java | 50 +++++++++++++++-- .../core/entity/type/ExplosiveMinecart.java | 53 ++++++++++++++++++ .../core/entity/type/FallingBlockEntity.java | 51 ++++++++++++++++++ .../kelp/core/entity/type/FireworkEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/FishHookEntity.java | 51 ++++++++++++++++++ .../pxav/kelp/core/entity/type/FoxEntity.java | 51 ++++++++++++++++++ .../kelp/core/entity/type/GhastEntity.java | 53 ++++++++++++++++++ .../kelp/core/entity/type/GuardianEntity.java | 50 +++++++++++++++-- .../kelp/core/entity/type/HoglinEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/HopperMinecart.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/HorseEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/HuskEntity.java | 52 ++++++++++++++++++ .../core/entity/type/IllusionerEntity.java | 53 ++++++++++++++++++ .../core/entity/type/IronGolemEntity.java | 52 ++++++++++++++++++ .../core/entity/type/ItemFrameEntity.java | 52 ++++++++++++++++++ .../core/entity/type/KillerBunnyEntity.java | 54 +++++++++++++++++++ .../kelp/core/entity/type/LargeFireball.java | 54 +++++++++++++++++++ .../core/entity/type/LeashHitchEntity.java | 50 +++++++++++++++++ .../core/entity/type/LightningEntity.java | 51 ++++++++++++++++++ .../kelp/core/entity/type/LlamaEntity.java | 52 ++++++++++++++++++ .../core/entity/type/LlamaSpitEntity.java | 51 ++++++++++++++++++ .../core/entity/type/MagmaCubeEntity.java | 51 ++++++++++++++++++ .../kelp/core/entity/type/MuleEntity.java | 53 ++++++++++++++++++ .../core/entity/type/MushroomCowEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/OcelotEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/PaintingEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/PandaEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/ParrotEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/PhantomEntity.java | 52 ++++++++++++++++++ .../pxav/kelp/core/entity/type/PigEntity.java | 52 ++++++++++++++++++ .../pxav/kelp/core/entity/type/PigZombie.java | 53 ++++++++++++++++++ .../core/entity/type/PiglinBruteEntity.java | 53 ++++++++++++++++++ .../kelp/core/entity/type/PiglinEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/PillagerEntity.java | 53 ++++++++++++++++++ .../pxav/kelp/core/entity/type/PolarBear.java | 53 ++++++++++++++++++ .../core/entity/type/PoweredMinecart.java | 52 ++++++++++++++++++ .../core/entity/type/PrimedTntEntity.java | 51 ++++++++++++++++++ .../core/entity/type/PufferfishEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/RabbitEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/RavagerEntity.java | 53 ++++++++++++++++++ .../core/entity/type/RideableMinecart.java | 53 ++++++++++++++++++ .../kelp/core/entity/type/SalmonEntity.java | 53 ++++++++++++++++++ .../kelp/core/entity/type/SheepEntity.java | 43 +++++++++++++-- .../core/entity/type/ShulkerBulletEntity.java | 51 ++++++++++++++++++ .../kelp/core/entity/type/ShulkerEntity.java | 52 ++++++++++++++++++ .../core/entity/type/SilverfishEntity.java | 53 ++++++++++++++++++ .../kelp/core/entity/type/SkeletonEntity.java | 52 ++++++++++++++++++ .../core/entity/type/SkeletonHorseEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/SlimeEntity.java | 52 ++++++++++++++++++ .../core/entity/type/SmallFireballEntity.java | 53 ++++++++++++++++++ .../kelp/core/entity/type/SnowmanEntity.java | 52 ++++++++++++++++++ .../core/entity/type/SpawnerMinecart.java | 53 ++++++++++++++++++ .../core/entity/type/SpectralArrowEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/SpiderEntity.java | 53 ++++++++++++++++++ .../kelp/core/entity/type/SquidEntity.java | 53 ++++++++++++++++++ .../core/entity/type/StorageMinecart.java | 52 ++++++++++++++++++ .../core/entity/type/StraySkeletonEntity.java | 53 ++++++++++++++++++ .../kelp/core/entity/type/StriderEntity.java | 52 ++++++++++++++++++ .../entity/type/ThrownChickenEggEntity.java | 52 ++++++++++++++++++ .../entity/type/ThrownEnderPearlEntity.java | 52 ++++++++++++++++++ .../type/ThrownExperienceBottleEntity.java | 52 ++++++++++++++++++ .../entity/type/ThrownFireballEntity.java | 52 ++++++++++++++++++ .../core/entity/type/ThrownPotionEntity.java | 52 ++++++++++++++++++ .../entity/type/ThrownSnowballEntity.java | 52 ++++++++++++++++++ .../core/entity/type/ThrownTridentEntity.java | 52 ++++++++++++++++++ .../entity/type/ThrownWitherSkullEntity.java | 53 ++++++++++++++++++ .../core/entity/type/TraderLlamaEntity.java | 53 ++++++++++++++++++ .../core/entity/type/TropicalFishEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/TurtleEntity.java | 53 ++++++++++++++++++ .../pxav/kelp/core/entity/type/VexEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/VillagerEntity.java | 52 ++++++++++++++++++ .../core/entity/type/VindicatorEntity.java | 52 ++++++++++++++++++ .../entity/type/WanderingTraderEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/WitchEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/WitherEntity.java | 50 +++++++++++++++++ .../entity/type/WitherSkeletonEntity.java | 53 ++++++++++++++++++ .../kelp/core/entity/type/WolfEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/ZoglinEntity.java | 52 ++++++++++++++++++ .../kelp/core/entity/type/ZombieEntity.java | 45 ++++++++++++++-- .../kelp/core/entity/type/ZombieGiant.java | 53 ++++++++++++++++++ .../kelp/core/entity/type/ZombieHorse.java | 52 ++++++++++++++++++ .../entity/type/ZombieVillagerEntity.java | 48 +++++++++++++++++ 109 files changed, 5621 insertions(+), 20 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/AreaEffectCloudEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/AreaEffectCloudEntity.java index a3b3460f..b2b58f10 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/AreaEffectCloudEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/AreaEffectCloudEntity.java @@ -1,19 +1,64 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.ProjectileLauncher; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.metadata.Color; import de.pxav.kelp.core.particle.type.ParticleType; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; import java.util.List; public interface AreaEffectCloudEntity extends KelpEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static AreaEffectCloudEntity create(KelpLocation location) { + return (AreaEffectCloudEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static AreaEffectCloudEntity from(Entity entity) { + return (AreaEffectCloudEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.AREA_EFFECT_CLOUD; + } + @Override default KelpEntityType getType() { - return KelpEntityType.AREA_EFFECT_CLOUD; + return getEntityType(); } int getDuration(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ArmorStandEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ArmorStandEntity.java index bf757a83..09d18bc3 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ArmorStandEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ArmorStandEntity.java @@ -7,18 +7,55 @@ import de.pxav.kelp.core.inventory.type.SimpleEntityEquipment; import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.entity.ArmorStand; +import org.bukkit.entity.Entity; import org.bukkit.util.EulerAngle; public interface ArmorStandEntity extends KelpEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ static ArmorStandEntity create(KelpLocation location) { return (ArmorStandEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) - .newKelpEntity(KelpEntityType.ARMOR_STAND, location.getBukkitLocation()); + .newKelpEntity(getEntityType(), location.getBukkitLocation()); } - static ArmorStandEntity from(ArmorStand armorStand) { + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static ArmorStandEntity from(Entity entity) { return (ArmorStandEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) - .getKelpEntity(armorStand); + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.ARMOR_STAND; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); } EulerAngle getBodyPose(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ArrowEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ArrowEntity.java index d54b7604..017b777a 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ArrowEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ArrowEntity.java @@ -1,13 +1,65 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AbstractArrowEntity; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; import java.util.List; public interface ArrowEntity extends AbstractArrowEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ArrowEntity create(KelpLocation location) { + return (ArrowEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static ArrowEntity from(Entity entity) { + return (ArrowEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.ARROW; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + ArrowEntity addCustomEffect(KelpPotionEffectType effect, int tier); boolean hasCustomEffect(KelpPotionEffectType effect); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/BatEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/BatEntity.java index 37632428..3ec50d47 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/BatEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/BatEntity.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MobileEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface BatEntity extends MobileEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static BatEntity create(KelpLocation location) { + return (BatEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static BatEntity from(Entity entity) { + return (BatEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.BAT; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + boolean isAwake(); BatEntity setAwake(boolean awake); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/BeeEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/BeeEntity.java index 1265a5d7..2ee4d805 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/BeeEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/BeeEntity.java @@ -1,11 +1,62 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.Location; +import org.bukkit.entity.Entity; public interface BeeEntity extends BreedableAnimalEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static BeeEntity create(KelpLocation location) { + return (BeeEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static BeeEntity from(Entity entity) { + return (BeeEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.BEE; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + KelpLocation getHive(); void setHive(KelpLocation hive); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/BlazeEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/BlazeEntity.java index 25882150..51a8f024 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/BlazeEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/BlazeEntity.java @@ -1,10 +1,63 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.Difficulty; +import org.bukkit.entity.Blaze; +import org.bukkit.entity.Entity; public interface BlazeEntity extends MonsterEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static BlazeEntity create(KelpLocation location) { + return (BlazeEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static BlazeEntity from(Entity entity) { + return (BlazeEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.BLAZE; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + @Override default int getMaximumSpawnLightLevel() { return -1; diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/BoatEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/BoatEntity.java index b2307535..997aac93 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/BoatEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/BoatEntity.java @@ -1,10 +1,62 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.VehicleEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.material.KelpMaterial; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface BoatEntity extends VehicleEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static BoatEntity create(KelpLocation location) { + return (BoatEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static BoatEntity from(Entity entity) { + return (BoatEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.BOAT; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + KelpMaterial getBoatType(); BoatEntity setBoatType(KelpMaterial boatType); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/CatEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/CatEntity.java index 6d3ed84d..a372e8c2 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/CatEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/CatEntity.java @@ -1,11 +1,64 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AnimalEntity; import de.pxav.kelp.core.entity.util.CatType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Cat; +import org.bukkit.entity.Entity; public interface CatEntity extends AnimalEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static CatEntity create(KelpLocation location) { + return (CatEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static CatEntity from(Entity entity) { + return (CatEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.CAT; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + Color getCollarDyeColor(); CatEntity setCollarDyeColor(Color color); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/CaveSpiderEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/CaveSpiderEntity.java index 04a170d2..85e1a68e 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/CaveSpiderEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/CaveSpiderEntity.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.Difficulty; +import org.bukkit.entity.Entity; public interface CaveSpiderEntity extends SpiderEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static CaveSpiderEntity create(KelpLocation location) { + return (CaveSpiderEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static CaveSpiderEntity from(Entity entity) { + return (CaveSpiderEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.CAVE_SPIDER; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + @Override default int getMaximumSpawnLightLevel() { return 7; diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ChickenEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ChickenEntity.java index 770c176c..68bcc708 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ChickenEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ChickenEntity.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface ChickenEntity extends BreedableAnimalEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ChickenEntity create(KelpLocation location) { + return (ChickenEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static ChickenEntity from(Entity entity) { + return (ChickenEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.CHICKEN; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/CodEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/CodEntity.java index 72919f4b..0f48cbf2 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/CodEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/CodEntity.java @@ -1,8 +1,60 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AbstractFishEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.entity.Cod; +import org.bukkit.entity.Entity; public interface CodEntity extends AbstractFishEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static CodEntity create(KelpLocation location) { + return (CodEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static CodEntity from(Entity entity) { + return (CodEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.COD; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/CommandMinecartEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/CommandMinecartEntity.java index 4c101164..e73c0791 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/CommandMinecartEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/CommandMinecartEntity.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MinecartEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface CommandMinecartEntity extends MinecartEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static CommandMinecartEntity create(KelpLocation location) { + return (CommandMinecartEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static CommandMinecartEntity from(Entity entity) { + return (CommandMinecartEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.MINECART_COMMAND; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + String getCommand(); CommandMinecartEntity setCommand(String command); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/CowEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/CowEntity.java index 24595b6f..933233d6 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/CowEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/CowEntity.java @@ -1,7 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AnimalEntity; import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.command.Command; +import org.bukkit.entity.Entity; public interface CowEntity extends AnimalEntity, BreedableAnimalEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static CowEntity create(KelpLocation location) { + return (CowEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static CowEntity from(Entity entity) { + return (CowEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.COW; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/CreeperEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/CreeperEntity.java index edc58c4c..ba8bcc31 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/CreeperEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/CreeperEntity.java @@ -1,11 +1,63 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.ExplosiveEntity; import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.Difficulty; +import org.bukkit.entity.Entity; public interface CreeperEntity extends MonsterEntity, ExplosiveEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static CreeperEntity create(KelpLocation location) { + return (CreeperEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static CreeperEntity from(Entity entity) { + return (CreeperEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.CREEPER; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + boolean isCharged(); CreeperEntity setCharged(boolean charged); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/DolphinEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/DolphinEntity.java index fcb5bedd..962b8a2c 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/DolphinEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/DolphinEntity.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.WaterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface DolphinEntity extends WaterEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static DolphinEntity create(KelpLocation location) { + return (DolphinEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static DolphinEntity from(Entity entity) { + return (DolphinEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.DOLPHIN; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/DonkeyEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/DonkeyEntity.java index 6819d889..cfd3c1fa 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/DonkeyEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/DonkeyEntity.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.ChestedHorse; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface DonkeyEntity extends ChestedHorse { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static DonkeyEntity create(KelpLocation location) { + return (DonkeyEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static DonkeyEntity from(Entity entity) { + return (DonkeyEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.DONKEY; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/DragonFireballEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/DragonFireballEntity.java index 7715ede4..d3f71f90 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/DragonFireballEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/DragonFireballEntity.java @@ -1,5 +1,58 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; + public interface DragonFireballEntity extends ThrownFireballEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static DragonFireballEntity create(KelpLocation location) { + return (DragonFireballEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static DragonFireballEntity from(Entity entity) { + return (DragonFireballEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.DRAGON_FIREBALL; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/DroppedItemEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/DroppedItemEntity.java index f25670d8..c35c4efb 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/DroppedItemEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/DroppedItemEntity.java @@ -2,9 +2,12 @@ import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.util.ItemDropType; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.item.KelpItem; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; import org.bukkit.entity.Item; /** @@ -14,8 +17,50 @@ */ public interface DroppedItemEntity extends KelpEntity { - static DroppedItemEntity from(Item item) { - return (DroppedItemEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class).getKelpEntity(item); + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static DroppedItemEntity create(KelpLocation location) { + return (DroppedItemEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static DroppedItemEntity from(Entity entity) { + return (DroppedItemEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.DROPPED_ITEM; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); } KelpItem getItem(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/DrownedEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/DrownedEntity.java index e1278b77..37c37e00 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/DrownedEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/DrownedEntity.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.Difficulty; +import org.bukkit.entity.Entity; public interface DrownedEntity extends ZombieEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ZombieEntity create(KelpLocation location) { + return (ZombieEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static ZombieEntity from(Entity entity) { + return (ZombieEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.DROWNED; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + @Override default int getMaximumSpawnLightLevel() { return 7; diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ElderGuardianEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ElderGuardianEntity.java index 57cadbcb..3cf648a5 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ElderGuardianEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ElderGuardianEntity.java @@ -1,10 +1,13 @@ package de.pxav.kelp.core.entity.type; import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityFactory; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; /** * A class description goes here. @@ -13,9 +16,50 @@ */ public interface ElderGuardianEntity extends MonsterEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ static ElderGuardianEntity create(KelpLocation location) { - return (ElderGuardianEntity) KelpPlugin.getInjector().getInstance(KelpEntityFactory.class) - .newKelpEntity(KelpEntityType.ELDER_GUARDIAN, location.getBukkitLocation()); + return (ElderGuardianEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static ElderGuardianEntity from(Entity entity) { + return (ElderGuardianEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.ELDER_GUARDIAN; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); } } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/EnderCrystalEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/EnderCrystalEntity.java index ced1b434..f245994d 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/EnderCrystalEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/EnderCrystalEntity.java @@ -1,10 +1,60 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface EnderCrystalEntity extends KelpEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static EnderCrystalEntity create(KelpLocation location) { + return (EnderCrystalEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static EnderCrystalEntity from(Entity entity) { + return (EnderCrystalEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.ENDER_CRYSTAL; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + boolean isShowingBottom(); EnderCrystalEntity setShowingBottom(boolean showingBottom); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/EnderDragonEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/EnderDragonEntity.java index 88fd31de..03d9a9c2 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/EnderDragonEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/EnderDragonEntity.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.LivingKelpEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface EnderDragonEntity extends LivingKelpEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static EnderDragonEntity create(KelpLocation location) { + return (EnderDragonEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static EnderDragonEntity from(Entity entity) { + return (EnderDragonEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.ENDER_DRAGON; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + int getDeathAnimationInTicks(); // TODO implement other ender dragon specific things diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/EnderSignalEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/EnderSignalEntity.java index d4d119e2..3ea3bf70 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/EnderSignalEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/EnderSignalEntity.java @@ -1,11 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.item.KelpItem; import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface EnderSignalEntity extends KelpEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static EnderSignalEntity create(KelpLocation location) { + return (EnderSignalEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static EnderSignalEntity from(Entity entity) { + return (EnderSignalEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.ENDER_SIGNAL; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + KelpLocation getTargetLocation(); EnderSignalEntity setTargetLocation(KelpLocation var1); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/EndermanEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/EndermanEntity.java index 9185d7e0..6b2c4311 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/EndermanEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/EndermanEntity.java @@ -1,10 +1,63 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.material.KelpMaterial; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Enderman; +import org.bukkit.entity.Entity; public interface EndermanEntity extends MonsterEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static EndermanEntity create(KelpLocation location) { + return (EndermanEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static EndermanEntity from(Entity entity) { + return (EndermanEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.ENDERMAN; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + KelpMaterial getCarriedBlock(); EndermanEntity setCarriedBlock(KelpMaterial carriedBlock); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/EndermiteEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/EndermiteEntity.java index 4949a665..8c42eec2 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/EndermiteEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/EndermiteEntity.java @@ -1,9 +1,62 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Endermite; +import org.bukkit.entity.Entity; public interface EndermiteEntity extends MonsterEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static EndermiteEntity create(KelpLocation location) { + return (EndermiteEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static EndermiteEntity from(Entity entity) { + return (EndermiteEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.ENDERMITE; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + boolean isPlayerSpawned(); EndermiteEntity setPlayerSpawned(boolean playerSpawned); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/EvokerEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/EvokerEntity.java index 20a506f9..5b3412b1 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/EvokerEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/EvokerEntity.java @@ -1,7 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.SpellcastingEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface EvokerEntity extends SpellcastingEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static EvokerEntity create(KelpLocation location) { + return (EvokerEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static EvokerEntity from(Entity entity) { + return (EvokerEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.EVOKER; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/EvokerFangEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/EvokerFangEntity.java index a6d3639e..4dd36b98 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/EvokerFangEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/EvokerFangEntity.java @@ -1,10 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.LivingKelpEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface EvokerFangEntity extends KelpEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static EvokerFangEntity create(KelpLocation location) { + return (EvokerFangEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static EvokerFangEntity from(Entity entity) { + return (EvokerFangEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.EVOKER_FANGS; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + LivingKelpEntity getFangOwner(); EvokerFangEntity setFangOwner(LivingKelpEntity fangOwner); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ExperienceOrbEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ExperienceOrbEntity.java index 85f70d11..c8b8b211 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ExperienceOrbEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ExperienceOrbEntity.java @@ -2,14 +2,58 @@ import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; import org.bukkit.entity.ExperienceOrb; public interface ExperienceOrbEntity extends KelpEntity { - static ExperienceOrbEntity from(ExperienceOrb experienceOrb) { - return (ExperienceOrbEntity) KelpPlugin.getInjector() - .getInstance(EntityTypeVersionTemplate.class).getKelpEntity(experienceOrb); + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ExperienceOrbEntity create(KelpLocation location) { + return (ExperienceOrbEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static ExperienceOrbEntity from(Entity entity) { + return (ExperienceOrbEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.EXPERIENCE_ORB; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); } int getExperience(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ExplosiveMinecart.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ExplosiveMinecart.java index 20247aea..02fafc64 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ExplosiveMinecart.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ExplosiveMinecart.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MinecartEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface ExplosiveMinecart extends MinecartEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ExplosiveMinecart create(KelpLocation location) { + return (ExplosiveMinecart) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static ExplosiveMinecart from(Entity entity) { + return (ExplosiveMinecart) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.MINECART_TNT; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/FallingBlockEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/FallingBlockEntity.java index b64e041a..db535d44 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/FallingBlockEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/FallingBlockEntity.java @@ -1,10 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.material.KelpMaterial; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface FallingBlockEntity extends KelpEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static FallingBlockEntity create(KelpLocation location) { + return (FallingBlockEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static FallingBlockEntity from(Entity entity) { + return (FallingBlockEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.FALLING_BLOCK; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + boolean canHurtEntities(); boolean willDropItem(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/FireworkEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/FireworkEntity.java index dc364b7e..76a074b8 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/FireworkEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/FireworkEntity.java @@ -1,11 +1,63 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.metadata.FireworkMetadata; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; import org.bukkit.entity.Firework; public interface FireworkEntity extends KelpProjectile { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static FireworkEntity create(KelpLocation location) { + return (FireworkEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static FireworkEntity from(Entity entity) { + return (FireworkEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.FIREWORK; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + FireworkEntity detonate(); FireworkMetadata getFireworkMetadata(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/FishHookEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/FishHookEntity.java index f57c300e..faa6e492 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/FishHookEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/FishHookEntity.java @@ -1,12 +1,63 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.KelpProjectile; import de.pxav.kelp.core.entity.util.FishHookState; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.craftbukkit.v1_16_R3.entity.CraftFishHook; +import org.bukkit.entity.Entity; public interface FishHookEntity extends KelpProjectile { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static FishHookEntity create(KelpLocation location) { + return (FishHookEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static FishHookEntity from(Entity entity) { + return (FishHookEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.FISHING_HOOK; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + KelpEntity getOwner(); int getWaitTimeInTicks(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/FoxEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/FoxEntity.java index 1ebbcb22..6ea49672 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/FoxEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/FoxEntity.java @@ -1,11 +1,62 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AnimalEntity; import de.pxav.kelp.core.entity.util.FoxType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface FoxEntity extends AnimalEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static FoxEntity create(KelpLocation location) { + return (FoxEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static FoxEntity from(Entity entity) { + return (FoxEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.FOX; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + FoxType getFoxType(); void setFoxType(FoxType foxType); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/GhastEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/GhastEntity.java index 245d86c4..adae9985 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/GhastEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/GhastEntity.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MobileEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface GhastEntity extends MobileEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static GhastEntity create(KelpLocation location) { + return (GhastEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static GhastEntity from(Entity entity) { + return (GhastEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.GHAST; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/GuardianEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/GuardianEntity.java index 80aa2daa..6480cc57 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/GuardianEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/GuardianEntity.java @@ -1,10 +1,13 @@ package de.pxav.kelp.core.entity.type; import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityFactory; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; /** * A class description goes here. @@ -13,9 +16,50 @@ */ public interface GuardianEntity extends MonsterEntity { - static ElderGuardianEntity create(KelpLocation location) { - return (ElderGuardianEntity) KelpPlugin.getInjector().getInstance(KelpEntityFactory.class) - .newKelpEntity(KelpEntityType.ELDER_GUARDIAN, location.getBukkitLocation()); + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static GuardianEntity create(KelpLocation location) { + return (GuardianEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static GuardianEntity from(Entity entity) { + return (GuardianEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.GUARDIAN; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); } } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/HoglinEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/HoglinEntity.java index d33e5363..bfa5aca4 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/HoglinEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/HoglinEntity.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface HoglinEntity extends BreedableAnimalEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static HoglinEntity create(KelpLocation location) { + return (HoglinEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static HoglinEntity from(Entity entity) { + return (HoglinEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.HOGLIN; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + boolean isImmuneToZombification(); void setImmuneToZombification(boolean immuneToZombification); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/HopperMinecart.java b/core/src/main/java/de/pxav/kelp/core/entity/type/HopperMinecart.java index c1d486c5..385bd629 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/HopperMinecart.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/HopperMinecart.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MinecartEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface HopperMinecart extends MinecartEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static HopperMinecart create(KelpLocation location) { + return (HopperMinecart) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static HopperMinecart from(Entity entity) { + return (HopperMinecart) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.MINECART_HOPPER; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + boolean isHopperEnabled(); HopperMinecart setHopperEnabled(boolean enabled); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/HorseEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/HorseEntity.java index ce372c92..fa894011 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/HorseEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/HorseEntity.java @@ -1,12 +1,64 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AbstractHorseEntity; import de.pxav.kelp.core.entity.util.HorseColor; import de.pxav.kelp.core.entity.util.HorseStyle; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.type.HorseInventory; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface HorseEntity extends AbstractHorseEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static HorseEntity create(KelpLocation location) { + return (HorseEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static HorseEntity from(Entity entity) { + return (HorseEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.HORSE; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + HorseInventory getInventory(); HorseColor getHorseColor(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/HuskEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/HuskEntity.java index f6ce476c..8078a994 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/HuskEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/HuskEntity.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; import org.bukkit.entity.Husk; public interface HuskEntity extends ZombieEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static HuskEntity create(KelpLocation location) { + return (HuskEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static HuskEntity from(Entity entity) { + return (HuskEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.HUSK; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + boolean isConverting(); int getConversionTime(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/IllusionerEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/IllusionerEntity.java index 7dfd74fb..da6058bb 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/IllusionerEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/IllusionerEntity.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.IllagerEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface IllusionerEntity extends IllagerEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static IllusionerEntity create(KelpLocation location) { + return (IllusionerEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static IllusionerEntity from(Entity entity) { + return (IllusionerEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.ILLUSIONER; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/IronGolemEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/IronGolemEntity.java index 17d1f363..420e7f09 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/IronGolemEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/IronGolemEntity.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.GolemEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface IronGolemEntity extends GolemEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static IronGolemEntity create(KelpLocation location) { + return (IronGolemEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static IronGolemEntity from(Entity entity) { + return (IronGolemEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.IRON_GOLEM; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + boolean isPlayerCreated(); IronGolemEntity setPlayerCreated(boolean playerCreated); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ItemFrameEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ItemFrameEntity.java index b569b48a..6458ec33 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ItemFrameEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ItemFrameEntity.java @@ -1,13 +1,65 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.HangingEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.item.KelpItem; +import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.Rotation; +import org.bukkit.entity.Entity; import org.bukkit.entity.ItemFrame; // hanging, attachable public interface ItemFrameEntity extends HangingEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ItemFrameEntity create(KelpLocation location) { + return (ItemFrameEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static ItemFrameEntity from(Entity entity) { + return (ItemFrameEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.ITEM_FRAME; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + Rotation getItemRotation(); ItemFrameEntity setItemRotation(Rotation rotation); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/KillerBunnyEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/KillerBunnyEntity.java index 4a1caacc..5514d0ce 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/KillerBunnyEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/KillerBunnyEntity.java @@ -1,4 +1,58 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; + public interface KillerBunnyEntity extends RabbitEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static KillerBunnyEntity create(KelpLocation location) { + return (KillerBunnyEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static KillerBunnyEntity from(Entity entity) { + return (KillerBunnyEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.KILLER_BUNNY; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/LargeFireball.java b/core/src/main/java/de/pxav/kelp/core/entity/type/LargeFireball.java index 4b4b2bba..ab43db05 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/LargeFireball.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/LargeFireball.java @@ -1,4 +1,58 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; + public interface LargeFireball extends ThrownFireballEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static LargeFireball create(KelpLocation location) { + return (LargeFireball) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static LargeFireball from(Entity entity) { + return (LargeFireball) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.LARGE_FIREBALL; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/LeashHitchEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/LeashHitchEntity.java index 49a0dd73..b5ded402 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/LeashHitchEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/LeashHitchEntity.java @@ -1,9 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.HangingEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface LeashHitchEntity extends HangingEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static LeashHitchEntity create(KelpLocation location) { + return (LeashHitchEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static LeashHitchEntity from(Entity entity) { + return (LeashHitchEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.LEASH_HITCH; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/LightningEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/LightningEntity.java index f834cdc2..c9ba58ee 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/LightningEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/LightningEntity.java @@ -1,9 +1,60 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface LightningEntity extends KelpEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static LightningEntity create(KelpLocation location) { + return (LightningEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static LightningEntity from(Entity entity) { + return (LightningEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.LIGHTNING; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + boolean isEffect(); } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/LlamaEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/LlamaEntity.java index 1d6d09a9..1be1054b 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/LlamaEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/LlamaEntity.java @@ -1,11 +1,63 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AbstractHorseEntity; import de.pxav.kelp.core.entity.util.LlamaColor; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.type.LlamaInventory; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface LlamaEntity extends AbstractHorseEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static LlamaEntity create(KelpLocation location) { + return (LlamaEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static LlamaEntity from(Entity entity) { + return (LlamaEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.LLAMA; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + LlamaInventory getInventory(); int getLlamaStrength(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/LlamaSpitEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/LlamaSpitEntity.java index 38e6109c..ef0fe14c 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/LlamaSpitEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/LlamaSpitEntity.java @@ -1,8 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface LlamaSpitEntity extends KelpProjectile { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static LlamaSpitEntity create(KelpLocation location) { + return (LlamaSpitEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static LlamaSpitEntity from(Entity entity) { + return (LlamaSpitEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.LLAMA_SPIT; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/MagmaCubeEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/MagmaCubeEntity.java index f3f6e64c..92111015 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/MagmaCubeEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/MagmaCubeEntity.java @@ -1,7 +1,58 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; + public interface MagmaCubeEntity extends SlimeEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static MagmaCubeEntity create(KelpLocation location) { + return (MagmaCubeEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static MagmaCubeEntity from(Entity entity) { + return (MagmaCubeEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.MAGMA_CUBE; + } + @Override + default KelpEntityType getType() { + return getEntityType(); + } } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/MuleEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/MuleEntity.java index 3ee8804e..c9e55971 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/MuleEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/MuleEntity.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.ChestedHorse; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface MuleEntity extends ChestedHorse { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static MuleEntity create(KelpLocation location) { + return (MuleEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static MuleEntity from(Entity entity) { + return (MuleEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.MULE; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/MushroomCowEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/MushroomCowEntity.java index 1cc95fce..9584b3df 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/MushroomCowEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/MushroomCowEntity.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.util.MushroomCowType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface MushroomCowEntity extends CowEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static MushroomCowEntity create(KelpLocation location) { + return (MushroomCowEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static MushroomCowEntity from(Entity entity) { + return (MushroomCowEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.MUSHROOM_COW; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + MushroomCowType getMushroomType(); MushroomCowEntity setMushroomType(MushroomCowType mushroomType); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/OcelotEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/OcelotEntity.java index 0e9038bb..2975e888 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/OcelotEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/OcelotEntity.java @@ -1,8 +1,60 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AnimalEntity; import de.pxav.kelp.core.entity.type.general.TameableAnimal; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface OcelotEntity extends AnimalEntity, TameableAnimal { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static OcelotEntity create(KelpLocation location) { + return (OcelotEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static OcelotEntity from(Entity entity) { + return (OcelotEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.OCELOT; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PaintingEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PaintingEntity.java index 745c6b66..16062fcb 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/PaintingEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PaintingEntity.java @@ -1,10 +1,62 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.HangingEntity; import de.pxav.kelp.core.entity.util.PaintingType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface PaintingEntity extends HangingEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static PaintingEntity create(KelpLocation location) { + return (PaintingEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static PaintingEntity from(Entity entity) { + return (PaintingEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.PAINTING; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + PaintingEntity setPaintingType(PaintingType type); PaintingType getPaintingType(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PandaEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PandaEntity.java index 7dd866c3..f6f40804 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/PandaEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PandaEntity.java @@ -1,12 +1,64 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AnimalEntity; import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; import de.pxav.kelp.core.entity.type.general.TameableAnimal; import de.pxav.kelp.core.entity.util.PandaGene; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface PandaEntity extends TameableAnimal, BreedableAnimalEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static PandaEntity create(KelpLocation location) { + return (PandaEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static PandaEntity from(Entity entity) { + return (PandaEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.PANDA; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + PandaEntity setMainGene(PandaGene prominentGene); PandaEntity setHiddenGene(PandaGene hiddenGene); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ParrotEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ParrotEntity.java index fc86294a..6cd76f1a 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ParrotEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ParrotEntity.java @@ -1,11 +1,63 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AnimalEntity; import de.pxav.kelp.core.entity.type.general.TameableAnimal; import de.pxav.kelp.core.entity.util.ParrotType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface ParrotEntity extends AnimalEntity, TameableAnimal { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ParrotEntity create(KelpLocation location) { + return (ParrotEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static ParrotEntity from(Entity entity) { + return (ParrotEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.PARROT; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + ParrotEntity setParrotType(ParrotType parrotType); ParrotType getParrotType(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PhantomEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PhantomEntity.java index b52e3ec9..d170a86d 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/PhantomEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PhantomEntity.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MobileEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface PhantomEntity extends MobileEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static PhantomEntity create(KelpLocation location) { + return (PhantomEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static PhantomEntity from(Entity entity) { + return (PhantomEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.PHANTOM; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + int getPhantomSize(); PhantomEntity setPhantomSize(int phantomSize); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PigEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PigEntity.java index 74cda716..7153b448 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/PigEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PigEntity.java @@ -1,12 +1,64 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AnimalEntity; import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; import de.pxav.kelp.core.entity.type.general.VehicleEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; import org.bukkit.entity.Pig; public interface PigEntity extends AnimalEntity, BreedableAnimalEntity, VehicleEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static PigEntity create(KelpLocation location) { + return (PigEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static PigEntity from(Entity entity) { + return (PigEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.PIG; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + boolean hasSaddle(); PigEntity setSaddled(boolean saddled); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PigZombie.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PigZombie.java index ac2fccfc..79360d20 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/PigZombie.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PigZombie.java @@ -1,7 +1,60 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; + public interface PigZombie extends ZombieEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static PigZombie create(KelpLocation location) { + return (PigZombie) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static PigZombie from(Entity entity) { + return (PigZombie) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.PIG_ZOMBIE; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + int getAnger(); void setAnger(int anger); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PiglinBruteEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PiglinBruteEntity.java index 98cc62d5..8dbadbdd 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/PiglinBruteEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PiglinBruteEntity.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AbstractPiglin; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface PiglinBruteEntity extends AbstractPiglin { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static PiglinBruteEntity create(KelpLocation location) { + return (PiglinBruteEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static PiglinBruteEntity from(Entity entity) { + return (PiglinBruteEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.PIGLIN_BRUTE; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PiglinEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PiglinEntity.java index f8c9f0bb..14ca9540 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/PiglinEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PiglinEntity.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AbstractPiglin; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface PiglinEntity extends AbstractPiglin { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static PiglinEntity create(KelpLocation location) { + return (PiglinEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static PiglinEntity from(Entity entity) { + return (PiglinEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.PIGLIN; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + boolean isAbleToHunt(); PiglinEntity setAbleToHunt(boolean ableToHunt); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PillagerEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PillagerEntity.java index 93faa975..accc3a6f 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/PillagerEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PillagerEntity.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.IllagerEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface PillagerEntity extends IllagerEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static PillagerEntity create(KelpLocation location) { + return (PillagerEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static PillagerEntity from(Entity entity) { + return (PillagerEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.PILLAGER; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PolarBear.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PolarBear.java index 3be2ed48..68c61e76 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/PolarBear.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PolarBear.java @@ -1,7 +1,60 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AnimalEntity; import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface PolarBear extends AnimalEntity, BreedableAnimalEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static PolarBear create(KelpLocation location) { + return (PolarBear) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static PolarBear from(Entity entity) { + return (PolarBear) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.POLAR_BEAR; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PoweredMinecart.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PoweredMinecart.java index 6c4e491a..bb817140 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/PoweredMinecart.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PoweredMinecart.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MinecartEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface PoweredMinecart extends MinecartEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static PoweredMinecart create(KelpLocation location) { + return (PoweredMinecart) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static PoweredMinecart from(Entity entity) { + return (PoweredMinecart) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.MINECART_FURNACE; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + int getFuelTicks(); PoweredMinecart setFuelTicks(int fuelTicks); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PrimedTntEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PrimedTntEntity.java index a4cd10d8..7a89ac9f 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/PrimedTntEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PrimedTntEntity.java @@ -1,12 +1,63 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.ExplosiveEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; import org.bukkit.entity.TNTPrimed; // explosive public interface PrimedTntEntity extends ExplosiveEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static PrimedTntEntity create(KelpLocation location) { + return (PrimedTntEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static PrimedTntEntity from(Entity entity) { + return (PrimedTntEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.PRIMED_TNT; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + int getFuseTicks(); PrimedTntEntity setFuseTicks(int fuseTicks); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/PufferfishEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/PufferfishEntity.java index e8817414..351aa4d9 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/PufferfishEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/PufferfishEntity.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.WaterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface PufferfishEntity extends WaterEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static PufferfishEntity create(KelpLocation location) { + return (PufferfishEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static PufferfishEntity from(Entity entity) { + return (PufferfishEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.PUFFERFISH; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + int getPuffState(); PufferfishEntity setPuffState(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/RabbitEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/RabbitEntity.java index 8f755f75..87e473a6 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/RabbitEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/RabbitEntity.java @@ -1,11 +1,63 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AnimalEntity; import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; import de.pxav.kelp.core.entity.util.RabbitType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface RabbitEntity extends AnimalEntity, BreedableAnimalEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static RabbitEntity create(KelpLocation location) { + return (RabbitEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static RabbitEntity from(Entity entity) { + return (RabbitEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.RABBIT; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + RabbitType getRabbitType(); RabbitEntity setRabbitType(RabbitType rabbitType); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/RavagerEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/RavagerEntity.java index 6100be06..8cdaa676 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/RavagerEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/RavagerEntity.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.RaidingEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface RavagerEntity extends RaidingEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static RavagerEntity create(KelpLocation location) { + return (RavagerEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static RavagerEntity from(Entity entity) { + return (RavagerEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.RAVAGER; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/RideableMinecart.java b/core/src/main/java/de/pxav/kelp/core/entity/type/RideableMinecart.java index 0dd8ae4e..4de1da77 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/RideableMinecart.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/RideableMinecart.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MinecartEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface RideableMinecart extends MinecartEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static RideableMinecart create(KelpLocation location) { + return (RideableMinecart) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static RideableMinecart from(Entity entity) { + return (RideableMinecart) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.MINECART; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SalmonEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SalmonEntity.java index 0a062a0a..433be0cc 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/SalmonEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SalmonEntity.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.WaterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface SalmonEntity extends WaterEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static SalmonEntity create(KelpLocation location) { + return (SalmonEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static SalmonEntity from(Entity entity) { + return (SalmonEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.SALMON; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SheepEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SheepEntity.java index a95e2520..c07cc926 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/SheepEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SheepEntity.java @@ -1,6 +1,7 @@ package de.pxav.kelp.core.entity.type; import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AnimalEntity; import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; @@ -11,14 +12,50 @@ public interface SheepEntity extends AnimalEntity, BreedableAnimalEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ static SheepEntity create(KelpLocation location) { return (SheepEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) - .newKelpEntity(KelpEntityType.SHEEP, location.getBukkitLocation()); + .newKelpEntity(getEntityType(), location.getBukkitLocation()); } - static SheepEntity from(Entity sheep) { + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static SheepEntity from(Entity entity) { return (SheepEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) - .getKelpEntity(sheep); + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.SHEEP; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); } boolean isSheared(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ShulkerBulletEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ShulkerBulletEntity.java index eb838304..16c7d41f 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ShulkerBulletEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ShulkerBulletEntity.java @@ -1,11 +1,62 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; import org.bukkit.entity.ShulkerBullet; public interface ShulkerBulletEntity extends KelpProjectile { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ShulkerBulletEntity create(KelpLocation location) { + return (ShulkerBulletEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static ShulkerBulletEntity from(Entity entity) { + return (ShulkerBulletEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.SHULKER_BULLET; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + KelpEntity getTarget(); void setTarget(KelpEntity target); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ShulkerEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ShulkerEntity.java index d0b81804..adacf734 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ShulkerEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ShulkerEntity.java @@ -1,10 +1,62 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.GolemEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface ShulkerEntity extends GolemEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ShulkerEntity create(KelpLocation location) { + return (ShulkerEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static ShulkerEntity from(Entity entity) { + return (ShulkerEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.SHULKER; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + Color getDyeColor(); ShulkerEntity setDyeColor(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SilverfishEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SilverfishEntity.java index 391c1200..df166f00 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/SilverfishEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SilverfishEntity.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface SilverfishEntity extends MonsterEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static SilverfishEntity create(KelpLocation location) { + return (SilverfishEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static SilverfishEntity from(Entity entity) { + return (SilverfishEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.ZOGLIN; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SkeletonEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SkeletonEntity.java index 0676c6d2..3a9d814c 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/SkeletonEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SkeletonEntity.java @@ -1,10 +1,62 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.Difficulty; +import org.bukkit.entity.Entity; public interface SkeletonEntity extends MonsterEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static SkeletonEntity create(KelpLocation location) { + return (SkeletonEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static SkeletonEntity from(Entity entity) { + return (SkeletonEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.SKELETON; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + //todo maybe check how many arrows left if possible in minecraft @Override diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SkeletonHorseEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SkeletonHorseEntity.java index a9186048..026f1472 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/SkeletonHorseEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SkeletonHorseEntity.java @@ -1,10 +1,62 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AbstractHorseEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.craftbukkit.v1_16_R3.entity.CraftAnimals; import org.bukkit.craftbukkit.v1_16_R3.entity.CraftHanging; +import org.bukkit.entity.Entity; import org.bukkit.entity.SkeletonHorse; public interface SkeletonHorseEntity extends AbstractHorseEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static SkeletonHorseEntity create(KelpLocation location) { + return (SkeletonHorseEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static SkeletonHorseEntity from(Entity entity) { + return (SkeletonHorseEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.SKELETON_HORSE; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SlimeEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SlimeEntity.java index 2b36606d..f996177b 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/SlimeEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SlimeEntity.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MobileEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface SlimeEntity extends MobileEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static SlimeEntity create(KelpLocation location) { + return (SlimeEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static SlimeEntity from(Entity entity) { + return (SlimeEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.SLIME; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + int getSlimeSize(); SlimeEntity setSlimeSize(int slimeSize); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SmallFireballEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SmallFireballEntity.java index be30fa9b..e5737091 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/SmallFireballEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SmallFireballEntity.java @@ -1,5 +1,58 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; + public interface SmallFireballEntity extends ThrownFireballEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static SmallFireballEntity create(KelpLocation location) { + return (SmallFireballEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static SmallFireballEntity from(Entity entity) { + return (SmallFireballEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.SMALL_FIREBALL; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SnowmanEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SnowmanEntity.java index e6c18701..0a56597d 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/SnowmanEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SnowmanEntity.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.GolemEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface SnowmanEntity extends GolemEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static SnowmanEntity create(KelpLocation location) { + return (SnowmanEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static SnowmanEntity from(Entity entity) { + return (SnowmanEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.SNOWMAN; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + boolean hasPumpkin(); SnowmanEntity setPumpkinHead(boolean pumpkinHead); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SpawnerMinecart.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SpawnerMinecart.java index b3a05e55..e03db823 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/SpawnerMinecart.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SpawnerMinecart.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MinecartEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface SpawnerMinecart extends MinecartEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static SpawnerMinecart create(KelpLocation location) { + return (SpawnerMinecart) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static SpawnerMinecart from(Entity entity) { + return (SpawnerMinecart) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.MINECART_MOB_SPAWNER; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SpectralArrowEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SpectralArrowEntity.java index 250824d9..482539f5 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/SpectralArrowEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SpectralArrowEntity.java @@ -1,10 +1,62 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AbstractArrowEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; // subtype of abstract arrow public interface SpectralArrowEntity extends AbstractArrowEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static SpectralArrowEntity create(KelpLocation location) { + return (SpectralArrowEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static SpectralArrowEntity from(Entity entity) { + return (SpectralArrowEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.SPECTRAL_ARROW; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + int getGlowingTicks(); SpectralArrowEntity setGlowingTicks(int durationInTicks); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SpiderEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SpiderEntity.java index 797d4385..24495643 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/SpiderEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SpiderEntity.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface SpiderEntity extends MonsterEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static SpiderEntity create(KelpLocation location) { + return (SpiderEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static SpiderEntity from(Entity entity) { + return (SpiderEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.SPIDER; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/SquidEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/SquidEntity.java index 1334a0c4..439e73e9 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/SquidEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/SquidEntity.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.WaterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface SquidEntity extends WaterEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static SquidEntity create(KelpLocation location) { + return (SquidEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static SquidEntity from(Entity entity) { + return (SquidEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.SQUID; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/StorageMinecart.java b/core/src/main/java/de/pxav/kelp/core/entity/type/StorageMinecart.java index 12be50ea..4c6dd169 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/StorageMinecart.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/StorageMinecart.java @@ -1,10 +1,62 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MinecartEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.type.StorageInventory; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface StorageMinecart extends MinecartEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static StorageMinecart create(KelpLocation location) { + return (StorageMinecart) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static StorageMinecart from(Entity entity) { + return (StorageMinecart) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.MINECART_CHEST; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + StorageInventory getInventory(); } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/StraySkeletonEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/StraySkeletonEntity.java index 7702c50e..13b4c002 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/StraySkeletonEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/StraySkeletonEntity.java @@ -1,5 +1,58 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; + public interface StraySkeletonEntity extends SkeletonEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static StraySkeletonEntity create(KelpLocation location) { + return (StraySkeletonEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static StraySkeletonEntity from(Entity entity) { + return (StraySkeletonEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.STRAY_SKELETON; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/StriderEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/StriderEntity.java index d0643a58..1c9c4d2d 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/StriderEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/StriderEntity.java @@ -1,10 +1,62 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AnimalEntity; import de.pxav.kelp.core.entity.type.general.BreedableAnimalEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface StriderEntity extends AnimalEntity, BreedableAnimalEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static StriderEntity create(KelpLocation location) { + return (StriderEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static StriderEntity from(Entity entity) { + return (StriderEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.STRIDER; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + boolean isShivering(); StriderEntity setShivering(boolean shivering); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownChickenEggEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownChickenEggEntity.java index 5602b32b..65c6587f 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownChickenEggEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownChickenEggEntity.java @@ -1,10 +1,62 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; import de.pxav.kelp.core.common.MathUtils; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface ThrownChickenEggEntity extends KelpProjectile { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ThrownChickenEggEntity create(KelpLocation location) { + return (ThrownChickenEggEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static ThrownChickenEggEntity from(Entity entity) { + return (ThrownChickenEggEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.CHICKEN_EGG; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + default boolean spawnsChicken() { return MathUtils.perCentChance(0.125); } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownEnderPearlEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownEnderPearlEntity.java index 9027eebd..c1d71fb6 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownEnderPearlEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownEnderPearlEntity.java @@ -1,8 +1,60 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.entity.EnderPearl; +import org.bukkit.entity.Entity; public interface ThrownEnderPearlEntity extends KelpProjectile { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ThrownEnderPearlEntity create(KelpLocation location) { + return (ThrownEnderPearlEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static ThrownEnderPearlEntity from(Entity entity) { + return (ThrownEnderPearlEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.ENDER_PEARL; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownExperienceBottleEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownExperienceBottleEntity.java index 047c0bec..3b682899 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownExperienceBottleEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownExperienceBottleEntity.java @@ -1,7 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface ThrownExperienceBottleEntity extends KelpProjectile { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ThrownExperienceBottleEntity create(KelpLocation location) { + return (ThrownExperienceBottleEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static ThrownExperienceBottleEntity from(Entity entity) { + return (ThrownExperienceBottleEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.THROWN_EXP_BOTTLE; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownFireballEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownFireballEntity.java index 7efc9691..97ab424b 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownFireballEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownFireballEntity.java @@ -1,10 +1,62 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.ExplosiveEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; import org.bukkit.util.Vector; public interface ThrownFireballEntity extends ExplosiveEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ThrownFireballEntity create(KelpLocation location) { + return (ThrownFireballEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static ThrownFireballEntity from(Entity entity) { + return (ThrownFireballEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.FIREBALL; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + Vector getDirection(); ThrownFireballEntity setDirection(Vector vector); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownPotionEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownPotionEntity.java index 474d7739..a09c7fe8 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownPotionEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownPotionEntity.java @@ -1,13 +1,65 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.KelpProjectile; import de.pxav.kelp.core.entity.util.potion.KelpPotionEffectType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.item.KelpItem; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; import java.util.Collection; public interface ThrownPotionEntity extends KelpProjectile { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ThrownPotionEntity create(KelpLocation location) { + return (ThrownPotionEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static ThrownPotionEntity from(Entity entity) { + return (ThrownPotionEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.SPLASH_POTION; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + Collection getPotionEffects(); KelpItem getItem(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownSnowballEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownSnowballEntity.java index 54bef011..c9b13545 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownSnowballEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownSnowballEntity.java @@ -1,7 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.KelpProjectile; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface ThrownSnowballEntity extends KelpProjectile { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ThrownSnowballEntity create(KelpLocation location) { + return (ThrownSnowballEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static ThrownSnowballEntity from(Entity entity) { + return (ThrownSnowballEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.SNOWBALL; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownTridentEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownTridentEntity.java index f828f910..dc37929c 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownTridentEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownTridentEntity.java @@ -1,7 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AbstractArrowEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface ThrownTridentEntity extends AbstractArrowEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ThrownTridentEntity create(KelpLocation location) { + return (ThrownTridentEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static ThrownTridentEntity from(Entity entity) { + return (ThrownTridentEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.TRIDENT; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownWitherSkullEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownWitherSkullEntity.java index 72c79fff..3f9ee145 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownWitherSkullEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ThrownWitherSkullEntity.java @@ -1,7 +1,60 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; + public interface ThrownWitherSkullEntity extends ThrownFireballEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ThrownWitherSkullEntity create(KelpLocation location) { + return (ThrownWitherSkullEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static ThrownWitherSkullEntity from(Entity entity) { + return (ThrownWitherSkullEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.WITHER_SKULL; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + boolean isCharged(); ThrownWitherSkullEntity setCharged(boolean charged); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/TraderLlamaEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/TraderLlamaEntity.java index e6960f55..da0a132d 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/TraderLlamaEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/TraderLlamaEntity.java @@ -1,5 +1,58 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; + public interface TraderLlamaEntity extends LlamaEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static TraderLlamaEntity create(KelpLocation location) { + return (TraderLlamaEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static TraderLlamaEntity from(Entity entity) { + return (TraderLlamaEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.TRADER_LLAMA; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/TropicalFishEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/TropicalFishEntity.java index 60876f17..6f7710d9 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/TropicalFishEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/TropicalFishEntity.java @@ -1,10 +1,62 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AbstractFishEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface TropicalFishEntity extends AbstractFishEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static TropicalFishEntity create(KelpLocation location) { + return (TropicalFishEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static TropicalFishEntity from(Entity entity) { + return (TropicalFishEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.TROPICAL_FISH; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + // TODO: Add patterns! Color getBodyDyeColor(); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/TurtleEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/TurtleEntity.java index ee9d84bf..87f1f437 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/TurtleEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/TurtleEntity.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AnimalEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface TurtleEntity extends AnimalEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static TurtleEntity create(KelpLocation location) { + return (TurtleEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static TurtleEntity from(Entity entity) { + return (TurtleEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.TURTLE; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/VexEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/VexEntity.java index 4d16b3af..2896e36c 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/VexEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/VexEntity.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface VexEntity extends MonsterEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static VexEntity create(KelpLocation location) { + return (VexEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static VexEntity from(Entity entity) { + return (VexEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.ZOGLIN; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + boolean isCharging(); VexEntity setCharging(boolean charging); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/VillagerEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/VillagerEntity.java index 0e1931bd..b990a699 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/VillagerEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/VillagerEntity.java @@ -1,11 +1,63 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AbstractVillager; import de.pxav.kelp.core.entity.util.VillagerProfession; import de.pxav.kelp.core.entity.util.VillagerType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface VillagerEntity extends AbstractVillager { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static VillagerEntity create(KelpLocation location) { + return (VillagerEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static VillagerEntity from(Entity entity) { + return (VillagerEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.VILLAGER; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + VillagerProfession getProfession(); VillagerEntity setProfession(VillagerProfession profession); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/VindicatorEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/VindicatorEntity.java index 7ebd8832..a38186f7 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/VindicatorEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/VindicatorEntity.java @@ -1,7 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.IllagerEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface VindicatorEntity extends IllagerEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static VindicatorEntity create(KelpLocation location) { + return (VindicatorEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static VindicatorEntity from(Entity entity) { + return (VindicatorEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.VINDICATOR; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/WanderingTraderEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/WanderingTraderEntity.java index 6b241734..35c53d18 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/WanderingTraderEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/WanderingTraderEntity.java @@ -1,9 +1,61 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AbstractVillager; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface WanderingTraderEntity extends AbstractVillager { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static WanderingTraderEntity create(KelpLocation location) { + return (WanderingTraderEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static WanderingTraderEntity from(Entity entity) { + return (WanderingTraderEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.WANDERING_TRADER; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + int getDespawnDelay(); WanderingTraderEntity setDespawnDelay(int despawnDelay); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/WitchEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/WitchEntity.java index 1e286bab..141be594 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/WitchEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/WitchEntity.java @@ -1,7 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface WitchEntity extends MonsterEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static WitchEntity create(KelpLocation location) { + return (WitchEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static WitchEntity from(Entity entity) { + return (WitchEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.WITCH; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/WitherEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/WitherEntity.java index 7fa8697b..a5c8c1af 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/WitherEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/WitherEntity.java @@ -1,9 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface WitherEntity extends MonsterEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static WitherEntity create(KelpLocation location) { + return (WitherEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static WitherEntity from(Entity entity) { + return (WitherEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.WITHER; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/WitherSkeletonEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/WitherSkeletonEntity.java index ffa18358..2e5f2950 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/WitherSkeletonEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/WitherSkeletonEntity.java @@ -1,5 +1,58 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; + public interface WitherSkeletonEntity extends SkeletonEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static WitherSkeletonEntity create(KelpLocation location) { + return (WitherSkeletonEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static WitherSkeletonEntity from(Entity entity) { + return (WitherSkeletonEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.WITHER_SKELETON; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/WolfEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/WolfEntity.java index ca518cfc..30151237 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/WolfEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/WolfEntity.java @@ -1,11 +1,63 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AnimalEntity; import de.pxav.kelp.core.entity.type.general.TameableAnimal; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.inventory.metadata.Color; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface WolfEntity extends AnimalEntity, TameableAnimal { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static WolfEntity create(KelpLocation location) { + return (WolfEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static WolfEntity from(Entity entity) { + return (WolfEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.WOLF; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + boolean isAngry(); WolfEntity setAngry(boolean angry); diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ZoglinEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ZoglinEntity.java index 1150346f..8e2571f3 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ZoglinEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ZoglinEntity.java @@ -1,7 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface ZoglinEntity extends MonsterEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ZoglinEntity create(KelpLocation location) { + return (ZoglinEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static ZoglinEntity from(Entity entity) { + return (ZoglinEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.ZOGLIN; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieEntity.java index c74af773..df5b3235 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieEntity.java @@ -1,23 +1,62 @@ package de.pxav.kelp.core.entity.type; import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityFactory; import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AgeableEntity; import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.Difficulty; +import org.bukkit.entity.Entity; public interface ZombieEntity extends AgeableEntity, MonsterEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ static ZombieEntity create(KelpLocation location) { - return (ZombieEntity) KelpPlugin.getInjector().getInstance(KelpEntityFactory.class) - .newKelpEntity(KelpEntityType.ZOMBIE, location.getBukkitLocation()); + return (ZombieEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static ZombieEntity from(Entity entity) { + return (ZombieEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.ZOMBIE; } @Override default KelpEntityType getType() { - return KelpEntityType.ZOMBIE; + return getEntityType(); } @Override diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieGiant.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieGiant.java index 5c854d20..5d769029 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieGiant.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieGiant.java @@ -1,6 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.MonsterEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface ZombieGiant extends MonsterEntity { + + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ZombieGiant create(KelpLocation location) { + return (ZombieGiant) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return The kelp instance of the given bukkit entity. + */ + static ZombieGiant from(Entity entity) { + return (ZombieGiant) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.ZOMBIE_GIANT; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieHorse.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieHorse.java index a66c08c7..d0d0fbc5 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieHorse.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieHorse.java @@ -1,7 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.type.general.AbstractHorseEntity; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; public interface ZombieHorse extends AbstractHorseEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ZombieHorse create(KelpLocation location) { + return (ZombieHorse) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(getEntityType(), location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static ZombieHorse from(Entity entity) { + return (ZombieHorse) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + static KelpEntityType getEntityType() { + return KelpEntityType.ZOMBIE_HORSE; + } + + @Override + default KelpEntityType getType() { + return getEntityType(); + } + } diff --git a/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieVillagerEntity.java b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieVillagerEntity.java index 506642c0..bab03f86 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieVillagerEntity.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/type/ZombieVillagerEntity.java @@ -1,11 +1,59 @@ package de.pxav.kelp.core.entity.type; +import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; +import de.pxav.kelp.core.entity.KelpEntityType; import de.pxav.kelp.core.entity.util.VillagerProfession; import de.pxav.kelp.core.entity.util.VillagerType; +import de.pxav.kelp.core.entity.version.EntityTypeVersionTemplate; +import de.pxav.kelp.core.world.KelpLocation; +import org.bukkit.entity.Entity; // sub type of zombie public interface ZombieVillagerEntity extends ZombieEntity { + /** + * Creates a new entity of this type at the given location. + * + * While this creates a new instance, it won't actually spawn the entity. + * You can first do some modifications on it and then call the + * {@link KelpEntity#spawn()} method. + * + * If you don't want to create a new entity, but just a new kelp + * entity instance based of an existing bukkit entity, you can use + * {@link #from(Entity)} instead. + * + * @param location The location, where the entity should be spawned later. + * @return A new instance of a sheep entity. + */ + static ZombieVillagerEntity create(KelpLocation location) { + return (ZombieVillagerEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .newKelpEntity(KelpEntityType.ZOMBIE_VILLAGER, location.getBukkitLocation()); + } + + /** + * Takes a bukkit entity and converts it to a kelp entity of the same type. + * + * This can be used if you are for example handling an event that returns a bukkit entity, + * but you want to use a kelp entity for your operations. You can also use + * the more general method provided by {@link de.pxav.kelp.core.entity.KelpEntity the + * kelp entity base class}: {@link de.pxav.kelp.core.entity.KelpEntity#from(Entity)}, + * but this way you don't have to cast your entity to the specific type + * manually. + * + * @param entity The entity you want to convert. + * @return + */ + static ZombieVillagerEntity from(Entity entity) { + return (ZombieVillagerEntity) KelpPlugin.getInjector().getInstance(EntityTypeVersionTemplate.class) + .getKelpEntity(entity); + } + + @Override + default KelpEntityType getType() { + return KelpEntityType.ZOMBIE_VILLAGER; + } + ZombieVillagerEntity setConversionTime(int conversionTime); ZombieVillagerEntity setVillagerType(VillagerType villagerType); From 09a915f74b29b38c7d48ef5f5c679eb518f5ac93 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 24 May 2021 13:24:42 +0200 Subject: [PATCH 320/325] Add documentation to EntityTypeVersionTemplate --- .../version/EntityTypeVersionTemplate.java | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/entity/version/EntityTypeVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/entity/version/EntityTypeVersionTemplate.java index 56af60c6..89bb1775 100644 --- a/core/src/main/java/de/pxav/kelp/core/entity/version/EntityTypeVersionTemplate.java +++ b/core/src/main/java/de/pxav/kelp/core/entity/version/EntityTypeVersionTemplate.java @@ -3,19 +3,42 @@ import de.pxav.kelp.core.application.KelpVersionTemplate; import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.KelpEntityType; +import de.pxav.kelp.core.world.KelpLocation; import org.bukkit.Location; import org.bukkit.entity.Entity; /** - * A class description goes here. + * This version template handles the conversion between kelp and bukkit + * entity types. It allows you to convert and create kelp entities and is + * used by other methods in the background such as the static factories + * in the entity classes. * * @author pxav */ @KelpVersionTemplate public abstract class EntityTypeVersionTemplate { + /** + * Creates a new kelp entity instance with a specific type at a specific location. + * This method won't spawn the entity, so that you can still do modifications + * on it as needed. + * + * @param entityType The type of the entity you want to spawn. + * @param location The location, where the entity should be spawned at later. + * @return The new kelp entity instance. + */ public abstract KelpEntity newKelpEntity(KelpEntityType entityType, Location location); + /** + * Takes any bukkit entity and converts it to a new kelp entity instance. + * + * This is used by the static methods in the entity classes such as + * {@link de.pxav.kelp.core.entity.type.SheepEntity#from(Entity)}, so if you + * are an application developer you should prefer those methods over this one. + * + * @param bukkitEntity The bukkit entity you want to convert. + * @return The instance of the kelp entity equivalent to the given bukkit entity. + */ public abstract KelpEntity getKelpEntity(Entity bukkitEntity); } From b3e11787d15893403a4902d1d99571213b9646a1 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 24 May 2021 13:51:15 +0200 Subject: [PATCH 321/325] Add method to get all entities in a world --- .../de/pxav/kelp/core/world/KelpWorld.java | 13 ++++++++++++ .../world/version/WorldVersionTemplate.java | 12 +++++++++++ .../world/VersionedWorld.java | 21 +++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/core/src/main/java/de/pxav/kelp/core/world/KelpWorld.java b/core/src/main/java/de/pxav/kelp/core/world/KelpWorld.java index 45046bfc..fd042115 100644 --- a/core/src/main/java/de/pxav/kelp/core/world/KelpWorld.java +++ b/core/src/main/java/de/pxav/kelp/core/world/KelpWorld.java @@ -1,6 +1,7 @@ package de.pxav.kelp.core.world; import de.pxav.kelp.core.KelpPlugin; +import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.type.DroppedItemEntity; import de.pxav.kelp.core.entity.util.ItemDropType; import de.pxav.kelp.core.inventory.item.KelpItem; @@ -375,6 +376,18 @@ public Collection getPlayers() { return versionTemplate.getPlayers(this); } + /** + * Gets all entities that are currently on the given world. + * This includes players as well as normal entities. If you only + * want to iterate players, you can also use {@link #getPlayers()} + * instead. + * + * @return A collection of all entities that are currently on this world. + */ + public Collection> getAllEntities() { + return versionTemplate.getEntities(this); + } + /** * Gets the current pvp mode of the world. If players are allowed to * fight each other, this will return {@code true}. diff --git a/core/src/main/java/de/pxav/kelp/core/world/version/WorldVersionTemplate.java b/core/src/main/java/de/pxav/kelp/core/world/version/WorldVersionTemplate.java index 239867c0..59e0526d 100644 --- a/core/src/main/java/de/pxav/kelp/core/world/version/WorldVersionTemplate.java +++ b/core/src/main/java/de/pxav/kelp/core/world/version/WorldVersionTemplate.java @@ -1,6 +1,7 @@ package de.pxav.kelp.core.world.version; import de.pxav.kelp.core.application.KelpVersionTemplate; +import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.type.DroppedItemEntity; import de.pxav.kelp.core.entity.util.ItemDropType; import de.pxav.kelp.core.inventory.item.KelpItem; @@ -217,6 +218,17 @@ public abstract class WorldVersionTemplate { */ public abstract Collection getPlayers(KelpWorld world); + /** + * Gets all entities that are currently on the given world. + * This includes players as well as normal entities. If you only + * want to iterate players, you can also use {@link #getPlayers(KelpWorld)} + * instead. + * + * @param world The world you want to get the players of. + * @return A collection of all entities that are currently on this world. + */ + public abstract Collection> getEntities(KelpWorld world); + /** * Gets the current pvp mode of the world. If players are allowed to * fight each other, this will return {@code true}. diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedWorld.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedWorld.java index be0793fb..3a47113f 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedWorld.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/world/VersionedWorld.java @@ -1,6 +1,7 @@ package de.pxav.kelp.implementation1_8.world; import com.google.common.collect.Lists; +import de.pxav.kelp.core.entity.KelpEntity; import de.pxav.kelp.core.entity.type.DroppedItemEntity; import de.pxav.kelp.core.entity.util.ItemDropType; import de.pxav.kelp.core.inventory.item.KelpItem; @@ -10,6 +11,7 @@ import de.pxav.kelp.core.world.util.ExplosionPower; import de.pxav.kelp.core.world.util.WorldType; import de.pxav.kelp.core.world.version.WorldVersionTemplate; +import net.minecraft.server.v1_8_R3.Entity; import net.minecraft.server.v1_8_R3.EntityHuman; import org.bukkit.Chunk; import org.bukkit.Difficulty; @@ -324,6 +326,25 @@ public Collection getPlayers(KelpWorld world) { return output; } + /** + * Gets all entities that are currently on the given world. + * This includes players as well as normal entities. If you only + * want to iterate players, you can also use {@link #getPlayers(KelpWorld)} + * instead. + * + * @param world The world you want to get the players of. + * @return A collection of all entities that are currently on this world. + */ + @Override + public Collection> getEntities(KelpWorld world) { + Collection> output = Lists.newArrayList(); + for (Entity entity : craftWorld(world).getHandle().entityList) { + org.bukkit.entity.Entity bukkitEntity = entity.getBukkitEntity(); + output.add(KelpEntity.from(bukkitEntity)); + } + return output; + } + /** * Gets the current pvp mode of the world. If players are allowed to * fight each other, this will return {@code true}. From d7e17eb245b13fc0c576a4d9ab7b3bf6100b8a14 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 24 May 2021 13:53:04 +0200 Subject: [PATCH 322/325] Add changelog for release 0.4.0 --- CHANGELOG/kelp-v0.4.0.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 CHANGELOG/kelp-v0.4.0.md diff --git a/CHANGELOG/kelp-v0.4.0.md b/CHANGELOG/kelp-v0.4.0.md new file mode 100644 index 00000000..fa8ab9f1 --- /dev/null +++ b/CHANGELOG/kelp-v0.4.0.md @@ -0,0 +1,25 @@ +# v0.4.0 +> Release date: 24.05.2021 + +**The entity update**: + +* Make methods of `StringUtils` and `ReflectionUtil` static. +* You can now invoke methods using `ReflectionUtils.invokeMethod(Object, String, Object...)` and `ReflectionUtils.invokeStaticMethod(Class, String name, Object... parameters)` +* Move `isInWater` and `isInCobweb` method from `KelpPlayer` to `KelpEntity` as this is a more general method that can be applied to all entities. +* `KelpPlayer` is now an interface instead of a class for better integration into the entity system + * Although it has ever been a sub-type of `LivingKelpEntity`, it was not handled as such. The `EntityTypeVersionTemplate` could not convert it. Now it is exactly handled as an entity with the only logical exceptions that you cannot create/spawn new ones (use `KelpNpc`), and you cannot remove players from the server (kick them instead). +* Complete rework of the entity library: + * Old entity classes and methods are not supported anymore. They have been removed from the code. + * Entities are now represented as interfaces in the core module instead of classes. + * Those interfaces are implemented by the version modules - similar to bukkit. All entity types for MC1.8 have been implemented + * Add new entity types to `KelpEntityType` enum that have been added in 1.15 and 1.16. +* With the entity rework, other features that entities depend on had to be implemented as well: + * Add potion API allowing you to add potion effects + * Add `@MinecraftPotion` annotation, and a class for each potion effect type. The Kelp-Binder can now check for custom implementations of a potion effect type: If you run a 1.8 server, but want to use the levitation effect, this is no problem because the levitation effect can be reproduced by Kelp (just as you would create a version template and implementation). However, no effect has been emulated yet - only the mechanics exist and have been tested. + * Add entity constants for all entities that exist in 1.8. You can now convert horse types, villager professions, etc. across different versions + * Add `StorageInventory` interface, which represents a general inventory just like bukkit's `Inventory` interface. + * Add `HorseInventory` and `AbstractHorseInventory` allowing you to easily access a horse's saddle or armor. + * `PlayerInventory` now also is a subtype of `StorageInventory` and has been converted to an interface as well. +* Add 1.16-1.16.5 versions to `KelpVersion` enum +* Add `getEntities()` method to `KelpWorld` returning a list of all entities in the given world. +* Fix bug that entities could not be damaged by left click interaction when Kelp was installed. This was due to a bug that when an interaction packet was intercepted, it was not passed on to the server afterwards. From b687eb046f040be98ce4f2645b17af3fab533928 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 24 May 2021 14:18:52 +0200 Subject: [PATCH 323/325] Properly merge kotlin properties with project properties --- pom.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 094da270..2f049faa 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,7 @@ UTF-8 0.3.3 + 1.4.32 @@ -67,11 +68,6 @@ kelp-sql - - UTF-8 - 1.4.32 - - From 9cfbbeb6489b50c594a1ccf285fd8504a4c46db0 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 24 May 2021 14:23:14 +0200 Subject: [PATCH 324/325] revision property is now also used in 1.14 implementation module --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2f049faa..9e7d39a6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ UTF-8 - 0.3.3 + 0.4.0 1.4.32 From 7680535108976a85635e3e78f18bf385876d36b2 Mon Sep 17 00:00:00 2001 From: pxav Date: Mon, 24 May 2021 14:55:21 +0200 Subject: [PATCH 325/325] Replace ${revision} tag with ${project.version}, fixes #63 --- core/pom.xml | 2 +- core/src/main/resources/plugin.yml | 2 +- pom.xml | 4 ++-- testing-module/pom.xml | 4 ++-- v1_8_implementation/pom.xml | 4 ++-- v_1_14_implementation/pom.xml | 3 ++- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 6fa0f8e0..a2d96ad2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ com.github.pxav.kelp parent - ${revision} + 0.4.0 4.0.0 diff --git a/core/src/main/resources/plugin.yml b/core/src/main/resources/plugin.yml index b19d252e..69f170c8 100644 --- a/core/src/main/resources/plugin.yml +++ b/core/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: Kelp -version: ${revision} +version: ${project.version} main: de.pxav.kelp.core.KelpPlugin author: pxav description: A cross version spigot framework. diff --git a/pom.xml b/pom.xml index 9e7d39a6..0ffe4c62 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.github.pxav.kelp parent pom - ${revision} + 0.4.0 Kelp A cross-version spigot framework to avoid boilerplate code and make your plugin compatible with multiple spigot versions easily @@ -15,8 +15,8 @@ UTF-8 - 0.4.0 1.4.32 + true diff --git a/testing-module/pom.xml b/testing-module/pom.xml index 52742652..3f1ba8bc 100644 --- a/testing-module/pom.xml +++ b/testing-module/pom.xml @@ -5,7 +5,7 @@ parent com.github.pxav.kelp - ${revision} + 0.4.0 4.0.0 @@ -85,7 +85,7 @@ com.github.pxav.kelp core - ${revision} + ${project.version} provided diff --git a/v1_8_implementation/pom.xml b/v1_8_implementation/pom.xml index c77949ba..7785af06 100644 --- a/v1_8_implementation/pom.xml +++ b/v1_8_implementation/pom.xml @@ -5,7 +5,7 @@ com.github.pxav.kelp parent - ${revision} + 0.4.0 4.0.0 @@ -90,7 +90,7 @@ com.github.pxav.kelp core - ${revision} + ${project.version} provided diff --git a/v_1_14_implementation/pom.xml b/v_1_14_implementation/pom.xml index e467a29a..57a13816 100644 --- a/v_1_14_implementation/pom.xml +++ b/v_1_14_implementation/pom.xml @@ -5,8 +5,9 @@ parent com.github.pxav.kelp - 0.3.4 + 0.4.0 + 4.0.0 v_1_14_implementation