Skip to content

Commit 742057a

Browse files
committed
Indent the data component and registry entry error messages on a new line
1 parent d41b39e commit 742057a

4 files changed

Lines changed: 90 additions & 0 deletions

File tree

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package net.errorcraft.codecium.mixin.minecraft.command.argument;
2+
3+
import net.errorcraft.codecium.util.StringUtil;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
import org.spongepowered.asm.mixin.injection.At;
6+
import org.spongepowered.asm.mixin.injection.ModifyArg;
7+
8+
public class ItemPredicateArgumentTypeExtender {
9+
@Mixin(targets = "net/minecraft/command/argument/ItemPredicateArgumentType$ComponentCheck")
10+
public static class ComponentCheckExtender {
11+
@ModifyArg(
12+
method = "method_58537",
13+
at = @At(
14+
value = "INVOKE",
15+
target = "Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;createWithContext(Lcom/mojang/brigadier/ImmutableStringReader;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException;",
16+
remap = false
17+
),
18+
index = 2
19+
)
20+
private Object indentErrorMessage(Object a) {
21+
return "\n" + StringUtil.indent(a.toString());
22+
}
23+
}
24+
25+
@Mixin(targets = "net/minecraft/command/argument/ItemPredicateArgumentType$SubPredicateCheck")
26+
public static class SubPredicateCheckExtender {
27+
@ModifyArg(
28+
method = "method_58560",
29+
at = @At(
30+
value = "INVOKE",
31+
target = "Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;createWithContext(Lcom/mojang/brigadier/ImmutableStringReader;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException;",
32+
remap = false
33+
),
34+
index = 2
35+
)
36+
private Object indentErrorMessage(Object a) {
37+
return "\n" + StringUtil.indent(a.toString());
38+
}
39+
}
40+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package net.errorcraft.codecium.mixin.minecraft.command.argument;
2+
3+
import net.errorcraft.codecium.util.StringUtil;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
import org.spongepowered.asm.mixin.injection.At;
6+
import org.spongepowered.asm.mixin.injection.ModifyArg;
7+
8+
public class ItemStringReaderExtender {
9+
@Mixin(targets = "net/minecraft/command/argument/ItemStringReader$Reader")
10+
public static class ReaderExtender {
11+
@ModifyArg(
12+
method = "method_57806",
13+
at = @At(
14+
value = "INVOKE",
15+
target = "Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;createWithContext(Lcom/mojang/brigadier/ImmutableStringReader;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException;",
16+
remap = false
17+
),
18+
index = 2
19+
)
20+
private Object indentErrorMessage(Object a) {
21+
return "\n" + StringUtil.indent(a.toString());
22+
}
23+
}
24+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package net.errorcraft.codecium.mixin.minecraft.command.argument;
2+
3+
import net.errorcraft.codecium.util.StringUtil;
4+
import net.minecraft.command.argument.RegistryEntryArgumentType;
5+
import org.spongepowered.asm.mixin.Mixin;
6+
import org.spongepowered.asm.mixin.injection.At;
7+
import org.spongepowered.asm.mixin.injection.ModifyArg;
8+
9+
@Mixin(RegistryEntryArgumentType.class)
10+
public class RegistryEntryArgumentTypeExtender {
11+
@ModifyArg(
12+
method = "method_58480",
13+
at = @At(
14+
value = "INVOKE",
15+
target = "Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;createWithContext(Lcom/mojang/brigadier/ImmutableStringReader;Ljava/lang/Object;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException;",
16+
remap = false
17+
)
18+
)
19+
private static Object indentErrorMessage(Object arg) {
20+
return "\n" + StringUtil.indent(arg.toString());
21+
}
22+
}

src/main/resources/codecium.mixins.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
"package": "net.errorcraft.codecium.mixin",
44
"compatibilityLevel": "JAVA_21",
55
"mixins": [
6+
"minecraft.command.argument.ItemPredicateArgumentTypeExtender$ComponentCheckExtender",
7+
"minecraft.command.argument.ItemPredicateArgumentTypeExtender$SubPredicateCheckExtender",
8+
"minecraft.command.argument.ItemStringReaderExtender$ReaderExtender",
9+
"minecraft.command.argument.RegistryEntryArgumentTypeExtender",
610
"minecraft.nbt.NbtOpsExtender",
711
"minecraft.nbt.NbtOpsExtender$MapLikeExtender",
812
"minecraft.registry.entry.RegistryElementCodecExtender",

0 commit comments

Comments
 (0)