Skip to content

Commit

Permalink
To fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ExceptedPrism3 committed Jun 25, 2023
1 parent 734501b commit 524133e
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 48 deletions.
4 changes: 2 additions & 2 deletions Logger-BungeeCord/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>Logger-Bungeecord</artifactId>
<version>1.8.0.9</version>
<version>1.8.0.11</version>
<packaging>jar</packaging>

<name>Logger-BungeeCord</name>
Expand All @@ -19,7 +19,7 @@
<parent>
<artifactId>Logger</artifactId>
<groupId>me.prism3</groupId>
<version>1.8.0.9</version>
<version>1.8.0.11</version>
</parent>

<build>
Expand Down
8 changes: 4 additions & 4 deletions Logger-Shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>Logger</artifactId>
<groupId>me.prism3</groupId>
<version>1.8.0.9</version>
<version>1.8.0.11</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -58,17 +58,17 @@
<dependency>
<groupId>me.prism3</groupId>
<artifactId>Logger-Spigot</artifactId>
<version>1.8.0.9</version>
<version>1.8.0.11</version>
</dependency>
<dependency>
<groupId>me.prism3</groupId>
<artifactId>Logger-Bungeecord</artifactId>
<version>1.8.0.9</version>
<version>1.8.0.11</version>
</dependency>
<dependency>
<groupId>me.prism3</groupId>
<artifactId>Logger-Velocity</artifactId>
<version>1.8.0.9</version>
<version>1.8.0.11</version>
</dependency>
</dependencies>
</project>
18 changes: 6 additions & 12 deletions Logger-Spigot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>Logger-Spigot</artifactId>
<version>1.8.0.9</version>
<version>1.8.0.11</version>
<packaging>jar</packaging>

<name>Logger-Spigot</name>
Expand All @@ -19,7 +19,7 @@
<parent>
<artifactId>Logger</artifactId>
<groupId>me.prism3</groupId>
<version>1.8.0.9</version>
<version>1.8.0.11</version>
</parent>

<build>
Expand Down Expand Up @@ -200,7 +200,7 @@
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>4.2.1_253</version>
<version>4.3.0_346</version>
<exclusions>
<exclusion>
<groupId>club.minnced</groupId>
Expand Down Expand Up @@ -235,7 +235,7 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.GitHub.MilkBowl</groupId>
<groupId>net.milkbowl.vault</groupId>
<artifactId>VaultAPI</artifactId>
<version>1.7</version>
<scope>provided</scope>
Expand Down Expand Up @@ -279,14 +279,8 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>3.0.5</version>
<version>3.1.2</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.4.1</version>
</dependency>

<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
Expand All @@ -298,7 +292,7 @@
<dependency>
<groupId>io.github.cdimascio</groupId>
<artifactId>dotenv-java</artifactId>
<version>2.2.4</version>
<version>2.3.1</version>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -31,42 +31,46 @@ public class OnChestInteraction implements Listener {
private final Main main = Main.getInstance();

private final List<Material> 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"));
}
}

Expand Down
4 changes: 2 additions & 2 deletions Logger-Velocity/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>Logger-Velocity</artifactId>
<version>1.8.0.9</version>
<version>1.8.0.11</version>
<packaging>jar</packaging>

<name>Logger-Velocity</name>
Expand All @@ -19,7 +19,7 @@
<parent>
<artifactId>Logger</artifactId>
<groupId>me.prism3</groupId>
<version>1.8.0.9</version>
<version>1.8.0.11</version>
</parent>

<build>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>me.prism3</groupId>
<artifactId>Logger</artifactId>
<version>1.8.0.9</version>
<version>1.8.0.11</version>
<modules>
<module>Logger-Spigot</module>
<module>Logger-BungeeCord</module>
Expand Down

0 comments on commit 524133e

Please sign in to comment.