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

Commit 5cb2523

Browse files
renevorenevo
committed
More project cleanup.
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
1 parent 4ff0988 commit 5cb2523

File tree

7 files changed

+41
-106
lines changed

7 files changed

+41
-106
lines changed

‎src/main/java/com/renevo/nethercore/blocks/BlockCompressedNetherrack.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import net.minecraft.world.World;
1313
import slimeknights.mantle.block.EnumBlock;
1414

15+
import java.util.Locale;
16+
1517
public class BlockCompressedNetherrack extends EnumBlock<BlockCompressedNetherrack.CompressionDepth> {
1618

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

5961
@Override
6062
public String getName() {
61-
return this.toString();
63+
return this.toString().toLowerCase(Locale.US);
6264
}
6365

6466
@Override

‎src/main/java/com/renevo/nethercore/blocks/BlockNetherOre.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import net.minecraft.world.World;
1717
import slimeknights.mantle.block.EnumBlock;
1818

19+
import java.util.Locale;
1920
import java.util.Random;
2021

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

165166
@Override
166167
public String getName() {
167-
return this.toString();
168+
return this.toString().toLowerCase(Locale.US);
168169
}
169170

170171
@Override

‎src/main/java/com/renevo/nethercore/blocks/BlockNetherStairs.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ public BlockNetherStairs(IBlockState blockState) {
1515
this.setCreativeTab(NetherCoreRegistry.tabNetherCore);
1616
}
1717

18-
public boolean canCreatureSpawn(IBlockAccess blockAccess, BlockPos blockPos, EntityLiving.SpawnPlacementType spawnPlacementType) {
18+
@Override
19+
public boolean canCreatureSpawn(IBlockState blockState, IBlockAccess blockAccess, BlockPos blockPos, EntityLiving.SpawnPlacementType spawnPlacementType) {
1920
return false;
2021
}
2122
}

‎src/main/java/com/renevo/nethercore/blocks/BlockNetherStone.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import net.minecraft.world.IBlockAccess;
1111
import slimeknights.mantle.block.EnumBlock;
1212

13+
import java.util.Locale;
14+
1315
public class BlockNetherStone extends EnumBlock<BlockNetherStone.StoneType> {
1416

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

4749
@Override
4850
public String getName() {
49-
return this.toString();
51+
return this.toString().toLowerCase(Locale.US);
5052
}
5153

5254
@Override

‎src/main/java/com/renevo/nethercore/blocks/BlockStoneSlab.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import net.minecraft.util.math.BlockPos;
1111
import net.minecraft.world.IBlockAccess;
1212

13+
import java.util.Locale;
14+
1315
public abstract class BlockStoneSlab extends EnumBlockSlab<BlockStoneSlab.SlabType> {
1416
public static final PropertyEnum<SlabType> VARIANT = PropertyEnum.create("variant", SlabType.class);
1517

@@ -41,7 +43,8 @@ public BlockStoneSlab(Material material) {
4143
this.setStepSound(NetherCoreBlocks.soundTypeNetherStone);
4244
}
4345

44-
public boolean canCreatureSpawn(IBlockAccess blockAccess, BlockPos blockPos, EntityLiving.SpawnPlacementType spawnPlacementType) {
46+
@Override
47+
public boolean canCreatureSpawn(IBlockState blockState, IBlockAccess blockAccess, BlockPos blockPos, EntityLiving.SpawnPlacementType spawnPlacementType) {
4548
return false;
4649
}
4750

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

6063
@Override
6164
public String getName() {
62-
return this.toString();
65+
return this.toString().toLowerCase(Locale.US);
6366
}
6467

6568
@Override

‎src/main/java/com/renevo/nethercore/blocks/BlockStoneWall.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import net.minecraft.block.state.IBlockState;
77
import net.minecraft.util.IStringSerializable;
88

9+
import java.util.Locale;
10+
911
public class BlockStoneWall extends EnumBlockWall<BlockStoneWall.WallType> {
1012
public static final PropertyEnum<WallType> VARIANT = PropertyEnum.create("variant", WallType.class);
1113

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

3941
@Override
4042
public String getName() {
41-
return this.toString();
43+
return this.toString().toLowerCase(Locale.US);
4244
}
4345

4446
@Override

‎src/main/resources/assets/nethercore/blockstates/wall_stone.json‎

Lines changed: 23 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -29,104 +29,28 @@
2929
"wall": "minecraft:blocks/nether_brick"
3030
}
3131
}
32+
}
33+
},
34+
"multipart": [
35+
{
36+
"when": { "up": "true" },
37+
"apply": { "model": "minecraft:wall_post" }
38+
},
39+
{
40+
"when": { "north": "true" },
41+
"apply": { "model": "minecraft:block/wall_side", "uvlock": true }
3242
},
33-
"east=false,north=false,south=false,up=false,variant=cobblestone,west=false": {"model": "minecraft:wall_post" },
34-
"east=false,north=true,south=false,up=false,variant=cobblestone,west=false": {"model": "minecraft:wall_n" },
35-
"east=true,north=false,south=false,up=false,variant=cobblestone,west=false": {"model": "minecraft:wall_n", "y": 90, "uvlock": true },
36-
"east=false,north=false,south=true,up=false,variant=cobblestone,west=false": {"model": "minecraft:wall_n", "y": 180, "uvlock": true },
37-
"east=false,north=false,south=false,up=false,variant=cobblestone,west=true": {"model": "minecraft:wall_n", "y": 270, "uvlock": true },
38-
"east=true,north=true,south=false,up=false,variant=cobblestone,west=false": {"model": "minecraft:wall_ne" },
39-
"east=true,north=false,south=true,up=false,variant=cobblestone,west=false": {"model": "minecraft:wall_ne", "y": 90, "uvlock": true },
40-
"east=false,north=false,south=true,up=false,variant=cobblestone,west=true": {"model": "minecraft:wall_ne", "y": 180, "uvlock": true },
41-
"east=false,north=true,south=false,up=false,variant=cobblestone,west=true": {"model": "minecraft:wall_ne", "y": 270, "uvlock": true },
42-
"east=false,north=true,south=true,up=false,variant=cobblestone,west=false": {"model": "minecraft:wall_ns" },
43-
"east=true,north=false,south=false,up=false,variant=cobblestone,west=true": {"model": "minecraft:wall_ns", "y": 90, "uvlock": true },
44-
"east=true,north=true,south=true,up=false,variant=cobblestone,west=false": {"model": "minecraft:wall_nse" },
45-
"east=true,north=false,south=true,up=false,variant=cobblestone,west=true": {"model": "minecraft:wall_nse", "y": 90, "uvlock": true },
46-
"east=false,north=true,south=true,up=false,variant=cobblestone,west=true": {"model": "minecraft:wall_nse", "y": 180, "uvlock": true },
47-
"east=true,north=true,south=false,up=false,variant=cobblestone,west=true": {"model": "minecraft:wall_nse", "y": 270, "uvlock": true },
48-
"east=true,north=true,south=true,up=false,variant=cobblestone,west=true": {"model": "minecraft:wall_nsew" },
49-
"east=false,north=false,south=false,up=true,variant=cobblestone,west=false": {"model": "minecraft:wall_post" },
50-
"east=false,north=true,south=false,up=true,variant=cobblestone,west=false": {"model": "minecraft:wall_n" },
51-
"east=true,north=false,south=false,up=true,variant=cobblestone,west=false": {"model": "minecraft:wall_n", "y": 90, "uvlock": true },
52-
"east=false,north=false,south=true,up=true,variant=cobblestone,west=false": {"model": "minecraft:wall_n", "y": 180, "uvlock": true },
53-
"east=false,north=false,south=false,up=true,variant=cobblestone,west=true": {"model": "minecraft:wall_n", "y": 270, "uvlock": true },
54-
"east=true,north=true,south=false,up=true,variant=cobblestone,west=false": {"model": "minecraft:wall_ne" },
55-
"east=true,north=false,south=true,up=true,variant=cobblestone,west=false": {"model": "minecraft:wall_ne", "y": 90, "uvlock": true },
56-
"east=false,north=false,south=true,up=true,variant=cobblestone,west=true": {"model": "minecraft:wall_ne", "y": 180, "uvlock": true },
57-
"east=false,north=true,south=false,up=true,variant=cobblestone,west=true": {"model": "minecraft:wall_ne", "y": 270, "uvlock": true },
58-
"east=false,north=true,south=true,up=true,variant=cobblestone,west=false": {"model": "minecraft:wall_ns_above" },
59-
"east=true,north=false,south=false,up=true,variant=cobblestone,west=true": {"model": "minecraft:wall_ns_above", "y": 90, "uvlock": true },
60-
"east=true,north=true,south=true,up=true,variant=cobblestone,west=false": {"model": "minecraft:wall_nse" },
61-
"east=true,north=false,south=true,up=true,variant=cobblestone,west=true": {"model": "minecraft:wall_nse", "y": 90, "uvlock": true },
62-
"east=false,north=true,south=true,up=true,variant=cobblestone,west=true": {"model": "minecraft:wall_nse", "y": 180, "uvlock": true },
63-
"east=true,north=true,south=false,up=true,variant=cobblestone,west=true": {"model": "minecraft:wall_nse", "y": 270, "uvlock": true },
64-
"east=true,north=true,south=true,up=true,variant=cobblestone,west=true": {"model": "minecraft:wall_nsew" },
65-
66-
"east=false,north=false,south=false,up=false,variant=stone,west=false": {"model": "minecraft:wall_post" },
67-
"east=false,north=true,south=false,up=false,variant=stone,west=false": {"model": "minecraft:wall_n" },
68-
"east=true,north=false,south=false,up=false,variant=stone,west=false": {"model": "minecraft:wall_n", "y": 90, "uvlock": true },
69-
"east=false,north=false,south=true,up=false,variant=stone,west=false": {"model": "minecraft:wall_n", "y": 180, "uvlock": true },
70-
"east=false,north=false,south=false,up=false,variant=stone,west=true": {"model": "minecraft:wall_n", "y": 270, "uvlock": true },
71-
"east=true,north=true,south=false,up=false,variant=stone,west=false": {"model": "minecraft:wall_ne" },
72-
"east=true,north=false,south=true,up=false,variant=stone,west=false": {"model": "minecraft:wall_ne", "y": 90, "uvlock": true },
73-
"east=false,north=false,south=true,up=false,variant=stone,west=true": {"model": "minecraft:wall_ne", "y": 180, "uvlock": true },
74-
"east=false,north=true,south=false,up=false,variant=stone,west=true": {"model": "minecraft:wall_ne", "y": 270, "uvlock": true },
75-
"east=false,north=true,south=true,up=false,variant=stone,west=false": {"model": "minecraft:wall_ns" },
76-
"east=true,north=false,south=false,up=false,variant=stone,west=true": {"model": "minecraft:wall_ns", "y": 90, "uvlock": true },
77-
"east=true,north=true,south=true,up=false,variant=stone,west=false": {"model": "minecraft:wall_nse" },
78-
"east=true,north=false,south=true,up=false,variant=stone,west=true": {"model": "minecraft:wall_nse", "y": 90, "uvlock": true },
79-
"east=false,north=true,south=true,up=false,variant=stone,west=true": {"model": "minecraft:wall_nse", "y": 180, "uvlock": true },
80-
"east=true,north=true,south=false,up=false,variant=stone,west=true": {"model": "minecraft:wall_nse", "y": 270, "uvlock": true },
81-
"east=true,north=true,south=true,up=false,variant=stone,west=true": {"model": "minecraft:wall_nsew" },
82-
"east=false,north=false,south=false,up=true,variant=stone,west=false": {"model": "minecraft:wall_post" },
83-
"east=false,north=true,south=false,up=true,variant=stone,west=false": {"model": "minecraft:wall_n" },
84-
"east=true,north=false,south=false,up=true,variant=stone,west=false": {"model": "minecraft:wall_n", "y": 90, "uvlock": true },
85-
"east=false,north=false,south=true,up=true,variant=stone,west=false": {"model": "minecraft:wall_n", "y": 180, "uvlock": true },
86-
"east=false,north=false,south=false,up=true,variant=stone,west=true": {"model": "minecraft:wall_n", "y": 270, "uvlock": true },
87-
"east=true,north=true,south=false,up=true,variant=stone,west=false": {"model": "minecraft:wall_ne" },
88-
"east=true,north=false,south=true,up=true,variant=stone,west=false": {"model": "minecraft:wall_ne", "y": 90, "uvlock": true },
89-
"east=false,north=false,south=true,up=true,variant=stone,west=true": {"model": "minecraft:wall_ne", "y": 180, "uvlock": true },
90-
"east=false,north=true,south=false,up=true,variant=stone,west=true": {"model": "minecraft:wall_ne", "y": 270, "uvlock": true },
91-
"east=false,north=true,south=true,up=true,variant=stone,west=false": {"model": "minecraft:wall_ns_above" },
92-
"east=true,north=false,south=false,up=true,variant=stone,west=true": {"model": "minecraft:wall_ns_above", "y": 90, "uvlock": true },
93-
"east=true,north=true,south=true,up=true,variant=stone,west=false": {"model": "minecraft:wall_nse" },
94-
"east=true,north=false,south=true,up=true,variant=stone,west=true": {"model": "minecraft:wall_nse", "y": 90, "uvlock": true },
95-
"east=false,north=true,south=true,up=true,variant=stone,west=true": {"model": "minecraft:wall_nse", "y": 180, "uvlock": true },
96-
"east=true,north=true,south=false,up=true,variant=stone,west=true": {"model": "minecraft:wall_nse", "y": 270, "uvlock": true },
97-
"east=true,north=true,south=true,up=true,variant=stone,west=true": {"model": "minecraft:wall_nsew" },
98-
99-
"east=false,north=false,south=false,up=false,variant=brick,west=false": {"model": "minecraft:wall_post" },
100-
"east=false,north=true,south=false,up=false,variant=brick,west=false": {"model": "minecraft:wall_n" },
101-
"east=true,north=false,south=false,up=false,variant=brick,west=false": {"model": "minecraft:wall_n", "y": 90, "uvlock": true },
102-
"east=false,north=false,south=true,up=false,variant=brick,west=false": {"model": "minecraft:wall_n", "y": 180, "uvlock": true },
103-
"east=false,north=false,south=false,up=false,variant=brick,west=true": {"model": "minecraft:wall_n", "y": 270, "uvlock": true },
104-
"east=true,north=true,south=false,up=false,variant=brick,west=false": {"model": "minecraft:wall_ne" },
105-
"east=true,north=false,south=true,up=false,variant=brick,west=false": {"model": "minecraft:wall_ne", "y": 90, "uvlock": true },
106-
"east=false,north=false,south=true,up=false,variant=brick,west=true": {"model": "minecraft:wall_ne", "y": 180, "uvlock": true },
107-
"east=false,north=true,south=false,up=false,variant=brick,west=true": {"model": "minecraft:wall_ne", "y": 270, "uvlock": true },
108-
"east=false,north=true,south=true,up=false,variant=brick,west=false": {"model": "minecraft:wall_ns" },
109-
"east=true,north=false,south=false,up=false,variant=brick,west=true": {"model": "minecraft:wall_ns", "y": 90, "uvlock": true },
110-
"east=true,north=true,south=true,up=false,variant=brick,west=false": {"model": "minecraft:wall_nse" },
111-
"east=true,north=false,south=true,up=false,variant=brick,west=true": {"model": "minecraft:wall_nse", "y": 90, "uvlock": true },
112-
"east=false,north=true,south=true,up=false,variant=brick,west=true": {"model": "minecraft:wall_nse", "y": 180, "uvlock": true },
113-
"east=true,north=true,south=false,up=false,variant=brick,west=true": {"model": "minecraft:wall_nse", "y": 270, "uvlock": true },
114-
"east=true,north=true,south=true,up=false,variant=brick,west=true": {"model": "minecraft:wall_nsew" },
115-
"east=false,north=false,south=false,up=true,variant=brick,west=false": {"model": "minecraft:wall_post" },
116-
"east=false,north=true,south=false,up=true,variant=brick,west=false": {"model": "minecraft:wall_n" },
117-
"east=true,north=false,south=false,up=true,variant=brick,west=false": {"model": "minecraft:wall_n", "y": 90, "uvlock": true },
118-
"east=false,north=false,south=true,up=true,variant=brick,west=false": {"model": "minecraft:wall_n", "y": 180, "uvlock": true },
119-
"east=false,north=false,south=false,up=true,variant=brick,west=true": {"model": "minecraft:wall_n", "y": 270, "uvlock": true },
120-
"east=true,north=true,south=false,up=true,variant=brick,west=false": {"model": "minecraft:wall_ne" },
121-
"east=true,north=false,south=true,up=true,variant=brick,west=false": {"model": "minecraft:wall_ne", "y": 90, "uvlock": true },
122-
"east=false,north=false,south=true,up=true,variant=brick,west=true": {"model": "minecraft:wall_ne", "y": 180, "uvlock": true },
123-
"east=false,north=true,south=false,up=true,variant=brick,west=true": {"model": "minecraft:wall_ne", "y": 270, "uvlock": true },
124-
"east=false,north=true,south=true,up=true,variant=brick,west=false": {"model": "minecraft:wall_ns_above" },
125-
"east=true,north=false,south=false,up=true,variant=brick,west=true": {"model": "minecraft:wall_ns_above", "y": 90, "uvlock": true },
126-
"east=true,north=true,south=true,up=true,variant=brick,west=false": {"model": "minecraft:wall_nse" },
127-
"east=true,north=false,south=true,up=true,variant=brick,west=true": {"model": "minecraft:wall_nse", "y": 90, "uvlock": true },
128-
"east=false,north=true,south=true,up=true,variant=brick,west=true": {"model": "minecraft:wall_nse", "y": 180, "uvlock": true },
129-
"east=true,north=true,south=false,up=true,variant=brick,west=true": {"model": "minecraft:wall_nse", "y": 270, "uvlock": true },
130-
"east=true,north=true,south=true,up=true,variant=brick,west=true": {"model": "minecraft:wall_nsew" }
131-
}
43+
{
44+
"when": { "east": "true" },
45+
"apply": { "model": "minecraft:block/wall_side", "y": 90, "uvlock": true }
46+
},
47+
{
48+
"when": { "south": "true" },
49+
"apply": { "model": "minecraft:block/wall_side", "y": 180, "uvlock": true }
50+
},
51+
{
52+
"when": { "west": "true" },
53+
"apply": { "model": "minecraft:block/wall_side", "y": 270, "uvlock": true }
54+
}
55+
]
13256
}

0 commit comments

Comments
 (0)