From 1c26538ae79739edd6ae87e310c6bcaec2885a02 Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Tue, 8 Mar 2022 19:23:49 +0100 Subject: update to 1.18.2 --- src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java | 2 +- src/main/resources/fabric.mod.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main') diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java index cba87f48..b3de4850 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java @@ -47,7 +47,7 @@ public abstract class HandledScreenMixin extends Screen { @Inject(at = @At("HEAD"), method = "keyPressed", cancellable = true) public void keyPressed(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable cir) { - if (keyCode != 256 && !MinecraftClient.getInstance().options.keyInventory.matchesKey(keyCode, scanCode)){ + if (keyCode != 256 && !MinecraftClient.getInstance().options.inventoryKey.matchesKey(keyCode, scanCode)){ if (WikiLookup.wikiLookup.matchesKey(keyCode, scanCode)) WikiLookup.openWiki(focusedSlot); } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index fa04da47..cf8c2ab8 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -5,7 +5,7 @@ "name": "Skyblocker", "description": "Hypixel Skyblock Mod", "authors": ["xMrVizzy", "d3dx9", "LifeIsAParadox"], - "contributors": ["ExternalTime", "Zailer43", "TacoMonkey", "KonaeAkira"], + "contributors": ["ExternalTime", "Zailer43", "TacoMonkey", "KonaeAkira", "Fix3dll"], "contact": { "homepage": "https://hysky.de", "sources": "https://github.com/LifeIsAParadox/Skyblocker", @@ -26,10 +26,10 @@ "skyblocker.mixins.json" ], "depends": { - "fabricloader": ">=0.12.11", + "fabricloader": ">=0.13.3", "fabric": "*", "cloth-config2": "*", - "minecraft": ["1.18.x","1.17.x"] + "minecraft": ["1.18.x"] }, "custom": { "modmenu": { -- cgit From 258bcb8cffd2b903af631e4450495a03ec5b6c77 Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Tue, 8 Mar 2022 19:48:09 +0100 Subject: migrate to slf4j --- build.gradle | 6 +----- .../me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java | 14 +++++++------- .../xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java | 5 ++++- .../skyblock/dungeon/terminal/ColorTerminal.java | 6 +++--- .../skyblocker/skyblock/item/PriceInfoTooltip.java | 14 ++++++++------ src/main/java/me/xmrvizzy/skyblocker/utils/Events.java | 6 +++--- 6 files changed, 26 insertions(+), 25 deletions(-) (limited to 'src/main') diff --git a/build.gradle b/build.gradle index 18643dfe..ec574060 100644 --- a/build.gradle +++ b/build.gradle @@ -56,13 +56,9 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - // https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit + // https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit used pull data from the NEU item repo include(implementation("org.eclipse.jgit:org.eclipse.jgit:6.0.0.202111291000-r")) - // https://mvnrepository.com/artifact/org.slf4j/slf4j-api - include(implementation("org.slf4j:slf4j-api:1.7.28")) - - //DiscordIPC + Libraries so it works on unix systems modImplementation ("com.jagrosh:DiscordIPC:0.5"){ exclude module: "slf4j-api" diff --git a/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java b/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java index efbc3e56..2b81a1a0 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java +++ b/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java @@ -17,7 +17,7 @@ public class DiscordRPCManager implements IPCListener{ public static long startTimestamp; public static IPCClient client; public boolean isConnected; - public static final Logger logger = LoggerFactory.getLogger("Skyblocker DiscordRPC"); + private static final Logger LOGGER = LoggerFactory.getLogger(DiscordRPCManager.class.getName()); public static DecimalFormat dFormat = new DecimalFormat("###,###.##"); public int cycleCount = 0; @@ -34,17 +34,17 @@ public class DiscordRPCManager implements IPCListener{ public void start(){ try { - logger.info("Starting..."); + LOGGER.info("[Skyblocker DiscordRPC] Starting..."); startTimestamp = OffsetDateTime.now().toEpochSecond(); client = new IPCClient(934607927837356052L); client.setListener(this); try { client.connect(); } catch (Exception e) { - logger.warn("Failed to connect: " + e.getMessage()); + LOGGER.warn("Failed to connect: " + e.getMessage()); } } catch (Throwable ex) { - logger.error("unexpected error occurred while trying to start..."); + LOGGER.error("[Skyblocker DiscordRPC] unexpected error occurred while trying to start..."); ex.printStackTrace(); } } @@ -79,7 +79,7 @@ public class DiscordRPCManager implements IPCListener{ public void stop(){ if (client != null && client.getStatus() == PipeStatus.CONNECTED) { - logger.info("Closing..."); + LOGGER.info("Closing..."); isConnected = false; client.close(); client = null; @@ -88,13 +88,13 @@ public class DiscordRPCManager implements IPCListener{ @Override public void onReady(IPCClient client) { - logger.info("Started!"); + LOGGER.info("Started!"); isConnected = true; } @Override public void onClose(IPCClient client, JsonObject json) { - logger.info("Closed"); + LOGGER.info("Closed"); isConnected = false; } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java index d4f7fec5..1b87925c 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java @@ -9,8 +9,11 @@ import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.Entity; import net.minecraft.util.math.Box; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DungeonBlaze { + private static final Logger LOGGER = LoggerFactory.getLogger(DungeonBlaze.class.getName()); static Entity highestBlaze = null; static Entity lowestBlaze = null; static boolean renderHooked = false; @@ -70,7 +73,7 @@ public class DungeonBlaze { } } }catch(Exception e) { - System.out.println("BlazeRenderer: " + e); + LOGGER.warn("[Skyblocker BlazeRenderer] " + e); } } } \ No newline at end of file diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java index 4d40ea83..57c40654 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java @@ -9,14 +9,14 @@ import net.minecraft.item.Items; import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; public class ColorTerminal extends ContainerSolver { - private static final Logger LOGGER = LogManager.getLogger(ColorTerminal.class.getName()); + private static final Logger LOGGER = LoggerFactory.getLogger(ColorTerminal.class.getName()); private static final Map colorFromName; private DyeColor targetColor; private static final Map itemColor; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java index 1d70c5e0..8afefdb4 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java @@ -13,7 +13,8 @@ import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; import net.minecraft.util.Formatting; import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.LogManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.InputStream; @@ -27,6 +28,7 @@ import java.util.concurrent.CompletableFuture; import java.util.zip.GZIPInputStream; public class PriceInfoTooltip { + private static final Logger LOGGER = LoggerFactory.getLogger(PriceInfoTooltip.class.getName()); private static final SkyblockerMod skyblocker = SkyblockerMod.getInstance(); private static final MinecraftClient client = MinecraftClient.getInstance(); private static JsonObject npcPricesJson; @@ -301,7 +303,7 @@ public class PriceInfoTooltip { } } } catch (IOException e) { - LogManager.getLogger(PriceInfoTooltip.class.getName()).warn("[Skyblocker] Failed to download average BIN prices!", e); + LOGGER.warn("[Skyblocker] Failed to download average BIN prices!", e); } switch (type) { case ONE_DAY -> oneDayAvgPricesJson = result; @@ -316,7 +318,7 @@ public class PriceInfoTooltip { InputStreamReader reader = new InputStreamReader(apiAddr.openStream()); result = new Gson().fromJson(reader, JsonObject.class); } catch (IOException e) { - LogManager.getLogger(PriceInfoTooltip.class.getName()).warn("[Skyblocker] Failed to download bazaar prices!", e); + LOGGER.warn("[Skyblocker] Failed to download bazaar prices!", e); } bazaarPricesJson = result; } @@ -328,7 +330,7 @@ public class PriceInfoTooltip { InputStreamReader reader = new InputStreamReader(apiAddr.openStream()); result = new Gson().fromJson(reader, JsonObject.class); } catch (IOException e) { - LogManager.getLogger(PriceInfoTooltip.class.getName()).warn("[Skyblocker] Failed to download lowest BIN prices!", e); + LOGGER.warn("[Skyblocker] Failed to download lowest BIN prices!", e); } lowestPricesJson = result; } @@ -340,7 +342,7 @@ public class PriceInfoTooltip { InputStreamReader reader = new InputStreamReader(apiAddr.openStream()); result = new Gson().fromJson(reader, JsonObject.class); } catch (IOException e) { - LogManager.getLogger(PriceInfoTooltip.class.getName()).warn("[Skyblocker] Failed to download NPC prices!", e); + LOGGER.warn("[Skyblocker] Failed to download NPC prices!", e); } npcPricesJson = result; } @@ -352,7 +354,7 @@ public class PriceInfoTooltip { InputStreamReader reader = new InputStreamReader(apiAddr.openStream()); result = new Gson().fromJson(reader, JsonObject.class); } catch (IOException e) { - LogManager.getLogger(PriceInfoTooltip.class.getName()).warn("[Skyblocker] Failed to download museum items!", e); + LOGGER.warn("[Skyblocker] Failed to download museum items!", e); } isMuseumJson = result; } diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Events.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Events.java index e3aa4da4..02936517 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/Events.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Events.java @@ -9,11 +9,11 @@ import org.slf4j.LoggerFactory; public class Events { public static MinecraftClient client = MinecraftClient.getInstance(); - public static Logger logger = LoggerFactory.getLogger(SkyblockerMod.NAMESPACE); + public static Logger LOGGER = LoggerFactory.getLogger(SkyblockerMod.NAMESPACE); public static void onSkyblockJoin(){ Utils.isOnSkyblock = true; - logger.info("Joined Skyblock"); + LOGGER.info("[Skyblocker] Joined Skyblock"); if (UpdateChecker.shouldUpdate()){ TranslatableText linkMessage = new TranslatableText("skyblocker.update.update_message"); TranslatableText linkMessageEnding = new TranslatableText("skyblocker.update.update_message_end"); @@ -26,7 +26,7 @@ public class Events { } public static void onSkyblockDisconnect(){ - logger.info("Disconnected from Skyblock"); + LOGGER.info("[Skyblocker] Disconnected from Skyblock"); SkyblockerMod.getInstance().discordRPCManager.stop(); Utils.isOnSkyblock = false; Utils.isInDungeons = false; -- cgit From a79c0e9a0eef818dd5a8909f4be94fba2d5059ba Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Tue, 8 Mar 2022 19:48:26 +0100 Subject: backpack preview fix --- src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/main') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java index 53a48a04..810c8538 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java @@ -47,7 +47,10 @@ public class BackpackPreview extends DrawableHelper { } private static File getSaveDir() { - String uuid = MinecraftClient.getInstance().player.getUuidAsString(); + String uuid = null; + if (MinecraftClient.getInstance().player != null) { + uuid = MinecraftClient.getInstance().player.getUuidAsString(); + } File dir = FabricLoader.getInstance().getConfigDir().resolve("skyblocker/backpack-preview/" + uuid).toFile(); dir.mkdirs(); return dir; -- cgit From b1ff58d9910b525680ffc8c0bdf2759875b4b578 Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Tue, 8 Mar 2022 19:53:19 +0100 Subject: fix discord rpc --- .../java/me/xmrvizzy/skyblocker/utils/Events.java | 5 ++-- .../java/me/xmrvizzy/skyblocker/utils/Utils.java | 28 ++++++++++++---------- 2 files changed, 19 insertions(+), 14 deletions(-) (limited to 'src/main') diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Events.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Events.java index 02936517..9c488f34 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/Events.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Events.java @@ -1,7 +1,6 @@ package me.xmrvizzy.skyblocker.utils; import me.xmrvizzy.skyblocker.SkyblockerMod; -import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import net.minecraft.client.MinecraftClient; import net.minecraft.text.*; import org.slf4j.Logger; @@ -21,7 +20,9 @@ public class Events { TranslatableText hoverText = new TranslatableText("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); - client.player.sendMessage(linkMessage, false); + if (client.player != null) { + client.player.sendMessage(linkMessage, false); + } } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java index 21c30ada..66d04b50 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java @@ -45,12 +45,13 @@ public class Utils { String location = null; List sidebarLines = getSidebar(); try { - assert sidebarLines != null; - for (String sidebarLine : sidebarLines) { - if (sidebarLine.contains("⏣")) location = sidebarLine; + if( sidebarLines != null) { + for (String sidebarLine : sidebarLines) { + if (sidebarLine.contains("⏣")) location = sidebarLine; + } + if (location == null) location = "Unknown"; + location = location.replace('⏣', ' ').strip(); } - if (location == null) location = "Unknown"; - location = location.replace('⏣', ' ').strip(); } catch (IndexOutOfBoundsException e) { e.printStackTrace(); } @@ -63,10 +64,12 @@ public class Utils { List sidebarLines = getSidebar(); try { - assert sidebarLines != null; - for (String sidebarLine : sidebarLines) { - if (sidebarLine.contains("Piggy:")) purseString = sidebarLine; - if (sidebarLine.contains("Purse:")) purseString = sidebarLine; + + if (sidebarLines != null) { + for (String sidebarLine : sidebarLines) { + if (sidebarLine.contains("Piggy:")) purseString = sidebarLine; + if (sidebarLine.contains("Purse:")) purseString = sidebarLine; + } } if (purseString != null) purse = Double.parseDouble(purseString.replaceAll("[^0-9.]", "").strip()); else purse = 0; @@ -82,9 +85,10 @@ public class Utils { String bitsString = null; List sidebarLines = getSidebar(); try { - assert sidebarLines != null; - for (String sidebarLine : sidebarLines) { - if (sidebarLine.contains("Bits")) bitsString = sidebarLine; + if (sidebarLines != null) { + for (String sidebarLine : sidebarLines) { + if (sidebarLine.contains("Bits")) bitsString = sidebarLine; + } } if (bitsString != null) { bits = Integer.parseInt(bitsString.replaceAll("[^0-9.]", "").strip()); -- cgit From 74bd4f2851b8c69ffbca3d461bf6aabe59d0303b Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Tue, 8 Mar 2022 19:53:35 +0100 Subject: misc --- src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java | 6 +++--- .../me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main') diff --git a/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java b/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java index 2b81a1a0..e13dfd09 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java +++ b/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java @@ -79,7 +79,7 @@ public class DiscordRPCManager implements IPCListener{ public void stop(){ if (client != null && client.getStatus() == PipeStatus.CONNECTED) { - LOGGER.info("Closing..."); + LOGGER.info("[Skyblocker DiscordRPC] Closing..."); isConnected = false; client.close(); client = null; @@ -88,13 +88,13 @@ public class DiscordRPCManager implements IPCListener{ @Override public void onReady(IPCClient client) { - LOGGER.info("Started!"); + LOGGER.info("[Skyblocker DiscordRPC] Started!"); isConnected = true; } @Override public void onClose(IPCClient client, JsonObject json) { - LOGGER.info("Closed"); + LOGGER.info("[Skyblocker DiscordRPC] Closed"); isConnected = false; } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java index 6781f99c..b7a6e919 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java @@ -130,7 +130,7 @@ public class ItemStackBuilder { for (int i = 0; i < otherNumsMin.size(); ++i) { String left = "\\{" + i + "\\}"; String right = otherNumsMin.get(i).getAsString() + " ➡ " + otherNumsMax.get(i).getAsString(); - list.add(new Pair(left, right)); + list.add(new Pair<>(left, right)); } return list; -- cgit From b1ce7fead3d41ad3b9c2192fbe6018b974dc5309 Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Tue, 8 Mar 2022 19:58:59 +0100 Subject: Indonesian translation added translated by @null2264 --- src/main/resources/assets/skyblocker/lang/id_id.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/main/resources/assets/skyblocker/lang/id_id.json (limited to 'src/main') diff --git a/src/main/resources/assets/skyblocker/lang/id_id.json b/src/main/resources/assets/skyblocker/lang/id_id.json new file mode 100644 index 00000000..9d093884 --- /dev/null +++ b/src/main/resources/assets/skyblocker/lang/id_id.json @@ -0,0 +1,18 @@ +{ + "key.categories.skyblocker": "Skyblocker", + "key.hotbarSlotLock": "Kunci Slot (Hotbar)", + "text.autoconfig.skyblocker.title": "Pengaturan Skyblocker", + "text.autoconfig.skyblocker.category.general": "Umum", + "text.autoconfig.skyblocker.option.general.bars": "Darah, Mana, Pertahanan & Bar XP", + "text.autoconfig.skyblocker.option.general.bars.enableBars": "Aktifkan Bar", + "text.autoconfig.skyblocker.category.locations": "Lokasi", + "text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons", + "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Aktifkan Peta", + "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Pecahkan Teka Teki \"Tiga Orang Aneh\"", + "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Pecahkan Teka Teki \"Blaze\"", + "text.autoconfig.skyblocker.category.messages": "Pesan", + "text.autoconfig.skyblocker.option.messages.hideAbility": "Sembunyikan Cooldown Kemampuan", + "text.autoconfig.skyblocker.option.messages.hideHeal": "Sembunyikan Pesan Penyembuhan", + "text.autoconfig.skyblocker.option.messages.hideAOTE": "Sembunyikan Pesan AOTE", + "text.autoconfig.skyblocker.option.messages.hideAds": "Sembunyikan Iklan dari Chat Publik" +} -- cgit From 418caae63d9ac1819916ad9a621ca9e6bc27a43e Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Tue, 8 Mar 2022 19:59:31 +0100 Subject: Russian translation added translated by @HyperSoop --- .../resources/assets/skyblocker/lang/ru_ru.json | 38 ++++++++++++---------- 1 file changed, 21 insertions(+), 17 deletions(-) (limited to 'src/main') diff --git a/src/main/resources/assets/skyblocker/lang/ru_ru.json b/src/main/resources/assets/skyblocker/lang/ru_ru.json index 0e89b9fa..96066725 100644 --- a/src/main/resources/assets/skyblocker/lang/ru_ru.json +++ b/src/main/resources/assets/skyblocker/lang/ru_ru.json @@ -1,30 +1,34 @@ { "key.categories.skyblocker": "Skyblocker", - "key.hotbarSlotLock": "Блокировка слотов (Хотбар)", + "key.hotbarSlotLock": "Блокировка Слотов (В хотбаре)", "text.autoconfig.skyblocker.title": "Настройки Skyblocker", "text.autoconfig.skyblocker.category.general": "Основные", - "text.autoconfig.skyblocker.option.general.apiKey": "Hypixel API-ключ ( в разработке)", - "text.autoconfig.skyblocker.option.general.bars": " Бары здоровья, маны, защиты и XP", - "text.autoconfig.skyblocker.option.general.bars.enableBars": "Включить бары", + "text.autoconfig.skyblocker.option.general.bars": "Полоски здоровья, маны, защиты и опыта", + "text.autoconfig.skyblocker.option.general.bars.enableBars": "Включить полоски", "text.autoconfig.skyblocker.category.locations": "Локации", "text.autoconfig.skyblocker.option.locations.dungeons": "Подземелья", - "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Включить карту", - "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Решить загадку \"Три чудака\"", - "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Решить головоломку Блейза", - "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Решить головоломку Тривия", - "text.autoconfig.skyblocker.option.locations.dwarvenMines": "Гномьи шахты", + "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Включить Карту", + "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Решать Головоломку \"Три чудака\"", + "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Решать Головоломку С Ифритами", + "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Решать Головоломку С Вопросами", + "text.autoconfig.skyblocker.option.locations.dwarvenMines": "Гномьи Шахты", "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Включить топливо дрели", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Solve Fetchur", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "Решить загадку \"Puzzler\"", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Решать загадку Fetchur-а", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "Решать загадку Puzzler-а", "text.autoconfig.skyblocker.category.messages": "Сообщения", - "text.autoconfig.skyblocker.option.messages.hideAbility": "Скрыть откат способностей", - "text.autoconfig.skyblocker.option.messages.hideHeal": "Скрыть сообщения об исцелении", - "text.autoconfig.skyblocker.option.messages.hideAOTE": "Скрыть сообщения от \"AOTE\"", - "text.autoconfig.skyblocker.option.messages.hideImplosion": "Скрыть сообщение \"Implosion\"", - "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "Скрыть сообщение \"Molten Wave\"", - "text.autoconfig.skyblocker.option.messages.hideAds": "Скрывать рекламу из публичного чата" + "text.autoconfig.skyblocker.option.messages.hideAbility": "Скрыть Перезарядку Способностей", + "text.autoconfig.skyblocker.option.messages.hideHeal": "Скрыть Сообщения об Исцелении", + "text.autoconfig.skyblocker.option.messages.hideAOTE": "Скрыть сообщения AOTE/AOTV", + "text.autoconfig.skyblocker.option.messages.hideImplosion": "Скрыть сообщения Implosion", + "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "Скрыть сообщения Molten Wave", + "text.autoconfig.skyblocker.option.messages.hideAds": "Скрывать рекламу в чате", + "text.autoconfig.skyblocker.option.locations.dungeons.oldLevers": "Хитбокс рычагов из 1.8", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "Решение Терминалов", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Решать Выбор по Цвету", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "Решать Клик По Возрастанию", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "Решать Начинается С" } \ No newline at end of file -- cgit From 83bcaae5fd6bf11503f71bdfce648e72ebc43099 Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Tue, 8 Mar 2022 19:59:46 +0100 Subject: add Translators --- src/main/resources/assets/skyblocker/lang/de_de.json | 1 - src/main/resources/fabric.mod.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main') diff --git a/src/main/resources/assets/skyblocker/lang/de_de.json b/src/main/resources/assets/skyblocker/lang/de_de.json index d08e868d..a74b39ff 100644 --- a/src/main/resources/assets/skyblocker/lang/de_de.json +++ b/src/main/resources/assets/skyblocker/lang/de_de.json @@ -5,7 +5,6 @@ "text.autoconfig.skyblocker.title": "Skyblocker-Einstellungen", "text.autoconfig.skyblocker.category.general": "Allgemein", - "text.autoconfig.skyblocker.option.general.apiKey": "Hypixel API Schlüssel (WIP)", "text.autoconfig.skyblocker.option.general.bars": "Gesundheits-, Mana-, Verteidigungs- und XP-Balken", "text.autoconfig.skyblocker.option.general.bars.enableBars": "Balken aktivieren", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index cf8c2ab8..aa1ad170 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -6,6 +6,7 @@ "description": "Hypixel Skyblock Mod", "authors": ["xMrVizzy", "d3dx9", "LifeIsAParadox"], "contributors": ["ExternalTime", "Zailer43", "TacoMonkey", "KonaeAkira", "Fix3dll"], + "translators" : ["null2264", "HyperSoop"], "contact": { "homepage": "https://hysky.de", "sources": "https://github.com/LifeIsAParadox/Skyblocker", -- cgit From 31ad86829ef86b82d4f4307171f31b9cf2b73a4c Mon Sep 17 00:00:00 2001 From: LifeIsAParadox Date: Tue, 8 Mar 2022 22:01:06 +0100 Subject: use more reliable fix for backpack preview thanks to @ExternalTime --- src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/main') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java index 810c8538..2638b0a6 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java @@ -47,10 +47,7 @@ public class BackpackPreview extends DrawableHelper { } private static File getSaveDir() { - String uuid = null; - if (MinecraftClient.getInstance().player != null) { - uuid = MinecraftClient.getInstance().player.getUuidAsString(); - } + String uuid = MinecraftClient.getInstance().getSession().getUuid(); File dir = FabricLoader.getInstance().getConfigDir().resolve("skyblocker/backpack-preview/" + uuid).toFile(); dir.mkdirs(); return dir; -- cgit