diff options
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java b/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java index aa6fee3387..59eba76d03 100644 --- a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java +++ b/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java @@ -1,16 +1,16 @@ package gregtech.common.render.items; +import codechicken.lib.render.TextureUtils; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Item; import gregtech.api.util.GT_Utility; import gregtech.common.render.GT_RenderUtil; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; @@ -42,16 +42,16 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { IIcon tIcon = aIconContainer.getIcon(); IIcon tOverlay = aIconContainer.getOverlayIcon(); + FluidStack aFluid = GT_Utility.getFluidForFilledItem(aStack, true); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glEnable(GL11.GL_ALPHA_TEST); if (tIcon != null) { - renderRegularItem(type, aStack, tIcon); + renderRegularItem(type, aStack, tIcon, aFluid == null); } - FluidStack aFluid = GT_Utility.getFluidForFilledItem(aStack, true); if (tOverlay != null && aFluid != null && aFluid.getFluid() != null) { IIcon fluidIcon = aFluid.getFluid().getIcon(aFluid); if (fluidIcon != null) { @@ -61,7 +61,7 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { if (tOverlay != null) { GL11.glColor3f(1.0F, 1.0F, 1.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + TextureUtils.bindAtlas(aItem.getSpriteNumber()); if (type.equals(IItemRenderer.ItemRenderType.INVENTORY)) { GT_RenderUtil.renderItemIcon(tOverlay, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { @@ -72,12 +72,13 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { GL11.glDisable(GL11.GL_BLEND); } - public void renderRegularItem(ItemRenderType type, ItemStack aStack, IIcon icon) { + public void renderRegularItem(ItemRenderType type, ItemStack aStack, IIcon icon, boolean shouldModulateColor) { GT_MetaGenerated_Item aItem = (GT_MetaGenerated_Item) aStack.getItem(); - short[] tModulation = aItem.getRGBa(aStack); - GL11.glColor3f(tModulation[0] / 255.0F, tModulation[1] / 255.0F, tModulation[2] / 255.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + if (shouldModulateColor) { + short[] tModulation = aItem.getRGBa(aStack); + GL11.glColor3f(tModulation[0] / 255.0F, tModulation[1] / 255.0F, tModulation[2] / 255.0F); + } if (type.equals(IItemRenderer.ItemRenderType.INVENTORY)) { GT_RenderUtil.renderItemIcon(icon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); @@ -87,10 +88,11 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { } - public void renderContainedFluid(ItemRenderType type, FluidStack tFluid, IIcon fluidIcon) { - int tColor = tFluid.getFluid().getColor(tFluid); + public void renderContainedFluid(ItemRenderType type, FluidStack aFluidStack, IIcon fluidIcon) { + Fluid aFluid = aFluidStack.getFluid(); + int tColor = aFluid.getColor(aFluidStack); GL11.glColor3f((tColor >> 16 & 0xFF) / 255.0F, (tColor >> 8 & 0xFF) / 255.0F, (tColor & 0xFF) / 255.0F); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + TextureUtils.bindAtlas(aFluid.getSpriteNumber()); GL11.glDepthFunc(GL11.GL_EQUAL); if (type.equals(IItemRenderer.ItemRenderType.INVENTORY)) { |