halotroop
/
Ginger3D
1
0
Fork 0
Code Pull Requests Packages Releases Activity

Simpler boolean setting for cave carving blocks

pull/12/head
Caroline Bell 2020-02-29 18:11:44 -08:00
parent 2af1a71ab5
commit d66e0bda90
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/github/halotroop/litecraft/types/block/Block.java
View File

@ -11,7 +11,7 @@ public class Block
{ // add properties to this builder! { // add properties to this builder!
private boolean visible = true; private boolean visible = true;
private boolean fullCube = true; private boolean fullCube = true;
private boolean canCaveCarve = false; private boolean canCaveCarve = true;
private final String identifier; private final String identifier;
public Properties(String identifier) public Properties(String identifier)
@ -29,9 +29,9 @@ public class Block
return this; return this;
} }
public Properties canCaveCarve(boolean canCaveCarve) public Properties cannotCarveCave()
{ {
this.canCaveCarve = canCaveCarve; this.canCaveCarve = false;
return this; return this;
} }
} }

15
src/main/java/com/github/halotroop/litecraft/types/block/Blocks.java
View File

@ -4,23 +4,14 @@ import com.github.halotroop.litecraft.types.block.Block.Properties;
public final class Blocks public final class Blocks
{ {
<<<<<<< Upstream, based on branch 'liteCraft' of https://github.com/halotroop/Ginger3D.git public static final Block AIR = new Block(new Properties("air").visible(false).fullCube(false).cannotCarveCave());
public static final Block AIR = new Block(new Properties("air").visible(false)); public static final Block GRASS = new Block(new Properties("block/cubes/soil/grass/grass_top.png"));
public static final Block GRASS = new Block(new Properties("block/cubes/soil/grass/grass_top.png").canCaveCarve(true));
public static final Block DIRT = new Block("block/cubes/soil/dirt.png", new Properties("dirt").canCaveCarve(true));
public static final Block ANDESITE = new Block("block/cubes/stone/basic/andesite.png", new Properties("andesite").canCaveCarve(true));
public static final Block DIORITE = new Block("block/cubes/stone/basic/diorite.png", new Properties("diorite").canCaveCarve(true));
public static final Block GRANITE = new Block("block/cubes/stone/basic/granite.png", new Properties("granite").canCaveCarve(true));
public static final Block GNEISS = new Block("block/cubes/stone/basic/gneiss.png", new Properties("gneiss").canCaveCarve(true));
=======
public static final Block AIR = new Block(new Properties("air").visible(false).fullCube(false));
public static final Block DIRT = new Block("block/cubes/soil/dirt.png", new Properties("dirt")); public static final Block DIRT = new Block("block/cubes/soil/dirt.png", new Properties("dirt"));
public static final Block ANDESITE = new Block("block/cubes/stone/basic/andesite.png", new Properties("andesite")); public static final Block ANDESITE = new Block("block/cubes/stone/basic/andesite.png", new Properties("andesite"));
public static final Block DIORITE = new Block("block/cubes/stone/basic/diorite.png", new Properties("diorite")); public static final Block DIORITE = new Block("block/cubes/stone/basic/diorite.png", new Properties("diorite"));
public static final Block GRANITE = new Block("block/cubes/stone/basic/granite.png", new Properties("granite")); public static final Block GRANITE = new Block("block/cubes/stone/basic/granite.png", new Properties("granite"));
public static final Block GNEISS = new Block("block/cubes/stone/basic/gneiss.png", new Properties("gneiss")); public static final Block GNEISS = new Block("block/cubes/stone/basic/gneiss.png", new Properties("gneiss"));
>>>>>>> 56b16c1 Made chunks add blocks next to all non-full cubes to the render list
public static Block init() public static Block init()
{ {
return AIR; return AIR;