Merge pull request #17 from Asleeepp/1.6-test

1.6 PR

Author: Asleeepp

build.gradle

@@ -0,0 +1,108 @@
+import org.apache.tools.ant.filters.ReplaceTokens
+
+plugins {
+    `java-library`
+    `maven-publish`
+    alias(libs.plugins.shadow)
+    alias(libs.plugins.run.paper)
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+    maven("https://repo.papermc.io/repository/maven-public/")
+    maven("https://repo.skriptlang.org/releases")
+    maven("https://jitpack.io")
+}
+
+java {
+    disableAutoTargetJvm()
+    toolchain.languageVersion = JavaLanguageVersion.of(21)
+}
+
+description = "A skript addon that aims to bring more to linking ItemsAdder and Skript"
+group = "me.asleepp"
+version = "1.6"
+
+dependencies {
+    compileOnly(libs.paper.api)
+    compileOnly(libs.lombok)
+    compileOnly(libs.itemsadder)
+    compileOnly(libs.skript)
+    annotationProcessor(libs.lombok)
+}
+
+
+tasks {
+    jar {
+        enabled = false
+    }
+
+    shadowJar {
+        archiveFileName = "${rootProject.name}-${project.version}.jar"
+        archiveClassifier = null
+
+        manifest {
+            attributes["Implementation-Version"] = rootProject.version
+        }
+
+        configurations = listOf(project.configurations.shadow.get())
+        minimize()
+    }
+
+    assemble {
+        dependsOn(shadowJar)
+    }
+
+    withType<JavaCompile> {
+        options.encoding = Charsets.UTF_8.name()
+        options.release = 17
+    }
+
+    withType<Javadoc>() {
+        options.encoding = Charsets.UTF_8.name()
+    }
+
+    processResources {
+        filter<ReplaceTokens>("tokens" to mapOf("version" to project.version))
+        inputs.property("version", project.version)
+
+        filesMatching("plugin.yml") {
+            expand(
+                "version" to rootProject.version,
+            )
+        }
+    }
+
+    defaultTasks("build")
+
+    // 1.8.8 - 1.16.5 = Java 8
+    // 1.17           = Java 16
+    // 1.18 - 1.20.4  = Java 17
+    // 1-20.5+        = Java 21
+    val version = "1.20.4"
+    val javaVersion = JavaLanguageVersion.of(17)
+
+    val jvmArgsExternal = listOf(
+        "-Dcom.mojang.eula.agree=true"
+    )
+
+    runServer {
+        minecraftVersion(version)
+        runDirectory = rootDir.resolve("run/paper/$version")
+
+        javaLauncher = project.javaToolchains.launcherFor {
+            languageVersion = javaVersion
+        }
+
+        downloadPlugins {
+            url("https://download.luckperms.net/1552/bukkit/loader/LuckPerms-Bukkit-5.4.137.jar")
+            url("https://github.com/SkriptLang/Skript/releases/download/2.9.1/Skript-2.9.1.jar")
+            url("https://github.com/dmulloy2/ProtocolLib/releases/download/5.2.0/ProtocolLib.jar")
+            url("https://github.com/LoneDev6/SpigotUtilities/raw/master/LoneLibs.jar")
+        }
+
+        jvmArgs = jvmArgsExternal
+    }
+}
+

build.gradle.kts

@@ -0,0 +1,3 @@
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.daemon=true

gradle.properties

@@ -0,0 +1,17 @@
+[versions]
+paper-api = "1.21-R0.1-SNAPSHOT"
+lombok = "1.18.34"
+shadow = "8.1.8"
+run-paper = "2.3.0"
+skript = "2.7.1"
+itemsadder = "3.6.1"
+
+[libraries]
+paper-api = { module = "io.papermc.paper:paper-api", version.ref = "paper-api" }
+lombok = { group = "org.projectlombok", name = "lombok", version.ref = "lombok" }
+skript = { group = "com.github.SkriptLang", name = "Skript", version.ref = "skript"}
+itemsadder = { group = "com.github.LoneDev6", name = "API-ItemsAdder", version.ref = "itemsadder"}
+
+[plugins]
+run-paper = { id = "xyz.jpenilla.run-paper", version.ref = "run-paper" }
+shadow = { id = "io.github.goooler.shadow", version.ref = "shadow" }

gradle/libs.versions.toml

@@ -0,0 +1,12 @@
+pluginManagement {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
+rootProject.name = "skript-itemsadder"

settings.gradle

@@ -2,8 +2,14 @@
 
 import java.io.IOException;
 
-
 import ch.njol.skript.util.Version;
+import lombok.Getter;
+import me.asleepp.SkriptItemsAdder.aliases.AliasesGenerator;
+import me.asleepp.SkriptItemsAdder.listeners.ItemsAdderEventListener;
+import me.asleepp.SkriptItemsAdder.util.Metrics;
+import me.asleepp.SkriptItemsAdder.util.SkriptItemsAdderCommand;
+import me.asleepp.SkriptItemsAdder.util.UpdateChecker;
+import me.asleepp.SkriptItemsAdder.util.Util;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -13,57 +19,89 @@
 
 import javax.annotation.Nullable;
 
-@SuppressWarnings("ALL")
 public class SkriptItemsAdder extends JavaPlugin {
 
     private static SkriptAddon addon;
-
     private static SkriptItemsAdder instance;
+    @Getter
+    private AliasesGenerator aliasesGenerator;
 
     @Nullable
     public static SkriptItemsAdder getInstance() {
         return instance;
     }
+
     @Nullable
     public static SkriptAddon getAddonInstance() {
         return addon;
     }
 
+    private final PluginManager manager = this.getServer().getPluginManager();
 
+    @Override
     public void onEnable() {
         // Let's get this show on the road.
-        final PluginManager manager = this.getServer().getPluginManager();
+        long start = System.currentTimeMillis();
         final Plugin skript = manager.getPlugin("Skript");
         if (skript == null || !skript.isEnabled()) {
             getLogger().severe("Could not find Skript! Disabling...");
             manager.disablePlugin(this);
             return;
-        } else if (Skript.getVersion().compareTo(new Version(2, 7, 0)) < 0) {
-            getLogger().warning("You are running an unsupported version of Skript. Disabling...");
+        } else if (Skript.getVersion().isSmallerThan(new Version(2, 7, 0))) {
+            getLogger().severe("You are running an unsupported version of Skript. Disabling...");
+            manager.disablePlugin(this);
+            return;
+        }
+        if (!Skript.isAcceptRegistrations()) {
+            getLogger().severe("The plugin can't load when it's already loaded! Disabling...");
             manager.disablePlugin(this);
             return;
         }
+
         final Plugin itemsadder = manager.getPlugin("ItemsAdder");
         if (itemsadder == null || !itemsadder.isEnabled()) {
             getLogger().severe("Could not find ItemsAdder! Disabling...");
             manager.disablePlugin(this);
             return;
         }
+
+        this.aliasesGenerator = new AliasesGenerator(this);
+
+        final SkriptItemsAdder plugin = this;
+
+        // Pass the aliasesGenerator to the event listener
+        ItemsAdderEventListener eventListener = new ItemsAdderEventListener(plugin, aliasesGenerator);
+        manager.registerEvents(eventListener, plugin);
+
         int pluginId = 20971;
         Metrics metrics = new Metrics(this, pluginId);
+        metrics.addCustomChart(new Metrics.SimplePie("skript_version", () -> Skript.getVersion().toString()));
+        metrics.addCustomChart(new Metrics.SimplePie("itemsadder_version", () -> Util.getPluginVersion("ItemsAdder")));
         instance = this;
         addon = Skript.registerAddon(this);
         addon.setLanguageFileDirectory("lang");
+        new SkriptItemsAdderCommand(this);
+
+        saveDefaultConfig();
+
         try {
-            addon.loadClasses("me.asleepp.SkriptItemsAdder");
+            addon.loadClasses("me.asleepp.SkriptItemsAdder", "elements");
         } catch (IOException error) {
             error.printStackTrace();
             manager.disablePlugin(this);
             return;
         }
 
+        if (getConfig().getBoolean("check-for-updates", true))
+            new UpdateChecker(this);
 
+        long finish = System.currentTimeMillis() - start;
+        getLogger().info("Successfully loaded skript-itemsadder in " + finish + "ms!");
+        eventListener.generateAliases();
     }
 
-
-}
+    @Override
+    public void onDisable() {
+        aliasesGenerator.saveAliases();
+    }
+}