Misc rendering fixes

This commit is contained in:
Vincent Lee committed 2015-12-31 12:45:18 -06:00
1 parent c8d4c54ed7
commit b3a83031c1
6 files changed
+110 -107

No files matched your search

@@ -54,7 +54,7 @@ public interface IBaubleRender {
}
public static void translateToHeadLevel(EntityPlayer player) {
GlStateManager.translate(0, (player != Minecraft.getMinecraft().thePlayer ? 1.62F : 0F) - player.getDefaultEyeHeight() + (player.isSneaking() ? 0.0625 : 0), 0);
GlStateManager.translate(0, -player.getDefaultEyeHeight() + (player.isSneaking() ? 0.0625 : 0), 0);
}
}
@@ -67,7 +67,6 @@ public final class BaubleRenderHandler {
if(helm != null && helm.getItem() instanceof ItemTerrasteelHelm)
ItemTerrasteelHelm.renderOnPlayer(helm, event);
ContributorFancinessHandler.render(event);
GlStateManager.popMatrix();
}
@@ -126,18 +125,7 @@ public final class BaubleRenderHandler {
int lightmapX = light % 65536;
int lightmapY = light / 65536;
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8
// for(int j = 0; j < 2; j++) {
// IIcon icon = item.getIcon(stack, j);
// float f = icon.getMinU();
// float f1 = icon.getMaxU();
// float f2 = icon.getMinV();
// float f3 = icon.getMaxV();
// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
//
// Color color = new Color(item.getColorFromItemStack(stack, 1));
// GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
// }
Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON);
GlStateManager.popMatrix();
if(renderedOne)
@@ -21,9 +21,11 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.entity.layers.LayerRenderer;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.settings.GameSettings.Options;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EnumPlayerModelParts;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.event.RenderPlayerEvent;
@@ -33,6 +35,7 @@ import org.lwjgl.opengl.GL11;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.item.IBaubleRender.Helper;
import vazkii.botania.api.subtile.signature.SubTileSignature;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.client.core.helper.ShaderHelper;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.version.VersionChecker;
@@ -41,28 +44,34 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.item.material.ItemManaResource;
import net.minecraftforge.fml.common.FMLLog;
public final class ContributorFancinessHandler {
public final class ContributorFancinessHandler implements LayerRenderer<EntityPlayer> {
public volatile static Map<String, ItemStack> flowerMap = null;
private volatile static boolean startedLoading = false;
private static boolean phi = true;
public static void render(RenderPlayerEvent.Specials event) {
String name = event.entityPlayer.getDisplayName().getUnformattedText();
@Override
public void doRenderLayer(EntityPlayer player, float p_177141_2_, float p_177141_3_, float partialTicks, float p_177141_5_, float p_177141_6_, float p_177141_7_, float scale) {
String name = player.getDisplayName().getUnformattedText();
if(name.equals("Vazkii") || name.equals("_phi")) {
if(phi)
renderPhiFlower(event);
else renderTwintails(event);
renderPhiFlower(player);
else renderTwintails(player, partialTicks);
} else if(name.equals("haighyorkie"))
renderGoldfish(event);
renderGoldfish(player);
firstStart();
name = name.toLowerCase();
if(event.entityPlayer.isWearing(EnumPlayerModelParts.CAPE) && flowerMap != null && flowerMap.containsKey(name))
renderFlower(event, flowerMap.get(name));
if(player.isWearing(EnumPlayerModelParts.CAPE) && flowerMap != null && flowerMap.containsKey(name))
renderFlower(player, flowerMap.get(name));
}
@Override
public boolean shouldCombineTextures() {
return false;
}
public static void firstStart() {
@@ -90,96 +99,85 @@ public final class ContributorFancinessHandler {
}
}
private static void renderTwintails(RenderPlayerEvent event) {
private static void renderTwintails(EntityPlayer player, float partialTicks) {
GlStateManager.pushMatrix();
TextureAtlasSprite icon = RenderEventHandler.INSTANCE.tailIcon;
float f = icon.getMinU();
float f1 = icon.getMaxU();
float f2 = icon.getMinV();
float f3 = icon.getMaxV();
Helper.translateToHeadLevel(event.entityPlayer);
Helper.translateToHeadLevel(player);
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
GlStateManager.color(1F, 1F, 1F, 1F);
GlStateManager.rotate(90F, 0F, 1F, 0F);
//GlStateManager.rotate(90F, 0F, 1F, 0F); todo 1.8 refine
GlStateManager.translate(0, 1.62, 0);
float t = 0.13F;
GlStateManager.translate(t, -0.5F, -0.1F);
if(event.entityPlayer.motionY < 0)
GlStateManager.rotate((float) event.entityPlayer.motionY * 20F, 1F, 0F, 0F);
if(player.motionY < 0)
GlStateManager.rotate((float) player.motionY * 20F, -1F, 0F, 0F);
float r = -18F + (float) Math.sin((ClientTickHandler.ticksInGame + event.partialRenderTick) * 0.05F) * 2F;
float r = -18F + (float) Math.sin((ClientTickHandler.ticksInGame + partialTicks) * 0.05F) * 2F;
GlStateManager.rotate(r, 0F, 0F, 1F);
float s = 0.9F;
GlStateManager.scale(s, s, s);
//ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
GlStateManager.rotate(-r, 0F, 0F, 1F);
GlStateManager.translate(-t, -0F, 0F);
GlStateManager.scale(-1F, 1F, 1F);
GlStateManager.translate(t, -0F, 0F);
GlStateManager.rotate(r, 0F, 0F, 1F);
//ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
GlStateManager.popMatrix();
}
private static void renderPhiFlower(RenderPlayerEvent event) {
private static void renderPhiFlower(EntityPlayer player) {
GlStateManager.pushMatrix();
TextureAtlasSprite icon = RenderEventHandler.INSTANCE.phiFlowerIcon;
float f = icon.getMinU();
float f1 = icon.getMaxU();
float f2 = icon.getMinV();
float f3 = icon.getMaxV();
Helper.translateToHeadLevel(event.entityPlayer);
Helper.translateToHeadLevel(player);
GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.rotate(180F, 1F, 0F, 0F);
GlStateManager.translate(-0.4F, 0.1F, -0.25F);
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
GlStateManager.rotate(90F, 0F, 1F, 0F);
// todo 1.8 refine
// GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.scale(0.4F, 0.4F, 0.4F);
GlStateManager.translate(-1.2F, 0.2F, 0.125F);
GlStateManager.rotate(20F, 1F, 0F, 0F);
//ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
GlStateManager.translate(0.70F, -3.5F, 0.125F);
// GlStateManager.rotate(20F, 1F, 0F, 0F);
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
GlStateManager.popMatrix();
}
private static void renderGoldfish(RenderPlayerEvent event) {
private static void renderGoldfish(EntityPlayer player) {
GlStateManager.pushMatrix();
TextureAtlasSprite icon = RenderEventHandler.INSTANCE.goldfishIcon;
float f = icon.getMinU();
float f1 = icon.getMaxU();
float f2 = icon.getMinV();
float f3 = icon.getMaxV();
Helper.rotateIfSneaking(event.entityPlayer);
GlStateManager.rotate(90F, 0F, 1F, 0F);
Helper.rotateIfSneaking(player);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-0.75F, 0.5F, 0F);
GlStateManager.scale(0.4F, 0.4F, 0.4F);
GlStateManager.translate(1.2F, 0.5F, 0F);
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
//ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
GlStateManager.popMatrix();
}
private static void renderFlower(RenderPlayerEvent event, ItemStack flower) {
private static void renderFlower(EntityPlayer player, ItemStack flower) {
GlStateManager.pushMatrix();
Helper.translateToHeadLevel(event.entityPlayer);
Helper.translateToHeadLevel(player);
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
GlStateManager.rotate(-90, 1, 0, 0);
GlStateManager.translate(0, 0, 1.22); // todo 1.8 refine
ShaderHelper.useShader(ShaderHelper.gold);
Minecraft.getMinecraft().getRenderItem().renderItemModelForEntity(flower, event.entityPlayer, ItemCameraTransforms.TransformType.THIRD_PERSON);
Minecraft.getMinecraft().getRenderItem().renderItemModelForEntity(flower, player, ItemCameraTransforms.TransformType.THIRD_PERSON);
ShaderHelper.releaseShader();
GlStateManager.popMatrix();
// float f = icon.getMinU();
// float f1 = icon.getMaxU();
// float f2 = icon.getMinV();
// float f3 = icon.getMaxV();
// GlStateManager.rotate(180F, 0F, 0F, 1F);
// GlStateManager.rotate(90F, 0F, 1F, 0F);
// GlStateManager.scale(0.5F, 0.5F, 0.5F);
// GlStateManager.translate(-0.5F, 0.7F, 0F);
//
// ShaderHelper.useShader(ShaderHelper.gold);
// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
// ShaderHelper.releaseShader();
// GlStateManager.popMatrix();
}
public static class ThreadContributorListLoader extends Thread {
@@ -15,11 +15,13 @@ import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.util.Calendar;
import java.util.Map;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.PlayerControllerMP;
import net.minecraft.client.network.NetHandlerPlayClient;
import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.client.renderer.entity.RenderSnowball;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@@ -49,6 +51,7 @@ import vazkii.botania.client.core.handler.BaubleRenderHandler;
import vazkii.botania.client.core.handler.BotaniaPlayerController;
import vazkii.botania.client.core.handler.BoundTileRenderer;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.core.handler.ContributorFancinessHandler;
import vazkii.botania.client.core.handler.CorporeaAutoCompleteHandler;
import vazkii.botania.client.core.handler.DebugHandler;
import vazkii.botania.client.core.handler.HUDHandler;
@@ -333,6 +336,12 @@ public class ClientProxy extends CommonProxy {
RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.class, new RenderBabylonWeapon(Minecraft.getMinecraft().getRenderManager()));
ShaderHelper.initShaders();
Map<String, RenderPlayer> skinMap = Minecraft.getMinecraft().getRenderManager().getSkinMap();
RenderPlayer render = skinMap.get("default");
render.addLayer(new ContributorFancinessHandler());
render = skinMap.get("slim");
render.addLayer(new ContributorFancinessHandler());
}
@Override
@@ -15,6 +15,7 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
@@ -34,6 +35,7 @@ import org.lwjgl.opengl.GL12;
import vazkii.botania.api.item.TinyPotatoRenderEvent;
import vazkii.botania.client.core.handler.ContributorFancinessHandler;
import vazkii.botania.client.core.handler.RenderEventHandler;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.client.core.helper.ShaderHelper;
import vazkii.botania.client.core.proxy.ClientProxy;
import vazkii.botania.client.lib.LibResources;
@@ -133,7 +135,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer {
mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
ContributorFancinessHandler.firstStart();
// todo 1.8 refine all below
float scale = 1F / 4F;
GlStateManager.translate(0F, 1F, 0F);
GlStateManager.scale(scale, scale, scale);
@@ -154,12 +156,12 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer {
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-0.5F, -1.2F, -0.4F);
//renderIcon(ModItems.cosmetic.getIconFromDamage(23));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 23), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("kamina")) {
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-0.5F, -1.1F, -0.4F);
//renderIcon(ModItems.cosmetic.getIconFromDamage(26));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 26), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("haighyorkie")) {
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
@@ -170,33 +172,33 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer {
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-0.5F, -0.7F, 0.1F);
//renderIcon(ModItems.cosmetic.getIconFromDamage(7));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 7), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("direwolf20")) {
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-0.5F, -2.2F, -0.5F);
//renderIcon(ModItems.cosmetic.getIconFromDamage(0));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("doctor")) {
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-0.5F, -1.15F, -0.4F);
//renderIcon(ModItems.cosmetic.getIconFromDamage(25));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 25), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("snoo")) {
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-0.5F, -0.7F, 0.1F);
GlStateManager.rotate(20F, 0F, 0F, 1F);
//renderIcon(ModItems.cosmetic.getIconFromDamage(24));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 24), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("charlotte")) {
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-0.5F, -1.2F, -0.4F);
//renderIcon(ModItems.cosmetic.getIconFromDamage(12));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 12), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("greg") || name.equals("gregorioust")) {
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.translate(-0.5F, -1.5F, -0.4F);
//renderIcon(Items.book.getIconFromDamage(0));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Items.book, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON);
mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
GlStateManager.translate(0.5F, 0.5F, 0F);
@@ -208,48 +210,50 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer {
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.translate(-0.5F, -1.2F, -0.4F);
//renderIcon(Items.bread.getIconFromDamage(0));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Items.bread, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("martysgames") || name.equals("marty")) {
GlStateManager.scale(0.7F, 0.7F, 0.7F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-0.75F, -2.4F, -0.7F);
GlStateManager.rotate(10F, 0F, 0F, 1F);
//renderIcon(ItemInfiniteFruit.dasBootIcon);
ItemStack renderStack = new ItemStack(ModItems.infiniteFruit, 1);
renderStack.setStackDisplayName("das boot");
Minecraft.getMinecraft().getRenderItem().renderItem(renderStack, ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("tromped")) {
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.translate(-0.5F, -1.2F, -0.4F);
//renderIcon(ModItems.cacophonium.getIconFromDamage(0));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cacophonium, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("kain vinosec")) {
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.translate(-0.3F, -1.5F, -0.4F);
//renderIcon(ModItems.recordGaia1.getIconFromDamage(0));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.recordGaia1, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON);
GlStateManager.translate(0F, 0F, 0.85F);
//renderIcon(ModItems.recordGaia2.getIconFromDamage(0));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.recordGaia2, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("mankrik")) {
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-0.5F, -0.2F, -0.1F);
//renderIcon(ModItems.cosmetic.getIconFromDamage(31));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 31), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("kurumi")) {
GlStateManager.scale(0.4F, 0.4F, 0.4F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-0.9F, -2.5F, -1.3F);
//renderIcon(ModItems.cosmetic.getIconFromDamage(17));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 17), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("ichun")) {
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-0.5F, -1.2F, -0.4F);
//renderIcon(ModItems.cosmetic.getIconFromDamage(15));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 15), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("wiiv") || name.equals("dylan4ever") || name.equals("dylankaiser")) {
GlStateManager.scale(1.5F, 1.5F, 1.5F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.translate(-0.5F, -1.1F, -0.325F);
//renderIcon(Items.painting.getIconFromDamage(0));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Items.painting, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("jibril")) {
GlStateManager.scale(1.5F, 1.5F, 1.5F);
GlStateManager.translate(0F, 0.7F, 0F);
@@ -272,13 +276,13 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer {
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.translate(-0.5F, -1F, 0.45F);
//renderIcon(ModItems.cosmetic.getIconFromDamage(8));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 8), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("etho") || name.equals("ethoslab")) {
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.translate(-0.5F, -1.2F, -0.4F);
//renderIcon(Items.cookie.getIconFromDamage(0));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Items.cookie, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("sethbling")) {
mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
GlStateManager.scale(1.2F, 1.2F, 1.2F);
@@ -289,15 +293,15 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer {
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-1F, -1.1F, -0.1F);
//renderIcon(Items.stick.getIconFromDamage(0));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Items.stick, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("kingdaddydmac")) {
GlStateManager.scale(0.5F, 0.5F, 0.5F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.translate(-0.3F, -2.5F, 1.075F);
//renderIcon(ModItems.manaRing.getIconFromDamage(0));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.manaRing, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON);
GlStateManager.translate(0F, 0F, -4F);
//renderIcon(ModItems.manaRing.getIconFromDamage(0));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.manaRing, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON);
mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
GlStateManager.scale(1.5F, 1.5F, 1.5F);
@@ -307,13 +311,13 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer {
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-0.5F, -1.27F, -0.4F);
//renderIcon(ModItems.cosmetic.getIconFromDamage(27));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(ModItems.cosmetic, 1, 27), ItemCameraTransforms.TransformType.THIRD_PERSON);
} else if(name.equals("martyn") || name.equals("inthelittlewood")) {
GlStateManager.scale(1.25F, 1.25F, 1.25F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-0.5F, -0.45F, -0.1F);
mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
//renderIcon(Blocks.sapling.getIcon(0, 0));
Minecraft.getMinecraft().getRenderItem().renderItem(new ItemStack(Blocks.sapling, 1, 0), ItemCameraTransforms.TransformType.THIRD_PERSON);
}else if(ContributorFancinessHandler.flowerMap != null && ContributorFancinessHandler.flowerMap.containsKey(name)) {
ItemStack icon = ContributorFancinessHandler.flowerMap.get(name);
if(icon != null) {
@@ -321,7 +325,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer {
GlStateManager.rotate(180F, 1F, 0F, 0F);
GlStateManager.translate(-0.5F, -0.5F, 0F);
ShaderHelper.useShader(ShaderHelper.gold);
//renderIcon(icon);
Minecraft.getMinecraft().getRenderItem().renderItem(icon, ItemCameraTransforms.TransformType.THIRD_PERSON);
ShaderHelper.releaseShader();
}
}
@@ -396,6 +400,6 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer {
float f1 = icon.getMaxU();
float f2 = icon.getMinV();
float f3 = icon.getMaxV();
//ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
}
}
@@ -13,12 +13,14 @@ package vazkii.botania.common.item;
import java.awt.Color;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.texture.TextureMap;
@@ -40,6 +42,7 @@ import net.minecraft.world.World;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
@@ -60,6 +63,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.common.lib.LibObfuscation;
public class ItemCraftingHalo extends ItemMod implements ICraftAchievement {
@@ -393,9 +397,20 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement {
render(stack, player, event.partialTicks);
}
private double getRenderPosX() { // todo 1.8
return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSX);
}
private double getRenderPosY() {
return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSY);
}
private double getRenderPosZ() {
return ObfuscationReflectionHelper.getPrivateValue(RenderManager.class, Minecraft.getMinecraft().getRenderManager(), LibObfuscation.RENDERPOSZ);
}
@SideOnly(Side.CLIENT)
public void render(ItemStack stack, EntityPlayer player, float partialTicks) {
/*
Minecraft mc = Minecraft.getMinecraft();
Tessellator tess = Tessellator.getInstance();
// todo 1.8.8 Tessellator.renderingWorldRenderer = false;
@@ -409,7 +424,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement {
double posY = player.prevPosY + (player.posY - player.prevPosY) * partialTicks;
double posZ = player.prevPosZ + (player.posZ - player.prevPosZ) * partialTicks;
GlStateManager.translate(posX - RenderManager.renderPosX, posY - RenderManager.renderPosY, posZ - RenderManager.renderPosZ);
GlStateManager.translate(posX - getRenderPosX(), posY - getRenderPosY() + player.getDefaultEyeHeight(), posZ - getRenderPosZ());
float base = getRotationBase(stack);
@@ -439,34 +454,21 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement {
ItemStack slotStack = getItemForSlot(stack, seg);
if(slotStack != null) {
mc.renderEngine.bindTexture(slotStack.getItem() instanceof ItemBlock ? TextureMap.locationBlocksTexture : TextureMap.locationItemsTexture);
mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
if(slotStack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(slotStack.getItem()).getRenderType())) {
if(slotStack.getItem() instanceof ItemBlock) {
float scale = seg == 0 ? 0.75F : 0.6F;
GlStateManager.scale(scale, scale, scale);
GlStateManager.rotate(180F, 0F, 1F, 0F);
GlStateManager.translate(seg == 0 ? 0.5F : 0F, seg == 0 ? -0.1F : 0.6F, 0F);
GlStateManager.translate(0, -0.5, 0.5F); // todo 1.8 refine
RenderBlocks.getInstance().renderBlockAsItem(Block.getBlockFromItem(slotStack.getItem()), slotStack.getItemDamage(), 1F);
IBlockState state = ((ItemBlock) slotStack.getItem()).block.getStateFromMeta(slotStack.getItemDamage());
Minecraft.getMinecraft().getBlockRendererDispatcher().renderBlockBrightness(state, 1.0F);
} else {
GlStateManager.scale(0.75F, 0.75F, 0.75F);
GlStateManager.translate(0F, 0F, 0.5F);
GlStateManager.rotate(90F, 0F, 1F, 0F);
int renderPass = 0;
do {
IIcon icon = slotStack.getItem().getIcon(slotStack, renderPass);
if(icon != null) {
Color color = new Color(slotStack.getItem().getColorFromItemStack(slotStack, renderPass));
GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
float f = icon.getMinU();
float f1 = icon.getMaxU();
float f2 = icon.getMinV();
float f3 = icon.getMaxV();
ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F);
GlStateManager.color(1F, 1F, 1F);
}
renderPass++;
} while(renderPass < slotStack.getItem().getRenderPasses(slotStack.getItemDamage()));
Minecraft.getMinecraft().getRenderItem().renderItem(slotStack, ItemCameraTransforms.TransformType.GUI);
}
}
GlStateManager.popMatrix();
@@ -479,6 +481,9 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement {
y0 = -y;
}
GlStateManager.enableBlend();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
if(seg % 2 == 0)
GlStateManager.color(0.6F, 0.6F, 0.6F, a);
else GlStateManager.color(1F, 1F, 1F, a);
@@ -507,7 +512,6 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement {
GlStateManager.popMatrix();
}
GlStateManager.popMatrix();
*/
}
@SideOnly(Side.CLIENT)