From eb3eeae9b493d054816101d892a5d533adba4364 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Fri, 23 Jun 2023 21:07:44 +0200
Subject: [PATCH] Updates Spigot version and materials

---
 pom.xml                                       |  2 +-
 .../factions/util/EnumerationUtil.java        | 32 +++++++++++++++----
 src/main/resources/plugin.yml                 | 10 +++---
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1c51a40c..989c2015 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.19.4-R0.1-SNAPSHOT</version>
+            <version>1.20.1-R0.1-SNAPSHOT</version>
         </dependency>
         <!-- MassiveCore -->
         <dependency>
diff --git a/src/main/java/com/massivecraft/factions/util/EnumerationUtil.java b/src/main/java/com/massivecraft/factions/util/EnumerationUtil.java
index ba7e5b79..48d7ea6d 100644
--- a/src/main/java/com/massivecraft/factions/util/EnumerationUtil.java
+++ b/src/main/java/com/massivecraft/factions/util/EnumerationUtil.java
@@ -26,6 +26,7 @@ public class EnumerationUtil {
 
             // The various flower pots, they had to make each one a different material -.-
             "POTTED_ACACIA_SAPLING", // Minecraft 1.13
+            "POTTED_AZALEA_BUSH",
             "POTTED_ALLIUM", // Minecraft 1.13
             "POTTED_AZURE_BLUET", // Minecraft 1.13
             "POTTED_BAMBOO", // Minecraft 1.13
@@ -33,14 +34,16 @@ public class EnumerationUtil {
             "POTTED_BLUE_ORCHID", // Minecraft 1.13
             "POTTED_BROWN_MUSHROOM", // Minecraft 1.13
             "POTTED_CACTUS", // Minecraft 1.13
-            "POTTED_CACTUS", // Minecraft 1.13
+            "POTTED_CHERRY_SAPLING",
             "POTTED_CORNFLOWER", // Minecraft 1.13
             "POTTED_DANDELION", // Minecraft 1.13
             "POTTED_DARK_OAK_SAPLING", // Minecraft 1.13
             "POTTED_DEAD_BUSH", // Minecraft 1.13
             "POTTED_FERN", // Minecraft 1.13
+            "POTTED_FLOWERING_AZALEA_BUSH",
             "POTTED_JUNGLE_SAPLING", // Minecraft 1.13
             "POTTED_LILY_OF_THE_VALLEY", // Minecraft 1.13
+            "POTTED_MANGROVE_PROPAGULE",
             "POTTED_OAK_SAPLING", // Minecraft 1.13
             "POTTED_ORANGE_TULIP", // Minecraft 1.13
             "POTTED_OXEYE_DAISY", // Minecraft 1.13
@@ -49,6 +52,7 @@ public class EnumerationUtil {
             "POTTED_RED_MUSHROOM", // Minecraft 1.13
             "POTTED_RED_TULIP", // Minecraft 1.13
             "POTTED_SPRUCE_SAPLING", // Minecraft 1.13
+            "POTTED_TORCHFLOWER",
             "POTTED_WHITE_TULIP", // Minecraft 1.13
             "POTTED_WITHER_ROSE", // Minecraft 1.13
             "POTTED_CRIMSON_FUNGUS", // Minecraft 1.16
@@ -124,7 +128,15 @@ public class EnumerationUtil {
             "CRIMSON_FENCE_GATE",
             "WARPED_DOOR",
             "WARPED_TRAPDOOR",
-            "WARPED_FENCE_GATE"
+            "WARPED_FENCE_GATE",
+            "MANGROVE_DOOR",
+            "MANGROVE_TRAPDOOR",
+
+            // 1.20
+            "BAMBOO_DOOR",
+            "BAMBOO_TRAPDOOR",
+            "CHERRY_DOOR",
+            "CHERRY_TRAPDOOR"
     );
 
     public static boolean isMaterialDoor(Material material) {
@@ -172,7 +184,8 @@ public class EnumerationUtil {
             "RED_SHULKER_BOX",
             "SILVER_SHULKER_BOX", // Changed name to light gray, I think. Kept for backwards compatibility
             "WHITE_SHULKER_BOX",
-            "YELLOW_SHULKER_BOX"
+            "YELLOW_SHULKER_BOX",
+            "CHISELED_BOOKSHELF" // 1.20
     );
 
     public static boolean isMaterialContainer(Material material) {
@@ -187,7 +200,8 @@ public class EnumerationUtil {
     public static final BackstringSet<EntityType> ENTITY_TYPES_EDIT_ON_INTERACT = new BackstringSet<>(EntityType.class,
             "ITEM_FRAME", // Minecraft 1.?
             "ARMOR_STAND", // Minecraft 1.8
-            "LEASH_HITCH"
+            "LEASH_HITCH",
+            "GLOW_ITEM_FRAME"
     );
 
     public static boolean isEntityTypeEditOnInteract(EntityType entityType) {
@@ -202,7 +216,8 @@ public class EnumerationUtil {
     public static final BackstringSet<EntityType> ENTITY_TYPES_EDIT_ON_DAMAGE = new BackstringSet<>(EntityType.class,
             "ITEM_FRAME", // Minecraft 1.?
             "ARMOR_STAND", // Minecraft 1.8
-            "ENDER_CRYSTAL" // Minecraft 1.10
+            "ENDER_CRYSTAL", // Minecraft 1.10
+            "GLOW_ITEM_FRAME"
     );
 
     public static boolean isEntityTypeEditOnDamage(EntityType entityType) {
@@ -215,7 +230,8 @@ public class EnumerationUtil {
 
     public static final BackstringSet<EntityType> ENTITY_TYPES_CONTAINER = new BackstringSet<>(EntityType.class,
             "MINECART_CHEST", // Minecraft 1.?
-            "MINECART_HOPPER" // Minecraft 1.?
+            "MINECART_HOPPER", // Minecraft 1.?
+            "CHEST_BOAT"
     );
 
     public static boolean isEntityTypeContainer(EntityType entityType) {
@@ -310,7 +326,9 @@ public class EnumerationUtil {
             "GOAT", // 1.17
             "GLOW_SQUID",
             "FROG",
-            "AXOLOTL"
+            "AXOLOTL",
+            "CAMEL", // 1.20
+            "SNIFFER" // 1.20
     );
 
     public static boolean isEntityTypeAnimal(EntityType entityType) {
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index eedc5e51..806e76c8 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,8 +1,8 @@
-main: ${project.groupId}.${project.name}
-name: ${project.name}
-version: ${project.version}
-website: ${project.url}
-description: ${project.description}
+main: '${project.groupId}.${project.name}'
+name: '${project.name}'
+version: '${project.version}'
+website: '${project.url}'
+description: '${project.description}'
 authors: [ Madus, Cayorion, Ulumulu1510, MarkehMe, Brettflan ]
 depend: [ MassiveCore ]
 softdepend: [ PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, LocalAreaChat, LWC, ChatManager, AuthMe, Vault, WorldEdit, WorldGuard ]