Optimise imports & Reformat code

Cadiboo · Dec 6, 2018 · 41fdf27 · 41fdf27
1 parent b3d3dcf
commit 41fdf27
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 50 deletions.
diff --git a/src/main/java/io/github/cadiboo/nocubes/renderer/OldNoCubes.java b/src/main/java/io/github/cadiboo/nocubes/renderer/OldNoCubes.java
@@ -13,9 +13,7 @@
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.BlockRendererDispatcher;
 import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.init.Blocks;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.ChunkCache;

diff --git a/src/main/java/io/github/cadiboo/nocubes/renderer/SurfaceNetsOOP.java b/src/main/java/io/github/cadiboo/nocubes/renderer/SurfaceNetsOOP.java
@@ -165,54 +165,6 @@ public static void renderPost(final RebuildChunkPostEvent event) {
 
 	}
 
-	public static class SurfaceNet {
-
-		public final HashMap<BlockPos, BlockPosSurfaceNetInfo> posInfos;
-
-		public SurfaceNet(final HashMap<BlockPos, BlockPosSurfaceNetInfo> posInfos) {
-			this.posInfos = posInfos;
-		}
-
-		public BlockPosSurfaceNetInfo get(BlockPos pos) {
-			return posInfos.get(pos);
-		}
-
-	}
-
-	public static class BlockPosSurfaceNetInfo {
-
-		public final IBlockState state;
-		public final BlockPos brightnessPos;
-		public final List<QuadVertexList> vertexList;
-
-		public BlockPosSurfaceNetInfo(final IBlockState state, final BlockPos brightnessPos, final List<QuadVertexList> quadVertexList) {
-			this.state = state;
-			this.brightnessPos = brightnessPos;
-			this.vertexList = quadVertexList;
-		}
-
-	}
-
-	public static class QuadVertexList {
-
-		public final Vec3d vertex1;
-		public final Vec3d vertex2;
-		public final Vec3d vertex3;
-		public final Vec3d vertex4;
-
-		public QuadVertexList(final Vec3d vertex1, final Vec3d vertex2, final Vec3d vertex3, final Vec3d vertex4) {
-			this.vertex1 = vertex1;
-			this.vertex2 = vertex2;
-			this.vertex3 = vertex3;
-			this.vertex4 = vertex4;
-		}
-
-		public Vec3d[] getVertexes() {
-			return new Vec3d[]{this.vertex1, this.vertex2, this.vertex3, this.vertex4};
-		}
-
-	}
-
 	public static SurfaceNet generateSurfaceNet(final BlockPos startingPositionIn, final IBlockAccess cache, final BiFunction<BlockPos, IBlockAccess, Float> potential) {
 		return generateSurfaceNetUNUSED(startingPositionIn, cache, potential);
 	}
@@ -414,4 +366,52 @@ public static SurfaceNet generateSurfaceNetUNUSED(final BlockPos startingPositio
 		return new SurfaceNet(posInfos);
 	}
 
+	public static class SurfaceNet {
+
+		public final HashMap<BlockPos, BlockPosSurfaceNetInfo> posInfos;
+
+		public SurfaceNet(final HashMap<BlockPos, BlockPosSurfaceNetInfo> posInfos) {
+			this.posInfos = posInfos;
+		}
+
+		public BlockPosSurfaceNetInfo get(BlockPos pos) {
+			return posInfos.get(pos);
+		}
+
+	}
+
+	public static class BlockPosSurfaceNetInfo {
+
+		public final IBlockState state;
+		public final BlockPos brightnessPos;
+		public final List<QuadVertexList> vertexList;
+
+		public BlockPosSurfaceNetInfo(final IBlockState state, final BlockPos brightnessPos, final List<QuadVertexList> quadVertexList) {
+			this.state = state;
+			this.brightnessPos = brightnessPos;
+			this.vertexList = quadVertexList;
+		}
+
+	}
+
+	public static class QuadVertexList {
+
+		public final Vec3d vertex1;
+		public final Vec3d vertex2;
+		public final Vec3d vertex3;
+		public final Vec3d vertex4;
+
+		public QuadVertexList(final Vec3d vertex1, final Vec3d vertex2, final Vec3d vertex3, final Vec3d vertex4) {
+			this.vertex1 = vertex1;
+			this.vertex2 = vertex2;
+			this.vertex3 = vertex3;
+			this.vertex4 = vertex4;
+		}
+
+		public Vec3d[] getVertexes() {
+			return new Vec3d[]{this.vertex1, this.vertex2, this.vertex3, this.vertex4};
+		}
+
+	}
+
 }