From c26890daab1b6ccf5ac9b6c5c52f4127fc1fc891 Mon Sep 17 00:00:00 2001
From: Alexey Krainev <xmrvizzy@ya.ru>
Date: Sat, 30 Jan 2021 06:27:29 +0500
Subject: v1.0.4

---
 src/main/resources/assets/skyblocker/lang/en_us.json     |   7 ++++---
 src/main/resources/assets/skyblocker/lang/ru_ru.json     |   7 ++++---
 .../resources/assets/skyblocker/textures/gui/bars.png    | Bin 0 -> 1212 bytes
 .../resources/assets/skyblocker/textures/gui/icons.png   | Bin 1350 -> 0 bytes
 .../assets/skyblocker/textures/gui/slot_lock.png         | Bin 0 -> 1187 bytes
 src/main/resources/skyblocker.mixins.json                |   3 +++
 6 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 src/main/resources/assets/skyblocker/textures/gui/bars.png
 delete mode 100644 src/main/resources/assets/skyblocker/textures/gui/icons.png
 create mode 100644 src/main/resources/assets/skyblocker/textures/gui/slot_lock.png

(limited to 'src/main/resources')

diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index 1d5a8367..590057a2 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -1,12 +1,13 @@
 {
+  "key.categories.skyblocker": "Skyblocker",
+  "key.hotbarSlotLock": "Slot Lock (Hotbar)",
+
   "text.autoconfig.skyblocker.title": "Skyblocker Settings",
 
   "text.autoconfig.skyblocker.category.general": "General",
   "text.autoconfig.skyblocker.option.general.apiKey": "Hypixel API Key (WIP)",
-  "text.autoconfig.skyblocker.option.general.bars": "Health & Mana Bars",
+  "text.autoconfig.skyblocker.option.general.bars": "Health, Mana, Defence & XP Bars",
   "text.autoconfig.skyblocker.option.general.bars.enableBars": "Enable Bars",
-  "text.autoconfig.skyblocker.option.general.bars.healthColor": "Health Color",
-  "text.autoconfig.skyblocker.option.general.bars.manaColor": "Mana Color",
 
   "text.autoconfig.skyblocker.category.locations": "Locations",
   "text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons",
diff --git a/src/main/resources/assets/skyblocker/lang/ru_ru.json b/src/main/resources/assets/skyblocker/lang/ru_ru.json
index c3bed00e..0564ed32 100644
--- a/src/main/resources/assets/skyblocker/lang/ru_ru.json
+++ b/src/main/resources/assets/skyblocker/lang/ru_ru.json
@@ -1,12 +1,13 @@
 {
+  "key.categories.skyblocker": "Skyblocker",
+  "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": "Бары здоровья и маны",
+  "text.autoconfig.skyblocker.option.general.bars": "Бары здоровья, маны, защиты, опыта",
   "text.autoconfig.skyblocker.option.general.bars.enableBars": "Включить бары",
-  "text.autoconfig.skyblocker.option.general.bars.healthColor": "Цвет здоровья",
-  "text.autoconfig.skyblocker.option.general.bars.manaColor": "Цвет маны",
 
   "text.autoconfig.skyblocker.category.locations": "Локации",
   "text.autoconfig.skyblocker.option.locations.dungeons": "Подземелья",
diff --git a/src/main/resources/assets/skyblocker/textures/gui/bars.png b/src/main/resources/assets/skyblocker/textures/gui/bars.png
new file mode 100644
index 00000000..0b700024
Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/bars.png differ
diff --git a/src/main/resources/assets/skyblocker/textures/gui/icons.png b/src/main/resources/assets/skyblocker/textures/gui/icons.png
deleted file mode 100644
index 5eb23b84..00000000
Binary files a/src/main/resources/assets/skyblocker/textures/gui/icons.png and /dev/null differ
diff --git a/src/main/resources/assets/skyblocker/textures/gui/slot_lock.png b/src/main/resources/assets/skyblocker/textures/gui/slot_lock.png
new file mode 100644
index 00000000..98b4c65a
Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/slot_lock.png differ
diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json
index 8b6d3cbd..3e904f73 100644
--- a/src/main/resources/skyblocker.mixins.json
+++ b/src/main/resources/skyblocker.mixins.json
@@ -4,6 +4,9 @@
   "compatibilityLevel": "JAVA_8",
   "client": [
     "ChatHudListenerMixin",
+    "ChatScreenMixin",
+    "ClientPlayerEntityMixin",
+    "ClientPlayNetworkHandlerMixin",
     "InGameHudMixin",
     "ItemRendererMixin",
     "MinecraftClientMixin"
-- 
cgit