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

Fixes #719

Browse Source
This commit is contained in:
Jesse Boyd 2017-09-02 13:49:16 +10:00
parent c0737415d5
commit 5ccb8411f3
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockData.java
View File

@ -213,8 +213,8 @@ public class BundledBlockData {
} }
return true; return true;
} }
FaweState dir = entry.states.get("rotation"); FaweState rot = entry.states.get("rotation");
if (dir != null && dir.values != null) { if (rot != null && rot.values != null) {
Vector[] range = new Vector[]{new Vector(0, 0, -1), Vector[] range = new Vector[]{new Vector(0, 0, -1),
new Vector(0.5, 0, -1), new Vector(0.5, 0, -1),
new Vector(1, 0, -1), new Vector(1, 0, -1),
@ -231,7 +231,7 @@ public class BundledBlockData {
new Vector(-1, 0, -0.5), new Vector(-1, 0, -0.5),
new Vector(-1, 0, -1), new Vector(-1, 0, -1),
new Vector(-0.5, 0, -1)}; new Vector(-0.5, 0, -1)};
for (Map.Entry<String, FaweStateValue> valuesEntry : dir.values.entrySet()) { for (Map.Entry<String, FaweStateValue> valuesEntry : rot.values.entrySet()) {
int index = Integer.parseInt(valuesEntry.getKey()); int index = Integer.parseInt(valuesEntry.getKey());
valuesEntry.getValue().setDirection(range[index]); valuesEntry.getValue().setDirection(range[index]);
} }
@ -257,7 +257,7 @@ public class BundledBlockData {
return true; return true;
} }
if (entry.legacyId == 69) { if (entry.legacyId == 69) {
dir = entry.states.get("facing"); FaweState facing = entry.states.get("facing");
Vector[] dirs = new Vector[]{ Vector[] dirs = new Vector[]{
new Vector(0, -1, 0), new Vector(0, -1, 0),
new Vector(1, 0, 0), new Vector(1, 0, 0),
@ -267,10 +267,10 @@ public class BundledBlockData {
new Vector(0, 1, 0), new Vector(0, 1, 0),
new Vector(0, 1, 0), new Vector(0, 1, 0),
new Vector(0, -1, 0)}; new Vector(0, -1, 0)};
int len = dir.values.size(); int len = facing.values.size();
int index = 0; int index = 0;
int amount = (dir.values.size() + 7) / 8; int amount = (facing.values.size() + 7) / 8;
for (Map.Entry<String, FaweStateValue> valuesEntry : dir.values.entrySet()) { for (Map.Entry<String, FaweStateValue> valuesEntry : facing.values.entrySet()) {
FaweStateValue state = valuesEntry.getValue(); FaweStateValue state = valuesEntry.getValue();
if (state != null) { if (state != null) {
state.setDirection(dirs[index / amount]); state.setDirection(dirs[index / amount]);
@ -300,6 +300,40 @@ public class BundledBlockData {
return true; return true;
} }
} }
FaweState shape = entry.states.get("shape");
if (shape != null && shape.values != null) {
for (Map.Entry<String, FaweStateValue> valueEntry : new ArrayList<>(shape.values.entrySet())) {
String variantName = valueEntry.getKey();
FaweStateValue state = valueEntry.getValue();
if (state.getDirection() == null) {
Vector dir = new Vector(0, 0, 0);
for (String keyWord : variantName.split("_")) {
switch (keyWord) {
case "ascending":
dir.mutY(1);
break;
case "north":
dir.mutZ(-1);
break;
case "east":
dir.mutX(1);
break;
case "south":
dir.mutZ(1);
break;
case "west":
dir.mutX(-1);
break;
}
}
if (dir.length() != 0) {
Vector inverse = Vector.ZERO.subtract(dir);
state.setDirection(dir);
shape.values.put("-" + variantName, new FaweStateValue(state).setDirection(inverse));
}
}
}
}
return true; return true;
} }