diff options
author | msg-programs <msgdoesstuff@gmail.com> | 2023-05-09 22:35:06 +0200 |
---|---|---|
committer | msg-programs <msgdoesstuff@gmail.com> | 2023-05-09 22:35:06 +0200 |
commit | bb16f61a2034848dc686bbcb30e79c2f0a624e97 (patch) | |
tree | 501f5d9d900035aa270910e319ffd3d57294fbbe /src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud | |
parent | c9cdbc42d34c3a55c26ceced01f74a700af3901c (diff) | |
download | Skyblocker-bb16f61a2034848dc686bbcb30e79c2f0a624e97.tar.gz Skyblocker-bb16f61a2034848dc686bbcb30e79c2f0a624e97.tar.bz2 Skyblocker-bb16f61a2034848dc686bbcb30e79c2f0a624e97.zip |
Add comments to and change comments of widget classes where needed
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud')
33 files changed, 54 insertions, 105 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/CommsWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/CommsWidget.java index dbe3e457..e45865e4 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/CommsWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/CommsWidget.java @@ -17,7 +17,7 @@ import net.minecraft.util.Formatting; import net.minecraft.util.math.MathHelper; // this widget shows the status of the king's commissions. -// works in both the dwarven mines and the CH +// (dwarven mines and crystal hollows) public class CommsWidget extends Widget { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/CookieWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/CookieWidget.java index dfab6818..8974efa7 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/CookieWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/CookieWidget.java @@ -9,7 +9,6 @@ import net.minecraft.util.Formatting; // this widget shows info about active super cookies // or not, if you're unwilling to buy one -// TODO: test with active cookie. I'm not buying one. public class CookieWidget extends Widget { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonDownedWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonDownedWidget.java index 9146fdbb..36245a4e 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonDownedWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonDownedWidget.java @@ -12,7 +12,7 @@ import net.minecraft.text.Text; import net.minecraft.util.Formatting; // this widget shows info about... something? -// TODO: test this. +// related to downed people in dungeons, not sure what this is supposed to show public class DungeonDownedWidget extends Widget { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java index 41d5d67a..7195e455 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonPlayerWidget.java @@ -16,7 +16,6 @@ import net.minecraft.text.Text; import net.minecraft.util.Formatting; // this widget shows info about a player in the current dungeon group -// when inside a dungeon public class DungeonPlayerWidget extends Widget { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonPuzzleWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonPuzzleWidget.java index 3aba547c..86d1f938 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonPuzzleWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonPuzzleWidget.java @@ -14,7 +14,6 @@ import net.minecraft.text.Text; import net.minecraft.util.Formatting; // this widget shows info about all puzzeles in the dungeon (name and status) -// TODO: if puzzle was failed, show player name public class DungeonPuzzleWidget extends Widget { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonSecretWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonSecretWidget.java index fed6b0b2..e0c83a35 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonSecretWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/DungeonSecretWidget.java @@ -11,7 +11,7 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -// this widget shows info about secrets of the dungeon +// this widget shows info about the secrets of the dungeon public class DungeonSecretWidget extends Widget { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EffectWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EffectWidget.java index 49449a97..d44d1ea7 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EffectWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EffectWidget.java @@ -8,8 +8,8 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -// this widgte shows, how many active effects you have -// it also shows one of those in detail +// this widgte shows, how many active effects you have. +// it also shows one of those in detail. // the parsing is super suspect and should be replaced by some regexes sometime later public class EffectWidget extends Widget { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EssenceWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EssenceWidget.java index 903c3a3d..7063ce3f 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EssenceWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EssenceWidget.java @@ -12,7 +12,7 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -// this widget shows your dungeon essences +// this widget shows your dungeon essences (dungeon hub only) public class EssenceWidget extends Widget { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EventWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EventWidget.java index 7fcbe1c1..eb741566 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EventWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/EventWidget.java @@ -11,7 +11,7 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -// this widget shows info about ongoing events (e.g. jacob's farming) +// this widget shows info about ongoing events (e.g. election) public class EventWidget extends Widget { private static final MutableText TITLE = Text.literal("Event Info").formatted(Formatting.YELLOW, Formatting.BOLD); diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/FireSaleWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/FireSaleWidget.java index ad82417f..9b7b2678 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/FireSaleWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/FireSaleWidget.java @@ -16,7 +16,7 @@ import net.minecraft.text.Text; import net.minecraft.util.math.MathHelper; import net.minecraft.util.Formatting; -// this widget shows info about fire sales when in the hub +// this widget shows info about fire sales when in the hub. // or not, if there isn't one going on public class FireSaleWidget extends Widget { @@ -27,7 +27,7 @@ public class FireSaleWidget extends Widget { // matches a fire sale item // group 1: item name // group 2: # items bought - // group 1: # items available in total (1 digit + "k") + // group 3: # items available in total (1 digit + "k") private static final Pattern FIRE_PATTERN = Pattern.compile(" (.*): (\\d*)/([0-9.]*)k"); public FireSaleWidget(List<PlayerListEntry> list) { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ForgeWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ForgeWidget.java index 787d9311..40e2f56d 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ForgeWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ForgeWidget.java @@ -13,7 +13,7 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -// this widget shows what you're forging right now +// this widget shows what you're forging right now. // for locked slots, the unlock requirement is shown public class ForgeWidget extends Widget { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/GardenServerWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/GardenServerWidget.java index c6c334d5..864dee8e 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/GardenServerWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/GardenServerWidget.java @@ -20,6 +20,8 @@ public class GardenServerWidget extends Widget { private static final MutableText TITLE = Text.literal("Server Info").formatted(Formatting.DARK_AQUA, Formatting.BOLD); + // match the next visitor in the garden + // group 1: visitor name private static final Pattern VISITOR_PATTERN = Pattern.compile(" Next Visitor: (.*)$"); public GardenServerWidget(List<PlayerListEntry> list) { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/GardenSkillsWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/GardenSkillsWidget.java index 99011616..26c90df7 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/GardenSkillsWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/GardenSkillsWidget.java @@ -15,6 +15,7 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; +// this widget shows info about your skills while in the garden public class GardenSkillsWidget extends Widget { @@ -25,8 +26,7 @@ public class GardenSkillsWidget extends Widget { // group 1: skill name and level // group 2: progress to next level (without "%") private static final Pattern SKILL_PATTERN = Pattern.compile("\\S*: ([A-Za-z]* [0-9]*): (\\S*)%"); - // same with leading space - // TODO: make better, maybe + // same, but with leading space private static final Pattern MS_PATTERN = Pattern.compile(" \\S*: ([A-Za-z]* [0-9]*): (\\S*)%"); public GardenSkillsWidget(List<PlayerListEntry> list) { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandGuestsWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandGuestsWidget.java index 5814c15c..fa27eaa0 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandGuestsWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandGuestsWidget.java @@ -12,8 +12,7 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -// this widget shows a list of all people visiting -// the same private island as you +// this widget shows a list of all people visiting the same private island as you public class IslandGuestsWidget extends Widget { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandOwnersWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandOwnersWidget.java index a0056a06..083f72b7 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandOwnersWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandOwnersWidget.java @@ -12,8 +12,7 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -// this widget shows a list of the owners of a private island -// when you're visiting someone else +// this widget shows a list of the owners of a home island while guesting public class IslandOwnersWidget extends Widget { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandSelfWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandSelfWidget.java index 96ec8ba5..aa1d951b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandSelfWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/IslandSelfWidget.java @@ -12,7 +12,7 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -// this widget shows a list of the owners of your home island +// this widget shows a list of the owners while on your home island public class IslandSelfWidget extends Widget { @@ -20,7 +20,7 @@ public class IslandSelfWidget extends Widget { Formatting.BOLD); // matches an owner - // group 1: player name + // group 1: player name private static final Pattern OWNER_PATTERN = Pattern.compile("\\[\\d*\\] (.*)"); public IslandSelfWidget(List<PlayerListEntry> list) { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java index 11817662..03defb4c 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java @@ -14,6 +14,8 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; +// this widget shows info about the current jacob's contest (garden only) + public class JacobsContestWidget extends Widget { private static final MutableText TITLE = Text.literal("Jacob's Contest").formatted(Formatting.YELLOW, diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java index 27c69567..90069c90 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java @@ -13,8 +13,8 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -// this widget shows a list of players with their skins -// in most areas +// this widget shows a list of players with their skins. +// responsible for non-private-island areas public class PlayerListWidget extends Widget { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PowderWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PowderWidget.java index 97485b4f..cca09d77 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PowderWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PowderWidget.java @@ -12,6 +12,7 @@ import net.minecraft.text.Text; import net.minecraft.util.Formatting; // this widget shows how much mithril and gemstone powder you have +// (dwarven mines and crystal hollows) public class PowderWidget extends Widget { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/QuestWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/QuestWidget.java index e2bd7fd3..5fdb1a5b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/QuestWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/QuestWidget.java @@ -11,7 +11,7 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -// this widget shows your Crimson Isle suests +// this widget shows your crimson isle faction quests public class QuestWidget extends Widget { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ReputationWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ReputationWidget.java index e234763b..75bd4e92 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ReputationWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ReputationWidget.java @@ -13,14 +13,20 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -// this widget shows your faction status +// this widget shows your faction status (crimson isle) public class ReputationWidget extends Widget { private static final MutableText TITLE = Text.literal("Faction Status").formatted(Formatting.AQUA, Formatting.BOLD); + // matches your faction alignment progress + // group 1: percentage to next alignment level private static final Pattern PROGRESS_PATTERN = Pattern.compile(" \\|+ \\(([0-9.]*)%\\)"); + + // matches alignment level names + // group 1: left level name + // group 2: right level name private static final Pattern STATE_PATTERN = Pattern.compile("(\\S*) *(\\S*)"); public ReputationWidget(List<PlayerListEntry> list) { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ServerWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ServerWidget.java index ce7bc56f..4084d4dd 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ServerWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/ServerWidget.java @@ -11,9 +11,9 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -// this widget shows info about "generic" servers +// this widget shows info about "generic" servers. // a server is "generic", when only name, server ID and gems are shown -// in the thrid column of the tab menu +// in the third column of the tab HUD public class ServerWidget extends Widget { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/SkillsWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/SkillsWidget.java index 0d105a53..be412421 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/SkillsWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/SkillsWidget.java @@ -17,7 +17,8 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -// this widget shows info about a skill and some stats +// this widget shows info about a skill and some stats, +// as seen in the rightmost column of the default HUD public class SkillsWidget extends Widget { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/TrapperWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/TrapperWidget.java index 981e4eef..4252888e 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/TrapperWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/TrapperWidget.java @@ -11,7 +11,7 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -// this widget shows, how meny pelts you have (farming island only) +// this widget shows how meny pelts you have (farming island) public class TrapperWidget extends Widget { private static final MutableText TITLE = Text.literal("Trapper").formatted(Formatting.DARK_AQUA, diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/UpgradeWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/UpgradeWidget.java index 9f3be82a..0e0fe6b7 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/UpgradeWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/UpgradeWidget.java @@ -8,7 +8,7 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -// this widget shows info about current profile/account upgrades +// this widget shows info about ongoing profile/account upgrades // or not, if there aren't any // TODO: not very pretty atm diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/VolcanoWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/VolcanoWidget.java index 9c81133f..cca4ca1b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/VolcanoWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/VolcanoWidget.java @@ -13,7 +13,7 @@ import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Pair; -// this widget shows the volcano status +// shows the volcano status (crimson isle) public class VolcanoWidget extends Widget { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/Widget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/Widget.java index c0d3bf0e..9e3c87cf 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/Widget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/Widget.java @@ -128,77 +128,4 @@ public abstract class Widget { private void drawVLine(MatrixStack ms, int xpos, int ypos, int height) { DrawableHelper.fill(ms, xpos, ypos, xpos + 1, ypos + height, this.color); } - - // static final int ICO_DIM = 16; - // static final int PAD_S = 2; - // static final int PAD_L = 4; - // static final int SKIN_ICO_DIM = 8; - - // static final int TEXT_H = txtRend.fontHeight; - // static final int BAR_H = TEXT_H; - - // static final int TITLED_BAR_H = TEXT_H + PAD_S + BAR_H + PAD_L; - // static final int ICO_LINE_H = ICO_DIM + PAD_L; - - // public void drawRect(MatrixStack ms, int x, int y, int w, int h) { - // DrawableHelper.fill(ms, x + xpos + CONTENT_OFFS_X, y + ypos + CONTENT_OFFS_Y, - // x + xpos + CONTENT_OFFS_X + w, - // y + ypos + CONTENT_OFFS_Y + h, this.color); - // } - - // void drawIcon(ItemStack ico, int x, int y) { - // itmRend.renderGuiItemIcon(ico, x + x + CONTENT_OFFS_X, y + y - // + CONTENT_OFFS_Y); - // } - - // void drawText(MatrixStack ms, Text text, int x, int y, int color) { - // txtRend.draw(ms, text, x + x + CONTENT_OFFS_X, y + y + - // CONTENT_OFFS_Y, 0xff000000 | color); - // } - - // void drawText(MatrixStack ms, Text text, int x, int y) { - // this.drawText(ms, text, x, y, 0xffffffff); - // } - - // void drawIcoText(MatrixStack ms, ItemStack ico, Text text, int x, int y) { - // this.drawIcon(ico, x, y); - // this.drawText(ms, text, x + ICO_DIM + PAD_L, y + 5); - // } - - // void fill(MatrixStack ms, int x1, int y1, int x2, int y2, int color) { - // DrawableHelper.fill(ms, x1 + x + CONTENT_OFFS_X, y1 + y + - // CONTENT_OFFS_Y, - // x2 + x + CONTENT_OFFS_X, y2 + y + CONTENT_OFFS_Y, 0xff000000 - // | color); - // } - - // void drawBar(MatrixStack ms, int x, int y, int width, float fillPcnt, int - // color) { - // this.fill(ms, x, y, x + width, y + 10, COL_BG_BAR); - // this.fill(ms, x, y, x + (int) (width * (fillPcnt / 100f)), y + 10, color); - // } - - // void drawTitledIcoBar(MatrixStack ms, ItemStack ico, Text title, int width, - // float pcnt, int x, int y, int color) { - // final int ICO_OFFS = 3; - // this.drawIcon(ico, x, y + ICO_OFFS); - // this.drawText(ms, title, x + ICO_DIM + PAD_L, y); - // this.drawBar(ms, x + ICO_DIM + PAD_L, y + TEXT_H + PAD_S, width, pcnt, - // color); - // } - - // void drawIcoFatText(MatrixStack ms, ItemStack ico, Text line1, Text line2, - // int x, int y) { - // final int ICO_OFFS = 1; - // this.drawIcon(ico, x, y + ICO_OFFS); - // this.drawText(ms, line1, x + ICO_DIM + PAD_L, y); - // this.drawText(ms, line2, x + ICO_DIM + PAD_L, y + TEXT_H + PAD_S); - // } - - // public void drawPlayerIco(MatrixStack ms, int x, int y, Identifier - // skinTexture) { - // RenderSystem.setShaderTexture(0, skinTexture); - // PlayerSkinDrawer.draw(ms, x + x + CONTENT_OFFS_X, y + y + - // CONTENT_OFFS_Y, SKIN_ICO_DIM); - // } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/IcoFatTextComponent.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/IcoFatTextComponent.java index 5865138c..9aec581b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/IcoFatTextComponent.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/IcoFatTextComponent.java @@ -4,6 +4,8 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; +// widget component that consists of an icon and two lines of text + public class IcoFatTextComponent extends Component { private static final int ICO_OFFS = 1; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/IcoTextComponent.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/IcoTextComponent.java index 66f15479..defbb2e6 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/IcoTextComponent.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/IcoTextComponent.java @@ -4,8 +4,10 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; +// widget component that consists of an icon and a line of text + public class IcoTextComponent extends Component { - + private ItemStack ico; private Text text; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlainTextComponent.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlainTextComponent.java index b801f3aa..8976e6a2 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlainTextComponent.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlainTextComponent.java @@ -3,6 +3,8 @@ package me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; +// widget component that consists of a line of text + public class PlainTextComponent extends Component { private Text text; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java index 7e1fd399..56e2b3c3 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/PlayerComponent.java @@ -7,6 +7,8 @@ import net.minecraft.client.network.PlayerListEntry; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; +// widget component that consists of a player's skin icon and their name + public class PlayerComponent extends Component { private static final int SKIN_ICO_DIM = 8; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/ProgressComponent.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/ProgressComponent.java index 41539d1c..1803e327 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/ProgressComponent.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/ProgressComponent.java @@ -5,6 +5,10 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; +// widget component that consists of an icon, some text and a progress bar +// progress bar either shows percentage or custom text +// NOTICE: pcnt is 0-100, not 0-1! + public class ProgressComponent extends Component { private static final int BAR_WIDTH = 100; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/TableComponent.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/TableComponent.java index 2d367b11..eeb8ce3b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/TableComponent.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/component/TableComponent.java @@ -3,6 +3,9 @@ package me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component; import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.util.math.MatrixStack; +// widget component that consists of a grid of other components +// grid cols are separated by lines + // FIXME: table isn't wide enough sometimes // FIXME: dividers drift when there are >2 cols public class TableComponent extends Component { |