diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index dfbc45751..e13a79fdf 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -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)), diff --git a/src/main/java/com/simibubi/create/AllCTs.java b/src/main/java/com/simibubi/create/AllCTs.java index acb9c3717..e3aae506f 100644 --- a/src/main/java/com/simibubi/create/AllCTs.java +++ b/src/main/java/com/simibubi/create/AllCTs.java @@ -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")), ; diff --git a/src/main/java/com/simibubi/create/foundation/world/AllWorldFeatures.java b/src/main/java/com/simibubi/create/foundation/world/AllWorldFeatures.java index ffec97bd6..f278e19b4 100644 --- a/src/main/java/com/simibubi/create/foundation/world/AllWorldFeatures.java +++ b/src/main/java/com/simibubi/create/foundation/world/AllWorldFeatures.java @@ -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)), ; diff --git a/src/main/resources/assets/create/blockstates/dark_scoria.json b/src/main/resources/assets/create/blockstates/dark_scoria.json new file mode 100644 index 000000000..bc13f6712 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dark_scoria.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/dark_scoria" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/dark_scoria_bricks.json b/src/main/resources/assets/create/blockstates/dark_scoria_bricks.json new file mode 100644 index 000000000..5abd98be0 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dark_scoria_bricks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/dark_scoria_bricks" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/dark_scoria_bricks_slab.json b/src/main/resources/assets/create/blockstates/dark_scoria_bricks_slab.json new file mode 100644 index 000000000..805e2c877 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dark_scoria_bricks_slab.json @@ -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" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/dark_scoria_bricks_stairs.json b/src/main/resources/assets/create/blockstates/dark_scoria_bricks_stairs.json new file mode 100644 index 000000000..780616087 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dark_scoria_bricks_stairs.json @@ -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 } + } +} diff --git a/src/main/resources/assets/create/blockstates/dark_scoria_bricks_wall.json b/src/main/resources/assets/create/blockstates/dark_scoria_bricks_wall.json new file mode 100644 index 000000000..0a629b0e3 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dark_scoria_bricks_wall.json @@ -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 } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/dark_scoria_tiles.json b/src/main/resources/assets/create/blockstates/dark_scoria_tiles.json new file mode 100644 index 000000000..d70796c69 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dark_scoria_tiles.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/dark_scoria_tiles" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/dark_scoria_tiles_slab.json b/src/main/resources/assets/create/blockstates/dark_scoria_tiles_slab.json new file mode 100644 index 000000000..d8c1225ba --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dark_scoria_tiles_slab.json @@ -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" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/dark_scoria_tiles_stairs.json b/src/main/resources/assets/create/blockstates/dark_scoria_tiles_stairs.json new file mode 100644 index 000000000..821b0df55 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/dark_scoria_tiles_stairs.json @@ -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 } + } +} diff --git a/src/main/resources/assets/create/blockstates/natural_scoria.json b/src/main/resources/assets/create/blockstates/natural_scoria.json new file mode 100644 index 000000000..7b46ac80e --- /dev/null +++ b/src/main/resources/assets/create/blockstates/natural_scoria.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/natural_scoria" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/polished_dark_scoria.json b/src/main/resources/assets/create/blockstates/polished_dark_scoria.json new file mode 100644 index 000000000..ea4af3e31 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/polished_dark_scoria.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/polished_dark_scoria" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/polished_scoria.json b/src/main/resources/assets/create/blockstates/polished_scoria.json new file mode 100644 index 000000000..89d8a57cd --- /dev/null +++ b/src/main/resources/assets/create/blockstates/polished_scoria.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/polished_scoria" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/polished_scoria_slab.json b/src/main/resources/assets/create/blockstates/polished_scoria_slab.json new file mode 100644 index 000000000..6e7dfeaa8 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/polished_scoria_slab.json @@ -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" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/scoria_bricks.json b/src/main/resources/assets/create/blockstates/scoria_bricks.json new file mode 100644 index 000000000..d98a6bfe0 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/scoria_bricks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/scoria_bricks" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/scoria_layers.json b/src/main/resources/assets/create/blockstates/scoria_layers.json new file mode 100644 index 000000000..a3b5fc99c --- /dev/null +++ b/src/main/resources/assets/create/blockstates/scoria_layers.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "create:block/palettes/scoria_layers" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/scoria_pillar.json b/src/main/resources/assets/create/blockstates/scoria_pillar.json new file mode 100644 index 000000000..277c4c5c6 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/scoria_pillar.json @@ -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 } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/scoria_slab.json b/src/main/resources/assets/create/blockstates/scoria_slab.json new file mode 100644 index 000000000..f222802e3 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/scoria_slab.json @@ -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" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/create/blockstates/scoria_stairs.json b/src/main/resources/assets/create/blockstates/scoria_stairs.json new file mode 100644 index 000000000..0d73bd070 --- /dev/null +++ b/src/main/resources/assets/create/blockstates/scoria_stairs.json @@ -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 } + } +} diff --git a/src/main/resources/assets/create/blockstates/scoria_wall.json b/src/main/resources/assets/create/blockstates/scoria_wall.json new file mode 100644 index 000000000..8627fec7c --- /dev/null +++ b/src/main/resources/assets/create/blockstates/scoria_wall.json @@ -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 } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/lang/en_us.json b/src/main/resources/assets/create/lang/en_us.json index dad349ccb..ea0a76265 100644 --- a/src/main/resources/assets/create/lang/en_us.json +++ b/src/main/resources/assets/create/lang/en_us.json @@ -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", diff --git a/src/main/resources/assets/create/models/block/palettes/dark_scoria.json b/src/main/resources/assets/create/models/block/palettes/dark_scoria.json new file mode 100644 index 000000000..a1f0c6c24 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dark_scoria.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/dark_scoria" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks.json b/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks.json new file mode 100644 index 000000000..0a55efaa8 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/dark_scoria_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_slab.json b/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_slab.json new file mode 100644 index 000000000..ae4777462 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_slab.json @@ -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" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_slab_top.json b/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_slab_top.json new file mode 100644 index 000000000..39ea10dcf --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_slab_top.json @@ -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" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_stairs.json b/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_stairs.json new file mode 100644 index 000000000..32c292bfe --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_stairs.json @@ -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" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_stairs_inner.json b/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_stairs_inner.json new file mode 100644 index 000000000..2a6081e0c --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_stairs_inner.json @@ -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" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_stairs_outer.json b/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_stairs_outer.json new file mode 100644 index 000000000..3c2051911 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_stairs_outer.json @@ -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" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_wall_post.json b/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_wall_post.json new file mode 100644 index 000000000..51cbab6f0 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_post", + "textures": { + "wall": "create:block/dark_scoria_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_wall_side.json b/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_wall_side.json new file mode 100644 index 000000000..a4c1da9ba --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dark_scoria_bricks_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_side", + "textures": { + "wall": "create:block/dark_scoria_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles.json b/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles.json new file mode 100644 index 000000000..a4694c185 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/dark_scoria_tiles" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles_slab.json b/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles_slab.json new file mode 100644 index 000000000..88a6ccc2a --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles_slab.json @@ -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" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles_slab_top.json b/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles_slab_top.json new file mode 100644 index 000000000..917af8582 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles_slab_top.json @@ -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" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles_stairs.json b/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles_stairs.json new file mode 100644 index 000000000..13bca8e71 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles_stairs.json @@ -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" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles_stairs_inner.json b/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles_stairs_inner.json new file mode 100644 index 000000000..5540dd43e --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles_stairs_inner.json @@ -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" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles_stairs_outer.json b/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles_stairs_outer.json new file mode 100644 index 000000000..4d8127cfb --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/dark_scoria_tiles_stairs_outer.json @@ -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" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/natural_scoria.json b/src/main/resources/assets/create/models/block/palettes/natural_scoria.json new file mode 100644 index 000000000..dfb033708 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/natural_scoria.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/scoria" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/polished_dark_scoria.json b/src/main/resources/assets/create/models/block/palettes/polished_dark_scoria.json new file mode 100644 index 000000000..8831e1c9d --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/polished_dark_scoria.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/polished_dark_scoria" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/polished_scoria.json b/src/main/resources/assets/create/models/block/palettes/polished_scoria.json new file mode 100644 index 000000000..9d79f7187 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/polished_scoria.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/polished_scoria" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/polished_scoria_double_slab.json b/src/main/resources/assets/create/models/block/palettes/polished_scoria_double_slab.json new file mode 100644 index 000000000..12724575b --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/polished_scoria_double_slab.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "create:block/polished_scoria", + "side": "create:block/polished_scoria_slab" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/polished_scoria_slab.json b/src/main/resources/assets/create/models/block/palettes/polished_scoria_slab.json new file mode 100644 index 000000000..0eb77c3b5 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/polished_scoria_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "create:block/polished_scoria", + "top": "create:block/polished_scoria", + "side": "create:block/polished_scoria_slab" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/polished_scoria_slab_top.json b/src/main/resources/assets/create/models/block/palettes/polished_scoria_slab_top.json new file mode 100644 index 000000000..8e640f05c --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/polished_scoria_slab_top.json @@ -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" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/scoria_bricks.json b/src/main/resources/assets/create/models/block/palettes/scoria_bricks.json new file mode 100644 index 000000000..dccf0a88a --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/scoria_bricks.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "create:block/polished_scoria", + "side": "create:block/scoria_bricks" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/scoria_layers.json b/src/main/resources/assets/create/models/block/palettes/scoria_layers.json new file mode 100644 index 000000000..1ddab7e63 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/scoria_layers.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "create:block/polished_scoria", + "side": "create:block/scoria_layers" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/scoria_pillar.json b/src/main/resources/assets/create/models/block/palettes/scoria_pillar.json new file mode 100644 index 000000000..fb45af941 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/scoria_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "create:block/scoria_pillar_top", + "side": "create:block/scoria_pillar" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/scoria_slab.json b/src/main/resources/assets/create/models/block/palettes/scoria_slab.json new file mode 100644 index 000000000..c808bc8fa --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/scoria_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab", + "textures": { + "bottom": "create:block/scoria", + "top": "create:block/scoria", + "side": "create:block/scoria" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/scoria_slab_top.json b/src/main/resources/assets/create/models/block/palettes/scoria_slab_top.json new file mode 100644 index 000000000..7cedb2cb9 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/scoria_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "block/slab_top", + "textures": { + "bottom": "create:block/scoria", + "top": "create:block/scoria", + "side": "create:block/scoria" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/scoria_stairs.json b/src/main/resources/assets/create/models/block/palettes/scoria_stairs.json new file mode 100644 index 000000000..9cf3fc005 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/scoria_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "create:block/scoria", + "top": "create:block/scoria", + "side": "create:block/scoria" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/scoria_stairs_inner.json b/src/main/resources/assets/create/models/block/palettes/scoria_stairs_inner.json new file mode 100644 index 000000000..76662fa5d --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/scoria_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "create:block/scoria", + "top": "create:block/scoria", + "side": "create:block/scoria" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/scoria_stairs_outer.json b/src/main/resources/assets/create/models/block/palettes/scoria_stairs_outer.json new file mode 100644 index 000000000..c6e826914 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/scoria_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "create:block/scoria", + "top": "create:block/scoria", + "side": "create:block/scoria" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/scoria_wall_post.json b/src/main/resources/assets/create/models/block/palettes/scoria_wall_post.json new file mode 100644 index 000000000..6685a6d73 --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/scoria_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_post", + "textures": { + "wall": "create:block/scoria" + } +} diff --git a/src/main/resources/assets/create/models/block/palettes/scoria_wall_side.json b/src/main/resources/assets/create/models/block/palettes/scoria_wall_side.json new file mode 100644 index 000000000..1a6a3cfbf --- /dev/null +++ b/src/main/resources/assets/create/models/block/palettes/scoria_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "block/template_wall_side", + "textures": { + "wall": "create:block/scoria" + } +} diff --git a/src/main/resources/assets/create/models/item/dark_scoria.json b/src/main/resources/assets/create/models/item/dark_scoria.json new file mode 100644 index 000000000..9e9fdfcb8 --- /dev/null +++ b/src/main/resources/assets/create/models/item/dark_scoria.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/dark_scoria" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/dark_scoria_bricks.json b/src/main/resources/assets/create/models/item/dark_scoria_bricks.json new file mode 100644 index 000000000..136074911 --- /dev/null +++ b/src/main/resources/assets/create/models/item/dark_scoria_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/dark_scoria_bricks" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/dark_scoria_bricks_slab.json b/src/main/resources/assets/create/models/item/dark_scoria_bricks_slab.json new file mode 100644 index 000000000..38c32a91d --- /dev/null +++ b/src/main/resources/assets/create/models/item/dark_scoria_bricks_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/dark_scoria_bricks_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/dark_scoria_bricks_stairs.json b/src/main/resources/assets/create/models/item/dark_scoria_bricks_stairs.json new file mode 100644 index 000000000..1502f474c --- /dev/null +++ b/src/main/resources/assets/create/models/item/dark_scoria_bricks_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/dark_scoria_bricks_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/dark_scoria_bricks_wall.json b/src/main/resources/assets/create/models/item/dark_scoria_bricks_wall.json new file mode 100644 index 000000000..995f218e4 --- /dev/null +++ b/src/main/resources/assets/create/models/item/dark_scoria_bricks_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_inventory", + "textures": { + "wall": "create:block/dark_scoria_bricks" + } +} diff --git a/src/main/resources/assets/create/models/item/dark_scoria_tiles.json b/src/main/resources/assets/create/models/item/dark_scoria_tiles.json new file mode 100644 index 000000000..1ff23b33a --- /dev/null +++ b/src/main/resources/assets/create/models/item/dark_scoria_tiles.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/dark_scoria_tiles" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/dark_scoria_tiles_slab.json b/src/main/resources/assets/create/models/item/dark_scoria_tiles_slab.json new file mode 100644 index 000000000..834315289 --- /dev/null +++ b/src/main/resources/assets/create/models/item/dark_scoria_tiles_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/dark_scoria_tiles_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/dark_scoria_tiles_stairs.json b/src/main/resources/assets/create/models/item/dark_scoria_tiles_stairs.json new file mode 100644 index 000000000..0d57d66de --- /dev/null +++ b/src/main/resources/assets/create/models/item/dark_scoria_tiles_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/dark_scoria_tiles_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/natural_scoria.json b/src/main/resources/assets/create/models/item/natural_scoria.json new file mode 100644 index 000000000..788cc7a7f --- /dev/null +++ b/src/main/resources/assets/create/models/item/natural_scoria.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/natural_scoria" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/polished_dark_scoria.json b/src/main/resources/assets/create/models/item/polished_dark_scoria.json new file mode 100644 index 000000000..932093fcd --- /dev/null +++ b/src/main/resources/assets/create/models/item/polished_dark_scoria.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/polished_dark_scoria" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/polished_scoria.json b/src/main/resources/assets/create/models/item/polished_scoria.json new file mode 100644 index 000000000..a3d1d87df --- /dev/null +++ b/src/main/resources/assets/create/models/item/polished_scoria.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/polished_scoria" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/polished_scoria_slab.json b/src/main/resources/assets/create/models/item/polished_scoria_slab.json new file mode 100644 index 000000000..3b2cb6aed --- /dev/null +++ b/src/main/resources/assets/create/models/item/polished_scoria_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/polished_scoria_slab" +} diff --git a/src/main/resources/assets/create/models/item/scoria_bricks.json b/src/main/resources/assets/create/models/item/scoria_bricks.json new file mode 100644 index 000000000..8f3180949 --- /dev/null +++ b/src/main/resources/assets/create/models/item/scoria_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/scoria_bricks" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/scoria_layers.json b/src/main/resources/assets/create/models/item/scoria_layers.json new file mode 100644 index 000000000..c0918b6ba --- /dev/null +++ b/src/main/resources/assets/create/models/item/scoria_layers.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/scoria_layers" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/scoria_pillar.json b/src/main/resources/assets/create/models/item/scoria_pillar.json new file mode 100644 index 000000000..b8adbbdb0 --- /dev/null +++ b/src/main/resources/assets/create/models/item/scoria_pillar.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/scoria_pillar" +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/item/scoria_slab.json b/src/main/resources/assets/create/models/item/scoria_slab.json new file mode 100644 index 000000000..baf76b347 --- /dev/null +++ b/src/main/resources/assets/create/models/item/scoria_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/scoria_slab" +} diff --git a/src/main/resources/assets/create/models/item/scoria_stairs.json b/src/main/resources/assets/create/models/item/scoria_stairs.json new file mode 100644 index 000000000..9e49dd43c --- /dev/null +++ b/src/main/resources/assets/create/models/item/scoria_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/palettes/scoria_stairs" +} diff --git a/src/main/resources/assets/create/models/item/scoria_wall.json b/src/main/resources/assets/create/models/item/scoria_wall.json new file mode 100644 index 000000000..68c2bf5ab --- /dev/null +++ b/src/main/resources/assets/create/models/item/scoria_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_inventory", + "textures": { + "wall": "create:block/scoria" + } +} diff --git a/src/main/resources/assets/create/textures/block/connected/polished_scoria.png b/src/main/resources/assets/create/textures/block/connected/polished_scoria.png new file mode 100644 index 000000000..3de2c3ffd Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/polished_scoria.png differ diff --git a/src/main/resources/assets/create/textures/block/connected/scoria_layers.png b/src/main/resources/assets/create/textures/block/connected/scoria_layers.png new file mode 100644 index 000000000..3a02bb893 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/connected/scoria_layers.png differ diff --git a/src/main/resources/assets/create/textures/block/dark_scoria.png b/src/main/resources/assets/create/textures/block/dark_scoria.png new file mode 100644 index 000000000..2e46e37ff Binary files /dev/null and b/src/main/resources/assets/create/textures/block/dark_scoria.png differ diff --git a/src/main/resources/assets/create/textures/block/dark_scoria_bricks.png b/src/main/resources/assets/create/textures/block/dark_scoria_bricks.png new file mode 100644 index 000000000..b6ba31e5a Binary files /dev/null and b/src/main/resources/assets/create/textures/block/dark_scoria_bricks.png differ diff --git a/src/main/resources/assets/create/textures/block/dark_scoria_tiles.png b/src/main/resources/assets/create/textures/block/dark_scoria_tiles.png new file mode 100644 index 000000000..31c3c46f4 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/dark_scoria_tiles.png differ diff --git a/src/main/resources/assets/create/textures/block/polished_dark_scoria.png b/src/main/resources/assets/create/textures/block/polished_dark_scoria.png new file mode 100644 index 000000000..c06240759 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/polished_dark_scoria.png differ diff --git a/src/main/resources/assets/create/textures/block/polished_scoria.png b/src/main/resources/assets/create/textures/block/polished_scoria.png new file mode 100644 index 000000000..b23da5662 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/polished_scoria.png differ diff --git a/src/main/resources/assets/create/textures/block/polished_scoria_slab.png b/src/main/resources/assets/create/textures/block/polished_scoria_slab.png new file mode 100644 index 000000000..225d4635d Binary files /dev/null and b/src/main/resources/assets/create/textures/block/polished_scoria_slab.png differ diff --git a/src/main/resources/assets/create/textures/block/scoria_bricks.png b/src/main/resources/assets/create/textures/block/scoria_bricks.png new file mode 100644 index 000000000..f965ccb1f Binary files /dev/null and b/src/main/resources/assets/create/textures/block/scoria_bricks.png differ diff --git a/src/main/resources/assets/create/textures/block/scoria_layers.png b/src/main/resources/assets/create/textures/block/scoria_layers.png new file mode 100644 index 000000000..91007977d Binary files /dev/null and b/src/main/resources/assets/create/textures/block/scoria_layers.png differ diff --git a/src/main/resources/assets/create/textures/block/scoria_pillar.png b/src/main/resources/assets/create/textures/block/scoria_pillar.png new file mode 100644 index 000000000..6ddda0ff7 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/scoria_pillar.png differ diff --git a/src/main/resources/assets/create/textures/block/scoria_pillar_top.png b/src/main/resources/assets/create/textures/block/scoria_pillar_top.png new file mode 100644 index 000000000..a207ed670 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/scoria_pillar_top.png differ diff --git a/src/main/resources/assets/create/textures/block/weathered_limestone.png b/src/main/resources/assets/create/textures/block/weathered_limestone.png index 4472f194e..448f1c63b 100644 Binary files a/src/main/resources/assets/create/textures/block/weathered_limestone.png and b/src/main/resources/assets/create/textures/block/weathered_limestone.png differ diff --git a/src/main/resources/data/create/loot_tables/blocks/dark_scoria.json b/src/main/resources/data/create/loot_tables/blocks/dark_scoria.json new file mode 100644 index 000000000..c26589bf5 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/dark_scoria.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:dark_scoria" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/dark_scoria_bricks.json b/src/main/resources/data/create/loot_tables/blocks/dark_scoria_bricks.json new file mode 100644 index 000000000..d2ae7ecae --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/dark_scoria_bricks.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:dark_scoria_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/dark_scoria_bricks_slab.json b/src/main/resources/data/create/loot_tables/blocks/dark_scoria_bricks_slab.json new file mode 100644 index 000000000..f0f16b380 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/dark_scoria_bricks_slab.json @@ -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" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/dark_scoria_bricks_stairs.json b/src/main/resources/data/create/loot_tables/blocks/dark_scoria_bricks_stairs.json new file mode 100644 index 000000000..830b936c5 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/dark_scoria_bricks_stairs.json @@ -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" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/dark_scoria_bricks_wall.json b/src/main/resources/data/create/loot_tables/blocks/dark_scoria_bricks_wall.json new file mode 100644 index 000000000..fafe71b46 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/dark_scoria_bricks_wall.json @@ -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" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/dark_scoria_tiles.json b/src/main/resources/data/create/loot_tables/blocks/dark_scoria_tiles.json new file mode 100644 index 000000000..2b934dd54 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/dark_scoria_tiles.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:dark_scoria_tiles" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/dark_scoria_tiles_slab.json b/src/main/resources/data/create/loot_tables/blocks/dark_scoria_tiles_slab.json new file mode 100644 index 000000000..181ce3f84 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/dark_scoria_tiles_slab.json @@ -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" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/dark_scoria_tiles_stairs.json b/src/main/resources/data/create/loot_tables/blocks/dark_scoria_tiles_stairs.json new file mode 100644 index 000000000..3b5b51142 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/dark_scoria_tiles_stairs.json @@ -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" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/natural_scoria.json b/src/main/resources/data/create/loot_tables/blocks/natural_scoria.json new file mode 100644 index 000000000..dc853d0da --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/natural_scoria.json @@ -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" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/polished_dark_scoria.json b/src/main/resources/data/create/loot_tables/blocks/polished_dark_scoria.json new file mode 100644 index 000000000..1369b41df --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/polished_dark_scoria.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:polished_dark_scoria" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/polished_scoria.json b/src/main/resources/data/create/loot_tables/blocks/polished_scoria.json new file mode 100644 index 000000000..b28b131c7 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/polished_scoria.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:polished_scoria" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/polished_scoria_slab.json b/src/main/resources/data/create/loot_tables/blocks/polished_scoria_slab.json new file mode 100644 index 000000000..4f44b847b --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/polished_scoria_slab.json @@ -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" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/scoria.json b/src/main/resources/data/create/loot_tables/blocks/scoria.json new file mode 100644 index 000000000..0025a35ae --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/scoria.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:scoria" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/scoria_bricks.json b/src/main/resources/data/create/loot_tables/blocks/scoria_bricks.json new file mode 100644 index 000000000..f3ed5de62 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/scoria_bricks.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:scoria_bricks" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/scoria_layers.json b/src/main/resources/data/create/loot_tables/blocks/scoria_layers.json new file mode 100644 index 000000000..01e30e6b7 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/scoria_layers.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:scoria_layers" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/scoria_pillar.json b/src/main/resources/data/create/loot_tables/blocks/scoria_pillar.json new file mode 100644 index 000000000..512348d29 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/scoria_pillar.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:scoria_pillar" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/scoria_slab.json b/src/main/resources/data/create/loot_tables/blocks/scoria_slab.json new file mode 100644 index 000000000..6e1cfbd6c --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/scoria_slab.json @@ -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:scoria_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2 + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "create:scoria_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/scoria_stairs.json b/src/main/resources/data/create/loot_tables/blocks/scoria_stairs.json new file mode 100644 index 000000000..94fe376b8 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/scoria_stairs.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:scoria_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/loot_tables/blocks/scoria_wall.json b/src/main/resources/data/create/loot_tables/blocks/scoria_wall.json new file mode 100644 index 000000000..54cf7b6b7 --- /dev/null +++ b/src/main/resources/data/create/loot_tables/blocks/scoria_wall.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:scoria_wall" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria.json new file mode 100644 index 000000000..1dd3ac7db --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria.json @@ -0,0 +1,26 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "LLL", + "LWL", + "LLL" + ], + "key": { + "L": { + "item": "create:scoria" + }, + "W": { + "tag": "forge:dyes/black" + } + }, + "result": { + "item": "create:dark_scoria", + "count": 8 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks.json new file mode 100644 index 000000000..79ab029da --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "create:polished_dark_scoria" + } + }, + "result": { + "item": "create:dark_scoria_bricks", + "count": 4 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_slab.json new file mode 100644 index 000000000..7cda4d17d --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_slab.json @@ -0,0 +1,21 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS" + ], + "key": { + "S": { + "item": "create:dark_scoria_bricks" + } + }, + "result": { + "item": "create:dark_scoria_bricks_slab", + "count": 6 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_stairs.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_stairs.json new file mode 100644 index 000000000..cdff6dd49 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_stairs.json @@ -0,0 +1,23 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "S ", + "SS ", + "SSS" + ], + "key": { + "S": { + "item": "create:dark_scoria_bricks" + } + }, + "result": { + "item": "create:dark_scoria_bricks_stairs", + "count": 4 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_wall.json new file mode 100644 index 000000000..b925afe5e --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_bricks_wall.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:dark_scoria_bricks" + } + }, + "result": { + "item": "create:dark_scoria_bricks_wall", + "count": 6 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles.json new file mode 100644 index 000000000..771ffe357 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles.json @@ -0,0 +1,21 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "S" + ], + "key": { + "S": { + "item": "create:dark_scoria_bricks" + } + }, + "result": { + "item": "create:dark_scoria_tiles", + "count": 1 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles_slab.json new file mode 100644 index 000000000..dd9f43614 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles_slab.json @@ -0,0 +1,21 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS" + ], + "key": { + "S": { + "item": "create:dark_scoria_tiles" + } + }, + "result": { + "item": "create:dark_scoria_tiles_slab", + "count": 6 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles_stairs.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles_stairs.json new file mode 100644 index 000000000..9d2c39207 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/dark_scoria_tiles_stairs.json @@ -0,0 +1,23 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "S ", + "SS ", + "SSS" + ], + "key": { + "S": { + "item": "create:dark_scoria_tiles" + } + }, + "result": { + "item": "create:dark_scoria_tiles_stairs", + "count": 4 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_dark_scoria.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_dark_scoria.json new file mode 100644 index 000000000..26eaf18ab --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_dark_scoria.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "create:dark_scoria" + } + }, + "result": { + "item": "create:polished_dark_scoria", + "count": 4 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_scoria.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_scoria.json new file mode 100644 index 000000000..004c5bc97 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_scoria.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "create:scoria" + } + }, + "result": { + "item": "create:polished_scoria", + "count": 4 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_scoria_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_scoria_slab.json new file mode 100644 index 000000000..04b8b31ee --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/polished_scoria_slab.json @@ -0,0 +1,21 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS" + ], + "key": { + "S": { + "item": "create:polished_scoria" + } + }, + "result": { + "item": "create:polished_scoria_slab", + "count": 6 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_bricks.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_bricks.json new file mode 100644 index 000000000..800331b23 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_bricks.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "create:polished_scoria" + } + }, + "result": { + "item": "create:scoria_bricks", + "count": 4 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_slab.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_slab.json new file mode 100644 index 000000000..7ff1ae588 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_slab.json @@ -0,0 +1,21 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS" + ], + "key": { + "S": { + "item": "create:scoria" + } + }, + "result": { + "item": "create:scoria_slab", + "count": 6 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_stairs.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_stairs.json new file mode 100644 index 000000000..c59d48af3 --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_stairs.json @@ -0,0 +1,23 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "S ", + "SS ", + "SSS" + ], + "key": { + "S": { + "item": "create:scoria" + } + }, + "result": { + "item": "create:scoria_stairs", + "count": 4 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_wall.json b/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_wall.json new file mode 100644 index 000000000..98b82c1fb --- /dev/null +++ b/src/main/resources/data/create/recipes/crafting_shaped/palettes/scoria_wall.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "SSS", + "SSS" + ], + "key": { + "S": { + "item": "create:scoria" + } + }, + "result": { + "item": "create:scoria_wall", + "count": 6 + }, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/smelting/soul_sand.json b/src/main/resources/data/create/recipes/smelting/soul_sand.json new file mode 100644 index 000000000..b320f7c74 --- /dev/null +++ b/src/main/resources/data/create/recipes/smelting/soul_sand.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:smelting", + "ingredient": { + "item": "minecraft:soul_sand" + }, + "result": "create:scoria", + "experience": 0.1, + "cookingtime": 200, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks.json new file mode 100644 index 000000000..d0b078a92 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:dark_scoria" + }, + "result": "create:dark_scoria_bricks", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_slab.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_slab.json new file mode 100644 index 000000000..7cde357fb --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_slab.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:dark_scoria" + }, + "result": "create:dark_scoria_bricks_slab", + "count": 2, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_slab2.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_slab2.json new file mode 100644 index 000000000..69926c8ee --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_slab2.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:dark_scoria_bricks" + }, + "result": "create:dark_scoria_bricks_slab", + "count": 2, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_stairs.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_stairs.json new file mode 100644 index 000000000..4862a420d --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_stairs.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:dark_scoria" + }, + "result": "create:dark_scoria_bricks_stairs", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_stairs2.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_stairs2.json new file mode 100644 index 000000000..03b579d40 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_stairs2.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:dark_scoria_bricks" + }, + "result": "create:dark_scoria_bricks_stairs", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_wall.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_wall.json new file mode 100644 index 000000000..610c61775 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_wall.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:dark_scoria" + }, + "result": "create:dark_scoria_bricks_wall", + "count": 2, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_wall2.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_wall2.json new file mode 100644 index 000000000..0a1126ff7 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_bricks_wall2.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:dark_scoria_bricks" + }, + "result": "create:dark_scoria_bricks_wall", + "count": 2, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles.json new file mode 100644 index 000000000..6a9b64194 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:dark_scoria" + }, + "result": "create:dark_scoria_tiles", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_slab.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_slab.json new file mode 100644 index 000000000..e1156f98d --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_slab.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:dark_scoria" + }, + "result": "create:dark_scoria_tiles_slab", + "count": 2, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_slab2.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_slab2.json new file mode 100644 index 000000000..2eaa92862 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_slab2.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:dark_scoria_tiles" + }, + "result": "create:dark_scoria_tiles_slab", + "count": 2, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_stairs.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_stairs.json new file mode 100644 index 000000000..9848e6171 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_stairs.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:dark_scoria" + }, + "result": "create:dark_scoria_tiles_stairs", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_stairs2.json b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_stairs2.json new file mode 100644 index 000000000..4e6f42405 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/dark_scoria_tiles_stairs2.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:dark_scoria_tiles" + }, + "result": "create:dark_scoria_tiles_stairs", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/polished_scoria.json b/src/main/resources/data/create/recipes/stonecutting/polished_scoria.json new file mode 100644 index 000000000..d585a93eb --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/polished_scoria.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:scoria" + }, + "result": "create:polished_scoria", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/polished_scoria_slab.json b/src/main/resources/data/create/recipes/stonecutting/polished_scoria_slab.json new file mode 100644 index 000000000..97ccb2548 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/polished_scoria_slab.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:scoria" + }, + "result": "create:polished_scoria_slab", + "count": 2, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/polished_scoria_slab2.json b/src/main/resources/data/create/recipes/stonecutting/polished_scoria_slab2.json new file mode 100644 index 000000000..9faa0616f --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/polished_scoria_slab2.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:polished_scoria" + }, + "result": "create:polished_scoria_slab", + "count": 2, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/scoria_bricks.json b/src/main/resources/data/create/recipes/stonecutting/scoria_bricks.json new file mode 100644 index 000000000..be134be29 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/scoria_bricks.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:scoria" + }, + "result": "create:scoria_bricks", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/scoria_layers.json b/src/main/resources/data/create/recipes/stonecutting/scoria_layers.json new file mode 100644 index 000000000..2cb68d07e --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/scoria_layers.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:scoria" + }, + "result": "create:scoria_layers", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/scoria_pillar.json b/src/main/resources/data/create/recipes/stonecutting/scoria_pillar.json new file mode 100644 index 000000000..6133b32b6 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/scoria_pillar.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:scoria" + }, + "result": "create:scoria_pillar", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/scoria_slab.json b/src/main/resources/data/create/recipes/stonecutting/scoria_slab.json new file mode 100644 index 000000000..56d131dd6 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/scoria_slab.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:scoria" + }, + "result": "create:scoria_slab", + "count": 2, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/scoria_stairs.json b/src/main/resources/data/create/recipes/stonecutting/scoria_stairs.json new file mode 100644 index 000000000..654a2d06e --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/scoria_stairs.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:scoria" + }, + "result": "create:scoria_stairs", + "count": 1, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/create/recipes/stonecutting/scoria_wall.json b/src/main/resources/data/create/recipes/stonecutting/scoria_wall.json new file mode 100644 index 000000000..89cc1f521 --- /dev/null +++ b/src/main/resources/data/create/recipes/stonecutting/scoria_wall.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "create:scoria" + }, + "result": "create:scoria_wall", + "count": 2, + "conditions": [ + { + "type": "create:module", + "module": "palettes" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/main/resources/data/minecraft/tags/blocks/slabs.json index bca79d676..ef9ea56a8 100644 --- a/src/main/resources/data/minecraft/tags/blocks/slabs.json +++ b/src/main/resources/data/minecraft/tags/blocks/slabs.json @@ -10,6 +10,10 @@ "create:dolomite_slab", "create:gabbro_slab", "create:indented_gabbro_slab", - "create:paved_gabbro_bricks_slab" + "create:paved_gabbro_bricks_slab", + "create:scoria_slab", + "create:dark_scoria_tiles_slab", + "create:dark_scoria_bricks_slab", + "create:polished_scoria_slab" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/stairs.json b/src/main/resources/data/minecraft/tags/blocks/stairs.json index 15951be74..75bb2f0d1 100644 --- a/src/main/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/main/resources/data/minecraft/tags/blocks/stairs.json @@ -7,6 +7,9 @@ "create:weathered_limestone_bricks_stairs", "create:dolomite_stairs", "create:gabbro_stairs", + "create:scoria_stairs", + "create:dark_scoria_tiles_stairs", + "create:dark_scoria_bricks_stairs", "create:gabbro_bricks_stairs" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/walls.json b/src/main/resources/data/minecraft/tags/blocks/walls.json index c9d6babae..0a8388a45 100644 --- a/src/main/resources/data/minecraft/tags/blocks/walls.json +++ b/src/main/resources/data/minecraft/tags/blocks/walls.json @@ -7,6 +7,8 @@ "create:weathered_limestone_bricks_wall", "create:dolomite_wall", "create:gabbro_wall", + "create:scoria_wall", + "create:dark_scoria_bricks_wall", "create:gabbro_bricks_wall" ] } \ No newline at end of file