Major Overhaul

.editorconfig

@@ -0,0 +1,14 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+max_line_length = 120
+tab_width = 4
+trim_trailing_whitespace = true
+ij_continuation_indent_size = 4
+[*.yml]
+indent_size = 2

.github/workflows/gradle.yml

@@ -0,0 +1,61 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
+
+name: Java CI with Gradle
+
+on:
+  push:
+    branches:
+      - master
+      - 'dev/**'
+      - 'update/**'
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  build_plugin:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4.2.1
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: Build with Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          arguments: build
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@master
+        with:
+          # Artifact name
+          name: SurvivalPlus-Plugin
+          # A file, directory or wildcard pattern that describes what to upload
+          path: build/libs/SurvivalPlus-*.jar
+  build_resource_pack:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4.2.1
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: Build with Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          arguments: resourcepack
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@master
+        with:
+          # Artifact name
+          name: SurvivalPlus-ResourcePack
+          # A file, directory or wildcard pattern that describes what to upload
+          path: build/libs/SurvivalPlusResourcePack-*.zip

.gitignore

@@ -1,34 +1,42 @@
-# Compiled class file
-*.class
+.gradle/
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
 
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-*.tar.gz
-*.rar
-
-# IntelliJ Files #
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
 *.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
 
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# Custom #
+### Eclipse ###
+.apt_generated
 .classpath
-.settings
+.factorypath
 .project
-bin
-JavaDocs/
-out/
-.idea/
-/target/
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store

README.md

@@ -1,14 +1,17 @@
 # SurvivalPlus
 ![GitHub issues](https://img.shields.io/github/issues/ShaneBeeStudios/SurvivalPlus.svg)
 [![Discord](https://img.shields.io/discord/425192525091831808.svg)](https://discordapp.com/invite/km3UF8Q)
-![Java CI with Maven](https://github.com/ShaneBeeStudios/SurvivalPlus/workflows/Java%20CI%20with%20Maven/badge.svg)
-
-![https://docs.google.com/uc?id=0B8D0KMKK7musWTBQaWozV0dxN2c](https://docs.google.com/uc?id=0B8D0KMKK7musWTBQaWozV0dxN2c)
+![Java CI with Maven](https://github.com/ShaneBeeStudios/SurvivalPlus/workflows/Java%20CI%20with%20Gradle/badge.svg)
 
 
 ## Welcome to SurvivalPlus
 SurvivalPlus is a Minecraft mod that adds new contents and experience to Minecraft Survival gameplay
 
 All info can be found on the [**WIKI**](https://github.com/ShaneBeeStudios/SurvivalPlus/wiki)
 
-Plugin downloads can be found on [**SpigotMC**](https://www.spigotmc.org/resources/survival-plus.67351/)
+Plugin downloads can be found on (TBD)
+
+### BUILDING:
+- To build the plugin run `./gradlew build` (This includes the datapack internally)
+- To build the datapack run `./gradlew datapack`
+- To build the resource pack run `./gradlew resourcepack`

build.gradle.kts

@@ -0,0 +1,104 @@
+plugins {
+    id("java")
+    id("io.github.goooler.shadow") version "8.1.7"
+}
+
+// Where this builds on the server
+val serverLocation = "Skript/1-21-4"
+// Version of SurvivalPlus
+val projectVersion = "1.0.0"
+// Minecraft version to build against
+val minecraftVersion = "1.21.4"
+
+java.sourceCompatibility = JavaVersion.VERSION_21
+
+repositories {
+    mavenCentral()
+    mavenLocal()
+
+    // Paper
+    maven("https://repo.papermc.io/repository/maven-public/")
+
+    // Command Api Snapshots
+    maven("https://s01.oss.sonatype.org/content/repositories")
+
+    // JitPack repo
+    maven("https://jitpack.io")
+
+    // Papi
+    maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
+}
+
+dependencies {
+    // Paper
+    compileOnly("io.papermc.paper:paper-api:${minecraftVersion}-R0.1-SNAPSHOT")
+
+    // FastBoard
+    implementation("fr.mrmicky:fastboard:2.1.3")
+
+    // Command Api
+    implementation("dev.jorel:commandapi-bukkit-shade-mojang-mapped:9.7.0")
+
+    // Papi
+    compileOnly("me.clip:placeholderapi:2.11.6")
+
+    // bStats
+    implementation("org.bstats:bstats-bukkit:3.0.2")
+
+}
+
+tasks {
+    register("server", Copy::class) {
+        dependsOn("shadowJar")
+        from("build/libs") {
+            include("SurvivalPlus-*.jar")
+            destinationDir = file("/Users/ShaneBee/Desktop/Server/${serverLocation}/plugins/")
+        }
+
+    }
+    register("resourcepack", Zip::class) {
+        archiveFileName = "SurvivalPlusResourcePack-${projectVersion}.zip"
+        from("src/main/resources/resource-pack") {
+            exclude("**/.DS_Store")
+            destinationDirectory = file("build/libs/")
+        }
+    }
+    register("datapack", Zip::class) {
+        archiveFileName = "SurvivalPlusDataPack-${projectVersion}.zip"
+        from("src/main/resources/datapack") {
+            exclude("**/.DS_Store")
+            destinationDirectory = file("build/libs/")
+        }
+    }
+    processResources {
+        expand("version" to projectVersion)
+        exclude("resource-pack/*")
+    }
+    compileJava {
+        options.release = 21
+        options.compilerArgs.add("-Xlint:unchecked")
+        options.compilerArgs.add("-Xlint:deprecation")
+    }
+    javadoc {
+        options.encoding = Charsets.UTF_8.name()
+        exclude("com/shanebeestudios/survival/plugin/SurvivalBootstrap.java")
+        exclude("com/shanebeestudios/survival/plugin/commands")
+        exclude("com/shanebeestudios/survival/plugin/listeners")
+        exclude("com/shanebeestudios/survival/plugin/tasks")
+        (options as CoreJavadocOptions).addBooleanOption("Xdoclint:none", true)
+        (options as StandardJavadocDocletOptions).links(
+            "https://jd.papermc.io/paper/${minecraftVersion}/",
+            "https://jd.advntr.dev/api/4.18.0/"
+        )
+    }
+    shadowJar {
+        relocate("fr.mrmicky.fastboard", "com.shanebeestudios.survival.api.fastboard")
+        relocate("dev.jorel.commandapi", "com.shanebeestudios.survival.api.commandapi")
+        relocate("org.bstats", "com.shanebeestudios.survival.api.metrics")
+        archiveFileName = "SurvivalPlus-${projectVersion}.jar"
+    }
+    jar {
+        dependsOn(shadowJar)
+        archiveFileName.set("SurvivalPlus.jar")
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists