From 918a5be5a81ac3c081298c82418e4f1ea67c5244 Mon Sep 17 00:00:00 2001 From: craisinlord Date: Mon, 10 Aug 2026 18:22:14 -0500 Subject: [PATCH] fix fabric r click bug add thoraxis music --- .../resources/assets/antarchy/lang/en_us.json | 2 ++ .../resources/assets/antarchy/sounds.json | 22 ++++++++++++++++++- .../client/KeybindingConflictFixStore.java | 4 ++++ .../client/KeybindingConflictFixMixin.java | 17 -------------- .../client/KeybindingConflictFixStore.java | 4 ++++ .../client/KeybindingConflictFixMixin.java | 17 -------------- .../fabric/registry/AntarchyFabricSounds.java | 3 +++ .../registry/AntarchyNeoforgeSounds.java | 1 + 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/common-1.21.1/src/main/resources/assets/antarchy/lang/en_us.json b/common-1.21.1/src/main/resources/assets/antarchy/lang/en_us.json index 70280540..c6091973 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/lang/en_us.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/lang/en_us.json @@ -1049,6 +1049,8 @@ "message.antarchy.tiger_eye_camouflage.invalid_block": "There is no suitable block beneath you", "music.antarchy.lucid_lullaby": "Lucid Lullaby", "music.antarchy.lucid_lullaby.credit": "hewo_", + "music.antarchy.whistling_void": "Whistling Void", + "music.antarchy.whistling_void.credit": "docshrekbot", "music.antarchy.venenatus": "Venenatus", "music.antarchy.venenatus.credit": "hewo_", "music.antarchy.wistful_wanderings": "Wistful Wanderings", diff --git a/common-1.21.1/src/main/resources/assets/antarchy/sounds.json b/common-1.21.1/src/main/resources/assets/antarchy/sounds.json index 0840ee91..b723d4d2 100644 --- a/common-1.21.1/src/main/resources/assets/antarchy/sounds.json +++ b/common-1.21.1/src/main/resources/assets/antarchy/sounds.json @@ -994,12 +994,25 @@ } ] }, + "whistling_void": { + "sounds": [ + { + "name": "antarchy:music/game/thoraxis/whistling_void", + "stream": true + } + ] + }, "music.game.thoraxis": { "sounds": [ { "name": "antarchy:lucid_lullaby", "type": "event", "stream": true + }, + { + "name": "antarchy:whistling_void", + "type": "event", + "stream": true } ] }, @@ -1033,7 +1046,14 @@ { "name": "antarchy:wistful_wanderings", "type": "event", - "stream": true + "stream": true, + "weight": 3 + }, + { + "name": "minecraft:music.game", + "type": "event", + "stream": true, + "weight": 2 } ] }, diff --git a/fabric-1.20.1/src/main/java/com/craisinlord/antarchy/fabric/client/KeybindingConflictFixStore.java b/fabric-1.20.1/src/main/java/com/craisinlord/antarchy/fabric/client/KeybindingConflictFixStore.java index ee5e3766..c65f50a0 100644 --- a/fabric-1.20.1/src/main/java/com/craisinlord/antarchy/fabric/client/KeybindingConflictFixStore.java +++ b/fabric-1.20.1/src/main/java/com/craisinlord/antarchy/fabric/client/KeybindingConflictFixStore.java @@ -8,12 +8,16 @@ import java.util.Map; import net.minecraft.client.KeyMapping; public final class KeybindingConflictFixStore { + private static final String ANTARCHY_KEY_PREFIX = "key.antarchy."; private static final Map> MAPPINGS = new HashMap<>(); private KeybindingConflictFixStore() { } public static void add(InputConstants.Key key, KeyMapping mapping) { + if (!mapping.getName().startsWith(ANTARCHY_KEY_PREFIX)) { + return; + } List mappings = MAPPINGS.computeIfAbsent(key, ignored -> new ArrayList<>()); if (!mappings.contains(mapping)) { mappings.add(mapping); diff --git a/fabric-1.20.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/client/KeybindingConflictFixMixin.java b/fabric-1.20.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/client/KeybindingConflictFixMixin.java index c9e59b6f..f7141bf8 100644 --- a/fabric-1.20.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/client/KeybindingConflictFixMixin.java +++ b/fabric-1.20.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/client/KeybindingConflictFixMixin.java @@ -19,7 +19,6 @@ public abstract class KeybindingConflictFixMixin { @Shadow @Final private static Map ALL; @Shadow private InputConstants.Key key; @Shadow private boolean isDown; - @Shadow private int clickCount; @Inject(method = "(Ljava/lang/String;Lcom/mojang/blaze3d/platform/InputConstants$Type;ILjava/lang/String;)V", at = @At("TAIL")) private void antarchy$addInitialMapping(String name, InputConstants.Type type, int key, String category, CallbackInfo ci) { @@ -34,17 +33,6 @@ public abstract class KeybindingConflictFixMixin { } } - @Inject(method = "click", at = @At("TAIL")) - private static void antarchy$clickConflicts(InputConstants.Key key, CallbackInfo ci) { - if (!AntarchySettings.fabricKeybindingConflictFixEnabled()) { - return; - } - KeyMapping active = MAP.get(key); - for (KeyMapping mapping : KeybindingConflictFixStore.others(key, active)) { - ((KeybindingConflictFixMixin) (Object) mapping).antarchy$click(); - } - } - @Inject(method = "set", at = @At("TAIL")) private static void antarchy$setConflicts(InputConstants.Key key, boolean down, CallbackInfo ci) { if (!AntarchySettings.fabricKeybindingConflictFixEnabled()) { @@ -56,11 +44,6 @@ public abstract class KeybindingConflictFixMixin { } } - @Unique - private void antarchy$click() { - this.clickCount++; - } - @Unique private void antarchy$setDown(boolean down) { this.isDown = down; diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/KeybindingConflictFixStore.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/KeybindingConflictFixStore.java index ee5e3766..c65f50a0 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/KeybindingConflictFixStore.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/client/KeybindingConflictFixStore.java @@ -8,12 +8,16 @@ import java.util.Map; import net.minecraft.client.KeyMapping; public final class KeybindingConflictFixStore { + private static final String ANTARCHY_KEY_PREFIX = "key.antarchy."; private static final Map> MAPPINGS = new HashMap<>(); private KeybindingConflictFixStore() { } public static void add(InputConstants.Key key, KeyMapping mapping) { + if (!mapping.getName().startsWith(ANTARCHY_KEY_PREFIX)) { + return; + } List mappings = MAPPINGS.computeIfAbsent(key, ignored -> new ArrayList<>()); if (!mappings.contains(mapping)) { mappings.add(mapping); diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/client/KeybindingConflictFixMixin.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/client/KeybindingConflictFixMixin.java index c9e59b6f..f7141bf8 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/client/KeybindingConflictFixMixin.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/mixin/client/KeybindingConflictFixMixin.java @@ -19,7 +19,6 @@ public abstract class KeybindingConflictFixMixin { @Shadow @Final private static Map ALL; @Shadow private InputConstants.Key key; @Shadow private boolean isDown; - @Shadow private int clickCount; @Inject(method = "(Ljava/lang/String;Lcom/mojang/blaze3d/platform/InputConstants$Type;ILjava/lang/String;)V", at = @At("TAIL")) private void antarchy$addInitialMapping(String name, InputConstants.Type type, int key, String category, CallbackInfo ci) { @@ -34,17 +33,6 @@ public abstract class KeybindingConflictFixMixin { } } - @Inject(method = "click", at = @At("TAIL")) - private static void antarchy$clickConflicts(InputConstants.Key key, CallbackInfo ci) { - if (!AntarchySettings.fabricKeybindingConflictFixEnabled()) { - return; - } - KeyMapping active = MAP.get(key); - for (KeyMapping mapping : KeybindingConflictFixStore.others(key, active)) { - ((KeybindingConflictFixMixin) (Object) mapping).antarchy$click(); - } - } - @Inject(method = "set", at = @At("TAIL")) private static void antarchy$setConflicts(InputConstants.Key key, boolean down, CallbackInfo ci) { if (!AntarchySettings.fabricKeybindingConflictFixEnabled()) { @@ -56,11 +44,6 @@ public abstract class KeybindingConflictFixMixin { } } - @Unique - private void antarchy$click() { - this.clickCount++; - } - @Unique private void antarchy$setDown(boolean down) { this.isDown = down; diff --git a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricSounds.java b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricSounds.java index a82df627..7beec29e 100644 --- a/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricSounds.java +++ b/fabric-1.21.1/src/main/java/com/craisinlord/antarchy/fabric/registry/AntarchyFabricSounds.java @@ -184,6 +184,9 @@ public final class AntarchyFabricSounds { public static final DeferredHolder LUCID_LULLABY = registerSoundEvent("lucid_lullaby"); + public static final DeferredHolder WHISTLING_VOID = registerSoundEvent("whistling_void"); + + public static final DeferredHolder MUSIC_GAME_THORAXIS = registerSoundEvent("music.game.thoraxis"); diff --git a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSounds.java b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSounds.java index db42ee60..98e2539d 100644 --- a/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSounds.java +++ b/neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSounds.java @@ -69,6 +69,7 @@ public final class AntarchyNeoforgeSounds { public static final DeferredHolder THORAXIS_LUCID_POOLS_BIOME_ADDITIONS = registerSoundEvent("thoraxis_lucid_pools_biome_additions"); public static final DeferredHolder THORAXIS_LUCID_POOLS_MOOD = registerSoundEvent("thoraxis_lucid_pools_mood"); public static final DeferredHolder LUCID_LULLABY = registerSoundEvent("lucid_lullaby"); + public static final DeferredHolder WHISTLING_VOID = registerSoundEvent("whistling_void"); public static final DeferredHolder MUSIC_GAME_THORAXIS = registerSoundEvent("music.game.thoraxis"); public static final DeferredHolder MUSIC_GAME_CAVARYN = registerSoundEvent("music.game.cavaryn"); public static final DeferredHolder WISTFUL_WANDERINGS = registerSoundEvent("wistful_wanderings");