Melhorias diversas (#1)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -40,7 +40,7 @@ Make sure to follow these instructions:
 
 **Platform on which you run NuVotifier**: <!-- Either Bukkit, Sponge, BungeeCord, or Velocity. -->
 
-**Version of NuVotifier**: 
+**Version of NuVotifier**:
 
 ```
 <!--
@@ -57,15 +57,16 @@ Velocity: Use /velocity plugins from in-game and hover over "nuvotifier"
 ```
 
 **Relevant log**: <!-- Paste the log on https://gist.github.com/, replace this with link -->
+
 ### Details
 
-**Description**  
+**Description**
 <!-- Replace this with a brief summary of the bug. -->
 
-**Steps to reproduce**  
+**Steps to reproduce**
 <!-- Replace this with exactly what you did to cause the bug. -->
 
-**Expected behavior**  
+**Expected behavior**
 <!-- Replace this with what you expected to happen. -->
 
 ```

.github/dependabot.yml

@@ -0,0 +1,20 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gradle" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+      time: "12:00"
+      timezone: "America/Sao_Paulo"
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "12:00"
+      timezone: "America/Sao_Paulo"

.github/workflows/build.yml

@@ -0,0 +1,36 @@
+name: Build and Upload
+
+on:
+  push:
+    branches: [ "master", "dev/*" ]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          check-latest: true
+          cache: gradle
+      - name: Run chmod to make gradlew executable
+        run: chmod +x ./gradlew
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Build with Gradle
+        run: ./gradlew shadowJar
+      - name: Upload Plugin
+        uses: actions/[email protected]
+        with:
+          name: NuVotifier
+          path: |
+            universal/build/libs/*.jar
+            velocity/build/libs/*.jar
+            bukkit/build/libs/*.jar

api/src/main/java/com/vexsoftware/votifier/model/Vote.java

@@ -78,14 +78,6 @@ public Vote(Vote vote) {
                 vote.getAdditionalData() == null ? null : vote.getAdditionalData().clone());
     }
 
-    private static String getTimestamp(JsonElement object) {
-        try {
-            return Long.toString(object.getAsLong());
-        } catch (Exception e) {
-            return object.getAsString();
-        }
-    }
-
     public Vote(JsonObject jsonObject) {
         this(jsonObject.get("serviceName").getAsString(),
                 jsonObject.get("username").getAsString(),
@@ -95,6 +87,14 @@ public Vote(JsonObject jsonObject) {
             additionalData = Base64.getDecoder().decode(jsonObject.get("additionalData").getAsString());
     }
 
+    private static String getTimestamp(JsonElement object) {
+        try {
+            return Long.toString(object.getAsLong());
+        } catch (Exception e) {
+            return object.getAsString();
+        }
+    }
+
     @Override
     public String toString() {
         String data;
@@ -108,6 +108,15 @@ public String toString() {
                 + " additionalData:" + data + ")";
     }
 
+    /**
+     * Gets the serviceName.
+     *
+     * @return The serviceName
+     */
+    public String getServiceName() {
+        return serviceName;
+    }
+
     /**
      * Sets the serviceName.
      *
@@ -119,12 +128,12 @@ public void setServiceName(String serviceName) {
     }
 
     /**
-     * Gets the serviceName.
+     * Gets the username.
      *
-     * @return The serviceName
+     * @return The username
      */
-    public String getServiceName() {
-        return serviceName;
+    public String getUsername() {
+        return username;
     }
 
     /**
@@ -138,12 +147,12 @@ public void setUsername(String username) {
     }
 
     /**
-     * Gets the username.
+     * Gets the address.
      *
-     * @return The username
+     * @return The address
      */
-    public String getUsername() {
-        return username;
+    public String getAddress() {
+        return address;
     }
 
     /**
@@ -157,12 +166,12 @@ public void setAddress(String address) {
     }
 
     /**
-     * Gets the address.
+     * Gets the time stamp.
      *
-     * @return The address
+     * @return The time stamp
      */
-    public String getAddress() {
-        return address;
+    public String getTimeStamp() {
+        return timeStamp;
     }
 
     /**
@@ -175,15 +184,6 @@ public void setTimeStamp(String timeStamp) {
         this.timeStamp = timeStamp;
     }
 
-    /**
-     * Gets the time stamp.
-     *
-     * @return The time stamp
-     */
-    public String getTimeStamp() {
-        return timeStamp;
-    }
-
     /**
      * Returns additional data sent with the vote, if it exists.
      *

api/src/test/java/com/vexsoftware/votifier/model/VoteTest.java

@@ -3,7 +3,8 @@
 import com.google.gson.JsonObject;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 public class VoteTest {
     @Test

build.gradle.kts

@@ -4,7 +4,8 @@ plugins {
     id("net.kyori.blossom") version "1.2.0" apply false
 }
 
-logger.lifecycle("""
+logger.lifecycle(
+    """
 *******************************************
  You are building NuVotifier!
  If you encounter trouble:
@@ -14,7 +15,8 @@ logger.lifecycle("""
 
  Output files will be in [subproject]/build/libs
 *******************************************
-""")
+"""
+)
 
 
 applyRootArtifactoryConfig()

buildSrc/build.gradle.kts

@@ -19,7 +19,7 @@ repositories {
 dependencies {
     implementation(gradleApi())
     implementation("org.ajoberstar.grgit:grgit-gradle:4.1.1")
-    implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
+    implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.1")
     implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.27.1")
     implementation("org.spongepowered:spongegradle-plugin-development:2.0.0")
     implementation("net.fabricmc:fabric-loom:1.0-SNAPSHOT")

buildSrc/src/main/kotlin/CommonConfig.kt

@@ -1,8 +1,6 @@
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.jvm.toolchain.JavaLanguageVersion
-import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.repositories
 import org.gradle.kotlin.dsl.the
 

buildSrc/src/main/kotlin/PlatformConfig.kt

@@ -20,7 +20,7 @@ fun Project.applyPlatformAndCoreConfiguration(javaRelease: Int = 8) {
 }
 
 fun Project.applyShadowConfiguration() {
-    apply(plugin = "com.github.johnrengelman.shadow")
+    apply(plugin = "com.gradleup.shadow")
     tasks.named<ShadowJar>("shadowJar") {
         archiveClassifier.set("dist")
         dependencies {

buildSrc/src/main/kotlin/Versions.kt

@@ -4,5 +4,5 @@ object Versions {
     const val FINDBUGS = "3.0.2"
     const val NETTYIO = "4.1.72.Final"
     const val GSON = "2.9.0"
-    const val VELOCITY = "3.1.0"
+    const val VELOCITY = "3.3.0-SNAPSHOT"
 }

bukkit/src/main/java/com/vexsoftware/votifier/NuVotifierBukkit.java

@@ -21,8 +21,6 @@
 import com.vexsoftware.votifier.cmd.NVReloadCmd;
 import com.vexsoftware.votifier.cmd.TestVoteCmd;
 import com.vexsoftware.votifier.forwarding.BukkitPluginMessagingForwardingSink;
-import com.vexsoftware.votifier.support.forwarding.ForwardedVoteListener;
-import com.vexsoftware.votifier.support.forwarding.ForwardingVoteSink;
 import com.vexsoftware.votifier.model.Vote;
 import com.vexsoftware.votifier.model.VotifierEvent;
 import com.vexsoftware.votifier.net.VotifierServerBootstrap;
@@ -33,6 +31,8 @@
 import com.vexsoftware.votifier.platform.LoggingAdapter;
 import com.vexsoftware.votifier.platform.VotifierPlugin;
 import com.vexsoftware.votifier.platform.scheduler.VotifierScheduler;
+import com.vexsoftware.votifier.support.forwarding.ForwardedVoteListener;
+import com.vexsoftware.votifier.support.forwarding.ForwardingVoteSink;
 import com.vexsoftware.votifier.util.IOUtil;
 import com.vexsoftware.votifier.util.KeyCreator;
 import com.vexsoftware.votifier.util.TokenUtil;
@@ -235,7 +235,8 @@ private boolean loadAndBind() {
             }
 
             this.bootstrap = new VotifierServerBootstrap(host, port, this, disablev1);
-            this.bootstrap.start(error -> {});
+            this.bootstrap.start(error -> {
+            });
         } else {
             getLogger().info("------------------------------------------------------------------------------");
             getLogger().info("Your Votifier port is less than 0, so we assume you do NOT want to start the");

bukkit/src/main/java/com/vexsoftware/votifier/forwarding/BukkitPluginMessagingForwardingSink.java

@@ -1,6 +1,5 @@
 package com.vexsoftware.votifier.forwarding;
 
-import com.vexsoftware.votifier.NuVotifierBukkit;
 import com.vexsoftware.votifier.support.forwarding.AbstractPluginMessagingForwardingSink;
 import com.vexsoftware.votifier.support.forwarding.ForwardedVoteListener;
 import org.apache.commons.lang.Validate;
@@ -16,6 +15,8 @@
  */
 public class BukkitPluginMessagingForwardingSink extends AbstractPluginMessagingForwardingSink implements PluginMessageListener {
 
+    private final Plugin p;
+    private final String channel;
     public BukkitPluginMessagingForwardingSink(Plugin p, String channel, ForwardedVoteListener listener) {
         super(listener);
         Validate.notNull(channel, "Channel cannot be null.");
@@ -24,9 +25,6 @@ public BukkitPluginMessagingForwardingSink(Plugin p, String channel, ForwardedVo
         this.p = p;
     }
 
-    private final Plugin p;
-    private final String channel;
-
     @Override
     public void halt() {
         Bukkit.getMessenger().unregisterIncomingPluginChannel(p, channel, this);

bukkit/src/main/java/com/vexsoftware/votifier/model/VotifierEvent.java

@@ -33,14 +33,18 @@ public VotifierEvent(final Vote vote) {
     /**
      * Constructs a vote event that encapsulated the given vote record.
      *
-     * @param vote vote record
+     * @param vote  vote record
      * @param async whether the event will be fired asynchronously
      */
     public VotifierEvent(final Vote vote, final boolean async) {
         super(async);
         this.vote = vote;
     }
 
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
     /**
      * Return the encapsulated vote record.
      *
@@ -54,8 +58,4 @@ public Vote getVote() {
     public HandlerList getHandlers() {
         return handlers;
     }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
 }

bukkit/src/main/resources/plugin.yml

@@ -2,7 +2,7 @@ name: Votifier
 main: com.vexsoftware.votifier.NuVotifierBukkit
 version: "${internalVersion}"
 description: A plugin that gets notified when votes are made for the server on toplists.
-authors: [Ichbinjoe, blakeman8192, Kramer, tuxed]
+authors: [ Ichbinjoe, blakeman8192, Kramer, tuxed ]
 api-version: 1.13
 
 commands: