Merge pull request #846 from pylonmc/idra/misc-tweaks

Misc tweaks

Author: LordIdra

rebar/src/main/kotlin/io/github/pylonmc/rebar/Rebar.kt

@@ -54,6 +54,7 @@ import kotlinx.coroutines.launch
 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.FallingBlock
 import org.bukkit.entity.Interaction
@@ -95,10 +96,21 @@ object Rebar : JavaPlugin(), RebarAddon {
             logger.severe("!!!!!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!")
             logger.severe("You are running Rebar on Minecraft version $actualVersion")
             logger.severe("This build of Rebar expects Minecraft version $expectedVersion")
-            logger.severe("Rebar may run fine, but you may encounter bugs ranging from mild to catastrophic")
-            logger.severe("Please update your Rebar version accordingly")
             logger.severe("Please see https://github.com/pylonmc/rebar/releases for available Rebar versions")
+            try {
+                if (RebarConfig.BYPASS_VERSION_CHECK) {
+                    logger.severe("Bypass version set to true in config; proceeding anyway")
+                } else {
+                    logger.severe("Rebar will refuse to start")
+                    logger.severe("You can attempt to start anyway by setting bypass-version-check to true in the config")
+                }
+            } catch (e: Exception){
+                throw RuntimeException("Error while getting value of bypass-version-check", e)
+            }
             logger.severe("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
+            if (!RebarConfig.BYPASS_VERSION_CHECK) {
+                throw RuntimeException("The server is running $actualVersion but Rebar expected $expectedVersion")
+            }
         }
 
         InvUI.getInstance().setPlugin(this)
@@ -274,10 +286,6 @@ object Rebar : JavaPlugin(), RebarAddon {
         )
 
         addDefaultPermission("rebar.command.guide")
-        addDefaultPermission("rebar.command.waila")
-        addDefaultPermission("rebar.command.research.list.self")
-        addDefaultPermission("rebar.command.research.discover")
-        addDefaultPermission("rebar.command.research.points.query.self")
         lifecycleManager.registerEventHandler(LifecycleEvents.COMMANDS) {
             it.registrar().register(ROOT_COMMAND)
             it.registrar().register(ROOT_COMMAND_RE_ALIAS)
@@ -404,10 +412,7 @@ object Rebar : JavaPlugin(), RebarAddon {
 
     override val material = Material.BEDROCK
 
-    override val languages: Set<Locale> = setOf(
-        Locale.ENGLISH,
-        Locale.of("enws")
-    )
+    override val defaultLanguage: Locale = RebarConfig.DEFAULT_LANGUAGE
 }
 
 private fun addDefaultPermission(permission: String) {

rebar/src/main/kotlin/io/github/pylonmc/rebar/addon/RebarAddon.kt

@@ -18,7 +18,9 @@ import org.bukkit.event.Listener
 import org.bukkit.event.server.PluginDisableEvent
 import org.bukkit.plugin.java.JavaPlugin
 import org.jetbrains.annotations.ApiStatus
+import java.io.File
 import java.util.Locale
+import java.util.jar.JarFile
 
 /**
  * Welcome to the place where it all begins: the Rebar addon!
@@ -31,14 +33,16 @@ interface RebarAddon : Keyed {
     val javaPlugin: JavaPlugin
 
     /**
-     * The set of [Locale]s this addon has translations for.
+     * The material to represent this addon in menus.
      */
-    val languages: Set<Locale>
+    val material: Material
 
     /**
-     * The material to represent this addon in menus.
+     * The language to fall back to if a language entry is not found for the user's language.
+     *
+     * It is recommended to make this configurable in your addon's config.yml
      */
-    val material: Material
+    val defaultLanguage: Locale
 
     /**
      * The name used to represent this addon in the guide and other places.
@@ -77,7 +81,7 @@ interface RebarAddon : Keyed {
 
         RebarRegistry.ADDONS.register(this)
         if (!suppressAddonNameWarning) {
-            for (locale in languages) {
+            for (locale in translator.languages) {
                 if (!translator.canTranslate("${key.namespace}.addon", locale)) {
                     Rebar.logger.warning("${key.namespace} is missing the 'addon' translation key for ${locale.displayName}")
                 }

rebar/src/main/kotlin/io/github/pylonmc/rebar/block/interfaces/FluidBufferRebarBlock.kt

@@ -45,6 +45,7 @@ interface FluidBufferRebarBlock : FluidRebarBlock {
      * @param output whether this buffer can be taken from by fluid output points
      */
     fun createFluidBuffer(fluid: RebarFluid, capacity: Double, input: Boolean, output: Boolean) {
+        check(fluid !in fluidBuffers) { "Fluid $fluid already has a buffer" }
         fluidBuffers[fluid] = FluidBufferData(0.0, capacity, input, output)
     }
 

rebar/src/main/kotlin/io/github/pylonmc/rebar/block/interfaces/FluidTankRebarBlock.kt

@@ -62,7 +62,7 @@ interface FluidTankRebarBlock : FluidRebarBlock {
             get() = fluidData.capacity - fluidData.amount
 
     /**
-     * Sets the type of fluid in the fluid tank
+     * Sets the type of fluid in the fluid tank.
      */
     fun setFluidType(fluid: RebarFluid?) {
         fluidData.fluid = fluid

rebar/src/main/kotlin/io/github/pylonmc/rebar/block/interfaces/GuiRebarBlock.kt

@@ -7,6 +7,7 @@ import io.github.pylonmc.rebar.event.RebarBlockLoadEvent
 import io.github.pylonmc.rebar.event.RebarBlockPlaceEvent
 import io.github.pylonmc.rebar.event.RebarBlockUnloadEvent
 import net.kyori.adventure.text.Component
+import org.bukkit.entity.Player
 import org.bukkit.event.Event
 import org.bukkit.event.EventHandler
 import org.bukkit.event.EventPriority
@@ -31,16 +32,44 @@ import java.util.IdentityHashMap
  */
 interface GuiRebarBlock : NoVanillaInventoryRebarBlock {
 
+    /**
+     * The title of the GUI
+     */
+    val guiTitle: Component
+        get() = (this as RebarBlock).nameTranslationKey
+
     /**
      * Returns the block's GUI. Called when a block is created.
      */
     fun createGui(): Gui
 
     /**
-     * The title of the GUI
+     * Refreshes the stores GUI by calling [createGui] again.
+     *
+     * If players have the GUI already open, it will be closed and then re-opened with the
+     * new GUI manually.
+     *
+     * Strongly consider [updating individual items](https://docs.xenondevs.xyz/invui/item/)
+     * before you use this method, to prevent having to constantly close and re-open windows.
      */
-    val guiTitle: Component
-        get() = (this as RebarBlock).nameTranslationKey
+    fun refreshGui() {
+        val oldGui = guiBlocks[this]
+        val players = oldGui?.windows?.map { it.viewer } ?: emptyList()
+        oldGui?.windows?.forEach { it.close() }
+        guiBlocks[this] = createGui()
+        for (player in players) {
+            open(player)
+        }
+    }
+
+    fun open(player: Player) {
+            Window.builder()
+                .setUpperGui(guiBlocks[this]!!)
+                .setTitle(guiTitle)
+                .setViewer(player)
+                .build()
+                .open()
+    }
 
     companion object : Listener {
         private val guiBlocks = IdentityHashMap<GuiRebarBlock, Gui>()
@@ -74,12 +103,7 @@ interface GuiRebarBlock : NoVanillaInventoryRebarBlock {
             event.setUseInteractedBlock(Event.Result.DENY)
             event.setUseItemInHand(Event.Result.DENY)
 
-            Window.builder()
-                .setUpperGui(guiBlocks[guiBlock]!!)
-                .setTitle(guiBlock.guiTitle)
-                .setViewer(event.player)
-                .build()
-                .open()
+            guiBlock.open(event.player)
         }
 
         @EventHandler

rebar/src/main/kotlin/io/github/pylonmc/rebar/command/RebarCommand.kt

@@ -18,6 +18,7 @@ import io.github.pylonmc.rebar.content.guide.RebarGuide
 import io.github.pylonmc.rebar.entity.display.transform.Rotation
 import io.github.pylonmc.rebar.gametest.GameTestConfig
 import io.github.pylonmc.rebar.i18n.RebarArgument
+import io.github.pylonmc.rebar.i18n.RebarTranslator.Companion.translator
 import io.github.pylonmc.rebar.i18n.customMiniMessage
 import io.github.pylonmc.rebar.item.ItemTypeWrapper
 import io.github.pylonmc.rebar.item.RebarItem
@@ -647,6 +648,7 @@ private val fillMultiblock = buildCommand("fillmultiblock") {
 }
 
 private val versions = buildCommand("versions") {
+    permission("rebar.command.versions")
     executes { sender ->
         RebarMetrics.onCommandRun("/rb versions")
         val serverImplementation = Bukkit.getName()
@@ -678,6 +680,17 @@ private val versions = buildCommand("versions") {
     }
 }
 
+private val reloadlang = buildCommand("reloadlang") {
+    permission("rebar.command.reloadlang")
+    executes { sender ->
+        RebarMetrics.onCommandRun("/rb reloadlang")
+        for (addon in RebarRegistry.ADDONS) {
+            addon.translator.reload()
+        }
+        sender.sendFeedback("reloadlang.success")
+    }
+}
+
 @JvmSynthetic
 internal val ROOT_COMMAND = buildCommand("rebar") {
     permission("rebar.command.guide")
@@ -699,6 +712,7 @@ internal val ROOT_COMMAND = buildCommand("rebar") {
     then(confetti)
     then(fillMultiblock)
     then(versions)
+    then(reloadlang)
 }
 
 @JvmSynthetic

rebar/src/main/kotlin/io/github/pylonmc/rebar/config/RebarConfig.kt

@@ -12,6 +12,12 @@ object RebarConfig {
 
     private val config = ConfigSection.copyResource(Rebar, "config.yml")
 
+    @JvmField
+    val BYPASS_VERSION_CHECK = config.getOrThrow("bypass-version-check", ConfigAdapter.BOOLEAN)
+
+    @JvmField
+    val DEFAULT_LANGUAGE = config.getOrThrow("default-language", ConfigAdapter.LOCALE)
+
     @JvmField
     val DEFAULT_TICK_INTERVAL = config.getOrThrow("default-tick-interval", ConfigAdapter.INTEGER)
 

rebar/src/main/kotlin/io/github/pylonmc/rebar/config/adapter/ConfigAdapter.kt

@@ -15,6 +15,7 @@ import org.joml.Vector3d
 import org.joml.Vector3f
 import org.joml.Vector3i
 import java.lang.reflect.Type
+import java.util.Locale
 
 interface ConfigAdapter<T> {
 
@@ -53,6 +54,7 @@ interface ConfigAdapter<T> {
         @JvmField val ITEM_TYPE_WRAPPER = KEYED.fromGetter { ItemTypeWrapper(it) }
         @JvmField val ITEM_STACK = ItemStackConfigAdapter
         @JvmField val BLOCK_DATA = ConfigAdapter { Bukkit.createBlockData(STRING.convert(it)) }
+        @JvmField val LOCALE = ConfigAdapter { Locale.of(STRING.convert(it)) }
 
          @JvmField val VECTOR_2I = ConfigAdapter {
             val list = (it as List<*>).filterIsInstance<Int>()

rebar/src/main/kotlin/io/github/pylonmc/rebar/fluid/RebarFluid.kt

@@ -62,7 +62,7 @@ open class RebarFluid(
 
     init {
         if (key !in nameWarningsSuppressed) {
-            for (locale in addon.languages) {
+            for (locale in addon.translator.languages) {
                 val translationKey = "${key.namespace}.fluid.${key.key}"
                 if (!addon.translator.canTranslate(translationKey, locale)) {
                     Rebar.logger.warning("${key.namespace} is missing a translation key for fluid ${key.key} (locale: ${locale.displayName} | expected translation key: $translationKey)")

rebar/src/main/kotlin/io/github/pylonmc/rebar/guide/button/ItemButton.kt

@@ -67,7 +67,7 @@ class ItemButton private constructor(
                 builder.set(DataComponentTypes.ITEM_MODEL, Material.STRUCTURE_VOID.key)
             }
 
-            if (!player.canCraft(itemSchema, respectBypass = false)) {
+            if (!player.canCraft(itemSchema)) {
                 builder.set(DataComponentTypes.ITEM_MODEL, Material.BARRIER.key)
                     .set(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE, false)
 
@@ -99,7 +99,7 @@ class ItemButton private constructor(
             }
 
             if (player.guideHints) {
-                if (!player.canCraft(itemSchema, respectBypass = false)) {
+                if (!player.canCraft(itemSchema)) {
                     builder.lore(Component.translatable("rebar.guide.button.item.hints.unresearched"))
                 }
             }