Revert "Refactor: Change module name to com.lambda.common"

emyfops · emyfops · commit 60a65511ef8b · 2024-03-10T11:59:11.000-04:00
This reverts commit af8c6a1.
diff --git a/common/src/main/java/com/lambda/mixin/ClientConnectionMixin.java b/common/src/main/java/com/lambda/mixin/ClientConnectionMixin.java
@@ -1,7 +1,7 @@
-package com.lambda.common.mixin;
+package com.lambda.mixin;
 
-import com.lambda.common.event.EventFlow;
-import com.lambda.common.event.events.PacketEvent;
+import com.lambda.event.EventFlow;
+import com.lambda.event.events.PacketEvent;
 import io.netty.channel.ChannelHandlerContext;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.NetworkSide;
diff --git a/common/src/main/java/com/lambda/mixin/KeyboardMixin.java b/common/src/main/java/com/lambda/mixin/KeyboardMixin.java
@@ -1,7 +1,7 @@
-package com.lambda.common.mixin;
+package com.lambda.mixin;
 
-import com.lambda.common.event.EventFlow;
-import com.lambda.common.event.events.KeyPressEvent;
+import com.lambda.event.EventFlow;
+import com.lambda.event.events.KeyPressEvent;
 import net.minecraft.client.Keyboard;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/common/src/main/java/com/lambda/mixin/MinecraftClientMixin.java b/common/src/main/java/com/lambda/mixin/MinecraftClientMixin.java
@@ -1,7 +1,7 @@
-package com.lambda.common.mixin;
+package com.lambda.mixin;
 
-import com.lambda.common.event.EventFlow;
-import com.lambda.common.event.events.TickEvent;
+import com.lambda.event.EventFlow;
+import com.lambda.event.events.TickEvent;
 import net.minecraft.client.MinecraftClient;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/common/src/main/kotlin/com/lambda/Lambda.kt b/common/src/main/kotlin/com/lambda/Lambda.kt
@@ -1,9 +1,9 @@
-package com.lambda.common
+package com.lambda
 
-import com.lambda.common.event.events.KeyPressEvent
-import com.lambda.common.event.listener.SafeListener.Companion.listener
-import com.lambda.common.task.tasks.HelloWorldTask
-import com.lambda.common.threading.taskContext
+import com.lambda.event.events.KeyPressEvent
+import com.lambda.event.listener.SafeListener.Companion.listener
+import com.lambda.task.tasks.HelloWorldTask
+import com.lambda.threading.taskContext
 import net.minecraft.client.MinecraftClient
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger
diff --git a/common/src/main/kotlin/com/lambda/LoaderInfo.kt b/common/src/main/kotlin/com/lambda/LoaderInfo.kt
@@ -1,4 +1,4 @@
-package com.lambda.common
+package com.lambda
 
 import dev.architectury.injectables.annotations.ExpectPlatform
 import org.jetbrains.annotations.Contract
@@ -8,4 +8,4 @@ object LoaderInfo {
     @ExpectPlatform
     @JvmStatic
     fun getVersion(): String = "DEV"
-}
+}
diff --git a/common/src/main/kotlin/com/lambda/common/event/CallbackEvent.kt b/common/src/main/kotlin/com/lambda/common/event/CallbackEvent.kt
diff --git a/common/src/main/kotlin/com/lambda/common/event/Event.kt b/common/src/main/kotlin/com/lambda/common/event/Event.kt
diff --git a/common/src/main/kotlin/com/lambda/common/event/events/KeyPressEvent.kt b/common/src/main/kotlin/com/lambda/common/event/events/KeyPressEvent.kt
diff --git a/common/src/main/kotlin/com/lambda/context/AbstractContext.kt b/common/src/main/kotlin/com/lambda/context/AbstractContext.kt
@@ -1,4 +1,4 @@
-package com.lambda.common.context
+package com.lambda.context
 
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.network.ClientPlayNetworkHandler
@@ -12,4 +12,4 @@ abstract class AbstractContext {
     abstract val player: ClientPlayerEntity?
     abstract val interaction: ClientPlayerInteractionManager?
     abstract val connection: ClientPlayNetworkHandler?
-}
+}
diff --git a/common/src/main/kotlin/com/lambda/context/ClientContext.kt b/common/src/main/kotlin/com/lambda/context/ClientContext.kt
@@ -1,4 +1,4 @@
-package com.lambda.common.context
+package com.lambda.context
 
 import net.minecraft.client.network.ClientPlayNetworkHandler
 import net.minecraft.client.network.ClientPlayerEntity
@@ -17,4 +17,4 @@ open class ClientContext : AbstractContext() {
         }
         return SafeContext(world, player, interaction, connection)
     }
-}
+}
diff --git a/common/src/main/kotlin/com/lambda/context/SafeContext.kt b/common/src/main/kotlin/com/lambda/context/SafeContext.kt
@@ -1,4 +1,4 @@
-package com.lambda.common.context
+package com.lambda.context
 
 import net.minecraft.client.network.ClientPlayNetworkHandler
 import net.minecraft.client.network.ClientPlayerEntity
@@ -10,4 +10,4 @@ open class SafeContext internal constructor(
     override val player: ClientPlayerEntity,
     override val interaction: ClientPlayerInteractionManager,
     override val connection: ClientPlayNetworkHandler
-) : AbstractContext()
+) : AbstractContext()
diff --git a/common/src/main/kotlin/com/lambda/event/CallbackEvent.kt b/common/src/main/kotlin/com/lambda/event/CallbackEvent.kt
@@ -0,0 +1,3 @@
+package com.lambda.event
+
+interface CallbackEvent : Event
diff --git a/common/src/main/kotlin/com/lambda/event/Event.kt b/common/src/main/kotlin/com/lambda/event/Event.kt
@@ -0,0 +1,3 @@
+package com.lambda.event
+
+interface Event
diff --git a/common/src/main/kotlin/com/lambda/event/EventFlow.kt b/common/src/main/kotlin/com/lambda/event/EventFlow.kt
@@ -1,12 +1,16 @@
-package com.lambda.common.event
+package com.lambda.event
 
-import com.lambda.common.event.listener.Listener
-import com.lambda.common.threading.runConcurrent
+import com.lambda.event.listener.Listener
+import com.lambda.event.listener.SafeListener
+import com.lambda.threading.runConcurrent
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterNot
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.ConcurrentSkipListSet
+import kotlin.reflect.KClass
 
 object EventFlow {
     /**
@@ -87,4 +91,4 @@ object EventFlow {
             }
         }
     }
-}
+}
diff --git a/common/src/main/kotlin/com/lambda/event/ICancellable.kt b/common/src/main/kotlin/com/lambda/event/ICancellable.kt
@@ -1,4 +1,4 @@
-package com.lambda.common.event
+package com.lambda.event
 
 import java.util.concurrent.atomic.AtomicBoolean
 
diff --git a/common/src/main/kotlin/com/lambda/event/Subscriber.kt b/common/src/main/kotlin/com/lambda/event/Subscriber.kt
@@ -1,6 +1,6 @@
-package com.lambda.common.event
+package com.lambda.event
 
-import com.lambda.common.event.listener.Listener
+import com.lambda.event.listener.Listener
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ConcurrentSkipListSet
 import kotlin.reflect.KClass
@@ -33,4 +33,4 @@ class Subscriber : ConcurrentHashMap<KClass<*>, ConcurrentSkipListSet<Listener>>
             listeners.isEmpty()
         }
     }
-}
+}
diff --git a/common/src/main/kotlin/com/lambda/event/events/KeyPressEvent.kt b/common/src/main/kotlin/com/lambda/event/events/KeyPressEvent.kt
@@ -0,0 +1,6 @@
+package com.lambda.event.events
+
+import com.lambda.event.Cancellable
+import com.lambda.event.ICancellable
+
+class KeyPressEvent(val key: Int): ICancellable by Cancellable()
diff --git a/common/src/main/kotlin/com/lambda/event/events/PacketEvent.kt b/common/src/main/kotlin/com/lambda/event/events/PacketEvent.kt
@@ -1,8 +1,8 @@
-package com.lambda.common.event.events
+package com.lambda.event.events
 
-import com.lambda.common.event.Cancellable
-import com.lambda.common.event.Event
-import com.lambda.common.event.ICancellable
+import com.lambda.event.Cancellable
+import com.lambda.event.ICancellable
+import com.lambda.event.Event
 import net.minecraft.network.packet.Packet
 
 abstract class PacketEvent : Event {
@@ -15,4 +15,4 @@ abstract class PacketEvent : Event {
         class Pre(val packet: Packet<*>) : Receive(), ICancellable by Cancellable()
         class Post(val packet: Packet<*>) : Receive()
     }
-}
+}
diff --git a/common/src/main/kotlin/com/lambda/event/events/TickEvent.kt b/common/src/main/kotlin/com/lambda/event/events/TickEvent.kt
@@ -1,8 +1,8 @@
-package com.lambda.common.event.events
+package com.lambda.event.events
 
-import com.lambda.common.event.Event
+import com.lambda.event.Event
 
 abstract class TickEvent : Event {
     class Pre : TickEvent()
     class Post : TickEvent()
-}
+}
diff --git a/common/src/main/kotlin/com/lambda/event/listener/Listener.kt b/common/src/main/kotlin/com/lambda/event/listener/Listener.kt
@@ -1,6 +1,7 @@
-package com.lambda.common.event.listener
+package com.lambda.event.listener
 
-import com.lambda.common.event.Event
+import com.lambda.event.Event
+import com.lambda.event.EventFlow
 
 abstract class Listener : Comparable<Listener> {
     abstract val priority: Int
@@ -15,4 +16,4 @@ abstract class Listener : Comparable<Listener> {
             // Needed because ConcurrentSkipListSet handles insertion based on compareTo
             it.hashCode()
         }.compare(this, other)
-}
+}
diff --git a/common/src/main/kotlin/com/lambda/event/listener/SafeListener.kt b/common/src/main/kotlin/com/lambda/event/listener/SafeListener.kt
@@ -1,10 +1,11 @@
-package com.lambda.common.event.listener
+package com.lambda.event.listener
 
-import com.lambda.common.event.Event
-import com.lambda.common.context.SafeContext
-import com.lambda.common.event.EventFlow
-import com.lambda.common.task.Task
-import com.lambda.common.threading.runSafe
+import com.lambda.context.SafeContext
+import com.lambda.event.Event
+import com.lambda.event.EventFlow
+import com.lambda.task.Task
+import com.lambda.threading.runSafe
+import java.util.concurrent.ConcurrentSkipListSet
 
 class SafeListener(
     override val priority: Int = 0,
diff --git a/common/src/main/kotlin/com/lambda/event/listener/UnsafeListener.kt b/common/src/main/kotlin/com/lambda/event/listener/UnsafeListener.kt
@@ -1,7 +1,9 @@
-package com.lambda.common.event.listener
+package com.lambda.event.listener
 
-import com.lambda.common.event.Event
-import com.lambda.common.event.EventFlow
+import com.lambda.event.Event
+import com.lambda.event.EventFlow
+import java.util.concurrent.ConcurrentSkipListSet
+import kotlin.reflect.KClass
 
 class UnsafeListener(
     override val priority: Int,
diff --git a/common/src/main/kotlin/com/lambda/task/Task.kt b/common/src/main/kotlin/com/lambda/task/Task.kt
@@ -1,11 +1,10 @@
-package com.lambda.common.task
+package com.lambda.task
 
-import com.lambda.common.Lambda.LOG
-import com.lambda.common.context.SafeContext
-import com.lambda.common.task.TaskResult
-import com.lambda.common.event.EventFlow
-import com.lambda.common.event.Subscriber
-import com.lambda.common.threading.runSafe
+import com.lambda.Lambda.LOG
+import com.lambda.context.SafeContext
+import com.lambda.event.EventFlow
+import com.lambda.event.Subscriber
+import com.lambda.threading.runSafe
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.delay
@@ -259,4 +258,4 @@ abstract class Task<Result>(
         this.onRepeat = action
         return this
     }
-}
+}
diff --git a/common/src/main/kotlin/com/lambda/task/TaskResult.kt b/common/src/main/kotlin/com/lambda/task/TaskResult.kt
@@ -1,4 +1,4 @@
-package com.lambda.common.task
+package com.lambda.task
 
 /**
  * Represents the result of a task.
@@ -34,4 +34,4 @@ sealed class TaskResult<out Result> {
      * Represents a cancelled task result.
      */
     data object Cancelled : TaskResult<Nothing>()
-}
+}
diff --git a/common/src/main/kotlin/com/lambda/task/tasks/HelloWorldTask.kt b/common/src/main/kotlin/com/lambda/task/tasks/HelloWorldTask.kt
@@ -1,10 +1,10 @@
-package com.lambda.common.task.tasks
+package com.lambda.task.tasks
 
-import com.lambda.common.Lambda.LOG
-import com.lambda.common.context.SafeContext
-import com.lambda.common.event.events.TickEvent
-import com.lambda.common.event.listener.SafeListener.Companion.listener
-import com.lambda.common.task.Task
+import com.lambda.Lambda.LOG
+import com.lambda.context.SafeContext
+import com.lambda.event.events.TickEvent
+import com.lambda.event.listener.SafeListener.Companion.listener
+import com.lambda.task.Task
 import kotlinx.coroutines.delay
 
 class HelloWorldTask : Task<Unit>() {
@@ -19,4 +19,4 @@ class HelloWorldTask : Task<Unit>() {
         delay(250)
         LOG.info("Bye, World! Action completed")
     }
-}
+}
diff --git a/common/src/main/kotlin/com/lambda/threading/Threading.kt b/common/src/main/kotlin/com/lambda/threading/Threading.kt
@@ -1,8 +1,12 @@
-package com.lambda.common.threading
+package com.lambda.threading
 
-import com.lambda.common.context.ClientContext
-import com.lambda.common.event.EventFlow
-import com.lambda.common.context.SafeContext
+import com.lambda.Lambda
+import com.lambda.context.ClientContext
+import com.lambda.event.EventFlow
+import com.lambda.context.SafeContext
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 
 /**
@@ -72,7 +76,7 @@ inline fun runSafeConcurrent(crossinline block: SafeContext.() -> Unit) {
  * @param block The task to be executed on the game's main thread.
  */
 inline fun runOnGameThread(crossinline block: () -> Unit) {
-    com.lambda.common.Lambda.mc.executeSync { block() }
+    Lambda.mc.executeSync { block() }
 }
 
 /**
@@ -94,4 +98,4 @@ inline fun runOnGameThread(crossinline block: () -> Unit) {
  */
 inline fun runSafeOnGameThread(crossinline block: SafeContext.() -> Unit) {
     runOnGameThread { runSafe { block() } }
-}
+}
diff --git a/common/src/main/resources/lambda.mixins.common.json b/common/src/main/resources/lambda.mixins.common.json
@@ -1,7 +1,7 @@
 {
   "required": true,
   "minVersion": "0.8",
-  "package": "com.lambda.common.mixin",
+  "package": "com.lambda.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
     "KeyboardMixin",
diff --git a/fabric/src/main/kotlin/com/lambda/fabric/LambdaFabric.kt b/fabric/src/main/kotlin/com/lambda/fabric/LambdaFabric.kt
@@ -1,8 +1,8 @@
 package com.lambda.fabric
 
 import net.fabricmc.api.ClientModInitializer
-import com.lambda.common.Lambda
-import com.lambda.common.Lambda.LOG
+import com.lambda.Lambda
+import com.lambda.Lambda.LOG
 
 object LambdaFabric : ClientModInitializer {
     override fun onInitializeClient() {
diff --git a/forge/src/main/kotlin/com/lambda/forge/LambdaForge.kt b/forge/src/main/kotlin/com/lambda/forge/LambdaForge.kt
@@ -1,8 +1,8 @@
 package com.lambda.forge
 
 import net.minecraftforge.fml.common.Mod
-import com.lambda.common.Lambda
-import com.lambda.common.Lambda.LOG
+import com.lambda.Lambda
+import com.lambda.Lambda.LOG
 
 @Mod(Lambda.MOD_ID)
 object LambdaForge {
diff --git a/neoforge/src/main/kotlin/com/lambda/neoforge/LambdaNeoForge.kt b/neoforge/src/main/kotlin/com/lambda/neoforge/LambdaNeoForge.kt
@@ -1,8 +1,8 @@
 package com.lambda.neoforge
 
 import net.neoforged.fml.common.Mod
-import com.lambda.common.Lambda
-import com.lambda.common.Lambda.LOG
+import com.lambda.Lambda
+import com.lambda.Lambda.LOG
 
 @Mod(Lambda.MOD_ID)
 object LambdaNeoForge {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.lambda.common.context`
	`1`	`+package com.lambda.context`
`2`	`2`
`3`	`3`	`import net.minecraft.client.network.ClientPlayNetworkHandler`
`4`	`4`	`import net.minecraft.client.network.ClientPlayerEntity`
`@@ -17,4 +17,4 @@ open class ClientContext : AbstractContext() {`
`17`	`17`	`}`
`18`	`18`	`return SafeContext(world, player, interaction, connection)`
`19`	`19`	`}`
`20`		`-}`
	`20`	`+}`