aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorYasin <LifeIsAParadox@users.noreply.github.com>2023-10-09 12:01:34 +0200
committerGitHub <noreply@github.com>2023-10-09 12:01:34 +0200
commita07b748c041875688f6f3d6d74ccf47cc1dc4445 (patch)
tree883af0e2de33b951d709dd8813f3f1f18e9f00d3 /src/main/resources
parent0c9381191663a74a9ec3cff9aae1c8b523215f0e (diff)
parent1618ac67169cf4d8a36ce8c1238aa1e925f938aa (diff)
downloadSkyblocker-a07b748c041875688f6f3d6d74ccf47cc1dc4445.tar.gz
Skyblocker-a07b748c041875688f6f3d6d74ccf47cc1dc4445.tar.bz2
Skyblocker-a07b748c041875688f6f3d6d74ccf47cc1dc4445.zip
Merge pull request #332 from Grayray75/item-cooldown
Item cooldown display
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_us.json2
-rw-r--r--src/main/resources/skyblocker.mixins.json7
2 files changed, 6 insertions, 3 deletions
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index 4c9965bf..f889595e 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -38,6 +38,8 @@
"text.autoconfig.skyblocker.option.general.fairySouls.highlightFoundSouls": "Highlight found fairy souls",
"text.autoconfig.skyblocker.option.general.fairySouls.highlightOnlyNearbySouls": "Only highlight nearby fairy souls",
"text.autoconfig.skyblocker.option.general.fairySouls.highlightOnlyNearbySouls.@Tooltip": "When enabled only fairy souls in a radius of 50 blocks are highlighted",
+ "text.autoconfig.skyblocker.option.general.itemCooldown": "Item Cooldown",
+ "text.autoconfig.skyblocker.option.general.itemCooldown.enableItemCooldowns": "Enable Item Cooldown",
"text.autoconfig.skyblocker.option.general.shortcuts": "Shortcuts",
"text.autoconfig.skyblocker.option.general.shortcuts.enableShortcuts": "Enable Shortcuts",
"text.autoconfig.skyblocker.option.general.shortcuts.enableShortcuts.@Tooltip": "Works anywhere, even in vanilla! Edit shortcuts with \"/skyblocker shortcuts\". At least one of the following options must be enabled for this to take effect.",
diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json
index a4fe92dd..cb8635e3 100644
--- a/src/main/resources/skyblocker.mixins.json
+++ b/src/main/resources/skyblocker.mixins.json
@@ -8,6 +8,7 @@
"ArmorTrimMixin",
"BatEntityMixin",
"ClientPlayerEntityMixin",
+ "ClientPlayerInteractionManagerMixin",
"ClientPlayNetworkHandlerMixin",
"DrawContextMixin",
"DyeableItemMixin",
@@ -27,15 +28,15 @@
"YggdrasilMinecraftSessionServiceMixin",
"YggdrasilServicesKeyInfoMixin",
"accessor.BeaconBlockEntityRendererInvoker",
+ "accessor.DrawContextInvoker",
"accessor.FrustumInvoker",
"accessor.HandledScreenAccessor",
"accessor.PlayerListHudAccessor",
"accessor.RecipeBookWidgetAccessor",
"accessor.ScreenAccessor",
- "accessor.WorldRendererAccessor",
- "accessor.DrawContextInvoker"
+ "accessor.WorldRendererAccessor"
],
"injectors": {
"defaultRequire": 1
}
-} \ No newline at end of file
+}