Upstream
/
FastAsyncWorldedit
mirror of https://github.com/boy0001/FastAsyncWorldedit.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix forge compile

This commit is contained in:
Jesse Boyd 2016-11-28 17:21:36 +11:00
parent 57a2bd73dd
commit 76eb1b9094
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
forge110/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java
View File

@ -51,19 +51,19 @@ public class ForgeChunk_All extends CharFaweChunk<Chunk, ForgeQueue_All> {
super(parent, x, z);
}
public ForgeChunk_All(FaweQueue parent, int x, int z, char[][] ids, short[] count, short[] air, short[] relight, byte[] heightMap) {
super(parent, x, z, ids, count, air, relight, heightMap);
public ForgeChunk_All(FaweQueue parent, int x, int z, char[][] ids, short[] count, short[] air, byte[] heightMap) {
super(parent, x, z, ids, count, air, heightMap);
}
@Override
public CharFaweChunk copy(boolean shallow) {
ForgeChunk_All copy;
if (shallow) {
copy = new ForgeChunk_All(getParent(), getX(), getZ(), ids, count, air, relight, heightMap);
copy = new ForgeChunk_All(getParent(), getX(), getZ(), ids, count, air, heightMap);
copy.biomes = biomes;
copy.chunk = chunk;
} else {
copy = new ForgeChunk_All(getParent(), getX(), getZ(), (char[][]) MainUtil.copyNd(ids), count.clone(), air.clone(), relight.clone(), heightMap.clone());
copy = new ForgeChunk_All(getParent(), getX(), getZ(), (char[][]) MainUtil.copyNd(ids), count.clone(), air.clone(), heightMap.clone());
copy.biomes = biomes;
copy.chunk = chunk;
copy.biomes = biomes.clone();

10
forge1710/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java
View File

@ -41,8 +41,8 @@ public class ForgeChunk_All extends CharFaweChunk<Chunk, ForgeQueue_All> {
this.datas = new NibbleArray[16];
}
public ForgeChunk_All(FaweQueue parent, int x, int z, char[][] ids, short[] count, short[] air, short[] relight, byte[] heightMap, byte[][] byteIds, NibbleArray[] datas) {
super(parent, x, z, ids, count, air, relight, heightMap);
public ForgeChunk_All(FaweQueue parent, int x, int z, char[][] ids, short[] count, short[] air, byte[] heightMap, byte[][] byteIds, NibbleArray[] datas) {
super(parent, x, z, ids, count, air, heightMap);
this.byteIds = byteIds;
this.datas = datas;
}
@ -51,11 +51,11 @@ public class ForgeChunk_All extends CharFaweChunk<Chunk, ForgeQueue_All> {
public CharFaweChunk copy(boolean shallow) {
ForgeChunk_All copy;
if (shallow) {
copy = new ForgeChunk_All(getParent(), getX(), getZ(), ids, count, air, relight, heightMap, byteIds, datas);
copy = new ForgeChunk_All(getParent(), getX(), getZ(), ids, count, air, heightMap, byteIds, datas);
copy.biomes = biomes;
copy.chunk = chunk;
} else {
copy = new ForgeChunk_All(getParent(), getX(), getZ(), (char[][]) MainUtil.copyNd(ids), count.clone(), air.clone(), relight.clone(), heightMap.clone(), (byte[][]) MainUtil.copyNd(byteIds), datas.clone());
copy = new ForgeChunk_All(getParent(), getX(), getZ(), (char[][]) MainUtil.copyNd(ids), count.clone(), air.clone(), heightMap.clone(), (byte[][]) MainUtil.copyNd(byteIds), datas.clone());
copy.biomes = biomes;
copy.chunk = chunk;
copy.biomes = biomes.clone();
@ -112,7 +112,7 @@ public class ForgeChunk_All extends CharFaweChunk<Chunk, ForgeQueue_All> {
case 62:
case 50:
case 10:
this.relight[i]++;
// this.relight[i]++;
default:
vs2[j] = (char) ((id << 4) + data);
vs[j] = (byte) id;

8
forge189/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java
View File

@ -41,19 +41,19 @@ public class ForgeChunk_All extends CharFaweChunk<Chunk, ForgeQueue_All> {
super(parent, x, z);
}
public ForgeChunk_All(FaweQueue parent, int x, int z, char[][] ids, short[] count, short[] air, short[] relight, byte[] heightMap) {
super(parent, x, z, ids, count, air, relight, heightMap);
public ForgeChunk_All(FaweQueue parent, int x, int z, char[][] ids, short[] count, short[] air, byte[] heightMap) {
super(parent, x, z, ids, count, air, heightMap);
}
@Override
public CharFaweChunk copy(boolean shallow) {
ForgeChunk_All copy;
if (shallow) {
copy = new ForgeChunk_All(getParent(), getX(), getZ(), ids, count, air, relight, heightMap);
copy = new ForgeChunk_All(getParent(), getX(), getZ(), ids, count, air, heightMap);
copy.biomes = biomes;
copy.chunk = chunk;
} else {
copy = new ForgeChunk_All(getParent(), getX(), getZ(), (char[][]) MainUtil.copyNd(ids), count.clone(), air.clone(), relight.clone(), heightMap.clone());
copy = new ForgeChunk_All(getParent(), getX(), getZ(), (char[][]) MainUtil.copyNd(ids), count.clone(), air.clone(), heightMap.clone());
copy.biomes = biomes;
copy.chunk = chunk;
copy.biomes = biomes.clone();

8
forge194/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java
View File

@ -51,19 +51,19 @@ public class ForgeChunk_All extends CharFaweChunk<Chunk, ForgeQueue_All> {
super(parent, x, z);
}
public ForgeChunk_All(FaweQueue parent, int x, int z, char[][] ids, short[] count, short[] air, short[] relight, byte[] heightMap) {
super(parent, x, z, ids, count, air, relight, heightMap);
public ForgeChunk_All(FaweQueue parent, int x, int z, char[][] ids, short[] count, short[] air, byte[] heightMap) {
super(parent, x, z, ids, count, air, heightMap);
}
@Override
public CharFaweChunk copy(boolean shallow) {
ForgeChunk_All copy;
if (shallow) {
copy = new ForgeChunk_All(getParent(), getX(), getZ(), ids, count, air, relight, heightMap);
copy = new ForgeChunk_All(getParent(), getX(), getZ(), ids, count, air, heightMap);
copy.biomes = biomes;
copy.chunk = chunk;
} else {
copy = new ForgeChunk_All(getParent(), getX(), getZ(), (char[][]) MainUtil.copyNd(ids), count.clone(), air.clone(), relight.clone(), heightMap.clone());
copy = new ForgeChunk_All(getParent(), getX(), getZ(), (char[][]) MainUtil.copyNd(ids), count.clone(), air.clone(), heightMap.clone());
copy.biomes = biomes;
copy.chunk = chunk;
copy.biomes = biomes.clone();