Minor config changes (#14)

* Minor config changes

* New build workflow + small config change

* Oops...

Author: AVuTuVA

.github/workflows/build.yml

@@ -1,44 +1,67 @@
 name: Java CI with Gradle
 
-on: [ push ]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.5
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2.3.1
+        uses: actions/checkout@v3.0.0
+      - name: Set up JDK
+        uses: actions/setup-java@v3.0.0
         with:
           distribution: adopt
           java-version: 11
-      - name: Cache gradle
-        uses: actions/[email protected]
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-gradle-
-      - name: Build
+      - name: Build VelocityTools
         run: ./gradlew build
-      - name: Upload a build artifact
-        uses: actions/upload-artifact@v2.2.4
+      - name: Upload VelocityTools
+        uses: actions/upload-artifact@v3.0.0
         with:
           name: VelocityTools
-          path: build/libs/velocity_tools-*.jar
+          path: "*/build/libs/*.jar"
       - uses: dev-drprasad/[email protected]
+        if: ${{ github.event_name == 'push' }}
         with:
           delete_release: true
           tag_name: dev-build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Find git version
+        id: git-version
+        run: echo "id=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+      - name: Find correct JAR
+        if: ${{ github.event_name == 'push' }}
+        id: find-jar
+        run: |
+          output="$(find plugin/build/libs/ ! -name "*-javadoc.jar" ! -name "*-sources.jar" -type f -printf "%f\n")"
+          echo "::set-output name=jarname::$output"
       - name: Release the build
+        if: ${{ github.event_name == 'push' }}
         uses: ncipollo/release-action@v1
         with:
-          artifacts: "build/libs/velocity_tools-*.jar"
+          artifacts: plugin/build/libs/${{ steps.find-jar.outputs.jarname }}
           body: ${{ join(github.event.commits.*.message, '\n') }}
           prerelease: true
-          name: Dev-build
+          name: Dev-build ${{ steps.git-version.outputs.id }}
           tag: dev-build
+      - name: Upload to Modrinth
+        if: ${{ github.event_name == 'push' }}
+        uses: RubixDev/[email protected]
+        with:
+          token: ${{ secrets.MODRINTH_TOKEN }}
+          file_path: plugin/build/libs/${{ steps.find-jar.outputs.jarname }}
+          name: Dev-build ${{ steps.git-version.outputs.id }}
+          version: ${{ steps.git-version.outputs.id }}
+          changelog: ${{ join(github.event.commits.*.message, '\n') }}
+          game_versions: 1.7.2
+          release_type: beta
+          loaders: velocity
+          featured: false
+          project_id: 4mehh1CR

.github/workflows/release.yml

@@ -0,0 +1,51 @@
+name: Java CI with Gradle
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+      - name: Set up JDK
+        uses: actions/[email protected]
+        with:
+          distribution: adopt
+          java-version: 11
+      - name: Build VelocityTools
+        run: ./gradlew build
+      - name: Upload VelocityTools
+        uses: actions/[email protected]
+        with:
+          name: VelocityTools
+          path: "*/build/libs/*.jar"
+      - name: Find correct JAR
+        id: find-jar
+        run: |
+          output="$(find plugin/build/libs/ ! -name "*-javadoc.jar" ! -name "*-sources.jar" -type f -printf "%f\n")"
+          echo "::set-output name=jarname::$output"
+      - name: Upload to the GitHub release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: plugin/build/libs/${{ steps.find-jar.outputs.jarname }}
+          asset_name: ${{ steps.find-jar.outputs.jarname }}
+          asset_content_type: application/java-archive
+      - name: Upload to Modrinth
+        uses: RubixDev/[email protected]
+        with:
+          token: ${{ secrets.MODRINTH_TOKEN }}
+          file_path: plugin/build/libs/${{ steps.find-jar.outputs.jarname }}
+          name: Release ${{ github.event.release.tag_name }}
+          version: ${{ github.event.release.tag_name }}
+          changelog: ${{ github.event.release.body }}
+          game_versions: 1.7.2
+          release_type: release
+          loaders: velocity
+          featured: true
+          project_id: 4mehh1CR

.github/workflows/test.yml

@@ -1 +1 @@
-1.1.8
+1.1.9

VERSION

@@ -3,13 +3,13 @@
 plugins {
     id("java")
     id("checkstyle")
-    id("com.github.spotbugs").version("5.0.3")
+    id("com.github.spotbugs").version("5.0.13")
     id("org.cadixdev.licenser").version("0.6.1")
-    id("com.github.johnrengelman.shadow").version("7.0.0")
+    id("com.github.johnrengelman.shadow").version("7.1.2")
 }
 
 setGroup("net.elytrium")
-setVersion("1.1.8")
+setVersion("1.1.9")
 
 compileJava {
     getOptions().setEncoding("UTF-8")

build.gradle

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -171,7 +171,7 @@ public static class BRAND_CHANGER {
 
       public boolean REWRITE_IN_PING = true;
       public boolean REWRITE_IN_GAME = true;
-      public String PING_BRAND = "YourServer 1.12.2-1.17.1";
+      public String PING_BRAND = "YourServer 1.12.2-1.19.3";
       @Comment("For ping.")
       public boolean SHOW_ALWAYS = false;
       @Comment("{0} - Original server brand (e.g. Paper).")
@@ -181,8 +181,8 @@ public static class BRAND_CHANGER {
     @Comment("Doesn't work with srv records.")
     public static class HOSTNAMES_MANAGER {
 
-      public boolean BLOCK_JOIN = true;
-      public boolean BLOCK_PING = true;
+      public boolean BLOCK_JOIN = false;
+      public boolean BLOCK_PING = false;
       @Comment("Connections IP logging.")
       public boolean DEBUG = false;
       @Comment("For \"debug\" option.")
@@ -191,7 +191,7 @@ public static class HOSTNAMES_MANAGER {
       public String KICK_REASON = "&cPlease, don't connect to the direct ip!{NL}Use example.com";
       public boolean WHITELIST = true;
       @Comment("IP Addresses starting with \"127.\" or equal to \"localhost\" will be blocked.")
-      public boolean BLOCK_LOCAL_ADDRESSES = true;
+      public boolean BLOCK_LOCAL_ADDRESSES = false;
       @Comment("DoMaIn.net will be similar to domain.net.")
       public boolean IGNORE_CASE = true;
       public List<String> HOSTNAMES = List.of("your-domain.net", "your-domain.com");