Skip to content

Commit d1cec1e

Browse files
Cart3r1234Cart3r1234
committed
portal gun workstation assets
- "average commit adds 12 gui sprites" factoid is actually just statistical error. textures georg, who sits in a cave and adds 250 gui textures each commit, is an outlier adn should not be counted
1 parent 04cf55b commit d1cec1e

File tree

263 files changed

+677
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

263 files changed

+677
-0
lines changed

‎src/main/resources/assets/portalcubed/blockstates/portal_gun_workstation.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"variants": {
3+
"facing=east,has_portal_gun=false": {
4+
"model": "portalcubed:block/portal_gun_workstation_empty",
5+
"y": 270
6+
},
7+
"facing=east,has_portal_gun=true": {
8+
"model": "portalcubed:block/portal_gun_workstation",
9+
"y": 270
10+
},
11+
"facing=north,has_portal_gun=false": {
12+
"model": "portalcubed:block/portal_gun_workstation_empty",
13+
"y": 180
14+
},
15+
"facing=north,has_portal_gun=true": {
16+
"model": "portalcubed:block/portal_gun_workstation",
17+
"y": 180
18+
},
19+
"facing=south,has_portal_gun=false": {
20+
"model": "portalcubed:block/portal_gun_workstation_empty"
21+
},
22+
"facing=south,has_portal_gun=true": {
23+
"model": "portalcubed:block/portal_gun_workstation"
24+
},
25+
"facing=west,has_portal_gun=false": {
26+
"model": "portalcubed:block/portal_gun_workstation_empty",
27+
"y": 90
28+
},
29+
"facing=west,has_portal_gun=true": {
30+
"model": "portalcubed:block/portal_gun_workstation",
31+
"y": 90
32+
}
33+
}
34+
}

‎src/main/resources/assets/portalcubed/emissives.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
"block/portal_1_floor_button": "block/button_emissives",
2121
"block/portal_1_floor_button_active": "block/button_emissives",
2222

23+
"block/portal_gun_workstation": "block/portal_gun_workstation_emissive",
24+
2325
"item/white_octopus_chamber_door": "item/octopus_chamber_door_emissive",
2426
"block/white_octopus_chamber_door_top_right_open": "block/chamber_door_emissive",
2527
"block/white_octopus_chamber_door_top_right_unlocked": "block/chamber_door_emissive",

‎src/main/resources/assets/portalcubed/items/portal_gun_workstation.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"model": {
3+
"type": "minecraft:model",
4+
"model": "portalcubed:block/portal_gun_workstation"
5+
}
6+
}

‎src/main/resources/assets/portalcubed/lang/en_us.json

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,37 @@
6464
"container.portalcubed.pedestal_button.offset": "Position Offset",
6565
"container.portalcubed.pedestal_button.base": "Include Base",
6666

67+
"container.portalcubed.portal_gun_workstation": "Portal Gun Workstation",
68+
"container.portalcubed.portal_gun_workstation.tab.portal_gun": "Portal Gun Settings",
69+
"container.portalcubed.portal_gun_workstation.tab.primary_portal": "Primary Portal Settings",
70+
"container.portalcubed.portal_gun_workstation.tab.secondary_portal": "Secondary Portal Settings",
71+
"container.portalcubed.portal_gun_workstation.tab.crosshair": "Crosshair Settings",
72+
"container.portalcubed.portal_gun_workstation.tab.prefabs": "Portal Gun Prefabs",
73+
"container.portalcubed.portal_gun_workstation.tab.custom": "Custom Portal Gun",
74+
75+
"container.portalcubed.portal_gun_workstation.portal_gun.preview_primary": "Preview Primary Shot",
76+
"container.portalcubed.portal_gun_workstation.portal_gun.preview_secondary": "Preview Secondary Shot",
77+
"container.portalcubed.portal_gun_workstation.portal_gun.toggle_primary": "Enable Primary portal",
78+
"container.portalcubed.portal_gun_workstation.portal_gun.toggle_secondary": "Enable secondary portal",
79+
"container.portalcubed.portal_gun_workstation.portal_gun.toggle_tracer": "Enable portal tracers",
80+
81+
"container.portalcubed.portal_gun_workstation.portal.preview_open": "Preview Open",
82+
"container.portalcubed.portal_gun_workstation.portal.preview_closed": "Preview Closed",
83+
"container.portalcubed.portal_gun_workstation.portal.preview_tracer": "Preview Tracer",
84+
"container.portalcubed.portal_gun_workstation.portal.random_color": "Randomize Color",
85+
"container.portalcubed.portal_gun_workstation.portal.reset_color": "Reset Color",
86+
"container.portalcubed.portal_gun_workstation.portal.pair_key": "Pair Key",
87+
88+
"container.portalcubed.portal_gun_workstation.crosshair.preview_primary": "Preview Primary Shot",
89+
"container.portalcubed.portal_gun_workstation.crosshair.preview_secondary": "Preview Secondary Shot",
90+
"container.portalcubed.portal_gun_workstation.crosshair.toggle_last_placed": "Enable last-placed indicator",
91+
92+
"container.portalcubed.portal_gun_workstation.locked.description": "This %s is locked! Maybe there's an advancement you can earn to unlock it...",
93+
"container.portalcubed.portal_gun_workstation.locked.portal": "portal type",
94+
"container.portalcubed.portal_gun_workstation.locked.crosshair": "crosshair",
95+
"container.portalcubed.portal_gun_workstation.locked.portal_gun": "portal gun",
96+
"container.portalcubed.portal_gun_workstation.locked.prefab": "prefab",
97+
6798

6899
"signage.portalcubed.large_signage.adhesion_gel": "Adhesion Gel",
69100
"signage.portalcubed.large_signage.cake": "Cake",
@@ -1116,6 +1147,8 @@
11161147

11171148
"block.portalcubed.prop_barrier": "Prop Barrier",
11181149

1150+
"block.portalcubed.portal_gun_workstation": "Portal Gun Workstation",
1151+
11191152
"block.portalcubed.toxic_goo": "Toxic Goo",
11201153
"item.portalcubed.toxic_goo_bucket": "Toxic Goo Bucket",
11211154
"block.portalcubed.toxic_goo_cauldron": "Toxic Goo Cauldron",

‎src/main/resources/assets/portalcubed/models/block/portal_gun_workstation.json

Lines changed: 286 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,286 @@
1+
{
2+
"credit": "Made by Cart3r using Blockbench.",
3+
"texture_size": [32, 32],
4+
"textures": {
5+
"0": "portalcubed:block/portal_gun_workstation",
6+
"1": "portalcubed:block/portal_gun_workstation_emissive",
7+
"particle": "portalcubed:block/portal_gun_workstation"
8+
},
9+
"elements": [
10+
{
11+
"from": [1.5, 0, 1.5],
12+
"to": [14.5, 1, 14.5],
13+
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0.5, 8]},
14+
"faces": {
15+
"north": {"uv": [9.5, 7, 16, 7.5], "texture": "#0"},
16+
"east": {"uv": [9.5, 7, 16, 7.5], "texture": "#0"},
17+
"south": {"uv": [9.5, 7, 16, 7.5], "texture": "#0"},
18+
"west": {"uv": [9.5, 7, 16, 7.5], "texture": "#0"},
19+
"up": {"uv": [9.5, 0, 16, 6.5], "texture": "#0"},
20+
"down": {"uv": [9.5, 0.032, 16, 6.532], "texture": "#0", "cullface": "down"}
21+
}
22+
},
23+
{
24+
"from": [3, 1, 3],
25+
"to": [13, 2, 13],
26+
"rotation": {"angle": 0, "axis": "y", "origin": [8, 1.5, 8]},
27+
"faces": {
28+
"north": {"uv": [4.5, 5.5, 9.5, 6], "texture": "#0"},
29+
"east": {"uv": [4.5, 5.5, 9.5, 6], "texture": "#0"},
30+
"south": {"uv": [4.5, 5.5, 9.5, 6], "texture": "#0"},
31+
"west": {"uv": [4.5, 5.5, 9.5, 6], "texture": "#0"},
32+
"up": {"uv": [4.5, 0, 9.5, 5], "texture": "#0"}
33+
}
34+
},
35+
{
36+
"from": [3, 10, 3],
37+
"to": [13, 11, 13],
38+
"rotation": {"angle": 0, "axis": "y", "origin": [8, 10.5, 8]},
39+
"faces": {
40+
"north": {"uv": [4.516, 5.516, 9.484, 5.984], "texture": "#0"},
41+
"east": {"uv": [4.516, 5.516, 9.484, 5.984], "texture": "#0"},
42+
"south": {"uv": [4.516, 5.516, 9.484, 5.984], "texture": "#0"},
43+
"west": {"uv": [4.516, 5.516, 9.484, 5.984], "texture": "#0"},
44+
"up": {"uv": [4.516, 0.016, 9.484, 4.984], "texture": "#0"},
45+
"down": {"uv": [4.516, 0.016, 9.484, 4.984], "texture": "#0"}
46+
}
47+
},
48+
{
49+
"from": [7.5, 2, 8],
50+
"to": [8.5, 3, 8],
51+
"rotation": {"angle": 0, "axis": "y", "origin": [8, 2.5, 8.5]},
52+
"faces": {
53+
"north": {"uv": [0, 7, 0.5, 7.5], "texture": "#0"},
54+
"south": {"uv": [0, 7, 0.5, 7.5], "texture": "#0"}
55+
}
56+
},
57+
{
58+
"from": [8, 2, 7.5],
59+
"to": [8, 3, 8.5],
60+
"rotation": {"angle": 0, "axis": "y", "origin": [8, 2.5, 8]},
61+
"faces": {
62+
"east": {"uv": [0, 7, 0.5, 7.5], "texture": "#0"},
63+
"west": {"uv": [0, 7, 0.5, 7.5], "texture": "#0"}
64+
}
65+
},
66+
{
67+
"from": [7.5, 11, 8],
68+
"to": [8.5, 15, 8],
69+
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 8.5]},
70+
"faces": {
71+
"north": {"uv": [0, 5.5, 0.5, 7.5], "texture": "#0"},
72+
"south": {"uv": [0, 5.5, 0.5, 7.5], "texture": "#0"}
73+
}
74+
},
75+
{
76+
"from": [8, 11, 7.5],
77+
"to": [8, 15, 8.5],
78+
"rotation": {"angle": 0, "axis": "y", "origin": [8, 12.5, 8]},
79+
"faces": {
80+
"east": {"uv": [0, 5.5, 0.5, 7.5], "texture": "#0"},
81+
"west": {"uv": [0, 5.5, 0.5, 7.5], "texture": "#0"}
82+
}
83+
},
84+
{
85+
"from": [6.5, 3, 6.5],
86+
"to": [9.5, 4, 9.5],
87+
"rotation": {"angle": 45, "axis": "y", "origin": [8, 3.5, 8]},
88+
"faces": {
89+
"north": {"uv": [2.484, 7.516, 1.016, 7.984], "texture": "#0"},
90+
"east": {"uv": [1.016, 7.516, 2.484, 7.984], "texture": "#0"},
91+
"south": {"uv": [2.484, 7.516, 1.016, 7.984], "texture": "#0"},
92+
"west": {"uv": [1.016, 7.516, 2.484, 7.984], "texture": "#0"},
93+
"up": {"uv": [1.016, 5.516, 2.484, 6.984], "texture": "#0"},
94+
"down": {"uv": [1.016, 5.516, 2.484, 6.984], "texture": "#0"}
95+
}
96+
},
97+
{
98+
"from": [7, 4, 7],
99+
"to": [9, 10, 9],
100+
"rotation": {"angle": 45, "axis": "y", "origin": [8, 4.5, 8]},
101+
"faces": {
102+
"north": {"uv": [3.016, 5.516, 3.984, 8.484], "texture": "#0"},
103+
"east": {"uv": [3.016, 5.516, 3.984, 8.484], "texture": "#0"},
104+
"south": {"uv": [3.016, 5.516, 3.984, 8.484], "texture": "#0"},
105+
"west": {"uv": [3.016, 5.516, 3.984, 8.484], "texture": "#0"}
106+
}
107+
},
108+
{
109+
"from": [11.5, 1.5, 4],
110+
"to": [11.5, 11.5, 12],
111+
"rotation": {"angle": 0, "axis": "y", "origin": [11.5, 5.5, 8.5]},
112+
"faces": {
113+
"east": {"uv": [4, 0, 0, 5], "texture": "#0"},
114+
"west": {"uv": [0, 0, 4, 5], "texture": "#0"}
115+
}
116+
},
117+
{
118+
"from": [4.5, 1.5, 4],
119+
"to": [4.5, 11.5, 12],
120+
"rotation": {"angle": 0, "axis": "y", "origin": [4.5, 5.5, 8.5]},
121+
"faces": {
122+
"east": {"uv": [0, 0, 4, 5], "texture": "#0"},
123+
"west": {"uv": [4, 0, 0, 5], "texture": "#0"}
124+
}
125+
},
126+
{
127+
"from": [4, 1.5, 4.5],
128+
"to": [12, 11.5, 4.5],
129+
"rotation": {"angle": 0, "axis": "y", "origin": [7.5, 5.5, 9]},
130+
"faces": {
131+
"north": {"uv": [4, 0, 0, 5], "texture": "#0"},
132+
"south": {"uv": [0, 0, 4, 5], "texture": "#0"}
133+
}
134+
},
135+
{
136+
"from": [4, 1.5, 11.5],
137+
"to": [12, 11.5, 11.5],
138+
"rotation": {"angle": 0, "axis": "y", "origin": [7.5, 5.5, 7]},
139+
"faces": {
140+
"north": {"uv": [0, 0, 4, 5], "texture": "#0"},
141+
"south": {"uv": [4, 0, 0, 5], "texture": "#0"}
142+
}
143+
},
144+
{
145+
"from": [6.5, 15, 6],
146+
"to": [9.5, 17, 10],
147+
"rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]},
148+
"faces": {
149+
"north": {"uv": [1, 8.5, 2.5, 9.5], "texture": "#0"},
150+
"south": {"uv": [1, 8.5, 2.5, 9.5], "texture": "#0"},
151+
"down": {"uv": [1, 10, 2.5, 12], "texture": "#0"}
152+
}
153+
},
154+
{
155+
"from": [8, 15.5, 5.5],
156+
"to": [8, 16.5, 10.5],
157+
"rotation": {"angle": -45, "axis": "z", "origin": [8, 16, 8]},
158+
"faces": {
159+
"east": {"uv": [0, 8, 0.5, 10.5], "rotation": 90, "texture": "#0"},
160+
"west": {"uv": [0, 8, 0.5, 10.5], "rotation": 90, "texture": "#0"}
161+
}
162+
},
163+
{
164+
"from": [8, 15.5, 5.5],
165+
"to": [8, 16.5, 10.5],
166+
"rotation": {"angle": 45, "axis": "z", "origin": [8, 16, 8]},
167+
"faces": {
168+
"east": {"uv": [0, 8, 0.5, 10.5], "rotation": 90, "texture": "#0"},
169+
"west": {"uv": [0, 8, 0.5, 10.5], "rotation": 90, "texture": "#0"}
170+
}
171+
},
172+
{
173+
"name": "cube_outline",
174+
"from": [9.5, 17, 10],
175+
"to": [6.5, 15, 6],
176+
"rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]},
177+
"faces": {
178+
"north": {"uv": [1, 8.5, 2.5, 9.5], "rotation": 180, "texture": "#0"},
179+
"south": {"uv": [1, 8.5, 2.5, 9.5], "rotation": 180, "texture": "#0"},
180+
"up": {"uv": [1, 10, 2.5, 12], "rotation": 180, "texture": "#0"}
181+
}
182+
},
183+
{
184+
"from": [5.95, 13.7, 3.025],
185+
"to": [10.05, 15.8, 3.025],
186+
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 14.75, 3.5]},
187+
"faces": {
188+
"north": {"uv": [1, 1, 5, 3], "texture": "#1"}
189+
}
190+
},
191+
{
192+
"from": [5, 12.75, 3],
193+
"to": [11, 16.75, 4],
194+
"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 14.75, 3.5]},
195+
"faces": {
196+
"north": {"uv": [6.016, 7.016, 8.984, 8.984], "texture": "#0"},
197+
"east": {"uv": [9.516, 9.516, 9.984, 11.484], "texture": "#0"},
198+
"south": {"uv": [6.016, 9.516, 8.984, 11.484], "texture": "#0"},
199+
"west": {"uv": [9.516, 9.516, 9.984, 11.484], "texture": "#0"},
200+
"up": {"uv": [6.016, 12.016, 8.984, 12.484], "texture": "#0"},
201+
"down": {"uv": [6.016, 13.016, 8.984, 13.484], "texture": "#0"}
202+
}
203+
},
204+
{
205+
"from": [7, 14, 4],
206+
"to": [9, 15, 9],
207+
"rotation": {"angle": 0, "axis": "x", "origin": [8, 14, 4.5]},
208+
"faces": {
209+
"north": {"uv": [4.5, 9.5, 5.5, 10], "texture": "#0"},
210+
"down": {"uv": [4.5, 9, 5.5, 6.5], "texture": "#0"}
211+
}
212+
},
213+
{
214+
"name": "cube_outline",
215+
"from": [9, 15, 9],
216+
"to": [7, 14, 4],
217+
"rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 4.5]},
218+
"faces": {
219+
"south": {"uv": [4.5, 9.5, 5.5, 10], "rotation": 180, "texture": "#0"},
220+
"up": {"uv": [4.5, 6.5, 5.5, 9], "rotation": 180, "texture": "#0"}
221+
}
222+
}
223+
],
224+
"display": {
225+
"thirdperson_righthand": {
226+
"rotation": [65, 45, 0],
227+
"translation": [0, 2.5, 1.5],
228+
"scale": [0.375, 0.375, 0.375]
229+
},
230+
"thirdperson_lefthand": {
231+
"rotation": [65, 45, 0],
232+
"translation": [0, 2.5, 1.5],
233+
"scale": [0.375, 0.375, 0.375]
234+
},
235+
"firstperson_righthand": {
236+
"rotation": [0, 114, 0],
237+
"translation": [0, 2.5, 0],
238+
"scale": [0.4, 0.4, 0.4]
239+
},
240+
"firstperson_lefthand": {
241+
"rotation": [0, 114, 0],
242+
"translation": [0, 2.5, 0],
243+
"scale": [0.4, 0.4, 0.4]
244+
},
245+
"ground": {
246+
"translation": [0, 3, 0],
247+
"scale": [0.25, 0.25, 0.25]
248+
},
249+
"gui": {
250+
"rotation": [30, 225, 0],
251+
"scale": [0.625, 0.625, 0.625]
252+
},
253+
"head": {
254+
"translation": [0, 3.75, 0],
255+
"scale": [1.93359, 1.93359, 1.93359]
256+
},
257+
"fixed": {
258+
"scale": [0.5, 0.5, 0.5]
259+
}
260+
},
261+
"groups": [
262+
0,
263+
1,
264+
2,
265+
3,
266+
4,
267+
5,
268+
6,
269+
7,
270+
8,
271+
{
272+
"name": "outer_supports",
273+
"origin": [8, 6, 7.5],
274+
"color": 0,
275+
"children": [9, 10, 11, 12]
276+
},
277+
13,
278+
14,
279+
15,
280+
16,
281+
17,
282+
18,
283+
19,
284+
20
285+
]
286+
}

0 commit comments

Comments
 (0)