Feature/schematic override

FEATURES.md

@@ -6,6 +6,9 @@ New features
 - New area commands
 - Mohist compatibility (kind of, you need to use particle aiming)
 - Folia support
+- Custom projectile definitions (Custom gravity, drag, water drag, constant acceleration, Custom model data and more)
+- Custom blocks support (Slimefun & ItemsAdder so far, requires custom format)
+- Command completions
 
 Fixes:
 ---------------
@@ -41,6 +44,9 @@ FireTask API:
 Exchange API:
 - You can define your own exchanges for cannons creation requirement, example at [CannonsEXP](https://github.com/Intybyte/CannonsEXP)
 
+Schematic Processing API:
+- You can define your own custom blocks to add by defining a namespace and adding it to SchematicWorldProcessorImpl
+
 Projectiles:
 - Projectile type events now give the FlyingProjectile
 - ProjectilePiercingEvent is now cancellable

api-internal/pom.xml

@@ -15,12 +15,24 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
             <version>2.11.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.Intybyte</groupId>
+            <artifactId>SchematicLib</artifactId>
+            <version>f420e46a34</version>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>

cannons-bukkit/pom.xml

@@ -65,6 +65,14 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>matteodev</id>
+            <url>https://maven.devs.beer/</url>
+        </repository>
+        <repository>
+            <id>nexo</id>
+            <url>https://repo.nexomc.com/releases</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -149,6 +157,38 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- Schematic handling -->
+        <dependency>
+            <groupId>com.github.Slimefun</groupId>
+            <artifactId>Slimefun4</artifactId>
+            <version>RC-37</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>dev.lone</groupId>
+            <artifactId>api-itemsadder</artifactId>
+            <version>4.0.10</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.nexomc</groupId>
+            <artifactId>nexo</artifactId>
+            <version>1.12.1-dev</version>
+            <scope>provided</scope>
+            <exclusions>
+                <!-- can't find these so you are getting excluded, stay in a corner -->
+                <exclusion>
+                    <groupId>dev.triumphteam</groupId>
+                    <artifactId>triumph-gui</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>net.byteflux</groupId>
+                    <artifactId>libby-bukkit</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+
         <!-- Testing dependencies  -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -189,7 +229,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.14.1</version>
                 <configuration>
                     <source>${java.source}</source>
                     <target>${java.target}</target>
@@ -241,6 +281,14 @@
                             <pattern>io.papermc.lib</pattern>
                             <shadedPattern>at.pavlov.cannons.shaded.paperlib</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>me.vaan</pattern>
+                            <shadedPattern>at.pavlov.cannons.shaded.vaan</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>com.google.gson</pattern>
+                            <shadedPattern>at.pavlov.cannons.shaded.google</shadedPattern>
+                        </relocation>
                     </relocations>
                     <filters>
                         <filter>

cannons-bukkit/src/main/java/at/pavlov/cannons/Cannons.java

@@ -180,7 +180,7 @@ public void onEnable() {
 		ProjectileManager.initialize(this);
 		CannonSelector.initialize(this);
 
-        DesignStorage.getInstance().loadCannonDesigns();
+        //DesignStorage.getInstance().loadCannonDesigns();
         ProjectileStorage.getInstance().loadProjectiles();
         CannonManager.getInstance().updateCannons();
         UserMessages.getInstance().loadLanguage();

cannons-bukkit/src/main/java/at/pavlov/cannons/cannon/Cannon.java

@@ -25,13 +25,21 @@
 import at.pavlov.cannons.interfaces.functionalities.Rotational;
 import at.pavlov.cannons.projectile.Projectile;
 import at.pavlov.cannons.projectile.ProjectileStorage;
+import at.pavlov.cannons.schematic.world.SchematicWorldProcessorImpl;
 import at.pavlov.cannons.utils.CannonsUtil;
 import at.pavlov.cannons.utils.InventoryManagement;
 import at.pavlov.cannons.utils.SoundUtils;
 import at.pavlov.internal.Key;
 import com.google.common.base.Preconditions;
 import lombok.Getter;
 import lombok.Setter;
+import me.vaan.schematiclib.base.block.BlockKey;
+import me.vaan.schematiclib.base.block.IBlock;
+import me.vaan.schematiclib.base.schematic.OffsetSchematic;
+import me.vaan.schematiclib.base.schematic.OffsetSchematicImpl;
+import me.vaan.schematiclib.base.schematic.Schematic;
+import me.vaan.schematiclib.file.block.FileBlock;
+import me.vaan.schematiclib.file.block.FileCoord;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Effect;
@@ -45,7 +53,6 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.material.Attachable;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.NotNull;
 
@@ -85,11 +92,12 @@ public class Cannon implements ICannon, Rotational {
     //TODO make a vector util class and add this there
     private final static Vector noVelocity = new Vector(0,0,0);
 
-
     public Cannon(CannonDesign design, UUID world, Vector cannonOffset, BlockFace cannonDirection, UUID owner) {
 
         this.design = design;
         this.cannonPosition = new CannonPosition(cannonDirection, cannonOffset, world, false, noVelocity.clone());
+
+        Schematic schematic = design.getSchematicMap().get(cannonPosition.getCannonDirection());
         boolean noFee = design.getEconomyBuildingCost() instanceof EmptyExchanger;
         this.mainData = new CannonMainData( UUID.randomUUID(),null, noFee, owner, true);
 
@@ -130,7 +138,7 @@ public Cannon(CannonDesign design, UUID world, Vector cannonOffset, BlockFace ca
      * @return location of the cannon
      */
     public Location getLocation() {
-        return design.getAllCannonBlocks(this).get(0);
+        return getFirstCannonBlock();
     }
 
     /**
@@ -151,8 +159,10 @@ public Location getRandomBarrelBlock() {
         List<Location> barrel = design.getBarrelBlocks(this);
         if (!barrel.isEmpty())
             return barrel.get(random.nextInt(barrel.size()));
-        List<Location> all = design.getAllCannonBlocks(this);
-        return all.get(random.nextInt(all.size()));
+
+        List<IBlock> positions = getOffsetSchematic().realBlocks().positions();
+        IBlock position = positions.get(random.nextInt(positions.size()));
+        return new Location(getWorldBukkit(), position.x(), position.y(), position.z());
     }
 
 
@@ -737,50 +747,43 @@ public MessageEnum destroyCannon(boolean breakBlocks, boolean canExplode, BreakC
      * this will force the cannon to show up at this location - all blocks will be overwritten
      */
     public void show() {
-        for (SimpleBlock cBlock : design.getAllCannonBlocks(this.getCannonDirection())) {
-            Block wBlock = cBlock.toLocation(getWorldBukkit(), getOffset()).getBlock();
-            //todo check show
-            wBlock.setBlockData(cBlock.getBlockData());
-            //wBlock.setBlockData(cBlock);
-        }
+        SchematicWorldProcessorImpl.getProcessor().place(
+            getOffsetSchematic(),
+            cannonPosition.getWorld()
+        );
     }
 
     /**
      * this will force the cannon blocks to become AIR
      */
     public void hide() {
-        //remove only attachable block
-        for (SimpleBlock cBlock : design.getAllCannonBlocks(this.getCannonDirection())) {
-            Block wBlock = cBlock.toLocation(getWorldBukkit(), getOffset()).getBlock();
-            //if that block is not loaded
-
-            if (wBlock.getState() instanceof Attachable) {
-                //Cannons.logger().info("hide " + wBlock.getType());
-                wBlock.setType(Material.AIR);
-                //wBlock.setData((byte) 0, false);
-            }
-        }
-
-        //remove all
-        for (SimpleBlock cBlock : design.getAllCannonBlocks(this.getCannonDirection())) {
-            Block wBlock = cBlock.toLocation(getWorldBukkit(), getOffset()).getBlock();
-
-            if (wBlock.getType() != Material.AIR) {
-                wBlock.setType(Material.AIR);
-                // wBlock.setData((byte) 0, false);
-            }
-        }
+        SchematicWorldProcessorImpl.getProcessor().destroy(
+            getOffsetSchematic(),
+            cannonPosition.getWorld()
+        );
     }
 
 
     /**
      * breaks all cannon blocks of the cannon
      */
     private void breakAllCannonBlocks() {
-        List<Location> locList = design.getAllCannonBlocks(this);
-        for (Location loc : locList) {
-            loc.getBlock().breakNaturally();
-        }
+        SchematicWorldProcessorImpl.getProcessor().breakNaturally(
+            getOffsetSchematic(),
+            cannonPosition.getWorld()
+        );
+    }
+
+    public OffsetSchematic getOffsetSchematic() {
+        Schematic schematic = design.getSchematicMap().get(cannonPosition.getCannonDirection());
+        Vector off = cannonPosition.getOffset();
+
+        return new OffsetSchematicImpl(
+            off.getBlockX(),
+            off.getBlockY(),
+            off.getBlockZ(),
+            schematic
+        );
     }
 
 
@@ -791,15 +794,45 @@ private void breakAllCannonBlocks() {
      * @return - true if it is part of this cannon
      */
     public boolean isCannonBlock(Block block) {
-        if (!getWorld().equals(block.getWorld().getUID())) {
+        UUID world = cannonPosition.getWorld();
+        if (!world.equals(block.getWorld().getUID())) {
             return false;
         }
 
-        for (SimpleBlock designBlock : design.getAllCannonBlocks(getCannonDirection())) {
-            if (designBlock.compareMaterialAndLoc(block, getOffset())) {
+        SchematicWorldProcessorImpl processor = SchematicWorldProcessorImpl.getProcessor();
+        OffsetSchematic offsetSchematic = getOffsetSchematic();
+        IBlock obtain = processor.registry().getBlock(block.getX(), block.getY(), block.getZ(), world);
+        BlockKey schemBlock = offsetSchematic.blockMap().get(
+            new FileCoord(
+                block.getX() - offsetSchematic.x(),
+                block.getY() - offsetSchematic.y(),
+                block.getZ() - offsetSchematic.z()
+            )
+        );
+
+        return obtain.key().equals(schemBlock);
+    }
+
+    public boolean isCannonBlock(IBlock block, UUID blockWorld) {
+        UUID world = cannonPosition.getWorld();
+        if (!world.equals(blockWorld)) {
+            return false;
+        }
+
+        Vector offset = cannonPosition.getOffset();
+        FileBlock offsetLessBlock = new FileBlock(
+            block.x() - offset.getBlockX(),
+            block.y() - offset.getBlockY(),
+            block.z() - offset.getBlockZ(),
+            block.key()
+        );
+
+        for (IBlock schemBlock : getOffsetSchematic().positions()) {
+            if (offsetLessBlock.matches(schemBlock)) {
                 return true;
             }
         }
+
         return false;
     }
 
@@ -976,8 +1009,14 @@ public boolean isSentryAutomatic() {
      * @return - first block of the cannon
      */
     public Location getFirstCannonBlock() {
-        return design.getAllCannonBlocks(getCannonDirection()).get(0).toLocation(getWorldBukkit(), getOffset());
-
+        Vector vec = cannonPosition.getOffset();
+        OffsetSchematic schematic = getOffsetSchematic();
+        IBlock first = schematic.positions().get(0);
+        return new Location(getWorldBukkit(),
+            first.x() + vec.getBlockX(),
+            first.y() + vec.getBlockY(),
+            first.z() + vec.getBlockZ()
+        );
     }
 
     /**