diff --git a/src/main/java/makeo/gadomancy/client/ClientProxy.java b/src/main/java/makeo/gadomancy/client/ClientProxy.java index c8ede9d..82aa11a 100644 --- a/src/main/java/makeo/gadomancy/client/ClientProxy.java +++ b/src/main/java/makeo/gadomancy/client/ClientProxy.java @@ -99,6 +99,8 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(RegisteredBlocks.blockStoneMachine), itemRenderStoneMachine); itemRenderStoneMachine.registerRenderer(0, new TileManipulationFocus(), renderTileManipulationFocus); + MinecraftForgeClient.registerItemRenderer(RegisteredItems.itemFamiliar, new ItemRenderFamiliar()); + //Blocks RegisteredBlocks.rendererTransparentBlock = registerBlockRenderer(new RenderBlockTransparent()); RegisteredBlocks.rendererExtendedNodeJarBlock = registerBlockRenderer(new BlockExtendedNodeJarRenderer()); diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java new file mode 100644 index 0000000..557cea7 --- /dev/null +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java @@ -0,0 +1,53 @@ +package makeo.gadomancy.client.renderers.item; + +import makeo.gadomancy.client.util.FamiliarHandlerClient; +import makeo.gadomancy.common.items.baubles.ItemFamiliar; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; +import org.lwjgl.opengl.GL11; +import thaumcraft.client.renderers.entity.RenderPrimalOrb; + +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *

+ * Created by HellFirePvP @ 01.11.2015 12:55 + */ +public class ItemRenderFamiliar implements IItemRenderer { + + private static final RenderPrimalOrb fallbackRenderer; + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return !(item == null || !(item.getItem() instanceof ItemFamiliar)); + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return helper != ItemRendererHelper.ENTITY_ROTATION; + } + + static { + fallbackRenderer = new RenderPrimalOrb(); + fallbackRenderer.setRenderManager(RenderManager.instance); + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + if(item == null || !(item.getItem() instanceof ItemFamiliar)) return; + GL11.glPushMatrix(); + if(type == ItemRenderType.EQUIPPED) { + GL11.glTranslatef(0.5F, 0.5F, 0.7F); + } else if(type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + GL11.glTranslatef(0, 1F, 0.8F); + } + GL11.glScalef(1.2F, 1.2F, 1.2F); + fallbackRenderer.renderEntityAt(FamiliarHandlerClient.PartialEntityFamiliar.DUMMY_FAMILIAR.dummyEntity, 0, 0, 0, 0, 0); + GL11.glPopMatrix(); + } + +} diff --git a/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java index 4f532bc..c5ffba7 100644 --- a/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java +++ b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java @@ -72,6 +72,8 @@ public class FamiliarHandlerClient { if(renderView.worldObj.provider.dimensionId != player.worldObj.provider.dimensionId) continue; if(renderView.getDistanceSqToEntity(player) > 1024) continue; + //Info: "Thanks" to RenderPlayerEvent, GL11 offset is moved to the player already. + //GL11 coordinates: Player.posX, Player.posY + Player.eyeHeight (1.62 client side..), Player.posZ, rotation: 0 fallbackRenderer.renderEntityAt(fam.dummyEntity, fam.renderX, fam.renderY, fam.renderZ, 0, partialTicks); //Render at abs positions: ram.posX, fam.posY, fam.posZ } @@ -79,7 +81,9 @@ public class FamiliarHandlerClient { @SideOnly(Side.CLIENT) public static void playerTickEvent() { + if(Minecraft.getMinecraft().theWorld == null) return; for(PartialEntityFamiliar fam : clientFamiliars.values()) fam.tick(); + PartialEntityFamiliar.DUMMY_FAMILIAR.tick(); } static { @@ -103,9 +107,10 @@ public class FamiliarHandlerClient { protected void writeEntityToNBT(NBTTagCompound p_70014_1_) {} } - @SideOnly(Side.CLIENT) public static class PartialEntityFamiliar { + public static final PartialEntityFamiliar DUMMY_FAMILIAR = new PartialEntityFamiliar(null, "§Invalid§"); + private static final double RAD_CAP = 2 * Math.PI; private static final int CRICLE_TIME_TICKS = 160; private static final double RADIUS = 1; @@ -132,6 +137,8 @@ public class FamiliarHandlerClient { EntityPlayer player = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(potentialOwnerName); if(player != null) { owner = new WeakReference(player); + } else { + return; } } else { return; @@ -151,7 +158,7 @@ public class FamiliarHandlerClient { double theta = RAD_CAP * part; this.renderX = RADIUS * Math.cos(theta); this.renderZ = RADIUS * Math.sin(theta); - this.renderY = 1 + Math.sin(theta * 2) / 4D; + this.renderY = 0.7 + Math.sin(theta * 2) / 4D; this.posX = owner.get().posX + renderX; this.posZ = owner.get().posZ + renderZ; diff --git a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java index 1d01c16..5aa1c1d 100644 --- a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java +++ b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java @@ -21,6 +21,8 @@ public class ItemFamiliar extends Item implements IBauble { public ItemFamiliar() { setUnlocalizedName("ItemFamiliar"); + setMaxStackSize(1); + setFull3D(); setCreativeTab(RegisteredItems.creativeTab); }