forked from LogBlock/LogBlock
No more enums
This commit is contained in:
@ -1,6 +1,6 @@
|
||||
package de.diddiz.LogBlock.blockstate;
|
||||
|
||||
import java.util.EnumMap;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.bukkit.Material;
|
||||
@ -8,7 +8,7 @@ import org.bukkit.block.BlockState;
|
||||
import org.bukkit.configuration.file.YamlConfiguration;
|
||||
|
||||
public class BlockStateCodecs {
|
||||
private static Map<Material, BlockStateCodec> codecs = new EnumMap<>(Material.class);
|
||||
private static Map<Material, BlockStateCodec> codecs = new HashMap<>();
|
||||
|
||||
public static void registerCodec(BlockStateCodec codec) {
|
||||
Material[] materials = codec.getApplicableMaterials();
|
||||
|
@ -16,8 +16,8 @@ import org.bukkit.entity.WaterMob;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.EnumMap;
|
||||
import java.util.EnumSet;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
@ -97,7 +97,7 @@ public class WorldConfig extends LoggingEnabledMapping {
|
||||
|
||||
private class EntityLoggingList {
|
||||
private final EntityLogging entityAction;
|
||||
private final EnumSet<EntityType> logged = EnumSet.noneOf(EntityType.class);
|
||||
private final HashSet<EntityType> logged = new HashSet<>();
|
||||
private final boolean logAll;
|
||||
private final boolean logAnimals;
|
||||
private final boolean logWateranimals;
|
||||
|
@ -29,40 +29,27 @@ public class BlockSpreadLogging extends LoggingListener {
|
||||
World world = event.getNewState().getWorld();
|
||||
Material type = event.getNewState().getType();
|
||||
|
||||
switch (type) {
|
||||
case GRASS:
|
||||
if (type == Material.GRASS) {
|
||||
if (!isLogging(world, Logging.GRASSGROWTH)) {
|
||||
return;
|
||||
}
|
||||
name = "GrassGrowth";
|
||||
break;
|
||||
case MYCELIUM:
|
||||
} else if (type == Material.MYCELIUM) {
|
||||
if (!isLogging(world, Logging.MYCELIUMSPREAD)) {
|
||||
return;
|
||||
}
|
||||
name = "MyceliumSpread";
|
||||
break;
|
||||
case VINE:
|
||||
case CAVE_VINES:
|
||||
case CAVE_VINES_PLANT:
|
||||
case WEEPING_VINES:
|
||||
case WEEPING_VINES_PLANT:
|
||||
case TWISTING_VINES:
|
||||
case TWISTING_VINES_PLANT:
|
||||
} else if (type == Material.VINE || type == Material.CAVE_VINES || type == Material.CAVE_VINES_PLANT || type == Material.WEEPING_VINES || type == Material.WEEPING_VINES_PLANT || type == Material.TWISTING_VINES || type == Material.TWISTING_VINES_PLANT) {
|
||||
if (!isLogging(world, Logging.VINEGROWTH)) {
|
||||
return;
|
||||
}
|
||||
name = "VineGrowth";
|
||||
break;
|
||||
case RED_MUSHROOM:
|
||||
case BROWN_MUSHROOM:
|
||||
} else if (type == Material.RED_MUSHROOM || type == Material.BROWN_MUSHROOM) {
|
||||
if (!isLogging(world, Logging.MUSHROOMSPREAD)) {
|
||||
return;
|
||||
}
|
||||
name = "MushroomSpread";
|
||||
break;
|
||||
case BAMBOO:
|
||||
case BAMBOO_SAPLING:
|
||||
} else if (type == Material.BAMBOO || type == Material.BAMBOO_SAPLING) {
|
||||
if (!isLogging(world, Logging.BAMBOOGROWTH)) {
|
||||
return;
|
||||
}
|
||||
@ -71,8 +58,7 @@ public class BlockSpreadLogging extends LoggingListener {
|
||||
// bamboo sapling gets replaced by bamboo
|
||||
consumer.queueBlockReplace(new Actor(name), event.getSource().getState(), Material.BAMBOO.createBlockData());
|
||||
}
|
||||
break;
|
||||
case POINTED_DRIPSTONE:
|
||||
} else if (type == Material.POINTED_DRIPSTONE) {
|
||||
if (!isLogging(world, Logging.DRIPSTONEGROWTH)) {
|
||||
return;
|
||||
}
|
||||
@ -101,18 +87,12 @@ public class BlockSpreadLogging extends LoggingListener {
|
||||
consumer.queueBlockReplace(new Actor(name), oldState, event.getNewState());
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case SCULK:
|
||||
case SCULK_VEIN:
|
||||
case SCULK_CATALYST:
|
||||
case SCULK_SENSOR:
|
||||
case SCULK_SHRIEKER:
|
||||
} else if (type == Material.SCULK || type == Material.SCULK_VEIN || type == Material.SCULK_CATALYST || type == Material.SCULK_SENSOR || type == Material.SCULK_SHRIEKER) {
|
||||
if (!isLogging(world, Logging.SCULKSPREAD)) {
|
||||
return;
|
||||
}
|
||||
name = "SculkSpread";
|
||||
break;
|
||||
default:
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -122,9 +122,7 @@ public class InteractLogging extends LoggingListener {
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
switch (type) {
|
||||
case CAKE:
|
||||
} else if (type == Material.CAKE) {
|
||||
if (event.hasItem() && BukkitUtils.isCandle(event.getItem().getType()) && event.useItemInHand() != Result.DENY) {
|
||||
BlockData newBlockData = Material.valueOf(event.getItem().getType().name() + "_CAKE").createBlockData();
|
||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
||||
@ -137,8 +135,7 @@ public class InteractLogging extends LoggingListener {
|
||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, Material.AIR.createBlockData());
|
||||
}
|
||||
}
|
||||
break;
|
||||
case NOTE_BLOCK:
|
||||
} else if (type == Material.NOTE_BLOCK) {
|
||||
if (wcfg.isLogging(Logging.NOTEBLOCKINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
||||
NoteBlock newBlockData = (NoteBlock) blockData.clone();
|
||||
if (newBlockData.getNote().getOctave() == 2) {
|
||||
@ -148,34 +145,29 @@ public class InteractLogging extends LoggingListener {
|
||||
}
|
||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
||||
}
|
||||
break;
|
||||
case REPEATER:
|
||||
} else if (type == Material.REPEATER) {
|
||||
if (wcfg.isLogging(Logging.DIODEINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
||||
Repeater newBlockData = (Repeater) blockData.clone();
|
||||
newBlockData.setDelay((newBlockData.getDelay() % 4) + 1);
|
||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
||||
}
|
||||
break;
|
||||
case COMPARATOR:
|
||||
} else if (type == Material.COMPARATOR) {
|
||||
if (wcfg.isLogging(Logging.COMPARATORINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
||||
Comparator newBlockData = (Comparator) blockData.clone();
|
||||
newBlockData.setMode(newBlockData.getMode() == Mode.COMPARE ? Mode.SUBTRACT : Mode.COMPARE);
|
||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
||||
}
|
||||
break;
|
||||
case DAYLIGHT_DETECTOR:
|
||||
} else if (type == Material.DAYLIGHT_DETECTOR) {
|
||||
if (wcfg.isLogging(Logging.DAYLIGHTDETECTORINTERACT) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
||||
DaylightDetector newBlockData = (DaylightDetector) blockData.clone();
|
||||
newBlockData.setInverted(!newBlockData.isInverted());
|
||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
||||
}
|
||||
break;
|
||||
case TRIPWIRE:
|
||||
} else if (type == Material.TRIPWIRE) {
|
||||
if (wcfg.isLogging(Logging.TRIPWIREINTERACT) && event.getAction() == Action.PHYSICAL) {
|
||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, blockData);
|
||||
}
|
||||
break;
|
||||
case FARMLAND:
|
||||
} else if (type == Material.FARMLAND) {
|
||||
if (wcfg.isLogging(Logging.CROPTRAMPLE) && event.getAction() == Action.PHYSICAL) {
|
||||
// 3 = Dirt ID
|
||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, Material.DIRT.createBlockData());
|
||||
@ -185,8 +177,7 @@ public class InteractLogging extends LoggingListener {
|
||||
consumer.queueBlockBreak(Actor.actorFromEntity(player), trampledCrop.getState());
|
||||
}
|
||||
}
|
||||
break;
|
||||
case TURTLE_EGG:
|
||||
} else if (type == Material.TURTLE_EGG) {
|
||||
if (wcfg.isLogging(Logging.BLOCKBREAK) && event.getAction() == Action.PHYSICAL) {
|
||||
TurtleEgg turtleEggData = (TurtleEgg) blockData;
|
||||
int eggs = turtleEggData.getEggs();
|
||||
@ -198,8 +189,7 @@ public class InteractLogging extends LoggingListener {
|
||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, turtleEggData, Material.AIR.createBlockData());
|
||||
}
|
||||
}
|
||||
break;
|
||||
case PUMPKIN:
|
||||
} else if (type == Material.PUMPKIN) {
|
||||
if ((wcfg.isLogging(Logging.BLOCKBREAK) || wcfg.isLogging(Logging.BLOCKPLACE)) && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
|
||||
ItemStack inHand = event.getItem();
|
||||
if (inHand != null && inHand.getType() == Material.SHEARS) {
|
||||
@ -222,9 +212,6 @@ public class InteractLogging extends LoggingListener {
|
||||
consumer.queueBlock(Actor.actorFromEntity(player), loc, blockData, newBlockData);
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -8,8 +8,6 @@ import java.lang.reflect.Method;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.EnumMap;
|
||||
import java.util.EnumSet;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
@ -69,26 +67,26 @@ public class BukkitUtils {
|
||||
private static final Set<Material> bedBlocks;
|
||||
|
||||
private static final Map<EntityType, Material> projectileItems;
|
||||
private static final EnumSet<Material> signs;
|
||||
private static final EnumSet<Material> wallSigns;
|
||||
private static final EnumSet<Material> hangingSigns;
|
||||
private static final EnumSet<Material> hangingWallSigns;
|
||||
private static final EnumSet<Material> allSigns;
|
||||
private static final HashSet<Material> signs;
|
||||
private static final HashSet<Material> wallSigns;
|
||||
private static final HashSet<Material> hangingSigns;
|
||||
private static final HashSet<Material> hangingWallSigns;
|
||||
private static final HashSet<Material> allSigns;
|
||||
private static final Set<Material> unmodifiableSigns;
|
||||
private static final EnumSet<Material> buttons;
|
||||
private static final EnumSet<Material> pressurePlates;
|
||||
private static final EnumSet<Material> woodenDoors;
|
||||
private static final EnumSet<Material> slabs;
|
||||
private static final EnumSet<Material> concreteBlocks;
|
||||
private static final EnumMap<Material, DyeColor> dyes;
|
||||
private static final EnumSet<Material> alwaysWaterlogged;
|
||||
private static final EnumSet<Material> candles;
|
||||
private static final EnumSet<Material> candleCakes;
|
||||
private static final EnumSet<Material> fenceGates;
|
||||
private static final EnumSet<Material> woodenTrapdoors;
|
||||
private static final HashSet<Material> buttons;
|
||||
private static final HashSet<Material> pressurePlates;
|
||||
private static final HashSet<Material> woodenDoors;
|
||||
private static final HashSet<Material> slabs;
|
||||
private static final HashSet<Material> concreteBlocks;
|
||||
private static final HashMap<Material, DyeColor> dyes;
|
||||
private static final HashSet<Material> alwaysWaterlogged;
|
||||
private static final HashSet<Material> candles;
|
||||
private static final HashSet<Material> candleCakes;
|
||||
private static final HashSet<Material> fenceGates;
|
||||
private static final HashSet<Material> woodenTrapdoors;
|
||||
|
||||
static {
|
||||
fenceGates = EnumSet.noneOf(Material.class);
|
||||
fenceGates = new HashSet<>();
|
||||
fenceGates.add(Material.OAK_FENCE_GATE);
|
||||
fenceGates.add(Material.SPRUCE_FENCE_GATE);
|
||||
fenceGates.add(Material.BIRCH_FENCE_GATE);
|
||||
@ -100,7 +98,7 @@ public class BukkitUtils {
|
||||
fenceGates.add(Material.MANGROVE_FENCE_GATE);
|
||||
fenceGates.add(Material.BAMBOO_FENCE_GATE);
|
||||
|
||||
woodenTrapdoors = EnumSet.noneOf(Material.class);
|
||||
woodenTrapdoors = new HashSet<>();
|
||||
woodenTrapdoors.add(Material.OAK_TRAPDOOR);
|
||||
woodenTrapdoors.add(Material.SPRUCE_TRAPDOOR);
|
||||
woodenTrapdoors.add(Material.BIRCH_TRAPDOOR);
|
||||
@ -112,7 +110,7 @@ public class BukkitUtils {
|
||||
woodenTrapdoors.add(Material.MANGROVE_TRAPDOOR);
|
||||
woodenTrapdoors.add(Material.BAMBOO_TRAPDOOR);
|
||||
|
||||
pressurePlates = EnumSet.noneOf(Material.class);
|
||||
pressurePlates = new HashSet<>();
|
||||
pressurePlates.add(Material.OAK_PRESSURE_PLATE);
|
||||
pressurePlates.add(Material.SPRUCE_PRESSURE_PLATE);
|
||||
pressurePlates.add(Material.BIRCH_PRESSURE_PLATE);
|
||||
@ -127,7 +125,7 @@ public class BukkitUtils {
|
||||
pressurePlates.add(Material.LIGHT_WEIGHTED_PRESSURE_PLATE);
|
||||
pressurePlates.add(Material.HEAVY_WEIGHTED_PRESSURE_PLATE);
|
||||
|
||||
woodenDoors = EnumSet.noneOf(Material.class);
|
||||
woodenDoors = new HashSet<>();
|
||||
woodenDoors.add(Material.OAK_DOOR);
|
||||
woodenDoors.add(Material.SPRUCE_DOOR);
|
||||
woodenDoors.add(Material.BIRCH_DOOR);
|
||||
@ -139,7 +137,7 @@ public class BukkitUtils {
|
||||
woodenDoors.add(Material.MANGROVE_DOOR);
|
||||
woodenDoors.add(Material.BAMBOO_DOOR);
|
||||
|
||||
EnumSet<Material> saplings = EnumSet.noneOf(Material.class);
|
||||
HashSet<Material> saplings = new HashSet<>();
|
||||
saplings.add(Material.OAK_SAPLING);
|
||||
saplings.add(Material.SPRUCE_SAPLING);
|
||||
saplings.add(Material.BIRCH_SAPLING);
|
||||
@ -150,7 +148,7 @@ public class BukkitUtils {
|
||||
saplings.add(Material.CRIMSON_FUNGUS);
|
||||
saplings.add(Material.MANGROVE_PROPAGULE);
|
||||
|
||||
EnumSet<Material> carpets = EnumSet.noneOf(Material.class);
|
||||
HashSet<Material> carpets = new HashSet<>();
|
||||
carpets.add(Material.BLACK_CARPET);
|
||||
carpets.add(Material.BLUE_CARPET);
|
||||
carpets.add(Material.LIGHT_GRAY_CARPET);
|
||||
@ -168,7 +166,7 @@ public class BukkitUtils {
|
||||
carpets.add(Material.WHITE_CARPET);
|
||||
carpets.add(Material.YELLOW_CARPET);
|
||||
|
||||
slabs = EnumSet.noneOf(Material.class);
|
||||
slabs = new HashSet<>();
|
||||
slabs.add(Material.OAK_SLAB);
|
||||
slabs.add(Material.SPRUCE_SLAB);
|
||||
slabs.add(Material.BIRCH_SLAB);
|
||||
@ -199,7 +197,7 @@ public class BukkitUtils {
|
||||
slabs.add(Material.MANGROVE_SLAB);
|
||||
slabs.add(Material.BAMBOO_SLAB);
|
||||
|
||||
buttons = EnumSet.noneOf(Material.class);
|
||||
buttons = new HashSet<>();
|
||||
buttons.add(Material.STONE_BUTTON);
|
||||
buttons.add(Material.OAK_BUTTON);
|
||||
buttons.add(Material.SPRUCE_BUTTON);
|
||||
@ -213,7 +211,7 @@ public class BukkitUtils {
|
||||
buttons.add(Material.BAMBOO_BUTTON);
|
||||
buttons.add(Material.POLISHED_BLACKSTONE_BUTTON);
|
||||
|
||||
signs = EnumSet.noneOf(Material.class);
|
||||
signs = new HashSet<>();
|
||||
signs.add(Material.OAK_SIGN);
|
||||
signs.add(Material.SPRUCE_SIGN);
|
||||
signs.add(Material.BIRCH_SIGN);
|
||||
@ -225,7 +223,7 @@ public class BukkitUtils {
|
||||
signs.add(Material.MANGROVE_SIGN);
|
||||
signs.add(Material.BAMBOO_SIGN);
|
||||
|
||||
wallSigns = EnumSet.noneOf(Material.class);
|
||||
wallSigns = new HashSet<>();
|
||||
wallSigns.add(Material.OAK_WALL_SIGN);
|
||||
wallSigns.add(Material.SPRUCE_WALL_SIGN);
|
||||
wallSigns.add(Material.BIRCH_WALL_SIGN);
|
||||
@ -237,7 +235,7 @@ public class BukkitUtils {
|
||||
wallSigns.add(Material.MANGROVE_WALL_SIGN);
|
||||
wallSigns.add(Material.BAMBOO_WALL_SIGN);
|
||||
|
||||
hangingSigns = EnumSet.noneOf(Material.class);
|
||||
hangingSigns = new HashSet<>();
|
||||
hangingSigns.add(Material.OAK_HANGING_SIGN);
|
||||
hangingSigns.add(Material.SPRUCE_HANGING_SIGN);
|
||||
hangingSigns.add(Material.BIRCH_HANGING_SIGN);
|
||||
@ -249,7 +247,7 @@ public class BukkitUtils {
|
||||
hangingSigns.add(Material.MANGROVE_HANGING_SIGN);
|
||||
hangingSigns.add(Material.BAMBOO_HANGING_SIGN);
|
||||
|
||||
hangingWallSigns = EnumSet.noneOf(Material.class);
|
||||
hangingWallSigns = new HashSet<>();
|
||||
hangingWallSigns.add(Material.OAK_WALL_HANGING_SIGN);
|
||||
hangingWallSigns.add(Material.SPRUCE_WALL_HANGING_SIGN);
|
||||
hangingWallSigns.add(Material.BIRCH_WALL_HANGING_SIGN);
|
||||
@ -261,14 +259,14 @@ public class BukkitUtils {
|
||||
hangingWallSigns.add(Material.MANGROVE_WALL_HANGING_SIGN);
|
||||
hangingWallSigns.add(Material.BAMBOO_WALL_HANGING_SIGN);
|
||||
|
||||
allSigns = EnumSet.noneOf(Material.class);
|
||||
allSigns = new HashSet<>();
|
||||
allSigns.addAll(signs);
|
||||
allSigns.addAll(wallSigns);
|
||||
allSigns.addAll(hangingSigns);
|
||||
allSigns.addAll(hangingWallSigns);
|
||||
unmodifiableSigns = Collections.unmodifiableSet(allSigns);
|
||||
|
||||
singleBlockPlants = EnumSet.noneOf(Material.class);
|
||||
singleBlockPlants = new HashSet<>();
|
||||
singleBlockPlants.add(Material.GRASS);
|
||||
singleBlockPlants.add(Material.FERN);
|
||||
singleBlockPlants.add(Material.DEAD_BUSH);
|
||||
@ -296,7 +294,7 @@ public class BukkitUtils {
|
||||
singleBlockPlants.add(Material.AZALEA);
|
||||
singleBlockPlants.add(Material.FLOWERING_AZALEA);
|
||||
|
||||
doublePlants = EnumSet.noneOf(Material.class);
|
||||
doublePlants = new HashSet<>();
|
||||
doublePlants.add(Material.TALL_GRASS);
|
||||
doublePlants.add(Material.LARGE_FERN);
|
||||
doublePlants.add(Material.TALL_SEAGRASS);
|
||||
@ -316,7 +314,7 @@ public class BukkitUtils {
|
||||
blockEquivalents.add(new HashSet<>(Arrays.asList(93, 94)));
|
||||
|
||||
// Blocks that break when they are attached to a block
|
||||
relativeBreakable = EnumSet.noneOf(Material.class);
|
||||
relativeBreakable = new HashSet<>();
|
||||
relativeBreakable.addAll(wallSigns);
|
||||
relativeBreakable.add(Material.LADDER);
|
||||
relativeBreakable.addAll(buttons);
|
||||
@ -332,7 +330,7 @@ public class BukkitUtils {
|
||||
relativeBreakable.add(Material.LARGE_AMETHYST_BUD);
|
||||
|
||||
// Blocks that break when they are on top of a block
|
||||
relativeTopBreakable = EnumSet.noneOf(Material.class);
|
||||
relativeTopBreakable = new HashSet<>();
|
||||
relativeTopBreakable.addAll(saplings);
|
||||
relativeTopBreakable.addAll(singleBlockPlants);
|
||||
relativeTopBreakable.add(Material.WHEAT);
|
||||
@ -375,7 +373,7 @@ public class BukkitUtils {
|
||||
}
|
||||
|
||||
// Blocks that break falling entities
|
||||
fallingEntityKillers = EnumSet.noneOf(Material.class);
|
||||
fallingEntityKillers = new HashSet<>();
|
||||
fallingEntityKillers.addAll(signs);
|
||||
fallingEntityKillers.addAll(wallSigns);
|
||||
fallingEntityKillers.addAll(pressurePlates);
|
||||
@ -427,7 +425,7 @@ public class BukkitUtils {
|
||||
}
|
||||
|
||||
// Crop Blocks
|
||||
cropBlocks = EnumSet.noneOf(Material.class);
|
||||
cropBlocks = new HashSet<>();
|
||||
cropBlocks.add(Material.WHEAT);
|
||||
cropBlocks.add(Material.MELON_STEM);
|
||||
cropBlocks.add(Material.PUMPKIN_STEM);
|
||||
@ -436,7 +434,7 @@ public class BukkitUtils {
|
||||
cropBlocks.add(Material.BEETROOT);
|
||||
|
||||
// Shulker Boxes
|
||||
shulkerBoxBlocks = EnumSet.noneOf(Material.class);
|
||||
shulkerBoxBlocks = new HashSet<>();
|
||||
shulkerBoxBlocks.add(Material.SHULKER_BOX);
|
||||
shulkerBoxBlocks.add(Material.BLACK_SHULKER_BOX);
|
||||
shulkerBoxBlocks.add(Material.BLUE_SHULKER_BOX);
|
||||
@ -456,7 +454,7 @@ public class BukkitUtils {
|
||||
shulkerBoxBlocks.add(Material.YELLOW_SHULKER_BOX);
|
||||
|
||||
// Container Blocks
|
||||
containerBlocks = EnumSet.noneOf(Material.class);
|
||||
containerBlocks = new HashSet<>();
|
||||
containerBlocks.add(Material.CHEST);
|
||||
containerBlocks.add(Material.TRAPPED_CHEST);
|
||||
containerBlocks.add(Material.DISPENSER);
|
||||
@ -473,7 +471,7 @@ public class BukkitUtils {
|
||||
// containerBlocks.add(Material.ENDER_CHEST);
|
||||
|
||||
// It doesn't seem like you could injure people with some of these, but they exist, so....
|
||||
projectileItems = new EnumMap<>(EntityType.class);
|
||||
projectileItems = new HashMap<>();
|
||||
projectileItems.put(EntityType.ARROW, Material.ARROW);
|
||||
projectileItems.put(EntityType.EGG, Material.EGG);
|
||||
projectileItems.put(EntityType.ENDER_PEARL, Material.ENDER_PEARL);
|
||||
@ -486,7 +484,7 @@ public class BukkitUtils {
|
||||
projectileItems.put(EntityType.WITHER_SKULL, Material.WITHER_SKELETON_SKULL);
|
||||
projectileItems.put(EntityType.FIREWORK, Material.FIREWORK_ROCKET);
|
||||
|
||||
nonFluidProofBlocks = EnumSet.noneOf(Material.class);
|
||||
nonFluidProofBlocks = new HashSet<>();
|
||||
nonFluidProofBlocks.addAll(singleBlockPlants);
|
||||
nonFluidProofBlocks.addAll(doublePlants);
|
||||
nonFluidProofBlocks.add(Material.REDSTONE_WALL_TORCH);
|
||||
@ -517,13 +515,13 @@ public class BukkitUtils {
|
||||
nonFluidProofBlocks.add(Material.DAYLIGHT_DETECTOR);
|
||||
nonFluidProofBlocks.addAll(carpets);
|
||||
|
||||
alwaysWaterlogged = EnumSet.noneOf(Material.class);
|
||||
alwaysWaterlogged = new HashSet<>();
|
||||
alwaysWaterlogged.add(Material.SEAGRASS);
|
||||
alwaysWaterlogged.add(Material.TALL_SEAGRASS);
|
||||
alwaysWaterlogged.add(Material.KELP);
|
||||
alwaysWaterlogged.add(Material.KELP_PLANT);
|
||||
|
||||
bedBlocks = EnumSet.noneOf(Material.class);
|
||||
bedBlocks = new HashSet<>();
|
||||
bedBlocks.add(Material.BLACK_BED);
|
||||
bedBlocks.add(Material.BLUE_BED);
|
||||
bedBlocks.add(Material.LIGHT_GRAY_BED);
|
||||
@ -541,7 +539,7 @@ public class BukkitUtils {
|
||||
bedBlocks.add(Material.WHITE_BED);
|
||||
bedBlocks.add(Material.YELLOW_BED);
|
||||
|
||||
concreteBlocks = EnumSet.noneOf(Material.class);
|
||||
concreteBlocks = new HashSet<>();
|
||||
concreteBlocks.add(Material.BLACK_CONCRETE);
|
||||
concreteBlocks.add(Material.BLUE_CONCRETE);
|
||||
concreteBlocks.add(Material.LIGHT_GRAY_CONCRETE);
|
||||
@ -559,7 +557,7 @@ public class BukkitUtils {
|
||||
concreteBlocks.add(Material.WHITE_CONCRETE);
|
||||
concreteBlocks.add(Material.YELLOW_CONCRETE);
|
||||
|
||||
candles = EnumSet.noneOf(Material.class);
|
||||
candles = new HashSet<>();
|
||||
candles.add(Material.CANDLE);
|
||||
candles.add(Material.BLACK_CANDLE);
|
||||
candles.add(Material.BLUE_CANDLE);
|
||||
@ -578,7 +576,7 @@ public class BukkitUtils {
|
||||
candles.add(Material.WHITE_CANDLE);
|
||||
candles.add(Material.YELLOW_CANDLE);
|
||||
|
||||
candleCakes = EnumSet.noneOf(Material.class);
|
||||
candleCakes = new HashSet<>();
|
||||
candleCakes.add(Material.CANDLE_CAKE);
|
||||
candleCakes.add(Material.BLACK_CANDLE_CAKE);
|
||||
candleCakes.add(Material.BLUE_CANDLE_CAKE);
|
||||
@ -597,7 +595,7 @@ public class BukkitUtils {
|
||||
candleCakes.add(Material.WHITE_CANDLE_CAKE);
|
||||
candleCakes.add(Material.YELLOW_CANDLE_CAKE);
|
||||
|
||||
dyes = new EnumMap<>(Material.class);
|
||||
dyes = new HashMap<>();
|
||||
dyes.put(Material.BLACK_DYE, DyeColor.BLACK);
|
||||
dyes.put(Material.BLUE_DYE, DyeColor.BLUE);
|
||||
dyes.put(Material.LIGHT_GRAY_DYE, DyeColor.LIGHT_GRAY);
|
||||
@ -1132,57 +1130,43 @@ public class BukkitUtils {
|
||||
if (expected == found) {
|
||||
return true;
|
||||
}
|
||||
switch (expected) {
|
||||
case DIRT:
|
||||
case MYCELIUM:
|
||||
case FARMLAND:
|
||||
case GRASS_BLOCK:
|
||||
case PODZOL:
|
||||
case DIRT_PATH:
|
||||
if (expected == Material.DIRT || expected == Material.MYCELIUM || expected == Material.FARMLAND || expected == Material.GRASS_BLOCK || expected == Material.PODZOL || expected == Material.DIRT_PATH) {
|
||||
return found == Material.DIRT || found == Material.MYCELIUM || found == Material.FARMLAND || found == Material.GRASS_BLOCK || found == Material.PODZOL || found == Material.DIRT_PATH;
|
||||
case BAMBOO:
|
||||
case BAMBOO_SAPLING:
|
||||
}
|
||||
if (expected == Material.BAMBOO || expected == Material.BAMBOO_SAPLING) {
|
||||
return found == Material.BAMBOO || found == Material.BAMBOO_SAPLING;
|
||||
case SPONGE:
|
||||
case WET_SPONGE:
|
||||
}
|
||||
if (expected == Material.SPONGE || expected == Material.WET_SPONGE) {
|
||||
return found == Material.SPONGE || found == Material.WET_SPONGE;
|
||||
case MELON_STEM:
|
||||
case ATTACHED_MELON_STEM:
|
||||
}
|
||||
if (expected == Material.MELON_STEM || expected == Material.ATTACHED_MELON_STEM) {
|
||||
return found == Material.MELON_STEM || found == Material.ATTACHED_MELON_STEM;
|
||||
case PUMPKIN_STEM:
|
||||
case ATTACHED_PUMPKIN_STEM:
|
||||
}
|
||||
if (expected == Material.PUMPKIN_STEM || expected == Material.ATTACHED_PUMPKIN_STEM) {
|
||||
return found == Material.PUMPKIN_STEM || found == Material.ATTACHED_PUMPKIN_STEM;
|
||||
case TWISTING_VINES:
|
||||
case TWISTING_VINES_PLANT:
|
||||
}
|
||||
if (expected == Material.TWISTING_VINES || expected == Material.TWISTING_VINES_PLANT) {
|
||||
return found == Material.TWISTING_VINES || found == Material.TWISTING_VINES_PLANT;
|
||||
case WEEPING_VINES:
|
||||
case WEEPING_VINES_PLANT:
|
||||
}
|
||||
if (expected == Material.WEEPING_VINES || expected == Material.WEEPING_VINES_PLANT) {
|
||||
return found == Material.WEEPING_VINES || found == Material.WEEPING_VINES_PLANT;
|
||||
case CAVE_VINES:
|
||||
case CAVE_VINES_PLANT:
|
||||
}
|
||||
if (expected == Material.CAVE_VINES || expected == Material.CAVE_VINES_PLANT) {
|
||||
return found == Material.CAVE_VINES || found == Material.CAVE_VINES_PLANT;
|
||||
case BIG_DRIPLEAF:
|
||||
case BIG_DRIPLEAF_STEM:
|
||||
}
|
||||
if (expected == Material.BIG_DRIPLEAF || expected == Material.BIG_DRIPLEAF_STEM) {
|
||||
return found == Material.BIG_DRIPLEAF || found == Material.BIG_DRIPLEAF_STEM;
|
||||
case COPPER_BLOCK:
|
||||
case EXPOSED_COPPER:
|
||||
case WEATHERED_COPPER:
|
||||
case OXIDIZED_COPPER:
|
||||
}
|
||||
if (expected == Material.COPPER_BLOCK || expected == Material.EXPOSED_COPPER || expected == Material.WEATHERED_COPPER || expected == Material.OXIDIZED_COPPER) {
|
||||
return found == Material.COPPER_BLOCK || found == Material.EXPOSED_COPPER || found == Material.WEATHERED_COPPER || found == Material.OXIDIZED_COPPER;
|
||||
case CUT_COPPER:
|
||||
case EXPOSED_CUT_COPPER:
|
||||
case WEATHERED_CUT_COPPER:
|
||||
case OXIDIZED_CUT_COPPER:
|
||||
}
|
||||
if (expected == Material.CUT_COPPER || expected == Material.EXPOSED_CUT_COPPER || expected == Material.WEATHERED_CUT_COPPER || expected == Material.OXIDIZED_CUT_COPPER) {
|
||||
return found == Material.CUT_COPPER || found == Material.EXPOSED_CUT_COPPER || found == Material.WEATHERED_CUT_COPPER || found == Material.OXIDIZED_CUT_COPPER;
|
||||
case CUT_COPPER_STAIRS:
|
||||
case EXPOSED_CUT_COPPER_STAIRS:
|
||||
case WEATHERED_CUT_COPPER_STAIRS:
|
||||
case OXIDIZED_CUT_COPPER_STAIRS:
|
||||
}
|
||||
if (expected == Material.CUT_COPPER_STAIRS || expected == Material.EXPOSED_CUT_COPPER_STAIRS || expected == Material.WEATHERED_CUT_COPPER_STAIRS || expected == Material.OXIDIZED_CUT_COPPER_STAIRS) {
|
||||
return found == Material.CUT_COPPER_STAIRS || found == Material.EXPOSED_CUT_COPPER_STAIRS || found == Material.WEATHERED_CUT_COPPER_STAIRS || found == Material.OXIDIZED_CUT_COPPER_STAIRS;
|
||||
case CUT_COPPER_SLAB:
|
||||
case EXPOSED_CUT_COPPER_SLAB:
|
||||
case WEATHERED_CUT_COPPER_SLAB:
|
||||
case OXIDIZED_CUT_COPPER_SLAB:
|
||||
}
|
||||
if (expected == Material.CUT_COPPER_SLAB || expected == Material.EXPOSED_CUT_COPPER_SLAB || expected == Material.WEATHERED_CUT_COPPER_SLAB || expected == Material.OXIDIZED_CUT_COPPER_SLAB) {
|
||||
return found == Material.CUT_COPPER_SLAB || found == Material.EXPOSED_CUT_COPPER_SLAB || found == Material.WEATHERED_CUT_COPPER_SLAB || found == Material.OXIDIZED_CUT_COPPER_SLAB;
|
||||
}
|
||||
return false;
|
||||
|
Reference in New Issue
Block a user