From d29b4e486d0ee8d3e0031b64c8d8b2fa3eaf2cd5 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Tue, 27 Oct 2020 21:19:23 -0400 Subject: [PATCH] Move to parallax views --- .../hunk/{ => view}/BiomeGridHunkView.java | 3 +- .../hunk/{ => view}/ChunkBiomeHunkView.java | 3 +- .../hunk/{ => view}/ChunkDataHunkView.java | 3 +- .../hunk/{ => view}/ChunkHunkView.java | 3 +- .../hunk/{ => view}/DriftHunkView.java | 4 +- .../hunk/{ => view}/InvertedHunkView.java | 4 +- .../v2/scaffold/hunk/view/ReadOnlyHunk.java | 60 +++++++++++++++++++ .../hunk/{ => view}/RotatedXHunkView.java | 4 +- .../hunk/{ => view}/RotatedYHunkView.java | 4 +- .../hunk/{ => view}/RotatedZHunkView.java | 4 +- 10 files changed, 83 insertions(+), 9 deletions(-) rename src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/{ => view}/BiomeGridHunkView.java (85%) rename src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/{ => view}/ChunkBiomeHunkView.java (88%) rename src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/{ => view}/ChunkDataHunkView.java (89%) rename src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/{ => view}/ChunkHunkView.java (89%) rename src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/{ => view}/DriftHunkView.java (88%) rename src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/{ => view}/InvertedHunkView.java (85%) create mode 100644 src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ReadOnlyHunk.java rename src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/{ => view}/RotatedXHunkView.java (92%) rename src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/{ => view}/RotatedYHunkView.java (92%) rename src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/{ => view}/RotatedZHunkView.java (92%) diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/BiomeGridHunkView.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/BiomeGridHunkView.java similarity index 85% rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/BiomeGridHunkView.java rename to src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/BiomeGridHunkView.java index d1c7f5d6d..8d4687328 100644 --- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/BiomeGridHunkView.java +++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/BiomeGridHunkView.java @@ -1,5 +1,6 @@ -package com.volmit.iris.gen.v2.scaffold.hunk; +package com.volmit.iris.gen.v2.scaffold.hunk.view; +import com.volmit.iris.gen.v2.scaffold.hunk.Hunk; import org.bukkit.block.Biome; import org.bukkit.generator.ChunkGenerator.BiomeGrid; diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/ChunkBiomeHunkView.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkBiomeHunkView.java similarity index 88% rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/ChunkBiomeHunkView.java rename to src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkBiomeHunkView.java index 4f9616bae..09f5ccde4 100644 --- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/ChunkBiomeHunkView.java +++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkBiomeHunkView.java @@ -1,5 +1,6 @@ -package com.volmit.iris.gen.v2.scaffold.hunk; +package com.volmit.iris.gen.v2.scaffold.hunk.view; +import com.volmit.iris.gen.v2.scaffold.hunk.Hunk; import org.bukkit.Chunk; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/ChunkDataHunkView.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkDataHunkView.java similarity index 89% rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/ChunkDataHunkView.java rename to src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkDataHunkView.java index e4e1852c2..9efe03a62 100644 --- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/ChunkDataHunkView.java +++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkDataHunkView.java @@ -1,5 +1,6 @@ -package com.volmit.iris.gen.v2.scaffold.hunk; +package com.volmit.iris.gen.v2.scaffold.hunk.view; +import com.volmit.iris.gen.v2.scaffold.hunk.Hunk; import org.bukkit.block.data.BlockData; import org.bukkit.generator.ChunkGenerator.ChunkData; diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/ChunkHunkView.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkHunkView.java similarity index 89% rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/ChunkHunkView.java rename to src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkHunkView.java index 928b7de2b..8bf76beab 100644 --- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/ChunkHunkView.java +++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkHunkView.java @@ -1,5 +1,6 @@ -package com.volmit.iris.gen.v2.scaffold.hunk; +package com.volmit.iris.gen.v2.scaffold.hunk.view; +import com.volmit.iris.gen.v2.scaffold.hunk.Hunk; import org.bukkit.Chunk; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/DriftHunkView.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/DriftHunkView.java similarity index 88% rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/DriftHunkView.java rename to src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/DriftHunkView.java index b396a1542..9440c50cd 100644 --- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/DriftHunkView.java +++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/DriftHunkView.java @@ -1,4 +1,6 @@ -package com.volmit.iris.gen.v2.scaffold.hunk; +package com.volmit.iris.gen.v2.scaffold.hunk.view; + +import com.volmit.iris.gen.v2.scaffold.hunk.Hunk; public class DriftHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/InvertedHunkView.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/InvertedHunkView.java similarity index 85% rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/InvertedHunkView.java rename to src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/InvertedHunkView.java index c85352e72..1c2773e73 100644 --- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/InvertedHunkView.java +++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/InvertedHunkView.java @@ -1,4 +1,6 @@ -package com.volmit.iris.gen.v2.scaffold.hunk; +package com.volmit.iris.gen.v2.scaffold.hunk.view; + +import com.volmit.iris.gen.v2.scaffold.hunk.Hunk; public class InvertedHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ReadOnlyHunk.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ReadOnlyHunk.java new file mode 100644 index 000000000..dd22f807f --- /dev/null +++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ReadOnlyHunk.java @@ -0,0 +1,60 @@ +package com.volmit.iris.gen.v2.scaffold.hunk.view; + +import com.volmit.iris.gen.v2.scaffold.hunk.Hunk; + +public class ReadOnlyHunk implements Hunk { + private final Hunk src; + + public ReadOnlyHunk(Hunk src) + { + this.src = src; + } + + @Override + public void setRaw(int x, int y, int z, T t) + { + throw new IllegalStateException("This hunk is read only!"); + } + + @Override + public T getRaw(int x, int y, int z) + { + return src.getRaw(x, y, z); + } + + @Override + public void set(int x1, int y1, int z1, int x2, int y2, int z2, T t) + { + throw new IllegalStateException("This hunk is read only!"); + } + + @Override + public void fill(T t) + { + throw new IllegalStateException("This hunk is read only!"); + } + + @Override + public int getWidth() + { + return src.getWidth(); + } + + @Override + public int getHeight() + { + return src.getHeight(); + } + + @Override + public int getDepth() + { + return src.getDepth(); + } + + @Override + public Hunk getSource() + { + return src; + } +} diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/RotatedXHunkView.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedXHunkView.java similarity index 92% rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/RotatedXHunkView.java rename to src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedXHunkView.java index f4ec0bee1..ba650fd79 100644 --- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/RotatedXHunkView.java +++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedXHunkView.java @@ -1,4 +1,6 @@ -package com.volmit.iris.gen.v2.scaffold.hunk; +package com.volmit.iris.gen.v2.scaffold.hunk.view; + +import com.volmit.iris.gen.v2.scaffold.hunk.Hunk; public class RotatedXHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/RotatedYHunkView.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedYHunkView.java similarity index 92% rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/RotatedYHunkView.java rename to src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedYHunkView.java index 30791f677..d0b8b67f3 100644 --- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/RotatedYHunkView.java +++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedYHunkView.java @@ -1,4 +1,6 @@ -package com.volmit.iris.gen.v2.scaffold.hunk; +package com.volmit.iris.gen.v2.scaffold.hunk.view; + +import com.volmit.iris.gen.v2.scaffold.hunk.Hunk; public class RotatedYHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/RotatedZHunkView.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedZHunkView.java similarity index 92% rename from src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/RotatedZHunkView.java rename to src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedZHunkView.java index 2ac02883b..2b2b0064f 100644 --- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/RotatedZHunkView.java +++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/RotatedZHunkView.java @@ -1,4 +1,6 @@ -package com.volmit.iris.gen.v2.scaffold.hunk; +package com.volmit.iris.gen.v2.scaffold.hunk.view; + +import com.volmit.iris.gen.v2.scaffold.hunk.Hunk; public class RotatedZHunkView implements Hunk {