fix: CI

.gitea/workflows/build.yml

@@ -24,6 +24,10 @@ jobs:
       - name: Setup gradle
         uses: gradle/actions/setup-gradle@v4
 
+      - name: Build
+        if: gitea.ref == 'refs/heads/master'
+        run: ./gradlew build
+
       - name: Run build & publish with Gradle Wrapper
         if: gitea.ref == 'refs/heads/master'
-        run: chmod +x ./gradlew && ./gradlew build publishAllPublicationsToMavenRepository -PnetheriteRepoUsername=${{ secrets.REPOSILITE_USER }} -PnetheriteRepoPassword=${{ secrets.REPOSILITE_PASSWORD }}
+        run: chmod +x ./gradlew && ./gradlew publishAllPublicationsToNetheriteRepoRepository -PnetheriteRepoUsername=${{ secrets.REPOSILITE_USER }} -PnetheriteRepoPassword=${{ secrets.REPOSILITE_PASSWORD }}

api/build.gradle.kts

@@ -1,7 +1,6 @@
 plugins {
     entitylib.`shadow-conventions`
     entitylib.`library-conventions`
-    `el-version`
 }
 
 dependencies {
@@ -10,21 +9,3 @@ dependencies {
     compileOnly(libs.bundles.adventure)
     compileOnly(libs.packetevents.api)
 }
-
-tasks {
-    javadoc {
-        mustRunAfter(generateVersionsFile)
-    }
-
-    sourcesJar {
-        mustRunAfter(generateVersionsFile)
-    }
-
-    withType<JavaCompile> {
-        dependsOn(generateVersionsFile)
-    }
-
-    generateVersionsFile {
-        packageName = "me.tofaa.entitylib.utils"
-    }
-}

api/src/main/java/me/tofaa/entitylib/EntityLib.java

@@ -1,7 +1,5 @@
 package me.tofaa.entitylib;
 
-import com.github.retrooper.packetevents.util.PEVersion;
-import me.tofaa.entitylib.utils.ELVersions;
 import me.tofaa.entitylib.utils.GithubUpdater;
 
 import java.util.Optional;
@@ -32,8 +30,4 @@ public final class EntityLib {
     public static Platform<?> getPlatform() {
         return platform;
     }
-
-    public static PEVersion getVersion() {
-        return ELVersions.CURRENT;
-    }
 }

api/src/main/java/me/tofaa/entitylib/utils/GithubUpdater.java

@@ -1,17 +1,6 @@
 package me.tofaa.entitylib.utils;
 
-import com.github.retrooper.packetevents.util.PEVersion;
-import com.github.retrooper.packetevents.util.adventure.AdventureSerializer;
-import com.google.gson.JsonObject;
 import me.tofaa.entitylib.EntityLib;
-import org.jetbrains.annotations.Blocking;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.concurrent.CompletableFuture;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -19,13 +8,11 @@ public final class GithubUpdater {
 
     private final String org;
     private final String repo;
-    private final PEVersion currentVersion;
     private final Logger logger;
 
     public GithubUpdater(String org, String repo) {
         this.org = org;
         this.repo = repo;
-        this.currentVersion = ELVersions.CURRENT;
         this.logger = EntityLib.getPlatform().getLogger();
 
         if (EntityLib.getApi().getSettings().shouldCheckForUpdate()) {
@@ -38,42 +25,7 @@ public final class GithubUpdater {
     }
 
     private void checkForUpdates() {
-        CompletableFuture.runAsync(() -> {
+        logger.log(Level.INFO, "Update checking disabled");
-            try {
-                PEVersion latestVersion = getLatestVersion();
-                if (currentVersion.isOlderThan(latestVersion)) {
-                    logger.log(Level.WARNING, "You are using an outdated version of EntityLib. Version: " + latestVersion + " is now available.");
-                } else if (currentVersion.equals(latestVersion)) {
-                    logger.log(Level.INFO, "No EntityLib updates found.");
-                }
-            } catch (Exception ex) {
-                logger.warning("Failed to check for updates: " + ex.getMessage());
-            }
-        });
-    }
-
-    @Blocking
-    private PEVersion getLatestVersion() throws IOException {
-        URL url = new URL("https://api.github.com/repos/" + org + "/" + repo + "/releases/latest");
-        URLConnection connection = url.openConnection();
-        connection.addRequestProperty("User-Agent", "Mozilla/5.0");
-        InputStreamReader isr = new InputStreamReader(connection.getInputStream());
-        BufferedReader reader = new BufferedReader(isr);
-        String response = reader.readLine();
-        JsonObject json = AdventureSerializer.getGsonSerializer().serializer().fromJson(response, JsonObject.class);
-
-        reader.close();
-        isr.close();
-
-        if (json.has("tag_name")) {
-            return PEVersion.fromString(json.get("tag_name").getAsString().replaceFirst("^[vV]", ""));
-        }
-        throw new IOException("Could not find name attribute in github api fetch");
-    }
-
-    @Deprecated
-    public String getCurrentVersion() {
-        return currentVersion.toString();
     }
 
     public String getOrg() {

build.gradle.kts

@@ -22,6 +22,7 @@ fun getVersionMeta(includeHash: Boolean): String {
     return "$commitHash-SNAPSHOT"
 }
 version = "$fullVersion${getVersionMeta(true)}"
+ext["fullVersion"] = fullVersion
 ext["versionBeta"] = getVersionMeta(true)
 ext["versionNoHash"] = "$fullVersion${getVersionMeta(false)}"
 

buildSrc/src/main/kotlin/entitylib.library-conventions.gradle.kts

@@ -48,13 +48,14 @@ publishing {
 
     repositories {
         maven {
-            url = uri("https://git.netherite.gg/api/packages/Netherite-Public/maven")
+            val urlHost = "repo.netherite.gg"
-            credentials(HttpHeaderCredentials) {
+
-                name = "Authorization"
+            name = "netheriteRepo"
-                value = "token ${project.properties["netherite.git.packages.token"]}"
+            url = uri("https://$urlHost/netherite")
-            }
+
+            credentials(PasswordCredentials::class.java)
             authentication {
-                header(HttpHeaderAuthentication)
+                create<BasicAuthentication>("basic")
             }
         }
     }
@@ -63,7 +64,7 @@ publishing {
         create<MavenPublication>("EntityLib") {
             groupId = project.group as String
             artifactId = project.name
-            version = rootProject.ext["versionBeta"] as String
+            version = rootProject.ext["fullVersion"] as String
             from(components["java"])
 
             pom {

platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/SpigotEntityLibPlatform.java

@@ -1,23 +1,11 @@
 package me.tofaa.entitylib.spigot;
 
-import com.github.retrooper.packetevents.PacketEventsAPI;
-import io.github.retrooper.packetevents.bstats.bukkit.Metrics;
-import io.github.retrooper.packetevents.bstats.charts.SimplePie;
 import me.tofaa.entitylib.APIConfig;
-import me.tofaa.entitylib.EntityLib;
 import me.tofaa.entitylib.common.AbstractPlatform;
-import me.tofaa.entitylib.utils.ConcurrentWeakIdentityHashMap;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.entity.Entity;
-import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
-import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Stream;
 
 public class SpigotEntityLibPlatform extends AbstractPlatform<JavaPlugin> {
 
@@ -35,12 +23,6 @@ public class SpigotEntityLibPlatform extends AbstractPlatform<JavaPlugin> {
         this.setEntityIdProvider(new SpigotEntityIdProvider(this));
         this.api.onLoad();
         this.api.onEnable();
-        if (settings.shouldUseBstats()) {
-            PacketEventsAPI<Plugin> pe = (PacketEventsAPI<Plugin>)api.getPacketEvents();
-            Metrics metrics = new Metrics(pe.getPlugin(), 21916);
-            metrics.addCustomChart(new SimplePie("entitylib-version", () -> EntityLib.getVersion().toString()));
-        }
-
     }
 
     @Override