mirror of
https://github.com/GTNewHorizons/Gadomancy.git
synced 2026-11-18 03:15:22 +00:00
- Familiars: Wisp Rendering fixed
- ResearchPage: Stuff sorted and exchanged
This commit is contained in:
1 parent
7108449069
commit
793da041dd
6 files changed
+124
-29
No files matched your search
@@ -2,11 +2,15 @@ package makeo.gadomancy.client.renderers.item;
|
||||
|
||||
import makeo.gadomancy.client.util.FamiliarHandlerClient;
|
||||
import makeo.gadomancy.common.items.baubles.ItemFamiliar;
|
||||
import makeo.gadomancy.common.utils.FakeWorld;
|
||||
import net.minecraft.client.renderer.ActiveRenderInfo;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.entity.item.EntityItemFrame;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.client.IItemRenderer;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import thaumcraft.client.renderers.entity.RenderPrimalOrb;
|
||||
import thaumcraft.client.renderers.entity.RenderWisp;
|
||||
import thaumcraft.common.entities.monster.EntityWisp;
|
||||
|
||||
/**
|
||||
* This class is part of the Gadomancy Mod
|
||||
@@ -18,7 +22,9 @@ import thaumcraft.client.renderers.entity.RenderPrimalOrb;
|
||||
*/
|
||||
public class ItemRenderFamiliar implements IItemRenderer {
|
||||
|
||||
private static final RenderPrimalOrb fallbackRenderer;
|
||||
private static final RenderWisp fallbackRenderer;
|
||||
private static final EntityWisp ENTITY_WISP;
|
||||
private float[] renderInfo = new float[5];
|
||||
|
||||
@Override
|
||||
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
|
||||
@@ -31,8 +37,9 @@ public class ItemRenderFamiliar implements IItemRenderer {
|
||||
}
|
||||
|
||||
static {
|
||||
fallbackRenderer = new RenderPrimalOrb();
|
||||
fallbackRenderer = new RenderWisp();
|
||||
fallbackRenderer.setRenderManager(RenderManager.instance);
|
||||
ENTITY_WISP = new EntityWisp(new FakeWorld());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -43,10 +50,68 @@ public class ItemRenderFamiliar implements IItemRenderer {
|
||||
GL11.glTranslatef(0.5F, 0.5F, 0.7F);
|
||||
} else if(type == ItemRenderType.EQUIPPED_FIRST_PERSON) {
|
||||
GL11.glTranslatef(0, 1F, 0.8F);
|
||||
} else if(type == ItemRenderType.INVENTORY) {
|
||||
GL11.glTranslatef(0, -0.45F, 0);
|
||||
}
|
||||
|
||||
try {
|
||||
cleanActiveRenderInfo(type);
|
||||
GL11.glScalef(1.2F, 1.2F, 1.2F);
|
||||
if(item.hasTagCompound() && item.getTagCompound().hasKey("aspect")) {
|
||||
ENTITY_WISP.ticksExisted = FamiliarHandlerClient.PartialEntityFamiliar.DUMMY_FAMILIAR.ticksExisted;
|
||||
ENTITY_WISP.setType(item.getTagCompound().getString("aspect"));
|
||||
fallbackRenderer.doRender(ENTITY_WISP, 0, 0, 0, 0, 0);
|
||||
}
|
||||
} finally {
|
||||
restoreActiveRenderInfo();
|
||||
}
|
||||
GL11.glScalef(1.2F, 1.2F, 1.2F);
|
||||
fallbackRenderer.renderEntityAt(FamiliarHandlerClient.PartialEntityFamiliar.DUMMY_FAMILIAR.dummyEntity, 0, 0, 0, 0, 0);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
private void cleanActiveRenderInfo(ItemRenderType renderType) {
|
||||
renderInfo[0] = ActiveRenderInfo.rotationX;
|
||||
renderInfo[1] = ActiveRenderInfo.rotationXZ;
|
||||
renderInfo[2] = ActiveRenderInfo.rotationZ;
|
||||
renderInfo[3] = ActiveRenderInfo.rotationYZ;
|
||||
renderInfo[4] = ActiveRenderInfo.rotationXY;
|
||||
switch (renderType) {
|
||||
case ENTITY:
|
||||
break;
|
||||
case EQUIPPED:
|
||||
ActiveRenderInfo.rotationX = 0.85535365F;
|
||||
ActiveRenderInfo.rotationXZ = 0.9868404F;
|
||||
ActiveRenderInfo.rotationZ = -0.51804453F;
|
||||
ActiveRenderInfo.rotationYZ = 0.083717324F;
|
||||
ActiveRenderInfo.rotationXY = 0.13822734F;
|
||||
break;
|
||||
case EQUIPPED_FIRST_PERSON:
|
||||
ActiveRenderInfo.rotationX = -0.4186075F;
|
||||
ActiveRenderInfo.rotationXZ = 0.99932945F;
|
||||
ActiveRenderInfo.rotationZ = -0.90816724F;
|
||||
ActiveRenderInfo.rotationYZ = 0.033253096F;
|
||||
ActiveRenderInfo.rotationXY = -0.015327567F;
|
||||
break;
|
||||
case INVENTORY:
|
||||
ActiveRenderInfo.rotationX = -0.71445745F;
|
||||
ActiveRenderInfo.rotationXZ = 0.9573291F;
|
||||
ActiveRenderInfo.rotationZ = 0.69967884F;
|
||||
ActiveRenderInfo.rotationYZ = -0.20220716F;
|
||||
ActiveRenderInfo.rotationXY = -0.20647818F;
|
||||
break;
|
||||
case FIRST_PERSON_MAP:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private void restoreActiveRenderInfo() {
|
||||
if(renderInfo[0] != -1) ActiveRenderInfo.rotationX = renderInfo[0];
|
||||
if(renderInfo[1] != -1) ActiveRenderInfo.rotationXZ = renderInfo[1];
|
||||
if(renderInfo[2] != -1) ActiveRenderInfo.rotationZ = renderInfo[2];
|
||||
if(renderInfo[3] != -1) ActiveRenderInfo.rotationYZ = renderInfo[3];
|
||||
if(renderInfo[4] != -1) ActiveRenderInfo.rotationXY = renderInfo[4];
|
||||
for (int i = 0; i < renderInfo.length; i++) {
|
||||
renderInfo[i] = -1;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -9,12 +9,14 @@ import makeo.gadomancy.common.utils.FakeWorld;
|
||||
import makeo.gadomancy.common.utils.NBTHelper;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.entity.DataWatcher;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.client.renderers.entity.RenderPrimalOrb;
|
||||
import thaumcraft.client.renderers.entity.RenderWisp;
|
||||
@@ -36,7 +38,7 @@ import java.util.Map;
|
||||
* Created by HellFirePvP @ 31.10.2015 12:13
|
||||
*/
|
||||
public class FamiliarHandlerClient {
|
||||
private static final EntityWisp ENTITY_WISP = new EntityWisp(new FakeWorld());
|
||||
private static final EntityWisp ENTITY_WISP;
|
||||
|
||||
private static RenderWisp fallbackRenderer;
|
||||
|
||||
@@ -52,7 +54,6 @@ public class FamiliarHandlerClient {
|
||||
PartialEntityFamiliar fam = clientFamiliars.get(p.getCommandSenderName());
|
||||
if(fam == null) return;
|
||||
Thaumcraft.proxy.nodeBolt(Minecraft.getMinecraft().theWorld, (float) fam.posX, (float) fam.posY, (float) fam.posZ, pkt.targetX, pkt.targetY, pkt.targetZ);
|
||||
//TODO zap given coordinates from current familiar render coordinates
|
||||
} else if(packet instanceof PacketFamiliar.PacketFamiliarSyncCompletely) {
|
||||
PacketFamiliar.PacketFamiliarSyncCompletely sync = (PacketFamiliar.PacketFamiliarSyncCompletely) packet;
|
||||
familiarPlayers = sync.playerNamesWithFamiliars;
|
||||
@@ -72,28 +73,21 @@ public class FamiliarHandlerClient {
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public static void playerRenderEvent(EntityPlayer player, float partialTicks) { //RenderPlayerEvent.Post
|
||||
EntityLivingBase renderView = Minecraft.getMinecraft().renderViewEntity;
|
||||
public static void playerRenderEvent(EntityPlayer player, float partialTicks) {
|
||||
for(String ownerName : clientFamiliars.keySet()) {
|
||||
PartialEntityFamiliar fam = clientFamiliars.get(ownerName);
|
||||
|
||||
if(!ownerName.equals(player.getCommandSenderName())) continue;
|
||||
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
|
||||
|
||||
ItemStack stack = BaublesApi.getBaubles(player).getStackInSlot(0);
|
||||
if(stack != null && stack.getItem() == RegisteredItems.itemFamiliar
|
||||
&& stack.hasTagCompound() && stack.getTagCompound().hasKey("aspect")) {
|
||||
//ENTITY_WISP.setType(stack.getTagCompound().getString("aspect"));
|
||||
//ENTITY_WISP.setType(Aspect.AIR.getName());
|
||||
ENTITY_WISP.getDataWatcher().getWatchedObject(22).setObject(Aspect.AIR.getName());
|
||||
ENTITY_WISP.setType(stack.getTagCompound().getString("aspect"));
|
||||
ENTITY_WISP.ticksExisted = fam.dummyEntity.ticksExisted;
|
||||
fallbackRenderer.renderEntityAt(ENTITY_WISP, fam.renderX, fam.renderY, fam.renderZ, 0, partialTicks);
|
||||
GL11.glPushMatrix();
|
||||
fallbackRenderer.doRender(ENTITY_WISP, fam.renderX, fam.renderY, fam.renderZ, 0, partialTicks);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
//Render at abs positions: ram.posX, fam.posY, fam.posZ
|
||||
}
|
||||
}
|
||||
|
||||
@@ -107,6 +101,7 @@ public class FamiliarHandlerClient {
|
||||
static {
|
||||
fallbackRenderer = new RenderWisp();
|
||||
fallbackRenderer.setRenderManager(RenderManager.instance);
|
||||
ENTITY_WISP = new EntityWisp(new FakeWorld());
|
||||
}
|
||||
|
||||
public static class DummyEntityFamiliar extends Entity {
|
||||
|
||||
@@ -11,6 +11,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
|
||||
import java.util.List;
|
||||
@@ -35,10 +36,39 @@ public class ItemFamiliar extends Item implements IBauble {
|
||||
@Override
|
||||
public void getSubItems(Item item, CreativeTabs tab, List list) {
|
||||
ItemStack stack = new ItemStack(item);
|
||||
NBTHelper.getData(stack).setString("aspect", Aspect.MAGIC.getName());
|
||||
NBTHelper.getData(stack).setString("aspect", Aspect.MAGIC.getTag());
|
||||
list.add(stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List lore, boolean par4Flag) {
|
||||
if(stack.hasTagCompound()) {
|
||||
if(stack.getTagCompound().hasKey("aspect") && Aspect.getAspect(stack.getTagCompound().getString("aspect")) != null) {
|
||||
lore.add(Aspect.getAspect(stack.getTagCompound().getString("aspect")).getName());
|
||||
}
|
||||
|
||||
if(stack.getTagCompound().hasKey("AttackUpgrade1") || stack.getTagCompound().hasKey("AttackUpgrade2") || stack.getTagCompound().hasKey("AttackUpgrade3")) {
|
||||
lore.add("");
|
||||
String strength = EnumChatFormatting.DARK_RED + "Strength ";
|
||||
if(stack.getTagCompound().hasKey("AttackUpgrade1")) strength += "I";
|
||||
if(stack.getTagCompound().hasKey("AttackUpgrade2")) strength += "I";
|
||||
if(stack.getTagCompound().hasKey("AttackUpgrade3")) strength += "I";
|
||||
lore.add(strength);
|
||||
}
|
||||
|
||||
if(stack.getTagCompound().hasKey("RangeUpgrade1")) {
|
||||
lore.add("");
|
||||
lore.add(EnumChatFormatting.GOLD + "Reach I");
|
||||
}
|
||||
|
||||
if(stack.getTagCompound().hasKey("CdUpgrade1")) {
|
||||
lore.add("");
|
||||
lore.add(EnumChatFormatting.AQUA + "Swiftness I");
|
||||
}
|
||||
}
|
||||
super.addInformation(stack, player, lore, par4Flag);
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumRarity getRarity(ItemStack stack) {
|
||||
return RegisteredItems.raritySacred;
|
||||
|
||||
@@ -133,18 +133,18 @@ public class RegisteredRecipes {
|
||||
List<Aspect> aspects = new ArrayList<Aspect>(Aspect.aspects.values());
|
||||
InfusionRecipe[] recipes = new InfusionRecipe[aspects.size()];
|
||||
|
||||
ItemWispEssence itemEssence = (ItemWispEssence)ConfigItems.itemWispEssence;
|
||||
ItemWispEssence itemEssence = (ItemWispEssence) ConfigItems.itemWispEssence;
|
||||
for (int i = 0; i < aspects.size(); i++) {
|
||||
Aspect aspect = aspects.get(i);
|
||||
|
||||
ItemStack wispyEssence = new ItemStack(itemEssence, 0, 0);
|
||||
itemEssence.setAspects(wispyEssence, new AspectList().add(aspect, 1));
|
||||
ItemStack wispyEssence = new ItemStack(itemEssence, 1, 0);
|
||||
itemEssence.setAspects(wispyEssence, new AspectList().add(aspect, 2));
|
||||
|
||||
ItemStack result = new ItemStack(RegisteredItems.itemFamiliar);
|
||||
NBTTagCompound compound = NBTHelper.getData(result);
|
||||
compound.setString("aspect", aspect.getName());
|
||||
compound.setString("aspect", aspect.getTag());
|
||||
|
||||
recipes[i] = ThaumcraftApi.addInfusionCraftingRecipe(SimpleResearchItem.getFullName("FAMILIAR"), result, 4, new AspectList().add(aspect, 46).add(Aspect.AURA, 34).add(Aspect.MAGIC, 51), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack[] { wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigBlocks.blockCrystal, 1, 6) , wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigBlocks.blockCrystal, 1, 6) });
|
||||
recipes[i] = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".FAMILIAR", result, 4, new AspectList().add(aspect, 46).add(Aspect.AURA, 34).add(Aspect.MAGIC, 51), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack[] { wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigBlocks.blockCrystal, 1, 6) , wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigBlocks.blockCrystal, 1, 6) });
|
||||
}
|
||||
return recipes;
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import makeo.gadomancy.common.Gadomancy;
|
||||
import makeo.gadomancy.common.research.AlternatingResearchItem;
|
||||
import makeo.gadomancy.common.research.PseudoResearchItem;
|
||||
import makeo.gadomancy.common.research.SimpleResearchItem;
|
||||
import makeo.gadomancy.common.utils.NBTHelper;
|
||||
import makeo.gadomancy.common.utils.SimpleResourceLocation;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
@@ -65,10 +66,11 @@ public class RegisteredResearches {
|
||||
.setPages(new ResearchPage("gadomancy.research_page.GOLEMRUNICSHIELD.1"), new ResearchPage(RegisteredRecipes.recipesGolemRunicShield)).registerResearchItem();
|
||||
|
||||
ResearchItem researchDistill = PseudoResearchItem.create("DISTILESSENTIA", -2, -5).registerResearchItem();
|
||||
ResearchItem researchBellows = PseudoResearchItem.create("BELLOWS", -3, -1).registerResearchItem();
|
||||
|
||||
researchArcaneDropper = new SimpleResearchItem("ARCANEDROPPER", -1, -2, 2, new ItemStack(RegisteredBlocks.blockArcaneDropper),
|
||||
new AspectList().add(Aspect.ORDER, 4).add(Aspect.AIR, 6).add(Aspect.EARTH, 5).add(Aspect.SENSES, 5).add(Aspect.MECHANISM, 7))
|
||||
.setParents(researchDistill.key).setConcealed()
|
||||
.setParents(researchDistill.key, researchBellows.key).setConcealed()
|
||||
.setPages(new ResearchPage("gadomancy.research_page.ARCANEDROPPER.1"), new ResearchPage(RegisteredRecipes.recipeArcaneDropper)).registerResearchItem();
|
||||
|
||||
ResearchItem researchHarvestGather = PseudoResearchItem.create("COREHARVEST", 3, -6).registerResearchItem();
|
||||
@@ -85,7 +87,7 @@ public class RegisteredResearches {
|
||||
ResearchItem researchItemVoidMetal = PseudoResearchItem.create("VOIDMETAL", -8, -6).registerResearchItem();
|
||||
ResearchItem researchWandPedestal = PseudoResearchItem.create("WANDPED", -9, -8).registerResearchItem();
|
||||
ResearchItem researchWardingStone = PseudoResearchItem.create("PAVEWARD", -10, -6).registerResearchItem();
|
||||
ResearchItem researchNodeStabilizer = PseudoResearchItem.create("NODESTABILIZER", -12, -5).registerResearchItem();
|
||||
ResearchItem researchNodeStabilizer = PseudoResearchItem.create("WANDPEDFOC", -12, -5).registerResearchItem();
|
||||
ResearchItem researchCoreUse = PseudoResearchItem.create("COREUSE", -5, -9).registerResearchItem();
|
||||
|
||||
researchInfusionClaw = new SimpleResearchItem("INFUSIONCLAW", -6, -7, 5, new ItemStack(RegisteredBlocks.blockInfusionClaw),
|
||||
@@ -131,9 +133,12 @@ public class RegisteredResearches {
|
||||
|
||||
ResearchItem nitorResearch = PseudoResearchItem.create("NITOR", 2, -4).registerResearchItem();
|
||||
|
||||
ItemStack familiarResearchStack = new ItemStack(RegisteredItems.itemFamiliar, 1, 0);
|
||||
NBTHelper.getData(familiarResearchStack).setString("aspect", Aspect.MAGIC.getTag());
|
||||
|
||||
researchFamiliarBasic = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".FAMILIAR", Gadomancy.MODID,
|
||||
new AspectList().add(Aspect.AURA, 8).add(Aspect.MAGIC, 10).add(Aspect.AIR, 2).add(Aspect.WATER, 2).add(Aspect.EARTH, 2).add(Aspect.FIRE, 2).add(Aspect.ORDER, 2).add(Aspect.ENTROPY, 2),
|
||||
3, -2, 2, new ItemStack(RegisteredItems.itemFamiliar, 1, 0))
|
||||
3, -2, 2, familiarResearchStack)
|
||||
.setSpecial().setConcealed()
|
||||
.setParents(nitorResearch.key)
|
||||
.setPages(new ResearchPage("gadomancy.research_page.FAMILIAR.1"), new ResearchPage(RegisteredRecipes.recipesFamilar)).registerResearchItem();
|
||||
|
||||
Reference in new issue
Block a user