Skip to content

Commit

Permalink
Compress sounds
Browse files Browse the repository at this point in the history
  • Loading branch information
SammySemicolon committed Nov 27, 2023
1 parent c63be26 commit 08063ad
Show file tree
Hide file tree
Showing 237 changed files with 5 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ public static void init() {

public static class LoadedOnly {

public static Item makeMagicKnife() {
return new MagicKnifeItem(SOUL_STAINED_STEEL, -1.5f, 0, 2, GEAR_PROPERTIES());
public static Item makeMagicKnife(Item.Properties properties) {
return new MagicKnifeItem(SOUL_STAINED_STEEL, -1.5f, 0, 2, properties);
}

public static void addInfo(IRecipeRegistration registration) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static void recoverSoulWard(TickEvent.PlayerTickEvent event) {
if (!player.isCreative()) {
SoundEvent sound = soulWardHandler.soulWard >= soulWardCap.getValue() ? SoundRegistry.SOUL_WARD_CHARGE.get() : SoundRegistry.SOUL_WARD_GROW.get();
float pitch = 1f + (soulWardHandler.soulWard / (float) soulWardCap.getValue()) * 0.5f + (Mth.ceil(soulWardHandler.soulWard) % 3) * 0.25f;
player.level().playSound(null, player.blockPosition(), sound, SoundSource.PLAYERS, 1, pitch);
player.level().playSound(null, player.blockPosition(), sound, SoundSource.PLAYERS, 0.25f, pitch);
}
soulWardHandler.soulWardProgress = getSoulWardCooldown(player);
MalumPlayerDataCapability.syncTrackingAndSelf(player);
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/sammy/malum/data/DataGenerators.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public class DataGenerators {
public static void gatherData(GatherDataEvent event) {
DataGenerator generator = event.getGenerator();
PackOutput output = generator.getPackOutput();
generator.addProvider(event.includeServer(), new MalumRecipes(output));
CompletableFuture<HolderLookup.Provider> provider = event.getLookupProvider();
ExistingFileHelper helper = event.getExistingFileHelper();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ public static <T extends Item> RegistryObject<T> register(String name, Item.Prop
public static final RegistryObject<Item> SOUL_STAINED_STEEL_AXE = register("soul_stained_steel_axe", GEAR_PROPERTIES(), (p) -> new MagicAxeItem(SOUL_STAINED_STEEL, -3f, 0, 4, p));
public static final RegistryObject<Item> SOUL_STAINED_STEEL_SHOVEL = register("soul_stained_steel_shovel", GEAR_PROPERTIES(), (p) -> new MagicShovelItem(SOUL_STAINED_STEEL, -2, 0, 2, p));
public static final RegistryObject<Item> SOUL_STAINED_STEEL_HOE = register("soul_stained_steel_hoe", GEAR_PROPERTIES(), (p) -> new MagicHoeItem(SOUL_STAINED_STEEL, 0, -1.5f, 1, p));
public static final RegistryObject<Item> SOUL_STAINED_STEEL_KNIFE = register("soul_stained_steel_knife", HIDDEN_PROPERTIES(), (p) -> FarmersDelightCompat.LOADED ? FarmersDelightCompat.LoadedOnly.makeMagicKnife() : new Item(p));
public static final RegistryObject<Item> SOUL_STAINED_STEEL_KNIFE = register("soul_stained_steel_knife", FarmersDelightCompat.LOADED ? GEAR_PROPERTIES() : HIDDEN_PROPERTIES(), (p) -> FarmersDelightCompat.LOADED ? FarmersDelightCompat.LoadedOnly.makeMagicKnife(p) : new Item(p));

public static final RegistryObject<Item> SOUL_STAINED_STEEL_HELMET = register("soul_stained_steel_helmet", GEAR_PROPERTIES(), (p) -> new SoulStainedSteelArmorItem(ArmorItem.Type.HELMET, p));
public static final RegistryObject<Item> SOUL_STAINED_STEEL_CHESTPLATE = register("soul_stained_steel_chestplate", GEAR_PROPERTIES(), (p) -> new SoulStainedSteelArmorItem(ArmorItem.Type.CHESTPLATE, p));
Expand Down
Binary file modified src/main/resources/assets/malum/sounds/altar/altar_consume1.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/altar/altar_consume2.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/altar/altar_craft1.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/altar/altar_craft2.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/altar/altar_loop.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/altar/altar_speedup1.ogg
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.
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.
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.
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.
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 modified src/main/resources/assets/malum/sounds/blocks/ether/break1.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/blocks/ether/break2.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/blocks/ether/break3.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/blocks/ether/break4.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/blocks/gemstone/hit1.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/blocks/gemstone/hit2.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/blocks/gemstone/hit3.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/blocks/gemstone/hit4.ogg
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.
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.
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/codex/book_close1.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/codex/book_close2.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/codex/book_close3.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/codex/book_close4.ogg
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 modified src/main/resources/assets/malum/sounds/codex/book_open1.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/codex/book_open2.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/codex/book_open3.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/codex/book_open4.ogg
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.
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.
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.
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.
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.
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.
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.
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.
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/heavenly_organs.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/plinth/alter1.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/plinth/alter2.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/plinth/alter3.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/suspicious_sound.ogg
Binary file not shown.
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/totem/totem_cancel.ogg
Binary file not shown.
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/totem/totem_charge2.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/totem/totem_charge3.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/totem/totem_engrave1.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/totem/totem_engrave2.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/totem/totem_engrave3.ogg
Binary file not shown.
Binary file modified src/main/resources/assets/malum/sounds/void_slash.ogg
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 08063ad

Please sign in to comment.