a swing and a miss for abstracting config set commands, so basically …

…just a newline
rhysdh540 · Jul 24, 2023 · 6540379 · 6540379
1 parent 0f44f7f
commit 6540379
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/common/src/main/java/dev/rdh/createunlimited/command/CreateUnlimitedCommands.java b/common/src/main/java/dev/rdh/createunlimited/command/CreateUnlimitedCommands.java
@@ -1,6 +1,7 @@
 package dev.rdh.createunlimited.command;
 
 import com.mojang.brigadier.Command;
+import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.arguments.DoubleArgumentType;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
@@ -29,7 +30,9 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Field;
+import java.util.HashMap;
 import java.util.List;
+import java.util.function.Supplier;
 
 import static net.minecraft.commands.Commands.argument;
 import static net.minecraft.commands.Commands.literal;
@@ -111,9 +114,9 @@ public static void registerConfigCommand() {
             if (value instanceof ForgeConfigSpec.BooleanValue bValue)
                 setBoolean(category, field, bValue);
 
-            // set for PlacmentCheck enum
-            else if (value.get() instanceof CUConfig.PlacementCheck)
-                setEnum(category, field, (ForgeConfigSpec.EnumValue<CUConfig.PlacementCheck>) value);
+            // set for enums
+            else if (value.get() instanceof Enum<?>)
+                setEnum(category, field, (ForgeConfigSpec.EnumValue<? extends Enum<?>>) value);
 
             // set for int
 			else if (value instanceof ForgeConfigSpec.IntValue iValue)
@@ -143,8 +146,8 @@ private static <T> void gdr(LiteralArgumentBuilder<CommandSourceStack> category,
 			.then(literal("reset").requires(CreateUnlimitedCommands::perms)
 				.executes(context -> {
 					if(value.get().equals(value.getDefault())) {
-						message("Value is already default!", context, ChatFormatting.RED);
-						return Command.SINGLE_SUCCESS;
+						error("Value is already default!", context);
+						return 0;
 					}
 					value.set(value.getDefault());
 					message(field.getName() + " reset to: " + value.get(), context);
@@ -208,8 +211,6 @@ private static <T extends Enum<T>> void setEnum(LiteralArgumentBuilder<CommandSo
 					}))));
 	}
 
-
-
 	private static MutableComponent link(String link, String display, ChatFormatting color) {
 		return ComponentUtils.wrapInSquareBrackets(Component.nullToEmpty(display))
 			.withStyle(color)
@@ -222,7 +223,7 @@ private static MutableComponent link(String link, String display, ChatFormatting
 	private static void message(String message, CommandContext<CommandSourceStack> context) {
 		context.getSource().sendSuccess(nullToEmpty(message), false);
 	}
-	private static void message(@NotNull String message, CommandContext<CommandSourceStack> context, ChatFormatting color) {
-		context.getSource().sendSuccess(Component.literal(message).withStyle(color), false);
+	private static void error(String message, CommandContext<CommandSourceStack> context) {
+		context.getSource().sendFailure(nullToEmpty(message));
 	}
 }
diff --git a/common/src/main/java/dev/rdh/createunlimited/command/EnumArgument.java b/common/src/main/java/dev/rdh/createunlimited/command/EnumArgument.java
@@ -39,6 +39,7 @@ public class EnumArgument<T extends Enum<T>> implements ArgumentType<T> {
 	public static <R extends Enum<R>> EnumArgument<R> enumArg(Class<R> enumClass, boolean lowercase) {
 		return new EnumArgument<>(enumClass, lowercase);
 	}
+
 	private EnumArgument(final Class<T> enumClass, final boolean lowercase) {
 		this.enumClass = enumClass;
 		this.lowercase = lowercase;