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

BaseBlock changes

Quellcode durchsuchen 
- Changed up EditSession.replaceBlocks to make BaseBlock.inIterable unnecessary.
- Returned BaseBlock.inIterable to its old state and deprecated it.
- Renamed the old BaseBlock.equals to equalsFuzzy, changed the parameter type and took the casts and type checks out.
- Made a new BaseBlock.equals that is consistent with the rules java prescribes.
Dieser Commit ist enthalten in:
TomyLobo 2012-01-31 16:57:40 +01:00
Ursprung ffa2824c4d
Commit d2c64e9304
2 geänderte Dateien mit 91 neuen und 29 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

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

@ -1244,8 +1244,18 @@ public class EditSession {
* @return number of blocks affected
* @throws MaxChangedBlocksException
*/
public int replaceBlocks(Region region, Set<BaseBlock> fromBlockTypes,
BaseBlock toBlock) throws MaxChangedBlocksException {
public int replaceBlocks(Region region, Set<BaseBlock> fromBlockTypes, BaseBlock toBlock) throws MaxChangedBlocksException {
Set<BaseBlock> definiteBlockTypes = new HashSet<BaseBlock>();
Set<Integer> fuzzyBlockTypes = new HashSet<Integer>();
for (BaseBlock block : fromBlockTypes) {
if (block.getData() == -1) {
fuzzyBlockTypes.add(block.getType());
} else {
definiteBlockTypes.add(block);
}
}
int affected = 0;
if (region instanceof CuboidRegion) {
@ -1266,11 +1276,20 @@ public class EditSession {
Vector pt = new Vector(x, y, z);
BaseBlock curBlockType = getBlock(pt);
if ((fromBlockTypes == null && !curBlockType.isAir())
|| (fromBlockTypes != null && curBlockType.inIterable(fromBlockTypes))) { // Probably faster if someone adds a proper hashCode to BaseBlock
if (setBlock(pt, toBlock)) {
++affected;
if (definiteBlockTypes == null) {
//replace <to-block>
if (curBlockType.isAir()) {
continue;
}
} else {
//replace <from-block> <to-block>
if (!definiteBlockTypes.contains(curBlockType) && fuzzyBlockTypes.contains(curBlockType.getType())) {
continue;
}
}
if (setBlock(pt, toBlock)) {
++affected;
}
}
}
@ -1279,11 +1298,20 @@ public class EditSession {
for (Vector pt : region) {
BaseBlock curBlockType = getBlock(pt);
if (fromBlockTypes == null && !curBlockType.isAir()
|| fromBlockTypes != null && curBlockType.inIterable(fromBlockTypes)) {
if (setBlock(pt, toBlock)) {
++affected;
if (definiteBlockTypes == null) {
//replace <to-block>
if (curBlockType.isAir()) {
continue;
}
} else {
//replace <from-block> <to-block>
if (!definiteBlockTypes.contains(curBlockType) && fuzzyBlockTypes.contains(curBlockType.getType())) {
continue;
}
}
if (setBlock(pt, toBlock)) {
++affected;
}
}
}
@ -1300,8 +1328,18 @@ public class EditSession {
* @return number of blocks affected
* @throws MaxChangedBlocksException
*/
public int replaceBlocks(Region region, Set<BaseBlock> fromBlockTypes,
Pattern pattern) throws MaxChangedBlocksException {
public int replaceBlocks(Region region, Set<BaseBlock> fromBlockTypes, Pattern pattern) throws MaxChangedBlocksException {
Set<BaseBlock> definiteBlockTypes = new HashSet<BaseBlock>();
Set<Integer> fuzzyBlockTypes = new HashSet<Integer>();
for (BaseBlock block : fromBlockTypes) {
if (block.getData() == -1) {
fuzzyBlockTypes.add(block.getType());
} else {
definiteBlockTypes.add(block);
}
}
int affected = 0;
if (region instanceof CuboidRegion) {
@ -1322,11 +1360,20 @@ public class EditSession {
Vector pt = new Vector(x, y, z);
BaseBlock curBlockType = getBlock(pt);
if ((fromBlockTypes == null && !curBlockType.isAir())
|| (fromBlockTypes != null && curBlockType.inIterable(fromBlockTypes))) { // Probably faster if someone adds a proper hashCode to BaseBlock
if (setBlock(pt, pattern.next(pt))) {
++affected;
if (definiteBlockTypes == null) {
//replace <to-block>
if (curBlockType.isAir()) {
continue;
}
} else {
//replace <from-block> <to-block>
if (!definiteBlockTypes.contains(curBlockType) && fuzzyBlockTypes.contains(curBlockType.getType())) {
continue;
}
}
if (setBlock(pt, pattern.next(pt))) {
++affected;
}
}
}
@ -1335,11 +1382,20 @@ public class EditSession {
for (Vector pt : region) {
BaseBlock curBlockType = getBlock(pt);
if (fromBlockTypes == null && !curBlockType.isAir()
|| curBlockType.inIterable(fromBlockTypes)) {
if (setBlock(pt, pattern.next(pt))) {
++affected;
if (definiteBlockTypes == null) {
//replace <to-block>
if (curBlockType.isAir()) {
continue;
}
} else {
//replace <from-block> <to-block>
if (!definiteBlockTypes.contains(curBlockType) && fuzzyBlockTypes.contains(curBlockType.getType())) {
continue;
}
}
if (setBlock(pt, pattern.next(pt))) {
++affected;
}
}
}

24
src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java
Datei anzeigen

@ -19,8 +19,6 @@
package com.sk89q.worldedit.blocks;
import java.util.Collection;
import com.sk89q.worldedit.CuboidClipboard.FlipDirection;
/**
@ -147,8 +145,12 @@ public class BaseBlock {
if (!(o instanceof BaseBlock)) {
return false;
}
return (type == ((BaseBlock) o).type)
&& (data == ((BaseBlock) o).data || data == -1 || ((BaseBlock) o).data == -1);
return type == ((BaseBlock) o).type && data == ((BaseBlock) o).data;
}
public boolean equalsFuzzy(BaseBlock o) {
return (type == o.type && data == o.data) || data == -1 || o.data == -1;
}
@Override
@ -163,13 +165,17 @@ public class BaseBlock {
return "BaseBlock id: " + getType() + " with damage: " + getData();
}
/**
*
*
* @param iter
* @return
* @deprecated This method is silly
*/
@Deprecated
public boolean inIterable(Iterable<BaseBlock> iter) {
if (iter instanceof Collection) {
return ((Collection<?>) iter).contains(this);
}
for (BaseBlock block : iter) {
if (block.equals(this)) {
if (block.equalsFuzzy(this)) {
return true;
}
}