From b518151ea5b8165ff094e08ec0753865c36c06b1 Mon Sep 17 00:00:00 2001 From: Carter <69820300+Cart3r1234@users.noreply.github.com> Date: Thu, 19 Oct 2023 18:35:40 -0400 Subject: [PATCH] Sounds.json changes, asset tweaks, new advancement - Reorganized and reformatted sounds.json -- Sound events are now in alphabetical order -- The order in which fields are used per-sound is now consistent -- Inconsistent spacing, indentation, and newlines have been fixed - Adjusted the volume of some sounds that were made quieter prior to blanketcon. This includes lasers, buttons, and a few others that were nearly inaudible even at maximum ingame volume - Added subtitles for the sounds made when a portal gun is used to pick up or drop an object - Adjusted the size of the LEGO Portal Gun when thrown on the ground to be consistent with other portal gun skins - Added a new advancement: Heartbreaker - Fizzle a companion cube - Fixed an issue with the emissives on doors that caused certain states to render darker when using smooth lighting - Added the glass tube to the portal gun frame's item model, as it was forgotten when I updated the others. The recipe now includes a glass pane. - Fixed a culling issue on the rocket turret base --- .../assets/portalcubed/emissives.json | 15 +- .../assets/portalcubed/lang/en_us.json | 5 + .../models/block/rocket_turret_base.json | 8 +- .../models/item/lego_portal_gun.json | 3 +- .../models/item/portal_gun_frame.json | 30 +- .../resources/assets/portalcubed/sounds.json | 1004 ++++++++--------- .../achievements/heartbreaker.json | 45 + .../recipes/portal_gun_frame_crafting.json | 5 +- .../tags/blocks/fizzles_props.json | 12 + .../tags/entity_types/companion_cubes.json | 6 + 10 files changed, 611 insertions(+), 522 deletions(-) create mode 100644 src/main/resources/data/portalcubed/advancements/achievements/heartbreaker.json create mode 100644 src/main/resources/data/portalcubed/tags/blocks/fizzles_props.json create mode 100644 src/main/resources/data/portalcubed/tags/entity_types/companion_cubes.json diff --git a/src/main/resources/assets/portalcubed/emissives.json b/src/main/resources/assets/portalcubed/emissives.json index 1b531ebc..d79c73d0 100644 --- a/src/main/resources/assets/portalcubed/emissives.json +++ b/src/main/resources/assets/portalcubed/emissives.json @@ -138,23 +138,32 @@ "block/auto_portal_lower": "block/auto_portal_e", "block/auto_portal_upper": "block/auto_portal_e", - - "block/portal_1_door_bottom_left": "block/portal_1_door_e", - "block/portal_1_door_bottom_left_open": "block/portal_1_door_e", "block/portal_1_door_bottom_right": "block/portal_1_door_e", "block/portal_1_door_bottom_right_open": "block/portal_1_door_e", + "block/portal_1_door_bottom_left": "block/portal_1_door_e", + "block/portal_1_door_bottom_left_open": "block/portal_1_door_e", + "block/portal_1_door_top_right": "block/portal_1_door_e", + "block/portal_1_door_top_right_open": "block/portal_1_door_e", + "block/portal_1_door_top_left": "block/portal_1_door_e", + "block/portal_1_door_top_left_open": "block/portal_1_door_e", "block/portal_2_door_bottom_right": "block/portal_2_door_e", "block/portal_2_door_bottom_right_open": "block/portal_2_door_e", + "block/portal_2_door_bottom_left": "block/portal_2_door_e", "block/portal_2_door_bottom_left_open": "block/portal_2_door_e", "block/portal_2_door_top_right": "block/portal_2_door_e", "block/portal_2_door_top_right_open": "block/portal_2_door_e", + "block/portal_2_door_top_left": "block/portal_2_door_e", + "block/portal_2_door_top_left_open": "block/portal_2_door_e", "block/octopus_door_bottom_right": "block/octopus_door_e", "block/octopus_door_bottom_right_open": "block/octopus_door_e", + "block/octopus_door_bottom_left": "block/octopus_door_e", "block/octopus_door_bottom_left_open": "block/octopus_door_e", "block/octopus_door_top_right": "block/octopus_door_e", "block/octopus_door_top_right_open": "block/octopus_door_e", + "block/octopus_door_top_left": "block/octopus_door_e", + "block/octopus_door_top_left_open": "block/octopus_door_e", "item/floor_button": "block/floor_button_e", "block/floor_button": "block/floor_button_e", diff --git a/src/main/resources/assets/portalcubed/lang/en_us.json b/src/main/resources/assets/portalcubed/lang/en_us.json index 2c30af36..3509e692 100644 --- a/src/main/resources/assets/portalcubed/lang/en_us.json +++ b/src/main/resources/assets/portalcubed/lang/en_us.json @@ -11,6 +11,9 @@ "subtitles.portalcubed.portal_gun_primary_fire": "Portal gun shoots primary portal", "subtitles.portalcubed.portal_invalid_surface": "Portal gun shot fails", + "subtitles.portalcubed.object_pickup": "Portal gun picks up object", + "subtitles.portalcubed.object_drop": "Portal gun releases object", + "subtitles.portalcubed.portal_open": "Portal opens", "subtitles.portalcubed.portal_close": "Portal closes", "subtitles.portalcubed.portal_fizzle": "Portal fizzles", @@ -77,6 +80,8 @@ "advancement.portalcubed.fizzler.title": "Fizzle Me This", "advancement.portalcubed.fizzler.description": "Walk through a Material Emancipation Grill", + "advancement.portalcubed.heartbreaker.title": "Heartbreaker", + "advancement.portalcubed.heartbreaker.description": "Fizzle your faithful companion cube. You monster.", "advancement.portalcubed.pellet.title": "Handle With Care", "advancement.portalcubed.pellet.description": "Obtain a High Energy Pellet", diff --git a/src/main/resources/assets/portalcubed/models/block/rocket_turret_base.json b/src/main/resources/assets/portalcubed/models/block/rocket_turret_base.json index c7bb184a..5fb0bc67 100644 --- a/src/main/resources/assets/portalcubed/models/block/rocket_turret_base.json +++ b/src/main/resources/assets/portalcubed/models/block/rocket_turret_base.json @@ -12,10 +12,10 @@ "to": [16.01, 17.01, 16.01], "rotation": {"angle": 0, "axis": "y", "origin": [8, 1, 8]}, "faces": { - "north": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0"}, - "east": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0"}, - "south": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0"}, - "west": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0"}, + "north": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0", "cullface": "north"}, + "east": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0", "cullface": "east"}, + "south": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0", "cullface": "south"}, + "west": {"uv": [0.008, 0.008, 3.992, 0.242], "texture": "#0", "cullface": "west"}, "up": {"uv": [0.008, 0.008, 3.992, 3.992], "texture": "#0"} } }, diff --git a/src/main/resources/assets/portalcubed/models/item/lego_portal_gun.json b/src/main/resources/assets/portalcubed/models/item/lego_portal_gun.json index 5579b3bb..22a36e90 100644 --- a/src/main/resources/assets/portalcubed/models/item/lego_portal_gun.json +++ b/src/main/resources/assets/portalcubed/models/item/lego_portal_gun.json @@ -300,7 +300,8 @@ }, "ground": { "rotation": [12, 0, 0], - "translation": [0, 6, 0] + "translation": [0, 3, 0], + "scale": [0.64844, 0.64844, 0.64844] }, "gui": { "rotation": [26.75, 43, 0], diff --git a/src/main/resources/assets/portalcubed/models/item/portal_gun_frame.json b/src/main/resources/assets/portalcubed/models/item/portal_gun_frame.json index 01c9b2eb..05274edf 100644 --- a/src/main/resources/assets/portalcubed/models/item/portal_gun_frame.json +++ b/src/main/resources/assets/portalcubed/models/item/portal_gun_frame.json @@ -3,6 +3,7 @@ "texture_size": [32, 32], "textures": { "0": "portalcubed:item/portal_gun", + "1": "portalcubed:item/portal_gun_dyeable", "particle": "portalcubed:item/portal_gun" }, "elements": [ @@ -97,9 +98,29 @@ "north": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, "east": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, "south": {"uv": [8.516, 9.516, 9.484, 10.484], "texture": "#0"}, - "west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"}, - "up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"}, - "down": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"} + "up": {"uv": [7.516, 4.984, 8.484, 3.016], "texture": "#0"} + } + }, + { + "name": "cube inverted inverted", + "from": [7.04, 2.4, 5.025], + "to": [9.04, 4.4, 8.975], + "rotation": {"angle": 45, "axis": "z", "origin": [8.025, 3.35, 7]}, + "faces": { + "west": {"uv": [8.484, 4.984, 7.516, 3.016], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8.484, 4.984, 7.516, 3.016], "texture": "#0"} + } + }, + { + "name": "transparent", + "from": [7, 2.4, 5], + "to": [9, 4.4, 9], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 3.4, 2.575]}, + "faces": { + "east": {"uv": [10.516, 15, 12.516, 16], "texture": "#1"}, + "west": {"uv": [7.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#1"}, + "up": {"uv": [10.516, 15, 12.516, 16], "rotation": 90, "texture": "#1"}, + "down": {"uv": [7.516, 3.016, 8.516, 5.016], "rotation": 180, "texture": "#1"} } } ], @@ -138,5 +159,8 @@ "rotation": [0, -87.75, 0], "translation": [0, 4.75, -1.25] } + }, + "portalcubed:render_types": { + "translucent": ["transparent"] } } \ No newline at end of file diff --git a/src/main/resources/assets/portalcubed/sounds.json b/src/main/resources/assets/portalcubed/sounds.json index e9cd29e4..7c13f1cf 100644 --- a/src/main/resources/assets/portalcubed/sounds.json +++ b/src/main/resources/assets/portalcubed/sounds.json @@ -1,512 +1,496 @@ { - "error": { - "sounds": [ - "portalcubed:error" - ] - }, - - "gel_run": { - "subtitle": "subtitles.portalcubed.gel_run", - "sounds": [ - "portalcubed:gel_run" - ] - }, - "gel_bounce": { - "subtitle": "subtitles.portalcubed.gel_bounce", - "sounds": [ - "portalcubed:gel_bounce", - "portalcubed:gel_bounce2", - "portalcubed:gel_bounce3" - ] - }, - "gel_splat": { - "subtitle": "subtitles.portalcubed.gel_blob_splash", - "sounds": [ - "portalcubed:paint_blob_splat_01", - "portalcubed:paint_blob_splat_02", - "portalcubed:paint_blob_splat_03", - "portalcubed:paint_blob_splat_04", - "portalcubed:paint_blob_splat_05", - "portalcubed:paint_blob_splat_06", - "portalcubed:paint_blob_splat_07", - "portalcubed:paint_blob_splat_08", - "portalcubed:paint_blob_splat_09", - "portalcubed:paint_blob_splat_10", - "portalcubed:paint_blob_splat_11", - "portalcubed:paint_blob_splat_12" - ] - }, - "portal_gun_primary": { - "subtitle": "subtitles.portalcubed.portal_gun_primary_fire", - "sounds": [ - "portalcubed:wpn_portal_gun_fire_blue_01", - "portalcubed:wpn_portal_gun_fire_blue_02", - "portalcubed:wpn_portal_gun_fire_blue_03" - ] - }, - "portal_gun_secondary": { - "subtitle": "subtitles.portalcubed.portal_gun_secondary_fire", - "sounds": [ - "portalcubed:wpn_portal_gun_fire_red_01", - "portalcubed:wpn_portal_gun_fire_red_02", - "portalcubed:wpn_portal_gun_fire_red_03" - ] - }, - "portal_enter": { - "subtitle": "subtitles.portalcubed.portal_enter", - "sounds": [ - "portalcubed:portal_enter1", - "portalcubed:portal_enter2" - ] - }, - "portal_exit": { - "subtitle": "subtitles.portalcubed.portal_exit", - "sounds": [ - "portalcubed:portal_exit1", - "portalcubed:portal_exit2" - ] - }, - "portal_open": { - "subtitle": "subtitles.portalcubed.portal_open", - "sounds": [ - "portalcubed:portal_open1", - "portalcubed:portal_open2", - "portalcubed:portal_open3" - ] - }, - "portal_close": { - "subtitle": "subtitles.portalcubed.portal_close", - "sounds": [ - "portalcubed:portal_close2" - ] - }, - "portal_fizzle": { - "subtitle": "subtitles.portalcubed.portal_fizzle", - "sounds": [ - "portalcubed:portal_fizzle2" - ] - }, - "portal_invalid_surface": { - "subtitle": "subtitles.portalcubed.portal_invalid_surface", - "sounds": [ - "portalcubed:portal_invalid_surface3" - ] - }, - "portal_ambience": { - "sounds": [ - "portalcubed:portal_ambient_loop" - ] - }, - "cube_hit_high": { - "sounds": [ - "portalcubed:cube_hit_hard1", - "portalcubed:cube_hit_hard2" - ] - }, - "cube_hit_low": { - "sounds": [ - "portalcubed:cube_hit_soft1", - "portalcubed:cube_hit_soft2" - ] - }, - "cube_scrape": { - "sounds": [ - "portalcubed:cube_scrape" - ] - }, - "companion_cube_ambiance": { - "sounds": [ - "portalcubed:companion_cube_ambiance" - ] - }, - "material_emancipation": { - "sounds": [ - "portalcubed:material_emancipation_01" - ], - "subtitle": "subtitles.portalcubed.material_emancipation" - }, - "catapult_launch": { - "sounds": [ - "portalcubed:heavy_metal_stop1" - ], - "subtitle": "subtitles.portalcubed.faith_plate" - }, - - "pedestal_button_press": { - "sounds": [ - { - "name": "portalcubed:button_synth_positive_01", - "volume": 0.3 - } - ], - "subtitle": "subtitles.portalcubed.pedestal_button_press" - }, - "pedestal_button_release": { - "sounds": [ - { - "name": "portalcubed:button_synth_negative_02", - "volume": 0.3 - } - ], - "subtitle": "subtitles.portalcubed.pedestal_button_release" - }, - "old_ap_pedestal_button_press": { - "sounds": [ - { - "name": "portalcubed:old_ap_pedestal_button_press", - "volume": 0.3 - } - - ], - "subtitle": "subtitles.portalcubed.pedestal_button_press" - }, - "old_ap_pedestal_button_release": { - "sounds": [ - { - "name": "portalcubed:old_ap_pedestal_button_release", - "volume": 0.3 - } - - ], - "subtitle": "subtitles.portalcubed.pedestal_button_release" - }, - "floor_button_press": { - "sounds": [ - { - "name": "portalcubed:portal_button_down_01", - "volume": 0.3 - } - ], - "subtitle": "subtitles.portalcubed.floor_button_press" - }, - "floor_button_release": { - "sounds": [ - { - "name": "portalcubed:portal_button_up_01", - "volume": 0.3 - } - ], - "subtitle": "subtitles.portalcubed.floor_button_release" - }, - "old_ap_floor_button_press": { - "sounds": [ - { - "name": "portalcubed:og_button_down_01", - "volume": 0.3 - }, - { - "name": "portalcubed:og_button_down_02", - "volume": 0.3 - }, - { - "name": "portalcubed:og_button_down_03", - "volume": 0.3 - } - ], - "subtitle": "subtitles.portalcubed.floor_button_press" - }, - "old_ap_floor_button_release": { - "sounds": [ - { - "name": "portalcubed:og_button_up_01", - "volume": 0.3 - }, - { - "name": "portalcubed:og_button_up_02", - "volume": 0.3 - }, - { - "name": "portalcubed:og_button_up_03", - "volume": 0.3 - } - ], - "subtitle": "subtitles.portalcubed.floor_button_release" - }, - - "rocket/fire": { - "sounds": [ - "portalcubed:rocket/rocket_fire1" - ], - "subtitle": "subtitles.portalcubed.rocket.fire" - }, - "rocket/fly": { - "sounds": [ - "portalcubed:rocket/rocket_fly_loop1" - ] - }, - "rocket/locked": { - "sounds": [ - "portalcubed:rocket/rocket_locked_beep1" - ], - "subtitle": "subtitles.portalcubed.rocket.locked" - }, - "rocket/locking": { - "sounds": [ - "portalcubed:rocket/rocket_locking_beep1" - ], - "subtitle": "subtitles.portalcubed.rocket.locking" - }, - "rocket/explode": { - "subtitle": "subtitles.portalcubed.rocket.explosion", - "sounds": [ - "portalcubed:rocket/blast1" - ] - }, - "rocket/goo": { - "sounds": [ - ] - }, - - "laser/emitter_activate": { - "sounds": [ - { - "name": "portalcubed:laser/laser_activation_01", - "volume": 0.3 - } - ], - "subtitle": "subtitles.portalcubed.laser.activate" - }, - "laser/beam_music": { - "sounds": [ - { - "name": "portalcubed:laser/laser_beam_lp_02", - "volume": 0.3 - } - ], - "subtitle": "subtitles.portalcubed.laser.ambiance" - }, - "laser/node_music": { - "sounds": [ - { - "name": "portalcubed:laser/laser_node_lp_01", - "volume": 0.3 - } - ], - "subtitle": "subtitles.portalcubed.laser.node_sing" - }, - "laser/node_activate": { - "sounds": [ - { - "name": "portalcubed:laser/laser_node_power_on", - "volume": 0.3 - } - ], - "subtitle": "subtitles.portalcubed.laser.node_activate" - }, - "laser/node_deactivate": { - "sounds": [ - { - "name": "portalcubed:laser/laser_node_power_off", - "volume": 0.3 - } - ], - "subtitle": "subtitles.portalcubed.laser.node_deactivate" - }, - "laser/triple_laser_sound_demo_1": { - "sounds": [ - "portalcubed:laser/sp_a2_triple_laser_l1_01" - ], - "subtitle": "subtitles.portalcubed.laser.node_sing" - }, - "laser/triple_laser_sound_demo_2": { - "sounds": [ - "portalcubed:laser/sp_a2_triple_laser_l2_01" - ], - "subtitle": "subtitles.portalcubed.laser.node_sing" - }, - "laser/triple_laser_sound_demo_3": { - "sounds": [ - "portalcubed:laser/sp_a2_triple_laser_l3_01" - ], - "subtitle": "subtitles.portalcubed.laser.node_sing" - }, - - "pellet/bounce": { - "sounds": [ - "portalcubed:pellet/energy_bounce1", - "portalcubed:pellet/energy_bounce2" - ], - "subtitle": "subtitles.portalcubed.pellet.bounce" - }, - "pellet/explode": { - "sounds": [ - "portalcubed:pellet/energy_sing_explosion2" - ], - "subtitle": "subtitles.portalcubed.pellet.explode" - }, - "pellet/spawn": { - "sounds": [ - "portalcubed:pellet/energy_sing_flyby1", - "portalcubed:pellet/energy_sing_flyby2" - ], - "subtitle": "subtitles.portalcubed.pellet.spawn" - }, - "pellet/travel": { - "sounds": [ - "portalcubed:pellet/energy_sing_loop4" - ] - }, - - "tbeam/enter": { - "sounds": [ - "portalcubed:tbeam/player_enter_tbeam_lp_01", - "portalcubed:tbeam/player_enter_tbeam_lp_02", - "portalcubed:tbeam/player_enter_tbeam_lp_03" - ] - }, - "tbeam/travel": { - "sounds": [ - "portalcubed:tbeam/sp_a4_tb_wall_button_tbin" - ] - }, - - "bullet/concrete": { - "sounds": [ - "portalcubed:bullet/concrete_impact_bullet1", - "portalcubed:bullet/concrete_impact_bullet2", - "portalcubed:bullet/concrete_impact_bullet3", - "portalcubed:bullet/concrete_impact_bullet4" - ], - "subtitle": "subtitles.portalcubed.impact.concrete" - }, - "bullet/glass": { - "sounds": [ - "portalcubed:bullet/glass_impact_bullet1", - "portalcubed:bullet/glass_impact_bullet2", - "portalcubed:bullet/glass_impact_bullet3", - "portalcubed:bullet/glass_impact_bullet4" - ], - "subtitle": "subtitles.portalcubed.impact.glass" - }, - "bullet/metal": { - "sounds": [ - "portalcubed:bullet/metal_solid_impact_bullet1", - "portalcubed:bullet/metal_solid_impact_bullet2", - "portalcubed:bullet/metal_solid_impact_bullet3", - "portalcubed:bullet/metal_solid_impact_bullet4" - ], - "subtitle": "subtitles.portalcubed.impact.metal" - }, - - "radio": { - "sounds": [ - { - "name": "portalcubed:radio/radio", - "stream": true - } - ] - }, - "exile_vilify": { - "sounds": [ - { - "name": "portalcubed:radio/exile_vilify", - "stream": true - } - ] - }, - - "curiosity_core": { - "sounds": [ - ] - }, - "anger_core": { - "sounds": [ - ] - }, - "cake_core": { - "sounds": [ - ] - }, - "space_core": { - "sounds": [ - ] - }, - "adventure_core": { - "sounds": [ - ] - }, - "fact_core": { - "sounds": [ - ] - }, - - "disc/still_alive": { - "sounds": [ - { - "name": "portalcubed:disc/portal_still_alive", - "stream": true, - "volume": 0.05 - } - ] - }, - "disc/cara_mia_addio": { - "sounds": [ - { - "name": "portalcubed:disc/portal2-12-cara_mia_addio", - "stream": true, - "volume": 0.05 - } - ] - }, - "disc/want_you_gone": { - "sounds": [ - { - "name": "portalcubed:disc/portal2-13-want_you_gone", - "stream": true, - "volume": 0.05 - } - ] - }, - "disc/reconstructing_more_science": { - "sounds": [ - { - "name": "portalcubed:disc/portal2-01-reconstructing_more_science", - "stream": true, - "volume": 0.05 - } - ] - }, - - "sewage_step": { - "sounds": [ - "portalcubed:mud1", - "portalcubed:mud2", - "portalcubed:mud3", - "portalcubed:mud4" - ], - "subtitle": "subtitles.block.generic.footsteps" - }, - - "crowbar_swoosh": { - "sounds": [ - "portalcubed:iceaxe_swing1" - ], - "subtitle": "subtitles.portalcubed.crowbar_swoosh" - }, - - "generic_physics_fall": { - "sounds": [ - ] - }, - - "hold/fail": { - "sounds": [ - "portalcubed:object_use_failure_01" - ] - }, - "hold/start": { - "sounds": [ - "portalcubed:object_use_lp_01_start" - ] - }, - "hold/loop": { - "sounds": [ - "portalcubed:object_use_lp_01_loop" - ] - }, - "hold/stop": { - "sounds": [ - "portalcubed:object_use_stop_01" - ] - } + "adventure_core": { + "sounds": [] + }, + "anger_core": { + "sounds": [] + }, + "bullet/concrete": { + "sounds": [ + "portalcubed:bullet/concrete_impact_bullet1", + "portalcubed:bullet/concrete_impact_bullet2", + "portalcubed:bullet/concrete_impact_bullet3", + "portalcubed:bullet/concrete_impact_bullet4" + ], + "subtitle": "subtitles.portalcubed.impact.concrete" + }, + "bullet/glass": { + "sounds": [ + "portalcubed:bullet/glass_impact_bullet1", + "portalcubed:bullet/glass_impact_bullet2", + "portalcubed:bullet/glass_impact_bullet3", + "portalcubed:bullet/glass_impact_bullet4" + ], + "subtitle": "subtitles.portalcubed.impact.glass" + }, + "bullet/metal": { + "sounds": [ + "portalcubed:bullet/metal_solid_impact_bullet1", + "portalcubed:bullet/metal_solid_impact_bullet2", + "portalcubed:bullet/metal_solid_impact_bullet3", + "portalcubed:bullet/metal_solid_impact_bullet4" + ], + "subtitle": "subtitles.portalcubed.impact.metal" + }, + "cake_core": { + "sounds": [] + }, + "catapult_launch": { + "sounds": [ + "portalcubed:heavy_metal_stop1" + ], + "subtitle": "subtitles.portalcubed.faith_plate" + }, + "companion_cube_ambiance": { + "sounds": [ + "portalcubed:companion_cube_ambiance" + ] + }, + "crowbar_swoosh": { + "sounds": [ + "portalcubed:iceaxe_swing1" + ], + "subtitle": "subtitles.portalcubed.crowbar_swoosh" + }, + "cube_hit_high": { + "sounds": [ + "portalcubed:cube_hit_hard1", + "portalcubed:cube_hit_hard2" + ] + }, + "cube_hit_low": { + "sounds": [ + "portalcubed:cube_hit_soft1", + "portalcubed:cube_hit_soft2" + ] + }, + "cube_scrape": { + "sounds": [ + "portalcubed:cube_scrape" + ] + }, + "curiosity_core": { + "sounds": [] + }, + "disc/cara_mia_addio": { + "sounds": [ + { + "name": "portalcubed:disc/portal2-12-cara_mia_addio", + "stream": true, + "volume": 0.1 + } + ] + }, + "disc/reconstructing_more_science": { + "sounds": [ + { + "name": "portalcubed:disc/portal2-01-reconstructing_more_science", + "stream": true, + "volume": 0.1 + } + ] + }, + "disc/still_alive": { + "sounds": [ + { + "name": "portalcubed:disc/portal_still_alive", + "stream": true, + "volume": 0.1 + } + ] + }, + "disc/want_you_gone": { + "sounds": [ + { + "name": "portalcubed:disc/portal2-13-want_you_gone", + "stream": true, + "volume": 0.1 + } + ] + }, + "error": { + "sounds": [ + "portalcubed:error" + ] + }, + "exile_vilify": { + "sounds": [ + { + "name": "portalcubed:radio/exile_vilify", + "stream": true + } + ] + }, + "fact_core": { + "sounds": [] + }, + "floor_button_press": { + "sounds": [ + { + "name": "portalcubed:portal_button_down_01", + "volume": 0.5 + } + ], + "subtitle": "subtitles.portalcubed.floor_button_press" + }, + "floor_button_release": { + "sounds": [ + { + "name": "portalcubed:portal_button_up_01", + "volume": 0.5 + } + ], + "subtitle": "subtitles.portalcubed.floor_button_release" + }, + "gel_bounce": { + "sounds": [ + "portalcubed:gel_bounce", + "portalcubed:gel_bounce2", + "portalcubed:gel_bounce3" + ], + "subtitle": "subtitles.portalcubed.gel_bounce" + }, + "gel_run": { + "sounds": [ + "portalcubed:gel_run" + ], + "subtitle": "subtitles.portalcubed.gel_run" + }, + "gel_splat": { + "sounds": [ + "portalcubed:paint_blob_splat_01", + "portalcubed:paint_blob_splat_02", + "portalcubed:paint_blob_splat_03", + "portalcubed:paint_blob_splat_04", + "portalcubed:paint_blob_splat_05", + "portalcubed:paint_blob_splat_06", + "portalcubed:paint_blob_splat_07", + "portalcubed:paint_blob_splat_08", + "portalcubed:paint_blob_splat_09", + "portalcubed:paint_blob_splat_10", + "portalcubed:paint_blob_splat_11", + "portalcubed:paint_blob_splat_12" + ], + "subtitle": "subtitles.portalcubed.gel_blob_splash" + }, + "generic_physics_fall": { + "sounds": [] + }, + "hold/fail": { + "sounds": [ + "portalcubed:object_use_failure_01" + ] + }, + "hold/loop": { + "sounds": [ + { + "name": "portalcubed:object_use_lp_01_loop", + "volume": 0.8 + } + ] + }, + "hold/start": { + "sounds": [ + { + "name": "portalcubed:object_use_lp_01_start", + "volume": 0.7 + } + ], + "subtitle": "subtitles.portalcubed.object_pickup" + }, + "hold/stop": { + "sounds": [ + "portalcubed:object_use_stop_01" + ], + "subtitle": "subtitles.portalcubed.object_drop" + }, + "laser/beam_music": { + "sounds": [ + { + "name": "portalcubed:laser/laser_beam_lp_02", + "volume": 0.7 + } + ], + "subtitle": "subtitles.portalcubed.laser.ambiance" + }, + "laser/emitter_activate": { + "sounds": [ + { + "name": "portalcubed:laser/laser_activation_01", + "volume": 0.7 + } + ], + "subtitle": "subtitles.portalcubed.laser.activate" + }, + "laser/node_activate": { + "sounds": [ + { + "name": "portalcubed:laser/laser_node_power_on", + "volume": 0.7 + } + ], + "subtitle": "subtitles.portalcubed.laser.node_activate" + }, + "laser/node_deactivate": { + "sounds": [ + { + "name": "portalcubed:laser/laser_node_power_off", + "volume": 0.7 + } + ], + "subtitle": "subtitles.portalcubed.laser.node_deactivate" + }, + "laser/node_music": { + "sounds": [ + { + "name": "portalcubed:laser/laser_node_lp_01", + "volume": 0.7 + } + ], + "subtitle": "subtitles.portalcubed.laser.node_sing" + }, + "laser/triple_laser_sound_demo_1": { + "sounds": [ + "portalcubed:laser/sp_a2_triple_laser_l1_01" + ], + "subtitle": "subtitles.portalcubed.laser.node_sing" + }, + "laser/triple_laser_sound_demo_2": { + "sounds": [ + "portalcubed:laser/sp_a2_triple_laser_l2_01" + ], + "subtitle": "subtitles.portalcubed.laser.node_sing" + }, + "laser/triple_laser_sound_demo_3": { + "sounds": [ + "portalcubed:laser/sp_a2_triple_laser_l3_01" + ], + "subtitle": "subtitles.portalcubed.laser.node_sing" + }, + "material_emancipation": { + "sounds": [ + "portalcubed:material_emancipation_01" + ], + "subtitle": "subtitles.portalcubed.material_emancipation" + }, + "old_ap_floor_button_press": { + "sounds": [ + { + "name": "portalcubed:og_button_down_01", + "volume": 0.5 + }, + { + "name": "portalcubed:og_button_down_02", + "volume": 0.5 + }, + { + "name": "portalcubed:og_button_down_03", + "volume": 0.5 + } + ], + "subtitle": "subtitles.portalcubed.floor_button_press" + }, + "old_ap_floor_button_release": { + "sounds": [ + { + "name": "portalcubed:og_button_up_01", + "volume": 0.5 + }, + { + "name": "portalcubed:og_button_up_02", + "volume": 0.5 + }, + { + "name": "portalcubed:og_button_up_03", + "volume": 0.5 + } + ], + "subtitle": "subtitles.portalcubed.floor_button_release" + }, + "old_ap_pedestal_button_press": { + "sounds": [ + { + "name": "portalcubed:old_ap_pedestal_button_press", + "volume": 0.5 + } + ], + "subtitle": "subtitles.portalcubed.pedestal_button_press" + }, + "old_ap_pedestal_button_release": { + "sounds": [ + { + "name": "portalcubed:old_ap_pedestal_button_release", + "volume": 0.5 + } + ], + "subtitle": "subtitles.portalcubed.pedestal_button_release" + }, + "pedestal_button_press": { + "sounds": [ + { + "name": "portalcubed:button_synth_positive_01", + "volume": 0.5 + } + ], + "subtitle": "subtitles.portalcubed.pedestal_button_press" + }, + "pedestal_button_release": { + "sounds": [ + { + "name": "portalcubed:button_synth_negative_02", + "volume": 0.5 + } + ], + "subtitle": "subtitles.portalcubed.pedestal_button_release" + }, + "pellet/bounce": { + "sounds": [ + "portalcubed:pellet/energy_bounce1", + "portalcubed:pellet/energy_bounce2" + ], + "subtitle": "subtitles.portalcubed.pellet.bounce" + }, + "pellet/explode": { + "sounds": [ + "portalcubed:pellet/energy_sing_explosion2" + ], + "subtitle": "subtitles.portalcubed.pellet.explode" + }, + "pellet/spawn": { + "sounds": [ + "portalcubed:pellet/energy_sing_flyby1", + "portalcubed:pellet/energy_sing_flyby2" + ], + "subtitle": "subtitles.portalcubed.pellet.spawn" + }, + "pellet/travel": { + "sounds": [ + "portalcubed:pellet/energy_sing_loop4" + ] + }, + "portal_ambience": { + "sounds": [ + "portalcubed:portal_ambient_loop" + ] + }, + "portal_close": { + "sounds": [ + "portalcubed:portal_close2" + ], + "subtitle": "subtitles.portalcubed.portal_close" + }, + "portal_enter": { + "sounds": [ + "portalcubed:portal_enter1", + "portalcubed:portal_enter2" + ], + "subtitle": "subtitles.portalcubed.portal_enter" + }, + "portal_exit": { + "sounds": [ + "portalcubed:portal_exit1", + "portalcubed:portal_exit2" + ], + "subtitle": "subtitles.portalcubed.portal_exit" + }, + "portal_fizzle": { + "sounds": [ + "portalcubed:portal_fizzle2" + ], + "subtitle": "subtitles.portalcubed.portal_fizzle" + }, + "portal_gun_primary": { + "sounds": [ + "portalcubed:wpn_portal_gun_fire_blue_01", + "portalcubed:wpn_portal_gun_fire_blue_02", + "portalcubed:wpn_portal_gun_fire_blue_03" + ], + "subtitle": "subtitles.portalcubed.portal_gun_primary_fire" + }, + "portal_gun_secondary": { + "sounds": [ + "portalcubed:wpn_portal_gun_fire_red_01", + "portalcubed:wpn_portal_gun_fire_red_02", + "portalcubed:wpn_portal_gun_fire_red_03" + ], + "subtitle": "subtitles.portalcubed.portal_gun_secondary_fire" + }, + "portal_invalid_surface": { + "sounds": [ + "portalcubed:portal_invalid_surface3" + ], + "subtitle": "subtitles.portalcubed.portal_invalid_surface" + }, + "portal_open": { + "sounds": [ + "portalcubed:portal_open1", + "portalcubed:portal_open2", + "portalcubed:portal_open3" + ], + "subtitle": "subtitles.portalcubed.portal_open" + }, + "radio": { + "sounds": [ + { + "name": "portalcubed:radio/radio", + "stream": true + } + ] + }, + "rocket/explode": { + "sounds": [ + "portalcubed:rocket/blast1" + ], + "subtitle": "subtitles.portalcubed.rocket.explosion" + }, + "rocket/fire": { + "sounds": [ + "portalcubed:rocket/rocket_fire1" + ], + "subtitle": "subtitles.portalcubed.rocket.fire" + }, + "rocket/fly": { + "sounds": [ + "portalcubed:rocket/rocket_fly_loop1" + ] + }, + "rocket/goo": { + "sounds": [] + }, + "rocket/locked": { + "sounds": [ + "portalcubed:rocket/rocket_locked_beep1" + ], + "subtitle": "subtitles.portalcubed.rocket.locked" + }, + "rocket/locking": { + "sounds": [ + "portalcubed:rocket/rocket_locking_beep1" + ], + "subtitle": "subtitles.portalcubed.rocket.locking" + }, + "sewage_step": { + "sounds": [ + "portalcubed:mud1", + "portalcubed:mud2", + "portalcubed:mud3", + "portalcubed:mud4" + ], + "subtitle": "subtitles.block.generic.footsteps" + }, + "space_core": { + "sounds": [] + }, + "tbeam/enter": { + "sounds": [ + "portalcubed:tbeam/player_enter_tbeam_lp_01", + "portalcubed:tbeam/player_enter_tbeam_lp_02", + "portalcubed:tbeam/player_enter_tbeam_lp_03" + ] + }, + "tbeam/travel": { + "sounds": [ + "portalcubed:tbeam/sp_a4_tb_wall_button_tbin" + ] + } } diff --git a/src/main/resources/data/portalcubed/advancements/achievements/heartbreaker.json b/src/main/resources/data/portalcubed/advancements/achievements/heartbreaker.json new file mode 100644 index 00000000..bb727d2f --- /dev/null +++ b/src/main/resources/data/portalcubed/advancements/achievements/heartbreaker.json @@ -0,0 +1,45 @@ +{ + "display": { + "icon": { + "item": "portalcubed:portal_1_companion_cube" + }, + "title": { + "translate": "advancement.portalcubed.heartbreaker.title" + }, + "description": { + "translate": "advancement.portalcubed.heartbreaker.description" + }, + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "parent": "portalcubed:achievements/fizzler", + "criteria": { + "requirement": { + "trigger": "minecraft:tick", + "conditions": { + "player": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "type": "minecraft:player", + "type_specific": { + "type": "player", + "looking_at": { + "type": "#portalcubed:companion_cubes", + "nbt": "{cardinal_components:{\"gravity_api:gravity_direction\":{ListSize: 0}},Locked:0b,NoGravity:1b}", + "location": { + "block": { + "tag": "portalcubed:fizzles_props" + } + } + } + } + } + } + ] + } + } + } +} diff --git a/src/main/resources/data/portalcubed/recipes/portal_gun_frame_crafting.json b/src/main/resources/data/portalcubed/recipes/portal_gun_frame_crafting.json index 95fc36a5..1db9c48e 100644 --- a/src/main/resources/data/portalcubed/recipes/portal_gun_frame_crafting.json +++ b/src/main/resources/data/portalcubed/recipes/portal_gun_frame_crafting.json @@ -1,12 +1,15 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - " X", + " YX", "XXX" ], "key": { "X": { "item": "minecraft:obsidian" + }, + "Y": { + "item": "minecraft:glass_pane" } }, "result": { diff --git a/src/main/resources/data/portalcubed/tags/blocks/fizzles_props.json b/src/main/resources/data/portalcubed/tags/blocks/fizzles_props.json new file mode 100644 index 00000000..7e3682e3 --- /dev/null +++ b/src/main/resources/data/portalcubed/tags/blocks/fizzles_props.json @@ -0,0 +1,12 @@ +{ + "replace": false, + "values" : [ + "portalcubed:fizzler", + "portalcubed:portal_1_fizzler", + "portalcubed:old_aperture_fizzler", + "portalcubed:death_fizzler", + "portalcubed:old_aperture_death_fizzler", + "portalcubed:matter_inquisition_field", + "portalcubed:toxic_goo" + ] +} diff --git a/src/main/resources/data/portalcubed/tags/entity_types/companion_cubes.json b/src/main/resources/data/portalcubed/tags/entity_types/companion_cubes.json new file mode 100644 index 00000000..20c50ed3 --- /dev/null +++ b/src/main/resources/data/portalcubed/tags/entity_types/companion_cubes.json @@ -0,0 +1,6 @@ +{ + "values": [ + "portalcubed:companion_cube", + "portalcubed:portal_1_companion_cube" + ] +} \ No newline at end of file