Skip to content

Commit

Permalink
More asset/data changes (who could've guessed)
Browse files Browse the repository at this point in the history
- Added a subtitle for the energy pellet travel noise
- Added faith plates, neurotoxin emitters, floor buttons, faith plates, and the old aperture pedestal button to the bullet_hole_concrete tag
- Added pedestal buttons, excursion funnel emitters, autoportals, elevator walls, and laser relays to the bullet_hole_metal tag
- Added emissives to the lights on the Portal 1 Elevator Wall blocks
- Changed the icon for the Pretty Painted Portal Producers advancement
- Changed the wording slightly on some config options to be more clear as to what they actually do
  • Loading branch information
Cart3r1234 committed Oct 22, 2023
1 parent 99d7c4a commit e42cd1b
Show file tree
Hide file tree
Showing 20 changed files with 130 additions and 27 deletions.
24 changes: 24 additions & 0 deletions src/main/resources/assets/portalcubed/emissives.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,30 @@
"block/laser_catcher": "block/laser_emitter_e",
"item/laser_catcher": "block/laser_emitter_e",

"block/portal_1_elevator_wall_top": [
"block/portal_1_elevator_wall_upper_e",
"block/portal_1_elevator_wall_middle_top_e"
],
"block/portal_1_elevator_wall_middle": [
"block/portal_1_elevator_wall_middle_e",
"block/portal_1_elevator_wall_middle_top_e"
],
"block/portal_1_elevator_wall_bottom": [
"block/portal_1_elevator_wall_lower_e",
"block/portal_1_elevator_wall_middle_top_e"
],
"item/portal_1_elevator_wall_top": [
"block/portal_1_elevator_wall_upper_e",
"block/portal_1_elevator_wall_middle_top_e"
],
"item/portal_1_elevator_wall_middle": [
"block/portal_1_elevator_wall_middle_e",
"block/portal_1_elevator_wall_middle_top_e"
],
"item/portal_1_elevator_wall_bottom": [
"block/portal_1_elevator_wall_lower_e",
"block/portal_1_elevator_wall_middle_top_e"
],

"block/portal_2_fizzler_top": "block/portal_2_fizzler_top",
"block/portal_2_fizzler_bottom": "block/portal_2_fizzler_bottom",
Expand Down
16 changes: 9 additions & 7 deletions src/main/resources/assets/portalcubed/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@
"subtitles.portalcubed.floor_button_release": "Button deactivates",

"subtitles.portalcubed.rocket.fire": "Rocket launches",
"subtitles.portalcubed.rocket.locked": "Rocket turret fires",
"subtitles.portalcubed.rocket.locking": "Rocket turret locks on",
"subtitles.portalcubed.rocket.locked": "Rocket turret fires",
"subtitles.portalcubed.rocket.travel": "Rocket flies",
"subtitles.portalcubed.rocket.explosion": "Rocket explodes",

"subtitles.portalcubed.pellet.spawn": "Energy pellet launches",
"subtitles.portalcubed.pellet.travel": "Energy pellet hums",
"subtitles.portalcubed.pellet.bounce": "Energy pellet bounces",
"subtitles.portalcubed.pellet.explode": "Energy pellet explodes",
"subtitles.portalcubed.pellet.spawn": "Energy pellet launches",

"subtitles.portalcubed.crowbar_swoosh": "Crowbar swooshes",
"subtitles.portalcubed.impact.concrete": "Concrete crumbles",
Expand Down Expand Up @@ -469,14 +471,14 @@
"portalcubed.midnightconfig.title": "Portal Cubed Config",
"portalcubed.midnightconfig.maxBridgeLength": "Maximum Emitter Block Range",
"portalcubed.midnightconfig.enableRoundPortals": "Use Round Portal Texture",
"portalcubed.midnightconfig.enableAccurateMovement": "Long Fall Boots Enable Source-Accurate Movement",
"portalcubed.midnightconfig.enableAccurateMovement": "Long Fall Boots Enable Source Engine Movement Physics",
"portalcubed.midnightconfig.fizzlerDamage": "Death Fizzler Damage",
"portalcubed.midnightconfig.rocketDamage": "Rocket Turret Damage",
"portalcubed.midnightconfig.pelletDamage": "Energy Pellet Damage",
"portalcubed.midnightconfig.laserDamage": "Thermal Discouragement Beam Damage",
"portalcubed.midnightconfig.portalHudMode": "Use Portal HUD",
"portalcubed.midnightconfig.portalHudMode": "Force Enable Portal HUD Mode",
"portalcubed.midnightconfig.gelOverlayOpacity": "Gel Screen Overlay Opacity",
"portalcubed.midnightconfig.staticPortalItemDrops": "Static Portal Item Drops",
"portalcubed.midnightconfig.staticPortalItemDrops": "Equipment Items Remain Stationary When Dropped",
"portalcubed.midnightconfig.renderer": "Portal Renderer (in development)",
"portalcubed.midnightconfig.enum.PortalRenderers.DISABLED": "Disabled",
"portalcubed.midnightconfig.enum.PortalRenderers.STENCIL": "Stencil",
Expand All @@ -492,8 +494,8 @@
"death.attack.vaporization.player": "%1$s was vaporized by a High Energy Pellet trying to escape %2$s",
"death.attack.laser": "%s was thermally discouraged",
"death.attack.laser.player": "%1$s was thermally discouraged trying to escape %2$s",
"death.attack.cube": "%s was hit on the head by a falling Weighted Cube",
"death.attack.cube.player": "%1$s was hit on the head by a falling Weighted Cube trying to escape %2$s",
"death.attack.cube": "%s was hit on the head by a falling Physics Entity",
"death.attack.cube.player": "%1$s was hit on the head by a falling Physics Entity trying to escape %2$s",

"key.portalcubed.category" : "Portal Cubed",
"key.portalcubed.grab" : "Grab",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"credit": "Made by Cart3r using Blockbench.",
"textures": {
"2": "portalcubed:block/portal_1_elevator_wall_middle_top",
"3": "portalcubed:block/portal_1_elevator_wall_middle_top_e",
"4": "portalcubed:block/portal_1_elevator_wall_lower_e",
"particle": "portalcubed:block/portal_1_elevator_wall_middle_top",
"end": "portalcubed:block/portal_1_elevator_wall_top",
"side": "portalcubed:block/portal_1_elevator_wall_lower"
Expand All @@ -18,6 +20,17 @@
"up": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "up"},
"down": {"uv": [0, 0, 16, 16], "texture": "#end", "cullface": "down"}
}
},
{
"from": [-0.01, -0.01, -0.01],
"to": [16.01, 16.01, 16.01],
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#4", "cullface": "north"},
"east": {"uv": [0, 0, 16, 16], "texture": "#4", "cullface": "east"},
"south": {"uv": [0, 0, 16, 16], "texture": "#4", "cullface": "south"},
"west": {"uv": [0, 0, 16, 16], "texture": "#4", "cullface": "west"},
"up": {"uv": [0, 0, 16, 16], "texture": "#3", "cullface": "up"}
}
}
],
"display": {
Expand Down Expand Up @@ -51,4 +64,4 @@
"scale": [0.5, 0.5, 0.5]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"credit": "Made by Cart3r using Blockbench.",
"textures": {
"2": "portalcubed:block/portal_1_elevator_wall_middle_top_e",
"3": "portalcubed:block/portal_1_elevator_wall_middle_e",
"particle": "portalcubed:block/portal_1_elevator_wall_middle_top",
"end": "portalcubed:block/portal_1_elevator_wall_middle_top",
"side": "portalcubed:block/portal_1_elevator_wall_middle"
Expand All @@ -17,6 +19,18 @@
"up": {"uv": [0, 0, 16, 16], "texture": "#end", "cullface": "up"},
"down": {"uv": [0, 0, 16, 16], "texture": "#end", "cullface": "down"}
}
},
{
"from": [-0.01, -0.01, -0.01],
"to": [16.01, 16.01, 16.01],
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#3", "cullface": "north"},
"east": {"uv": [0, 0, 16, 16], "texture": "#3", "cullface": "east"},
"south": {"uv": [0, 0, 16, 16], "texture": "#3", "cullface": "south"},
"west": {"uv": [0, 0, 16, 16], "texture": "#3", "cullface": "west"},
"up": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "up"},
"down": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "down"}
}
}
],
"display": {
Expand Down Expand Up @@ -50,4 +64,4 @@
"scale": [0.5, 0.5, 0.5]
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"credit": "Made by Cart3r using Blockbench.",
"textures": {
"2": "portalcubed:block/portal_1_elevator_wall_middle_top",
"3": "portalcubed:block/portal_1_elevator_wall_upper_e",
"4": "portalcubed:block/portal_1_elevator_wall_middle_top_e",
"particle": "portalcubed:block/portal_1_elevator_wall_middle_top",
"end": "portalcubed:block/portal_1_elevator_wall_top",
"side": "portalcubed:block/portal_1_elevator_wall_upper"
Expand All @@ -18,6 +20,17 @@
"up": {"uv": [0, 0, 16, 16], "texture": "#end", "cullface": "up"},
"down": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "down"}
}
},
{
"from": [-0.01, -0.01, -0.01],
"to": [16.01, 16.01, 16.01],
"faces": {
"north": {"uv": [0, 0, 16, 16], "texture": "#3", "cullface": "north"},
"east": {"uv": [0, 0, 16, 16], "texture": "#3", "cullface": "east"},
"south": {"uv": [0, 0, 16, 16], "texture": "#3", "cullface": "south"},
"west": {"uv": [0, 0, 16, 16], "texture": "#3", "cullface": "west"},
"down": {"uv": [0, 0, 16, 16], "texture": "#4", "cullface": "down"}
}
}
],
"display": {
Expand Down Expand Up @@ -51,4 +64,4 @@
"scale": [0.5, 0.5, 0.5]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "portalcubed:item/auto_portal"
}
}
"credit": "Made by Cart3r using Blockbench.",
"parent": "minecraft:item/generated",
"textures": {
"layer0": "portalcubed:item/auto_portal"
},
"overrides": [
{"model": "portalcubed:item/rainbow_autoportal", "predicate": {"custom_model_data": 1}}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "portalcubed:item/rainbow_autoportal"
}
}
6 changes: 4 additions & 2 deletions src/main/resources/assets/portalcubed/sounds.json
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,8 @@
"pellet/travel": {
"sounds": [
"portalcubed:pellet/energy_sing_loop4"
]
],
"subtitle": "subtitles.portalcubed.pellet.travel"
},
"portal_ambience": {
"sounds": [
Expand Down Expand Up @@ -452,7 +453,8 @@
"rocket/fly": {
"sounds": [
"portalcubed:rocket/rocket_fly_loop1"
]
],
"subtitle": "subtitles.portalcubed.rocket.travel"
},
"rocket/goo": {
"sounds": []
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"frametime": 30,
"interpolate": true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"display": {
"icon": {
"item": "portalcubed:auto_portal",
"nbt": "{Enchantments:[{id:infinity,lvl:1}]}"
"nbt": "{CustomModelData:1}"
},
"title": {
"translate": "advancement.portalcubed.rainbow_autoportals.title"
Expand Down Expand Up @@ -176,4 +176,4 @@
"rewards": {
"experience": 100
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@
"portalcubed:physics_repulsion_field_emitter",
"portalcubed:matter_inquisition_field_emitter",
"portalcubed:laser_emitter",
"portalcubed:laser_catcher"
"portalcubed:laser_catcher",
"portalcubed:neurotoxin_emitter",
"portalcubed:faith_plate",
"portalcubed:beta_faith_plate",
"portalcubed:old_ap_pedestal_button",
"portalcubed:old_ap_floor_button",
"portalcubed:floor_button"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

"minecraft:tinted_glass",

"minecraft:beacon"
"minecraft:beacon",
"minecraft:sea_lantern"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,17 @@
"portalcubed:portal_1_2x2_exposed_panel_top_right",
"portalcubed:portal_1_2x2_exposed_panel_bottom_right",

"portalcubed:portal_1_elevator_wall_bottom",
"portalcubed:portal_1_elevator_wall_middle",
"portalcubed:portal_1_elevator_wall_top",

"portalcubed:portal_1_fizzler_emitter",
"portalcubed:old_aperture_fizzler_emitter",
"portalcubed:old_aperture_death_fizzler_emitter",
"portalcubed:pedestal_button",
"portalcubed:excursion_funnel_emitter",
"portalcubed:auto_portal",
"portalcubed:laser_relay",

"minecraft:iron_block",
"minecraft:gold_block",
Expand Down
9 changes: 6 additions & 3 deletions src/main/resources/portal_blocks.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,16 @@
"map_color": "terracotta_white"
},
"portal_1_elevator_wall_bottom": {
"map_color": "clay"
"map_color": "clay",
"render_layer": "cutout"
},
"portal_1_elevator_wall_middle": {
"map_color": "clay"
"map_color": "clay",
"render_layer": "cutout"
},
"portal_1_elevator_wall_top": {
"map_color": "clay"
"map_color": "clay",
"render_layer": "cutout"
},
"solid_office_concrete": {
"map_color": "terracotta_cyan"
Expand Down
7 changes: 4 additions & 3 deletions src/main/resources/quilt.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,17 @@
"description": "A portal gun mod for Quilt",
"contributors": {
"Fusion Flux": "Developer",
"Gaming32": "Developer",
"Maximum": "Developer",
"TropheusJ": "Developer",
"Platymemo": "Developer",
"Gaming32": "Developer",
"sailKite": "Cheerleader",
"Siuolplex": "Quilt Porter",
"Cart3r": "Artist",
"LudoCrypt": "Audio",
"asojidev": "Audio"
},
"license": "MIT",
"license": "MPL-2.0",
"contact": {
"homepage": "https://modrinth.com/mod/portal-cubed",
"sources": "https://github.com/Fusion-Flux/Portal-Cubed",
Expand All @@ -91,4 +92,4 @@
"mixin.entity.fast_suffocation_check": false
},
"access_widener": "portalcubed.accesswidener"
}
}

0 comments on commit e42cd1b

Please sign in to comment.