Skip to content

Settings system & Waila update #386

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Settings system & Waila update #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1983c78
settings system & waila update
JustAHuman-xD Oct 6, 2025
2b7f808
reorder that
JustAHuman-xD Oct 6, 2025
89571b5
Update pylon-core/src/main/resources/config.yml
JustAHuman-xD Oct 7, 2025
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
30 changes: 24 additions & 6 deletions pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/PylonCore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,20 @@ import io.github.pylonmc.pylon.core.addon.PylonAddon
import io.github.pylonmc.pylon.core.block.*
import io.github.pylonmc.pylon.core.block.base.*
import io.github.pylonmc.pylon.core.resourcepack.block.BlockTextureEngine
import io.github.pylonmc.pylon.core.block.waila.Waila
import io.github.pylonmc.pylon.core.command.ROOT_COMMAND
import io.github.pylonmc.pylon.core.command.ROOT_COMMAND_PY_ALIAS
import io.github.pylonmc.pylon.core.config.Config
import io.github.pylonmc.pylon.core.config.ConfigSection
import io.github.pylonmc.pylon.core.config.PylonConfig
import io.github.pylonmc.pylon.core.content.debug.DebugWaxedWeatheredCutCopperStairs
import io.github.pylonmc.pylon.core.content.fluid.*
import io.github.pylonmc.pylon.core.content.guide.PylonGuide
import io.github.pylonmc.pylon.core.entity.EntityListener
import io.github.pylonmc.pylon.core.entity.EntityStorage
import io.github.pylonmc.pylon.core.entity.PylonEntity
import io.github.pylonmc.pylon.core.fluid.connecting.ConnectingService
import io.github.pylonmc.pylon.core.guide.button.PageButton
import io.github.pylonmc.pylon.core.guide.pages.SettingsPage
import io.github.pylonmc.pylon.core.i18n.PylonTranslator
import io.github.pylonmc.pylon.core.item.PylonItem
import io.github.pylonmc.pylon.core.item.PylonItemListener
Expand All @@ -31,8 +33,11 @@ import io.github.pylonmc.pylon.core.recipe.ConfigurableRecipeType
import io.github.pylonmc.pylon.core.recipe.PylonRecipeListener
import io.github.pylonmc.pylon.core.recipe.RecipeType
import io.github.pylonmc.pylon.core.registry.PylonRegistry
import io.github.pylonmc.pylon.core.resourcepack.armor.ArmorTextureConfig
import io.github.pylonmc.pylon.core.resourcepack.block.BlockTextureConfig
import io.github.pylonmc.pylon.core.resourcepack.armor.ArmorTextureEngine
import io.github.pylonmc.pylon.core.waila.Waila
import io.github.pylonmc.pylon.core.waila.WailaConfig
import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder
import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents
import kotlinx.coroutines.delay
Expand All @@ -44,7 +49,6 @@ import org.bukkit.Bukkit
import org.bukkit.Material
import org.bukkit.NamespacedKey
import org.bukkit.configuration.file.YamlConfiguration
import org.bukkit.entity.BlockDisplay
import org.bukkit.entity.Interaction
import org.bukkit.entity.ItemDisplay
import org.bukkit.permissions.Permission
Expand Down Expand Up @@ -72,8 +76,6 @@ object PylonCore : JavaPlugin(), PylonAddon {
val packetEvents = PacketEvents.getAPI()
packetEvents.init()

packetEvents.eventManager.registerListener(ArmorTextureEngine, PacketListenerPriority.HIGHEST)

val entityLibPlatform = SpigotEntityLibPlatform(this)
entityLibPlatform.entityIdProvider = EntityIdProvider { uuid, type -> Bukkit.getUnsafe().nextEntityId() }
val entityLibSettings = APIConfig(packetEvents)
Expand All @@ -98,7 +100,6 @@ object PylonCore : JavaPlugin(), PylonAddon {
Bukkit.getPluginManager().registerEvents(MultiblockCache, this)
Bukkit.getPluginManager().registerEvents(EntityStorage, this)
Bukkit.getPluginManager().registerEvents(EntityListener, this)
Bukkit.getPluginManager().registerEvents(Waila, this)
Bukkit.getPluginManager().registerEvents(Research, this)
Bukkit.getPluginManager().registerEvents(PylonGuiBlock, this)
Bukkit.getPluginManager().registerEvents(PylonEntityHolderBlock, this)
Expand All @@ -110,11 +111,28 @@ object PylonCore : JavaPlugin(), PylonAddon {
Bukkit.getPluginManager().registerEvents(PylonTickingBlock, this)
Bukkit.getPluginManager().registerEvents(PylonGuide, this)

if (BlockTextureConfig.customBlockTexturesEnabled) {
if (WailaConfig.wailaEnabled) {
PylonGuide.settingsPage.addSetting(PageButton(SettingsPage.wailaSettings))
Bukkit.getPluginManager().registerEvents(Waila, this)
}

PylonGuide.settingsPage.addSetting(PageButton(SettingsPage.resourcePackSettings))

if (ArmorTextureConfig.armorTexturesEnabled) {
SettingsPage.resourcePackSettings.addSetting(SettingsPage.armorTextureSetting)
packetEvents.eventManager.registerListener(ArmorTextureEngine, PacketListenerPriority.HIGHEST)
}

if (BlockTextureConfig.blockTexturesEnabled) {
SettingsPage.resourcePackSettings.addSetting(PageButton(SettingsPage.blockTextureSettings))
Bukkit.getPluginManager().registerEvents(BlockTextureEngine, this)
BlockTextureEngine.updateOccludingCacheJob.start()
}

if (PylonConfig.researchesEnabled) {
PylonGuide.settingsPage.addSetting(SettingsPage.researchEffects)
}

Bukkit.getScheduler().runTaskTimer(
this,
MultiblockCache.MultiblockChecker,
Expand Down
6 changes: 3 additions & 3 deletions pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/block/PhantomBlock.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package io.github.pylonmc.pylon.core.block

import io.github.pylonmc.pylon.core.block.context.BlockBreakContext
import io.github.pylonmc.pylon.core.block.context.BlockCreateContext
import io.github.pylonmc.pylon.core.block.waila.WailaConfig
import io.github.pylonmc.pylon.core.datatypes.PylonSerializers
import io.github.pylonmc.pylon.core.i18n.PylonArgument
import io.github.pylonmc.pylon.core.item.PylonItem
import io.github.pylonmc.pylon.core.item.builder.ItemStackBuilder
import io.github.pylonmc.pylon.core.util.pylonKey
import io.github.pylonmc.pylon.core.waila.WailaDisplay
import net.kyori.adventure.bossbar.BossBar
import org.bukkit.Material
import org.bukkit.NamespacedKey
Expand Down Expand Up @@ -50,8 +50,8 @@ class PhantomBlock(
throw UnsupportedOperationException("Phantom block cannot be loaded")
}

override fun getWaila(player: Player): WailaConfig? {
return WailaConfig(
override fun getWaila(player: Player): WailaDisplay? {
return WailaDisplay(
text = defaultWailaTranslationKey.arguments(PylonArgument.of("block", erroredBlockKey.toString())),
color = BossBar.Color.RED
)
Expand Down
8 changes: 4 additions & 4 deletions pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/block/PylonBlock.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import io.github.pylonmc.pylon.core.block.base.PylonEntityHolderBlock
import io.github.pylonmc.pylon.core.block.base.PylonGuiBlock
import io.github.pylonmc.pylon.core.block.context.BlockBreakContext
import io.github.pylonmc.pylon.core.block.context.BlockCreateContext
import io.github.pylonmc.pylon.core.block.waila.WailaConfig
import io.github.pylonmc.pylon.core.config.Config
import io.github.pylonmc.pylon.core.config.Settings
import io.github.pylonmc.pylon.core.content.debug.DebugWaxedWeatheredCutCopperStairs
Expand All @@ -21,6 +20,7 @@ import io.github.pylonmc.pylon.core.resourcepack.block.BlockTextureConfig
import io.github.pylonmc.pylon.core.util.position.BlockPosition
import io.github.pylonmc.pylon.core.util.position.position
import io.github.pylonmc.pylon.core.util.pylonKey
import io.github.pylonmc.pylon.core.waila.WailaDisplay
import io.github.retrooper.packetevents.util.SpigotConversionUtil
import me.tofaa.entitylib.meta.display.ItemDisplayMeta
import me.tofaa.entitylib.wrapper.WrapperEntity
Expand Down Expand Up @@ -90,7 +90,7 @@ open class PylonBlock internal constructor(val block: Block) {
* you can use [updateBlockTexture] to change the entity's item to reflect the lit/unlit state.
*/
val blockTextureEntity: WrapperEntity? by lazy {
if (!BlockTextureConfig.customBlockTexturesEnabled || disableBlockTextureEntity) {
if (!BlockTextureConfig.blockTexturesEnabled || disableBlockTextureEntity) {
null
} else {
val entity = WrapperEntity(EntityTypes.ITEM_DISPLAY)
Expand Down Expand Up @@ -201,8 +201,8 @@ open class PylonBlock internal constructor(val block: Block) {
*
* @return the WAILA configuration, or null if WAILA should not be shown for this block.
*/
open fun getWaila(player: Player): WailaConfig? {
return WailaConfig(defaultWailaTranslationKey)
open fun getWaila(player: Player): WailaDisplay? {
return WailaDisplay(defaultWailaTranslationKey)
}

/**
Expand Down
174 changes: 0 additions & 174 deletions pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/block/waila/Waila.kt
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/block/waila/WailaConfig.kt
View file
Open in desktop

This file was deleted.

12 changes: 8 additions & 4 deletions pylon-core/src/main/kotlin/io/github/pylonmc/pylon/core/command/PylonCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import io.github.pylonmc.pylon.core.PylonCore
import io.github.pylonmc.pylon.core.addon.PylonAddon
import io.github.pylonmc.pylon.core.block.BlockStorage
import io.github.pylonmc.pylon.core.block.PylonBlockSchema
import io.github.pylonmc.pylon.core.block.waila.Waila.Companion.wailaEnabled
import io.github.pylonmc.pylon.core.content.debug.DebugWaxedWeatheredCutCopperStairs
import io.github.pylonmc.pylon.core.content.guide.PylonGuide
import io.github.pylonmc.pylon.core.entity.display.transform.Rotation
Expand All @@ -33,6 +32,8 @@ import io.github.pylonmc.pylon.core.gametest.GameTestConfig
import io.github.pylonmc.pylon.core.util.mergeGlobalConfig
import io.github.pylonmc.pylon.core.util.position.BlockPosition
import io.github.pylonmc.pylon.core.util.vanillaDisplayName
import io.github.pylonmc.pylon.core.waila.Waila.Companion.wailaConfig
import io.github.pylonmc.pylon.core.waila.WailaConfig
import io.papermc.paper.command.brigadier.CommandSourceStack
import io.papermc.paper.command.brigadier.argument.ArgumentTypes
import io.papermc.paper.command.brigadier.argument.resolvers.BlockPositionResolver
Expand Down Expand Up @@ -172,8 +173,9 @@ private val waila = buildCommand("waila") {
permission("pylon.command.waila")
executesWithPlayer { player ->
PylonMetrics.onCommandRun("/py waila")
player.wailaEnabled = !player.wailaEnabled
player.sendFeedback(if (player.wailaEnabled) "waila.enabled" else "waila.disabled")
val config = player.wailaConfig
config.enabled = !config.enabled
player.sendFeedback(if (config.enabled) "waila.enabled" else "waila.disabled")
}
}

Expand Down Expand Up @@ -516,7 +518,9 @@ internal val ROOT_COMMAND = buildCommand("pylon") {
then(debug)
then(key)
then(setblock)
then(waila)
if (WailaConfig.wailaEnabled) {
then(waila)
}
then(gametest)
then(research)
then(exposeRecipeConfig)
Expand Down
Loading