diff --git a/dependencies.gradle b/dependencies.gradle index 5e1509c..118f182 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,21 +1,21 @@ // Add your dependencies here dependencies { - implementation('com.github.GTNewHorizons:NotEnoughItems:2.8.20-GTNH:dev') + implementation('com.github.GTNewHorizons:NotEnoughItems:2.8.50-GTNH:dev') shadowImplementation('au.com.bytecode:opencsv:2.4') - compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.69:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.205:dev") { transitive = false } - runtimeOnlyNonPublishable("com.github.GTNewHorizons:WAILAPlugins:0.7.0:dev") { + runtimeOnlyNonPublishable("com.github.GTNewHorizons:WAILAPlugins:0.7.2:dev") { exclude group: 'com.github.GTNewHorizons', module: 'waila' } - runtimeOnlyNonPublishable("com.github.GTNewHorizons:EnderCore:0.5.0:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:BuildCraft:7.1.31:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:EnderCore:0.5.3:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:BuildCraft:7.1.48:dev") runtimeOnlyNonPublishable("curse.maven:cofh-lib-220333:2388748") runtimeOnlyNonPublishable("curse.maven:extrautils-225561:2264383") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:OpenBlocks:1.12.3-GTNH:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:Railcraft:9.17.6:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:OpenBlocks:1.12.4-GTNH:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:Railcraft:9.17.12:dev") runtimeOnlyNonPublishable('curse.maven:thermal-foundation-222880:2388753') runtimeOnlyNonPublishable('curse.maven:thermal-expansion-69163:2388759') runtimeOnlyNonPublishable('curse.maven:thermal-dynamics-227443:2388756') diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderStack.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderStack.java index c541292..2615bdf 100644 --- a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderStack.java +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderStack.java @@ -7,15 +7,21 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import cpw.mods.fml.common.registry.GameData; import mcp.mobius.waila.api.IWailaCommonAccessor; import mcp.mobius.waila.api.IWailaTooltipRenderer; +import mcp.mobius.waila.api.SpecialChars; import mcp.mobius.waila.overlay.DisplayUtil; public class TTRenderStack implements IWailaTooltipRenderer { @Override public Dimension getSize(String[] params, IWailaCommonAccessor accessor) { - return new Dimension(16, 16); + boolean small = Boolean.parseBoolean(params.length > 4 ? params[4] : "false"); + return small ? new Dimension(10, 8) : new Dimension(16, 16); } @Override @@ -24,14 +30,43 @@ public class TTRenderStack implements IWailaTooltipRenderer { String name = params[1]; // Fully qualified name int amount = Integer.parseInt(params[2]); int meta = Integer.parseInt(params[3]); + boolean small = Boolean.parseBoolean(params.length > 4 ? params[4] : "false"); + final float scale = 0.5f; ItemStack stack = null; if (type == 0) stack = new ItemStack((Block) Block.blockRegistry.getObject(name), amount, meta); if (type == 1) stack = new ItemStack((Item) Item.itemRegistry.getObject(name), amount, meta); RenderHelper.enableGUIStandardItemLighting(); - DisplayUtil.renderStack(0, 0, stack); + + if (small) { + GL11.glPushMatrix(); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glScaled(scale, scale, 1.0f); + + DisplayUtil.renderStack(0, 0, stack); + + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + GL11.glPopMatrix(); + } else { + DisplayUtil.renderStack(0, 0, stack); + } RenderHelper.disableStandardItemLighting(); } + public static String create(ItemStack itemStack, int amount, boolean small) { + String name = GameData.getItemRegistry().getNameForObject(itemStack.getItem()); + int meta = itemStack.getItemDamage(); + return SpecialChars.getRenderString( + "waila.stack", + String.valueOf(1), + name, + String.valueOf(amount), + String.valueOf(meta), + String.valueOf(small)); + } + + public static String create(ItemStack itemStack, boolean small) { + return create(itemStack, 1, small); + } }