All entity renders and TESR's, except starfield

This commit is contained in:
Vincent Lee committed 2017-01-04 23:35:06 -06:00
1 parent c30035ed06
commit ee4ebde69e
15 files changed
+26 -26

No files matched your search

@@ -30,7 +30,7 @@ public class LayerGaiaHead implements LayerRenderer<EntityPlayer> {
public void doRenderLayer(@Nonnull EntityPlayer player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
ItemStack itemstack = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD);
if (itemstack != null && itemstack.getItem() == ModItems.gaiaHead) // Botania - check for head
if (!itemstack.isEmpty() && itemstack.getItem() == ModItems.gaiaHead) // Botania - check for head
{
GlStateManager.pushMatrix();
@@ -62,8 +62,8 @@ public class RenderCorporeaSpark extends RenderSparkBase<EntityCorporeaSpark> {
float absTime = Math.abs(time) - pticks;
ItemStack stack = entity.getDisplayedItem().orNull();
if(stack == null)
ItemStack stack = entity.getDisplayedItem().or(ItemStack.EMPTY);
if(stack.isEmpty())
return;
GlStateManager.pushMatrix();
@@ -56,7 +56,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer<TileAltar> {
if(water) {
int petals = 0;
for(int i = 0; i < altar.getSizeInventory(); i++)
if(altar.getItemHandler().getStackInSlot(i) != null)
if(!altar.getItemHandler().getStackInSlot(i).isEmpty())
petals++;
else break;
@@ -71,7 +71,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer<TileAvatar> {
}
ItemStack stack = avatar.getItemHandler().getStackInSlot(0);
if(stack != null) {
if(!stack.isEmpty()) {
GlStateManager.pushMatrix();
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
float s = 0.6F;
@@ -50,7 +50,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer<TileBrewery> {
}
public void renderItemStack(ItemStack stack) {
if(stack != null) {
if(!stack.isEmpty()) {
Minecraft mc = Minecraft.getMinecraft();
GlStateManager.pushMatrix();
mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
@@ -51,7 +51,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<Til
@Override
public void renderTileEntityAt(@Nonnull TileCorporeaCrystalCube cube, double d0, double d1, double d2, float f, int digProgress) {
ItemStack stack = null;
ItemStack stack = ItemStack.EMPTY;
if (cube != null) {
if(entity == null)
entity = new EntityItem(cube.getWorld(), cube.getPos().getX(), cube.getPos().getY(), cube.getPos().getZ(), new ItemStack(Blocks.STONE));
@@ -85,7 +85,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<Til
GlStateManager.translate(0.5F, 1.5F, 0.5F);
GlStateManager.scale(1F, -1F, -1F);
GlStateManager.translate(0F, (float) Math.sin(worldTicks / 20.0 * 1.55) * 0.025F, 0F);
if(stack != null) {
if(!stack.isEmpty()) {
GlStateManager.pushMatrix();
float s = stack.getItem() instanceof ItemBlock ? 0.7F : 0.5F;
GlStateManager.translate(0F, 0.8F, 0F);
@@ -97,7 +97,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<Til
GlStateManager.color(1F, 1F, 1F);
if(stack != null) {
if(!stack.isEmpty()) {
int count = cube.getItemCount();
String countStr = "" + count;
int color = 0xFFFFFF;
@@ -45,7 +45,7 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer<TileEnchanter
else if(enchanter.stage == TileEnchanter.State.DO_ENCHANT)
alphaMod = 1F;
if(enchanter.itemToEnchant != null) {
if(!enchanter.itemToEnchant.isEmpty()) {
if(item == null)
item = new EntityItem(enchanter.getWorld(), enchanter.getPos().getX(), enchanter.getPos().getY() + 1, enchanter.getPos().getZ(), enchanter.itemToEnchant);
@@ -23,8 +23,8 @@ import net.minecraft.entity.boss.EntityDragon;
import net.minecraft.entity.boss.EntityWither;
import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.monster.EntitySkeleton;
import net.minecraft.entity.monster.EntityWitherSkeleton;
import net.minecraft.entity.monster.EntityZombie;
import net.minecraft.entity.monster.SkeletonType;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntitySkull;
import net.minecraft.util.EnumFacing;
@@ -61,11 +61,11 @@ public class RenderTileGaiaHead extends TileEntitySkullRenderer {
if(view instanceof EntityPlayer) {
skullType = 3;
profile = ((EntityPlayer) mc.getRenderViewEntity()).getGameProfile();
} else if (view instanceof EntitySkeleton) {
} else if (view instanceof EntitySkeleton)
skullType = 0;
if (((EntitySkeleton) view).getSkeletonType() == SkeletonType.WITHER)
skullType = 1;
} else if(view instanceof EntityWither)
else if(view instanceof EntityWitherSkeleton)
skullType = 1;
else if(view instanceof EntityWither)
skullType = 1;
else if(view instanceof EntityZombie)
skullType = 2;
@@ -48,11 +48,11 @@ public class RenderTileHourglass extends TileEntitySpecialRenderer<TileHourglass
float x = 0.5F + (float) Math.cos(time * 0.05F) * 0.025F;
float y = 0.55F + (float) (Math.sin(time * 0.04F) + 1F) * 0.05F;
float z = 0.5F + (float) Math.sin(time * 0.05F) * 0.025F;
ItemStack stack = hasWorld ? hourglass.getItemHandler().getStackInSlot(0) : null;
ItemStack stack = hasWorld ? hourglass.getItemHandler().getStackInSlot(0) : ItemStack.EMPTY;
float activeFraction = stack == null ? 0 : hourglass.lastFraction + (hourglass.timeFraction - hourglass.lastFraction) * ticks;
float fract1 = stack == null ? 0 : activeFraction;
float fract2 = stack == null ? 0 : 1F - activeFraction;
float activeFraction = stack.isEmpty() ? 0 : hourglass.lastFraction + (hourglass.timeFraction - hourglass.lastFraction) * ticks;
float fract1 = stack.isEmpty() ? 0 : activeFraction;
float fract2 = stack.isEmpty() ? 0 : 1F - activeFraction;
GlStateManager.translate(x, y, z);
float rot = hasWorld && hourglass.flip ? 180F : 1F;
@@ -39,7 +39,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer<TileIncens
return;
ItemStack stack = plate.getItemHandler().getStackInSlot(0);
if(stack == null)
if(stack.isEmpty())
return;
EnumFacing facing = plate.getWorld().getBlockState(plate.getPos()).getValue(BotaniaStateProps.CARDINALS);
@@ -34,7 +34,7 @@ public class RenderTilePrism extends TileEntitySpecialRenderer<TilePrism> {
ItemStack stack = prism.getItemHandler().getStackInSlot(0);
if(stack != null) {
if(!stack.isEmpty()) {
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
if(stack.getItem() instanceof ILens) {
GlStateManager.pushMatrix();
@@ -35,7 +35,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer<TileRuneAltar
int items = 0;
for(int i = 0; i < altar.getSizeInventory(); i++)
if(altar.getItemHandler().getStackInSlot(i) == null)
if(altar.getItemHandler().getStackInSlot(i).isEmpty())
break;
else items++;
float[] angles = new float[altar.getSizeInventory()];
@@ -57,7 +57,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer<TileRuneAltar
GlStateManager.translate(0D, 0.075 * Math.sin((time + i * 10) / 5D), 0F);
ItemStack stack = altar.getItemHandler().getStackInSlot(i);
Minecraft mc = Minecraft.getMinecraft();
if(stack != null) {
if(!stack.isEmpty()) {
mc.getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.GROUND);
}
GlStateManager.popMatrix();
@@ -30,7 +30,7 @@ public class RenderTileSparkChanger extends TileEntitySpecialRenderer<TileSparkC
GlStateManager.translate(0.8F, 0.2F, -0.22F);
GlStateManager.color(1F, 1F, 1F, 1F);
ItemStack stack = tileentity.getItemHandler().getStackInSlot(0);
if(stack != null) {
if(!stack.isEmpty()) {
GlStateManager.pushMatrix();
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
float s = 0.6F;
@@ -87,7 +87,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer<TileSpreader>
GlStateManager.scale(1F, -1F, -1F);
ItemStack stack = spreader.getItemHandler().getStackInSlot(0);
if(stack != null) {
if(!stack.isEmpty()) {
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
stack.getItem();
GlStateManager.pushMatrix();
@@ -163,7 +163,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
for(int i = 0; i < potato.getSizeInventory(); i++) {
ItemStack stack = potato.getItemHandler().getStackInSlot(i);
if(stack == null)
if(stack.isEmpty())
continue;
GlStateManager.pushMatrix();