Use a singleton for RenderFluidTask test so mods like ProjectRed can't screw with it. Fixes #5067

This commit is contained in:
Thiakil committed 2018-05-31 17:10:44 +08:00
1 parent 39bab1b93c
commit 1d1d9c9573
3 files changed
+4 -5

No files matched your search

@@ -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());
@@ -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)
@@ -21,6 +21,8 @@ import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
public class RenderFluidTank extends TileEntitySpecialRenderer<TileEntityFluidTank>
{
public static final RenderFluidTank INSTANCE = new RenderFluidTank();
private static Map<Fluid, DisplayInteger[]> cachedCenterFluids = new HashMap<>();
private static Map<Fluid, DisplayInteger[]> cachedValveFluids = new HashMap<>();