Skip to content
This repository has been archived by the owner on Mar 9, 2024. It is now read-only.

Commit

Permalink
More project cleanup.
Browse files Browse the repository at this point in the history 
The walls are going to need a lot of work.
The rest of the blocks are going to need 1st/3rd person models.
Glass is completely see-through.
Stairs are broken when upside down.
Ore generates correctly.
Spores spread correctly.
Furnace works correctly.
Fuels work correctly.
#29
  • Loading branch information
@renevo
renevo committed May 15, 2016
1 parent 4ff0988 commit 5cb2523
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 106 deletions.
4 changes: 3 additions & 1 deletion src/main/java/com/renevo/nethercore/blocks/BlockCompressedNetherrack.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import net.minecraft.world.World;
import slimeknights.mantle.block.EnumBlock;

import java.util.Locale;

public class BlockCompressedNetherrack extends EnumBlock<BlockCompressedNetherrack.CompressionDepth> {

public static final PropertyEnum<CompressionDepth> TYPE = PropertyEnum.create("type", CompressionDepth.class);
Expand Down Expand Up @@ -58,7 +60,7 @@ public enum CompressionDepth implements IStringSerializable, EnumBlock.IEnumMeta

@Override
public String getName() {
return this.toString();
return this.toString().toLowerCase(Locale.US);
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/renevo/nethercore/blocks/BlockNetherOre.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import net.minecraft.world.World;
import slimeknights.mantle.block.EnumBlock;

import java.util.Locale;
import java.util.Random;

public class BlockNetherOre extends EnumBlock<BlockNetherOre.OreTypes> {
Expand Down Expand Up @@ -164,7 +165,7 @@ public enum OreTypes implements IStringSerializable, EnumBlock.IEnumMeta {

@Override
public String getName() {
return this.toString();
return this.toString().toLowerCase(Locale.US);
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/renevo/nethercore/blocks/BlockNetherStairs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ public BlockNetherStairs(IBlockState blockState) {
this.setCreativeTab(NetherCoreRegistry.tabNetherCore);
}

public boolean canCreatureSpawn(IBlockAccess blockAccess, BlockPos blockPos, EntityLiving.SpawnPlacementType spawnPlacementType) {
@Override
public boolean canCreatureSpawn(IBlockState blockState, IBlockAccess blockAccess, BlockPos blockPos, EntityLiving.SpawnPlacementType spawnPlacementType) {
return false;
}
}
4 changes: 3 additions & 1 deletion src/main/java/com/renevo/nethercore/blocks/BlockNetherStone.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import net.minecraft.world.IBlockAccess;
import slimeknights.mantle.block.EnumBlock;

import java.util.Locale;

public class BlockNetherStone extends EnumBlock<BlockNetherStone.StoneType> {

public final static PropertyEnum<StoneType> TYPE = PropertyEnum.create("type", StoneType.class);
Expand Down Expand Up @@ -46,7 +48,7 @@ public enum StoneType implements IStringSerializable, EnumBlock.IEnumMeta {

@Override
public String getName() {
return this.toString();
return this.toString().toLowerCase(Locale.US);
}

@Override
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/com/renevo/nethercore/blocks/BlockStoneSlab.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;

import java.util.Locale;

public abstract class BlockStoneSlab extends EnumBlockSlab<BlockStoneSlab.SlabType> {
public static final PropertyEnum<SlabType> VARIANT = PropertyEnum.create("variant", SlabType.class);

Expand Down Expand Up @@ -41,7 +43,8 @@ public BlockStoneSlab(Material material) {
this.setStepSound(NetherCoreBlocks.soundTypeNetherStone);
}

public boolean canCreatureSpawn(IBlockAccess blockAccess, BlockPos blockPos, EntityLiving.SpawnPlacementType spawnPlacementType) {
@Override
public boolean canCreatureSpawn(IBlockState blockState, IBlockAccess blockAccess, BlockPos blockPos, EntityLiving.SpawnPlacementType spawnPlacementType) {
return false;
}

Expand All @@ -59,7 +62,7 @@ public enum SlabType implements IStringSerializable, EnumBlockSlab.IEnumMeta {

@Override
public String getName() {
return this.toString();
return this.toString().toLowerCase(Locale.US);
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/renevo/nethercore/blocks/BlockStoneWall.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.IStringSerializable;

import java.util.Locale;

public class BlockStoneWall extends EnumBlockWall<BlockStoneWall.WallType> {
public static final PropertyEnum<WallType> VARIANT = PropertyEnum.create("variant", WallType.class);

Expand Down Expand Up @@ -38,7 +40,7 @@ public enum WallType implements IStringSerializable, EnumBlockWall.IEnumMeta {

@Override
public String getName() {
return this.toString();
return this.toString().toLowerCase(Locale.US);
}

@Override
Expand Down
122 changes: 23 additions & 99 deletions src/main/resources/assets/nethercore/blockstates/wall_stone.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,104 +29,28 @@
"wall": "minecraft:blocks/nether_brick"
}
}
}
},
"multipart": [
{
"when": { "up": "true" },
"apply": { "model": "minecraft:wall_post" }
},
{
"when": { "north": "true" },
"apply": { "model": "minecraft:block/wall_side", "uvlock": true }
},
"east=false,north=false,south=false,up=false,variant=cobblestone,west=false": {"model": "minecraft:wall_post" },
"east=false,north=true,south=false,up=false,variant=cobblestone,west=false": {"model": "minecraft:wall_n" },
"east=true,north=false,south=false,up=false,variant=cobblestone,west=false": {"model": "minecraft:wall_n", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=false,variant=cobblestone,west=false": {"model": "minecraft:wall_n", "y": 180, "uvlock": true },
"east=false,north=false,south=false,up=false,variant=cobblestone,west=true": {"model": "minecraft:wall_n", "y": 270, "uvlock": true },
"east=true,north=true,south=false,up=false,variant=cobblestone,west=false": {"model": "minecraft:wall_ne" },
"east=true,north=false,south=true,up=false,variant=cobblestone,west=false": {"model": "minecraft:wall_ne", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=false,variant=cobblestone,west=true": {"model": "minecraft:wall_ne", "y": 180, "uvlock": true },
"east=false,north=true,south=false,up=false,variant=cobblestone,west=true": {"model": "minecraft:wall_ne", "y": 270, "uvlock": true },
"east=false,north=true,south=true,up=false,variant=cobblestone,west=false": {"model": "minecraft:wall_ns" },
"east=true,north=false,south=false,up=false,variant=cobblestone,west=true": {"model": "minecraft:wall_ns", "y": 90, "uvlock": true },
"east=true,north=true,south=true,up=false,variant=cobblestone,west=false": {"model": "minecraft:wall_nse" },
"east=true,north=false,south=true,up=false,variant=cobblestone,west=true": {"model": "minecraft:wall_nse", "y": 90, "uvlock": true },
"east=false,north=true,south=true,up=false,variant=cobblestone,west=true": {"model": "minecraft:wall_nse", "y": 180, "uvlock": true },
"east=true,north=true,south=false,up=false,variant=cobblestone,west=true": {"model": "minecraft:wall_nse", "y": 270, "uvlock": true },
"east=true,north=true,south=true,up=false,variant=cobblestone,west=true": {"model": "minecraft:wall_nsew" },
"east=false,north=false,south=false,up=true,variant=cobblestone,west=false": {"model": "minecraft:wall_post" },
"east=false,north=true,south=false,up=true,variant=cobblestone,west=false": {"model": "minecraft:wall_n" },
"east=true,north=false,south=false,up=true,variant=cobblestone,west=false": {"model": "minecraft:wall_n", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=true,variant=cobblestone,west=false": {"model": "minecraft:wall_n", "y": 180, "uvlock": true },
"east=false,north=false,south=false,up=true,variant=cobblestone,west=true": {"model": "minecraft:wall_n", "y": 270, "uvlock": true },
"east=true,north=true,south=false,up=true,variant=cobblestone,west=false": {"model": "minecraft:wall_ne" },
"east=true,north=false,south=true,up=true,variant=cobblestone,west=false": {"model": "minecraft:wall_ne", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=true,variant=cobblestone,west=true": {"model": "minecraft:wall_ne", "y": 180, "uvlock": true },
"east=false,north=true,south=false,up=true,variant=cobblestone,west=true": {"model": "minecraft:wall_ne", "y": 270, "uvlock": true },
"east=false,north=true,south=true,up=true,variant=cobblestone,west=false": {"model": "minecraft:wall_ns_above" },
"east=true,north=false,south=false,up=true,variant=cobblestone,west=true": {"model": "minecraft:wall_ns_above", "y": 90, "uvlock": true },
"east=true,north=true,south=true,up=true,variant=cobblestone,west=false": {"model": "minecraft:wall_nse" },
"east=true,north=false,south=true,up=true,variant=cobblestone,west=true": {"model": "minecraft:wall_nse", "y": 90, "uvlock": true },
"east=false,north=true,south=true,up=true,variant=cobblestone,west=true": {"model": "minecraft:wall_nse", "y": 180, "uvlock": true },
"east=true,north=true,south=false,up=true,variant=cobblestone,west=true": {"model": "minecraft:wall_nse", "y": 270, "uvlock": true },
"east=true,north=true,south=true,up=true,variant=cobblestone,west=true": {"model": "minecraft:wall_nsew" },

"east=false,north=false,south=false,up=false,variant=stone,west=false": {"model": "minecraft:wall_post" },
"east=false,north=true,south=false,up=false,variant=stone,west=false": {"model": "minecraft:wall_n" },
"east=true,north=false,south=false,up=false,variant=stone,west=false": {"model": "minecraft:wall_n", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=false,variant=stone,west=false": {"model": "minecraft:wall_n", "y": 180, "uvlock": true },
"east=false,north=false,south=false,up=false,variant=stone,west=true": {"model": "minecraft:wall_n", "y": 270, "uvlock": true },
"east=true,north=true,south=false,up=false,variant=stone,west=false": {"model": "minecraft:wall_ne" },
"east=true,north=false,south=true,up=false,variant=stone,west=false": {"model": "minecraft:wall_ne", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=false,variant=stone,west=true": {"model": "minecraft:wall_ne", "y": 180, "uvlock": true },
"east=false,north=true,south=false,up=false,variant=stone,west=true": {"model": "minecraft:wall_ne", "y": 270, "uvlock": true },
"east=false,north=true,south=true,up=false,variant=stone,west=false": {"model": "minecraft:wall_ns" },
"east=true,north=false,south=false,up=false,variant=stone,west=true": {"model": "minecraft:wall_ns", "y": 90, "uvlock": true },
"east=true,north=true,south=true,up=false,variant=stone,west=false": {"model": "minecraft:wall_nse" },
"east=true,north=false,south=true,up=false,variant=stone,west=true": {"model": "minecraft:wall_nse", "y": 90, "uvlock": true },
"east=false,north=true,south=true,up=false,variant=stone,west=true": {"model": "minecraft:wall_nse", "y": 180, "uvlock": true },
"east=true,north=true,south=false,up=false,variant=stone,west=true": {"model": "minecraft:wall_nse", "y": 270, "uvlock": true },
"east=true,north=true,south=true,up=false,variant=stone,west=true": {"model": "minecraft:wall_nsew" },
"east=false,north=false,south=false,up=true,variant=stone,west=false": {"model": "minecraft:wall_post" },
"east=false,north=true,south=false,up=true,variant=stone,west=false": {"model": "minecraft:wall_n" },
"east=true,north=false,south=false,up=true,variant=stone,west=false": {"model": "minecraft:wall_n", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=true,variant=stone,west=false": {"model": "minecraft:wall_n", "y": 180, "uvlock": true },
"east=false,north=false,south=false,up=true,variant=stone,west=true": {"model": "minecraft:wall_n", "y": 270, "uvlock": true },
"east=true,north=true,south=false,up=true,variant=stone,west=false": {"model": "minecraft:wall_ne" },
"east=true,north=false,south=true,up=true,variant=stone,west=false": {"model": "minecraft:wall_ne", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=true,variant=stone,west=true": {"model": "minecraft:wall_ne", "y": 180, "uvlock": true },
"east=false,north=true,south=false,up=true,variant=stone,west=true": {"model": "minecraft:wall_ne", "y": 270, "uvlock": true },
"east=false,north=true,south=true,up=true,variant=stone,west=false": {"model": "minecraft:wall_ns_above" },
"east=true,north=false,south=false,up=true,variant=stone,west=true": {"model": "minecraft:wall_ns_above", "y": 90, "uvlock": true },
"east=true,north=true,south=true,up=true,variant=stone,west=false": {"model": "minecraft:wall_nse" },
"east=true,north=false,south=true,up=true,variant=stone,west=true": {"model": "minecraft:wall_nse", "y": 90, "uvlock": true },
"east=false,north=true,south=true,up=true,variant=stone,west=true": {"model": "minecraft:wall_nse", "y": 180, "uvlock": true },
"east=true,north=true,south=false,up=true,variant=stone,west=true": {"model": "minecraft:wall_nse", "y": 270, "uvlock": true },
"east=true,north=true,south=true,up=true,variant=stone,west=true": {"model": "minecraft:wall_nsew" },

"east=false,north=false,south=false,up=false,variant=brick,west=false": {"model": "minecraft:wall_post" },
"east=false,north=true,south=false,up=false,variant=brick,west=false": {"model": "minecraft:wall_n" },
"east=true,north=false,south=false,up=false,variant=brick,west=false": {"model": "minecraft:wall_n", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=false,variant=brick,west=false": {"model": "minecraft:wall_n", "y": 180, "uvlock": true },
"east=false,north=false,south=false,up=false,variant=brick,west=true": {"model": "minecraft:wall_n", "y": 270, "uvlock": true },
"east=true,north=true,south=false,up=false,variant=brick,west=false": {"model": "minecraft:wall_ne" },
"east=true,north=false,south=true,up=false,variant=brick,west=false": {"model": "minecraft:wall_ne", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=false,variant=brick,west=true": {"model": "minecraft:wall_ne", "y": 180, "uvlock": true },
"east=false,north=true,south=false,up=false,variant=brick,west=true": {"model": "minecraft:wall_ne", "y": 270, "uvlock": true },
"east=false,north=true,south=true,up=false,variant=brick,west=false": {"model": "minecraft:wall_ns" },
"east=true,north=false,south=false,up=false,variant=brick,west=true": {"model": "minecraft:wall_ns", "y": 90, "uvlock": true },
"east=true,north=true,south=true,up=false,variant=brick,west=false": {"model": "minecraft:wall_nse" },
"east=true,north=false,south=true,up=false,variant=brick,west=true": {"model": "minecraft:wall_nse", "y": 90, "uvlock": true },
"east=false,north=true,south=true,up=false,variant=brick,west=true": {"model": "minecraft:wall_nse", "y": 180, "uvlock": true },
"east=true,north=true,south=false,up=false,variant=brick,west=true": {"model": "minecraft:wall_nse", "y": 270, "uvlock": true },
"east=true,north=true,south=true,up=false,variant=brick,west=true": {"model": "minecraft:wall_nsew" },
"east=false,north=false,south=false,up=true,variant=brick,west=false": {"model": "minecraft:wall_post" },
"east=false,north=true,south=false,up=true,variant=brick,west=false": {"model": "minecraft:wall_n" },
"east=true,north=false,south=false,up=true,variant=brick,west=false": {"model": "minecraft:wall_n", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=true,variant=brick,west=false": {"model": "minecraft:wall_n", "y": 180, "uvlock": true },
"east=false,north=false,south=false,up=true,variant=brick,west=true": {"model": "minecraft:wall_n", "y": 270, "uvlock": true },
"east=true,north=true,south=false,up=true,variant=brick,west=false": {"model": "minecraft:wall_ne" },
"east=true,north=false,south=true,up=true,variant=brick,west=false": {"model": "minecraft:wall_ne", "y": 90, "uvlock": true },
"east=false,north=false,south=true,up=true,variant=brick,west=true": {"model": "minecraft:wall_ne", "y": 180, "uvlock": true },
"east=false,north=true,south=false,up=true,variant=brick,west=true": {"model": "minecraft:wall_ne", "y": 270, "uvlock": true },
"east=false,north=true,south=true,up=true,variant=brick,west=false": {"model": "minecraft:wall_ns_above" },
"east=true,north=false,south=false,up=true,variant=brick,west=true": {"model": "minecraft:wall_ns_above", "y": 90, "uvlock": true },
"east=true,north=true,south=true,up=true,variant=brick,west=false": {"model": "minecraft:wall_nse" },
"east=true,north=false,south=true,up=true,variant=brick,west=true": {"model": "minecraft:wall_nse", "y": 90, "uvlock": true },
"east=false,north=true,south=true,up=true,variant=brick,west=true": {"model": "minecraft:wall_nse", "y": 180, "uvlock": true },
"east=true,north=true,south=false,up=true,variant=brick,west=true": {"model": "minecraft:wall_nse", "y": 270, "uvlock": true },
"east=true,north=true,south=true,up=true,variant=brick,west=true": {"model": "minecraft:wall_nsew" }
}
{
"when": { "east": "true" },
"apply": { "model": "minecraft:block/wall_side", "y": 90, "uvlock": true }
},
{
"when": { "south": "true" },
"apply": { "model": "minecraft:block/wall_side", "y": 180, "uvlock": true }
},
{
"when": { "west": "true" },
"apply": { "model": "minecraft:block/wall_side", "y": 270, "uvlock": true }
}
]
}

0 comments on commit 5cb2523

Please sign in to comment.