From ca2c617e036dbfc07243faf06f0b77a03636134d Mon Sep 17 00:00:00 2001 From: vicisacat Date: Tue, 26 Mar 2024 17:50:20 +0100 Subject: testing things --- .../skyblocker/textures/gui/sprites/bars/bar_test.png | Bin 0 -> 170 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_test.png (limited to 'src/main/resources') diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_test.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_test.png new file mode 100644 index 00000000..cde2a16f Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_test.png differ -- cgit From 0d5b04f9a5f57be03c79b76ff9b730951b5f959f Mon Sep 17 00:00:00 2001 From: vicisacat Date: Sun, 31 Mar 2024 14:51:18 +0200 Subject: progress ig --- .../skyblocker/textures/gui/sprites/bars/bar_back.png | Bin 0 -> 196 bytes .../textures/gui/sprites/bars/bar_back.png.mcmeta | 10 ++++++++++ .../skyblocker/textures/gui/sprites/bars/bar_fill.png | Bin 0 -> 179 bytes .../textures/gui/sprites/bars/bar_fill.png.mcmeta | 10 ++++++++++ .../skyblocker/textures/gui/sprites/bars/bar_test.png | Bin 170 -> 0 bytes 5 files changed, 20 insertions(+) create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_back.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_back.png.mcmeta create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_fill.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_fill.png.mcmeta delete mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_test.png (limited to 'src/main/resources') 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 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_back.png differ 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 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_fill.png differ 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/bar_test.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_test.png deleted file mode 100644 index cde2a16f..00000000 Binary files a/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/bar_test.png and /dev/null differ -- cgit From 3581365e654306cf08d0c4284ddfa454befd519d Mon Sep 17 00:00:00 2001 From: vicisacat Date: Sat, 13 Apr 2024 00:00:50 +0200 Subject: ssergorp --- .../textures/gui/sprites/bars/icons/defense.png | Bin 0 -> 198 bytes .../textures/gui/sprites/bars/icons/experience.png | Bin 0 -> 243 bytes .../skyblocker/textures/gui/sprites/bars/icons/health.png | Bin 0 -> 197 bytes .../textures/gui/sprites/bars/icons/intelligence.png | Bin 0 -> 194 bytes src/main/resources/skyblocker.mixins.json | 1 + 5 files changed, 1 insertion(+) create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/defense.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/experience.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/health.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/intelligence.png (limited to 'src/main/resources') 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 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/defense.png differ 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 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/experience.png differ 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 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/health.png differ 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 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/bars/icons/intelligence.png differ diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index 99d9faaa..a483c0f0 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -49,6 +49,7 @@ "accessor.ScreenAccessor", "accessor.SkullBlockEntityAccessor", "accessor.SlotAccessor", + "accessor.WindowAccessor", "accessor.WorldRendererAccessor", "discordipc.ConnectionMixin" ], -- cgit From b791e38cbd36360935164e337fa992bf514cbb36 Mon Sep 17 00:00:00 2001 From: vicisacat Date: Sun, 14 Apr 2024 17:36:21 +0200 Subject: it works so cool --- src/main/resources/assets/skyblocker/lang/en_us.json | 10 ++++++++++ src/main/resources/skyblocker.mixins.json | 1 + 2 files changed, 11 insertions(+) (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 d1a5966c..5921cc95 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -496,6 +496,16 @@ "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.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/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index a483c0f0..261b7073 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", -- cgit From f0ff0b555621f2d7f240bc72ccc1c7667badab6f Mon Sep 17 00:00:00 2001 From: vicisacat Date: Wed, 17 Apr 2024 23:07:49 +0200 Subject: things happened yea rewrote the entire thing to use semi data-driven BarAnchors help button in the config screen --- src/main/resources/assets/skyblocker/lang/en_us.json | 3 +++ 1 file changed, 3 insertions(+) (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 5921cc95..e28b2316 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -505,6 +505,9 @@ "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.\n\nEverything is saved when you leave", "skyblocker.updaterepository.failed": "§cUpdating local repository failed. Remove files manually and restart game.", -- cgit From 28521b8c1457146da6852316c5115afb2e64481c Mon Sep 17 00:00:00 2001 From: vicisacat Date: Wed, 17 Apr 2024 23:28:22 +0200 Subject: remove any mention of old status bars also moved FancyStatusBars.java --- src/main/resources/assets/skyblocker/lang/en_us.json | 8 -------- 1 file changed, 8 deletions(-) (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 e28b2316..63b959e5 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", -- cgit From 67ca667c3d796d6796a374050dd0ddcdcdade4df Mon Sep 17 00:00:00 2001 From: vicisacat Date: Thu, 18 Apr 2024 14:16:09 +0200 Subject: remove WindowAccessor.java added some null checks --- src/main/resources/skyblocker.mixins.json | 1 - 1 file changed, 1 deletion(-) (limited to 'src/main/resources') diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index 261b7073..8169c0c4 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -50,7 +50,6 @@ "accessor.ScreenAccessor", "accessor.SkullBlockEntityAccessor", "accessor.SlotAccessor", - "accessor.WindowAccessor", "accessor.WorldRendererAccessor", "discordipc.ConnectionMixin" ], -- cgit From de10287482995655bea8850aa364a257e9ce9b29 Mon Sep 17 00:00:00 2001 From: vicisacat Date: Thu, 18 Apr 2024 22:59:15 +0200 Subject: mention resizing in explanation and add spacing --- src/main/resources/assets/skyblocker/lang/en_us.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 63b959e5..1b81a3f5 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -499,7 +499,7 @@ "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.\n\nEverything is saved when you leave", + "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.", -- cgit From c43370daf17ea547f80908cf9391fac1d7756b45 Mon Sep 17 00:00:00 2001 From: Kevin <92656833+kevinthegreat1@users.noreply.github.com> Date: Sun, 21 Apr 2024 15:33:06 -0400 Subject: Delete src/main/resources/assets/skyblocker/textures/gui/bars.png --- .../resources/assets/skyblocker/textures/gui/bars.png | Bin 9288 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/skyblocker/textures/gui/bars.png (limited to 'src/main/resources') 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 Binary files a/src/main/resources/assets/skyblocker/textures/gui/bars.png and /dev/null differ -- cgit