Sounds, lang file changes, and sounds.json are now all sent directly …

…into the Mod and Content modules from SoundHelper.

content/src/client/resources/assets/mario_qua_mario/lang/en_us.json

@@ -0,0 +1,118 @@
+{
+  "fabric.mods.mario_qua_mario": "Mario qua Mario",
+
+  "text.autoconfig.mario_qua_mario.title": "Qua Mario Options",
+
+  "text.autoconfig.mario_qua_mario.option.spinputType": "Spin Input Type",
+  "fabric.mods.mario_qua_mario.spin": "Spin",
+
+  "mount.onboard.mario": "Hold %s and press %s to Dismount",
+
+  "text.autoconfig.mario_qua_mario.option.sideflipAnimType": "Sideflip Camera Animation",
+  "text.autoconfig.mario_qua_mario.option.backflipAnimType": "Backflip Camera Animation",
+  "text.autoconfig.mario_qua_mario.option.tripleJumpAnimType": "Triple Jump Camera Animation",
+
+  "death.attack.marioStomp": "%s was stomped by %s",
+  "death.attack.marioStomp.item": "%s was stomped by %s using %s",
+  "death.attack.marioHipDrop": "%s was pounded flat by %s",
+  "death.attack.marioHipDrop.item": "%s was pounded flat by %s using %s",
+  "death.attack.marioKick": "%s was given the boot by %s",
+  "death.attack.marioKick.item": "%s was given the boot by %s using %s",
+
+  "death.attack.marioCeilingBonk": "%s was bonked from below by %s",
+  "death.attack.marioCeilingBonk.item": "%s was bonked from below by %s",
+
+  "enchantment.mario_qua_mario.pulverizing": "Pulverizing",
+  "enchantment.mario_qua_mario.pulverizing.desc": "Increased damage from Stomps or Ground Pounds",
+  "enchantment.mario_qua_mario.bounding": "Bounding",
+  "enchantment.mario_qua_mario.bounding.desc": "Higher bounce after a Stomp",
+  "enchantment.mario_qua_mario.depth_charge": "Depth Charge",
+  "enchantment.mario_qua_mario.depth_charge.desc": "Ground Pounds retain their momentum for longer underwater",
+
+  "tag.item.mario_qua_mario.enchantable.pulverizing": "Enchantable with Pulverizing",
+
+  "subtitles.mario_qua_mario.movement.flip": "Aerial flip",
+  "subtitles.mario_qua_mario.movement.jump": "Jumping",
+
+  "subtitles.mario_qua_mario.power_up.fireball": "Fireball thrown",
+  "subtitles.mario_qua_mario.power_up.fireball_enemy": "Fireball strikes",
+  "subtitles.mario_qua_mario.power_up.fireball_wall": "Fireball impact",
+
+  "subtitles.mario_qua_mario.stomp.kick": "Something gets attacked",
+  "subtitles.mario_qua_mario.stomp.stomp": "Something gets stomped",
+  "subtitles.mario_qua_mario.stomp.heavy": "Something gets stomped",
+  "subtitles.mario_qua_mario.stomp.spin": "Something gets stomped",
+  "subtitles.mario_qua_mario.stomp.yoshi": "Something gets crushed",
+
+  "subtitles.mario_qua_mario.action.duck": "Ducking",
+  "subtitles.mario_qua_mario.action.ground_pound_flip": "Aerial flip",
+  "subtitles.mario_qua_mario.action.unduck": "Un-ducking",
+
+  "subtitles.mario_qua_mario.voice.luigi.bonk": "Luigi bonks",
+  "subtitles.mario_qua_mario.voice.luigi.burnt": "Luigi gets burned",
+  "subtitles.mario_qua_mario.voice.luigi.death": "Luigi dies",
+  "subtitles.mario_qua_mario.voice.luigi.double_jump": "Luigi jumps",
+  "subtitles.mario_qua_mario.voice.luigi.duck": "Luigi ducks",
+  "subtitles.mario_qua_mario.voice.luigi.duck_jump": "Luigi grunts",
+  "subtitles.mario_qua_mario.voice.luigi.fireball": "Luigi throws",
+  "subtitles.mario_qua_mario.voice.luigi.get_star": "Luigi cheers",
+  "subtitles.mario_qua_mario.voice.luigi.long_jump": "Luigi cheers",
+  "subtitles.mario_qua_mario.voice.luigi.shock": "Luigi shocked",
+  "subtitles.mario_qua_mario.voice.luigi.revert": "Luigi hurts",
+  "subtitles.mario_qua_mario.voice.luigi.select": "Luigi selected",
+  "subtitles.mario_qua_mario.voice.luigi.sideflip": "Luigi cheers",
+  "subtitles.mario_qua_mario.voice.luigi.gymnast_salute": "Luigi celebrates",
+  "subtitles.mario_qua_mario.voice.luigi.triple_jump": "Luigi cheers",
+  "subtitles.mario_qua_mario.voice.luigi.wall_jump": "Luigi jumps",
+
+  "subtitles.mario_qua_mario.voice.mario.bonk": "Mario bonks",
+  "subtitles.mario_qua_mario.voice.mario.burnt": "Mario gets burned",
+  "subtitles.mario_qua_mario.voice.mario.death": "Mario dies",
+  "subtitles.mario_qua_mario.voice.mario.double_jump": "Mario jumps",
+  "subtitles.mario_qua_mario.voice.mario.duck": "Mario ducks",
+  "subtitles.mario_qua_mario.voice.mario.duck_jump": "Mario grunts",
+  "subtitles.mario_qua_mario.voice.mario.fireball": "Mario throws",
+  "subtitles.mario_qua_mario.voice.mario.get_star": "Mario cheers",
+  "subtitles.mario_qua_mario.voice.mario.long_jump": "Mario cheers",
+  "subtitles.mario_qua_mario.voice.mario.shock": "Mario shocked",
+  "subtitles.mario_qua_mario.voice.mario.revert": "Mario hurts",
+  "subtitles.mario_qua_mario.voice.mario.select": "Mario selected",
+  "subtitles.mario_qua_mario.voice.mario.sideflip": "Mario cheers",
+  "subtitles.mario_qua_mario.voice.mario.gymnast_salute": "Mario celebrates",
+  "subtitles.mario_qua_mario.voice.mario.triple_jump": "Mario cheers",
+  "subtitles.mario_qua_mario.voice.mario.wall_jump": "Mario jumps",
+
+  "subtitles.mario_qua_mario.voice.toadette.bonk": "Toadette bonks",
+  "subtitles.mario_qua_mario.voice.toadette.burnt": "Toadette gets burned",
+  "subtitles.mario_qua_mario.voice.toadette.death": "Toadette dies",
+  "subtitles.mario_qua_mario.voice.toadette.double_jump": "Toadette jumps",
+  "subtitles.mario_qua_mario.voice.toadette.duck": "Toadette ducks",
+  "subtitles.mario_qua_mario.voice.toadette.duck_jump": "Toadette grunts",
+  "subtitles.mario_qua_mario.voice.toadette.fireball": "Toadette throws",
+  "subtitles.mario_qua_mario.voice.toadette.get_star": "Toadette cheers",
+  "subtitles.mario_qua_mario.voice.toadette.long_jump": "Toadette cheers",
+  "subtitles.mario_qua_mario.voice.toadette.shock": "Toadette shocked",
+  "subtitles.mario_qua_mario.voice.toadette.revert": "Toadette hurts",
+  "subtitles.mario_qua_mario.voice.toadette.select": "Toadette selected",
+  "subtitles.mario_qua_mario.voice.toadette.sideflip": "Toadette cheers",
+  "subtitles.mario_qua_mario.voice.toadette.gymnast_salute": "Toadette celebrates",
+  "subtitles.mario_qua_mario.voice.toadette.triple_jump": "Toadette cheers",
+  "subtitles.mario_qua_mario.voice.toadette.wall_jump": "Toadette jumps",
+
+  "subtitles.mario_qua_mario.voice.toad.bonk": "Toad bonks",
+  "subtitles.mario_qua_mario.voice.toad.burnt": "Toad gets burned",
+  "subtitles.mario_qua_mario.voice.toad.death": "Toad dies",
+  "subtitles.mario_qua_mario.voice.toad.double_jump": "Toad jumps",
+  "subtitles.mario_qua_mario.voice.toad.duck": "Toad ducks",
+  "subtitles.mario_qua_mario.voice.toad.duck_jump": "Toad grunts",
+  "subtitles.mario_qua_mario.voice.toad.fireball": "Toad throws",
+  "subtitles.mario_qua_mario.voice.toad.get_star": "Toad cheers",
+  "subtitles.mario_qua_mario.voice.toad.long_jump": "Toad cheers",
+  "subtitles.mario_qua_mario.voice.toad.shock": "Toad shocked",
+  "subtitles.mario_qua_mario.voice.toad.revert": "Toad hurts",
+  "subtitles.mario_qua_mario.voice.toad.select": "Toad selected",
+  "subtitles.mario_qua_mario.voice.toad.sideflip": "Toad cheers",
+  "subtitles.mario_qua_mario.voice.toad.gymnast_salute": "Toad celebrates",
+  "subtitles.mario_qua_mario.voice.toad.triple_jump": "Toad cheers",
+  "subtitles.mario_qua_mario.voice.toad.wall_jump": "Toad jumps"
+}

content/src/client/resources/assets/mario_qua_mario/sounds.json

@@ -0,0 +1,80 @@
+{
+	"sfx.action.duck": {
+		"subtitle": "subtitles.mario_qua_mario.action.duck",
+		"sounds": [
+			"mario_qua_mario:sfx/action/duck"
+		]
+	},
+	"sfx.action.ground_pound_flip": {
+		"subtitle": "subtitles.mario_qua_mario.action.ground_pound_flip",
+		"sounds": [
+			"mario_qua_mario:sfx/action/ground_pound_flip"
+		]
+	},
+	"sfx.action.unduck": {
+		"subtitle": "subtitles.mario_qua_mario.action.unduck",
+		"sounds": [
+			"mario_qua_mario:sfx/action/unduck"
+		]
+	},
+	"sfx.movement.flip": {
+		"subtitle": "subtitles.mario_qua_mario.movement.flip",
+		"sounds": [
+			"mario_qua_mario:sfx/movement/flip"
+		]
+	},
+	"sfx.movement.jump": {
+		"subtitle": "subtitles.mario_qua_mario.movement.jump",
+		"sounds": [
+			"mario_qua_mario:sfx/movement/jump"
+		]
+	},
+	"sfx.power_up.fireball": {
+		"subtitle": "subtitles.mario_qua_mario.power_up.fireball",
+		"sounds": [
+			"mario_qua_mario:sfx/power_up/fireball"
+		]
+	},
+	"sfx.power_up.fireball_enemy": {
+		"subtitle": "subtitles.mario_qua_mario.power_up.fireball_enemy",
+		"sounds": [
+			"mario_qua_mario:sfx/power_up/fireball_enemy"
+		]
+	},
+	"sfx.power_up.fireball_wall": {
+		"subtitle": "subtitles.mario_qua_mario.power_up.fireball_wall",
+		"sounds": [
+			"mario_qua_mario:sfx/power_up/fireball_wall"
+		]
+	},
+	"sfx.stomp.heavy": {
+		"subtitle": "subtitles.mario_qua_mario.stomp.heavy",
+		"sounds": [
+			"mario_qua_mario:sfx/stomp/heavy"
+		]
+	},
+	"sfx.stomp.kick": {
+		"subtitle": "subtitles.mario_qua_mario.stomp.kick",
+		"sounds": [
+			"mario_qua_mario:sfx/stomp/kick"
+		]
+	},
+	"sfx.stomp.spin": {
+		"subtitle": "subtitles.mario_qua_mario.stomp.spin",
+		"sounds": [
+			"mario_qua_mario:sfx/stomp/spin"
+		]
+	},
+	"sfx.stomp.stomp": {
+		"subtitle": "subtitles.mario_qua_mario.stomp.stomp",
+		"sounds": [
+			"mario_qua_mario:sfx/stomp/stomp"
+		]
+	},
+	"sfx.stomp.yoshi": {
+		"subtitle": "subtitles.mario_qua_mario.stomp.yoshi",
+		"sounds": [
+			"mario_qua_mario:sfx/stomp/yoshi"
+		]
+	}
+}

content/src/main/java/com/fqf/mario_qua_mario/MarioQuaMarioContent.java

@@ -1,5 +1,6 @@
 package com.fqf.mario_qua_mario;
 
+import com.fqf.mario_qua_mario.util.MarioContentSFX;
 import net.fabricmc.api.ModInitializer;
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
@@ -12,6 +13,8 @@ public class MarioQuaMarioContent implements ModInitializer {
 	@Override
 	public void onInitialize() {
 		LOGGER.info("Mario qua Mario Content intializing...");
+
+		MarioContentSFX.staticInitialize();
 	}
 
 	public static Identifier makeID(String path) {

content/src/main/java/com/fqf/mario_qua_mario/util/MarioContentSFX.java

@@ -0,0 +1,36 @@
+package com.fqf.mario_qua_mario.util;
+
+import com.fqf.mario_qua_mario.MarioQuaMarioContent;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.util.Identifier;
+
+public class MarioContentSFX {
+
+
+	private static SoundEvent makeMovementSound(String name) {
+		return makeAndRegisterSound("sfx.movement." + name);
+	}
+	private static SoundEvent makePowerSound(String name) {
+		return makeAndRegisterSound("sfx.power_up." + name);
+	}
+	private static SoundEvent makeStompSound(String name) {
+		return makeAndRegisterSound("sfx.stomp." + name);
+	}
+	private static SoundEvent makeActionSound(String name) {
+		return makeAndRegisterSound("sfx.action." + name);
+	}
+
+	private static SoundEvent makeAndRegisterSound(String path) {
+		Identifier identifier = MarioQuaMarioContent.makeResID(path);
+		SoundEvent event = SoundEvent.of(identifier);
+
+		Registry.register(Registries.SOUND_EVENT, identifier, event);
+
+		return event;
+	}
+	public static void staticInitialize() {
+
+	}
+}

mod/src/client/resources/assets/mario_qua_mario/lang/en_us.json

@@ -0,0 +1,43 @@
+{
+  "fabric.mods.mario_qua_mario": "Mario qua Mario",
+
+  "text.autoconfig.mario_qua_mario.title": "Qua Mario Options",
+
+  "text.autoconfig.mario_qua_mario.option.spinputType": "Spin Input Type",
+  "fabric.mods.mario_qua_mario.spin": "Spin",
+
+  "mount.onboard.mario": "Hold %s and press %s to Dismount",
+
+  "text.autoconfig.mario_qua_mario.option.sideflipAnimType": "Sideflip Camera Animation",
+  "text.autoconfig.mario_qua_mario.option.backflipAnimType": "Backflip Camera Animation",
+  "text.autoconfig.mario_qua_mario.option.tripleJumpAnimType": "Triple Jump Camera Animation",
+
+  "death.attack.marioStomp": "%s was stomped by %s",
+  "death.attack.marioStomp.item": "%s was stomped by %s using %s",
+  "death.attack.marioHipDrop": "%s was pounded flat by %s",
+  "death.attack.marioHipDrop.item": "%s was pounded flat by %s using %s",
+  "death.attack.marioKick": "%s was given the boot by %s",
+  "death.attack.marioKick.item": "%s was given the boot by %s using %s",
+
+  "death.attack.marioCeilingBonk": "%s was bonked from below by %s",
+  "death.attack.marioCeilingBonk.item": "%s was bonked from below by %s",
+
+  "enchantment.mario_qua_mario.pulverizing": "Pulverizing",
+  "enchantment.mario_qua_mario.pulverizing.desc": "Increased damage from Stomps or Ground Pounds",
+  "enchantment.mario_qua_mario.bounding": "Bounding",
+  "enchantment.mario_qua_mario.bounding.desc": "Higher bounce after a Stomp",
+  "enchantment.mario_qua_mario.depth_charge": "Depth Charge",
+  "enchantment.mario_qua_mario.depth_charge.desc": "Ground Pounds retain their momentum for longer underwater",
+
+  "tag.item.mario_qua_mario.enchantable.pulverizing": "Enchantable with Pulverizing",
+
+  "subtitles.mario_qua_mario.movement.bump": "Block bumped",
+  "subtitles.mario_qua_mario.movement.skid": "Skidding",
+  "subtitles.mario_qua_mario.movement.skid_ice": "Slipping",
+  "subtitles.mario_qua_mario.movement.skid_sand": "Skidding",
+  "subtitles.mario_qua_mario.movement.skid_snow": "Skidding",
+  "subtitles.mario_qua_mario.movement.skid_wall": "Sliding",
+
+  "subtitles.mario_qua_mario.power_up.empower": "Powering up",
+  "subtitles.mario_qua_mario.power_up.revert": "Powering down"
+}

mod/src/client/resources/assets/mario_qua_mario/sounds.json

@@ -0,0 +1,50 @@
+{
+	"sfx.movement.bump": {
+		"subtitle": "subtitles.mario_qua_mario.movement.bump",
+		"sounds": [
+			"mario_qua_mario:sfx/movement/bump"
+		]
+	},
+	"sfx.movement.skid": {
+		"subtitle": "subtitles.mario_qua_mario.movement.skid",
+		"sounds": [
+			"mario_qua_mario:sfx/movement/skid"
+		]
+	},
+	"sfx.movement.skid_ice": {
+		"subtitle": "subtitles.mario_qua_mario.movement.skid_ice",
+		"sounds": [
+			"mario_qua_mario:sfx/movement/skid_ice"
+		]
+	},
+	"sfx.movement.skid_sand": {
+		"subtitle": "subtitles.mario_qua_mario.movement.skid_sand",
+		"sounds": [
+			"mario_qua_mario:sfx/movement/skid_sand"
+		]
+	},
+	"sfx.movement.skid_snow": {
+		"subtitle": "subtitles.mario_qua_mario.movement.skid_snow",
+		"sounds": [
+			"mario_qua_mario:sfx/movement/skid_snow"
+		]
+	},
+	"sfx.movement.skid_wall": {
+		"subtitle": "subtitles.mario_qua_mario.movement.skid_wall",
+		"sounds": [
+			"mario_qua_mario:sfx/movement/skid_wall"
+		]
+	},
+	"sfx.power_up.empower": {
+		"subtitle": "subtitles.mario_qua_mario.power_up.empower",
+		"sounds": [
+			"mario_qua_mario:sfx/power_up/empower"
+		]
+	},
+	"sfx.power_up.revert": {
+		"subtitle": "subtitles.mario_qua_mario.power_up.revert",
+		"sounds": [
+			"mario_qua_mario:sfx/power_up/revert"
+		]
+	}
+}

mod/src/main/java/com/fqf/mario_qua_mario/registries/RegistryManager.java

@@ -10,6 +10,7 @@
 import com.fqf.mario_qua_mario.registries.actions.ParsedActionHelper;
 import com.fqf.mario_qua_mario.registries.power_granting.ParsedCharacter;
 import com.fqf.mario_qua_mario.registries.power_granting.ParsedPowerUp;
+import com.fqf.mario_qua_mario.util.MarioModSFX;
 import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder;
 import net.fabricmc.fabric.api.event.registry.RegistryAttribute;
 import net.fabricmc.loader.api.FabricLoader;
@@ -25,6 +26,7 @@
 
 public class RegistryManager {
 	public static void registerAll() {
+		MarioModSFX.staticInitialize();
 		registerStompTypes();
 		registerActions();
 		registerPowerUps();