Merge branch 'development'

# Conflicts: # Compatibility/pom.xml # Core/pom.xml # Core/src/main/java/com/songoda/core/SongodaCore.java # NMS/NMS-API/pom.xml # NMS/NMS-v1_10_R1/pom.xml # NMS/NMS-v1_11_R1/pom.xml # NMS/NMS-v1_12_R1/pom.xml # NMS/NMS-v1_13_R1/pom.xml # NMS/NMS-v1_13_R2/pom.xml # NMS/NMS-v1_14_R1/pom.xml # NMS/NMS-v1_15_R1/pom.xml # NMS/NMS-v1_16_R1/pom.xml # NMS/NMS-v1_16_R2/pom.xml # NMS/NMS-v1_16_R3/pom.xml # NMS/NMS-v1_17_R1/pom.xml # NMS/NMS-v1_8_R1/pom.xml # NMS/NMS-v1_8_R2/pom.xml # NMS/NMS-v1_8_R3/pom.xml # NMS/NMS-v1_9_R1/pom.xml # NMS/NMS-v1_9_R2/pom.xml # pom.xml
2025-02-25 16:01:30 +01:00 · 2021-09-30 13:11:16 -03:00 · 2021-09-30 13:11:16 -03:00 · e2b8f61385
commit e2b8f61385
parent 799bf30651 820b7ffbd3
22 changed files with 51 additions and 21 deletions
--- a/Compatibility/pom.xml
+++ b/Compatibility/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/Compatibility/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java
+++ b/Compatibility/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java
@ -2108,9 +2108,11 @@ public enum CompatibleMaterial {
                return COOKED_RABBIT;
            case KELP:
                return DRIED_KELP;
+            case RAW_IRON:
            case IRON_ORE:
            case DEEPSLATE_IRON_ORE:
                return IRON_INGOT;
+            case RAW_GOLD:
            case GOLD_ORE:
            case DEEPSLATE_GOLD_ORE:
                return GOLD_INGOT;
@ -2131,6 +2133,7 @@ public enum CompatibleMaterial {
                return EMERALD;
            case NETHER_QUARTZ_ORE:
                return QUARTZ;
+            case RAW_COPPER:
            case COPPER_ORE:
            case DEEPSLATE_COPPER_ORE:
                return COPPER_INGOT;
@ -2756,6 +2759,33 @@ public enum CompatibleMaterial {
        return true;
    }

+    /**
+     * @return true if this material is a valid brewing stand ingredient
+     */
+    public boolean isBrewingStandIngredient() {
+        switch (this) {
+            case NETHER_WART:
+            case REDSTONE:
+            case GLOWSTONE_DUST:
+            case FERMENTED_SPIDER_EYE:
+            case GUNPOWDER:
+            case DRAGON_BREATH:
+            case SUGAR:
+            case RABBIT_FOOT:
+            case GLISTERING_MELON_SLICE:
+            case SPIDER_EYE:
+            case PUFFERFISH:
+            case MAGMA_CREAM:
+            case GOLDEN_CARROT:
+            case BLAZE_POWDER:
+            case GHAST_TEAR:
+            case TURTLE_HELMET:
+            case PHANTOM_MEMBRANE:
+                return true;
+        }
+
+        return false;
+    }
    /**
     * @return true if this material is a food that can be cooked and is in its cooked state
     */
--- a/Core/pom.xml
+++ b/Core/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/Core/src/main/java/com/songoda/core/SongodaCore.java
+++ b/Core/src/main/java/com/songoda/core/SongodaCore.java
@ -53,7 +53,7 @@ public class SongodaCore {
    /**
     * This has been added as of Rev 6
     */
-    private final static String coreVersion = "2.5.10";
+    private final static String coreVersion = "2.5.11";

    /**
     * This is specific to the website api
--- a/NMS/NMS-API/pom.xml
+++ b/NMS/NMS-API/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/NMS/NMS-v1_10_R1/pom.xml
+++ b/NMS/NMS-v1_10_R1/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/NMS/NMS-v1_11_R1/pom.xml
+++ b/NMS/NMS-v1_11_R1/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/NMS/NMS-v1_12_R1/pom.xml
+++ b/NMS/NMS-v1_12_R1/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/NMS/NMS-v1_13_R1/pom.xml
+++ b/NMS/NMS-v1_13_R1/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/NMS/NMS-v1_13_R2/pom.xml
+++ b/NMS/NMS-v1_13_R2/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/NMS/NMS-v1_14_R1/pom.xml
+++ b/NMS/NMS-v1_14_R1/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/NMS/NMS-v1_15_R1/pom.xml
+++ b/NMS/NMS-v1_15_R1/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/NMS/NMS-v1_16_R1/pom.xml
+++ b/NMS/NMS-v1_16_R1/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/NMS/NMS-v1_16_R2/pom.xml
+++ b/NMS/NMS-v1_16_R2/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/NMS/NMS-v1_16_R3/pom.xml
+++ b/NMS/NMS-v1_16_R3/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/NMS/NMS-v1_17_R1/pom.xml
+++ b/NMS/NMS-v1_17_R1/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/NMS/NMS-v1_8_R1/pom.xml
+++ b/NMS/NMS-v1_8_R1/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/NMS/NMS-v1_8_R2/pom.xml
+++ b/NMS/NMS-v1_8_R2/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/NMS/NMS-v1_8_R3/pom.xml
+++ b/NMS/NMS-v1_8_R3/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/NMS/NMS-v1_9_R1/pom.xml
+++ b/NMS/NMS-v1_9_R1/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/NMS/NMS-v1_9_R2/pom.xml
+++ b/NMS/NMS-v1_9_R2/pom.xml
@ -7,7 +7,7 @@
    <parent>
        <groupId>com.songoda</groupId>
        <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.5.10</version>
+        <version>2.5.11</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/pom.xml
+++ b/pom.xml
@ -6,7 +6,7 @@

    <groupId>com.songoda</groupId>
    <artifactId>SongodaCore-Modules</artifactId>
-    <version>2.5.10</version>
+    <version>2.5.11</version>
    <packaging>pom</packaging>

    <!-- Run 'mvn versions:set -DgenerateBackupPoms=false -DnewVersion=X.Y.Z' to update version recursively -->