Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-02 11:26:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Using trove collections for most internal stuff, using array access in BlockType and ItemType

Browse Source
This commit is contained in:
zml2008
2012-01-16 18:46:33 -08:00
parent 31bd786fdf
commit 410ac65c6a
7 changed files with 88 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/sk89q/worldedit/blocks/BaseItem.java
View File

@ -19,8 +19,8 @@
package com.sk89q.worldedit.blocks;
import java.util.HashMap;
import java.util.Map;
import gnu.trove.map.TIntIntMap;
import gnu.trove.map.hash.TIntIntHashMap;
/**
* Represents an item.
@ -37,7 +37,7 @@ public class BaseItem {
*/
private short damage;
private Map<Integer, Integer> enchantments = new HashMap<Integer, Integer>();
private TIntIntMap enchantments = new TIntIntHashMap();
/**
* Construct the object.
@ -88,7 +88,7 @@ public class BaseItem {
this.damage = damage;
}
public Map<Integer, Integer> getEnchantments() {
public TIntIntMap getEnchantments() {
return enchantments;
}
}

53
src/main/java/com/sk89q/worldedit/blocks/BlockType.java
View File

@ -19,13 +19,15 @@
package com.sk89q.worldedit.blocks;
import java.util.HashSet;
import java.util.Arrays;
import java.util.Map;
import java.util.HashMap;
import java.util.EnumSet;
import java.util.Map.Entry;
import java.util.Random;
import java.util.Set;
import gnu.trove.map.TIntObjectMap;
import gnu.trove.map.hash.TIntObjectHashMap;
import gnu.trove.set.TIntSet;
import gnu.trove.set.hash.TIntHashSet;
import com.sk89q.util.StringUtil;
import com.sk89q.worldedit.PlayerDirection;
@ -163,7 +165,7 @@ public enum BlockType {
/**
* Stores a map of the IDs for fast access.
*/
private static final Map<Integer, BlockType> ids = new HashMap<Integer, BlockType>();
private static BlockType[] ids = new BlockType[256];
/**
* Stores a map of the names for fast access.
*/
@ -174,8 +176,13 @@ public enum BlockType {
private final String[] lookupKeys;
static {
for (BlockType type : EnumSet.allOf(BlockType.class)) {
ids.put(type.id, type);
for (BlockType type : values()) {
if (ids.length > type.id) {
ids[type.id] = type;
} else {
ids = Arrays.copyOf(ids, type.id + 10);
ids[type.id] = type;
}
for (String key : type.lookupKeys) {
lookup.put(key, type);
}
@ -214,7 +221,11 @@ public enum BlockType {
* @return
*/
public static BlockType fromID(int id) {
return ids.get(id);
if (id < 0 || id >= ids.length) {
return null;
} else {
return ids[id];
}
}
/**
@ -287,7 +298,7 @@ public enum BlockType {
/**
* HashSet for shouldPlaceLast.
*/
private static final Set<Integer> shouldPlaceLast = new HashSet<Integer>();
private static final TIntSet shouldPlaceLast = new TIntHashSet();
static {
shouldPlaceLast.add(BlockID.SAPLING);
shouldPlaceLast.add(BlockID.BED);
@ -348,7 +359,7 @@ public enum BlockType {
/**
* HashSet for shouldPlaceLast.
*/
private static final Set<Integer> shouldPlaceFinal = new HashSet<Integer>();
private static final TIntSet shouldPlaceFinal = new TIntHashSet();
static {
shouldPlaceFinal.add(BlockID.SIGN_POST);
shouldPlaceFinal.add(BlockID.WOODEN_DOOR);
@ -376,7 +387,7 @@ public enum BlockType {
/**
* HashSet for canPassThrough.
*/
private static final Set<Integer> canPassThrough = new HashSet<Integer>();
private static final TIntSet canPassThrough = new TIntHashSet();
static {
canPassThrough.add(BlockID.AIR);
canPassThrough.add(BlockID.WATER);
@ -440,7 +451,7 @@ public enum BlockType {
/**
* HashSet for usesData.
*/
private static final Set<Integer> usesData = new HashSet<Integer>();
private static final TIntSet usesData = new TIntHashSet();
static {
usesData.add(BlockID.SAPLING);
usesData.add(BlockID.WATER);
@ -532,7 +543,7 @@ public enum BlockType {
/**
* HashSet for isContainerBlock.
*/
private static final Set<Integer> isContainerBlock = new HashSet<Integer>();
private static final TIntSet isContainerBlock = new TIntHashSet();
static {
isContainerBlock.add(BlockID.DISPENSER);
isContainerBlock.add(BlockID.FURNACE);
@ -563,7 +574,7 @@ public enum BlockType {
/**
* HashSet for isRedstoneBlock.
*/
private static final Set<Integer> isRedstoneBlock = new HashSet<Integer>();
private static final TIntSet isRedstoneBlock = new TIntHashSet();
static {
isRedstoneBlock.add(BlockID.POWERED_RAIL);
isRedstoneBlock.add(BlockID.DETECTOR_RAIL);
@ -607,7 +618,7 @@ public enum BlockType {
/**
* HashSet for canTransferRedstone.
*/
private static final Set<Integer> canTransferRedstone = new HashSet<Integer>();
private static final TIntSet canTransferRedstone = new TIntHashSet();
static {
canTransferRedstone.add(BlockID.REDSTONE_TORCH_OFF);
canTransferRedstone.add(BlockID.REDSTONE_TORCH_ON);
@ -640,7 +651,7 @@ public enum BlockType {
/**
* HashSet for isRedstoneSource.
*/
private static final Set<Integer> isRedstoneSource = new HashSet<Integer>();
private static final TIntSet isRedstoneSource = new TIntHashSet();
static {
isRedstoneSource.add(BlockID.DETECTOR_RAIL);
isRedstoneSource.add(BlockID.REDSTONE_TORCH_OFF);
@ -673,7 +684,7 @@ public enum BlockType {
/**
* HashSet for isRailBlock.
*/
private static final Set<Integer> isRailBlock = new HashSet<Integer>();
private static final TIntSet isRailBlock = new TIntHashSet();
static {
isRailBlock.add(BlockID.POWERED_RAIL);
isRailBlock.add(BlockID.DETECTOR_RAIL);
@ -702,7 +713,7 @@ public enum BlockType {
/**
* HashSet for isNaturalBlock.
*/
private static final Set<Integer> isNaturalTerrainBlock = new HashSet<Integer>();
private static final TIntSet isNaturalTerrainBlock = new TIntHashSet();
static {
isNaturalTerrainBlock.add(BlockID.STONE);
isNaturalTerrainBlock.add(BlockID.GRASS);
@ -751,7 +762,7 @@ public enum BlockType {
/**
* HashSet for emitsLight.
*/
private static final Set<Integer> emitsLight = new HashSet<Integer>();
private static final TIntSet emitsLight = new TIntHashSet();
static {
emitsLight.add(BlockID.LAVA);
emitsLight.add(BlockID.STATIONARY_LAVA);
@ -785,7 +796,7 @@ public enum BlockType {
/**
* HashSet for isTranslucent.
*/
private static final Set<Integer> isTranslucent = new HashSet<Integer>();
private static final TIntSet isTranslucent = new TIntHashSet();
static {
isTranslucent.add(BlockID.AIR);
isTranslucent.add(BlockID.SAPLING);
@ -1244,8 +1255,8 @@ public enum BlockType {
}
}
private static final Map<Integer, PlayerDirection> dataAttachments = new HashMap<Integer, PlayerDirection>();
private static final Map<Integer, PlayerDirection> nonDataAttachments = new HashMap<Integer, PlayerDirection>();
private static final TIntObjectMap<PlayerDirection> dataAttachments = new TIntObjectHashMap<PlayerDirection>();
private static final TIntObjectMap<PlayerDirection> nonDataAttachments = new TIntObjectHashMap<PlayerDirection>();
static {
nonDataAttachments.put(BlockID.SAPLING, PlayerDirection.DOWN);
nonDataAttachments.put(BlockID.POWERED_RAIL, PlayerDirection.DOWN);

32
src/main/java/com/sk89q/worldedit/blocks/ItemType.java
View File

@ -19,15 +19,14 @@
package com.sk89q.worldedit.blocks;
import java.util.HashSet;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.HashMap;
import java.util.EnumSet;
import java.util.Map.Entry;
import java.util.Set;
import com.sk89q.util.StringUtil;
import gnu.trove.set.TIntSet;
import gnu.trove.set.hash.TIntHashSet;
/**
* ItemType types.
@ -308,7 +307,7 @@ public enum ItemType {
/**
* Stores a map of the IDs for fast access.
*/
private static final Map<Integer, ItemType> ids = new HashMap<Integer, ItemType>();
private static ItemType[] ids = new ItemType[3200];
/**
* Stores a map of the names for fast access.
*/
@ -319,8 +318,13 @@ public enum ItemType {
private final String[] lookupKeys;
static {
for (ItemType type : EnumSet.allOf(ItemType.class)) {
ids.put(type.id, type);
for (ItemType type : values()) {
if (ids.length > type.id) {
ids[type.id] = type;
} else {
ids = Arrays.copyOf(ids, type.id + 10);
ids[type.id] = type;
}
for (String key : type.lookupKeys) {
lookup.put(key, type);
}
@ -359,7 +363,11 @@ public enum ItemType {
* @return
*/
public static ItemType fromID(int id) {
return ids.get(id);
if (id < 0 || id >= ids.length) {
return null;
} else {
return ids[id];
}
}
/**
@ -369,7 +377,7 @@ public enum ItemType {
* @return
*/
public static String toName(int id) {
ItemType type = ids.get(id);
ItemType type = fromID(id);
if (type != null) {
return type.getName();
} else {
@ -387,7 +395,7 @@ public enum ItemType {
if (id == 0) {
return "Hand";
}
ItemType type = ids.get(id);
ItemType type = fromID(id);
if (type != null) {
return type.getName();
} else {
@ -470,7 +478,7 @@ public enum ItemType {
return lookupKeys;
}
private static final Set<Integer> shouldNotStack = new HashSet<Integer>();
private static final TIntSet shouldNotStack = new TIntHashSet();
static {
shouldNotStack.add(ItemID.IRON_SHOVEL);
shouldNotStack.add(ItemID.IRON_PICK);
@ -560,7 +568,7 @@ public enum ItemType {
return shouldNotStack.contains(id);
}
private static final Set<Integer> usesDamageValue = new HashSet<Integer>();
private static final TIntSet usesDamageValue = new TIntHashSet();
static {
usesDamageValue.add(BlockID.SAPLING);
//usesDamageValue.add(BlockID.WATER);