Api/api bukkit

api-bukkit/pom.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>at.pavlov</groupId>
+        <artifactId>cannons</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>api-bukkit</artifactId>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <repositories>
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>at.pavlov</groupId>
+            <artifactId>api-internal</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.21.1-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.papermc</groupId>
+            <artifactId>paperlib</artifactId>
+            <version>1.0.7</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
+                <configuration>
+                    <source>${java.source}</source>
+                    <target>${java.target}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

cannons-bukkit/src/main/java/at/pavlov/cannons/builders/ParticleBuilder.java → api-bukkit/src/main/java/at/pavlov/bukkit/builders/ParticleBuilder.java

@@ -1,4 +1,4 @@
-package at.pavlov.cannons.builders;
+package at.pavlov.bukkit.builders;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

api-bukkit/src/main/java/at/pavlov/bukkit/cannons/CannonBukkit.java

@@ -0,0 +1,13 @@
+package at.pavlov.bukkit.cannons;
+
+import at.pavlov.internal.cannons.functionalities.InventoryObject;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+
+public interface CannonBukkit extends CannonDataHolderBukkit, InventoryObject<Inventory> {
+    boolean sameType(CannonBukkit cannonBukkit);
+
+    default boolean isAccessLinkingAllowed(CannonBukkit fcannon, Player player) {
+        return !this.getCannonDesign().isAccessForOwnerOnly() || fcannon.getOwner() == player.getUniqueId();
+    }
+}

api-bukkit/src/main/java/at/pavlov/bukkit/cannons/CannonDataHolderBukkit.java

@@ -0,0 +1,14 @@
+package at.pavlov.bukkit.cannons;
+
+import at.pavlov.bukkit.cannons.holders.CannonDesignHBukkit;
+import at.pavlov.bukkit.cannons.holders.CannonPositionHBukkit;
+import at.pavlov.bukkit.projectile.BukkitProjectile;
+import at.pavlov.internal.cannons.functionalities.CannonDataHolder;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+
+public interface CannonDataHolderBukkit extends
+        CannonDataHolder<BlockFace, BukkitProjectile, Player>,
+        CannonPositionHBukkit,
+        CannonDesignHBukkit
+{}

api-bukkit/src/main/java/at/pavlov/bukkit/cannons/CannonDesignHolder.java

@@ -0,0 +1,25 @@
+package at.pavlov.bukkit.cannons;
+
+import at.pavlov.bukkit.cannons.data.BukkitCannonDesign;
+import at.pavlov.internal.cannons.functionalities.Updatable;
+
+public interface CannonDesignHolder extends Updatable {
+    void setCannonDesign(BukkitCannonDesign design);
+
+    BukkitCannonDesign getCannonDesign();
+
+    default boolean sameDesign(CannonBukkit cannon) {
+        return sameDesign(cannon.getCannonDesign());
+    }
+
+    default boolean sameDesign(BukkitCannonDesign cannonDesign) {
+        return getCannonDesign().equals(cannonDesign);
+    }
+
+    default String getDesignID() {
+        return getCannonDesign().getDesignID();
+    }
+
+    void setDesignID(String designID);
+
+}

api-bukkit/src/main/java/at/pavlov/bukkit/cannons/data/BukkitCannonDesign.java

@@ -0,0 +1,103 @@
+package at.pavlov.bukkit.cannons.data;
+
+import at.pavlov.bukkit.cannons.CannonBukkit;
+import at.pavlov.bukkit.container.BukkitCannonBlocks;
+import at.pavlov.bukkit.container.holders.BukkitBlock;
+import at.pavlov.bukkit.container.holders.BukkitItemHolder;
+import at.pavlov.bukkit.container.holders.BukkitSoundHolder;
+import at.pavlov.bukkit.factory.VectorUtils;
+import at.pavlov.internal.CannonLogger;
+import at.pavlov.internal.cannons.data.CannonDesign;
+import at.pavlov.internal.container.location.CannonVector;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.inventory.ItemStack;
+
+public class BukkitCannonDesign extends CannonDesign<
+        BlockData,
+        BlockFace,
+        Material,
+        BukkitItemHolder,
+        BukkitSoundHolder,
+        BukkitBlock,
+        BukkitCannonBlocks
+        > {
+
+    /**
+     * returns the rotation center of a cannon design
+     */
+    public Location getRotationCenter(CannonBukkit cannon)
+    {
+    	BukkitCannonBlocks cannonBlocks  = cannonBlockMap.get(cannon.getCannonDirection());
+    	if (cannonBlocks != null)
+    	{
+            CannonVector vector = cannonBlocks.getRotationCenter().clone().add(cannon.getOffset());
+    		return VectorUtils.toLoc(cannon.getWorldBukkit(), vector);
+    	}
+
+    	CannonLogger.getLogger().info("missing rotation center for cannon design " + cannon.getCannonName());
+    	return VectorUtils.toLoc(cannon.getWorldBukkit(), cannon.getOffset());
+    }
+
+
+    /**
+     * returns the muzzle location
+     */
+    public Location getMuzzle(CannonBukkit cannon)
+    {
+    	BukkitCannonBlocks cannonBlocks  = cannonBlockMap.get(cannon.getCannonDirection());
+    	if (cannonBlocks != null)
+    	{
+            CannonVector vector = cannonBlocks.getMuzzle().clone().add(cannon.getOffset());
+    		return VectorUtils.toLoc(cannon.getWorldBukkit(), vector);
+    	}
+
+    	CannonLogger.getLogger().info("missing muzzle location for cannon design " + cannon.getCannonName());
+    	return VectorUtils.toLoc(cannon.getWorldBukkit(), cannon.getOffset());
+    }
+
+    /**
+     * is this Item a cooling tool to cool down a cannon
+     * @param item - item to check
+     * @return - true if this item is in the list of cooling items
+     */
+    public boolean isCoolingTool(ItemStack item)
+    {
+    	//todo rework tool properties
+        for (BukkitItemHolder mat : itemCooling)
+        {
+            if (mat.equalsFuzzy(item))
+                return true;
+        }
+        return false;
+    }
+
+    /**
+     * returns the used used item. E.g. a water bucket will be an empty bucket.
+     * @param item - the item used for the event
+     * @return the new item which replaces the old one
+     */
+    public ItemStack getCoolingToolUsed(ItemStack item)
+    {
+        for (int i=0; i < itemCooling.size(); i++)
+        {
+			//todo rework tool properties
+            if (itemCooling.get(i).equalsFuzzy(item))
+            {
+                return itemCoolingUsed.get(i).toItemStack(item.getAmount());
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void putCannonBlockMap(BlockFace cannonDirection, BukkitCannonBlocks blocks) {
+        for (var block : blocks.getAllCannonBlocks()) {
+            allowedMaterials.add(block.getBlockData().getMaterial());
+        }
+
+        cannonBlockMap.put(cannonDirection, blocks);
+    }
+}

api-bukkit/src/main/java/at/pavlov/bukkit/cannons/holders/CannonDesignHBukkit.java

@@ -0,0 +1,7 @@
+package at.pavlov.bukkit.cannons.holders;
+
+import at.pavlov.bukkit.cannons.data.BukkitCannonDesign;
+import at.pavlov.internal.cannons.holders.CannonDesignHolder;
+
+public interface CannonDesignHBukkit extends CannonDesignHolder<BukkitCannonDesign> {
+}

api-bukkit/src/main/java/at/pavlov/bukkit/cannons/holders/CannonPositionHBukkit.java

@@ -0,0 +1,34 @@
+package at.pavlov.bukkit.cannons.holders;
+
+import at.pavlov.internal.cannons.holders.CannonPositionHolder;
+import at.pavlov.internal.container.location.CannonVector;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.block.BlockFace;
+
+public interface CannonPositionHBukkit extends CannonPositionHolder<BlockFace> {
+
+    /**
+     * @return bukkit world from saved UUID
+     */
+    default World getWorldBukkit() {
+        if (this.getWorld() == null) {
+            return null;
+        }
+        World bukkitWorld = Bukkit.getWorld(this.getWorld());
+        //if (bukkitWorld == null)
+        //    Cannons.logger().info("Can't find world: " + getWorld());
+        return Bukkit.getWorld(this.getWorld());
+        // return new Location(bukkitWorld, )
+    }
+
+    default void move(CannonVector moved) {
+        getOffset().add(moved);
+        this.hasUpdated();
+    }
+
+    Location getLocation();
+
+    Location getMuzzle();
+}

api-bukkit/src/main/java/at/pavlov/bukkit/container/BukkitCannonBlocks.java

@@ -0,0 +1,12 @@
+package at.pavlov.bukkit.container;
+
+import at.pavlov.bukkit.container.holders.BukkitBlock;
+import at.pavlov.internal.container.CannonBlocks;
+
+/**
+ * This class is used internally to keep track of some blocks,
+ * it is not suggested to create new instances of it but instead
+ * use it to get the positions of the various stuff
+ */
+public class BukkitCannonBlocks extends CannonBlocks<BukkitBlock> {
+}

api-bukkit/src/main/java/at/pavlov/bukkit/container/BukkitDeathCause.java

@@ -0,0 +1,12 @@
+package at.pavlov.bukkit.container;
+
+import at.pavlov.bukkit.projectile.BukkitProjectile;
+import at.pavlov.internal.container.DeathCause;
+
+import java.util.UUID;
+
+public final class BukkitDeathCause extends DeathCause<BukkitProjectile> {
+    public BukkitDeathCause(BukkitProjectile projectile, UUID cannonUID, UUID shooterUID) {
+        super(projectile, cannonUID, shooterUID);
+    }
+}

api-bukkit/src/main/java/at/pavlov/bukkit/container/BukkitFakeBlockEntry.java

@@ -0,0 +1,33 @@
+package at.pavlov.bukkit.container;
+
+import at.pavlov.bukkit.factory.VectorUtils;
+import at.pavlov.internal.container.FakeBlockEntry;
+import at.pavlov.internal.enums.FakeBlockType;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+public class BukkitFakeBlockEntry extends FakeBlockEntry {
+
+    public BukkitFakeBlockEntry(Location loc, Player player, FakeBlockType type, long duration) {
+        super(VectorUtils.fromLoc(loc), loc.getWorld().getUID(), player.getUniqueId(), type, duration);
+    }
+
+    public World getWorldBukkit() {
+        return Bukkit.getWorld(getWorld());
+    }
+
+    public Location getLocation() {
+        World world = getWorldBukkit();
+        if (world == null) {
+            return null;
+        }
+
+        return new Location(world, getLocX(), getLocY(), getLocZ());
+    }
+
+    public Player getPlayerBukkit() {
+        return Bukkit.getPlayer(getPlayer());
+    }
+}

api-bukkit/src/main/java/at/pavlov/bukkit/container/BukkitMovingObject.java

@@ -0,0 +1,63 @@
+package at.pavlov.bukkit.container;
+
+import at.pavlov.bukkit.factory.VectorUtils;
+import at.pavlov.internal.container.MovingObject;
+import at.pavlov.internal.container.location.CannonVector;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.EntityType;
+import org.bukkit.util.Vector;
+
+import java.util.List;
+import java.util.UUID;
+
+public class BukkitMovingObject extends MovingObject<EntityType> {
+
+    public BukkitMovingObject(UUID world, CannonVector loc, CannonVector vel, EntityType entityType) {
+        super(world, loc, vel, entityType);
+    }
+
+    public BukkitMovingObject(Location newLoc, Vector velocity, EntityType projectileEntity) {
+        super(newLoc.getWorld().getUID(), VectorUtils.fromLoc(newLoc), VectorUtils.fromBaseVector(velocity), projectileEntity);
+    }
+
+    /**
+     * teleports the projectile to this location
+     * @param loc the projectile will be teleported to this location
+     * @param vel velocity of the object
+     */
+    public void teleport(Location loc, Vector vel)
+    {
+        this.loc = VectorUtils.fromBaseVector(loc.toVector());
+        this.vel = VectorUtils.fromBaseVector(vel);
+        this.world = loc.getWorld().getUID();
+    }
+
+    /**
+     * returns the calculated location of the projectile
+     * @return the location where the projectile should be
+     */
+    public Location getLocation()
+    {
+        return VectorUtils.toLoc(Bukkit.getWorld(world), loc);
+    }
+
+    public void setLocation(Location loc)
+    {
+        this.loc =  VectorUtils.fromBaseVector(loc.toVector());
+        this.world = loc.getWorld().getUID();
+    }
+
+
+    @Override
+    public EntityType arrow() {
+        return EntityType.ARROW;
+    }
+
+    static private final List<EntityType> fireballs = List.of(EntityType.FIREBALL, EntityType.SMALL_FIREBALL);
+    @Override
+    public List<EntityType> fireballs() {
+        return fireballs;
+    }
+}
+