diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java
index f10e8d9..3ae0823 100644
--- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java
+++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java
@@ -57,9 +57,9 @@ public class ItemRenderFamiliar implements IItemRenderer {
try {
cleanActiveRenderInfo(type);
GL11.glScalef(1.2F, 1.2F, 1.2F);
- if(item.hasTagCompound() && item.getTagCompound().hasKey("aspect")) {
+ if(((ItemFamiliar) item.getItem()).hasAspect(item)) {
ENTITY_WISP.ticksExisted = FamiliarHandlerClient.PartialEntityFamiliar.DUMMY_FAMILIAR.ticksExisted;
- ENTITY_WISP.setType(item.getTagCompound().getString("aspect"));
+ ENTITY_WISP.setType(((ItemFamiliar) item.getItem()).getAspect(item).getTag());
fallbackRenderer.doRender(ENTITY_WISP, 0, 0, 0, 0, 0);
}
} finally {
diff --git a/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java
index a78d928..7598028 100644
--- a/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java
+++ b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java
@@ -3,6 +3,7 @@ package makeo.gadomancy.client.util;
import baubles.api.BaublesApi;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+import makeo.gadomancy.common.items.baubles.ItemFamiliar;
import makeo.gadomancy.common.network.packets.PacketFamiliar;
import makeo.gadomancy.common.registration.RegisteredItems;
import makeo.gadomancy.common.utils.FakeWorld;
@@ -84,9 +85,8 @@ public class FamiliarHandlerClient {
if(!ownerName.equals(player.getCommandSenderName())) continue;
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"));
+ if(((ItemFamiliar) stack.getItem()).hasAspect(stack)) {
+ ENTITY_WISP.setType(((ItemFamiliar) stack.getItem()).getAspect(stack).getTag());
ENTITY_WISP.ticksExisted = fam.dummyEntity.ticksExisted;
GL11.glPushMatrix();
fallbackRenderer.doRender(ENTITY_WISP, fam.renderX, fam.renderY, fam.renderZ, 0, partialTicks);
diff --git a/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java b/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java
index 0840acd..650d817 100644
--- a/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java
+++ b/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java
@@ -1,18 +1,45 @@
package makeo.gadomancy.common.items;
import makeo.gadomancy.common.Gadomancy;
+import net.minecraft.client.renderer.ItemRenderer;
+import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
+
+import java.awt.*;
/**
* 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 makeo @ 20.10.2015 22:49
*/
public class ItemFakeModIcon extends Item {
+
public ItemFakeModIcon() {
setTextureName(Gadomancy.MODID + ":category_icon");
}
+
+ public IIcon[] icons = new IIcon[6];
+
+ @Override
+ public void registerIcons(IIconRegister ir) {
+ icons[0] = ir.registerIcon(Gadomancy.MODID + ":category_icon");
+ icons[1] = ir.registerIcon(Gadomancy.MODID + ":Attack1");
+ icons[2] = ir.registerIcon(Gadomancy.MODID + ":Attack2");
+ icons[3] = ir.registerIcon(Gadomancy.MODID + ":Attack3");
+ icons[4] = ir.registerIcon(Gadomancy.MODID + ":Range1");
+ icons[5] = ir.registerIcon(Gadomancy.MODID + ":Cooldown1");
+ }
+
+ @Override
+ public IIcon getIconFromDamage(int damage) {
+ if(damage < 0 || damage >= icons.length) return null;
+ return icons[damage];
+ }
+
}
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 6e4a968..8f6ff5e 100644
--- a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java
+++ b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java
@@ -31,35 +31,38 @@ public class ItemFamiliar extends Item implements IBauble {
setMaxStackSize(1);
setFull3D();
setCreativeTab(RegisteredItems.creativeTab);
+
+ //Shut up FML.
+ setTextureName(Gadomancy.MODID + ":category_icon");
}
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
ItemStack stack = new ItemStack(item);
- NBTHelper.getData(stack).setString("aspect", Aspect.MAGIC.getTag());
+ setAspect(stack, Aspect.MAGIC);
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(hasAspect(stack)) {
+ lore.add(getAspect(stack).getName());
}
- if(stack.getTagCompound().hasKey("AttackUpgrade1") || stack.getTagCompound().hasKey("AttackUpgrade2") || stack.getTagCompound().hasKey("AttackUpgrade3")) {
+ if(hasUpgrade(stack, FamiliarUpgrade.ATTACK_1) || hasUpgrade(stack, FamiliarUpgrade.ATTACK_2) || hasUpgrade(stack, FamiliarUpgrade.ATTACK_3)) {
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";
+ if(hasUpgrade(stack, FamiliarUpgrade.ATTACK_1)) strength += "I";
+ if(hasUpgrade(stack, FamiliarUpgrade.ATTACK_2)) strength += "I";
+ if(hasUpgrade(stack, FamiliarUpgrade.ATTACK_3)) strength += "I";
lore.add(strength);
}
- if(stack.getTagCompound().hasKey("RangeUpgrade1")) {
+ if(hasUpgrade(stack, FamiliarUpgrade.RANGE_1)) {
lore.add(EnumChatFormatting.GOLD + "Reach I");
}
- if(stack.getTagCompound().hasKey("CdUpgrade1")) {
+ if(hasUpgrade(stack, FamiliarUpgrade.COOLDOWN_1)) {
lore.add(EnumChatFormatting.AQUA + "Swiftness I");
}
}
@@ -76,7 +79,23 @@ public class ItemFamiliar extends Item implements IBauble {
return BaubleType.AMULET;
}
- //Called both server- and clientside!
+ public Aspect getAspect(ItemStack stack) {
+ if(!hasAspect(stack)) return null;
+ if(stack == null || !(stack.getItem() instanceof ItemFamiliar)) return null;
+ if(!stack.hasTagCompound() || !stack.getTagCompound().hasKey("aspect")) return null;
+ return Aspect.getAspect(stack.getTagCompound().getString("aspect"));
+ }
+
+ public boolean hasAspect(ItemStack stack) {
+ if(stack == null || !(stack.getItem() instanceof ItemFamiliar)) return false;
+ if(!stack.hasTagCompound() || !stack.getTagCompound().hasKey("aspect")) return false;
+ return Aspect.getAspect(stack.getTagCompound().getString("aspect")) != null;
+ }
+
+ public void setAspect(ItemStack stack, Aspect aspect) {
+ if(stack == null || !(stack.getItem() instanceof ItemFamiliar)) return;
+ NBTHelper.getData(stack).setString("aspect", aspect.getTag());
+ }
@Override
public void onWornTick(ItemStack itemStack, EntityLivingBase entity) {
@@ -114,17 +133,17 @@ public class ItemFamiliar extends Item implements IBauble {
public int getAttackRangeIncrease(ItemStack itemStack) {
if(!(itemStack.getItem() instanceof ItemFamiliar)) return 0;
- int attack = 0;
+ int range = 0;
- if(NBTHelper.getData(itemStack).getBoolean("RangeUpgrade1")) {
- attack += 3;
+ if(hasUpgrade(itemStack, FamiliarUpgrade.RANGE_1)) {
+ range += 3;
}
- return attack;
+ return range;
}
public int getAttackCooldownReduction(ItemStack itemStack) {
if(!(itemStack.getItem() instanceof ItemFamiliar)) return 0;
- return NBTHelper.getData(itemStack).getBoolean("CdUpgrade1") ? 10 : 0;
+ return hasUpgrade(itemStack, FamiliarUpgrade.COOLDOWN_1) ? 10 : 0;
}
public float getAttackStrength(ItemStack itemStack) {
@@ -132,15 +151,56 @@ public class ItemFamiliar extends Item implements IBauble {
float attack = 1F;
- if(NBTHelper.getData(itemStack).getBoolean("AttackUpgrade1")) {
+ if(hasUpgrade(itemStack, FamiliarUpgrade.ATTACK_1)) {
attack += 1F;
}
- if(NBTHelper.getData(itemStack).getBoolean("AttackUpgrade2")) {
+ if(hasUpgrade(itemStack, FamiliarUpgrade.ATTACK_2)) {
attack += 2F;
}
- if(NBTHelper.getData(itemStack).getBoolean("AttackUpgrade3")) {
+ if(hasUpgrade(itemStack, FamiliarUpgrade.ATTACK_3)) {
attack += 4F;
}
return attack;
}
+
+ public boolean hasUpgrade(ItemStack stack, FamiliarUpgrade upgrade) {
+ if(stack == null || !(stack.getItem() instanceof ItemFamiliar)) return false;
+ if(!stack.hasTagCompound() || !stack.getTagCompound().hasKey(upgrade.getTag())) return false;
+ return stack.getTagCompound().getBoolean(upgrade.getTag());
+ }
+
+ public void addUpgrade(ItemStack stack, FamiliarUpgrade upgrade) {
+ if(stack == null || !(stack.getItem() instanceof ItemFamiliar)) return;
+ NBTHelper.getData(stack).setBoolean(upgrade.getTag(), true);
+ }
+
+ public static enum FamiliarUpgrade {
+
+ ATTACK_1("AttackUpgrade1"),
+ ATTACK_2("AttackUpgrade2", ATTACK_1),
+ ATTACK_3("AttackUpgrade3", ATTACK_2),
+ COOLDOWN_1("CdUpgrade1"),
+ RANGE_1("RangeUpgrade1");
+
+ private String tag;
+ private FamiliarUpgrade neededUpgrade;
+
+ private FamiliarUpgrade(String tagStr) {
+ this(tagStr, null);
+ }
+
+ private FamiliarUpgrade(String tagStr, FamiliarUpgrade neededUpgrade) {
+ this.tag = tagStr;
+ this.neededUpgrade = neededUpgrade;
+ }
+
+ public String getTag() {
+ return tag;
+ }
+
+ public FamiliarUpgrade getNeededPreviousUpgrade() {
+ return neededUpgrade;
+ }
+ }
+
}
diff --git a/src/main/java/makeo/gadomancy/common/registration/FamiliarAugmentInfusion.java b/src/main/java/makeo/gadomancy/common/registration/FamiliarAugmentInfusion.java
new file mode 100644
index 0000000..ce665a2
--- /dev/null
+++ b/src/main/java/makeo/gadomancy/common/registration/FamiliarAugmentInfusion.java
@@ -0,0 +1,76 @@
+package makeo.gadomancy.common.registration;
+
+import makeo.gadomancy.common.items.baubles.ItemFamiliar;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import thaumcraft.api.ThaumcraftApiHelper;
+import thaumcraft.api.aspects.AspectList;
+import thaumcraft.api.crafting.InfusionRecipe;
+
+import java.util.ArrayList;
+
+/**
+ * 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 @ 02.11.2015 17:39
+ */
+public class FamiliarAugmentInfusion extends InfusionRecipe {
+
+ private ItemFamiliar.FamiliarUpgrade upgradeToAdd;
+
+ public FamiliarAugmentInfusion(String research, int inst, AspectList aspects2, ItemStack input, ItemFamiliar.FamiliarUpgrade upgradeToAdd, ItemStack[] recipe) {
+ super(research, null, inst, aspects2, input, recipe);
+ this.upgradeToAdd = upgradeToAdd;
+ }
+
+ @Override
+ public boolean matches(ArrayList input, ItemStack central, World world, EntityPlayer player) {
+ if(central == null || !(central.getItem() instanceof ItemFamiliar)) return false; //We call it "FamiliarAugment" Recipe for a reason..
+ if(getRecipeInput() == null || !(getRecipeInput().getItem() instanceof ItemFamiliar)) return false; //A bit late but still working..
+
+ if ((this.research.length() > 0) && (!ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), this.research))) {
+ return false;
+ }
+
+ ItemStack centralCopy = central.copy();
+ if(!((ItemFamiliar) centralCopy.getItem()).hasUpgrade(centralCopy, getUpgradeToAdd().getNeededPreviousUpgrade())) return false;
+
+ ArrayList ii = new ArrayList();
+ for (ItemStack is : input) {
+ ii.add(is.copy());
+ }
+ for (ItemStack comp : getComponents()) {
+ boolean b = false;
+ for (int a = 0; a < ii.size(); a++) {
+ centralCopy = ii.get(a).copy();
+ if (comp.getItemDamage() == 32767) {
+ centralCopy.setItemDamage(32767);
+ }
+ if (areItemStacksEqual(centralCopy, comp, true)) {
+ ii.remove(a);
+ b = true;
+ break;
+ }
+ }
+ if (!b) {
+ return false;
+ }
+ }
+ return ii.size() == 0;
+ }
+
+ @Override
+ public Object getRecipeOutput(ItemStack input) {
+ ItemStack inputCopy = input.copy();
+ ((ItemFamiliar) input.getItem()).addUpgrade(inputCopy, getUpgradeToAdd());
+ return inputCopy;
+ }
+
+ public ItemFamiliar.FamiliarUpgrade getUpgradeToAdd() {
+ return upgradeToAdd;
+ }
+}
diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java
index 56533e3..bfef6ba 100644
--- a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java
+++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java
@@ -4,12 +4,12 @@ import makeo.gadomancy.api.golems.AdditionalGolemType;
import makeo.gadomancy.common.Gadomancy;
import makeo.gadomancy.common.crafting.InfusionUpgradeRecipe;
import makeo.gadomancy.common.crafting.RecipeStickyJar;
+import makeo.gadomancy.common.items.baubles.ItemFamiliar;
import makeo.gadomancy.common.research.SimpleResearchItem;
import makeo.gadomancy.common.utils.NBTHelper;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
@@ -47,6 +47,9 @@ public class RegisteredRecipes {
public static InfusionRecipe recipeRandomizationFocus;
public static InfusionRecipe[] recipesFamilar;
+ //ID's: 0-2=Strength upgrades, 3=range, 4=cdReduction
+ public static InfusionRecipe[][] recipesFamiliarAugmentation;
+
public static IArcaneRecipe recipeStickyJar;
public static IArcaneRecipe recipeArcaneDropper;
public static IArcaneRecipe recipeRemoteJar;
@@ -100,7 +103,82 @@ public class RegisteredRecipes {
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), null, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 0), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11),
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), null, new ItemStack(RegisteredBlocks.blockNodeManipulator, 1, 5), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15)));
+
+
recipesFamilar = createFamilarRecipes();
+ recipesFamiliarAugmentation = createFamiliarAugmentationRecipes();
+ }
+
+ private static InfusionRecipe[][] createFamiliarAugmentationRecipes() {
+ InfusionRecipe[][] recipes = new InfusionRecipe[5][];
+ ItemWispEssence wispEssence = (ItemWispEssence) ConfigItems.itemWispEssence;
+ ItemFamiliar familiar = (ItemFamiliar) RegisteredItems.itemFamiliar;
+
+ List aspects = new ArrayList(Aspect.aspects.values());
+ InfusionRecipe[] upgradeArrayStr1 = new InfusionRecipe[aspects.size()];
+ InfusionRecipe[] upgradeArrayStr2 = new InfusionRecipe[aspects.size()];
+ InfusionRecipe[] upgradeArrayStr3 = new InfusionRecipe[aspects.size()];
+ InfusionRecipe[] upgradeArrayRange1 = new InfusionRecipe[aspects.size()];
+ InfusionRecipe[] upgradeArrayCd1 = new InfusionRecipe[aspects.size()];
+
+ for (int i = 0; i < aspects.size(); i++) {
+ Aspect aspect = aspects.get(i);
+ ItemStack wispyEssence = new ItemStack(wispEssence, 1, 0);
+ wispEssence.setAspects(wispyEssence, new AspectList().add(aspect, 2));
+
+ ItemStack familiarIn = new ItemStack(RegisteredItems.itemFamiliar);
+ familiar.setAspect(familiarIn, aspect);
+
+ FamiliarAugmentInfusion infusion = new FamiliarAugmentInfusion(Gadomancy.MODID.toUpperCase() + ".FAM_ATTACK_1", 4, new AspectList().add(Aspect.AURA, 37).add(Aspect.MAGIC, 53).add(aspect, 35), familiarIn, ItemFamiliar.FamiliarUpgrade.ATTACK_1,
+ new ItemStack[]{ wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 6), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 4), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 6), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 4)});
+ ThaumcraftApi.getCraftingRecipes().add(infusion);
+ upgradeArrayStr1[i] = infusion;
+
+ familiarIn = new ItemStack(RegisteredItems.itemFamiliar);
+ familiar.setAspect(familiarIn, aspect);
+ familiar.addUpgrade(familiarIn, ItemFamiliar.FamiliarUpgrade.ATTACK_1);
+
+ infusion = new FamiliarAugmentInfusion(Gadomancy.MODID.toUpperCase() + ".FAM_ATTACK_2", 6, new AspectList().add(Aspect.AURA, 43).add(Aspect.MAGIC, 71).add(Aspect.ELDRITCH, 37).add(aspect, 59), familiarIn, ItemFamiliar.FamiliarUpgrade.ATTACK_2,
+ new ItemStack[] { wispyEssence, new ItemStack(ConfigBlocks.blockCrystal, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 15), wispyEssence, new ItemStack(ConfigBlocks.blockCrystal, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 17), wispyEssence, new ItemStack(ConfigBlocks.blockCrystal, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 15), wispyEssence, new ItemStack(ConfigBlocks.blockCrystal, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 17)});
+ ThaumcraftApi.getCraftingRecipes().add(infusion);
+ upgradeArrayStr2[i] = infusion;
+
+
+ familiarIn = new ItemStack(RegisteredItems.itemFamiliar);
+ familiar.setAspect(familiarIn, aspect);
+ familiar.addUpgrade(familiarIn, ItemFamiliar.FamiliarUpgrade.ATTACK_1);
+ familiar.addUpgrade(familiarIn, ItemFamiliar.FamiliarUpgrade.ATTACK_2);
+
+ infusion = new FamiliarAugmentInfusion(Gadomancy.MODID.toUpperCase() + ".FAM_ATTACK_3", 10, new AspectList().add(Aspect.AURA, 77).add(Aspect.MAGIC, 93).add(Aspect.WEAPON, 49).add(aspect, 104), familiarIn, ItemFamiliar.FamiliarUpgrade.ATTACK_3,
+ new ItemStack[] { new ItemStack(ConfigItems.itemEldritchObject, 1, 3), wispyEssence, new ItemStack(ConfigBlocks.blockCustomPlant, 1, 4), wispyEssence, new ItemStack(Items.nether_star, 1, 0), wispyEssence, new ItemStack(ConfigBlocks.blockCustomPlant, 1, 4), wispyEssence });
+ ThaumcraftApi.getCraftingRecipes().add(infusion);
+ upgradeArrayStr3[i] = infusion;
+
+ familiarIn = new ItemStack(RegisteredItems.itemFamiliar);
+ familiar.setAspect(familiarIn, aspect);
+
+ infusion = new FamiliarAugmentInfusion(Gadomancy.MODID.toUpperCase() + ".FAM_RANGE_1", 8, new AspectList().add(Aspect.AURA, 44).add(Aspect.MAGIC, 51).add(aspect, 37), familiarIn, ItemFamiliar.FamiliarUpgrade.RANGE_1,
+ new ItemStack[] { new ItemStack(ConfigItems.itemResource, 1, 0), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 17), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 0), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 17), wispyEssence });
+ ThaumcraftApi.getCraftingRecipes().add(infusion);
+ upgradeArrayRange1[i] = infusion;
+
+
+ familiarIn = new ItemStack(RegisteredItems.itemFamiliar);
+ familiar.setAspect(familiarIn, aspect);
+
+ infusion = new FamiliarAugmentInfusion(Gadomancy.MODID.toUpperCase() + ".FAM_COOLDOWN_1", 10, new AspectList().add(Aspect.AURA, 79).add(Aspect.MAGIC, 101).add(Aspect.EXCHANGE, 54).add(aspect, 81), familiarIn, ItemFamiliar.FamiliarUpgrade.COOLDOWN_1,
+ new ItemStack[] { new ItemStack(ConfigItems.itemEldritchObject, 1, 3), new ItemStack(ConfigItems.itemFocusPrimal, 1, 0), wispyEssence, new ItemStack(ConfigItems.itemBathSalts, 1, 0), new ItemStack(ConfigItems.itemFocusPrimal, 1, 0), wispyEssence, new ItemStack(ConfigItems.itemBathSalts, 1, 0) });
+ ThaumcraftApi.getCraftingRecipes().add(infusion);
+ upgradeArrayCd1[i] = infusion;
+ }
+
+ recipes[0] = upgradeArrayStr1;
+ recipes[1] = upgradeArrayStr2;
+ recipes[2] = upgradeArrayStr3;
+ recipes[3] = upgradeArrayRange1;
+ recipes[4] = upgradeArrayCd1;
+
+ return recipes;
}
private static IArcaneRecipe[] stickyJarRecipes = null;
@@ -132,6 +210,7 @@ public class RegisteredRecipes {
public static InfusionRecipe[] createFamilarRecipes() {
List aspects = new ArrayList(Aspect.aspects.values());
InfusionRecipe[] recipes = new InfusionRecipe[aspects.size()];
+ ItemFamiliar familiar = (ItemFamiliar) RegisteredItems.itemFamiliar;
ItemWispEssence itemEssence = (ItemWispEssence) ConfigItems.itemWispEssence;
for (int i = 0; i < aspects.size(); i++) {
@@ -141,8 +220,7 @@ public class RegisteredRecipes {
itemEssence.setAspects(wispyEssence, new AspectList().add(aspect, 2));
ItemStack result = new ItemStack(RegisteredItems.itemFamiliar);
- NBTTagCompound compound = NBTHelper.getData(result);
- compound.setString("aspect", aspect.getTag());
+ familiar.setAspect(result, aspect);
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) });
}
diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java
index 4789d12..75eff22 100644
--- a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java
+++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java
@@ -48,6 +48,11 @@ public class RegisteredResearches {
//Familiar
public static ResearchItem researchFamiliarBasic;
+ public static ResearchItem researchFamiliarAttack_1;
+ public static ResearchItem researchFamiliarAttack_2;
+ public static ResearchItem researchFamiliarAttack_3;
+ public static ResearchItem researchFamiliarRange_1;
+ public static ResearchItem researchFamiliarCooldown_1;
public static void init() {
@@ -143,6 +148,54 @@ public class RegisteredResearches {
.setParents(nitorResearch.key)
.setPages(new ResearchPage("gadomancy.research_page.FAMILIAR.1"), new ResearchPage(RegisteredRecipes.recipesFamilar)).registerResearchItem();
+ ResearchItem researchTallow = PseudoResearchItem.create("TALLOW", 7, -3).registerResearchItem();
+
+ researchFamiliarAttack_1 = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".FAM_ATTACK_1", Gadomancy.MODID,
+ new AspectList(),
+ 5, -1, 2, new ItemStack(RegisteredItems.itemFakeModIcon, 1, 1))
+ .setConcealed()
+ .setParents(Gadomancy.MODID.toUpperCase() + ".FAMILIAR", researchTallow.key)
+ .setPages(new ResearchPage("gadomancy.research_page.FAM_ATTACK_1.1"), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[0])).registerResearchItem();
+
+ ResearchItem researchVoidSeed = PseudoResearchItem.create("ELDRITCHMINOR", 8, -2).registerResearchItem();
+
+ researchFamiliarAttack_2 = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".FAM_ATTACK_2", Gadomancy.MODID,
+ new AspectList(),
+ 7, 0, 2, new ItemStack(RegisteredItems.itemFakeModIcon, 1, 2))
+ .setConcealed()
+ .setParents(Gadomancy.MODID.toUpperCase() + ".FAM_ATTACK_1", researchVoidSeed.key)
+ .setPages(new ResearchPage("gadomancy.research_page.FAM_ATTACK_2.1"), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[1])).registerResearchItem();
+
+ ResearchItem researchPrimodialPearl = PseudoResearchItem.create("PRIMPEARL", 10, 1).registerResearchItem();
+ ResearchItem researchEthBloom = PseudoResearchItem.create("ETHEREALBLOOM", 9, 0).registerResearchItem();
+ ResearchItem researchBathSalts = PseudoResearchItem.create("BATHSALTS", 3, 2).registerResearchItem();
+ ResearchItem researchPrimalFocus2 = PseudoResearchItem.create("FOCUSPRIMAL", 3, 4, true).registerResearchItem();
+ ResearchItem researchAlumentum = PseudoResearchItem.create("ALUMENTUM", 2, 0).registerResearchItem();
+
+ researchFamiliarAttack_3 = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".FAM_ATTACK_3", Gadomancy.MODID,
+ new AspectList(),
+ 8, 2, 2, new ItemStack(RegisteredItems.itemFakeModIcon, 1, 3))
+ .setConcealed()
+ .setParents(Gadomancy.MODID.toUpperCase() + ".FAM_ATTACK_2", researchPrimodialPearl.key, researchEthBloom.key)
+ .setPages(new ResearchPage("gadomancy.research_page.FAM_ATTACK_3.1"), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[2])).registerResearchItem();
+
+ researchFamiliarRange_1 = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".FAM_RANGE_1", Gadomancy.MODID,
+ new AspectList(),
+ 4, 1, 2, new ItemStack(RegisteredItems.itemFakeModIcon, 1, 4))
+ .setConcealed()
+ .setParents(Gadomancy.MODID.toUpperCase() + ".FAMILIAR", Gadomancy.MODID.toUpperCase() + ".FAM_ATTACK_2", researchAlumentum.key)
+ .setPages(new ResearchPage("gadomancy.research_page.FAM_RANGE_1.1"), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[3])).registerResearchItem();
+
+ researchFamiliarCooldown_1 = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".FAM_COOLDOWN_1", Gadomancy.MODID,
+ new AspectList(),
+ 5, 3, 2, new ItemStack(RegisteredItems.itemFakeModIcon, 1, 5))
+ .setConcealed()
+ .setParents(Gadomancy.MODID.toUpperCase() + ".FAM_RANGE_1", Gadomancy.MODID.toUpperCase() + ".FAM_ATTACK_3", researchBathSalts.key, researchPrimalFocus2.key)
+ .setPages(new ResearchPage("gadomancy.research_page.FAM_COOLDOWN_1.1"), new ResearchPage(RegisteredRecipes.recipesFamiliarAugmentation[4])).registerResearchItem();
+
+ //Warpy warpy
+ ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".FAM_ATTACK_3", 2);
+ ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".FAM_COOLDOWN_1", 3);
ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR", 4);
ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTHCLUE", 3);
ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".FAMILIAR", 1);
diff --git a/src/main/java/makeo/gadomancy/common/research/PseudoResearchItem.java b/src/main/java/makeo/gadomancy/common/research/PseudoResearchItem.java
index 43a3c71..26810c6 100644
--- a/src/main/java/makeo/gadomancy/common/research/PseudoResearchItem.java
+++ b/src/main/java/makeo/gadomancy/common/research/PseudoResearchItem.java
@@ -27,14 +27,14 @@ public class PseudoResearchItem extends SimpleResearchItem {
private final ResearchItem original;
- private PseudoResearchItem(ResearchItem original, String key, int col, int row, ResourceLocation icon) {
- super(PSEUDO_PREFIX + key, col, row, original.getComplexity(), icon, new AspectList());
+ private PseudoResearchItem(ResearchItem original, String key, int col, int row, ResourceLocation icon, boolean doubleThisPage) {
+ super(PSEUDO_PREFIX + key + (doubleThisPage ? ".2" : ""), col, row, original.getComplexity(), icon, new AspectList());
this.original = original;
setStub().setHidden();
}
- private PseudoResearchItem(ResearchItem original, String key, int col, int row, ItemStack icon) {
- super(PSEUDO_PREFIX + key, col, row, original.getComplexity(), icon, new AspectList());
+ private PseudoResearchItem(ResearchItem original, String key, int col, int row, ItemStack icon, boolean doubleThisPage) {
+ super(PSEUDO_PREFIX + key + (doubleThisPage ? ".2" : ""), col, row, original.getComplexity(), icon, new AspectList());
this.original = original;
setStub().setHidden();
}
@@ -67,15 +67,19 @@ public class PseudoResearchItem extends SimpleResearchItem {
}
public static ResearchItem create(String original, int col, int row) {
+ return create(original, col, row, false);
+ }
+
+ public static ResearchItem create(String original, int col, int row, boolean doubleInThisPage) {
ResearchItem item = ResearchCategories.getResearch(original);
if(item != null) {
ResearchItem pseudo;
if(item.icon_resource == null) {
- pseudo = new PseudoResearchItem(item, item.key, col, row, item.icon_item);
+ pseudo = new PseudoResearchItem(item, item.key, col, row, item.icon_item, doubleInThisPage);
} else {
- pseudo = new PseudoResearchItem(item, item.key, col, row, item.icon_resource);
+ pseudo = new PseudoResearchItem(item, item.key, col, row, item.icon_resource, doubleInThisPage);
}
String[] siblings = item.siblings;
diff --git a/src/main/resources/assets/gadomancy/lang/en_US.lang b/src/main/resources/assets/gadomancy/lang/en_US.lang
index 06a449b..5364d3f 100644
--- a/src/main/resources/assets/gadomancy/lang/en_US.lang
+++ b/src/main/resources/assets/gadomancy/lang/en_US.lang
@@ -37,6 +37,26 @@ tc.research_name.GADOMANCY.FAMILIAR=Familiar
tc.research_text.GADOMANCY.FAMILIAR=A arcane follower
gadomancy.research_page.FAMILIAR.1=Thanks to your deep research into Wisps and arcane flames you call 'Nitor' you think you may be able to create a being just like the Wisp. Using the same Ethereal Essence and Essentia you are able to define the base aspect of your Familiar. But that's not enough! You might be able to direct its movements and actions to defend yourself with it. However, making it attack players doesn't seem so easy and it seems a bit weak too.. Let's do something about that when the time comes...
+tc.research_name.GADOMANCY.FAM_ATTACK_1=Attack Enhancement
+tc.research_text.GADOMANCY.FAM_ATTACK_1=Increasing the damage
+gadomancy.research_page.FAM_ATTACK_1.1=a1
+
+tc.research_name.GADOMANCY.FAM_ATTACK_2=Further Attack Enhancement
+tc.research_text.GADOMANCY.FAM_ATTACK_2=What does the scouter say about its power level?
+gadomancy.research_page.FAM_ATTACK_2.1=a2
+
+tc.research_name.GADOMANCY.FAM_ATTACK_3=Maximized Damage
+tc.research_text.GADOMANCY.FAM_ATTACK_3=ITS OVER 9000!
+gadomancy.research_page.FAM_ATTACK_3.1=a3
+
+tc.research_name.GADOMANCY.FAM_RANGE_1=Range Enhancement
+tc.research_text.GADOMANCY.FAM_RANGE_1=Attacking even further
+gadomancy.research_page.FAM_RANGE_1.1=r1
+
+tc.research_name.GADOMANCY.FAM_COOLDOWN_1=Attack-Speed Enhancement
+tc.research_text.GADOMANCY.FAM_COOLDOWN_1=A scientific Railgun
+gadomancy.research_page.FAM_COOLDOWN_1.1=c1
+
tc.research_name.GADOMANCY.NODE_MANIPULATOR=Node Manipulator
tc.research_text.GADOMANCY.NODE_MANIPULATOR=Almost like roulette
gadomancy.research_page.NODE_MANIPULATOR.1=By infusing your ordinary Wand Recharge Pedestal with the stabilizing factors of a Node Stabilizer and the Paving Stone of Warding along with some of the most ancient ingredients that share the highest affinity when it comes to channeling Vis in its most pure form, one of the most dangerous machines fell into your possession: The Node Manipulator. A machine so capable of changing the way an aura node transports Vis from their end to our end.
diff --git a/src/main/resources/assets/gadomancy/textures/items/Attack1.png b/src/main/resources/assets/gadomancy/textures/items/Attack1.png
new file mode 100644
index 0000000..ffa5b0c
Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/items/Attack1.png differ
diff --git a/src/main/resources/assets/gadomancy/textures/items/Attack2.png b/src/main/resources/assets/gadomancy/textures/items/Attack2.png
new file mode 100644
index 0000000..72ae4a2
Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/items/Attack2.png differ
diff --git a/src/main/resources/assets/gadomancy/textures/items/Attack3.png b/src/main/resources/assets/gadomancy/textures/items/Attack3.png
new file mode 100644
index 0000000..cd15a71
Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/items/Attack3.png differ
diff --git a/src/main/resources/assets/gadomancy/textures/items/Cooldown1.png b/src/main/resources/assets/gadomancy/textures/items/Cooldown1.png
new file mode 100644
index 0000000..b0f66b2
Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/items/Cooldown1.png differ
diff --git a/src/main/resources/assets/gadomancy/textures/items/Range1.png b/src/main/resources/assets/gadomancy/textures/items/Range1.png
new file mode 100644
index 0000000..93c8a5e
Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/items/Range1.png differ