From 87fca6d525c70c5e95122a3610916ad5f48cc4b8 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Thu, 3 Aug 2023 21:30:53 +0800 Subject: Refactor Scheduler#queueOpenScreen --- src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/config') diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 2cc7dd36..8d633563 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -8,6 +8,7 @@ import me.shedaniel.autoconfig.annotation.ConfigEntry; import me.shedaniel.autoconfig.serializer.GsonConfigSerializer; import me.xmrvizzy.skyblocker.SkyblockerMod; import me.xmrvizzy.skyblocker.chat.ChatFilterResult; +import me.xmrvizzy.skyblocker.utils.Scheduler; import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.minecraft.client.resource.language.I18n; @@ -544,7 +545,7 @@ public class SkyblockerConfig implements ConfigData { */ private static LiteralArgumentBuilder optionsLiteral(String name) { // Don't immediately open the next screen as it will be closed by ChatScreen right after this command is executed - return literal(name).executes(context -> SkyblockerMod.getInstance().scheduler.queueOpenScreen(AutoConfig.getConfigScreen(SkyblockerConfig.class, null))); + return literal(name).executes(Scheduler.queueOpenScreenCommand(AutoConfig.getConfigScreen(SkyblockerConfig.class, null))); } public static SkyblockerConfig get() { -- cgit From 79ba1ed6fc133bacf64ee8e3a5d1454d1eadde2f Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Tue, 8 Aug 2023 20:28:24 -0400 Subject: Add Item Renaming --- .../skyblocker/config/SkyblockerConfig.java | 25 ++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/config') diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 8d633563..fac8055d 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -1,10 +1,15 @@ package me.xmrvizzy.skyblocker.config; +import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import me.shedaniel.autoconfig.AutoConfig; import me.shedaniel.autoconfig.ConfigData; import me.shedaniel.autoconfig.annotation.Config; import me.shedaniel.autoconfig.annotation.ConfigEntry; +import me.shedaniel.autoconfig.serializer.ConfigSerializer; import me.shedaniel.autoconfig.serializer.GsonConfigSerializer; import me.xmrvizzy.skyblocker.SkyblockerMod; import me.xmrvizzy.skyblocker.chat.ChatFilterResult; @@ -12,9 +17,11 @@ import me.xmrvizzy.skyblocker.utils.Scheduler; import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.minecraft.client.resource.language.I18n; +import net.minecraft.text.Text; import java.util.ArrayList; import java.util.List; +import java.util.Map; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal; @@ -188,6 +195,8 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Gui.Excluded public List lockedSlots = new ArrayList<>(); + + public Map customItemNames = new Object2ObjectLinkedOpenHashMap<>(); } public static class TabHudConf { @@ -530,10 +539,18 @@ public class SkyblockerConfig implements ConfigData { } /** - * Registers the config to AutoConfig and register commands to open the config screen. + * Registers the config to AutoConfig and registers commands to open the config screen. */ public static void init() { - AutoConfig.register(SkyblockerConfig.class, GsonConfigSerializer::new); + Gson gson = new GsonBuilder() + .setPrettyPrinting() + .registerTypeHierarchyAdapter(Text.class, new Text.Serializer()) + .registerTypeHierarchyAdapter(net.minecraft.text.Style.class, new net.minecraft.text.Style.Serializer()) + .create(); + + ConfigSerializer.Factory serializer = (cfg, cfgClass) -> new GsonConfigSerializer(cfg, cfgClass, gson); + + AutoConfig.register(SkyblockerConfig.class, serializer); ClientCommandRegistrationCallback.EVENT.register(((dispatcher, registryAccess) -> dispatcher.register(literal(SkyblockerMod.NAMESPACE).then(optionsLiteral("config")).then(optionsLiteral("options"))))); } @@ -551,4 +568,8 @@ public class SkyblockerConfig implements ConfigData { public static SkyblockerConfig get() { return AutoConfig.getConfigHolder(SkyblockerConfig.class).getConfig(); } + + public static void save() { + AutoConfig.getConfigHolder(SkyblockerConfig.class).save(); + } } -- cgit From a629801cc3ffa5913bc07af173e8a01673a70681 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Wed, 9 Aug 2023 20:01:18 -0400 Subject: Custom Armour Dye Colours --- .../me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/config') diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index fac8055d..7d44fecb 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -1,6 +1,7 @@ package me.xmrvizzy.skyblocker.config; -import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; +import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; +import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -17,11 +18,11 @@ import me.xmrvizzy.skyblocker.utils.Scheduler; import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.minecraft.client.resource.language.I18n; +import net.minecraft.text.Style; import net.minecraft.text.Text; import java.util.ArrayList; import java.util.List; -import java.util.Map; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal; @@ -196,7 +197,9 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Gui.Excluded public List lockedSlots = new ArrayList<>(); - public Map customItemNames = new Object2ObjectLinkedOpenHashMap<>(); + public Object2ObjectOpenHashMap customItemNames = new Object2ObjectOpenHashMap<>(); + + public Object2IntOpenHashMap customDyeColors = new Object2IntOpenHashMap<>(); } public static class TabHudConf { @@ -439,13 +442,13 @@ public class SkyblockerConfig implements ConfigData { public boolean enabled = true; @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) @ConfigEntry.Gui.Tooltip(count = 3) - public Style style = Style.SIMPLE; + public DwarvenHudStyle style = DwarvenHudStyle.SIMPLE; public boolean enableBackground = true; public int x = 10; public int y = 10; } - public enum Style { + public enum DwarvenHudStyle { SIMPLE, FANCY, CLASSIC; @@ -545,7 +548,7 @@ public class SkyblockerConfig implements ConfigData { Gson gson = new GsonBuilder() .setPrettyPrinting() .registerTypeHierarchyAdapter(Text.class, new Text.Serializer()) - .registerTypeHierarchyAdapter(net.minecraft.text.Style.class, new net.minecraft.text.Style.Serializer()) + .registerTypeHierarchyAdapter(Style.class, new Style.Serializer()) .create(); ConfigSerializer.Factory serializer = (cfg, cfgClass) -> new GsonConfigSerializer(cfg, cfgClass, gson); -- cgit From 16c6debb1cc90be5815cd188264b16ddf8b76f16 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Thu, 10 Aug 2023 10:55:45 +0800 Subject: Refactor CustomArmorDyeColors and CustomItemNames --- src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/config') diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 7d44fecb..75e6fdc5 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -551,7 +551,7 @@ public class SkyblockerConfig implements ConfigData { .registerTypeHierarchyAdapter(Style.class, new Style.Serializer()) .create(); - ConfigSerializer.Factory serializer = (cfg, cfgClass) -> new GsonConfigSerializer(cfg, cfgClass, gson); + ConfigSerializer.Factory serializer = (cfg, cfgClass) -> new GsonConfigSerializer<>(cfg, cfgClass, gson); AutoConfig.register(SkyblockerConfig.class, serializer); ClientCommandRegistrationCallback.EVENT.register(((dispatcher, registryAccess) -> dispatcher.register(literal(SkyblockerMod.NAMESPACE).then(optionsLiteral("config")).then(optionsLiteral("options"))))); -- cgit