Skip to content

Set up standardized formatting for JSON and XML files #11114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Thodor12 wants to merge 1 commit into
base: version/main
Choose a base branch
from
Open

Set up standardized formatting for JSON and XML files #11114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
48 changes: 48 additions & 0 deletions .idea/codeStyles/Project.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 25 additions & 8 deletions src/main/resources/assets/minecolonies/blockstates/bell_pepper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
{"variants": {
"age=0": {"model": "minecolonies:block/crops/bell_pepper/stage0"},
"age=1": {"model": "minecolonies:block/crops/bell_pepper/stage1"},
"age=2": {"model": "minecolonies:block/crops/bell_pepper/stage2"},
"age=3": {"model": "minecolonies:block/crops/bell_pepper/stage3"},
"age=4": {"model": "minecolonies:block/crops/bell_pepper/stage4"},
"age=5": {"model": "minecolonies:block/crops/bell_pepper/stage5"},
"age=6": {"model": "minecolonies:block/crops/bell_pepper/stage6"}}}
{
"variants": {
"age=0": {
"model": "minecolonies:block/crops/bell_pepper/stage0"
},
"age=1": {
"model": "minecolonies:block/crops/bell_pepper/stage1"
},
"age=2": {
"model": "minecolonies:block/crops/bell_pepper/stage2"
},
"age=3": {
"model": "minecolonies:block/crops/bell_pepper/stage3"
},
"age=4": {
"model": "minecolonies:block/crops/bell_pepper/stage4"
},
"age=5": {
"model": "minecolonies:block/crops/bell_pepper/stage5"
},
"age=6": {
"model": "minecolonies:block/crops/bell_pepper/stage6"
}
}
}
33 changes: 11 additions & 22 deletions src/main/resources/assets/minecolonies/blockstates/blockconstructiontape.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"apply": {
"model": "minecolonies:block/blockconstructiontape_center"
}
},
{
}, {
"when": {
"north": "false",
"east": "false",
Expand All @@ -16,8 +15,7 @@
"model": "minecolonies:block/blockconstructiontape_corner",
"uvlock": true
}
},
{
}, {
"when": {
"north": "true",
"east": "false",
Expand All @@ -28,8 +26,7 @@
"model": "minecolonies:block/blockconstructiontape_corner",
"uvlock": true
}
},
{
}, {
"when": {
"north": "true",
"east": "true",
Expand All @@ -40,8 +37,7 @@
"model": "minecolonies:block/blockconstructiontape_corner",
"uvlock": true
}
},
{
}, {
"when": {
"north": "false",
"east": "true",
Expand All @@ -62,8 +58,7 @@
"model": "minecolonies:block/blockconstructiontape",
"uvlock": true
}
},
{
}, {
Copy link
Copy Markdown
Contributor

@someaddons someaddons Aug 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

those look odd, think I prefer different lines

Copy link
Copy Markdown
Contributor Author

@Thodor12 Thodor12 Aug 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately that seems to be one limitation of the Intellij formatter

"when": {
"east": "true"
},
Expand All @@ -72,8 +67,7 @@
"y": 90,
"uvlock": true
}
},
{
}, {
"when": {
"south": "true"
},
Expand All @@ -82,8 +76,7 @@
"y": 180,
"uvlock": true
}
},
{
}, {
"when": {
"west": "true"
},
Expand All @@ -92,8 +85,7 @@
"y": 270,
"uvlock": true
}
},
{
}, {
"__comment": "A compatibility condition. If you see this in 1.16+, please remove it",
"when": {
"facing": "east|west",
Expand All @@ -106,8 +98,7 @@
"model": "minecolonies:block/blockconstructiontape",
"uvlock": true
}
},
{
}, {
"__comment": "A compatibility condition. If you see this in 1.16+, please remove it",
"when": {
"facing": "east|west",
Expand All @@ -121,8 +112,7 @@
"y": 180,
"uvlock": true
}
},
{
}, {
"__comment": "A compatibility condition. If you see this in 1.16+, please remove it",
"when": {
"facing": "north|south",
Expand All @@ -136,8 +126,7 @@
"y": 90,
"uvlock": true
}
},
{
}, {
"__comment": "A compatibility condition. If you see this in 1.16+, please remove it",
"when": {
"facing": "north|south",
Expand Down
140 changes: 110 additions & 30 deletions src/main/resources/assets/minecolonies/blockstates/blockhutcitizen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,112 @@
{
"variants": {
"facing=north":[
{"model": "minecolonies:block/blockhutcitizen","y": 90,"weight": 20},
{"model": "minecolonies:block/blockhutcitizen_1","y": 90,"weight": 20},
{"model": "minecolonies:block/blockhutcitizen_2","y": 90,"weight": 20},
{"model": "minecolonies:block/blockhutcitizen_3","y": 90,"weight": 20},
{"model": "minecolonies:block/blockhutcitizen_4","y": 90,"weight": 20}
],
"facing=east":[
{"model": "minecolonies:block/blockhutcitizen","y": 180,"weight": 20},
{"model": "minecolonies:block/blockhutcitizen_1","y": 180,"weight": 20},
{"model": "minecolonies:block/blockhutcitizen_2","y": 180,"weight": 20},
{"model": "minecolonies:block/blockhutcitizen_3","y": 180,"weight": 20},
{"model": "minecolonies:block/blockhutcitizen_4","y": 180,"weight": 20}
],
"facing=south":[
{"model": "minecolonies:block/blockhutcitizen","y": 270,"weight": 20},
{"model": "minecolonies:block/blockhutcitizen_1","y": 270,"weight": 20},
{"model": "minecolonies:block/blockhutcitizen_2","y": 270,"weight": 20},
{"model": "minecolonies:block/blockhutcitizen_3","y": 270,"weight": 20},
{"model": "minecolonies:block/blockhutcitizen_4","y": 270,"weight": 20}
],
"facing=west":[
{"model": "minecolonies:block/blockhutcitizen","y": 0,"weight": 20},
{"model": "minecolonies:block/blockhutcitizen_1","y": 0,"weight": 20},
{"model": "minecolonies:block/blockhutcitizen_2","y": 0,"weight": 20},
{"model": "minecolonies:block/blockhutcitizen_3","y": 0,"weight": 20},
{"model": "minecolonies:block/blockhutcitizen_4","y": 0,"weight": 20}
]
}
"variants": {
"facing=north": [
{
"model": "minecolonies:block/blockhutcitizen",
"y": 90,
"weight": 20
},
{
"model": "minecolonies:block/blockhutcitizen_1",
"y": 90,
"weight": 20
},
{
"model": "minecolonies:block/blockhutcitizen_2",
"y": 90,
"weight": 20
},
{
"model": "minecolonies:block/blockhutcitizen_3",
"y": 90,
"weight": 20
},
{
"model": "minecolonies:block/blockhutcitizen_4",
"y": 90,
"weight": 20
}
],
"facing=east": [
{
"model": "minecolonies:block/blockhutcitizen",
"y": 180,
"weight": 20
},
{
"model": "minecolonies:block/blockhutcitizen_1",
"y": 180,
"weight": 20
},
{
"model": "minecolonies:block/blockhutcitizen_2",
"y": 180,
"weight": 20
},
{
"model": "minecolonies:block/blockhutcitizen_3",
"y": 180,
"weight": 20
},
{
"model": "minecolonies:block/blockhutcitizen_4",
"y": 180,
"weight": 20
}
],
"facing=south": [
{
"model": "minecolonies:block/blockhutcitizen",
"y": 270,
"weight": 20
},
{
"model": "minecolonies:block/blockhutcitizen_1",
"y": 270,
"weight": 20
},
{
"model": "minecolonies:block/blockhutcitizen_2",
"y": 270,
"weight": 20
},
{
"model": "minecolonies:block/blockhutcitizen_3",
"y": 270,
"weight": 20
},
{
"model": "minecolonies:block/blockhutcitizen_4",
"y": 270,
"weight": 20
}
],
"facing=west": [
{
"model": "minecolonies:block/blockhutcitizen",
"y": 0,
"weight": 20
},
{
"model": "minecolonies:block/blockhutcitizen_1",
"y": 0,
"weight": 20
},
{
"model": "minecolonies:block/blockhutcitizen_2",
"y": 0,
"weight": 20
},
{
"model": "minecolonies:block/blockhutcitizen_3",
"y": 0,
"weight": 20
},
{
"model": "minecolonies:block/blockhutcitizen_4",
"y": 0,
"weight": 20
}
]
}
}
36 changes: 18 additions & 18 deletions src/main/resources/assets/minecolonies/blockstates/blockhutnetherworker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"variants": {
"facing=east": {
"model": "minecolonies:block/blockhutnetherworker",
"y": 90
},
"facing=south": {
"model": "minecolonies:block/blockhutnetherworker",
"y": 180
},
"facing=west": {
"model": "minecolonies:block/blockhutnetherworker",
"y": 270
},
"facing=north": {
"model": "minecolonies:block/blockhutnetherworker",
"y": 0
}
"variants": {
"facing=east": {
"model": "minecolonies:block/blockhutnetherworker",
"y": 90
},
"facing=south": {
"model": "minecolonies:block/blockhutnetherworker",
"y": 180
},
"facing=west": {
"model": "minecolonies:block/blockhutnetherworker",
"y": 270
},
"facing=north": {
"model": "minecolonies:block/blockhutnetherworker",
"y": 0
}
}
}
}
Loading