Merge pull request #18 from Matt-MX/dev-2.0

Dev 2.0

.gitignore

@@ -1,113 +1,6 @@
-# User-specific stuff
-.idea/
-
-*.iml
-*.ipr
-*.iws
-
-# IntelliJ
-out/
-
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-# Windows thumbnail cache files
-Thumbs.db
-Thumbs.db:encryptable
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-target/
-
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-.mvn/wrapper/maven-wrapper.jar
-.flattened-pom.xml
-
-# Common working directory
-run/
+.gradle
+.idea
+build
+common/build
+gameserver/build
+proxy/build

README.md

@@ -35,8 +35,8 @@
 <!-- PROJECT LOGO -->
 <br />
 <div align="center">
-  <a href="rc_banner.png">
-    <img src="rc_banner.png" alt="Logo" width="512">
+  <a href="img/rc_banner.png">
+    <img src="img/rc_banner.png" alt="Logo" width="512">
   </a>
 
 <h3 align="center">Reconnect [Velocity]</h3>

build.gradle.kts

@@ -0,0 +1,52 @@
+plugins {
+    id("java")
+    alias(libs.plugins.shadow) apply true
+    alias(libs.plugins.runVelocity)
+}
+
+repositories {
+    mavenCentral()
+    maven("https://jitpack.io")
+    maven("https://repo.papermc.io/repository/maven-public/")
+}
+
+dependencies {
+    compileOnly(libs.velocity.api)
+    annotationProcessor(libs.velocity.api)
+
+    compileOnly(libs.litebans.api)
+    compileOnly(libs.luckperms.api)
+
+    implementation(libs.storage.yaml)
+    implementation(libs.storage.mysql)
+    implementation(libs.storage.maria)
+    implementation(libs.storage.sqlite)
+    implementation(libs.storage.hikari)
+}
+
+sourceSets["main"].resources.srcDir("src/resources/")
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
+tasks {
+    build {
+        dependsOn(shadowJar)
+    }
+    shadowJar {
+        mergeServiceFiles()
+    }
+    runVelocity {
+//        velocityVersion(libs.versions.velocity.api.get())
+    }
+//    withType(xyz.jpenilla.runtask.task.AbstractRun::class) {
+//        javaLauncher.set(javaToolchains.launcherFor {
+//            languageVersion = JavaLanguageVersion.of(17)
+//            vendor = JvmVendorSpec.JETBRAINS
+//        })
+//        jvmArgs("-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods")
+//    }
+}

gradle.properties

@@ -0,0 +1,2 @@
+kotlin.code.style=official
+kotlin.stdlib.default.dependency=false

gradle/libs.versions.toml

@@ -0,0 +1,32 @@
+[versions]
+
+updateVersions = "0.51.0"
+shadow = "8.1.8"
+velocity= "3.3.0-SNAPSHOT"
+runPaper = "2.2.4"
+litebans = "0.5.0"
+luckperms = "5.4"
+
+yaml = "1.7.2"
+mysql = "8.0.29"
+maria = "3.3.3"
+sqlite = "3.41.2.2"
+hikari = "5.1.0"
+
+[libraries]
+
+velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "velocity" }
+litebans-api = { module = "com.gitlab.ruany:LiteBansAPI", version.ref = "litebans" }
+luckperms-api = { module = "net.luckperms:api", version.ref = "luckperms" }
+
+storage-yaml = { module = "me.carleslc.Simple-YAML:Simple-Yaml", version.ref = "yaml" }
+storage-mysql = { module = "mysql:mysql-connector-java", version.ref = "mysql" }
+storage-maria = { module = "org.mariadb.jdbc:mariadb-java-client", version.ref = "maria" }
+storage-sqlite = { module = "org.xerial:sqlite-jdbc", version.ref = "sqlite" }
+storage-hikari = { module = "com.zaxxer:HikariCP", version.ref = "hikari" }
+
+[plugins]
+
+updateDeps = { id = "com.github.ben-manes.versions", version.ref = "updateVersions" }
+shadow = { id = "io.github.goooler.shadow", version.ref = "shadow" }
+runVelocity = { id = "xyz.jpenilla.run-velocity", version.ref = "runPaper" }

pom.xml → gradle/pom.xml

@@ -66,7 +66,7 @@
                 </plugins>
                 <resources>
                     <resource>
-                        <directory>src/main/resources</directory>
+                        <directory>../src/main/resources</directory>
                         <filtering>true</filtering>
                     </resource>
                 </resources>
@@ -77,7 +77,7 @@
     <build>
         <resources>
             <resource>
-                <directory>${project.basedir}/src/main/resources</directory>
+                <directory>../src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>

gradle/wrapper/gradle-wrapper.properties

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