1.20.6

Author: zenfyrdev

build.gradle

@@ -144,25 +144,18 @@ publishMods {
 
     displayName = "${project.mod_version} (${project.minecraft_version})"
 
-    ["1.19.2", "1.19.3", "1.19.4", "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4"].each {
-        modrinth {
-            minecraftVersions.add(it)
-        }
-        curseforge {
-            minecraftVersions.add(it)
-        }
-    }
-
     modrinth {
         projectId = "sc4Mu9Zu"
         accessToken = providers.environmentVariable("MODRINTH_TOKEN")
+        minecraftVersions.add("${project.minecraft_version}")
 
         requires("fabric-api")
         embeds("dark-matter")
     }
     curseforge {
         projectId = "622736"
         accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
+        minecraftVersions.add("${project.minecraft_version}")
 
         requires("fabric-api")
         embeds("dark-matter")

gradle.properties

@@ -2,8 +2,8 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.20.2
-yarn_mappings=1.20.2+build.4
+minecraft_version=1.20.6
+yarn_mappings=1.20.6+build.3
 # Mod Properties
 mod_version=5.4.4
 maven_group=com.github.vini2003.linkart

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ dark-matter = "4.0.0-1.20.1-build.481"
 
 [libraries]
 fabric-loader = { group = "net.fabricmc", name = "fabric-loader", version = "0.15.11" }
-fabric-api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version = "0.90.0+1.20.2" }
+fabric-api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version = "0.99.4+1.20.6" }
 
 dark-matter-base = { group = "me.melontini", name = "dark-matter-base", version.ref = "dark-matter" }
 

src/main/java/com/github/vini2003/linkart/mixin/AbstractMinecartEntityMixin.java

@@ -157,14 +157,14 @@ void onPushAway(Entity entity, CallbackInfo ci) {
     private void linkart$write(NbtCompound nbt, CallbackInfo ci) {
         if (linkart$followingUUID != null) nbt.putUuid("LK-Following", linkart$followingUUID);
         if (linkart$followerUUID != null) nbt.putUuid("LK-Follower", linkart$followerUUID);
-        if (linkart$itemStack != null) nbt.put("LK-ItemStack", linkart$itemStack.writeNbt(new NbtCompound()));
+        if (linkart$itemStack != null) nbt.put("LK-ItemStack", linkart$itemStack.encodeAllowEmpty(this.getRegistryManager()));
     }
 
     @Inject(at = @At("RETURN"), method = "readCustomDataFromNbt")
     private void linkart$read(NbtCompound nbt, CallbackInfo ci) {
         if (nbt.contains("LK-Following")) linkart$followingUUID = nbt.getUuid("LK-Following");
         if (nbt.contains("LK-Follower")) linkart$followerUUID = nbt.getUuid("LK-Follower");
-        if (nbt.contains("LK-ItemStack")) linkart$itemStack = ItemStack.fromNbt(nbt.getCompound("LK-ItemStack"));
+        if (nbt.contains("LK-ItemStack")) linkart$itemStack = ItemStack.fromNbtOrEmpty(this.getRegistryManager(), nbt.getCompound("LK-ItemStack"));
     }
 
     @Override

src/main/java/com/github/vini2003/linkart/utility/LinkartCommand.java

@@ -2,52 +2,24 @@
 
 import com.github.vini2003.linkart.Linkart;
 import com.mojang.brigadier.CommandDispatcher;
-import me.melontini.dark_matter.api.base.util.Exceptions;
-import me.melontini.dark_matter.api.base.util.Mapper;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.Text;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
 import java.util.function.Supplier;
 
 public class LinkartCommand {
-    private static final Logger LOGGER = LogManager.getLogger();
 
     private static final Supplier<Text> RELOADED = () -> TextUtil.literal("reloaded linkart config");
-    private static final MethodHandle cachedHandle = Exceptions.supply(() -> {
-        try {
-            String mthd = Mapper.mapMethod(ServerCommandSource.class, "method_9226", MethodType.methodType(void.class, Supplier.class, boolean.class));
-            return MethodHandles.insertArguments(MethodHandles.lookup().findVirtual(ServerCommandSource.class, mthd, MethodType.methodType(void.class, Supplier.class, boolean.class)),
-                    1, RELOADED, true);
-        } catch (Throwable e) {
-            String mthd = Mapper.mapMethod(ServerCommandSource.class, "method_9226", MethodType.methodType(void.class, Text.class, boolean.class));
-            return MethodHandles.insertArguments(MethodHandles.lookup().findVirtual(ServerCommandSource.class, mthd, MethodType.methodType(void.class, Text.class, boolean.class)),
-                    1, RELOADED.get(), true);
-        }
-    });
 
     public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
         dispatcher.register(CommandManager.literal("linkart")
                 .then(CommandManager.literal("config")
                         .then(CommandManager.literal("reload")
                                 .executes(context -> {
                                     Linkart.loadConfig();
-                                    invoke(context.getSource());
+                                    context.getSource().sendFeedback(RELOADED, true);
                                     return 1;
                                 }))));
     }
-
-    private static void invoke(Object... args) {
-        try {
-            LinkartCommand.cachedHandle.invokeWithArguments(args);
-        } catch (Throwable e) {
-            LOGGER.error(e);
-            throw new RuntimeException(e);
-        }
-    }
 }

src/main/java/com/github/vini2003/linkart/utility/LoadingCarts.java

@@ -1,57 +1,33 @@
 package com.github.vini2003.linkart.utility;
 
-import me.melontini.dark_matter.api.base.util.Exceptions;
-import me.melontini.dark_matter.api.base.util.Mapper;
-import me.melontini.dark_matter.api.base.util.Utilities;
 import net.minecraft.entity.vehicle.AbstractMinecartEntity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.nbt.NbtList;
 import net.minecraft.nbt.NbtLong;
+import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.server.world.ChunkTicketType;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.PersistentState;
-import net.minecraft.world.PersistentStateManager;
 
-import java.lang.invoke.*;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.function.Function;
-import java.util.function.Supplier;
 
 public class LoadingCarts extends PersistentState {
 
-    private static final Function<PersistentStateManager, LoadingCarts> GETTER = Exceptions.supply(() -> {
-        Supplier<LoadingCarts> supplier = LoadingCarts::new;
-        Function<NbtCompound, LoadingCarts> function = nbt -> new LoadingCarts().readNbt(nbt);
-        try {
-            Type<LoadingCarts> type = new Type<>(supplier, function, null);//thanks, FAPI
-            return manager -> manager.getOrCreate(type, "linkart_loading_carts");
-        } catch (Throwable e) {
-            String mth = Mapper.mapMethod(PersistentStateManager.class, "method_17924", MethodType.methodType(PersistentState.class, Function.class, Supplier.class, String.class));
-            MethodHandle h = Exceptions.supply(() -> MethodHandles.lookup().findVirtual(PersistentStateManager.class, mth, MethodType.methodType(PersistentState.class, Function.class, Supplier.class, String.class)));
-
-            //Not pretty, but is faster than reflection and handles.
-            interface Invoker {
-                PersistentState invoke(PersistentStateManager manager, Function<?,?> f, Supplier<?> s, String name);
-            }
-
-            Invoker invoker = Utilities.makeLambda(MethodHandles.lookup(), Invoker.class, h);
-            return manager -> (LoadingCarts) invoker.invoke(manager, function, supplier, "linkart_loading_carts");
-        }
-    });
+    private static final Type<LoadingCarts> TYPE = new Type<>(LoadingCarts::new, (compound, lookup) -> new LoadingCarts().readNbt(compound), null);//thanks, FAPI
 
     public static LoadingCarts getOrCreate(ServerWorld world) {
-        return GETTER.apply(world.getPersistentStateManager());
+        return world.getPersistentStateManager().getOrCreate(TYPE, "linkart_loading_carts");
     }
 
     private final Set<BlockPos> chunksToReload = new HashSet<>();
     private final Set<AbstractMinecartEntity> cartsToBlockPos = new HashSet<>();
 
     @Override
-    public NbtCompound writeNbt(NbtCompound nbt) {
+    public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
         NbtList list = new NbtList();
         for (AbstractMinecartEntity minecart : cartsToBlockPos) {
             if (!minecart.isRemoved()) list.add(NbtLong.of(minecart.getBlockPos().asLong()));