Merge pull request #19 from Avanatiker/feature/renderer

ESP

Author: Avanatiker

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

@@ -42,7 +42,7 @@ private void injectQuickPerspectiveSwap(BlockView area, Entity focusedEntity, bo
 
     @Inject(method = "clipToSpace", at = @At("HEAD"), cancellable = true)
     private void onClipToSpace(double desiredCameraDistance, CallbackInfoReturnable<Double> info) {
-        if (CameraTweaks.getNoClipCam()) {
+        if (CameraTweaks.INSTANCE.isEnabled() && CameraTweaks.getNoClipCam()) {
             info.setReturnValue(desiredCameraDistance);
         }
     }

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

@@ -1,14 +1,44 @@
 package com.lambda.mixin.render;
 
 import com.lambda.command.CommandManager;
+import com.lambda.graphics.renderer.gui.font.FontRenderer;
+import com.lambda.graphics.renderer.gui.font.LambdaEmoji;
+import com.lambda.graphics.renderer.gui.font.glyph.GlyphInfo;
+import kotlin.Pair;
+import kotlin.ranges.IntRange;
 import net.minecraft.client.gui.screen.ChatScreen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import java.util.Collections;
+import java.util.List;
+
 @Mixin(ChatScreen.class)
 public abstract class ChatScreenMixin {
+    @ModifyArg(method = "sendMessage", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayNetworkHandler;sendChatMessage(Ljava/lang/String;)V"), index = 0)
+    private String modifyChatText(String chatText) {
+        List<Pair<GlyphInfo, IntRange>> emojis = FontRenderer.Companion.parseEmojis(chatText, LambdaEmoji.Twemoji);
+        Collections.reverse(emojis);
+
+        for (Pair<GlyphInfo, IntRange> emoji : emojis) {
+            String emojiString = chatText.substring(emoji.getSecond().getStart() + 1, emoji.getSecond().getEndInclusive());
+            if (LambdaEmoji.Twemoji.get(emojiString) == null)
+                continue;
+
+            // Because the width of a char is bigger than an emoji
+            // we can simply replace the matches string by a space
+            // and render it after the text
+            chatText = chatText.substring(0, emoji.getSecond().getStart()) + " " + chatText.substring(emoji.getSecond().getEndInclusive() + 1);
+
+            // TODO: Build a renderer for the emojis
+            // TODO: Render the emojis at their correct position
+        }
+
+        return chatText;
+    }
 
     @Inject(method = "sendMessage", at = @At("HEAD"), cancellable = true)
     void sendMessageInject(String chatText, boolean addToHistory, CallbackInfoReturnable<Boolean> cir) {

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

@@ -10,8 +10,10 @@ import com.lambda.core.Loader
 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.threading.runGameScheduled
 import com.lambda.util.KeyCode
 import com.mojang.authlib.GameProfile
+import com.mojang.blaze3d.systems.RenderSystem.recordRenderCall
 import net.minecraft.block.Block
 import net.minecraft.client.MinecraftClient
 import net.minecraft.util.math.BlockPos

common/src/main/kotlin/com/lambda/config/AbstractSetting.kt

@@ -5,6 +5,7 @@ import com.lambda.Lambda.gson
 import com.lambda.context.SafeContext
 import com.lambda.threading.runSafe
 import com.lambda.util.Nameable
+import java.lang.reflect.Type
 import kotlin.properties.Delegates
 import kotlin.reflect.KProperty
 
@@ -49,10 +50,12 @@ import kotlin.reflect.KProperty
  *
  * @property defaultValue The default value of the setting.
  * @property description A description of the setting.
+ * @property type The type reflection of the setting.
  * @property visibility A function that determines whether the setting is visible.
  */
 abstract class AbstractSetting<T : Any>(
     private val defaultValue: T,
+    private val type: Type,
     val description: String,
     val visibility: () -> Boolean,
 ) : Jsonable, Nameable {
@@ -74,10 +77,10 @@ abstract class AbstractSetting<T : Any>(
     }
 
     override fun toJson(): JsonElement =
-        gson.toJsonTree(value)
+        gson.toJsonTree(value, type)
 
     override fun loadFromJson(serialized: JsonElement) {
-        value = gson.fromJson(serialized, value::class.java)
+        value = gson.fromJson(serialized, type)
     }
 
     fun onValueChange(block: SafeContext.(from: T, to: T) -> Unit) {
@@ -101,4 +104,4 @@ abstract class AbstractSetting<T : Any>(
     }
 
     class ValueListener<T>(val requiresValueChange: Boolean, val execute: (from: T, to: T) -> Unit)
-}
+}

common/src/main/kotlin/com/lambda/config/Configuration.kt

@@ -131,6 +131,7 @@ abstract class Configuration : Jsonable {
                 }
                 .onFailure {
                     val message = "Failed to save ${configName.capitalize()} config"
+                    LOG.error(message, it)
                     logError(message)
                 }
         }

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

@@ -3,6 +3,7 @@ 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.TagWindow
+import com.lambda.gui.impl.hudgui.LambdaHudGui
 import com.lambda.module.tag.ModuleTag
 import com.lambda.util.math.Vec2d
 import java.lang.reflect.Type
@@ -29,8 +30,16 @@ object TagWindowSerializer : JsonSerializer<TagWindow>, JsonDeserializer<TagWind
         json: JsonElement?,
         typeOfT: Type?,
         context: JsonDeserializationContext?,
-    ) = json?.asJsonObject?.let {
-        TagWindow(ModuleTag(it["tag"].asString), LambdaClickGui).apply {
+    )  = json?.asJsonObject?.let {
+        val tag = ModuleTag(it["tag"].asString)
+
+        val gui = when (tag) {
+            in ModuleTag.defaults -> LambdaClickGui
+            in ModuleTag.hudDefaults -> LambdaHudGui
+            else -> return@let null
+        }
+
+        TagWindow(tag, gui).apply {
             width = it["width"].asDouble
             height = it["height"].asDouble
             isOpen = it["isOpen"].asBoolean

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

@@ -1,5 +1,6 @@
 package com.lambda.config.settings
 
+import com.google.gson.reflect.TypeToken
 import com.lambda.config.AbstractSetting
 
 /**
@@ -17,6 +18,7 @@ class CharSetting(
     visibility: () -> Boolean,
 ) : AbstractSetting<Char>(
     defaultValue,
+    TypeToken.get(Char::class.java).type,
     description,
     visibility
-)
+)

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

@@ -1,5 +1,6 @@
 package com.lambda.config.settings
 
+import com.google.gson.reflect.TypeToken
 import com.lambda.config.AbstractSetting
 import java.text.NumberFormat
 import java.util.*
@@ -26,6 +27,7 @@ abstract class NumericSetting<T>(
     val unit: String,
 ) : AbstractSetting<T>(
     value,
+    TypeToken.get(value::class.java).type,
     description,
     visibility
 ) where T : Number, T : Comparable<T> {
@@ -36,4 +38,4 @@ abstract class NumericSetting<T>(
     override operator fun setValue(thisRef: Any?, property: KProperty<*>, valueIn: T) {
         value = valueIn.coerceIn(range)
     }
-}
+}

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

@@ -1,5 +1,6 @@
 package com.lambda.config.settings
 
+import com.google.gson.reflect.TypeToken
 import com.lambda.config.AbstractSetting
 
 /**
@@ -17,6 +18,7 @@ class StringSetting(
     visibility: () -> Boolean,
 ) : AbstractSetting<String>(
     defaultValue,
+    TypeToken.get(String::class.java).type,
     description,
     visibility
-)
+)

common/src/main/kotlin/com/lambda/config/settings/collections/ListSetting.kt

@@ -1,6 +1,7 @@
 package com.lambda.config.settings.collections
 
 import com.google.gson.JsonElement
+import com.google.gson.reflect.TypeToken
 import com.lambda.Lambda.gson
 import com.lambda.config.AbstractSetting
 import java.lang.reflect.Type
@@ -13,6 +14,7 @@ class ListSetting<T : Any>(
     visibility: () -> Boolean,
 ) : AbstractSetting<MutableList<T>>(
     defaultValue,
+    type,
     description,
     visibility
 ) {
@@ -21,7 +23,6 @@ class ListSetting<T : Any>(
     }
 
     override fun toJson(): JsonElement {
-        value = defaultValue // Hack the Delegates.observable
         return gson.toJsonTree(value)
     }
 }