option to mute selling sounds oh and half complete boss stuff ig

lycanea · lycanea · commit 6d5b0ea2c5e3 · 2026-01-02T14:17:41.000+11:00
diff --git a/src/main/java/dev/lycanea/mwonmod/Config.java b/src/main/java/dev/lycanea/mwonmod/Config.java
@@ -75,6 +75,11 @@ public class Config {
     @SerialEntry
     public boolean codespaceHider = true;
 
+    @TickBox
+    @AutoGen(category = "QOL", group = "Misc")
+    @SerialEntry
+    public boolean muteSellingSound = true;
+
     //Auction
 
     @TickBox
diff --git a/src/main/java/dev/lycanea/mwonmod/Mwonmod.java b/src/main/java/dev/lycanea/mwonmod/Mwonmod.java
@@ -24,7 +24,6 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.tooltip.HoveredTooltipPositioner;
 import net.minecraft.client.gui.tooltip.TooltipComponent;
@@ -84,6 +83,8 @@ public void onInitializeClient() {
 
         itemData = loadJsonFile(ITEM_DATA_PATH);
 
+        BossState.init();
+
         RegionLoader.init();
         RegionRenderer.init();
         RegionUpdater.init();
@@ -149,6 +150,7 @@ public static JsonObject loadJsonFile(String PATH) {
     }
 
     private void renderHUDOverlay(DrawContext context) {
+        // we really should move this to a seperate class and... clean it up more
         MinecraftClient client = MinecraftClient.getInstance();
         if (Config.HANDLER.instance().debugMode) {
             List<String> debugLines = new ArrayList<>(List.of(
@@ -167,6 +169,7 @@ private void renderHUDOverlay(DrawContext context) {
             if (GameState.trophies != null) debugLines.add("CURRENT TROPHIES: " + GameState.trophies);
             if (GameState.karma != null) debugLines.add("CURRENT KARMA: " + GameState.karma);
             if (GameState.melonJoin != null) debugLines.add("MWON TIMER: " + Duration.between(GameState.melonJoin, LocalDateTime.now()).getSeconds());
+            if (BossState.boss != null) debugLines.add("CURRENT BOSS: " + BossState.boss.bossID);
 
             assert MinecraftClient.getInstance().player != null;
             BlockPos pos = MinecraftClient.getInstance().player.getBlockPos().add(-plot_origin.x, 0, -plot_origin.y);
@@ -175,7 +178,7 @@ private void renderHUDOverlay(DrawContext context) {
             }
             debugLines.add("PLOTSPACE POS: " + pos);
 
-            int startY = context.getScaledWindowHeight() - 390;
+            int startY = context.getScaledWindowHeight() /2 - debugLines.toArray().length*5;
             drawDebugLines(context, client, debugLines, startY, 10, 0xFF82B7ED);
         }
         if (!(client.player == null) && !(client.world == null) && onMelonKing()) {
diff --git a/src/main/java/dev/lycanea/mwonmod/mixin/InGameHudMixin.java b/src/main/java/dev/lycanea/mwonmod/mixin/InGameHudMixin.java
@@ -14,7 +14,7 @@
 import java.util.regex.Pattern;
 
 @Mixin(InGameHud.class)
-public class ActionBarMixin {
+public class InGameHudMixin {
     @Inject(method = "setOverlayMessage", at = @At("HEAD"))
     private void onSetOverlayMessage(Text message, boolean tinted, CallbackInfo ci) {
         Matcher MelonKingActionbarMatcher = Pattern.compile("Trophies: (?<trophy>\\d*) Karma: (?<karma>\\d*) Medals: (?<medals>\\d*)").matcher(message.getString());
@@ -24,4 +24,9 @@ private void onSetOverlayMessage(Text message, boolean tinted, CallbackInfo ci)
             GameState.medals = Integer.valueOf(MelonKingActionbarMatcher.group("medals"));
         }
     }
+
+    @Inject(method = "setTitle", at = @At("HEAD"))
+    private void onSetTitle(Text message, CallbackInfo ci) {
+//        Mwonmod.LOGGER.info("Title: {}", message.getString());
+    }
 }
diff --git a/src/main/java/dev/lycanea/mwonmod/mixin/OnPacketMixin.java b/src/main/java/dev/lycanea/mwonmod/mixin/OnPacketMixin.java
@@ -3,6 +3,7 @@
 import dev.dfonline.flint.util.Toaster;
 import dev.lycanea.mwonmod.Config;
 import dev.lycanea.mwonmod.Mwonmod;
+import dev.lycanea.mwonmod.util.BossState;
 import dev.lycanea.mwonmod.util.GameState;
 
 import com.google.gson.JsonObject;
@@ -17,6 +18,7 @@
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.s2c.play.GameMessageS2CPacket;
 import net.minecraft.network.packet.s2c.play.OpenScreenS2CPacket;
+import net.minecraft.network.packet.s2c.play.PlaySoundS2CPacket;
 import net.minecraft.text.HoverEvent;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
@@ -37,6 +39,11 @@ private static <T extends PacketListener> void onGameMessage(Packet<T> packet, P
         if (packet instanceof GameMessageS2CPacket(Text content, boolean overlay)) {
             handleChatPacket(content, overlay, ci);
         }
+        if (packet instanceof PlaySoundS2CPacket PlaySoundS2CPacket && Mwonmod.onMelonKing()) {
+            if (Objects.equals(PlaySoundS2CPacket.getSound().getIdAsString(), "minecraft:entity.sheep.shear") && Config.HANDLER.instance().muteSellingSound) {
+                ci.cancel();
+            }
+        }
         if (packet instanceof OpenScreenS2CPacket openScreenPacket) {
             if (Mwonmod.onMelonKing()) {
                 Text screenTitle = openScreenPacket.getName();
@@ -68,15 +75,23 @@ private static void handleChatPacket(Text content, boolean overlay, CallbackInfo
 
             Toaster.toast(
                     Component.text("MwonMod"),
-                    Component.text("Using Alpha version ", mainStyle)
+                    Component.text("Version: ", mainStyle)
                             .append(versionComponent)
-                            .append(Component.text(", please report bugs on the Discord!", mainStyle))
+                            .append(Component.text(", bugs may occur!", mainStyle))
             );
 
             GameState.melonJoin = LocalDateTime.now();
         }
 
         if (!Mwonmod.onMelonKing()) return;
+        if (message.equals("» All combatants perished, so the battle was lost.")) {
+            BossState.updateBoss(null);
+        }
+        if (BossState.dialogueToBoss.containsKey(message)) {
+            String bossID = BossState.dialogueToBoss.get(message);
+            BossState.updateBoss(bossID);
+        }
+
         if (Config.HANDLER.instance().hideSellFailMessage && Objects.equals(message, "> You don't have any Super Enchanted Melons. Get them by cooking four Enchanted Melon Slices, which are gotten by cooking four Melon Slices.")) {
             ci.cancel();
         }
@@ -115,6 +130,9 @@ private static void handleChatPacket(Text content, boolean overlay, CallbackInfo
         } else if (kingMatcher.find()) {
             assert MinecraftClient.getInstance().player != null;
             if (Config.HANDLER.instance().kingChangeNotification) {
+                GameState.bank_gold = 0;
+                GameState.coins = 0;
+                BossState.updateBoss(null);
                 GameState.currentMonarch = kingMatcher.group(1);
                 Mwonmod.notification("New Monarch", kingMatcher.group(1));
             }
diff --git a/src/main/java/dev/lycanea/mwonmod/music/CustomMusicManager.java b/src/main/java/dev/lycanea/mwonmod/music/CustomMusicManager.java
@@ -1,5 +1,6 @@
 package dev.lycanea.mwonmod.music;
 
+import dev.lycanea.mwonmod.util.BossState;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.sound.SoundInstance;
 import net.minecraft.sound.SoundEvent;
@@ -14,6 +15,13 @@ public static void setCurrentSong(CustomSong song) {
         currentSong = song;
     }
 
+    public static void init() {
+        BossState.BossChangeCallback.EVENT.register((previousBoss, currentBoss) -> {
+
+            return null;
+        });
+    }
+
     public static void tick(MinecraftClient client) {
 //        client.options.getSoundVolumeOption(SoundCategory.MUSIC).setValue(0.0);
 
@@ -33,15 +41,15 @@ private static void playSong(MinecraftClient client, CustomSong song) {
         if (soundId == null) return;
 
         SoundEvent soundEvent = SoundEvent.of(soundId);
-        LoopingSoundInstance sound = new LoopingSoundInstance(soundEvent);
+        CustomMusicSoundInstance sound = new CustomMusicSoundInstance(soundEvent);
         currentSound = sound;
 
         client.getSoundManager().play(sound);
     }
 
     public static void stopCurrentSong(MinecraftClient client) {
         if (currentSound != null) {
-            if (currentSound instanceof LoopingSoundInstance looping) {
+            if (currentSound instanceof CustomMusicSoundInstance looping) {
                 looping.stop();
             }
             client.getSoundManager().stop(currentSound);
diff --git a/src/main/java/dev/lycanea/mwonmod/music/CustomMusicSoundInstance.java b/src/main/java/dev/lycanea/mwonmod/music/CustomMusicSoundInstance.java
@@ -6,10 +6,10 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.util.math.random.Random;
 
-public class LoopingSoundInstance extends AbstractSoundInstance implements TickableSoundInstance {
+public class CustomMusicSoundInstance extends AbstractSoundInstance implements TickableSoundInstance {
     private boolean done = false;
 
-    public LoopingSoundInstance(SoundEvent soundEvent) {
+    public CustomMusicSoundInstance(SoundEvent soundEvent) {
         super(soundEvent, SoundCategory.MUSIC, Random.create());
         this.volume = 1.0f;
         this.pitch = 1.0f;
diff --git a/src/main/java/dev/lycanea/mwonmod/util/Boss.java b/src/main/java/dev/lycanea/mwonmod/util/Boss.java
@@ -0,0 +1,10 @@
+package dev.lycanea.mwonmod.util;
+
+public class Boss {
+    public String bossID;
+//    public BossPhase phase;  // we arent gonna... bother with phases for now
+
+    public Boss(String bossID) {
+        this.bossID = bossID;
+    }
+}
diff --git a/src/main/java/dev/lycanea/mwonmod/util/BossState.java b/src/main/java/dev/lycanea/mwonmod/util/BossState.java
@@ -0,0 +1,55 @@
+package dev.lycanea.mwonmod.util;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+import net.minecraft.util.ActionResult;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static dev.lycanea.mwonmod.Mwonmod.loadJsonFile;
+
+public class BossState {
+    public static Boss boss;
+    public static Map<String, String> dialogueToBoss = new HashMap<>();
+
+    private static final String BOSS_DATA_PATH = "assets/mwonmod/data/bosses.json";
+
+    public static void init() {
+        JsonObject boss_dataJson = loadJsonFile(BOSS_DATA_PATH);
+        if (boss_dataJson != null) {
+            for (String boss_id : boss_dataJson.keySet()) {
+                // each boss
+                for (JsonElement jsonElement : boss_dataJson.get(boss_id).getAsJsonObject().get("dialogue").getAsJsonArray()) {
+                    // each dialogue
+                    String dialogue = jsonElement.getAsString();
+                    dialogueToBoss.put(dialogue, boss_id);
+                }
+            }
+        }
+    }
+
+    public static void updateBoss(String updatedBossID) {
+        Boss updatedBoss = new Boss(updatedBossID);
+        ActionResult result = BossChangeCallback.EVENT.invoker().trigger(boss, updatedBoss);
+        boss = updatedBoss;
+    }
+
+    public interface BossChangeCallback {
+        Event<BossChangeCallback> EVENT = EventFactory.createArrayBacked(BossChangeCallback.class,
+                (listeners) -> (Boss previousBoss, Boss currentBoss) -> {
+            for (BossChangeCallback event : listeners) {
+                ActionResult result = event.trigger(previousBoss, currentBoss);
+
+                if (result != ActionResult.PASS) { // all this actionresult stuff is useless but idk im copying from the fabric docs
+                    return result;
+                }
+            }
+
+            return ActionResult.PASS;
+        });
+        ActionResult trigger(Boss previousBoss, Boss currentBoss);
+    }
+}
diff --git a/src/main/resources/assets/mwonmod/data/bosses.json b/src/main/resources/assets/mwonmod/data/bosses.json
@@ -0,0 +1,107 @@
+{
+  "pumpkin_king_easy": {
+    "dialogue": [
+      "Pumpkin King > It’s beautiful out, no?",
+      "Pumpkin King > Peace and quiet, free from the stressful tasks brought upon us by interkingdom politics.",
+      "Pumpkin King > A bit too quiet, some might say. I am more than aware of the crimes your people have committed.",
+      "Pumpkin King > A king of taproots, ripped away from his people and throne. Though an absentee king, how much involvement is too much?",
+      "Pumpkin King > The monarch of fungal networks, slaughtered, in spite of all his advantages. It was a lesson of hubris you failed to learn.",
+      "Pumpkin King > The eldest lord of the grass, his legacy burned from history itself. Now nothing more than a page in the books, no thanks to you.",
+      "Pumpkin King > Your predecessor, a poetic reflection of your fate. Time is cruel, but most of all to the realm you hail from.",
+      "Pumpkin King > And now, me. Your journey could have ended, but I was not a friend, but a mere road block.",
+      "Pumpkin King > ...Why?",
+      "> His words flitter away like smoke through your fingers. Order was never your cup of melon juice.",
+      "> He can only speak to you in a language you know intimately.",
+      "> Your journey ends here, the hands of war stretched thin enough to snap in two. After all, when you reach the top, there's only one way to go.",
+      "> Down."
+    ],
+    "phases": [
+      {"audio": "mwonmod:pumpkin_king_phaseOne"}
+    ],
+    "arena": "economics_room"
+  },
+
+  "carrot_king_normal": {
+    "dialogue": [
+      "Carrot King > It appears you have fallen for my trap.",
+      "Carrot King > Your rash decision to attack my kingdom shall only end in the loss of your lives.",
+      "Carrot King > Now fight, or die trying!",
+      "Carrot King > Freeze!",
+      "Carrot King > Fry!",
+      "Carrot King > Feel the wrath of the Carrot Kingdom!",
+      "Carrot King > You have exhausted my machinery.",
+      "Carrot King > I doubt you will be simply leaving me be, though.",
+      "Carrot King > I suppose I should have forseen an event such as this.",
+      "Carrot King > Though I was not expecting there to be so many of you.",
+      "Carrot King > I could have sworn I have seen some of your faces more than once...",
+      "Carrot King > In fact, it's almost as if your soldiers simply cannot die."
+    ],
+    "phases": [
+      {"trigger": 2, "name": "phase1"}, {"trigger": 6, "name": "defeat"}
+    ]
+  },
+  "mushroom_king_normal": {
+    "dialogue": [
+      "Mushroom King > Your kingdom's technology is inferior to mine by far.",
+      "Mushroom King > Yet still, you have the audacity to challenge me in battle?",
+      "Mushroom King > Then let us see who will reign victorious.",
+      "Mushroom King > I hear of your undying soldiers, words from the Taproot himself. Meet my own.",
+      "Mushroom King > Come here, cowards!",
+      "Mushroom King > Feel the full force of my machine!",
+      "Mushroom King > You have... slain me, it seems...",
+      "Mushroom King > If you have defeated me despite my best attempts...",
+      "Mushroom King > ...Then so be it."
+    ],
+    "phases": [
+      {"trigger": 2, "name": "phase1"}, {"trigger": 6, "name": "defeat"}
+    ]
+  },
+  "wheat_king_normal": {
+    "dialogue": [
+      "Wheat King > My kingdom was destroyed centuries before the first historians came to be.",
+      "Wheat King > Yet still, I live on, the magic from my spires giving me what little vitality I have left.",
+      "Wheat King > And you wish to destroy that? What would you gain from such acts?",
+      "Wheat King > Though, if I cannot convince you otherwise, then it seems we must do battle.",
+      "Wheat King > Respect your elders!",
+      "Wheat King > You dare destroy half of what I use to live?",
+      "Wheat King > This shall not bode well for you.",
+      "Wheat King > You broke them both...",
+      "Wheat King > I suppose that marks the end of my fragile life.",
+      "Wheat King > I cannot live on without their magic...",
+      "Wheat King > So this shall be my final farewell.",
+      "Wheat King > I despise you."
+    ],
+    "phases": [
+      {"trigger": 3, "name": "phase1"}, {"trigger": 6, "name": "half_killed"}, {"trigger": 7, "name": "defeat"}
+    ]
+  },
+  "melon_king_normal": {
+    "dialogue": [
+      "Melon King > I knew I would see you again.",
+      "Melon King > Neither of us are going anywhere.",
+      "Melon King > At least not any time soon.",
+      "Melon King > That said...",
+      "Melon King > How about a rematch?",
+      "Melon King > I can't... do this... anymore...",
+      "Melon King > Slay me... and claim... your reward...",
+      "Melon King > Well, there's no point in hiding it.",
+      "Melon King > You know what comes next.",
+      "title spam dialogue",
+      "Melon King > I can't... keep going...",
+      "Melon King > Despite my best efforts...",
+      "Melon King > Despite all the power I've used against you...",
+      "Melon King > You just keep coming back...",
+      "Melon King > Once and once again...",
+      "Melon King > I would envy you, Toxicpid...",
+      "Melon King > But your suffering is...",
+      "Melon King > Far greater than my own...",
+      "Melon King > Regardless... it seems that...",
+      "Melon King > This is the end of the road for me...",
+      "Melon King > Yet still, I have a feeling...",
+      "Melon King > We shall meet again."
+    ],
+    "phases": [
+      {"trigger": 4, "name": "phase1"}, {"trigger":  5, "name": "fakeout"}, {"trigger": 8, "name": "phase2"}, {"trigger": 10, "name": "defeat"}
+    ]
+  }
+}
diff --git a/src/main/resources/assets/mwonmod/lang/en_us.json b/src/main/resources/assets/mwonmod/lang/en_us.json
@@ -17,6 +17,7 @@
   "yacl3.config.mwonmod:config.preventAttackingWithHoe": "Prevent Attacking With Hoe",
   "yacl3.config.mwonmod:config.codespaceHider": "Melon King Codespace Hider",
   "yacl3.config.mwonmod:config.showPercentageInInventoryOverview": "Show Percentage in Inventory Overview",
+  "yacl3.config.mwonmod:config.muteSellingSound": "Mute Selling Sound",
 
   "yacl3.config.mwonmod:config.category.Auction": "Auction Improvements",
   "yacl3.config.mwonmod:config.category.Auction.group.Timers": "Timers",
diff --git a/src/main/resources/mwonmod.mixins.json b/src/main/resources/mwonmod.mixins.json
@@ -4,7 +4,7 @@
   "package": "dev.lycanea.mwonmod.mixin",
   "compatibilityLevel": "JAVA_21",
   "client": [
-    "ActionBarMixin",
+    "InGameHudMixin",
     "ChestRendering",
     "InventoryScreenMixin",
     "ItemDropMixin",

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`import java.util.regex.Pattern;`
`15`	`15`
`16`	`16`	`@Mixin(InGameHud.class)`
`17`		`-public class ActionBarMixin {`
	`17`	`+public class InGameHudMixin {`
`18`	`18`	`@Inject(method = "setOverlayMessage", at = @At("HEAD"))`
`19`	`19`	`private void onSetOverlayMessage(Text message, boolean tinted, CallbackInfo ci) {`
`20`	`20`	`Matcher MelonKingActionbarMatcher = Pattern.compile("Trophies: (?<trophy>\\d) Karma: (?<karma>\\d) Medals: (?<medals>\\d*)").matcher(message.getString());`
`@@ -24,4 +24,9 @@ private void onSetOverlayMessage(Text message, boolean tinted, CallbackInfo ci)`
`24`	`24`	`GameState.medals = Integer.valueOf(MelonKingActionbarMatcher.group("medals"));`
`25`	`25`	`}`
`26`	`26`	`}`
	`27`	`+`
	`28`	`+ @Inject(method = "setTitle", at = @At("HEAD"))`
	`29`	`+ private void onSetTitle(Text message, CallbackInfo ci) {`
	`30`	`+// Mwonmod.LOGGER.info("Title: {}", message.getString());`
	`31`	`+ }`
`27`	`32`	`}`