Replace Ruby with Kotlin

.editorconfig

@@ -8,6 +8,16 @@ insert_final_newline = false
 indent_style=tab
 tab_width=4
 
+[*.{kt, kts}]
+indent_style=space
+tab_width=4
+continuation_indent_size=4
+
+[*.gradle]
+indent_style=space
+tab_width=4
+continuation_indent_size=4
+
 [*.rb]
 indent_style=space
-indent_size=2
+indent_size=2

.gitignore

@@ -9,8 +9,10 @@
 *.class
 *.iml
 
-/data/rsa.pem
-/data/savedGames
+/game/data/rsa.pem
+/game/data/savedGames
 /lib/
 */target/
 */build/
+**/build/
+**/out/

Jenkinsfile

@@ -0,0 +1,14 @@
+node {
+  stage 'Stage Checkout'
+  checkout scm
+
+  stage 'Stage Build'
+  gradle 'clean assemble'
+
+  stage 'Stage Test'
+  gradle 'check'
+}
+
+def gradle(command) {
+    sh "${tool name: 'gradle', type: 'hudson.plugins.gradle.GradleInstallation'}/bin/gradle ${command}"
+}

README.md

@@ -4,7 +4,7 @@ Apollo is a high-performance, modular RuneScape emulator with a collection of ut
 
 ### Developer information
 
-Most discussion related to the development of Apollo happens on our [Slack team](https://join.slack.com/t/apollo-rsps/shared_invite/enQtMjQ0NTYwNzkwMjExLTI5NGVmOWZjZGRkYzY4NjM1MjgxNjYyYmEyZWQxMzcxZTA5NDM1MGJkNmRkMjc2ZDQ2NjUwMjAzOGI1NjY1Zjk). If you have a problem and can't get in touch with anyone, create a GitHub issue. If making a pull request, please make sure all tests are still passing after making your changes, and that your code style is consistent with the rest of Apollo.
+Most discussion related to the development of Apollo happens on our [Discord](https://discord.gg/Fuft67P). If you have a problem and can't get in touch with anyone, create a GitHub issue. If making a pull request, please make sure all tests are still passing after making your changes, and that your code style is consistent with the rest of Apollo.
 
 ### Getting started
 

azure-pipelines.yml

@@ -0,0 +1,47 @@
+pool:
+  vmImage: 'ubuntu-latest'
+
+variables:
+  GRADLE_USER_HOME: $(Pipeline.Workspace)/.gradle
+
+steps:
+  - task: CacheBeta@0
+    inputs:
+      key: $(Agent.OS)
+      path: $(GRADLE_USER_HOME)
+    displayName: "Gradle: setup build cache"
+
+  - task: SonarCloudPrepare@1
+    inputs:
+      SonarCloud: 'apollo-rsps-sonarcloud'
+      organization: 'apollo-rsps'
+      scannerMode: 'Other'
+    displayName: "SonarCloud: prepare analysis"
+
+  - task: Gradle@2
+    displayName: "Gradle: build"
+    inputs:
+      workingDirectory: ''
+      gradleWrapperFile: 'gradlew'
+      gradleOptions: '-Xmx3072m -Dorg.gradle.parallel=true -Dorg.gradle.caching=true -Dsonar.host.url=https://sonarcloud.io'
+      javaHomeOption: 'JDKVersion'
+      jdkVersionOption: '1.8'
+      jdkArchitectureOption: 'x64'
+      publishJUnitResults: true
+      testResultsFiles: '**/TEST-*.xml'
+      tasks: 'check jacocoTestReport sonarqube'
+
+  - script: |
+      ./gradlew --stop
+    displayName: "Gradle: stop daemon"
+
+  - task: SonarCloudPublish@1
+    inputs:
+      pollingTimeoutSec: '300'
+    displayName: "SonarCloud: publish quality gate"
+
+  - script: |
+      bash <(curl -s https://codecov.io/bash) -t "${CODECOV_TOKEN}"
+    env:
+      CODECOV_TOKEN: $(CODECOV_TOKEN)
+    displayName: "Codecov: publish coverage"

build.gradle

@@ -1,51 +1,34 @@
+plugins {
+    id 'org.jetbrains.kotlin.jvm' version '1.3.41' apply(false)
+    id 'org.jetbrains.intellij' version '0.4.9' apply(false)
+    id 'org.jmailen.kotlinter' version '1.26.0' apply(false)
+    id 'org.sonarqube' version '2.7.1'
+    id "io.gitlab.arturbosch.detekt" version '1.0.0-RC16'
+}
+
 allprojects {
     group = 'apollo'
     version = '0.0.1'
-    apply plugin: 'java'
-}
-
-subprojects {
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
 
     repositories {
         mavenLocal()
         maven { url "https://repo.maven.apache.org/maven2" }
+        maven { url "https://dl.bintray.com/kotlin/kotlinx/" }
     }
+}
 
-    dependencies {
-        compile group: 'org.apache.commons', name: 'commons-compress', version: '1.10'
-        compile group: 'org.jruby', name: 'jruby-complete', version: '9.0.5.0'
-        compile group: 'com.google.guava', name: 'guava', version: '19.0'
-        compile group: 'io.netty', name: 'netty-all', version: '4.0.34.Final'
-        compile group: 'com.lambdaworks', name: 'scrypt', version: '1.4.0'
-        compile group: 'com.mchange', name: 'c3p0', version: '0.9.5.2'
-        compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.54'
-        testCompile group: 'junit', name: 'junit', version: '4.12'
-        testCompile group: 'org.powermock', name: 'powermock-module-junit4', version: '1.6.4'
-        testCompile group: 'org.powermock', name: 'powermock-api-mockito', version: '1.6.4'
-    }
+apply from: 'gradle/properties.gradle'
+apply from: 'gradle/code-quality.gradle'
+apply from: 'gradle/testing.gradle'
+apply from: 'gradle/wrapper.gradle'
 
-    sourceSets {
-        main {
-            java {
-                srcDirs = ['src/main']
-            }
-        }
+gradle.projectsEvaluated {
+    task check {
+        def deps = []
+        deps += getTasksByName("check", true).findAll { it.project != rootProject }
+        deps += "detekt"
+        deps += jacocoReport
 
-        test {
-            java {
-                srcDirs = ['src/test']
-            }
-        }
+        dependsOn(deps)
     }
-}
-
-task(run, dependsOn: classes, type: JavaExec) {
-    def gameSubproject = project(':game')
-    def gameClasspath = gameSubproject.sourceSets.main.runtimeClasspath
-
-    main = 'org.apollo.Server'
-    classpath = gameClasspath
-    jvmArgs = ['-Xmx1750M']
-}
+}

cache/build.gradle

@@ -1,5 +1,14 @@
+apply plugin: 'java-library'
+
 description = 'Apollo Cache'
 
 dependencies {
-    compile project(':util')
+    implementation project(':util')
+    implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
+
+    test.useJUnitPlatform()
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junitJupiterVersion
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterVersion
+    testImplementation group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVintageVersion
+    testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: junitPlatformVersion
 }

game/build.gradle

@@ -1,7 +1,45 @@
+apply plugin: 'application'
+apply plugin: 'org.jetbrains.kotlin.jvm'
+apply from: "$rootDir/gradle/kotlin.gradle"
+
 description = 'Apollo Game'
+mainClassName = 'org.apollo.Server'
 
 dependencies {
     compile project(':cache')
     compile project(':net')
     compile project(':util')
+
+    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8'
+    compile group: 'org.jetbrains.kotlin', name: 'kotlin-scripting-common'
+    compile group: 'org.jetbrains.kotlin', name: 'kotlin-script-runtime'
+    compile group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-jdk8', version: kotlinxCoroutinesVersion
+    compile group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: kotlinxCoroutinesVersion
+
+    implementation group: 'com.google.guava', name: 'guava', version: guavaVersion
+    implementation group: 'io.github.classgraph', name: 'classgraph', version: classGraphVersion
+    implementation group: 'com.lambdaworks', name: 'scrypt', version: scryptVersion
+
+    test.useJUnitPlatform()
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junitJupiterVersion
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterVersion
+    testImplementation group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVintageVersion
+    testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: junitPlatformVersion
+
+    testImplementation group: 'junit', name: 'junit', version: junitVersion
+    testImplementation group: 'org.powermock', name: 'powermock-module-junit4', version: powermockVersion
+    testImplementation group: 'org.powermock', name: 'powermock-api-mockito2', version: powermockVersion
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: assertjVersion
+
+    project(":game:plugin").subprojects { pluginProject ->
+         if (pluginProject.buildFile.exists()) {
+            runtimeClasspath pluginProject
+        }
+    }
+}
+
+applicationDistribution.from("$rootDir/data") {
+    include '*.dat'
+    include '*.xml'
+    into "data/"
 }

data/messages.xml → game/data/messages.xml

@@ -71,6 +71,12 @@
             <handler>org.apollo.game.message.handler.ItemVerificationHandler</handler>
         </chain>
     </message>
+    <message>
+        <type>org.apollo.game.message.impl.MagicOnMobMessage</type>
+        <chain>
+            <handler>org.apollo.game.message.handler.MagicOnMobVerificationHandler</handler>
+        </chain>
+    </message>
     <message>
         <type>org.apollo.game.message.impl.NpcActionMessage</type>
         <chain>

game/plugin-detekt-rules/build.gradle

@@ -0,0 +1,16 @@
+apply plugin: 'java-library'
+apply plugin: 'org.jetbrains.kotlin.jvm'
+apply from: "$rootDir/gradle/kotlin.gradle"
+
+dependencies {
+    api group: 'io.gitlab.arturbosch.detekt', name: 'detekt-api', version: detektVersion
+    api group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8'
+
+    test.useJUnitPlatform()
+    testImplementation("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
+    testImplementation("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")
+    testImplementation("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}")
+    testImplementation("org.junit.platform:junit-platform-launcher:${junitPlatformVersion}")
+
+    testImplementation group: 'io.gitlab.arturbosch.detekt', name: 'detekt-test', version: detektVersion
+}

game/plugin-detekt-rules/src/main/kotlin/org/apollo/game/plugin/detekt/ApolloPluginRuleSetProvider.kt

@@ -0,0 +1,16 @@
+package org.apollo.game.plugin.detekt
+
+import io.gitlab.arturbosch.detekt.api.Config
+import io.gitlab.arturbosch.detekt.api.RuleSet
+import io.gitlab.arturbosch.detekt.api.RuleSetProvider
+import org.apollo.game.plugin.detekt.rules.DeclarationInScriptRule
+
+class ApolloPluginRuleSetProvider : RuleSetProvider {
+    override val ruleSetId = "apollo-plugin"
+
+    override fun instance(config: Config): RuleSet {
+        return RuleSet(ruleSetId, listOf(
+            DeclarationInScriptRule()
+        ))
+    }
+}

game/plugin-detekt-rules/src/main/kotlin/org/apollo/game/plugin/detekt/rules/DeclarationInScriptRule.kt

@@ -0,0 +1,31 @@
+package org.apollo.game.plugin.detekt.rules
+
+import io.gitlab.arturbosch.detekt.api.*
+import org.jetbrains.kotlin.psi.KtClass
+import org.jetbrains.kotlin.psi.KtFile
+import org.jetbrains.kotlin.psi.KtObjectDeclaration
+
+class DeclarationInScriptRule : Rule() {
+    override val issue = Issue(
+        "DeclarationInScript",
+        Severity.CodeSmell,
+        "This rule reports a plugin file containing class or object declarations.",
+        Debt.FIVE_MINS
+    )
+
+    override fun visit(root: KtFile) {
+        super.visit(root)
+
+        val script = root.script ?: return
+        val declarations = script.declarations.filter { it is KtClass || it is KtObjectDeclaration }
+
+        declarations
+            .forEach {
+                report(CodeSmell(
+                    issue,
+                    Entity.from(it),
+                    message = "Declaration of ${it.name} should live in a top-level file, not a script"
+                ))
+            }
+    }
+}

game/plugin-detekt-rules/src/main/resources/META-INF/services/io.gitlab.arturbosch.detekt.api.RuleSetProvider

@@ -0,0 +1 @@
+org.apollo.game.plugin.detekt.ApolloPluginRuleSetProvider

game/plugin-detekt-rules/src/test/kotlin/org/apollo/game/plugin/detekt/rules/DeclarationInScriptRuleTest.kt

@@ -0,0 +1,19 @@
+package org.apollo.game.plugin.detekt.rules
+
+import io.gitlab.arturbosch.detekt.test.lint
+import java.nio.file.Paths
+import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Test
+
+internal class DeclarationInScriptRuleTest {
+    val rule = DeclarationInScriptRule()
+
+    @Test
+    fun `Finds warning in script file`() {
+        val srcPath = Paths.get(this.javaClass.getResource("/testData/example.kts").toURI())
+        val findings = rule.lint(srcPath)
+
+        assertEquals(1, findings.size)
+        assertEquals("Declaration of ExampleDeclaration should live in a top-level file, not a script", findings[0].message)
+    }
+}

game/plugin-detekt-rules/src/test/resources/testData/example.kts

@@ -0,0 +1,3 @@
+class ExampleDeclaration {
+
+}

game/plugin-testing/build.gradle

@@ -0,0 +1,28 @@
+apply plugin: 'java-library'
+apply plugin: 'org.jetbrains.kotlin.jvm'
+apply from: "$rootDir/gradle/kotlin.gradle"
+
+dependencies {
+    test.useJUnitPlatform()
+
+    api project(':game')
+    api project(':net')
+
+    // JUnit Jupiter API and TestEngine implementation
+    api("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
+    api("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")
+    implementation("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}")
+    implementation("org.junit.platform:junit-platform-launcher:${junitPlatformVersion}")
+
+    api group: 'io.mockk', name: 'mockk', version: mockkVersion
+    api group: 'org.assertj', name: 'assertj-core', version: assertjVersion
+    api group: 'com.willowtreeapps.assertk', name: 'assertk', version: assertkVersion
+
+    implementation group: 'org.powermock', name: 'powermock-module-junit4', version: powermockVersion
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}

game/plugin-testing/src/main/kotlin/org/apollo/game/plugin/testing/assertions/StringAssertions.kt

@@ -0,0 +1,7 @@
+package org.apollo.game.plugin.testing.assertions
+
+import io.mockk.MockKMatcherScope
+
+fun MockKMatcherScope.contains(search: String) = match<String> { it.contains(search) }
+fun MockKMatcherScope.startsWith(search: String) = match<String> { it.startsWith(search) }
+fun MockKMatcherScope.endsWith(search: String) = match<String> { it.endsWith(search) }