Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a few utility methods.

Browse Source
This commit is contained in:
Matthew Miller 2018-08-03 23:01:56 +10:00
parent b2bc043eeb
commit b2769befdb
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,7 @@ import com.sk89q.worldedit.world.item.ItemTypes;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import java.util.HashMap; import java.util.HashMap;
@ -106,6 +107,26 @@ public class BukkitAdapter {
return new BukkitWorld(world); return new BukkitWorld(world);
} }
/**
* Create a WorldEdit Player from a Bukkit Player.
*
* @param player The Bukkit player
* @return The WorldEdit player
*/
public static BukkitPlayer adapt(Player player) {
return WorldEditPlugin.getInstance().wrapPlayer(player);
}
/**
* Create a Bukkit Player from a WorldEdit Player.
*
* @param player The WorldEdit player
* @return The Bukkit player
*/
public static Player adapt(com.sk89q.worldedit.entity.Player player) {
return ((BukkitPlayer) player).getPlayer();
}
/** /**
* Create a Bukkit world from a WorldEdit world. * Create a Bukkit world from a WorldEdit world.
* *

5
worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultBlockParser.java
View File

@ -268,7 +268,10 @@ class DefaultBlockParser extends InputParser<BlockStateHolder> {
// No wildcards allowed => eliminate them. (Start with default state) // No wildcards allowed => eliminate them. (Start with default state)
state = blockType.getDefaultState(); state = blockType.getDefaultState();
} else { } else {
state = new BlockState(blockType, blockStates); state = blockType.getDefaultState().toFuzzy();
for (Map.Entry<Property<?>, Object> blockState : blockStates.entrySet()) {
state = state.with((Property) blockState.getKey(), blockState.getValue());
}
} }
state = applyProperties(state, stateProperties); state = applyProperties(state, stateProperties);

8
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
View File

@ -50,7 +50,7 @@ public class BlockState implements BlockStateHolder<BlockState> {
// Neighbouring state table. // Neighbouring state table.
private Table<Property<?>, Object, BlockState> states; private Table<Property<?>, Object, BlockState> states;
BlockState(BlockType blockType) { private BlockState(BlockType blockType) {
this.blockType = blockType; this.blockType = blockType;
this.values = new LinkedHashMap<>(); this.values = new LinkedHashMap<>();
this.fuzzy = false; this.fuzzy = false;
@ -62,13 +62,13 @@ public class BlockState implements BlockStateHolder<BlockState> {
* @param blockType The block type * @param blockType The block type
* @param values The block state values * @param values The block state values
*/ */
public BlockState(BlockType blockType, Map<Property<?>, Object> values) { private BlockState(BlockType blockType, Map<Property<?>, Object> values) {
this.blockType = blockType; this.blockType = blockType;
this.values = values; this.values = values;
this.fuzzy = true; this.fuzzy = true;
} }
public static Map<Map<Property<?>, Object>, BlockState> generateStateMap(BlockType blockType) { static Map<Map<Property<?>, Object>, BlockState> generateStateMap(BlockType blockType) {
Map<Map<Property<?>, Object>, BlockState> stateMap = new LinkedHashMap<>(); Map<Map<Property<?>, Object>, BlockState> stateMap = new LinkedHashMap<>();
List<? extends Property> properties = blockType.getProperties(); List<? extends Property> properties = blockType.getProperties();
@ -105,7 +105,7 @@ public class BlockState implements BlockStateHolder<BlockState> {
return stateMap; return stateMap;
} }
public void populate(Map<Map<Property<?>, Object>, BlockState> stateMap) { private void populate(Map<Map<Property<?>, Object>, BlockState> stateMap) {
final Table<Property<?>, Object, BlockState> states = HashBasedTable.create(); final Table<Property<?>, Object, BlockState> states = HashBasedTable.create();
for(final Map.Entry<Property<?>, Object> entry : this.values.entrySet()) { for(final Map.Entry<Property<?>, Object> entry : this.values.entrySet()) {