From 4c822a6383d8f92dc850c82b93fa6cd4a67f2610 Mon Sep 17 00:00:00 2001 From: viciscat <51047087+viciscat@users.noreply.github.com> Date: Sun, 1 Jun 2025 02:25:16 +0200 Subject: Epic Armor Customization GUI (#1215) * start creating the screen * trim selection * colo(u)ring and button in inventory * translation and little touches * translation and little touches * things i forgot * remove debug stuff oops * replace speed by duration * 1.12.5 - Remake the trim buttons because mojang hates me - Undo the OkLabColor cache * some docs and things * requested changes * fix crash in tests * changes! * clean up * Test animated dye interpolation * Add DFU for animated dye and item background * Add slider steps * Add config data fixer test * Draw trim material item * remove old stuff * Clean up interpolate and gui code * supplier * 180 * grrrrr --------- Co-authored-by: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> --- src/main/resources/assets/skyblocker/lang/en_us.json | 11 +++++++++++ .../gui/sprites/armor_customization_screen/button.png | Bin 0 -> 8999 bytes .../sprites/armor_customization_screen/mini_hotbar.png | Bin 0 -> 2344 bytes .../textures/gui/sprites/color_picker/sv_thumb.png | Bin 0 -> 157 bytes .../textures/gui/sprites/hotbar_selection_full.png | Bin 0 -> 720 bytes .../skyblocker/textures/gui/sprites/menu_inner_space.png | Bin 0 -> 173 bytes .../textures/gui/sprites/menu_inner_space.png.mcmeta | 10 ++++++++++ src/main/resources/skyblocker.mixins.json | 2 ++ 8 files changed, 23 insertions(+) create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/armor_customization_screen/button.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/armor_customization_screen/mini_hotbar.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/color_picker/sv_thumb.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/hotbar_selection_full.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/menu_inner_space.png create mode 100644 src/main/resources/assets/skyblocker/textures/gui/sprites/menu_inner_space.png.mcmeta (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 b0cc45b3..b5f2a3db 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -1382,6 +1382,17 @@ "skyblocker.profileviewer.inventory.inactive.description.backpack": "The selected backpack", "skyblocker.profileviewer.inventory.inactive.description.general": "does not contain this slot", + "skyblocker.armorCustomization.animated": "Animated", + "skyblocker.armorCustomization.cannotCustomizeColor": "Cannot customize this piece's color :(", + "skyblocker.armorCustomization.cycleBack": "Cycle Back", + "skyblocker.armorCustomization.resetColor": "Reset color", + "skyblocker.armorCustomization.delay": "Delay: %s", + "skyblocker.armorCustomization.delayTooltip": "The animation will be delayed by this amount in seconds.", + "skyblocker.armorCustomization.duration": "Duration: %s", + "skyblocker.armorCustomization.durationTooltip": "The duration of the animation in seconds.", + "skyblocker.armorCustomization.title": "Customize Your Armor", + "skyblocker.armorCustomization.titleSecret": "Pimp Your Armor", + "skyblocker.chat.confirmationPromptNotification": "Click anywhere on screen within 60 seconds to accept the prompt.", "emi.category.skyblocker.skyblock": "Skyblock" diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/armor_customization_screen/button.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/armor_customization_screen/button.png new file mode 100644 index 00000000..4e0da0e3 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/armor_customization_screen/button.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/armor_customization_screen/mini_hotbar.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/armor_customization_screen/mini_hotbar.png new file mode 100644 index 00000000..3a03dd27 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/armor_customization_screen/mini_hotbar.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/color_picker/sv_thumb.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/color_picker/sv_thumb.png new file mode 100644 index 00000000..d9f03e90 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/color_picker/sv_thumb.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/hotbar_selection_full.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/hotbar_selection_full.png new file mode 100644 index 00000000..0cfd15cb Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/hotbar_selection_full.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/menu_inner_space.png b/src/main/resources/assets/skyblocker/textures/gui/sprites/menu_inner_space.png new file mode 100644 index 00000000..03e635a7 Binary files /dev/null and b/src/main/resources/assets/skyblocker/textures/gui/sprites/menu_inner_space.png differ diff --git a/src/main/resources/assets/skyblocker/textures/gui/sprites/menu_inner_space.png.mcmeta b/src/main/resources/assets/skyblocker/textures/gui/sprites/menu_inner_space.png.mcmeta new file mode 100644 index 00000000..94db0d64 --- /dev/null +++ b/src/main/resources/assets/skyblocker/textures/gui/sprites/menu_inner_space.png.mcmeta @@ -0,0 +1,10 @@ +{ + "gui": { + "scaling": { + "type": "nine_slice", + "width": 16, + "height": 16, + "border": 2 + } + } +} diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index c9155f6d..5735a48b 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -56,6 +56,7 @@ "accessors.CheckboxWidgetAccessor", "accessors.DrawContextInvoker", "accessors.EndermanEntityAccessor", + "accessors.EntityRenderDispatcherAccessor", "accessors.FrustumInvoker", "accessors.HandledScreenAccessor", "accessors.InGameHudInvoker", @@ -65,6 +66,7 @@ "accessors.RecipeBookWidgetAccessor", "accessors.ScreenAccessor", "accessors.SlotAccessor", + "accessors.SpriteContentsAccessor", "accessors.WorldRendererAccessor", "discordipc.ConnectionMixin", "jgit.SystemReaderMixin", -- cgit