diff --git a/TODO.txt b/TODO.txt index a22d2b0..34674bf 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,6 +1,5 @@ Part ASM? Description ------------------------------------------------------------------------------------------------------- -deco No Granite/diorite/andesite slab textures deco No Armchairs deco No Thrones ------------------------------------------------------------------------------------------------------- diff --git a/src/resources/assets/mmm/models/block/deco/slabs/andesite/bottom.json b/src/resources/assets/mmm/models/block/deco/slabs/andesite/bottom.json index 4361a8e..0523df6 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/andesite/bottom.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/andesite/bottom.json @@ -3,6 +3,6 @@ "textures": { "bottom": "minecraft:blocks/stone_andesite_smooth", "top": "minecraft:blocks/stone_andesite_smooth", - "side": "minecraft:blocks/stone_andesite_smooth" + "side": "mmm:blocks/deco/slabs/andesite_side" } } diff --git a/src/resources/assets/mmm/models/block/deco/slabs/andesite/double.json b/src/resources/assets/mmm/models/block/deco/slabs/andesite/double.json index 28f0d36..40ada33 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/andesite/double.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/andesite/double.json @@ -2,6 +2,6 @@ "parent": "minecraft:block/cube_column", "textures": { "end": "minecraft:blocks/stone_andesite_smooth", - "side": "minecraft:blocks/stone_andesite_smooth" + "side": "mmm:blocks/deco/slabs/andesite_side" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/slabs/andesite/top.json b/src/resources/assets/mmm/models/block/deco/slabs/andesite/top.json index e0c29a8..caa36db 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/andesite/top.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/andesite/top.json @@ -3,6 +3,6 @@ "textures": { "bottom": "minecraft:blocks/stone_andesite_smooth", "top": "minecraft:blocks/stone_andesite_smooth", - "side": "minecraft:blocks/stone_andesite_smooth" + "side": "mmm:blocks/deco/slabs/andesite_side" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/slabs/diorite/bottom.json b/src/resources/assets/mmm/models/block/deco/slabs/diorite/bottom.json index 8db4067..a15608f 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/diorite/bottom.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/diorite/bottom.json @@ -3,6 +3,6 @@ "textures": { "bottom": "minecraft:blocks/stone_diorite_smooth", "top": "minecraft:blocks/stone_diorite_smooth", - "side": "minecraft:blocks/stone_diorite_smooth" + "side": "mmm:blocks/deco/slabs/diorite_side" } } diff --git a/src/resources/assets/mmm/models/block/deco/slabs/diorite/double.json b/src/resources/assets/mmm/models/block/deco/slabs/diorite/double.json index 99fba90..f0d9b78 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/diorite/double.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/diorite/double.json @@ -2,6 +2,6 @@ "parent": "minecraft:block/cube_column", "textures": { "end": "minecraft:blocks/stone_diorite_smooth", - "side": "minecraft:blocks/stone_diorite_smooth" + "side": "mmm:blocks/deco/slabs/diorite_side" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/slabs/diorite/top.json b/src/resources/assets/mmm/models/block/deco/slabs/diorite/top.json index 6a5e706..27f90f2 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/diorite/top.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/diorite/top.json @@ -3,6 +3,6 @@ "textures": { "bottom": "minecraft:blocks/stone_diorite_smooth", "top": "minecraft:blocks/stone_diorite_smooth", - "side": "minecraft:blocks/stone_diorite_smooth" + "side": "mmm:blocks/deco/slabs/diorite_side" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/slabs/granite/bottom.json b/src/resources/assets/mmm/models/block/deco/slabs/granite/bottom.json index 6cc3717..09e68b4 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/granite/bottom.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/granite/bottom.json @@ -3,6 +3,6 @@ "textures": { "bottom": "minecraft:blocks/stone_granite_smooth", "top": "minecraft:blocks/stone_granite_smooth", - "side": "minecraft:blocks/stone_granite_smooth" + "side": "mmm:blocks/deco/slabs/granite_side" } } diff --git a/src/resources/assets/mmm/models/block/deco/slabs/granite/double.json b/src/resources/assets/mmm/models/block/deco/slabs/granite/double.json index b6fef9f..6e3ce26 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/granite/double.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/granite/double.json @@ -2,6 +2,6 @@ "parent": "minecraft:block/cube_column", "textures": { "end": "minecraft:blocks/stone_granite_smooth", - "side": "minecraft:blocks/stone_granite_smooth" + "side": "mmm:blocks/deco/slabs/granite_side" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/models/block/deco/slabs/granite/top.json b/src/resources/assets/mmm/models/block/deco/slabs/granite/top.json index 89d4f73..c8856bb 100644 --- a/src/resources/assets/mmm/models/block/deco/slabs/granite/top.json +++ b/src/resources/assets/mmm/models/block/deco/slabs/granite/top.json @@ -3,6 +3,6 @@ "textures": { "bottom": "minecraft:blocks/stone_granite_smooth", "top": "minecraft:blocks/stone_granite_smooth", - "side": "minecraft:blocks/stone_granite_smooth" + "side": "mmm:blocks/deco/slabs/granite_side" } } \ No newline at end of file diff --git a/src/resources/assets/mmm/textures/blocks/deco/slabs/andesite_side.png b/src/resources/assets/mmm/textures/blocks/deco/slabs/andesite_side.png new file mode 100644 index 0000000..4e87b24 Binary files /dev/null and b/src/resources/assets/mmm/textures/blocks/deco/slabs/andesite_side.png differ diff --git a/src/resources/assets/mmm/textures/blocks/deco/slabs/diorite_side.png b/src/resources/assets/mmm/textures/blocks/deco/slabs/diorite_side.png new file mode 100644 index 0000000..d39718f Binary files /dev/null and b/src/resources/assets/mmm/textures/blocks/deco/slabs/diorite_side.png differ diff --git a/src/resources/assets/mmm/textures/blocks/deco/slabs/granite_side.png b/src/resources/assets/mmm/textures/blocks/deco/slabs/granite_side.png new file mode 100644 index 0000000..920bcda Binary files /dev/null and b/src/resources/assets/mmm/textures/blocks/deco/slabs/granite_side.png differ