aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/config
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/config')
-rw-r--r--src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java5
-rw-r--r--src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java7
-rw-r--r--src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java2
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java13
4 files changed, 20 insertions, 7 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java b/src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java
index 07109b46..41511732 100644
--- a/src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java
@@ -6,7 +6,6 @@ import it.unimi.dsi.fastutil.ints.IntIntMutablePair;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.text.Text;
-import net.minecraft.util.math.MathHelper;
import java.awt.*;
import java.util.List;
@@ -70,8 +69,8 @@ public abstract class HudConfigScreen extends Screen {
@Override
public final boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
if (button == 0 && draggingWidget != null) {
- draggingWidget.setX((int) MathHelper.clamp(mouseX - mouseClickRelativeX, 0, this.width - draggingWidget.getWidth()));
- draggingWidget.setY((int) MathHelper.clamp(mouseY - mouseClickRelativeY, 0, this.height - draggingWidget.getHeight()));
+ draggingWidget.setX((int) Math.clamp(mouseX - mouseClickRelativeX, 0, this.width - draggingWidget.getWidth()));
+ draggingWidget.setY((int) Math.clamp(mouseY - mouseClickRelativeY, 0, this.height - draggingWidget.getHeight()));
}
return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
}
diff --git a/src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java b/src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java
index 584b79e7..77dd2f61 100644
--- a/src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java
+++ b/src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java
@@ -8,6 +8,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
@@ -85,7 +86,7 @@ public class ImageRepoLoader {
update(retries + 1);
}
}
- });
+ }, Executors.newVirtualThreadPerTaskExecutor());
}
/**
@@ -96,7 +97,7 @@ public class ImageRepoLoader {
if (Files.exists(file)) {
try (BufferedReader reader = Files.newBufferedReader(file)) {
- CommitData commitData = CommitData.CODEC.parse(JsonOps.INSTANCE, JsonParser.parseReader(reader)).result().orElseThrow();
+ CommitData commitData = CommitData.CODEC.parse(JsonOps.INSTANCE, JsonParser.parseReader(reader)).getOrThrow();
return commitData.commit();
}
@@ -115,7 +116,7 @@ public class ImageRepoLoader {
CommitData commitData = new CommitData(newHash, System.currentTimeMillis());
try (BufferedWriter writer = Files.newBufferedWriter(file)) {
- SkyblockerMod.GSON.toJson(CommitData.CODEC.encodeStart(JsonOps.INSTANCE, commitData).result().orElseThrow(), writer);
+ SkyblockerMod.GSON.toJson(CommitData.CODEC.encodeStart(JsonOps.INSTANCE, commitData).getOrThrow(), writer);
}
}
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
index 70578822..31f1357d 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java
@@ -4,7 +4,7 @@ import com.google.gson.FieldNamingPolicy;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import de.hysky.skyblocker.SkyblockerMod;
import de.hysky.skyblocker.config.categories.*;
-import de.hysky.skyblocker.mixin.accessor.HandledScreenAccessor;
+import de.hysky.skyblocker.mixins.accessors.HandledScreenAccessor;
import de.hysky.skyblocker.utils.scheduler.Scheduler;
import dev.isxander.yacl3.api.YetAnotherConfigLib;
import dev.isxander.yacl3.config.v2.api.ConfigClassHandler;
diff --git a/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java
index e2684115..4b3c0dfd 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java
@@ -4,6 +4,7 @@ import de.hysky.skyblocker.config.ConfigUtils;
import de.hysky.skyblocker.config.SkyblockerConfig;
import dev.isxander.yacl3.api.ConfigCategory;
import dev.isxander.yacl3.api.Option;
+import dev.isxander.yacl3.api.OptionDescription;
import dev.isxander.yacl3.api.OptionGroup;
import dev.isxander.yacl3.api.controller.IntegerFieldControllerBuilder;
import dev.isxander.yacl3.api.controller.StringControllerBuilder;
@@ -51,6 +52,7 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button1.item.nbt,
() -> config.quickNav.button1.item.nbt,
newValue -> config.quickNav.button1.item.nbt = newValue)
@@ -99,6 +101,7 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button2.item.nbt,
() -> config.quickNav.button2.item.nbt,
newValue -> config.quickNav.button2.item.nbt = newValue)
@@ -147,6 +150,7 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button3.item.nbt,
() -> config.quickNav.button3.item.nbt,
newValue -> config.quickNav.button3.item.nbt = newValue)
@@ -195,6 +199,7 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button4.item.nbt,
() -> config.quickNav.button4.item.nbt,
newValue -> config.quickNav.button4.item.nbt = newValue)
@@ -243,6 +248,7 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button5.item.nbt,
() -> config.quickNav.button5.item.nbt,
newValue -> config.quickNav.button5.item.nbt = newValue)
@@ -291,6 +297,7 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button6.item.nbt,
() -> config.quickNav.button6.item.nbt,
newValue -> config.quickNav.button6.item.nbt = newValue)
@@ -339,6 +346,7 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button7.item.nbt,
() -> config.quickNav.button7.item.nbt,
newValue -> config.quickNav.button7.item.nbt = newValue)
@@ -387,6 +395,7 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button8.item.nbt,
() -> config.quickNav.button8.item.nbt,
newValue -> config.quickNav.button8.item.nbt = newValue)
@@ -435,6 +444,7 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button9.item.nbt,
() -> config.quickNav.button9.item.nbt,
newValue -> config.quickNav.button9.item.nbt = newValue)
@@ -483,6 +493,7 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button10.item.nbt,
() -> config.quickNav.button10.item.nbt,
newValue -> config.quickNav.button10.item.nbt = newValue)
@@ -531,6 +542,7 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button11.item.nbt,
() -> config.quickNav.button11.item.nbt,
newValue -> config.quickNav.button11.item.nbt = newValue)
@@ -579,6 +591,7 @@ public class QuickNavigationCategory {
.build())
.option(Option.<String>createBuilder()
.name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt"))
+ .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.item.nbt.@Tooltip")))
.binding(defaults.quickNav.button12.item.nbt,
() -> config.quickNav.button12.item.nbt,
newValue -> config.quickNav.button12.item.nbt = newValue)
generated by cgit (git 2.46.0) at 2025-02-11 18:00:58 +0000