Rewrite block entity renderers #22
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,13 +9,16 @@ | |
| import net.minecraft.client.render.VertexConsumerProvider; | ||
| import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; | ||
| import net.minecraft.client.util.math.MatrixStack; | ||
| import net.minecraft.fluid.Fluids; | ||
| import net.minecraft.item.ItemDisplayContext; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.item.Items; | ||
| import net.minecraft.util.math.MathHelper; | ||
| import net.minecraft.util.math.RotationAxis; | ||
| import net.minecraft.util.math.Vec3d; | ||
|
|
||
| public class ClarifierBlockEntityRenderer extends IndustriaBlockEntityRenderer<ClarifierBlockEntity> { | ||
|
|
||
| private final ClarifierModel model; | ||
| private final InWorldFluidRenderingComponent fluidRenderer = new InWorldFluidRenderingComponent(); | ||
|
|
||
|
|
@@ -50,11 +53,13 @@ public ClarifierBlockEntityRenderer(BlockEntityRendererFactory.Context context) | |
| } | ||
|
|
||
| @Override | ||
| protected void renderModel(ClarifierBlockEntity entity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { | ||
| this.model.getRootPart().render(matrices, vertexConsumers.getBuffer(this.model.getLayer(ClarifierModel.TEXTURE_LOCATION)), light, overlay); | ||
| } | ||
|
|
||
| @Override | ||
| protected void onRender(ClarifierBlockEntity entity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { | ||
| if (entity.getWorld() == null) return; | ||
|
|
||
| renderInputFluid(entity, matrices, vertexConsumers, light, overlay); | ||
| renderOutputFluid(entity, matrices, vertexConsumers, light, overlay); | ||
|
|
@@ -64,20 +69,21 @@ protected void onRender(ClarifierBlockEntity entity, float tickDelta, MatrixStac | |
| } | ||
|
|
||
| private void renderOutputStack(ClarifierBlockEntity entity, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { | ||
| ItemStack outputStack = new ItemStack(Items.DIAMOND_BLOCK, 64); // Items.DIAMOND.getDefaultStack(); //entity.getOutputInventory().getStack(0); | ||
| if (outputStack.isEmpty()) | ||
| return; | ||
|
|
||
| float scale = 0.05f; | ||
| float zOffset = -(11f / 16f + 10f / 16f + 2f / 16f); | ||
| float startY = -1.1f + scale / 2; | ||
|
|
||
| for (int i = 0; i < MathHelper.clamp(outputStack.getCount(), 1, 64); i++) { | ||
| matrices.push(); | ||
|
|
||
| GridPosition position = OUTPUT_ITEM_POSITIONS[i]; | ||
| float xOff = position.x * (scale + (0.0625f * scale)) - 0.345f; | ||
| float yOff = position.y * (scale + (0.0625f * scale)); | ||
|
|
||
| matrices.translate(xOff, startY - yOff, zOffset); | ||
| matrices.scale(scale, scale, scale); | ||
| this.context.getItemRenderer().renderItem(outputStack, ItemDisplayContext.NONE, light, overlay, matrices, vertexConsumers, entity.getWorld(), 0); | ||
|
|
@@ -87,12 +93,12 @@ private void renderOutputStack(ClarifierBlockEntity entity, MatrixStack matrices | |
|
|
||
| // Thanks to Basti for the item rendering math | ||
| private void renderCurrentOutputItem(ClarifierBlockEntity blockEntity, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { | ||
| ItemStack nextOutput = Items.DIAMOND_BLOCK.getDefaultStack(); //blockEntity.getNextOutputItemStack(); | ||
|
|
||
| if (nextOutput.isEmpty()) | ||
| return; | ||
|
|
||
| float itemProgress = (blockEntity.getWorld().getTime() / 100f) % 1; // (float) blockEntity.getProgress() / blockEntity.getMaxProgress(); | ||
|
|
||
| float scale = 0.15f; | ||
| float firstStretch = 11f / 16f; | ||
|
|
@@ -123,66 +129,68 @@ private void renderCurrentOutputItem(ClarifierBlockEntity blockEntity, MatrixSta | |
| } | ||
|
|
||
| matrices.push(); | ||
| matrices.translate(0, -0.75 + scale / 2 + dy, -dz); | ||
| matrices.scale(scale, scale, scale); | ||
| matrices.multiply(RotationAxis.POSITIVE_X.rotation(rotation)); | ||
| this.context.getItemRenderer().renderItem(nextOutput, ItemDisplayContext.NONE, light, overlay, matrices, vertexConsumers, blockEntity.getWorld(), 0); | ||
| matrices.pop(); | ||
| } | ||
|
|
||
| private void renderInputFluid(ClarifierBlockEntity entity, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { | ||
| // SyncingFluidStorage fluidStorage = entity.getInputFluidTank(); | ||
| // if (fluidStorage == null || fluidStorage.isResourceBlank() || fluidStorage.amount <= 0) | ||
| // return; | ||
|
|
||
| FluidVariant fluidVariant = FluidVariant.of(Fluids.WATER); // fluidStorage.getResource(); | ||
|
|
||
| long amount = 10000; //fluidStorage.amount; | ||
| float fluidProgress = (float) amount / (FluidConstants.BUCKET * 5); | ||
| fluidProgress = (float) (Math.sin(entity.getWorld().getTime() / 64.0) * 0.5 + 0.5); | ||
|
|
||
| float fluidHeight = 0.625f - (fluidProgress * 1 + 1.999f / 16f); | ||
|
|
||
| float size = 1.25f; | ||
| if (fluidHeight > 0f) | ||
| size = 0.5f; | ||
|
|
||
| // this.fluidRenderer.renderTopFaceOnly(fluidVariant, | ||
| // vertexConsumers, matrices, | ||
| // light, overlay, | ||
| // entity.getWorld(), entity.getPos(), | ||
| // -size, fluidHeight, -size, | ||
| // size, size); | ||
| } | ||
|
|
||
| private void renderOutputFluid(ClarifierBlockEntity entity, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { | ||
| // SyncingFluidStorage fluidStorage = entity.getOutputFluidTank(); | ||
| // if (fluidStorage == null || fluidStorage.isResourceBlank() || fluidStorage.amount <= 0) | ||
| // return; | ||
| // | ||
| // FluidVariant fluidVariant = fluidStorage.getResource(); | ||
| // | ||
| // long amount = fluidStorage.amount; | ||
|
|
||
|
|
||
| FluidVariant fluidVariant = FluidVariant.of(Fluids.WATER); | ||
| long amount = 10000; | ||
|
|
||
| float fluidProgress = (float) amount / (FluidConstants.BUCKET * 5); | ||
| fluidProgress = (float) (Math.sin(entity.getWorld().getTime() / 64.0) * 0.5 + 0.5); | ||
| float fluidHeight = 1.375f - (fluidProgress * 0.5f); | ||
|
|
||
| // this.fluidRenderer.renderTopFaceOnly(fluidVariant, | ||
| // vertexConsumers, matrices, | ||
| // light, overlay, | ||
| // entity.getWorld(), entity.getPos(), | ||
| // 0.375f, fluidHeight, 0.5f, | ||
| // -0.375f, -1.4375f); | ||
| // | ||
| // this.fluidRenderer.drawTiledXYQuadOnly(fluidVariant, | ||
| // vertexConsumers, matrices, | ||
| // light, overlay, | ||
| // entity.getWorld(), entity.getPos(), | ||
| // -0.375f, 1.375f, -1.4375f, | ||
| // 0.375f, fluidHeight, -1.4375f); | ||
| } | ||
|
|
||
| private record GridPosition(int x, int y) { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Empty renderModel causes the Arc Furnace to render nothing.
With the base class now rendering via
renderModel(...), leaving this method empty results in no visual output for the block entity (and likely its item form, oncerenderForItemis fixed).Port the previous model draw into
renderModel(...). If you need a temporary stopgap while migrating, delegate toonRender(...)(assuming it still contains the prior rendering code), e.g.:@Override protected void renderModel(ArcFurnaceBlockEntity entity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { - + // TEMP: delegate to onRender until the model is fully migrated here + onRender(entity, tickDelta, matrices, vertexConsumers, light, overlay); }However, since
onRender(...)is also empty here, the real fix is to move the actual model rendering code into this method (similar to Electrolyzer/Digester).📝 Committable suggestion
🤖 Prompt for AI Agents