Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/portal' into portal
Browse files Browse the repository at this point in the history
  • Loading branch information
@gemsb
gemsb committed Jan 14, 2025
2 parents 80ecc22 + 701b8d8 commit 9203862
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 8 deletions.
15 changes: 8 additions & 7 deletions src/main/java/net/ugi/sculk_depths/block/ModBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import net.ugi.sculk_depths.block.custom.ModCauldron.ModCauldronBehavior;
import net.ugi.sculk_depths.fluid.ModFluids;
import net.ugi.sculk_depths.item.ModItemGroup;
import net.ugi.sculk_depths.sound.ModBlockSoundGroups;
import net.ugi.sculk_depths.world.WorldGenerator;
import net.ugi.sculk_depths.block.custom.ModCauldron.SporeFlumrockCauldronBlock;
import net.ugi.sculk_depths.block.dryable.*;
Expand All @@ -33,25 +34,25 @@ public class ModBlocks {
// amalgamite

public static final Block AMALGAMITE = registerBlock("amalgamite",
new Block(AbstractBlock.Settings.copy(Blocks.DEEPSLATE).strength(3.0f, 6.0f).requiresTool()), ModItemGroup.SCULK_DEPTHS_BLOCKS);
new Block(AbstractBlock.Settings.copy(Blocks.DEEPSLATE).strength(3.0f, 6.0f).requiresTool().sounds(ModBlockSoundGroups.AMALGAMITE)), ModItemGroup.SCULK_DEPTHS_BLOCKS);

public static final Block AMALGAMITE_BRICKS = registerBlock("amalgamite_bricks",
new Block(AbstractBlock.Settings.copy(Blocks.DEEPSLATE_BRICKS).strength(2.9f, 6.0f).requiresTool()), ModItemGroup.SCULK_DEPTHS_BLOCKS);
new Block(AbstractBlock.Settings.copy(Blocks.DEEPSLATE_BRICKS).strength(2.9f, 6.0f).requiresTool().sounds(ModBlockSoundGroups.AMALGAMITE)), ModItemGroup.SCULK_DEPTHS_BLOCKS);

public static final Block CHISELED_AMALGAMITE = registerBlock("chiseled_amalgamite",
new Block(AbstractBlock.Settings.copy(Blocks.DEEPSLATE_BRICKS).strength(2.9f, 6.0f).requiresTool()), ModItemGroup.SCULK_DEPTHS_BLOCKS);
new Block(AbstractBlock.Settings.copy(Blocks.DEEPSLATE_BRICKS).strength(2.9f, 6.0f).requiresTool().sounds(ModBlockSoundGroups.AMALGAMITE)), ModItemGroup.SCULK_DEPTHS_BLOCKS);

public static final Block AMALGAMITE_BRICK_STAIRS = registerBlock("amalgamite_brick_stairs",
new StairsBlock(ModBlocks.AMALGAMITE_BRICKS.getDefaultState(), AbstractBlock.Settings.copy(ModBlocks.AMALGAMITE_BRICKS)), ModItemGroup.SCULK_DEPTHS_BLOCKS);
new StairsBlock(ModBlocks.AMALGAMITE_BRICKS.getDefaultState(), AbstractBlock.Settings.copy(ModBlocks.AMALGAMITE_BRICKS).sounds(ModBlockSoundGroups.AMALGAMITE)), ModItemGroup.SCULK_DEPTHS_BLOCKS);

public static final Block AMALGAMITE_BRICK_SLAB = registerBlock("amalgamite_brick_slab",
new SlabBlock(AbstractBlock.Settings.copy(ModBlocks.AMALGAMITE_BRICKS)), ModItemGroup.SCULK_DEPTHS_BLOCKS);
new SlabBlock(AbstractBlock.Settings.copy(ModBlocks.AMALGAMITE_BRICKS).sounds(ModBlockSoundGroups.AMALGAMITE)), ModItemGroup.SCULK_DEPTHS_BLOCKS);

public static final Block ACTIVATED_AMALGAMITE = registerBlock("activated_amalgamite",
new Block(AbstractBlock.Settings.copy(Blocks.DEEPSLATE).strength(-1.0f, 3600000.0f)), ModItemGroup.SCULK_DEPTHS_BLOCKS);
new Block(AbstractBlock.Settings.copy(Blocks.REINFORCED_DEEPSLATE).strength(-1.0f, 3600000.0f).sounds(ModBlockSoundGroups.AMALGAMITE)), ModItemGroup.SCULK_DEPTHS_BLOCKS);

public static final Block AMALGAMITE_BRICK_WALL = registerBlock("amalgamite_brick_wall",
new WallBlock(AbstractBlock.Settings.copy(ModBlocks.AMALGAMITE_BRICKS)), ModItemGroup.SCULK_DEPTHS_BLOCKS);
new WallBlock(AbstractBlock.Settings.copy(ModBlocks.AMALGAMITE_BRICKS).sounds(ModBlockSoundGroups.AMALGAMITE)), ModItemGroup.SCULK_DEPTHS_BLOCKS);

public static final Block LARGUTH = registerBlock("larguth",
new Block(AbstractBlock.Settings.copy(Blocks.OBSIDIAN).strength(40.0f,1000f).requiresTool()), ModItemGroup.SCULK_DEPTHS_BLOCKS);
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/net/ugi/sculk_depths/sound/ModBlockSoundGroups.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package net.ugi.sculk_depths.sound;

import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.sound.SoundEvents;

import static net.ugi.sculk_depths.sound.ModSounds.*;

public class ModBlockSoundGroups {
public static BlockSoundGroup AMALGAMITE = new BlockSoundGroup(1,1,BLOCK_AMALGAMITE_BREAK_EVENT, SoundEvents.BLOCK_DEEPSLATE_STEP, SoundEvents.BLOCK_DEEPSLATE_PLACE, SoundEvents.BLOCK_DEEPSLATE_HIT, SoundEvents.BLOCK_DEEPSLATE_FALL);
}
7 changes: 7 additions & 0 deletions src/main/java/net/ugi/sculk_depths/sound/ModSounds.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.sound.SoundEvent;
import net.minecraft.sound.SoundEvents;
import net.minecraft.util.Identifier;
import net.ugi.sculk_depths.SculkDepths;

Expand All @@ -15,13 +17,16 @@ public class ModSounds {
public static final Identifier SCULK_DEPTHS_OST_1 = SculkDepths.identifier("music.sculk_depths.ost-1");
public static final Identifier AMBIENT_WIND_ADDITIONS = SculkDepths.identifier("ambient.wind.additions");
public static final Identifier AMBIENT_CAVE_ADDITIONS = SculkDepths.identifier("ambient.cave.additions");
public static final Identifier BLOCK_AMALGAMITE_BREAK = SculkDepths.identifier("block.amalgamite.break");
public static SoundEvent SCULK_DEPTHS_MAIN_SOUNDTRACK_EVENT = SoundEvent.of(SCULK_DEPTHS_MAIN_SOUNDTRACK);
public static SoundEvent SCULK_DEPTHS_CEPHLERA_SOUNDTRACK_EVENT = SoundEvent.of(SCULK_DEPTHS_CEPHLERA_SOUNDTRACK);
public static SoundEvent SCULK_DEPTHS_MAIN_THEME_EVENT = SoundEvent.of(SCULK_DEPTHS_MAIN_THEME);
public static SoundEvent SCULK_DEPTHS_ZINNIA_EVENT = SoundEvent.of(SCULK_DEPTHS_ZINNIA);
public static SoundEvent SCULK_DEPTHS_OST_1_EVENT = SoundEvent.of(SCULK_DEPTHS_OST_1);
public static SoundEvent AMBIENT_WIND_ADDITIONS_EVENT = SoundEvent.of(AMBIENT_WIND_ADDITIONS);
public static SoundEvent AMBIENT_CAVE_ADDITIONS_EVENT = SoundEvent.of(AMBIENT_CAVE_ADDITIONS);
public static SoundEvent BLOCK_AMALGAMITE_BREAK_EVENT = SoundEvent.of(BLOCK_AMALGAMITE_BREAK);


public static void registerModSounds() {
Registry.register(Registries.SOUND_EVENT, ModSounds.SCULK_DEPTHS_MAIN_SOUNDTRACK, SCULK_DEPTHS_MAIN_SOUNDTRACK_EVENT);
Expand All @@ -31,5 +36,7 @@ public static void registerModSounds() {
Registry.register(Registries.SOUND_EVENT, ModSounds.SCULK_DEPTHS_OST_1, SCULK_DEPTHS_OST_1_EVENT);
Registry.register(Registries.SOUND_EVENT, ModSounds.AMBIENT_WIND_ADDITIONS, AMBIENT_WIND_ADDITIONS_EVENT);
Registry.register(Registries.SOUND_EVENT, ModSounds.AMBIENT_CAVE_ADDITIONS, AMBIENT_CAVE_ADDITIONS_EVENT);
Registry.register(Registries.SOUND_EVENT, ModSounds.BLOCK_AMALGAMITE_BREAK, BLOCK_AMALGAMITE_BREAK_EVENT);
}

}
25 changes: 25 additions & 0 deletions src/main/resources/assets/sculk_depths/sounds.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,31 @@
"name":"minecraft:ambient/nether/basalt_deltas/long_debris2"
}
]
},
"block.amalgamite.break": {
"category": "block",
"sounds": [
{
"name":"sculk_depths:block/amalgamite_break",
"volume": 0.4,
"pitch": 1.05
},
{
"name":"sculk_depths:block/amalgamite_break",
"volume": 0.4,
"pitch": 1
},
{
"name":"sculk_depths:block/amalgamite_break",
"volume": 0.4,
"pitch": 0.95
},
{
"name":"sculk_depths:block/amalgamite_break",
"volume": 0.4,
"pitch": 0.9
}
]
}

}
Binary file added src/main/resources/assets/sculk_depths/sounds/block/amalgamite_break.ogg
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/main/resources/data/sculk_depths/dimension_type/sculk_depths_type.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"logical_height": 256,
"infiniburn": "#minecraft:infiniburn_overworld",
"effects": "minecraft:the_nether",
"ambient_light": 0.003,
"ambient_light": 0.004,
"ultrawarm": false,
"natural": false,
"piglin_safe": false,
Expand Down

0 comments on commit 9203862

Please sign in to comment.