Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-11 20:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small code quality changes

Browse Source
This commit is contained in:
MattBDev
2020-03-24 12:15:24 -04:00
parent 1577ef61d4
commit e648b35b95
13 changed files with 36 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
View File

@ -41,6 +41,11 @@ import com.sk89q.worldedit.world.block.BlockType;
import com.sk89q.worldedit.world.entity.EntityType;
import com.sk89q.worldedit.world.gamemode.GameMode;
import com.sk89q.worldedit.world.item.ItemType;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.Map;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import org.bukkit.Material;
import org.bukkit.block.Biome;
import org.bukkit.block.data.BlockData;
@ -48,6 +53,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* Adapts between Bukkit and WorldEdit equivalent objects.
@ -335,12 +341,16 @@ public enum BukkitAdapter {
return getAdapter().adapt(entityType);
}
private static EnumMap<Material, BlockType> materialBlockTypeCache = new EnumMap<>(Material.class);
private static EnumMap<Material, ItemType> materialItemTypeCache = new EnumMap<>(Material.class);
/**
* Converts a Material to a BlockType
*
* @param material The material
* @return The blocktype
*/
@Nullable
public static BlockType asBlockType(Material material) {
return getAdapter().asBlockType(material);
}
@ -351,12 +361,13 @@ public enum BukkitAdapter {
* @param material The material
* @return The itemtype
*/
@Nullable
public static ItemType asItemType(Material material) {
return getAdapter().asItemType(material);
}
/*
private static Map<String, BlockState> blockStateCache = new HashMap<>();
/*
private static Int2ObjectMap<BlockState> blockStateCache = new Int2ObjectOpenHashMap<>();
private static Map<String, BlockState> blockStateStringCache = new HashMap<>();
/**
* Create a WorldEdit BlockState from a Bukkit BlockData
@ -367,9 +378,9 @@ public enum BukkitAdapter {
public static BlockState adapt(@NotNull BlockData blockData) {
return getAdapter().adapt(blockData);
}
/*
private static Map<String, BlockData> blockDataCache = new HashMap<>();
*/
private static Int2ObjectMap<BlockData> blockDataCache = new Int2ObjectOpenHashMap<>();
/**
* Create a Bukkit BlockData from a WorldEdit BlockStateHolder
*
@ -409,4 +420,4 @@ public enum BukkitAdapter {
public static ItemStack adapt(BaseItemStack item) {
return getAdapter().adapt(item);
}
}
}

1
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplAdapter.java
View File

@ -187,6 +187,7 @@ public interface BukkitImplAdapter<T> extends IBukkitAdapter {
BaseItemStack adapt(ItemStack itemStack);
default OptionalInt getInternalBlockStateId(BlockData data) {
// return OptionalInt.empty();
return getInternalBlockStateId(BukkitAdapter.adapt(data));
}

2
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/BukkitImplLoader.java
View File

@ -77,7 +77,7 @@ public class BukkitImplLoader {
}
}
public void addClass(Class cls) {
public void addClass(Class<?> cls) {
adapterCandidates.add(0, cls.getName());
}