Fixes #2448: Facades items and blocks now use the same algorithm to determine the block texture.

Facades will now use the correct side to determine the texture to use, and will fall back to general quads.
Fixed crafting of facades on the server by removing the check for model simplicity.
This commit is contained in:
Sebastian Hartte
2016-10-09 21:59:56 +02:00
parent 5de15d5b2c
commit 55d66be929
5 changed files with 63 additions and 41 deletions
@@ -21,7 +21,6 @@ package appeng.client.render;
import java.util.Collections;
import java.util.List;
import javax.annotation.Nullable;
import net.minecraft.block.Block;
@@ -31,6 +30,7 @@ import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.block.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
@@ -49,9 +49,12 @@ public class FacadeDispatcherBakedModel implements IBakedModel
private final IBakedModel baseModel;
public FacadeDispatcherBakedModel( IBakedModel baseModel )
private final VertexFormat format;
public FacadeDispatcherBakedModel( IBakedModel baseModel, VertexFormat format )
{
this.baseModel = baseModel;
this.format = format;
}
// This is never used. See the item override list below.
@@ -111,7 +114,7 @@ public class FacadeDispatcherBakedModel implements IBakedModel
// This is kinda fascinating, how do we get the meta from the itemblock
IBlockState state = block.getStateFromMeta( meta );
return new FacadeWithBlockBakedModel( baseModel, state );
return new FacadeWithBlockBakedModel( baseModel, state, format );
}
};
}