Ladysnake · mrsterner · Dec 6, 2024 · Dec 6, 2024 · Dec 6, 2024 · Dec 6, 2024
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
-	id 'org.quiltmc.loom' version '1.6.+'
+	id 'fabric-loom' version '1.9-SNAPSHOT'
 	id 'io.github.ladysnake.chenille' version '0.13.1'
 	id 'maven-publish'
 }
@@ -49,8 +49,8 @@ repositories {
 dependencies {
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "org.quiltmc:quilt-mappings:${minecraft_version}+build.${quilt_mappings}:intermediary-v2"
-	modImplementation "org.quiltmc:quilt-loader:${project.loader_version}"
+	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
 
@@ -60,7 +60,7 @@ dependencies {
 
 	compileOnly "com.demonwav.mcdev:annotations:1.0"
 
-	modCompileOnly "maven.modrinth:backslot:${backslot_version}"	// not updated yet
+	modCompileOnly "maven.modrinth:backslot:${backslot_version}"
 	modLocalRuntime ("me.shedaniel.cloth:cloth-config-fabric:${cloth_config_version}") { transitive = false }
 
 	modLocalRuntime ("com.terraformersmc:modmenu:${modmenu_version}") { transitive = false }

diff --git a/gradle.properties b/gradle.properties
@@ -3,21 +3,21 @@ org.gradle.jvmargs=-Xmx3G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version = 1.21
-	quilt_mappings = 1
-	loader_version=0.26.0
+	minecraft_version = 1.21.1
+	yarn_mappings=1.21.1+build.3
+	loader_version=0.16.9
 
 # Mod Properties
-	mod_version = 0.13.0
+	mod_version = 0.14.0
 	maven_group = org.ladysnake
 	archives_base_name = locki
 
 # Dependencies
-	fabric_api_version = 0.100.1+1.21
+	fabric_api_version = 0.110.0+1.21.1
 	cca_version = 6.1.0
 	fpa_version=0.2-SNAPSHOT
     # V1.2.12
-	backslot_version=1.2.15+1.20.6
+	backslot_version=1.2.16+1.21.1
 	cloth_config_version=15.0.127
 	modmenu_version=11.0.0-rc.2
 	elmendorf_version=0.13.0
@@ -28,7 +28,6 @@ org.gradle.jvmargs=-Xmx3G
 	gpl_version = 3
 	curseforge_id = 483059
 	modrinth_id = qS8U15sj
-	curseforge_versions = 1.21
-	cf_requirements = qsl
+	curseforge_versions = 1.21.1
 	cf_embeddeds = cardinal-components-api
 	release_type = beta
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/junit-loader/build.gradle b/junit-loader/build.gradle
@@ -2,32 +2,24 @@ plugins {
     id 'java-library'
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
-archivesBaseName = "quilt-loader-junit"
+archivesBaseName = "fabric-loader-junit"
 version = rootProject.version
 group = rootProject.group
 
 repositories {
     mavenCentral()
 
-    maven {
-        name = 'Quilt'
-        url = 'https://maven.quiltmc.org/repository/release'
-    }
-    maven {
-        name = 'Quilt Snapshots'
-        url = 'https://maven.quiltmc.org/repository/snapshot'
-    }
     maven {
         name = 'Fabric'
         url = 'https://maven.fabricmc.net/'
     }
 }
 
 dependencies {
-    compileOnly "org.quiltmc:quilt-loader:${project.loader_version}"
+    compileOnly "net.fabricmc:fabric-loader:${project.loader_version}"
 
     api platform("org.junit:junit-bom:5.9.2")
     api "org.junit.jupiter:junit-jupiter-engine"

diff --git a/...r/QuiltLoaderLauncherSessionListener.java → .../FabricLoaderLauncherSessionListener.java b/...r/QuiltLoaderLauncherSessionListener.java → .../FabricLoaderLauncherSessionListener.java
@@ -17,15 +17,15 @@
 package org.ladysnake.junitloader;
 
 import net.fabricmc.api.EnvType;
+import net.fabricmc.loader.impl.launch.knot.Knot;
+import net.fabricmc.loader.impl.util.SystemProperties;
 import org.junit.platform.launcher.LauncherSession;
 import org.junit.platform.launcher.LauncherSessionListener;
-import org.quiltmc.loader.impl.launch.knot.Knot;
-import org.quiltmc.loader.impl.util.SystemProperties;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-public class QuiltLoaderLauncherSessionListener implements LauncherSessionListener {
+public class FabricLoaderLauncherSessionListener implements LauncherSessionListener {
     static {
         System.setProperty(SystemProperties.DEVELOPMENT, "true");
     }
@@ -34,7 +34,7 @@ public class QuiltLoaderLauncherSessionListener implements LauncherSessionListen
 
     private ClassLoader launcherSessionClassLoader;
 
-    public QuiltLoaderLauncherSessionListener() throws InvocationTargetException, IllegalAccessException, NoSuchMethodException {
+    public FabricLoaderLauncherSessionListener() throws InvocationTargetException, IllegalAccessException, NoSuchMethodException {
         final Thread currentThread = Thread.currentThread();
         final ClassLoader originalClassLoader = currentThread.getContextClassLoader();
 

diff --git a/.../src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/.../src/main/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
@@ -1 +1 @@
-org.ladysnake.junitloader.QuiltLoaderLauncherSessionListener
+org.ladysnake.junitloader.FabricLoaderLauncherSessionListener
diff --git a/settings.gradle b/settings.gradle
@@ -1,9 +1,5 @@
 pluginManagement {
     repositories {
-        maven {
-            name = 'QuiltMC'
-            url = 'https://maven.quiltmc.org/repository/release'
-        }
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'

diff --git a/src/main/java/org/ladysnake/locki/Locki.java b/src/main/java/org/ladysnake/locki/Locki.java
@@ -24,7 +24,7 @@
 import net.fabricmc.fabric.api.command.v2.ArgumentTypeRegistry;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.util.TriState;
-import net.minecraft.command.argument.SingletonArgumentInfo;
+import net.minecraft.command.argument.serialize.ConstantArgumentSerializer;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.command.ServerCommandSource;
@@ -157,8 +157,14 @@ public static Stream<String> streamNodeNames() {
     @Override
     public void onInitialize() {
         this.baseInit();
-        ArgumentTypeRegistry.registerArgumentType(id("inventory_lock"), InventoryLockArgumentType.class, SingletonArgumentInfo.contextFree(InventoryLockArgumentType::inventoryLock));
-        ArgumentTypeRegistry.registerArgumentType(id("inventory_node"), InventoryNodeArgumentType.class, SingletonArgumentInfo.contextFree(InventoryNodeArgumentType::inventoryNode));
+        ArgumentTypeRegistry.registerArgumentType(id("inventory_lock"),
+                InventoryLockArgumentType.class,
+                ConstantArgumentSerializer.of(InventoryLockArgumentType::inventoryLock)
+        );
+        ArgumentTypeRegistry.registerArgumentType(id("inventory_node"),
+                InventoryNodeArgumentType.class,
+                ConstantArgumentSerializer.of(InventoryNodeArgumentType::inventoryNode)
+        );
     }
 
     void baseInit() {

diff --git a/src/main/java/org/ladysnake/locki/impl/InventoryKeeperBase.java b/src/main/java/org/ladysnake/locki/impl/InventoryKeeperBase.java
@@ -23,7 +23,8 @@
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.nbt.NbtList;
-import net.minecraft.registry.HolderLookup;
+import net.minecraft.registry.RegistryEntryLookup;
+import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.util.Identifier;
 import org.ladysnake.cca.api.v3.component.Component;
 import org.ladysnake.locki.InventoryKeeper;
@@ -143,7 +144,7 @@ protected BitSet lookup(InventoryNode inventoryNode) {
     }
 
     @Override
-    public void readFromNbt(NbtCompound tag, HolderLookup.Provider registryLookup) {
+    public void readFromNbt(NbtCompound tag, RegistryWrapper.WrapperLookup registryLookup) {
         if (tag.contains("locks", NbtElement.COMPOUND_TYPE)) {
             this.clearCache();
             this.getLocks().clear();
@@ -170,7 +171,7 @@ public void readFromNbt(NbtCompound tag, HolderLookup.Provider registryLookup) {
     }
 
     @Override
-    public void writeToNbt(NbtCompound tag, HolderLookup.Provider registryLookup) {
+    public void writeToNbt(NbtCompound tag, RegistryWrapper.WrapperLookup registryLookup) {
         NbtCompound dict = new NbtCompound();
         for (Map.Entry<InventoryNode, Reference2BooleanMap<InventoryLock>> nodeEntry : this.getLocks().entrySet()) {
             NbtList list = new NbtList();

diff --git a/src/main/java/org/ladysnake/locki/impl/LockiClient.java b/src/main/java/org/ladysnake/locki/impl/LockiClient.java
@@ -20,8 +20,8 @@
 import net.fabricmc.api.ClientModInitializer;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ingame.InventoryScreen;
-import net.minecraft.client.gui.screen.recipe_book.RecipeBookProvider;
-import net.minecraft.client.gui.widget.recipe_book.RecipeBookWidget;
+import net.minecraft.client.gui.screen.recipebook.RecipeBookProvider;
+import net.minecraft.client.gui.screen.recipebook.RecipeBookWidget;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.Identifier;
 import org.ladysnake.locki.DefaultInventoryNodes;

diff --git a/src/main/java/org/ladysnake/locki/impl/LockiClientMixinPlugin.java b/src/main/java/org/ladysnake/locki/impl/LockiClientMixinPlugin.java
@@ -18,8 +18,8 @@
 package org.ladysnake.locki.impl;
 
 import net.fabricmc.api.EnvType;
+import net.fabricmc.loader.api.FabricLoader;
 import org.objectweb.asm.tree.ClassNode;
-import org.quiltmc.loader.api.minecraft.MinecraftQuiltLoader;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
 
@@ -39,7 +39,7 @@ public String getRefMapperConfig() {
 
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        return MinecraftQuiltLoader.getEnvironmentType() == EnvType.CLIENT;
+        return FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT;
     }
 
     @Override

diff --git a/src/main/java/org/ladysnake/locki/impl/compat/LockiCompatMixinPlugin.java b/src/main/java/org/ladysnake/locki/impl/compat/LockiCompatMixinPlugin.java
@@ -17,8 +17,8 @@
  */
 package org.ladysnake.locki.impl.compat;
 
+import net.fabricmc.loader.api.FabricLoader;
 import org.objectweb.asm.tree.ClassNode;
-import org.quiltmc.loader.api.QuiltLoader;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
 
@@ -45,7 +45,7 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
         Matcher matcher = mixinPattern.matcher(mixinClassName);
         if (!matcher.matches()) throw new IllegalStateException("Bad mixin name " + mixinClassName);
         String modId = matcher.group("modid");
-        return QuiltLoader.isModLoaded(modId);
+        return FabricLoader.getInstance().isModLoaded(modId);
     }
 
     @Override

diff --git a/src/main/java/org/ladysnake/locki/impl/compat/mixin/backslot/SwitchPacketMixin.java b/src/main/java/org/ladysnake/locki/impl/compat/mixin/backslot/SwitchPacketMixin.java
@@ -17,6 +17,7 @@
  */
 package org.ladysnake.locki.impl.compat.mixin.backslot;
 
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import net.backslot.network.SwitchPacketReceiver;
 import net.minecraft.item.ItemStack;
 import net.minecraft.server.MinecraftServer;
@@ -33,12 +34,20 @@ public abstract class SwitchPacketMixin {
     public static boolean isItemAllowed(ItemStack stack, int slot) {
         return false;
     }
-
-    @Redirect(method = "receive", at = @At(value = "INVOKE", target = "Lnet/backslot/network/SwitchPacketReceiver;isItemAllowed(Lnet/minecraft/item/ItemStack;I)Z"))
+/*TODO
+    @WrapWithCondition(
+            method = "receive(Lnet/backslot/network/SwitchPacket;Lnet/fabricmc/fabric/api/networking/v1/ServerPlayNetworking$Context;)V",
+            at = @At(
+                    value = "INVOKE",
+                    target = ""
+            )
+    )
     private boolean lockAdditionalSlots(ItemStack stack, int slot, MinecraftServer server, ServerPlayerEntity player) {
         if (InventoryKeeper.get(player).isSlotLocked(slot)) {
             return false;
         }
         return isItemAllowed(stack, slot);
     }
+
+ */
 }
diff --git a/src/main/java/org/ladysnake/locki/impl/mixin/InputSlotFillerMixin.java b/src/main/java/org/ladysnake/locki/impl/mixin/InputSlotFillerMixin.java
@@ -35,7 +35,7 @@
 public abstract class InputSlotFillerMixin {
     @Shadow protected AbstractRecipeScreenHandler<?, ?> handler;
 
-    @WrapOperation(method = "fillInputSlots(Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/recipe/RecipeHolder;Z)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/recipe/RecipeMatcher;match(Lnet/minecraft/recipe/Recipe;Lit/unimi/dsi/fastutil/ints/IntList;)Z"))
+    @WrapOperation(method = "fillInputSlots(Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/recipe/RecipeEntry;Z)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/recipe/RecipeMatcher;match(Lnet/minecraft/recipe/Recipe;Lit/unimi/dsi/fastutil/ints/IntList;)Z"))
     private boolean blockInventoryCrafting(RecipeMatcher instance, Recipe<?> recipe, IntList output, Operation<Boolean> original, ServerPlayerEntity entity) {
         if (this.handler == entity.playerScreenHandler && InventoryKeeper.get(entity).isLocked(DefaultInventoryNodes.CRAFTING_GRID)) {
             return false;

diff --git a/src/main/java/org/ladysnake/locki/impl/mixin/PlayerInventoryMixin.java b/src/main/java/org/ladysnake/locki/impl/mixin/PlayerInventoryMixin.java
@@ -17,6 +17,8 @@
  */
 package org.ladysnake.locki.impl.mixin;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
@@ -29,7 +31,6 @@
 import org.ladysnake.locki.impl.LockiComponents;
 import org.ladysnake.locki.impl.PlayerInventoryKeeper;
 import org.objectweb.asm.Opcodes;
-import org.quiltmc.loader.api.minecraft.ClientOnly;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -111,7 +112,7 @@ private void constructor(PlayerEntity player, CallbackInfo ci) {
         this.locki$keeper = LockiComponents.INVENTORY_KEEPER.maybeGet(player).orElse(null);
     }
 
-    @ClientOnly
+    @Environment(EnvType.CLIENT)
     @Inject(method = {"addPickBlock", "scrollInHotbar"},
         at = @At(value = "FIELD", opcode = Opcodes.PUTFIELD, target = "Lnet/minecraft/entity/player/PlayerInventory;selectedSlot:I", shift = At.Shift.AFTER)
     )

diff --git a/src/main/java/org/ladysnake/locki/impl/mixin/ServerPlayNetworkHandlerMixin.java b/src/main/java/org/ladysnake/locki/impl/mixin/ServerPlayNetworkHandlerMixin.java
@@ -18,7 +18,7 @@
 package org.ladysnake.locki.impl.mixin;
 
 import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
-import net.minecraft.network.packet.c2s.play.SelectedSlotUpdateC2SPacket;
+import net.minecraft.network.packet.c2s.play.UpdateSelectedSlotC2SPacket;
 import net.minecraft.server.network.ServerPlayNetworkHandler;
 import net.minecraft.server.network.ServerPlayerEntity;
 import org.ladysnake.locki.DefaultInventoryNodes;
@@ -35,8 +35,8 @@ public abstract class ServerPlayNetworkHandlerMixin {
     @Shadow
     public ServerPlayerEntity player;
 
-    @Inject(method = "onSelectedSlotUpdate", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/c2s/play/SelectedSlotUpdateC2SPacket;getSelectedSlot()I", ordinal = 0))
-    private void fixSelectedSlot(SelectedSlotUpdateC2SPacket packet, CallbackInfo ci) {
+    @Inject(method = "onUpdateSelectedSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/c2s/play/UpdateSelectedSlotC2SPacket;getSelectedSlot()I", ordinal = 0))
+    private void fixSelectedSlot(UpdateSelectedSlotC2SPacket packet, CallbackInfo ci) {
         ((UpdateSelectedSlotC2SPacketAccessor) packet).locki$setSelectedSlot(PlayerInventoryKeeper.fixSelectedSlot(player, packet.getSelectedSlot()));
     }
 

diff --git a/src/main/java/org/ladysnake/locki/impl/mixin/UpdateSelectedSlotC2SPacketAccessor.java b/src/main/java/org/ladysnake/locki/impl/mixin/UpdateSelectedSlotC2SPacketAccessor.java
@@ -17,11 +17,11 @@
  */
 package org.ladysnake.locki.impl.mixin;
 
-import net.minecraft.network.packet.c2s.play.SelectedSlotUpdateC2SPacket;
+import net.minecraft.network.packet.c2s.play.UpdateSelectedSlotC2SPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-@Mixin(SelectedSlotUpdateC2SPacket.class)
+@Mixin(UpdateSelectedSlotC2SPacket.class)
 public interface UpdateSelectedSlotC2SPacketAccessor {
     @Accessor("selectedSlot")
     void locki$setSelectedSlot(int selectedSlot);

diff --git a/src/main/java/org/ladysnake/locki/impl/mixin/UpdateSelectedSlotC2SPacketMixin.java b/src/main/java/org/ladysnake/locki/impl/mixin/UpdateSelectedSlotC2SPacketMixin.java
@@ -17,13 +17,13 @@
  */
 package org.ladysnake.locki.impl.mixin;
 
-import net.minecraft.network.packet.c2s.play.SelectedSlotUpdateC2SPacket;
+import net.minecraft.network.packet.c2s.play.UpdateSelectedSlotC2SPacket;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.Shadow;
 
-@Mixin(SelectedSlotUpdateC2SPacket.class)
+@Mixin(UpdateSelectedSlotC2SPacket.class)
 public class UpdateSelectedSlotC2SPacketMixin {
     @SuppressWarnings("unused") // only there to make selectedSlot mutable - for use by the accessor
     @Shadow @Mutable @Final private int selectedSlot;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		org.ladysnake.junitloader.QuiltLoaderLauncherSessionListener
		org.ladysnake.junitloader.FabricLoaderLauncherSessionListener