mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 11:59:14 +00:00
Merge branch 'master' into dev
This commit is contained in:
2 files changed
+19
-9
No files matched your search
+2
-2
@@ -1,10 +1,10 @@
|
||||
// Add your dependencies here
|
||||
|
||||
dependencies {
|
||||
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta57:api')
|
||||
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta59:api')
|
||||
api("com.github.GTNewHorizons:Mantle:0.5.1:dev")
|
||||
api("com.github.GTNewHorizons:ForgeMultipart:1.6.8:dev")
|
||||
implementation("com.github.GTNewHorizons:NotEnoughItems:2.8.0-GTNH:dev")
|
||||
implementation("com.github.GTNewHorizons:NotEnoughItems:2.8.8-GTNH:dev")
|
||||
compileOnlyApi("curse.maven:cofh-core-69162:2388751")
|
||||
compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.7.1:api")
|
||||
compileOnly("com.github.GTNewHorizons:waila:1.9.0:api")
|
||||
|
||||
@@ -23,6 +23,18 @@ public abstract class AbstractTab extends GuiButton {
|
||||
|
||||
@Override
|
||||
public void drawButton(Minecraft mc, int mouseX, int mouseY) {
|
||||
drawButton(mc, this.renderStack, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Draws inventory tab
|
||||
*
|
||||
* @param mc
|
||||
* @param tabIcon Item to use as tab icon
|
||||
* @param enableItemIconDepthTest whether to enable GL_DEPTH_TEST for rendering the item icon
|
||||
*/
|
||||
|
||||
protected void drawButton(Minecraft mc, ItemStack tabIcon, boolean enableItemIconDepthTest) {
|
||||
if (this.visible) {
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
|
||||
@@ -39,18 +51,16 @@ public abstract class AbstractTab extends GuiButton {
|
||||
this.itemRenderer.zLevel = 100.0F;
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
|
||||
if (enableItemIconDepthTest) GL11.glEnable(GL11.GL_DEPTH_TEST);
|
||||
this.itemRenderer.renderItemAndEffectIntoGUI(
|
||||
mc.fontRenderer,
|
||||
mc.renderEngine,
|
||||
renderStack,
|
||||
xPosition + 6,
|
||||
yPosition + 8);
|
||||
this.itemRenderer.renderItemOverlayIntoGUI(
|
||||
mc.fontRenderer,
|
||||
mc.renderEngine,
|
||||
renderStack,
|
||||
tabIcon,
|
||||
xPosition + 6,
|
||||
yPosition + 8);
|
||||
this.itemRenderer
|
||||
.renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, tabIcon, xPosition + 6, yPosition + 8);
|
||||
if (enableItemIconDepthTest) GL11.glDisable(GL11.GL_DEPTH_TEST);
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
this.itemRenderer.zLevel = 0.0F;
|
||||
|
||||
Reference in new issue
Block a user