Rename fabric-block-view-api-v2 to fabric-block-getter-api-v2 (#5141)

PepperCode1 · web-flow · commit ac3be0b356e2 · 2026-01-17T10:19:56.000Z
diff --git a/fabric-block-getter-api-v2/build.gradle b/fabric-block-getter-api-v2/build.gradle
diff --git a/fabric-block-getter-api-v2/src/client/java/net/fabricmc/fabric/impl/blockgetter/client/RenderDataMapConsumer.java b/fabric-block-getter-api-v2/src/client/java/net/fabricmc/fabric/impl/blockgetter/client/RenderDataMapConsumer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.impl.blockview.client;
+package net.fabricmc.fabric.impl.blockgetter.client;
 
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 
diff --git a/fabric-block-getter-api-v2/src/client/java/net/fabricmc/fabric/mixin/blockgetter/client/MovingBlockRenderStateMixin.java b/fabric-block-getter-api-v2/src/client/java/net/fabricmc/fabric/mixin/blockgetter/client/MovingBlockRenderStateMixin.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.blockview.client;
+package net.fabricmc.fabric.mixin.blockgetter.client;
 
 import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/fabric-block-getter-api-v2/src/client/java/net/fabricmc/fabric/mixin/blockgetter/client/RenderRegionCacheMixin.java b/fabric-block-getter-api-v2/src/client/java/net/fabricmc/fabric/mixin/blockgetter/client/RenderRegionCacheMixin.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.blockview.client;
+package net.fabricmc.fabric.mixin.blockgetter.client;
 
 import java.util.ConcurrentModificationException;
 import java.util.Map;
@@ -40,7 +40,7 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.chunk.LevelChunk;
 
-import net.fabricmc.fabric.impl.blockview.client.RenderDataMapConsumer;
+import net.fabricmc.fabric.impl.blockgetter.client.RenderDataMapConsumer;
 
 @Mixin(RenderRegionCache.class)
 public abstract class RenderRegionCacheMixin {
diff --git a/fabric-block-getter-api-v2/src/client/java/net/fabricmc/fabric/mixin/blockgetter/client/RenderSectionRegionMixin.java b/fabric-block-getter-api-v2/src/client/java/net/fabricmc/fabric/mixin/blockgetter/client/RenderSectionRegionMixin.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.blockview.client;
+package net.fabricmc.fabric.mixin.blockgetter.client;
 
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import org.jspecify.annotations.Nullable;
@@ -30,7 +30,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.biome.Biome;
 
-import net.fabricmc.fabric.impl.blockview.client.RenderDataMapConsumer;
+import net.fabricmc.fabric.impl.blockgetter.client.RenderDataMapConsumer;
 
 @Mixin(RenderSectionRegion.class)
 public abstract class RenderSectionRegionMixin implements BlockAndTintGetter, RenderDataMapConsumer {
diff --git a/fabric-block-getter-api-v2/src/client/resources/fabric-block-getter-api-v2.client.mixins.json b/fabric-block-getter-api-v2/src/client/resources/fabric-block-getter-api-v2.client.mixins.json
@@ -1,11 +1,11 @@
 {
   "required": true,
-  "package": "net.fabricmc.fabric.mixin.blockview.client",
+  "package": "net.fabricmc.fabric.mixin.blockgetter.client",
   "compatibilityLevel": "JAVA_25",
   "client": [
-    "RenderSectionRegionMixin",
+    "MovingBlockRenderStateMixin",
     "RenderRegionCacheMixin",
-    "MovingBlockRenderStateMixin"
+    "RenderSectionRegionMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/fabric-block-getter-api-v2/src/main/java/net/fabricmc/fabric/api/blockgetter/v2/FabricBlockGetter.java b/fabric-block-getter-api-v2/src/main/java/net/fabricmc/fabric/api/blockgetter/v2/FabricBlockGetter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.api.blockview.v2;
+package net.fabricmc.fabric.api.blockgetter.v2;
 
 import org.jetbrains.annotations.UnknownNullability;
 import org.jspecify.annotations.Nullable;
@@ -34,7 +34,7 @@
  *
  * <p>Note: This interface is automatically implemented on all {@link BlockGetter} instances via Mixin and interface injection.
  */
-public interface FabricBlockView {
+public interface FabricBlockGetter {
 	/**
 	 * Retrieves block entity render data for a given block position.
 	 *
diff --git a/fabric-block-getter-api-v2/src/main/java/net/fabricmc/fabric/api/blockgetter/v2/RenderDataBlockEntity.java b/fabric-block-getter-api-v2/src/main/java/net/fabricmc/fabric/api/blockgetter/v2/RenderDataBlockEntity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.api.blockview.v2;
+package net.fabricmc.fabric.api.blockgetter.v2;
 
 import org.jspecify.annotations.Nullable;
 
@@ -49,12 +49,12 @@ public interface RenderDataBlockEntity {
 	 * use in a multithreaded environment.
 	 *
 	 * <p>Note: <b>This method should not be called directly</b>; use
-	 * {@link FabricBlockView#getBlockEntityRenderData(BlockPos)} instead. Only call this
+	 * {@link FabricBlockGetter#getBlockEntityRenderData(BlockPos)} instead. Only call this
 	 * method when the result is used to implement
-	 * {@link FabricBlockView#getBlockEntityRenderData(BlockPos)}.
+	 * {@link FabricBlockGetter#getBlockEntityRenderData(BlockPos)}.
 	 *
 	 * @return the render data
-	 * @see FabricBlockView#getBlockEntityRenderData(BlockPos)
+	 * @see FabricBlockGetter#getBlockEntityRenderData(BlockPos)
 	 */
 	@Nullable
 	default Object getRenderData() {
diff --git a/fabric-block-getter-api-v2/src/main/java/net/fabricmc/fabric/mixin/blockgetter/BlockEntityMixin.java b/fabric-block-getter-api-v2/src/main/java/net/fabricmc/fabric/mixin/blockgetter/BlockEntityMixin.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.blockview;
+package net.fabricmc.fabric.mixin.blockgetter;
 
 import org.spongepowered.asm.mixin.Mixin;
 
 import net.minecraft.world.level.block.entity.BlockEntity;
 
-import net.fabricmc.fabric.api.blockview.v2.RenderDataBlockEntity;
+import net.fabricmc.fabric.api.blockgetter.v2.RenderDataBlockEntity;
 
 @Mixin(BlockEntity.class)
 public abstract class BlockEntityMixin implements RenderDataBlockEntity {
diff --git a/fabric-block-getter-api-v2/src/main/java/net/fabricmc/fabric/mixin/blockgetter/BlockGetterMixin.java b/fabric-block-getter-api-v2/src/main/java/net/fabricmc/fabric/mixin/blockgetter/BlockGetterMixin.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.blockview;
+package net.fabricmc.fabric.mixin.blockgetter;
 
 import org.spongepowered.asm.mixin.Mixin;
 
 import net.minecraft.world.level.BlockGetter;
 
-import net.fabricmc.fabric.api.blockview.v2.FabricBlockView;
+import net.fabricmc.fabric.api.blockgetter.v2.FabricBlockGetter;
 
 @Mixin(BlockGetter.class)
-public interface BlockGetterMixin extends FabricBlockView {
+public interface BlockGetterMixin extends FabricBlockGetter {
 }
diff --git a/fabric-block-getter-api-v2/src/main/java/net/fabricmc/fabric/mixin/blockgetter/LevelReaderMixin.java b/fabric-block-getter-api-v2/src/main/java/net/fabricmc/fabric/mixin/blockgetter/LevelReaderMixin.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.fabricmc.fabric.mixin.blockview;
+package net.fabricmc.fabric.mixin.blockgetter;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/fabric-block-getter-api-v2/src/main/resources/assets/fabric-block-getter-api-v2/icon.png b/fabric-block-getter-api-v2/src/main/resources/assets/fabric-block-getter-api-v2/icon.png
diff --git a/fabric-block-getter-api-v2/src/main/resources/fabric-block-getter-api-v2.mixins.json b/fabric-block-getter-api-v2/src/main/resources/fabric-block-getter-api-v2.mixins.json
@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "net.fabricmc.fabric.mixin.blockview",
+  "package": "net.fabricmc.fabric.mixin.blockgetter",
   "compatibilityLevel": "JAVA_25",
   "mixins": [
     "BlockEntityMixin",
diff --git a/fabric-block-getter-api-v2/src/main/resources/fabric.mod.json b/fabric-block-getter-api-v2/src/main/resources/fabric.mod.json
@@ -1,11 +1,11 @@
 {
   "schemaVersion": 1,
-  "id": "fabric-block-view-api-v2",
-  "name": "Fabric BlockView API (v2)",
+  "id": "fabric-block-getter-api-v2",
+  "name": "Fabric BlockGetter API (v2)",
   "version": "${version}",
   "environment": "*",
   "license": "Apache-2.0",
-  "icon": "assets/fabric-block-view-api-v2/icon.png",
+  "icon": "assets/fabric-block-getter-api-v2/icon.png",
   "contact": {
     "homepage": "https://fabricmc.net",
     "irc": "irc://irc.esper.net:6667/fabric",
@@ -18,19 +18,19 @@
   "depends": {
     "fabricloader": ">=0.18.3"
   },
-  "description": "Hooks for block views",
+  "description": "Hooks for block getters",
   "mixins": [
-    "fabric-block-view-api-v2.mixins.json",
+    "fabric-block-getter-api-v2.mixins.json",
     {
-      "config": "fabric-block-view-api-v2.client.mixins.json",
+      "config": "fabric-block-getter-api-v2.client.mixins.json",
       "environment": "client"
     }
   ],
   "custom": {
     "fabric-api:module-lifecycle": "stable",
     "loom:injected_interfaces": {
-      "net/minecraft/world/level/BlockGetter": ["net/fabricmc/fabric/api/blockview/v2/FabricBlockView"],
-      "net/minecraft/world/level/block/entity/BlockEntity": ["net/fabricmc/fabric/api/blockview/v2/RenderDataBlockEntity"]
+      "net/minecraft/world/level/BlockGetter": ["net/fabricmc/fabric/api/blockgetter/v2/FabricBlockGetter"],
+      "net/minecraft/world/level/block/entity/BlockEntity": ["net/fabricmc/fabric/api/blockgetter/v2/RenderDataBlockEntity"]
     }
   }
 }
diff --git a/fabric-renderer-api-v1/build.gradle b/fabric-renderer-api-v1/build.gradle
@@ -8,7 +8,7 @@ moduleDependencies(project, [
 
 testDependencies(project, [
 	':fabric-block-api-v1',
-	':fabric-block-view-api-v2',
+	':fabric-block-getter-api-v2',
 	':fabric-model-loading-api-v1',
 	':fabric-object-builder-api-v1',
 	':fabric-particles-v1',
diff --git a/fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/FrameBlock.java b/fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/FrameBlock.java
@@ -34,7 +34,7 @@
 import net.minecraft.world.phys.BlockHitResult;
 
 import net.fabricmc.fabric.api.block.v1.FabricBlock;
-import net.fabricmc.fabric.api.blockview.v2.FabricBlockView;
+import net.fabricmc.fabric.api.blockgetter.v2.FabricBlockGetter;
 
 // Need to implement FabricBlock manually because this is a testmod for another Fabric module, otherwise it would be injected.
 public class FrameBlock extends Block implements EntityBlock, FabricBlock {
@@ -105,7 +105,7 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
 	@Override
 	public BlockState getAppearance(BlockState state, BlockAndTintGetter renderView, BlockPos pos, Direction side, @Nullable BlockState sourceState, @Nullable BlockPos sourcePos) {
 		// For this specific block, the render data works on both the client and the server, so let's use that.
-		if (((FabricBlockView) renderView).getBlockEntityRenderData(pos) instanceof Block mimickedBlock) {
+		if (((FabricBlockGetter) renderView).getBlockEntityRenderData(pos) instanceof Block mimickedBlock) {
 			return mimickedBlock.defaultBlockState();
 		}
 
diff --git a/fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/FrameBlockEntity.java b/fabric-renderer-api-v1/src/testmod/java/net/fabricmc/fabric/test/renderer/FrameBlockEntity.java
@@ -32,7 +32,7 @@
 import net.minecraft.world.level.storage.ValueInput;
 import net.minecraft.world.level.storage.ValueOutput;
 
-import net.fabricmc.fabric.api.blockview.v2.RenderDataBlockEntity;
+import net.fabricmc.fabric.api.blockgetter.v2.RenderDataBlockEntity;
 
 public class FrameBlockEntity extends BlockEntity implements RenderDataBlockEntity {
 	private static final Codec<Block> BLOCK_CODEC = BuiltInRegistries.BLOCK.byNameCodec();
diff --git a/fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/client/BiomeDependentBlockStateModel.java b/fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/client/BiomeDependentBlockStateModel.java
@@ -36,7 +36,7 @@
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.state.BlockState;
 
-import net.fabricmc.fabric.api.blockview.v2.FabricBlockView;
+import net.fabricmc.fabric.api.blockgetter.v2.FabricBlockGetter;
 import net.fabricmc.fabric.api.client.model.loading.v1.CustomUnbakedBlockStateModel;
 import net.fabricmc.fabric.api.client.renderer.v1.mesh.QuadEmitter;
 
@@ -53,7 +53,7 @@ public BiomeDependentBlockStateModel(BlockStateModel regularModel, BlockStateMod
 
 	@Override
 	public void emitQuads(QuadEmitter emitter, BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random, Predicate<@Nullable Direction> cullTest) {
-		if (((FabricBlockView) level).hasBiomes() && ((FabricBlockView) level).getBiomeFabric(pos).is(biomeTag)) {
+		if (((FabricBlockGetter) level).hasBiomes() && ((FabricBlockGetter) level).getBiomeFabric(pos).is(biomeTag)) {
 			biomeModel.emitQuads(emitter,
 					level, pos, state, random, cullTest);
 		} else {
@@ -65,7 +65,7 @@ public void emitQuads(QuadEmitter emitter, BlockAndTintGetter level, BlockPos po
 	@Override
 	@Nullable
 	public Object createGeometryKey(BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random) {
-		if (((FabricBlockView) level).hasBiomes() && ((FabricBlockView) level).getBiomeFabric(pos).is(biomeTag)) {
+		if (((FabricBlockGetter) level).hasBiomes() && ((FabricBlockGetter) level).getBiomeFabric(pos).is(biomeTag)) {
 			return biomeModel.createGeometryKey(level, pos, state, random);
 		} else {
 			return regularModel.createGeometryKey(level, pos, state, random);
@@ -83,7 +83,7 @@ public TextureAtlasSprite particleIcon() {
 
 	@Override
 	public TextureAtlasSprite particleIcon(BlockAndTintGetter level, BlockPos pos, BlockState state) {
-		if (((FabricBlockView) level).hasBiomes() && ((FabricBlockView) level).getBiomeFabric(pos).is(biomeTag)) {
+		if (((FabricBlockGetter) level).hasBiomes() && ((FabricBlockGetter) level).getBiomeFabric(pos).is(biomeTag)) {
 			return biomeModel.particleIcon(level, pos, state);
 		} else {
 			return regularModel.particleIcon(level, pos, state);
diff --git a/fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/client/FrameBlockStateModel.java b/fabric-renderer-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/renderer/client/FrameBlockStateModel.java
@@ -36,7 +36,7 @@
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 
-import net.fabricmc.fabric.api.blockview.v2.FabricBlockView;
+import net.fabricmc.fabric.api.blockgetter.v2.FabricBlockGetter;
 import net.fabricmc.fabric.api.client.model.loading.v1.CustomUnbakedBlockStateModel;
 import net.fabricmc.fabric.api.client.renderer.v1.mesh.QuadEmitter;
 
@@ -54,7 +54,7 @@ public void emitQuads(QuadEmitter emitter, BlockAndTintGetter level, BlockPos po
 				level, pos, state, random, cullTest);
 
 		// We should not access the block entity from here. We should instead use the immutable render data provided by the block entity.
-		if (!(((FabricBlockView) level).getBlockEntityRenderData(pos) instanceof Block mimickedBlock)) {
+		if (!(((FabricBlockGetter) level).getBlockEntityRenderData(pos) instanceof Block mimickedBlock)) {
 			return; // No inner block to render, or data of wrong type
 		}
 
@@ -105,7 +105,7 @@ public void emitQuads(QuadEmitter emitter, BlockAndTintGetter level, BlockPos po
 	@Nullable
 	public Object createGeometryKey(BlockAndTintGetter level, BlockPos pos, BlockState state, RandomSource random) {
 		// We should not access the block entity from here. We should instead use the immutable render data provided by the block entity.
-		if (!(((FabricBlockView) level).getBlockEntityRenderData(pos) instanceof Block mimickedBlock)) {
+		if (!(((FabricBlockGetter) level).getBlockEntityRenderData(pos) instanceof Block mimickedBlock)) {
 			return this; // No inner block to render, or data of wrong type
 		}
 
@@ -136,7 +136,7 @@ public TextureAtlasSprite particleIcon() {
 	@Override
 	public TextureAtlasSprite particleIcon(BlockAndTintGetter level, BlockPos pos, BlockState state) {
 		// We should not access the block entity from here. We should instead use the immutable render data provided by the block entity.
-		if (!(((FabricBlockView) level).getBlockEntityRenderData(pos) instanceof Block mimickedBlock)) {
+		if (!(((FabricBlockGetter) level).getBlockEntityRenderData(pos) instanceof Block mimickedBlock)) {
 			return frameModel.particleIcon(level, pos, state); // No inner block to render, or data of wrong type
 		}
 
diff --git a/gradle.properties b/gradle.properties
@@ -15,7 +15,7 @@ fabric-api-base-version=2.0.0
 fabric-api-lookup-api-v1-version=2.0.3
 fabric-biome-api-v1-version=18.0.0
 fabric-block-api-v1-version=2.1.0
-fabric-block-view-api-v2-version=2.0.1
+fabric-block-getter-api-v2-version=2.0.1
 fabric-client-gametest-api-v1-version=5.0.1
 fabric-command-api-v2-version=3.0.0
 fabric-content-registries-v0-version=11.0.3
diff --git a/settings.gradle b/settings.gradle
@@ -28,7 +28,7 @@ include 'fabric-api-base'
 include 'fabric-api-lookup-api-v1'
 include 'fabric-biome-api-v1'
 include 'fabric-block-api-v1'
-include 'fabric-block-view-api-v2'
+include 'fabric-block-getter-api-v2'
 include 'fabric-client-gametest-api-v1'
 include 'fabric-command-api-v2'
 include 'fabric-content-registries-v0'
