projects/mmm
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Limestone / slate / basalt slabs

Browse source
This commit is contained in:
Emmanuel BENOîT 2016-07-12 18:37:43 +02:00
parent 25a58e091b
commit b35e3db181
37 changed files with 148 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TODO.txt
View file

@ -5,7 +5,7 @@ deco No Copper pots
deco No Copper plates
deco No Lanterns
deco No Light plates
deco No Stone - Stairs + slabs
deco No Stone - Stairs
Limestone
Slate
Basalt

7
src/java/mmm/deco/slabs/DSlabParts.java
View file

@ -3,6 +3,7 @@ package mmm.deco.slabs;
import mmm.core.CRegistry;
import mmm.core.api.I_RecipeRegistrar;
import mmm.deco.DSmoothStone;
import mmm.materials.MTree;
import net.minecraft.block.Block;
import net.minecraft.block.BlockStone;
@ -37,6 +38,12 @@ public class DSlabParts
return slab;
}
public static DSlabParts fromSmoothStone( final DSmoothStone.SmoothStoneBlock stone )
{
return new DSlabParts( stone.getDefaultState( ) , stone.rock.name );
}
public final DSlabHalf HALF;
public final DSlabDouble DOUBLE;
public final ItemSlab ITEM;

11
src/java/mmm/deco/slabs/DSlabs.java
View file

@ -1,6 +1,7 @@
package mmm.deco.slabs;
import mmm.MmmDeco;
import mmm.MmmMaterials;
import net.minecraft.block.BlockStone;
@ -11,6 +12,11 @@ public class DSlabs
public final DSlabParts GRANITE;
public final DSlabParts DIORITE;
public final DSlabParts ANDESITE;
public final DSlabParts LIMESTONE;
public final DSlabParts SLATE;
public final DSlabParts BASALT;
public final DSlabParts HEVEA;
public final DSlabParts BAMBOO;
@ -20,6 +26,11 @@ public class DSlabs
this.GRANITE = DSlabParts.fromVanillaSmoothStone( BlockStone.EnumType.GRANITE_SMOOTH );
this.DIORITE = DSlabParts.fromVanillaSmoothStone( BlockStone.EnumType.DIORITE_SMOOTH );
this.ANDESITE = DSlabParts.fromVanillaSmoothStone( BlockStone.EnumType.ANDESITE_SMOOTH );
this.LIMESTONE = DSlabParts.fromSmoothStone( MmmDeco.STONE.LIMESTONE );
this.SLATE = DSlabParts.fromSmoothStone( MmmDeco.STONE.SLATE );
this.BASALT = DSlabParts.fromSmoothStone( MmmDeco.STONE.BASALT );
this.HEVEA = DSlabParts.fromWood( MmmMaterials.TREE.HEVEA );
this.BAMBOO = DSlabParts.fromWood( MmmMaterials.TREE.BAMBOO );
}

6
src/resources/assets/mmm/blockstates/deco/slabs/basalt.json Normal file
View file

@ -0,0 +1,6 @@
{
"variants": {
"half=bottom,variant=default": { "model": "mmm:deco/slabs/basalt/bottom" },
"half=top,variant=default": { "model": "mmm:deco/slabs/basalt/top" }
}
}

5
src/resources/assets/mmm/blockstates/deco/slabs/basalt_double.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"variant=default": { "model": "mmm:deco/slabs/basalt/double" }
}
}

6
src/resources/assets/mmm/blockstates/deco/slabs/limestone.json Normal file
View file

@ -0,0 +1,6 @@
{
"variants": {
"half=bottom,variant=default": { "model": "mmm:deco/slabs/limestone/bottom" },
"half=top,variant=default": { "model": "mmm:deco/slabs/limestone/top" }
}
}

5
src/resources/assets/mmm/blockstates/deco/slabs/limestone_double.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"variant=default": { "model": "mmm:deco/slabs/limestone/double" }
}
}

6
src/resources/assets/mmm/blockstates/deco/slabs/slate.json Normal file
View file

@ -0,0 +1,6 @@
{
"variants": {
"half=bottom,variant=default": { "model": "mmm:deco/slabs/slate/bottom" },
"half=top,variant=default": { "model": "mmm:deco/slabs/slate/top" }
}
}

5
src/resources/assets/mmm/blockstates/deco/slabs/slate_double.json Normal file
View file

@ -0,0 +1,5 @@
{
"variants": {
"variant=default": { "model": "mmm:deco/slabs/slate/double" }
}
}

15
src/resources/assets/mmm/lang/en_US.lang
View file

@ -137,18 +137,21 @@ tile.mmm.deco.smoothstone.limestone.name=Polished Limestone
tile.mmm.deco.smoothstone.basalt.name=Polished Basalt
tile.mmm.deco.smoothstone.slate.name=Polished Slate
tile.mmm.deco.slabs.granite.name=Granite Slab
tile.mmm.deco.slabs.diorite.name=Diorite Slab
tile.mmm.deco.slabs.andesite.name=Andesite Slab
tile.mmm.deco.slabs.limestone.name=Limestone Slab
tile.mmm.deco.slabs.basalt.name=Basalt Slab
tile.mmm.deco.slabs.slate.name=Slate Slab
tile.mmm.deco.slabs.hevea.name=Hevea Wood Slab
tile.mmm.deco.slabs.bamboo.name=Bamboo Wood Slab
tile.mmm.deco.stairs.granite.name=Granite Stairs
tile.mmm.deco.stairs.diorite.name=Diorite Stairs
tile.mmm.deco.stairs.andesite.name=Andesite Stairs
tile.mmm.deco.stairs.hevea.name=Hevea Wood Stairs
tile.mmm.deco.stairs.bamboo.name=Bamboo Wood Stairs
tile.mmm.deco.slabs.granite.name=Granite Slab
tile.mmm.deco.slabs.diorite.name=Diorite Slab
tile.mmm.deco.slabs.andesite.name=Andesite Slab
tile.mmm.deco.slabs.hevea.name=Hevea Wood Slab
tile.mmm.deco.slabs.bamboo.name=Bamboo Wood Slab
tile.mmm.deco.fence.hevea.name=Hevea Fence
tile.mmm.deco.fence.gate.hevea.name=Hevea Fence Gate
tile.mmm.deco.fence.bamboo.name=Bamboo Fence

2
src/resources/assets/mmm/models/block/deco/slabs/andesite/bottom.json
View file

@ -3,6 +3,6 @@
"textures": {
"bottom": "minecraft:blocks/stone_andesite_smooth",
"top": "minecraft:blocks/stone_andesite_smooth",
"side": "mmm:blocks/deco/slabs/andesite_side"
"side": "mmm:blocks/deco/slabs/andesite"
}
}

2
src/resources/assets/mmm/models/block/deco/slabs/andesite/double.json
View file

@ -2,6 +2,6 @@
"parent": "minecraft:block/cube_column",
"textures": {
"end": "minecraft:blocks/stone_andesite_smooth",
"side": "mmm:blocks/deco/slabs/andesite_side"
"side": "mmm:blocks/deco/slabs/andesite"
}
}

2
src/resources/assets/mmm/models/block/deco/slabs/andesite/top.json
View file

@ -3,6 +3,6 @@
"textures": {
"bottom": "minecraft:blocks/stone_andesite_smooth",
"top": "minecraft:blocks/stone_andesite_smooth",
"side": "mmm:blocks/deco/slabs/andesite_side"
"side": "mmm:blocks/deco/slabs/andesite"
}
}

8
src/resources/assets/mmm/models/block/deco/slabs/basalt/bottom.json Normal file
View file

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

7
src/resources/assets/mmm/models/block/deco/slabs/basalt/double.json Normal file
View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column",
"textures": {
"end": "mmm:blocks/deco/smoothstone/basalt",
"side": "mmm:blocks/deco/slabs/basalt"
}
}

8
src/resources/assets/mmm/models/block/deco/slabs/basalt/top.json Normal file
View file

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

2
src/resources/assets/mmm/models/block/deco/slabs/diorite/bottom.json
View file

@ -3,6 +3,6 @@
"textures": {
"bottom": "minecraft:blocks/stone_diorite_smooth",
"top": "minecraft:blocks/stone_diorite_smooth",
"side": "mmm:blocks/deco/slabs/diorite_side"
"side": "mmm:blocks/deco/slabs/diorite"
}
}

2
src/resources/assets/mmm/models/block/deco/slabs/diorite/double.json
View file

@ -2,6 +2,6 @@
"parent": "minecraft:block/cube_column",
"textures": {
"end": "minecraft:blocks/stone_diorite_smooth",
"side": "mmm:blocks/deco/slabs/diorite_side"
"side": "mmm:blocks/deco/slabs/diorite"
}
}

2
src/resources/assets/mmm/models/block/deco/slabs/diorite/top.json
View file

@ -3,6 +3,6 @@
"textures": {
"bottom": "minecraft:blocks/stone_diorite_smooth",
"top": "minecraft:blocks/stone_diorite_smooth",
"side": "mmm:blocks/deco/slabs/diorite_side"
"side": "mmm:blocks/deco/slabs/diorite"
}
}

2
src/resources/assets/mmm/models/block/deco/slabs/granite/bottom.json
View file

@ -3,6 +3,6 @@
"textures": {
"bottom": "minecraft:blocks/stone_granite_smooth",
"top": "minecraft:blocks/stone_granite_smooth",
"side": "mmm:blocks/deco/slabs/granite_side"
"side": "mmm:blocks/deco/slabs/granite"
}
}

2
src/resources/assets/mmm/models/block/deco/slabs/granite/double.json
View file

@ -2,6 +2,6 @@
"parent": "minecraft:block/cube_column",
"textures": {
"end": "minecraft:blocks/stone_granite_smooth",
"side": "mmm:blocks/deco/slabs/granite_side"
"side": "mmm:blocks/deco/slabs/granite"
}
}

2
src/resources/assets/mmm/models/block/deco/slabs/granite/top.json
View file

@ -3,6 +3,6 @@
"textures": {
"bottom": "minecraft:blocks/stone_granite_smooth",
"top": "minecraft:blocks/stone_granite_smooth",
"side": "mmm:blocks/deco/slabs/granite_side"
"side": "mmm:blocks/deco/slabs/granite"
}
}

8
src/resources/assets/mmm/models/block/deco/slabs/limestone/bottom.json Normal file
View file

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

7
src/resources/assets/mmm/models/block/deco/slabs/limestone/double.json Normal file
View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column",
"textures": {
"end": "mmm:blocks/deco/smoothstone/limestone",
"side": "mmm:blocks/deco/slabs/limestone"
}
}

8
src/resources/assets/mmm/models/block/deco/slabs/limestone/top.json Normal file
View file

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

8
src/resources/assets/mmm/models/block/deco/slabs/slate/bottom.json Normal file
View file

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

7
src/resources/assets/mmm/models/block/deco/slabs/slate/double.json Normal file
View file

@ -0,0 +1,7 @@
{
"parent": "minecraft:block/cube_column",
"textures": {
"end": "mmm:blocks/deco/smoothstone/slate",
"side": "mmm:blocks/deco/slabs/slate"
}
}

8
src/resources/assets/mmm/models/block/deco/slabs/slate/top.json Normal file
View file

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

3
src/resources/assets/mmm/models/item/deco/slabs/basalt.json Normal file
View file

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

3
src/resources/assets/mmm/models/item/deco/slabs/limestone.json Normal file
View file

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

3
src/resources/assets/mmm/models/item/deco/slabs/slate.json Normal file
View file

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

0
src/resources/assets/mmm/textures/blocks/deco/slabs/andesite_side.png → src/resources/assets/mmm/textures/blocks/deco/slabs/andesite.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 746 B

After

Width:  |  Height:  |  Size: 746 B

BIN
src/resources/assets/mmm/textures/blocks/deco/slabs/basalt.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 506 B

0
src/resources/assets/mmm/textures/blocks/deco/slabs/diorite_side.png → src/resources/assets/mmm/textures/blocks/deco/slabs/diorite.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 608 B

After

Width:  |  Height:  |  Size: 608 B

0
src/resources/assets/mmm/textures/blocks/deco/slabs/granite_side.png → src/resources/assets/mmm/textures/blocks/deco/slabs/granite.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 473 B

After

Width:  |  Height:  |  Size: 473 B

BIN
src/resources/assets/mmm/textures/blocks/deco/slabs/limestone.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 539 B

BIN
src/resources/assets/mmm/textures/blocks/deco/slabs/slate.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 421 B