Skip to content

Commit

Permalink
Asset/data stuff, file reformats, misc other changes.
Browse files Browse the repository at this point in the history
- 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
Cart3r1234 committed Oct 17, 2023
1 parent 7d1e720 commit 7f5031c
Show file tree
Hide file tree
Showing 269 changed files with 7,184 additions and 3,501 deletions.
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"
}
]




}
}
}
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"
}
]




}
}
}
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"
}
]




}
}
}
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"
}
]




}
}
}
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"
}
]




}
}
}
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"
}
]




}
}
}
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"
}
]




}
}
}
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"
}
]




}
}
}
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"
}
]




}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@
"model": "portalcubed:block/beta_faith_plate",
"y": 270
},


"facing=down,horifacing=south": {
"model": "portalcubed:block/beta_faith_plate",
"y": 180,
Expand All @@ -57,4 +55,4 @@
"x": 180
}
}
}
}
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"
}
]




}
}
}
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"
}
]




}
}
}
Loading

0 comments on commit 7f5031c

Please sign in to comment.