Skip to content

26.2 port #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mat0u5 merged 7 commits into from
Jun 30, 2026
+55 −654
Merged

26.2 port #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
594ecbf
26.2 init
Mat0u5 Jun 24, 2026
dc121ce
26.2 progress
Mat0u5 Jun 25, 2026
8af6dc5
26.2 remaining
Mat0u5 Jun 25, 2026
ce3b678
Fixed CustomItemRenderer
Mat0u5 Jun 27, 2026
0b89284
Merge branch '26.2' into 26.2
Mat0u5 Jun 27, 2026
7e18b01
Fixed merge issues
Mat0u5 Jun 27, 2026
cfad78c
Removed unused BufferSource related things.
Mat0u5 Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 0 additions & 106 deletions common/src/main/java/com/anthonyhilyard/iceberg/renderer/CheckedBufferSource.java
View file
Open in desktop

This file was deleted.

66 changes: 27 additions & 39 deletions common/src/main/java/com/anthonyhilyard/iceberg/renderer/CustomItemRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.anthonyhilyard.iceberg.util.EntityCollector;
import com.anthonyhilyard.iceberg.util.IGuiRenderStateAccess;
import com.anthonyhilyard.iceberg.util.ItemUtil;
import com.mojang.blaze3d.GpuFormat;
import com.mojang.blaze3d.ProjectionType;
import com.mojang.blaze3d.pipeline.RenderTarget;
import com.mojang.blaze3d.pipeline.TextureTarget;
Expand All @@ -12,8 +13,6 @@
import com.mojang.blaze3d.textures.FilterMode;
import com.mojang.blaze3d.textures.GpuSampler;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.QuadInstance;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.mojang.datafixers.util.Pair;
import com.mojang.math.Axis;
import net.minecraft.client.Minecraft;
Expand All @@ -29,19 +28,13 @@
import net.minecraft.client.renderer.entity.EntityRenderer;
import net.minecraft.client.renderer.entity.state.EntityRenderState;
import net.minecraft.client.renderer.item.TrackingItemStackRenderState;
import net.minecraft.client.renderer.rendertype.RenderType;
import net.minecraft.client.renderer.state.gui.BlitRenderState;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.client.resources.model.geometry.BakedQuad;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.component.DataComponentMap;
import net.minecraft.util.ARGB;
import net.minecraft.util.LightCoordsUtil;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntitySpawnReason;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.*;
import net.minecraft.world.entity.animal.equine.Horse;
import net.minecraft.world.entity.animal.wolf.Wolf;
import net.minecraft.world.entity.decoration.ArmorStand;
Expand All @@ -55,20 +48,20 @@
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
import org.joml.Matrix3x2f;
import org.joml.Matrix4f;
import org.joml.Matrix4fStack;
import org.joml.Quaternionf;
import org.joml.*;

import java.lang.Math;
import java.util.List;
import java.util.Optional;
import java.util.OptionalDouble;
import java.util.OptionalInt;

public class CustomItemRenderer
{
private final Minecraft minecraft;
private RenderTarget renderTarget;
private final ProjectionMatrixBuffer projectionMatrixBuffer;
private final Projection projection = new Projection();
private final SubmitNodeStorage submitNodeStorage = new SubmitNodeStorage();
private boolean isClosed = false;

private static ArmorStand armorStand = null;
Expand All @@ -82,7 +75,6 @@ public class CustomItemRenderer
private static Pair<Item, DataComponentMap> cachedEntityItem = null;

private final BlockModelRenderState blockRenderState = new BlockModelRenderState();
private final QuadInstance quadInstance = new QuadInstance();

public CustomItemRenderer(Minecraft mc)
{
Expand Down Expand Up @@ -132,14 +124,14 @@ private void drawAndBlit(GuiGraphicsExtractor graphics, ItemStack stack, int x,
{
renderTarget.destroyBuffers();
}
renderTarget = new TextureTarget("Iceberg Item Renderer", fboSize, fboSize, true);
renderTarget = new TextureTarget("Iceberg Item Renderer", fboSize, fboSize, true, GpuFormat.RGBA8_UNORM);
}

try (RenderPass clearPass = RenderSystem.getDevice().createCommandEncoder().createRenderPass(
() -> "Item",
// 0x00000000 is a transparent black (outline).
renderTarget.getColorTextureView(), OptionalInt.of(0x00000000),
renderTarget.getDepthTextureView(), OptionalDouble.of(1.0)
renderTarget.getColorTextureView(), Optional.of(new Vector4f(0, 0, 0, 0)),
renderTarget.getDepthTextureView(), OptionalDouble.of(0.0)
)) {}

RenderSystem.outputColorTextureOverride = renderTarget.getColorTextureView();
Expand All @@ -150,9 +142,9 @@ private void drawAndBlit(GuiGraphicsExtractor graphics, ItemStack stack, int x,
modelViewStack.pushMatrix();
modelViewStack.identity();

Matrix4f ortho = new Matrix4f().setOrtho(0f, 16f, 16f, 0f, -1000f, 1000f);
this.projection.setupOrtho(-1000.0f, 1000.0f, 16, 16, true);
RenderSystem.setProjectionMatrix(
this.projectionMatrixBuffer.getBuffer(ortho),
this.projectionMatrixBuffer.getBuffer(this.projection),
ProjectionType.ORTHOGRAPHIC
);

Expand All @@ -168,11 +160,9 @@ private void drawAndBlit(GuiGraphicsExtractor graphics, ItemStack stack, int x,
boolean is3D = itemState.usesBlockLight() || isSpinning;
boolean renderedEntity = false;

MultiBufferSource.BufferSource bufferSource = minecraft.renderBuffers().bufferSource();

if (renderEntities)
{
if (tryEntityRenderers(stack, poseStack, rotation, bufferSource))
if (tryEntityRenderers(stack, poseStack, rotation))
{
renderedEntity = true;
is3D = true;
Expand All @@ -186,22 +176,20 @@ private void drawAndBlit(GuiGraphicsExtractor graphics, ItemStack stack, int x,

if (!is3D)
{
minecraft.gameRenderer.getLighting().setupFor(Lighting.Entry.ITEMS_FLAT);
minecraft.gameRenderer.lighting().setupFor(Lighting.Entry.ITEMS_FLAT);
}

if (!renderedEntity)
{
SubmitNodeStorage submitNodeStorage = minecraft.gameRenderer.getSubmitNodeStorage();
itemState.submit(poseStack, submitNodeStorage, LightCoordsUtil.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, 0);
}

minecraft.gameRenderer.getFeatureRenderDispatcher().renderAllFeatures();
bufferSource.endBatch();
minecraft.gameRenderer.featureRenderDispatcher().renderAllFeatures(submitNodeStorage);

if (!is3D)
{
// We must set the renderer lighting back to 3D.
minecraft.gameRenderer.getLighting().setupFor(Lighting.Entry.ITEMS_3D);
minecraft.gameRenderer.lighting().setupFor(Lighting.Entry.ITEMS_3D);
}

modelViewStack.popMatrix();
Expand All @@ -224,7 +212,7 @@ private void drawAndBlit(GuiGraphicsExtractor graphics, ItemStack stack, int x,
));
}

private boolean tryEntityRenderers(ItemStack stack, PoseStack poseStack, Quaternionf rotation, MultiBufferSource.BufferSource bufferSource)
private boolean tryEntityRenderers(ItemStack stack, PoseStack poseStack, Quaternionf rotation)
{
boolean renderedEntity = false;

Expand Down Expand Up @@ -270,7 +258,6 @@ private boolean tryEntityRenderers(ItemStack stack, PoseStack poseStack, Quatern
poseStack.mulPose(Axis.YP.rotationDegrees(225.0f));

BlockState blockState = blockItem.getBlock().defaultBlockState();
SubmitNodeStorage submitNodeStorage = minecraft.gameRenderer.getSubmitNodeStorage();

if (blockState.hasProperty(BlockStateProperties.DOUBLE_BLOCK_HALF))
{
Expand Down Expand Up @@ -398,8 +385,7 @@ private <T extends Entity, S extends EntityRenderState> void renderEntityModel(T

try
{
SubmitNodeCollector submitNodeCollector = minecraft.gameRenderer.getSubmitNodeStorage();
renderer.submit(state, poseStack, submitNodeCollector, null);
renderer.submit(state, poseStack, submitNodeStorage, null);
} catch (Exception e) {}

poseStack.popPose();
Expand All @@ -424,8 +410,7 @@ private <T extends BlockEntity, S extends BlockEntityRenderState> boolean render
float partialTicks = minecraft.getDeltaTracker().getGameTimeDeltaTicks();
renderer.extractRenderState((T) blockEntity, state, partialTicks, net.minecraft.world.phys.Vec3.ZERO, null);

SubmitNodeCollector submitNodeCollector = minecraft.gameRenderer.getSubmitNodeStorage();
renderer.submit(state, poseStack, submitNodeCollector, null);
renderer.submit(state, poseStack, submitNodeStorage, null);

return true;
}
Expand Down Expand Up @@ -467,10 +452,11 @@ private boolean updateArmorStand(ItemStack itemStack)

if (armorStand == null && minecraft.level != null)
{
armorStand = EntityType.ARMOR_STAND.create(minecraft.level, EntitySpawnReason.COMMAND);
armorStand = EntityTypes.ARMOR_STAND.create(minecraft.level, EntitySpawnReason.COMMAND);
if (armorStand != null)
{
armorStand.setInvisible(true);
armorStand.setId(1);
}
}

Expand All @@ -496,10 +482,11 @@ private boolean updateHorseArmor(ItemStack horseArmorItem)
{
if (horse == null && minecraft.level != null)
{
horse = EntityType.HORSE.create(minecraft.level, EntitySpawnReason.COMMAND);
horse = EntityTypes.HORSE.create(minecraft.level, EntitySpawnReason.COMMAND);
if (horse != null)
{
horse.setInvisible(true);
horse.setId(1);
}
}

Expand All @@ -511,7 +498,7 @@ private boolean updateHorseArmor(ItemStack horseArmorItem)
Pair<Item, DataComponentMap> currentItem = Pair.of(horseArmorItem.getItem(), horseArmorItem.getComponents());
if (!currentItem.equals(cachedHorseArmorItem))
{
horse.setBodyArmorItem(horseArmorItem);
horse.setItemSlot(EquipmentSlot.BODY, horseArmorItem);
cachedHorseArmorItem = currentItem;
}
return true;
Expand All @@ -521,10 +508,11 @@ private boolean updateWolfArmor(ItemStack wolfArmorItem)
{
if (wolf == null && minecraft.level != null)
{
wolf = EntityType.WOLF.create(minecraft.level, EntitySpawnReason.COMMAND);
wolf = EntityTypes.WOLF.create(minecraft.level, EntitySpawnReason.COMMAND);
if (wolf != null)
{
wolf.setInvisible(true);
wolf.setId(1);
}
}

Expand All @@ -536,7 +524,7 @@ private boolean updateWolfArmor(ItemStack wolfArmorItem)
Pair<Item, DataComponentMap> currentItem = Pair.of(wolfArmorItem.getItem(), wolfArmorItem.getComponents());
if (!currentItem.equals(cachedWolfArmorItem))
{
wolf.setBodyArmorItem(wolfArmorItem);
wolf.setItemSlot(EquipmentSlot.BODY, wolfArmorItem);
cachedWolfArmorItem = currentItem;
}
return true;
Expand Down
Loading