Further fixes

apple502j · Aug 29, 2024 · 3e72cd2 · 3e72cd2
1 parent d894af2
commit 3e72cd2
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 23 deletions.
diff --git a/...i-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/FabricApiLookupTest.java b/...i-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/FabricApiLookupTest.java
@@ -16,19 +16,17 @@
 
 package net.fabricmc.fabric.test.lookup;
 
-import net.minecraft.block.Block;
-import net.minecraft.registry.RegistryKey;
-
-import net.minecraft.registry.RegistryKeys;
-
 import org.jetbrains.annotations.NotNull;
 
 import net.minecraft.block.AbstractBlock;
+import net.minecraft.block.Block;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.RegistryKeys;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Direction;
 

diff --git a/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/WorldgenProvider.java b/fabric-biome-api-v1/src/testmod/java/net/fabricmc/fabric/test/biome/WorldgenProvider.java
@@ -31,9 +31,9 @@ public WorldgenProvider(FabricDataOutput output, CompletableFuture<RegistryWrapp
 
 	@Override
 	protected void configure(RegistryWrapper.WrapperLookup registries, Entries entries) {
-		entries.addAll(registries.getWrapperOrThrow(RegistryKeys.BIOME));
-		entries.addAll(registries.getWrapperOrThrow(RegistryKeys.PLACED_FEATURE));
-		entries.addAll(registries.getWrapperOrThrow(RegistryKeys.CONFIGURED_FEATURE));
+		entries.addAll(registries.getOrThrow(RegistryKeys.BIOME));
+		entries.addAll(registries.getOrThrow(RegistryKeys.PLACED_FEATURE));
+		entries.addAll(registries.getOrThrow(RegistryKeys.CONFIGURED_FEATURE));
 	}
 
 	@Override

diff --git a/.../src/testmod/java/net/fabricmc/fabric/test/object/builder/ObjectBuilderTestConstants.java b/.../src/testmod/java/net/fabricmc/fabric/test/object/builder/ObjectBuilderTestConstants.java
@@ -16,14 +16,12 @@
 
 package net.fabricmc.fabric.test.object.builder;
 
-import net.minecraft.block.Block;
-import net.minecraft.registry.RegistryKey;
-
-import net.minecraft.registry.RegistryKeys;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import net.minecraft.block.Block;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.RegistryKeys;
 import net.minecraft.util.Identifier;
 
 public final class ObjectBuilderTestConstants {

diff --git a/fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/Registration.java b/fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/Registration.java
@@ -16,6 +16,8 @@
 
 package net.fabricmc.fabric.test.renderer;
 
+import java.util.function.Function;
+
 import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
@@ -24,14 +26,11 @@
 import net.minecraft.item.Item;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
-
-import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
-
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.util.Identifier;
 
-import java.util.function.Function;
+import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
 
 public final class Registration {
 	public static final FrameBlock FRAME_BLOCK = register("frame", FrameBlock::new, AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).nonOpaque());

diff --git a/...pi-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/RecipeManagerMixin.java b/...pi-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/RecipeManagerMixin.java
@@ -29,10 +29,10 @@
 public class RecipeManagerMixin extends SinglePreparationResourceReloaderMixin {
 	@Shadow
 	@Final
-	private RegistryWrapper.WrapperLookup registryLookup;
+	private RegistryWrapper.WrapperLookup registries;
 
 	@Override
 	protected @Nullable RegistryOps.RegistryInfoGetter fabric_getRegistryLookup() {
-		return new RegistryOps.CachedRegistryInfoGetter(registryLookup);
+		return new RegistryOps.CachedRegistryInfoGetter(registries);
 	}
 }
diff --git a/...main/java/net/fabricmc/fabric/mixin/resource/conditions/ServerAdvancementLoaderMixin.java b/...main/java/net/fabricmc/fabric/mixin/resource/conditions/ServerAdvancementLoaderMixin.java
@@ -29,10 +29,10 @@
 public class ServerAdvancementLoaderMixin extends SinglePreparationResourceReloaderMixin {
 	@Shadow
 	@Final
-	private RegistryWrapper.WrapperLookup registryLookup;
+	private RegistryWrapper.WrapperLookup registries;
 
 	@Override
 	protected @Nullable RegistryOps.RegistryInfoGetter fabric_getRegistryLookup() {
-		return new RegistryOps.CachedRegistryInfoGetter(this.registryLookup);
+		return new RegistryOps.CachedRegistryInfoGetter(this.registries);
 	}
 }
diff --git a/...-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ResourceManagerHelperImpl.java b/...-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ResourceManagerHelperImpl.java
@@ -242,7 +242,7 @@ private RegistryWrapper.WrapperLookup getWrapperLookup(List<ResourceReloader> li
 
 		for (ResourceReloader resourceReloader : listeners) {
 			if (resourceReloader instanceof RecipeManager recipeManager) {
-				return recipeManager.registryLookup;
+				return recipeManager.registries;
 			}
 		}
 

diff --git a/fabric-resource-loader-v0/src/main/resources/fabric-resource-loader-v0.accesswidener b/fabric-resource-loader-v0/src/main/resources/fabric-resource-loader-v0.accesswidener
@@ -4,4 +4,4 @@ accessible method net/minecraft/resource/NamespaceResourceManager getMetadataPat
 accessible method net/minecraft/resource/NamespaceResourceManager loadMetadata (Lnet/minecraft/resource/InputSupplier;)Lnet/minecraft/resource/metadata/ResourceMetadata;
 accessible field net/minecraft/resource/FileResourcePackProvider source Lnet/minecraft/resource/ResourcePackSource;
 accessible field net/minecraft/resource/ResourcePackManager providers Ljava/util/Set;
-accessible field net/minecraft/recipe/RecipeManager registryLookup Lnet/minecraft/registry/RegistryWrapper$WrapperLookup;
+accessible field net/minecraft/recipe/RecipeManager registries Lnet/minecraft/registry/RegistryWrapper$WrapperLookup;