Merge branch 'master' into feature/taskflow

Author: Avanatiker

common/src/main/java/com/lambda/mixin/baritone/MixinBaritonePlayerContext.java

@@ -14,7 +14,9 @@
 
 @Mixin(value = BaritonePlayerContext.class, remap = false) // fix compileJava warning
 public class MixinBaritonePlayerContext {
-    @Shadow @Final private Baritone baritone;
+    @Shadow
+    @Final
+    private Baritone baritone;
 
     // Let baritone know the actual rotation
     @Inject(method = "playerRotations", at = @At("HEAD"), cancellable = true, remap = false)

common/src/main/java/com/lambda/mixin/entity/ClientPlayerEntityMixin.java

@@ -21,13 +21,16 @@
 @Mixin(value = ClientPlayerEntity.class, priority = Integer.MAX_VALUE)
 public abstract class ClientPlayerEntityMixin extends EntityMixin {
 
-    @Shadow protected abstract void autoJump(float dx, float dz);
+    @Shadow
+    public Input input;
+    @Shadow
+    private boolean autoJumpEnabled;
 
-    @Shadow public abstract boolean isUsingItem();
+    @Shadow
+    protected abstract void autoJump(float dx, float dz);
 
-    @Shadow private boolean autoJumpEnabled;
-
-    @Shadow public Input input;
+    @Shadow
+    public abstract boolean isUsingItem();
 
     @Inject(method = "move", at = @At("HEAD"), cancellable = true)
     void onMove(MovementType movementType, Vec3d movement, CallbackInfo ci) {

common/src/main/java/com/lambda/mixin/entity/EntityMixin.java

@@ -13,9 +13,12 @@
 
 @Mixin(Entity.class)
 public abstract class EntityMixin {
-    @Shadow public void move(MovementType movementType, Vec3d movement) {}
+    @Shadow
+    public void move(MovementType movementType, Vec3d movement) {
+    }
 
-    @Shadow public abstract float getYaw();
+    @Shadow
+    public abstract float getYaw();
 
     @Redirect(method = "updateVelocity", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;getYaw()F"))
     public float velocityYaw(Entity entity) {

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

@@ -8,7 +8,6 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import static org.lwjgl.opengl.GL11.*;
-import static org.lwjgl.opengl.GL11.GL_CULL_FACE;
 
 @Mixin(GlStateManager.class)
 public class GlStateManagerMixin {

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

@@ -25,7 +25,8 @@ object Lambda {
     const val SYMBOL = "λ"
     val VERSION: String = LoaderInfo.getVersion()
     val LOG: Logger = LogManager.getLogger(SYMBOL)
-    @JvmStatic val mc: MinecraftClient by lazy { MinecraftClient.getInstance() }
+    @JvmStatic
+    val mc: MinecraftClient by lazy { MinecraftClient.getInstance() }
 
     val gson: Gson = GsonBuilder()
         .setPrettyPrinting()

common/src/main/kotlin/com/lambda/brigadier/argument/MiscArguments.kt

@@ -23,10 +23,8 @@
 package com.lambda.brigadier.argument
 
 import com.lambda.brigadier.*
-import com.lambda.brigadier.assumeSourceNotUsed
 import com.mojang.brigadier.arguments.ArgumentType
 import com.mojang.brigadier.arguments.IntegerArgumentType
-
 import com.mojang.brigadier.builder.LiteralArgumentBuilder
 import net.minecraft.command.argument.TimeArgumentType
 import net.minecraft.command.argument.UuidArgumentType
@@ -70,7 +68,7 @@ fun DefaultArgumentReader<UuidArgumentType>.value(): UUID {
 @BrigadierDsl
 fun <S> time(
     name: String,
-    minimumTicks: Int = 0
+    minimumTicks: Int = 0,
 ): DefaultArgumentConstructor<S, TimeArgumentType> {
     return argument(name, TimeArgumentType.time(minimumTicks))
 }
@@ -80,7 +78,7 @@ fun <S> time(
  */
 @BrigadierDsl
 fun <S> uuid(
-    name: String
+    name: String,
 ): RequiredArgumentConstructor<
         S,
         DefaultArgumentDescriptor<
@@ -99,7 +97,7 @@ fun <S> uuid(
  */
 @BrigadierDsl
 fun <S> literal(
-    name: String
+    name: String,
 ): ArgumentConstructor<
         S,
         LiteralArgumentBuilder<S>,

common/src/main/kotlin/com/lambda/brigadier/brigadier.md

@@ -43,32 +43,32 @@ registerEvents {
                 //optional argument
                 optional(literal("ping")) { ping ->
                     execute {
-                       //shorthand for source.sendFeedback 
-                       sendFeedback(
-                          buildText { 
-                             val sourceName = entity?.displayName ?: "stranger"
-                             literal("Hello $sourceName! ")
-                             
-                             //accessing an argument with a special requirement (block pos must be loaded) 
-                             val state = world.getBlockState(getPos().requireLoaded()) 
-                             val id = Registry.BLOCK.getId(state.block)
-                             literal("Selected block was $id. ")
-                             
-                             //accessing a normal argument 
-                             val range = getIntRange().value() 
-                             val random = Random.nextInt(range.min ?: 0, (range.max ?: 100) + 1)
-                             literal("Random number is $random.")
-                             
-                             //check if optional present 
-                             if (ping != null) { 
-                                 literal(" Pong!") 
-                             } 
-                          }
-                       ) 
-                    } 
-                } 
-            } 
-        } 
+                        //shorthand for source.sendFeedback 
+                        sendFeedback(
+                            buildText {
+                                val sourceName = entity?.displayName ?: "stranger"
+                                literal("Hello $sourceName! ")
+
+                                //accessing an argument with a special requirement (block pos must be loaded) 
+                                val state = world.getBlockState(getPos().requireLoaded())
+                                val id = Registry.BLOCK.getId(state.block)
+                                literal("Selected block was $id. ")
+
+                                //accessing a normal argument 
+                                val range = getIntRange().value()
+                                val random = Random.nextInt(range.min ?: 0, (range.max ?: 100) + 1)
+                                literal("Random number is $random.")
+
+                                //check if optional present 
+                                if (ping != null) {
+                                    literal(" Pong!")
+                                }
+                            }
+                        )
+                    }
+                }
+            }
+        }
     }
 }
 ```
@@ -126,20 +126,23 @@ and pass those along with the name to QKL's `argument` function:
 
 ```kotlin
 //arguments using default descriptors can use shorter versions and typealiases
-@BrigadierDsl fun <S> identifier(
+@BrigadierDsl
+fun <S> identifier(
     name: String
 ): DefaultArgumentConstructor<S, IdentifierArgumentType> {
     return argument(name, IdentifierArgumentType.identifier())
 }
 
 //two ways to create an entity argument
-@BrigadierDsl fun <S> entity(
+@BrigadierDsl
+fun <S> entity(
     name: String
 ): RequiredArgumentConstructor<S, SingleEntityArgumentDescriptor> {
     return argument(name, EntityArgumentType.entity(), SingleEntityArgumentDescriptor)
 }
 
-@BrigadierDsl fun <S> entities(
+@BrigadierDsl
+fun <S> entities(
     name: String
 ): RequiredArgumentConstructor<S, ListEntityArgumentDescriptor> {
     return argument(name, EntityArgumentType.entities(), ListEntityArgumentDescriptor)
@@ -156,25 +159,28 @@ and the argument name:
 //A reader using the default descriptor for StringArgumentType and usable on any context
 //If creating multiple functions with the same name, give them different JVM names
 @JvmName("valueStringArg")
-@BrigadierDsl fun DefaultArgumentReader<StringArgumentType>.value(): String {
+@BrigadierDsl
+fun DefaultArgumentReader<StringArgumentType>.value(): String {
     return StringArgumentType.getString(context, name)
 }
 
 //A reader for multiple entities argument
 //Uses the List descriptor and can only be called for ServerCommandSource contexts
 @JvmName("optionalEntityArg")
-@BrigadierDsl fun ArgumentReader<
-        ServerCommandSource, 
+@BrigadierDsl
+fun ArgumentReader<
+        ServerCommandSource,
         ListEntityArgumentDescriptor
         >.optional(): Collection<Entity> {
-  return EntityArgumentType.getOptionalEntities(context, name)
+    return EntityArgumentType.getOptionalEntities(context, name)
 }
 
 //A reader for string-based EnumArgumentType
 //Similar to above, but callable on any context
 @JvmName("valueEnumStringArg")
-@BrigadierDsl fun ArgumentReader<*, StringEnumArgumentDescriptor>.value(): String {
-  return EnumArgumentType.getEnum(context, name)
+@BrigadierDsl
+fun ArgumentReader<*, StringEnumArgumentDescriptor>.value(): String {
+    return EnumArgumentType.getEnum(context, name)
 }
 ```
 
@@ -219,28 +225,28 @@ context receiver instead, e.g.:
 @BrigadierDsl
 context(CommandContext<*>)
 fun <T : Enum<T>> ArgumentReader<TypedEnumArgumentDescriptor<T>>.value(): T {
-   return EnumArgumentType.getEnumConstant(
-      this@CommandContext,
-      name,
-      argumentDescriptor.type
-   )
+    return EnumArgumentType.getEnumConstant(
+        this@CommandContext,
+        name,
+        argumentDescriptor.type
+    )
 }
 ```
 
 The use-site would then change as well:
 
 ```kotlin
 //before
-required(blockPos("pos")) { getPos -> 
-  execute {
-      getPos().value()
-  }
+required(blockPos("pos")) { getPos ->
+    execute {
+        getPos().value()
+    }
 }
 
 //after
-required(blockPos("pos")) { pos -> 
-  execute {
-      pos.value()
-  }
+required(blockPos("pos")) { pos ->
+    execute {
+        pos.value()
+    }
 }
 ```

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

@@ -17,8 +17,11 @@ import com.lambda.util.Communication.joinToText
 import com.lambda.util.Communication.warn
 import com.lambda.util.StringUtils
 import com.lambda.util.primitives.extension.CommandBuilder
-import com.lambda.util.text.*
 import com.lambda.util.text.ClickEvents.suggestCommand
+import com.lambda.util.text.buildText
+import com.lambda.util.text.clickEvent
+import com.lambda.util.text.literal
+import com.lambda.util.text.styled
 import java.awt.Color
 
 object ModuleCommand : LambdaCommand(

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

@@ -1,8 +1,13 @@
 package com.lambda.command.commands
 
 import com.google.gson.JsonSyntaxException
-import com.lambda.brigadier.*
-import com.lambda.brigadier.argument.*
+import com.lambda.brigadier.CommandResult
+import com.lambda.brigadier.argument.greedyString
+import com.lambda.brigadier.argument.integer
+import com.lambda.brigadier.argument.literal
+import com.lambda.brigadier.argument.value
+import com.lambda.brigadier.executeWithResult
+import com.lambda.brigadier.required
 import com.lambda.command.LambdaCommand
 import com.lambda.module.modules.player.Replay
 import com.lambda.util.FolderRegister

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

@@ -100,5 +100,5 @@ abstract class AbstractSetting<T : Any>(
         value = defaultValue
     }
 
-    class ValueListener <T> (val requiresValueChange: Boolean, val execute: (from: T, to: T) -> Unit)
+    class ValueListener<T>(val requiresValueChange: Boolean, val execute: (from: T, to: T) -> Unit)
 }