diff --git a/CHANGELOG.md b/CHANGELOG.md index 77bd261c..7214791b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1,2 @@ -- It appears that the serialization fixes from 2.0.0-beta.2 *weren't actually saved to git*. This has been rectified. The issue is most certainly resolved now. (@StellarWitch7) +- Fixed spell slots in the player's inventory having a clickable hitbox when inactive. +- Fixed an incorrect spell signature. \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 89402459..111aa32a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ deps.yarn=1.21+build.2 loader_version=0.15.11 # Mod Properties -mod_version=2.0.0-beta.2c +mod_version=2.0.0-beta.2d maven_group=dev.enjarai archives_base_name=trickster diff --git a/src/client/java/dev/enjarai/trickster/screen/SpellSlotWidget.java b/src/client/java/dev/enjarai/trickster/screen/SpellSlotWidget.java index 3e3103ca..0762b208 100644 --- a/src/client/java/dev/enjarai/trickster/screen/SpellSlotWidget.java +++ b/src/client/java/dev/enjarai/trickster/screen/SpellSlotWidget.java @@ -36,6 +36,11 @@ public void onPress() { } } + @Override + protected boolean isValidClickButton(int button) { + return super.isValidClickButton(button) && currentState != State.INACTIVE; + } + public void updateState(@Nullable CasterComponent.RunningSpellData spellData) { if (spellData == null) { currentState = State.INACTIVE; diff --git a/src/main/resources/assets/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/inventory.md b/src/main/resources/assets/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/inventory.md index 9dbe7521..f2d1ca42 100644 --- a/src/main/resources/assets/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/inventory.md +++ b/src/main/resources/assets/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/inventory.md @@ -58,7 +58,7 @@ Constructs a slot from an index and an inventory source, using the caster by def <|glyph@trickster:templates|trick-id=trickster:check_hat,title=Cranium Delusion|> --> number +-> number | void ---