mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Move BlockUtils into cargo package. removed ender chest from the list. use slimefun's method to check minecraft version
This commit is contained in:
parent
4cc2e8c4d2
commit
88a5129b1a
@ -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));
|
||||
}
|
||||
}
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user