Skip to content

Commit fdcf657

Browse files
ErrorCraftErrorCraft
committed
Migrate to 26.1-snapshot-1
1 parent e77837a commit fdcf657

30 files changed

Lines changed: 109 additions & 143 deletions

‎build.gradle‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'fabric-loom' version '1.15-SNAPSHOT'
2+
id 'net.fabricmc.fabric-loom' version '1.15-SNAPSHOT'
33
id 'maven-publish'
44
}
55

@@ -33,8 +33,7 @@ loom {
3333
dependencies {
3434
// To change the versions see the gradle.properties file
3535
minecraft "com.mojang:minecraft:${project.minecraft_version}"
36-
mappings loom.officialMojangMappings()
37-
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
36+
implementation "net.fabricmc:fabric-loader:${project.loader_version}"
3837
}
3938

4039
processResources {
@@ -46,7 +45,7 @@ processResources {
4645
}
4746

4847
tasks.withType(JavaCompile).configureEach {
49-
it.options.release = 21
48+
it.options.release = 25
5049
}
5150

5251
java {
@@ -55,8 +54,8 @@ java {
5554
// If you remove this line, sources will not be generated.
5655
withSourcesJar()
5756

58-
sourceCompatibility = JavaVersion.VERSION_21
59-
targetCompatibility = JavaVersion.VERSION_21
57+
sourceCompatibility = JavaVersion.VERSION_25
58+
targetCompatibility = JavaVersion.VERSION_25
6059
}
6160

6261
jar {

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ org.gradle.parallel=true
44

55
# Fabric Properties
66
# check these on https://fabricmc.net/develop
7-
minecraft_version=1.21.5
8-
loader_version=0.16.10
7+
minecraft_version=26.1-snapshot-1
8+
loader_version=0.18.4
99

1010
# Mod Properties
1111
mod_version=1.1.0

‎src/main/java/net/errorcraft/codecium/access/minecraft/IdentifierExceptionAccess.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package net.errorcraft.codecium.access.minecraft;
2+
3+
public interface IdentifierExceptionAccess {
4+
String codecium$messageWithoutId();
5+
void codecium$setGivenIdentifier(String givenIdentifier);
6+
}

‎src/main/java/net/errorcraft/codecium/access/minecraft/util/InvalidIdentifierExceptionAccess.java‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/main/java/net/errorcraft/codecium/mixin/minecraft/IdentifierExceptionExtender.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package net.errorcraft.codecium.mixin.minecraft;
22

3-
import net.errorcraft.codecium.access.minecraft.util.InvalidIdentifierExceptionAccess;
4-
import net.minecraft.ResourceLocationException;
3+
import net.errorcraft.codecium.access.minecraft.IdentifierExceptionAccess;
4+
import net.minecraft.IdentifierException;
55
import org.spongepowered.asm.mixin.Mixin;
66
import org.spongepowered.asm.mixin.Unique;
77

8-
@Mixin(ResourceLocationException.class)
9-
public class IdentifierExceptionExtender extends RuntimeException implements InvalidIdentifierExceptionAccess {
8+
@Mixin(IdentifierException.class)
9+
public class IdentifierExceptionExtender extends RuntimeException implements IdentifierExceptionAccess {
1010
@Unique
1111
private String givenIdentifier;
1212

‎src/main/java/net/errorcraft/codecium/mixin/minecraft/commands/arguments/ResourceOrIdArgumentExtender.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,18 @@
66
import org.spongepowered.asm.mixin.injection.At;
77
import org.spongepowered.asm.mixin.injection.ModifyArg;
88

9-
@Mixin(ResourceOrIdArgument.class)
109
public class ResourceOrIdArgumentExtender {
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
10+
@Mixin(ResourceOrIdArgument.InlineResult.class)
11+
public static class InlineResultExtender {
12+
@ModifyArg(
13+
method = "lambda$parse$0",
14+
at = @At(
15+
value = "INVOKE",
16+
target = "Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;createWithContext(Lcom/mojang/brigadier/ImmutableStringReader;Ljava/lang/Object;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException;"
17+
)
1718
)
18-
)
19-
private static Object indentErrorMessage(Object arg) {
20-
return "\n" + StringUtil.indent(arg.toString());
19+
private static Object indentErrorMessage(Object arg) {
20+
return "\n" + StringUtil.indent(arg.toString());
21+
}
2122
}
2223
}

‎src/main/java/net/errorcraft/codecium/mixin/minecraft/commands/arguments/item/ItemParserExtender.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ public class ItemParserExtender {
99
@Mixin(targets = "net/minecraft/commands/arguments/item/ItemParser$State")
1010
public static class StateExtender {
1111
@ModifyArg(
12-
method = "method_57806",
12+
method = "lambda$readComponent$0",
1313
at = @At(
1414
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
15+
target = "Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;createWithContext(Lcom/mojang/brigadier/ImmutableStringReader;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException;"
1716
),
1817
index = 2
1918
)

‎src/main/java/net/errorcraft/codecium/mixin/minecraft/commands/arguments/item/ItemPredicateArgumentExtender.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ public class ItemPredicateArgumentExtender {
99
@Mixin(targets = "net/minecraft/commands/arguments/item/ItemPredicateArgument$ComponentWrapper")
1010
public static class ComponentWrapperExtender {
1111
@ModifyArg(
12-
method = "method_58537",
12+
method = "lambda$decode$0",
1313
at = @At(
1414
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
15+
target = "Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;createWithContext(Lcom/mojang/brigadier/ImmutableStringReader;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException;"
1716
),
1817
index = 2
1918
)
@@ -25,11 +24,10 @@ private Object indentErrorMessage(Object a) {
2524
@Mixin(targets = "net/minecraft/commands/arguments/item/ItemPredicateArgument$PredicateWrapper")
2625
public static class PredicateWrapperExtender {
2726
@ModifyArg(
28-
method = "method_58560",
27+
method = "lambda$decode$0",
2928
at = @At(
3029
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
30+
target = "Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;createWithContext(Lcom/mojang/brigadier/ImmutableStringReader;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException;"
3331
),
3432
index = 2
3533
)

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ public class NbtOpsExtender {
2020
method = "getNumberValue(Lnet/minecraft/nbt/Tag;)Lcom/mojang/serialization/DataResult;",
2121
at = @At(
2222
value = "INVOKE",
23-
target = "Ljava/util/Optional;orElseGet(Ljava/util/function/Supplier;)Ljava/lang/Object;",
24-
remap = false
23+
target = "Ljava/util/Optional;orElseGet(Ljava/util/function/Supplier;)Ljava/lang/Object;"
2524
)
2625
)
2726
private Supplier<DataResult<Number>> notANumberUseBetterErrorMessage(Supplier<DataResult<Number>> supplier, @Local(argsOnly = true) final Tag input) {
@@ -32,8 +31,7 @@ private Supplier<DataResult<Number>> notANumberUseBetterErrorMessage(Supplier<Da
3231
method = "getStringValue(Lnet/minecraft/nbt/Tag;)Lcom/mojang/serialization/DataResult;",
3332
at = @At(
3433
value = "INVOKE",
35-
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
36-
remap = false
34+
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;"
3735
)
3836
)
3937
private Supplier<String> notAStringUseBetterErrorMessage(Supplier<String> message, @Local(argsOnly = true) final Tag input) {
@@ -44,8 +42,7 @@ private Supplier<String> notAStringUseBetterErrorMessage(Supplier<String> messag
4442
method = { "getMapValues(Lnet/minecraft/nbt/Tag;)Lcom/mojang/serialization/DataResult;", "getMapEntries(Lnet/minecraft/nbt/Tag;)Lcom/mojang/serialization/DataResult;", "getMap(Lnet/minecraft/nbt/Tag;)Lcom/mojang/serialization/DataResult;" },
4543
at = @At(
4644
value = "INVOKE",
47-
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
48-
remap = false
45+
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;"
4946
)
5047
)
5148
private Supplier<String> notAMapUseBetterErrorMessage(Supplier<String> message, @Local(argsOnly = true) final Tag input) {
@@ -56,8 +53,7 @@ private Supplier<String> notAMapUseBetterErrorMessage(Supplier<String> message,
5653
method = { "getStream(Lnet/minecraft/nbt/Tag;)Lcom/mojang/serialization/DataResult;", "getList(Lnet/minecraft/nbt/Tag;)Lcom/mojang/serialization/DataResult;" },
5754
at = @At(
5855
value = "INVOKE",
59-
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
60-
remap = false
56+
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;"
6157
)
6258
)
6359
private Supplier<String> notAListUseBetterErrorMessage(Supplier<String> message, @Local(argsOnly = true) final Tag input) {

‎src/main/java/net/errorcraft/codecium/mixin/minecraft/resources/HolderSetCodecExtender.java‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,10 @@ public class HolderSetCodecExtender<E> {
3131
private static ResourceKey<? extends Registry<?>> tempRegistryKey;
3232

3333
@ModifyArg(
34-
method = "method_58027",
34+
method = "lambda$lookupTag$0",
3535
at = @At(
3636
value = "INVOKE",
37-
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
38-
remap = false
37+
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;"
3938
)
4039
)
4140
private static <E> Supplier<String> unknownRegistryTagUseBetterErrorMessage(Supplier<String> message, @Local(argsOnly = true) TagKey<E> tag) {
@@ -46,12 +45,11 @@ private static <E> Supplier<String> unknownRegistryTagUseBetterErrorMessage(Supp
4645
method = "encode(Lnet/minecraft/core/HolderSet;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;",
4746
at = @At(
4847
value = "INVOKE",
49-
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
50-
remap = false
48+
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;"
5149
)
5250
)
53-
private Supplier<String> invalidOwnerUseBetterErrorMessage(Supplier<String> message, @Local(argsOnly = true) HolderSet<E> registryEntries) {
54-
return () -> "Registry tag " + registryEntries.unwrapKey().orElseThrow().location() + " is not part of the current registry set";
51+
private Supplier<String> invalidOwnerUseBetterErrorMessage(Supplier<String> message, @Local(argsOnly = true) HolderSet<E> holderSet) {
52+
return () -> "Registry tag " + holderSet.unwrapKey().orElseThrow().location() + " is not part of the current registry set";
5553
}
5654

5755
@Inject(
@@ -63,15 +61,14 @@ private <T> void storeTemporaryRegistryKey(DynamicOps<T> ops, T input, CallbackI
6361
}
6462

6563
@ModifyArg(
66-
method = "method_40381",
64+
method = "lambda$decodeWithoutRegistry$0",
6765
at = @At(
6866
value = "INVOKE",
69-
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;",
70-
remap = false
67+
target = "Lcom/mojang/serialization/DataResult;error(Ljava/util/function/Supplier;)Lcom/mojang/serialization/DataResult;"
7168
)
7269
)
73-
private static <R> Supplier<String> inaccessibleRegistryUseBetterErrorMessage(Supplier<String> message, @Local Holder<R> entry) {
74-
return () -> "Registry " + HolderSetCodecExtender.tempRegistryKey.location() + " is inaccessible for " + entry.unwrapKey().orElseThrow();
70+
private static <R> Supplier<String> inaccessibleRegistryUseBetterErrorMessage(Supplier<String> message, @Local(name = "holder") Holder<R> holder) {
71+
return () -> "Registry " + HolderSetCodecExtender.tempRegistryKey.identifier() + " is inaccessible for " + holder.unwrapKey().orElseThrow();
7572
}
7673

7774
@Inject(

0 commit comments

Comments
 (0)