SteamWar/FastAsyncWorldEdit
13
0
Fork 0
geforkt von Mirrors/FastAsyncWorldEdit
Code Issues Pull-Requests Pakete Projekte Releases Wiki Aktivität

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

Quellcode durchsuchen 
This reverts commit 410ac65c6a.
This has been causing compatibility issues with Spout. I haven't been ble to reproduce, but until somebody figures out why, this gets to go
Dieser Commit ist enthalten in:
zml2008 2012-01-22 01:23:41 -08:00
Ursprung 2aba54a30f
Commit 9830d9d326
7 geänderte Dateien mit 48 neuen und 88 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

10
pom.xml
Datei anzeigen

@ -90,14 +90,6 @@
<artifactId>spoutapi</artifactId>
<version>dev-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.trove4j</groupId>
<artifactId>trove4j</artifactId>
<version>3.0.2</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
</dependencies>
<build>
@ -181,10 +173,8 @@
<!-- We want to bundle in the modified jchronic library -->
<includes>
<include>com.sk89q:jchronic</include>
<include>net.sf.trove4j:trove4j</include>
</includes>
</artifactSet>
<minimizeJar>true</minimizeJar>
</configuration>
</execution>
</executions>

10
src/main/java/com/sk89q/worldedit/EditSession.java
Datei anzeigen

@ -39,8 +39,6 @@ import com.sk89q.worldedit.expression.ExpressionException;
import com.sk89q.worldedit.expression.runtime.RValue;
import com.sk89q.worldedit.masks.Mask;
import com.sk89q.worldedit.patterns.*;
import gnu.trove.set.TIntSet;
import gnu.trove.set.hash.TIntHashSet;
/**
* This class can wrap all block editing operations into one "edit session" that
@ -120,7 +118,7 @@ public class EditSession {
/**
* List of missing blocks;
*/
private TIntSet missingBlocks = new TIntHashSet();
private Set<Integer> missingBlocks = new HashSet<Integer>();
/**
* Mask to cover operations.
@ -662,9 +660,9 @@ public class EditSession {
*
* @return
*/
public TIntSet popMissingBlocks() {
TIntSet missingBlocks = this.missingBlocks;
this.missingBlocks = new TIntHashSet();
public Set<Integer> popMissingBlocks() {
Set<Integer> missingBlocks = this.missingBlocks;
this.missingBlocks = new HashSet<Integer>();
return missingBlocks;
}

7
src/main/java/com/sk89q/worldedit/WorldEdit.java
Datei anzeigen

@ -49,7 +49,6 @@ import com.sk89q.worldedit.scripting.*;
import com.sk89q.worldedit.tools.*;
import com.sk89q.worldedit.masks.*;
import com.sk89q.worldedit.patterns.*;
import gnu.trove.set.TIntSet;
/**
* This class is the main entry point for WorldEdit. All events are routed
@ -975,7 +974,7 @@ public class WorldEdit {
blockBag.flushChanges();
}
TIntSet missingBlocks = editSession.popMissingBlocks();
Set<Integer> missingBlocks = editSession.popMissingBlocks();
if (missingBlocks.size() > 0) {
StringBuilder str = new StringBuilder();
@ -983,12 +982,12 @@ public class WorldEdit {
int size = missingBlocks.size();
int i = 0;
for (int id : missingBlocks.toArray()) {
for (Integer id : missingBlocks) {
BlockType type = BlockType.fromID(id);
str.append(type != null
? type.getName() + " (" + id + ")"
: id);
: id.toString());
++i;

8
src/main/java/com/sk89q/worldedit/blocks/BaseItem.java
Datei anzeigen

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

53
src/main/java/com/sk89q/worldedit/blocks/BlockType.java
Datei anzeigen

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

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

14
src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java
Datei anzeigen

@ -22,7 +22,6 @@ package com.sk89q.worldedit.bukkit;
import java.util.HashMap;
import java.util.Map;
import gnu.trove.procedure.TIntIntProcedure;
import org.bukkit.block.Block;
import org.bukkit.block.BlockState;
import org.bukkit.block.Furnace;
@ -684,20 +683,13 @@ public class BukkitWorld extends LocalWorld {
}
if (contents[i] != null) {
final ItemStack toAdd = new ItemStack(contents[i].getType(),
ItemStack toAdd = new ItemStack(contents[i].getType(),
contents[i].getAmount(),
contents[i].getDamage());
try {
contents[i].getEnchantments().forEachEntry(new TIntIntProcedure() {
@Override
public boolean execute(int key, int value) {
Enchantment ench = Enchantment.getById(key);
if (ench != null) {
toAdd.addEnchantment(ench, value);
for (Map.Entry<Integer, Integer> entry : contents[i].getEnchantments().entrySet()) {
toAdd.addEnchantment(Enchantment.getById(entry.getKey()), entry.getValue());
}
return true;
}
});
} catch (Throwable ignore) {}
inven.setItem(i, toAdd);
} else {