Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Fix up FluidDisplay not using the tint color of a fluid

Browse source
This commit is contained in:
Mrbysco 2024-03-09 17:04:07 +01:00
parent 53e4cb8a9b
commit ba64232ac1
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FluidDisplay.java
View file

@ -10,13 +10,13 @@
package de.ellpeck.actuallyadditions.mod.inventory.gui; package de.ellpeck.actuallyadditions.mod.inventory.gui;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.FastColor;
import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluid;
import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn; import net.neoforged.api.distmarker.OnlyIn;
@ -89,29 +89,35 @@ public class FluidDisplay {
FluidStack stack = this.fluidReference.getFluid(); FluidStack stack = this.fluidReference.getFluid();
Fluid fluid = stack.getFluid(); Fluid fluid = stack.getFluid();
if (this.resLoc == null || this.oldFluid != stack.getFluid()) { if (stack != null && !stack.isEmpty() && fluid != null) {
this.oldFluid = stack.getFluid(); IClientFluidTypeExtensions fluidTypeExtension = IClientFluidTypeExtensions.of(fluid);
int color = fluidTypeExtension.getTintColor(stack);
float red = (float)(FastColor.ARGB32.red(color) / 255.0);
float green = (float)(FastColor.ARGB32.green(color) / 255.0);
float blue = (float)(FastColor.ARGB32.blue(color) / 255.0);
float alpha = (float)(FastColor.ARGB32.alpha(color) / 255.0);
if (fluid != null && IClientFluidTypeExtensions.of(fluid).getStillTexture() != null) { if (this.resLoc == null || this.oldFluid != stack.getFluid()) {
this.resLoc = new ResourceLocation(IClientFluidTypeExtensions.of(fluid).getStillTexture().getNamespace(), "textures/" + IClientFluidTypeExtensions.of(fluid).getStillTexture().getPath() + ".png"); this.oldFluid = stack.getFluid();
if (fluidTypeExtension.getStillTexture() != null) {
this.resLoc = new ResourceLocation(fluidTypeExtension.getStillTexture().getNamespace(), "textures/" + IClientFluidTypeExtensions.of(fluid).getStillTexture().getPath() + ".png");
}
} }
}
if (stack != null && fluid != null && this.resLoc != null) { if (this.resLoc != null) {
// GlStateManager._pushMatrix(); RenderSystem.setShaderColor(red, green, blue, alpha);
RenderSystem.enableBlend(); RenderSystem.enableBlend();
// GlStateManager._disableAlphaTest(); RenderSystem.blendFuncSeparate(770, 771, 1, 0);
RenderSystem.blendFuncSeparate(770, 771, 1, 0); int i = this.fluidReference.getFluid().getAmount() * 83 / this.fluidReference.getCapacity();
int i = this.fluidReference.getFluid().getAmount() * 83 / this.fluidReference.getCapacity(); guiGraphics.blit(this.resLoc, barX + 1, barY + 84 - i, 0, 0, 16, i, 16, 512);
guiGraphics.blit(this.resLoc, barX + 1, barY + 84 - i, 0, 0, 16, i, 16, 512); RenderSystem.disableBlend();
//drawModalRectWithCustomSizedTexture(barX + 1, barY + 84 - i, 36, 172, 16, i, 16, 512); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
RenderSystem.disableBlend(); }
// GlStateManager._enableAlphaTest();
// GlStateManager._popMatrix();
}
if (this.drawTextNextTo) { if (this.drawTextNextTo) {
guiGraphics.drawString(mc.font, this.getOverlayText(), barX + 25, barY + 78, 0xFFFFFF, false); guiGraphics.drawString(mc.font, this.getOverlayText(), barX + 25, barY + 78, 0xFFFFFF, false);
}
} }
} }