From edd13667f2d5b80e8ad9945d7253aaaf0f5b5c5f Mon Sep 17 00:00:00 2001
From: Spencer <75862693+TacoMonkey11@users.noreply.github.com>
Date: Wed, 10 May 2023 20:20:44 -0400
Subject: Remove unused toastbuilader
---
.../me/xmrvizzy/skyblocker/utils/ToastBuilder.java | 34 ----------------------
1 file changed, 34 deletions(-)
delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java
(limited to 'src')
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java b/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java
deleted file mode 100644
index 7a0ad754..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/ToastBuilder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package me.xmrvizzy.skyblocker.utils;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.gui.DrawableHelper;
-import net.minecraft.client.render.GameRenderer;
-import net.minecraft.client.toast.Toast;
-import net.minecraft.client.toast.ToastManager;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.Text;
-
-@Environment(value= EnvType.CLIENT)
-public class ToastBuilder implements Toast {
- private final Text title;
- private final Text description;
-
- public ToastBuilder(Text title, Text description) {
- this.title = title;
- this.description = description;
- }
-
- @Override
- public Toast.Visibility draw(MatrixStack matrices, ToastManager manager, long startTime) {
- RenderSystem.setShader(GameRenderer::getPositionTexProgram);
- RenderSystem.setShaderTexture(0, TEXTURE);
- RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
-
- DrawableHelper.drawTexture(matrices, 0, 0, 0, 0, this.getWidth(), this.getHeight());
- manager.getClient().textRenderer.draw(matrices, title, 7.0f, 7.0f, -11534256);
- manager.getClient().textRenderer.draw(matrices, description, 7.0f, 18.0f, -16777216);
- return startTime >= 3000L ? Toast.Visibility.HIDE : Toast.Visibility.SHOW;
- }
-}
--
cgit
From d903fc93ac2d3dea2ce5e784bdfce97e37232d94 Mon Sep 17 00:00:00 2001
From: Spencer <75862693+TacoMonkey11@users.noreply.github.com>
Date: Wed, 10 May 2023 20:31:34 -0400
Subject: Remove update checker along with translations
---
.../xmrvizzy/skyblocker/SkyblockerInitializer.java | 2 -
.../xmrvizzy/skyblocker/utils/UpdateChecker.java | 67 ----------------------
.../resources/assets/skyblocker/lang/en_us.json | 5 --
.../resources/assets/skyblocker/lang/fr_fr.json | 5 --
.../resources/assets/skyblocker/lang/id_id.json | 1 -
.../resources/assets/skyblocker/lang/ja_JP.json | 5 --
.../resources/assets/skyblocker/lang/ko_KR.json | 5 --
.../resources/assets/skyblocker/lang/ru_ru.json | 4 --
.../resources/assets/skyblocker/lang/zh_cn.json | 5 --
9 files changed, 99 deletions(-)
delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/utils/UpdateChecker.java
(limited to 'src')
diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
index 3d713727..23c40ace 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
@@ -9,7 +9,6 @@ import me.xmrvizzy.skyblocker.skyblock.dwarven.DwarvenHud;
import me.xmrvizzy.skyblocker.skyblock.item.PriceInfoTooltip;
import me.xmrvizzy.skyblocker.skyblock.item.WikiLookup;
import me.xmrvizzy.skyblocker.skyblock.itemlist.ItemRegistry;
-import me.xmrvizzy.skyblocker.utils.UpdateChecker;
import net.fabricmc.api.ClientModInitializer;
public class SkyblockerInitializer implements ClientModInitializer {
@@ -23,7 +22,6 @@ public class SkyblockerInitializer implements ClientModInitializer {
StatsCommand.init();
DwarvenHud.init();
ChatMessageListener.init();
- UpdateChecker.init();
DiscordRPCManager.init();
}
}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/UpdateChecker.java b/src/main/java/me/xmrvizzy/skyblocker/utils/UpdateChecker.java
deleted file mode 100644
index a2809712..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/UpdateChecker.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package me.xmrvizzy.skyblocker.utils;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import me.xmrvizzy.skyblocker.SkyblockerMod;
-import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.ClickEvent;
-import net.minecraft.text.HoverEvent;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
-import org.spongepowered.asm.util.VersionNumber;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.util.concurrent.CompletableFuture;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class UpdateChecker {
- public static final Pattern pattern = Pattern.compile("v(.*)\\+.*");
- public static final Pattern localPattern = Pattern.compile("(.*)\\+.*");
- public static Matcher matcher;
- private static VersionNumber latestVersion = null;
- private static VersionNumber localVersion = null;
- public static void shouldUpdate(){
- if (!SkyblockerConfig.get().general.enableUpdateNotification) return;
- try {
- URI uri = new URI("https://api.modrinth.com/v2/project/skyblocker-liap/version");
- HttpRequest request = HttpRequest.newBuilder(uri).GET().build();
- CompletableFuture<HttpResponse<String>> response = HttpClient.newHttpClient().sendAsync(request, HttpResponse.BodyHandlers.ofString());
- response.thenAccept(httpResponse -> {
- JsonObject versionJson = new Gson().fromJson(httpResponse.body(), JsonElement.class).getAsJsonArray().get(0).getAsJsonObject();
- matcher = pattern.matcher(versionJson.get("version_number").getAsString());
- if (matcher.find()) {
- latestVersion = VersionNumber.parse(matcher.group(1));
- }
- matcher = localPattern.matcher(FabricLoader.getInstance().getModContainer(SkyblockerMod.NAMESPACE).get().getMetadata().getVersion().getFriendlyString());
- if (matcher.find()) {
- localVersion = VersionNumber.parse(matcher.group(1));
- }
- if (latestVersion != null && localVersion != null) {
- if (localVersion.compareTo(latestVersion) < 0) {
- MutableText linkMessage = Text.translatable("skyblocker.update.update_message");
- MutableText linkMessageEnding = Text.translatable("skyblocker.update.update_message_end");
- MutableText link = Text.translatable("skyblocker.update.update_link");
- MutableText hoverText = Text.translatable("skyblocker.update.hover_text");
- linkMessage.append(link.styled(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://modrinth.com/mod/skyblocker-liap/versions")).withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hoverText)))).append(linkMessageEnding);
-
- MinecraftClient.getInstance().player.sendMessage(linkMessage, false);
- }
- }
- });
- } catch (URISyntaxException e) {
- e.printStackTrace();
- }
- }
-
- public static void init(){
- SkyblockEvents.JOIN.register(UpdateChecker::shouldUpdate);
- }
-}
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index 0ff95ccc..d0ba073b 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -188,11 +188,6 @@
"text.autoconfig.skyblocker.option.messages.hideMana": "Hide Mana Consumption Messages from Action Bar",
"text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "Gives a better experience with FancyBar",
- "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2There is a new version available!",
- "skyblocker.update.update_link": " §2§nClick here§r",
- "skyblocker.update.update_message_end" : " §ato find out about latest features.",
- "skyblocker.update.hover_text": "Open Modrinth",
- "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "Update Notification",
"text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "Hide empty item tooltips in menus",
"skyblocker.api.got_key": "§b[§6Skyblocker§b] §2Automatically set your API key!"
diff --git a/src/main/resources/assets/skyblocker/lang/fr_fr.json b/src/main/resources/assets/skyblocker/lang/fr_fr.json
index 0aa85969..f1b48e9e 100644
--- a/src/main/resources/assets/skyblocker/lang/fr_fr.json
+++ b/src/main/resources/assets/skyblocker/lang/fr_fr.json
@@ -75,11 +75,6 @@
"text.autoconfig.skyblocker.option.messages.hideMana": "Cacher les messages de consommation de mana de la barre d'action",
"text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "Permet une meilleure expérience avec les barres",
- "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2Une nouvelle version est disponible !",
- "skyblocker.update.update_link": " §2§nCliquez ici§r",
- "skyblocker.update.update_message_end": " §apour découvrir les dernières fonctionnalités.",
- "skyblocker.update.hover_text": "Ouvrir Modrinth",
- "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "Notification de mise à jour",
"skyblocker.api.got_key": "§b[§6Skyblocker§b] §2Votre clé d'API a été automatiquement définie!"
}
\ No newline at end of file
diff --git a/src/main/resources/assets/skyblocker/lang/id_id.json b/src/main/resources/assets/skyblocker/lang/id_id.json
index 04257559..4a9696e6 100644
--- a/src/main/resources/assets/skyblocker/lang/id_id.json
+++ b/src/main/resources/assets/skyblocker/lang/id_id.json
@@ -29,6 +29,5 @@
"text.autoconfig.skyblocker.option.general.quicknav": "Navigasi Cepat",
"text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Aktifkan Navigasi Cepat",
"text.autoconfig.skyblocker.option.general.itemTooltip": "Keterangan Item",
- "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "Perbarui Notifikasi",
"skyblocker.api.got_key": "§b[§6Skyblocker§b] §2Setel API key anda secara otomatis!"
}
\ No newline at end of file
diff --git a/src/main/resources/assets/skyblocker/lang/ja_JP.json b/src/main/resources/assets/skyblocker/lang/ja_JP.json
index 954647c7..9692708f 100644
--- a/src/main/resources/assets/skyblocker/lang/ja_JP.json
+++ b/src/main/resources/assets/skyblocker/lang/ja_JP.json
@@ -65,10 +65,5 @@
"text.autoconfig.skyblocker.option.messages.hideAutopet": "Autopetのメッセージを非表示にする",
"text.autoconfig.skyblocker.option.messages.hideMana": "マナの使用表示をアクションバーから非表示にする",
"text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "FancyBarでより良くできます",
- "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2新しいバージョンがあります!",
- "skyblocker.update.update_link": " §2§nここをクリック§r",
- "skyblocker.update.update_message_end": " §a最新の機能を体験しましょう.",
- "skyblocker.update.hover_text": "Modrinthを開く",
- "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "アップデート通知",
"skyblocker.api.got_key": "§b[§6Skyblocker§b] §2あなたのAPI keyを設定しました!"
}
diff --git a/src/main/resources/assets/skyblocker/lang/ko_KR.json b/src/main/resources/assets/skyblocker/lang/ko_KR.json
index 93930cc1..b190b865 100644
--- a/src/main/resources/assets/skyblocker/lang/ko_KR.json
+++ b/src/main/resources/assets/skyblocker/lang/ko_KR.json
@@ -180,10 +180,5 @@
"text.autoconfig.skyblocker.option.messages.hideAutopet": "Autopet 메시지 가리기",
"text.autoconfig.skyblocker.option.messages.hideMana": "액션바에서 마나 사용 메시지 가리기",
"text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "FancyBar 로 더 나은 기능을 사용합니다",
- "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2새로운 버전이 사용 가능합니다!",
- "skyblocker.update.update_link": " §2§n여기§r",
- "skyblocker.update.update_message_end": " §a를 클릭하여 최신 기능에 대해 알아보세요.",
- "skyblocker.update.hover_text": "Modrinth 열기",
- "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "업데이트 알림",
"skyblocker.api.got_key": "§b[§6Skyblocker§b] §2자동으로 API 키를 설정했습니다!"
}
diff --git a/src/main/resources/assets/skyblocker/lang/ru_ru.json b/src/main/resources/assets/skyblocker/lang/ru_ru.json
index 693d2e8f..b1cf0c37 100644
--- a/src/main/resources/assets/skyblocker/lang/ru_ru.json
+++ b/src/main/resources/assets/skyblocker/lang/ru_ru.json
@@ -50,10 +50,6 @@
"text.autoconfig.skyblocker.option.general.itemList": "Список предметов",
"text.autoconfig.skyblocker.option.general.itemList.enableItemList": "Включено",
"text.autoconfig.skyblocker.option.messages.hideCombo": "Скрывать сообщения о комбо",
- "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2Доступна новая версия!",
- "skyblocker.update.update_message_end": " §aчтобы узнать об изменениях.",
- "skyblocker.update.hover_text": "Открыть Modrinth",
- "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "Оповещать об обновлениях",
"skyblocker.api.got_key": "§b[§6Skyblocker§b] §2Ключ API установлен автоматически!",
"key.wikiLookup": "Быстрый переход на вики",
"text.autoconfig.skyblocker.option.general.itemTooltip": "Описание предметов",
diff --git a/src/main/resources/assets/skyblocker/lang/zh_cn.json b/src/main/resources/assets/skyblocker/lang/zh_cn.json
index 3f4ccdc8..9b712096 100644
--- a/src/main/resources/assets/skyblocker/lang/zh_cn.json
+++ b/src/main/resources/assets/skyblocker/lang/zh_cn.json
@@ -95,11 +95,6 @@
"text.autoconfig.skyblocker.option.messages.hideAutopet": "隐藏自动宠物消息",
"text.autoconfig.skyblocker.option.messages.hideMana": "在动作栏中隐藏魔力消耗信息",
"text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "被已经提供了更好方案的属性条代替",
- "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2有新版本可用！",
- "skyblocker.update.update_link": " §2§n点击这里§r",
- "skyblocker.update.update_message_end": " §a来了解最新功能",
- "skyblocker.update.hover_text": "打开Modrinth",
- "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "更新通知",
"skyblocker.api.got_key": "§b[§6Skyblocker§b] §2自动设置你的API秘钥！",
"text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "NBT"
}
--
cgit
From 1ca1b63fd9f268618bba31389e9a691b3f02211d Mon Sep 17 00:00:00 2001
From: Spencer <75862693+TacoMonkey11@users.noreply.github.com>
Date: Wed, 10 May 2023 20:35:26 -0400
Subject: Remove unused API records and commands
---
.../xmrvizzy/skyblocker/SkyblockerInitializer.java | 2 -
.../skyblocker/skyblock/api/ApiKeyListener.java | 29 ----
.../skyblocker/skyblock/api/ProfileUtils.java | 107 ---------------
.../skyblocker/skyblock/api/StatsCommand.java | 29 ----
.../skyblock/api/records/Enchanting.java | 27 ----
.../skyblocker/skyblock/api/records/Farming.java | 30 -----
.../skyblocker/skyblock/api/records/Items.java | 52 --------
.../skyblock/api/records/PlayerProfiles.java | 147 ---------------------
.../skyblocker/skyblock/api/records/Slayer.java | 29 ----
.../skyblock/api/records/dungeons/Dungeons.java | 40 ------
.../skyblock/api/records/dungeons/Floor.java | 44 ------
.../skyblock/api/records/dungeons/Journals.java | 18 ---
.../skyblock/api/records/mining/Core.java | 41 ------
.../skyblock/api/records/mining/Mining.java | 18 ---
.../skyblock/api/records/misc/Burrows.java | 19 ---
.../skyblocker/skyblock/api/records/misc/Misc.java | 42 ------
16 files changed, 674 deletions(-)
delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ApiKeyListener.java
delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java
delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java
delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Enchanting.java
delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Farming.java
delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Items.java
delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java
delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Slayer.java
delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Dungeons.java
delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Floor.java
delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Journals.java
delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/mining/Core.java
delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/mining/Mining.java
delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/misc/Burrows.java
delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/misc/Misc.java
(limited to 'src')
diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
index 23c40ace..1e6477db 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java
@@ -4,7 +4,6 @@ import me.xmrvizzy.skyblocker.chat.ChatMessageListener;
import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
import me.xmrvizzy.skyblocker.discord.DiscordRPCManager;
import me.xmrvizzy.skyblocker.skyblock.HotbarSlotLock;
-import me.xmrvizzy.skyblocker.skyblock.api.StatsCommand;
import me.xmrvizzy.skyblocker.skyblock.dwarven.DwarvenHud;
import me.xmrvizzy.skyblocker.skyblock.item.PriceInfoTooltip;
import me.xmrvizzy.skyblocker.skyblock.item.WikiLookup;
@@ -19,7 +18,6 @@ public class SkyblockerInitializer implements ClientModInitializer {
PriceInfoTooltip.init();
WikiLookup.init();
ItemRegistry.init();
- StatsCommand.init();
DwarvenHud.init();
ChatMessageListener.init();
DiscordRPCManager.init();
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ApiKeyListener.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ApiKeyListener.java
deleted file mode 100644
index dec2835b..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ApiKeyListener.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.api;
-
-import me.shedaniel.autoconfig.AutoConfig;
-import me.xmrvizzy.skyblocker.chat.ChatFilterResult;
-import me.xmrvizzy.skyblocker.chat.ChatPatternListener;
-import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.Text;
-
-import java.util.regex.Matcher;
-
-public class ApiKeyListener extends ChatPatternListener {
- public ApiKeyListener() {
- super("^Your new API key is (.*)$");
- }
-
- @Override
- protected ChatFilterResult state() {
- return null;
- }
-
- @Override
- protected boolean onMatch(Text message, Matcher matcher) {
- SkyblockerConfig.get().general.apiKey = matcher.group(1);
- AutoConfig.getConfigHolder(SkyblockerConfig.class).save();
- MinecraftClient.getInstance().player.sendMessage(Text.translatable("skyblocker.api.got_key"), false);
- return false;
- }
-}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java
deleted file mode 100644
index dfa6f6dc..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.api;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
-import me.xmrvizzy.skyblocker.skyblock.api.records.PlayerProfiles;
-import me.xmrvizzy.skyblocker.skyblock.itemlist.ItemFixerUpper;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
-import net.minecraft.nbt.*;
-import net.minecraft.text.Text;
-
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-
-public class ProfileUtils {
- public static PlayerProfiles getProfiles(String name){
- try {
- URL url = new URL("https://sky.shiiyu.moe/api/v2/profile/" + name);
- InputStreamReader reader = new InputStreamReader(url.openStream());
- Gson gson = new GsonBuilder()
- .serializeNulls()
- .create();
- return gson.fromJson(reader, PlayerProfiles.class);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return null;
- }
-
- public static List<ItemStack> itemsFromApiInventory(me.xmrvizzy.skyblocker.skyblock.api.records.Items.Item[] items){
- List<ItemStack> inventory = new ArrayList<>();
- for (me.xmrvizzy.skyblocker.skyblock.api.records.Items.Item item : items){
- try{
- if (item.tag() != null){
- JsonObject obj = new Gson().fromJson(Files.readString(Path.of("./config/skyblocker/items-repo/items/" + item.tag().extraAttributes().id() + ".json")), JsonObject.class);
-
- NbtCompound root = new NbtCompound();
- root.put("Count", NbtByte.of(item.count()));
- root.put("id", NbtString.of(ItemFixerUpper.convertItemId(obj.get("itemid").getAsString(), obj.get("damage").getAsInt())));
- NbtCompound tag = new NbtCompound();
- root.put("tag", tag);
-
- if (item.tag().ench() != null){
- NbtList enchantments = new NbtList();
- enchantments.add(new NbtCompound());
- tag.put("Enchantments", enchantments);
- }
-
- NbtCompound extraAttributes = new NbtCompound();
- tag.put("ExtraAttributes", extraAttributes);
- extraAttributes.put("id", NbtString.of(item.tag().extraAttributes().id()));
- if (item.tag().extraAttributes().enchantments() != null){
- NbtCompound enchantments = new NbtCompound();
- extraAttributes.put("enchantments", enchantments);
- for (String enchant : item.tag().extraAttributes().enchantments().keySet()){
- enchantments.put(enchant, NbtInt.of(item.tag().extraAttributes().enchantments().get(enchant)));
- }
- }
-
- NbtCompound display = new NbtCompound();
- tag.put("display", display);
- display.put("Name", NbtString.of(Text.Serializer.toJson(Text.of(item.tag().display().name()))));
- if (item.tag().display().lore() != null){
- NbtList lore = new NbtList();
- display.put("Lore", lore);
- for (int i = 0; i < item.tag().display().lore().length; i++) {
- if (i < item.tag().display().lore().length - 1)
- lore.add(i, NbtString.of(Text.Serializer.toJson(Text.of(Arrays.stream(item.tag().display().lore()).toArray()[i].toString()))));
- }
- }
- if (item.tag().display().color() != null){
- display.put("color", NbtInt.of(item.tag().display().color()));
- }
-
- if (item.tag().skullOwner() != null){
- NbtCompound skullOwner = new NbtCompound();
- tag.put("SkullOwner", skullOwner);
- UUID uuid = UUID.fromString(item.tag().skullOwner().id());
- skullOwner.put("Id", NbtHelper.fromUuid(uuid));
- skullOwner.put("Name", NbtString.of(item.tag().extraAttributes().id()));
-
- NbtCompound properties = new NbtCompound();
- skullOwner.put("Properties", properties);
- NbtList textures = new NbtList();
- properties.put("textures", textures);
- NbtCompound texture = new NbtCompound();
- textures.add(texture);
- texture.put("Value", NbtString.of(item.tag().skullOwner().properties().textures()[0].get("Value")));
- }
- inventory.add(ItemStack.fromNbt(root));
- } else {
- inventory.add(Items.AIR.getDefaultStack());
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- return inventory;
- }
-}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java
deleted file mode 100644
index 3e848925..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.api;
-
-import com.google.gson.GsonBuilder;
-import com.mojang.brigadier.arguments.StringArgumentType;
-import me.xmrvizzy.skyblocker.skyblock.api.records.PlayerProfiles;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
-import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.ClickEvent;
-import net.minecraft.text.Text;
-
-public class StatsCommand {
- public static void init(){
- ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register(ClientCommandManager.literal("skyblocker")
- .then(ClientCommandManager.literal("debug")
- .then(ClientCommandManager.literal("stats").then(ClientCommandManager.argument("username", StringArgumentType.string())
- .executes(context -> {
- new Thread(() -> {
- PlayerProfiles playerProfiles = ProfileUtils.getProfiles(StringArgumentType.getString(context, "username"));
- for (String profileId : playerProfiles.profiles().keySet()){
- MinecraftClient.getInstance().player.sendMessage(Text.literal(playerProfiles.profiles().get(profileId).cuteName())
- .styled(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, new GsonBuilder().serializeNulls().setPrettyPrinting().create().toJson(playerProfiles.profiles().get(profileId))))), false);
- }
- }).start();
- return 1;
- }))))));
-
- }
-}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Enchanting.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Enchanting.java
deleted file mode 100644
index 42538e42..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Enchanting.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.api.records;
-
-import com.google.gson.annotations.SerializedName;
-import me.xmrvizzy.skyblocker.skyblock.api.records.PlayerProfiles;
-
-import java.util.HashMap;
-
-public record Enchanting(boolean experimented, HashMap<String, Experiment> experiments){
- public record Experiment(
- String name,
- Stats stats,
- Tier[] tiers
-
- ){
- public record Stats(
- @SerializedName("last_attempt") PlayerProfiles.PlayerProfile.Data.LastUpdated lastAttempt,
- @SerializedName("bonus_clicks") int bonusClicks,
- @SerializedName("last_claimed") PlayerProfiles.PlayerProfile.Data.LastUpdated lastClaimed
- ){}
- public record Tier(
- String name,
- int attempts,
- int claims,
- @SerializedName("best_score") int bestScore
- ){}
- }
-}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Farming.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Farming.java
deleted file mode 100644
index 87325819..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Farming.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.api.records;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.util.HashMap;
-
-public record Farming(
- boolean talked,
- @SerializedName("current_badges") Badges currentBadges,
- @SerializedName("total_badges") Badges totalBadges,
- Perks perks,
- @SerializedName("unique_golds") int unique_golds,
- HashMap<String, Crop> crops,
- Contests contests
-){
- public record Badges(int bronze, int silver, int gold){}
- public record Perks(@SerializedName("double_drops") int doubleDrops, @SerializedName("farming_level_cap") int farmingLevelCap){}
- public record Crop(
- String name,
- boolean attended,
- @SerializedName("unique_gold") boolean uniqueGold,
- int contests,
- @SerializedName("personal_best") int personalBest,
- Badges badges
- ){}
- public record Contests(@SerializedName("attended_contests") int attendedContests, @SerializedName("all_contests") Contest[] allContests){}
- public record Contest(String date, String crop, int collected, boolean claimed, String medal, Placing placing){
- public record Placing(int position, double percentage){}
- }
-}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Items.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Items.java
deleted file mode 100644
index 28a4e4af..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Items.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.api.records;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.util.HashMap;
-
-public record Items(
- Item[] armor,
- Item[][] wardrobe,
- Item[] inventory,
- Item[] enderchest,
- @SerializedName("talisman_bag") Item[] talismanBag,
- @SerializedName("fishing_bag") Item[] fishingBag,
- Item[] quiver,
- @SerializedName("potion_bag") Item[] potionBag,
- @SerializedName("personal_vault") Item[] personalVault,
- Item[] storage,
- Item[] weapons,
- Item[] hoes,
- Item[] pickaxes,
- Item[] rods,
- @SerializedName("highest_rarity_sword") Item highestRaritySword,
- @SerializedName("highest_rarity_bow") Item highestRarityBow,
- @SerializedName("highest_rarity_rod") Item highestRarityRod,
- @SerializedName("armor_set_rarity") String armorSetRarity
-){
- public record Item(
- @SerializedName("Count") byte count,
- int damage,
- Tag tag,
- boolean isInactive,
- boolean inBackpack,
- Item[] containsItems
- ){
- public record Tag(
- @SerializedName("ExtraAttributes") ExtraAttributes extraAttributes,
- Display display,
- @SerializedName("SkullOwner") SkullOwner skullOwner,
- Enchant[] ench
- ){
- public record ExtraAttributes(String id, HashMap<String, Integer> enchantments){}
- public record Display(@SerializedName("Name") String name, @SerializedName("Lore") String[] lore, Integer color){}
- public record SkullOwner(
- @SerializedName("Id") String id,
- @SerializedName("Properties") Properties properties
- ){
- public record Properties(HashMap<String, String>[] textures){}
- }
- public record Enchant(int lvl, int id){}
- }
- }
-}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java
deleted file mode 100644
index d215c589..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.api.records;
-
-import com.google.gson.annotations.SerializedName;
-import me.xmrvizzy.skyblocker.skyblock.api.records.dungeons.Dungeons;
-import me.xmrvizzy.skyblocker.skyblock.api.records.mining.Mining;
-import me.xmrvizzy.skyblocker.skyblock.api.records.misc.Misc;
-
-import java.util.HashMap;
-
-public record PlayerProfiles(HashMap<String, PlayerProfile> profiles) {
- public record PlayerProfile(
- @SerializedName("profile_id") String profileId,
- @SerializedName("cute_name") String cuteName,
- boolean current,
- @SerializedName("last_save") long lastSave,
- Items items,
- Data data
-
- ){
- public record Data(
- Stats stats,
- @SerializedName("fairy_bonus") Stats fairyBonus,
- @SerializedName("fairy_souls") FairySouls fairySouls,
- @SerializedName("levels") HashMap<String, Level> skills,
- @SerializedName("average_level") double averageLevel,
- @SerializedName("average_level_no_progress") double trueAverageLevel,
- @SerializedName("total_skill_xp") double totalSkillXp,
- @SerializedName("skill_bonus") HashMap<String, Stats> skillBonus,
- @SerializedName("average_level_rank") double averageLevelRank,
- @SerializedName("slayer_coins_spent") HashMap<String, Integer> slayerCoinsSpent,
- @SerializedName("slayer_bonus") HashMap<String, Stats> slayerBonus,
- HashMap<String, Slayer> slayers,
- @SerializedName("slayer_xp") int slayerXp,
- @SerializedName("display_name") String username,
- String uuid,
- double bank,
- double purse,
- @SerializedName("current_area") String currentArea,
- Entity[] kills,
- Entity[] deaths,
- @SerializedName("wardrobe_equipped_slot") int wardrobeEquippedSlot,
- @SerializedName("skin_data") SkinData skinData,
- Profile profile,
- Member[] members,
- Minion[] minions,
- @SerializedName("minion_slots") MinionSlots minionSlots,
- HashMap<String, Collection> collections,
- Social social,
- Dungeons dungeons,
- Fishing fishing,
- Farming farming,
- Enchanting Enchanting,
- Mining mining,
- Misc misc,
- @SerializedName("auctions_bought") Auctions auctionsBought,
- @SerializedName("auctions_sold") Auctions auctionsSold,
- @SerializedName("last_updated") LastUpdated lastUpdated,
- @SerializedName("first_join") LastUpdated firstJoin
-
- ){
- public record Stats(
- int health,
- int defense,
- @SerializedName("effective_health") int effectiveHealth,
- int strength,
- int speed,
- @SerializedName("crit_chance") double critChance,
- @SerializedName("crit_damage") int critDamage,
- @SerializedName("bonus_attack_speed") int bonusAttackSpeed,
- int intelligence,
- @SerializedName("sea_creature_chance") int seaCreatureChance,
- @SerializedName("magic_find") int magicFind,
- @SerializedName("pet_luck") int petLuck,
- int ferocity,
- @SerializedName("ability_damage") double abilityDamage,
- @SerializedName("mining_speed") int miningSpeed,
- @SerializedName("mining_fortune") int miningFortune,
- @SerializedName("farming_fortune") int farmingFortune,
- @SerializedName("foraging_fortune") int foragingFortune,
- int pristine,
- int damage,
- @SerializedName("damage_increase") double damageIncrease
- ){}
- public record FairySouls(int collected, int total, double progress){}
- public record Level(
- Double xp,
- Integer level,
- Integer maxLevel,
- Long xpCurrent,
- Integer xpForNext,
- Double progress,
- Integer levelCap,
- Integer uncappedLevel,
- Integer rank,
- Double levelWithProgress,
- Double unlockableLevelWithProgress
- ){}
- public record Entity(String type, String entityId, int amount, String entityName){}
- public record SkinData(@SerializedName("skinurl") String skinUrl, String model){}
- public record Profile(String gamemode){}
- public record Member(
- String uuid,
- @SerializedName("display_name") String displayName,
- @SerializedName("last_updated") LastUpdated lastUpdated,
- @SerializedName("skin_data") SkinData skinData
- ){}
- public record LastUpdated(long unix, String text){}
- public record Minion(
- String id,
- String type,
- int tiers,
- String name,
- Integer[] levels
-
- ){}
- public record MinionSlots(int currentSlots, int toNext, int toNextSlot){}
- public record Collection(int tier, long amount, long totalAmount, UserAmount[] amounts){
- public record UserAmount(String username, long amount){}
- }
- public record Social(
- @SerializedName("DISCORD") String discord,
- @SerializedName("HYPIXEL") String hypixel,
- @SerializedName("TWITTER") String twitter,
- @SerializedName("YOUTUBE") String youtube,
- @SerializedName("INSTAGRAM") String instagram,
- @SerializedName("TWITCH") String twitch
- ){}
- public record Fishing(
- int total,
- int treasure,
- @SerializedName("treasure_large") int treasureLarge,
- @SerializedName("shredder_fished") int shredderFished,
- @SerializedName("shredder_bait") int shredderBait
- ){}
- public record Auctions(
- int uncommon,
- int rare,
- int epic,
- int common,
- int legendary,
- int special
- ){}
- }
-
- }
-}
-
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Slayer.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Slayer.java
deleted file mode 100644
index 77c73b0c..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/Slayer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.api.records;
-
-import com.google.gson.annotations.SerializedName;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.HashMap;
-
-public record Slayer(
- PlayerProfiles.PlayerProfile.Data.Level level,
- Kills kills,
- @SerializedName("claimed_levels") ClaimedLevels claimedLevels,
- int xp,
- @SerializedName("boss_kills_tier_0") int bossKillsTier0,
- @SerializedName("boss_kills_tier_1") int bossKillsTier1,
- @SerializedName("boss_kills_tier_2") int bossKillsTier2,
- @SerializedName("boss_kills_tier_3") int bossKillsTier3
-){
- public record Kills(@Nullable HashMap<String, Integer> kills){}
- public record ClaimedLevels(
- @SerializedName("level_1") boolean level1,
- @SerializedName("level_2") boolean level2,
- @SerializedName("level_3") boolean level3,
- @SerializedName("level_4") boolean level4,
- @SerializedName("level_5") boolean level5,
- @SerializedName("level_6") boolean level6,
- @SerializedName("level_7_special") boolean level7
- ){}
-
-}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Dungeons.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Dungeons.java
deleted file mode 100644
index 64c4c99c..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Dungeons.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.api.records.dungeons;
-
-import com.google.gson.annotations.SerializedName;
-import me.xmrvizzy.skyblocker.skyblock.api.records.PlayerProfiles;
-
-import java.util.HashMap;
-
-public record Dungeons(
- Dungeon catacombs,
- @SerializedName("master_catacombs") Dungeon masterCatacombs,
- HashMap<String, Class> classes,
- @SerializedName("used_classes") boolean usedClasses,
- @SerializedName("selected_class") String selectedClass,
- @SerializedName("secrets_found") int secretsFound,
- HashMap<String, Integer> essence,
- @SerializedName("unlocked_collections") boolean unlockedCollections,
- @SerializedName("boss_collections") HashMap<String, Collection> bossCollections,
- Journals journals
-
-){
- public record Dungeon(
- String id,
- boolean visited,
- PlayerProfiles.PlayerProfile.Data.Level level,
- @SerializedName("highest_floor") String highestFloor,
- HashMap<Integer, Floor> floors
-
- ){}
- public record Collection(
- String name,
- String texture,
- int tier,
- boolean maxed,
- int killed,
- HashMap<String, Integer> floors,
- int unclaimed,
- String[] claimed
- ){}
- public record Class(PlayerProfiles.PlayerProfile.Data.Level experience, boolean current){}
-}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Floor.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Floor.java
deleted file mode 100644
index 8f5a9790..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Floor.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.api.records.dungeons;
-
-import com.google.gson.annotations.SerializedName;
-
-public record Floor(
- String name,
- Stats stats,
- @SerializedName("most_damage") MostDamage mostDamage,
- Bonuses bonuses
-
-){
- public record Stats(
- @SerializedName("times_played") int timesPlayed,
- @SerializedName("best_score") int bestScore,
- @SerializedName("mobs_killed") int mobsKilled,
- @SerializedName("most_mobs_killed") int mostMobsKilled,
- @SerializedName("most_healing") double mostHealing,
- @SerializedName("tier_completions") int tierCompletions,
- @SerializedName("fastest_time") long fastestTime,
- @SerializedName("watcher_kills") int watcherKills,
- @SerializedName("best_runs") Run[] bestRuns
- ){}
- public record MostDamage(
- @SerializedName("class") String classUsed,
- @SerializedName("value") double damage
- ){}
- public record Run(
- long timestamp,
- @SerializedName("score_exploration") int scoreExploration,
- @SerializedName("score_speed") int scoreSpeed,
- @SerializedName("score_skill") int scoreSkill,
- @SerializedName("score_bonus") int scoreBonus,
- @SerializedName("dungeon_class") int dungeonClass,
- String[] teammates,
- @SerializedName("elapsed_time") long elapsedTime,
- @SerializedName("damaged_dealt") int damageDealt,
- int deaths,
- @SerializedName("mobs_killed") int mobsKilled,
- @SerializedName("secrets_found") int secretsFound,
- @SerializedName("damage_mitigated") double damageMitigated,
- @SerializedName("ally_healing") int allyHealing
- ){}
- public record Bonuses(@SerializedName("item_boost") int itemBoost){}
-}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Journals.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Journals.java
deleted file mode 100644
index a9553fd3..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/dungeons/Journals.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.api.records.dungeons;
-
-import com.google.gson.annotations.SerializedName;
-
-public record Journals(
- @SerializedName("pages_completed") int pagesCompleted,
- @SerializedName("journals_completed") int journalsCompleted,
- @SerializedName("total_pages") Integer totalPages,
- boolean maxed,
- @SerializedName("journal_entries") Entry[] journalEntries
-
-){
- public record Entry(
- String name,
- @SerializedName("pages_collected") int pagesCollected,
- @SerializedName("total_pages") Integer totalPages
- ){}
-}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/mining/Core.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/mining/Core.java
deleted file mode 100644
index 305b9c35..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/mining/Core.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.api.records.mining;
-
-import com.google.gson.annotations.SerializedName;
-import me.xmrvizzy.skyblocker.skyblock.api.records.PlayerProfiles;
-
-import java.util.HashMap;
-
-public record Core(
- PlayerProfiles.PlayerProfile.Data.Level tier,
- Spent tokens,
- @SerializedName("selected_pickaxe_ability") String selectedMiningAbility,
- HashMap<String, Spent> powder,
- @SerializedName("crystal_nucleus") Nucleus crystalNucleus,
- @SerializedName("daily_ores") DailyOres dailyOres,
- @SerializedName("hotm_last_reset") long hotmLastReset,
- @SerializedName("crystal_hollows_last_access") long crystalHollowsLastAccess
-){
- public record Spent(int total, int spent, int available){}
- public record Nucleus(
- @SerializedName("times_completed") int timesCompleted,
- HashMap<String, Crystal> crystals,
- Goblin goblin
- ){
- public record Crystal(
- String state,
- @SerializedName("total_placed") int totalPlaced,
- @SerializedName("total_found") int totalFound
- ){}
- public record Goblin(
- @SerializedName("king_quest_active") boolean kingQuestActive,
- @SerializedName("king_quest_completed") boolean kingQuestCompleted
- ){}
- }
- public record DailyOres(
- int mined,
- int day,
- @SerializedName("daily_ores") HashMap<String, Ore> dailyOres
- ){
- public record Ore(int day, int count){}
- }
-}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/mining/Mining.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/mining/Mining.java
deleted file mode 100644
index d6f52fe4..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/mining/Mining.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.api.records.mining;
-
-public record Mining(
- Commissions commissions,
- Forge forge,
- Core core
-){
- public record Forge(Process[] processes){
- public record Process(
- String id,
- int slot,
- long timeFinished,
- String timeFinishedText,
- String name
- ){}
- }
- public record Commissions(int milestone){}
-}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/misc/Burrows.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/misc/Burrows.java
deleted file mode 100644
index 2e3d55d7..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/misc/Burrows.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.api.records.misc;
-
-import com.google.gson.annotations.SerializedName;
-
-public record Burrows(
- @SerializedName("dug_next") Rarities dugNext,
- @SerializedName("dug_combat") Rarities dugCombat,
- @SerializedName("dug_treasure") Rarities dugTreasure,
- @SerializedName("chains_complete") Rarities chainsComplete
-){
- public record Rarities(
- int total,
- @SerializedName("null") int common,
- int uncommon,
- int rare,
- int epic,
- int legendary
- ){}
-}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/misc/Misc.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/misc/Misc.java
deleted file mode 100644
index f0bad737..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/misc/Misc.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package me.xmrvizzy.skyblocker.skyblock.api.records.misc;
-
-import com.google.gson.annotations.SerializedName;
-
-public record Misc(
- Milestones milestones,
- Gifts gifts,
- Winter winter,
- Dragons dragons,
- Protector protector,
- Damage damage,
- Burrows burrows,
- ProfileUpgrades profileUpgrades
-){
- public record Milestones(
- @SerializedName("ores_mined") int oresMined,
- @SerializedName("sea_creatures_killed") int seaCreaturesKilled
- ){}
- public record Gifts(@SerializedName("gifts_given") int giftsGiven){}
- public record Winter(
- @SerializedName("most_winter_snowballs_hit") int mostWinterSnowballsHit,
- @SerializedName("most_winter_damage_dealt") int mostWinterDamageDealt,
- @SerializedName("most_winter_magma_damage_dealt") int mostWinterMagmaDamageDealt
- ){}
- public record Dragons(
- @SerializedName("ender_crystals_destroyed") int enderCrystalsDestroyed,
- @SerializedName("last_hits") int lastHits,
- @SerializedName("deaths") int deaths
- ){}
- public record Protector(
- @SerializedName("last_hits") int lastHits,
- int deaths
- ){}
- public record Damage(@SerializedName("highest_critical_damage") double highestCriticalDamage){}
- public record ProfileUpgrades(
- @SerializedName("island_size") int islandSize,
- @SerializedName("minion_slots") int minionSlots,
- @SerializedName("guest_count") int guestCount,
- @SerializedName("coop_slots") int coopSlots,
- @SerializedName("coins_allowance") int coinsAllowance
- ){}
-}
--
cgit
From 6618004b1cb178db735f1ade83ac429f958e0e20 Mon Sep 17 00:00:00 2001
From: Spencer <75862693+TacoMonkey11@users.noreply.github.com>
Date: Wed, 10 May 2023 20:38:23 -0400
Subject: Remove api-key translations and listener reference
---
src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java | 4 +---
src/main/resources/assets/skyblocker/lang/en_us.json | 4 +---
src/main/resources/assets/skyblocker/lang/fr_fr.json | 5 +----
src/main/resources/assets/skyblocker/lang/id_id.json | 1 -
src/main/resources/assets/skyblocker/lang/ja_JP.json | 3 +--
src/main/resources/assets/skyblocker/lang/ko_KR.json | 1 -
src/main/resources/assets/skyblocker/lang/ru_ru.json | 2 --
src/main/resources/assets/skyblocker/lang/zh_cn.json | 1 -
8 files changed, 4 insertions(+), 17 deletions(-)
(limited to 'src')
diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java
index 9ee87f2b..a32123e0 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java
@@ -1,14 +1,13 @@
package me.xmrvizzy.skyblocker.chat;
import me.xmrvizzy.skyblocker.chat.filters.*;
-import me.xmrvizzy.skyblocker.skyblock.api.ApiKeyListener;
import me.xmrvizzy.skyblocker.skyblock.barn.HungryHiker;
+import me.xmrvizzy.skyblocker.skyblock.barn.TreasureHunter;
import me.xmrvizzy.skyblocker.skyblock.dungeon.Reparty;
import me.xmrvizzy.skyblocker.skyblock.dungeon.ThreeWeirdos;
import me.xmrvizzy.skyblocker.skyblock.dungeon.Trivia;
import me.xmrvizzy.skyblocker.skyblock.dwarven.Fetchur;
import me.xmrvizzy.skyblocker.skyblock.dwarven.Puzzler;
-import me.xmrvizzy.skyblocker.skyblock.barn.TreasureHunter;
import net.fabricmc.fabric.api.event.Event;
import net.fabricmc.fabric.api.event.EventFactory;
import net.minecraft.text.Text;
@@ -26,7 +25,6 @@ public interface ChatMessageListener {
static void init() {
ChatMessageListener[] listeners = new ChatMessageListener[]{
// Features
- new ApiKeyListener(),
new Fetchur(),
new Puzzler(),
new Reparty(),
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index d0ba073b..b4e320aa 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -188,7 +188,5 @@
"text.autoconfig.skyblocker.option.messages.hideMana": "Hide Mana Consumption Messages from Action Bar",
"text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "Gives a better experience with FancyBar",
- "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "Hide empty item tooltips in menus",
-
- "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2Automatically set your API key!"
+ "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "Hide empty item tooltips in menus"
}
diff --git a/src/main/resources/assets/skyblocker/lang/fr_fr.json b/src/main/resources/assets/skyblocker/lang/fr_fr.json
index f1b48e9e..a4fe390d 100644
--- a/src/main/resources/assets/skyblocker/lang/fr_fr.json
+++ b/src/main/resources/assets/skyblocker/lang/fr_fr.json
@@ -73,8 +73,5 @@
"text.autoconfig.skyblocker.option.messages.hideCombo": "Cacher les messages de combo",
"text.autoconfig.skyblocker.option.messages.hideAutopet": "Cacher les messages de l'auto-familier",
"text.autoconfig.skyblocker.option.messages.hideMana": "Cacher les messages de consommation de mana de la barre d'action",
- "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "Permet une meilleure expérience avec les barres",
-
-
- "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2Votre clé d'API a été automatiquement définie!"
+ "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "Permet une meilleure expérience avec les barres"
}
\ No newline at end of file
diff --git a/src/main/resources/assets/skyblocker/lang/id_id.json b/src/main/resources/assets/skyblocker/lang/id_id.json
index 4a9696e6..67dc88f1 100644
--- a/src/main/resources/assets/skyblocker/lang/id_id.json
+++ b/src/main/resources/assets/skyblocker/lang/id_id.json
@@ -29,5 +29,4 @@
"text.autoconfig.skyblocker.option.general.quicknav": "Navigasi Cepat",
"text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Aktifkan Navigasi Cepat",
"text.autoconfig.skyblocker.option.general.itemTooltip": "Keterangan Item",
- "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2Setel API key anda secara otomatis!"
}
\ No newline at end of file
diff --git a/src/main/resources/assets/skyblocker/lang/ja_JP.json b/src/main/resources/assets/skyblocker/lang/ja_JP.json
index 9692708f..101da288 100644
--- a/src/main/resources/assets/skyblocker/lang/ja_JP.json
+++ b/src/main/resources/assets/skyblocker/lang/ja_JP.json
@@ -64,6 +64,5 @@
"text.autoconfig.skyblocker.option.messages.hideCombo": "Comboのメッセージを非表示にする",
"text.autoconfig.skyblocker.option.messages.hideAutopet": "Autopetのメッセージを非表示にする",
"text.autoconfig.skyblocker.option.messages.hideMana": "マナの使用表示をアクションバーから非表示にする",
- "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "FancyBarでより良くできます",
- "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2あなたのAPI keyを設定しました!"
+ "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "FancyBarでより良くできます"
}
diff --git a/src/main/resources/assets/skyblocker/lang/ko_KR.json b/src/main/resources/assets/skyblocker/lang/ko_KR.json
index b190b865..ac6703e2 100644
--- a/src/main/resources/assets/skyblocker/lang/ko_KR.json
+++ b/src/main/resources/assets/skyblocker/lang/ko_KR.json
@@ -180,5 +180,4 @@
"text.autoconfig.skyblocker.option.messages.hideAutopet": "Autopet 메시지 가리기",
"text.autoconfig.skyblocker.option.messages.hideMana": "액션바에서 마나 사용 메시지 가리기",
"text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "FancyBar 로 더 나은 기능을 사용합니다",
- "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2자동으로 API 키를 설정했습니다!"
}
diff --git a/src/main/resources/assets/skyblocker/lang/ru_ru.json b/src/main/resources/assets/skyblocker/lang/ru_ru.json
index b1cf0c37..6fd6d329 100644
--- a/src/main/resources/assets/skyblocker/lang/ru_ru.json
+++ b/src/main/resources/assets/skyblocker/lang/ru_ru.json
@@ -32,7 +32,6 @@
"text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "Решать начинается с",
"skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b] §cИнформация о цене предмета обновится через менее чем 60 секунд. Если нет, проверьте latest.log.",
"text.autoconfig.skyblocker.option.messages.hideTeleportPad": "Скрывать сообщения телепортаторов",
- "skyblocker.update.update_link": " §2§nНажми,§r",
"text.autoconfig.skyblocker.option.general.quicknav": "Кнопки быстрого доступа",
"text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Включено",
"text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "Показать средние цены на BIN",
@@ -50,7 +49,6 @@
"text.autoconfig.skyblocker.option.general.itemList": "Список предметов",
"text.autoconfig.skyblocker.option.general.itemList.enableItemList": "Включено",
"text.autoconfig.skyblocker.option.messages.hideCombo": "Скрывать сообщения о комбо",
- "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2Ключ API установлен автоматически!",
"key.wikiLookup": "Быстрый переход на вики",
"text.autoconfig.skyblocker.option.general.itemTooltip": "Описание предметов",
"text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "Показать цены у NPC"
diff --git a/src/main/resources/assets/skyblocker/lang/zh_cn.json b/src/main/resources/assets/skyblocker/lang/zh_cn.json
index 9b712096..78815a12 100644
--- a/src/main/resources/assets/skyblocker/lang/zh_cn.json
+++ b/src/main/resources/assets/skyblocker/lang/zh_cn.json
@@ -95,6 +95,5 @@
"text.autoconfig.skyblocker.option.messages.hideAutopet": "隐藏自动宠物消息",
"text.autoconfig.skyblocker.option.messages.hideMana": "在动作栏中隐藏魔力消耗信息",
"text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "被已经提供了更好方案的属性条代替",
- "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2自动设置你的API秘钥！",
"text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "NBT"
}
--
cgit
From 80a57fa12f23b31552fe75a98c8708288e6354df Mon Sep 17 00:00:00 2001
From: Spencer <spenceralj@gmail.com>
Date: Mon, 10 Jul 2023 18:17:08 -0400
Subject: Final touch ups
---
src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java | 3 ---
src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 1 -
2 files changed, 4 deletions(-)
(limited to 'src')
diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
index 4688d90f..cc712405 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
@@ -7,7 +7,6 @@ import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
import me.xmrvizzy.skyblocker.discord.DiscordRPCManager;
import me.xmrvizzy.skyblocker.gui.ContainerSolverManager;
import me.xmrvizzy.skyblocker.skyblock.*;
-import me.xmrvizzy.skyblocker.skyblock.api.StatsCommand;
import me.xmrvizzy.skyblocker.skyblock.dungeon.DungeonBlaze;
import me.xmrvizzy.skyblocker.skyblock.dungeon.DungeonMap;
import me.xmrvizzy.skyblocker.skyblock.dungeon.LividColor;
@@ -74,10 +73,8 @@ public class SkyblockerMod implements ClientModInitializer {
NEURepo.init();
BackpackPreview.init();
QuickNav.init();
- StatsCommand.init();
DwarvenHud.init();
ChatMessageListener.init();
- UpdateChecker.init();
DiscordRPCManager.init();
LividColor.init();
FishingHelper.init();
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 7da9979a..bd616c2c 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -134,7 +134,6 @@ public class SkyblockerConfig implements ConfigData {
}
public static class General {
- public boolean enableUpdateNotification = true;
public boolean acceptReparty = true;
public boolean backpackPreviewWithoutShift = false;
public boolean hideEmptyTooltips = true;
--
cgit