-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Asset/data stuff, file reformats, misc other changes.
- Reformatted most blockstates and loot tables to remove inconsistent/unnecessary tabs, spaces, and newlines - Portal Gun skins and other nbt-dependent things now show up in the "Other Testing Elements" creative tab when the Operator Items Tab setting is enabled. Once skins for props such as turrets are added, this will likely become its own operator tab. - Added 5 more Portal Gun Skins: -- 2005 Beta Portal Gun -- Blueprint Portal Gun (from Aperture Investment Opportunity: Boots) -- Bendy's Portal Gun (from the Portal 1 reveal trailer) -- 2D Portal Guns (default + striped variants) -- LEGO Portal Gun (from LEGO Dimensions) - Added various vanilla metal blocks to the bullet_hole_metal tag - Added Beacons to the bullet_hole_glass tag - Removed Light Bridge Emitters from the bullet_hole_concrete tag, as they no longer have a block behind them in their model - Fixed certain faces on the radio being flipped - Fixed some wonky tiling with some of the portal 1 office concrete textures - Removed an unused texture - Changed the break particles of a few blocks to match previous texture changes
- Loading branch information
1 parent
7d1e720
commit 7f5031c
Showing
269 changed files
with
7,184 additions
and
3,501 deletions.
There are no files selected for viewing
13 changes: 5 additions & 8 deletions
13
src/main/resources/assets/portalcubed/blockstates/1x1_double_crossbar.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,9 @@ | ||
{ | ||
"variants": { | ||
"":[ { "model": "portalcubed:block/1x1_double_crossbar" } | ||
|
||
|
||
"": [ | ||
{ | ||
"model": "portalcubed:block/1x1_double_crossbar" | ||
} | ||
] | ||
|
||
|
||
|
||
|
||
} | ||
} | ||
} |
13 changes: 5 additions & 8 deletions
13
src/main/resources/assets/portalcubed/blockstates/1x1_single_crossbar.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,9 @@ | ||
{ | ||
"variants": { | ||
"":[ { "model": "portalcubed:block/1x1_single_crossbar" } | ||
|
||
|
||
"": [ | ||
{ | ||
"model": "portalcubed:block/1x1_single_crossbar" | ||
} | ||
] | ||
|
||
|
||
|
||
|
||
} | ||
} | ||
} |
34 changes: 20 additions & 14 deletions
34
src/main/resources/assets/portalcubed/blockstates/aged_padded_gray_half_panel.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,24 @@ | ||
{ | ||
"variants": { | ||
"":[ | ||
{ "model": "portalcubed:block/aged_padded_gray_half_panel" }, | ||
{ "model": "portalcubed:block/aged_padded_gray_half_panel2" }, | ||
{ "model": "portalcubed:block/aged_padded_gray_half_panel3" }, | ||
{ "model": "portalcubed:block/aged_padded_gray_half_panel4" }, | ||
{ "model": "portalcubed:block/aged_padded_gray_half_panel5" }, | ||
{ "model": "portalcubed:block/aged_padded_gray_half_panel6" } | ||
|
||
|
||
"": [ | ||
{ | ||
"model": "portalcubed:block/aged_padded_gray_half_panel" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_padded_gray_half_panel2" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_padded_gray_half_panel3" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_padded_gray_half_panel4" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_padded_gray_half_panel5" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_padded_gray_half_panel6" | ||
} | ||
] | ||
|
||
|
||
|
||
|
||
} | ||
} | ||
} |
32 changes: 20 additions & 12 deletions
32
src/main/resources/assets/portalcubed/blockstates/aged_padded_gray_panel.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,24 @@ | ||
{ | ||
"variants": { | ||
"":[ | ||
{ "model": "portalcubed:block/aged_padded_gray_panel" }, | ||
{"model": "portalcubed:block/aged_padded_gray_panel2"}, | ||
{"model": "portalcubed:block/aged_padded_gray_panel3"}, | ||
{"model": "portalcubed:block/aged_padded_gray_panel4"}, | ||
{"model": "portalcubed:block/aged_padded_gray_panel5"}, | ||
{"model": "portalcubed:block/aged_padded_gray_panel6"} | ||
"": [ | ||
{ | ||
"model": "portalcubed:block/aged_padded_gray_panel" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_padded_gray_panel2" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_padded_gray_panel3" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_padded_gray_panel4" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_padded_gray_panel5" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_padded_gray_panel6" | ||
} | ||
] | ||
|
||
|
||
|
||
|
||
} | ||
} | ||
} |
34 changes: 20 additions & 14 deletions
34
src/main/resources/assets/portalcubed/blockstates/aged_smooth_gray_half_panel.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,24 @@ | ||
{ | ||
"variants": { | ||
"":[ | ||
{ "model": "portalcubed:block/aged_smooth_gray_half_panel" }, | ||
{ "model": "portalcubed:block/aged_smooth_gray_half_panel2" }, | ||
{ "model": "portalcubed:block/aged_smooth_gray_half_panel3" }, | ||
{ "model": "portalcubed:block/aged_smooth_gray_half_panel4" }, | ||
{ "model": "portalcubed:block/aged_smooth_gray_half_panel5" }, | ||
{ "model": "portalcubed:block/aged_smooth_gray_half_panel6" } | ||
|
||
|
||
"": [ | ||
{ | ||
"model": "portalcubed:block/aged_smooth_gray_half_panel" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_smooth_gray_half_panel2" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_smooth_gray_half_panel3" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_smooth_gray_half_panel4" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_smooth_gray_half_panel5" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_smooth_gray_half_panel6" | ||
} | ||
] | ||
|
||
|
||
|
||
|
||
} | ||
} | ||
} |
36 changes: 23 additions & 13 deletions
36
src/main/resources/assets/portalcubed/blockstates/aged_smooth_gray_panel.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,27 @@ | ||
{ | ||
"variants": { | ||
"":[ | ||
{ "model": "portalcubed:block/aged_smooth_gray_panel" }, | ||
{ "model": "portalcubed:block/aged_smooth_gray_panel2" }, | ||
{ "model": "portalcubed:block/aged_smooth_gray_panel3" }, | ||
{ "model": "portalcubed:block/aged_smooth_gray_panel3" }, | ||
{ "model": "portalcubed:block/aged_smooth_gray_panel4" }, | ||
{ "model": "portalcubed:block/aged_smooth_gray_panel5" }, | ||
{ "model": "portalcubed:block/aged_smooth_gray_panel6" } | ||
"": [ | ||
{ | ||
"model": "portalcubed:block/aged_smooth_gray_panel" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_smooth_gray_panel2" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_smooth_gray_panel3" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_smooth_gray_panel3" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_smooth_gray_panel4" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_smooth_gray_panel5" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_smooth_gray_panel6" | ||
} | ||
] | ||
|
||
|
||
|
||
|
||
} | ||
} | ||
} |
13 changes: 5 additions & 8 deletions
13
src/main/resources/assets/portalcubed/blockstates/aged_white_checkered_panel.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,9 @@ | ||
{ | ||
"variants": { | ||
"":[ { "model": "portalcubed:block/aged_white_checkered_panel" } | ||
|
||
|
||
"": [ | ||
{ | ||
"model": "portalcubed:block/aged_white_checkered_panel" | ||
} | ||
] | ||
|
||
|
||
|
||
|
||
} | ||
} | ||
} |
75 changes: 47 additions & 28 deletions
75
src/main/resources/assets/portalcubed/blockstates/aged_white_half_panel.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,32 +1,51 @@ | ||
{ | ||
"variants": { | ||
"":[ | ||
{ "model": "portalcubed:block/aged_white_half_panel" }, | ||
{ "model": "portalcubed:block/aged_white_half_panel" }, | ||
{ "model": "portalcubed:block/aged_white_half_panel" }, | ||
|
||
{ "model": "portalcubed:block/aged_white_half_panel2" }, | ||
|
||
{ "model": "portalcubed:block/aged_white_half_panel3" }, | ||
{ "model": "portalcubed:block/aged_white_half_panel3" }, | ||
{ "model": "portalcubed:block/aged_white_half_panel3" }, | ||
|
||
{ "model": "portalcubed:block/aged_white_half_panel4" }, | ||
{ "model": "portalcubed:block/aged_white_half_panel4" }, | ||
|
||
{ "model": "portalcubed:block/aged_white_half_panel5" }, | ||
|
||
{ "model": "portalcubed:block/aged_white_half_panel6" }, | ||
{ "model": "portalcubed:block/aged_white_half_panel6" }, | ||
{ "model": "portalcubed:block/aged_white_half_panel6" }, | ||
{ "model": "portalcubed:block/aged_white_half_panel6" }, | ||
{ "model": "portalcubed:block/aged_white_half_panel6" } | ||
|
||
|
||
"": [ | ||
{ | ||
"model": "portalcubed:block/aged_white_half_panel" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_half_panel" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_half_panel" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_half_panel2" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_half_panel3" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_half_panel3" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_half_panel3" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_half_panel4" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_half_panel4" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_half_panel5" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_half_panel6" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_half_panel6" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_half_panel6" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_half_panel6" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_half_panel6" | ||
} | ||
] | ||
|
||
|
||
|
||
|
||
} | ||
} | ||
} |
30 changes: 17 additions & 13 deletions
30
src/main/resources/assets/portalcubed/blockstates/aged_white_panel.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,21 @@ | ||
{ | ||
"variants": { | ||
"":[ { "model": "portalcubed:block/aged_white_panel" }, | ||
{ "model": "portalcubed:block/aged_white_panel2" }, | ||
{ "model": "portalcubed:block/aged_white_panel3" }, | ||
{ "model": "portalcubed:block/aged_white_panel4" }, | ||
{ "model": "portalcubed:block/aged_white_panel5" } | ||
|
||
|
||
|
||
"": [ | ||
{ | ||
"model": "portalcubed:block/aged_white_panel" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_panel2" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_panel3" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_panel4" | ||
}, | ||
{ | ||
"model": "portalcubed:block/aged_white_panel5" | ||
} | ||
] | ||
|
||
|
||
|
||
|
||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 5 additions & 8 deletions
13
src/main/resources/assets/portalcubed/blockstates/blue_office_concrete.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,9 @@ | ||
{ | ||
"variants": { | ||
"":[ { "model": "portalcubed:block/blue_office_concrete" } | ||
|
||
|
||
"": [ | ||
{ | ||
"model": "portalcubed:block/blue_office_concrete" | ||
} | ||
] | ||
|
||
|
||
|
||
|
||
} | ||
} | ||
} |
13 changes: 5 additions & 8 deletions
13
src/main/resources/assets/portalcubed/blockstates/capped_office_concrete.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,9 @@ | ||
{ | ||
"variants": { | ||
"":[ { "model": "portalcubed:block/capped_vertical_office_concrete" } | ||
|
||
|
||
"": [ | ||
{ | ||
"model": "portalcubed:block/capped_vertical_office_concrete" | ||
} | ||
] | ||
|
||
|
||
|
||
|
||
} | ||
} | ||
} |
Oops, something went wrong.