From 524133eabea22b0158fd3f52588c7f080dc1614c Mon Sep 17 00:00:00 2001 From: ExceptedPrism3 Date: Sun, 25 Jun 2023 12:46:54 +0100 Subject: [PATCH] To fix --- Logger-BungeeCord/pom.xml | 4 +- Logger-Shaded/pom.xml | 8 +-- Logger-Spigot/pom.xml | 18 ++---- .../oninventories/OnChestInteraction.java | 58 ++++++++++--------- Logger-Velocity/pom.xml | 4 +- pom.xml | 2 +- 6 files changed, 46 insertions(+), 48 deletions(-) diff --git a/Logger-BungeeCord/pom.xml b/Logger-BungeeCord/pom.xml index 042a76fb..3f177a87 100644 --- a/Logger-BungeeCord/pom.xml +++ b/Logger-BungeeCord/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Logger-Bungeecord - 1.8.0.9 + 1.8.0.11 jar Logger-BungeeCord @@ -19,7 +19,7 @@ Logger me.prism3 - 1.8.0.9 + 1.8.0.11 diff --git a/Logger-Shaded/pom.xml b/Logger-Shaded/pom.xml index a90860f4..86000c2b 100644 --- a/Logger-Shaded/pom.xml +++ b/Logger-Shaded/pom.xml @@ -5,7 +5,7 @@ Logger me.prism3 - 1.8.0.9 + 1.8.0.11 4.0.0 @@ -58,17 +58,17 @@ me.prism3 Logger-Spigot - 1.8.0.9 + 1.8.0.11 me.prism3 Logger-Bungeecord - 1.8.0.9 + 1.8.0.11 me.prism3 Logger-Velocity - 1.8.0.9 + 1.8.0.11 \ No newline at end of file diff --git a/Logger-Spigot/pom.xml b/Logger-Spigot/pom.xml index 50ecb6d3..89b49752 100644 --- a/Logger-Spigot/pom.xml +++ b/Logger-Spigot/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Logger-Spigot - 1.8.0.9 + 1.8.0.11 jar Logger-Spigot @@ -19,7 +19,7 @@ Logger me.prism3 - 1.8.0.9 + 1.8.0.11 @@ -200,7 +200,7 @@ net.dv8tion JDA - 4.2.1_253 + 4.3.0_346 club.minnced @@ -235,7 +235,7 @@ provided - com.GitHub.MilkBowl + net.milkbowl.vault VaultAPI 1.7 provided @@ -279,14 +279,8 @@ org.mariadb.jdbc mariadb-java-client - 3.0.5 + 3.1.2 - - org.postgresql - postgresql - 42.4.1 - - com.zaxxer HikariCP @@ -298,7 +292,7 @@ io.github.cdimascio dotenv-java - 2.2.4 + 2.3.1 \ No newline at end of file diff --git a/Logger-Spigot/src/main/java/me/prism3/logger/events/oninventories/OnChestInteraction.java b/Logger-Spigot/src/main/java/me/prism3/logger/events/oninventories/OnChestInteraction.java index 1ede8913..f9094668 100644 --- a/Logger-Spigot/src/main/java/me/prism3/logger/events/oninventories/OnChestInteraction.java +++ b/Logger-Spigot/src/main/java/me/prism3/logger/events/oninventories/OnChestInteraction.java @@ -31,42 +31,46 @@ public class OnChestInteraction implements Listener { private final Main main = Main.getInstance(); private final List containerMaterials = new ArrayList<>(Arrays.asList( - Material.CHEST, - Material.TRAPPED_CHEST, - Material.ENDER_CHEST, - Material.DROPPER, - Material.DISPENSER, - Material.HOPPER, - Material.BREWING_STAND, - Material.FURNACE + Material.valueOf("CHEST"), + Material.valueOf("TRAPPED_CHEST"), + Material.valueOf("ENDER_CHEST"), + Material.valueOf("DROPPER"), + Material.valueOf("DISPENSER"), + Material.valueOf("HOPPER"), + Material.valueOf("BREWING_STAND"), + Material.valueOf("FURNACE") )); private void addAdditionalItems() { if (this.main.getVersion().isAtLeast(NmsVersions.v1_11_R1)) { - this.containerMaterials.add(Material.SHULKER_BOX); - this.containerMaterials.add(Material.BLACK_SHULKER_BOX); - this.containerMaterials.add(Material.BLUE_SHULKER_BOX); - this.containerMaterials.add(Material.BROWN_SHULKER_BOX); - this.containerMaterials.add(Material.CYAN_SHULKER_BOX); - this.containerMaterials.add(Material.GRAY_SHULKER_BOX); - this.containerMaterials.add(Material.GREEN_SHULKER_BOX); - this.containerMaterials.add(Material.LIGHT_BLUE_SHULKER_BOX); - this.containerMaterials.add(Material.LIGHT_GRAY_SHULKER_BOX); - this.containerMaterials.add(Material.LIME_SHULKER_BOX); - this.containerMaterials.add(Material.MAGENTA_SHULKER_BOX); - this.containerMaterials.add(Material.ORANGE_SHULKER_BOX); - this.containerMaterials.add(Material.PINK_SHULKER_BOX); - this.containerMaterials.add(Material.PURPLE_SHULKER_BOX); - this.containerMaterials.add(Material.RED_SHULKER_BOX); - this.containerMaterials.add(Material.WHITE_SHULKER_BOX); - this.containerMaterials.add(Material.YELLOW_SHULKER_BOX); + this.containerMaterials.add(Material.valueOf("BLACK_SHULKER_BOX")); + this.containerMaterials.add(Material.valueOf("BLUE_SHULKER_BOX")); + this.containerMaterials.add(Material.valueOf("BROWN_SHULKER_BOX")); + this.containerMaterials.add(Material.valueOf("CYAN_SHULKER_BOX")); + this.containerMaterials.add(Material.valueOf("GRAY_SHULKER_BOX")); + this.containerMaterials.add(Material.valueOf("GREEN_SHULKER_BOX")); + this.containerMaterials.add(Material.valueOf("LIGHT_BLUE_SHULKER_BOX")); + this.containerMaterials.add(Material.valueOf("LIME_SHULKER_BOX")); + this.containerMaterials.add(Material.valueOf("MAGENTA_SHULKER_BOX")); + this.containerMaterials.add(Material.valueOf("ORANGE_SHULKER_BOX")); + this.containerMaterials.add(Material.valueOf("PINK_SHULKER_BOX")); + this.containerMaterials.add(Material.valueOf("PURPLE_SHULKER_BOX")); + this.containerMaterials.add(Material.valueOf("RED_SHULKER_BOX")); + this.containerMaterials.add(Material.valueOf("WHITE_SHULKER_BOX")); + this.containerMaterials.add(Material.valueOf("YELLOW_SHULKER_BOX")); + } + + if (this.main.getVersion().isAtLeast(NmsVersions.v1_13_R1)) { + + this.containerMaterials.add(Material.valueOf("SHULKER_BOX")); + this.containerMaterials.add(Material.valueOf("LIGHT_GRAY_SHULKER_BOX")); } if (this.main.getVersion().isAtLeast(NmsVersions.v1_14_R1)) { - this.containerMaterials.add(Material.BARREL); - this.containerMaterials.add(Material.BLAST_FURNACE); + this.containerMaterials.add(Material.valueOf("BARREL")); + this.containerMaterials.add(Material.valueOf("BLAST_FURNACE")); } } diff --git a/Logger-Velocity/pom.xml b/Logger-Velocity/pom.xml index 4caf0b64..9390fe42 100644 --- a/Logger-Velocity/pom.xml +++ b/Logger-Velocity/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Logger-Velocity - 1.8.0.9 + 1.8.0.11 jar Logger-Velocity @@ -19,7 +19,7 @@ Logger me.prism3 - 1.8.0.9 + 1.8.0.11 diff --git a/pom.xml b/pom.xml index 9e8f11a7..2ceecee4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ me.prism3 Logger - 1.8.0.9 + 1.8.0.11 Logger-Spigot Logger-BungeeCord