-
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.
More asset/data stuff (shocking, I know)
- Changed the rocket turret textures to reduce the brightness of the emissives - Added some detail to the gel block textures - Removed the excursion funnel block references from emissive.json since they're not blocks anymore - Remade the neurotoxin emitter assets. They now actually show their `facing` state rather than having vents on all sides - Added the neurotoxin emitters to pickaxe.json and gave them a loot table - Moved the recipe advancements to the `recipes` subfolder - Tweaked the rocket turret subtitles - Fixed a punctuation mistake in the radio tooltip - Fixed an issue with the portal 2 storage cube recipe
- Loading branch information
1 parent
a25ddb7
commit a255f2a
Showing
45 changed files
with
272 additions
and
53 deletions.
There are no files selected for viewing
50 changes: 46 additions & 4 deletions
50
src/main/resources/assets/portalcubed/blockstates/neurotoxin_emitter.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,10 +1,52 @@ | ||
| { | ||
| "variants": { | ||
| "powered=false": { | ||
| "model": "portalcubed:block/neurotoxin_emitter_off" | ||
| "facing=east,powered=true": { | ||
| "model": "portalcubed:block/neurotoxin_emitter_on", | ||
| "y": 270 | ||
| }, | ||
| "powered=true": { | ||
| "model": "portalcubed:block/neurotoxin_emitter_on" | ||
| "facing=north,powered=true": { | ||
| "model": "portalcubed:block/neurotoxin_emitter_on", | ||
| "y": 180 | ||
| }, | ||
| "facing=south,powered=true": { | ||
| "model": "portalcubed:block/neurotoxin_emitter_on", | ||
| "y": 0 | ||
| }, | ||
| "facing=west,powered=true": { | ||
| "model": "portalcubed:block/neurotoxin_emitter_on", | ||
| "y": 90 | ||
| }, | ||
| "facing=up,powered=true": { | ||
| "model": "portalcubed:block/neurotoxin_emitter_on", | ||
| "x": 90 | ||
| }, | ||
| "facing=down,powered=true": { | ||
| "model": "portalcubed:block/neurotoxin_emitter_on", | ||
| "x": 270 | ||
| }, | ||
| "facing=east,powered=false": { | ||
| "model": "portalcubed:block/neurotoxin_emitter_off", | ||
| "y": 270 | ||
| }, | ||
| "facing=north,powered=false": { | ||
| "model": "portalcubed:block/neurotoxin_emitter_off", | ||
| "y": 180 | ||
| }, | ||
| "facing=south,powered=false": { | ||
| "model": "portalcubed:block/neurotoxin_emitter_off", | ||
| "y": 0 | ||
| }, | ||
| "facing=west,powered=false": { | ||
| "model": "portalcubed:block/neurotoxin_emitter_off", | ||
| "y": 90 | ||
| }, | ||
| "facing=up,powered=false": { | ||
| "model": "portalcubed:block/neurotoxin_emitter_off", | ||
| "x": 90 | ||
| }, | ||
| "facing=down,powered=false": { | ||
| "model": "portalcubed:block/neurotoxin_emitter_off", | ||
| "x": 270 | ||
| } | ||
| } | ||
| } |
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
80 changes: 76 additions & 4 deletions
80
src/main/resources/assets/portalcubed/models/block/neurotoxin_emitter_off.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,6 +1,78 @@ | ||
| { | ||
| "parent": "block/cube_all", | ||
| "textures": { | ||
| "all": "portalcubed:block/neurotoxin_emitter_off" | ||
| } | ||
| "credit": "Made by Cart3r using Blockbench.", | ||
| "textures": { | ||
| "0": "portalcubed:block/neurotoxin_emitter_vent", | ||
| "1": "portalcubed:block/neurotoxin_emitter_front", | ||
| "2": "portalcubed:block/dirty_borderless_panel", | ||
| "3": "portalcubed:block/neurotoxin_emitter_background", | ||
| "particle": "portalcubed:block/neurotoxin_emitter_vent" | ||
| }, | ||
| "elements": [ | ||
| { | ||
| "from": [0, 0, 0], | ||
| "to": [16, 16, 16], | ||
| "faces": { | ||
| "north": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "north"}, | ||
| "east": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "east"}, | ||
| "south": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "south"}, | ||
| "west": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "west"}, | ||
| "up": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "up"}, | ||
| "down": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "down"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [1.95, 1.95, 15.85], | ||
| "to": [14.05, 14.05, 15.95], | ||
| "rotation": {"angle": 0, "axis": "y", "origin": [-2, -2, -0.076]}, | ||
| "faces": { | ||
| "south": {"uv": [2, 2, 14, 14], "texture": "#0", "cullface": "south"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [1, 1, 16], | ||
| "to": [15, 15, 15], | ||
| "faces": { | ||
| "east": {"uv": [14.032, 1.032, 14.968, 14.968], "texture": "#3"}, | ||
| "south": {"uv": [1.032, 1.032, 14.968, 14.968], "texture": "#3"}, | ||
| "west": {"uv": [1.032, 1.032, 1.968, 14.968], "texture": "#3"}, | ||
| "up": {"uv": [1.032, 1.032, 14.968, 1.968], "texture": "#3"}, | ||
| "down": {"uv": [1.032, 14.032, 14.968, 14.968], "texture": "#3"} | ||
| } | ||
| } | ||
| ], | ||
| "display": { | ||
| "thirdperson_righthand": { | ||
| "rotation": [75, -120, 0], | ||
| "translation": [0, 2.5, 0], | ||
| "scale": [0.375, 0.375, 0.375] | ||
| }, | ||
| "thirdperson_lefthand": { | ||
| "rotation": [75, -120, 0], | ||
| "translation": [0, 2.5, 0], | ||
| "scale": [0.375, 0.375, 0.375] | ||
| }, | ||
| "firstperson_righthand": { | ||
| "rotation": [0, -64, 0], | ||
| "scale": [0.4, 0.4, 0.4] | ||
| }, | ||
| "firstperson_lefthand": { | ||
| "rotation": [0, -64, 0], | ||
| "scale": [0.4, 0.4, 0.4] | ||
| }, | ||
| "ground": { | ||
| "translation": [0, 3, 0], | ||
| "scale": [0.25, 0.25, 0.25] | ||
| }, | ||
| "gui": { | ||
| "rotation": [30, 45, 0], | ||
| "scale": [0.625, 0.625, 0.625] | ||
| }, | ||
| "head": { | ||
| "rotation": [0, 180, 0] | ||
| }, | ||
| "fixed": { | ||
| "rotation": [0, 180, 0], | ||
| "scale": [0.5, 0.5, 0.5] | ||
| } | ||
| } | ||
| } |
126 changes: 122 additions & 4 deletions
126
src/main/resources/assets/portalcubed/models/block/neurotoxin_emitter_on.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,6 +1,124 @@ | ||
| { | ||
| "parent": "block/cube_all", | ||
| "textures": { | ||
| "all": "portalcubed:block/neurotoxin_emitter_on" | ||
| } | ||
| "credit": "Made by Cart3r using Blockbench.", | ||
| "textures": { | ||
| "0": "portalcubed:block/neurotoxin_emitter_vent", | ||
| "1": "portalcubed:block/neurotoxin_emitter_front", | ||
| "2": "portalcubed:block/dirty_borderless_panel", | ||
| "3": "portalcubed:block/neurotoxin_emitter_background", | ||
| "particle": "portalcubed:block/neurotoxin_emitter_vent" | ||
| }, | ||
| "elements": [ | ||
| { | ||
| "from": [0, 0, 0], | ||
| "to": [16, 16, 16], | ||
| "faces": { | ||
| "north": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "north"}, | ||
| "east": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "east"}, | ||
| "south": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "south"}, | ||
| "west": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "west"}, | ||
| "up": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "up"}, | ||
| "down": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "down"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [1, 1, 16], | ||
| "to": [15, 15, 15], | ||
| "faces": { | ||
| "east": {"uv": [14.032, 1.032, 14.968, 14.968], "texture": "#3"}, | ||
| "south": {"uv": [1.032, 1.032, 14.968, 14.968], "texture": "#3"}, | ||
| "west": {"uv": [1.032, 1.032, 1.968, 14.968], "texture": "#3"}, | ||
| "up": {"uv": [1.032, 1.032, 14.968, 1.968], "texture": "#3"}, | ||
| "down": {"uv": [1.032, 14.032, 14.968, 14.968], "texture": "#3"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [2, 12, 16], | ||
| "to": [14, 14, 16], | ||
| "rotation": {"angle": -45, "axis": "x", "origin": [8, 13, 16]}, | ||
| "faces": { | ||
| "north": {"uv": [2, 2, 14, 4], "texture": "#0"}, | ||
| "south": {"uv": [2, 2, 14, 4], "texture": "#0"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [2, 10, 16], | ||
| "to": [14, 12, 16], | ||
| "rotation": {"angle": -45, "axis": "x", "origin": [8, 11, 16]}, | ||
| "faces": { | ||
| "north": {"uv": [2, 4, 14, 6], "texture": "#0"}, | ||
| "south": {"uv": [2, 4, 14, 6], "texture": "#0"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [2, 8, 16], | ||
| "to": [14, 10, 16], | ||
| "rotation": {"angle": -45, "axis": "x", "origin": [8, 9, 16]}, | ||
| "faces": { | ||
| "north": {"uv": [2, 6, 14, 8], "texture": "#0"}, | ||
| "south": {"uv": [2, 6, 14, 8], "texture": "#0"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [2, 6, 16], | ||
| "to": [14, 8, 16], | ||
| "rotation": {"angle": -45, "axis": "x", "origin": [8, 7, 16]}, | ||
| "faces": { | ||
| "north": {"uv": [2, 8, 14, 10], "texture": "#0"}, | ||
| "south": {"uv": [2, 8, 14, 10], "texture": "#0"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [2, 4, 16], | ||
| "to": [14, 6, 16], | ||
| "rotation": {"angle": -45, "axis": "x", "origin": [8, 5, 16]}, | ||
| "faces": { | ||
| "north": {"uv": [2, 10, 14, 12], "texture": "#0"}, | ||
| "south": {"uv": [2, 10, 14, 12], "texture": "#0"} | ||
| } | ||
| }, | ||
| { | ||
| "from": [2, 2, 16], | ||
| "to": [14, 4, 16], | ||
| "rotation": {"angle": -45, "axis": "x", "origin": [8, 3, 16]}, | ||
| "faces": { | ||
| "north": {"uv": [2, 12, 14, 14], "texture": "#0"}, | ||
| "south": {"uv": [2, 12, 14, 14], "texture": "#0"} | ||
| } | ||
| } | ||
| ], | ||
| "display": { | ||
| "thirdperson_righthand": { | ||
| "rotation": [75, -120, 0], | ||
| "translation": [0, 2.5, 0], | ||
| "scale": [0.375, 0.375, 0.375] | ||
| }, | ||
| "thirdperson_lefthand": { | ||
| "rotation": [75, -120, 0], | ||
| "translation": [0, 2.5, 0], | ||
| "scale": [0.375, 0.375, 0.375] | ||
| }, | ||
| "firstperson_righthand": { | ||
| "rotation": [0, -64, 0], | ||
| "scale": [0.4, 0.4, 0.4] | ||
| }, | ||
| "firstperson_lefthand": { | ||
| "rotation": [0, -64, 0], | ||
| "scale": [0.4, 0.4, 0.4] | ||
| }, | ||
| "ground": { | ||
| "translation": [0, 3, 0], | ||
| "scale": [0.25, 0.25, 0.25] | ||
| }, | ||
| "gui": { | ||
| "rotation": [30, 45, 0], | ||
| "scale": [0.625, 0.625, 0.625] | ||
| }, | ||
| "head": { | ||
| "rotation": [0, 180, 0] | ||
| }, | ||
| "fixed": { | ||
| "rotation": [0, 180, 0], | ||
| "scale": [0.5, 0.5, 0.5] | ||
| } | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/main/resources/assets/portalcubed/models/item/neurotoxin_emitter.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,4 +1,4 @@ | ||
| { | ||
| "parent": "portalcubed:block/neurotoxin_emitter_off" | ||
| "parent": "portalcubed:block/neurotoxin_emitter_on" | ||
|
|
||
| } |
Binary file modified
BIN
+707 Bytes
(110%)
src/main/resources/assets/portalcubed/textures/block/adhesion_gel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+606 Bytes
(110%)
src/main/resources/assets/portalcubed/textures/block/conversion_gel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+4.93 KB
...n/resources/assets/portalcubed/textures/block/neurotoxin_emitter_background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+5.16 KB
src/main/resources/assets/portalcubed/textures/block/neurotoxin_emitter_front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed
BIN
-265 Bytes
src/main/resources/assets/portalcubed/textures/block/neurotoxin_emitter_off.png
Binary file not shown.
Binary file removed
BIN
-280 Bytes
src/main/resources/assets/portalcubed/textures/block/neurotoxin_emitter_on.png
Binary file not shown.
Binary file added
BIN
+5 KB
src/main/resources/assets/portalcubed/textures/block/neurotoxin_emitter_vent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+657 Bytes
(110%)
src/main/resources/assets/portalcubed/textures/block/propulsion_gel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+399 Bytes
(110%)
src/main/resources/assets/portalcubed/textures/block/reflection_gel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+671 Bytes
(110%)
src/main/resources/assets/portalcubed/textures/block/repulsion_gel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+9.18 KB
(920%)
src/main/resources/assets/portalcubed/textures/block/rocket_turret_active.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+9.18 KB
(920%)
src/main/resources/assets/portalcubed/textures/block/rocket_turret_firing.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+9.18 KB
(920%)
src/main/resources/assets/portalcubed/textures/block/rocket_turret_lock_on.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
20 changes: 20 additions & 0 deletions
20
src/main/resources/data/portalcubed/loot_tables/blocks/neurotoxin_emitter.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 |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "type": "minecraft:block", | ||
| "pools": [ | ||
| { | ||
| "rolls": 1.0, | ||
| "bonus_rolls": 0.0, | ||
| "entries": [ | ||
| { | ||
| "type": "minecraft:item", | ||
| "name": "portalcubed:neurotoxin_emitter" | ||
| } | ||
| ], | ||
| "conditions": [ | ||
| { | ||
| "condition": "minecraft:survives_explosion" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
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
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
Oops, something went wrong.