Merge pull request #16 from Avanatiker/feature/plugin

Refactor!: Plugin architecture

Author: emyfops

.gitignore

@@ -1,5 +1,50 @@
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
 .idea/
-.gradle/
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
 
-build/
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.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
+
+### Minecraft ###
 run/
+logs/
+
+### Architectury ###
+.architectury-transformer/

build.gradle.kts

@@ -80,10 +80,11 @@ allprojects {
     apply(plugin = "maven-publish")
     apply(plugin = "org.jetbrains.kotlin.jvm")
 
-    base.archivesName.set(modId)
     group = mavenGroup
     version = modVersion
 
+    base.archivesName = modId
+
     repositories {
         maven("https://api.modrinth.com/maven")
         maven("https://jitpack.io")
@@ -98,9 +99,7 @@ allprojects {
     }
 
     java {
-        // Uncomment these lines when the plugin system is ready
-        // withSourcesJar()
-        // withJavadocJar()
+        withSourcesJar()
 
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17

common/build.gradle.kts

@@ -1,5 +1,4 @@
 val fabricLoaderVersion = property("fabric_loader_version").toString()
-val mixinExtrasVersion = property("mixinextras_version").toString()
 val kotlinVersion = property("kotlin_version").toString()
 val kotlinxCoroutinesVersion = property("kotlinx_coroutines_version").toString()
 
@@ -24,16 +23,9 @@ dependencies {
 
     // Add Kotlin
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
+    implementation(kotlin("reflect"))
 
     // Baritone
     modImplementation("baritone-api:baritone-api:1.10.2")
     modImplementation("baritone-api:baritone-unoptimized-fabric:1.10.2")
 }
-
-tasks {
-    // Prevent recursive libraries
-    remapJar {
-        enabled = false
-    }
-}
-

common/src/main/kotlin/com/lambda/command/CommandManager.kt

@@ -1,10 +1,7 @@
 package com.lambda.command
 
-import com.lambda.core.Loadable
 import com.lambda.brigadier.CommandException
-import com.lambda.brigadier.register
-import com.lambda.config.Configurable
-import com.lambda.config.configurations.LambdaConfig
+import com.lambda.command.CommandRegistry.prefix
 import com.lambda.context.SafeContext
 import com.lambda.threading.runSafe
 import com.lambda.util.Communication
@@ -13,26 +10,17 @@ import com.lambda.util.text.*
 import com.lambda.util.text.ClickEvents.suggestCommand
 import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.StringReader
-import com.mojang.brigadier.builder.LiteralArgumentBuilder
 import com.mojang.brigadier.exceptions.CommandSyntaxException
 import net.minecraft.command.CommandSource
-import org.reflections.Reflections
-import org.reflections.scanners.Scanners
-import org.reflections.util.ClasspathHelper
-import org.reflections.util.ConfigurationBuilder
 import java.awt.Color
 import kotlin.math.max
 import kotlin.math.min
 
 
-object CommandManager : Configurable(LambdaConfig), Loadable {
-    override val name = "command"
-
-    val prefix by setting("prefix", ';')
+object CommandManager {
+    private const val ERROR_PADDING = 10
 
-    val commands = mutableSetOf<LambdaCommand>()
     val dispatcher by lazy { CommandDispatcher<CommandSource>() }
-    private const val ERROR_PADDING = 10
 
     fun executeCommand(command: String) {
         runSafe {
@@ -103,23 +91,4 @@ object CommandManager : Configurable(LambdaConfig), Loadable {
             }
         })
     }
-
-    override fun load(): String {
-        Reflections(
-            ConfigurationBuilder()
-                .forPackage("com.lambda.command.commands")
-                .setScanners(Scanners.SubTypes)
-        ).getSubTypesOf(LambdaCommand::class.java).forEach { commandClass ->
-            commandClass.declaredFields.find {
-                it.name == "INSTANCE"
-            }?.apply {
-                isAccessible = true
-                (get(null) as? LambdaCommand)?.let { command ->
-                    commands.add(command)
-                }
-            }
-        }
-
-        return "Registered ${commands.size} commands"
-    }
 }

common/src/main/kotlin/com/lambda/command/CommandRegistry.kt

@@ -0,0 +1,38 @@
+package com.lambda.command
+
+import com.lambda.config.Configurable
+import com.lambda.config.configurations.LambdaConfig
+import com.lambda.core.Loadable
+import org.reflections.Reflections
+import org.reflections.scanners.Scanners
+import org.reflections.util.ConfigurationBuilder
+
+object CommandRegistry : Configurable(LambdaConfig), Loadable {
+    override val name = "command"
+
+    val prefix by setting("prefix", ';')
+    val commands = mutableSetOf<LambdaCommand>()
+
+    private val paths = mutableSetOf("com.lambda.command.commands")
+
+    fun injectPath(path: String) = paths.add(path)
+
+    override fun load(): String {
+        Reflections(
+            ConfigurationBuilder()
+                .forPackages(*paths.toTypedArray())
+                .setScanners(Scanners.SubTypes)
+        ).getSubTypesOf(LambdaCommand::class.java).forEach { commandClass ->
+            commandClass.declaredFields.find {
+                it.name == "INSTANCE"
+            }?.apply {
+                isAccessible = true
+                (get(null) as? LambdaCommand)?.let { command ->
+                    commands.add(command)
+                }
+            }
+        }
+
+        return "Registered ${commands.size} commands"
+    }
+}

common/src/main/kotlin/com/lambda/command/commands/ConfigCommand.kt

@@ -29,4 +29,4 @@ object ConfigCommand : LambdaCommand(
             }
         }
     }
-}
+}

common/src/main/kotlin/com/lambda/command/commands/ModuleCommand.kt

@@ -6,10 +6,9 @@ import com.lambda.brigadier.argument.boolean
 import com.lambda.brigadier.argument.string
 import com.lambda.brigadier.argument.value
 import com.lambda.brigadier.executeWithResult
-import com.lambda.brigadier.get
 import com.lambda.brigadier.optional
 import com.lambda.brigadier.required
-import com.lambda.command.CommandManager.prefix
+import com.lambda.command.CommandRegistry.prefix
 import com.lambda.command.LambdaCommand
 import com.lambda.module.ModuleRegistry
 import com.lambda.threading.runSafe
@@ -131,4 +130,4 @@ object ModuleCommand : LambdaCommand(
             }
         }
     }
-}
+}

common/src/main/kotlin/com/lambda/command/commands/ReplayCommand.kt

@@ -27,7 +27,7 @@ object ReplayCommand : LambdaCommand(
             required(greedyString("replay filepath")) { replayName ->
                 suggests { _, builder ->
                     val dir = FolderRegister.replay
-                    dir.listRecursive().forEach {
+                    dir.listRecursive { it.isFile }.forEach {
                         builder.suggest(it.relativeTo(dir).path)
                     }
                     builder.buildFuture()
@@ -67,4 +67,4 @@ object ReplayCommand : LambdaCommand(
             }
         }
     }
-}
+}

common/src/main/kotlin/com/lambda/core/Loader.kt

@@ -2,25 +2,27 @@ package com.lambda.core
 
 import com.lambda.Lambda
 import com.lambda.Lambda.LOG
-import com.lambda.command.CommandManager
+import com.lambda.command.CommandRegistry
+import com.lambda.friend.FriendRegistry
 import com.lambda.graphics.renderer.gui.font.LambdaFont
 import com.lambda.gui.GuiConfigurable
 import com.lambda.interaction.PlayerPacketManager
 import com.lambda.interaction.RotationManager
 import com.lambda.module.ModuleRegistry
+import com.lambda.sound.SoundRegistry
 import com.lambda.util.Communication.ascii
 import kotlin.system.measureTimeMillis
 
 object Loader {
     private val loadables = listOf(
         ModuleRegistry,
-        CommandManager,
+        CommandRegistry,
         RotationManager,
         PlayerPacketManager,
         LambdaFont.Loader,
         GuiConfigurable,
-        FriendManager,
-        SoundManager,
+        FriendRegistry,
+        SoundRegistry,
     )
 
     fun initialize() {

…/kotlin/com/lambda/core/FriendManager.kt …otlin/com/lambda/friend/FriendManager.ktcommon/src/main/kotlin/com/lambda/core/FriendManager.kt renamed to common/src/main/kotlin/com/lambda/friend/FriendManager.kt common/src/main/kotlin/com/lambda/core/FriendManager.kt renamed to common/src/main/kotlin/com/lambda/friend/FriendManager.kt

@@ -1,16 +1,11 @@
-package com.lambda.core
+package com.lambda.friend
 
-import com.lambda.config.Configurable
-import com.lambda.config.configurations.FriendConfig
+import com.lambda.friend.FriendRegistry.friends
 import com.mojang.authlib.GameProfile
 import net.minecraft.server.network.ServerPlayerEntity
 import java.util.UUID
 
-object FriendManager : Configurable(FriendConfig), Loadable {
-    override val name = "FriendManager"
-
-    private var friends by setting("friends", listOf<GameProfile>())
-
+object FriendManager {
     fun add(profile: GameProfile) = friends.add(profile)
 
     fun remove(profile: GameProfile) = friends.remove(profile)
@@ -29,10 +24,4 @@ object FriendManager : Configurable(FriendConfig), Loadable {
 
     fun ServerPlayerEntity.befriend() = add(gameProfile)
     fun ServerPlayerEntity.unfriend() = remove(gameProfile)
-
-    override fun load(): String {
-        if (friends.isEmpty()) return "No friends loaded, you don't have to be antisocial online too,"
-        val word = if (friends.size == 1) "friend" else "friends"
-        return "Loaded ${friends.size} $word."
-    }
 }