Dynamically generated type safe config command and help commands

Author: Avanatiker

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

@@ -14,12 +14,6 @@
  * limitations under the License.
  */
 
-/*
- * Preserve binary compatibility when moving extensions between files
- */
-@file:JvmMultifileClass
-@file:JvmName("ArgumentsKt")
-
 package com.lambda.brigadier.argument
 
 import com.lambda.brigadier.*
@@ -36,7 +30,6 @@ import java.util.function.Predicate
  *
  * @see BlockPredicateArgumentType.getBlockPredicate
  */
-@JvmName("valueBlockPredicateArg")
 @BrigadierDsl
 fun DefaultArgumentReader<BlockPredicateArgumentType>.value(): Predicate<CachedBlockPosition> {
     return BlockPredicateArgumentType.getBlockPredicate(context.assumeSourceNotUsed(), name)
@@ -48,7 +41,6 @@ fun DefaultArgumentReader<BlockPredicateArgumentType>.value(): Predicate<CachedB
  *
  * @see BlockStateArgumentType.getBlockState
  */
-@JvmName("valueBlockStateArg")
 @BrigadierDsl
 fun DefaultArgumentReader<BlockStateArgumentType>.value(): BlockStateArgument {
     return BlockStateArgumentType.getBlockState(context.assumeSourceNotUsed(), name)

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

@@ -14,12 +14,6 @@
  * limitations under the License.
  */
 
-/*
- * Preserve binary compatibility when moving extensions between files
- */
-@file:JvmMultifileClass
-@file:JvmName("ArgumentsKt")
-
 package com.lambda.brigadier.argument
 
 import com.lambda.brigadier.*
@@ -52,14 +46,11 @@ object ListEntityArgumentDescriptor : ArgumentDescriptor<EntityArgumentType>
  *
  * @see EntityAnchorArgumentType.getEntityAnchor
  */
-@JvmName("valueEntityAnchorArg")
 @BrigadierDsl
-fun DefaultArgumentReader<EntityAnchorArgumentType>.value(): EntityAnchorArgumentType.EntityAnchor {
-    return EntityAnchorArgumentType.getEntityAnchor(
-        context.assumeSourceNotUsed(),
-        name
+fun DefaultArgumentReader<EntityAnchorArgumentType>.value() =
+    EntityAnchorArgumentType.getEntityAnchor(
+        context.assumeSourceNotUsed(), name
     )
-}
 
 /**
  * Reads the collection of entities from the argument in
@@ -69,14 +60,9 @@ fun DefaultArgumentReader<EntityAnchorArgumentType>.value(): EntityAnchorArgumen
  *
  * @see EntityArgumentType.getEntities
  */
-@JvmName("requiredEntityArg")
 @BrigadierDsl
-fun ArgumentReader<
-        ServerCommandSource,
-        ListEntityArgumentDescriptor
-        >.required(): Collection<Entity> {
-    return EntityArgumentType.getEntities(context, name)
-}
+fun ArgumentReader<ServerCommandSource, ListEntityArgumentDescriptor>.required() =
+    EntityArgumentType.getEntities(context, name)
 
 /**
  * Reads the collection of entities from the argument in
@@ -86,29 +72,19 @@ fun ArgumentReader<
  *
  * @see EntityArgumentType.getOptionalEntities
  */
-@JvmName("optionalEntityArg")
 @BrigadierDsl
-fun ArgumentReader<
-        ServerCommandSource,
-        ListEntityArgumentDescriptor
-        >.optional(): Collection<Entity> {
-    return EntityArgumentType.getOptionalEntities(context, name)
-}
+fun ArgumentReader<ServerCommandSource, ListEntityArgumentDescriptor>.optional(): Collection<Entity> =
+    EntityArgumentType.getOptionalEntities(context, name)
 
 /**
  * Reads the [Entity] value from the argument in
  * the receiver [ArgumentReader].
  *
  * @see EntityArgumentType.getEntity
  */
-@JvmName("valueSingleEntityArg")
 @BrigadierDsl
-fun ArgumentReader<
-        ServerCommandSource,
-        SingleEntityArgumentDescriptor
-        >.value(): Entity {
-    return EntityArgumentType.getEntity(context, name)
-}
+fun ArgumentReader<ServerCommandSource, SingleEntityArgumentDescriptor>.value(): Entity =
+    EntityArgumentType.getEntity(context, name)
 
 /**
  * Creates an entity anchor argument with [name] as the parameter name.
@@ -126,22 +102,14 @@ fun <S> entityAnchor(
 @BrigadierDsl
 fun <S> entities(
     name: String,
-): RequiredArgumentConstructor<
-        S,
-        ListEntityArgumentDescriptor
-        > {
-    return argument(name, EntityArgumentType.entities(), ListEntityArgumentDescriptor)
-}
+): RequiredArgumentConstructor<S, ListEntityArgumentDescriptor> =
+    argument(name, EntityArgumentType.entities(), ListEntityArgumentDescriptor)
 
 /**
  * Creates an entity selector argument with [name] as the parameter name.
  */
 @BrigadierDsl
 fun <S> entity(
     name: String,
-): RequiredArgumentConstructor<
-        S,
-        SingleEntityArgumentDescriptor
-        > {
-    return argument(name, EntityArgumentType.entity(), SingleEntityArgumentDescriptor)
-}
+): RequiredArgumentConstructor<S, SingleEntityArgumentDescriptor> =
+    argument(name, EntityArgumentType.entity(), SingleEntityArgumentDescriptor)

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

@@ -14,12 +14,6 @@
  * limitations under the License.
  */
 
-/*
- * Preserve binary compatibility when moving extensions between files
- */
-@file:JvmMultifileClass
-@file:JvmName("ArgumentsKt")
-
 package com.lambda.brigadier.argument
 
 
@@ -35,28 +29,19 @@ import java.util.*
  *
  * @see AngleArgumentType.getAngle
  */
-@JvmName("valueAngleArg")
 @BrigadierDsl
-fun ArgumentReader<
-        ServerCommandSource,
-        DefaultArgumentDescriptor<
-                AngleArgumentType
-                >
-        >.value(): Float {
-    return AngleArgumentType.getAngle(context, name)
-}
+fun ArgumentReader<ServerCommandSource, DefaultArgumentDescriptor<AngleArgumentType>>.value() =
+    AngleArgumentType.getAngle(context, name)
 
 /**
  * Reads the raw [PosArgument] value from the
  * argument in the receiver [ArgumentReader].
  *
  * @see RotationArgumentType.getRotation
  */
-@JvmName("valueRotationArg")
 @BrigadierDsl
-fun DefaultArgumentReader<RotationArgumentType>.value(): PosArgument {
-    return RotationArgumentType.getRotation(context.assumeSourceNotUsed(), name)
-}
+fun DefaultArgumentReader<RotationArgumentType>.value(): PosArgument =
+    RotationArgumentType.getRotation(context.assumeSourceNotUsed(), name)
 
 /**
  * Reads the [Vec2f] value from the argument
@@ -66,28 +51,19 @@ fun DefaultArgumentReader<RotationArgumentType>.value(): PosArgument {
  * @see RotationArgumentType.getRotation
  * @see PosArgument.toAbsoluteRotation
  */
-@JvmName("absoluteRotationArg")
 @BrigadierDsl
-fun ArgumentReader<
-        ServerCommandSource,
-        DefaultArgumentDescriptor<
-                RotationArgumentType
-                >
-        >.absolute(): Vec2f {
-    return RotationArgumentType.getRotation(context, name).toAbsoluteRotation(context.source)
-}
+fun ArgumentReader<ServerCommandSource, DefaultArgumentDescriptor<RotationArgumentType>>.absolute(): Vec2f =
+    RotationArgumentType.getRotation(context, name).toAbsoluteRotation(context.source)
 
 /**
  * Reads the set of [Direction.Axis] from the
  * argument in the receiver [ArgumentReader].
  *
  * @see SwizzleArgumentType.getSwizzle
  */
-@JvmName("valueSwizzleArg")
 @BrigadierDsl
-fun DefaultArgumentReader<SwizzleArgumentType>.value(): EnumSet<Direction.Axis> {
-    return SwizzleArgumentType.getSwizzle(context.assumeSourceNotUsed(), name)
-}
+fun DefaultArgumentReader<SwizzleArgumentType>.value(): EnumSet<Direction.Axis> =
+    SwizzleArgumentType.getSwizzle(context.assumeSourceNotUsed(), name)
 
 /**
  * Reads the [BlockPos] value from the
@@ -97,14 +73,8 @@ fun DefaultArgumentReader<SwizzleArgumentType>.value(): EnumSet<Direction.Axis>
  */
 @JvmName("valueBlockPosArg")
 @BrigadierDsl
-fun ArgumentReader<
-        ServerCommandSource,
-        DefaultArgumentDescriptor<
-                BlockPosArgumentType
-                >
-        >.value(): BlockPos {
-    return BlockPosArgumentType.getBlockPos(context, name)
-}
+fun ArgumentReader<ServerCommandSource, DefaultArgumentDescriptor<BlockPosArgumentType>>.value(): BlockPos =
+    BlockPosArgumentType.getBlockPos(context, name)
 
 /**
  * Reads the [BlockPos] value from the
@@ -116,98 +86,62 @@ fun ArgumentReader<
  * @see BlockPosArgumentType.getLoadedBlockPos
  */
 @BrigadierDsl
-fun ArgumentReader<
-        ServerCommandSource,
-        DefaultArgumentDescriptor<
-                BlockPosArgumentType
-                >
-        >.requireLoaded(): BlockPos {
-    return BlockPosArgumentType.getLoadedBlockPos(context, name)
-}
+fun ArgumentReader<ServerCommandSource, DefaultArgumentDescriptor<BlockPosArgumentType>>.requireLoaded(): BlockPos =
+    BlockPosArgumentType.getLoadedBlockPos(context, name)
 
 /**
  * Reads the [ColumnPos] value from the
  * argument in the receiver [ArgumentReader].
  *
  * @see ColumnPosArgumentType.getColumnPos
  */
-@JvmName("valueColumnPosArg")
 @BrigadierDsl
-fun ArgumentReader<
-        ServerCommandSource,
-        DefaultArgumentDescriptor<
-                ColumnPosArgumentType
-                >
-        >.value(): ColumnPos {
-    return ColumnPosArgumentType.getColumnPos(context, name)
-}
+fun ArgumentReader<ServerCommandSource, DefaultArgumentDescriptor<ColumnPosArgumentType>>.value(): ColumnPos =
+    ColumnPosArgumentType.getColumnPos(context, name)
 
 /**
  * Reads the [Vec2f] value from the
  * argument in the receiver [ArgumentReader].
  *
  * @see Vec2ArgumentType.getVec2
  */
-@JvmName("valueVec2Arg")
 @BrigadierDsl
-fun ArgumentReader<
-        ServerCommandSource,
-        DefaultArgumentDescriptor<
-                Vec2ArgumentType
-                >
-        >.value(): Vec2f {
-    return Vec2ArgumentType.getVec2(context, name)
-}
+fun ArgumentReader<ServerCommandSource, DefaultArgumentDescriptor<Vec2ArgumentType>>.value(): Vec2f =
+    Vec2ArgumentType.getVec2(context, name)
 
 /**
  * Reads the [Vec3d] value from the
  * argument in the receiver [ArgumentReader].
  *
  * @see Vec3ArgumentType.getVec3
  */
-@JvmName("valueVec3Arg")
 @BrigadierDsl
-fun ArgumentReader<
-        ServerCommandSource,
-        DefaultArgumentDescriptor<
-                Vec3ArgumentType
-                >
-        >.value(): Vec3d {
-    return Vec3ArgumentType.getVec3(context, name)
-}
+fun ArgumentReader<ServerCommandSource, DefaultArgumentDescriptor<Vec3ArgumentType>>.value(): Vec3d =
+    Vec3ArgumentType.getVec3(context, name)
 
 /**
  * Reads the raw [PosArgument] value from the
  * argument in the receiver [ArgumentReader].
  *
  * @see Vec3ArgumentType.getPosArgument
  */
-@JvmName("posVec3Arg")
 @BrigadierDsl
-fun DefaultArgumentReader<Vec3ArgumentType>.posArgument(): PosArgument {
-    return Vec3ArgumentType.getPosArgument(context.assumeSourceNotUsed(), name)
-}
-
+fun DefaultArgumentReader<Vec3ArgumentType>.posArgument(): PosArgument =
+    Vec3ArgumentType.getPosArgument(context.assumeSourceNotUsed(), name)
 
 /**
  * Creates an angle argument with [name] as the parameter name.
  */
 @BrigadierDsl
-fun <S> angle(
-    name: String,
-): DefaultArgumentConstructor<S, AngleArgumentType> {
-    return argument(name, AngleArgumentType.angle())
-}
+fun <S> angle(name: String): DefaultArgumentConstructor<S, AngleArgumentType> =
+    argument(name, AngleArgumentType.angle())
 
 /**
  * Creates a rotation argument with [name] as the parameter name.
  */
 @BrigadierDsl
-fun <S> rotation(
-    name: String,
-): DefaultArgumentConstructor<S, RotationArgumentType> {
-    return argument(name, RotationArgumentType.rotation())
-}
+fun <S> rotation(name: String): DefaultArgumentConstructor<S, RotationArgumentType> =
+    argument(name, RotationArgumentType.rotation())
 
 /**
  * Creates a swizzle argument with [name] as the parameter name.

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

@@ -14,12 +14,6 @@
  * limitations under the License.
  */
 
-/*
- * Preserve binary compatibility when moving extensions between files
- */
-@file:JvmMultifileClass
-@file:JvmName("ArgumentsKt")
-
 package com.lambda.brigadier.argument
 
 import com.lambda.brigadier.*
@@ -79,11 +73,7 @@ fun <S> time(
 @BrigadierDsl
 fun <S> uuid(
     name: String,
-): RequiredArgumentConstructor<
-        S,
-        DefaultArgumentDescriptor<
-                UuidArgumentType>
-        > {
+): RequiredArgumentConstructor<S, DefaultArgumentDescriptor<UuidArgumentType>> {
     return argument(name, UuidArgumentType.uuid())
 }
 
@@ -98,10 +88,6 @@ fun <S> uuid(
 @BrigadierDsl
 fun <S> literal(
     name: String,
-): ArgumentConstructor<
-        S,
-        LiteralArgumentBuilder<S>,
-        LiteralDescriptor
-        > {
+): ArgumentConstructor<S, LiteralArgumentBuilder<S>, LiteralDescriptor> {
     return ArgumentConstructor(LiteralArgumentBuilder.literal(name), name, LiteralDescriptor)
 }