diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/BlockUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/BlockUtils.java similarity index 72% rename from src/main/java/io/github/thebusybiscuit/slimefun4/utils/BlockUtils.java rename to src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/BlockUtils.java index 2d051fdee..5f0521ed8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/BlockUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/BlockUtils.java @@ -1,11 +1,10 @@ -package io.github.thebusybiscuit.slimefun4.utils; -import io.github.thebusybiscuit.cscorelib2.reflection.ReflectionUtils; +package io.github.thebusybiscuit.slimefun4.core.networks.cargo; +import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion; +import me.mrCookieSlime.Slimefun.SlimefunPlugin; import org.bukkit.Material; import org.bukkit.block.Block; public final class BlockUtils { - private static final boolean is_1_14 = ReflectionUtils.isVersion("v1_14_"); - private BlockUtils() {} public static boolean hasInventory(Block block) { @@ -20,12 +19,11 @@ public final class BlockUtils { case DROPPER: case HOPPER: case BREWING_STAND: - case ENDER_CHEST: return true; default: if (type.name().endsWith("SHULKER_BOX")) return true; - return (is_1_14 && + return (SlimefunPlugin.getMinecraftVersion().isAtLeast(MinecraftVersion.MINECRAFT_1_14) && (type == Material.BARREL || type == Material.BLAST_FURNACE || type == Material.LECTERN || type == Material.SMOKER)); } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java index bbb08d739..bc5b1150d 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java @@ -10,7 +10,6 @@ import java.util.Optional; import java.util.Set; import java.util.logging.Level; -import io.github.thebusybiscuit.slimefun4.utils.BlockUtils; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.block.BlockState; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java index e97a9b04c..bde955675 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java @@ -3,7 +3,6 @@ package io.github.thebusybiscuit.slimefun4.core.networks.cargo; import java.util.ArrayList; import java.util.List; -import io.github.thebusybiscuit.slimefun4.utils.BlockUtils; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockState; diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/ChestTerminalNetwork.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/ChestTerminalNetwork.java index 8c01a1813..4adadefaf 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/ChestTerminalNetwork.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/ChestTerminalNetwork.java @@ -9,7 +9,6 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import io.github.thebusybiscuit.slimefun4.utils.BlockUtils; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block;