Final Palettes Push

- Added Scoria (legally distinct from basalt) and Dark Scoria themed blocks
- World gen now spawns 'natural scoria' which is silk touch sensitive
This commit is contained in:
simibubi 2020-02-08 03:47:27 +01:00
parent 394263c04f
commit 6930c89d61
143 changed files with 1687 additions and 14 deletions

View file

@ -123,17 +123,17 @@ public enum AllBlocks {
HAND_CRANK(new HandCrankBlock()),
CUCKOO_CLOCK(new CuckooClockBlock(false)),
MYSTERIOUS_CUCKOO_CLOCK(new CuckooClockBlock(true)),
CRUSHING_WHEEL(new CrushingWheelBlock()),
CRUSHING_WHEEL_CONTROLLER(new CrushingWheelControllerBlock()),
MECHANICAL_PRESS(new MechanicalPressBlock()),
MECHANICAL_MIXER(new MechanicalMixerBlock()),
BASIN(new BasinBlock()),
MECHANICAL_CRAFTER(new MechanicalCrafterBlock()),
FLYWHEEL(new FlywheelBlock()),
FURNACE_ENGINE(new FurnaceEngineBlock()),
SPEED_GAUGE(new GaugeBlock(GaugeBlock.Type.SPEED)),
STRESS_GAUGE(new GaugeBlock(GaugeBlock.Type.STRESS)),
@ -227,6 +227,14 @@ public enum AllBlocks {
SLIGHTLY_MOSSY_GABBRO_BRICKS(new Block(Properties.from(GABBRO.block))),
MOSSY_GABBRO_BRICKS(new Block(Properties.from(GABBRO.block))),
GABBRO_LAYERS(new LayeredCTBlock(Properties.from(GABBRO.block), AllCTs.GABBRO_LAYERS, AllCTs.POLISHED_GABBRO)),
DOLOMITE(new Block(Properties.from(Blocks.QUARTZ_BLOCK)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL),
DOLOMITE_BRICKS(new Block(Properties.from(DOLOMITE.block))),
POLISHED_DOLOMITE(new Block(Properties.from(DOLOMITE.block))),
DOLOMITE_PILLAR(new RotatedPillarBlock(Properties.from(DOLOMITE.block))),
DOLOMITE_LAYERS(
new LayeredCTBlock(Properties.from(DOLOMITE.block), AllCTs.DOLOMITE_LAYERS, AllCTs.POLISHED_DOLOMITE)),
LIMESAND(new FallingBlock(Properties.from(Blocks.SAND))),
LIMESTONE(new Block(Properties.from(Blocks.SANDSTONE)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL),
LIMESTONE_BRICKS(new Block(Properties.from(LIMESTONE.block)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL),
@ -241,14 +249,18 @@ public enum AllBlocks {
WEATHERED_LIMESTONE_PILLAR(new RotatedPillarBlock(Properties.from(WEATHERED_LIMESTONE.block))),
WEATHERED_LIMESTONE_LAYERS(new LayeredCTBlock(Properties.from(WEATHERED_LIMESTONE.block),
AllCTs.WEATHERED_LIMESTONE_LAYERS, AllCTs.POLISHED_WEATHERED_LIMESTONE)),
DOLOMITE(new Block(Properties.from(Blocks.QUARTZ_BLOCK)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL),
DOLOMITE_BRICKS(new Block(Properties.from(DOLOMITE.block))),
POLISHED_DOLOMITE(new Block(Properties.from(DOLOMITE.block))),
DOLOMITE_PILLAR(new RotatedPillarBlock(Properties.from(DOLOMITE.block))),
DOLOMITE_LAYERS(
new LayeredCTBlock(Properties.from(DOLOMITE.block), AllCTs.DOLOMITE_LAYERS, AllCTs.POLISHED_DOLOMITE)),
SCORIA(new ScoriaBlock()),
NATURAL_SCORIA(new ScoriaBlock()),
SCORIA(new Block(Properties.from(Blocks.ANDESITE)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL),
POLISHED_SCORIA(new Block(Properties.from(SCORIA.block)), ComesWith.SLAB),
SCORIA_BRICKS(new Block(Properties.from(SCORIA.block))),
SCORIA_LAYERS(new LayeredCTBlock(Properties.from(SCORIA.block), AllCTs.SCORIA_LAYERS, AllCTs.POLISHED_SCORIA)),
SCORIA_PILLAR(new RotatedPillarBlock(Properties.from(SCORIA.block))),
DARK_SCORIA(new Block(Properties.from(Blocks.ANDESITE))),
POLISHED_DARK_SCORIA(new Block(Properties.from(DARK_SCORIA.block))),
DARK_SCORIA_TILES(new Block(Properties.from(DARK_SCORIA.block)), ComesWith.STAIRS, ComesWith.SLAB),
DARK_SCORIA_BRICKS(new Block(Properties.from(DARK_SCORIA.block)), ComesWith.STAIRS, ComesWith.SLAB, ComesWith.WALL),
__MATERIALS__(),
COPPER_ORE(new OxidizingBlock(Properties.from(Blocks.IRON_ORE), 1)),

View file

@ -32,6 +32,7 @@ public enum AllCTs {
DOLOMITE_LAYERS(layers("dolomite")),
LIMESTONE_LAYERS(layers("limestone")),
WEATHERED_LIMESTONE_LAYERS(layers("weathered_limestone")),
SCORIA_LAYERS(layers("scoria")),
POLISHED_GRANITE(polishedVanilla("granite")),
POLISHED_DIORITE(polishedVanilla("diorite")),
@ -40,6 +41,7 @@ public enum AllCTs {
POLISHED_DOLOMITE(polished("dolomite")),
POLISHED_LIMESTONE(polished("limestone")),
POLISHED_WEATHERED_LIMESTONE(polished("weathered_limestone")),
POLISHED_SCORIA(polished("scoria")),
;

View file

@ -27,7 +27,7 @@ public enum AllWorldFeatures {
WEATHERED_LIMESTONE(new ChanceOreFeature(AllBlocks.WEATHERED_LIMESTONE.get(), 128, 1 / 32f).between(10, 30)),
DOLOMITE(new ChanceOreFeature(AllBlocks.DOLOMITE.get(), 128, 1 / 64f).between(20, 70)),
GABBRO(new ChanceOreFeature(AllBlocks.GABBRO.get(), 128, 1 / 64f).between(20, 70)),
SCORIA(new ChanceOreFeature(AllBlocks.SCORIA.get(), 128, 1 / 32f).between(0, 10)),
SCORIA(new ChanceOreFeature(AllBlocks.NATURAL_SCORIA.get(), 128, 1 / 32f).between(0, 10)),
;

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "create:block/palettes/dark_scoria" }
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "create:block/palettes/dark_scoria_bricks" }
}
}

View file

@ -0,0 +1,13 @@
{
"forge_marker": 1,
"defaults": {
"uvlock": true
},
"variants": {
"type": {
"top": { "model":"create:block/palettes/dark_scoria_bricks_slab_top" },
"bottom": { "model":"create:block/palettes/dark_scoria_bricks_slab" },
"double": { "model":"create:block/palettes/dark_scoria_bricks" }
}
}
}

View file

@ -0,0 +1,44 @@
{
"variants": {
"facing=east,half=bottom,shape=straight": { "model": "create:block/palettes/dark_scoria_bricks_stairs" },
"facing=west,half=bottom,shape=straight": { "model": "create:block/palettes/dark_scoria_bricks_stairs", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=straight": { "model": "create:block/palettes/dark_scoria_bricks_stairs", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=straight": { "model": "create:block/palettes/dark_scoria_bricks_stairs", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_right": { "model": "create:block/palettes/dark_scoria_bricks_stairs_outer" },
"facing=west,half=bottom,shape=outer_right": { "model": "create:block/palettes/dark_scoria_bricks_stairs_outer", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=outer_right": { "model": "create:block/palettes/dark_scoria_bricks_stairs_outer", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=outer_right": { "model": "create:block/palettes/dark_scoria_bricks_stairs_outer", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_left": { "model": "create:block/palettes/dark_scoria_bricks_stairs_outer", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=outer_left": { "model": "create:block/palettes/dark_scoria_bricks_stairs_outer", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=outer_left": { "model": "create:block/palettes/dark_scoria_bricks_stairs_outer" },
"facing=north,half=bottom,shape=outer_left": { "model": "create:block/palettes/dark_scoria_bricks_stairs_outer", "y": 180, "uvlock": true },
"facing=east,half=bottom,shape=inner_right": { "model": "create:block/palettes/dark_scoria_bricks_stairs_inner" },
"facing=west,half=bottom,shape=inner_right": { "model": "create:block/palettes/dark_scoria_bricks_stairs_inner", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=inner_right": { "model": "create:block/palettes/dark_scoria_bricks_stairs_inner", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=inner_right": { "model": "create:block/palettes/dark_scoria_bricks_stairs_inner", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=inner_left": { "model": "create:block/palettes/dark_scoria_bricks_stairs_inner", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=inner_left": { "model": "create:block/palettes/dark_scoria_bricks_stairs_inner", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=inner_left": { "model": "create:block/palettes/dark_scoria_bricks_stairs_inner" },
"facing=north,half=bottom,shape=inner_left": { "model": "create:block/palettes/dark_scoria_bricks_stairs_inner", "y": 180, "uvlock": true },
"facing=east,half=top,shape=straight": { "model": "create:block/palettes/dark_scoria_bricks_stairs", "x": 180, "uvlock": true },
"facing=west,half=top,shape=straight": { "model": "create:block/palettes/dark_scoria_bricks_stairs", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=straight": { "model": "create:block/palettes/dark_scoria_bricks_stairs", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=straight": { "model": "create:block/palettes/dark_scoria_bricks_stairs", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=outer_right": { "model": "create:block/palettes/dark_scoria_bricks_stairs_outer", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=outer_right": { "model": "create:block/palettes/dark_scoria_bricks_stairs_outer", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=outer_right": { "model": "create:block/palettes/dark_scoria_bricks_stairs_outer", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=outer_right": { "model": "create:block/palettes/dark_scoria_bricks_stairs_outer", "x": 180, "uvlock": true },
"facing=east,half=top,shape=outer_left": { "model": "create:block/palettes/dark_scoria_bricks_stairs_outer", "x": 180, "uvlock": true },
"facing=west,half=top,shape=outer_left": { "model": "create:block/palettes/dark_scoria_bricks_stairs_outer", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=outer_left": { "model": "create:block/palettes/dark_scoria_bricks_stairs_outer", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=outer_left": { "model": "create:block/palettes/dark_scoria_bricks_stairs_outer", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=inner_right": { "model": "create:block/palettes/dark_scoria_bricks_stairs_inner", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=inner_right": { "model": "create:block/palettes/dark_scoria_bricks_stairs_inner", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=inner_right": { "model": "create:block/palettes/dark_scoria_bricks_stairs_inner", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=inner_right": { "model": "create:block/palettes/dark_scoria_bricks_stairs_inner", "x": 180, "uvlock": true },
"facing=east,half=top,shape=inner_left": { "model": "create:block/palettes/dark_scoria_bricks_stairs_inner", "x": 180, "uvlock": true },
"facing=west,half=top,shape=inner_left": { "model": "create:block/palettes/dark_scoria_bricks_stairs_inner", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=inner_left": { "model": "create:block/palettes/dark_scoria_bricks_stairs_inner", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=inner_left": { "model": "create:block/palettes/dark_scoria_bricks_stairs_inner", "x": 180, "y": 270, "uvlock": true }
}
}

View file

@ -0,0 +1,19 @@
{
"multipart": [
{ "when": { "up": "true" },
"apply": { "model": "create:block/palettes/dark_scoria_bricks_wall_post" }
},
{ "when": { "north": "true" },
"apply": { "model": "create:block/palettes/dark_scoria_bricks_wall_side", "uvlock": true }
},
{ "when": { "east": "true" },
"apply": { "model": "create:block/palettes/dark_scoria_bricks_wall_side", "y": 90, "uvlock": true }
},
{ "when": { "south": "true" },
"apply": { "model": "create:block/palettes/dark_scoria_bricks_wall_side", "y": 180, "uvlock": true }
},
{ "when": { "west": "true" },
"apply": { "model": "create:block/palettes/dark_scoria_bricks_wall_side", "y": 270, "uvlock": true }
}
]
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "create:block/palettes/dark_scoria_tiles" }
}
}

View file

@ -0,0 +1,13 @@
{
"forge_marker": 1,
"defaults": {
"uvlock": true
},
"variants": {
"type": {
"top": { "model":"create:block/palettes/dark_scoria_tiles_slab_top" },
"bottom": { "model":"create:block/palettes/dark_scoria_tiles_slab" },
"double": { "model":"create:block/palettes/dark_scoria_tiles" }
}
}
}

View file

@ -0,0 +1,44 @@
{
"variants": {
"facing=east,half=bottom,shape=straight": { "model": "create:block/palettes/dark_scoria_tiles_stairs" },
"facing=west,half=bottom,shape=straight": { "model": "create:block/palettes/dark_scoria_tiles_stairs", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=straight": { "model": "create:block/palettes/dark_scoria_tiles_stairs", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=straight": { "model": "create:block/palettes/dark_scoria_tiles_stairs", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_right": { "model": "create:block/palettes/dark_scoria_tiles_stairs_outer" },
"facing=west,half=bottom,shape=outer_right": { "model": "create:block/palettes/dark_scoria_tiles_stairs_outer", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=outer_right": { "model": "create:block/palettes/dark_scoria_tiles_stairs_outer", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=outer_right": { "model": "create:block/palettes/dark_scoria_tiles_stairs_outer", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_left": { "model": "create:block/palettes/dark_scoria_tiles_stairs_outer", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=outer_left": { "model": "create:block/palettes/dark_scoria_tiles_stairs_outer", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=outer_left": { "model": "create:block/palettes/dark_scoria_tiles_stairs_outer" },
"facing=north,half=bottom,shape=outer_left": { "model": "create:block/palettes/dark_scoria_tiles_stairs_outer", "y": 180, "uvlock": true },
"facing=east,half=bottom,shape=inner_right": { "model": "create:block/palettes/dark_scoria_tiles_stairs_inner" },
"facing=west,half=bottom,shape=inner_right": { "model": "create:block/palettes/dark_scoria_tiles_stairs_inner", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=inner_right": { "model": "create:block/palettes/dark_scoria_tiles_stairs_inner", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=inner_right": { "model": "create:block/palettes/dark_scoria_tiles_stairs_inner", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=inner_left": { "model": "create:block/palettes/dark_scoria_tiles_stairs_inner", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=inner_left": { "model": "create:block/palettes/dark_scoria_tiles_stairs_inner", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=inner_left": { "model": "create:block/palettes/dark_scoria_tiles_stairs_inner" },
"facing=north,half=bottom,shape=inner_left": { "model": "create:block/palettes/dark_scoria_tiles_stairs_inner", "y": 180, "uvlock": true },
"facing=east,half=top,shape=straight": { "model": "create:block/palettes/dark_scoria_tiles_stairs", "x": 180, "uvlock": true },
"facing=west,half=top,shape=straight": { "model": "create:block/palettes/dark_scoria_tiles_stairs", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=straight": { "model": "create:block/palettes/dark_scoria_tiles_stairs", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=straight": { "model": "create:block/palettes/dark_scoria_tiles_stairs", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=outer_right": { "model": "create:block/palettes/dark_scoria_tiles_stairs_outer", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=outer_right": { "model": "create:block/palettes/dark_scoria_tiles_stairs_outer", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=outer_right": { "model": "create:block/palettes/dark_scoria_tiles_stairs_outer", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=outer_right": { "model": "create:block/palettes/dark_scoria_tiles_stairs_outer", "x": 180, "uvlock": true },
"facing=east,half=top,shape=outer_left": { "model": "create:block/palettes/dark_scoria_tiles_stairs_outer", "x": 180, "uvlock": true },
"facing=west,half=top,shape=outer_left": { "model": "create:block/palettes/dark_scoria_tiles_stairs_outer", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=outer_left": { "model": "create:block/palettes/dark_scoria_tiles_stairs_outer", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=outer_left": { "model": "create:block/palettes/dark_scoria_tiles_stairs_outer", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=inner_right": { "model": "create:block/palettes/dark_scoria_tiles_stairs_inner", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=inner_right": { "model": "create:block/palettes/dark_scoria_tiles_stairs_inner", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=inner_right": { "model": "create:block/palettes/dark_scoria_tiles_stairs_inner", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=inner_right": { "model": "create:block/palettes/dark_scoria_tiles_stairs_inner", "x": 180, "uvlock": true },
"facing=east,half=top,shape=inner_left": { "model": "create:block/palettes/dark_scoria_tiles_stairs_inner", "x": 180, "uvlock": true },
"facing=west,half=top,shape=inner_left": { "model": "create:block/palettes/dark_scoria_tiles_stairs_inner", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=inner_left": { "model": "create:block/palettes/dark_scoria_tiles_stairs_inner", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=inner_left": { "model": "create:block/palettes/dark_scoria_tiles_stairs_inner", "x": 180, "y": 270, "uvlock": true }
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "create:block/palettes/natural_scoria" }
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "create:block/palettes/polished_dark_scoria" }
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "create:block/palettes/polished_scoria" }
}
}

View file

@ -0,0 +1,13 @@
{
"forge_marker": 1,
"defaults": {
"uvlock": true
},
"variants": {
"type": {
"top": { "model":"create:block/palettes/polished_scoria_slab_top" },
"bottom": { "model":"create:block/palettes/polished_scoria_slab" },
"double": { "model":"create:block/palettes/polished_scoria_double_slab" }
}
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "create:block/palettes/scoria_bricks" }
}
}

View file

@ -0,0 +1,5 @@
{
"variants": {
"": { "model": "create:block/palettes/scoria_layers" }
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"axis=y": { "model": "create:block/palettes/scoria_pillar" },
"axis=z": { "model": "create:block/palettes/scoria_pillar", "x": 90 },
"axis=x": { "model": "create:block/palettes/scoria_pillar", "x": 90, "y": 90 }
}
}

View file

@ -0,0 +1,13 @@
{
"forge_marker": 1,
"defaults": {
"uvlock": true
},
"variants": {
"type": {
"top": { "model":"create:block/palettes/scoria_slab_top" },
"bottom": { "model":"create:block/palettes/scoria_slab" },
"double": { "model":"create:block/palettes/scoria" }
}
}
}

View file

@ -0,0 +1,44 @@
{
"variants": {
"facing=east,half=bottom,shape=straight": { "model": "create:block/palettes/scoria_stairs" },
"facing=west,half=bottom,shape=straight": { "model": "create:block/palettes/scoria_stairs", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=straight": { "model": "create:block/palettes/scoria_stairs", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=straight": { "model": "create:block/palettes/scoria_stairs", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_right": { "model": "create:block/palettes/scoria_stairs_outer" },
"facing=west,half=bottom,shape=outer_right": { "model": "create:block/palettes/scoria_stairs_outer", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=outer_right": { "model": "create:block/palettes/scoria_stairs_outer", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=outer_right": { "model": "create:block/palettes/scoria_stairs_outer", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_left": { "model": "create:block/palettes/scoria_stairs_outer", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=outer_left": { "model": "create:block/palettes/scoria_stairs_outer", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=outer_left": { "model": "create:block/palettes/scoria_stairs_outer" },
"facing=north,half=bottom,shape=outer_left": { "model": "create:block/palettes/scoria_stairs_outer", "y": 180, "uvlock": true },
"facing=east,half=bottom,shape=inner_right": { "model": "create:block/palettes/scoria_stairs_inner" },
"facing=west,half=bottom,shape=inner_right": { "model": "create:block/palettes/scoria_stairs_inner", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=inner_right": { "model": "create:block/palettes/scoria_stairs_inner", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=inner_right": { "model": "create:block/palettes/scoria_stairs_inner", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=inner_left": { "model": "create:block/palettes/scoria_stairs_inner", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=inner_left": { "model": "create:block/palettes/scoria_stairs_inner", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=inner_left": { "model": "create:block/palettes/scoria_stairs_inner" },
"facing=north,half=bottom,shape=inner_left": { "model": "create:block/palettes/scoria_stairs_inner", "y": 180, "uvlock": true },
"facing=east,half=top,shape=straight": { "model": "create:block/palettes/scoria_stairs", "x": 180, "uvlock": true },
"facing=west,half=top,shape=straight": { "model": "create:block/palettes/scoria_stairs", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=straight": { "model": "create:block/palettes/scoria_stairs", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=straight": { "model": "create:block/palettes/scoria_stairs", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=outer_right": { "model": "create:block/palettes/scoria_stairs_outer", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=outer_right": { "model": "create:block/palettes/scoria_stairs_outer", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=outer_right": { "model": "create:block/palettes/scoria_stairs_outer", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=outer_right": { "model": "create:block/palettes/scoria_stairs_outer", "x": 180, "uvlock": true },
"facing=east,half=top,shape=outer_left": { "model": "create:block/palettes/scoria_stairs_outer", "x": 180, "uvlock": true },
"facing=west,half=top,shape=outer_left": { "model": "create:block/palettes/scoria_stairs_outer", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=outer_left": { "model": "create:block/palettes/scoria_stairs_outer", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=outer_left": { "model": "create:block/palettes/scoria_stairs_outer", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=inner_right": { "model": "create:block/palettes/scoria_stairs_inner", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=inner_right": { "model": "create:block/palettes/scoria_stairs_inner", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=inner_right": { "model": "create:block/palettes/scoria_stairs_inner", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=inner_right": { "model": "create:block/palettes/scoria_stairs_inner", "x": 180, "uvlock": true },
"facing=east,half=top,shape=inner_left": { "model": "create:block/palettes/scoria_stairs_inner", "x": 180, "uvlock": true },
"facing=west,half=top,shape=inner_left": { "model": "create:block/palettes/scoria_stairs_inner", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=inner_left": { "model": "create:block/palettes/scoria_stairs_inner", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=inner_left": { "model": "create:block/palettes/scoria_stairs_inner", "x": 180, "y": 270, "uvlock": true }
}
}

View file

@ -0,0 +1,19 @@
{
"multipart": [
{ "when": { "up": "true" },
"apply": { "model": "create:block/palettes/scoria_wall_post" }
},
{ "when": { "north": "true" },
"apply": { "model": "create:block/palettes/scoria_wall_side", "uvlock": true }
},
{ "when": { "east": "true" },
"apply": { "model": "create:block/palettes/scoria_wall_side", "y": 90, "uvlock": true }
},
{ "when": { "south": "true" },
"apply": { "model": "create:block/palettes/scoria_wall_side", "y": 180, "uvlock": true }
},
{ "when": { "west": "true" },
"apply": { "model": "create:block/palettes/scoria_wall_side", "y": 270, "uvlock": true }
}
]
}

View file

@ -172,8 +172,6 @@
"block.create.granite_bricks": "Granite Bricks",
"block.create.granite_layers": "Layered Granite",
"block.create.volcanic_rock": "Basalt",
"block.create.gabbro": "Gabbro",
"block.create.gabbro_stairs": "Gabbro Stairs",
"block.create.gabbro_slab": "Gabbro Slab",
@ -228,7 +226,28 @@
"block.create.polished_limestone_slab": "Polished Limestone Slab",
"block.create.limestone_pillar": "Limestone Pillar",
"block.create.limestone_layers": "Layered Limestone",
"block.create.natural_scoria": "Natural Scoria",
"block.create.scoria": "Scoria",
"block.create.scoria_stairs": "Scoria Stairs",
"block.create.scoria_slab": "Scoria Slab",
"block.create.scoria_wall": "Scoria Wall",
"block.create.scoria_bricks": "Scoria Bricks",
"block.create.polished_scoria": "Polished Scoria",
"block.create.polished_scoria_slab": "Polished Scoria Slab",
"block.create.scoria_pillar": "Scoria Pillar",
"block.create.scoria_layers": "Layered Scoria",
"block.create.dark_scoria": "Dark Scoria",
"block.create.polished_dark_scoria": "Polished Dark Scoria",
"block.create.dark_scoria_tiles": "Dark Scoria Tiles",
"block.create.dark_scoria_tiles_stairs": "Dark Scoria Tile Stairs",
"block.create.dark_scoria_tiles_slab": "Dark Scoria Tile Slab",
"block.create.dark_scoria_bricks": "Dark Scoria Bricks",
"block.create.dark_scoria_bricks_stairs": "Dark Scoria Brick Stairs",
"block.create.dark_scoria_bricks_slab": "Dark Scoria Brick Slab",
"block.create.dark_scoria_bricks_wall": "Dark Scoria Brick Wall",
"block.create.schematicannon": "Schematicannon",
"block.create.schematic_table": "Schematic Table",
"block.create.creative_crate": "Schematicannon Creatifier",

View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "create:block/dark_scoria"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "create:block/dark_scoria_bricks"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/slab",
"textures": {
"bottom": "create:block/dark_scoria_bricks",
"top": "create:block/dark_scoria_bricks",
"side": "create:block/dark_scoria_bricks"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/slab_top",
"textures": {
"bottom": "create:block/dark_scoria_bricks",
"top": "create:block/dark_scoria_bricks",
"side": "create:block/dark_scoria_bricks"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "create:block/dark_scoria_bricks",
"top": "create:block/dark_scoria_bricks",
"side": "create:block/dark_scoria_bricks"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "create:block/dark_scoria_bricks",
"top": "create:block/dark_scoria_bricks",
"side": "create:block/dark_scoria_bricks"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "create:block/dark_scoria_bricks",
"top": "create:block/dark_scoria_bricks",
"side": "create:block/dark_scoria_bricks"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "block/template_wall_post",
"textures": {
"wall": "create:block/dark_scoria_bricks"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "block/template_wall_side",
"textures": {
"wall": "create:block/dark_scoria_bricks"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "create:block/dark_scoria_tiles"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/slab",
"textures": {
"bottom": "create:block/dark_scoria_tiles",
"top": "create:block/dark_scoria_tiles",
"side": "create:block/dark_scoria_tiles"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/slab_top",
"textures": {
"bottom": "create:block/dark_scoria_tiles",
"top": "create:block/dark_scoria_tiles",
"side": "create:block/dark_scoria_tiles"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "create:block/dark_scoria_tiles",
"top": "create:block/dark_scoria_tiles",
"side": "create:block/dark_scoria_tiles"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "create:block/dark_scoria_tiles",
"top": "create:block/dark_scoria_tiles",
"side": "create:block/dark_scoria_tiles"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "create:block/dark_scoria_tiles",
"top": "create:block/dark_scoria_tiles",
"side": "create:block/dark_scoria_tiles"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "create:block/scoria"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "create:block/polished_dark_scoria"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "create:block/polished_scoria"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "block/cube_column",
"textures": {
"end": "create:block/polished_scoria",
"side": "create:block/polished_scoria_slab"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/slab",
"textures": {
"bottom": "create:block/polished_scoria",
"top": "create:block/polished_scoria",
"side": "create:block/polished_scoria_slab"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/slab_top",
"textures": {
"bottom": "create:block/polished_scoria",
"top": "create:block/polished_scoria",
"side": "create:block/polished_scoria_slab"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "block/cube_column",
"textures": {
"end": "create:block/polished_scoria",
"side": "create:block/scoria_bricks"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "block/cube_column",
"textures": {
"end": "create:block/polished_scoria",
"side": "create:block/scoria_layers"
}
}

View file

@ -0,0 +1,7 @@
{
"parent": "block/cube_column",
"textures": {
"end": "create:block/scoria_pillar_top",
"side": "create:block/scoria_pillar"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/slab",
"textures": {
"bottom": "create:block/scoria",
"top": "create:block/scoria",
"side": "create:block/scoria"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/slab_top",
"textures": {
"bottom": "create:block/scoria",
"top": "create:block/scoria",
"side": "create:block/scoria"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/stairs",
"textures": {
"bottom": "create:block/scoria",
"top": "create:block/scoria",
"side": "create:block/scoria"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/inner_stairs",
"textures": {
"bottom": "create:block/scoria",
"top": "create:block/scoria",
"side": "create:block/scoria"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/outer_stairs",
"textures": {
"bottom": "create:block/scoria",
"top": "create:block/scoria",
"side": "create:block/scoria"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "block/template_wall_post",
"textures": {
"wall": "create:block/scoria"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "block/template_wall_side",
"textures": {
"wall": "create:block/scoria"
}
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/palettes/dark_scoria"
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/palettes/dark_scoria_bricks"
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/palettes/dark_scoria_bricks_slab"
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/palettes/dark_scoria_bricks_stairs"
}

View file

@ -0,0 +1,6 @@
{
"parent": "block/wall_inventory",
"textures": {
"wall": "create:block/dark_scoria_bricks"
}
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/palettes/dark_scoria_tiles"
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/palettes/dark_scoria_tiles_slab"
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/palettes/dark_scoria_tiles_stairs"
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/palettes/natural_scoria"
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/palettes/polished_dark_scoria"
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/palettes/polished_scoria"
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/palettes/polished_scoria_slab"
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/palettes/scoria_bricks"
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/palettes/scoria_layers"
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/palettes/scoria_pillar"
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/palettes/scoria_slab"
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/palettes/scoria_stairs"
}

View file

@ -0,0 +1,6 @@
{
"parent": "block/wall_inventory",
"textures": {
"wall": "create:block/scoria"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 619 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 643 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 577 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 630 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 649 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 619 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 676 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 627 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 608 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 672 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 714 B

After

Width:  |  Height:  |  Size: 685 B

View file

@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "create:dark_scoria"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

View file

@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "create:dark_scoria_bricks"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

View file

@ -0,0 +1,32 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:set_count",
"conditions": [
{
"condition": "minecraft:block_state_property",
"block": "create:dark_scoria_bricks_slab",
"properties": {
"type": "double"
}
}
],
"count": 2
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "create:dark_scoria_bricks_slab"
}
]
}
]
}

View file

@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "create:dark_scoria_bricks_stairs"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

View file

@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "create:dark_scoria_bricks_wall"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

View file

@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "create:dark_scoria_tiles"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

View file

@ -0,0 +1,32 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:set_count",
"conditions": [
{
"condition": "minecraft:block_state_property",
"block": "create:dark_scoria_tiles_slab",
"properties": {
"type": "double"
}
}
],
"count": 2
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "create:dark_scoria_tiles_slab"
}
]
}
]
}

View file

@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "create:dark_scoria_tiles_stairs"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

View file

@ -0,0 +1,43 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"name": "create:natural_scoria"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"name": "create:scoria"
}
]
}
]
}
]
}

View file

@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "create:polished_dark_scoria"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

View file

@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "create:polished_scoria"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

View file

@ -0,0 +1,32 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:set_count",
"conditions": [
{
"condition": "minecraft:block_state_property",
"block": "create:polished_scoria_slab",
"properties": {
"type": "double"
}
}
],
"count": 2
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "create:polished_scoria_slab"
}
]
}
]
}

View file

@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "create:scoria"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

View file

@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "create:scoria_bricks"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

View file

@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "create:scoria_layers"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

View file

@ -0,0 +1,19 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "create:scoria_pillar"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

Some files were not shown because too many files have changed in this diff Show more