Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*Fix for other clipboard implementations

Browse Source
This commit is contained in:
Jesse Boyd 2016-08-15 11:39:44 +10:00
parent fb9bdeca7d
commit fb33ecf71e
4 changed files with 72 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/boydti/fawe/object/IntegerTrio.java
View File

@ -1,9 +1,9 @@
package com.boydti.fawe.object;
public class IntegerTrio {
private final int z;
private final int x;
private final int y;
public final int z;
public final int x;
public final int y;
public IntegerTrio(int x, int y, int z) {
this.x = x;

55
core/src/main/java/com/boydti/fawe/object/clipboard/CPUOptimizedClipboard.java
View File

@ -1,6 +1,7 @@
package com.boydti.fawe.object.clipboard;
import com.boydti.fawe.FaweCache;
import com.boydti.fawe.object.IntegerTrio;
import com.boydti.fawe.object.RunnableVal2;
import com.sk89q.jnbt.CompoundTag;
import com.sk89q.worldedit.Vector;
@ -12,20 +13,9 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
public class CPUOptimizedClipboard extends FaweClipboard {
public CPUOptimizedClipboard(int width, int height, int length) {
this.width = width;
this.height = height;
this.length = length;
this.area = width * length;
this.volume = area * height;
ids = new byte[volume];
datas = new byte[volume];
nbtMap = new HashMap<>();
entities = new HashSet<>();
}
private int length;
private int height;
private int width;
@ -34,9 +24,42 @@ public class CPUOptimizedClipboard extends FaweClipboard {
private byte[] ids;
private byte[] datas;
private byte[] add;
private final HashMap<Integer, CompoundTag> nbtMap;
private final HashMap<IntegerTrio, CompoundTag> nbtMapLoc;
private final HashMap<Integer, CompoundTag> nbtMapIndex;
private final HashSet<ClipboardEntity> entities;
public CPUOptimizedClipboard(int width, int height, int length) {
this.width = width;
this.height = height;
this.length = length;
this.area = width * length;
this.volume = area * height;
ids = new byte[volume];
datas = new byte[volume];
nbtMapLoc = new HashMap<>();
nbtMapIndex = new HashMap<>();
entities = new HashSet<>();
}
public void convertTilesToIndex() {
if (nbtMapLoc.isEmpty()) {
return;
}
for (Map.Entry<IntegerTrio, CompoundTag> entry : nbtMapLoc.entrySet()) {
IntegerTrio key = entry.getKey();
nbtMapIndex.put(getIndex(key.x, key.y, key.z), entry.getValue());
}
nbtMapLoc.clear();
}
private CompoundTag getTag(int index) {
convertTilesToIndex();
return nbtMapIndex.get(index);
}
public int getId(int index) {
if (add != null) {
return ids[index] & 0xFF + add[index] & 0xFF;
@ -115,7 +138,7 @@ public class CPUOptimizedClipboard extends FaweClipboard {
block = FaweCache.getBlock(id, 0);
}
if (FaweCache.hasNBT(id)) {
CompoundTag nbt = nbtMap.get(index);
CompoundTag nbt = getTag(index);
if (nbt != null) {
block = new BaseBlock(block.getId(), block.getData());
block.setNbtData(nbt);
@ -145,7 +168,7 @@ public class CPUOptimizedClipboard extends FaweClipboard {
@Override
public boolean setTile(int x, int y, int z, CompoundTag tag) {
nbtMap.put(getIndex(x, y, z), tag);
nbtMapLoc.put(new IntegerTrio(x, y, z), tag);
return true;
}
@ -159,7 +182,7 @@ public class CPUOptimizedClipboard extends FaweClipboard {
setData(index, (byte) block.getData());
CompoundTag tile = block.getNbtData();
if (tile != null) {
nbtMap.put(index, tile);
nbtMapIndex.put(index, tile);
}
return true;
}

31
core/src/main/java/com/boydti/fawe/object/clipboard/MemoryOptimizedClipboard.java
View File

@ -2,6 +2,7 @@ package com.boydti.fawe.object.clipboard;
import com.boydti.fawe.FaweCache;
import com.boydti.fawe.config.Settings;
import com.boydti.fawe.object.IntegerTrio;
import com.boydti.fawe.object.RunnableVal2;
import com.boydti.fawe.util.MainUtil;
import com.sk89q.jnbt.CompoundTag;
@ -14,6 +15,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
public class MemoryOptimizedClipboard extends FaweClipboard {
@ -33,7 +35,9 @@ public class MemoryOptimizedClipboard extends FaweClipboard {
private byte[] buffer = new byte[MainUtil.getMaxCompressedLength(BLOCK_SIZE)];
private final HashMap<Integer, CompoundTag> nbtMap;
private final HashMap<IntegerTrio, CompoundTag> nbtMapLoc;
private final HashMap<Integer, CompoundTag> nbtMapIndex;
private final HashSet<ClipboardEntity> entities;
private int lastIdsI = -1;
@ -62,11 +66,28 @@ public class MemoryOptimizedClipboard extends FaweClipboard {
this.volume = area * height;
ids = new byte[1 + (volume >> BLOCK_SHIFT)][];
datas = new byte[1 + (volume >> BLOCK_SHIFT)][];
nbtMap = new HashMap<>();
nbtMapLoc = new HashMap<>();
nbtMapIndex = new HashMap<>();
entities = new HashSet<>();
this.compressionLevel = compressionLevel;
}
public void convertTilesToIndex() {
if (nbtMapLoc.isEmpty()) {
return;
}
for (Map.Entry<IntegerTrio, CompoundTag> entry : nbtMapLoc.entrySet()) {
IntegerTrio key = entry.getKey();
nbtMapIndex.put(getIndex(key.x, key.y, key.z), entry.getValue());
}
nbtMapLoc.clear();
}
private CompoundTag getTag(int index) {
convertTilesToIndex();
return nbtMapIndex.get(index);
}
public int getId(int index) {
int i = index >> BLOCK_SHIFT;
if (i == lastIdsI) {
@ -290,7 +311,7 @@ public class MemoryOptimizedClipboard extends FaweClipboard {
block = FaweCache.getBlock(id, 0);
}
if (FaweCache.hasNBT(id)) {
CompoundTag nbt = nbtMap.get(index);
CompoundTag nbt = getTag(index);
if (nbt != null) {
block = new BaseBlock(block.getId(), block.getData());
block.setNbtData(nbt);
@ -338,7 +359,7 @@ public class MemoryOptimizedClipboard extends FaweClipboard {
@Override
public boolean setTile(int x, int y, int z, CompoundTag tag) {
nbtMap.put(getIndex(x, y, z), tag);
nbtMapLoc.put(new IntegerTrio(x, y, z), tag);
return true;
}
@ -352,7 +373,7 @@ public class MemoryOptimizedClipboard extends FaweClipboard {
setData(index, (byte) block.getData());
CompoundTag tile = block.getNbtData();
if (tile != null) {
nbtMap.put(index, tile);
nbtMapIndex.put(index, tile);
}
return true;
}

4
core/src/main/java/com/boydti/fawe/util/MathMan.java
View File

@ -83,6 +83,10 @@ public class MathMan {
return (byte) ((value >> 4) & 0xF);
}
public static int lossyFastDivide(int a, int b) {
return (a*((1<<16)/b))>>16;
}
public static int sqrt(int x) {
int xn;