Skip to content

Commit f1b0eb1

Browse files
ErrorCraftErrorCraft
committed
Fix the remaining remapping issues
1 parent 69c3223 commit f1b0eb1

File tree

4 files changed

+33
-33
lines changed

4 files changed

+33
-33
lines changed

‎src/main/java/net/errorcraft/codecium/mixin/minecraft/nbt/NbtOpsExtender.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public class NbtOpsExtender {
1919
method = "getNumberValue(Lnet/minecraft/nbt/NbtElement;)Lcom/mojang/serialization/DataResult;",
2020
at = @At(
2121
value = "INVOKE",
22-
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;"
23-
),
24-
remap = false
22+
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
23+
remap = false
24+
)
2525
)
2626
private Supplier<String> notANumberUseBetterErrorMessage(Supplier<String> message, @Local(argsOnly = true) final NbtElement input) {
2727
return () -> "Element is not a number: " + input;
@@ -31,9 +31,9 @@ private Supplier<String> notANumberUseBetterErrorMessage(Supplier<String> messag
3131
method = "getStringValue(Lnet/minecraft/nbt/NbtElement;)Lcom/mojang/serialization/DataResult;",
3232
at = @At(
3333
value = "INVOKE",
34-
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;"
35-
),
36-
remap = false
34+
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
35+
remap = false
36+
)
3737
)
3838
private Supplier<String> notAStringUseBetterErrorMessage(Supplier<String> message, @Local(argsOnly = true) final NbtElement input) {
3939
return () -> "Element is not a string: " + input;
@@ -43,9 +43,9 @@ private Supplier<String> notAStringUseBetterErrorMessage(Supplier<String> messag
4343
method = { "getMapValues(Lnet/minecraft/nbt/NbtElement;)Lcom/mojang/serialization/DataResult;", "getMapEntries(Lnet/minecraft/nbt/NbtElement;)Lcom/mojang/serialization/DataResult;", "getMap(Lnet/minecraft/nbt/NbtElement;)Lcom/mojang/serialization/DataResult;" },
4444
at = @At(
4545
value = "INVOKE",
46-
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;"
47-
),
48-
remap = false
46+
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
47+
remap = false
48+
)
4949
)
5050
private Supplier<String> notAMapUseBetterErrorMessage(Supplier<String> message, @Local(argsOnly = true) final NbtElement input) {
5151
return () -> "Element is not a map: " + input;
@@ -55,9 +55,9 @@ private Supplier<String> notAMapUseBetterErrorMessage(Supplier<String> message,
5555
method = { "getStream(Lnet/minecraft/nbt/NbtElement;)Lcom/mojang/serialization/DataResult;", "getList(Lnet/minecraft/nbt/NbtElement;)Lcom/mojang/serialization/DataResult;" },
5656
at = @At(
5757
value = "INVOKE",
58-
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;"
59-
),
60-
remap = false
58+
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
59+
remap = false
60+
)
6161
)
6262
private Supplier<String> notAListUseBetterErrorMessage(Supplier<String> message, @Local(argsOnly = true) final NbtElement input) {
6363
return () -> "Element is not a list: " + input;

‎src/main/java/net/errorcraft/codecium/mixin/minecraft/registry/entry/RegistryElementCodecExtender.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ public class RegistryElementCodecExtender<E> {
2323
method = "encode(Lnet/minecraft/registry/entry/RegistryEntry;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;",
2424
at = @At(
2525
value = "INVOKE",
26-
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;"
27-
),
28-
remap = false
26+
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
27+
remap = false
28+
)
2929
)
3030
private Supplier<String> invalidOwnerUseBetterErrorMessage(Supplier<String> message, @Local(argsOnly = true) RegistryEntry<E> registryEntry) {
3131
return () -> "Holder " + registryEntry.getKey().orElseThrow().getValue() + " is not part of the current registry set";
@@ -36,9 +36,9 @@ private Supplier<String> invalidOwnerUseBetterErrorMessage(Supplier<String> mess
3636
at = @At(
3737
value = "INVOKE",
3838
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
39-
ordinal = 0
40-
),
41-
remap = false
39+
ordinal = 0,
40+
remap = false
41+
)
4242
)
4343
private Supplier<String> inaccessibleRegistryUseBetterErrorMessage(Supplier<String> message) {
4444
return () -> "Registry " + this.registryRef.getValue() + " is inaccessible";
@@ -49,9 +49,9 @@ private Supplier<String> inaccessibleRegistryUseBetterErrorMessage(Supplier<Stri
4949
at = @At(
5050
value = "INVOKE",
5151
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
52-
ordinal = 1
53-
),
54-
remap = false
52+
ordinal = 1,
53+
remap = false
54+
)
5555
)
5656
private Supplier<String> inlinedHoldersDisallowedUseBetterErrorMessage(Supplier<String> message) {
5757
return () -> "Cannot decode a direct holder";

‎src/main/java/net/errorcraft/codecium/mixin/minecraft/registry/entry/RegistryEntryListCodecExtender.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ private static <E> Supplier<String> unknownRegistryTagUseBetterErrorMessage(Supp
4646
method = "encode(Lnet/minecraft/registry/entry/RegistryEntryList;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;",
4747
at = @At(
4848
value = "INVOKE",
49-
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;"
50-
),
51-
remap = false
49+
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
50+
remap = false
51+
)
5252
)
5353
private Supplier<String> invalidOwnerUseBetterErrorMessage(Supplier<String> message, @Local(argsOnly = true) RegistryEntryList<E> registryEntries) {
5454
return () -> "Registry tag " + registryEntries.getTagKey().orElseThrow().id() + " is not part of the current registry set";

‎src/main/java/net/errorcraft/codecium/mixin/minecraft/registry/entry/RegistryFixedCodecExtender.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ public class RegistryFixedCodecExtender<E> {
2525
at = @At(
2626
value = "INVOKE",
2727
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
28-
ordinal = 0
29-
),
30-
remap = false
28+
ordinal = 0,
29+
remap = false
30+
)
3131
)
3232
private Supplier<String> invalidOwnerUseBetterErrorMessage(Supplier<String> message, @Local(argsOnly = true) RegistryEntry<E> registryEntry) {
3333
return () -> "Holder " + registryEntry.getKey().orElseThrow().getValue() + " is not part of the current registry set";
@@ -38,9 +38,9 @@ private Supplier<String> invalidOwnerUseBetterErrorMessage(Supplier<String> mess
3838
at = @At(
3939
value = "INVOKE",
4040
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
41-
ordinal = 1
42-
),
43-
remap = false
41+
ordinal = 1,
42+
remap = false
43+
)
4444
)
4545
private Supplier<String> encodeInaccessibleRegistryUseBetterErrorMessage(Supplier<String> message) {
4646
return () -> "Registry " + this.registry.getValue() + " is inaccessible";
@@ -62,9 +62,9 @@ private Supplier<String> directRegistryEntryUseBetterErrorMessage(Supplier<Strin
6262
method = "decode",
6363
at = @At(
6464
value = "INVOKE",
65-
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;"
66-
),
67-
remap = false
65+
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
66+
remap = false
67+
)
6868
)
6969
private Supplier<String> decodeInaccessibleRegistryUseBetterErrorMessage(Supplier<String> message) {
7070
return () -> "Registry " + this.registry.getValue() + " is inaccessible";

0 commit comments

Comments
 (0)