Bring back block holograms with FRAPI

Author: AzureAaron

gradle.properties

@@ -8,7 +8,7 @@ loader_version=0.18.2
 loom_version=1.14-SNAPSHOT
 
 # Fabric API
-fabric_api_version=0.139.4+1.21.11
+fabric_api_version=0.140.0+1.21.11
 
 # Minecraft Mods
 ## Dandelion

src/main/java/de/hysky/skyblocker/utils/render/Renderer.java

@@ -71,7 +71,7 @@ public static BufferBuilder getBuffer(RenderPipeline pipeline, TextureSetup text
 	/**
 	 * Returns the appropriate {@code BufferBuilder} that should be used with the given pipeline, texture view, and line width.
 	 */
-	private static BufferBuilder getBuffer(RenderPipeline pipeline, TextureSetup textureSetup, boolean translucent) {
+	public static BufferBuilder getBuffer(RenderPipeline pipeline, TextureSetup textureSetup, boolean translucent) {
 		if (!EXCLUDED_FROM_BATCHING.contains(pipeline)) {
 			return setupBatched(pipeline, textureSetup, translucent);
 		} else {

src/main/java/de/hysky/skyblocker/utils/render/primitive/BlockHologramRenderer.java

@@ -1,24 +1,37 @@
 package de.hysky.skyblocker.utils.render.primitive;
 
+import org.joml.Matrix4f;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+
+import de.hysky.skyblocker.utils.render.MatrixHelper;
+import de.hysky.skyblocker.utils.render.Renderer;
 import de.hysky.skyblocker.utils.render.state.BlockHologramRenderState;
+import net.fabricmc.fabric.api.renderer.v1.render.RenderLayerHelper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.render.TextureSetup;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.RenderPipelines;
+import net.minecraft.client.renderer.block.model.BlockStateModel;
+import net.minecraft.client.renderer.rendertype.RenderTypes;
 import net.minecraft.client.renderer.state.CameraRenderState;
+import net.minecraft.client.renderer.texture.TextureAtlas;
 
 public final class BlockHologramRenderer implements PrimitiveRenderer<BlockHologramRenderState> {
 	protected static final BlockHologramRenderer INSTANCE = new BlockHologramRenderer();
-	/*private static final MinecraftClient CLIENT = MinecraftClient.getInstance();
-	private static final boolean SODIUM_LOADED = FabricLoader.getInstance().isModLoaded("sodium");*/
+	private static final Minecraft CLIENT = Minecraft.getInstance();
 
 	private BlockHologramRenderer() {}
 
 	@Override
 	public void submitPrimitives(BlockHologramRenderState state, CameraRenderState cameraState) {
-		// TODO find alternative for this
-		/*Matrix4f positionMatrix = new Matrix4f()
-				.translate((float) (state.pos.getX() - cameraState.pos.getX()), (float) (state.pos.getY() - cameraState.pos.getY()), (float) (state.pos.getZ() - cameraState.pos.getZ()));
-		MatrixStack matrices = MatrixHelper.toStack(positionMatrix);
-		BlockStateModel model = CLIENT.getBlockRenderManager().getModel(state.state);
+		Matrix4f positionMatrix = new Matrix4f()
+				.translate((float) (state.pos.getX() - cameraState.pos.x()), (float) (state.pos.getY() - cameraState.pos.y()), (float) (state.pos.getZ() - cameraState.pos.z()));
+		PoseStack matrices = MatrixHelper.toStack(positionMatrix);
+		BlockStateModel model = CLIENT.getBlockRenderer().getBlockModel(state.state);
 
-		VertexConsumerProvider consumers = SODIUM_LOADED ? CLIENT.getBufferBuilders().getEntityVertexConsumers() : _layer -> Renderer.getBuffer(RenderPipelines.TRANSLUCENT, RenderHelper.singleTexture(BlockRenderLayer.TRANSLUCENT.getTextureView()), true);
-		CLIENT.getBlockRenderManager().getModelRenderer().render(CLIENT.world, model, state.state, state.pos, matrices, RenderLayerHelper.movingDelegate(consumers), true, state.state.getRenderingSeed(state.pos), 0);*/
+		@SuppressWarnings("deprecation")
+		MultiBufferSource bufferSource = _type -> Renderer.getBuffer(RenderPipelines.TRANSLUCENT_MOVING_BLOCK, TextureSetup.singleTextureWithLightmap(CLIENT.getTextureManager().getTexture(TextureAtlas.LOCATION_BLOCKS).getTextureView(), RenderTypes.MOVING_BLOCK_SAMPLER.get()), true);
+		CLIENT.getBlockRenderer().getModelRenderer().render(CLIENT.level, model, state.state, state.pos, matrices, RenderLayerHelper.movingDelegate(bufferSource), true, state.state.getSeed(state.pos), 0);
 	}
 }

src/main/resources/fabric.mod.json

@@ -44,7 +44,7 @@
   "accessWidener": "skyblocker.accesswidener",
   "depends": {
     "fabricloader": ">=0.18.2",
-    "fabric-api": ">=0.137.0+1.21.10",
+    "fabric-api": ">=0.140.0+1.21.11",
 	"dandelion": ">=1.0.0-alpha.5+1.21.8",
     "yet_another_config_lib_v3": ">=3.8.1+1.21.11",
 	"fabric-language-kotlin": "*",