From 76eb1b9094874196e22b978fabacbef7eb09480c Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Mon, 28 Nov 2016 17:21:36 +1100 Subject: [PATCH] Fix forge compile --- .../java/com/boydti/fawe/forge/v0/ForgeChunk_All.java | 8 ++++---- .../java/com/boydti/fawe/forge/v0/ForgeChunk_All.java | 10 +++++----- .../java/com/boydti/fawe/forge/v0/ForgeChunk_All.java | 8 ++++---- .../java/com/boydti/fawe/forge/v0/ForgeChunk_All.java | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/forge110/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java b/forge110/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java index 17211d20..c7db0436 100644 --- a/forge110/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java +++ b/forge110/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java @@ -51,19 +51,19 @@ public class ForgeChunk_All extends CharFaweChunk { 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(); diff --git a/forge1710/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java b/forge1710/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java index 1c3bc1fa..22b0e218 100644 --- a/forge1710/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java +++ b/forge1710/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java @@ -41,8 +41,8 @@ public class ForgeChunk_All extends CharFaweChunk { 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 { 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 { case 62: case 50: case 10: - this.relight[i]++; +// this.relight[i]++; default: vs2[j] = (char) ((id << 4) + data); vs[j] = (byte) id; diff --git a/forge189/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java b/forge189/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java index 5eedbfab..a3223982 100644 --- a/forge189/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java +++ b/forge189/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java @@ -41,19 +41,19 @@ public class ForgeChunk_All extends CharFaweChunk { 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(); diff --git a/forge194/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java b/forge194/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java index 5ef6fb06..11047ac2 100644 --- a/forge194/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java +++ b/forge194/src/main/java/com/boydti/fawe/forge/v0/ForgeChunk_All.java @@ -51,19 +51,19 @@ public class ForgeChunk_All extends CharFaweChunk { 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();