fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lots of compile fixes

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-04 03:02:48 +02:00
parent 6eb2a9504a
commit 237463dd94
241 changed files with 3438 additions and 3474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/TesrRenderHelper.java
+51 -48
View File
@@ -19,9 +19,14 @@
package appeng.client.render;
import appeng.api.storage.data.IAEItemStack;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Direction;
import appeng.util.IWideReadableNumberConverter;
@@ -91,52 +96,50 @@ public class TesrRenderHelper
}
//TODO, A different approach will have to be used for this from TESRs, -covers, i have ideas.
// /**
// * Render an item in 2D.
// */
// public static void renderItem2d( ItemStack itemStack, float scale )
// {
// if( !itemStack.isEmpty() )
// {
// RenderSystem.glMultiTexCoord2f( GL13.GL_TEXTURE22, 240.f, 240.0f );
//
// RenderSystem.pushMatrix();
//
// // The Z-scaling by 0.0001 causes the model to be visually "flattened"
// // This cannot replace a proper projection, but it's cheap and gives the desired
// // effect at least from head-on
// RenderSystem.scaled( scale / 32.0f, scale / 32.0f, 0.0001f );
// // Position the item icon at the top middle of the panel
// RenderSystem.translated( -8, -11, 0 );
//
// ItemRenderer renderItem = Minecraft.getInstance().getItemRenderer();
// renderItem.renderItemAndEffectIntoGUI( itemStack, 0, 0 );
//
// RenderSystem.popMatrix();
// }
// }
//
// /**
// * Render an item in 2D and the given text below it.
// *
// * @param spacing Specifies how far apart the item and the item stack amount are rendered.
// */
// public static void renderItem2dWithAmount( IAEItemStack itemStack, float itemScale, float spacing )
// {
// final ItemStack renderStack = itemStack.asItemStackRepresentation();
//
// TesrRenderHelper.renderItem2d( renderStack, itemScale );
//
// final long stackSize = itemStack.getStackSize();
// final String renderedStackSize = NUMBER_CONVERTER.toWideReadableForm( stackSize );
//
// // Render the item count
// final FontRenderer fr = Minecraft.getInstance().fontRenderer;
// final int width = fr.getStringWidth( renderedStackSize );
// RenderSystem.translated( 0.0f, spacing, 0 );
// RenderSystem.scaled( 1.0f / 62.0f, 1.0f / 62.0f, 1.0f / 62.0f );
// RenderSystem.translated( -0.5f * width, 0.0f, 0.5f );
// fr.drawString( renderedStackSize, 0, 0, 0 );
//
// }
/**
* Render an item in 2D.
*/
public static void renderItem2d(MatrixStack matrixStack, IRenderTypeBuffer buffers, ItemStack itemStack, float scale)
{
if( !itemStack.isEmpty() )
{
// FIXME RenderSystem.glMultiTexCoord2f( GL13.GL_TEXTURE22, 240.f, 240.0f );
// FIXME RenderSystem.pushMatrix();
// FIXME // The Z-scaling by 0.0001 causes the model to be visually "flattened"
// FIXME // This cannot replace a proper projection, but it's cheap and gives the desired
// FIXME // effect at least from head-on
// FIXME RenderSystem.scaled( scale / 32.0f, scale / 32.0f, 0.0001f );
// FIXME // Position the item icon at the top middle of the panel
// FIXME RenderSystem.translated( -8, -11, 0 );
// FIXME ItemRenderer renderItem = Minecraft.getInstance().getItemRenderer();
// FIXME renderItem.renderItemAndEffectIntoGUI( itemStack, 0, 0 );
// FIXME RenderSystem.popMatrix();
}
}
/**
* Render an item in 2D and the given text below it.
*
* @param matrixStack
* @param buffers
* @param spacing Specifies how far apart the item and the item stack amount are rendered.
*/
public static void renderItem2dWithAmount(MatrixStack matrixStack, IRenderTypeBuffer buffers, IAEItemStack itemStack, float itemScale, float spacing)
{
final ItemStack renderStack = itemStack.asItemStackRepresentation();
TesrRenderHelper.renderItem2d( matrixStack, buffers, renderStack, itemScale );
final long stackSize = itemStack.getStackSize();
final String renderedStackSize = NUMBER_CONVERTER.toWideReadableForm( stackSize );
// Render the item count
final FontRenderer fr = Minecraft.getInstance().fontRenderer;
final int width = fr.getStringWidth( renderedStackSize );
matrixStack.translate( 0.0f, spacing, 0 );
matrixStack.scale( 1.0f / 62.0f, 1.0f / 62.0f, 1.0f / 62.0f );
matrixStack.translate( -0.5f * width, 0.0f, 0.5f );
fr.drawString( renderedStackSize, 0, 0, 0 );
}
}