From 79ba1ed6fc133bacf64ee8e3a5d1454d1eadde2f Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Tue, 8 Aug 2023 20:28:24 -0400
Subject: Add Item Renaming

---
 src/main/resources/assets/skyblocker/lang/en_us.json | 7 ++++++-
 src/main/resources/skyblocker.mixins.json            | 1 +
 2 files changed, 7 insertions(+), 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 8e8de38a..4c3ed043 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -292,5 +292,10 @@
   "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.added": "§b[§6Skyblocker§b] §fAdded 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 custom item name :( (Are you in skyblock?, are you holding an item?)"
 }
diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json
index 360a966a..19ad03bf 100644
--- a/src/main/resources/skyblocker.mixins.json
+++ b/src/main/resources/skyblocker.mixins.json
@@ -11,6 +11,7 @@
     "HandledScreenMixin",
     "InGameHudMixin",
     "InventoryScreenMixin",
+    "ItemStackMixin",
     "LeverBlockMixin",
     "MinecraftClientMixin",
     "PlayerListHudMixin",
-- 
cgit 


From a629801cc3ffa5913bc07af173e8a01673a70681 Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Wed, 9 Aug 2023 20:01:18 -0400
Subject: Custom Armour Dye Colours

---
 src/main/resources/assets/skyblocker/lang/en_us.json | 13 +++++++++++--
 src/main/resources/skyblocker.mixins.json            |  1 +
 2 files changed, 12 insertions(+), 2 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 4c3ed043..e7f68753 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -295,7 +295,16 @@
   "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.added": "§b[§6Skyblocker§b] §fAdded a custom name for your currently held item!",
+  "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 custom item name :( (Are you in skyblock?, are you holding an item?)"
+  "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 19ad03bf..522c3af0 100644
--- a/src/main/resources/skyblocker.mixins.json
+++ b/src/main/resources/skyblocker.mixins.json
@@ -6,6 +6,7 @@
     "ClientPlayerEntityMixin",
     "ClientPlayNetworkHandlerMixin",
     "DrawContextMixin",
+    "DyeableItemMixin",
     "FarmlandBlockMixin",
     "GenericContainerScreenHandlerMixin",
     "HandledScreenMixin",
-- 
cgit 


From ada74ef6b54168a1793c76bf3dd1c2c9d379c604 Mon Sep 17 00:00:00 2001
From: Julienraptor01 <julienraptor01@gmail.com>
Date: Thu, 10 Aug 2023 06:40:53 +0200
Subject: Make IF a conflict (#237)

make sure people get a warning in log so that if they crash, they can see why
---
 src/main/resources/fabric.mod.json | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main/resources')

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 71d9763e..596fe8cf 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -37,6 +37,9 @@
     "cloth-config2": "*",
     "minecraft": "~1.20"
   },
+  "conflicts": {
+    "immediatelyfast": "<=1.1.26+1.20.1"
+  },
   "custom": {
     "modmenu": {
       "links": {
-- 
cgit