aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorviciscat <51047087+viciscat@users.noreply.github.com>2024-08-07 19:21:35 +0200
committerviciscat <51047087+viciscat@users.noreply.github.com>2024-12-12 18:19:34 +0100
commite11c67bcc936f8726664725f2ae33113e7c29296 (patch)
tree09d848c14ee0e93d2141f269bb835407be77b960 /src/main/java
parentbafda22d7d7d5370f6dfaf7676890c7b689a4cb3 (diff)
downloadSkyblocker-e11c67bcc936f8726664725f2ae33113e7c29296.tar.gz
Skyblocker-e11c67bcc936f8726664725f2ae33113e7c29296.tar.bz2
Skyblocker-e11c67bcc936f8726664725f2ae33113e7c29296.zip
thingies
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/de/hysky/skyblocker/SkyblockerMod.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java1
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java4
4 files changed, 2 insertions, 7 deletions
diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
index fd6a2eaa..2a66a73a 100644
--- a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
+++ b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
@@ -68,8 +68,6 @@ public class SkyblockerMod implements ClientModInitializer {
Scheduler.INSTANCE.scheduleCyclic(Utils::update, 20);
Scheduler.INSTANCE.scheduleCyclic(DiscordRPCManager::updateDataAndPresence, 200);
Scheduler.INSTANCE.scheduleCyclic(BackpackPreview::tick, 50);
- //Scheduler.INSTANCE.scheduleCyclic(DwarvenHud::update, 40);
- //Scheduler.INSTANCE.scheduleCyclic(CrystalsHudWidget::update, 40);
Scheduler.INSTANCE.scheduleCyclic(PlayerListMgr::updateList, 20);
}
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java
index 7a7c63bc..41b62cac 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/UIAndVisualsCategory.java
@@ -195,7 +195,7 @@ public class UIAndVisualsCategory {
.build())
.option(Option.<Boolean>createBuilder()
.name(Text.literal("Effects from footer"))
- .description(OptionDescription.of(Text.literal("If on, will fetch current effects from the tab footer if the hypixel Effects widget is disabled")))
+ .description(OptionDescription.of(Text.literal("If on, will fetch current effects from the tab footer if the Hypixel Effects Widget is disabled")))
.controller(ConfigUtils::createBooleanController)
.binding(defaults.uiAndVisuals.tabHud.effectsFromFooter,
() -> config.uiAndVisuals.tabHud.effectsFromFooter,
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
index fcb7e9d5..a81a6d4b 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHud.java
@@ -65,7 +65,6 @@ public class FarmingHud {
}
FarmingHudWidget.INSTANCE.update();
- //FarmingHudWidget.INSTANCE.render(context, SkyblockerConfigManager.get().uiAndVisuals.tabHud.enableHudBackground);
}
});
ClientPlayerBlockBreakEvents.AFTER.register((world, player, pos, state) -> {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
index c51f0814..383e2061 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/garden/FarmingHudWidget.java
@@ -53,8 +53,6 @@ public class FarmingHudWidget extends ComponentBasedWidget {
public FarmingHudWidget() {
super(TITLE, Formatting.YELLOW.getColorValue(), "hud_farming");
- //setX(SkyblockerConfigManager.get().farming.garden.farmingHud.x);
- //setY(SkyblockerConfigManager.get().farming.garden.farmingHud.y);
update();
}
@@ -67,7 +65,7 @@ public class FarmingHudWidget extends ComponentBasedWidget {
ItemStack farmingToolStack = client.player.getMainHandStack();
if (farmingToolStack == null) return;
String itemId = ItemUtils.getItemId(farmingToolStack);
- String cropItemId = FARMING_TOOLS.containsKey(itemId) ? FARMING_TOOLS.get(itemId) : "";
+ String cropItemId = FARMING_TOOLS.getOrDefault(itemId, "");
ItemStack cropStack = ItemRepository.getItemStack(cropItemId.replace(":", "-")); // Hacky conversion to neu id since ItemUtils.getNeuId requires an item stack.
String counterText = FarmingHud.counterText();