From be9c81c9944a9456f2338e0a18ea78c60470d8f8 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Mon, 22 Apr 2024 12:48:45 -0400 Subject: Use Virtual Threads for updating the image repo This blocks threads for quite some time so its best if we use virtual threads to allow other processes to do work. --- src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java b/src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java index 584b79e7..b8585916 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()); } /** -- cgit From 08b5d5e735b8d36243a3a6b45e94d608d521a5ec Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Tue, 23 Apr 2024 16:17:46 -0400 Subject: Disable QuickNav NBT editing --- .../config/categories/QuickNavigationCategory.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/main/java/de/hysky/skyblocker/config') 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..4f3bff36 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/QuickNavigationCategory.java @@ -55,6 +55,7 @@ public class QuickNavigationCategory { () -> config.quickNav.button1.item.nbt, newValue -> config.quickNav.button1.item.nbt = newValue) .controller(StringControllerBuilder::create) + .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -103,6 +104,7 @@ public class QuickNavigationCategory { () -> config.quickNav.button2.item.nbt, newValue -> config.quickNav.button2.item.nbt = newValue) .controller(StringControllerBuilder::create) + .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -151,6 +153,7 @@ public class QuickNavigationCategory { () -> config.quickNav.button3.item.nbt, newValue -> config.quickNav.button3.item.nbt = newValue) .controller(StringControllerBuilder::create) + .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -199,6 +202,7 @@ public class QuickNavigationCategory { () -> config.quickNav.button4.item.nbt, newValue -> config.quickNav.button4.item.nbt = newValue) .controller(StringControllerBuilder::create) + .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -247,6 +251,7 @@ public class QuickNavigationCategory { () -> config.quickNav.button5.item.nbt, newValue -> config.quickNav.button5.item.nbt = newValue) .controller(StringControllerBuilder::create) + .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -295,6 +300,7 @@ public class QuickNavigationCategory { () -> config.quickNav.button6.item.nbt, newValue -> config.quickNav.button6.item.nbt = newValue) .controller(StringControllerBuilder::create) + .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -343,6 +349,7 @@ public class QuickNavigationCategory { () -> config.quickNav.button7.item.nbt, newValue -> config.quickNav.button7.item.nbt = newValue) .controller(StringControllerBuilder::create) + .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -391,6 +398,7 @@ public class QuickNavigationCategory { () -> config.quickNav.button8.item.nbt, newValue -> config.quickNav.button8.item.nbt = newValue) .controller(StringControllerBuilder::create) + .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -439,6 +447,7 @@ public class QuickNavigationCategory { () -> config.quickNav.button9.item.nbt, newValue -> config.quickNav.button9.item.nbt = newValue) .controller(StringControllerBuilder::create) + .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -487,6 +496,7 @@ public class QuickNavigationCategory { () -> config.quickNav.button10.item.nbt, newValue -> config.quickNav.button10.item.nbt = newValue) .controller(StringControllerBuilder::create) + .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -535,6 +545,7 @@ public class QuickNavigationCategory { () -> config.quickNav.button11.item.nbt, newValue -> config.quickNav.button11.item.nbt = newValue) .controller(StringControllerBuilder::create) + .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -583,6 +594,7 @@ public class QuickNavigationCategory { () -> config.quickNav.button12.item.nbt, newValue -> config.quickNav.button12.item.nbt = newValue) .controller(StringControllerBuilder::create) + .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) -- cgit From df9c1b29f0ca35f97e1c74910f6d0e01c2ca6ccb Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Tue, 23 Apr 2024 20:18:43 -0400 Subject: Refactor usages of Optional's orElseThrow to getOrThrow Mojang's method is more concise and provides far superior error messages incase the value isn't present (like why it happened) whereas with Optionals its just the standard value not present message. --- src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') diff --git a/src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java b/src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java index b8585916..77dd2f61 100644 --- a/src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java +++ b/src/main/java/de/hysky/skyblocker/config/ImageRepoLoader.java @@ -97,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(); } @@ -116,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); } } -- cgit From 17d356b95b0d54b81a11701279818159490458eb Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Tue, 23 Apr 2024 21:22:34 -0400 Subject: Replace usages of MathHelper#clamp with Java 21's Math#clamp --- src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') 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); } -- cgit From d24bac4d728d8ea9264e08934fb863771bcca5e2 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Fri, 26 Apr 2024 20:00:18 -0400 Subject: Pluralize the mixin and accessor packages --- src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/de/hysky/skyblocker/config') 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; -- cgit From 6368f24b87f8a3d6dbd113d1fdf921e394e5a936 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sat, 27 Apr 2024 12:40:11 -0400 Subject: Enable QuickNav NBT editing & add warning about it --- .../config/categories/QuickNavigationCategory.java | 25 +++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/config') 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 4f3bff36..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,11 +52,11 @@ public class QuickNavigationCategory { .build()) .option(Option.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) .controller(StringControllerBuilder::create) - .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -100,11 +101,11 @@ public class QuickNavigationCategory { .build()) .option(Option.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) .controller(StringControllerBuilder::create) - .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -149,11 +150,11 @@ public class QuickNavigationCategory { .build()) .option(Option.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) .controller(StringControllerBuilder::create) - .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -198,11 +199,11 @@ public class QuickNavigationCategory { .build()) .option(Option.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) .controller(StringControllerBuilder::create) - .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -247,11 +248,11 @@ public class QuickNavigationCategory { .build()) .option(Option.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) .controller(StringControllerBuilder::create) - .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -296,11 +297,11 @@ public class QuickNavigationCategory { .build()) .option(Option.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) .controller(StringControllerBuilder::create) - .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -345,11 +346,11 @@ public class QuickNavigationCategory { .build()) .option(Option.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) .controller(StringControllerBuilder::create) - .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -394,11 +395,11 @@ public class QuickNavigationCategory { .build()) .option(Option.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) .controller(StringControllerBuilder::create) - .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -443,11 +444,11 @@ public class QuickNavigationCategory { .build()) .option(Option.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) .controller(StringControllerBuilder::create) - .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -492,11 +493,11 @@ public class QuickNavigationCategory { .build()) .option(Option.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) .controller(StringControllerBuilder::create) - .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -541,11 +542,11 @@ public class QuickNavigationCategory { .build()) .option(Option.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) .controller(StringControllerBuilder::create) - .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) @@ -590,11 +591,11 @@ public class QuickNavigationCategory { .build()) .option(Option.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) .controller(StringControllerBuilder::create) - .available(false) .build()) .option(Option.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.quickNav.button.uiTitle")) -- cgit