Skip to content

Commit 89839e3

Browse files
bangettobangetto
committed
26.2 to 26.1 backport
1 parent e940385 commit 89839e3

25 files changed

Lines changed: 542 additions & 0 deletions

‎backport_to_26_1/assets/minecraft/items/brick_slab.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"model": {
3+
"type": "minecraft:select",
4+
"property": "minecraft:custom_model_data",
5+
"index": 0,
6+
"cases": [
7+
{
8+
"when": "minecraft:cinnabar_brick_slab",
9+
"model": {
10+
"type": "minecraft:model",
11+
"model": "minecraft:block/cinnabar_brick_slab"
12+
}
13+
}
14+
],
15+
"fallback": {
16+
"type": "minecraft:model",
17+
"model": "minecraft:block/brick_slab"
18+
}
19+
}
20+
}

‎backport_to_26_1/assets/minecraft/items/brick_stairs.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"model": {
3+
"type": "minecraft:select",
4+
"property": "minecraft:custom_model_data",
5+
"index": 0,
6+
"cases": [
7+
{
8+
"when": "minecraft:cinnabar_brick_stairs",
9+
"model": {
10+
"type": "minecraft:model",
11+
"model": "minecraft:block/cinnabar_brick_stairs"
12+
}
13+
}
14+
],
15+
"fallback": {
16+
"type": "minecraft:model",
17+
"model": "minecraft:block/brick_stairs"
18+
}
19+
}
20+
}

‎backport_to_26_1/assets/minecraft/items/brick_wall.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"model": {
3+
"type": "minecraft:select",
4+
"property": "minecraft:custom_model_data",
5+
"index": 0,
6+
"cases": [
7+
{
8+
"when": "minecraft:cinnabar_brick_wall",
9+
"model": {
10+
"type": "minecraft:model",
11+
"model": "minecraft:block/cinnabar_brick_wall_inventory"
12+
}
13+
}
14+
],
15+
"fallback": {
16+
"type": "minecraft:model",
17+
"model": "minecraft:block/brick_wall_inventory"
18+
}
19+
}
20+
}

‎backport_to_26_1/assets/minecraft/items/bricks.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"model": {
3+
"type": "minecraft:select",
4+
"property": "minecraft:custom_model_data",
5+
"index": 0,
6+
"cases": [
7+
{
8+
"when": "minecraft:cinnabar_bricks",
9+
"model": {
10+
"type": "minecraft:model",
11+
"model": "minecraft:block/cinnabar_bricks"
12+
}
13+
}
14+
],
15+
"fallback": {
16+
"type": "minecraft:model",
17+
"model": "minecraft:block/bricks"
18+
}
19+
}
20+
}

‎backport_to_26_1/assets/minecraft/items/chiseled_copper.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"model": {
3+
"type": "minecraft:select",
4+
"property": "minecraft:custom_model_data",
5+
"index": 0,
6+
"cases": [
7+
{
8+
"when": "minecraft:chiseled_cinnabar",
9+
"model": {
10+
"type": "minecraft:model",
11+
"model": "minecraft:block/chiseled_cinnabar"
12+
}
13+
}
14+
],
15+
"fallback": {
16+
"type": "minecraft:model",
17+
"model": "minecraft:block/chiseled_copper"
18+
}
19+
}
20+
}

‎backport_to_26_1/assets/minecraft/items/chiseled_sandstone.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"model": {
3+
"type": "minecraft:select",
4+
"property": "minecraft:custom_model_data",
5+
"index": 0,
6+
"cases": [
7+
{
8+
"when": "minecraft:chiseled_sulfur",
9+
"model": {
10+
"type": "minecraft:model",
11+
"model": "minecraft:block/chiseled_sulfur"
12+
}
13+
}
14+
],
15+
"fallback": {
16+
"type": "minecraft:model",
17+
"model": "minecraft:block/chiseled_sandstone"
18+
}
19+
}
20+
}

‎backport_to_26_1/assets/minecraft/items/end_stone.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"model": {
3+
"type": "minecraft:select",
4+
"property": "minecraft:custom_model_data",
5+
"index": 0,
6+
"cases": [
7+
{
8+
"when": "minecraft:potent_sulfur",
9+
"model": {
10+
"type": "minecraft:model",
11+
"model": "minecraft:block/potent_sulfur"
12+
}
13+
}
14+
],
15+
"fallback": {
16+
"type": "minecraft:model",
17+
"model": "minecraft:block/end_stone"
18+
}
19+
}
20+
}

‎backport_to_26_1/assets/minecraft/items/end_stone_brick_slab.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"model": {
3+
"type": "minecraft:select",
4+
"property": "minecraft:custom_model_data",
5+
"index": 0,
6+
"cases": [
7+
{
8+
"when": "minecraft:sulfur_brick_slab",
9+
"model": {
10+
"type": "minecraft:model",
11+
"model": "minecraft:block/sulfur_brick_slab"
12+
}
13+
}
14+
],
15+
"fallback": {
16+
"type": "minecraft:model",
17+
"model": "minecraft:block/end_stone_brick_slab"
18+
}
19+
}
20+
}

‎backport_to_26_1/assets/minecraft/items/end_stone_brick_stairs.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"model": {
3+
"type": "minecraft:select",
4+
"property": "minecraft:custom_model_data",
5+
"index": 0,
6+
"cases": [
7+
{
8+
"when": "minecraft:sulfur_brick_stairs",
9+
"model": {
10+
"type": "minecraft:model",
11+
"model": "minecraft:block/sulfur_brick_stairs"
12+
}
13+
}
14+
],
15+
"fallback": {
16+
"type": "minecraft:model",
17+
"model": "minecraft:block/end_stone_brick_stairs"
18+
}
19+
}
20+
}

‎backport_to_26_1/assets/minecraft/items/end_stone_brick_wall.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"model": {
3+
"type": "minecraft:select",
4+
"property": "minecraft:custom_model_data",
5+
"index": 0,
6+
"cases": [
7+
{
8+
"when": "minecraft:sulfur_brick_wall",
9+
"model": {
10+
"type": "minecraft:model",
11+
"model": "minecraft:block/sulfur_brick_wall_inventory"
12+
}
13+
}
14+
],
15+
"fallback": {
16+
"type": "minecraft:model",
17+
"model": "minecraft:block/end_stone_brick_wall_inventory"
18+
}
19+
}
20+
}

0 commit comments

Comments
 (0)