Merge branch 'feature/renderer'

Author: Avanatiker

common/src/main/java/com/lambda/mixin/render/GameRendererMixin.java

@@ -2,7 +2,9 @@
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.RenderEvent;
+import com.lambda.graphics.RenderMain;
 import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -16,4 +18,9 @@ private void updateTargetedEntityInvoke(float tickDelta, CallbackInfo info) {
             info.cancel();
         }
     }
+
+    @Inject(method = "renderWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;render(Lnet/minecraft/client/util/math/MatrixStack;FJZLnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/GameRenderer;Lnet/minecraft/client/render/LightmapTextureManager;Lorg/joml/Matrix4f;)V", shift = At.Shift.AFTER))
+    private void onRenderWorld(float tickDelta, long limitTime, MatrixStack matrix, CallbackInfo ci) {
+        RenderMain.render3D(matrix.peek().getPositionMatrix());
+    }
 }

common/src/main/kotlin/com/lambda/Lambda.kt

@@ -3,10 +3,12 @@ package com.lambda
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.lambda.config.serializer.*
+import com.lambda.config.serializer.gui.CustomModuleWindowSerializer
 import com.lambda.config.serializer.gui.ModuleTagSerializer
 import com.lambda.config.serializer.gui.TagWindowSerializer
 import com.lambda.core.Loader
-import com.lambda.gui.impl.clickgui.windows.TagWindow
+import com.lambda.gui.impl.clickgui.windows.tag.CustomModuleWindow
+import com.lambda.gui.impl.clickgui.windows.tag.TagWindow
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.KeyCode
 import com.mojang.authlib.GameProfile
@@ -28,6 +30,7 @@ object Lambda {
     val gson: Gson = GsonBuilder()
         .setPrettyPrinting()
         .registerTypeAdapter(ModuleTag::class.java, ModuleTagSerializer)
+        .registerTypeAdapter(CustomModuleWindow::class.java, CustomModuleWindowSerializer)
         .registerTypeAdapter(TagWindow::class.java, TagWindowSerializer)
         .registerTypeAdapter(KeyCode::class.java, KeyCodeSerializer)
         .registerTypeAdapter(Color::class.java, ColorSerializer)

common/src/main/kotlin/com/lambda/config/configurations/GuiConfig.kt

@@ -6,4 +6,4 @@ import com.lambda.util.FolderRegister
 object GuiConfig : Configuration() {
     override val configName = "gui"
     override val primary = FolderRegister.config.resolve("$configName.json")
-}
+}

common/src/main/kotlin/com/lambda/config/serializer/gui/CustomModuleWindowSerializer.kt

@@ -0,0 +1,56 @@
+package com.lambda.config.serializer.gui
+
+import com.google.gson.*
+import com.lambda.gui.impl.clickgui.LambdaClickGui
+import com.lambda.gui.impl.clickgui.windows.tag.CustomModuleWindow
+import com.lambda.module.ModuleRegistry
+import com.lambda.util.math.Vec2d
+import java.lang.reflect.Type
+
+object CustomModuleWindowSerializer : JsonSerializer<CustomModuleWindow>, JsonDeserializer<CustomModuleWindow> {
+    override fun serialize(
+        src: CustomModuleWindow?,
+        typeOfSrc: Type?,
+        context: JsonSerializationContext?,
+    ): JsonElement = src?.let {
+        JsonObject().apply {
+            addProperty("title", it.title)
+            add("modules", JsonArray().apply {
+                it.modules.forEach {
+                    add(it.name)
+                }
+            })
+            addProperty("width", it.width)
+            addProperty("height", it.height)
+            addProperty("isOpen", it.isOpen)
+            add("position", JsonArray().apply {
+                add(it.position.x)
+                add(it.position.y)
+            })
+        }
+    } ?: JsonNull.INSTANCE
+
+    override fun deserialize(
+        json: JsonElement?,
+        typeOfT: Type?,
+        context: JsonDeserializationContext?,
+    )  = json?.asJsonObject?.let {
+        CustomModuleWindow(
+            it["title"].asString,
+            it["modules"].asJsonArray.mapNotNull { name ->
+                ModuleRegistry.modules.firstOrNull { module ->
+                    module.name == name.asString
+                }
+            } as MutableList,
+            LambdaClickGui
+        ).apply {
+            width = it["width"].asDouble
+            height = it["height"].asDouble
+            isOpen = it["isOpen"].asBoolean
+            position = Vec2d(
+                it["position"].asJsonArray[0].asDouble,
+                it["position"].asJsonArray[1].asDouble
+            )
+        }
+    } ?: throw JsonParseException("Invalid window data")
+}

common/src/main/kotlin/com/lambda/config/serializer/gui/TagWindowSerializer.kt

@@ -1,7 +1,8 @@
 package com.lambda.config.serializer.gui
 
 import com.google.gson.*
-import com.lambda.gui.impl.clickgui.windows.TagWindow
+import com.lambda.gui.impl.clickgui.LambdaClickGui
+import com.lambda.gui.impl.clickgui.windows.tag.TagWindow
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.math.Vec2d
 import java.lang.reflect.Type
@@ -13,12 +14,7 @@ object TagWindowSerializer : JsonSerializer<TagWindow>, JsonDeserializer<TagWind
         context: JsonSerializationContext?,
     ): JsonElement = src?.let {
         JsonObject().apply {
-            addProperty("title", it.title)
-            add("tags", JsonArray().apply {
-                it.tags.forEach { tag ->
-                    add(tag.name)
-                }
-            })
+            addProperty("tag", it.tag.name)
             addProperty("width", it.width)
             addProperty("height", it.height)
             addProperty("isOpen", it.isOpen)
@@ -33,15 +29,10 @@ object TagWindowSerializer : JsonSerializer<TagWindow>, JsonDeserializer<TagWind
         json: JsonElement?,
         typeOfT: Type?,
         context: JsonDeserializationContext?,
-    ) = json?.asJsonObject?.let {
-        TagWindow(
-            tags = it["tags"].asJsonArray.map { tag ->
-                ModuleTag(tag.asString)
-            }.toSet(),
-            title = it["title"].asString,
-            width = it["width"].asDouble,
+    )  = json?.asJsonObject?.let {
+        TagWindow(ModuleTag(it["tag"].asString), LambdaClickGui).apply {
+            width = it["width"].asDouble
             height = it["height"].asDouble
-        ).apply {
             isOpen = it["isOpen"].asBoolean
             position = Vec2d(
                 it["position"].asJsonArray[0].asDouble,

common/src/main/kotlin/com/lambda/config/settings/NumericSetting.kt

@@ -31,6 +31,6 @@ abstract class NumericSetting<T>(
     override fun toString() = "$value$unit"
 
     override operator fun setValue(thisRef: Any?, property: KProperty<*>, valueIn: T) {
-        value = valueIn.coerceIn(range).roundToStep(step)
+        value = valueIn.coerceIn(range)
     }
 }

common/src/main/kotlin/com/lambda/config/settings/comparable/EnumSetting.kt

@@ -1,6 +1,8 @@
 package com.lambda.config.settings.comparable
 
 import com.lambda.config.AbstractSetting
+import com.lambda.util.Nameable
+import java.util.*
 
 class EnumSetting<T : Enum<T>>(
     override val name: String,
@@ -12,7 +14,13 @@ class EnumSetting<T : Enum<T>>(
     description,
     visibility,
 ) {
-    private val enumValues: Array<T> = defaultValue.declaringJavaClass.enumConstants
+    val displayValue get() = (value as? Nameable)?.name ?: value.name.split('_').joinToString(" ") { low ->
+        low.lowercase().replaceFirstChar {
+            if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString()
+        }
+    }
+
+    val enumValues: Array<T> = defaultValue.declaringJavaClass.enumConstants
 
     fun next() {
         value = enumValues[((value.ordinal + 1) % enumValues.size)]

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

@@ -0,0 +1,20 @@
+package com.lambda.core
+
+import com.lambda.core.SoundManager.toIdentifier
+import net.minecraft.sound.SoundEvent
+import net.minecraft.util.Identifier
+
+enum class LambdaSound(val id: Identifier) {
+    BUTTON_CLICK("button_click".toIdentifier()),
+
+    BOOLEAN_SETTING_ON("bool_on".toIdentifier()),
+    BOOLEAN_SETTING_OFF("bool_off".toIdentifier()),
+
+    MODULE_ON("module_on".toIdentifier()),
+    MODULE_OFF("module_off".toIdentifier()),
+
+    SETTINGS_OPEN("settings_open".toIdentifier()),
+    SETTINGS_CLOSE("settings_close".toIdentifier());
+
+    val event: SoundEvent = SoundEvent.of(id)
+}

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

@@ -4,7 +4,7 @@ import com.lambda.Lambda
 import com.lambda.Lambda.LOG
 import com.lambda.command.CommandManager
 import com.lambda.graphics.renderer.gui.font.LambdaFont
-import com.lambda.gui.impl.clickgui.GuiConfigurable
+import com.lambda.gui.GuiConfigurable
 import com.lambda.interaction.PlayerPacketManager
 import com.lambda.interaction.RotationManager
 import com.lambda.module.ModuleRegistry
@@ -20,6 +20,7 @@ object Loader {
         LambdaFont.Loader,
         GuiConfigurable,
         FriendManager,
+        SoundManager,
     )
 
     fun initialize() {
@@ -28,7 +29,7 @@ object Loader {
 
         val initTime = measureTimeMillis {
             loadables.forEach { loadable ->
-                var info: String
+                val info: String
                 val phaseTime = measureTimeMillis {
                     info = loadable.load()
                 }

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

@@ -0,0 +1,37 @@
+package com.lambda.core
+
+import com.lambda.Lambda
+import com.lambda.Lambda.mc
+import com.lambda.util.math.random
+import net.minecraft.client.sound.PositionedSoundInstance
+import net.minecraft.registry.Registries
+import net.minecraft.registry.Registry
+import net.minecraft.sound.SoundEvent
+import net.minecraft.util.Identifier
+
+object SoundManager : Loadable {
+
+    override fun load(): String {
+        LambdaSound.entries.forEach {
+            Registry.register(Registries.SOUND_EVENT, it.id, it.event)
+        }
+
+        return "Loaded ${LambdaSound.entries.size} sounds"
+    }
+
+    fun playSound(event: SoundEvent, pitch: Double = 1.0) {
+        mc.soundManager.play(
+            PositionedSoundInstance.master(event, pitch.toFloat())
+        )
+    }
+
+    fun playSoundRandomly(event: SoundEvent, pitch: Double = 1.0, pitchRange: Double = 0.05) {
+        val actualPitch = (pitch - pitchRange..pitch + pitchRange).random()
+
+        mc.soundManager.play(
+            PositionedSoundInstance.master(event, actualPitch.toFloat())
+        )
+    }
+
+    fun String.toIdentifier() = Identifier(Lambda.MOD_ID, this)
+}