diff options
author | Kevin <92656833+kevinthegreat1@users.noreply.github.com> | 2023-08-10 12:40:33 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-10 12:40:33 +0800 |
commit | 50ec28e8c6c11d73019afc12b07eb3656c1107ed (patch) | |
tree | 0e4e1e3e1d8723c7ef91b5225bf8027fd8195976 /src/main/resources | |
parent | f46f40de3a3b1adeccc192134eb445f5294850f5 (diff) | |
parent | 16c6debb1cc90be5815cd188264b16ddf8b76f16 (diff) | |
download | Skyblocker-50ec28e8c6c11d73019afc12b07eb3656c1107ed.tar.gz Skyblocker-50ec28e8c6c11d73019afc12b07eb3656c1107ed.tar.bz2 Skyblocker-50ec28e8c6c11d73019afc12b07eb3656c1107ed.zip |
Merge pull request #234 from AzureAaron/item-renaming
Add Item Renaming & Custom Armour Dye Colours
Diffstat (limited to 'src/main/resources')
-rw-r--r-- | src/main/resources/assets/skyblocker/lang/en_us.json | 16 | ||||
-rw-r--r-- | src/main/resources/skyblocker.mixins.json | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 8e8de38a..e7f68753 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -292,5 +292,19 @@ "skyblocker.shortcuts.deleteQuestion": "Are you sure you want to remove this shortcut?", "skyblocker.shortcuts.deleteWarning": "Shortcut '%s' will be lost forever! (A long time!)", "skyblocker.shortcuts.new": "New Shortcut", - "skyblocker.shortcuts.commandSuggestionTooltip": "Due to limitations of Minecraft, command suggestions will only work after a restart of the game." + "skyblocker.shortcuts.commandSuggestionTooltip": "Due to limitations of Minecraft, command suggestions will only work after a restart of the game.", + + "skyblocker.customItemNames.removed": "§b[§6Skyblocker§b] §fRemoved this item's custom name.", + "skyblocker.customItemNames.neverHad": "§b[§6Skyblocker§b] §fThis item doesn't have a custom name set, but why not add one? ;)", + "skyblocker.customItemNames.added": "§b[§6Skyblocker§b] §fSet a custom name for your currently held item!", + "skyblocker.customItemNames.noItemUuid": "§b[§6Skyblocker§b] §cYou must be holding an item that has a uuid in order to set a custom name!", + "skyblocker.customItemNames.unableToSetName": "§b[§6Skyblocker§b] §cUnable to set a custom item name :( (Are you in skyblock?, are you holding an item?)", + + "skyblocker.customDyeColors.invalidHex": "§b[§6Skyblocker§b] §cInvalid HEX color code!", + "skyblocker.customDyeColors.notDyeable": "§b[§6Skyblocker§b] §cThis item isn't a dyeable armor piece!", + "skyblocker.customDyeColors.removed": "§b[§6Skyblocker§b] §fRemoved this item's custom dye color.", + "skyblocker.customDyeColors.neverHad": "§b[§6Skyblocker§b] §fThis item doesn't have a custom dye color set, but why not add one? ;)", + "skyblocker.customDyeColors.added": "§b[§6Skyblocker§b] §fSet a custom dye color for your currently held item!", + "skyblocker.customDyeColors.noItemUuid": "§b[§6Skyblocker§b] §cYou must be holding an item that has a uuid in order to set a custom dye color!", + "skyblocker.customDyeColors.unableToSetColor": "§b[§6Skyblocker§b] §cUnable to set a custom dye color :( (Are you in skyblock?)" } diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index 360a966a..522c3af0 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -6,11 +6,13 @@ "ClientPlayerEntityMixin", "ClientPlayNetworkHandlerMixin", "DrawContextMixin", + "DyeableItemMixin", "FarmlandBlockMixin", "GenericContainerScreenHandlerMixin", "HandledScreenMixin", "InGameHudMixin", "InventoryScreenMixin", + "ItemStackMixin", "LeverBlockMixin", "MinecraftClientMixin", "PlayerListHudMixin", |