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

Fix facade recipes. Hopefully the last null check fix.

Browse Source
This commit is contained in:
Gunther De Wachter
2017-06-27 20:39:06 +02:00
parent b819fe4adb
commit 61b81fc802
52 changed files with 101 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/ClientHelper.java
+2 -2
View File
@@ -338,11 +338,11 @@ public class ClientHelper extends ServerHelper
if( player.isSneaking() )
{
final EnumHand hand;
if( player.getHeldItem( EnumHand.MAIN_HAND ) != null && player.getHeldItem( EnumHand.MAIN_HAND ).getItem() instanceof IMouseWheelItem )
if( !player.getHeldItem( EnumHand.MAIN_HAND ).isEmpty() && player.getHeldItem( EnumHand.MAIN_HAND ).getItem() instanceof IMouseWheelItem )
{
hand = EnumHand.MAIN_HAND;
}
else if( player.getHeldItem( EnumHand.OFF_HAND ) != null && player.getHeldItem( EnumHand.OFF_HAND ).getItem() instanceof IMouseWheelItem )
else if( !player.getHeldItem( EnumHand.OFF_HAND ).isEmpty() && player.getHeldItem( EnumHand.OFF_HAND ).getItem() instanceof IMouseWheelItem )
{
hand = EnumHand.OFF_HAND;
}
src/main/java/appeng/client/render/TesrRenderHelper.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class TesrRenderHelper
*/
public static void renderItem2d( ItemStack itemStack, float scale )
{
if( itemStack != null )
if( !itemStack.isEmpty() )
{
OpenGlHelper.setLightmapTextureCoords( OpenGlHelper.lightmapTexUnit, 240.f, 240.0f );
src/main/java/appeng/client/render/tesr/InscriberTESR.java
+3 -1
View File
@@ -1,6 +1,8 @@
package appeng.client.render.tesr;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import org.lwjgl.opengl.GL11;
import net.minecraft.block.Block;
@@ -200,7 +202,7 @@ public class InscriberTESR extends TileEntitySpecialRenderer<TileInscriber>
// heuristic to scale items down much further than blocks
final Block blk = Block.getBlockFromItem( sis.getItem() );
if( blk == null )
if( blk == Blocks.AIR )
{
GlStateManager.scale( 0.5, 0.5, 0.5 );
}