Merge pull request #654 from viciscat/fancier-bars

Fancier bars

11 files changed, 34 insertions, 8 deletions

diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index d1a5966c..1b81a3f5 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -26,14 +26,6 @@
   "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.barpositions": "Configure Bar Positions",
-  "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER1": "Layer 1",
-  "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER2": "Layer 2",
-  "text.autoconfig.skyblocker.option.general.bars.barpositions.RIGHT": "Right",
-  "text.autoconfig.skyblocker.option.general.bars.barpositions.NONE": "Disabled",
-  "text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition": "Health Bar Position",
-  "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "Mana Bar Position",
-  "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "Defence Bar Position",
-  "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "Experience Bar Position",
   "text.autoconfig.skyblocker.option.general.experiments": "Experiments Solver",
   "text.autoconfig.skyblocker.option.general.experiments.enableChronomatronSolver": "Enable Chronomatron Solver",
   "text.autoconfig.skyblocker.option.general.experiments.enableSuperpairsSolver": "Enable Superpairs Solver",
@@ -496,6 +488,19 @@
   "text.autoconfig.skyblocker.option.general.dontStripSkinAlphaValues": "Correct Transparent Skin Pixels",
   "text.autoconfig.skyblocker.option.general.dontStripSkinAlphaValues.@Tooltip": "When enabled, the alpha values of pixels in skin textures are no longer stripped while in Skyblock.\n\nThis results in the \"filler\" pixels on items using Player Heads to now be completely transparent, although this may have some side effects in odd cases.",
 
+  "skyblocker.bars.config.health": "Health",
+  "skyblocker.bars.config.defense": "Defense",
+  "skyblocker.bars.config.intelligence": "Intelligence",
+  "skyblocker.bars.config.experience": "Experience",
+  "skyblocker.bars.config.mainColor": "Main Color",
+  "skyblocker.bars.config.overflowColor": "Overflow Color",
+  "skyblocker.bars.config.textColor": "Text Color",
+  "skyblocker.bars.config.showValue": "Show Value",
+  "skyblocker.bars.config.icon": "Icon",
+  "skyblocker.bars.config.openScreen": "Status Bars Config screen",
+  "skyblocker.bars.config.explanationTitle": "What is this?",
+  "skyblocker.bars.config.explanation": "Welcome to the status bars config screen!\n\nDrag and drop the bars to snap them to an anchor (white squares) or existing bars.\nYou can right click them to edit a bunch of properties.\nBy hovering your mouse between 2 bars (your cursor should change), you can resize them.\n\nEverything is saved when you leave",
+
   "skyblocker.updaterepository.failed":  "§cUpdating local repository failed. Remove files manually and restart game.",
 
   "skyblocker.dungeons.secrets.physicalEntranceNotFound": "§cDungeon Entrance Room coordinates not found. Please go back to the green Entrance Room.",
diff --git a/src/main/resources/assets/skyblocker/textures/gui/bars.png b/src/main/resources/assets/skyblocker/textures/gui/bars.png
deleted file mode 100644
index 5ea1f830..00000000
--- a/src/main/resources/assets/skyblocker/textures/gui/bars.png
+++ /dev/null
diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_back.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_back.png
new file mode 100644
index 00000000..150d6ad6
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_back.png
diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_back.png.mcmeta b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_back.png.mcmeta
new file mode 100644
index 00000000..4744012e
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_back.png.mcmeta
@@ -0,0 +1,10 @@
+{
+  "gui": {
+    "scaling": {
+      "type": "nine_slice",
+      "width": 120,
+      "height": 7,
+      "border": 3
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_fill.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_fill.png
new file mode 100644
index 00000000..714ae675
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_fill.png
diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_fill.png.mcmeta b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_fill.png.mcmeta
new file mode 100644
index 00000000..8a9af809
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_fill.png.mcmeta
@@ -0,0 +1,10 @@
+{
+  "gui": {
+    "scaling": {
+      "type": "nine_slice",
+      "width": 120,
+      "height": 5,
+      "border": 2
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/defense.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/defense.png
new file mode 100644
index 00000000..4dd13141
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/defense.png
diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/experience.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/experience.png
new file mode 100644
index 00000000..c1ba7d0c
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/experience.png
diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/health.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/health.png
new file mode 100644
index 00000000..a92f80d0
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/health.png
diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/intelligence.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/intelligence.png
new file mode 100644
index 00000000..0f3872b9
--- /dev/null
+++ b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/intelligence.png
diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json
index 99d9faaa..8169c0c4 100644
--- a/src/main/resources/skyblocker.mixins.json
+++ b/src/main/resources/skyblocker.mixins.json
@@ -34,6 +34,7 @@
     "RenderFishMixin",
     "ScoreboardMixin",
     "SocialInteractionsPlayerListWidgetMixin",
+    "WindowMixin",
     "WorldRendererMixin",
     "YggdrasilMinecraftSessionServiceMixin",
     "YggdrasilServicesKeyInfoMixin",