diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index d8aec33..4d98693 100644 --- a/.gitea/workflows/build.yml +++ b/.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 }} \ No newline at end of file + run: chmod +x ./gradlew && ./gradlew publishAllPublicationsToNetheriteRepoRepository -PnetheriteRepoUsername=${{ secrets.REPOSILITE_USER }} -PnetheriteRepoPassword=${{ secrets.REPOSILITE_PASSWORD }} \ No newline at end of file diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 43334d1..a91defa 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -1,7 +1,6 @@ plugins { entitylib.`shadow-conventions` entitylib.`library-conventions` - `el-version` } dependencies { @@ -9,22 +8,4 @@ dependencies { compileOnly(libs.bundles.adventure) compileOnly(libs.packetevents.api) -} - -tasks { - javadoc { - mustRunAfter(generateVersionsFile) - } - - sourcesJar { - mustRunAfter(generateVersionsFile) - } - - withType { - dependsOn(generateVersionsFile) - } - - generateVersionsFile { - packageName = "me.tofaa.entitylib.utils" - } -} +} \ No newline at end of file diff --git a/api/src/main/java/me/tofaa/entitylib/EntityLib.java b/api/src/main/java/me/tofaa/entitylib/EntityLib.java index c71a4c3..583c041 100644 --- a/api/src/main/java/me/tofaa/entitylib/EntityLib.java +++ b/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; - } } diff --git a/api/src/main/java/me/tofaa/entitylib/utils/GithubUpdater.java b/api/src/main/java/me/tofaa/entitylib/utils/GithubUpdater.java index a753dec..f153e51 100644 --- a/api/src/main/java/me/tofaa/entitylib/utils/GithubUpdater.java +++ b/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(() -> { - 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(); + logger.log(Level.INFO, "Update checking disabled"); } public String getOrg() { diff --git a/buildSrc/src/main/kotlin/entitylib.library-conventions.gradle.kts b/buildSrc/src/main/kotlin/entitylib.library-conventions.gradle.kts index 11e57b4..facd407 100644 --- a/buildSrc/src/main/kotlin/entitylib.library-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/entitylib.library-conventions.gradle.kts @@ -49,12 +49,11 @@ publishing { repositories { maven { url = uri("https://git.netherite.gg/api/packages/Netherite-Public/maven") - credentials(HttpHeaderCredentials) { - name = "Authorization" - value = "token ${project.properties["netherite.git.packages.token"]}" - } + name = "netheriteRepo" + + credentials(PasswordCredentials::class.java) authentication { - header(HttpHeaderAuthentication) + create("basic") } } } diff --git a/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/SpigotEntityLibPlatform.java b/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/SpigotEntityLibPlatform.java index 6c9a2cc..ffa5640 100644 --- a/platforms/spigot/src/main/java/me/tofaa/entitylib/spigot/SpigotEntityLibPlatform.java +++ b/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 { @@ -35,12 +23,6 @@ public class SpigotEntityLibPlatform extends AbstractPlatform { this.setEntityIdProvider(new SpigotEntityIdProvider(this)); this.api.onLoad(); this.api.onEnable(); - if (settings.shouldUseBstats()) { - PacketEventsAPI pe = (PacketEventsAPI)api.getPacketEvents(); - Metrics metrics = new Metrics(pe.getPlugin(), 21916); - metrics.addCustomChart(new SimplePie("entitylib-version", () -> EntityLib.getVersion().toString())); - } - } @Override