From 3cd8cc1a0708a40ca6fb3f34bf29e5799b8b0455 Mon Sep 17 00:00:00 2001 From: halotroop2288 Date: Sat, 29 Feb 2020 20:28:09 -0800 Subject: [PATCH 1/2] You commited without an import @Valoeghese --- src/main/java/com/github/halotroop/litecraft/world/Chunk.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/github/halotroop/litecraft/world/Chunk.java b/src/main/java/com/github/halotroop/litecraft/world/Chunk.java index 82df46a..630b1b9 100644 --- a/src/main/java/com/github/halotroop/litecraft/world/Chunk.java +++ b/src/main/java/com/github/halotroop/litecraft/world/Chunk.java @@ -33,7 +33,6 @@ public class Chunk implements BlockAccess, WorldGenConstants, SODSerializable private boolean fullyGenerated = false; public final int dimension; private boolean dirty = true; - private World world; private BlockInstance[] renderedBlocks = new BlockInstance[CHUNK_SIZE * CHUNK_SIZE * CHUNK_SIZE]; public Chunk(World world, int chunkX, int chunkY, int chunkZ, int dimension) @@ -45,7 +44,6 @@ public class Chunk implements BlockAccess, WorldGenConstants, SODSerializable this.chunkStartY = chunkY << POS_SHIFT; this.chunkStartZ = chunkZ << POS_SHIFT; this.dimension = dimension; - this.world = world; } public boolean doRender() From e4787171c21d48ac2290fb26b302cb9b762f3810 Mon Sep 17 00:00:00 2001 From: halotroop2288 Date: Sun, 1 Mar 2020 12:59:12 -0800 Subject: [PATCH 2/2] Block textures always use textures from the block folder, right? --- .../halotroop/litecraft/types/block/Block.java | 2 +- .../halotroop/litecraft/types/block/Blocks.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/github/halotroop/litecraft/types/block/Block.java b/src/main/java/com/github/halotroop/litecraft/types/block/Block.java index 63ab853..e1806b4 100644 --- a/src/main/java/com/github/halotroop/litecraft/types/block/Block.java +++ b/src/main/java/com/github/halotroop/litecraft/types/block/Block.java @@ -54,7 +54,7 @@ public class Block { this((TexturedModel) null, properties); } protected Block(String texture, Properties properties) - { this(ModelLoader.loadGenericCube(texture), properties); } + { this(ModelLoader.loadGenericCube("block/"+texture), properties); } protected Block(TexturedModel model, Properties properties) { diff --git a/src/main/java/com/github/halotroop/litecraft/types/block/Blocks.java b/src/main/java/com/github/halotroop/litecraft/types/block/Blocks.java index 400ec4e..a85dd72 100644 --- a/src/main/java/com/github/halotroop/litecraft/types/block/Blocks.java +++ b/src/main/java/com/github/halotroop/litecraft/types/block/Blocks.java @@ -10,12 +10,12 @@ public final class Blocks public static List blocks = new ArrayList(); public static final Block AIR = new Block(new Properties("air").visible(false).fullCube(false)); - public static final Block GRASS = new Block(new Properties("block/cubes/soil/grass/grass_top.png").caveCarveThreshold(0.04f)); - public static final Block DIRT = new Block("block/cubes/soil/dirt.png", new Properties("dirt").caveCarveThreshold(0.04f)); - public static final Block ANDESITE = new Block("block/cubes/stone/basic/andesite.png", new Properties("andesite").caveCarveThreshold(0.08f)); - public static final Block DIORITE = new Block("block/cubes/stone/basic/diorite.png", new Properties("diorite").caveCarveThreshold(0.05f)); - public static final Block GRANITE = new Block("block/cubes/stone/basic/granite.png", new Properties("granite").caveCarveThreshold(0.06f)); - public static final Block GNEISS = new Block("block/cubes/stone/basic/gneiss.png", new Properties("gneiss").caveCarveThreshold(0.09f)); + public static final Block GRASS = new Block(new Properties("cubes/soil/grass/grass_top.png").caveCarveThreshold(0.04f)); + public static final Block DIRT = new Block("cubes/soil/dirt.png", new Properties("dirt").caveCarveThreshold(0.04f)); + public static final Block ANDESITE = new Block("cubes/stone/basic/andesite.png", new Properties("andesite").caveCarveThreshold(0.08f)); + public static final Block DIORITE = new Block("cubes/stone/basic/diorite.png", new Properties("diorite").caveCarveThreshold(0.05f)); + public static final Block GRANITE = new Block("cubes/stone/basic/granite.png", new Properties("granite").caveCarveThreshold(0.06f)); + public static final Block GNEISS = new Block("cubes/stone/basic/gneiss.png", new Properties("gneiss").caveCarveThreshold(0.09f)); public static Block init() {