Skip to content

Commit 246157b

Browse files
AzzyypaarasAzzyypaaras
committed
Sculpting a new world
* Renamed rotten ground to flayed earth * Added slake paesian * started major changes to how dragonrot generates
1 parent 02d4808 commit 246157b

File tree

57 files changed

+313
-102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+313
-102
lines changed

‎src/main/generated/assets/spectrum/blockstates/flayed_earth.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"variants": {
3+
"": [
4+
{
5+
"model": "spectrum:block/flayed_earth"
6+
},
7+
{
8+
"model": "spectrum:block/flayed_earth_1"
9+
},
10+
{
11+
"model": "spectrum:block/flayed_earth_2"
12+
}
13+
]
14+
}
15+
}

‎src/main/generated/assets/spectrum/blockstates/rotten_ground.json‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/main/generated/assets/spectrum/blockstates/slake_paesian.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"variants": {
3+
"": [
4+
{
5+
"model": "spectrum:block/slake_paesian"
6+
},
7+
{
8+
"model": "spectrum:block/slake_paesian_1"
9+
},
10+
{
11+
"model": "spectrum:block/slake_paesian_2"
12+
}
13+
]
14+
}
15+
}

‎src/main/generated/assets/spectrum/models/block/ash2.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"parent": "minecraft:block/cube_all",
33
"textures": {
4-
<<<<<<<< HEAD:src/main/resources/assets/spectrum/models/block/rotten_ground_1.json
5-
"all": "spectrum:block/rotten_ground_1"
6-
========
74
"all": "spectrum:block/ash2"
8-
>>>>>>>> 1.21.1-port:src/main/generated/assets/spectrum/models/block/ash2.json
95
}
106
}

‎src/main/generated/assets/spectrum/models/block/ash3.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"parent": "minecraft:block/cube_all",
33
"textures": {
4-
<<<<<<<< HEAD:src/main/resources/assets/spectrum/models/block/rotten_ground_2.json
5-
"all": "spectrum:block/rotten_ground_2"
6-
========
74
"all": "spectrum:block/ash3"
8-
>>>>>>>> 1.21.1-port:src/main/generated/assets/spectrum/models/block/ash3.json
95
}
106
}

src/main/generated/assets/spectrum/models/block/rotten_ground.json renamed to src/main/generated/assets/spectrum/models/block/flayed_earth.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parent": "minecraft:block/cube_all",
33
"textures": {
4-
"all": "spectrum:block/rotten_ground"
4+
"all": "spectrum:block/flayed_earth"
55
}
66
}

src/main/generated/assets/spectrum/models/block/rotten_ground_1.json renamed to src/main/generated/assets/spectrum/models/block/flayed_earth_1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parent": "minecraft:block/cube_all",
33
"textures": {
4-
"all": "spectrum:block/rotten_ground_1"
4+
"all": "spectrum:block/flayed_earth_1"
55
}
66
}

src/main/generated/assets/spectrum/models/block/rotten_ground_2.json renamed to src/main/generated/assets/spectrum/models/block/flayed_earth_2.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parent": "minecraft:block/cube_all",
33
"textures": {
4-
"all": "spectrum:block/rotten_ground_2"
4+
"all": "spectrum:block/flayed_earth_2"
55
}
66
}

‎src/main/generated/assets/spectrum/models/block/slake_paesian.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"parent": "minecraft:block/cube_bottom_top",
3+
"textures": {
4+
"bottom": "spectrum:block/flayed_earth",
5+
"side": "spectrum:block/slake_paesian_side",
6+
"top": "spectrum:block/slake_paesian_top"
7+
}
8+
}

‎src/main/generated/assets/spectrum/models/block/slake_paesian_1.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"parent": "minecraft:block/cube_bottom_top",
3+
"textures": {
4+
"bottom": "spectrum:block/flayed_earth",
5+
"side": "spectrum:block/slake_paesian_side_1",
6+
"top": "spectrum:block/slake_paesian_top_1"
7+
}
8+
}

0 commit comments

Comments
 (0)