Skip to content

Commit

Permalink
paintbrush sounds
Browse files Browse the repository at this point in the history
  • Loading branch information
DaFuqs committed Aug 9, 2022
1 parent f4ee6da commit d9b76bb
Show file tree
Hide file tree
Showing 15 changed files with 41 additions and 7 deletions.
5 changes: 5 additions & 0 deletions credits/Freesound - Paint-brush.wav by AryaNotStark.URL
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[InternetShortcut]
https://freesound.org/people/AryaNotStark/sounds/407625/

cut into pieces and used in
paintbrush_paint1 - paintbrush_paint10
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ default ActionResult checkAndDoPaintbrushTrigger(BlockState state, World world,
if(player.getStackInHand(hand).getItem() instanceof PaintBrushItem) {
ActionResult actionResult = onPaintBrushTrigger(state, world, pos, player, hand, hit);
if(actionResult.isAccepted()) {
world.playSound(null, pos, SpectrumSoundEvents.ENCHANTER_DING, SoundCategory.PLAYERS, 1.0F, 1.0F);
world.playSound(null, pos, SpectrumSoundEvents.PAINTBRUSH_TRIGGER, SoundCategory.PLAYERS, 1.0F, 1.0F);
} else {
world.playSound(null, pos, SpectrumSoundEvents.USE_FAIL, SoundCategory.PLAYERS, 1.0F, 1.0F);
}
return actionResult;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ public class SpectrumSoundEvents {
public static final SoundEvent CELESTIAL_POCKET_WATCH_TICKING = register("celestial_pocket_watch_ticking");
public static final SoundEvent CELESTIAL_POCKET_WATCH_FLY_BY = register("celestial_pocket_watch_sky_fly_by");

public static final SoundEvent PAINTBRUSH_TRIGGER = register("paintbrush_trigger");
public static final SoundEvent PAINTBRUSH_PAINT = register("paintbrush_paint");

public static final SoundEvent SHOOTING_STAR_CRACKER = register("shooting_star_cracker");
public static final SoundEvent TEXT_REVEALED = register("spectrum.ui.text_revealed");
public static final SoundEvent USE_FAIL = register("use_fail");
Expand Down Expand Up @@ -70,7 +73,6 @@ public class SpectrumSoundEvents {
public static final SoundEvent MIDNIGHT_SOLUTION_AMBIENT = register("midnight_solution_ambient");

public static final SoundEvent FADING_PLACED = register("fading_placed");
;
public static final SoundEvent FAILING_PLACED = register("failing_placed");
public static final SoundEvent RUIN_PLACED = register("ruin_placed");

Expand All @@ -92,6 +94,7 @@ public class SpectrumSoundEvents {
public static final SoundEvent BLOCK_MEDIUM_CITRINE_BUD_PLACE = register("block.medium_citrine_bud.place");
public static final SoundEvent BLOCK_LARGE_CITRINE_BUD_BREAK = register("block.large_citrine_bud.break");
public static final SoundEvent BLOCK_LARGE_CITRINE_BUD_PLACE = register("block.large_citrine_bud.place");
public static final SoundEvent BLOCK_CITRINE_BLOCK_CHIME = register("block.citrine_block.chime");

public static final SoundEvent BLOCK_TOPAZ_BLOCK_BREAK = register("block.topaz_block.break");
public static final SoundEvent BLOCK_TOPAZ_BLOCK_STEP = register("block.topaz_block.step");
Expand All @@ -109,6 +112,8 @@ public class SpectrumSoundEvents {
public static final SoundEvent BLOCK_MEDIUM_TOPAZ_BUD_PLACE = register("block.medium_topaz_bud.place");
public static final SoundEvent BLOCK_LARGE_TOPAZ_BUD_BREAK = register("block.large_topaz_bud.break");
public static final SoundEvent BLOCK_LARGE_TOPAZ_BUD_PLACE = register("block.large_topaz_bud.place");
public static final SoundEvent BLOCK_TOPAZ_BLOCK_CHIME = register("block.topaz_block.chime");

public static final SoundEvent BLOCK_ONYX_BLOCK_BREAK = register("block.onyx_block.break");
public static final SoundEvent BLOCK_ONYX_BLOCK_STEP = register("block.onyx_block.step");
public static final SoundEvent BLOCK_ONYX_BLOCK_PLACE = register("block.onyx_block.place");
Expand All @@ -125,6 +130,8 @@ public class SpectrumSoundEvents {
public static final SoundEvent BLOCK_MEDIUM_ONYX_BUD_PLACE = register("block.medium_onyx_bud.place");
public static final SoundEvent BLOCK_LARGE_ONYX_BUD_BREAK = register("block.large_onyx_bud.break");
public static final SoundEvent BLOCK_LARGE_ONYX_BUD_PLACE = register("block.large_onyx_bud.place");
public static final SoundEvent BLOCK_ONYX_BLOCK_CHIME = register("block.onyx_block.chime");

public static final SoundEvent BLOCK_MOONSTONE_BLOCK_BREAK = register("block.moonstone_block.break");
public static final SoundEvent BLOCK_MOONSTONE_BLOCK_STEP = register("block.moonstone_block.step");
public static final SoundEvent BLOCK_MOONSTONE_BLOCK_PLACE = register("block.moonstone_block.place");
Expand All @@ -141,6 +148,7 @@ public class SpectrumSoundEvents {
public static final SoundEvent BLOCK_MEDIUM_MOONSTONE_BUD_PLACE = register("block.medium_moonstone_bud.place");
public static final SoundEvent BLOCK_LARGE_MOONSTONE_BUD_BREAK = register("block.large_moonstone_bud.break");
public static final SoundEvent BLOCK_LARGE_MOONSTONE_BUD_PLACE = register("block.large_moonstone_bud.place");
public static final SoundEvent BLOCK_MOONSTONE_BLOCK_CHIME = register("block.moonstone_block.chime");

public static final SoundEvent SPECTRAL_BLOCK_BREAK = register("block.spectral_block.break");
public static final SoundEvent SPECTRAL_BLOCK_STEP = register("block.spectral_block.step");
Expand All @@ -149,11 +157,6 @@ public class SpectrumSoundEvents {
public static final SoundEvent SPECTRAL_BLOCK_HIT = register("block.spectral_block.hit");
public static final SoundEvent SPECTRAL_BLOCK_CHIME = register("block.spectral_block.chime");

public static final SoundEvent BLOCK_CITRINE_BLOCK_CHIME = register("block.citrine_block.chime");
public static final SoundEvent BLOCK_TOPAZ_BLOCK_CHIME = register("block.topaz_block.chime");
public static final SoundEvent BLOCK_ONYX_BLOCK_CHIME = register("block.onyx_block.chime");
public static final SoundEvent BLOCK_MOONSTONE_BLOCK_CHIME = register("block.moonstone_block.chime");

private static SoundEvent register(String id) {
Identifier identifier = new Identifier(SpectrumCommon.MOD_ID, id);
return Registry.register(Registry.SOUND_EVENT, identifier, new SoundEvent(identifier));
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/assets/spectrum/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,8 @@
"enchantment.spectrum.indestructible": "Indestructible",
"enchantment.spectrum.indestructible.desc": "Makes the tool fully unbreakable",

"spectrum.subtitles.paintbrush_trigger": "Paintbrush activation",
"spectrum.subtitles.paintbrush_paint": "Paintbrush paints",
"spectrum.subtitles.celestial_pocket_watch_ticking": "Pocketwatch ticks",
"spectrum.subtitles.shooting_star_cracker": "Shooting Star cracks",
"spectrum.subtitles.block.memory.advance": "Memory defines further",
Expand Down Expand Up @@ -1318,6 +1320,7 @@
"item.spectrum.end_portal_cracker": "End Portal Cracker",
"item.spectrum.manual": "Colorful World",
"item.spectrum.manual.landing_text": "$(br)The energies growing$(br)$(c_gray) like roots, they sprout$()$(br)magic of nature overflowing$(br)$(c_gray) ’til you discover$(br) what's all about.",
"item.spectrum.paintbrush": "Paintbrush",
"item.spectrum.multitool": "Multitool",
"item.spectrum.silker_pickaxe": "Tender Pickaxe",
"item.spectrum.fortune_pickaxe": "Lucky Pickaxe",
Expand Down
21 changes: 21 additions & 0 deletions src/main/resources/assets/spectrum/sounds.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,27 @@
"spectrum:use_fail"
]
},
"paintbrush_trigger": {
"subtitle": "spectrum.subtitles.paintbrush_trigger",
"sounds": [
"spectrum:enchanter_ding"
]
},
"paintbrush_paint": {
"subtitle": "spectrum.subtitles.paintbrush_paint",
"sounds": [
"spectrum:paintbrush_paint1",
"spectrum:paintbrush_paint2",
"spectrum:paintbrush_paint3",
"spectrum:paintbrush_paint4",
"spectrum:paintbrush_paint5",
"spectrum:paintbrush_paint6",
"spectrum:paintbrush_paint7",
"spectrum:paintbrush_paint8",
"spectrum:paintbrush_paint9",
"spectrum:paintbrush_paint10"
]
},
"enchanter_working": {
"subtitle": "spectrum.subtitles.enchanter_working",
"sounds": [
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit d9b76bb

Please sign in to comment.