Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.21] Fix incorrect logic with BaseOwoHandledScreen slot methods #305

Merged
merged 2 commits into from
Oct 23, 2024
Merged

[1.21] Fix incorrect logic with BaseOwoHandledScreen slot methods #305

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46600fd
[ui] Fix incorrect logic with BaseOwoHandledScreen slot methods
Dragon-Seeker Sep 16, 2024
2f860a6
[ui] remove hideSlot methods
gliscowo Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/main/java/io/wispforest/owo/ui/base/BaseOwoHandledScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ protected void init() {
* @param index The index of the slot to disable
*/
protected void disableSlot(int index) {
((OwoSlotExtension) this.handler.slots.get(index)).owo$setDisabledOverride(true);
this.disableSlot(this.handler.slots.get(index));
}

/**
Expand All @@ -115,7 +115,7 @@ protected void disableSlot(Slot slot) {
* @param index The index of the slot to enable
*/
protected void enableSlot(int index) {
((OwoSlotExtension) this.handler.slots.get(index)).owo$setDisabledOverride(false);
this.enableSlot(this.handler.slots.get(index));
}

/**
Expand All @@ -124,15 +124,23 @@ protected void enableSlot(int index) {
* a slot that is disabled through its own will
*/
protected void enableSlot(Slot slot) {
((OwoSlotExtension) slot).owo$setDisabledOverride(true);
((OwoSlotExtension) slot).owo$setDisabledOverride(false);
}

/**
* @return whether the given slot is enabled or disabled
* using the {@link OwoSlotExtension} disabling functionality
*/
protected boolean isSlotEnabled(int index) {
return ((OwoSlotExtension) this.handler.slots.get(index)).owo$getDisabledOverride();
return isSlotEnabled(this.handler.slots.get(index));
}

/**
* @return whether the given slot is enabled or disabled
* using the {@link OwoSlotExtension} disabling functionality
*/
protected boolean isSlotEnabled(Slot slot) {
return ((OwoSlotExtension) slot).owo$getDisabledOverride();
return !((OwoSlotExtension) slot).owo$getDisabledOverride();
}

/**
Expand Down
Loading