Replace deprecated variables in pom, add more plugin.yml attributes, …

…add adjust-hitbox config option
cerus · Mar 8, 2022 · 36b4a96 · 36b4a96
1 parent 987f6bf
commit 36b4a96
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 20 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.visualcrafting</groupId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/api/src/main/java/dev/cerus/visualcrafting/api/config/Config.java b/api/src/main/java/dev/cerus/visualcrafting/api/config/Config.java
@@ -33,4 +33,11 @@ public interface Config {
      */
     int mapIdRangeMax();
 
+    /**
+     * Whether to always force the hitbox to the top or not
+     *
+     * @return True or false
+     */
+    boolean adjustHitbox();
+
 }
diff --git a/bukkit-16R3/pom.xml b/bukkit-16R3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.visualcrafting</groupId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>dev.cerus.visualcrafting</groupId>
             <artifactId>api</artifactId>
-            <version>${parent.version}</version>
+            <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/bukkit-16R3/src/main/java/dev/cerus/visualcrafting/v16r3/VersionAdapter16R3.java b/bukkit-16R3/src/main/java/dev/cerus/visualcrafting/v16r3/VersionAdapter16R3.java
@@ -55,7 +55,7 @@ public int spawnItemFrame(final Location location, final BlockFace direction) {
                     default -> 0;
                 },
                 EntityTypes.ITEM_FRAME,
-                switch (direction) {
+                this.config.adjustHitbox() ? 0 : switch (direction) {
                     case UP -> 1;
                     case NORTH -> 2;
                     case SOUTH -> 3;

diff --git a/bukkit-17R1/pom.xml b/bukkit-17R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.visualcrafting</groupId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>dev.cerus.visualcrafting</groupId>
             <artifactId>api</artifactId>
-            <version>${parent.version}</version>
+            <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/bukkit-18R1/pom.xml b/bukkit-18R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.visualcrafting</groupId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>dev.cerus.visualcrafting</groupId>
             <artifactId>api</artifactId>
-            <version>${parent.version}</version>
+            <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/bukkit-18R2/pom.xml b/bukkit-18R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.visualcrafting</groupId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>dev.cerus.visualcrafting</groupId>
             <artifactId>api</artifactId>
-            <version>${parent.version}</version>
+            <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.visualcrafting</groupId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,31 +32,31 @@
         <dependency>
             <groupId>dev.cerus.visualcrafting</groupId>
             <artifactId>api</artifactId>
-            <version>${parent.version}</version>
+            <version>${project.parent.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>dev.cerus.visualcrafting</groupId>
             <artifactId>bukkit-16R3</artifactId>
-            <version>${parent.version}</version>
+            <version>${project.parent.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>dev.cerus.visualcrafting</groupId>
             <artifactId>bukkit-17R1</artifactId>
-            <version>${parent.version}</version>
+            <version>${project.parent.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>dev.cerus.visualcrafting</groupId>
             <artifactId>bukkit-18R1</artifactId>
-            <version>${parent.version}</version>
+            <version>${project.parent.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>dev.cerus.visualcrafting</groupId>
             <artifactId>bukkit-18R2</artifactId>
-            <version>${parent.version}</version>
+            <version>${project.parent.version}</version>
             <scope>compile</scope>
         </dependency>
 

diff --git a/plugin/src/main/java/dev/cerus/visualcrafting/plugin/VisualCraftingPlugin.java b/plugin/src/main/java/dev/cerus/visualcrafting/plugin/VisualCraftingPlugin.java
@@ -83,4 +83,9 @@ public int mapIdRangeMax() {
         return this.getConfig().getInt("map-id.max");
     }
 
+    @Override
+    public boolean adjustHitbox() {
+        return this.getConfig().getBoolean("adjust-hitbox");
+    }
+
 }
diff --git a/plugin/src/main/resources/config.yml b/plugin/src/main/resources/config.yml
@@ -4,4 +4,9 @@ entity-id:
 
 map-id:
   min: 500000
-  max: 1000000
+  max: 1000000
+
+# Will move the frame's hitbox out of the way to allow players to
+# access the crafting table from the top. This will only work on
+# 1.16.5, unfortunately.
+adjust-hitbox: false
diff --git a/plugin/src/main/resources/plugin.yml b/plugin/src/main/resources/plugin.yml
@@ -1,5 +1,9 @@
 name: visual-crafting
-version: ${parent.version}
+version: ${project.parent.version}
 author: Cerus
 main: dev.cerus.visualcrafting.plugin.VisualCraftingPlugin
-api-version: 1.16
+api-version: 1.16
+
+description: "Visualizes the crafting process using invisible item frames and maps."
+prefix: "Visual Crafting"
+website: "https://github.com/cerus/visual-crafting"
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>dev.cerus.visualcrafting</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <modules>
         <module>plugin</module>
         <module>api</module>