Merge pull request #6 from true-og/codex/rename-minecraft-plugin-to-panilla-og

Rename plugin to Panilla-OG, target GraalVM 17, and set output jar name

README.md

@@ -1,11 +1,11 @@
-# Panilla
-Panilla (the name) is a combination of the word Packet and Vanilla (as in Vanilla Minecraft).
+# Panilla-OG
+Panilla-OG (originally Panilla) is a combination of the word Packet and Vanilla (as in Vanilla Minecraft).
 
 [Support the development of this plugin and purchase a precompiled .jar file on SpigotMC](https://www.spigotmc.org/resources/65694/) (or compile your own for free)
 
 
 ## Overview
-Panilla is software to prevent abusive NBT and packets on Minecraft servers.
+Panilla-OG is software to prevent abusive NBT and packets on Minecraft servers.
 
 With this software, you will be able to prevent:
 
@@ -23,7 +23,7 @@ With this software, you will be able to prevent:
 - and more abusive NBT
 
 ## Supported Platforms
-Currently Panilla supports:
+Currently Panilla-OG supports:
 - Bukkit
   - CraftBukkit* 1.8.8
   - CraftBukkit* 1.12.x-1.19.x
@@ -33,8 +33,8 @@ Currently Panilla supports:
 If you would like support for a server platform or Minecraft version that is not listed, please make an issue on GitHub.  
 
 ## Compiling
-In order for you to compile Panilla, you will need to use [BuildTools, by SpigotMC](https://www.spigotmc.org/wiki/buildtools), and build each version of CraftBukkit which is supported by Panilla.
-When you run BuildTools, it will add the dependencies required (CraftBukkit/Bukkit) to your local Maven repository.
-From there, you can compile the project with `./gradlew build`. The output plugin jars file will located in the `target/` directory.
-
-Java 17 is required to build Panilla.
+In order for you to compile Panilla-OG, you will need to use [BuildTools, by SpigotMC](https://www.spigotmc.org/wiki/buildtools), and build each version of CraftBukkit which is supported by Panilla-OG.
+When you run BuildTools, it will add the dependencies required (CraftBukkit/Bukkit) to your local Maven repository.
+From there, you can compile the project with `./gradlew build`. The installable plugin jar is written to `build/libs/Panilla-<version>-.jar`.
+
+Gradle 8.14.3 with GraalVM Java 17 is required to build Panilla-OG.

build.gradle.kts

@@ -1,4 +1,6 @@
 import org.gradle.api.artifacts.component.ModuleComponentSelector
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.jvm.toolchain.JvmVendorSpec
 
 plugins {
     id("eclipse")
@@ -25,6 +27,10 @@ subprojects {
     apply(plugin = "java")
 
     extensions.configure<JavaPluginExtension> {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(17))
+            vendor.set(JvmVendorSpec.GRAAL_VM)
+        }
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }

bukkit/build.gradle.kts

@@ -1,6 +1,7 @@
 import org.gradle.api.tasks.SourceSetContainer
 import org.gradle.jvm.tasks.Jar
 import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.jvm.toolchain.JvmVendorSpec
 
 plugins {
     java
@@ -39,6 +40,7 @@ dependencies {
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.GRAAL_VM)
     }
 }
 
@@ -50,11 +52,9 @@ tasks.processResources {
 
 val pluginJar by tasks.registering(Jar::class) {
     group = LifecycleBasePlugin.BUILD_GROUP
-    description = "Assembles the deployable Panilla plugin jar."
+    description = "Assembles the deployable Panilla-OG plugin jar."
 
-    archiveBaseName.set("Panilla")
-    archiveVersion.set(pluginVersion)
-    archiveClassifier.set("")
+    archiveFileName.set("Panilla-${pluginVersion}-.jar")
     destinationDirectory.set(rootProject.layout.buildDirectory.dir("libs"))
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 

bukkit/src/main/java/com/ruinscraft/panilla/bukkit/PanillaCommand.java

@@ -21,15 +21,15 @@ public class PanillaCommand implements CommandExecutor {
     private boolean showInfo(CommandSender sender) {
         String version = panillaPlugin.getDescription().getVersion();
         List<String> authors = panillaPlugin.getDescription().getAuthors();
-        sender.sendMessage(ChatColor.GOLD + "Running Panilla version " + version + " by " + String.join(", ", authors));
+        sender.sendMessage(ChatColor.GOLD + "Running Panilla-OG version " + version + " by " + String.join(", ", authors));
         return true;
     }
 
     private boolean showDebug(CommandSender sender) {
         List<String> debugInfo = new ArrayList<>();
-        debugInfo.add(ChatColor.BOLD + "=== Panilla Debug ===");
+        debugInfo.add(ChatColor.BOLD + "=== Panilla-OG Debug ===");
         debugInfo.add("Bukkit version: " + Bukkit.getVersion());
-        debugInfo.add("Panilla version: " + panillaPlugin.getDescription().getVersion());
+        debugInfo.add("Panilla-OG version: " + panillaPlugin.getDescription().getVersion());
         debugInfo.add("Java version: " + System.getProperty("java.version"));
         List<String> pluginNames = new ArrayList<>();
         for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {

bukkit/src/main/java/com/ruinscraft/panilla/bukkit/PanillaPlugin.java

@@ -290,7 +290,7 @@ public class PanillaPlugin extends JavaPlugin implements IPanilla {
                         break imp;
                 }
             default:
-                getLogger().warning("Unknown server implementation. " + Bukkit.getVersion() + " may not be supported by Panilla.");
+                getLogger().warning("Unknown server implementation. " + Bukkit.getVersion() + " may not be supported by Panilla-OG.");
                 return;
         }
 

bukkit/src/main/resources/config.yml

@@ -1,5 +1,5 @@
 ##################################################################
-# Panilla Bukkit Configuration
+# Panilla-OG Bukkit Configuration
 #
 # Resource page: https://www.spigotmc.org/resources/65694/
 # Source code: https://github.com/Ruinscraft/Panilla
@@ -30,8 +30,8 @@ prevent-minecraft-education-skulls: false
 # out FAWE brush items which may trick others into accidentally WorldEdit'ing
 prevent-fawe-brush-nbt: false
 
-# When checking packets, by default, Panilla will check any inventory (player, chest, etc...)
-# Setting this to true will make Panilla only check player inventories
+# When checking packets, by default, Panilla-OG will check any inventory (player, chest, etc...)
+# Setting this to true will make Panilla-OG only check player inventories
 
 # This can help with ensuring custom GUI's in plugins don't get flagged
 # This may also marginally improve performance
@@ -48,7 +48,7 @@ no-block-entity-tag: false
 nbt-whitelist:
 #  - Enchantments
 
-# Prevent Panilla from checking NBT in certain worlds
+# Prevent Panilla-OG from checking NBT in certain worlds
 # Effectively sets the world to the lenient strictness (to prevent crash exploits)
 # Case sensitive!
 disabled-worlds:

bukkit/src/main/resources/plugin.yml

@@ -1,4 +1,4 @@
-name: Panilla
+name: Panilla-OG
 version: ${version}
 main: com.ruinscraft.panilla.bukkit.PanillaPlugin
 api-version: 1.13

settings.gradle.kts

@@ -63,7 +63,7 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "Panilla"
+rootProject.name = "Panilla-OG"
 
 include(
     ":panilla-api",