.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
         with:
           fetch-depth: 0
       - uses: gradle/wrapper-validation-action@v1
-      - run: ./gradlew check build publishToMavenLocal --stacktrace --warning-mode=fail -Porg.gradle.parallel.threads=4
+      - run: ./gradlew check build publishToMavenLocal --stacktrace --warning-mode=fail
       - uses: Juuxel/publish-checkstyle-report@v1
         if: ${{ failure() }}
         with:

.github/workflows/release.yml

@@ -22,7 +22,7 @@ jobs:
           context: changelog
           workflow_id: release.yml
       - uses: gradle/wrapper-validation-action@v1
-      - run: ./gradlew checkVersion build publish publishMods --stacktrace -Porg.gradle.parallel.threads=4
+      - run: ./gradlew checkVersion build publish publishMods --stacktrace
         env:
           MAVEN_URL: ${{ secrets.MAVEN_URL }}
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}

build.gradle

@@ -22,6 +22,13 @@ def metaProjects = [
 	'fabric-api-catalog'
 ]
 
+def debugArgs = [
+	"-enableassertions",
+	"-Dmixin.debug.verify=true",
+	//"-Dmixin.debug.strict=true",
+	"-Dmixin.debug.countInjections=true",
+]
+
 import net.fabricmc.loom.util.gradle.SourceSetHelper
 import groovy.json.JsonSlurper
 import org.apache.commons.codec.digest.DigestUtils
@@ -204,7 +211,7 @@ allprojects {
 	}
 
 	loom.runs.configureEach {
-		vmArg("-enableassertions")
+		vmArgs(debugArgs)
 	}
 
 	allprojects.each { p ->
@@ -518,8 +525,8 @@ tasks.register('runProductionAutoTestClient', JavaExec) {
 		jvmArgs(
 				"-Dfabric.addMods=${remapJar.archiveFile.get().asFile.absolutePath}${File.pathSeparator}${remapTestmodJar.archiveFile.get().asFile.absolutePath}",
 				"-Dfabric.autoTest",
-				"-enableassertions"
 				)
+		jvmArgs(debugArgs)
 	}
 }
 
@@ -550,8 +557,8 @@ tasks.register('runProductionAutoTestServer', JavaExec) {
 		jvmArgs(
 				"-Dfabric.addMods=${remapJar.archiveFile.get().asFile.absolutePath}${File.pathSeparator}${remapTestmodJar.archiveFile.get().asFile.absolutePath}",
 				"-Dfabric.autoTest",
-				"-enableassertions"
 				)
+		jvmArgs(debugArgs)
 
 		args("nogui")
 	}

fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/compat/WrappedInventory.java

@@ -60,7 +60,7 @@ public ItemStack tryInsert(ItemStack input, boolean simulate) {
 			if (inv.isValid(i, input)) {
 				ItemStack stack = inv.getStack(i);
 
-				if (stack.isEmpty() || ItemStack.areItemsAndNbtEqual(stack, input)) {
+				if (stack.isEmpty() || ItemStack.areItemsAndComponentsEqual(stack, input)) {
 					int remainingSpace = Math.min(inv.getMaxCountPerStack(), stack.getItem().getMaxCount()) - stack.getCount();
 					int inserted = Math.min(remainingSpace, input.getCount());
 

fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/item/FabricItemApiLookupTest.java

@@ -18,6 +18,7 @@
 
 import static net.fabricmc.fabric.test.lookup.FabricApiLookupTest.ensureException;
 
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.Item;
 import net.minecraft.item.Items;
 import net.minecraft.item.ToolItem;
@@ -41,7 +42,7 @@ public static void onInitialize() {
 
 		// Diamonds and diamond blocks can be inspected and will also print their name.
 		INSPECTABLE.registerForItems((stack, ignored) -> () -> {
-			if (stack.hasCustomName()) {
+			if (stack.contains(DataComponentTypes.CUSTOM_NAME)) {
 				return stack.getName();
 			} else {
 				return Text.literal("Unnamed gem.");

fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/LandPathNodeMakerMixin.java

@@ -44,16 +44,4 @@ private static void getCommonNodeType(BlockView world, BlockPos pos, CallbackInf
 			cir.setReturnValue(nodeType);
 		}
 	}
-
-	/**
-	 * Overrides the node type for the specified position, if the position is found as neighbor block in a path.
-	 */
-	@Inject(method = "getNodeTypeFromNeighbors", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/entity/ai/pathing/LandPathNodeMaker;getCommonNodeType(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/entity/ai/pathing/PathNodeType;"), cancellable = true)
-	private static void getNodeTypeFromNeighbors(BlockView world, BlockPos.Mutable pos, PathNodeType nodeType, CallbackInfoReturnable<PathNodeType> cir) {
-		PathNodeType neighborNodeType = LandPathNodeTypesRegistry.getPathNodeType(world.getBlockState(pos), world, pos, true);
-
-		if (neighborNodeType != null) {
-			cir.setReturnValue(neighborNodeType);
-		}
-	}
 }

fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/PathContextMixin.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.fabricmc.fabric.mixin.content.registry;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.ai.pathing.PathContext;
+import net.minecraft.entity.ai.pathing.PathNodeType;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.CollisionView;
+
+import net.fabricmc.fabric.api.registry.LandPathNodeTypesRegistry;
+
+@Mixin(PathContext.class)
+public abstract class PathContextMixin {
+	@Shadow
+	public abstract BlockState getBlockState(BlockPos blockPos);
+
+	@Shadow
+	public abstract CollisionView getWorld();
+
+	/**
+	 * Overrides the node type for the specified position, if the position is found as neighbor block in a path.
+	 */
+	@Inject(method = "getNodeType", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/util/math/BlockPos$Mutable;set(III)Lnet/minecraft/util/math/BlockPos$Mutable;"), cancellable = true)
+	private void onGetNodeType(int x, int y, int z, CallbackInfoReturnable<PathNodeType> cir, @Local BlockPos pos) {
+		final PathNodeType neighborNodeType = LandPathNodeTypesRegistry.getPathNodeType(getBlockState(pos), getWorld(), pos, true);
+
+		if (neighborNodeType != null) {
+			cir.setReturnValue(neighborNodeType);
+		}
+	}
+}

fabric-content-registries-v0/src/main/resources/fabric-content-registries-v0.mixins.json

@@ -4,6 +4,7 @@
   "compatibilityLevel": "JAVA_17",
   "mixins": [
     "AxeItemAccessor",
+    "PathContextMixin",
     "FarmerWorkTaskAccessor",
     "GiveGiftsToHeroTaskAccessor",
     "HoeItemAccessor",

fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/api/attachment/v1/AttachmentTarget.java

@@ -51,7 +51,7 @@
  * <p>
  * Note about {@link BlockEntity} targets: by default, many block entities use their NBT to synchronize with the client.
  * That would mean persistent attachments are automatically synced with the client for those block entities. As this is
- * undesirable behavior, the API completely removes attachments from the result of {@link BlockEntity#toInitialChunkDataNbt()},
+ * undesirable behavior, the API completely removes attachments from the result of {@link BlockEntity#toInitialChunkDataNbt},
  * which takes care of all vanilla types. However, modded block entities may be coded differently, so be wary of this
  * when attaching data to modded block entities.
  * </p>

fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentSerializingImpl.java

@@ -50,7 +50,7 @@ public static void serializeAttachmentData(NbtCompound nbt, RegistryWrapper.Wrap
 			Codec<Object> codec = (Codec<Object>) type.persistenceCodec();
 
 			if (codec != null) {
-				RegistryOps<NbtElement> registryOps = wrapperLookup.method_57093(NbtOps.INSTANCE);
+				RegistryOps<NbtElement> registryOps = wrapperLookup.getOps(NbtOps.INSTANCE);
 				codec.encodeStart(registryOps, entry.getValue())
 						.get()
 						.ifRight(partial -> {
@@ -81,7 +81,7 @@ public static IdentityHashMap<AttachmentType<?>, Object> deserializeAttachmentDa
 				Codec<?> codec = type.persistenceCodec();
 
 				if (codec != null) {
-					RegistryOps<NbtElement> registryOps = wrapperLookup.method_57093(NbtOps.INSTANCE);
+					RegistryOps<NbtElement> registryOps = wrapperLookup.getOps(NbtOps.INSTANCE);
 					codec.parse(registryOps, compound.get(key))
 							.get()
 							.ifRight(partial -> {

fabric-data-attachment-api-v1/src/test/java/net/fabricmc/fabric/test/attachment/CommonAttachmentTests.java

@@ -253,7 +253,7 @@ void testWorldPersistentState() {
 
 	private static DynamicRegistryManager mockDRM() {
 		DynamicRegistryManager drm = mock(DynamicRegistryManager.class);
-		when(drm.method_57093(any())).thenReturn((RegistryOps<Object>) (Object) RegistryOps.of(NbtOps.INSTANCE, drm));
+		when(drm.getOps(any())).thenReturn((RegistryOps<Object>) (Object) RegistryOps.of(NbtOps.INSTANCE, drm));
 		return drm;
 	}
 }

fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricAdvancementProvider.java

@@ -65,7 +65,7 @@ protected FabricAdvancementProvider(FabricDataOutput output, CompletableFuture<R
 	 *
 	 * <p>Use {@link Advancement.Builder#build(Consumer, String)} to help build advancements.
 	 */
-	public abstract void generateAdvancement(Consumer<AdvancementEntry> consumer);
+	public abstract void generateAdvancement(RegistryWrapper.WrapperLookup registryLookup, Consumer<AdvancementEntry> consumer);
 
 	/**
 	 * Return a new exporter that applies the specified conditions to any advancement it receives.
@@ -80,13 +80,13 @@ protected Consumer<AdvancementEntry> withConditions(Consumer<AdvancementEntry> e
 
 	@Override
 	public CompletableFuture<?> run(DataWriter writer) {
-		final Set<Identifier> identifiers = Sets.newHashSet();
-		final Set<AdvancementEntry> advancements = Sets.newHashSet();
+		return this.registryLookup.thenCompose(lookup -> {
+			final Set<Identifier> identifiers = Sets.newHashSet();
+			final Set<AdvancementEntry> advancements = Sets.newHashSet();
 
-		generateAdvancement(advancements::add);
+			generateAdvancement(lookup, advancements::add);
 
-		return this.registryLookup.thenCompose(lookup -> {
-			RegistryOps<JsonElement> ops = lookup.method_57093(JsonOps.INSTANCE);
+			RegistryOps<JsonElement> ops = lookup.getOps(JsonOps.INSTANCE);
 			final List<CompletableFuture<?>> futures = new ArrayList<>();
 
 			for (AdvancementEntry advancement : advancements) {

fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricBlockLootTableProvider.java

@@ -72,7 +72,7 @@ public void excludeFromStrictValidation(Block block) {
 	}
 
 	@Override
-	public void accept(BiConsumer<Identifier, LootTable.Builder> biConsumer) {
+	public void accept(RegistryWrapper.WrapperLookup registryLookup, BiConsumer<Identifier, LootTable.Builder> biConsumer) {
 		generate();
 
 		for (Map.Entry<Identifier, LootTable.Builder> entry : lootTables.entrySet()) {

fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricCodecDataProvider.java

@@ -59,7 +59,7 @@ protected FabricCodecDataProvider(FabricDataOutput dataOutput, CompletableFuture
 	public CompletableFuture<?> run(DataWriter writer) {
 		return this.registriesFuture.thenCompose(lookup -> {
 			Map<Identifier, JsonElement> entries = new HashMap<>();
-			RegistryOps<JsonElement> ops = lookup.method_57093(JsonOps.INSTANCE);
+			RegistryOps<JsonElement> ops = lookup.getOps(JsonOps.INSTANCE);
 
 			BiConsumer<Identifier, T> provider = (id, value) -> {
 				JsonElement json = this.convert(id, value, ops);

fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricDynamicRegistryProvider.java

@@ -208,7 +208,7 @@ public CompletableFuture<?> run(DataWriter writer) {
 						return entries;
 					})
 					.thenCompose(entries -> {
-						final RegistryOps<JsonElement> dynamicOps = registries.method_57093(JsonOps.INSTANCE);
+						final RegistryOps<JsonElement> dynamicOps = registries.getOps(JsonOps.INSTANCE);
 						ArrayList<CompletableFuture<?>> futures = new ArrayList<>();
 
 						for (RegistryEntries<?> registryEntries : entries.queuedEntries.values()) {

fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLanguageProvider.java

@@ -41,6 +41,7 @@
 import net.minecraft.item.ItemGroup;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.stat.StatType;
 import net.minecraft.text.TextContent;
@@ -51,53 +52,57 @@
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 
 /**
- * Extend this class and implement {@link FabricLanguageProvider#generateTranslations(TranslationBuilder)}.
- * Make sure to use {@link FabricLanguageProvider#FabricLanguageProvider(FabricDataOutput, String)} FabricLanguageProvider} to declare what language code is being generated if it isn't {@code en_us}.
+ * Extend this class and implement {@link FabricLanguageProvider#generateTranslations}.
+ * Make sure to use {@link FabricLanguageProvider#FabricLanguageProvider(FabricDataOutput, String, CompletableFuture) FabricLanguageProvider} to declare what language code is being generated if it isn't {@code en_us}.
  *
  * <p>Register an instance of the class with {@link FabricDataGenerator.Pack#addProvider} in a {@link net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint}.
  */
 public abstract class FabricLanguageProvider implements DataProvider {
 	protected final FabricDataOutput dataOutput;
 	private final String languageCode;
+	private final CompletableFuture<RegistryWrapper.WrapperLookup> registryLookup;
 
-	protected FabricLanguageProvider(FabricDataOutput dataOutput) {
-		this(dataOutput, "en_us");
+	protected FabricLanguageProvider(FabricDataOutput dataOutput, CompletableFuture<RegistryWrapper.WrapperLookup> registryLookup) {
+		this(dataOutput, "en_us", registryLookup);
 	}
 
-	protected FabricLanguageProvider(FabricDataOutput dataOutput, String languageCode) {
+	protected FabricLanguageProvider(FabricDataOutput dataOutput, String languageCode, CompletableFuture<RegistryWrapper.WrapperLookup> registryLookup) {
 		this.dataOutput = dataOutput;
 		this.languageCode = languageCode;
+		this.registryLookup = registryLookup;
 	}
 
 	/**
 	 * Implement this method to register languages.
 	 *
 	 * <p>Call {@link TranslationBuilder#add(String, String)} to add a translation.
 	 */
-	public abstract void generateTranslations(TranslationBuilder translationBuilder);
+	public abstract void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, TranslationBuilder translationBuilder);
 
 	@Override
 	public CompletableFuture<?> run(DataWriter writer) {
 		TreeMap<String, String> translationEntries = new TreeMap<>();
 
-		generateTranslations((String key, String value) -> {
-			Objects.requireNonNull(key);
-			Objects.requireNonNull(value);
+		return this.registryLookup.thenCompose(lookup -> {
+			generateTranslations(lookup, (String key, String value) -> {
+				Objects.requireNonNull(key);
+				Objects.requireNonNull(value);
 
-			if (translationEntries.containsKey(key)) {
-				throw new RuntimeException("Existing translation key found - " + key + " - Duplicate will be ignored.");
-			}
+				if (translationEntries.containsKey(key)) {
+					throw new RuntimeException("Existing translation key found - " + key + " - Duplicate will be ignored.");
+				}
 
-			translationEntries.put(key, value);
-		});
+				translationEntries.put(key, value);
+			});
 
-		JsonObject langEntryJson = new JsonObject();
+			JsonObject langEntryJson = new JsonObject();
 
-		for (Map.Entry<String, String> entry : translationEntries.entrySet()) {
-			langEntryJson.addProperty(entry.getKey(), entry.getValue());
-		}
+			for (Map.Entry<String, String> entry : translationEntries.entrySet()) {
+				langEntryJson.addProperty(entry.getKey(), entry.getValue());
+			}
 
-		return DataProvider.writeToPath(writer, langEntryJson, getLangFilePath(this.languageCode));
+			return DataProvider.writeToPath(writer, langEntryJson, getLangFilePath(this.languageCode));
+		});
 	}
 
 	private Path getLangFilePath(String code) {
@@ -112,7 +117,7 @@ public String getName() {
 	}
 
 	/**
-	 * A consumer used by {@link FabricLanguageProvider#generateTranslations(TranslationBuilder)}.
+	 * A consumer used by {@link FabricLanguageProvider#generateTranslations}.
 	 */
 	@ApiStatus.NonExtendable
 	@FunctionalInterface

fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java

@@ -99,7 +99,7 @@ public void accept(Identifier recipeId, Recipe<?> recipe, @Nullable AdvancementE
 					throw new IllegalStateException("Duplicate recipe " + identifier);
 				}
 
-				RegistryOps<JsonElement> registryOps = wrapperLookup.method_57093(JsonOps.INSTANCE);
+				RegistryOps<JsonElement> registryOps = wrapperLookup.getOps(JsonOps.INSTANCE);
 				JsonObject recipeJson = Util.getResult(Recipe.CODEC.encodeStart(registryOps, recipe), IllegalStateException::new).getAsJsonObject();
 				ConditionJsonProvider[] conditions = FabricDataGenHelper.consumeConditions(recipe);
 				ConditionJsonProvider.write(recipeJson, conditions);

fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagProvider.java

@@ -84,7 +84,7 @@ public FabricTagProvider(FabricDataOutput output, RegistryKey<? extends Registry
 	/**
 	 * Implement this method and then use {@link FabricTagProvider#getOrCreateTagBuilder} to get and register new tag builders.
 	 */
-	protected abstract void configure(RegistryWrapper.WrapperLookup arg);
+	protected abstract void configure(RegistryWrapper.WrapperLookup wrapperLookup);
 
 	/**
 	 * Override to enable adding objects to the tag builder directly.

fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/loot/FabricLootTableProviderImpl.java

@@ -58,17 +58,17 @@ public static CompletableFuture<?> run(
 		HashMap<Identifier, LootTable> builders = Maps.newHashMap();
 		HashMap<Identifier, ConditionJsonProvider[]> conditionMap = new HashMap<>();
 
-		provider.accept((identifier, builder) -> {
-			ConditionJsonProvider[] conditions = FabricDataGenHelper.consumeConditions(builder);
-			conditionMap.put(identifier, conditions);
+		return registryLookup.thenCompose(lookup -> {
+			provider.accept(lookup, (identifier, builder) -> {
+				ConditionJsonProvider[] conditions = FabricDataGenHelper.consumeConditions(builder);
+				conditionMap.put(identifier, conditions);
 
-			if (builders.put(identifier, builder.type(lootContextType).build()) != null) {
-				throw new IllegalStateException("Duplicate loot table " + identifier);
-			}
-		});
+				if (builders.put(identifier, builder.type(lootContextType).build()) != null) {
+					throw new IllegalStateException("Duplicate loot table " + identifier);
+				}
+			});
 
-		return registryLookup.thenCompose(lookup -> {
-			RegistryOps<JsonElement> ops = lookup.method_57093(JsonOps.INSTANCE);
+			RegistryOps<JsonElement> ops = lookup.getOps(JsonOps.INSTANCE);
 			final List<CompletableFuture<?>> futures = new ArrayList<>();
 
 			for (Map.Entry<Identifier, LootTable> entry : builders.entrySet()) {