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

Move runSync function into InterfacesListeners #7

Merged
merged 2 commits into from
Jun 27, 2024
Merged

Move runSync function into InterfacesListeners #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30c38f1
Move runSync function into InterfacesListeners
FllipEis Jun 26, 2024
1c5d946
Remove unused import
FllipEis Jun 26, 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
11 changes: 10 additions & 1 deletion interfaces/src/main/kotlin/com/noxcrew/interfaces/InterfacesListeners.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import com.noxcrew.interfaces.click.ClickHandler
import com.noxcrew.interfaces.click.CompletableClickHandler
import com.noxcrew.interfaces.grid.GridPoint
import com.noxcrew.interfaces.pane.PlayerPane
import com.noxcrew.interfaces.utilities.runSync
import com.noxcrew.interfaces.view.AbstractInterfaceView
import com.noxcrew.interfaces.view.ChestInterfaceView
import com.noxcrew.interfaces.view.InterfaceView
Expand Down Expand Up @@ -505,4 +504,14 @@ public class InterfacesListeners private constructor(private val plugin: Plugin)
(query.view as AbstractInterfaceView<*, *, *>).markClosed(Reason.PLAYER)
}
}

/** Runs [function] on the main thread. */
internal fun runSync(function: () -> Unit) {
if (Bukkit.isPrimaryThread()) {
function()
return
}

Bukkit.getScheduler().callSyncMethod(plugin, function)
}
}
15 changes: 0 additions & 15 deletions interfaces/src/main/kotlin/com/noxcrew/interfaces/utilities/ThreadUtils.kt
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions interfaces/src/main/kotlin/com/noxcrew/interfaces/view/AbstractInterfaceView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import com.noxcrew.interfaces.properties.Trigger
import com.noxcrew.interfaces.transform.AppliedTransform
import com.noxcrew.interfaces.utilities.CollapsablePaneMap
import com.noxcrew.interfaces.utilities.forEachInGrid
import com.noxcrew.interfaces.utilities.runSync
import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Semaphore
import kotlinx.coroutines.withTimeout
Expand Down Expand Up @@ -176,7 +175,7 @@ public abstract class AbstractInterfaceView<I : InterfacesInventory, T : Interfa
// Ensure we always close on the main thread! Don't close if we are
// changing views though.
if (!changingView && isOpen()) {
runSync {
InterfacesListeners.INSTANCE.runSync {
if (!player.isConnected) return@runSync
player.closeInventory()
}
Expand Down Expand Up @@ -394,7 +393,7 @@ public abstract class AbstractInterfaceView<I : InterfacesInventory, T : Interfa
// Draw the contents of the inventory synchronously because
// we don't want it to happen in between ticks and show
// a half-finished inventory.
runSync {
InterfacesListeners.INSTANCE.runSync {
// If the menu has since been requested to close we ignore all this
if (!shouldBeOpened.get()) return@runSync

Expand Down
3 changes: 1 addition & 2 deletions interfaces/src/main/kotlin/com/noxcrew/interfaces/view/PlayerInterfaceView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import com.noxcrew.interfaces.InterfacesListeners
import com.noxcrew.interfaces.interfaces.PlayerInterface
import com.noxcrew.interfaces.inventory.PlayerInterfacesInventory
import com.noxcrew.interfaces.pane.PlayerPane
import com.noxcrew.interfaces.utilities.runSync
import net.kyori.adventure.text.Component
import org.bukkit.entity.Player
import org.bukkit.event.inventory.InventoryCloseEvent
Expand Down Expand Up @@ -65,7 +64,7 @@ public class PlayerInterfaceView internal constructor(

// Ensure we update the interface state in the main thread!
// Even if the menu is not currently on the screen.
runSync {
InterfacesListeners.INSTANCE.runSync {
InterfacesListeners.INSTANCE.setOpenInterface(player.uniqueId, null)
}
}
Expand Down
Loading