Basalt / limestone / slate stairs

This commit is contained in:
Emmanuel BENOîT 2016-07-12 18:48:25 +02:00
parent b35e3db181
commit b972cd0987
18 changed files with 235 additions and 4 deletions

View file

@ -5,10 +5,6 @@ deco No Copper pots
deco No Copper plates deco No Copper plates
deco No Lanterns deco No Lanterns
deco No Light plates deco No Light plates
deco No Stone - Stairs
Limestone
Slate
Basalt
------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------
plants No? Tomatoes plants No? Tomatoes
plants No? Turnips plants No? Turnips

View file

@ -1,6 +1,7 @@
package mmm.deco; package mmm.deco;
import mmm.MmmDeco;
import mmm.MmmMaterials; import mmm.MmmMaterials;
import mmm.core.CRegistry; import mmm.core.CRegistry;
import mmm.core.api.I_RecipeRegistrar; import mmm.core.api.I_RecipeRegistrar;
@ -31,6 +32,14 @@ public class DStairs
} }
public static StairsBlock fromSmoothStone( final DSmoothStone.SmoothStoneBlock type )
{
final StairsBlock stairs = new StairsBlock( type , type.rock.name );
CRegistry.addBlock( stairs );
return stairs;
}
public static StairsBlock fromWood( final MTree materials ) public static StairsBlock fromWood( final MTree materials )
{ {
final StairsBlock stairs = new StairsBlock( materials.PLANKS.getDefaultState( ) , materials.NAME ); final StairsBlock stairs = new StairsBlock( materials.PLANKS.getDefaultState( ) , materials.NAME );
@ -76,6 +85,11 @@ public class DStairs
public final StairsBlock GRANITE; public final StairsBlock GRANITE;
public final StairsBlock DIORITE; public final StairsBlock DIORITE;
public final StairsBlock ANDESITE; public final StairsBlock ANDESITE;
public final StairsBlock LIMESTONE;
public final StairsBlock SLATE;
public final StairsBlock BASALT;
public final StairsBlock HEVEA; public final StairsBlock HEVEA;
public final StairsBlock BAMBOO; public final StairsBlock BAMBOO;
@ -85,6 +99,11 @@ public class DStairs
this.GRANITE = StairsBlock.fromVanillaSmoothStone( BlockStone.EnumType.GRANITE_SMOOTH ); this.GRANITE = StairsBlock.fromVanillaSmoothStone( BlockStone.EnumType.GRANITE_SMOOTH );
this.DIORITE = StairsBlock.fromVanillaSmoothStone( BlockStone.EnumType.DIORITE_SMOOTH ); this.DIORITE = StairsBlock.fromVanillaSmoothStone( BlockStone.EnumType.DIORITE_SMOOTH );
this.ANDESITE = StairsBlock.fromVanillaSmoothStone( BlockStone.EnumType.ANDESITE_SMOOTH ); this.ANDESITE = StairsBlock.fromVanillaSmoothStone( BlockStone.EnumType.ANDESITE_SMOOTH );
this.LIMESTONE = StairsBlock.fromSmoothStone( MmmDeco.STONE.LIMESTONE );
this.SLATE = StairsBlock.fromSmoothStone( MmmDeco.STONE.SLATE );
this.BASALT = StairsBlock.fromSmoothStone( MmmDeco.STONE.BASALT );
this.HEVEA = StairsBlock.fromWood( MmmMaterials.TREE.HEVEA ); this.HEVEA = StairsBlock.fromWood( MmmMaterials.TREE.HEVEA );
this.BAMBOO = StairsBlock.fromWood( MmmMaterials.TREE.BAMBOO ); this.BAMBOO = StairsBlock.fromWood( MmmMaterials.TREE.BAMBOO );
} }

View file

@ -0,0 +1,44 @@
{
"variants": {
"facing=east,half=bottom,shape=straight": { "model": "mmm:deco/stairs/basalt/straight" },
"facing=west,half=bottom,shape=straight": { "model": "mmm:deco/stairs/basalt/straight", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=straight": { "model": "mmm:deco/stairs/basalt/straight", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=straight": { "model": "mmm:deco/stairs/basalt/straight", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/basalt/outer" },
"facing=west,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/basalt/outer", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/basalt/outer", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/basalt/outer", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/basalt/outer", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/basalt/outer", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/basalt/outer" },
"facing=north,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/basalt/outer", "y": 180, "uvlock": true },
"facing=east,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/basalt/inner" },
"facing=west,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/basalt/inner", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/basalt/inner", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/basalt/inner", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/basalt/inner", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/basalt/inner", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/basalt/inner" },
"facing=north,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/basalt/inner", "y": 180, "uvlock": true },
"facing=east,half=top,shape=straight": { "model": "mmm:deco/stairs/basalt/straight", "x": 180, "uvlock": true },
"facing=west,half=top,shape=straight": { "model": "mmm:deco/stairs/basalt/straight", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=straight": { "model": "mmm:deco/stairs/basalt/straight", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=straight": { "model": "mmm:deco/stairs/basalt/straight", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=outer_right": { "model": "mmm:deco/stairs/basalt/outer", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=outer_right": { "model": "mmm:deco/stairs/basalt/outer", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=outer_right": { "model": "mmm:deco/stairs/basalt/outer", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=outer_right": { "model": "mmm:deco/stairs/basalt/outer", "x": 180, "uvlock": true },
"facing=east,half=top,shape=outer_left": { "model": "mmm:deco/stairs/basalt/outer", "x": 180, "uvlock": true },
"facing=west,half=top,shape=outer_left": { "model": "mmm:deco/stairs/basalt/outer", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=outer_left": { "model": "mmm:deco/stairs/basalt/outer", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=outer_left": { "model": "mmm:deco/stairs/basalt/outer", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=inner_right": { "model": "mmm:deco/stairs/basalt/inner", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=inner_right": { "model": "mmm:deco/stairs/basalt/inner", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=inner_right": { "model": "mmm:deco/stairs/basalt/inner", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=inner_right": { "model": "mmm:deco/stairs/basalt/inner", "x": 180, "uvlock": true },
"facing=east,half=top,shape=inner_left": { "model": "mmm:deco/stairs/basalt/inner", "x": 180, "uvlock": true },
"facing=west,half=top,shape=inner_left": { "model": "mmm:deco/stairs/basalt/inner", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=inner_left": { "model": "mmm:deco/stairs/basalt/inner", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=inner_left": { "model": "mmm:deco/stairs/basalt/inner", "x": 180, "y": 270, "uvlock": true }
}
}

View file

@ -0,0 +1,44 @@
{
"variants": {
"facing=east,half=bottom,shape=straight": { "model": "mmm:deco/stairs/limestone/straight" },
"facing=west,half=bottom,shape=straight": { "model": "mmm:deco/stairs/limestone/straight", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=straight": { "model": "mmm:deco/stairs/limestone/straight", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=straight": { "model": "mmm:deco/stairs/limestone/straight", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/limestone/outer" },
"facing=west,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/limestone/outer", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/limestone/outer", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/limestone/outer", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/limestone/outer", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/limestone/outer", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/limestone/outer" },
"facing=north,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/limestone/outer", "y": 180, "uvlock": true },
"facing=east,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/limestone/inner" },
"facing=west,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/limestone/inner", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/limestone/inner", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/limestone/inner", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/limestone/inner", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/limestone/inner", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/limestone/inner" },
"facing=north,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/limestone/inner", "y": 180, "uvlock": true },
"facing=east,half=top,shape=straight": { "model": "mmm:deco/stairs/limestone/straight", "x": 180, "uvlock": true },
"facing=west,half=top,shape=straight": { "model": "mmm:deco/stairs/limestone/straight", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=straight": { "model": "mmm:deco/stairs/limestone/straight", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=straight": { "model": "mmm:deco/stairs/limestone/straight", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=outer_right": { "model": "mmm:deco/stairs/limestone/outer", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=outer_right": { "model": "mmm:deco/stairs/limestone/outer", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=outer_right": { "model": "mmm:deco/stairs/limestone/outer", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=outer_right": { "model": "mmm:deco/stairs/limestone/outer", "x": 180, "uvlock": true },
"facing=east,half=top,shape=outer_left": { "model": "mmm:deco/stairs/limestone/outer", "x": 180, "uvlock": true },
"facing=west,half=top,shape=outer_left": { "model": "mmm:deco/stairs/limestone/outer", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=outer_left": { "model": "mmm:deco/stairs/limestone/outer", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=outer_left": { "model": "mmm:deco/stairs/limestone/outer", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=inner_right": { "model": "mmm:deco/stairs/limestone/inner", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=inner_right": { "model": "mmm:deco/stairs/limestone/inner", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=inner_right": { "model": "mmm:deco/stairs/limestone/inner", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=inner_right": { "model": "mmm:deco/stairs/limestone/inner", "x": 180, "uvlock": true },
"facing=east,half=top,shape=inner_left": { "model": "mmm:deco/stairs/limestone/inner", "x": 180, "uvlock": true },
"facing=west,half=top,shape=inner_left": { "model": "mmm:deco/stairs/limestone/inner", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=inner_left": { "model": "mmm:deco/stairs/limestone/inner", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=inner_left": { "model": "mmm:deco/stairs/limestone/inner", "x": 180, "y": 270, "uvlock": true }
}
}

View file

@ -0,0 +1,44 @@
{
"variants": {
"facing=east,half=bottom,shape=straight": { "model": "mmm:deco/stairs/slate/straight" },
"facing=west,half=bottom,shape=straight": { "model": "mmm:deco/stairs/slate/straight", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=straight": { "model": "mmm:deco/stairs/slate/straight", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=straight": { "model": "mmm:deco/stairs/slate/straight", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/slate/outer" },
"facing=west,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/slate/outer", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/slate/outer", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=outer_right": { "model": "mmm:deco/stairs/slate/outer", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/slate/outer", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/slate/outer", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/slate/outer" },
"facing=north,half=bottom,shape=outer_left": { "model": "mmm:deco/stairs/slate/outer", "y": 180, "uvlock": true },
"facing=east,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/slate/inner" },
"facing=west,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/slate/inner", "y": 180, "uvlock": true },
"facing=south,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/slate/inner", "y": 90, "uvlock": true },
"facing=north,half=bottom,shape=inner_right": { "model": "mmm:deco/stairs/slate/inner", "y": 270, "uvlock": true },
"facing=east,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/slate/inner", "y": 270, "uvlock": true },
"facing=west,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/slate/inner", "y": 90, "uvlock": true },
"facing=south,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/slate/inner" },
"facing=north,half=bottom,shape=inner_left": { "model": "mmm:deco/stairs/slate/inner", "y": 180, "uvlock": true },
"facing=east,half=top,shape=straight": { "model": "mmm:deco/stairs/slate/straight", "x": 180, "uvlock": true },
"facing=west,half=top,shape=straight": { "model": "mmm:deco/stairs/slate/straight", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=straight": { "model": "mmm:deco/stairs/slate/straight", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=straight": { "model": "mmm:deco/stairs/slate/straight", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=outer_right": { "model": "mmm:deco/stairs/slate/outer", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=outer_right": { "model": "mmm:deco/stairs/slate/outer", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=outer_right": { "model": "mmm:deco/stairs/slate/outer", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=outer_right": { "model": "mmm:deco/stairs/slate/outer", "x": 180, "uvlock": true },
"facing=east,half=top,shape=outer_left": { "model": "mmm:deco/stairs/slate/outer", "x": 180, "uvlock": true },
"facing=west,half=top,shape=outer_left": { "model": "mmm:deco/stairs/slate/outer", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=outer_left": { "model": "mmm:deco/stairs/slate/outer", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=outer_left": { "model": "mmm:deco/stairs/slate/outer", "x": 180, "y": 270, "uvlock": true },
"facing=east,half=top,shape=inner_right": { "model": "mmm:deco/stairs/slate/inner", "x": 180, "y": 90, "uvlock": true },
"facing=west,half=top,shape=inner_right": { "model": "mmm:deco/stairs/slate/inner", "x": 180, "y": 270, "uvlock": true },
"facing=south,half=top,shape=inner_right": { "model": "mmm:deco/stairs/slate/inner", "x": 180, "y": 180, "uvlock": true },
"facing=north,half=top,shape=inner_right": { "model": "mmm:deco/stairs/slate/inner", "x": 180, "uvlock": true },
"facing=east,half=top,shape=inner_left": { "model": "mmm:deco/stairs/slate/inner", "x": 180, "uvlock": true },
"facing=west,half=top,shape=inner_left": { "model": "mmm:deco/stairs/slate/inner", "x": 180, "y": 180, "uvlock": true },
"facing=south,half=top,shape=inner_left": { "model": "mmm:deco/stairs/slate/inner", "x": 180, "y": 90, "uvlock": true },
"facing=north,half=top,shape=inner_left": { "model": "mmm:deco/stairs/slate/inner", "x": 180, "y": 270, "uvlock": true }
}
}

View file

@ -149,6 +149,9 @@ tile.mmm.deco.slabs.bamboo.name=Bamboo Wood Slab
tile.mmm.deco.stairs.granite.name=Granite Stairs tile.mmm.deco.stairs.granite.name=Granite Stairs
tile.mmm.deco.stairs.diorite.name=Diorite Stairs tile.mmm.deco.stairs.diorite.name=Diorite Stairs
tile.mmm.deco.stairs.andesite.name=Andesite Stairs tile.mmm.deco.stairs.andesite.name=Andesite Stairs
tile.mmm.deco.stairs.limestone.name=Limestone Stairs
tile.mmm.deco.stairs.basalt.name=Basalt Stairs
tile.mmm.deco.stairs.slate.name=Slate Stairs
tile.mmm.deco.stairs.hevea.name=Hevea Wood Stairs tile.mmm.deco.stairs.hevea.name=Hevea Wood Stairs
tile.mmm.deco.stairs.bamboo.name=Bamboo Wood Stairs tile.mmm.deco.stairs.bamboo.name=Bamboo Wood Stairs

View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/inner_stairs",
"textures": {
"bottom": "mmm:blocks/deco/smoothstone/basalt",
"top": "mmm:blocks/deco/smoothstone/basalt",
"side": "mmm:blocks/deco/smoothstone/basalt"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/outer_stairs",
"textures": {
"bottom": "mmm:blocks/deco/smoothstone/basalt",
"top": "mmm:blocks/deco/smoothstone/basalt",
"side": "mmm:blocks/deco/smoothstone/basalt"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/stairs",
"textures": {
"bottom": "mmm:blocks/deco/smoothstone/basalt",
"top": "mmm:blocks/deco/smoothstone/basalt",
"side": "mmm:blocks/deco/smoothstone/basalt"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/inner_stairs",
"textures": {
"bottom": "mmm:blocks/deco/smoothstone/limestone",
"top": "mmm:blocks/deco/smoothstone/limestone",
"side": "mmm:blocks/deco/smoothstone/limestone"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/outer_stairs",
"textures": {
"bottom": "mmm:blocks/deco/smoothstone/limestone",
"top": "mmm:blocks/deco/smoothstone/limestone",
"side": "mmm:blocks/deco/smoothstone/limestone"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/stairs",
"textures": {
"bottom": "mmm:blocks/deco/smoothstone/limestone",
"top": "mmm:blocks/deco/smoothstone/limestone",
"side": "mmm:blocks/deco/smoothstone/limestone"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/inner_stairs",
"textures": {
"bottom": "mmm:blocks/deco/smoothstone/slate",
"top": "mmm:blocks/deco/smoothstone/slate",
"side": "mmm:blocks/deco/smoothstone/slate"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/outer_stairs",
"textures": {
"bottom": "mmm:blocks/deco/smoothstone/slate",
"top": "mmm:blocks/deco/smoothstone/slate",
"side": "mmm:blocks/deco/smoothstone/slate"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/stairs",
"textures": {
"bottom": "mmm:blocks/deco/smoothstone/slate",
"top": "mmm:blocks/deco/smoothstone/slate",
"side": "mmm:blocks/deco/smoothstone/slate"
}
}

View file

@ -0,0 +1,3 @@
{
"parent": "mmm:block/deco/stairs/basalt/straight"
}

View file

@ -0,0 +1,3 @@
{
"parent": "mmm:block/deco/stairs/limestone/straight"
}

View file

@ -0,0 +1,3 @@
{
"parent": "mmm:block/deco/stairs/slate/straight"
}