From ca843f1b902c19db4d919011866d45e4a31c6a12 Mon Sep 17 00:00:00 2001 From: MattBDev <4009945+MattBDev@users.noreply.github.com> Date: Wed, 23 Oct 2019 22:33:51 -0400 Subject: [PATCH] Minor changes for readability --- .../sk89q/worldedit/bukkit/BukkitWorld.java | 2 +- .../cfi/HeightMapMCAGenerator.java | 2 +- .../brush/visualization/cfi/MCAWriter.java | 37 +++++-------------- .../fawe/object/extent/FaweRegionExtent.java | 7 +--- .../boydti/fawe/wrappers/WorldWrapper.java | 4 +- .../KochanekBartelsInterpolation.java | 4 +- .../com/sk89q/worldedit/world/NullWorld.java | 2 +- .../java/com/sk89q/worldedit/world/World.java | 2 +- 8 files changed, 18 insertions(+), 42 deletions(-) diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java index 48ff11687..c67ef1c27 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java @@ -516,7 +516,7 @@ public class BukkitWorld extends AbstractWorld { } @Override - public void sendChunk(int X, int Z, int mask) { + public void sendChunk(int chunkX, int chunkZ, int bitMask) { } @Override diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/HeightMapMCAGenerator.java b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/HeightMapMCAGenerator.java index 982321c81..04107f27f 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/HeightMapMCAGenerator.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/HeightMapMCAGenerator.java @@ -320,7 +320,7 @@ public class HeightMapMCAGenerator extends MCAWriter implements StreamChange, Dr } @Override - public void sendChunk(int X, int Z, int mask) { + public void sendChunk(int chunkX, int chunkZ, int bitMask) { throw new UnsupportedOperationException("TODO NOT IMPLEMENTED"); // add method to adapter to send custom chunk } diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/MCAWriter.java b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/MCAWriter.java index 51994ec62..ef09226ff 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/MCAWriter.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/MCAWriter.java @@ -80,34 +80,15 @@ public abstract class MCAWriter implements Extent { final ForkJoinPool pool = new ForkJoinPool(); int tcx = (width - 1) >> 4; int tcz = (length - 1) >> 4; - final ThreadLocal chunkStore = new ThreadLocal() { - @Override - protected WritableMCAChunk initialValue() { - WritableMCAChunk chunk = new WritableMCAChunk(); - Arrays.fill(chunk.blocks, BlockID.AIR); -// Arrays.fill(chunk.skyLight, (byte) 255); - return chunk; - } - }; - final ThreadLocal byteStore1 = new ThreadLocal() { - @Override - protected byte[] initialValue() { - return new byte[500000]; - } - }; - final ThreadLocal byteStore2 = new ThreadLocal() { - @Override - protected byte[] initialValue() { - return new byte[500000]; - } - }; - final ThreadLocal deflateStore = new ThreadLocal() { - @Override - protected Deflater initialValue() { - Deflater deflater = new Deflater(Deflater.BEST_SPEED, false); - return deflater; - } - }; + final ThreadLocal chunkStore = ThreadLocal.withInitial(() -> { + WritableMCAChunk chunk = new WritableMCAChunk(); + Arrays.fill(chunk.blocks, BlockID.AIR); + return chunk; + }); + final ThreadLocal byteStore1 = ThreadLocal.withInitial(() -> new byte[500000]); + final ThreadLocal byteStore2 = ThreadLocal.withInitial(() -> new byte[500000]); + final ThreadLocal deflateStore = ThreadLocal + .withInitial(() -> new Deflater(Deflater.BEST_SPEED, false)); byte[] fileBuf = new byte[1 << 16]; int mcaXMin = 0; int mcaZMin = 0; diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/FaweRegionExtent.java b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/FaweRegionExtent.java index 5b625e9bc..a8663b3ff 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/object/extent/FaweRegionExtent.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/object/extent/FaweRegionExtent.java @@ -2,12 +2,9 @@ package com.boydti.fawe.object.extent; import com.boydti.fawe.FaweCache; import com.boydti.fawe.beta.IBatchProcessor; -import com.boydti.fawe.beta.IChunkSet; import com.boydti.fawe.object.FaweLimit; -import com.boydti.fawe.object.exception.FaweException; import com.boydti.fawe.util.ExtentTraverser; import com.boydti.fawe.util.WEManager; -import com.sk89q.jnbt.CompoundTag; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.Entity; @@ -22,9 +19,6 @@ import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockStateHolder; import com.sk89q.worldedit.world.block.BlockTypes; import java.util.Collection; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; import javax.annotation.Nullable; public abstract class FaweRegionExtent extends ResettableExtent implements IBatchProcessor { @@ -56,6 +50,7 @@ public abstract class FaweRegionExtent extends ResettableExtent implements IBatc } @Override + public Extent construct(Extent child) { if (getExtent() != child) { new ExtentTraverser(this).setNext(child); diff --git a/worldedit-core/src/main/java/com/boydti/fawe/wrappers/WorldWrapper.java b/worldedit-core/src/main/java/com/boydti/fawe/wrappers/WorldWrapper.java index 9976e9579..4834c446a 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/wrappers/WorldWrapper.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/wrappers/WorldWrapper.java @@ -235,8 +235,8 @@ public class WorldWrapper extends AbstractWorld { } @Override - public void sendChunk(int X, int Z, int mask) { - parent.sendChunk(X, Z, mask); + public void sendChunk(int chunkX, int chunkZ, int bitMask) { + parent.sendChunk(chunkX, chunkZ, bitMask); } @Override diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/math/interpolation/KochanekBartelsInterpolation.java b/worldedit-core/src/main/java/com/sk89q/worldedit/math/interpolation/KochanekBartelsInterpolation.java index 91b899ebb..9c370ee5a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/math/interpolation/KochanekBartelsInterpolation.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/math/interpolation/KochanekBartelsInterpolation.java @@ -31,8 +31,8 @@ import java.util.List; /** * A Kochanek-Bartels interpolation; continuous in the 2nd derivative. * - *

Supports {@link Node#tension tension}, {@link Node#bias bias} and - * {@link Node#continuity continuity} parameters per {@link Node}.

+ *

Supports {@link Node#getTension() tension}, {@link Node#getBias() bias} and + * {@link Node#getContinuity() continuity} parameters per {@link Node}.

*/ public class KochanekBartelsInterpolation implements Interpolation { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java index a71a31779..e27a2c7ef 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java @@ -148,7 +148,7 @@ public class NullWorld extends AbstractWorld { } @Override - public void sendChunk(int X, int Z, int mask) { + public void sendChunk(int chunkX, int chunkZ, int bitMask) { } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java index 010c97412..8a066288a 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/World.java @@ -300,7 +300,7 @@ public interface World extends Extent, Keyed, IChunkCache { * @param chunkZ * @param bitMask */ - void sendChunk(final int X, final int Z, final int mask); + void sendChunk(final int chunkX, final int chunkZ, final int bitMask); @Override IChunkGet get(int x, int z);