aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKevin <92656833+kevinthegreat1@users.noreply.github.com>2023-09-02 00:30:56 -0400
committerGitHub <noreply@github.com>2023-09-02 00:30:56 -0400
commit225644de8bf2a15c7a0970d84c548189d5a15ec4 (patch)
tree1fa27c471d9eec98054f2ff3e9b925f37cb09e00 /src
parent3dba852fc81d0a0fd30fc8f1191327ba0e5ba534 (diff)
downloadSkyblocker-225644de8bf2a15c7a0970d84c548189d5a15ec4.tar.gz
Skyblocker-225644de8bf2a15c7a0970d84c548189d5a15ec4.tar.bz2
Skyblocker-225644de8bf2a15c7a0970d84c548189d5a15ec4.zip
Add Quiver Warning (#270)
Diffstat (limited to 'src')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java1
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java10
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/QuiverWarning.java66
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_us.json18
4 files changed, 89 insertions, 6 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
index f15427c1..4ef19931 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
@@ -99,6 +99,7 @@ public class SkyblockerMod implements ClientModInitializer {
CustomArmorDyeColors.init();
CustomArmorTrims.init();
TicTacToe.init();
+ QuiverWarning.init();
containerSolverManager.init();
statusBarTracker.init();
scheduler.scheduleCyclic(Utils::update, 20);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 3373b71d..5d251f4f 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -174,6 +174,10 @@ public class SkyblockerConfig implements ConfigData {
@ConfigEntry.Gui.CollapsibleObject()
public Shortcuts shortcuts = new Shortcuts();
+ @ConfigEntry.Category("quiverWarning")
+ @ConfigEntry.Gui.CollapsibleObject()
+ public QuiverWarning quiverWarning = new QuiverWarning();
+
@ConfigEntry.Category("itemList")
@ConfigEntry.Gui.CollapsibleObject()
public ItemList itemList = new ItemList();
@@ -302,6 +306,12 @@ public class SkyblockerConfig implements ConfigData {
public boolean enableCommandArgShortcuts = true;
}
+ public static class QuiverWarning {
+ public boolean enableQuiverWarning = true;
+ public boolean enableQuiverWarningInDungeons = true;
+ public boolean enableQuiverWarningAfterDungeon = true;
+ }
+
public static class Hitbox {
public boolean oldFarmlandHitbox = true;
public boolean oldLeverHitbox = false;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/QuiverWarning.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/QuiverWarning.java
new file mode 100644
index 00000000..cf793461
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/QuiverWarning.java
@@ -0,0 +1,66 @@
+package me.xmrvizzy.skyblocker.skyblock;
+
+import me.xmrvizzy.skyblocker.SkyblockerMod;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.utils.Utils;
+import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.hud.InGameHud;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import org.jetbrains.annotations.Nullable;
+
+public class QuiverWarning {
+ @Nullable
+ private static Type warning = null;
+
+ public static void init() {
+ ClientReceiveMessageEvents.ALLOW_GAME.register(QuiverWarning::onChatMessage);
+ SkyblockerMod.getInstance().scheduler.scheduleCyclic(QuiverWarning::update, 10);
+ }
+
+ public static boolean onChatMessage(Text text, boolean overlay) {
+ String message = text.getString();
+ if (SkyblockerConfig.get().general.quiverWarning.enableQuiverWarning && message.endsWith("left in your Quiver!")) {
+ MinecraftClient.getInstance().inGameHud.setDefaultTitleFade();
+ if (message.startsWith("You only have 50")) {
+ onChatMessage(Type.FIFTY_LEFT);
+ } else if (message.startsWith("You only have 10")) {
+ onChatMessage(Type.TEN_LEFT);
+ } else if (message.startsWith("You don't have any more")) {
+ onChatMessage(Type.EMPTY);
+ }
+ }
+ return true;
+ }
+
+ private static void onChatMessage(Type warning) {
+ if (!Utils.isInDungeons()) {
+ MinecraftClient.getInstance().inGameHud.setTitle(Text.translatable(warning.key).formatted(Formatting.RED));
+ } else if (SkyblockerConfig.get().general.quiverWarning.enableQuiverWarningInDungeons) {
+ MinecraftClient.getInstance().inGameHud.setTitle(Text.translatable(warning.key).formatted(Formatting.RED));
+ QuiverWarning.warning = warning;
+ }
+ }
+
+ public static void update() {
+ if (warning != null && SkyblockerConfig.get().general.quiverWarning.enableQuiverWarning && SkyblockerConfig.get().general.quiverWarning.enableQuiverWarningAfterDungeon && !Utils.isInDungeons()) {
+ InGameHud inGameHud = MinecraftClient.getInstance().inGameHud;
+ inGameHud.setDefaultTitleFade();
+ inGameHud.setTitle(Text.translatable(warning.key).formatted(Formatting.RED));
+ warning = null;
+ }
+ }
+
+ private enum Type {
+ NONE(""),
+ FIFTY_LEFT("50Left"),
+ TEN_LEFT("10Left"),
+ EMPTY("empty");
+ private final String key;
+
+ Type(String key) {
+ this.key = "skyblocker.quiverWarning." + key;
+ }
+ }
+}
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index ec1b73b1..33f6ff9c 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -37,8 +37,10 @@
"text.autoconfig.skyblocker.option.general.shortcuts.enableCommandShortcuts.@Tooltip": "Shortcuts for commands consisting of only one word. Edit shortcuts with \"/skyblocker shortcuts\". Shortcuts must be enabled for this to take effect.",
"text.autoconfig.skyblocker.option.general.shortcuts.enableCommandArgShortcuts": "Enable Command Argument Shortcuts",
"text.autoconfig.skyblocker.option.general.shortcuts.enableCommandArgShortcuts.@Tooltip": "Shortcuts that replace one or more word(s)/argument(s) of a command which has multiple words/arguments. Edit shortcuts with \"/skyblocker shortcuts\". Shortcuts must be enabled for this to take effect.",
- "text.autoconfig.skyblocker.option.general.quicknav": "Quicknav",
- "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Enable Quicknav",
+ "text.autoconfig.skyblocker.option.general.quiverWarning": "Quiver Warning",
+ "text.autoconfig.skyblocker.option.general.quiverWarning.enableQuiverWarning": "Enable Quiver Warning",
+ "text.autoconfig.skyblocker.option.general.quiverWarning.enableQuiverWarningInDungeons": "Enable Quiver Warning In Dungeons",
+ "text.autoconfig.skyblocker.option.general.quiverWarning.enableQuiverWarningAfterDungeon": "Enable Quiver Warning After a Dungeon",
"text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "View backpack preview without holding Shift",
"text.autoconfig.skyblocker.option.general.tabHud": "Fancy tab HUD",
"text.autoconfig.skyblocker.option.general.tabHud.tabHudEnabled": "Enable fancy tab HUD",
@@ -322,13 +324,13 @@
"skyblocker.shortcuts.deleteWarning": "Shortcut '%s' will be lost forever! (A long time!)",
"skyblocker.shortcuts.new": "New Shortcut",
"skyblocker.shortcuts.commandSuggestionTooltip": "Due to limitations of Minecraft, command suggestions will only work after a restart of the game.",
-
+
"skyblocker.customItemNames.removed": "§b[§6Skyblocker§b] §fRemoved this item's custom name.",
"skyblocker.customItemNames.neverHad": "§b[§6Skyblocker§b] §fThis item doesn't have a custom name set, but why not add one? ;)",
"skyblocker.customItemNames.added": "§b[§6Skyblocker§b] §fSet a custom name for your currently held item!",
"skyblocker.customItemNames.noItemUuid": "§b[§6Skyblocker§b] §cYou must be holding an item that has a uuid in order to set a custom name!",
"skyblocker.customItemNames.unableToSetName": "§b[§6Skyblocker§b] §cUnable to set a custom item name :( (Are you in skyblock?, are you holding an item?)",
-
+
"skyblocker.customDyeColors.invalidHex": "§b[§6Skyblocker§b] §cInvalid HEX color code!",
"skyblocker.customDyeColors.notDyeable": "§b[§6Skyblocker§b] §cThis item isn't a dyeable armor piece!",
"skyblocker.customDyeColors.removed": "§b[§6Skyblocker§b] §fRemoved this item's custom dye color.",
@@ -336,12 +338,16 @@
"skyblocker.customDyeColors.added": "§b[§6Skyblocker§b] §fSet a custom dye color for your currently held item!",
"skyblocker.customDyeColors.noItemUuid": "§b[§6Skyblocker§b] §cYou must be holding an item that has a uuid in order to set a custom dye color!",
"skyblocker.customDyeColors.unableToSetColor": "§b[§6Skyblocker§b] §cUnable to set a custom dye color :( (Are you in skyblock?, are you holding an item?)",
-
+
"skyblocker.customArmorTrims.invalidMaterialOrPattern": "§b[§6Skyblocker§b] §cYou supplied either an invalid material, or an invalid trim pattern!",
"skyblocker.customArmorTrims.notAnArmorPiece": "§b[§6Skyblocker§b] §cThis item isn't an armor piece!",
"skyblocker.customArmorTrims.removed": "§b[§6Skyblocker§b] §fRemoved this item's custom armor trim.",
"skyblocker.customArmorTrims.neverHad": "§b[§6Skyblocker§b] §fThis item doesn't have a armor trim set, but why not add one? ;)",
"skyblocker.customArmorTrims.added": "§b[§6Skyblocker§b] §fSet a custom armor trim for your currently held item!",
"skyblocker.customArmorTrims.noItemUuid": "§b[§6Skyblocker§b] §cYou must be holding an item that has a uuid in order to set a custom armor trim!",
- "skyblocker.customArmorTrims.unableToSetTrim": "§b[§6Skyblocker§b] §cUnable to set a custom armor trim :( (Are you in skyblock?, are you holding an item?)"
+ "skyblocker.customArmorTrims.unableToSetTrim": "§b[§6Skyblocker§b] §cUnable to set a custom armor trim :( (Are you in skyblock?, are you holding an item?)",
+
+ "skyblocker.quiverWarning.50Left": "You only have 50 Arrows left in your Quiver!",
+ "skyblocker.quiverWarning.10Left": "You only have 10 Arrows left in your Quiver!",
+ "skyblocker.quiverWarning.empty": "You don't have any more Arrows left in your Quiver!"
}