From 7510d292ca8e9e32df8efb6c204f5ece9a00d23a Mon Sep 17 00:00:00 2001 From: TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> Date: Tue, 25 Jan 2022 16:31:16 -0500 Subject: Added rich presence and fishing ding --- .../skyblocker/config/SkyblockerConfig.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'src/main/java/me/xmrvizzy/skyblocker/config') diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 74cff226..a424ea14 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -24,6 +24,10 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Gui.TransitiveObject public Messages messages = new Messages(); + @ConfigEntry.Category("fishing") + @ConfigEntry.Gui.TransitiveObject + public Fishing fishing = new Fishing(); + public static class General { public String apiKey; @@ -31,6 +35,10 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Gui.CollapsibleObject(startExpanded = true) public Bars bars = new Bars(); + @ConfigEntry.Category("RichPresence") + @ConfigEntry.Gui.CollapsibleObject() + public RichPresence richPresence = new RichPresence(); + @ConfigEntry.Gui.Excluded public List lockedSlots = new ArrayList<>(); } @@ -38,6 +46,13 @@ public class SkyblockerConfig implements ConfigData { public static class Bars { public boolean enableBars = true; } + public static class RichPresence { + @ConfigEntry.Gui.Tooltip() + public boolean enableRichPresence = true; + @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) + public Info info = Info.LOCATION; + public String customMessage; + } public static class Locations { @ConfigEntry.Category("dungeons") @@ -80,6 +95,15 @@ public class SkyblockerConfig implements ConfigData { public boolean hideAds = false; } + public static class Fishing { + public boolean enableFishingDing = false; + } + public enum Info { + PIGGY, + BITS, + LOCATION + } + public static void init() { AutoConfig.register(SkyblockerConfig.class, GsonConfigSerializer::new); } -- cgit From e4f8de38390832772a58204f9a3c3d6aa152fac5 Mon Sep 17 00:00:00 2001 From: TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> Date: Tue, 25 Jan 2022 16:57:54 -0500 Subject: renamed piggy to purse --- src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 2 +- src/main/java/me/xmrvizzy/skyblocker/utils/Discord.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/config') diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index a424ea14..0b5a17e4 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -99,7 +99,7 @@ public class SkyblockerConfig implements ConfigData { public boolean enableFishingDing = false; } public enum Info { - PIGGY, + PURSE, BITS, LOCATION } diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Discord.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Discord.java index e04f2bdd..73ade9aa 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/Discord.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Discord.java @@ -34,7 +34,7 @@ public class Discord { public static String getInfo(){ String info = null; if (SkyblockerConfig.get().general.richPresence.info == SkyblockerConfig.Info.BITS) info = "Bits: " + Utils.getBits(); - if (SkyblockerConfig.get().general.richPresence.info == SkyblockerConfig.Info.PIGGY) info = "Purse: " + dFormat.format(Utils.getPurse()); + if (SkyblockerConfig.get().general.richPresence.info == SkyblockerConfig.Info.PURSE) info = "Purse: " + dFormat.format(Utils.getPurse()); if (SkyblockerConfig.get().general.richPresence.info == SkyblockerConfig.Info.LOCATION) info = "⏣ " + Utils.getLocation(); return info; } -- cgit From 71a3d9c23a89753b77e53548250600211f6bcf64 Mon Sep 17 00:00:00 2001 From: TacoMonkey <75862693+TacoMonkey11@users.noreply.github.com> Date: Tue, 25 Jan 2022 19:36:10 -0500 Subject: Bikeshedded fishing ding --- FEATURES.md | 3 +-- .../skyblocker/config/SkyblockerConfig.java | 8 ------- .../mixin/ClientPlayNetworkHandlerMixin.java | 3 ++- .../skyblocker/mixin/SoundManagerMixin.java | 27 ---------------------- .../java/me/xmrvizzy/skyblocker/utils/Utils.java | 1 + src/main/resources/skyblocker.mixins.json | 2 +- 6 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/mixin/SoundManagerMixin.java (limited to 'src/main/java/me/xmrvizzy/skyblocker/config') diff --git a/FEATURES.md b/FEATURES.md index 827cff7b..9a86591e 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -11,5 +11,4 @@ * price tooltip: npc, bazaar (avg, lbin), ah, museum * reparty: write /rp to reparty * Wiki Lookup: press f4 to open the wiki page about the held item -* Discord Rich Presence: Allows user to show either their Piggy, Bits, or location. Along with a custom message -* Fishing Ding: Plays a ding sound when you catch a fish, which can more easily notify the player \ No newline at end of file +* Discord Rich Presence: Allows user to show either their Piggy, Bits, or location. Along with a custom message \ No newline at end of file diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 0b5a17e4..6d5e0a02 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -24,10 +24,6 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Gui.TransitiveObject public Messages messages = new Messages(); - @ConfigEntry.Category("fishing") - @ConfigEntry.Gui.TransitiveObject - public Fishing fishing = new Fishing(); - public static class General { public String apiKey; @@ -94,10 +90,6 @@ public class SkyblockerConfig implements ConfigData { public boolean hideMoltenWave = false; public boolean hideAds = false; } - - public static class Fishing { - public boolean enableFishingDing = false; - } public enum Info { PURSE, BITS, diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java index 26012b21..ef900eef 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayNetworkHandlerMixin.java @@ -5,6 +5,7 @@ import com.mojang.brigadier.CommandDispatcher; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.network.ClientPlayNetworkHandler; +import net.minecraft.client.util.telemetry.TelemetrySender; import net.minecraft.command.CommandSource; import net.minecraft.network.ClientConnection; import net.minecraft.network.packet.s2c.play.CommandTreeS2CPacket; @@ -22,7 +23,7 @@ public class ClientPlayNetworkHandlerMixin { @Shadow private CommandDispatcher commandDispatcher; @Inject(method = "", at = @At("RETURN")) - private void init(MinecraftClient client, Screen screen, ClientConnection connection, GameProfile profile, CallbackInfo ci) { + private void init(MinecraftClient client, Screen screen, ClientConnection connection, GameProfile profile, TelemetrySender telemetrySender, CallbackInfo ci) { commandDispatcher.register(literal("skb")); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/SoundManagerMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/SoundManagerMixin.java deleted file mode 100644 index 94380724..00000000 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/SoundManagerMixin.java +++ /dev/null @@ -1,27 +0,0 @@ -package me.xmrvizzy.skyblocker.mixin; - - -import me.xmrvizzy.skyblocker.config.SkyblockerConfig; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.sound.SoundInstance; -import net.minecraft.client.sound.SoundManager; -import net.minecraft.sound.SoundEvents; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(SoundManager.class) -public class SoundManagerMixin { - - private MinecraftClient client = MinecraftClient.getInstance(); - - @Inject(at = @At("HEAD"), method = "play(Lnet/minecraft/client/sound/SoundInstance;)V") - private void play(SoundInstance sound, CallbackInfo ci) { - if (sound.getId().toString().equals("minecraft:entity.player.splash")){ - if (client.player.fishHook != null) - if (client.player.fishHook.isInOpenWater() && sound.getX() != client.player.getX() && sound.getY() != client.player.getY() && sound.getZ() != client.player.getZ() && SkyblockerConfig.get().fishing.enableFishingDing) - client.player.playSound(SoundEvents.ENTITY_ARROW_HIT_PLAYER, 1, 1); - } - } -} diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java index 93a28993..d790755d 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java @@ -53,6 +53,7 @@ public class Utils { for (int i = 0; i < sidebarLines.size(); i++) { if(sidebarLines.get(i).contains("⏣")) location = sidebarLines.get(i); } + if (location == null) location = "Unknown"; location = location.replace('⏣', ' ').strip(); } catch (IndexOutOfBoundsException e) { e.printStackTrace(); diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index 1c37565f..50b69254 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -12,7 +12,7 @@ "LeverBlockMixin", "GenericContainerScreenMixin", "GenericContainerScreenHandlerMixin", - "SoundManagerMixin" + "ClientPlayNetworkHandlerMixin" ], "injectors": { "defaultRequire": 1 -- cgit