From 1d1d9c957337b57bdf9350112cee4e4886f144de Mon Sep 17 00:00:00 2001 From: Thiakil Date: Thu, 31 May 2018 17:10:44 +0800 Subject: [PATCH] Use a singleton for RenderFluidTask test so mods like ProjectRed can't screw with it. Fixes #5067 --- src/main/java/mekanism/client/ClientProxy.java | 2 +- .../mekanism/client/render/item/BakedCustomItemModel.java | 5 +---- .../mekanism/client/render/tileentity/RenderFluidTank.java | 2 ++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index b41dceee1..d8a95a3c2 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -335,7 +335,7 @@ public class ClientProxy extends CommonProxy ClientRegistry.registerTileEntity(TileEntityChemicalCrystallizer.class, "ChemicalCrystallizer", new RenderChemicalCrystallizer()); ClientRegistry.registerTileEntity(TileEntitySeismicVibrator.class, "SeismicVibrator", new RenderSeismicVibrator()); ClientRegistry.registerTileEntity(TileEntityPRC.class, "PressurizedReactionChamber", new RenderConfigurableMachine<>()); - ClientRegistry.registerTileEntity(TileEntityFluidTank.class, "FluidTank", new RenderFluidTank()); + ClientRegistry.registerTileEntity(TileEntityFluidTank.class, "FluidTank", RenderFluidTank.INSTANCE); ClientRegistry.registerTileEntity(TileEntitySolarNeutronActivator.class, "SolarNeutronActivator", new RenderSolarNeutronActivator()); ClientRegistry.registerTileEntity(TileEntityFormulaicAssemblicator.class, "FormulaicAssemblicator", new RenderConfigurableMachine<>()); ClientRegistry.registerTileEntity(TileEntityResistiveHeater.class, "ResistiveHeater", new RenderResistiveHeater()); diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index b94e4ee66..9909bae4a 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -81,9 +81,6 @@ public class BakedCustomItemModel implements IBakedModel private Minecraft mc = Minecraft.getMinecraft(); - private static final RenderFluidTank fluidTankRenderer = (RenderFluidTank)TileEntityRendererDispatcher.instance.renderers.get(TileEntityFluidTank.class); - private final RenderBin binRenderer = (RenderBin)TileEntityRendererDispatcher.instance.renderers.get(TileEntityBin.class); - public static ModelJetpack jetpack = new ModelJetpack(); public static ModelArmoredJetpack armoredJetpack = new ModelArmoredJetpack(); public static ModelGasMask gasMask = new ModelGasMask(); @@ -158,7 +155,7 @@ public class BakedCustomItemModel implements IBakedModel float targetScale = (float)(itemMachine.getFluidStack(stack) != null ? itemMachine.getFluidStack(stack).amount : 0)/itemMachine.getCapacity(stack); FluidTankTier tier = FluidTankTier.values()[itemMachine.getBaseTier(stack).ordinal()]; Fluid fluid = itemMachine.getFluidStack(stack) != null ? itemMachine.getFluidStack(stack).getFluid() : null; - fluidTankRenderer.render(tier, fluid, targetScale, false, null, -0.5, -0.5, -0.5); + RenderFluidTank.INSTANCE.render(tier, fluid, targetScale, false, null, -0.5, -0.5, -0.5); GlStateManager.popMatrix(); } else if(machineType == MachineType.PERSONAL_CHEST) diff --git a/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java index 43f8ce6bd..a5bf0d855 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderFluidTank.java @@ -21,6 +21,8 @@ import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class RenderFluidTank extends TileEntitySpecialRenderer { + public static final RenderFluidTank INSTANCE = new RenderFluidTank(); + private static Map cachedCenterFluids = new HashMap<>(); private static Map cachedValveFluids = new HashMap<>();