From 5acbd0b9775b52739cd75ffb419a1d51a98e73dd Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Thu, 9 Apr 2026 22:29:55 +0200 Subject: [PATCH] fix world client leak in RendererMachine (#90) --- .../binnie/core/machines/MachinePackage.java | 4 +--- .../binnie/core/machines/RendererMachine.java | 23 ++++++------------- .../core/machines/storage/Compartment.java | 4 +--- .../apiary/machine/AlvearyMachine.java | 4 +--- .../extratrees/machines/ExtraTreeMachine.java | 4 +--- .../genetics/machine/PackageGeneticBase.java | 3 +-- .../machine/lab/LabMachinePackage.java | 4 +--- 7 files changed, 13 insertions(+), 33 deletions(-) diff --git a/src/main/java/binnie/core/machines/MachinePackage.java b/src/main/java/binnie/core/machines/MachinePackage.java index 57283fa8..1471a9ab 100644 --- a/src/main/java/binnie/core/machines/MachinePackage.java +++ b/src/main/java/binnie/core/machines/MachinePackage.java @@ -1,6 +1,5 @@ package binnie.core.machines; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; import binnie.core.util.I18N; @@ -53,8 +52,7 @@ public abstract class MachinePackage { this.group = group; } - public abstract void renderMachine(Machine machine, double x, double y, double z, float partialTick, - RenderBlocks renderer); + public abstract void renderMachine(Machine machine, double x, double y, double z, float partialTick); public boolean isActive() { return active; diff --git a/src/main/java/binnie/core/machines/RendererMachine.java b/src/main/java/binnie/core/machines/RendererMachine.java index 141dc2bc..ec43200c 100644 --- a/src/main/java/binnie/core/machines/RendererMachine.java +++ b/src/main/java/binnie/core/machines/RendererMachine.java @@ -5,7 +5,6 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; import binnie.Binnie; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; @@ -13,30 +12,27 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; // Hmm. It's used class public class RendererMachine extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler { - RenderBlocks blockRenderer; - @Override public void renderTileEntityAt(TileEntity entity, double x, double y, double z, float partialTick) { - renderTileEntity((TileEntityMachine) entity, x, y, z, partialTick, blockRenderer); + renderTileEntity((TileEntityMachine) entity, x, y, z, partialTick); } - public void renderTileEntity(TileEntityMachine entity, double x, double y, double z, float partialTick, - RenderBlocks renderer) { + private void renderTileEntity(TileEntityMachine entity, double x, double y, double z, float partialTick) { if (entity != null && entity.getMachine() != null) { MachinePackage machinePackage = entity.getMachine().getPackage(); - machinePackage.renderMachine(entity.getMachine(), x, y, z, partialTick, renderer); + machinePackage.renderMachine(entity.getMachine(), x, y, z, partialTick); } } - public void renderInvBlock(RenderBlocks renderblocks, Block block, int i, int j) { + private void renderInvBlock(Block block, int i, int j) { TileEntity entity = block.createTileEntity(null, i); - renderTileEntity((TileEntityMachine) entity, 0.0, -0.1, 0.0, 0.0625f, renderblocks); + renderTileEntity((TileEntityMachine) entity, 0.0, -0.1, 0.0, 0.0625f); } @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { if (modelID == Binnie.Machine.getMachineRenderID()) { - renderInvBlock(renderer, block, metadata, modelID); + renderInvBlock(block, metadata, modelID); } } @@ -48,7 +44,7 @@ public class RendererMachine extends TileEntitySpecialRenderer implements ISimpl && tile.getMachine().getPackage() != null && tile.getMachine().getPackage().getGroup() != null && !tile.getMachine().getPackage().getGroup().customRenderer) { - renderTileEntity(tile, x, y, z, 1.0f, renderer); + renderTileEntity(tile, x, y, z, 1.0f); } return true; } @@ -62,9 +58,4 @@ public class RendererMachine extends TileEntitySpecialRenderer implements ISimpl public int getRenderId() { return Binnie.Machine.getMachineRenderID(); } - - @Override - public void func_147496_a(World par1World) { - blockRenderer = new RenderBlocks(par1World); - } } diff --git a/src/main/java/binnie/core/machines/storage/Compartment.java b/src/main/java/binnie/core/machines/storage/Compartment.java index 91d7f765..7b820659 100644 --- a/src/main/java/binnie/core/machines/storage/Compartment.java +++ b/src/main/java/binnie/core/machines/storage/Compartment.java @@ -1,6 +1,5 @@ package binnie.core.machines.storage; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -51,8 +50,7 @@ enum Compartment implements IMachineType { } @Override - public void renderMachine(Machine machine, double x, double y, double z, float partialTick, - RenderBlocks renderer) { + public void renderMachine(Machine machine, double x, double y, double z, float partialTick) { MachineRendererCompartment.instance.renderMachine(machine, renderTexture, x, y, z); } } diff --git a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java index 19d43a70..4c34a80d 100644 --- a/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java +++ b/src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java @@ -1,6 +1,5 @@ package binnie.extrabees.apiary.machine; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -66,8 +65,7 @@ public enum AlvearyMachine implements IMachineType { } @Override - public void renderMachine(Machine machine, double x, double y, double z, float partialTick, - RenderBlocks renderer) { + public void renderMachine(Machine machine, double x, double y, double z, float partialTick) { MachineRendererBlock.instance.renderMachine(machineTexture, x, y, z, partialTick); } } diff --git a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java index a80cb706..fc69865b 100644 --- a/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java +++ b/src/main/java/binnie/extratrees/machines/ExtraTreeMachine.java @@ -1,6 +1,5 @@ package binnie.extratrees.machines; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -81,8 +80,7 @@ public enum ExtraTreeMachine implements IMachineType { } @Override - public void renderMachine(Machine machine, double x, double y, double z, float partialTick, - RenderBlocks renderer) { + public void renderMachine(Machine machine, double x, double y, double z, float partialTick) { MachineRendererForestry.renderMachine(textureName.getShortPath(), x, y, z); } } diff --git a/src/main/java/binnie/genetics/machine/PackageGeneticBase.java b/src/main/java/binnie/genetics/machine/PackageGeneticBase.java index b265207b..6d7f5304 100644 --- a/src/main/java/binnie/genetics/machine/PackageGeneticBase.java +++ b/src/main/java/binnie/genetics/machine/PackageGeneticBase.java @@ -1,6 +1,5 @@ package binnie.genetics.machine; -import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.tileentity.TileEntity; import binnie.core.machines.Machine; @@ -26,7 +25,7 @@ public abstract class PackageGeneticBase extends MachinePackage { } @Override - public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) { + public void renderMachine(Machine machine, double x, double y, double z, float partialTick) { MachineRendererGenetics.instance.renderMachine(machine, renderTexture, x, y, z); } } diff --git a/src/main/java/binnie/genetics/machine/lab/LabMachinePackage.java b/src/main/java/binnie/genetics/machine/lab/LabMachinePackage.java index 19927846..e45f7a85 100644 --- a/src/main/java/binnie/genetics/machine/lab/LabMachinePackage.java +++ b/src/main/java/binnie/genetics/machine/lab/LabMachinePackage.java @@ -1,7 +1,5 @@ package binnie.genetics.machine.lab; -import net.minecraft.client.renderer.RenderBlocks; - import binnie.core.machines.Machine; import binnie.genetics.core.GeneticsTexture; import binnie.genetics.machine.ComponentGUIHolder; @@ -20,7 +18,7 @@ public class LabMachinePackage extends PackageGeneticBase { } @Override - public void renderMachine(Machine machine, double x, double y, double z, float partialTick, RenderBlocks renderer) { + public void renderMachine(Machine machine, double x, double y, double z, float partialTick) { MachineRendererLab.instance.renderMachine(machine, renderTexture, x, y, z); } }