Skip to content

Commit

Permalink
Merge branch 'props' of https://github.com/Fusion-Flux/Portal-Cubed-R…
Browse files Browse the repository at this point in the history 
…ewrite into props
  • Loading branch information
@maximumpower55
maximumpower55 committed Feb 3, 2024
2 parents 4049643 + 0e71d83 commit d58952e
Show file tree
Hide file tree
Showing 87 changed files with 4,536 additions and 20 deletions.
13 changes: 12 additions & 1 deletion src/main/resources/assets/portalcubed/emissives.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,16 @@
"item/legacy_portal_gun": "item/portal_gun_dyeable",
"item/legacy_portal_gun_atlas": "item/portal_gun_dyeable",
"item/legacy_portal_gun_p_body": "item/portal_gun_dyeable",
"item/legacy_portal_gun_reloaded": "item/portal_gun_dyeable"
"item/legacy_portal_gun_reloaded": "item/portal_gun_dyeable",

"item/storage_cube": "item/storage_cube_e",
"item/storage_cube_lit": "item/storage_cube_e",
"item/companion_cube": "item/storage_cube_e",
"item/companion_cube_lit": "item/storage_cube_e",
"item/redirection_cube": "item/redirection_cube_e",
"item/redirection_cube_lit": "item/redirection_cube_e",
"item/schrodinger_cube": "item/schrodinger_cube_e",
"item/schrodinger_cube_lit": "item/schrodinger_cube_e",

"item/radio": "item/radio_e"
}
49 changes: 30 additions & 19 deletions src/main/resources/assets/portalcubed/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,21 +172,41 @@

"item.portalcubed.radio": "Radio",
"item.portalcubed.beans": "Bean Can",
"item.portalcubed.cooking_pot": "Cooking Pot",
"item.portalcubed.jug": "Water Jug",
"item.portalcubed.computer": "Computer",
"item.portalcubed.chair": "Office Chair",
"item.portalcubed.mug": "Mug",
"item.portalcubed.hoopy": "Hoopy",
"item.portalcubed.lil_pineapple": "Lil' Pineapple",
"item.portalcubed.core_frame": "Core Frame",
"item.portalcubed.anger_core": "Anger Core",
"item.portalcubed.intelligence_core": "Intelligence Core",
"item.portalcubed.curiosity_core": "Curiosity Core",
"item.portalcubed.morality_core": "Morality Core",

"item.portalcubed.fact_core": "Fact Core",
"item.portalcubed.space_core": "Space Core",
"item.portalcubed.adventure_core": "Adventure Core",
"item.portalcubed.clipboard": "Clipboard",
"item.portalcubed.clipboard_blank": "Blank Clipboard",
"item.portalcubed.clipboard_chell": "Test Subject Clipboard",
"item.portalcubed.clipboard_chicken": "Chicken Test Clipboard",
"item.portalcubed.clipboard_hazard": "Hazard Warnings Clipboard",
"item.portalcubed.clipboard_text": "Contract Clipboard",

"item.portalcubed.mug": "Mug",
"item.portalcubed.mug_red": "Red Mug",
"item.portalcubed.mug_blue": "Blue Mug",
"item.portalcubed.mug_yellow": "Yellow Mug",
"item.portalcubed.mug_white": "White Mug",

"item.portalcubed.oil_drum": "Oil Drum",
"item.portalcubed.oil_drum_blue": "Blue Oil Drum",
"item.portalcubed.oil_drum_white": "White Oil Drum",
"item.portalcubed.oil_drum_brown": "Brown Oil Drum",

"item.portalcubed.lil_pineapple": "Lil' Pineapple",
"item.portalcubed.lil_pineapple_ace": "Ace Lil' Prideapple",
"item.portalcubed.lil_pineapple_agender": "Agender Lil' Prideapple",
"item.portalcubed.lil_pineapple_aro": "Aro Lil' Prideapple",
"item.portalcubed.lil_pineapple_bi": "Bi Lil' Prideapple",
"item.portalcubed.lil_pineapple_genderfluid": "Genderfluid Lil' Prideapple",
"item.portalcubed.lil_pineapple_lesbian": "Lesbian Lil' Prideapple",
"item.portalcubed.lil_pineapple_nonbinary": "Nonbinary Lil' Prideapple",
"item.portalcubed.lil_pineapple_pan": "Pan Lil' Prideapple",
"item.portalcubed.lil_pineapple_trans": "Trans Lil' Prideapple",
"item.portalcubed.lil_pineapple_proud": "Proud Lil' Prideapple",

"item.portalcubed.portal_gun_frame": "Portal Gun Frame",
"item.portalcubed.portal_gun_casing": "Portal Gun Casing",
Expand Down Expand Up @@ -525,15 +545,6 @@
"entity.portalcubed.reflection_gel_blob": "Reflection Gel Blob",
"entity.portalcubed.repulsion_gel_blob": "Repulsion Gel Blob",

"entity.portalcubed.adventure_core": "Adventure Core",
"entity.portalcubed.anger_core": "Anger Core",
"entity.portalcubed.core_frame": "Core Frame",
"entity.portalcubed.curiosity_core": "Curiosity Core",
"entity.portalcubed.fact_core": "Fact Core",
"entity.portalcubed.intelligence_core": "Intelligence Core",
"entity.portalcubed.morality_core": "Morality Core",
"entity.portalcubed.space_core": "Space Core",

"entity.portalcubed.beans": "Bean Can",
"entity.portalcubed.chair": "Office Chair",
"entity.portalcubed.computer": "Computer",
Expand Down
90 changes: 90 additions & 0 deletions src/main/resources/assets/portalcubed/models/item/beans.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
{
"credit": "Made with Blockbench by Cart3r. ",
"textures": {
"0": "portalcubed:item/beans"
},
"elements": [
{
"from": [6, 0, 6],
"to": [10, 6, 10],
"faces": {
"north": {"uv": [0, 4, 4, 10], "texture": "#0"},
"east": {"uv": [8, 4, 4, 10], "texture": "#0"},
"south": {"uv": [12, 4, 8, 10], "texture": "#0"},
"west": {"uv": [12, 4, 16, 10], "texture": "#0"},
"up": {"uv": [8, 4, 4, 0], "texture": "#0"},
"down": {"uv": [12, 4, 8, 0], "texture": "#0"}
}
},
{
"name": "cube inverted",
"from": [10, 6, 10],
"to": [6, 0, 6],
"faces": {
"north": {"uv": [16, 16, 12, 10], "texture": "#0"},
"east": {"uv": [12, 16, 16, 10], "texture": "#0"},
"south": {"uv": [16, 10, 12, 16], "texture": "#0"},
"west": {"uv": [12, 10, 16, 16], "texture": "#0"},
"up": {"uv": [8, 4, 12, 0], "texture": "#0"}
}
},
{
"from": [6, 10.24193, 9.75665],
"to": [10, 10.24193, 11.75665],
"rotation": {"angle": 45, "axis": "x", "origin": [-3, 10.24193, 5.75665]},
"faces": {
"up": {"uv": [6, 12, 2, 10], "texture": "#0"},
"down": {"uv": [6, 12, 2, 10], "texture": "#0"}
}
},
{
"from": [6, 7.33771, 8.20218],
"to": [10, 9.33771, 8.20218],
"rotation": {"angle": -22.5, "axis": "x", "origin": [8, 8.33771, 8.20218]},
"faces": {
"north": {"uv": [16, 2, 12, 0], "texture": "#0"},
"south": {"uv": [16, 2, 12, 0], "texture": "#0"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 3],
"scale": [0.75391, 0.75391, 0.75391]
},
"thirdperson_lefthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 3],
"scale": [0.75391, 0.75391, 0.75391]
},
"firstperson_righthand": {
"rotation": [-6.75, 45, 0],
"translation": [-1.5, 7, 3],
"scale": [0.75391, 0.75391, 0.75391]
},
"firstperson_lefthand": {
"rotation": [-6.75, 45, 0],
"translation": [-1.5, 7, 3],
"scale": [0.75391, 0.75391, 0.75391]
},
"ground": {
"translation": [0, 3, 0],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [30, 225, 0],
"translation": [0, 4, 0],
"scale": [1.25391, 1.25391, 1.25391]
},
"head": {
"translation": [0, 16.75, 0],
"scale": [1.31055, 1.31055, 1.31055]
},
"fixed": {
"rotation": [0, 87.25, 0],
"translation": [0, 2.75, 0],
"scale": [0.875, 0.87695, 0.875]
}
}
}
153 changes: 153 additions & 0 deletions src/main/resources/assets/portalcubed/models/item/chair.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
{
"credit": "Made with Blockbench by Cart3r. ",
"texture_size": [32, 32],
"textures": {
"0": "portalcubed:item/chair"
},
"elements": [
{
"from": [8.5, 1.5, 3.75],
"to": [8.5, 6.5, 12.75],
"rotation": {"angle": 45, "axis": "y", "origin": [8, -0.5, 8.75]},
"faces": {
"east": {"uv": [0.008, 4.508, 4.484, 6.984], "texture": "#0"},
"west": {"uv": [0.008, 4.508, 4.484, 6.984], "texture": "#0"}
}
},
{
"from": [7.5, 1.5, 3.75],
"to": [7.5, 6.5, 12.75],
"rotation": {"angle": -45, "axis": "y", "origin": [8, -0.5, 8.75]},
"faces": {
"east": {"uv": [4.484, 4.508, 0.008, 6.984], "texture": "#0"},
"west": {"uv": [4.484, 4.508, 0.008, 6.984], "texture": "#0"}
}
},
{
"from": [4.56802, 6.5, 4.47487],
"to": [11.56802, 7.5, 11.47487],
"rotation": {"angle": 0, "axis": "y", "origin": [4.81802, 7.5, 11.22487]},
"faces": {
"north": {"uv": [0.016, 3.508, 3.484, 3.984], "texture": "#0"},
"east": {"uv": [3.516, 3.508, 6.984, 3.984], "texture": "#0"},
"south": {"uv": [7.016, 3.508, 10.484, 3.984], "texture": "#0"},
"west": {"uv": [10.516, 3.508, 13.984, 3.984], "texture": "#0"},
"up": {"uv": [6.984, 3.5, 3.508, 0.016], "texture": "#0"},
"down": {"uv": [10.484, 3.5, 7.008, 0.016], "texture": "#0"}
}
},
{
"from": [10.56802, 11.5, 4.47487],
"to": [11.56802, 15.5, 11.47487],
"rotation": {"angle": 0, "axis": "z", "origin": [8.06802, 7, 7.97487]},
"faces": {
"north": {"uv": [0.016, 7.508, 0.484, 9.484], "texture": "#0"},
"east": {"uv": [4.508, 9.484, 7.984, 7.508], "texture": "#0"},
"south": {"uv": [4.016, 7.508, 4.484, 9.484], "texture": "#0"},
"west": {"uv": [0.508, 9.484, 3.984, 7.508], "texture": "#0"},
"up": {"uv": [3.984, 7.484, 0.508, 7.008], "rotation": 90, "texture": "#0"},
"down": {"uv": [7.484, 7.484, 4.008, 7.008], "rotation": 90, "texture": "#0"}
}
},
{
"from": [11.56802, 7.5, 6.97487],
"to": [11.56802, 11.5, 8.97487],
"rotation": {"angle": 0, "axis": "z", "origin": [8.06802, 7, 7.97487]},
"faces": {
"east": {"uv": [10.508, 5.984, 11.484, 4.008], "texture": "#0"},
"west": {"uv": [10.508, 5.984, 11.484, 4.008], "texture": "#0"}
}
},
{
"from": [7, 0, 2.25],
"to": [8, 2, 4.25],
"rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 7.25]},
"faces": {
"north": {"uv": [1.008, 0.508, 1.484, 1.484], "texture": "#0"},
"east": {"uv": [2.484, 0.508, 1.508, 1.484], "texture": "#0"},
"south": {"uv": [2.508, 1.484, 2.984, 0.508], "texture": "#0"},
"west": {"uv": [0.008, 0.508, 0.984, 1.484], "texture": "#0"},
"up": {"uv": [0.508, 0.484, 1.484, 0.008], "rotation": 90, "texture": "#0"},
"down": {"uv": [1.508, 0.484, 2.484, 0.008], "rotation": 90, "texture": "#0"}
}
},
{
"from": [8, 0, 2.25],
"to": [9, 2, 4.25],
"rotation": {"angle": -45, "axis": "y", "origin": [8, 0, 7.25]},
"faces": {
"north": {"uv": [1.484, 0.508, 1.008, 1.484], "texture": "#0"},
"east": {"uv": [0.984, 0.508, 0.008, 1.484], "texture": "#0"},
"south": {"uv": [2.984, 1.484, 2.508, 0.508], "texture": "#0"},
"west": {"uv": [1.508, 0.508, 2.484, 1.484], "texture": "#0"},
"up": {"uv": [0.508, 0.008, 1.484, 0.484], "rotation": 90, "texture": "#0"},
"down": {"uv": [1.508, 0.008, 2.484, 0.484], "rotation": 90, "texture": "#0"}
}
},
{
"from": [8, 0, 11.75],
"to": [9, 2, 13.75],
"rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8.75]},
"faces": {
"north": {"uv": [2.508, 1.484, 2.984, 0.508], "texture": "#0"},
"east": {"uv": [0.008, 0.508, 0.984, 1.484], "texture": "#0"},
"south": {"uv": [1.008, 0.508, 1.484, 1.484], "texture": "#0"},
"west": {"uv": [2.484, 0.508, 1.508, 1.484], "texture": "#0"},
"up": {"uv": [1.484, 0.008, 0.508, 0.484], "rotation": 90, "texture": "#0"},
"down": {"uv": [2.484, 0.008, 1.508, 0.484], "rotation": 90, "texture": "#0"}
}
},
{
"from": [7, 0, 11.75],
"to": [8, 2, 13.75],
"rotation": {"angle": -45, "axis": "y", "origin": [8, 0, 8.75]},
"faces": {
"north": {"uv": [2.984, 1.484, 2.508, 0.508], "texture": "#0"},
"east": {"uv": [1.508, 0.508, 2.484, 1.484], "texture": "#0"},
"south": {"uv": [1.484, 0.508, 1.008, 1.484], "texture": "#0"},
"west": {"uv": [0.984, 0.508, 0.008, 1.484], "texture": "#0"},
"up": {"uv": [1.484, 0.484, 0.508, 0.008], "rotation": 90, "texture": "#0"},
"down": {"uv": [2.484, 0.484, 1.508, 0.008], "rotation": 90, "texture": "#0"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.79883, 0.79883, 0.79883]
},
"thirdperson_lefthand": {
"rotation": [75, 45, 0],
"translation": [0, 2.5, 0],
"scale": [0.79883, 0.79883, 0.79883]
},
"firstperson_righthand": {
"rotation": [0, 45, 0],
"translation": [0, 3.5, 0],
"scale": [0.65391, 0.65391, 0.65391]
},
"firstperson_lefthand": {
"rotation": [-180, -54.75, 180],
"translation": [0, 3.5, 0],
"scale": [0.65391, 0.65391, 0.65391]
},
"ground": {
"translation": [0, 3, 0],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [30, 136, 0],
"translation": [0, 0.5, 0],
"scale": [0.79688, 0.79688, 0.79688]
},
"head": {
"rotation": [3.25, -88.25, -180],
"translation": [0, 5.75, -2.5],
"scale": [1.65039, 1.65039, 1.65039]
},
"fixed": {
"scale": [0.97461, 0.97461, 0.97461]
}
}
}
Loading

0 comments on commit d58952e

Please sign in to comment.